configure: improve checks for GLX.

diff --git a/configure.ac b/configure.ac
index d0209fc..a8f6e00 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -277,21 +277,43 @@ dnl ---------------------------------------------------------------------------
 dnl Check for X11
 PKG_CHECK_MODULES(X11, [x11])
 
-dnl Check for OpenGL
-USE_GLX=1
-if test "$enable_glx" != "yes"; then
-    USE_GLX=0
+dnl OpenGL
+enable_opengl="no"
+if test "$enable_glx" = "yes"; then
+    enable_opengl="yes"
 fi
-GLX_CFLAGS=""
-GLX_LIBS=""
-AC_CHECK_HEADERS([GL/gl.h GL/glext.h GL/glx.h], [], [USE_GLX=0], [
+
+HAVE_GL=0
+if test "$enable_opengl" = "yes"; then
+    HAVE_GL=1
+    PKG_CHECK_MODULES([GL], [gl], [:], [HAVE_GL=0])
+    saved_CPPFLAGS="$CPPFLAGS"
+    CPPFLAGS="$CPPFLAGS $GL_CFLAGS"
+    AC_CHECK_HEADERS([GL/gl.h GL/glext.h], [:], [HAVE_GL=0], [
 #ifdef HAVE_GL_GL_H
 # include <GL/gl.h>
 #endif
-])
-AC_CHECK_LIB(GL, glXCreateContext, [GLX_LIBS="-lGL"], [USE_GLX=0])
-AC_SUBST(GLX_CFLAGS)
-AC_SUBST(GLX_LIBS)
+    ])
+    CPPFLAGS="$saved_CPPFLAGS"
+fi
+
+dnl ... GLX
+USE_GLX=0
+if test "$enable_glx" = "yes" -a $HAVE_GL -eq 1; then
+    USE_GLX=1
+    saved_CPPFLAGS="$CPPFLAGS"
+    saved_LIBS="$LIBS"
+    CPPFLAGS="$CPPFLAGS $GL_CFLAGS"
+    LIBS="$LIBS $GL_LIBS"
+    AC_CHECK_HEADERS([GL/glx.h], [:], [USE_GLX=0], [
+#ifdef HAVE_GL_GL_H
+# include <GL/gl.h>
+#endif
+    ])
+    AC_CHECK_LIB([GL], [glXCreateContext], [:], [USE_GLX=0])
+    CPPFLAGS="$saved_CPPFLAGS"
+    LIBS="$saved_LIBS"
+fi
 
 dnl ---------------------------------------------------------------------------
 dnl -- VA-API                                                                --

diff --git a/gst-libs/gst/vaapi/Makefile.am b/gst-libs/gst/vaapi/Makefile.am
index 49f95c5..1ddf17f 100644 (file)
--- a/gst-libs/gst/vaapi/Makefile.am
+++ b/gst-libs/gst/vaapi/Makefile.am
@@ -234,13 +234,13 @@ libgstvaapi_glx_@GST_MAJORMINOR@_la_CFLAGS =      \
        -I$(top_srcdir)/gst-libs                \
        $(GLIB_CFLAGS)                          \
        $(GST_BASE_CFLAGS)                      \
-       $(GLX_CFLAGS)                           \
+       $(GL_CFLAGS)                            \
        $(LIBVA_GLX_CFLAGS)                     \
        $(NULL)
 
 libgstvaapi_glx_@GST_MAJORMINOR@_la_LIBADD =   \
        $(GLIB_LIBS)                            \
-       $(GLX_LIBS)                             \
+       $(GL_LIBS)                              \
        $(LIBVA_GLX_LIBS)                       \
        libgstvaapi-x11-@GST_MAJORMINOR@.la     \
        $(NULL)