diff options
| author | Max Kellermann <max@duempel.org> | 2009-07-16 07:37:13 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2009-07-16 07:37:13 +0200 |
| commit | 4100035b19a5d0dedcf8f71a272fa67f6a24361a (patch) | |
| tree | c4a0f11b0cf5d219fd70e55316ed0b95f348480c /configure.ac | |
| parent | 9bef46c0daa4fa2778db0e05d5883746cc995264 (diff) | |
| parent | d7bad6ae020ffabfd5d2ae9d2ce723e67e999077 (diff) | |
| download | mpd-4100035b19a5d0dedcf8f71a272fa67f6a24361a.tar.gz mpd-4100035b19a5d0dedcf8f71a272fa67f6a24361a.tar.xz mpd-4100035b19a5d0dedcf8f71a272fa67f6a24361a.zip | |
Merged release 0.15.1 from branch 'v0.15.x'
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index c3a780dc2..e828f4201 100644 --- a/configure.ac +++ b/configure.ac @@ -402,9 +402,9 @@ if test x$enable_audiofile = xyes; then fi AC_ARG_ENABLE(ffmpeg, - AS_HELP_STRING([--disable-ffmpeg], - [enable 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], @@ -932,10 +932,8 @@ AM_CONDITIONAL(HAVE_FLAC_COMMON, AM_CONDITIONAL(HAVE_OGG_COMMON, test x$enable_vorbis = xyes || test x$enable_oggflac = xyes || test x$enable_flac = 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 |