summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Rankin <rankincj@yahoo.com>2012-07-29 20:25:34 +0100
committerChris Rankin <rankincj@yahoo.com>2012-07-29 20:25:34 +0100
commit5b4d4a897887a2461ecfc432aee2626a9207d665 (patch)
treea8ad95c436390943c1fb418ceca2c48e92303447
parent91d638ea335db62b2eed7bb9586de74e733bedb3 (diff)
downloadxine-lib-5b4d4a897887a2461ecfc432aee2626a9207d665.tar.gz
xine-lib-5b4d4a897887a2461ecfc432aee2626a9207d665.tar.bz2
Finally fix compilation on Fedora 16/17.
-rw-r--r--m4/decoders.m42
1 files changed, 2 insertions, 0 deletions
diff --git a/m4/decoders.m4 b/m4/decoders.m4
index 659f8a766..bb8722702 100644
--- a/m4/decoders.m4
+++ b/m4/decoders.m4
@@ -92,6 +92,7 @@ AC_DEFUN([XINE_DECODER_PLUGINS], [
dnl Check presence of ffmpeg/avutil.h to see if it's old or new
dnl style for headers. The new style would be preferred actually...
+ ac_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $FFMPEG_CFLAGS"
AC_CHECK_HEADERS([ffmpeg/avutil.h])
AC_CHECK_HEADERS([libavutil/avutil.h])
AC_CHECK_HEADERS([libavutil/sha1.h])
@@ -99,6 +100,7 @@ AC_DEFUN([XINE_DECODER_PLUGINS], [
if test "$ac_cv_header_ffmpeg_avutil_h" = "yes" && test "$ac_cv_header_libavutil_avutil_h" = "yes"; then
AC_MSG_ERROR([old & new ffmpeg headers found - you need to clean up!])
fi
+ CFLAGS="$ac_save_CFLAGS"
dnl gdk-pixbuf (optional; enabled by default)
AC_ARG_ENABLE([gdkpixbuf],