configure: fix GLX and EGL tests.

Migrate checks for GLX and EGL to pkg-config checks or use default
include and libraries for testing.

Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>

diff --git a/configure.ac b/configure.ac
index b4ec1e5..7d47a00 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -180,13 +180,17 @@ AM_CONDITIONAL(BUILD_DUMMY_BACKEND, test x$enable_dummy_backend = xyes)
 USE_GLX="no"
 GL_DEPS_CFLAGS=""
 GL_DEPS_LIBS=""
-if test x$enable_glx = xyes; then
+if test "$enable_glx" = "yes"; then
+    saved_CFLAGS="$CFLAGS"
+    saved_LIBS="$LIBS"
+    PKG_CHECK_MODULES([GL_DEPS], [gl], [], [GL_DEPS_LIBS="-lX11 -lGL"])
+    CFLAGS="$CFLAGS $GL_DEPS_CFLAGS"
+    LIBS="$LIBS $GL_DEPS_LIBS"
     AC_CHECK_HEADERS([GL/gl.h])
     AC_CHECK_HEADERS([GL/glx.h])
-    AC_CHECK_LIB(GL, glXCreateContext, [
-        USE_GLX="yes"
-        GL_DEPS_LIBS="-lX11 -lGL"
-    ])
+    AC_CHECK_LIB(GL, glXCreateContext, [USE_GLX="yes"])
+    CFLAGS="$saved_CFLAGS"
+    LIBS="$saved_LIBS"
 fi
 AC_SUBST(GL_DEPS_CFLAGS)
 AC_SUBST(GL_DEPS_LIBS)
@@ -197,18 +201,19 @@ USE_EGL="no"
 EGL_DEPS_CFLAGS=""
 EGL_DEPS_LIBS=""
 if test "$enable_egl" = "yes"; then
-    AC_CHECK_HEADERS([EGL/egl.h], [USE_EGL="yes"])
+    saved_CFLAGS="$CFLAGS"
+    saved_LIBS="$LIBS"
+    PKG_CHECK_MODULES([EGL_DEPS], [egl], [], [EGL_DEPS_LIBS="-lEGL"])
+    CFLAGS="$CFLAGS $EGL_DEPS_CFLAGS"
+    LIBS="$LIBS $EGL_DEPS_LIBS"
+    AC_CHECK_HEADERS([EGL/egl.h])
+    AC_CHECK_LIB(EGL, eglGetDisplay, [USE_EGL="yes"])
+    CFLAGS="$saved_CFLAGS"
+    LIBS="$saved_LIBS"
+
+    libglesv1_cm="no"
+    PKG_CHECK_MODULES([GLESv1_CM], [glesv1_cm], [libglesv1_cm="yes"], [])
 fi
-
-if test "x$USE_EGL" = "xyes"; then
-    AC_CHECK_LIB(EGL, eglGetDisplay, [
-        USE_EGL="yes"
-        EGL_DEPS_LIBS="-lEGL"
-    ])
-
-    PKG_CHECK_MODULES([GLESv1_CM], [glesv1_cm], [libglesv1_cm=yes], [libglesv1_cm=no])
-fi
-
 AC_SUBST(EGL_DEPS_CFLAGS)
 AC_SUBST(EGL_DEPS_LIBS)
 AM_CONDITIONAL(USE_EGL, test "$USE_EGL" = "yes")