From c213749b19b80a2757b6a4898d7d073937f14439 Mon Sep 17 00:00:00 2001
From: Ben Byer <bbyer@bbyer.local>
Date: Fri, 9 Nov 2007 03:40:37 -0800
Subject: [PATCH] fixes to allow Xvfb and Xephyr to be built if you build with
 --disable-xdarwin

---
 configure.ac   | 2 +-
 dix/main.c     | 2 +-
 hw/Makefile.am | 2 ++
 mi/miinitext.c | 6 +++---
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index 3b6d3858b..0935d158b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1868,7 +1868,7 @@ if test "$KDRIVE" = yes; then
     KDRIVE_OS_INC='-I$(top_srcdir)/hw/kdrive/linux'
     KDRIVE_INCS="$KDRIVE_PURE_INCS $KDRIVE_OS_INC"
     
-    KDRIVE_CFLAGS="$XSERVER_CFLAGS -DHAVE_KDRIVE_CONFIG_H $TSLIB_CFLAGS"
+    KDRIVE_CFLAGS="$XSERVER_CFLAGS -DHAVE_KDRIVE_CONFIG_H $TSLIB_CFLAGS -fno-common"
 
     KDRIVE_PURE_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB $OS_LIB"
     KDRIVE_LIB='$(top_builddir)/hw/kdrive/src/libkdrive.a'
diff --git a/dix/main.c b/dix/main.c
index 31e291b02..80d89006a 100644
--- a/dix/main.c
+++ b/dix/main.c
@@ -259,7 +259,7 @@ main(int argc, char *argv[], char *envp[])
     /* Quartz support on Mac OS X requires that the Cocoa event loop be in
      * the main thread. This allows the X server main to be called again
      * from another thread. */
-#if defined(__DARWIN__) && defined(DARWIN_WITH_QUARTZ)
+#ifdef DARWIN_WITH_QUARTZ
     DarwinHandleGUI(argc, argv, envp);
 #endif
 
diff --git a/hw/Makefile.am b/hw/Makefile.am
index a1918ab0e..db76977af 100644
--- a/hw/Makefile.am
+++ b/hw/Makefile.am
@@ -22,7 +22,9 @@ if XPRINT
 XPRINT_SUBDIRS = xprint
 endif
 
+if XDARWIN
 DARWIN_SUBDIRS = darwin
+endif
 
 SUBDIRS =			\
 	$(XORG_SUBDIRS)		\
diff --git a/mi/miinitext.c b/mi/miinitext.c
index fa760708a..6522890ed 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -673,10 +673,10 @@ InitVisualWrap()
 {
     miResetInitVisuals();
 #ifdef GLXEXT
-#ifndef __DARWIN__
-    GlxWrapInitVisuals(&miInitVisualsProc);
-#else
+#ifdef INXQUARTZ
     DarwinGlxWrapInitVisuals(&miInitVisualsProc);
+#else
+    GlxWrapInitVisuals(&miInitVisualsProc);
 #endif
 #endif
 }