move NormalLibExpat definition into OS specific config files that'll help

the merge from/to XFree86 at a later stage.

4 files changed, 512 insertions, 152 deletions

diff --git a/xc/config/cf/FreeBSD.cf b/xc/config/cf/FreeBSD.cf
index ea113a775..475238754 100644
--- a/xc/config/cf/FreeBSD.cf
+++ b/xc/config/cf/FreeBSD.cf
@@ -225,10 +225,12 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
 /*
  * Drivers that don't need AGP can work with 4.0, but we don't have a
  * mechanism for specifying a subset of drivers in the OS.cf files yet.
+ * Also build static expat library for DRI drivers config tools.
  */
 #ifndef BuildXF86DRI
 #if OSMajorVersion >= 5 || (OSMajorVersion == 4 && OSMinorVersion >= 1)
 #define BuildXF86DRI		YES
+#define NormalLibExpat		YES
 #endif
 #endif
 
diff --git a/xc/config/cf/OpenBSD.cf b/xc/config/cf/OpenBSD.cf
index 53b23ce3e..56a09cfd1 100644
--- a/xc/config/cf/OpenBSD.cf
+++ b/xc/config/cf/OpenBSD.cf
@@ -1,6 +1,4 @@
-XCOMM platform:  $XFree86: xc/config/cf/OpenBSD.cf,v 3.23 1999/04/29 09:13:19 dawes Exp $
-XCOMM
-XCOMM $OpenBSD: OpenBSD.cf,v 1.33 1998/09/27 04:52:48 rahnds Exp $
+XCOMM platform:  $XFree86: xc/config/cf/OpenBSD.cf,v 3.90 2003/09/09 03:20:27 dawes Exp $
 XCOMM
 
 #ifndef OSName
@@ -21,6 +19,24 @@ XCOMM
 #endif
 XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion)
 
+#ifdef Ports
+
+#define BinDir			/usr/local/bin
+#define LibDir			/usr/local/lib/X11
+#define UsrLibDir		/usr/local/lib
+#define ManDirectoryRoot	/usr/local/man
+#define LdPreLib		-L/usr/X11R6/lib -L/usr/local/lib
+#define XpmLibDir		/usr/X11R6/lib
+#define XpmIncDir		/usr/X11R6/include
+#define ConfigDir		/usr/X11R6/lib/X11/config
+#define IncRoot			/usr/local/include
+#define TopXInclude		-I/usr/X11R6/include
+#define ImakeCmd		imake -DPorts
+#define DocDir			/usr/local/share/doc
+#define BuildHtmlManPages	NO
+
+#endif
+
 /*
  * C library features
  */
@@ -36,27 +52,99 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
 #define HasShm          	YES
 #define HasWChar32		YES
 #define HasMkstemp		YES
+#define HasSetProcTitle		YES
 #define HasZlib			YES
-#define HasDlopen		YES
-#define DlLibrary		/**/
+#ifndef HasKrbIV
+# if OSMajorVersion == 2 || OSMajorVersion == 3 && OSMinorVersion < 3
+#  define HasKrbIV		YES
+# else
+   /* Kerberos IV was removed after OpenBSD 3.3 */
+#  define HasKrbIV		NO
+# endif
+#endif
 #define HasUsableFileMmap	YES
+#define HasShadowPasswd		NO
+
+#define RandomDefines          -DARC4_RANDOM   
 
 #define HasNCurses		YES
 #define NCursesLibName		-lcurses
+#if defined(TermcapLibrary)
+#undef TermcapLibrary
+#endif
+#define TermcapLibrary		-lcurses
+
+#define HasVarRun		YES
+#define HasVarDb		YES
+#define VarLibDir		VarDbDirectory
+
+#define InstallXloadSetGID	NO
+
+#ifndef HasIssetugid
+# if (OSMajorVersion >= 2)
+#  define HasIssetugid		YES
+# endif
+#endif
+
+#ifndef HasMktemp
+# if (OSMajorVersion > 2) || (OSMajorVersion == 2 && OSMinorVersion >= 1)
+#  define HasMktemp		YES
+# else
+#  define HasMktemp		NO
+# endif
+#endif
+
+/* OpenBSD >= 2.7 has getifaddrs() */
+#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 7)
+#define HasGetIfAddrs		YES
+#endif
+
+/* OpenBSD >= 2.8 has setusercontext() */
+#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 7)
+#define HasSetUserContext	YES
+#endif
+
+/* OpenBSD after 2.9 has BSD authentication */
+#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 9)
+# define HasBSDAuth		YES
+#endif
+
+/* OpenBSD 3.0 and later has getpeereid() */
+#if OSMajorVersion >= 3
+# define HasGetpeereid		YES
+#endif
+
+/* OpenBSD 3.0 has APM with kqueue interface */
+#if OSMajorVersion >= 3
+# define HasApmKqueue		YES
+#endif
+
+/* OpenBSD 3.0 has libusb, next versions have libusbhid */
+#if OSMajorVersion >= 3 
+# define HasLibUsb		YES
+# ifndef HasLibUsbHid
+#  if OSMajorVersion == 3 && OSMinorVersion > 0 || OSMajorVersion > 3
+#   define HasLibUsbHid		YES
+#   define UsbHidLib 		-lusbhid
+#  else
+#   define HasLibUsbHid		NO
+#   define UsbHidLib		-lusb
+#  endif
+# endif
+#endif
 
 /*
  * Compiler Features
  */
-#undef HasGcc
-#define HasGcc			YES
-#define HasGcc2			YES
-#ifndef HasGcc2ForCplusplus
-#define HasGcc2ForCplusplus	YES
-#endif
 #define GccUsesGas		YES
 #define UseGas			YES
 #define GnuCpp			YES
 
+#ifndef HasGccStackProtector	
+#define HasGccStackProtector	NO
+#endif
+
+#define UseGnuMalloc		NO
 
 #define NeedConstPrototypes	YES
 #define NeedFunctionPrototypes	YES
@@ -66,80 +154,71 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
 
 #define MkdirHierCmd		mkdir -p
 
+#ifndef CppCmd
 #define CppCmd          	/usr/libexec/cpp
+#endif
 #define StandardCppOptions	-traditional
 #define StandardCppDefines	/**/
 #define PreProcessCmd   	CppCmd
 #define PreIncDir		DefaultGccIncludeDir
 
-#undef CcCmd
-#define CcCmd 			gcc
+#ifndef CcCmd
+#define CcCmd 			cc
+#endif
+#ifndef AsCmd
+#define AsCmd			cc -c -x assembler
+#endif
+#ifndef DefaultCCOptions
 #if defined(UseInstalled)
 #define DefaultCCOptions 	/**/
 #else
-#define DefaultCCOptions 	-ansi -Dasm=__asm GccWarningOptions
+#  ifdef  PpcArchitecture
+#    define DefaultCCOptions	-ansi -fsigned-char GccWarningOptions
+#  else
+#    define DefaultCCOptions 	-ansi GccWarningOptions
+#  endif
+#endif
 #endif
 
 #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		/**/
-#else
-# define OptimizedCDebugFlags 	-O2
-# if defined(SparcArchitecture) || defined(AlphaArchitecture)
-#  define ServerOSDefines 	-DDDXOSINIT
+/* UseElfFormat defaults to YES if __ELF__ set */
+#ifndef UseElfFormat
+# ifdef __ELF__
+#  undef __ELF__			/* other imake files shouldn't care */
+#  define UseElfFormat YES
 # else
-#  define ServerOSDefines 	/**/
+#  define UseElfFormat NO
 # endif
 #endif
-#if defined(i386Architecture) || defined(ArcArchitecture)
-# define ServerExtraDefines GccGasOption XFree86ServerDefines
-# ifndef XFree86ConsoleDefines
-#  if defined(ArcArchitecture)
-#   define XFree86ConsoleDefines -DPCCONS_SUPPORT
-#  else
-#   define XFree86ConsoleDefines -DPCCONS_SUPPORT -DPCVT_SUPPORT
-#  endif
-# endif
-#else
-# if defined(AlphaArchitecture)
-#  define ServerExtraDefines GccGasOption -D_XSERVER64
-# else
-#  define ServerExtraDefines GccGasOption
-# endif
+
+/*
+ * Increment shared libraries major numbers if using Gcc Stack Protector
+ * (This introduces an ABI change)
+ */
+#ifndef OverrideShlibRevs
+# define OverrideShlibRevs     HasGccStackProtector
 #endif
 
+
 #define StandardDefines	-DCSRG_BASED
 #define XawI18nDefines	-DUSE_XWCHAR_STRING -DUSE_XMBTOWC
 
-#ifndef DoLoadableServer
-#define DoLoadableServer	YES
-#endif
-
-#ifndef ExtraLibraries
-#define ExtraLibraries		/**/
-#endif
-#define UseGnuMalloc		NO
 
 #define	AdmDir			/var/log
 
+#define HasFlex			YES
+
+/* OpenBSD doesn't have gperf in the base install */
+#define DontRebuildGperfOutput	YES
+
 /*
  * Make & install Features
  */
 
 #define HasBsdMake		YES
 
-#define StripInstalledPrograms	YES
 #define BuildCyrillicFonts	YES
 #define GzipFontCompression	YES
 #define DefaultUserPath		/bin:/usr/bin:/usr/local/bin:$(BINDIR)
@@ -162,15 +241,12 @@ 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
- */
-#if defined(i386Architecture)
-#ifndef HasNetBSDApertureDriver
-#define HasNetBSDApertureDriver	YES
-#endif
+#ifndef HasCookieMaker
+#  define HasCookieMaker	YES
+#  define MkCookieCmd \
+	'dd if=/dev/urandom bs=16 count=1 2>/dev/null | hexdump -e \\"%08x\\"'
 #endif
 
 
@@ -182,15 +258,14 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
 #define FileManSuffix	5
 #define ManSourcePath	$(MANPATH)/cat
 
-#define InstallManPageLong(file,destdir,dest)                           @@\
+#define InstallManPageLongBase(file,destdir,dest)			@@\
 all:: file.0								@@\
 									@@\
-file.0:: file.man							@@\
-	@if [ -f file.man ]; \						@@\
+file.0:: file.$(MANNEWSUFFIX)						@@\
+	@if [ -f file.$(MANNEWSUFFIX) ]; \				@@\
 	then \								@@\
-	cat file.man | $(NEQN) | $(TBL) | $(NROFF) $(MANMACROS) | $(COL) >/tmp/$$$$.man; \	@@\
-	cp /tmp/$$$$.man file.0; \					@@\
-	$(RM) /tmp/$$$$.man; \						@@\
+	cat file.$(MANNEWSUFFIX) | $(NEQN) | $(TBL) | \			@@\
+		$(NROFF) $(MANMACROS) | $(COL) > file.0; \		@@\
 	fi 								@@\
 									@@\
 install.man::                                                           @@\
@@ -203,16 +278,27 @@ install.man::                                                           @@\
 clean::									@@\
 	RemoveFile(file.0)
 
+#define InstallManPageLong(file,destdir,dest)				@@\
+BuildInstallHtmlManPage(file,dest,$(MANSUFFIX))				@@\
+									@@\
+CppManTarget(file, $(EXTRAMANDEFS))					@@\
+									@@\
+InstallManPageLongBase(file,destdir,dest)
+
 #define InstallGenManPageLong(file,destdir,dest,suffix)			@@\
-	InstallManPageLong(file,destdir,dest)
+BuildInstallHtmlManPage(file,dest,suffix)				@@\
+									@@\
+CppManTarget(file, $(EXTRAMANDEFS))					@@\
+									@@\
+InstallManPageLongBase(file,destdir,dest)
 
 #define InstallMultipleMan(list,dest)                                   @@\
 install.man:: 								@@\
 	MakeDir($(DESTDIR)dest)						@@\
 	case '${MFLAGS}' in *[i]*) set +e;; esac; \			@@\
 	for i in list; do \                                             @@\
-	  (set -x; \							@@\
-	   MNAME=`echo $$i | cut -f1 -d.`; \				@@\
+	  (MNAME=`echo $$i | cut -f1 -d.`; \				@@\
+	  set -x; \							@@\
 	  cat $$i | $(NEQN) | $(TBL) | $(NROFF) $(MANMACROS) \		@@\
 		| $(COL) > $${MNAME}.0; \				@@\
 	  $(INSTALL) -c $(INSTMANFLAGS) $${MNAME}.0 \			@@\
@@ -233,7 +319,7 @@ install.man:: 								@@\
 	  $(RM) $$i.0 ); \						@@\
 	done
 
-#define InstallManPageAliases(file,destdir,aliases)                     @@\
+#define InstallManPageAliasesBase(file,destdir,aliases)			@@\
 install.man:: 								@@\
 	@case '${MFLAGS}' in *[i]*) set +e;; esac; \                    @@\
 	for i in aliases; do \                                          @@\
@@ -243,8 +329,15 @@ install.man:: 								@@\
 		); \							@@\
 	done
 
+#define InstallManPageAliases(file,destdir,aliases)			@@\
+InstallHtmlManPageAliases(file,aliases,$(MANSUFFIX))			@@\
+									@@\
+InstallManPageAliasesBase(file,destdir,aliases)
+
 #define InstallGenManPageAliases(file,destdir,suffix,aliases)		@@\
-	InstallManPageAliases(file,destdir,aliases)
+InstallHtmlManPageAliases(file,aliases,suffix)				@@\
+									@@\
+InstallManPageAliasesBase(file,destdir,aliases)
 
 
 /*
@@ -262,11 +355,12 @@ install:: fonts.alias							@@\
 	$(RM) _fonts.alias
 #endif /* InstallFontAliasesNoComment */
 
-/* We now only use the XFree86 tree - thus we can define this
- * independent of the architecture
+/*
+ * OpenBSD specific Imake Config files
  */
-#ifndef XF86Contrib
-#define XF86Contrib
+#ifndef LocalConfigFiles
+#define LocalConfigFiles \
+	OpenBSDLib.rules OpenBSDLib.tmpl
 #endif
 
 /*
@@ -280,41 +374,53 @@ install:: fonts.alias							@@\
  */
 #ifdef AlphaArchitecture
 
-/*
- * The code for an Alpha XF86_TGA server compiles, but it DOES NOT work
- */
-# define BuildAlphaXF86		NO
-
-# if BuildAlphaXF86
-#  include <xf86.rules>
+# if OSMajorVersion == 3 && OSMinorVersion > 1 || OSMajorVersion > 3
+#  define HasWeakSymbols		YES
 # endif
 
- /*
-  * For the current ECOFF system
-  */
-# define HasSharedLibraries	NO
-# define UseElfFormat		NO
- /*
-  * For the upcoming ELF system
-  */
-# if 0 /* NOT YET */
-#  define HasSharedLibraries	YES
-#  define UseElfFormat		YES
+/* XXX Xvfb currently causes a linker error: */
+/* XXX crtbegin.c(.fini+0x10): relocation truncated to fit: BRADDR text */
+# ifdef XVirtualFramebufferServer
+#  undef XVirtualFramebufferServer
 # endif
+# define XVirtualFramebufferServer	NO
+# ifdef XnestServer
+#  undef XnestServer
+# endif
+# define XnestServer	NO
 
-# define BuildServer		YES
-# define XnestServer		YES
-# define XVirtualFramebufferServer	YES
+# if (OSMajorVersion < 3)
+#  define HasSharedLibraries	NO
+#  define SharedLibXThrStub	NO
+# endif
 
-# define BuildDPMSLibrary	NO
-# define BuildDPMSExt		NO
+# ifndef XF86Server
+#  if OSMajorVersion == 3 && OSMinorVersion >= 2 || OSMajorVersion > 3
+#    define XF86Server		YES
+#  else
+#    define XF86Server		NO
+#  endif
+# endif
 
-# define BuildXF86DGALibrary	NO
-# define BuildXF86DGA		NO
+/* Definitions for building the XFree86 server */
+# if XF86Server
+#   ifndef HasNetBSDApertureDriver
+#     define HasNetBSDApertureDriver	YES
+#   endif
+#   define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME -DDDXOSINIT
+#   define ServerExtraDefines	GccGasOption -D_XSERVER64 XFree86ServerDefines
+#   define ServerExtraSysLibs	-lalpha
+#   ifndef DoLoadableServer
+#     define DoLoadableServer	YES
+#   endif
+#   ifndef XFree86ConsoleDefines
+#     define XFree86ConsoleDefines -DWSCONS_SUPPORT -DPCVT_SUPPORT
+#   endif
+#   define UseMatroxHal		NO	/* Matrox HAL is i386 only */
+
+# endif /* XF86Server */
 
-# if BuildAlphaXF86
-#  include <xfree86.cf>
-# endif
+# include <xfree86.cf>
 
 #endif /* AlphaArchitecture */
 
@@ -324,6 +430,91 @@ install:: fonts.alias							@@\
  */
 #ifdef i386Architecture
 
+# ifndef DoLoadableServer
+#  define DoLoadableServer	YES
+# endif
+
+/* Direct rendering (OpenBSD 3.3 and up). */ 
+/* Need static expat library too, for DRI drivers config tools */
+# if OSMajorVersion > 3 || (OSMajorVersion == 3 && OSMinorVersion > 2)
+#  ifndef BuildXF86DRI
+#   define BuildXF86DRI			YES
+#  endif 
+#  ifndef BuildXF86DRM
+#   define BuildXF86DRM			NO
+#  endif 
+#  ifndef BuildXF86OldDRMCompat
+#   define BuildXF86OldDRMCompat	NO
+#  endif
+# define NormalLibExpat			YES
+# endif 
+
+#define HasWeakSymbols		YES
+
+/* To use the NetBSD Aperture driver */
+# ifndef HasNetBSDApertureDriver
+#  define HasNetBSDApertureDriver	YES
+# endif
+
+/* 2.7 and later have support for setting MTRRs */
+# ifndef HasMTRRSupport
+#  if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 6)
+#   define HasMTRRSupport		YES
+#  else
+#   define HasMTRRSupport		NO
+#  endif
+# endif
+
+/* 
+ * agpgart support (OpenBSD 3.2 and up) 
+ */ 
+# if OSMajorVersion > 3 || (OSMajorVersion == 3 && OSMinorVersion > 1)
+#  ifndef HasAgpGart 
+#   define HasAgpGart   YES 
+#  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)
+#   define UsbMouseSupport		YES
+#  endif
+# endif
+
+
+/* A hack to work around an optimization problem with gcc 2.95.2 */
+# if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 6)
+#  define GccOptBug295
+# endif
+
+/* No MMX support in OpenBSD/a.out gas */
+# ifndef HasMMXSupport
+#   define HasMMXSupport	UseElfFormat
+# endif
+
+/* for DRI */
+# ifndef HasX86Support
+#  define HasX86Support		UseElfFormat
+# endif
+
 # include <xfree86.cf>
 
 #endif /* i386Architecture */
@@ -343,6 +534,9 @@ install:: fonts.alias							@@\
  */
 
 # define PositionIndependentCFlags -fpic -fno-function-cse
+# define HasWeakSymbols		NO
+# define BuildGlxExt		NO
+# define BuildGLXLibrary	YES
  
 #endif /* Mc68020Architecture */
 
@@ -357,6 +551,8 @@ install:: fonts.alias							@@\
 #  define BuildServer		NO
 # endif
 
+# define ServerExtraDefines	-DXFree86Server
+
 #endif /* AmigaArchitecture */
 
 
@@ -365,7 +561,6 @@ install:: fonts.alias							@@\
  */
 #ifdef Hp300Architecture
 
-# include <xf86.rules>
 # ifndef BuildServer
 #  define BuildServer		NO
 # endif
@@ -374,6 +569,10 @@ install:: fonts.alias							@@\
 # define InstallFontAliases	InstallFontAliasesNoComment
 # define UseRgbTxt		NO
 
+# define ServerExtraDefines	-DXFree86Server
+
+#include <xfree86.cf>
+
 #endif /* Hp300Architecture */
 
 
@@ -382,11 +581,15 @@ install:: fonts.alias							@@\
  */
 #ifdef Mac68kArchitecture
 
-# include <xf86.rules>
+
 # ifndef BuildServer
 #  define BuildServer		NO
 # endif
 
+# define ServerExtraDefines	-DXFree86Server
+
+# include <xfree86.cf>
+
 #endif /* mac68kArchitecture */
 
 
@@ -395,11 +598,14 @@ install:: fonts.alias							@@\
  */
 #ifdef Mvme68kArchitecture
 
-# include <xf86.rules>
 # ifndef BuildServer
 #  define BuildServer		NO
 # endif
 
+# define ServerExtraDefines	-DXFree86Server
+
+# include <xfree86.cf>
+
 #endif /* Mvme68kArchitecture */
 
 
@@ -410,39 +616,24 @@ install:: fonts.alias							@@\
 
 # include <xf86.rules>
 
-# define OptimizedCDebugFlags  -O2
 # define ServerOSDefines       -DDDXOSINIT
 # 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		YES
+#  define Xsun24Server		NO
 # endif
 # ifndef XsunServer
 #  define XsunServer		YES
 # endif
 # ifndef XsunMonoServer
-#  define XsunMonoServer	YES
+#  define XsunMonoServer	NO
 # endif
 
 #define XkbServerDefines  -DXKB_ALWAYS_USES_SOFT_REPEAT
 
-#if 0
-# ifndef BuildXKB
-#  define BuildXKB        	NO
-# endif
-
-# ifndef BuildXKBlib
-#  define BuildXKBlib     	NO
-# endif
-
-# ifndef BuildPexExt
-#  define BuildPexExt 		(XsunServer || Xsun24Server)
-# endif
-#endif
-
 #endif /* Sun3Architecture */
 
 
@@ -456,8 +647,8 @@ install:: fonts.alias							@@\
   */
 # define PositionIndependentCFlags
 # define SharedLibraryLoadFlags -x -shared --whole-archive -soname `echo $@ | sed 's/\.[0-9]*$$//'`
-# define SharedXtReqs -L$(BUILDLIBDIR) $(XLIBONLY) $(SMLIB) $(ICELIB)
-# define SharedXmuReqs $(LDPRELIB) $(XTOOLONLYLIB) $(XONLYLIB) $(EXTENSIONLIB)
+# define SharedXtReqs -L$(BUILDLIBDIR) $(XONLYLIB) $(SMLIB) $(ICELIB)
+# define SharedXmuReqs $(LDPRELIB) $(XTOOLONLYLIB) $(XLIB)
 
 #endif /* MipsArchitecture */
 
@@ -467,6 +658,11 @@ install:: fonts.alias							@@\
  */
 #ifdef ArcArchitecture
 
+#  define ServerExtraDefines GccGasOption XFree86ServerDefines
+#  ifndef XFree86ConsoleDefines
+#    define XFree86ConsoleDefines -DPCCONS_SUPPORT
+#  endif
+
 # include <xfree86.cf>
 
 #endif /* ArcArchitecture */
@@ -488,43 +684,184 @@ install:: fonts.alias							@@\
 
 #endif /* PmaxArchitecture */
 
-#ifdef ppcArchitecture
-# define HasSharedLibraries	NO
-# define UseElfFormat		YES
-# define BuildDynamicLoading	NO
-#endif
+/*
+ * Definitions for the PowerPC architecture 
+ */
+#ifdef PpcArchitecture
+
+# define XkbServerDefines	-DXKB_ALWAYS_USES_SOFT_REPEAT
+# ifndef XFree86ConsoleDefines
+#   define XFree86ConsoleDefines	-DWSCONS_SUPPORT
+# endif
+
+# if OSMajorVersion == 3 && OSMinorVersion > 1 || OSMajorVersion > 3
+#  define HasWeakSymbols	YES
+# endif
+# ifndef GccWarningOptions
+#  if XFree86Devel
+#   define GccWarningOptions -Wall -Wpointer-arith -Wstrict-prototypes \
+			  -Wmissing-prototypes -Wmissing-declarations \
+			  -Wnested-externs
+#  else
+#   define GccWarningOptions -Wall -Wpointer-arith
+#  endif
+# endif
+
+# ifndef XF86Server
+#   define XF86Server		YES
+# endif
+
+/* Definitions for building the X server */
+# if XF86Server
+#   define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME -DDDXOSINIT
+#   define ServerExtraDefines	GccGasOption XFree86ServerDefines
+#   ifndef DoLoadableServer
+#     define DoLoadableServer	YES
+#   endif
+#   ifndef XF86CardDrivers
+#    define XF86CardDrivers	ati mga glint s3virge sis savage\
+				trident chips tdfx \
+				DevelDrivers vga \
+				XF86OSCardDrivers XF86ExtraCardDrivers
+#   endif
+#   ifndef DevelDrivers 
+#    define DevelDrivers nv
+#   endif
+
+    /* Support for USB Mices */
+#   ifndef UsbMouseSupport
+#     define UsbMouseSupport		YES
+#   endif
+
+# endif /* XF86Server */
+
+# include <xfree86.cf>
+
+#endif /* PpcArchitecture */
 
 /*
  * Definitions for the sparc architecture
  */
 #ifdef SparcArchitecture
 
-# include <xf86.rules>
+# define ServerOSDefines 	-DDDXOSINIT
+# define ServerExtraDefines	-DAVOID_GLYPHBLT -DPIXPRIV  -DXFree86Server \
+				DebugDefines \
+				-DX_BYTE_ORDER=$(X_BYTE_ORDER)
+# define BuildXF86MiscExt	NO
+# define BuildMITMiscExt	NO
 
-# ifndef Xsun24Server
-# define Xsun24Server		YES
-# endif
-# ifndef XsunServer
-# define XsunServer		YES
+# if OSMajorVersion == 2 || OSMajorVersion == 3 && OSMinorVersion < 2
+#  ifndef Xsun24Server
+#   define Xsun24Server		YES
+#  endif
+#  ifndef XsunServer
+#   define XsunServer		YES
+#  endif
+#  ifndef XsunMonoServer
+#   define XsunMonoServer	YES
+#  endif
+# else 
+#  ifndef Xsun24Server
+#   define Xsun24Server		NO
+#  endif
+#  ifndef XsunServer
+#   define XsunServer		NO
+#  endif
+#  ifndef XsunMonoServer
+#   define XsunMonoServer	NO
+#  endif
+#endif
+
+# define XkbServerDefines	-DXKB_ALWAYS_USES_SOFT_REPEAT
+
+# define BuildXF86VidModeExt	NO
+# define BuildXF86DGA		NO
+# define BuildXInputExt		NO
+# include <xfree86.cf>
+
+#endif /* SparcArchitecture */
+
+/*
+ * Definitions for the sparc64 architecture
+ */
+
+#ifdef Sparc64Architecture
+
+# if OSMajorVersion == 3 && OSMinorVersion > 1 || OSMajorVersion > 3
+#  define HasWeakSymbols	YES
 # endif
-# ifndef XsunMonoServer
-# define XsunMonoServer		YES
+
+# ifndef XF86Server
+#  define XF86Server		YES
 # endif
 
-#define XkbServerDefines  -DXKB_ALWAYS_USES_SOFT_REPEAT
+# define ServerExtraDefines	GccGasOption -D_XSERVER64 XFree86ServerDefines
+# define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME -DDDXOSINIT
+# define XkbServerDefines  -DXKB_ALWAYS_USES_SOFT_REPEAT
 
-# ifndef BuildPexExt
-#  define BuildPexExt 	(XsunServer || Xsun24Server)
+# if XF86Server
+#   ifndef DoLoadableServer
+#     define DoLoadableServer	NO
+#   endif
+#   define XFree86ConsoleDefines -DWSCONS_SUPPORT
 # endif
-#endif /* SparcArchitecture */
 
+# include <xfree86.cf>
+
+#endif /* Sparc64Architecture */
 
 /* End or architecture specific section */
 
 /*
  * Generic settings for all architectures
+ * which can be overridden by architecture specific sections above
  */
 
+#if !defined(OptimizedCDebugFlags)
+# define OptimizedCDebugFlags	-O2
+#endif
+
+#ifndef ServerOSDefines
+#  define ServerOSDefines 	/**/
+#endif
+
+#ifndef ServerExtraDefines
+#  define ServerExtraDefines GccGasOption
+#endif
+
+#ifndef HasWeakSymbols
+# define HasWeakSymbols			NO
+#endif
+
+/*
+ * Multi-thread safe libs 
+ */	
+#if HasWeakSymbols == YES && (OSMajorVersion == 2 && OSMinorVersion >= 6 || OSMajorVersion >= 3)
+#  define HasPosixThreads		YES
+#  define ThreadedX			YES
+#  define SystemMTDefines		/**/
+#  define BuildThreadStubLibrary	YES 
+#  define NeedUIThrStubs		YES
+#  define ThreadsCompileFlag		-pthread
+#  define ThreadsLibraries		-pthread
+#  define SharedX11Reqs			$(LDPRELIBS) $(XTHRSTUBLIB)
+#  define SharedXtReqs			$(LDPRELIB) $(XONLYLIB) $(SMLIB) \
+					$(ICELIB) $(XTHRSTUBLIB)
+#endif
+
+
+/* Set this to YES when getpwuid_r is added to libc_r */
+#define HasThreadSafeAPI		NO
+
+#ifndef ExtraLibraries
+# define ExtraLibraries		/**/
+#endif
+
+#ifndef DoLoadableServer
+#define DoLoadableServer	NO
+#endif
+
 #ifndef XVirtualFramebufferServer
 # undef BuildServer
 # define BuildServer			YES
@@ -549,6 +886,10 @@ install:: fonts.alias							@@\
 # define CompressAllFonts		YES
 #endif
 
+#ifndef SharedLibXdmGreet
+# define SharedLibXdmGreet		NO
+#endif
+
 /*
  * XFree86 uses its own (more portable) database routines to speed up
  * the RGB database lookups
@@ -567,6 +908,26 @@ install:: fonts.alias							@@\
 # endif
 #endif
 
-/* This must come last */
-#include <bsdLib.rules>
+#ifndef HasDlopen
+# define HasDlopen		YES
+#endif
+
+#ifndef DlLibrary
+# if (OSMajorVersion < 3 || OSMajorVersion == 3 && OSMinorVersion == 0)\
+    && UseElfFormat
+#  define DlLibrary -ldl
+# else
+#  define DlLibrary /**/
+# 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>
+#else
+# include <bsdLib.rules>
+#endif
diff --git a/xc/config/cf/host.def b/xc/config/cf/host.def
index 39ac5ef18..69894771a 100644
--- a/xc/config/cf/host.def
+++ b/xc/config/cf/host.def
@@ -83,11 +83,6 @@
 #define XnestServer NO
 #define XVirtualFramebufferServer NO
 
-/* we do have libexpat sources in DRI CVS and want to build static to 
- * link with libGL to isolate link problems with systems that don't have it */
-#define HasExpat NO
-#define NormalLibExpat YES 
-
 /*
  * Don't change anything below or the build will fail.
  */
diff --git a/xc/config/cf/linux.cf b/xc/config/cf/linux.cf
index f3f823f8d..7239208e6 100644
--- a/xc/config/cf/linux.cf
+++ b/xc/config/cf/linux.cf
@@ -306,11 +306,13 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class
 /*
  * Build shared libGL and the DRI modules without -fPIC on some architectures.
  * This improves performance.
+ * Also build a static expat library for DRI drivers config tool.
  */
 #if BuildXF86DRI
 # if defined(i386Architecture)
 #  define BuildLibGlxWithoutPIC	YES
 # endif
+# define NormalLibExpat 	YES
 #endif
 
 #if 0