diff options
| author | George Sapountzis <[email protected]> | 2008-04-26 12:34:11 +0300 |
|---|---|---|
| committer | George Sapountzis <[email protected]> | 2008-05-05 18:14:52 +0300 |
| commit | 2ed0f7278e389ecc0cf568518799a9a8f33b1365 (patch) | |
| tree | 6da3d05a379c49854ca477a49bda9fe415302bcf /configure.ac | |
| parent | 2fa2dd3908c783663ca421134cde82e9b6a38a0d (diff) | |
glcore: Set all external variables in configuration
based on patch by Dan Nicholson <[email protected]>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 672bab85c18..1e9a7981f8b 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 @@ -642,6 +638,18 @@ 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 AC_ARG_ENABLE(glu, |