From 2a8b70f736eb9ed758f78313cd0c24b295bc58b6 Mon Sep 17 00:00:00 2001 From: Ali Sabil Date: Thu, 10 May 2007 06:35:31 +0000 Subject: [PATCH] configure.ac: Save and restore CFLAGS for OpenGL check. Fixes #437260. Original commit message from CVS: Patch by: Ali Sabil * configure.ac: Save and restore CFLAGS for OpenGL check. Fixes #437260. --- ChangeLog | 8 ++++++++ configure.ac | 3 +++ 2 files changed, 11 insertions(+) diff --git a/ChangeLog b/ChangeLog index 718f8f5d63..913f2d102f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2007-05-10 Stefan Kost + + Patch by: Ali Sabil + + * configure.ac: + Save and restore CFLAGS for OpenGL check. Fixes #437260. + + 2007-05-09 Sebastien Moutte * docs/plugins/gst-plugins-bad-plugins.args: diff --git a/configure.ac b/configure.ac index 7ec0f7ef7e..e783a4b80d 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