summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Kost <ensonic@users.sourceforge.net>2007-05-10 07:41:47 +0000
committerStefan Kost <ensonic@users.sourceforge.net>2007-05-10 07:41:47 +0000
commit9fb6db067b7407d6feae421432d363c6a29bd89a (patch)
tree215d5a703a4b13e8305f1702149d218a2decafd8
parent2a8b70f736eb9ed758f78313cd0c24b295bc58b6 (diff)
downloadgst-plugins-bad-9fb6db067b7407d6feae421432d363c6a29bd89a.tar.gz
gst-plugins-bad-9fb6db067b7407d6feae421432d363c6a29bd89a.tar.bz2
gst-plugins-bad-9fb6db067b7407d6feae421432d363c6a29bd89a.zip
common/m4/gst-x11.m4: Restore CFLAGS and LIBS.
Original commit message from CVS: * common/m4/gst-x11.m4: Restore CFLAGS and LIBS. * configure.ac: Revert previous patch.
-rw-r--r--ChangeLog8
-rw-r--r--configure.ac2
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 913f2d10..972b04ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2007-05-10 Stefan Kost <ensonic@users.sf.net>
+ * common/m4/gst-x11.m4:
+ Restore CFLAGS and LIBS.
+
+ * configure.ac:
+ Revert previous patch.
+
+2007-05-10 Stefan Kost <ensonic@users.sf.net>
+
Patch by: Ali Sabil <ali.sabil@gmail.com>
* configure.ac:
diff --git a/configure.ac b/configure.ac
index e783a4b8..bbe3cc01 100644
--- a/configure.ac
+++ b/configure.ac
@@ -290,7 +290,6 @@ 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"
@@ -299,7 +298,6 @@ 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