Import most of XFree86 4.4RC3. This import excludes files which have thexf86-4_3_99_903_special

    new license. If we want to, later we can import 4.4RC3 again and pick
    up the files that have the new license, but for now the vendor branch
    is "pure."

4 files changed, 18 insertions, 10 deletions

diff --git a/FreeBSD.cf b/FreeBSD.cf
index 502a3f0..d131320 100644
--- a/FreeBSD.cf
+++ b/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.147 2004/01/28 01:46:21 dawes Exp $
+XCOMM platform:  $XFree86: xc/config/cf/FreeBSD.cf,v 3.148 2004/02/07 04:30:15 dawes Exp $
 
 #ifndef UseElfFormat
 #define UseElfFormat		DefaultToElfFormat
@@ -126,6 +126,7 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
 #  endif
 #  if (OSRelVersion >= 500016)
 #   define ThreadsLibraries	-lc_r
+#   define SharedGLReqs		$(LDPRELIBS) $(XLIB) -lc
 #  else
 #   define ThreadsLibraries	-pthread
 #  endif
diff --git a/X11.tmpl b/X11.tmpl
index ee04e6d..19d6e41 100644
--- a/X11.tmpl
+++ b/X11.tmpl
@@ -5,7 +5,7 @@ XCOMM
 XCOMM
 XCOMM
 XCOMM
-XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.244 2004/01/11 18:48:11 dawes Exp $
+XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.247 2004/02/10 10:38:56 alanh Exp $
 
 /***************************************************************************
  *                                                                         *
@@ -1291,9 +1291,6 @@ FCHOWN_DEFINES = -DHAS_FCHOWN
 #ifndef XTrueTypeStandAloneCConv
 #define XTrueTypeStandAloneCConv NO
 #endif
-#ifndef XTTInLibXFont
-#define XTTInLibXFont NO
-#endif
 #ifndef XTrueTypeSrcDir
 #define XTrueTypeSrcDir $(TOP)/extras/X-TrueType
 #endif
diff --git a/darwin.cf b/darwin.cf
index e470e2e..4820402 100644
--- a/darwin.cf
+++ b/darwin.cf
@@ -1,4 +1,4 @@
-XCOMM platform:  $XFree86: xc/config/cf/darwin.cf,v 1.50 2004/01/20 23:54:50 torrey Exp $
+XCOMM platform:  $XFree86: xc/config/cf/darwin.cf,v 1.51 2004/02/11 00:30:27 torrey Exp $
 
 /* Darwin / Mac OS X configuration by John Carmack <johnc@idsoftware.com> */
 
@@ -217,17 +217,22 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
 # define ByteOrder              X_LITTLE_ENDIAN
 #endif /* i386DarwinArchitecture */
 
+#if OSMajorVersion < 7
+# define DarwinLocaleDefines    -DX_LOCALE
+#else
+# define DarwinLocaleDefines    /**/
+# define XawI18nDefines         -DHAS_WCHAR_H -DHAS_WCTYPE_H -DNO_WIDEC_H
+#endif
+
 /*
  * __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.
- *
- * Darwin's setlocale() doesn't work properly, so use X11's instead.
  */
 #define StandardDefines         DarwinMachineDefines -D__DARWIN__ \
-                                -DNO_ALLOCA -DX_LOCALE -DCSRG_BASED
+                                -DNO_ALLOCA -DCSRG_BASED DarwinLocaleDefines
 
 /*
  * Set this to NO to just build the client libs, which should work without
diff --git a/sun.cf b/sun.cf
index 63279af..ae915d4 100644
--- a/sun.cf
+++ b/sun.cf
@@ -3,7 +3,7 @@ XCOMM platform:  $Xorg: sun.cf,v 1.4 2000/08/17 19:41:48 cpqbld Exp $
 
 
 
-XCOMM platform:  $XFree86: xc/config/cf/sun.cf,v 3.70 2004/01/13 02:42:51 tsi Exp $
+XCOMM platform:  $XFree86: xc/config/cf/sun.cf,v 3.71 2004/02/02 03:55:26 dawes Exp $
 
 #ifndef OSName
 # define OSName		DefaultOSName
@@ -530,3 +530,8 @@ man_keywords::								@@\
 #define	UseSeparateConfDir	NO
 #endif
 
+#ifndef BuildGLULibrary
+#if HasSunC
+#define BuildGLULibrary NO
+#endif
+#endif