From: Zoltan B. <zb...@fr...> - 2013-05-29 14:11:01
|
# HG changeset patch # User Zoltan Boszormenyi <zb...@fr...> # Date 1368698183 -7200 # Node ID a83318fe884c641364abf51689369f18341ef037 # Branch default # Parent a51b18f1a7696745afe6309285be9373a60a5ed5 Fix configure to find ffmpeg on Fedora 18. diff --git a/m4/decoders.m4 b/m4/decoders.m4 --- a/m4/decoders.m4 +++ b/m4/decoders.m4 @@ -93,6 +93,8 @@ 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 @@ 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) |