sound-juicer r2457 - in trunk: . libjuicer

[hadess svn gnome org]

Author: hadess
Date: Thu Feb 19 10:05:21 2009
New Revision: 2457
URL: http://svn.gnome.org/viewvc/sound-juicer?rev=2457&view=rev

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

	* configure.in:
	* libjuicer/Makefile.am:
	* libjuicer/sj-metadata-getter.c (lookup_cd):
	Allow building with the old libmusicbrainz as long
	as libmusicbrainz3 is available (Closes: #572383)



Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/libjuicer/Makefile.am
   trunk/libjuicer/sj-metadata-getter.c

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Thu Feb 19 10:05:21 2009
@@ -89,9 +89,17 @@
 	AC_DEFINE([HAVE_MUSICBRAINZ3], 1, [Whether libmusicbrainz3 is available])
 fi
 
-PKG_CHECK_MODULES(MUSICBRAINZ, libmusicbrainz >= 2.1.3)
+PKG_CHECK_MODULES(MUSICBRAINZ, libmusicbrainz >= 2.1.3, [have_mb=yes], [have_mb=no])
 AC_SUBST(MUSICBRAINZ_CFLAGS)
 AC_SUBST(MUSICBRAINZ_LIBS)
+AM_CONDITIONAL([HAVE_MUSICBRAINZ], [test "$have_mb" = "yes"])
+if test "$have_mb" = "yes" ; then
+	AC_DEFINE([HAVE_MUSICBRAINZ], 1, [Whether libmusicbrainz is available])
+fi
+
+if test "$have_mb" = "no" && test "$have_mb3" = "no" ; then
+        AC_MSG_ERROR([Either libmusicbrainz or libmusicbrainz3 needs to be available for sound-juicer to build])
+fi
 
 oldlibs=$LIBS
 LIBS="$LIBS $MUSICBRAINZ_LIBS"

Modified: trunk/libjuicer/Makefile.am
==============================================================================
--- trunk/libjuicer/Makefile.am	(original)
+++ trunk/libjuicer/Makefile.am	Thu Feb 19 10:05:21 2009
@@ -10,8 +10,6 @@
 	sj-extractor.c \
 	sj-metadata.h \
 	sj-metadata.c \
-	sj-metadata-musicbrainz.h \
-	sj-metadata-musicbrainz.c \
 	sj-metadata-gvfs.h \
 	sj-metadata-gvfs.c \
 	sj-metadata-getter.c \
@@ -46,6 +44,12 @@
 	-export-dynamic \
 	$(AM_LDFLAGS)
 
+if HAVE_MUSICBRAINZ
+libjuicer_la_SOURCES += \
+	sj-metadata-musicbrainz.h \
+	sj-metadata-musicbrainz.c
+endif
+
 if HAVE_MUSICBRAINZ3
 libjuicer_la_SOURCES += \
 	sj-metadata-musicbrainz3.h \

Modified: trunk/libjuicer/sj-metadata-getter.c
==============================================================================
--- trunk/libjuicer/sj-metadata-getter.c	(original)
+++ trunk/libjuicer/sj-metadata-getter.c	Thu Feb 19 10:05:21 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 */