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

configure.ac: renamed --enable-mod to --enable-mikmod

This commit is contained in:
Max Kellermann 2009-04-01 22:48:06 +02:00
parent cd6182862a
commit a7685780ed
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -364,7 +364,7 @@ if HAVE_AUDIOFILE
DECODER_SRC += src/decoder/audiofile_plugin.c
endif
if HAVE_MIKMOD
if ENABLE_MIKMOD_DECODER
DECODER_SRC += src/decoder/mikmod_plugin.c
endif

22
configure.ac
View File

@ -413,9 +413,9 @@ if test x$enable_mad = xyes; then
fi
AM_CONDITIONAL(HAVE_MAD, test x$enable_mad = xyes)
AC_ARG_ENABLE(mod,
AS_HELP_STRING([--enable-mod],
[enable MOD support (default: disable)]),,
AC_ARG_ENABLE(mikmod,
AS_HELP_STRING([--enable-mikmod],
[enable the mikmod decoder (default: disable)]),,
enable_mod=no)
AC_ARG_ENABLE(modplug,
@ -854,18 +854,18 @@ fi
AM_CONDITIONAL(HAVE_AUDIOFILE, test x$enable_audiofile = xyes)
if test x$enable_mod = xyes; then
if test x$enable_mikmod = xyes; then
AC_PATH_PROG(LIBMIKMOD_CONFIG, libmikmod-config)
if test x$LIBMIKMOD_CONFIG != x ; then
AC_SUBST(LIBMIKMOD_CFLAGS, `$LIBMIKMOD_CONFIG --cflags`)
AC_SUBST(LIBMIKMOD_LIBS, `$LIBMIKMOD_CONFIG --libs`)
AC_DEFINE(HAVE_MIKMOD, 1, [Define for mikmod support])
AC_DEFINE(ENABLE_MIKMOD_DECODER, 1, [Define for mikmod support])
else
enable_mod=no
enable_mikmod=no
fi
fi
AM_CONDITIONAL(HAVE_MIKMOD, test x$enable_mod = xyes)
AM_CONDITIONAL(ENABLE_MIKMOD_DECODER, test x$enable_mikmod = xyes)
if test x$enable_ffmpeg = xyes; then
PKG_CHECK_MODULES(FFMPEG, [libavformat libavcodec libavutil],,
@ -1288,10 +1288,10 @@ else
echo " fluidsynth MIDI support .......disabled"
fi
if test x$enable_mod = xyes; then
echo " MOD support ...................enabled"
if test x$enable_mikmod = xyes; then
echo " MikMod support ................enabled"
else
echo " MOD support ...................disabled"
echo " MikMod support ................disabled"
fi
if test x$enable_modplug = xyes; then
@ -1376,7 +1376,7 @@ if
test x$enable_fluidsynth = xno &&
test x$enable_wildmidi = xno &&
test x$enable_mp4 = xno &&
test x$enable_mod = xno; then
test x$enable_mikmod = xno; then
AC_MSG_ERROR([No input plugins supported!])
fi

2
scripts/test.sh
View File

@ -18,7 +18,7 @@ test -x configure || NOCONFIGURE=1 ./autogen.sh
./configure --prefix=$PREFIX/full \
--disable-dependency-tracking --enable-debug --enable-werror \
--enable-un \
--enable-ao --enable-mod --enable-mvp
--enable-ao --enable-mikmod --enable-mvp
$MAKE install
$MAKE distclean

2
src/decoder_list.c
View File

@ -74,7 +74,7 @@ static const struct decoder_plugin *const decoder_plugins[] = {
#ifdef HAVE_MODPLUG
&modplug_plugin,
#endif
#ifdef HAVE_MIKMOD
#ifdef ENABLE_MIKMOD_DECODER
&mikmod_decoder_plugin,
#endif
#ifdef ENABLE_SIDPLAY