[banshee/watcher] [watcher] Only build if mono >= 2.4.3



commit 400cc2b95bcdd49f9a61d5141c0cb61302f67cf9
Author: Gabriel Burt <gabriel burt gmail com>
Date:   Wed Jan 20 11:55:28 2010 -0800

    [watcher] Only build if mono >= 2.4.3
    
    But keep the overall Banshee Mono dep at 1.9.1

 NEWS                                              |    1 +
 configure.ac                                      |    7 ++++++-
 src/Extensions/Banshee.LibraryWatcher/Makefile.am |    5 ++++-
 3 files changed, 11 insertions(+), 2 deletions(-)
---
diff --git a/NEWS b/NEWS
index 3326b69..9b818b2 100644
--- a/NEWS
+++ b/NEWS
@@ -93,6 +93,7 @@ DEPENDENCIES
       * mono-zeroconf >= 0.8.0
       * boo >= 0.8.1
       * GIO support reequires glib >= 2.22 and gio-sharp and gtk-sharp-beans
+      * Library Watcher extension requires Mono >= 2.4.3
       * Accessibilty for ListView and Rating widgets requires Gtk# >= 2.12.10
 
     * Run-time requirements for default feature stack:
diff --git a/configure.ac b/configure.ac
index 2b62bc2..e076228 100644
--- a/configure.ac
+++ b/configure.ac
@@ -65,7 +65,7 @@ BANSHEE_CHECK_GSTREAMER
 BANSHEE_CHECK_NOW_PLAYING_X11
 
 dnl Mono and gmcs
-SHAMROCK_CHECK_MONO_MODULE(2.4.3)
+SHAMROCK_CHECK_MONO_MODULE(1.9.1)
 SHAMROCK_FIND_MONO_2_0_COMPILER
 SHAMROCK_FIND_MONO_RUNTIME
 SHAMROCK_CHECK_MONO_2_0_GAC_ASSEMBLIES([	
@@ -77,6 +77,10 @@ SHAMROCK_CHECK_MONO_2_0_GAC_ASSEMBLIES([
 	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 NDesk DBus libraries
 BANSHEE_CHECK_NDESK_DBUS
 
@@ -337,6 +341,7 @@ ${PACKAGE}-${VERSION}
     Podcast Support:   ${enable_podcast}
     Boo Scripting:     ${enable_boo}
     Builtin Equalizer: ${enable_builtin_equalizer}
+    Library Watcher:   ${HAVE_MONO_2_4_3} (requires Mono >= 2.4.3)
     GIO Support:       ${enable_gio} (requires glib >= 2.22, gtk-sharp-beans, and gio-sharp)
 
   Build/Development:
diff --git a/src/Extensions/Banshee.LibraryWatcher/Makefile.am b/src/Extensions/Banshee.LibraryWatcher/Makefile.am
index 67d22fe..fec87a8 100644
--- a/src/Extensions/Banshee.LibraryWatcher/Makefile.am
+++ b/src/Extensions/Banshee.LibraryWatcher/Makefile.am
@@ -9,5 +9,8 @@ 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]