XFree86 4.3.99.901 (RC 1)xf86-4_3_99_901

5 files changed, 44 insertions, 44 deletions

diff --git a/Imake.cf b/Imake.cf
index 06203e5..9729060 100644
--- a/Imake.cf
+++ b/Imake.cf
@@ -17,7 +17,7 @@ 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.85 2003/11/07 23:57:43 dawes Exp $
+XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.87 2003/11/29 01:08:30 dawes Exp $
 
 #if defined(__APPLE__)
 # undef __APPLE__
@@ -177,6 +177,11 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.85 2003/11/07 23:57:43 dawes Exp $
 # endif /* __hppa__ */
 #endif /* OpenBSD */
 
+/* Systems based on kernel of OpenBSD */
+#if defined(__OpenBSD__) || defined(__OpenBSD_kernel__)
+#define KOpenBSDArchitecture
+#endif
+
 #ifdef __NetBSD__
 # define MacroIncludeFile <NetBSD.cf>
 # define MacroFile NetBSD.cf
@@ -224,6 +229,11 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.85 2003/11/07 23:57:43 dawes Exp $
 # endif
 #endif /* NetBSD */
 
+/* Systems based on kernel of NetBSD */
+#if defined(__NetBSD__) || defined(__NetBSD_kernel__)
+#define KNetBSDArchitecture
+#endif
+
 #ifdef __FreeBSD__
 # define MacroIncludeFile <FreeBSD.cf>
 # define MacroFile FreeBSD.cf
@@ -254,6 +264,11 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.85 2003/11/07 23:57:43 dawes Exp $
 # endif
 #endif /* __FreeBSD__ */
 
+/* Systems based on kernel of FreeBSD */
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#define KFreeBSDArchitecture
+#endif
+
 #ifdef AMOEBA
  /* Should be before the 'sun' entry because we may be cross-compiling */
 # define MacroIncludeFile <Amoeba.cf>
@@ -962,10 +977,21 @@ XCOMM Keep cpp from replacing path elements containing i486/i586/i686
 #define i386Architecture
 #endif /* minix */
 
-#ifdef MACH
-#ifdef __GNU__
+/* Systems with GNU libc and userland */
+#if defined(__GNU__) || defined(__GNU_userland__) || \
+  defined(__GNU_KFreeBSD__) || \
+  defined(__GNU_KNetBSD__) || defined(__GNU_KOpenBSD__)
+#define GNUArchitecture
 #define MacroIncludeFile <gnu.cf>
 #define MacroFile gnu.cf
+#ifdef __i386__
+#define i386Architecture
+#endif
+#endif
+
+#ifdef MACH
+#ifdef __GNU__
+/* Mach-based GNU system */
 #define GNUMachArchitecture
 #else
 #define MacroIncludeFile <mach.cf>
diff --git a/OpenBSD.cf b/OpenBSD.cf
index 0db3605..189911a 100644
--- a/OpenBSD.cf
+++ b/OpenBSD.cf
@@ -1,4 +1,4 @@
-XCOMM platform:  $XFree86: xc/config/cf/OpenBSD.cf,v 3.97 2003/11/19 04:43:59 dawes Exp $
+XCOMM platform:  $XFree86: xc/config/cf/OpenBSD.cf,v 3.99 2003/11/23 21:29:00 herrb Exp $
 XCOMM
 
 #ifndef OSName
@@ -879,13 +879,15 @@ install:: fonts.alias							@@\
 #  define HasPosixThreads		YES
 #  define ThreadedX			YES
 #  define SystemMTDefines		/**/
-#  define BuildThreadStubLibrary	YES 
+#  define BuildThreadStubLibrary	YES
 #  define NeedUIThrStubs		YES
 #  define ThreadsCompileFlag		-pthread
 #  define ThreadsLibraries		-pthread
 #  define SharedX11Reqs			$(LDPRELIBS) $(XTHRSTUBLIB)
 #  define SharedXtReqs			$(LDPRELIB) $(XONLYLIB) $(SMLIB) \
 					$(ICELIB) $(XTHRSTUBLIB)
+#else
+#  define ThreadedX			NO
 #endif
 
 
diff --git a/gnu.cf b/gnu.cf
index a976495..b34f848 100644
--- a/gnu.cf
+++ b/gnu.cf
@@ -1,4 +1,4 @@
-XCOMM platform:  $XFree86: xc/config/cf/gnu.cf,v 1.11 2001/02/28 18:58:49 dawes Exp $
+XCOMM platform:  $XFree86: xc/config/cf/gnu.cf,v 1.12 2003/11/24 02:02:26 dawes Exp $
 
 #ifndef OSName
 #define OSName			DefaultOSName
@@ -26,12 +26,11 @@ XCOMM XXXMB: What about _GNU_SOURCE, see Linux/UseInstalled?
 
 #define XawI18nDefines        -DHAS_WCHAR_H -DHAS_WCTYPE_H -DNO_WIDEC_H
 
-XCOMM Enable this when we have pthreads.
-XCOMM #define HasPosixThreads         YES
-XCOMM #define ThreadedX               YES
-XCOMM #define HasThreadSafeAPI        YES
-XCOMM #define ThreadsLibraries        -lpthread
-XCOMM #define SystemMTDefines         -D_REENTRANT
+#define HasPosixThreads         YES
+#define ThreadedX               YES
+#define HasThreadSafeAPI        YES
+#define ThreadsLibraries        -lpthread
+#define SystemMTDefines         -D_REENTRANT
 
 #ifndef HasLibCrypt
 #define HasLibCrypt             YES
@@ -134,7 +133,7 @@ XCOMM i386Architecture
 #define VendorHasX11R6_3libXext	YES
 
 #ifndef StandardDefines
-#define StandardDefines		-D__GNU__ GNUMachineDefines GNUSourceDefines
+#define StandardDefines		GNUMachineDefines GNUSourceDefines
 #endif
 
 #define DlLibrary		-rdynamic -ldl
diff --git a/linux.cf b/linux.cf
index a622ae2..738b486 100644
--- a/linux.cf
+++ b/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.215 2003/11/17 20:23:17 dawes Exp $
+XCOMM platform:  $XFree86: xc/config/cf/linux.cf,v 3.216 2003/11/25 19:11:54 dawes Exp $
 
 #ifndef LinuxElfDefault
 # define LinuxElfDefault	YES
@@ -329,40 +329,12 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class
 # endif
 #endif
 
-#if 0
 /*
  * Building the DRM module requires kernel source be installed.  It's safest
  * to just not enable it by default.
  */
-
-/* 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.  Unfortunately,
-   the kernel API is a moving target and the module may break with new
-   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) || defined(SparcArchitecture) || defined(AlphaArchitecture) || defined(AMD64Architecture)
-#    if OSMajorVersion == 2
-       /* 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.18 */
-#        if OSMinorVersion == 3 && OSTeenyVersion <= 18
-#          define BuildXF86DRM	YES
-#        else
-           /* Note: add more conditions when 2.4.x and 2.5.x are released */
-#          define BuildXF86DRM	NO
-#        endif
-#      endif
-#    else
-       /* Note: add more conditions when 3.0.x and 3.1.x are released */
-#      define BuildXF86DRM	NO
-#    endif
-#  else
-#    define BuildXF86DRM	NO
-#  endif
-#endif
+#define BuildXF86DRM	NO
 #endif
 
 #ifndef HasAgpGart
diff --git a/os2Lib.tmpl b/os2Lib.tmpl
index afd0a40..d886739 100644
--- a/os2Lib.tmpl
+++ b/os2Lib.tmpl
@@ -2,7 +2,7 @@ XCOMM $Xorg: os2Lib.tmpl,v 1.3 2000/08/17 19:41:48 cpqbld Exp $
 
 
 
-XCOMM $XFree86: xc/config/cf/os2Lib.tmpl,v 3.18 2003/11/12 00:10:23 dawes Exp $
+XCOMM $XFree86: xc/config/cf/os2Lib.tmpl,v 3.19 2003/11/29 01:51:31 dawes Exp $
 
 /*
  * OS2/EMX shared library template
@@ -45,6 +45,7 @@ XCOMM $XFree86: xc/config/cf/os2Lib.tmpl,v 3.18 2003/11/12 00:10:23 dawes Exp $
 #define SharedXvMCReqs $(LDPRELIB) $(XLIB)
 #define SharedXResReqs	$(LDPRELIB) $(XLIB)
 #define SharedXfontcacheReqs $(LDPRELIB) $(XLIB)
+#define SharedFontencReqs $(LDPRELIB) GzipLibrary
 
 /* library revisions, these are typically empty! */
 #define SharedX11Rev /**/