XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folksxf86-4_3_99_16

1 files changed, 85 insertions, 27 deletions

diff --git a/darwin.cf b/darwin.cf
index 1a1f18e..a6471e2 100644
--- a/darwin.cf
+++ b/darwin.cf
@@ -1,4 +1,4 @@
-XCOMM platform:  $XFree86: xc/config/cf/darwin.cf,v 1.34 2002/12/04 04:40:15 torrey Exp $
+XCOMM platform:  $XFree86: xc/config/cf/darwin.cf,v 1.46 2003/11/18 19:00:14 torrey Exp $
 
 /* Darwin / Mac OS X configuration by John Carmack <johnc@idsoftware.com> */
 
@@ -25,12 +25,14 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
  * Define the operating system's capabilities
  */
 #define HasSnprintf             YES
+#define HasStrlcat		YES
 #define HasPutenv               YES
 #define HasBSD44Sockets         YES
 #define Malloc0ReturnsNull      NO
 #define HasShadowPasswd         NO
 #define HasUsableFileMmap       YES
 #define HasZlib                 YES
+#define HasArc4Random		YES
 #ifndef HasShm
 # define HasShm                 YES
 #endif
@@ -59,7 +61,7 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
 #endif
 
 /* Libtool on Darwin always uses minor numbers */
-#define LibtoolMinorVersions	YES
+#define LibtoolMinorVersions    YES
 
 /* The most common file system, HFS+, is not case sensitive. */
 #ifndef CaseSensitiveFileSystem
@@ -83,31 +85,48 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
 
 #if DarwinQuartzSupport
 
-# ifndef GlxUseAqua
-#  define GlxUseAqua            YES
+# if OSMajorVersion >= 7
+   PROJ_BUILD = xcodebuild
+# else
+   PROJ_BUILD = pbxbuild
 # endif
 
-/*
- * Before Mac OS X 10.1 a number of features were missing or broken.
- */
-# if (OSMajorVersion == 1 && OSMinorVersion >= 4) || OSMajorVersion >= 5
-#  ifndef HasNSCarbonWindow
-#   define HasNSCarbonWindow    YES
+# ifndef HasXplugin
+#  if OSMajorVersion >= 7
+#   define HasXplugin           YES
+#  else
+#   define HasXplugin           NO
 #  endif
-#  ifndef HasCGMachPort
-#   define HasCGMachPort        YES
+# endif
+
+# if HasXplugin
+#  ifndef XpLibDir
+#   define XpLibDir             /usr/lib
 #  endif
-# else
-/* NSWindow(NSCarbonExtensions) is broken. */
-#  ifndef HasNSCarbonWindow
-#   define HasNSCarbonWindow    NO
+#  ifndef XpIncDir
+#   define XpIncDir             $(SERVERSRC)/hw/darwin/quartz/xpr
 #  endif
-/* CGWindowServerCFMachPort() does not exist. */
-#  ifndef HasCGMachPort
-#   define HasCGMachPort        NO
+   XPLIBDIR = XpLibDir
+   XPINCDIR = XpIncDir
+#  define XpluginLibrary        Concat(-L,$(XPLIBDIR)) -lXplugin
+# else
+#  define XpluginLibrary        /**/
+# endif
+
+# ifndef BuildAppleDRI
+#  if HasXplugin
+#   define BuildAppleDRI        YES
+#  else
+#   define BuildAppleDRI        NO
 #  endif
 # endif
 
+# if BuildAppleDRI
+#  define GlxExtraDefines -DGLX_DIRECT_RENDERING -DGLX_USE_APPLEGL GlxArchDefines
+# endif
+
+#define BuildAppleWMLibrary     YES
+
 #endif  /* DarwinQuartzSupport */
 
 /* we don't need -lm */
@@ -121,8 +140,22 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
 
 #define MkdirHierCmd            mkdir -p
 
-/* our cpp isn't in /lib/cpp and early versions don't like -undef */
-#define CppCmd                  /usr/bin/cpp
+/* Use flex -l for compatibility with various versions of flex. */
+#ifndef LexCmd
+# define LexCmd                 flex -l
+#endif
+#define HasFlex                 YES
+
+/*
+ * Our cpp isn't in /lib/cpp and early versions don't like -undef.
+ * The default cpp-3.3 that ships with Panther inserts spurious #pragmas,
+ * so we use the 3.1-based version.
+ */
+#if OSMajorVersion >= 7
+# define CppCmd                 /usr/bin/cpp3
+#else
+# define CppCmd                 /usr/bin/cpp
+#endif
 #if HasGcc3
 # define RawCppCmd              CppCmd -undef
 #else
@@ -150,12 +183,18 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
 # define LibraryCCOptions       DefaultCCOptions -fno-common
 #endif
 
+/* The cr implementation does not build with NEED_SCREEN_REGIONS,
+   so play it safe. */
+#ifndef ServerCCOptions
+# define ServerCCOptions        DefaultCCOptions -UNEED_SCREEN_REGIONS
+#endif
+
 #ifdef PpcDarwinArchitecture
 # define DarwinMachineDefines   -D__powerpc__
 # if HasGcc3
-#  define OptimizedCDebugFlags   -Os
+#  define OptimizedCDebugFlags  -Os
 # else
-#  define OptimizedCDebugFlags   -O2
+#  define OptimizedCDebugFlags  -O2
 # endif
 # define ByteOrder              X_BIG_ENDIAN
 #endif /* PpcDarwinArchitecture */
@@ -163,9 +202,9 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
 #ifdef i386DarwinArchitecture
 # define DarwinMachineDefines   -D__i386__
 # if HasGcc3
-#  define OptimizedCDebugFlags   -Os
+#  define OptimizedCDebugFlags  -Os
 # else
-#  define OptimizedCDebugFlags   -O2 -fno-strength-reduce
+#  define OptimizedCDebugFlags  -O2 -fno-strength-reduce
 # endif
 # define ByteOrder              X_LITTLE_ENDIAN
 #endif /* i386DarwinArchitecture */
@@ -206,13 +245,13 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
 #define BuildXInputLib          YES
 
 /* no Display Power Management extension */
-#define BuildDPMSExt            NO
+#define BuildDPMS               NO
 
 /* no XFree86-Misc extension */
 #define BuildXF86MiscExt        NO
 
 /* no XFree86-VidMode extension */
-#define BuildXF86VidModeExt	NO
+#define BuildXF86VidModeExt     NO
 
 #define BuildLibPathVar         DYLD_LIBRARY_PATH
 
@@ -220,6 +259,25 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
 #include <darwinLib.rules>
 
 /*
+ * BundleProgramTarget - Generate rules for compiling, linking and
+ * installing a bundle executable. 
+ */
+#ifndef BundleProgramTarget
+#define BundleProgramTarget(program,loader,subdirs,objs,deplib,syslib,dstdir) @@\
+                                                                        @@\
+AllTarget(program)							@@\
+									@@\
+program: loader subdirs objs deplib					@@\
+	RemoveTargetProgram($@)						@@\
+	LinkRule($@,-bundle $(LDOPTIONS),objs,deplib $(LDLIBS) syslib -bundle_loader loader) @@\
+									@@\
+InstallProgram(program,dstdir/program.bundle/Contents/MacOS)		@@\
+									@@\
+clean::									@@\
+	RemoveFile(program)
+#endif /* BundleProgramTarget */
+
+/*
  * Darwin specific Imake Config files
  */
 #ifndef LocalConfigFiles