diff options
| author | Max Kellermann <max@duempel.org> | 2009-07-14 14:23:49 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2009-07-14 14:23:49 +0200 |
| commit | 0c1c753e23c06c0fb8cf7287138fc2776cfe538f (patch) | |
| tree | 4c809b42244bfeff2a1f6159099bb63000f6542e | |
| parent | 58dd6eee5d95e0d836b953c9e587651c2cb53008 (diff) | |
| download | mpd-0c1c753e23c06c0fb8cf7287138fc2776cfe538f.tar.gz mpd-0c1c753e23c06c0fb8cf7287138fc2776cfe538f.tar.xz mpd-0c1c753e23c06c0fb8cf7287138fc2776cfe538f.zip | |
configure.ac: fail when ffmpeg is enabled, but not found
| -rw-r--r-- | configure.ac | 12 |
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 |