Index: xc/ChangeLog
===================================================================
RCS file: /cvs/xorg/xc/ChangeLog,v
retrieving revision 1.88
diff -u -2 -0 -r1.88 ChangeLog
--- xc/ChangeLog	7 Jul 2004 19:44:28 -0000	1.88
+++ xc/ChangeLog	13 Jul 2004 01:38:50 -0000
@@ -1,20 +1,24 @@
+2004-07-12 Roland Mainz <roland.mainz@nrubsig.org>
+        * xc/config/cf/linux.cf
+        Bugzilla #824: Build fix for SuSE Linux
+
 2004-07-07  Eric Anholt  <anholt@FreeBSD.org>
 
 	* Imakefile:
 	Bugzilla #478: Install xrender.pc (required by xcursor.pc).
 
 2004-07-07  Rik Faith  <faith(at)freedesktop.org>
 
 	* programs/Xserver/hw/dmx/dmxinit.c:
 	* programs/Xserver/hw/dmx/glxProxy/glxsingle.c:
 	* programs/Xserver/hw/dmx/glxProxy/glxvendor.c:
 	* programs/Xserver/hw/dmx/input/Imakefile:
 	* programs/Xserver/hw/dmx/input/dmxinputinit.c:
 	* programs/Xserver/hw/dmx/input/dmxsigio.c:
 	Bugzilla #817: Enable build under Solaris
 	(Thanks to Alan Coopersmith)
 
 2004-07-06  Kevin E. Martin <kem(at)freedesktop.org>
 
 	* config/cf/README:
 	* config/cf/X11.tmpl:
Index: xc/config/cf/linux.cf
===================================================================
RCS file: /cvs/xorg/xc/config/cf/linux.cf,v
retrieving revision 1.6
diff -u -2 -0 -r1.6 linux.cf
--- xc/config/cf/linux.cf	6 Jul 2004 23:50:59 -0000	1.6
+++ xc/config/cf/linux.cf	13 Jul 2004 01:38:51 -0000
@@ -160,40 +160,46 @@
 /* at present, glide3 only works on alpha and i386 */
 #   if defined(i386Architecture) || defined(AlphaArchitecture)
 #    define HasGlide3			YES
 #    define Glide3IncDir		/usr/include/glide3
 #   endif /* i386Architecture || AlphaArchitecture */
 /* extended instruction set support */
 #   ifdef i386Architecture
 #   define HasX86Support		YES
 #    define HasMMXSupport		YES
 #    define Has3DNowSupport		YES
 /* 2.4 is not yet the official (or predominant) kernel in unstable */
 #    define HasSSESupport		NO
 #   endif /* i386Architecture */
 # endif /* DebianMaintainer */
 #endif /* LinuxDebian */
 
 #if LinuxDistribution == LinuxRedHat
 #define FSUseSyslog		YES
 #endif
 
+#if LinuxDistribution == LinuxSuSE
+/* Build always the in-tree copy of freetype2 since older SuSE
+ * (like SuSE 8.2) may not have the minimum version we need */
+# define HasFreetype2		NO
+#endif
+
 /*
  * The Linux BinUtils major version.  25 => 2.5.x, which is what is included
  * with Slackware 3.0
  *
  * This remains for compatibility only.
  *
  */
 #ifndef BinUtilsMajorVersion
 # define BinUtilsMajorVersion	LinuxBinUtilsMajorVersion
 #endif
 
 #if (LinuxCLibMajorVersion >= 6 || LinuxDistribution == LinuxSuSE)
 # define LinuxLocaleDefines	/**/
 #else
 # define LinuxLocaleDefines	-DX_LOCALE
 #endif
 
 #ifndef  LinuxAdditionalIncludes
 # define LinuxAdditionalIncludes	/**/
 #endif