rhythmbox r6155 - in trunk: . plugins/audiocd

[hadess svn gnome org]

Author: hadess
Date: Thu Feb 19 10:08:25 2009
New Revision: 6155
URL: http://svn.gnome.org/viewvc/rhythmbox?rev=6155&view=rev

Log:
2009-02-19  Bastien Nocera  <hadess hadess net>

	* configure.ac: Allow building with libmusicbrainz3 only,
	and don't require the old libmusicbrainz
	* plugins/audiocd/sj-metadata-getter.c (lookup_cd):
	Update from sound-juicer for above



Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/plugins/audiocd/sj-metadata-getter.c

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Thu Feb 19 10:08:25 2009
@@ -315,15 +315,15 @@
 	RHYTHMBOX_CFLAGS="$RHYTHMBOX_CFLAGS $MUSICBRAINZ_CFLAGS"
 	RHYTHMBOX_LIBS="$RHYTHMBOX_LIBS $MUSICBRAINZ_LIBS"
 	AC_DEFINE(HAVE_MUSICBRAINZ, 1, [define if you have Musicbrainz])
-
-	PKG_CHECK_MODULES(MUSICBRAINZ3, libmusicbrainz3, [have_mb3=yes], [have_mb3=no])
-	AC_SUBST(MUSICBRAINZ3_CFLAGS)
-	AC_SUBST(MUSICBRAINZ3_LIBS)
-	if test "$have_mb3" = "yes" ; then
-		AC_DEFINE([HAVE_MUSICBRAINZ3], 1, [Whether libmusicbrainz3 is available])
-	fi
 fi
 AM_CONDITIONAL(HAVE_MUSICBRAINZ, test "x$enable_musicbrainz" = "xyes")
+
+PKG_CHECK_MODULES(MUSICBRAINZ3, libmusicbrainz3, [have_mb3=yes], [have_mb3=no])
+AC_SUBST(MUSICBRAINZ3_CFLAGS)
+AC_SUBST(MUSICBRAINZ3_LIBS)
+if test "$have_mb3" = "yes" ; then
+	AC_DEFINE([HAVE_MUSICBRAINZ3], 1, [Whether libmusicbrainz3 is available])
+fi
 AM_CONDITIONAL([HAVE_MUSICBRAINZ3], [test "x$have_mb3" = "xyes"])
 
 AC_PATH_XTRA
@@ -857,6 +857,12 @@
 	AC_MSG_NOTICE([** MusicBrainz support is enabled])
 fi
 
+if test x"$have_mb3" != "xyes"; then
+	AC_MSG_NOTICE([   MusicBrainz3 support is disabled])
+else
+	AC_MSG_NOTICE([** MusicBrainz3 support is enabled])
+fi
+
 if test x"$use_ipod" = xyes; then
 	AC_MSG_NOTICE([** iPod integration enabled])
 else

Modified: trunk/plugins/audiocd/sj-metadata-getter.c
==============================================================================
--- trunk/plugins/audiocd/sj-metadata-getter.c	(original)
+++ trunk/plugins/audiocd/sj-metadata-getter.c	Thu Feb 19 10:08:25 2009
@@ -28,7 +28,9 @@
 #ifdef HAVE_MUSICBRAINZ3
 #include "sj-metadata-musicbrainz3.h"
 #endif /* HAVE_MUSICBRAINZ3 */
+#ifdef HAVE_MUSICBRAINZ
 #include "sj-metadata-musicbrainz.h"
+#endif /* HAVE_MUSICBRAINZ */
 #ifdef HAVE_LIBCDIO
 #include "sj-metadata-cdtext.h"
 #endif /* HAVE_LIBCDIO */
@@ -179,7 +181,9 @@
 #ifdef HAVE_MUSICBRAINZ3
     SJ_TYPE_METADATA_MUSICBRAINZ3,
 #endif /* HAVE_MUSICBRAINZ3 */
+#ifdef HAVE_MUSICBRAINZ
     SJ_TYPE_METADATA_MUSICBRAINZ,
+#endif /* HAVE_MUSICBRAINZ */
 #ifdef HAVE_LIBCDIO
     SJ_TYPE_METADATA_CDTEXT,
 #endif /* HAVE_LIBCDIO */