diff options
| author |  Alexey Yakovenko <wakeroid@gmail.com> | 2010-03-28 10:10:44 +0200 |
|---|---|---|
| committer | Alexey Yakovenko <wakeroid@gmail.com> | 2010-03-28 10:10:44 +0200 |
| commit | 3e8bb0dcf945a1e8c741f2a134f59c2695634bbf (patch) | |
| tree | f9fe9ec7f26a98fee9cb20136723a4d64a82187d | |
| parent | 9c806f8aade3e95ce2a8d334be8a4123363116ac (diff) | |
removed taglib remainings from configure.ac and Makefile.am
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | configure.ac | 10 |
2 files changed, 1 insertions, 12 deletions
diff --git a/Makefile.am b/Makefile.am index a7eea18a..91d16383 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,8 +23,7 @@ SUBDIRS = ${MPGMAD_DIR}\ ${OSS_DIR}\ ${PULSE_DIR}\ ${ARTWORK_DIR}\ - plugins/supereq\ - ${TAGLIB_DIR} + plugins/supereq dumbpath=@top_srcdir@/dumb gmepath=@top_srcdir@/gme/Game_Music_Emu-0.5.2 diff --git a/configure.ac b/configure.ac index 29cec518..369becdf 100644 --- a/configure.ac +++ b/configure.ac @@ -49,7 +49,6 @@ PKG_CHECK_MODULES(GTKUI_DEPS, gtk+-2.0 >= 2.12 gthread-2.0 glib-2.0, HAVE_GTK=1, PKG_CHECK_MODULES(ALSA_DEPS, alsa, HAVE_ALSA=1, NO_ALSA=1) PKG_CHECK_MODULES(FFMPEG_DEPS, libavcodec >= 51.0.0 libavutil libavformat >= 52.0.0, HAVE_FFMPEG=1, NO_FFMPEG=1) PKG_CHECK_MODULES(PULSE_DEPS, libpulse-simple, HAVE_PULSE=1, NO_PULSE=1) -PKG_CHECK_MODULES(TAGLIB_DEPS, taglib, HAVE_TAGLIB=yes, HAVE_TAGLIB=no) AC_ARG_ENABLE(libnotify, [ --enable-libnotify Enable support for OSD notifications], [libnotify=yes]) @@ -269,13 +268,6 @@ if test ${HAVE_CURL}; then AC_SUBST(ARTWORK_DIR) fi -if test "x$HAVE_TAGLIB" = "xyes" ; then - TAGLIB_DIR="plugins/taglib" - AC_SUBST(TAGLIB_DIR) - AC_SUBST(TAGLIB_DEPS_CFLAGS) - AC_SUBST(TAGLIB_DEPS_LIBS) -fi - dnl print summary echo echo "plugin summary:" @@ -317,7 +309,6 @@ PRINT_PLUGIN_INFO([oss],[oss output plugin],[test "x$have_oss" = "xyes"]) PRINT_PLUGIN_INFO([pulse],[PulseAudio output plugin],[test $HAVE_PULSE]) PRINT_PLUGIN_INFO([artwork],[Cover art plugin],[test $HAVE_ARTWORK]) PRINT_PLUGIN_INFO([supereq],[Equalizer based on Super EQ library by Naoki Shibata],[true]) -PRINT_PLUGIN_INFO([taglib],[Tag writer plugin based on taglib],[test "x$HAVE_TAGLIB" = "xyes"]) echo AC_OUTPUT([ @@ -349,7 +340,6 @@ plugins/oss/Makefile plugins/pulse/Makefile plugins/artwork/Makefile plugins/supereq/Makefile -plugins/taglib/Makefile deadbeef.desktop ]) |