autoconf: Fixup EGL build

This gets the needed libraries pulled in for libEGL for autoconf.

diff --git a/configs/autoconf.in b/configs/autoconf.in
index af66d58a6d2b66f23670ce681659c8a17844adc0..e034431618168c998705f8126bdd437850f52218 100644 (file)
--- 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 bc233a75099e351273cb19d2c20838a79efcf1d0..a57e5b3ea7a94b815c28ce8917313c5f71c29686 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -855,6 +855,19 @@ AC_SUBST([OSMESA_MESA_DEPS])
 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