XQuartz: Initial work on readding GLX to the 1.5 server

(cherry picked from commit a186cab6ae)

configure.ac

@@ -638,7 +638,6 @@ case $host_os in
 			XQUARTZ=yes
 			XVFB=no
 			XNEST=no
-			GLX=no
 
 			COMPOSITE=no
 			DGA=no

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

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 \

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 = \