aboutsummaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authorAvuton Olrich <avuton@gmail.com>2009-03-06 01:29:11 -0800
committerAvuton Olrich <avuton@gmail.com>2009-03-06 08:30:59 -0800
commitbc65890abf809dcdd82ce14d8be1d43f86544f89 (patch)
tree81582319858265feed99938d33d404264788530e /configure.ac
parent721b6f3e61790271c013f3b02bfd32c6d565004b (diff)
downloadmpd-bc65890abf809dcdd82ce14d8be1d43f86544f89.tar.gz
mpd-bc65890abf809dcdd82ce14d8be1d43f86544f89.tar.xz
mpd-bc65890abf809dcdd82ce14d8be1d43f86544f89.zip
configure: Group libmad stuff together, rename --enable-mp3 --enable-mad
Diffstat (limited to '')
-rw-r--r--configure.ac43
1 files changed, 26 insertions, 17 deletions
diff --git a/configure.ac b/configure.ac
index c05a4fb3f..d0061a4a9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -379,6 +379,27 @@ AC_ARG_ENABLE(flac,
[disable flac support (default: enable)]),,
enable_flac=yes)
+dnl ###
+dnl MAD mp3 decoder
+dnl ###
+dnl Depreciated option, available for backwards compatibility
+AC_ARG_ENABLE(mp3,,
+ enable_mad=$enableval,
+ enable_mad=yes)
+
+AC_ARG_ENABLE(mad,
+ AS_HELP_STRING([--disable-mad],
+ [disable mad mp3 decoder support (default: enable)]),enable_mad=$enableval,
+ enable_mad=yes)
+
+if test x$enable_mad = xyes; then
+ PKG_CHECK_MODULES([MAD], [mad],
+ AC_DEFINE(HAVE_MAD, 1, [Define to use libmad]),
+ enable_mad=no)
+fi
+
+AM_CONDITIONAL(HAVE_MAD, test x$enable_mad = xyes)
+
AC_ARG_ENABLE(mod,
AS_HELP_STRING([--enable-mod],
[enable MOD support (default: disable)]),,
@@ -389,10 +410,7 @@ AC_ARG_ENABLE(modplug,
[enable MODPLUG support (default: disable)]),,
enable_modplug=no)
-AC_ARG_ENABLE(mp3,
- AS_HELP_STRING([--disable-mp3],
- [disable mp3 support (default: enable)]),,
- enable_mp3=yes)
+
AC_ARG_ENABLE(mpc,
AS_HELP_STRING([--disable-mpc],
@@ -663,15 +681,6 @@ fi
AM_CONDITIONAL(HAVE_ID3TAG, test x$enable_id3 = xyes)
-if test x$enable_mp3 = xyes; then
- PKG_CHECK_MODULES([MAD], [mad],
- AC_DEFINE(HAVE_MAD, 1, [Define to use libmad]),
- enable_mp3=no)
-fi
-
-AM_CONDITIONAL(HAVE_MAD, test x$enable_mp3 = xyes)
-
-
if test x$enable_mpc = xyes; then
if test "x$mpcdec_libraries" != "x" ; then
MPCDEC_LIBS="-L$mpcdec_libraries"
@@ -1315,10 +1324,10 @@ else
echo " MODPLUG support ...............disabled"
fi
-if test x$enable_mp3 = xyes; then
- echo " mp3 support ...................enabled"
+if test x$enable_mad = xyes; then
+ echo " MAD mp3 decoder support .......enabled"
else
- echo " mp3 support ...................disabled"
+ echo " MAD mp3 decoder support .......disabled"
fi
if test x$enable_mp4 = xyes; then
@@ -1377,7 +1386,7 @@ fi
if
- test x$enable_mp3 = xno &&
+ test x$enable_mad = xno &&
test x$enable_oggvorbis = xno &&
test x$enable_flac = xno &&
test x$enable_oggflac = xno &&