From 53b373451142aeea9111143d7902bf8f5716ef75 Mon Sep 17 00:00:00 2001 From: Dan Nicholson Date: Wed, 25 Feb 2009 17:45:34 -0800 Subject: autoconf: Fixup EGL build This gets the needed libraries pulled in for libEGL for autoconf. --- configs/autoconf.in | 1 + configure.ac | 13 +++++++++++++ 2 files changed, 14 insertions(+) diff --git a/configs/autoconf.in b/configs/autoconf.in index af66d58a6d..e034431618 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 bc233a7509..a57e5b3ea7 100644 --- 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 -- cgit v1.2.3