diff options
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/ffmpeg.m4 | 11 | ||||
| -rw-r--r-- | m4/xine.m4 | 2 |
2 files changed, 10 insertions, 3 deletions
diff --git a/m4/ffmpeg.m4 b/m4/ffmpeg.m4 index d228de8a0..51f1eef83 100644 --- a/m4/ffmpeg.m4 +++ b/m4/ffmpeg.m4 @@ -75,13 +75,17 @@ if test x"$external_ffmpeg" != "xno"; then AC_CHECK_LIB(postproc, pp_get_context, AC_CHECK_LIB(avcodec, register_avcodec, [external_ffmpeg_found=yes - FFMPEG_LIBS="${FFMPEG_LIBS} -lavcodec -lpostproc" + FFMPEG_POSTPROC_LIBS="${FFMPEG_LIBS} -lpostproc" + FFMPEG_LIBS="${FFMPEG_LIBS} -lavcodec" break] ),, [-lavcodec] ) done - + if test x$FFMPEG_POSTPROC_LIBS = "x"; then + FFMPEG_POSTPROC_LIBS="${FFMPEG_LIBS}" + fi + dnl result of autodetection if test x"$external_ffmpeg_found" = "xyes"; then AC_MSG_RESULT([External ffmpeg library was found in ${dir}.]) @@ -99,7 +103,7 @@ configure option --with-external-ffmpeg. else dnl check specified flags CPPFLAGS="${FFMPEG_CPPFLAGS} ${ac_save_CPPFLAGS}" - LDFLAGS="${FFMPEG_LIBS} ${ac_save_LDFLAGS}" + LDFLAGS="${FFMPEG_LIBS} ${FFMPEG_POSTPROC_LIBS } ${ac_save_LDFLAGS}" AC_LINK_IFELSE([#include <avcodec.h> #include <postprocess.h> @@ -158,6 +162,7 @@ use internal ffmpeg. AC_SUBST(FFMPEG_CPPFLAGS) AC_SUBST(FFMPEG_LIBS) + AC_SUBST(FFMPEG_POSTPROC_LIBS) else AC_MSG_RESULT([using included ffmpeg]) diff --git a/m4/xine.m4 b/m4/xine.m4 index 3f361bfbd..316ca4918 100644 --- a/m4/xine.m4 +++ b/m4/xine.m4 @@ -210,4 +210,6 @@ main () dnl Make sure HAVE_STRSEP, HAVE_SETENV and HAVE_STRPBRK are defined as dnl necessary. AC_CHECK_FUNCS([strsep strpbrk setenv]) +dnl alloca (in public macro) and MinGW + AC_CHECK_HEADERS([malloc.h]) ]) |