xserver: Branch 'xorg-server-1.2-apple' - 2 commits

[Ben Byer]

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

New commits:
commit 9be5f6c850f1e6684a3c00ee886cbae7da728b77
Author: Ben Byer <bbyer at bbyer.local>
Date:   Fri Nov 9 04:13:01 2007 -0800

    bump to 1.2a8

diff --git a/configure.ac b/configure.ac
index 083bc2d..3a046ce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,7 +28,7 @@ dnl Process this file with autoconf to create configure.
 AC_PREREQ(2.57)
 dnl This is the not the Xorg version number, it's the server version number.
 dnl Yes, that's weird.
-AC_INIT([xorg-server], 1.2a7, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+AC_INIT([xorg-server], 1.2a8, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([dist-bzip2 foreign])
 AM_MAINTAINER_MODE
diff --git a/hw/darwin/apple/X11Application.m b/hw/darwin/apple/X11Application.m
index 1033e95..92d369b 100644
--- a/hw/darwin/apple/X11Application.m
+++ b/hw/darwin/apple/X11Application.m
@@ -156,7 +156,7 @@ message_kit_thread (SEL selector, NSObject *arg)
 	
     tem = [infoDict objectForKey:@"CFBundleShortVersionString"];
 	
-    [dict setObject:[NSString stringWithFormat:@"X11.app %@ - X.org X11R7.2 (xorg-server-1.2a7)",
+    [dict setObject:[NSString stringWithFormat:@"X11.app %@ - X.org X11R7.2 (xorg-server-1.2a8)",
 					 tem] forKey:@"ApplicationVersion"];
 	
     [self orderFrontStandardAboutPanelWithOptions: dict];
commit e99a715e54d5c990d976a38020bf78c9dda3fed4
Author: Ben Byer <bbyer at bbyer.local>
Date:   Fri Nov 9 03:40:37 2007 -0800

    fixes to allow Xvfb and Xephyr to be built if you build with --disable-xdarwin

diff --git a/configure.ac b/configure.ac
index 22252fb..083bc2d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1727,7 +1727,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"
 
     # dix os fb mi extension glx (NOTYET) damage shadow xpstubs
     #KDRIVE_PURE_LIBS="$DIX_LIB $OS_LIB $FB_LIB $XEXT_LIB $MIEXT_DAMAGE_LIB \
diff --git a/dix/main.c b/dix/main.c
index f3cde18..586b800 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 a1918ab..db76977 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 8736745..f15d0c9 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -672,10 +672,10 @@ InitVisualWrap()
 {
     miResetInitVisuals();
 #ifdef GLXEXT
-#ifndef __DARWIN__
-    GlxWrapInitVisuals(&miInitVisualsProc);
-#else
+#ifdef INXQUARTZ
     DarwinGlxWrapInitVisuals(&miInitVisualsProc);
+#else
+    GlxWrapInitVisuals(&miInitVisualsProc);
 #endif
 #endif
 }