From 7bfcb6151dc0a6b4ea86d16bc8d6fc6d8961986d Mon Sep 17 00:00:00 2001 From: Avuton Olrich Date: Sat, 17 Apr 2010 03:55:52 -0700 Subject: configure.ac: Move wavpack to Decoder Plugins, add header. --- configure.ac | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 36dcf8276..2fa93efba 100644 --- a/configure.ac +++ b/configure.ac @@ -695,15 +695,6 @@ fi AM_CONDITIONAL(ENABLE_ARCHIVE, test x$enable_archive = xyes) -MPD_AUTO_PKG(wavpack, WAVPACK, [wavpack], - [WavPack decoder plugin], [libwavpack not found]) -AM_CONDITIONAL(HAVE_WAVPACK, test x$enable_wavpack = xyes) -if test x$enable_wavpack = xyes; then - AC_DEFINE([HAVE_WAVPACK], 1, [Define to enable WavPack support]) -fi - - - dnl --------------------------------------------------------------------------- dnl Encoders for Streaming Audio Output Plugins dnl --------------------------------------------------------------------------- @@ -1127,6 +1118,16 @@ fi AM_CONDITIONAL(ENABLE_SIDPLAY, test x$enable_sidplay = xyes) +dnl --------------------------------- wavpack --------------------------------- +MPD_AUTO_PKG(wavpack, WAVPACK, [wavpack], + [WavPack decoder plugin], [libwavpack not found]) +AM_CONDITIONAL(HAVE_WAVPACK, test x$enable_wavpack = xyes) +if test x$enable_wavpack = xyes; then + AC_DEFINE([HAVE_WAVPACK], 1, [Define to enable WavPack support]) +fi + + + MPD_AUTO_PKG(ffmpeg, FFMPEG, [libavformat libavcodec libavutil], [ffmpeg decoder library], [libavformat+libavcodec+libavutil not found]) -- cgit v1.2.3