[banshee/gtk3] build: Default to our internal copy of notify-sharp



commit 6ea998bc2cf3d483e0e4317ddf6b363187aba0fb
Author: Bertrand Lorentz <bertrand lorentz gmail com>
Date:   Fri Jul 22 19:32:02 2011 +0200

    build: Default to our internal copy of notify-sharp
    
    Bring back the option to use the system-installed notify-sharp, but it
    will not be the case by default. As notify-sharp upstream depends on
    gtk-sharp-2.0 and hasn't seen a release for quite a while, we now
    default on using to our internal copy.
    
    You can still force the use of the system-installed notify-sharp by
    adding the --with-system-notify-sharp configure flag. But do that at
    your own risk, it will probably cause a build failure.

 build/m4/banshee/notify-sharp.m4                   |   12 ++++++++++++
 .../Banshee.NotificationArea/Makefile.am           |    6 +++++-
 src/Extensions/Banshee.SoundMenu/Makefile.am       |    7 ++++++-
 3 files changed, 23 insertions(+), 2 deletions(-)
---
diff --git a/build/m4/banshee/notify-sharp.m4 b/build/m4/banshee/notify-sharp.m4
index 6310e1a..3025b6b 100644
--- a/build/m4/banshee/notify-sharp.m4
+++ b/build/m4/banshee/notify-sharp.m4
@@ -1,4 +1,16 @@
 AC_DEFUN([BANSHEE_CHECK_NOTIFY_SHARP],
 [
+	AC_ARG_WITH([system-notify-sharp],
+		AC_HELP_STRING([--with-system-notify-sharp], [Use the notify-sharp library installed on the system]),
+		use_system_notifysharp="yes", use_system_notifysharp="no")
+
+	if test "x$use_system_notifysharp" = "xyes"; then
+		PKG_CHECK_MODULES(NOTIFY_SHARP, notify-sharp)
+		AC_SUBST(NOTIFY_SHARP_LIBS)
+		AM_CONDITIONAL(EXTERNAL_NOTIFY_SHARP, true)
+	else
+		AM_CONDITIONAL(EXTERNAL_NOTIFY_SHARP, false)
+		AC_MSG_NOTICE([Using internal copy of notify-sharp])
+	fi
 ])
 
diff --git a/src/Extensions/Banshee.NotificationArea/Makefile.am b/src/Extensions/Banshee.NotificationArea/Makefile.am
index ee4f409..27b2580 100644
--- a/src/Extensions/Banshee.NotificationArea/Makefile.am
+++ b/src/Extensions/Banshee.NotificationArea/Makefile.am
@@ -1,5 +1,9 @@
+if EXTERNAL_NOTIFY_SHARP
+NOTIFY_SHARP_LIBS = $(NOTIFY_SHARP_LIBS)
+else
 GMCS_FLAGS+="-define:INTERNAL_NOTIFY_SHARP"
 NOTIFY_SHARP_LIBS = 
+endif
 
 if HAVE_GDK_2_22
 GMCS_FLAGS+= "-define:HAVE_GDK_2_22"
@@ -7,7 +11,7 @@ endif
 
 ASSEMBLY = Banshee.NotificationArea
 TARGET = library
-LINK = $(REF_EXTENSION_NOTIFICATIONAREA)
+LINK = $(REF_EXTENSION_NOTIFICATIONAREA) $(NOTIFY_SHARP_LIBS)
 INSTALL_DIR = $(EXTENSIONS_INSTALL_DIR)
 
 SOURCES =  \
diff --git a/src/Extensions/Banshee.SoundMenu/Makefile.am b/src/Extensions/Banshee.SoundMenu/Makefile.am
index e803bae..cbe504c 100644
--- a/src/Extensions/Banshee.SoundMenu/Makefile.am
+++ b/src/Extensions/Banshee.SoundMenu/Makefile.am
@@ -1,4 +1,9 @@
+if EXTERNAL_NOTIFY_SHARP
+NOTIFY_SHARP_LIBS = $(NOTIFY_SHARP_LIBS)
+else
 GMCS_FLAGS+="-define:INTERNAL_NOTIFY_SHARP"
+NOTIFY_SHARP_LIBS = 
+endif
 
 if HAVE_INDICATESHARP
 GMCS_FLAGS+= "-define:HAVE_INDICATESHARP"
@@ -6,7 +11,7 @@ endif
 
 ASSEMBLY = Banshee.SoundMenu
 TARGET = library
-LINK = $(REF_EXTENSION_SOUNDMENU)
+LINK = $(REF_EXTENSION_SOUNDMENU) $(NOTIFY_SHARP_LIBS)
 INSTALL_DIR = $(EXTENSIONS_INSTALL_DIR)
 
 SOURCES =  \



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