25 files changed, 579 insertions, 356 deletions
diff --git a/xc/config/cf/FreeBSD.cf b/xc/config/cf/FreeBSD.cf
index bba0c012f..6b8f994e6 100644
--- a/xc/config/cf/FreeBSD.cf
+++ b/xc/config/cf/FreeBSD.cf
@@ -2,7 +2,7 @@ XCOMM platform:  $Xorg: FreeBSD.cf,v 1.3 2000/08/17 19:41:45 cpqbld Exp $
 XCOMM
 XCOMM
 XCOMM
-XCOMM platform:  $XFree86: xc/config/cf/FreeBSD.cf,v 3.106 2001/03/02 23:01:27 dawes Exp $
+XCOMM platform:  $XFree86: xc/config/cf/FreeBSD.cf,v 3.108 2001/04/19 19:54:41 dawes Exp $
 
 #ifndef UseElfFormat
 #define UseElfFormat		DefaultToElfFormat
@@ -130,6 +130,15 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
 #endif
 
 /*
+ * 2.2.x has perl 4 by default, not perl 5.
+ */
+#if (OSMajorVersion <= 2)
+#ifndef HasPerl5
+#define HasPerl5		NO
+#endif
+#endif
+
+/*
  * Add an LD_LIBRARY_PATH environment variable, defined by $(CLIENTENVSETUP),
  * when building X to avoid that for each client ld give the message
  *
@@ -452,7 +461,7 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
 # define PreIncDir	/usr/include
 #endif
 
-#define TroffCmd	groff -Tps
+#define HasGroff	YES
 #define NroffCmd	groff -Tascii
 #define SetTtyGroup	YES
 
diff --git a/xc/config/cf/Imake.cf b/xc/config/cf/Imake.cf
index d68043095..08270fe2e 100644
--- a/xc/config/cf/Imake.cf
+++ b/xc/config/cf/Imake.cf
@@ -17,13 +17,21 @@ XCOMM $Xorg: Imake.cf,v 1.4 2000/08/17 19:41:45 cpqbld Exp $
  *
  *     4.  Create a .cf file with the name given by MacroFile.
  */
-XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.64 2001/01/17 16:22:29 dawes Exp $
+XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.67 2001/04/18 17:13:58 dawes Exp $
 
 #if defined(__APPLE__)
 # undef __APPLE__
 # define MacroIncludeFile <darwin.cf>
 # define MacroFile darwin.cf
 # define DarwinArchitecture
+# ifdef __ppc__
+#  define PpcDarwinArchitecture
+#  undef __ppc__
+# endif
+# ifdef __i386__
+#  define i386DarwinArchitecture
+#  undef __i386__
+# endif
 #endif
 
 #if defined(clipper) || defined(__clipper__)
@@ -41,6 +49,7 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.64 2001/01/17 16:22:29 dawes Exp $
 #undef i386
 #undef __i386__
 #undef _X86_
+#undef __CYGWIN__
 #endif /* CYGWIN */
 
 #ifdef ultrix
@@ -53,6 +62,7 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.64 2001/01/17 16:22:29 dawes Exp $
 # ifdef mips
 #  undef mips
 #  define MipsArchitecture
+#  define MipselArchitecture
 # endif
 # undef ultrix
 # define UltrixArchitecture
@@ -567,6 +577,7 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.64 2001/01/17 16:22:29 dawes Exp $
 # ifdef __mips__
 #  undef __mips__
 #  define MipsArchitecture
+#  define MipselArchitecture
 # endif
 # ifdef __alpha
 #  undef __alpha
@@ -743,6 +754,11 @@ XCOMM Keep cpp from replacing path elements containing i486/i586/i686
 #  define MipsArchitecture
 #  undef mips
 #  undef __mips__
+#  if defined(MIPSEL) || defined(_MIPSEL)
+#   define MipselArchitecture
+#  endif
+#  undef MIPSEL
+#  undef _MIPSEL
 # endif
 XCOMM  for compatibility with 3.3.x 
 # ifdef PpcArchitecture
diff --git a/xc/config/cf/Imake.rules b/xc/config/cf/Imake.rules
index 4aeca765f..d6b3822a3 100644
--- a/xc/config/cf/Imake.rules
+++ b/xc/config/cf/Imake.rules
@@ -5,7 +5,7 @@ XCOMM
 XCOMM
 XCOMM
 XCOMM
-XCOMM rules:  $XFree86: xc/config/cf/Imake.rules,v 3.93 2001/03/31 01:57:20 keithp Exp $
+XCOMM rules:  $XFree86: xc/config/cf/Imake.rules,v 3.94 2001/04/26 21:27:48 dawes Exp $
 
 /*
  *		   MACHINE-INDEPENDENT RULES; DO NOT MODIFY
@@ -3254,7 +3254,7 @@ MutexDirective:	targets
  * ObjectModuleTarget - build a module as a single object file
  */
 #ifndef ObjectModuleTarget
-#if MakeDllModules
+#if MakeDllModules && DoLoadableServer
 #define ObjectModuleTarget(module,objects)				@@\
 DynamicModuleTarget(Concat(module,_drv.so), objects)
 #else
@@ -3267,7 +3267,7 @@ NormalRelocatableTarget(Concat(module,_drv), objects)
  * LibraryModuleTarget
  */
 #ifndef LibraryModuleTarget
-#if MakeDllModules
+#if MakeDllModules && DoLoadableServer
 #define LibraryModuleTarget(module,objects)				@@\
 NormalLibraryTarget(module, objects)					@@\
 DynamicModuleTarget(Concat3(lib,module,.so), objects)
@@ -3281,7 +3281,7 @@ NormalLibraryTarget(module, objects)
  * DepLibraryModuleTarget
  */
 #ifndef DepLibraryModuleTarget
-#if MakeDllModules
+#if MakeDllModules && DoLoadableServer
 #define DepLibraryModuleTarget(module,deplist,objects)			@@\
 NormalDepLibraryTarget(module, deplist, objects)			@@\
 DepDynamicModuleTarget(Concat3(lib,module,.so), deplist, objects)
diff --git a/xc/config/cf/Imake.tmpl b/xc/config/cf/Imake.tmpl
index 73f4a7547..98c022d43 100644
--- a/xc/config/cf/Imake.tmpl
+++ b/xc/config/cf/Imake.tmpl
@@ -5,7 +5,7 @@ XCOMM
 XCOMM
 XCOMM
 XCOMM
-XCOMM $XFree86: xc/config/cf/Imake.tmpl,v 3.97 2001/03/18 14:50:30 dawes Exp $
+XCOMM $XFree86: xc/config/cf/Imake.tmpl,v 3.102 2001/04/26 21:09:38 dawes Exp $
 XCOMM ----------------------------------------------------------------------
 
 /*
@@ -194,6 +194,10 @@ XCOMM the platform-specific parameters - edit site.def to change
 #define HasPerl			YES
 #endif
 
+#ifndef HasPerl5
+#define HasPerl5		HasPerl
+#endif
+
 #ifndef PerlCmd
 #define PerlCmd			perl
 #endif
@@ -243,6 +247,10 @@ XCOMM the platform-specific parameters - edit site.def to change
 #endif
 #endif
 
+#ifndef HasGroff
+#define HasGroff NO
+#endif
+
 #ifndef HasCookieMaker
 #define HasCookieMaker	NO
 #endif
@@ -374,7 +382,7 @@ XCOMM the platform-specific parameters - edit site.def to change
 #ifndef ByteOrder
 #if defined(VaxArchitecture)
 #define ByteOrder		X_LITTLE_ENDIAN
-#elif defined(MipsArchitecture) && (defined(UltrixArchitecture) || defined(OSF1Architecture))
+#elif defined(MipsArchitecture) && defined(MipselArchitecture)
 #define ByteOrder		X_LITTLE_ENDIAN
 #elif defined(MipsArchitecture)
 #define ByteOrder		X_BIG_ENDIAN
@@ -1229,6 +1237,12 @@ TCLIBDIR = TclLibDir
 #else
 #define DependCmd $(DEPENDSRC)/gccmakedep
 #endif
+#elif UseCCMakeDepend
+#ifdef UseInstalled		/* assume BINDIR in path */
+#define DependCmd ccmakedep
+#else
+#define DependCmd $(DEPENDSRC)/ccmakedep
+#endif
 #else
 #ifdef UseInstalled		/* assume BINDIR in path */
 #define DependCmd makedepend
@@ -1278,7 +1292,11 @@ TCLIBDIR = TclLibDir
 #endif
 #endif
 #ifndef TroffCmd
+#if HasGroff
 #define TroffCmd groff -Tps
+#else
+#define TroffCmd troff -Tps
+#endif
 #endif
 #ifndef NroffCmd
 #define NroffCmd nroff
@@ -1663,7 +1681,7 @@ MODLDCOMBINEFLAGS = ModuleLdCombineFlags
  * LOCAL_LDFLAGS contains client-specific ld flags flags set in Imakefile
  */
       ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(STD_INCLUDES)
-       ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEPENDDEFINES) $(DEFINES) $(EXTRA_DEFINES)
+       ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES)
            CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES)
         LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES)
          LDPRELIB = LdPreLib
@@ -1691,7 +1709,7 @@ MODLDCOMBINEFLAGS = ModuleLdCombineFlags
      LDSTRIPFLAGS = LdStripFlags
    LDCOMBINEFLAGS = LdCombineFlags
       DEPENDFLAGS = DependFlags
-    DEPENDDEFINES = DependDefines
+   DEPEND_DEFINES = DependDefines
 
 XCOMM Not sure this belongs here
          TKLIBDIR = TkLibDir
diff --git a/xc/config/cf/NetBSD.cf b/xc/config/cf/NetBSD.cf
index c71f6015d..71fe3524c 100644
--- a/xc/config/cf/NetBSD.cf
+++ b/xc/config/cf/NetBSD.cf
@@ -2,7 +2,7 @@ XCOMM platform:  $Xorg: NetBSD.cf,v 1.3 2000/08/17 19:41:46 cpqbld Exp $
 
 
 
-XCOMM platform:  $XFree86: xc/config/cf/NetBSD.cf,v 3.92 2001/02/11 21:39:36 herrb Exp $
+XCOMM platform:  $XFree86: xc/config/cf/NetBSD.cf,v 3.95 2001/04/22 08:54:03 herrb Exp $
 
 
 #ifndef OSName
@@ -226,7 +226,14 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
 #endif
 
 #define StandardDefines	-DCSRG_BASED
+/* Citrus mb locale were added in 1.5P */
+#if ((OSMajorVersion > 1) || \
+     (OSMajorVersion == 1 && OSMinorVersion > 5) || \
+     (OSMajorVersion == 1 && OSMinorVersion == 5 && OSTeenyVersion >= 15))
+#define XawI18nDefines	-DHAS_WCHAR_H -DHAS_WCTYPE_H -DNO_WIDEC_H
+#else
 #define XawI18nDefines	-DUSE_XWCHAR_STRING -DUSE_XMBTOWC
+#endif
 
 #ifndef ExtraLibraries
 #define ExtraLibraries		/**/
@@ -293,7 +300,7 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
 #define NeqnCmd			neqn -Tlatin1
 #define NroffCmd		nroff -Tlatin1
 #define	EqnCmd 			eqn -Tps
-#define TroffCmd        	groff -Tps
+#define HasGroff		YES
 
 /*
  * To use the NetBSD Aperture driver
@@ -524,6 +531,13 @@ sed 's/\.[0-9]*$$//'`
 #define BuildServer	NO
 #endif
 
+/* 
+ * General settings for all platforms 
+ */ 
 #ifndef SharedLibXdmGreet
 #define SharedLibXdmGreet NO
 #endif
+
+#ifndef BuildHtmlManPages 
+#define BuildHtmlManPages NO /* We don't want HTML manpages */ 
+#endif
diff --git a/xc/config/cf/OpenBSD.cf b/xc/config/cf/OpenBSD.cf
index 2433ec460..d4411f2a2 100644
--- a/xc/config/cf/OpenBSD.cf
+++ b/xc/config/cf/OpenBSD.cf
@@ -1,4 +1,4 @@
-XCOMM platform:  $XFree86: xc/config/cf/OpenBSD.cf,v 3.52 2001/03/03 09:52:59 herrb Exp $
+XCOMM platform:  $XFree86: xc/config/cf/OpenBSD.cf,v 3.54 2001/04/22 16:28:18 herrb Exp $
 XCOMM
 
 #ifndef OSName
@@ -87,26 +87,6 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
 #endif
 
 /*
- * Multi-thread safe libs 
- */	
-#if !defined(PpcArchitecture) && (OSMajorVersion == 2 && OSMinorVersion >= 6 || OSMajorVersion >= 3)
-# define HasPosixThreads	YES
-# define ThreadedX		YES
-# define SystemMTDefines	-D_REENTRANT
-# if HasLibPthread
-#  define ThreadsLibraries	-lpthread
-# else
-#  define BuildThreadStubLibrary  YES 
-#  define NeedUIThrStubs          YES 
-#  define ThreadsCompileFlags	-pthread
-#  define ThreadsLibraries     -lc_r
-# endif
-#endif
-
-/* Set this to YES when getpwuid_r is added to libc_r */
-# define HasThreadSafeAPI      NO
-
-/*
  * Compiler Features
  */
 #define GccUsesGas		YES
@@ -145,64 +125,6 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
 #define GccGasOption 		-DGCCUSESGAS
 #define AsmDefines 		-DUSE_GAS
 
-#ifdef i386Architecture
-#  ifndef DefaultGcc2i386Opt
-#    if (OSMajorVersion == 2 && OSMinorVersion >= 3) || OSMajorVersion > 2
-       /* The GCC strength-reduce bug is fixed for OpenBSD 2.3 and later */
-#      define DefaultGcc2i386Opt	-O2
-#    endif
-#  endif
-#  define OptimizedCDebugFlags	DefaultGcc2i386Opt
-#  define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME
-#  define ServerExtraSysLibs	-li386
-#  define LdPostLib		/**/
-#  define ServerExtraDefines GccGasOption XFree86ServerDefines
-#  ifndef XFree86ConsoleDefines
-#   if OSMajorVersion == 2 && OSMinorVersion <= 8 
-#    define XFree86ConsoleDefines -DPCCONS_SUPPORT -DPCVT_SUPPORT
-#   else
-#    define XFree86ConsoleDefines -DWSCONS_SUPPORT
-#   endif
-#  endif
-#endif
-
-#ifdef SparcArchitecture
-#  define OptimizedCDebugFlags	-O2
-#  define ServerOSDefines 	-DDDXOSINIT
-#  define ServerExtraDefines	XFree86ServerDefines
-#endif 
-
-#ifdef AlphaArchitecture
-#  define OptimizedCDebugFlags	-O2
-#  define ServerOSDefines 	-DDDXOSINIT
-#  define ServerExtraDefines	GccGasOption -D_XSERVER64
-#endif
-
-#ifdef ArcArchitecture
-#  define ServerExtraDefines GccGasOption XFree86ServerDefines
-#  ifndef XFree86ConsoleDefines
-#    define XFree86ConsoleDefines -DPCCONS_SUPPORT
-#  endif
-#endif
-
-#ifdef PpcArchitecture
-#  define OptimizedCDebugFlags 	-O2
-#  define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME -DDDXOSINIT
-#  define ServerExtraDefines	GccGasOption XFree86ServerDefines
-#  define XkbServerDefines	-DXKB_ALWAYS_USES_SOFT_REPEAT
-#  ifndef XFree86ConsoleDefines
-#    define XFree86ConsoleDefines	-DWSCONS_SUPPORT
-#  endif
-#endif /* Ppc */
-
-#ifndef ServerOSDefines
-#  define ServerOSDefines 	/**/
-#endif
-
-#ifndef ServerExtraDefines
-#  define ServerExtraDefines GccGasOption
-#endif
-
 #define StandardDefines	-DCSRG_BASED
 #define XawI18nDefines	-DUSE_XWCHAR_STRING -DUSE_XMBTOWC
 
@@ -243,16 +165,10 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
 #define NeqnCmd			neqn -Tlatin1
 #define NroffCmd		nroff -Tlatin1
 #define	EqnCmd 			eqn -Tps
-#define TroffCmd        	groff -Tps
-
-/*
- * To use the NetBSD Aperture driver
- */
-#if defined(i386Architecture)
-#ifndef HasNetBSDApertureDriver
-#define HasNetBSDApertureDriver	YES
-#endif
-#endif
+#define HasGroff		YES
+/* Don't build HTML manual pages */
+#define BuildRman		NO
+#define BuildHtmlManPages	NO
 
 #ifndef HasCookieMaker
 #  define HasCookieMaker	YES
@@ -385,31 +301,24 @@ install:: fonts.alias							@@\
  */
 #ifdef AlphaArchitecture
 
-/*
- * The code for an Alpha XF86_TGA server compiles, but it DOES NOT work
- */
-# define BuildAlphaXF86		NO
+# define OptimizedCDebugFlags	-O2
+# define ServerOSDefines 	-DDDXOSINIT
+# define ServerExtraDefines	GccGasOption -D_XSERVER64 -DXFree86Server
 
-# if BuildAlphaXF86
-#  include <xf86.rules>
-# endif
+# define HasWeakSymbols		NO
 
- /*
-  * For the current ECOFF system
-  */
-# define HasSharedLibraries	NO
-# define UseElfFormat		NO
- /*
-  * For the upcoming ELF system
-  */
-# if 0 /* NOT YET */
-#  define HasSharedLibraries	YES
+# if (OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 9))
 #  define UseElfFormat		YES
 # endif
+# if 1
+#  define HasSharedLibraries	NO
+#  define SharedLibXThrStub	NO
+# else /* NOT YET */
+#  define HasSharedLibraries	YES
+# endif
 
-# define BuildServer		YES
-# define XnestServer		YES
-# define XVirtualFramebufferServer	YES
+
+# define XF86Server		NO
 
 # define BuildDPMSLibrary	NO
 # define BuildDPMSExt		NO
@@ -417,9 +326,7 @@ install:: fonts.alias							@@\
 # define BuildXF86DGALibrary	NO
 # define BuildXF86DGA		NO
 
-# if BuildAlphaXF86
-#  include <xfree86.cf>
-# endif
+# include <xfree86.cf>
 
 #endif /* AlphaArchitecture */
 
@@ -430,10 +337,15 @@ install:: fonts.alias							@@\
 #ifdef i386Architecture
 
 # ifndef DoLoadableServer
-# define DoLoadableServer	YES
+#  define DoLoadableServer	YES
+# endif
+
+/* To use the NetBSD Aperture driver */
+# ifndef HasNetBSDApertureDriver
+#  define HasNetBSDApertureDriver	YES
 # endif
 
-/* 2.7 and later will have support for setting MTRRs */
+/* 2.7 and later have support for setting MTRRs */
 # ifndef HasMTRRSupport
 #  if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 6)
 #   define HasMTRRSupport		YES
@@ -442,6 +354,23 @@ install:: fonts.alias							@@\
 #  endif
 # endif
 
+# ifndef DefaultGcc2i386Opt
+#   if (OSMajorVersion == 2 && OSMinorVersion >= 3) || OSMajorVersion > 2
+      /* The GCC strength-reduce bug is fixed for OpenBSD 2.3 and later */
+#     define DefaultGcc2i386Opt	-O2
+#   endif
+# endif
+# define OptimizedCDebugFlags	DefaultGcc2i386Opt
+# define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME
+# define ServerExtraSysLibs	-li386
+# define LdPostLib		/**/
+# define ServerExtraDefines GccGasOption XFree86ServerDefines
+# ifndef XFree86ConsoleDefines
+#   define XFree86ConsoleDefines -DWSCONS_SUPPORT -DPCVT_SUPPORT
+# endif
+
+#define JoystickSupport	NO
+
 /* Support for USB Mices */
 # ifndef UsbMouseSupport
 #  if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 6)
@@ -449,9 +378,8 @@ install:: fonts.alias							@@\
 #  endif
 # endif
 
-/*
- * A hack to work around an optimization problem with gcc 2.95.2
- */
+
+/* A hack to work around an optimization problem with gcc 2.95.2 */
 # if OSMajorVersion == 2 && OSMinorVersion >= 6 
 #  define GccOptBug295
 # endif
@@ -475,6 +403,9 @@ install:: fonts.alias							@@\
  */
 
 # define PositionIndependentCFlags -fpic -fno-function-cse
+# define HasWeakSymbols		NO
+# define BuildGlxExt		NO
+# define BuildGLXLibrary	YES
  
 #endif /* Mc68020Architecture */
 
@@ -489,6 +420,8 @@ install:: fonts.alias							@@\
 #  define BuildServer		NO
 # endif
 
+# define ServerExtraDefines	-DXFree86Server
+
 #endif /* AmigaArchitecture */
 
 
@@ -497,7 +430,6 @@ install:: fonts.alias							@@\
  */
 #ifdef Hp300Architecture
 
-# include <xf86.rules>
 # ifndef BuildServer
 #  define BuildServer		NO
 # endif
@@ -506,6 +438,10 @@ install:: fonts.alias							@@\
 # define InstallFontAliases	InstallFontAliasesNoComment
 # define UseRgbTxt		NO
 
+# define ServerExtraDefines	-DXFree86Server
+
+#include <xfree86.cf>
+
 #endif /* Hp300Architecture */
 
 
@@ -514,11 +450,15 @@ install:: fonts.alias							@@\
  */
 #ifdef Mac68kArchitecture
 
-# include <xf86.rules>
+
 # ifndef BuildServer
 #  define BuildServer		NO
 # endif
 
+# define ServerExtraDefines	-DXFree86Server
+
+# include <xfree86.cf>
+
 #endif /* mac68kArchitecture */
 
 
@@ -527,11 +467,14 @@ install:: fonts.alias							@@\
  */
 #ifdef Mvme68kArchitecture
 
-# include <xf86.rules>
 # ifndef BuildServer
 #  define BuildServer		NO
 # endif
 
+# define ServerExtraDefines	-DXFree86Server
+
+# include <xfree86.cf>
+
 #endif /* Mvme68kArchitecture */
 
 
@@ -547,7 +490,7 @@ install:: fonts.alias							@@\
 # define BootstrapCFlags       -Dsun3
 # define UnalignedReferencesAllowed	YES /* changes _XtCopyArgs() */
 /* Note: -ansi turns off -Dmc68000 */
-# define ServerExtraDefines    GccGasOption -Dmc68000 -Dmc68020
+# define ServerExtraDefines    GccGasOption -Dmc68000 -Dmc68020 -DXFree86Server
 
 # ifndef Xsun24Server
 #  define Xsun24Server		NO
@@ -561,16 +504,6 @@ install:: fonts.alias							@@\
 
 #define XkbServerDefines  -DXKB_ALWAYS_USES_SOFT_REPEAT
 
-#if 0
-# ifndef BuildXKB
-#  define BuildXKB        	NO
-# endif
-
-# ifndef BuildXKBlib
-#  define BuildXKBlib     	NO
-# endif
-#endif
-
 # ifndef BuildPexExt
 #  define BuildPexExt 		(XsunServer || Xsun24Server)
 # endif
@@ -599,6 +532,11 @@ install:: fonts.alias							@@\
  */
 #ifdef ArcArchitecture
 
+#  define ServerExtraDefines GccGasOption XFree86ServerDefines
+#  ifndef XFree86ConsoleDefines
+#    define XFree86ConsoleDefines -DPCCONS_SUPPORT
+#  endif
+
 # include <xfree86.cf>
 
 #endif /* ArcArchitecture */
@@ -625,34 +563,51 @@ install:: fonts.alias							@@\
  */
 #ifdef PpcArchitecture
 
+# define OptimizedCDebugFlags 	-O2
+# define XkbServerDefines	-DXKB_ALWAYS_USES_SOFT_REPEAT
+# ifndef XFree86ConsoleDefines
+#   define XFree86ConsoleDefines	-DWSCONS_SUPPORT
+# endif
+
 # define UseElfFormat		YES
+# define HasWeakSymbols		NO
 
-#  if XFree86Devel
+# if XFree86Devel
 #   define GccWarningOptions -Wall -Wpointer-arith -Wstrict-prototypes \
 			  -Wmissing-prototypes -Wmissing-declarations \
 			  -Wnested-externs
-#  else
+# else
 #   define GccWarningOptions -Wall -Wpointer-arith
-#  endif
+# endif
 
-# if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 8)
-#   ifndef DoLoadableServer
-#     define DoLoadableServer	YES
-#   endif
-#   define DevelDrivers cirrus ati
-    /* Support for USB Mices */
-#   define UsbMouseSupport		YES
-#   include <xfree86.cf>
+# ifndef XF86Server
+#   define XF86Server		NO
+# endif
 
-# else /* 2.7 and earlier */
-#  include <xf86.rules>
-#  ifndef BuildServer
-#   define BuildServer		YES
-#  endif
+/* Definitions for building the XFree86 server */
+# if XF86Server
+#   define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME -DDDXOSINIT
+#   define ServerExtraDefines	GccGasOption XFree86ServerDefines
+#   if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 8)
+#     ifndef DoLoadableServer
+#       define DoLoadableServer	YES
+#     endif
+#     define DevelDrivers cirrus ati
+      /* Support for USB Mices */
+#     define UsbMouseSupport		YES
+#     include <xfree86.cf>
+
+#   else /* 2.7 and earlier */
+#     include <xf86.rules>
+#     ifndef BuildServer
+#       define BuildServer		NO
+#     endif
+
+#     define HasSharedLibraries	NO
+#     define BuildDynamicLoading	NO
+#   endif
+# endif /* XF86Server */
 
-#  define HasSharedLibraries	NO
-#  define BuildDynamicLoading	NO
-# endif
 #endif /* PpcArchitecture */
 
 /*
@@ -660,20 +615,28 @@ install:: fonts.alias							@@\
  */
 #ifdef SparcArchitecture
 
+# define OptimizedCDebugFlags	-O2
+# define ServerOSDefines 	-DDDXOSINIT
+# define ServerExtraDefines	-DAVOID_GLYPHBLT -DPIXPRIV  -DXFree86Server \
+				ServerSnprintfDefines DebugDefines \
+				-DX_BYTE_ORDER=ByteOrder
+# define BuildXF86MiscExt	NO
+# define BuildMITMiscExt	NO
+
 # ifndef Xsun24Server
-# define Xsun24Server		NO
+#  define Xsun24Server		YES
 # endif
 # ifndef XsunServer
-# define XsunServer		YES
+#  define XsunServer		YES
 # endif
 # ifndef XsunMonoServer
-# define XsunMonoServer		NO
+#  define XsunMonoServer	YES
 # endif
 
-#define XkbServerDefines  -DXKB_ALWAYS_USES_SOFT_REPEAT
+# define XkbServerDefines	-DXKB_ALWAYS_USES_SOFT_REPEAT
 
 # ifndef BuildPexExt
-#  define BuildPexExt 	(XsunServer || Xsun24Server)
+#  define BuildPexExt		(XsunServer || Xsun24Server)
 # endif
 
 # define BuildXF86VidModeExt	NO
@@ -683,7 +646,6 @@ install:: fonts.alias							@@\
 
 #endif /* SparcArchitecture */
 
-
 /* End or architecture specific section */
 
 /*
@@ -691,8 +653,51 @@ install:: fonts.alias							@@\
  * which can be overridden by architecture specific sections above
  */
 
+#ifndef ServerOSDefines
+#  define ServerOSDefines 	/**/
+#endif
+
+#ifndef ServerExtraDefines
+#  define ServerExtraDefines GccGasOption
+#endif
+
+#ifndef BuildCyrillicFonts
+# define BuildCyrillicFonts	YES
+#endif
+#ifndef BuildLatin2Fonts
+# define BuildLatin2Fonts	YES
+#endif
+#ifndef UseKoi8RForCyrillic
+# define UseKoi8RForCyrillic	YES
+#endif
+
+#ifndef HasWeakSymbols
+# define HasWeakSymbols YES
+#endif
+
+/*
+ * Multi-thread safe libs 
+ */	
+#if HasWeakSymbols == YES && (OSMajorVersion == 2 && OSMinorVersion >= 6 || OSMajorVersion >= 3)
+# define HasPosixThreads	YES
+# define ThreadedX		YES
+# define SystemMTDefines	-D_REENTRANT
+# if HasLibPthread
+#  define ThreadsLibraries	-lpthread
+# else
+#  define BuildThreadStubLibrary  YES 
+#  define NeedUIThrStubs          YES 
+#  define ThreadsCompileFlags	-pthread
+#  define ThreadsLibraries	-pthread
+# endif
+#endif
+
+/* Set this to YES when getpwuid_r is added to libc_r */
+#define HasThreadSafeAPI	NO
+
+
 #ifndef DoLoadableServer
-#define DoLoadableServer		NO
+#define DoLoadableServer	NO
 #endif
 
 #ifndef XVirtualFramebufferServer
@@ -741,6 +746,10 @@ install:: fonts.alias							@@\
 # endif
 #endif
 
+#  if !defined(GccWarningOptions)
+#    define GccWarningOptions 		-Wall -Wpointer-arith
+#  endif
+
 /* This must come last */
 #if OSMajorVersion == 2 && OSMinorVersion >= 8 || OSMajorVersion > 2
 # include <OpenBSDLib.rules>
diff --git a/xc/config/cf/Server.tmpl b/xc/config/cf/Server.tmpl
index 520687a9f..762c9ead7 100644
--- a/xc/config/cf/Server.tmpl
+++ b/xc/config/cf/Server.tmpl
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/config/cf/Server.tmpl,v 3.17 2001/01/17 16:22:30 dawes Exp $
+XCOMM $XFree86: xc/config/cf/Server.tmpl,v 3.18 2001/04/20 15:51:15 tsi Exp $
 /*
  * Server imakefile info  - this contains any special redefinitions, etc.
  * that Imakefiles in the server subtree will need.
@@ -55,6 +55,7 @@ SERVER_THREAD_DEFINES = XThreadsDefines ThreadTypeDefines
 STD_DEFINES = ServerDefines $(SERVER_THREAD_DEFINES)
 CDEBUGFLAGS = ServerCDebugFlags
 EXT_DEFINES = ExtensionDefines
+OS_DEFINES  = ServerOSDefines
 
 GLX_DEFINES = GlxDefines
  
diff --git a/xc/config/cf/X11.tmpl b/xc/config/cf/X11.tmpl
index 8e650f616..9f6e26fa4 100644
--- a/xc/config/cf/X11.tmpl
+++ b/xc/config/cf/X11.tmpl
@@ -5,7 +5,7 @@ XCOMM
 XCOMM
 XCOMM
 XCOMM
-XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.111 2001/04/05 02:43:33 dawes Exp $
+XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.114 2001/04/23 15:53:45 dawes Exp $
 
 /***************************************************************************
  *                                                                         *
@@ -144,13 +144,13 @@ VENDORMANVERSION = XVendorManVersionString
 #endif
 /* Some bdf font generation details.  The scripts for this require perl. */
 #ifndef TruncateUCSFonts
-#define TruncateUCSFonts	HasPerl
+#define TruncateUCSFonts	HasPerl5
 #endif
 #ifndef MaxUCSChar
 #define MaxUCSChar		0x3200
 #endif
 #ifndef DerivedUCSFonts
-#define DerivedUCSFonts		HasPerl
+#define DerivedUCSFonts		HasPerl5
 #endif
 /* These primarily control generation of derived 8-bit fonts. */
 #ifndef BuildUCSFonts
@@ -2520,7 +2520,7 @@ ProjectUnsharedLibReferences(XFT,Xft,$(XFTLIBSRC),XBuildLibDir)
 #define LdLibraryPath LD_LIBRARY_PATH
 #endif
 
-#ifdef BuildXKBlib
+#if BuildXKBlib
     XKBFILELIBSRC = $(LIBSRC)/xkbfile
 ProjectUnsharedLibReferences(XKBFILE,xkbfile,$(XKBFILELIBSRC),XBuildLibDir)
 #ifndef XkbClientDepLibs
@@ -2875,7 +2875,7 @@ InstallNamedTarget(install,edir/encodings.dir,$(INSTDATFLAGS),fdir,encodings.dir
 
 
 #ifndef MakeBdfFontFromUCSMaster
-#if HasPerl
+#if HasPerl5
 #define MakeBdfFontFromUCSMaster(font,enc)				@@\
 includes:: font-enc.bdf							@@\
 									@@\
@@ -2889,7 +2889,7 @@ clean::									@@\
 #endif
 
 #ifndef MakeTruncatedUCSBdfFont
-#if HasPerl
+#if HasPerl5
 #define MakeTruncatedUCSBdfFont(font,trunc,name)			@@\
 includes:: name.bdf							@@\
 									@@\
@@ -3033,6 +3033,14 @@ install:: deps								@@\
 #define InstallRoffDoc(name) InstallDoc(name,name.PS name.txt)
 #endif
 
+#ifndef InstallLatexDoc
+#if HasLatex
+#define InstallLatexDoc(name) InstallDoc(name,name.PS)
+#else
+#define InstallLatexDoc(name)
+#endif
+#endif
+
 #ifndef InstallHardcopyDoc
 #define InstallHardcopyDoc(name,deps)					@@\
 all:: deps								@@\
diff --git a/xc/config/cf/bsdi.cf b/xc/config/cf/bsdi.cf
index 25f5d300a..7688d5b7f 100644
--- a/xc/config/cf/bsdi.cf
+++ b/xc/config/cf/bsdi.cf
@@ -2,7 +2,7 @@ XCOMM platform:  $Xorg: bsdi.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $
 
 
 
-XCOMM platform:  $XFree86: xc/config/cf/bsdi.cf,v 3.35 2001/01/23 23:31:48 dawes Exp $
+XCOMM platform:  $XFree86: xc/config/cf/bsdi.cf,v 3.36 2001/04/19 19:54:42 dawes Exp $
 #ifndef OSName
 #define OSName		DefaultOSName
 #endif
@@ -97,7 +97,7 @@ XCOMM xf86site.def
 #endif
 
 #define CppCmd		/usr/bin/cpp
-#define TroffCmd	groff -Tps
+#define HasGroff	YES
 #define MkdirHierCmd	mkdir -p
 #define SetTtyGroup	YES
 #define HasNdbm		YES
diff --git a/xc/config/cf/cygwin.cf b/xc/config/cf/cygwin.cf
index dd11550f0..60242bf47 100644
--- a/xc/config/cf/cygwin.cf
+++ b/xc/config/cf/cygwin.cf
@@ -1,18 +1,4 @@
-XCOMM platform:  $XFree86: xc/config/cf/cygwin.cf,v 3.3 2001/01/12 19:28:24 dawes Exp $
-XCOMM
-XCOMM - changes since B20 Cygwin32 release
-XCOMM	- avoided tons of "not in XXX directory" messages;
-XCOMM	- dlls are built stripped;
-XCOMM	- search for cpp in a default location;
-XCOMM	- fixed problem with missing netinet/tcp.h;
-XCOMM - Added AF_UNIX socket support;
-XCOMM	- xterm compiles and works;
-XCOMM	- more libs are built as a DLLs;
-XCOMM	- all DLLs have different base addresses;
-XCOMM - changes since B20 Cygwin32 release
-XCOMM	- dllwrap is used to build DLLs;
-XCOMM - Plan to add WATCOM TCP headers support;
-XCOMM	- gcc -E is invoked instead of cpp;
+XCOMM platform:  $XFree86: xc/config/cf/cygwin.cf,v 3.9 2001/04/27 12:32:42 alanh Exp $
 
 #ifndef OSName
 #define OSName                  Cygwin
@@ -26,12 +12,10 @@ XCOMM	- gcc -E is invoked instead of cpp;
 #ifndef OSMinorVersion
 #define OSMinorVersion          1
 #endif
-#ifndef OSTeenyVersion		2
-#define OSTeenyVersion
+#ifndef OSTeenyVersion
+#define OSTeenyVersion		8
 #endif
 
-XCOMM #define OSDefines	             -DSYSV -DSYSV386		
-
 #define ProjectRoot /usr/X11R6
 
 #define BuildServer		YES
@@ -40,26 +24,33 @@ XCOMM #define OSDefines	             -DSYSV -DSYSV386
 #define UnixCpp
 #endif
 
-#define HasGcc                  YES
-#define HasGcc2                 YES
 #define HasGcc2ForCplusplus     YES
 #define GccUsesGas              YES
 #define UseGas                  YES
 #define GnuCpp                  YES
+#define BootstrapCFlags		-L/lib/automode.o
+
 #define HasShadowPasswd         NO
 #define HasLibCrypt             YES
 #define HasPutenv               YES
 #define HasPoll			NO
 #define HasShm                  NO
+#define HasSnprintf		YES
+#define HasZlib			YES
+
+/*
+ * Cygwin has Tcl/Tk, but you need to keep the version numbers
+ * of the libs in sync.  These version numbers may change
+ * occassionally.
+ */
 #define Hastcl                  YES
 #define Hastk                   YES
 #define TclLibName              tcl80
 #define TkLibName               tk80
+
 #define HasSockets              YES
 #define GzipFontCompression	YES
-#define BuildXKB		YES
-#define BuildXF86MiscExt        YES
-#define BuildXF86VidModeExt     YES   /* need -fpcc-struct-return for gcc-2.95.2 or it will fail*/
+
 #define SharedLibFont           NO
 #define AvoidNullMakeCommand    YES
 #define StripInstalledPrograms  NO
@@ -74,23 +65,24 @@ XCOMM #define OSDefines	             -DSYSV -DSYSV386
 #define ExpandManNames          NO
 #define HasDlopen	        NO
 #define HasGnuMake		YES
-XCOMM #define ExtraLoaderDefines      DlopenHack
 #ifndef DefaultCCOptions
 #define DefaultCCOptions        -Wall
-#endif
+#endif /* DefaultCCOptions */
 #define DefaultGcc2i386Opt      -O2 
 #define LibraryCDebugFlags      -O2
 #define UseGccMakeDepend	YES
 
-
-
+/*
+ * This options may depend on the state of POSIX thread
+ * support in Cygwin, which is improving as of 2001-04-12.
+ */
 #define ThreadedX               NO
 #define HasThreadSafeAPI        NO
+
 #define LnCmd                   ln -s
 #define CcCmd                   gcc
 #define CpluplusCmd		c++ -fpermissive
 #define AsCmd                   as
-XCOMM #define AsCmd                	  gcc -S
 #define GccGasOption	        -DGCCUSESGAS
 #define AsmDefines	        -DUSE_GAS -DGCCUSESGAS
 #define LdCmd                   ld
@@ -100,18 +92,23 @@ XCOMM #define AsCmd                	  gcc -S
 #define LexCmd                  flex -l
 #define LexLib                  -lfl
 #define HasFlex			YES
+
 #define PreProcessCmd           CcCmd -E
-XCOMM #define StdIncDir               `CcCmd --print-libgcc-file-name | sed ':libgcc.a:../../../../i586-cygwin32/include:'|sed 's,\\\\,/,g'`
-XCOMM #define PostIncDir              `CcCmd --print-libgcc-file-name | sed ':libgcc.a:/include:'|sed 's,\\\\,/,g'`
+
 #define StdIncDir               `CcCmd --print-libgcc-file-name | sed 's,\\\\,/,g' | sed 's,libgcc.a,../../../../i686-pc-cygwin/include,'`
+
 #define PostIncDir              `CcCmd --print-libgcc-file-name | sed 's,\\\\,/,g' | sed 's,libgcc.a,include,'`
+
 #define LdCombineFlags          -r
-#define OptimizedCDebugFlags    -O2 -pedantic -fno-strength-reduce -fpcc-struct-return -fvtable-thunks -m486
-#define StandardDefines         -D__i386__ -DWIN32_LEAN_AND_MEAN -DX_LOCALE -D_MT -D_X86_ -D__STDC__ -DNO_TCP_H -D__CYGWIN__ -D_XOPEN_SOURCE -D_REENTRANT -D_POSIX_C_SOURCE=199309L -D_BSD_SOURCE -D_SVID_SOURCE -D_GNU_SOURCE -DX_SOURCE
+
+#define OptimizedCDebugFlags	-O2 -fno-strength-reduce -fpcc-struct-return -m486
+
+#define StandardDefines         -D__i386__ -DWIN32_LEAN_AND_MEAN -DX_LOCALE -D_X86_ -D__STDC__ -DNO_TCP_H -D__CYGWIN__ -D_XOPEN_SOURCE -D_POSIX_C_SOURCE=199309L -D_BSD_SOURCE -D_SVID_SOURCE -D_GNU_SOURCE -DX_SOURCE
+
 #define XawI18nDefines          -DUSE_XWCHAR_STRING -DUSE_XMBTOWC
 #define HasWChar32              YES
 #define StandardCppDefines      -traditional StandardDefines
-#define ServerOSDefines         XFree86ServerDefines -DDDXTIME -DFD_SETSIZE=256 -DDXOSINIT 
+#define ServerOSDefines         XFree86ServerDefines -DDDXTIME -DFD_SETSIZE=256 -DDXOSINIT
 #define XkbServerDefines        -DXKB_ALWAYS_USES_SOFT_REPEAT
 #define ServerExtraDefines      -DGCCUSESGAS XFree86ServerDefines
 #define ConnectionFlags         -DTCPCONN -DUNIXCONN
@@ -120,20 +117,88 @@ XCOMM #define PostIncDir              `CcCmd --print-libgcc-file-name | sed ':li
 #define UseRgbTxt                YES
 #define ExtraFilesToClean	  *.obj *.orig *.rej junk.c *.exe *.dll *.lib *~
 
-/* This a must to compile for xfddx display driver, or your server will NOT work on Win32. DO NOT change to NO */
-
-#define BuildSurfLibrary	YES
-
-/* The DRM module requires Linux kernel services, thus useless for CYGWIN compilers*/
-
+/*
+ * You'll probably want BuildDebug to be YES if you are debugging :)
+ */
+#define BuildDebug		NO
+#define XFree86Devel		NO
+#define BuildPexExt		YES
+#define BuildXinerama		NO
+#define BuildGlxExt             YES
+#define BuildXIE		YES
+#define BuildXF86RushExt	YES
+#define BuildXF86RushLibrary	YES
+#define BuildXInputExt		YES
+#define BuildXF86VidModeExt     YES
+#define BuildXF86DGA		NO
+#define BuildXvExt		YES
+#define BuildXF86MiscExt	YES
+#define BuildRender		YES
 #define BuildXF86DRI		NO
 #define BuildXF86DRM		NO
-#define BuildGlxExt		YES
-#define BuildXinrama		YES
+#define BuildXKB		YES
+#define BuildXCMiscExt		YES
+#define BuildTestExt		YES
+#define BuildMITMiscExt		YES
+#define BuildSyncExt		YES
+#define BuildBigReqsExt		YES
+#define BuildEVI		YES
+#define BuildXF86BigfontExt	YES
+#define BuildRECORD		YES
+#define BuildDBE		YES
+#define BuildFontCache		YES
+#define BuildLBX		YES
+#define BuildCup		YES
+#define BuildXCSecurity		YES
+#define BuildAppgroup		YES
+#define BuildShapeExt		YES
+#define BuildScanpci		NO
+#define BuildDPMS		NO
+#define BuildDPMSExt		NO
+#define DPMSDefines		/**/
+#define BuildScreenSaverExt	NO
+
+/*
+ * What is Plugin?
+ */
 #define BuildPlugin		NO
+
+/* DPS is the Adobe Display Postscript library */
+#define BuildDPS		YES
+#define BuildDPSLibraries	YES
 #define BuildDPSLibrary		YES
-XCOMM #define GlxStaticServerLib	YES
-#define DoLoadableServer   NO
+
+/*
+ * Doing a loadable server would probably take some extra work.
+ */
+#define DoLoadableServer	NO
+
+/*
+ * Don't build the XFree86 server
+ */
+#define XF86Server		NO
+
+/*
+ * Try to avoid building anything related to graphics cards
+ */
+#define XFShadowFB		NO
+#define XF24_32Bpp		NO
+#define XF8_16Bpp		NO
+#define XF8_32Bpp		NO
+#define XF4Bpp			NO
+#define XF1Bpp			NO
+#define XF86VgaHw		NO
+#define XF86FBDevHw		NO
+#define XF86XAA			NO
+#define XF86Ramdac		NO
+#define XF86I2C			NO
+#define XF86DDC			NO
+#define XF86RAC			NO
+#define XF86Int10		NO
+
+#define XF86AFB			NO
+
+#define XF86CardDrivers		/**/
 
 /* Some of these man page defaults are overriden in the above OS sections */
 #ifndef ManSuffix
@@ -155,13 +220,19 @@ XCOMM #define GlxStaticServerLib	YES
 # define FileManDir     $(MANSOURCEPATH)5
 #endif
 
+/* we don't need -lm */
+#define MathLibrary             /**/
 #define TermcapLibrary -ltermcap
-#define XnestServer	YES
-#define BuildXprint	YES
-#define XprtServer	YES
+#define XnestServer			YES
+#define BuildXprint			YES
+#define XprtServer			YES
 #define XVirtualFramebufferServer	YES
-#define XWinServer	YES
-#define UseSmartScheduler       NO
+#define XWinServer			YES
+
+/*
+ * Why we don't use the smart scheduler?
+ */
+#define UseSmartScheduler		NO
 
 /* --unix option of cygwin make fools the standard MakeFlagsToShellFlags macro */
 #define MakeFlagsToShellFlags(makeflags,shellcmd)\
@@ -170,4 +241,3 @@ XCOMM #define GlxStaticServerLib	YES
 
 #include <cygwin.rules>
 #include <xfree86.cf>
-/*#include <xttMod.tmpl>*/
diff --git a/xc/config/cf/cygwin.rules b/xc/config/cf/cygwin.rules
index efca2c16a..fae4486c4 100644
--- a/xc/config/cf/cygwin.rules
+++ b/xc/config/cf/cygwin.rules
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/config/cf/cygwin.rules,v 3.3 2001/02/13 19:19:11 dawes Exp $
+XCOMM $XFree86: xc/config/cf/cygwin.rules,v 3.5 2001/04/27 12:32:42 alanh Exp $
 
 #define CPPOnlyAsm(basename,options) RemoveFile(basename.i)		@@\
 	$(CPP) AsmDefines $(DEFINES) $(INCLUDES) options  basename.S | grep -v '^\#' > basename.i
@@ -30,7 +30,8 @@ XCOMM $XFree86: xc/config/cf/cygwin.rules,v 3.3 2001/02/13 19:19:11 dawes Exp $
 #define SharedLibgetsurf NO 
 #define SharedLibDps	YES
 #define SharedLibDpsTk	YES
-
+#define NormalLibGlu	YES
+#define SharedLibGlu	YES
 
 #ifndef SharedDataSeparation
 #define SharedDataSeparation NO
@@ -143,15 +144,6 @@ InstallTarget(install,Concat3(lib,libname,.dll),$(INSTLIBFLAGS),$(BINDIR))
 #define ProgramTargetName(target)target.exe
 
 /*
- * LinkBuildBinary - export a *.exe to exports/bin.
- */
-#define LinkBuildBinary(program)					@@\
-all:: $(BUILDBINDIR)/program program					@@\
-	$(BUILDBINDIR)/program: program					 @@\
-	RemoveFile$(@)				@@\
-	cd $(BUILDBINDIR) && $(CP) $(BUILDBINTOP)/$(CURRENT_DIR)/program .
-
-/*
  * LinkBuildDLL - export a .dll to exports/bin.
  */
 #ifdef UseInstalled
@@ -168,13 +160,11 @@ all:: $(BUILDBINDIR)/program program					@@\
 
 
 #ifndef LinkBuildBinary
-#define LinkBuildBinary
-all:: $(BUILDBINDIR)/ProgramTargetName(binary) ProgramTargetName(binary) @@\
-									@@\
-$(BUILDBINDIR)/ProgramTargetName(binary): ProgramTargetName(binary)	@@\
+#define LinkBuildBinary(program)	@@\
+all:: program  @@\
 	MakeDir($(BUILDBINDIR))					@@\
-	RemoveFile($(BUILDBINDIR)/ProgramTargetName(binary)))	@@\
-	cd $(BUILDBINDIR) && $(LN) $(BUILDBINTOP)/$(CURRENT_DIR)/ProgramTargetName(binary) .
+	RemoveFile($(BUILDBINDIR)/program)	@@\
+	$(CP) $(BUILDBINTOP)/$(CURRENT_DIR)/program $(BUILDBINDIR)
 #endif /* LinkBuildBinary */
 
 /* This is to replace an ugly hack in /xc/nls/XLC_LOCALE */
diff --git a/xc/config/cf/cygwin.tmpl b/xc/config/cf/cygwin.tmpl
index ec18609cd..0a06d48dc 100644
--- a/xc/config/cf/cygwin.tmpl
+++ b/xc/config/cf/cygwin.tmpl
@@ -1,5 +1,5 @@
 XCOMM $XConsortium: WinLib.tmpl,v 1.1 94/01/08 18:32:51 rws Exp $
-XCOMM $XFree86: xc/config/cf/cygwin.tmpl,v 3.3 2001/02/13 19:19:11 dawes Exp $
+XCOMM $XFree86: xc/config/cf/cygwin.tmpl,v 3.4 2001/04/18 17:13:58 dawes Exp $
 
 #define SharedOldXReqs $(LDPRELIB) $(XLIBONLY)
 #define SharedXtReqs $(LDPRELIB) $(SMLIB) $(ICELIB) $(XLIBONLY)
@@ -26,6 +26,7 @@ XCOMM #define SharedXfontReqs $(LDPRELIB) $(XLIB)
 #define SharedDPSTKReqs  $(LDPRELIB) $(SMLIB) $(ICELIB) $(XTOOLLIB) $(DPSLIB) $(XLIB)
 #define SharedXrenderReqs $(LDPRELIB) $(EXTENSIONLIB) $(XLIB)
 #define SharedpsresReqs $(LDPRELIB) $(SMLIB) $(ICELIB) $(XTOOLLIB) $(XLIB)
+#define SharedXmuuReqs $(LDPRELIB) $(XTOOLLIB) $(XLIB)
 
 
 #ifndef FixupLibReferences
diff --git a/xc/config/cf/darwin.cf b/xc/config/cf/darwin.cf
index e101a3dce..c32d5d227 100644
--- a/xc/config/cf/darwin.cf
+++ b/xc/config/cf/darwin.cf
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/config/cf/darwin.cf,v 1.9 2001/03/26 02:55:59 torrey Exp $
+XCOMM $XFree86: xc/config/cf/darwin.cf,v 1.11 2001/04/16 06:51:46 torrey Exp $
 
 /* Darwin / Mac OS X configuration by John Carmack <johnc@idsoftware.com> */
 
@@ -19,13 +19,17 @@ XCOMM $XFree86: xc/config/cf/darwin.cf,v 1.9 2001/03/26 02:55:59 torrey Exp $
 /*
  * This enables some settings for developers.
  */
-#define XFree86Devel            NO
+#ifndef XFree86Devel
+# define XFree86Devel            NO
+#endif
 
 /*
  * This enables Quartz compatibility.
  * Turn off to build on raw Darwin systems.
  */
-#define DarwinQuartzSupport     YES
+#ifndef DarwinQuartzSupport
+# define DarwinQuartzSupport     YES
+#endif
 
 /* we don't need -lm */
 #define MathLibrary             /**/
@@ -67,15 +71,18 @@ XCOMM $XFree86: xc/config/cf/darwin.cf,v 1.9 2001/03/26 02:55:59 torrey Exp $
 # define LibraryCCOptions       DefaultCCOptions -fno-common
 #endif
 
-/* A lot of xfree86 code needs __powerpc__ to avoid doing outport asm.
- *
+/*
  * __DARWIN__ will be used for platform specific #ifdefs that can't
  * be handled by existing X defines.
  *
  * Darwin's alloca() seg faults (rather than returning NULL) on failed
  * allocations, so we can't use it.
  */
+#ifdef PpcDarwinArchitecture
 #define StandardDefines         -D__powerpc__ -D__DARWIN__ -DNO_ALLOCA
+#else
+#define StandardDefines         -D__DARWIN__ -DNO_ALLOCA
+#endif
 
 /* programs/rgb/rgb.h and others needs this */
 #define HasNdbm                 YES
@@ -88,6 +95,11 @@ XCOMM $XFree86: xc/config/cf/darwin.cf,v 1.9 2001/03/26 02:55:59 torrey Exp $
 /* our custom X server */
 #define XDarwinServer           YES
 
+/* Thanks to the IOKit, the X server does not have to be SetUID. */
+#ifndef InstallXserverSetUID
+# define InstallXserverSetUID	NO
+#endif
+
 /* pex? bah.  I'm not going to bother getting the device
  * dependent part of this working.  If I get the time, i'll
  * get glx working instead.
@@ -97,8 +109,9 @@ XCOMM $XFree86: xc/config/cf/darwin.cf,v 1.9 2001/03/26 02:55:59 torrey Exp $
 /* no direct graphics extension */
 #define BuildXF86DGA            NO
 
-/* no extra tablets and weird input devices */
+/* no server support for extra tablets and weird input devices */
 #define BuildXInputExt          NO
+#define BuildXInputLib          YES
 
 /* no Display Power Management extension */
 #define BuildDPMSExt            NO
diff --git a/xc/config/cf/kdrive.cf b/xc/config/cf/kdrive.cf
index 2a9a43c4b..5b9bda671 100644
--- a/xc/config/cf/kdrive.cf
+++ b/xc/config/cf/kdrive.cf
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/config/cf/kdrive.cf,v 1.8 2000/12/08 22:09:39 keithp Exp $
+XCOMM $XFree86: xc/config/cf/kdrive.cf,v 1.9 2001/04/10 16:07:47 dawes Exp $
 /*
  * This configuration file contains all of the configuration
  * information for the XFree86 based X Servers.
@@ -211,6 +211,12 @@ XF86COMSRC=.
 #endif
 #endif
 
+#if defined(HasGcc2) && defined(PpcArchitecture)
+#ifndef DefaultGcc2PpcOpt
+#define DefaultGcc2PpcOpt -O2
+#endif
+#endif
+
 #ifndef DefaultGcc2DebugOpt
 #define DefaultGcc2DebugOpt -g
 #endif
diff --git a/xc/config/cf/linux.cf b/xc/config/cf/linux.cf
index 38e1275a1..d3e4762e8 100644
--- a/xc/config/cf/linux.cf
+++ b/xc/config/cf/linux.cf
@@ -4,7 +4,7 @@ XCOMM platform:  $Xorg: linux.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $
 
 
 
-XCOMM platform:  $XFree86: xc/config/cf/linux.cf,v 3.162 2001/04/03 02:29:30 dawes Exp $
+XCOMM platform:  $XFree86: xc/config/cf/linux.cf,v 3.165 2001/04/19 19:54:43 dawes Exp $
 
 #ifndef LinuxElfDefault
 # define LinuxElfDefault	YES
@@ -87,73 +87,79 @@ XCOMM libc:	(LinuxCLibMajorVersion./**/LinuxCLibMinorVersion./**/LinuxCLibTeenyV
 XCOMM binutils:	(LinuxBinUtilsMajorVersion)
 
 #if LinuxDistribution == LinuxDebian
-#ifdef DebianMaintainer
-#define XFree86Devel		YES
-#endif
-#define HasTk			YES
-#define TkLibDir		/usr/lib
-#define TkIncDir		/usr/include
-#define TkLibName		tk8.3
-#define XF86SetupUsesStaticTk	NO
-#define HasTcl			YES
-#define TclLibDir		/usr/lib
-#define TclIncDir		/usr/include
-#define TclLibName		tcl8.3
-#define XF86SetupUsesStaticTcl	NO
+# define SystemManDirectory	/usr/share/man
+# define HasPam			YES
+# define HasTk			YES
+# define TkLibDir		/usr/lib
+# define TkIncDir		/usr/include
+# define TkLibName		tk8.3
+# define XF86SetupUsesStaticTk	NO
+# define HasTcl			YES
+# define TclLibDir		/usr/lib
+# define TclIncDir		/usr/include
+# define TclLibName		tcl8.3
+# define XF86SetupUsesStaticTcl	NO
 /* un-comment this when it is un-broken */
-/* #define JoystickSupport YES */
-#define InstallXinitConfig	YES
-#define InstallXdmConfig	YES
-#define InstallFSConfig		YES
-#ifdef DebianMaintainer
-#define HasXdmAuth		YES
-#endif
-#define DebuggableLibraries	YES
-#define ForceNormalLib		YES
-#define BuildSpecsDocs		YES
-#define SpecsDocDirs		CTEXT GL ICCCM X11 Xext Xv i18n xterm
-/* right now glide only works on i386 */
-#ifdef i386Architecture
-#ifdef DebianMaintainer
-#define HasGlide2		YES
-#endif
-#define Glide2IncDir		/usr/include/glide
-#ifdef DebianMaintainer
-#define HasGlide3		YES
-#endif
-#define Glide3IncDir		/usr/include/glide3
-#endif
-#define XAppLoadDir		EtcX11Directory/app-defaults
-#define XFileSearchPathDefault	Concat4(EtcX11Directory/%L/%T/%N%C,%S:EtcX11Directory/%l/%T/%N%C,%S:EtcX11Directory/%T/%N%C,%S:EtcX11Directory/%L/%T/%N%S:EtcX11Directory/%l/%T/%N%S:EtcX11Directory/%T/%N%S):Concat4($(LIBDIR)/%L/%T/%N%C,%S:$(LIBDIR)/%l/%T/%N%C,%S:$(LIBDIR)/%T/%N%C,%S:$(LIBDIR)/%L/%T/%N%S:$(LIBDIR)/%l/%T/%N%S:$(LIBDIR)/%T/%N%S)
-#ifdef DebianMaintainer
+/* # define JoystickSupport YES */
+# define InstallXinitConfig	YES
+# define InstallXdmConfig	YES
+# define InstallFSConfig	YES
+# define DebuggableLibraries	YES
+# define ForceNormalLib		YES
+# define BuildSpecsDocs		YES
+# define SpecsDocDirs		CTEXT GL ICCCM X11 Xext Xv i18n xterm
+# define XAppLoadDir		EtcX11Directory/app-defaults
+# define XFileSearchPathDefault	Concat4(EtcX11Directory/%L/%T/%N%C,%S:EtcX11Directory/%l/%T/%N%C,%S:EtcX11Directory/%T/%N%C,%S:EtcX11Directory/%L/%T/%N%S:EtcX11Directory/%l/%T/%N%S:EtcX11Directory/%T/%N%S):Concat4($(LIBDIR)/%L/%T/%N%C,%S:$(LIBDIR)/%l/%T/%N%C,%S:$(LIBDIR)/%T/%N%C,%S:$(LIBDIR)/%L/%T/%N%S:$(LIBDIR)/%l/%T/%N%S:$(LIBDIR)/%T/%N%S)
 /* the relative symlink created by this rule causes problems for us */
-#if InstallAppDefFiles
-#define InstallAppDefaultsLong(file,class)				@@\
+# if InstallAppDefFiles
+#  define InstallAppDefaultsLong(file,class)				@@\
 InstallNamedTarget(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class)
-#else
-#define InstallAppDefaultsLong(file,class)				@@\
+# else
+#  define InstallAppDefaultsLong(file,class)				@@\
 InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class)
-#endif /* InstallAppDefFiles */
-#endif
-#ifdef DebianMaintainer
-#define BuilderEMailAddr	"submit@bugs.debian.org"
-#endif
-#define SharedLibXdmGreet	YES
-#define LinkGLToUsrInclude	NO
-#define LinkGLToUsrLib		NO
-#define SharedLibFont		NO
-#define SharedLibXft		NO
-#define SharedLibXrender	NO
-#define HasZlib			YES
-#define SharedLibGlu		YES
-#define NormalLibGlu		YES
-#define BuildRman		NO
-#define BuildHtmlManPages	NO
-#define FSUseSyslog		YES
-#ifndef HasKatmaiSupport
-#define HasKatmaiSupport	NO
-#endif
-#endif
+# endif /* InstallAppDefFiles */
+# define SharedLibXdmGreet	NO
+# define LinkGLToUsrInclude	NO
+# define LinkGLToUsrLib		NO
+# define SharedLibFont		NO
+# define HasZlib		YES
+# define SharedLibGlu		YES
+# define NormalLibGlu		YES
+# define BuildRman		NO
+# define BuildHtmlManPages	NO
+# define FSUseSyslog		YES
+
+/*
+ *
+ *
+# define DebianMaintainer	"xfree86@packages.debian.org"
+ *
+ *
+ */
+
+# ifdef DebianMaintainer
+#  define BuilderEMailAddr	"submit@bugs.debian.org"
+#  define XFree86Devel		YES
+#  define BuildAllSpecsDocs	YES
+/* we build-depend on libfreetype6-dev (FreeType 2.x) */
+#  define BuildFreetype2Library	NO
+#  define HasXdmAuth		YES
+/* modern LaTeX chokes on ancient sync.tex document */
+/* #  define HasLatex		YES */
+#  define BuilderEMailAddr	"submit@bugs.debian.org"
+/* right now glide only works on i386 */
+#  ifdef i386Architecture
+#   define HasMMXSupport	YES
+#   define Has3DNowSupport	YES
+/* 2.4 is not yet the official (or predominant) kernel in unstable */
+#   define HasKatmaiSupport	NO
+#   define HasGlide2		YES
+#   define Glide2IncDir		/usr/include/glide
+#   define HasGlide3		YES
+#   define Glide3IncDir		/usr/include/glide3
+#  endif /* i386Architecture */
+# endif /* DebianMaintiner */
+#endif /* LinuxDebian */
 
 #if LinuxDistribution == LinuxRedHat
 #define FSUseSyslog		YES
@@ -266,6 +272,10 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class
 #    define BuildXF86DRI	YES
 #  elif defined(PpcArchitecture)
 #    define BuildXF86DRI	NO
+#  elif defined(Mc68020Architecture)
+#    define BuildXF86DRI	NO
+#  elif defined(Arm32Architecture)
+#    define BuildXF86DRI	NO
 #  else
 #    define BuildXF86DRI	NO
 #  endif
@@ -285,7 +295,7 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class
    kernel revisions.  So, we'll only build the module for kernels that are
    known to be supported by the module. */
 #ifndef BuildXF86DRM
-#  if defined(i386Architecture) || defined(ia64Architecture)
+#  if defined(i386Architecture) || defined(ia64Architecture) || defined(SparcArchitecture) || defined(AlphaArchitecture)
 #    if OSMajorVersion == 2
        /* Only tested for Linux 2.2.0 through 2.2.12 */
 #      if OSMinorVersion == 2 && OSTeenyVersion <= 12
@@ -416,6 +426,10 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class
 #define HasNCurses		YES
 #endif
 
+#ifndef HasGroff
+#define HasGroff		YES
+#endif
+
 #define AvoidNullMakeCommand	YES
 #ifndef DebuggableLibraries
 #define DebuggableLibraries	NO
@@ -619,7 +633,7 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class
 # endif
 # define LinuxMachineDefines	-D__alpha__
 # define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME -DPART_NET
-# define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
+# define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 -DJENSEN_SUPPORT
 # ifdef UseCompaqMathLibrary
 #  define MathLibrary		-lcpml -lm
 # endif
@@ -630,7 +644,7 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class
 # ifndef OptimizedCDebugFlags
 #  define OptimizedCDebugFlags 	-O3
 # endif
-# define LinuxMachineDefines	-D__arm__ -U__arm -Uarm
+# define LinuxMachineDefines	-D__arm__ -D__arm32__ -U__arm -Uarm
 # define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME -DPART_NET
 # define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines
 #endif /* Arm32Achitecture */
@@ -658,7 +672,7 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class
 #ifdef PpcArchitecture
 # define DefaultCCOptions	-fsigned-char
 # ifndef OptimizedCDebugFlags
-#  define OptimizedCDebugFlags	-O2
+#  define OptimizedCDebugFlags	DefaultGcc2PpcOpt
 # endif
 # define LinuxMachineDefines	-D__powerpc__
 # define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME -DPART_NET
@@ -758,7 +772,7 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class
 #define TtClientLibs $(TTLIB) $(XTOOLLIB) $(XLIB)
 #define TtClientDepLibs $(DEPTTLIB) $(DEPXTOOLLIB) $(DEPXLIB)
 
-#ifdef S390Architecture
+#ifdef s390Architecture
 # define HasXServer	NO
 #endif
 
diff --git a/xc/config/cf/lynx.cf b/xc/config/cf/lynx.cf
index 7e5c4c55e..2ccfd95a1 100644
--- a/xc/config/cf/lynx.cf
+++ b/xc/config/cf/lynx.cf
@@ -3,7 +3,7 @@ XCOMM $Xorg: lynx.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $
 
 
 
-XCOMM platform:  $XFree86: xc/config/cf/lynx.cf,v 3.42 2001/01/23 23:31:49 dawes Exp $
+XCOMM platform:  $XFree86: xc/config/cf/lynx.cf,v 3.43 2001/04/19 19:54:43 dawes Exp $
 
 
 #ifndef OSName
@@ -281,6 +281,8 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
 # define FileManDir	$(MANSOURCEPATH)5
 #endif
 
+#define HasGroff	YES
+
 /* groff 1.09 compiles right out of the box with LynxOS 2.3,
  * so if you want to have manual pages you should install groff 1.09
  * before you run 'make install.man'
diff --git a/xc/config/cf/mach.cf b/xc/config/cf/mach.cf
index cbc7f1d2b..4489ee678 100644
--- a/xc/config/cf/mach.cf
+++ b/xc/config/cf/mach.cf
@@ -2,7 +2,7 @@ XCOMM $Xorg: mach.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $
 
 
 
-XCOMM platform:  $XFree86: xc/config/cf/mach.cf,v 3.12 2001/01/17 16:22:32 dawes Exp $
+XCOMM platform:  $XFree86: xc/config/cf/mach.cf,v 3.13 2001/04/19 19:54:43 dawes Exp $
 
 #define OSName           Mach 2.5/3.0
 #define OSVendor          /**/
@@ -61,7 +61,7 @@ XCOMM operating system:  OSName
 # define PreIncDir	/usr/include
 #endif
 
-#define TroffCmd        groff -Tps
+#define HasGroff	YES
 
 #ifndef ExtraFilesToClean
 # define ExtraFilesToClean *.core
diff --git a/xc/config/cf/os2.cf b/xc/config/cf/os2.cf
index e123328db..8f65b6e16 100644
--- a/xc/config/cf/os2.cf
+++ b/xc/config/cf/os2.cf
@@ -2,7 +2,7 @@ XCOMM $Xorg: os2.cf,v 1.3 2000/08/17 19:41:48 cpqbld Exp $
 
 
 
-XCOMM platform:  $XFree86: xc/config/cf/os2.cf,v 3.33 2001/01/17 16:22:32 dawes Exp $
+XCOMM platform:  $XFree86: xc/config/cf/os2.cf,v 3.34 2001/04/19 19:54:43 dawes Exp $
 
 #define OSName           OS/2
 #define OSVendor	 IBM
@@ -62,7 +62,7 @@ XCOMM platform:  $XFree86: xc/config/cf/os2.cf,v 3.33 2001/01/17 16:22:32 dawes
 #define NeqnCmd		eqn 
 #define NroffCmd	groff -Tascii
 #define	EqnCmd 		eqn -Tascii
-#define TroffCmd        groff -Tps
+#define HasGroff	YES
          NEQN = NeqnCmd
         NROFF = NroffCmd
 
diff --git a/xc/config/cf/xfree86.cf b/xc/config/cf/xfree86.cf
index 57ac75dc6..f19945e5e 100644
--- a/xc/config/cf/xfree86.cf
+++ b/xc/config/cf/xfree86.cf
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/config/cf/xfree86.cf,v 3.354 2001/04/05 21:29:09 dawes Exp $
+XCOMM $XFree86: xc/config/cf/xfree86.cf,v 3.358 2001/04/20 16:00:46 alanh Exp $
 /*
  * This configuration file contains all of the configuration
  * information for the XFree86 based X Servers.
@@ -104,7 +104,7 @@ XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $
 #define XLogFile		XFree86
 #endif
 
- /*
+/*
  * BuildXFree86ConfigTools:
  *
  * Turning this on allows the XFree86 config tools to build when
@@ -322,7 +322,11 @@ XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $
 
 /* Sparc drivers */
 
-#if defined(SparcArchitecture) && !defined(LynxOSArchitecture) && !defined(NetBSDArchitecture) && !defined(OpenBSDArchitecture) && !defined(SunArchitecture)
+#if  defined(SparcArchitecture) && \
+    !defined(LynxOSArchitecture) && \
+    !defined(NetBSDArchitecture) && \
+    !defined(OpenBSDArchitecture) && \
+    !defined(SunArchitecture)
 # ifndef XF86Server
 #  define XF86Server            YES
 # endif
@@ -389,8 +393,8 @@ XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $
 				sunbw2 ati glint fbdev \
 				XF86OSCardDrivers XF86ExtraCardDrivers
 # endif
-# ifndef DRIDrivers
-#  define DRIDrivers		ffb
+# ifndef DriDrivers
+#  define DriDrivers		ffb
 # endif
 
 #endif
@@ -638,6 +642,14 @@ XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $
 				DevelDrivers vga \
 				XF86OSCardDrivers XF86ExtraCardDrivers
 # endif
+# if HasGlide3
+#  define TdfxDriDriver		tdfx
+# else
+#  define TdfxDriDriver		/**/
+# endif
+# ifndef DriDrivers
+#  define DriDrivers		gamma TdfxDriDriver mga r128 radeon
+# endif
 #endif
 
 
@@ -769,11 +781,25 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8
 #    define GlxBuiltInSIS          NO
 #  endif
 
-#  if GlxBuiltInTdfx || GlxBuiltInMga || GlxBuiltInI810 || GlxBuiltInR128 || GlxBuiltInRadeon || GlxBuildInFfb || GlxBuiltInSIS
+#  if GlxBuiltInTdfx || \
+      GlxBuiltInMga || \
+      GlxBuiltInI810 || \
+      GlxBuiltInR128 || \
+      GlxBuiltInRadeon || \
+      GlxBuildInFfb || \
+      GlxBuiltInSIS
 #    define GlxDriverUsesMesa      YES
 #  endif
 
-#  if GlxBuiltInGamma || GlxBuiltInTdfx || GlxBuiltInMga || GlxBuiltInI810 || GlxBuiltInR128 || GlxBuiltInRadeon || GlxBuiltInFfb || GlxBuiltInSIS || GlxBuiltInMesa
+#  if GlxBuiltInGamma || \
+      GlxBuiltInTdfx || \
+      GlxBuiltInMga || \
+      GlxBuiltInI810 || \
+      GlxBuiltInR128 || \
+      GlxBuiltInRadeon || \
+      GlxBuiltInFfb || \
+      GlxBuiltInSIS || \
+      GlxBuiltInMesa
 #    define GlxUseBuiltInDRIDriver YES
 #    define DRIDynLoadDefines /**/
 #  else
@@ -992,6 +1018,13 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8
 #endif
 
 /*
+ * Build SuperProbe
+ */
+#ifndef BuildSuperProbe
+# define BuildSuperProbe 		NO
+#endif
+
+/*
  * Build XF86Setup -- needs Tk and Tcl
  */
 /* There are problems building XF86Setup, so turn it off for now */
@@ -1000,7 +1033,8 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8
 #endif
 
 #ifndef BuildXF86Setup
-# if HasTk && HasTcl && BuildXF86VidModeLibrary && BuildXF86MiscLibrary && BuildXKBlib
+# if HasTk && HasTcl && \
+     BuildXF86VidModeLibrary && BuildXF86MiscLibrary && BuildXKBlib
 #  define BuildXF86Setup		YES
 # else
 #  define BuildXF86Setup		NO
@@ -1373,6 +1407,12 @@ XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japanese
 # endif
 #endif
 
+#if HasGcc2 && defined(PpcArchitecture)
+# ifndef DefaultGcc2PpcOpt
+#  define DefaultGcc2PpcOpt -O2
+# endif
+#endif
+
 #ifndef DefaultGcc2DebugOpt
 # define DefaultGcc2DebugOpt -g
 #endif
diff --git a/xc/config/cf/xttMod.tmpl b/xc/config/cf/xttMod.tmpl
index 40f65cbd6..dc83240ca 100644
--- a/xc/config/cf/xttMod.tmpl
+++ b/xc/config/cf/xttMod.tmpl
@@ -1,6 +1,6 @@
 /* -*- Makefile -*- */
 XCOMM Code converter template of X-TT
-XCOMM $XFree86: xc/config/cf/xttMod.tmpl,v 1.5 2000/08/24 22:20:06 tsi Exp $ */
+XCOMM $XFree86: xc/config/cf/xttMod.tmpl,v 1.6 2001/04/23 21:41:43 dawes Exp $ */
 
 #ifdef IHaveModules
 /* New designed XFree86 module */
@@ -33,7 +33,7 @@ InstallDriverSDKLibraryModule($(MODULENAME),$(DRIVERSDKMODULEDIR),codeconv)
 # else
 /* dlopen based code converter */
 
-#if DoLoadableServer
+#if DoLoadableServer && BuildServer
 #define IHaveSubdirs
 #define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)"
 SUBDIRS = module
@@ -75,7 +75,7 @@ SharedDepModuleTarget($(CCONV_MODULE_FILE),$(OBJS),$(OBJS))
 
 #endif /* 0 */
 
-#if DoLoadableServer
+#if DoLoadableServer && BuildServer
 MakeSubdirs($(SUBDIRS))
 DependSubdirs($(SUBDIRS))
 #endif
diff --git a/xc/config/imake/imakemdep.h b/xc/config/imake/imakemdep.h
index 05c5b89f8..6d47f2f66 100644
--- a/xc/config/imake/imakemdep.h
+++ b/xc/config/imake/imakemdep.h
@@ -20,7 +20,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/config/imake/imakemdep.h,v 3.48 2001/03/27 00:21:17 torrey Exp $ */
+/* $XFree86: xc/config/imake/imakemdep.h,v 3.50 2001/04/25 16:44:54 tsi Exp $ */
 
 
 /* 
@@ -653,6 +653,12 @@ char *cpp_argv[ARGUMENTS] = {
 #if defined(__APPLE__)
         "-D__APPLE__",
         "-D__DARWIN__",
+# ifdef __ppc__
+        "-D__ppc__",
+# endif
+# ifdef __i386__
+        "-D__i386__",
+# endif
 #endif
 
 };
@@ -906,7 +912,14 @@ struct symtab	predefs[] = {
 	{"mc68020", "1"},
 #endif
 #ifdef __GNUC__
+# if __GNUC__ == 1
 	{"__GNUC__", "1"},
+# else
+	{"__GNUC__", "2"},
+# endif
+#endif
+#ifdef __STRICT_ANSI__
+	{"__STRICT_ANSI__", "1"},
 #endif
 #if __STDC__
 	{"__STDC__", "1"},
diff --git a/xc/config/makedepend/cppsetup.c b/xc/config/makedepend/cppsetup.c
index 492033c8e..1190f39c8 100644
--- a/xc/config/makedepend/cppsetup.c
+++ b/xc/config/makedepend/cppsetup.c
@@ -20,7 +20,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/config/makedepend/cppsetup.c,v 3.6 2001/01/17 16:38:57 dawes Exp $ */
+/* $XFree86: xc/config/makedepend/cppsetup.c,v 3.8 2001/04/27 03:03:51 tsi Exp $ */
 
 #include "def.h"
 
@@ -181,6 +181,7 @@ my_eval_defined (IfParser *ip, const char *var, int len)
 static long
 my_eval_variable (IfParser *ip, const char *var, int len)
 {
+    long val;
     struct symtab **s;
 
     s = lookup_variable (ip, var, len);
@@ -193,7 +194,9 @@ my_eval_variable (IfParser *ip, const char *var, int len)
 	s = lookup_variable (ip, var, strlen(var));
     } while (s);
 
-    return strtol(var, NULL, 0);
+    var = ParseIfExpression(ip, var, &val);
+    if (var && *var) debug(3, ("extraneous: '%s'\n", var));
+    return val;
 }
 
 int
diff --git a/xc/config/makedepend/main.c b/xc/config/makedepend/main.c
index 4697bfd13..b10465fec 100644
--- a/xc/config/makedepend/main.c
+++ b/xc/config/makedepend/main.c
@@ -20,7 +20,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/config/makedepend/main.c,v 3.18 2001/01/17 16:38:59 dawes Exp $ */
+/* $XFree86: xc/config/makedepend/main.c,v 3.19 2001/04/25 16:44:55 tsi Exp $ */
 
 #include "def.h"
 #ifdef hpux
@@ -570,10 +570,7 @@ char *getnextline(struct filepointer *filep)
 			*p++ = ' ', *p++ = ' ';
 			while (*p && *p != '\n')
 				*p++ = ' ';
-			if (*p == '\n') {
-				lineno++;
-				*p++ = ' ';
-			}
+			if (*p == '\n') --p;
 			continue;
 		}
 		else if (*p == '\\') {
@@ -593,6 +590,7 @@ char *getnextline(struct filepointer *filep)
 				for (cp = bol+1; 
 				     *cp && (*cp == ' ' || *cp == '\t'); cp++);
 				if (*cp) goto done;
+				--p;
 			}
 			bol = p+1;
 		}
diff --git a/xc/config/util/Imakefile b/xc/config/util/Imakefile
index 880baf9dd..3f5219737 100644
--- a/xc/config/util/Imakefile
+++ b/xc/config/util/Imakefile
@@ -2,10 +2,10 @@ XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:41:52 cpqbld Exp $
 
 
 
-XCOMM $XFree86: xc/config/util/Imakefile,v 3.34 2001/03/21 20:25:00 dawes Exp $
+XCOMM $XFree86: xc/config/util/Imakefile,v 3.36 2001/04/26 21:09:39 dawes Exp $
 
 #if UseCCMakeDepend
-MDEP_PROG = makedepend
+CCMDEP_PROG = ccmakedep
 #endif
 
 #ifdef ExportListGenSource
@@ -29,7 +29,7 @@ RMAN_PROG = ProgramTargetName(rman)
 QNXCopyInstaller($(PROJECTROOT)/bin/install.qnx,./install.sh)
 #endif
 
-PROGRAMS = xmkmf $(MDEP_PROG) $(GCCMDEP_PROG) mergelib $(LNDIR_PROG) \
+PROGRAMS = xmkmf $(CCMDEP_PROG) $(GCCMDEP_PROG) mergelib $(LNDIR_PROG) \
 	   $(RMAN_PROG) ProgramTargetName(revpath) \
 	   ProgramTargetName(makestrs) $(EXPORTLISTGEN) $(CMKDIRHIER)
 DEPLIBS =
@@ -67,7 +67,7 @@ InstallNamedProg(exportlistgen,exportlistgen,$(BINDIR))
 #endif
 
 CppScriptTarget(xmkmf,xmkmf.cpp,-DCONFIGDIRSPEC='"'"-I$(CONFIGDIR)"'"',$(ICONFIGFILES))
-CppScriptTarget(makedepend,mdepend.cpp,-DPREPROC='"'"$(PREPROCESSCMD_MKDEPEND)"'"',$(ICONFIGFILES))
+CppScriptTarget(ccmakedep,mdepend.cpp,-DPREPROC='"'"$(PREPROCESSCMD_MKDEPEND)"'"',$(ICONFIGFILES))
 CppScriptTarget(mergelib,mergelib.cpp,"-DARCMD=$(AR)" "-DRANLIB=$(RANLIB)",$(ICONFIGFILES))
 #ifndef OS2Architecture
 CppScriptTarget(gccmakedep,gccmdep.cpp,-DCCCMD='"'"$(GCCCMD)"'"' -DRMCMD='"'"$(RM)"'"' -DLNCMD='"'"$(LN)"'"' -DMVCMD='"'"$(MV)"'"',$(ICONFIGFILES))
@@ -138,10 +138,8 @@ InstallNamedProg(mkhtmlindex.sh,mkhtmlindex,$(BINDIR))
 #endif
 #endif
 InstallManPage(mkdirhier,$(MANDIR))
-#if UseCCMakeDepend
-InstallNamedProg(makedepend,makedepend,$(BINDIR))
-InstallDriverSDKNamedProg(makedepend,makedepend,$(DRIVERSDKDIR)/config/util)
-#endif
+InstallNamedProg(ccmakedep,ccmakedep,$(BINDIR))
+InstallDriverSDKNamedProg(ccmakedep,ccmakedep,$(DRIVERSDKDIR)/config/util)
 #if SystemV || SystemV4
 InstallNamedProg(bsdinst.sh,bsdinst,$(BINDIR))
 InstallDriverSDKNamedProg(bsdinst.sh,bsdinst.sh,$(DRIVERSDKDIR)/config/util)
diff --git a/xc/config/util/mdepend.cpp b/xc/config/util/mdepend.cpp
index 364855551..5aef89521 100644
--- a/xc/config/util/mdepend.cpp
+++ b/xc/config/util/mdepend.cpp
@@ -22,7 +22,7 @@ XCOMM	work on both USG and BSD systems.  However, when System V.4 comes out,
 XCOMM	USG users will probably have to change "silent" to "-s" instead of
 XCOMM	"-" (at least, that is what the documentation implies).
 XCOMM
-XCOMM $XFree86: xc/config/util/mdepend.cpp,v 3.7 2001/03/15 18:39:00 tsi Exp $
+XCOMM $XFree86: xc/config/util/mdepend.cpp,v 3.9 2001/04/26 20:55:10 dawes Exp $
 XCOMM
 
 CC=PREPROC