aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2009-04-01 22:48:06 +0200
committerMax Kellermann <max@duempel.org>2009-04-01 22:48:06 +0200
commita7685780ede43fc079d04c8d748a44e0ac7bf80e (patch)
tree12e24c5d6dec0f37df3158ce2ce5083bd73e17a7
parentcd6182862a3a9cab9aeb57e92fd027f9292d529b (diff)
downloadmpd-a7685780ede43fc079d04c8d748a44e0ac7bf80e.tar.gz
mpd-a7685780ede43fc079d04c8d748a44e0ac7bf80e.tar.xz
mpd-a7685780ede43fc079d04c8d748a44e0ac7bf80e.zip
configure.ac: renamed --enable-mod to --enable-mikmod
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac22
-rwxr-xr-xscripts/test.sh2
-rw-r--r--src/decoder_list.c2
4 files changed, 14 insertions, 14 deletions
diff --git a/Makefile.am b/Makefile.am
index 268f03224..06cb3cba2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -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
diff --git a/configure.ac b/configure.ac
index 0a00c90fd..478ba7f62 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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
diff --git a/scripts/test.sh b/scripts/test.sh
index 9419ee07f..170e247fa 100755
--- a/scripts/test.sh
+++ b/scripts/test.sh
@@ -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
diff --git a/src/decoder_list.c b/src/decoder_list.c
index 8ae268241..6e5c8cfd3 100644
--- a/src/decoder_list.c
+++ b/src/decoder_list.c
@@ -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