aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2009-04-01 22:50:21 +0200
committerMax Kellermann <max@duempel.org>2009-04-01 22:50:21 +0200
commita376b471893cf8670b4912be8200548946500e4a (patch)
tree0a40ce83daa54fad766e653ef4b3f87901e6bd34
parenta7685780ede43fc079d04c8d748a44e0ac7bf80e (diff)
downloadmpd-a376b471893cf8670b4912be8200548946500e4a.tar.gz
mpd-a376b471893cf8670b4912be8200548946500e4a.tar.xz
mpd-a376b471893cf8670b4912be8200548946500e4a.zip
configure.ac: moved libmikmod test to --enable-mikmod
-rw-r--r--configure.ac26
1 files changed, 13 insertions, 13 deletions
diff --git a/configure.ac b/configure.ac
index 478ba7f62..6389c33fc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -418,6 +418,19 @@ AC_ARG_ENABLE(mikmod,
[enable the mikmod decoder (default: disable)]),,
enable_mod=no)
+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(ENABLE_MIKMOD_DECODER, 1, [Define for mikmod support])
+ else
+ enable_mikmod=no
+ fi
+fi
+
+AM_CONDITIONAL(ENABLE_MIKMOD_DECODER, test x$enable_mikmod = xyes)
+
AC_ARG_ENABLE(modplug,
AS_HELP_STRING([--enable-modplug],
[enable modplug decoder plugin]),,
@@ -854,19 +867,6 @@ fi
AM_CONDITIONAL(HAVE_AUDIOFILE, test x$enable_audiofile = xyes)
-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(ENABLE_MIKMOD_DECODER, 1, [Define for mikmod support])
- else
- enable_mikmod=no
- fi
-fi
-
-AM_CONDITIONAL(ENABLE_MIKMOD_DECODER, test x$enable_mikmod = xyes)
-
if test x$enable_ffmpeg = xyes; then
PKG_CHECK_MODULES(FFMPEG, [libavformat libavcodec libavutil],,
enable_ffmpeg=no)