summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac13
1 files changed, 11 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 0abcd1251..0442334a5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -136,7 +136,7 @@ dnl ---------------------------------------------
dnl Check for assembler (ffmpeg need it), don't call this before LIBTOOL
dnl ---------------------------------------------
-AM_PROG_AS_MOD
+AM_PROG_AS
dnl ---------------------------------------------
@@ -365,8 +365,17 @@ AC_SUBST(LIBMPEG2_CFLAGS)
AC_ARG_WITH([external-ffmpeg], AC_HELP_STRING([--with-external-ffmpeg], [use external ffmpeg library]))
+case "x$with_external_ffmpeg" in
+ xyes)
+ PKG_CHECK_MODULES([FFMPEG], [libavcodec >= 51.20.0])
+ ;;
+ xsoft)
+ with_external_ffmpeg=yes
+ PKG_CHECK_MODULES([FFMPEG], [libavcodec >= 51.20.0], [],
+ [AC_MSG_RESULT(no); with_external_ffmpeg=no])
+ ;;
+esac
if test "x$with_external_ffmpeg" = "xyes"; then
- PKG_CHECK_MODULES([FFMPEG], [libavcodec >= 51.20.0])
PKG_CHECK_MODULES([FFMPEG_POSTPROC], [libpostproc])
AC_SUBST([FFMPEG_CFLAGS])
AC_SUBST([FFMPEG_LIBS])