summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--configure.ac3
2 files changed, 11 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 718f8f5d..913f2d10 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-05-10 Stefan Kost <ensonic@users.sf.net>
+
+ Patch by: Ali Sabil <ali.sabil@gmail.com>
+
+ * configure.ac:
+ Save and restore CFLAGS for OpenGL check. Fixes #437260.
+
+
2007-05-09 Sebastien Moutte <sebastien@moutte.net>
* docs/plugins/gst-plugins-bad-plugins.args:
diff --git a/configure.ac b/configure.ac
index 7ec0f7ef..e783a4b8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -290,6 +290,7 @@ dnl OpenGL
translit(dnm, m, l) AM_CONDITIONAL(USE_OPENGL, true)
AG_GST_CHECK_X
save_CPPFLAGS="$CPPFLAGS"
+save_CFLAGS="$CFLAGS"
save_LIBS="$LIBS"
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
LIBS="$LIBS $X_LIBS"
@@ -298,6 +299,7 @@ AG_GST_CHECK_FEATURE(OPENGL, [Open GL], glsink, [
GL/gl.h, HAVE_OPENGL="yes", HAVE_OPENGL="no")
])
CPPFLAGS="$save_CPPFLAGS"
+CFLAGS="$save_CFLAGS"
LIBS="$save_LIBS"
dnl Check for X11
@@ -1084,6 +1086,7 @@ dnl *** output files ***
dnl po/Makefile.in
+
AC_CONFIG_FILES(
Makefile
gst-plugins-bad.spec