aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAvuton Olrich <avuton@gmail.com>2010-04-17 03:38:29 -0700
committerAvuton Olrich <avuton@gmail.com>2010-04-21 07:10:16 -0700
commit7886fd711f757c64744966455243b035badaf419 (patch)
tree7bfa9cbf545c9aedd0fbc1f113350e8151c0822c
parent3993ed6b8118daee8b8185bc7dbeec1fd15859cc (diff)
downloadmpd-7886fd711f757c64744966455243b035badaf419.tar.gz
mpd-7886fd711f757c64744966455243b035badaf419.tar.xz
mpd-7886fd711f757c64744966455243b035badaf419.zip
configure.ac: Move libmikmod to Decoder Plugins, add header.
-rw-r--r--configure.ac24
1 files changed, 12 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac
index 18a2ae6d5..ad2b973be 100644
--- a/configure.ac
+++ b/configure.ac
@@ -709,18 +709,7 @@ dnl ###
-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)
found_modplug=$HAVE_CXX
MPD_AUTO_PRE(modplug, [modplug decoder plugin], [No C++ compiler found])
@@ -1044,8 +1033,19 @@ if test x$enable_mpg123 = xyes; then
fi
AM_CONDITIONAL(HAVE_MPG123, test x$enable_mpg123 = xyes)
+dnl -------------------------------- libmikmod --------------------------------
+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)