diff options
| author |  Alexey Yakovenko <wakeroid@gmail.com> | 2009-11-04 22:14:52 +0100 |
|---|---|---|
| committer | Alexey Yakovenko <wakeroid@gmail.com> | 2009-11-04 22:14:52 +0100 |
| commit | 934588b8b01f45b8b7fe23642127cce41b4b8df4 (patch) | |
| tree | fd05e22c2ac9618c0a07cc55389477dbc0864e48 | |
| parent | db2131695b2c59465e91f843d757f70513bb1e09 (diff) | |
removed aac plugin from build for 0.3.0
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | configure.ac | 23 |
2 files changed, 12 insertions, 14 deletions
diff --git a/Makefile.am b/Makefile.am index 7bf75fb8..b8d1be0a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -16,8 +16,7 @@ SUBDIRS = gme/Game_Music_Emu-0.5.2\ ${WAVPACK_DIR}\ ${SNDFILE_DIR}\ ${VFS_CURL_DIR}\ - ${CDDA_DIR}\ - ${FAAD2_DIR} + ${CDDA_DIR} dumbpath=@top_srcdir@/dumb sidpath=@top_srcdir@/sid/sidplay-libs-2.1.0 diff --git a/configure.ac b/configure.ac index 9b8ff022..2dc16135 100644 --- a/configure.ac +++ b/configure.ac @@ -120,16 +120,16 @@ if test ${HAVE_CURL}; then fi dnl faad2 plugin -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 -lmp4v2" - FAAD2_DIR="plugins/faad2" - AC_SUBST(FAAD2_LIBS) - AC_SUBST(FAAD2_DIR) -fi +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 AC_CHECK_LIB([cdio], [main], [HAVE_CDIO=1]) @@ -170,7 +170,7 @@ PRINT_PLUGIN_INFO([flac],[flac player],[test $HAVE_FLAC]) PRINT_PLUGIN_INFO([wavpack],[wavpack player],[test $HAVE_WAVPACK]) PRINT_PLUGIN_INFO([sndfile],[PCM (wav,aiff,etc) player based on libsndfile],[test $HAVE_SNDFILE]) PRINT_PLUGIN_INFO([vfs_curl],[http/ftp streaming support],[test $HAVE_CURL]) -PRINT_PLUGIN_INFO([faad2],[aac/mp4 player],[test $HAVE_FAAD && test $HAVE_MP4FF]) +dnl PRINT_PLUGIN_INFO([faad2],[aac/mp4 player],[test $HAVE_FAAD && test $HAVE_MP4FF]) PRINT_PLUGIN_INFO([cdda],[cd audio player],[test $HAVE_CDIO && test $HAVE_CDDB]) echo @@ -191,7 +191,6 @@ plugins/flac/Makefile plugins/wavpack/Makefile plugins/sndfile/Makefile plugins/vfs_curl/Makefile -plugins/faad2/Makefile plugins/cdda/Makefile deadbeef.desktop ]) |