configure.ac: Save and restore CFLAGS for OpenGL check. Fixes #437260.

Original commit message from CVS:
Patch by: Ali Sabil <ali.sabil@gmail.com>
* configure.ac:
Save and restore CFLAGS for OpenGL check. Fixes #437260.
This commit is contained in:
Ali Sabil 2007-05-10 06:35:31 +00:00 committed by Stefan Kost
parent b09d59da79
commit 2a8b70f736
2 changed files with 11 additions and 0 deletions

View file

@ -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> 2007-05-09 Sebastien Moutte <sebastien@moutte.net>
* docs/plugins/gst-plugins-bad-plugins.args: * docs/plugins/gst-plugins-bad-plugins.args:

View file

@ -290,6 +290,7 @@ dnl OpenGL
translit(dnm, m, l) AM_CONDITIONAL(USE_OPENGL, true) translit(dnm, m, l) AM_CONDITIONAL(USE_OPENGL, true)
AG_GST_CHECK_X AG_GST_CHECK_X
save_CPPFLAGS="$CPPFLAGS" save_CPPFLAGS="$CPPFLAGS"
save_CFLAGS="$CFLAGS"
save_LIBS="$LIBS" save_LIBS="$LIBS"
CPPFLAGS="$CPPFLAGS $X_CFLAGS" CPPFLAGS="$CPPFLAGS $X_CFLAGS"
LIBS="$LIBS $X_LIBS" 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") GL/gl.h, HAVE_OPENGL="yes", HAVE_OPENGL="no")
]) ])
CPPFLAGS="$save_CPPFLAGS" CPPFLAGS="$save_CPPFLAGS"
CFLAGS="$save_CFLAGS"
LIBS="$save_LIBS" LIBS="$save_LIBS"
dnl Check for X11 dnl Check for X11
@ -1084,6 +1086,7 @@ dnl *** output files ***
dnl po/Makefile.in dnl po/Makefile.in
AC_CONFIG_FILES( AC_CONFIG_FILES(
Makefile Makefile
gst-plugins-bad.spec gst-plugins-bad.spec