xserver: Branch 'xorg-server-1.4-apple' - 4 commits

[Jeremy Huddleston]

 configure.ac                        |    8 ++++----
 hw/xquartz/Makefile.am              |    6 ++++++
 hw/xquartz/mach-startup/Makefile.am |   12 ++++++++++--
 hw/xquartz/mach-startup/stub.c      |    8 ++++++++
 4 files changed, 28 insertions(+), 6 deletions(-)

New commits:
commit 5b015850d25614fe3517b77ac9e07639d9376c25
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Fri Nov 21 11:20:58 2008 -0800

    1.4.2-apple24

diff --git a/configure.ac b/configure.ac
index 31d3a72..3863859 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.57)
-AC_INIT([xorg-server], 1.4.2-apple23, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+AC_INIT([xorg-server], 1.4.2-apple24, [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
commit e62107e55261ef252a2a24dd26a60e5dd295d560
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Fri Nov 21 11:20:31 2008 -0800

    XQuartz: Don't use LS to find X11.app on Tiger.

diff --git a/hw/xquartz/mach-startup/stub.c b/hw/xquartz/mach-startup/stub.c
index a011c4e..bc4f7ec 100644
--- a/hw/xquartz/mach-startup/stub.c
+++ b/hw/xquartz/mach-startup/stub.c
@@ -50,6 +50,8 @@
 
 #include <signal.h>
 
+#include <AvailabilityMacros.h>
+
 #include "launchd_fd.h"
 
 #ifndef BUILD_DATE
@@ -66,6 +68,8 @@ static char x11_path[PATH_MAX + 1];
 static pid_t x11app_pid = 0;
 
 static void set_x11_path() {
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
+
     CFURLRef appURL = NULL;
     CFBundleRef bundle = NULL;
     OSStatus osstatus = LSFindApplicationForInfo(kLSUnknownCreator, CFSTR(kX11AppBundleId), nil, nil, &appURL);
@@ -117,6 +121,10 @@ static void set_x11_path() {
                     kX11AppBundleId, (int)osstatus);
             exit(11);
     }
+#else
+    /* TODO: Make Tiger smarter... but TBH, this should never get called on Tiger... */
+    strlcpy(x11_path, "/Applications/Utilities/X11.app/Contents/MacOS/X11", sizeof(x11_path));
+#endif
 }
 
 static int connect_to_socket(const char *filename) {
commit 0ad91c59be8759a9c9e9d4f639056d8c689a3bc5
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Fri Nov 21 11:08:00 2008 -0800

    XQuartz: Update applewm deps

diff --git a/configure.ac b/configure.ac
index e613eb3..31d3a72 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1766,7 +1766,8 @@ if test "x$XQUARTZ" = xyes; then
 
 	CFLAGS="${CFLAGS} -DROOTLESS_WORKAROUND -DROOTLESS_SAFEALPHA -DNO_ALLOCA"
 
-	PKG_CHECK_MODULES(APPLEWM, [applewmproto >= 1.1.1])
+	PKG_CHECK_MODULES(APPLEWMPROTO, [applewmproto >= 1.1.1])
+	PKG_CHECK_MODULES(APPLEWM, [applewm >= 1.0.0])
 
 	if test "x$STANDALONE_XPBPROXY" = xyes ; then
 		AC_DEFINE(STANDALONE_XPBPROXY,1,[Build a standalone xpbproxy])
commit b6490aef49a1cd45fc1cf9f56947eb642b8ecff8
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Fri Nov 21 11:03:11 2008 -0800

    XQuartz: honor --disable-glx

diff --git a/configure.ac b/configure.ac
index 2518ee2..e613eb3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1759,8 +1759,7 @@ if test "x$XQUARTZ" = xyes; then
 	AC_DEFINE(XQUARTZ,1,[Have Quartz])
 	AC_DEFINE(ROOTLESS,1,[Build Rootless code])
 
-	DARWIN_GLX_LIBS='$(top_builddir)/hw/xquartz/GL/libCGLCore.la $(top_builddir)/GL/glx/libglx.la'
-	DARWIN_LIBS="$MI_LIB $OS_LIB $DIX_LIB $FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $XTRAP_LIB $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $XPSTUBS_LIB $DARWIN_GLX_LIBS"
+	DARWIN_LIBS="$MI_LIB $OS_LIB $DIX_LIB $FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $XTRAP_LIB $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $XPSTUBS_LIB"
 	AC_SUBST([DARWIN_LIBS])
 
 	AC_CHECK_LIB([Xplugin],[xp_init],[:])
diff --git a/hw/xquartz/Makefile.am b/hw/xquartz/Makefile.am
index 6dd446d..f9d7823 100644
--- a/hw/xquartz/Makefile.am
+++ b/hw/xquartz/Makefile.am
@@ -9,8 +9,14 @@ AM_CPPFLAGS = \
 	-DXFree86Server \
 	-I$(top_srcdir)/miext/rootless
 
+if GLX
+GL_DIR = GL
+endif
+
 SUBDIRS = bundle . GL xpr pbproxy mach-startup doc
 
+DIST_SUBDIRS = bundle . $(GL_DIR) xpr pbproxy mach-startup doc
+
 libXquartz_la_SOURCES = \
 	$(top_srcdir)/fb/fbcmap_mi.c \
 	$(top_srcdir)/mi/miinitext.c \
diff --git a/hw/xquartz/mach-startup/Makefile.am b/hw/xquartz/mach-startup/Makefile.am
index cb5276b..889da80 100644
--- a/hw/xquartz/mach-startup/Makefile.am
+++ b/hw/xquartz/mach-startup/Makefile.am
@@ -24,12 +24,20 @@ X11_LDFLAGS =  \
 	-XCClinker -Objc \
 	-Wl,-u,_miDCInitialize \
 	-Wl,-framework,Carbon \
-	-L/System/Library/Frameworks/OpenGL.framework/Libraries -lGL \
-	-Wl,-framework,OpenGL \
 	-Wl,-framework,Cocoa \
 	-Wl,-framework,CoreAudio \
 	-Wl,-framework,IOKit
 
+if GLX
+X11_LDADD += \
+	$(top_builddir)/hw/xquartz/GL/libCGLCore.la \
+	$(top_builddir)/GL/glx/libglx.la
+
+X11_LDFLAGS += \
+	-L/System/Library/Frameworks/OpenGL.framework/Libraries -lGL \
+	-Wl,-framework,OpenGL
+endif
+
 bin_PROGRAMS = Xquartz
 
 dist_Xquartz_SOURCES = \