From 2ed0f7278e389ecc0cf568518799a9a8f33b1365 Mon Sep 17 00:00:00 2001
From: George Sapountzis <gsap7@yahoo.gr>
Date: Sat, 26 Apr 2008 12:34:11 +0300
Subject: glcore: Set all external variables in configuration

based on patch by Dan Nicholson <dbn.lists@gmail.com>
---
 configure.ac | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 672bab85c1..1e9a7981f8 100644
--- a/configure.ac
+++ b/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
-- 
cgit v1.2.3