? ChangeLog.foo
? ChangeLog.tmp
? bar
? list
? config/cf/foo
Index: ChangeLog
===================================================================
RCS file: /cvs/xorg/xc/ChangeLog,v
retrieving revision 1.666
diff -u -r1.666 ChangeLog
--- ChangeLog	11 Jan 2005 15:10:23 -0000	1.666
+++ ChangeLog	11 Jan 2005 16:09:00 -0000
@@ -1,7 +1,14 @@
 2005-01-11  Egbert Eich  <eich-at-freedesktop-dot-org>
 
+	* config/cf/xorg.cf:
+	Don't build tdfx DRI driver on any platform but x86 and AXP
+	as therequired Glide3 lib is only available there (if at all).
+	Readability fixes.
+
+2005-01-11  Egbert Eich  <eich-at-freedesktop-dot-org>
+
 	* programs/Xserver/hw/xfree86/drivers/chips/chips.man:
-	Explain the FpMode option.
+	Explain the FpMode option (Bugzilla #).
 	
 2005-01-11  Egbert Eich  <eich-at-freedesktop-dot-org>
 
Index: config/cf/xorg.cf
===================================================================
RCS file: /cvs/xorg/xc/config/cf/xorg.cf,v
retrieving revision 1.39
diff -u -r1.39 xorg.cf
--- config/cf/xorg.cf	11 Jan 2005 15:02:55 -0000	1.39
+++ config/cf/xorg.cf	11 Jan 2005 16:09:00 -0000
@@ -411,12 +411,15 @@
 
 # ifndef DriDrivers
 #  ifndef ia64Architecture
-#   define i386DRIDrivers i810 i915
+#   define i386DRIDrivers i810 i915 sis tdfx
 #  else
+   /*
+    *  The tdfx driver needs Glide, which is not available for IA64.
+    *  SiS is 64-bit unclean as of this writing. 
+    */  
 #   define i386DRIDrivers /**/
 #  endif
-#  define DriDrivers		gamma i386DRIDrivers mga r128 radeon r200 \
-				sis tdfx
+#  define DriDrivers		gamma i386DRIDrivers mga r128 radeon r200
 # endif
 #endif /* i386Architecture || ia64Architecture */
 
@@ -451,11 +454,13 @@
 				XF86OSCardDrivers XF86ExtraCardDrivers DevelDrivers
 # endif
 
-/* The tdfx driver needs Glide, which is not available for AMD64.  SiS is 64-bit
- * unclean as of this writing.
+/* 
+ * The tdfx driver needs Glide, which is not available for AMD64.  
+ * SiS is 64-bit unclean as of this writing.
  */
-# define DriDrivers		i915 gamma mga r128 radeon r200
-
+# ifndef DriDrivers
+#  define DriDrivers		i915 gamma mga r128 radeon r200
+# endif
 #endif /*AMD64Arcitecture*/
 
 /* SPARC and UltraSPARC drivers */
@@ -589,7 +594,10 @@
 				savage nv cirrus DevelDrivers siliconmotion  \
 				vga XF86OSCardDrivers XF86ExtraCardDrivers
 # endif
-/* SiS is 64-bit unclean as of this writing. */
+/*
+ *  Glide is available for Alpha, therefore build tdfx DRM module.
+ *  SiS is 64-bit unclean as of this writing. 
+ */  
 # ifndef DriDrivers
 #  define DriDrivers		gamma tdfx mga r128 radeon r200
 # endif
@@ -623,10 +631,11 @@
 				DevelDrivers vga \
 				XF86OSCardDrivers XF86ExtraCardDrivers
 # endif
+/*  The tdfx driver needs Glide, which is not available for PPC. */
 # ifndef DriDrivers
-#  define DriDrivers		gamma tdfx mga r128 radeon r200
+#  define DriDrivers		gamma mga r128 radeon r200
 # endif
-#endif
+#endif  /* PpcArchitecture || Mc68020Architecture */
 
 /*
  * Intel StrongARM and Hewlett-Packard PA-RISC