summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Nicholson <[email protected]>2009-02-25 17:45:34 -0800
committerDan Nicholson <[email protected]>2009-02-25 17:45:34 -0800
commit53b373451142aeea9111143d7902bf8f5716ef75 (patch)
tree2cedd0a3cff371a5328507e28a45e361e3ade6f5
parentd0415a5a01c1a8c2c2a389d977401a7f6cee031b (diff)
autoconf: Fixup EGL build
This gets the needed libraries pulled in for libEGL for autoconf.
-rw-r--r--configs/autoconf.in1
-rw-r--r--configure.ac13
2 files changed, 14 insertions, 0 deletions
diff --git a/configs/autoconf.in b/configs/autoconf.in
index af66d58a6d2..e0344316181 100644
--- a/configs/autoconf.in
+++ b/configs/autoconf.in
@@ -90,6 +90,7 @@ MOTIF_CFLAGS = @MOTIF_CFLAGS@
GL_LIB_DEPS = $(EXTRA_LIB_PATH) @GL_LIB_DEPS@
OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) @OSMESA_MESA_DEPS@ \
$(EXTRA_LIB_PATH) @OSMESA_LIB_DEPS@
+EGL_LIB_DEPS = $(EXTRA_LIB_PATH) @EGL_LIB_DEPS@
GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) @GLU_MESA_DEPS@ \
$(EXTRA_LIB_PATH) @GLU_LIB_DEPS@
GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) @GLUT_MESA_DEPS@ \
diff --git a/configure.ac b/configure.ac
index bc233a75099..a57e5b3ea7a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -856,6 +856,19 @@ AC_SUBST([OSMESA_PC_REQ])
AC_SUBST([OSMESA_PC_LIB_PRIV])
dnl
+dnl EGL configuration
+dnl
+if test "$x11_pkgconfig" = yes; then
+ PKG_CHECK_MODULES([EGL],[x11])
+ EGL_LIB_DEPS="$EGL_LIBS"
+else
+ # should check these...
+ EGL_LIB_DEPS="$X_LIBS -lX11"
+fi
+EGL_LIB_DEPS="$EGL_LIB_DEPS $DLOPEN_LIBS $OS_LIBS"
+AC_SUBST([EGL_LIB_DEPS])
+
+dnl
dnl GLU configuration
dnl
AC_ARG_ENABLE([glu],