CVS: moonbase/x11/xfree86 BUILD,1.5,1.6

[Steven Michaelske]

Update of /var/cvs/lunar/moonbase/x11/xfree86
In directory dbguin.lunar-linux.org:/tmp/cvs-serv10994

Modified Files:
	BUILD 
Log Message:
fixing xfree86 and freetype2 once and for all :-P  see bug 414


Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/x11/xfree86/BUILD,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- BUILD	5 Dec 2003 17:30:27 -0000	1.5
+++ BUILD	11 Dec 2003 04:15:22 -0000	1.6
@@ -14,8 +14,20 @@
    echo "Your master xinitrc file has been backed up as /etc/X11/xinit/xinitrc.orig"
 fi
 
-if    [  -f  $CONFIG_CACHE/host.def  ]
-then  cp     $CONFIG_CACHE/host.def  config/cf/host.def
+if    [  -f  $CONFIG_CACHE/host.def  ]; then  
+  #BECAUSE CONFIGURE dosent always catch this!
+  if module_installed freetype2; then
+    if ! grep -q "#define BuildFreetype2Library[:space:]*NO" $CONFIG_CACHE/host.def
+    then
+      sedit "/ HasFreetype2/d"                $CONFIG_CACHE/host.def
+      sedit "/ BuildFreetype2Library/d"       $CONFIG_CACHE/host.def
+      sedit "/ Freetype2Dir/"                 $CONFIG_CACHE/host.def
+      echo "#define HasFreetype2              YES"  >> $CONFIG_CACHE/host.def
+      echo "#define BuildFreetype2Library     NO"   >> $CONFIG_CACHE/host.def
+      echo "#define Freetype2Dir              /usr" >> $CONFIG_CACHE/host.def
+    fi
+  fi
+  cp     $CONFIG_CACHE/host.def  config/cf/host.def
 fi
 
 message  "Building XFree86 takes a very long time."