From: pabs3 Date: Mon, 29 Sep 2008 17:10:47 +0000 (+0000) Subject: Cope with some changes in the locations of the libavformat and libswscale headers. X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=58d3e2c317f536f4437b43c83c11f057a77e5a57;p=synfig.git Cope with some changes in the locations of the libavformat and libswscale headers. git-svn-id: https://synfig.svn.sourceforge.net/svnroot/synfig@2075 1f10aa63-cdf2-0310-b900-c93c546f37ac --- diff --git a/synfig-core/trunk/configure.ac b/synfig-core/trunk/configure.ac index a6bb3c4..882f16d 100644 --- a/synfig-core/trunk/configure.ac +++ b/synfig-core/trunk/configure.ac @@ -247,6 +247,17 @@ if test $with_libavcodec = "yes" ; then { if test $with_libavcodec = "yes" ; then { + + # Need to check both the new and old locations for the avformat header + # Need to save flags, add avformat flags, check headers and restore flags + ac_save_CPPFLAGS="$CPPFLAGS" + ac_save_CFLAGS="$CFLAGS" + CPPFLAGS="${CPPFLAGS} ${LIBAVCODEC_CFLAGS}" + CFLAGS="${CFLAGS} ${LIBAVCODEC_CFLAGS}" + AC_CHECK_HEADERS(libavformat/avformat.h avformat.h ffmpeg/avformat.h) + CPPFLAGS="${ac_save_CPPFLAGS}" + CFLAGS="${ac_save_CFLAGS}" + AC_ARG_WITH(libswscale, [AS_HELP_STRING([--without-libswscale], [disable support for libswscale (Default=auto)])], @@ -260,6 +271,16 @@ if test $with_libavcodec = "yes" ; then { if test $with_libswscale = "yes" ; then { AC_DEFINE(WITH_LIBSWSCALE, [], [enable libswscale support]) + + # Need to check both the new and old locations for the swscale header + # Need to save flags, add swscale flags, check headers and restore flags + ac_save_CPPFLAGS="$CPPFLAGS" + ac_save_CFLAGS="$CFLAGS" + CPPFLAGS="${CPPFLAGS} ${LIBSWSCALE_CFLAGS}" + CFLAGS="${CFLAGS} ${LIBSWSCALE_CFLAGS}" + AC_CHECK_HEADERS(libswscale/swscale.h swscale.h ffmpeg/swscale.h) + CPPFLAGS="${ac_save_CPPFLAGS}" + CFLAGS="${ac_save_CFLAGS}" } else { AC_CHECK_LIB(avcodec, img_convert, [AC_MSG_RESULT([ *** Using deprecated function img_convert.])], diff --git a/synfig-core/trunk/src/modules/mod_libavcodec/trgt_av.cpp b/synfig-core/trunk/src/modules/mod_libavcodec/trgt_av.cpp index 4584409..94881a7 100644 --- a/synfig-core/trunk/src/modules/mod_libavcodec/trgt_av.cpp +++ b/synfig-core/trunk/src/modules/mod_libavcodec/trgt_av.cpp @@ -35,10 +35,30 @@ extern "C" { -#include + +/* + ffmpeg library headers have historically had multiple locations. + We should check all of the locations to be more portable. +*/ + +#ifdef HAVE_LIBAVFORMAT_AVFORMAT_H +# include +#elif defined(HAVE_AVFORMAT_H) +# include +#elif defined(HAVE_FFMPEG_AVFORMAT_H) +# include +#endif + #ifdef WITH_LIBSWSCALE +#ifdef HAVE_LIBSWSCALE_SWSCALE_H +# include +#elif defined(HAVE_SWSCALE_H) # include +#elif defined(HAVE_FFMPEG_SWSCALE_H) +# include +#endif #endif + } #include