Switch to using pkgconfig to detect libGL. Since we use recent features added to...

Original commit message from CVS:
* configure.ac:
* sys/glsink/Makefile.am:
Switch to using pkgconfig to detect libGL.  Since we use
recent features added to Mesa, there's no point in adding
a check for pre-pkgconfig versions.

diff --git a/ChangeLog b/ChangeLog
index 86bdd63..ea018a6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-12-30  David Schleef  <ds@schleef.org>
+
+       * configure.ac:
+       * sys/glsink/Makefile.am:
+         Switch to using pkgconfig to detect libGL.  Since we use
+         recent features added to Mesa, there's no point in adding
+         a check for pre-pkgconfig versions.
+
 2007-12-29  Sebastian Dröge  <slomo@circular-chaos.org>
 
        * ext/ladspa/gstladspa.c: (gst_ladspa_get_property):

diff --git a/configure.ac b/configure.ac
index ec60e61..976cb28 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -286,17 +286,16 @@ dnl *** sys plug-ins ***
 
 dnl OpenGL
 translit(dnm, m, l) AM_CONDITIONAL(USE_OPENGL, true)
-AG_GST_CHECK_X
-save_CPPFLAGS="$CPPFLAGS"
-save_LIBS="$LIBS"
-CPPFLAGS="$CPPFLAGS $X_CFLAGS"
-LIBS="$LIBS $X_LIBS"
 AG_GST_CHECK_FEATURE(OPENGL, [Open GL], glsink, [
-  AG_GST_CHECK_LIBHEADER(GL, GL, glTexImage2D,,
-                      GL/gl.h, HAVE_OPENGL="yes", HAVE_OPENGL="no")
+  PKG_CHECK_MODULES(GL, gl >= 7.1.0, [
+    HAVE_GL="yes"
+    AC_SUBST(GL_CFLAGS)
+    AC_SUBST(GL_LIBS)
+  ],[
+    HAVE_GL=no
+    AC_MSG_RESULT(no)
+  ])
 ])
-CPPFLAGS="$save_CPPFLAGS"
-LIBS="$save_LIBS"
 
 dnl check for QuickTime
 translit(dnm, m, l) AM_CONDITIONAL(USE_QUICKTIME, true)

diff --git a/sys/glsink/Makefile.am b/sys/glsink/Makefile.am
index 6cb9dd1..1929e45 100644 (file)
--- a/sys/glsink/Makefile.am
+++ b/sys/glsink/Makefile.am
@@ -20,8 +20,8 @@ libgstglimagesink_la_SOURCES = \
        gstglfilterexample.c \
        gstglconvert.c
 libgstglimagesink_la_CFLAGS = $(GST_CFLAGS) $(X_CFLAGS) $(GST_BASE_CFLAGS) \
-       $(GST_PLUGINS_BASE_CFLAGS)
-libgstglimagesink_la_LIBADD = $(X_LIBS) $(XSHM_LIBS) -lGL \
+       $(GST_PLUGINS_BASE_CFLAGS) $(GL_CFLAGS)
+libgstglimagesink_la_LIBADD = $(GL_LIBS) \
        $(GST_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \
        $(GST_PLUGINS_BASE_LIBS) -lgstinterfaces-$(GST_MAJORMINOR)
 libgstglimagesink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)