[banshee/cleanup: 8/10] cleanup: Bump Mono dep to 2.4.3



commit f8772ba35da1c000f798a7e9b5bb4a503418b260
Author: Gabriel Burt <gabriel burt gmail com>
Date:   Wed Apr 27 14:28:08 2011 -0500

    cleanup: Bump Mono dep to 2.4.3
    
    LibraryWatcher depends on it; remove conditional that allowed Banshee to
    be built without it on older Mono.

 README                                            |    2 +-
 configure.ac                                      |    7 +------
 src/Extensions/Banshee.LibraryWatcher/Makefile.am |    4 ----
 3 files changed, 2 insertions(+), 11 deletions(-)
---
diff --git a/README b/README
index 9390b6b..7e9909f 100644
--- a/README
+++ b/README
@@ -18,7 +18,7 @@ Learn More: http://banshee.fm/
 DEPENDENCIES
 ===============================================================================
 
-    * Mono 1.9.1 (.NET 2.0 Profile / gmcs)
+    * Mono 2.4.3 (.NET 2.0 Profile / gmcs)
     * SQlite 3.4
     * Gtk# 2.12.10
     * GStreamer 0.10.26
diff --git a/configure.ac b/configure.ac
index b089fb9..c180ba7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -64,15 +64,11 @@ dnl User help
 SHAMROCK_CHECK_GNOME_DOC_UTILS(0.17.3)
 
 dnl Mono and gmcs
-SHAMROCK_CHECK_MONO_MODULE(1.9.1)
+SHAMROCK_CHECK_MONO_MODULE(2.4.3)
 SHAMROCK_FIND_MONO_2_0_COMPILER
 SHAMROCK_FIND_MONO_RUNTIME
 SHAMROCK_CHECK_MONO_2_0_GAC_ASSEMBLIES([Mono.Cairo Mono.Posix ICSharpCode.SharpZipLib])
 
-dnl Check for mono >= 2.4.3 for LibraryWatcher extension, with fix for bnc#322330
-PKG_CHECK_MODULES(MONO_2_4_3, mono >= 2.4.3, HAVE_MONO_2_4_3=yes, HAVE_MONO_2_4_3=no)
-AM_CONDITIONAL(ENABLE_LIBRARY_WATCHER, test "x$HAVE_MONO_2_4_3" = "xyes")
-
 dnl Check for GNOME >= 2.28 to see if we should remove
 dnl 'Media Player' from the app Name, bgo#596242, except
 dnl in MeeGo where GNOME >= 2.28, but we want the full name
@@ -400,7 +396,6 @@ ${PACKAGE}-${VERSION}
     DAAP:                  ${enable_daap}
     GIO Backend:           ${enable_gio} (glib >= 2.22, gtk-sharp-beans, and gio-sharp)
     GIO Hardware:          ${enable_gio_hardware} (gudev-sharp, gkeyfile-sharp)
-    Library Watcher:       ${HAVE_MONO_2_4_3} (Mono >= 2.4.3)
     Podcasts:              ${enable_podcast}
     Gapless playback:      ${ENABLE_GAPLESS} (gstreamer-plugins-base > 0.10.25.2)
     YouTube extension:     ${enable_youtube} (gdata-sharp >= 1.4)
diff --git a/src/Extensions/Banshee.LibraryWatcher/Makefile.am b/src/Extensions/Banshee.LibraryWatcher/Makefile.am
index fec87a8..d75e889 100644
--- a/src/Extensions/Banshee.LibraryWatcher/Makefile.am
+++ b/src/Extensions/Banshee.LibraryWatcher/Makefile.am
@@ -9,8 +9,4 @@ SOURCES =  \
 
 RESOURCES = Banshee.LibraryWatcher.addin.xml
 
-if ENABLE_LIBRARY_WATCHER
 include $(top_srcdir)/build/build.mk
-else
-EXTRA_DIST = $(SOURCES) $(RESOURCES)
-endif



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]