[Lunar-commits] CVS: moonbase/zbeta/XOrg-test BUILD, 1.1, 1.2 CONFIGURE, 1.1, NONE

[Nick Hudson]

Update of /var/cvs/lunar/moonbase/zbeta/XOrg-test
In directory espresso.foo-projects.org:/tmp/cvs-serv3956

Modified Files:
	BUILD 
Removed Files:
	CONFIGURE 
Log Message:

Removing the CONFIGURE script for now, as its not needed it looks anymore.  Also adding some stuff to the host.def file so that it will build some extra options.  Testing out to see if fontconfig from XOrg will work ok by itself so that we will not have any more problems with the fontconfig module


Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/zbeta/XOrg-test/BUILD,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- BUILD	10 Sep 2004 04:01:42 -0000	1.1
+++ BUILD	4 Oct 2004 03:05:32 -0000	1.2
@@ -19,7 +19,7 @@
   bad_flags '-funroll-loops' '-ffast-math'
 
   # first copy the stored settings over:
-  cp $CONFIG_CACHE/host.def config/cf/host.def &&
+  #cp $CONFIG_CACHE/host.def config/cf/host.def &&
 
   # then add stuff on the fly:
   echo  "#define InstallXdmConfig YES"          >> config/cf/host.def &&
@@ -38,6 +38,19 @@
   echo  "#define OptimizedCDebugFlags  $CFLAGS" >> config/cf/host.def &&
   echo  "#define XVendorString \"Lunar-Linux.org (The X.Org Foundation $VERSION)\"" >> config/cf/host.def &&
   echo  "#define FontDir /usr/share/fonts"      >> config/cf/host.def &&
+  echo  "#define HasZlib YES"                   >> config/cf/host.def &&
+  echo  "#define HasFreetype2 YES"              >> config/cf/host.def &&
+  echo  "#define ForceNormalLib  YES"           >> config/cf/host.def &&	
+  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 &&
+  echo  "#define UseFontconfig YES"		>> config/cf/host.def &&
+  echo  "#define HasFontconfig YES"		>> config/cf/host.def &&
+  echo  "#define SharedLibXft YES"		>> config/cf/host.def &&
+  echo  "#define PreferXdmcpIPv6 YES"		>> config/cf/host.def &&
+  echo  "#define ProPoliceSupport YES"		>> config/cf/host.def &&
 
   if grep -q "Compilation aborted" /usr/include/linux/config.h ; then
     # This must happen or it will cause the module to break
@@ -47,7 +60,6 @@
     invoke_installwatch
   fi
   
-  mkdir -p /usr/src/xc/programs     &&
   make World                            &&
   prepare_install                       &&
   cd $SOURCE_DIRECTORY                  &&

--- CONFIGURE DELETED ---