[Lunar-commits] CVS: moonbase/zbeta/XOrg-test BUILD,1.5,1.6

[Auke Kok]

Update of /var/cvs/lunar/moonbase/zbeta/XOrg-test
In directory espresso.foo-projects.org:/home/sofar/active/moonbase/zbeta/XOrg-test

Modified Files:
	BUILD 
Log Message:
Random untested changes.


Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/zbeta/XOrg-test/BUILD,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- BUILD	1 Nov 2004 19:34:17 -0000	1.5
+++ BUILD	17 Nov 2004 14:35:49 -0000	1.6
@@ -31,10 +31,10 @@
   echo  "#define InstallXserverSetUID YES"      >> config/cf/host.def &&
   echo  "#define BuildServersOnly NO"           >> config/cf/host.def &&
 
- # if module_installed Linux-PAM ; then
- #   echo "#define HasPam YES"                   >> config/cf/host.def &&
- #   echo "#define HasPamMisc YES"               >> config/cf/host.def 
- # fi 
+  if module_installed Linux-PAM ; then
+    echo "#define HasPam YES"                   >> config/cf/host.def &&
+    echo "#define HasPamMisc YES"               >> config/cf/host.def 
+  fi 
 
   echo  "#define DefaultCCOptions      $CFLAGS" >> config/cf/host.def &&
   echo  "#define LibraryCDebugFlags    $CFLAGS" >> config/cf/host.def &&
@@ -48,8 +48,12 @@
   echo  "#define HasExpat  YES"			>> config/cf/host.def &&
   echo  "#define UseExpat  YES"                 >> config/cf/host.def &&
   echo  "#define HasLibpng YES"			>> config/cf/host.def &&
-  echo  "#define HasLibxml2 YES"		>> config/cf/host.def &&
-  echo  "#define InstallFontconfigLibrary YES"  >> config/cf/host.def &&
+  if module_installed libxml2 ; then
+    echo  "#define HasLibxml2 YES"		>> config/cf/host.def
+  else
+    echo  "#define HasLibxml2 NO"		>> config/cf/host.def
+  fi
+  echo  "#define InstallFontconfigLibrary NO"   >> config/cf/host.def &&
   echo  "#define SharedLibXft YES"		>> config/cf/host.def &&
   echo  "#define PreferXdmcpIPv6 YES"		>> config/cf/host.def &&
 
@@ -68,7 +72,7 @@
   make  install.man                     &&
   install_drm                           &&
   mkdir -p /usr/X11R6/include/GL        &&
-  rm     -f  /usr/X11R6/lib/libz.a      &&
+  rm     -f /usr/X11R6/lib/libz.a       &&
   rm     -f /usr/X11R6/include/zlib.h   &&
   rm     -f /usr/X11R6/include/zconf.h  &&
   rm     -f /usr/X11R6/lib/libz.a       &&