oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

configure: Group libmad stuff together, rename --enable-mp3 --enable-mad

Browse Source
This commit is contained in:
Avuton Olrich 2009-03-06 01:29:11 -08:00
parent 721b6f3e61
commit bc65890abf
1 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
configure.ac
View File

@ -379,6 +379,27 @@ AC_ARG_ENABLE(flac,
[disable flac support (default: enable)]),, [disable flac support (default: enable)]),,
enable_flac=yes) 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, AC_ARG_ENABLE(mod,
AS_HELP_STRING([--enable-mod], AS_HELP_STRING([--enable-mod],
[enable MOD support (default: disable)]),, [enable MOD support (default: disable)]),,
@ -389,10 +410,7 @@ AC_ARG_ENABLE(modplug,
[enable MODPLUG support (default: disable)]),, [enable MODPLUG support (default: disable)]),,
enable_modplug=no) enable_modplug=no)
AC_ARG_ENABLE(mp3,
AS_HELP_STRING([--disable-mp3],
[disable mp3 support (default: enable)]),,
enable_mp3=yes)
AC_ARG_ENABLE(mpc, AC_ARG_ENABLE(mpc,
AS_HELP_STRING([--disable-mpc], AS_HELP_STRING([--disable-mpc],
@ -663,15 +681,6 @@ fi
AM_CONDITIONAL(HAVE_ID3TAG, test x$enable_id3 = xyes) 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$enable_mpc = xyes; then
if test "x$mpcdec_libraries" != "x" ; then if test "x$mpcdec_libraries" != "x" ; then
MPCDEC_LIBS="-L$mpcdec_libraries" MPCDEC_LIBS="-L$mpcdec_libraries"
@ -1315,10 +1324,10 @@ else
echo " MODPLUG support ...............disabled" echo " MODPLUG support ...............disabled"
fi fi
if test x$enable_mp3 = xyes; then if test x$enable_mad = xyes; then
echo " mp3 support ...................enabled" echo " MAD mp3 decoder support .......enabled"
else else
echo " mp3 support ...................disabled" echo " MAD mp3 decoder support .......disabled"
fi fi
if test x$enable_mp4 = xyes; then if test x$enable_mp4 = xyes; then
@ -1377,7 +1386,7 @@ fi
if if
test x$enable_mp3 = xno && test x$enable_mad = xno &&
test x$enable_oggvorbis = xno && test x$enable_oggvorbis = xno &&
test x$enable_flac = xno && test x$enable_flac = xno &&
test x$enable_oggflac = xno && test x$enable_oggflac = xno &&