merged with devel

1 files changed, 52 insertions, 14 deletions

diff --git a/configure.ac b/configure.ac
index 5aeed8cf..5b43f27c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -90,6 +90,10 @@ AC_ARG_ENABLE(musepack, [  --disable-musepack      disable musepack plugin (defa
 AC_ARG_ENABLE(wildmidi, [  --disable-wildmidi      disable wildmidi plugin (default: enabled)], [enable_wildmidi=$enableval], [enable_wildmidi=yes])
 AC_ARG_ENABLE(tta,     [  --disable-tta            disable tta plugin (default: enabled)], [enable_tta=$enableval], [enable_tta=yes])
 AC_ARG_ENABLE(dca,     [  --disable-dca            disable dca (DTS audio)  plugin (default: enabled)], [enable_dca=$enableval], [enable_dca=yes])
+AC_ARG_ENABLE(aac,     [  --disable-aac            disable AAC decoder based on FAAD2 (default: enabled)], [enable_aac=$enableval], [enable_aac=yes])
+AC_ARG_ENABLE(mms,     [  --disable-mms            disable MMS streaming vfs plugin (default: enabled)], [enable_mms=$enableval], [enable_mms=yes])
+AC_ARG_ENABLE(shn,     [  --disable-shn            disable shorten plugin (default: enabled)], [enable_shn=$enableval], [enable_shn=yes])
+AC_ARG_ENABLE(ao,     [  --disable-ao            disable audio overload plugin (default: enabled)], [enable_ao=$enableval], [enable_ao=yes])
 
 PKG_CHECK_MODULES(DEPS, samplerate)
 
@@ -202,18 +206,6 @@ if test "x$enable_vfs_curl" != "xno" ; then
     fi
 fi
 
-dnl faad2 plugin
-dnl AC_CHECK_LIB([faad], [main], [HAVE_FAAD=1])
-dnl AC_CHECK_LIB([mp4ff], [main], [HAVE_MP4FF=1])
-dnl AM_CONDITIONAL(HAVE_FAAD, test $HAVE_FAAD)
-dnl AM_CONDITIONAL(HAVE_MP4FF, test $HAVE_MP4FF)
-dnl if test ${HAVE_FAAD} && test ${HAVE_MP4FF} ; then
-dnl     FAAD2_LIBS="-lfaad -lmp4ff -lmp4v2"
-dnl     FAAD2_DIR="plugins/faad2"
-dnl     AC_SUBST(FAAD2_LIBS)
-dnl     AC_SUBST(FAAD2_DIR)
-dnl fi
-
 dnl cdda plugin
 if test "x$enable_cdda" != "xno" ; then
     AC_CHECK_LIB([cdio], [main], [HAVE_CDIO=yes])
@@ -377,7 +369,42 @@ if test "x$enable_dca" != "xno" ; then
     HAVE_DCA=yes
 fi
 
-PLUGINS_DIRS="plugins/lastfm plugins/mpgmad plugins/vorbis plugins/flac plugins/wavpack plugins/sndfile plugins/vfs_curl plugins/cdda plugins/gtkui plugins/alsa plugins/ffmpeg plugins/hotkeys plugins/oss plugins/artwork plugins/adplug plugins/ffap plugins/sid plugins/nullout plugins/supereq plugins/vtx plugins/gme plugins/dumb plugins/pulse plugins/notify plugins/musepack plugins/wildmidi plugins/tta plugins/dca plugins/shellexec"
+f test "x$enable_aac" != "xno" ; then
+    AC_CHECK_LIB([faad], [main], [HAVE_FAAD=1])
+    AC_CHECK_LIB([mp4ff], [main], [HAVE_MP4FF=1])
+    AM_CONDITIONAL(HAVE_FAAD, test $HAVE_FAAD)
+    AM_CONDITIONAL(HAVE_MP4FF, test $HAVE_MP4FF)
+    if test ${HAVE_FAAD} && test ${HAVE_MP4FF} ; then
+        FAAD2_LIBS="-lfaad -lmp4ff"
+        AC_SUBST(FAAD2_LIBS)
+        HAVE_AAC=yes
+    fi
+fi
+
+if test "x$enable_mms" != "xno" ; then
+    AC_CHECK_LIB([mms], [main], [HAVE_LIBMMS=1])
+    AM_CONDITIONAL(HAVE_LIBMMS, test $HAVE_LIBMMS)
+    if test ${HAVE_LIBMMS} ; then
+        LIBMMS_LIBS="-lmms"
+        AC_SUBST(LIBMMS_LIBS)
+        HAVE_MMS=yes
+    fi
+fi
+
+if test "x$enable_shn" != "xno" ; then
+    HAVE_SHN=yes
+fi
+
+if test "x$enable_ao" != "xno" ; then
+    AC_CHECK_LIB([z], [main], [HAVE_ZLIB=yes])
+    if test "x$HAVE_ZLIB" = "xyes"; then
+        ZLIB_LIBS="-lz"
+        AC_SUBST(ZLIB_LIBS)
+        HAVE_AO=yes
+    fi
+fi
+
+PLUGINS_DIRS="plugins/lastfm plugins/mpgmad plugins/vorbis plugins/flac plugins/wavpack plugins/sndfile plugins/vfs_curl plugins/cdda plugins/gtkui plugins/alsa plugins/ffmpeg plugins/hotkeys plugins/oss plugins/artwork plugins/adplug plugins/ffap plugins/sid plugins/nullout plugins/supereq plugins/vtx plugins/gme plugins/dumb plugins/pulse plugins/notify plugins/musepack plugins/wildmidi plugins/tta plugins/dca plugins/aac plugins/mms plugins/shn plugins/ao plugins/shellexec"
 
 AM_CONDITIONAL(HAVE_VORBIS, test "x$HAVE_VORBISPLUGIN" = "xyes")
 AM_CONDITIONAL(HAVE_FLAC, test "x$HAVE_FLACPLUGIN" = "xyes")
@@ -409,6 +436,10 @@ AM_CONDITIONAL(HAVE_MUSEPACK, test "x$HAVE_MUSEPACK" = "xyes")
 AM_CONDITIONAL(HAVE_WILDMIDI, test "x$HAVE_WILDMIDI" = "xyes")
 AM_CONDITIONAL(HAVE_TTA, test "x$HAVE_TTA" = "xyes")
 AM_CONDITIONAL(HAVE_DCA, test "x$HAVE_DCA" = "xyes")
+AM_CONDITIONAL(HAVE_AAC, test "x$HAVE_AAC" = "xyes")
+AM_CONDITIONAL(HAVE_MMS, test "x$HAVE_MMS" = "xyes")
+AM_CONDITIONAL(HAVE_SHN, test "x$HAVE_SHN" = "xyes")
+AM_CONDITIONAL(HAVE_AO, test "x$HAVE_AO" = "xyes")
 
 AC_SUBST(PLUGINS_DIRS)
 
@@ -451,7 +482,6 @@ PRINT_PLUGIN_INFO([sndfile],[PCM (wav,aiff,etc) player based on libsndfile],[tes
 PRINT_PLUGIN_INFO([vtx],[vtx file player (ay8910/12 emulation)],[test "x$HAVE_VTX" = "xyes"])
 PRINT_PLUGIN_INFO([adplug],[adplug player (OPL2/OPL3 emulation)],[test "x$HAVE_ADPLUG" = "xyes"])
 PRINT_PLUGIN_INFO([vfs_curl],[http/ftp streaming support],[test "x$HAVE_VFS_CURL" = "xyes"])
-dnl PRINT_PLUGIN_INFO([faad2],[aac/mp4 player],[test $HAVE_FAAD && test $HAVE_MP4FF])
 PRINT_PLUGIN_INFO([cdda],[cd audio player],[test "x$HAVE_CDDAPLUGIN" = "xyes"])
 PRINT_PLUGIN_INFO([gtkui],[GTK user interface],[test "x$HAVE_GTK" = "xyes"])
 PRINT_PLUGIN_INFO([hotkeys],[Global hotkeys support],[test "x$HAVE_HOTKEYS" = "xyes"])
@@ -467,6 +497,10 @@ PRINT_PLUGIN_INFO([musepack],[musepack player plugin],[test "x$HAVE_MUSEPACK" =
 PRINT_PLUGIN_INFO([wildmidi],[WildMidi player plugin],[test "x$HAVE_WILDMIDI" = "xyes"])
 PRINT_PLUGIN_INFO([tta],[TTA player plugin],[test "x$HAVE_TTA" = "xyes"])
 PRINT_PLUGIN_INFO([dca],[libdca (DTS Audio) player plugin],[test "x$HAVE_DCA" = "xyes"])
+PRINT_PLUGIN_INFO([aac],[AAC player (m4a, aac, mp4) based on FAAD2],[test "x$HAVE_AAC" = "xyes"])
+PRINT_PLUGIN_INFO([mms],[mms streaming support],[test "x$HAVE_MMS" = "xyes"])
+PRINT_PLUGIN_INFO([shn],[shorten player based on xmms-shn],[test "x$HAVE_SHN" = "xyes"])
+PRINT_PLUGIN_INFO([ao],[psf1/psf2/spu/ssf player using Audio Overload],[test "x$HAVE_AO" = "xyes"])
 
 echo
 
@@ -504,6 +538,10 @@ plugins/musepack/Makefile
 plugins/wildmidi/Makefile
 plugins/tta/Makefile
 plugins/dca/Makefile
+plugins/aac/Makefile
+plugins/mms/Makefile
+plugins/shn/Makefile
+plugins/ao/Makefile
 intl/Makefile
 po/Makefile.in
 deadbeef.desktop