beagle r4768 - in trunk/beagle: . Filters

[dbera svn gnome org]

Author: dbera
Date: Sun Jun  1 20:36:18 2008
New Revision: 4768
URL: http://svn.gnome.org/viewvc/beagle?rev=4768&view=rev

Log:
Hard dependency added: taglib-sharp-2.x.
 - Every (major?) distribution now has packages for taglib-sharp. Save some trouble by not including it anymore.


Modified:
   trunk/beagle/Filters/Makefile.am
   trunk/beagle/configure.in

Modified: trunk/beagle/Filters/Makefile.am
==============================================================================
--- trunk/beagle/Filters/Makefile.am	(original)
+++ trunk/beagle/Filters/Makefile.am	Sun Jun  1 20:36:18 2008
@@ -151,24 +151,13 @@
 ASSEMBLIES =				\
 	$(BEAGLED_LIBS)			\
 	$(SHARPZIPLIB_LIBS)		\
+	$(TAGLIB_SHARP_LIBS)		\
 	-r:Mono.Posix			\
 	-r:System.Web			\
 	$(LOCAL_ASSEMBLIES:%=-r:%)
 
 ########################################################
 
-include TagLib/TagLib.sources
-
-if INTERNAL_TAGLIB
-CSFILES += $(TAGLIB_CSFILES)
-else
-ASSEMBLIES += $(TAGLIB_SHARP_LIBS)
-endif
-
-COND_CS_FILES += $(TAGLIB_CSFILES)
-
-########################################################
-
 RESOURCES =
 
 $(TARGET): $(CSFILES) $(LOCAL_ASSEMBLIES)

Modified: trunk/beagle/configure.in
==============================================================================
--- trunk/beagle/configure.in	(original)
+++ trunk/beagle/configure.in	Sun Jun  1 20:36:18 2008
@@ -381,24 +381,8 @@
 
 dnl taglib-sharp: Needed for indexing audio formats
 
-AC_ARG_ENABLE([internal-taglib],
-	AC_HELP_STRING([--enable-internal-taglib], [Use internal taglib-sharp (default auto)]),
-	enable_internal_taglib=$enableval,
-	enable_internal_taglib=auto)
-
-if test "x$enable_internal_taglib" != "xyes"; then
-	PKG_CHECK_MODULES(TAGLIB_SHARP, taglib-sharp >= 2.0, internal_taglib=no, internal_taglib=yes)
-	if test "x$enable_internal_taglib" = "xno" -a "x$internal_taglib" = "xyes"; then
-		AC_MSG_ERROR([taglib-sharp >= 2.0 not found])
-	else
-		enable_internal_taglib=$internal_taglib
-	fi
-else
-	enable_internal_taglib="yes"
-fi
-
+PKG_CHECK_MODULES(TAGLIB_SHARP, taglib-sharp >= 2.0)
 AC_SUBST(TAGLIB_SHARP_LIBS)
-AM_CONDITIONAL(INTERNAL_TAGLIB, test "x$enable_internal_taglib" = "xyes")
 
 dnl ----------------------------------------------
 
@@ -711,8 +695,6 @@
 	Thunderbird Extension? 	  ${enable_tbird}
 	Google Backends?          ${enable_google}
 
-	Local taglib-sharp?       ${enable_internal_taglib}
-
 	Monitor screensaver       ${have_xss}
 	beagle-search GUI	  ${enable_gui}
 	Qt beagle-settings GUI    ${enable_qt}