rhythmbox r6164 - in trunk: . plugins/audiocd

[hadess svn gnome org]

Author: hadess
Date: Wed Feb 25 10:51:25 2009
New Revision: 6164
URL: http://svn.gnome.org/viewvc/rhythmbox?rev=6164&view=rev

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

	* configure.ac:
	* plugins/audiocd/Makefile.am: More fixes for the conditional
	compilation of libmusicbrainz3 (Closes: #573086)



Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/plugins/audiocd/Makefile.am

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Wed Feb 25 10:51:25 2009
@@ -326,6 +326,11 @@
 fi
 AM_CONDITIONAL([HAVE_MUSICBRAINZ3], [test "x$have_mb3" = "xyes"])
 
+if test "$have_mb3" = "yes" || test x"$enable_musicbrainz" = xyes; then
+	have_sj_getter=yes
+fi
+AM_CONDITIONAL([HAVE_SJ_METADATA_GETTER], [test "x$have_sj_getter" = "xyes"])
+
 AC_PATH_XTRA
 CFLAGS="$CFLAGS $X_CFLAGS"
 #LIBS=$X_LIBS

Modified: trunk/plugins/audiocd/Makefile.am
==============================================================================
--- trunk/plugins/audiocd/Makefile.am	(original)
+++ trunk/plugins/audiocd/Makefile.am	Wed Feb 25 10:51:25 2009
@@ -81,16 +81,19 @@
 
 MARSHALFILES = 
 
-if HAVE_MUSICBRAINZ
+if HAVE_SJ_METADATA_GETTER
 libaudiocd_la_SOURCES +=							\
 	sj-metadata.h sj-metadata.c						\
 	sj-metadata-getter.c sj-metadata-getter.h				\
-	sj-metadata-musicbrainz.h sj-metadata-musicbrainz.c			\
 	sj-metadata-gvfs.c sj-metadata-gvfs.h					\
 	sj-structures.h sj-structures.c						\
 	sj-error.h sj-error.c							\
 	$(MARSHALFILES)
 
+if HAVE_MUSICBRAINZ
+libaudiocd_la_SOURCES += sj-metadata-musicbrainz.c sj-metadata-musicbrainz.h
+endif
+
 if HAVE_MUSICBRAINZ3
 libaudiocd_la_SOURCES += sj-metadata-musicbrainz3.c sj-metadata-musicbrainz3.h
 endif