[sound-juicer] Remove support for obsolete libmusicbrainz2

[Bastien Nocera <hadess src gnome org>]

commit edd6235f1ceb11d0d96e523af73981c74e2a6bf1
Author: Bastien Nocera <hadess hadess net>
Date:   Fri May 14 16:30:33 2010 +0100

    Remove support for obsolete libmusicbrainz2

 configure.in                        |   19 +-
 libjuicer/Makefile.am               |    8 -
 libjuicer/sj-metadata-musicbrainz.c |  616 -----------------------------------
 libjuicer/sj-metadata-musicbrainz.h |   57 ----
 tests/Makefile.am                   |    2 -
 5 files changed, 2 insertions(+), 700 deletions(-)
---
diff --git a/configure.in b/configure.in
index 2b5b4aa..1cef7d7 100644
--- a/configure.in
+++ b/configure.in
@@ -82,25 +82,10 @@ AC_SUBST(MUSICBRAINZ3_LIBS)
 AM_CONDITIONAL([HAVE_MUSICBRAINZ3], [test "$have_mb3" = "yes"])
 if test "$have_mb3" = "yes" ; then
 	AC_DEFINE([HAVE_MUSICBRAINZ3], 1, [Whether libmusicbrainz3 is available])
+else
+        AC_MSG_ERROR([libmusicbrainz3 needs to be available for sound-juicer to build])
 fi
 
-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"
-AC_CHECK_FUNCS(mb_SetProxyCreds)
-LIBS="$oldlibs"
-
 oldlibs=$LIBS
 LIBS="$LIBS $MUSICBRAINZ3_LIBS"
 AC_CHECK_FUNCS(mb_extract_uuid)
diff --git a/libjuicer/Makefile.am b/libjuicer/Makefile.am
index 0db4007..f134c2b 100644
--- a/libjuicer/Makefile.am
+++ b/libjuicer/Makefile.am
@@ -22,7 +22,6 @@ libjuicer_la_CPPFLAGS = \
 
 libjuicer_la_CFLAGS = \
 	$(WARN_CFLAGS)	\
-	$(MUSICBRAINZ_CFLAGS) \
 	$(MUSICBRAINZ3_CFLAGS) \
 	$(GSTREAMER_CFLAGS) \
 	$(MEDIA_PROFILES_CFLAGS) \
@@ -32,7 +31,6 @@ libjuicer_la_CFLAGS = \
 	$(AM_CFLAGS)
 
 libjuicer_la_LIBADD = \
-	$(MUSICBRAINZ_LIBS) \
 	$(MUSICBRAINZ3_LIBS) \
 	$(MEDIA_PROFILES_LIBS) \
 	$(GSTREAMER_LIBS) \
@@ -44,12 +42,6 @@ libjuicer_la_LDFLAGS = \
 	-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 \
diff --git a/tests/Makefile.am b/tests/Makefile.am
index b18630e..27906b2 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -12,7 +12,6 @@ mb_test_CPPFLAGS = \
 
 mb_test_CFLAGS = \
 	$(WARN_CFLAGS) \
-	$(MUSICBRAINZ_CFLAGS) \
 	$(GSTREAMER_CFLAGS) \
 	$(MEDIA_PROFILES_CFLAGS) \
 	$(BURN_CFLAGS) \
@@ -23,7 +22,6 @@ mb_test_CFLAGS = \
 mb_test_LDADD = \
 	$(BURN_LIBS) \
 	$(UI_LIBS) \
-	$(MUSICBRAINZ_LIBS) \
 	$(DBUS_LIBS) \
 	$(top_builddir)/libjuicer/libjuicer.la