aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAvuton Olrich <avuton@gmail.com>2010-04-17 03:57:05 -0700
committerAvuton Olrich <avuton@gmail.com>2010-04-21 07:35:30 -0700
commitee88b8f8c47dec9bba39637f86b93f5eae01f42a (patch)
treeada37a7d7d9ca71324b981f8fba4e2674a3cea97
parent7bfcb6151dc0a6b4ea86d16bc8d6fc6d8961986d (diff)
downloadmpd-ee88b8f8c47dec9bba39637f86b93f5eae01f42a.tar.gz
mpd-ee88b8f8c47dec9bba39637f86b93f5eae01f42a.tar.xz
mpd-ee88b8f8c47dec9bba39637f86b93f5eae01f42a.zip
configure.ac: Move WildMidi to Decoder Plugins, add header.
Diffstat (limited to '')
-rw-r--r--configure.ac37
1 files changed, 19 insertions, 18 deletions
diff --git a/configure.ac b/configure.ac
index 2fa93efba..5795fc5b1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1126,7 +1126,26 @@ if test x$enable_wavpack = xyes; then
AC_DEFINE([HAVE_WAVPACK], 1, [Define to enable WavPack support])
fi
+dnl --------------------------------- WildMidi --------------------------------
+if test x$enable_wildmidi = xyes; then
+ oldcflags=$CFLAGS
+ oldlibs=$LIBS
+ oldcppflags=$CPPFLAGS
+
+ AC_CHECK_LIB(WildMidi, WildMidi_Init,,
+ AC_MSG_ERROR([libwildmidi not found]))
+
+ CFLAGS=$oldcflags
+ LIBS=$oldlibs
+ CPPFLAGS=$oldcppflags
+
+ AC_SUBST(WILDMIDI_LIBS,-lWildMidi)
+ AC_SUBST(WILDMIDI_CFLAGS,)
+ AC_DEFINE(ENABLE_WILDMIDI, 1, [Define for wildmidi support])
+fi
+
+AM_CONDITIONAL(ENABLE_WILDMIDI, test x$enable_wildmidi = xyes)
MPD_AUTO_PKG(ffmpeg, FFMPEG, [libavformat libavcodec libavutil],
@@ -1159,25 +1178,7 @@ AM_CONDITIONAL(HAVE_FFMPEG, test x$enable_ffmpeg = xyes)
-if test x$enable_wildmidi = xyes; then
- oldcflags=$CFLAGS
- oldlibs=$LIBS
- oldcppflags=$CPPFLAGS
-
- AC_CHECK_LIB(WildMidi, WildMidi_Init,,
- AC_MSG_ERROR([libwildmidi not found]))
-
- CFLAGS=$oldcflags
- LIBS=$oldlibs
- CPPFLAGS=$oldcppflags
-
- AC_SUBST(WILDMIDI_LIBS,-lWildMidi)
- AC_SUBST(WILDMIDI_CFLAGS,)
- AC_DEFINE(ENABLE_WILDMIDI, 1, [Define for wildmidi support])
-fi
-
-AM_CONDITIONAL(ENABLE_WILDMIDI, test x$enable_wildmidi = xyes)
dnl