From 7886fd711f757c64744966455243b035badaf419 Mon Sep 17 00:00:00 2001
From: Avuton Olrich <avuton@gmail.com>
Date: Sat, 17 Apr 2010 03:38:29 -0700
Subject: configure.ac: Move libmikmod to Decoder Plugins, add header.

---
 configure.ac | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'configure.ac')

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)
 
 
 
-- 
cgit v1.2.3