Import of XFree86 3.9.17

author: faith <faith> 2000-01-06 12:41:09 +0000
committer: faith <faith> 2000-01-06 12:41:09 +0000
commit: 0387caff984518490a7dc7834a184390bbf4fb97 (patch)
tree: 3e384e8272b323453802e0cb015c3e28e1077174 /xc/config/cf
parent: b700746a28cb32d457c7aae74d8d04ffd0e4ab5d (diff)
23 files changed, 1070 insertions, 72 deletions
diff --git a/xc/config/cf/Imake.cf b/xc/config/cf/Imake.cf
index b77981f80..32b9b9c2c 100644
--- a/xc/config/cf/Imake.cf
+++ b/xc/config/cf/Imake.cf
@@ -17,7 +17,7 @@ XCOMM $TOG: Imake.cf /main/30 1998/04/28 13:55:25 barstow $
  *
  *     4.  Create a .cf file with the name given by MacroFile.
  */
-XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.50 1999/02/28 11:19:13 dawes Exp $
+XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.51 1999/12/27 00:39:15 robin Exp $
 
 #if defined(clipper) || defined(__clipper__)
 # undef clipper
@@ -716,6 +716,13 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.50 1999/02/28 11:19:13 dawes Exp $
 #define i386Architecture
 #endif /* emxos2 */
 
+#if defined(__QNX__) && !defined(__QNXNTO__)
+#define MacroIncludeFile <QNX4.cf>
+#define MacroFile QNX4.cf
+#define QNX4Architecture
+#define i386Architecture
+#endif /* QNX4 */
+
 #ifndef MacroIncludeFile
 XCOMM WARNING:  Imake.cf not configured; guessing at definitions!!!
 XCOMM This might mean that BOOTSTRAPCFLAGS was not set when building imake.
diff --git a/xc/config/cf/Imake.rules b/xc/config/cf/Imake.rules
index 1a1aa03d6..1b0c4a462 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.60 1999/08/14 10:48:57 dawes Exp $
+XCOMM rules:  $XFree86: xc/config/cf/Imake.rules,v 3.62 1999/10/13 16:49:01 dawes Exp $
 
 /*
  *		   MACHINE-INDEPENDENT RULES; DO NOT MODIFY
@@ -1915,18 +1915,18 @@ LintLibReferences(varname,libname,libsource)
  * UnsharedLibObjCompile - compile fragment for unshared objects
  */
 #ifndef UnsharedLibObjCompile
-#define UnsharedLibObjCompile(options) LibObjCompile(unshared,$(CDEBUGFLAGS) options)
+#define UnsharedLibObjCompile(options) LibObjCompile(unshared,$(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) options)
 #endif
 
 #ifndef UnsharedLibObjCplusplusCompile
-#define UnsharedLibObjCplusplusCompile(options) LibObjCplusplusCompile(unshared,$(CXXDEBUGFLAGS) options)
+#define UnsharedLibObjCplusplusCompile(options) LibObjCplusplusCompile(unshared,$(CXXDEBUGFLAGS) $(CXXLIBDEBUGFLAGS) options)
 #endif
 
 /*
  * SharedLibObjCompile - compile fragment for shared objects
  */
 #ifndef SharedLibObjCompile
-#define SharedLibObjCompile(options) LibObjCompile(shared,options $(SHLIBDEF) $(SHAREDCODEDEF) $(PICFLAGS) $(CDEBUGFLAGS))
+#define SharedLibObjCompile(options) LibObjCompile(shared,options $(SHLIBDEF) $(SHAREDCODEDEF) $(PICFLAGS) $(CDEBUGFLAGS) $(CLIBDEBUGFLAGS))
 #endif
 
 /*
@@ -3030,3 +3030,22 @@ InstallDynamicModule(ModuleLibraryTargetName(module),dest,subdir)
 InstallGenManPage(module,$(DRIVERMANDIR),$(DRIVERMANSUFFIX))
 #endif
 
+#ifndef BuildObjectFromLibraryWithPath
+#define BuildObjectFromLibraryWithPath(libpath,libname,objname)		@@\
+AllTarget(objname.Osuf)							@@\
+									@@\
+objname.Osuf: Concat3(libpath,/lib,libname.a)				@@\
+	@$(MKDIRHIER) tmp						@@\
+	@$(CP) Concat3(libpath,/lib,libname.a) tmp			@@\
+	@(cd tmp; set -x; ArExtCmd Concat(lib,libname.a); \		@@\
+	  $(LD) $(LDCOMBINEFLAGS) *.Osuf -o ../$@; \			@@\
+	  RemoveFiles(*.Osuf))						@@\
+	@$(RM) -r tmp							@@\
+									@@\
+clean::									@@\
+	RemoveFile(objname.Osuf)
+#endif
+
+#ifndef BuildObjectFromLibrary
+#define BuildObjectFromLibrary(libname,objname) BuildObjectFromLibraryWithPath(.,libname,objname)
+#endif
diff --git a/xc/config/cf/Imakefile b/xc/config/cf/Imakefile
index 142e1f254..948d79895 100644
--- a/xc/config/cf/Imakefile
+++ b/xc/config/cf/Imakefile
@@ -1,5 +1,5 @@
 XCOMM $XConsortium: Imakefile /main/38 1996/11/07 14:43:46 kaleb $
-XCOMM $XFree86: xc/config/cf/Imakefile,v 3.20 1999/08/14 10:48:58 dawes Exp $
+XCOMM $XFree86: xc/config/cf/Imakefile,v 3.21 1999/12/27 00:39:16 robin Exp $
 
 XCOMM Some compilers generate fatal errors if an -L directory does
 XCOMM not exist.  Since BUILDLIBDIR may not exist yet suppress its use.
@@ -44,6 +44,7 @@ sgiLib.rules \
 sunLib.rules \
 sv3Lib.rules \
 sv4Lib.rules \
+QNX4.rules \
 xf86.rules
 
 TMPLFILES = \
@@ -115,6 +116,7 @@ ultrix.cf \
 usl.cf \
 lynx.cf \
 x386.cf \
+QNX4.cf \
 xfree86.cf
 
 INSTFILES = $(RULEFILES) $(TMPLFILES) $(DEFFILES) $(CFFILES) $(LOCALFILES)
diff --git a/xc/config/cf/Library.tmpl b/xc/config/cf/Library.tmpl
index fb0079037..c965cd436 100644
--- a/xc/config/cf/Library.tmpl
+++ b/xc/config/cf/Library.tmpl
@@ -19,7 +19,7 @@ XCOMM $TOG: Library.tmpl /main/44 1997/04/28 11:47:53 kaleb $
 
 
 
-XCOMM $XFree86: xc/config/cf/Library.tmpl,v 3.11 1999/08/28 09:00:17 dawes Exp $
+XCOMM $XFree86: xc/config/cf/Library.tmpl,v 3.12 1999/10/13 04:20:41 dawes Exp $
 
 #ifndef LibraryCplusplusOptions
 # if DoSharedLib && defined(SharedLibraryCplusplusOptions)
@@ -34,11 +34,13 @@ XCOMM $XFree86: xc/config/cf/Library.tmpl,v 3.11 1999/08/28 09:00:17 dawes Exp $
 #ifndef LibraryDebugOpt
 # define LibraryDebugOpt /**/
 #endif
+/* Note: Changing LibraryCDebugFlags has no effect because CDEBUGFLAGS is over-
+   ridden by PassCDebugFlags in the parent Makefile or toplevel xmakefile. */
 #ifndef LibraryCDebugFlags
-# define LibraryCDebugFlags DefaultCDebugFlags LibraryDebugOpt
+# define LibraryCDebugFlags DefaultCDebugFlags
 #endif
 #ifndef LibraryCplusplusDebugFlags
-# define LibraryCplusplusDebugFlags DefaultCplusplusDebugFlags LibraryDebugOpt
+# define LibraryCplusplusDebugFlags DefaultCplusplusDebugFlags
 #endif
 #ifndef SeparateSharedCompile
 # define SeparateSharedCompile YES
@@ -64,6 +66,8 @@ XCOMM $XFree86: xc/config/cf/Library.tmpl,v 3.11 1999/08/28 09:00:17 dawes Exp $
   CCOPTIONS = LibraryCCOptions
 STD_DEFINES = LibraryDefines $(PROJECT_DEFINES)
 CDEBUGFLAGS = LibraryCDebugFlags
+CLIBDEBUGFLAGS = LibraryDebugOpt
+     CFLAGS = $(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES)
 # if defined(LargePICTable) && LargePICTable && defined(LargePositionIndependentCFlags)
    PICFLAGS = LargePositionIndependentCFlags
 # endif
@@ -87,6 +91,8 @@ CDEBUGFLAGS = LibraryCDebugFlags
    CXXOPTIONS = LibraryCplusplusOptions
   STD_DEFINES = LibraryDefines $(PROJECT_DEFINES)
 CXXDEBUGFLAGS = LibraryCplusplusDebugFlags
+CXXLIBDEBUGFLAGS = LibraryDebugOpt
+     CXXFLAGS = $(CXXDEBUGFLAGS) $(CXXLIBDEBUGFLAGS) $(CXXOPTIONS) $(THREADS_CXXFLAGS) $(CXXDEFINES)
 # if defined(LargePICTable) && LargePICTable
 #  ifdef LargePositionIndependentCplusplusFlags
   CXXPICFLAGS = LargePositionIndependentCplusplusFlags
diff --git a/xc/config/cf/NetBSD.cf b/xc/config/cf/NetBSD.cf
index ea472a3f4..ec30ecc01 100644
--- a/xc/config/cf/NetBSD.cf
+++ b/xc/config/cf/NetBSD.cf
@@ -2,7 +2,7 @@ XCOMM platform:  $XConsortium: NetBSD.cf /main/16 1996/10/31 14:47:14 kaleb $
 
 
 
-XCOMM platform:  $XFree86: xc/config/cf/NetBSD.cf,v 3.74 1999/08/22 11:59:42 dawes Exp $
+XCOMM platform:  $XFree86: xc/config/cf/NetBSD.cf,v 3.76 1999/12/14 02:40:07 robin Exp $
 
 
 #ifndef OSName
@@ -265,10 +265,24 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
  * To use the NetBSD Aperture driver
  */
 #if defined(i386Architecture)
-#ifndef HasNetBSDApertureDriver
-#define HasNetBSDApertureDriver	YES
-#endif
-#endif
+# ifndef HasNetBSDApertureDriver
+#  define HasNetBSDApertureDriver	YES
+   /* Where the aperture driver is installed */
+#  ifndef NetBSDApertureDir
+#   define NetBSDApertureDir		/usr/local/aperture
+#  endif
+# endif
+
+ /*
+  * MTRR support is provided by the Aperture driver
+  */
+# if HasNetBSDApertureDriver
+#  ifndef HasMTRRSupport
+#   define HasMTRRSupport	YES
+#  endif
+# endif
+#endif /* i386Architecture */
+
 
 /*
  * ForceSubdirs - force make to build subdirectories
diff --git a/xc/config/cf/OpenBSD.cf b/xc/config/cf/OpenBSD.cf
index 53b23ce3e..9831dc4bf 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.23 1999/04/29 09:13:19 dawes Exp $
+XCOMM platform:  $XFree86: xc/config/cf/OpenBSD.cf,v 3.24 1999/11/19 13:53:21 hohndel Exp $
 XCOMM
 XCOMM $OpenBSD: OpenBSD.cf,v 1.33 1998/09/27 04:52:48 rahnds Exp $
 XCOMM
@@ -324,6 +324,15 @@ install:: fonts.alias							@@\
  */
 #ifdef i386Architecture
 
+/* 2.7 and later will have support for setting MTRRs */
+#ifndef HasMTRRSupport
+#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 6)
+#define HasMTRRSupport		YES
+#else
+#define HasMTRRSupport		NO
+#endif
+#endif
+
 # include <xfree86.cf>
 
 #endif /* i386Architecture */
diff --git a/xc/config/cf/QNX4.cf b/xc/config/cf/QNX4.cf
new file mode 100644
index 000000000..e04df5c18
--- /dev/null
+++ b/xc/config/cf/QNX4.cf
@@ -0,0 +1,87 @@
+XCOMM platform:  $XFree86: xc/config/cf/QNX4.cf,v 1.1 1999/12/27 00:45:43 robin Exp $
+
+#define NewInput		NO
+#define StripInstalledPrograms	NO
+#define BuildServer 		YES
+#define DoLoadableServer	NO     /* sorry, are u listenning QSSL? */
+#define BuildLBX  		YES    /* For now */
+#define ExpandManNames		YES
+XCOMM you can only one space (or tab) between ByteOrder and X_LITTLE_ENDIAN
+XCOMM or you will have -DX_BYTE_ORDER=       X_LITTLE_ENDIAN
+XCOMM instead of -DX_BYTE_ORDER=X_LITTLE_ENDIAN 
+XCOMM in the generated Makefile
+#define ByteOrder X_LITTLE_ENDIAN
+
+#ifndef OSName
+#define OSName 			QNX4
+#endif
+
+#ifndef OSVendor
+#define OSVendor		QNX Corp.
+#endif
+#ifndef OSMajorVersion
+#define OSMajorVersion		4
+#endif
+#ifndef OSMinorVersion
+#define OSMinorVersion		25
+#endif
+
+/* Use a non-broken shell ... */
+#define BourneShell		/usr/local/bin/pdksh
+#define OSDefines		-DQNX4 -DQNX -D__QNX__ -DNO_REGEX -DSTRINGS_ALIGNED -D__i386__
+
+#define SourceDefines		-D_POSIX_SOURCE
+#define HasGcc			NO
+#define HasGcc2			NO
+#define DoRanlibCmd 		NO
+#undef ArCmd
+#define ArCmd			wlib -b -c -p=256
+#define MkdirHierCmd		mkdir -p
+#define InstallCmd		/usr/X11R6/bin/install.qnx
+
+#define DefaultCCOptions	-5s -Otx -Wc,-r -b -j -Wc,-ei -N128000 -zp4 -mf
+#define LibraryCCOptions	-5s -Otx -Wc,-r -b -j -Wc,-ei -zp4 -mf
+#define ServerCCOptions		-5s -Otx -Wc,-r -T1 -M -N4096000 -j -b -mf -Wc,-ei -Wc,-s -zp4 -llibmalloc
+#define LocalLibraries
+#define ExtraLibraries		-lsocket -lunix 
+#define CLibrary
+#define PosixLibraries
+#define ConnectionFlags 	-DTCPCONN 
+#define CppCmd			/usr/X11R6/bin/cpp
+
+#define HasShadowPasswd		YES
+#define HasLibCrypt		YES
+#define SharedLibXdmGreet	NO
+#define HasShm			NO    /* For now as well */
+#define HasSockets		YES
+#define HasPutenv		YES
+#define HasCbrt			NO
+#define HasVarDirectory		NO
+
+#define AvoidNullMakeCommand    YES
+#define CompressAllFonts        YES
+#define Malloc0ReturnsNull      YES
+#define UseInternalMalloc	NO
+#define NeedConstPrototypes     YES
+#define NeedFunctionPrototypes  YES
+#define NeedNestedPrototypes    YES
+#define NeedVarargsPrototypes   YES
+
+#ifndef NeedWidePrototypes
+#define NeedWidePrototypes      NO
+#endif
+
+#define TermcapLibrary		-lncurses
+#ifndef UseStaticTermcapLib
+#define UseStaticTermcapLib     NO
+#endif
+
+#define StandardCppDefines	-traditional StandardDefines
+#define StandardDefines OSDefines SourceDefines
+#define ServerOSDefines -DDDXTIME XFree86ServerOSDefines 
+#define ServerExtraDefines XFree86ServerDefines
+#define ExtraFilesToClean       *.err *.map 
+
+#include <QNX4.rules>
+#include <xfree86.cf>
+
diff --git a/xc/config/cf/QNX4.rules b/xc/config/cf/QNX4.rules
new file mode 100644
index 000000000..010596341
--- /dev/null
+++ b/xc/config/cf/QNX4.rules
@@ -0,0 +1,72 @@
+XCOMM platform:  $XFree86: xc/config/cf/QNX4.rules,v 1.1 1999/12/27 00:45:43 robin Exp $
+
+XCOMM Rules to work around wlib for QNX...
+
+#define LinkFile(tofile, fromfile)				@@\
+tofile:: fromfile						@@\
+	$(CP) fromfile tofile					@@\
+								@@\
+includes:: tofile						@@\
+								@@\
+depend:: tofile							@@\
+								@@\
+clean::								@@\
+	RemoveFile(tofile)
+
+XCOMM This special rule is used to install the install script.
+XCOMM Else there's a name conflict with the QNX installer.
+
+#define QNXCopyInstaller(tofile, fromfile)			@@\
+tofile:: 							@@\
+	$(CP) fromfile tofile					@@\
+								@@\
+includes:: tofile
+
+
+#define ObjectFromSpecialSource(dst, src, flags)		@@\
+NoConfigRec(dst.c)						@@\
+								@@\
+dst.c: src.c							@@\
+	RemoveFile($@)						@@\
+	$(CP) $? $@						@@\
+								@@\
+SpecialCObjectRule(dst,NullParameter,flags)			@@\
+								@@\
+includes:: dst.c						@@\
+								@@\
+depend:: dst.c							@@\
+								@@\
+clean::								@@\
+	RemoveFile(dst.c)
+
+
+#define ObjectFromSpecialAsmSource(dst, src, flags)		@@\
+dst.S: src.S							@@\
+	RemoveFile($@)						@@\
+	$(CP) $? $@						@@\
+								@@\
+dst.o: dst.S							@@\
+	AssembleObject(flags)					@@\
+								@@\
+dst.i: dst.S							@@\
+	CPPOnlyAsm(dst,flags)					@@\
+								@@\
+depend:: dst.S							@@\
+								@@\
+clean::								@@\
+	RemoveFile(dst.S)
+
+/* This is the rule to make reloc. OMF objects. We use a little
+ * trick which works only for OMF....
+ */
+#define NormalRelocatableTarget(objname,objlist)		@@\
+AllTarget(objname.Osuf)						@@\
+								@@\
+objname.Osuf: objlist $(EXTRALIBRARYDEPS)			@@\
+	RemoveFile($@)						@@\
+	/bin/cat objlist > $@
+
+
+	
+
+
diff --git a/xc/config/cf/Server.tmpl b/xc/config/cf/Server.tmpl
index 238a17811..90f71371a 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.14 1999/03/01 02:13:56 dawes Exp $
+XCOMM $XFree86: xc/config/cf/Server.tmpl,v 3.15 1999/10/13 04:20:41 dawes Exp $
 /*
  * Server imakefile info  - this contains any special redefinitions, etc.
  * that Imakefiles in the server subtree will need.
@@ -17,6 +17,8 @@ XCOMM $TOG: Server.tmpl /main/15 1997/07/16 14:43:38 kaleb $
 #ifndef ServerDefines
 #define ServerDefines StandardDefines
 #endif
+/* Note: Changing ServerCDebugFlags has no effect because CDEBUGFLAGS is over-
+   ridden by PassCDebugFlags in the parent Makefile or toplevel xmakefile. */
 #ifndef ServerCDebugFlags
 #define ServerCDebugFlags DefaultCDebugFlags
 #endif
diff --git a/xc/config/cf/X11.tmpl b/xc/config/cf/X11.tmpl
index 2d0691e2c..f950f8a3a 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.51 1999/08/28 09:00:18 dawes Exp $
+XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.54 1999/11/19 13:53:21 hohndel Exp $
 
 /***************************************************************************
  *                                                                         *
@@ -67,6 +67,9 @@ XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.51 1999/08/28 09:00:18 dawes Exp $
 #ifndef BuildXTrueType
 #define BuildXTrueType		NO
 #endif
+#ifndef BuildBuiltinFonts
+#define BuildBuiltinFonts	NO
+#endif
 #ifndef BuildFonts
 #define BuildFonts		(BuildServer | BuildFontServer)
 #endif
@@ -247,15 +250,15 @@ XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.51 1999/08/28 09:00:18 dawes Exp $
 #ifndef BuildXF86MiscLibrary
 #define BuildXF86MiscLibrary	BuildXF86MiscExt
 #endif
+#ifndef BuildXF86BigfontExt
+#define BuildXF86BigfontExt	NO
+#endif
 #ifndef BuildXF86DGA
 #define BuildXF86DGA		NO
 #endif
 #ifndef BuildXF86DGALibrary
 #define BuildXF86DGALibrary	BuildXF86DGA
 #endif
-#ifndef BuildXF86RushLibrary
-#define BuildXF86RushLibrary	NO
-#endif
 #ifndef BuildXvExt
 #define BuildXvExt		NO
 #endif
@@ -274,6 +277,12 @@ XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.51 1999/08/28 09:00:18 dawes Exp $
 #ifndef BuildGLXLibrary
 #define BuildGLXLibrary		BuildGlxExt
 #endif
+#ifndef BuildXF86RushExt
+#define BuildXF86RushExt	NO
+#endif
+#ifndef BuildXF86RushLibrary
+#define BuildXF86RushLibrary	BuildXF86RushExt
+#endif
 
 #ifndef BuildMiscDocs
 #define BuildMiscDocs		NO
@@ -620,6 +629,14 @@ FCHOWN_DEFINES = -DHAS_FCHOWN
 #endif
 #endif
 
+#ifndef XF86BigfontExtensionDefines
+#if BuildXF86BigfontExt
+#define XF86BigfontExtensionDefines -DXF86BIGFONT
+#else
+#define XF86BigfontExtensionDefines /**/
+#endif
+#endif
+
 #ifndef XvExtensionDefines
 #if BuildXvExt
 #define XvExtensionDefines -DXV
@@ -690,7 +707,8 @@ FCHOWN_DEFINES = -DHAS_FCHOWN
 #ifndef PervasiveExtensionDefines
 #define PervasiveExtensionDefines \
 	ShapeDefines XInputDefines XkbDefines LbxDefines AppgroupDefines \
-	XCSecurityDefines CupDefines PervasiveDBEDefines DPMSDefines \
+	XCSecurityDefines CupDefines PervasiveDBEDefines \
+	XF86BigfontExtensionDefines DPMSDefines \
 	LowMemDefines XprintDefines XineramaDefines \
 	SitePervasiveExtensionDefines
 #endif
diff --git a/xc/config/cf/itsy.cf b/xc/config/cf/itsy.cf
new file mode 100644
index 000000000..282421b77
--- /dev/null
+++ b/xc/config/cf/itsy.cf
@@ -0,0 +1,108 @@
+/*
+ * This configuration file contains additional configuration needed
+ * to cross compile X for the Compaq Itsy handheld computer.
+ * To use this, add the following to host.def:
+   #define XItsyServer YES
+   #define KDriveServer YES
+ */
+ 
+#define CrossCompiling YES
+
+#undef i386Architecture
+#define Arm32Architecture
+
+#undef OptimizedCDebugFlags
+#define OptimizedCDebugFlags 	-O2
+#define ServerCDebugFlags	-O2
+#undef StandardDefines
+#define StandardDefines 	-Dlinux -D__arm__ -D_POSIX_SOURCE \
+				-D_BSD_SOURCE -D_GNU_SOURCE -DX_LOCALE
+#undef CcCmd
+#define StdIncDir /usr/local/arm-unknown-linuxelf/include
+#define PreIncDir /usr/local/arm-unknown-linuxelf/lib/gcc-include
+#undef PostIncDir
+#define PostIncDir /usr/local/lib/gcc-lib/arm-unknown-linuxelf/egcs-2.91.66/include
+#define CcCmd /usr/local/bin/arm-unknown-linuxelf-gcc
+#define DoRanlibCmd YES
+#define RanlibCmd /usr/local/bin/arm-unknown-linuxelf-ranlib
+#undef ExtraLoadFlags
+#define ExtraLoadFlags
+#define FbNoPixelAddrCode
+#undef TermcapLibrary
+#define TermcapLibrary -ltermcap
+
+#undef LdPostLib
+#define LdPostLib	-L/usr/local/arm-unknown-linuxelf/lib
+
+#undef XfbdevServer
+#define XfbdevServer		NO
+#undef BuildXprint
+#define BuildLBX 		NO
+#define BuildFonts 		NO
+#define BuildAppgroup 		NO
+#define BuildRECORD 		NO
+#define BuildDBE 		NO
+#define BuildXCSecurity 	NO
+#define ItsyCompilerBug 	YES
+#define FontServerAccess	NO
+#define ServerXdmcpDefines	/**/
+
+#undef ExtensionOSDefines
+#define ExtensionOSDefines
+
+#define ProjectRoot
+
+#define GzipFontCompression	NO
+
+#define KdriveServerExtraDefines -DITSY -DMAXSCREENS=1
+
+#define HostLinkRule(target, flags, src, libs)  cc -I$(BUILDINCDIR) -o target src
+
+/* ComplexHostProgramTarget - Compile a program such that we can run
+ * it on this host, i.e., don't use the default cross compiler.
+ */
+#ifndef ComplexHostProgramTarget
+#define	ComplexHostProgramTarget(program)				@@\
+              CC=cc							@@\
+    STD_INCLUDES=							@@\
+          CFLAGS=$(TOP_INCLUDES) $(INCLUDES) $(BOOTSTRAPCFLAGS)		@@\
+EXTRA_LOAD_FLAGS=							@@\
+        PROGRAM = program						@@\
+									@@\
+AllTarget(program)							@@\
+									@@\
+program: $(OBJS) $(DEPLIBS)						@@\
+	RemoveTargetProgram($@)						@@\
+	HostLinkRule($@,$(_NOOP_),$(OBJS),$(DEPLIBS) $(LOCAL_LIBRARIES)) @@\
+									@@\
+DependTarget()								@@\
+									@@\
+LintTarget()								@@\
+									@@\
+clean::									@@\
+	RemoveFile(ProgramTargetName(program))
+#endif /* ComplexHostProgramTarget */
+
+#ifndef SimpleHostProgramTarget
+#define SimpleHostProgramTarget(program)				@@\
+           SRCS = program.c						@@\
+									@@\
+              CC=cc							@@\
+    STD_INCLUDES=							@@\
+          CFLAGS=$(TOP_INCLUDES) $(INCLUDES) $(BOOTSTRAPCFLAGS)		@@\
+EXTRA_LOAD_FLAGS=							@@\
+        PROGRAM = program						@@\
+									@@\
+AllTarget(program)							@@\
+									@@\
+program: program.o $(DEPLIBS)						@@\
+	RemoveTargetProgram($@)						@@\
+	HostLinkRule($@,$(_NOOP_),program.o,$(DEPLIBS) $(LOCAL_LIBRARIES)) @@\
+									@@\
+DependTarget()								@@\
+									@@\
+LintTarget()								@@\
+									@@\
+clean::									@@\
+	RemoveFile(ProgramTargetName(program))
+#endif /* SimpleHostProgramTarget */
diff --git a/xc/config/cf/kdrive.cf b/xc/config/cf/kdrive.cf
new file mode 100644
index 000000000..10c9d475e
--- /dev/null
+++ b/xc/config/cf/kdrive.cf
@@ -0,0 +1,203 @@
+XCOMM $XFree86: xc/config/cf/kdrive.cf,v 1.2 1999/12/30 03:56:16 robin Exp $
+/*
+ * This configuration file contains all of the configuration
+ * information for the XFree86 based X Servers.
+ *
+ * Most of these settings can be overridden in a vendor.cf or the
+ * BeforeVendor part of the site.def file.
+ */
+XCOMM $XConsortium: $
+
+#undef BuildXprint
+#define BuildXprint 	NO
+#ifndef XTS300Server
+#define XTS300Server 	NO
+#endif
+#ifndef XfbdevServer
+#define XfbdevServer 	YES
+#endif
+#ifndef XIGSServer
+#define XIGSServer 	NO
+#endif
+#ifndef XTridentServer
+#define XTridentServer	NO
+#endif
+#ifndef XSavageServer
+#define XSavageServer	NO
+#endif
+#ifndef XItsyServer
+#define XItsyServer	NO
+#endif
+
+#if XItsyServer
+#include <itsy.cf>
+#endif
+
+#define XprtServer	NO
+#define BuildXIE	NO
+#define BuildXInputExt	NO
+#define BuildPexExt	NO
+#ifndef BuildLBX
+#define BuildLBX	YES
+#endif
+#ifndef BuildPseudo8
+#define BuildPseudo8	NO
+#endif
+
+/*
+ * By default, build all of the fonts.
+ */
+#ifndef Build75Dpi
+#define Build75Dpi		YES
+#endif
+
+#ifndef Build100Dpi
+#define Build100Dpi		YES
+#endif
+
+#ifndef BuildSpeedo
+#define BuildSpeedo		NO
+#endif
+
+#ifndef BuildType1
+#define BuildType1		NO
+#endif
+
+#ifndef BuildCID
+#define BuildCID		NO
+#endif
+
+#ifndef BuildFreeType
+#define BuildFreeType		NO
+#endif
+
+#ifndef BuildBuiltinFonts
+#define BuildBuiltinFonts	YES
+#endif
+
+#ifndef CompressAllFonts
+#define CompressAllFonts	YES
+#endif
+
+#ifndef GzipFontCompression
+#define GzipFontCompression	YES
+#endif
+
+#define DefaultFontPath built-ins,$(FONTDIR)/misc/,$(FONTDIR)/75dpi/,$(FONTDIR)/100dpi/
+
+#ifndef HasLinuxDoc
+#define HasLinuxDoc		NO
+#endif
+
+#ifndef InstallJapaneseDocs
+#define InstallJapaneseDocs	NO
+#endif
+
+#ifndef HasDlsymBug
+#define HasDlsymBug		NO
+#endif
+
+#ifndef XVendorString
+#define XVendorString	"Keith Packard"
+#endif
+
+#ifndef XVendorRelease
+#define XVendorRelease	600300
+#endif
+
+#ifndef BuildXKB
+#define BuildXKB		NO
+#endif
+
+#ifndef BuildXIE
+#define BuildXIE		NO
+#endif
+
+#ifndef BuildEVI
+#define BuildEVI		NO
+#endif
+
+#ifndef BuildRECORD
+#define BuildRECORD		NO
+#endif
+
+#ifndef BuildPexExt
+#define BuildPexExt		NO
+#endif
+
+#ifndef BuildDPMS
+#define BuildDPMS		NO
+#endif
+
+#ifndef FontServerAccess
+#define FontServerAccess	YES
+#endif
+
+/*
+ * Fix some xfree86 assumptions
+ */
+ 
+#undef DoLoadableServer
+#define DoLoadableServer	NO
+
+#define NormalLibFont		YES
+#define SharedLibFont		NO
+
+#define DBMLibrary		/**/
+
+#define DDXOsColor YES
+
+#if FontServerAccess
+#else
+FONTSERVERACCESS=-DNOFONTSERVERACCESS
+#endif
+
+#if BuildPseudo8
+#define Pseudo8Defines -DPSEUDO8
+#else
+#define Pseudo8Defines
+#endif
+
+#ifndef KdriveServerExtraDefines
+#define KdriveServerExtraDefines
+#endif
+
+XF86COMSRC=.
+
+#undef ServerExtraDefines
+#define ServerExtraDefines -DKDRIVESERVER -DGCCUSESGAS -DDDXOSINIT -DSMART_SCHEDULE $(FONTSERVERACCESS) Pseudo8Defines KdriveServerExtraDefines
+#undef ServerOSDefines
+#define ServerOSDefines -DDDXOSINIT
+
+#ifndef Other IConfigFiles
+#define OtherIConfigFile $(IRULESRC)/kdrive.cf
+#endif
+
+#if HasGcc2 && defined(i386Architecture)
+#ifndef DefaultGcc2i386Opt
+#define DefaultGcc2i386Opt -O2 -fno-strength-reduce
+#endif
+#endif
+
+#if HasGcc2 && defined(AlphaArchitecture)
+#ifndef DefaultGcc2AxpOpt
+#define DefaultGcc2AxpOpt -O2
+#endif
+#endif
+
+#ifndef DefaultGcc2DebugOpt
+#define DefaultGcc2DebugOpt -g
+#endif
+
+#define InstallDriverSDKNonExecFile(file,dest)				/**/
+#define InstallDriverSDKLibrary(libname,dest)				/**/
+#define InstallDriverSDKNamedLibrary(libname,dlibname,dest)		/**/
+#define InstallDriverSDKNamedNonExec(srcname,dstname,dest)		/**/
+#define InstallDriverSDKNamedProg(srcname,dstname,dest)			/**/
+#define InstallDriverSDKSubdirs(dirs)					/**/
+#define InstallDriverSDKMultipleDestFlags(list,dest,flags)		/**/
+#define InstallDriverSDKDynamicModule(module,dest,subdir)		/**/
+#define InstallDriverSDKObjectModule(module,dest,subdir)		/**/
+#define InstallDriverSDKLibraryModule(module,dest,subdir)		/**/
+#define ServerDriverSDKTarget(program)					/**/
+#define InstallDriverSDKProgramWithFlags(program,dest,flags)		/**/
diff --git a/xc/config/cf/linux.cf b/xc/config/cf/linux.cf
index dafa04eed..c20951ac7 100644
--- a/xc/config/cf/linux.cf
+++ b/xc/config/cf/linux.cf
@@ -1,5 +1,5 @@
 XCOMM platform:  $TOG: linux.cf /main/47 1998/04/17 11:32:51 mgreess
-XCOMM platform:  $XFree86: xc/config/cf/linux.cf,v 3.100 1999/08/31 08:39:01 dawes Exp $
+XCOMM platform:  $XFree86: xc/config/cf/linux.cf,v 3.108 1999/12/03 19:17:17 eich Exp $
 
 #ifndef LinuxElfDefault
 #define LinuxElfDefault		YES
@@ -122,7 +122,7 @@ XCOMM binutils:	(LinuxBinUtilsMajorVersion)
 #endif
 #define HasPoll			YES
 #else
-#define LinuxSourceDefines	-D_POSIX_SOURCE \
+#define LinuxSourceDefines	-D_POSIX_SOURCE -D_POSIX_C_SOURCE=2 \
 				-D_BSD_SOURCE -D_SVID_SOURCE \
 				LinuxGnuSourceDefines LinuxLocaleDefines
 #define XawI18nDefines		-DUSE_XWCHAR_STRING -DUSE_XMBTOWC
@@ -146,6 +146,13 @@ XCOMM binutils:	(LinuxBinUtilsMajorVersion)
 #endif
 #endif
 
+#define XF86INT10	        YES
+#ifdef i386Architecture
+#define XF86INT10_BUILD X86VM
+#elif defined(X86EMU_LIBPATH)
+# define XF86INT10_BUILD X86EMU_OS
+#endif
+
 /* The DRM module requires kernel services that appeared in late 2.1.x
    kernels and are known to be present in 2.2.x kernels. */
 #ifndef BuildXF86DRI
@@ -168,12 +175,12 @@ XCOMM binutils:	(LinuxBinUtilsMajorVersion)
 #ifndef BuildXF86DRM
 #  ifdef i386Architecture
 #    if OSMajorVersion == 2
-       /* Only tested for Linux 2.2.0 through 2.2.10 */
-#      if OSMinorVersion == 2 && OSTeenyVersion <= 10
+       /* Only tested for Linux 2.2.0 through 2.2.12 */
+#      if OSMinorVersion == 2 && OSTeenyVersion <= 12
 #        define BuildXF86DRM        YES
 #      else
-         /* Only tested for Linux 2.3.0 through 2.3.8 */
-#        if OSMinorVersion == 3 && OSTeenyVersion <= 8
+         /* Only tested for Linux 2.3.0 through 2.3.18 */
+#        if OSMinorVersion == 3 && OSTeenyVersion <= 18
 #          define BuildXF86DRM      YES
 #        else
            /* Note: add more conditions when 2.4.x and 2.5.x are released */
@@ -189,6 +196,13 @@ XCOMM binutils:	(LinuxBinUtilsMajorVersion)
 #  endif
 #endif
 
+/*
+ * The Rush extension support.
+ */
+#ifndef BuildXF86RushExt
+#define BuildXF86RushExt	YES
+#endif
+
 #ifndef LinuxFBDevSupport
 #define LinuxFBDevSupport	YES
 #endif
@@ -250,17 +264,36 @@ XCOMM binutils:	(LinuxBinUtilsMajorVersion)
 #define MkdirHierCmd		mkdir -p
 #if LinuxElfDefault
 #if UseElfFormat
+#ifndef CcCmd
 #define CcCmd			gcc
+#endif
+#ifndef AsCmd
 #define AsCmd			as
+#endif
+#ifndef LdCmd
 #define LdCmd			ld
+#endif
 #define AsmDefines		-D__ELF__
 #define CplusplusCmd		c++
+#ifndef LinuxUsesNcurses
+#if LinuxCLibMajorVersion >= 6 || (LinuxDistribution == LinuxSuSE)
+#define LinuxUsesNcurses	YES
+#else
+#define LinuxUsesNcurses	NO
+#endif
+#endif
 #ifndef TermcapLibrary
 #if UseStaticTermcapLib
+#if LinuxUsesNcurses
+#define TermcapLibrary		StaticLibrary(/usr/lib,ncurses)
+#else
 #define TermcapLibrary		StaticLibrary(/usr/lib/termcap,termcap)
+#endif
 #else
-#if (LinuxDistribution == LinuxSuSE) || (LinuxDistribution == LinuxDebian)
+#if LinuxUsesNcurses
 #define TermcapLibrary		-lncurses
+#else
+#define TermcapLibrary		-ltermcap
 #endif
 #endif
 #endif
@@ -323,19 +356,16 @@ XCOMM binutils:	(LinuxBinUtilsMajorVersion)
 #endif
 #endif
 #define CppCmd			/lib/cpp
-#ifndef YaccCmd
-#if OSMajorVersion >= 2
-#define YaccCmd			yacc
-#else
+/* Some Linux distributions have yacc, some don't. All have bison. */
 #define YaccCmd			bison -y
-#endif
-#endif
 #define LexCmd			flex -l
 #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
@@ -388,7 +418,9 @@ XCOMM binutils:	(LinuxBinUtilsMajorVersion)
 #define PositionIndependentCplusplusFlags -fpic
 #endif
 
+#ifndef StandardDefines
 #define StandardDefines		-Dlinux LinuxMachineDefines LinuxSourceDefines
+#endif
 
 #if UseElfFormat
 #define DlLibrary		-rdynamic -ldl
@@ -440,4 +472,12 @@ XCOMM binutils:	(LinuxBinUtilsMajorVersion)
 #define TtClientDepLibs $(DEPTTLIB) $(DEPXTOOLLIB) $(DEPXLIB)
 
 #include <lnxLib.rules>
+#ifdef KDriveXServer
+#include <kdrive.cf>
+#else
 #include <xfree86.cf>
+#endif
+
+#ifndef XFree86ServerOSDefines
+#define XFree86ServerOSDefines
+#endif
diff --git a/xc/config/cf/lynx.cf b/xc/config/cf/lynx.cf
index 0aed85b89..33faa351e 100644
--- a/xc/config/cf/lynx.cf
+++ b/xc/config/cf/lynx.cf
@@ -1,4 +1,4 @@
-XCOMM platform:  $XFree86: xc/config/cf/lynx.cf,v 3.30 1999/07/21 08:44:38 dawes Exp $
+XCOMM platform:  $XFree86: xc/config/cf/lynx.cf,v 3.31 1999/12/08 06:10:01 dawes Exp $
 
 
 #ifndef OSName
@@ -191,6 +191,11 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
 # define XawI18nDefines		-DUSE_XWCHAR_STRING -DUSE_XMBTOWC
 #endif
 
+/* If you have the mtrr driver installed you might want to enable this */
+#ifndef HasMTRRSupport
+#define HasMTRRSupport		NO
+#endif
+
 #if (defined(i386Architecture) || defined(PpcArchitecture)) && (OSMajorVersion > 2 || OSMinorVersion > 2)
 # ifndef DoLoadableServer
 #  define DoLoadableServer	YES
diff --git a/xc/config/cf/nto.cf b/xc/config/cf/nto.cf
new file mode 100644
index 000000000..68767336e
--- /dev/null
+++ b/xc/config/cf/nto.cf
@@ -0,0 +1,132 @@
+/* $XFree86: xc/config/cf/nto.cf,v 1.2 1999/12/27 00:45:43 robin Exp $ */
+/* Get X to build using the gcc toolchain, from QNX4 */
+/* Let us try to separate the x86 stuff out of here as well... */ 
+
+
+#ifndef OSName
+#define OSName 			Neutrino	
+#endif
+
+#ifndef OSVendor
+#define OSVendor		QNX Corp.
+#endif
+#ifndef OSMajorVersion
+#define OSMajorVersion		2
+#endif
+#ifndef OSMinorVersion
+#define OSMinorVersion		0
+#endif
+
+#if defined(i386Architecture)
+#define BuildServer 		YES
+#else
+#define BuildServer		NO
+#endif
+
+/* Use a non-broken shell ... */
+#define BourneShell		/bin/pdksh
+#define OSDefines		-DNO_REGEX -DSTRINGS_ALIGNED
+#define XawI18nDefines		-DUSE_XWCHAR_STRING -DUSE_XMBTOWC
+#define StripInstalledPrograms	NO
+#define BuildLBX		YES 
+
+#define SourceDefines		-D_POSIX_SOURCE
+#define CrossCompiling		YES
+#define HasGcc			YES
+#define HasGcc2			YES
+#define DoRanlibCmd 		YES
+#define GccUsesGas		YES
+#define MkdirHierCmd		mkdir -p
+
+#define InstallCmd		/usr/X11R6/bin/install.qnx
+#define DefaultCCOptions	
+#define LibraryCCOptions
+#define ServerCCOptions		
+#define LocalLibraries
+#define CLibrary
+#define PosixLibraries
+#define ConnectionFlags 	-DTCPCONN 
+
+#define StandardCppDefines	-traditional StandardDefines
+#define PreProcessCmd		CppCmd
+
+#define HasShm			NO    /* For now as well */
+#define HasSockets		YES
+#define HasPutenv		YES
+#define HasCbrt			NO
+#define HasShadowPasswd	YES
+
+#define AvoidNullMakeCommand    YES
+#define CompressAllFonts        YES
+#define Malloc0ReturnsNull      YES
+#define NeedConstPrototypes     YES
+#define NeedFunctionPrototypes  YES
+#define NeedNestedPrototypes    YES
+#define NeedVarargsPrototypes   YES
+#define OptimizedCDebugFlags	-O2
+#define DefaultCDebugFlags	-O2
+
+#ifndef NeedWidePrototypes
+#define NeedWidePrototypes      NO
+#endif
+
+#define LexLib
+#define TermcapLibrary		-lncurses
+#ifndef UseStaticTermcapLib
+#define UseStaticTermcapLib     NO
+#endif
+
+/* Here, we put in the #defines which are CPU-specific */
+/* Note that the full paths to the tools will go away when self-hosted */
+
+#ifdef i386Architecture
+#define BootstrapCFlags		-D__QNXNTO__ -Di386
+#define OSDefines		-DNO_REGEX -DSTRINGS_ALIGNED 
+#define NTODefines		-D__i386__ -D__ELF__ -D__QNXNTO__ -D_i386
+#define CcCmd			/usr/gcc/ntox86/bin/gcc -bntox86
+#define ArCmd			/usr/gcc/bin/ar cq
+#define LdCmd			/usr/gcc/bin/ld
+#define AsCmd			/usr/gcc/ntox86/bin/as
+#define RanlibCmd		/usr/gcc/bin/ranlib
+#define CppCmd			/usr/gcc/lib/gcc-lib/ntox86/2.8.1/cpp
+#define AsmDefines		-DUSE_GAS -D__ELF__ -D__QNXNTO__
+#define ExtraLibraries		-lsocket
+#endif
+
+/* MIPS architecture */
+#ifdef mipsArchitecture
+#define BootstrapCFlags		-D__QNXNTO__ -DMIPS
+#define OSDefines		-DNO_REGEX -DSTRINGS_ALIGNED
+#define NTODefines		-D__MIPS__ -D__ELF__ -D__QNXNTO__
+#define CcCmd			/usr/gcc/ntomips/bin/gcc -bntomips -EL
+#define ArCmd			/usr/gcc/bin/ar cq
+#define LdCmd			/usr/gcc/bin/ld
+#define AsCmd			/usr/gcc/ntomips/bin/as
+#define RanlibCmd		/usr/gcc/bin/ranlib
+#define AsmDefines		-DUSE_GAS -D__ELF__ -D__QNXNTO__
+#define ExtraLibraries		-lsocket 
+#endif
+
+/* Power PC support */
+#ifdef PPCArchitecture
+#define BootstrapCFlags		-D__QNXNTO__ -DPPC
+#define OSDefines		-DNO_REGEX -DSTRINGS_ALIGNED
+#define NTODefines		-D__PPC__ -D__ELF__ -D__QNXNTO__
+#define CcCmd			/usr/gcc/ntoppc/bin/gcc -bntoppc
+#define ArCmd			/usr/gcc/bin/ar cq
+#define LdCmd			/usr/gcc/bin/ld
+#define AsCmd			/usr/gcc/ntoppc/bin/as
+#define RanlibCmd		/usr/gcc/bin/ranlib
+#define AsmDefines		-DUSE_GAS -D__ELF__ -D__QNXNTO__
+#define ExtraLibraries		-lsocket
+#endif
+
+
+#define StandardDefines OSDefines SourceDefines NTODefines
+#define ServerOSDefines -DDDXTIME XFree86ServerOSDefines 
+#define ServerExtraDefines XFree86ServerDefines
+#define ExtraFilesToClean       *.err *.map 
+
+#include <nto.rules>
+#include <xfree86.cf>
+
diff --git a/xc/config/cf/nto.rules b/xc/config/cf/nto.rules
new file mode 100644
index 000000000..0332ab7a3
--- /dev/null
+++ b/xc/config/cf/nto.rules
@@ -0,0 +1,212 @@
+XCOMM $XFree86: xc/config/cf/nto.rules,v 1.2 1999/12/27 00:45:44 robin Exp $ 
+XCOMM Rules for QNX/Neutrino
+XCOMM Note that some of these will disappear when we stop cross-compiling
+
+#ifndef HasSharedLibraries
+#define HasSharedLibraries YES
+#endif
+
+#ifndef SharedDataSeparation
+#define SharedDataSeparation NO
+#endif
+#ifndef SharedCodeDef
+#define SharedCodeDef /**/
+#endif
+#ifndef SharedLibraryDef
+#define SharedLibraryDef /**/
+#endif
+#ifndef SharedLibraryLoadFlags
+#define SharedLibraryLoadFlags -shared
+#endif
+#ifndef PositionIndependentCFlags
+#define PositionIndependentCFlags -fPIC
+#endif
+#ifndef PositionIndependentCplusplusFlags
+#define PositionIndependentCplusplusFlags -fPIC
+#endif
+
+#define LinkFile(tofile, fromfile)				@@\
+tofile:: fromfile						@@\
+	$(CP) fromfile tofile					@@\
+								@@\
+includes:: tofile						@@\
+								@@\
+depend:: tofile							@@\
+								@@\
+clean::								@@\
+	RemoveFile(tofile)
+
+XCOMM This special rule is used to install the install script.
+XCOMM Else theres a name conflict with the QNX installer.
+
+#define QNXCopyInstaller(tofile, fromfile)			@@\
+tofile:: 							@@\
+	$(CP) fromfile tofile					@@\
+								@@\
+includes:: tofile
+
+
+#define ObjectFromSpecialSource(dst, src, flags)		@@\
+NoConfigRec(dst.c)						@@\
+								@@\
+dst.c: src.c							@@\
+	RemoveFile($@)						@@\
+	$(CP) $? $@						@@\
+								@@\
+SpecialCObjectRule(dst,NullParameter,flags)			@@\
+								@@\
+includes:: dst.c						@@\
+								@@\
+depend:: dst.c							@@\
+								@@\
+clean::								@@\
+	RemoveFile(dst.c)
+
+
+#define ObjectFromSpecialAsmSource(dst, src, flags)		@@\
+dst.S: src.S							@@\
+	RemoveFile($@)						@@\
+	$(CP) $? $@						@@\
+								@@\
+dst.o: dst.S							@@\
+	AssembleObject(flags)					@@\
+								@@\
+dst.i: dst.S							@@\
+	CPPOnlyAsm(dst,flags)					@@\
+								@@\
+depend:: dst.S							@@\
+								@@\
+clean::								@@\
+	RemoveFile(dst.S)
+
+XCOMM Special rule ComplexHostProgramTarget needed to compile 
+XCOMM our utilities locally because we are cross-compiling...
+XCOMM
+
+#define ComplexHostProgramTarget(program)			@@\
+           CC=cc						@@\
+           STD_INCLUDES =					@@\
+           CFLAGS=$(TOP_INCLUDES) $(INCLUDES) $(BOOTSTRAPCFLAGS)	@@\
+           CCOPTIONS =						@@\
+           EXTRA_LOAD_FLAGS =					@@\
+           PROGRAM = program					@@\
+								@@\
+AllTarget(program)						@@\
+								@@\
+program: $(OBJS) $(DEPLIBS)					@@\
+	RemoveTargetProgram($@)					@@\
+	HostLinkRule($@,$(_NOOP_),$(OBJS),$(DEPLIBS) $(LOCAL_LIBRARIES)) @@\
+								@@\
+DependTarget()							@@\
+								@@\
+clean::								@@\
+	RemoveFile(ProgramTargetName(program))
+
+XCOMM And this rule is again for a host simple host program when cross-compiling.
+XCOMM
+
+#define SimpleHostProgramTarget(program)			@@\
+         OBJS = program.o					@@\
+         SRCS = program.c					@@\
+								@@\
+ComplexHostProgramTarget(program)
+	
+#define HostLinkRule(target,flags,src,libs)			@@\
+	cc -F -o target src $(ALLINCLUDES)
+
+#ifndef FixupLibReferences
+#define FixupLibReferences()						@@\
+XMULIBONLY = -lXmu							@@\
+XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB)
+#endif
+
+#ifndef SharedLibraryTarget
+#ifdef UseInstalled
+#define LinkBuildSonameLibrary(lib) true
+#else
+#define LinkBuildSonameLibrary(lib) (RemoveFile($(BUILDLIBDIR)/lib); \
+	cd $(BUILDLIBDIR); $(LN) $(BUILDINCTOP)/$(CURRENT_DIR)/lib .)
+#endif
+
+#define SharedLibraryTarget(libname,rev,solist,down,up)			@@\
+AllTarget(Concat(lib,libname.so.rev))					@@\
+									@@\
+Concat(lib,libname.so.rev):  solist $(EXTRALIBRARYDEPS)			@@\
+	$(RM) $@~							@@\
+	@SONAME=`echo $@ | sed 's/\.[^\.]*$$//'`; set -x; \		@@\
+		(cd down; $(CC) -o up/$@~ $(SHLIBLDFLAGS) -Wl,-soname,$$SONAME solist $(REQUIREDLIBS) BaseShLibReqs); \ @@\
+		$(RM) $$SONAME; $(LN) $@ $$SONAME; \			@@\
+		LinkBuildSonameLibrary($$SONAME)			@@\
+	$(RM) $@ 							@@\
+	$(MV) $@~ $@							@@\
+	$(RM) Concat(lib,libname.so)					@@\
+	$(LN) $@ Concat(lib,libname.so)					@@\
+	LinkBuildLibrary($@)						@@\
+	LinkBuildLibrary(Concat(lib,libname.so))			@@\
+									@@\
+clean::									@@\
+	@MAJREV=`expr rev : '\(.*\)\.'`; \				@@\
+	set -x; $(RM) Concat(lib,libname.so.$$MAJREV)			@@\
+	$(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so)
+#endif
+/*
+ * InstallSharedLibrary - generate rules to install the shared library.
+ * NOTE: file must be executable, hence "INSTBINFLAGS"
+ */
+#ifndef InstallSharedLibrary
+#define	InstallSharedLibrary(libname,rev,dest)				@@\
+install:: Concat(lib,libname.so.rev) 					@@\
+	MakeDir($(DESTDIR)dest)						@@\
+	$(INSTALL) $(INSTALLFLAGS) $(INSTBINFLAGS) Concat(lib,libname.so.rev) $(DESTDIR)dest @@\
+	@T=`echo Concat($(DESTDIR)dest/lib,libname.so.rev) | sed 's/\.[^\.]*$$//'`;\
+	  set -x; $(RM) $$T && $(LN) Concat(lib,libname.so.rev) $$T	@@\
+	$(RM) Concat($(DESTDIR)dest/lib,libname.so)			@@\
+	$(LN) Concat(lib,libname.so.rev) Concat($(DESTDIR)dest/lib,libname.so)
+#endif /* InstallSharedLibrary */
+
+/*
+ * SharedLibraryDataTarget - generate rules to create shlib data file;
+ */
+#ifndef SharedLibraryDataTarget
+#define SharedLibraryDataTarget(libname,rev,salist)
+#endif /* SharedLibraryTarget */
+
+/*
+ * InstallSharedLibraryData - generate rules to install the shared library data
+ */
+#ifndef InstallSharedLibraryData
+#define	InstallSharedLibraryData(libname,rev,dest)
+#endif /* InstallSharedLibraryData */
+
+#define BaseShLibReqs
+
+
+
+/*
+ * ServerTargetWithFlags - generate rules to compile, link, and relink a server
+ */
+#ifndef ServerTargetWithFlags
+#define	ServerTargetWithFlags(server,subdirs,objects,libs,syslibs,flags) @@\
+AllTarget(ProgramTargetName(server))					@@\
+ProgramTargetName(server): subdirs objects libs				@@\
+	MoveToBakFile($@)						@@\
+	LinkRule($@,$(LDOPTIONS),objects,libs $(LDLIBS) syslibs) 	@@\
+									@@\
+Concat(load,server):							@@\
+	MoveToBakFile(ProgramTargetName(server))			@@\
+	LinkRule(ProgramTargetName(server),$(LDOPTIONS),objects,libs $(LDLIBS) syslibs) @@\
+									@@\
+loadX:: Concat(load,server)						@@\
+									@@\
+SentinelProgramTarget(server,subdirs objects libs,objects libs $(LDLIBS) syslibs) @@\
+SentinelLinkTarget(Concat(load,server),server,objects libs $(LDLIBS) syslibs) @@\
+PurifyProgramTarget(server,subdirs objects libs,objects libs $(LDLIBS) syslibs) @@\
+PurifyLinkTarget(Concat(load,server),server,objects libs $(LDLIBS) syslibs) @@\
+ProofProgramTarget(server,subdirs objects libs,objects libs $(LDLIBS) syslibs) @@\
+ProofLinkTarget(Concat(load,server),server,objects libs $(LDLIBS) syslibs) @@\
+									@@\
+InstallProgramWithFlags(server,$(BINDIR),flags)				@@\
+									@@\
+clean::									@@\
+	RemoveFile(ProgramTargetName(server))
+#endif /* ServerTargetWithFlags */
diff --git a/xc/config/cf/scoLib.rules b/xc/config/cf/scoLib.rules
index abedb4d06..55476dd4b 100644
--- a/xc/config/cf/scoLib.rules
+++ b/xc/config/cf/scoLib.rules
@@ -1,5 +1,5 @@
 XCOMM $XConsortium: scoLib.rules /main/2 1996/09/28 16:12:20 rws $
-XCOMM $XFree86: xc/config/cf/scoLib.rules,v 1.4 1999/06/06 08:47:45 dawes Exp $
+XCOMM $XFree86: xc/config/cf/scoLib.rules,v 1.5 1999/10/13 04:20:42 dawes Exp $
 
 /*
  * SharedLibraryTarget3 - generate rules to create a shared library;
@@ -38,7 +38,7 @@ clean::									@@\
 #ifndef UnsharedLibObjCompile
 #define UnsharedLibObjCompile(options) RemoveFile($@)                  @@\
         ClearmakeOSName                                                  \
-        $(CC) -c $(CDEBUGFLAGS) $(THREADS_CFLAGS) $(ALLDEFINES) options $*.c @@\
+        $(CC) -c $(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) $(THREADS_CFLAGS) $(ALLDEFINES) options $*.c @@\
         $(MV) $@ unshared/$@
 #endif
 
diff --git a/xc/config/cf/sv3Lib.rules b/xc/config/cf/sv3Lib.rules
index 101f70e46..9072b4f40 100644
--- a/xc/config/cf/sv3Lib.rules
+++ b/xc/config/cf/sv3Lib.rules
@@ -2,7 +2,7 @@ XCOMM $XConsortium: sv3Lib.rules /main/1 1996/10/31 14:47:33 kaleb $
 
 
 
-XCOMM $XFree86: xc/config/cf/sv3Lib.rules,v 3.2 1999/01/11 05:13:09 dawes Exp $
+XCOMM $XFree86: xc/config/cf/sv3Lib.rules,v 3.3 1999/10/13 04:20:43 dawes Exp $
 /*
  * SVR3 shared library rules
  * Copyright (c) 1992, 1993 by Thomas Wolfram, Berlin, Germany
@@ -114,7 +114,8 @@ XCOMM $XFree86: xc/config/cf/sv3Lib.rules,v 3.2 1999/01/11 05:13:09 dawes Exp $
 #define SharedLibObjCompile(options) $(RM) shared/$@ 	                   @@\
 	cat import.h $*.c >_$*.c                                           @@\
         $(CC) -c $(ANSICCOPTIONS) $(CCOPTIONS) $(ALLDEFINES) options \     @@\
-$(SHLIBDEF) $(SHAREDCODEDEF) $(PICFLAGS) $(CDEBUGFLAGS) _$*.c              @@\
+$(SHLIBDEF) $(SHAREDCODEDEF) $(PICFLAGS) $(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) \@@\
+_$*.c                                                                      @@\
 	$(MV) _$*.o shared/$@                                              @@\
 	$(RM) _$*.c
 #endif
diff --git a/xc/config/cf/svr4.cf b/xc/config/cf/svr4.cf
index bbdd753d7..c8c2327a0 100644
--- a/xc/config/cf/svr4.cf
+++ b/xc/config/cf/svr4.cf
@@ -1,5 +1,5 @@
 XCOMM $TOG: svr4.cf /main/17 1997/06/08 20:08:31 kaleb $
-XCOMM $XFree86: xc/config/cf/svr4.cf,v 3.36 1999/05/29 14:41:42 dawes Exp $
+XCOMM $XFree86: xc/config/cf/svr4.cf,v 3.38 1999/12/08 21:36:55 robin Exp $
 /*
  * A default OS name
  */
diff --git a/xc/config/cf/usl.cf b/xc/config/cf/usl.cf
index 0a1ccbcdf..5f8176d5a 100644
--- a/xc/config/cf/usl.cf
+++ b/xc/config/cf/usl.cf
@@ -3,7 +3,7 @@ XCOMM platform:  $TOG: usl.cf /main/50 1997/04/17 14:11:39 barstow $
 
 
 
-XCOMM platform:  $XFree86: xc/config/cf/usl.cf,v 3.16 1999/05/17 13:17:01 dawes Exp $
+XCOMM platform:  $XFree86: xc/config/cf/usl.cf,v 3.17 1999/12/08 21:36:56 robin Exp $
 
 #ifndef OSName
 # define OSName		DefaultOSName
@@ -88,6 +88,9 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVer
 #define DtPrintDefines		DtSearchDefines
 
 #define HasStrcasecmp		NO
+#ifndef HasSnprintf
+#define HasSnprintf		YES
+#endif
 
 /* For DtHelp's TIFF processing routines. */
 #define LSBBitOrder		YES
diff --git a/xc/config/cf/xf86.rules b/xc/config/cf/xf86.rules
index da0f42a1b..3806818d2 100644
--- a/xc/config/cf/xf86.rules
+++ b/xc/config/cf/xf86.rules
@@ -1,5 +1,5 @@
 XCOMM $XConsortium: xf86.rules /main/9 1996/10/31 14:54:26 kaleb $
-XCOMM $XFree86: xc/config/cf/xf86.rules,v 3.29 1999/08/28 09:00:19 dawes Exp $
+XCOMM $XFree86: xc/config/cf/xf86.rules,v 3.30 1999/10/13 16:49:02 dawes Exp $
 
 /*
  * These rules are needed to build the XFree86 X Servers
@@ -206,9 +206,6 @@ InstallMultipleDestFlags(install.sdk,list,dest,flags)
 #define InstallDriverSDKDynamicModule(module,dest,subdir)		/**/
 #else
 #define InstallDriverSDKDynamicModule(module,dest,subdir)		@@\
-AllTarget(module)							@@\
-	LinkBuildModule(module,subdir)					@@\
-									@@\
 install.sdk:: module							@@\
 	MakeDir($(DESTDIR)dest/subdir)					@@\
 	$(INSTALL) -c module $(DESTDIR)dest/subdir
diff --git a/xc/config/cf/xf86site.def b/xc/config/cf/xf86site.def
index 6e456755b..13f08dc6b 100644
--- a/xc/config/cf/xf86site.def
+++ b/xc/config/cf/xf86site.def
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.147 1999/08/29 12:20:50 dawes Exp $
+XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.153 1999/12/03 19:17:17 eich Exp $
 /******************************************************************************/
 /*
  * This file is to provide a quick method for most people to change the
@@ -59,6 +59,32 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.147 1999/08/29 12:20:50 dawes Exp
                           -Wredundant-decls -Wnested-externs
  */
 
+/* 
+ * Sun Compiler stuff.. 
+ *
+#define HasSunC                         YES
+#define HasSunCplusplus                 YES
+#define CplusplusCompilerMajorVersion   5
+#define CplusplusCompilerMinorVersion   0
+#define CCompilerMajorVersion           5
+#define CCompilerMinorVersion           0
+ */
+
+/*
+ * Optimized Sun Compiler Build.
+ *
+#define DefaultCDebugFlags              -xO4 -xtarget=pentium_pro
+#define OptimizedCDebugFlags            -xO4 -xtarget=pentium_pro
+ */
+
+/* 
+ * Debuggable Sun Compiler Build. 
+ * Note: This builds _EVERYTHING_ as debuggable
+ *
+#define DefaultCDebugFlags              -g -xs
+#define OptimizedCDebugFlags            -g -xs
+ */
+
 /*
  * For Linux, this should match the Binutils version you have.  This example
  * is for 2.6.0.7.  See linux.cf for the default setting.
@@ -222,7 +248,7 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.147 1999/08/29 12:20:50 dawes Exp
 				neomagic i740 tdfx \
 				cirrus tseng trident chips apm \
 				GlideDriver fbdev \
-				ati vga XF86ExtraCardDrivers
+				ati r128 vga XF86ExtraCardDrivers
  */
 
 /*
@@ -405,9 +431,9 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.147 1999/08/29 12:20:50 dawes Exp
  */
 
 /* 
- * If you want to build Xinerama, uncomment this.
+ * If you don't want to build Xinerama support, uncomment this.
  *
-#define BuildXinerama		YES
+#define BuildXinerama		NO
  */
 
 /*
@@ -448,10 +474,16 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.147 1999/08/29 12:20:50 dawes Exp
  */
 
 /*
- * If you want to build the client library for the xf86rush extension,
+ * If you don't want to build the xf86rush extension, uncomment this line.
+ *
+#define BuildXF86RushExt	NO
+ */
+
+/*
+ * If you don't want to build the client library for the xf86rush extension,
  * uncomment this line.
  *
-#define BuildXF86RushLibrary	YES
+#define BuildXF86RushLibrary	NO
  */
 
 /*
@@ -521,6 +553,7 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.147 1999/08/29 12:20:50 dawes Exp
  * this. Assumes you have Gcc2.
  * (If you don't have Gcc2, you can use the DebugLib{X11,Xt,Xaw,...} variables
  * to build debugging versions of the libraries separately.)
+ *
 #define DebuggableLibraries	YES
 */
 
@@ -615,3 +648,10 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.147 1999/08/29 12:20:50 dawes Exp
  *
 #define GlideIncDir /usr/include/glide
  */
+
+/*
+ * If your system doesn't support vm86() mode and you have
+ * libx86emu set library path here
+ *
+#define X86EMU_LIBPATH /usr/local/lib
+ */ 
diff --git a/xc/config/cf/xfree86.cf b/xc/config/cf/xfree86.cf
index bd6d5ae05..87bcad5c6 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.246 1999/08/29 12:20:50 dawes Exp $
+XCOMM $XFree86: xc/config/cf/xfree86.cf,v 3.255 2000/01/03 14:29:59 robin Exp $
 /*
  * This configuration file contains all of the configuration
  * information for the XFree86 based X Servers.
@@ -18,17 +18,13 @@ XCOMM $TOG: xfree86.cf /main/38 1997/10/22 13:01:59 kaleb $
 #define XConfigDir		$(LIBDIR)
 #endif
 
-#ifndef NewInput
-#define NewInput YES
-#endif
-
 /*
  * Default settings for which X Servers to build.
  */
 
 /* XInput drivers */
 #ifndef XInputDrivers
-#if NewInput
+#if 1
 #define XInputDrivers		dynapro microtouch wacom
 #else
 #define XInputDrivers		dynapro elo2300 elographics magellan \
@@ -108,6 +104,14 @@ XCOMM $TOG: xfree86.cf /main/38 1997/10/22 13:01:59 kaleb $
 #ifndef XF86RAC
 #define XF86RAC			YES
 #endif
+/* int10 module */
+#ifndef XF86INT10
+#define XF86INT10               NO
+#endif
+#define X86EMU_GENERIC  1
+#define X86VM           2
+#define X86EMU_OS       3
+
 /*
  * Amiga framebuffer module.
  * This is for build testing only.  It isn't actually used on this platform.
@@ -122,7 +126,7 @@ XCOMM $TOG: xfree86.cf /main/38 1997/10/22 13:01:59 kaleb $
 				neomagic i740 tdfx \
 				cirrus tseng trident chips apm \
 				GlideDriver fbdev \
-				ati vga XF86ExtraCardDrivers
+				ati r128 vga XF86ExtraCardDrivers
 #endif
 #endif
 
@@ -222,7 +226,7 @@ XCOMM $TOG: xfree86.cf /main/38 1997/10/22 13:01:59 kaleb $
 
 /* Pure PCI drivers should go first */
 #ifndef XF86CardDrivers
-#define XF86CardDrivers		mga glint s3virge rendition tga \
+#define XF86CardDrivers		mga tdfx glint s3virge rendition tga \
 				vga XF86ExtraCardDrivers
 #endif
 #endif
@@ -410,8 +414,15 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8
 #  ifndef GlxBuiltInMesa
 #    define GlxBuiltInMesa         NO
 #  endif
+#  ifndef GlxBuiltInTdfx
+#    define GlxBuiltInTdfx         NO
+#  endif
 
-#  if GlxBuiltInGamma || GlxBuiltInMesa
+#  if GlxBuiltInTdfx
+#    define GlxDriverUsesMesa      YES
+#  endif
+
+#  if GlxBuiltInGamma || GlxBuiltInMesa || GlxBuiltInTdfx
 #    define GlxUseBuiltInDRIDriver YES
 #    define DRIDynLoadDefines /**/
 #  else
@@ -469,6 +480,14 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8
 #endif
 
 /*
+ * Build the Rush extension library (non standard extension for cooperation
+ * between glide library and X server). Enabled by default only for Linux.
+ */
+#ifndef BuildXF86RushExt
+#define BuildXF86RushExt	NO
+#endif
+
+/*
  * XIE
  */
 #ifndef BuildXIE
@@ -542,6 +561,9 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8
 #ifndef BuildGLXLibrary
 #define BuildGLXLibrary		YES
 #endif
+#ifndef BuildXF86RushLibrary
+#define BuildXF86RushLibrary	BuildXF86RushExt
+#endif
 
 /*
  * Build the XFree86-VidMode extension
@@ -559,6 +581,13 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8
 #endif
 
 /*
+ * Build the XFree86-Bigfont extension
+ */
+#ifndef BuildXF86BigfontExt
+#define BuildXF86BigfontExt		HasShm
+#endif
+
+/*
  * Build XF86Setup -- needs Tk and Tcl
  */
 /* There are problems building XF86Setup, so turn it off for now */
@@ -775,15 +804,6 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8
 #endif
 #endif
 
-/* A temporary addition for testing the new input device code. */
-#ifndef NewInputDefines
-#if NewInput
-#define NewInputDefines -DNEW_INPUT
-#else
-#define NewInputDefines /**/
-#endif
-#endif
-
 #if !HasSnprintf
 #define ServerSnprintfDefines -DNEED_SNPRINTF
 #else
@@ -797,12 +817,13 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8
 				XFree86LoaderDefines -DXFree86Server \
 				VidModeExtensionDefines \
 				ServerSnprintfDefines \
-				-DX_BYTE_ORDER=ByteOrder NewInputDefines
+				-DX_BYTE_ORDER=ByteOrder \
+				-DSMART_SCHEDULE
 #endif
 
 #ifndef XFree86ServerOSDefines
 #define XFree86ServerOSDefines	-DDDXOSINIT -DSERVER_LOCK -DDDXOSFATALERROR \
-				-DDDXOSVERRORF
+				-DDDXOSVERRORF -DSMART_SCHEDULE
 #endif
 
 #ifndef XFree86ConsoleDefines
@@ -906,7 +927,7 @@ XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japanese
 #endif
 
 #ifndef XFree86Version
-#define XFree86Version	3916
+#define XFree86Version	3917
 #endif
 
 #ifndef XVendorString
author	faith <faith>	2000-01-06 12:41:09 +0000
committer	faith <faith>	2000-01-06 12:41:09 +0000
commit	0387caff984518490a7dc7834a184390bbf4fb97 (patch)
tree	3e384e8272b323453802e0cb015c3e28e1077174 /xc/config/cf
parent	b700746a28cb32d457c7aae74d8d04ffd0e4ab5d (diff)