commit 7ebbb8205b1257be9b4ca2ef7c2ac8bd3bca62e0 Author: phantomjinx <p.g.richard...@phantomjinx.co.uk> Date: Fri May 13 22:25:51 2011 +0100
No need for binary to depend on id3tag * Only the mp3 filetype plugin needs to depend on id3tag configure.ac | 5 ++--- plugins/filetype_mp3/Makefile.am | 3 ++- 2 files changed, 4 insertions(+), 4 deletions(-) --- diff --git a/configure.ac b/configure.ac index ebee8a7..8e4b2d2 100644 --- a/configure.ac +++ b/configure.ac @@ -138,9 +138,8 @@ PKG_CHECK_MODULES(ID3TAG, id3tag >= 0.15, [have_id3="yes"], [AC_MSG_FAILURE([*** AM_CONDITIONAL(HAVE_ID3TAG, [test "x$have_id3" = "xyes"]) if test "x$have_id3" = "xyes"; then AC_DEFINE(HAVE_ID3TAG, 1, [Define if you have id3 support]) - CPPFLAGS="$CPPFLAGS $ID3TAG_CFLAGS" - CFLAGS="$CFLAGS $ID3TAG_CFLAGS" - LIBS="$LIBS $ID3TAG_LIBS" + AC_SUBST(ID3TAG_CFLAGS) + AC_SUBST(ID3TAG_LIBS) fi dnl Check for libcurl diff --git a/plugins/filetype_mp3/Makefile.am b/plugins/filetype_mp3/Makefile.am index ef8aa77..6593058 100644 --- a/plugins/filetype_mp3/Makefile.am +++ b/plugins/filetype_mp3/Makefile.am @@ -34,7 +34,8 @@ libfiletype_mp3_la_LDFLAGS = $(GTKPOD_PLUGIN_LDFLAGS) # Plugin dependencies libfiletype_mp3_la_LIBADD = \ $(GTKPOD_LIBS) \ - $(LIBANJUTA_LIBS) + $(LIBANJUTA_LIBS) \ + $(ID3TAG_LIBS) EXTRA_DIST = \ $(plugin_file).in \ ------------------------------------------------------------------------------ Achieve unprecedented app performance and reliability What every C/C++ and Fortran developer should know. Learn how Intel has extended the reach of its next-generation tools to help boost performance applications - inlcuding clusters. http://p.sf.net/sfu/intel-dev2devmay _______________________________________________ gtkpod-cvs2 mailing list gtkpod-cvs2@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2