aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--configure.ac12
1 files changed, 5 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac
index ebf08cb8f..aca0743c7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -397,9 +397,9 @@ AC_ARG_ENABLE(audiofile,
enable_audiofile=yes)
AC_ARG_ENABLE(ffmpeg,
- AS_HELP_STRING([--disable-ffmpeg],
- [disable FFMPEG support (default: enable)]),,
- enable_ffmpeg=yes)
+ AS_HELP_STRING([--enable-ffmpeg],
+ [enable FFMPEG support]),,
+ enable_ffmpeg=auto)
AC_ARG_ENABLE(flac,
AS_HELP_STRING([--disable-flac],
@@ -914,10 +914,8 @@ fi
AM_CONDITIONAL(HAVE_AUDIOFILE, test x$enable_audiofile = xyes)
-if test x$enable_ffmpeg = xyes; then
- PKG_CHECK_MODULES(FFMPEG, [libavformat libavcodec libavutil],,
- enable_ffmpeg=no)
-fi
+MPD_AUTO_PKG(ffmpeg, FFMPEG, [libavformat libavcodec libavutil],
+ [ffmpeg decoder library], [libavformat+libavcodec+libavutil not found])
if test x$enable_ffmpeg = xyes; then
old_LIBS=$LIBS