diff options
| author | Zoltan Boszormenyi <zboszor@freemail.hu> | 2013-05-16 11:56:23 +0200 |
|---|---|---|
| committer | Zoltan Boszormenyi <zboszor@freemail.hu> | 2013-05-16 11:56:23 +0200 |
| commit | 553cf5c688fe00a373c9acff5e30dfbfb8ce4759 (patch) | |
| tree | 10341d0abbe8cf3f46d1e97533964ba47d94d6f7 | |
| parent | a3385e7a57da315b65334475e47a46016966746b (diff) | |
| download | xine-lib-553cf5c688fe00a373c9acff5e30dfbfb8ce4759.tar.gz xine-lib-553cf5c688fe00a373c9acff5e30dfbfb8ce4759.tar.bz2 | |
Fix configure to find ffmpeg on Fedora 18.
| -rw-r--r-- | m4/decoders.m4 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/m4/decoders.m4 b/m4/decoders.m4 index bb8722702..b5c977022 100644 --- a/m4/decoders.m4 +++ b/m4/decoders.m4 @@ -93,6 +93,8 @@ 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_save_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CFLAGS $FFMPEG_CFLAGS $AVUTIL_CFLAGS" AC_CHECK_HEADERS([ffmpeg/avutil.h]) AC_CHECK_HEADERS([libavutil/avutil.h]) AC_CHECK_HEADERS([libavutil/sha1.h]) @@ -100,6 +102,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 + CPPFLAGS="$ac_save_CPPFLAGS" CFLAGS="$ac_save_CFLAGS" dnl gdk-pixbuf (optional; enabled by default) |