Revision: 2320
http://gtkpod.svn.sourceforge.net/gtkpod/?rev=2320&view=rev
Author: dudyk
Date: 2009-04-17 11:00:30 +0000 (Fri, 17 Apr 2009)
Log Message:
-----------
Fixed dependency, should now work without it
Modified Paths:
--------------
gtkpod/branches/taglib-branch/ChangeLog
gtkpod/branches/taglib-branch/configure.in
Modified: gtkpod/branches/taglib-branch/ChangeLog
===================================================================
--- gtkpod/branches/taglib-branch/ChangeLog 2009-04-17 10:17:12 UTC (rev
2319)
+++ gtkpod/branches/taglib-branch/ChangeLog 2009-04-17 11:00:30 UTC (rev
2320)
@@ -1,3 +1,12 @@
+2009-04-17 David Kohen <dudyk at users.sourceforge.net>
+
+ * configure.in: Fixed tests and include for TagLib
+
+2009-04-17 Paul Richardson <phantom_sf at users.sourceforge.net>
+
+ * Reverted src/mp3file.c and configure.in due to lack of released
+ taglib support. Branched existing code to branches/taglib-branch
+
2009-04-16 David Kohen <dudyk at users.sourceforge.net>
* src/mp3file.c: added taglib support
Modified: gtkpod/branches/taglib-branch/configure.in
===================================================================
--- gtkpod/branches/taglib-branch/configure.in 2009-04-17 10:17:12 UTC (rev
2319)
+++ gtkpod/branches/taglib-branch/configure.in 2009-04-17 11:00:30 UTC (rev
2320)
@@ -50,6 +50,8 @@
CFLAGS="$CFLAGS $GTK_CFLAGS $GLIB_CFLAGS $GMODULE_CFLAGS $GTHREAD_CFLAGS
$LIBGLADE_CFLAGS $LIBGPOD_CFLAGS"
LIBS="$LIBS $GTK_LIBS $GLIB_LIBS $GMODULE_LIBS $GTHREAD_LIBS $LIBGLADE_LIBS
$LIBGPOD_LIBS"
+<<<<<<< HEAD:gtkpod/trunk/configure.in
+=======
dnl Check for TagLib's C bindings
AC_ARG_WITH(taglib, AC_HELP_STRING([--without-taglib],[Disable TagLib, use
only id3lib (has problems writing tags)]))
if test "x$with_taglib" != "xno"; then
@@ -61,14 +63,8 @@
AM_CONDITIONAL(HAVE_TAGLIB, test "x$have_taglib_pkg" = "xyes")
if test "x$have_taglib_pkg" = "xyes"; then
OLD_CFLAGS="$CFLAGS"
- OLD_LIBS="$LIBS"
CFLAGS="$CFLAGS $TAGLIB_C_CFLAGS"
- LIBS="$LIBS $TAGLIB_C_LIBS"
- AC_TRY_COMPILE( [#include <tag_c.h>],
- [BOOL Test_taglib_binds(TagLib_File *File)
- {
- return taglib_id3v2_has_lyrics(File);
- } ], taglib_has_lyrics=yes)
+ AC_SEARCH_LIBS([taglib_id3v2_has_lyrics], ["tag_c tag"],
taglib_has_lyrics=yes,taglib_has_lyrics=no)
if test "x$taglib_has_lyrics" = "xyes"; then
have_taglib="yes -- will build with TagLib support"
AC_DEFINE(USE_TAGLIB, 1, [Define if you have TagLib support])
@@ -76,12 +72,12 @@
have_taglib="*no -- will build without taglib support (problems
writing tags, especially lyrics)"
AC_MSG_WARN([LibTag was found but is missing C bindings, did you use a
patched 1.15 or later version?])
CFLAGS="$OLD_CFLAGS"
- LIBS="$OLD_LIBS"
fi
else
have_taglib="*no -- will build without taglib support (problems writing
tags, especially lyrics)"
fi
+>>>>>>> Fixed configure for taglib:gtkpod/trunk/configure.in
dnl we need 'flex'
AM_PROG_LEX
case "$LEX" in
@@ -350,7 +346,6 @@
libgpod version ......: $libgpod_version
gnome-vfs.............: $have_gnome_vfs
hal...................: $have_hal
- TagLib................: $have_taglib
libcurl ..............: $have_curl
mp4v2 ................: $have_mp4v2
vorbisfile ...........: $have_ogg
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Stay on top of everything new and different, both inside and
around Java (TM) technology - register by April 22, and save
$200 on the JavaOne (SM) conference, June 2-5, 2009, San Francisco.
300 plus technical and hands-on sessions. Register today.
Use priority code J9JMT32. http://p.sf.net/sfu/p
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
