xserver: Branch 'xorg-server-1.5-apple'

[Jeremy Huddleston]

 configure.ac                        |    1 -
 hw/xquartz/GL/Makefile.am           |    2 ++
 hw/xquartz/Makefile.am              |    9 +++++++--
 hw/xquartz/mach-startup/Makefile.am |   12 ++++++++++--
 4 files changed, 19 insertions(+), 5 deletions(-)

New commits:
commit a186cab6ae82340770c13b37ff5df731ce2a0ceb
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Fri Nov 14 14:57:09 2008 -0800

    XQuartz: Initial work on readding GLX to the 1.5 server

diff --git a/configure.ac b/configure.ac
index 0d664e2..2c34b3a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -671,7 +671,6 @@ case $host_os in
 			XQUARTZ=yes
 			XVFB=no
 			XNEST=no
-			GLX=no
 
 			COMPOSITE=no
 			DGA=no
diff --git a/hw/xquartz/GL/Makefile.am b/hw/xquartz/GL/Makefile.am
index 8f4478f..728746a 100644
--- a/hw/xquartz/GL/Makefile.am
+++ b/hw/xquartz/GL/Makefile.am
@@ -12,8 +12,10 @@ AM_CPPFLAGS = \
 libCGLCore_la_SOURCES = \
 	indirect.c \
 	capabilities.c \
+	glcontextmodes.c \
 	visualConfigs.c
 
 EXTRA_DIST = \
 	capabilities.h \
+	glcontextmodes.h \
 	visualConfigs.h
diff --git a/hw/xquartz/Makefile.am b/hw/xquartz/Makefile.am
index 782321e..cc1ff83 100644
--- a/hw/xquartz/Makefile.am
+++ b/hw/xquartz/Makefile.am
@@ -9,8 +9,13 @@ AM_CPPFLAGS = \
 	-DXFree86Server \
 	-I$(top_srcdir)/miext/rootless
 
-# GL
-SUBDIRS = bundle . xpr mach-startup doc pbproxy
+if GLX
+GL_DIR = GL
+endif
+
+SUBDIRS = bundle . GL xpr mach-startup doc pbproxy
+
+DIST_SUBDIRS = bundle . $(GL_DIR) xpr mach-startup doc pbproxy
 
 libXquartz_la_SOURCES = \
 	$(top_srcdir)/fb/fbcmap_mi.c \
diff --git a/hw/xquartz/mach-startup/Makefile.am b/hw/xquartz/mach-startup/Makefile.am
index 800fb0c..aa71f8e 100644
--- a/hw/xquartz/mach-startup/Makefile.am
+++ b/hw/xquartz/mach-startup/Makefile.am
@@ -27,12 +27,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)/glx/libglx.la
+
+X11_LDFLAGS += \
+	-L/System/Library/Frameworks/OpenGL.framework/Libraries -lGL \
+	-Wl,-framework,OpenGL
+endif
+
 bin_PROGRAMS = Xquartz
 
 dist_Xquartz_SOURCES = \