From ee88b8f8c47dec9bba39637f86b93f5eae01f42a Mon Sep 17 00:00:00 2001 From: Avuton Olrich Date: Sat, 17 Apr 2010 03:57:05 -0700 Subject: configure.ac: Move WildMidi to Decoder Plugins, add header. --- configure.ac | 37 +++++++++++++++++++------------------ 1 file 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 -- cgit v1.2.3