Re: [Rhythmbox-devel] rhythmbox doesn't detect incorrect libid3tagversion

[Bastien Nocera <hadess hadess net>]

On Tue, 2003-12-02 at 18:16, Owen Williams wrote:
> I had been having trouble installing rhythmbox 0.6.1+, and have finally
> discovered that my version of libid3tag was out of date.   the configure
> script should be modified to check for version 0.15.0b or higher.

My mistake, a patch for that, and to revive the tests directory.
Colin, can you apply?

Cheers

---
Bastien Nocera <hadess@hadess.net> 
Her hair glistened in the rain like nose hair after a sneeze. 
Index: Makefile.am
===================================================================
RCS file: /cvs/gnome/rhythmbox/Makefile.am,v
retrieving revision 1.32
diff -u -r1.32 Makefile.am
--- Makefile.am	29 Nov 2003 05:58:01 -0000	1.32
+++ Makefile.am	3 Dec 2003 01:35:09 -0000
@@ -4,7 +4,7 @@
 
 DISTCHECK_CONFIGURE_FLAGS = --disable-schemas-install
 
-SUBDIRS = lib monkey-media rhythmdb widgets sources iradio corba shell data po component help
+SUBDIRS = lib monkey-media rhythmdb widgets sources iradio corba shell data po component help tests
 
 EXTRA_DIST = 			\
 	autogen.sh		\
Index: configure.ac
===================================================================
RCS file: /cvs/gnome/rhythmbox/configure.ac,v
retrieving revision 1.61
diff -u -r1.61 configure.ac
--- configure.ac	1 Dec 2003 04:20:14 -0000	1.61
+++ configure.ac	3 Dec 2003 01:35:11 -0000
@@ -188,13 +188,12 @@
 AC_ARG_ENABLE(mp3, AC_HELP_STRING([--disable-mp3],
 				[don't build with MP3 support]))
 if test "x$enable_mp3" != "xno"; then
-  AC_CHECK_HEADER(id3tag.h,[enable_mp3=yes],)
+  PKG_CHECK_MODULES(ID3TAG, id3tag >= 0.15.0b, enable_mp3=yes, enable_mp3=no)
 fi
 if test "x$enable_mp3" = "xyes"; then
   if test x"$have_gstreamer" = xyes; then
     AM_GST_ELEMENT_CHECK(mad,,missing_gst_elements="$missing_gst_elements mad")
   fi
-  ID3TAG_LIBS="-lid3tag"
   AC_SUBST(ID3TAG_LIBS)
 fi
 if test "x$enable_mp3" = "xyes"; then
@@ -424,6 +423,7 @@
 help/C/Makefile
 po/Makefile.in
 component/Makefile
+tests/Makefile
 rhythmbox.spec
 ])
 
Index: tests/Makefile.am
===================================================================
RCS file: /cvs/gnome/rhythmbox/tests/Makefile.am,v
retrieving revision 1.7
diff -u -r1.7 Makefile.am
--- tests/Makefile.am	29 Sep 2003 04:52:54 -0000	1.7
+++ tests/Makefile.am	3 Dec 2003 01:35:14 -0000
@@ -1,10 +1,12 @@
 ## arch-tag: Automake rules for test programs
 ## Process this file with automake to produce Makefile.in
 
-TESTS = test-rhythmdb-simple test-rhythmdb-indexing \
-		  test-rhythmdb-query test-rhythmdb-tree-serialization \
-		  test-rhythmdb-tree-deserialization \
-		  test-rhythmdb-view
+#TESTS = test-rhythmdb-simple test-rhythmdb-indexing \
+#		  test-rhythmdb-query test-rhythmdb-tree-serialization \
+#		  test-rhythmdb-tree-deserialization \
+#		  test-rhythmdb-view
+
+TESTS = 
 
 noinst_PROGRAMS = test-info test-cmdline $(TESTS)