glcore: Set all external variables in configuration

based on patch by Dan Nicholson <dbn.lists@gmail.com>

configs/autoconf.in

@@ -79,6 +79,7 @@ GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) @GLW_MESA_DEPS@ \
 APP_LIB_DEPS = $(EXTRA_LIB_PATH) @APP_LIB_DEPS@
 
 # GLcore dependencies
+XORG_CFLAGS = @XORG_CFLAGS@
 GLCORE_LIB_DEPS = $(EXTRA_LIB_PATH) @GLCORE_LIB_DEPS@
 
 # DRI dependencies

configs/default

@@ -80,6 +80,9 @@ GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lXt -lX11
 # Program dependencies - specific GL/glut libraries added in Makefiles
 APP_LIB_DEPS = -lm
 
+# GLcore dependencies
+XORG_CFLAGS = `pkg-config --cflags xorg-server`
+GLCORE_LIB_DEPS = -lm -lpthread
 
 
 # Installation directories (for make install)

configure.ac

@@ -381,7 +381,6 @@ xlib)
         GL_LIB_DEPS="$X_LIBS -lX11 -lXext"
     fi
     GL_LIB_DEPS="$GL_LIB_DEPS $SELINUX_LIBS -lm -lpthread"
-    GLCORE_LIB_DEPS=""
 
     # if static, move the external libraries to the programs
     # and empty the libraries for libGL
@@ -413,16 +412,13 @@ dri)
 
     # need DRM libs, -lpthread, etc.
     GL_LIB_DEPS="$GL_LIB_DEPS $LIBDRM_LIBS -lm -lpthread $DLOPEN_LIBS"
-    GLCORE_LIB_DEPS="-lm -lpthread $DLOPEN_LIBS"
     ;;
 osmesa)
     # No libGL for osmesa
     GL_LIB_DEPS=""
-    GLCORE_LIB_DEPS=""
     ;;
 esac
 AC_SUBST(GL_LIB_DEPS)
-AC_SUBST(GLCORE_LIB_DEPS)
 
 dnl
 dnl More X11 setup
@@ -641,6 +637,18 @@ esac
 AC_SUBST(OSMESA_LIB_DEPS)
 AC_SUBST(OSMESA_MESA_DEPS)
 
+dnl
+dnl GLcore configuration
+dnl
+# delay pkg-config checks until `make glcore' run
+XORG_CFLAGS='`pkg-config --cflags xorg-server`'
+GLCORE_LIB_DEPS='-lm -lpthread'
+if test "$mesa_driver" = dri; then
+    GLCORE_LIB_DEPS="$GLCORE_LIB_DEPS $DLOPEN_LIBS"
+fi
+AC_SUBST(XORG_CFLAGS)
+AC_SUBST(GLCORE_LIB_DEPS)
+
 dnl
 dnl GLU configuration
 dnl

src/mesa/drivers/xorg/Makefile

@@ -32,7 +32,7 @@ C_SOURCES =		\
 MESA_MODULES = $(TOP)/src/mesa/libmesa.a
 
 C_SOURCES += ../common/driverfuncs.c
-ifeq ("${DRIVER_DIRS}", "dri")
+ifeq ($(WINDOW_SYSTEM),dri)
 C_SOURCES += ../dri/common/utils.c
 endif
 
@@ -46,12 +46,12 @@ INCLUDES = \
 	-I$(TOP)/src/mesa \
 	-I$(TOP)/src/mesa/main \
 	-I$(TOP)/src/mesa/glapi \
-	`pkg-config --cflags xorg-server`
+	$(XORG_CFLAGS)
 
-ifeq ("${DRIVER_DIRS}", "dri")
+ifeq ($(WINDOW_SYSTEM),dri)
 INCLUDES += \
 	-I$(TOP)/src/mesa/drivers/dri/common \
-	`pkg-config --cflags libdrm`
+	$(LIBDRM_CFLAGS)
 endif
 
 # undef 'USE_XSHM' to make it explicit that 'XFree86Server' takes precedence