Index: xc/ChangeLog
===================================================================
RCS file: /cvs/xorg/xc/ChangeLog,v
retrieving revision 1.760
diff -u -2 -0 -r1.760 ChangeLog
--- xc/ChangeLog	9 Feb 2005 02:22:39 -0000	1.760
+++ xc/ChangeLog	9 Feb 2005 04:02:55 -0000
@@ -1,20 +1,27 @@
+2005-02-09 Roland Mainz <roland.mainz@nrubsig.org>
+	* xc/config/cf/gnu.cf
+	Bugzilla #2507 (https://bugs.freedesktop.org/show_bug.cgi?id=2507)
+	attachment #xxx (https://bugs.freedesktop.org/attachment.cgi?id=xxx):
+	Fix build problems on GNU/Hurd.
+	Patch by Pierre Chifflier
+
 2005-02-09  Roland Scheidegger  <rscheidegger_lists@hispeed.ch>
 
 	* programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c:
 	do not enable color tiling on r300 chips and newer, since it doesn't work (yet)
 	(Bugzilla #2504)
 
 2005-02-01 Alan Hourihane <alanh@fairlite.demon.co.uk>
 	* xc/programs/Xserver/hw/xfree86/drivers/i810/i830_video.c
 	Setup the Xv atoms correctly.
 
 2005-02-07  Egbert Eich  <eich-at-freedesktop-dot-org>
 
 	* programs/Xserver/hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c: (vm86_rep):
 	Save gs register before calling the vm86_old syscall thru
 	int 0x80. This is required for linuxthreads as the TLS uses
 	this register to keep track of local thread storage
 	(Bugzilla #2431, J. Scott Berg).
 	
 2005-02-07  Egbert Eich  <eich-at-freedesktop-dot-org>
 
Index: xc/config/cf/gnu.cf
===================================================================
RCS file: /cvs/xorg/xc/config/cf/gnu.cf,v
retrieving revision 1.2
diff -u -2 -0 -r1.2 gnu.cf
--- xc/config/cf/gnu.cf	23 Apr 2004 18:41:58 -0000	1.2
+++ xc/config/cf/gnu.cf	9 Feb 2005 04:02:55 -0000
@@ -35,41 +35,43 @@
 
 #ifndef HasLibCrypt
 #define HasLibCrypt             YES
 #endif
 
 #ifndef BuildXF86RushExt
 # define BuildXF86RushExt	YES
 #endif
 
 #define BuildLibPathVar		LD_LIBRARY_PATH
 #define GccUsesGas		YES
 #define UseGas			YES
 #define GnuCpp			YES
 #define HasDlopen		YES
 #ifndef HasShadowPasswd
 #  define HasShadowPasswd	YES
 #endif
 #define HasPutenv		YES
 
 XCOMM Not implemented and will always fail.
-#define HasShm			YES
+#ifndef HasShm
+# define HasShm			YES
+#endif
 
 #define HasBSD44Sockets		YES
 #define HasSockets		YES
 #define HasSnprintf		YES
 #define HasMkstemp		YES
 #define HasUsableFileMmap	YES
 #ifndef HasNCurses
 #define HasNCurses		YES
 #endif
 
 #define AvoidNullMakeCommand	YES
 #ifndef DebuggableLibraries
 #define DebuggableLibraries	NO
 #endif
 #define CompressAllFonts	YES
 #define Malloc0ReturnsNull	YES
 #define NeedConstPrototypes	YES
 #define NeedFunctionPrototypes	YES
 #define NeedNestedPrototypes	YES
 #define NeedVarargsPrototypes	YES
@@ -88,41 +90,41 @@
 #endif
 #ifndef AsCmd
 #define AsCmd			as
 #endif
 #ifndef LdCmd
 #define LdCmd			ld
 #endif
 
 #define AsmDefines		-D__ELF__
 #define CplusplusCmd		c++
 #ifndef TermcapLibrary
 #if UseStaticTermcapLib
 #define TermcapLibrary		StaticLibrary(/usr/lib,ncurses)
 #else
 #define TermcapLibrary		-lncurses
 #endif
 #endif
 #ifndef DoLoadableServer
 #define DoLoadableServer	YES
 #endif
-#ifndef
+#ifndef CppCmd
 #define CppCmd			/lib/cpp
 #endif
 #define YaccCmd			bison -y
 #define LexCmd			flex -l
 #define HasFlex			YES
 #define LexLib			-lfl
 #define PreProcessCmd		CcCmd -E
 #define PostIncDir		DefaultGccIncludeDir
 #define LdCombineFlags		-r
 #ifndef LdPostLib
 #define LdPostLib		/* Never needed */
 #endif
 #define HasWChar32		YES
 #define StandardCppOptions	-traditional
 #define StandardCppDefines	StandardDefines
 
 #define HasVarRun		YES
 #define VarDbDirectory		$(VARDIR)/lib
 
 XCOMM i386Architecture