banshee r3550 - in branches/banshee/stable: . build/m4/banshee src/Core/Banshee.Base src/Plugins/Banshee.Plugins.NotificationAreaIcon

[sdroege svn gnome org]

Author: sdroege
Date: Wed Mar 26 08:12:38 2008
New Revision: 3550
URL: http://svn.gnome.org/viewvc/banshee?rev=3550&view=rev

Log:
* build/m4/banshee/notify-sharp.m4:
* configure.ac:
* src/Core/Banshee.Base/Makefile.am:
* src/Plugins/Banshee.Plugins.NotificationAreaIcon/Makefile.am: Allow
building against an external notify-sharp if one is found. This is
especially important as the next notification-daemon release in a
few days changes the DBus API and a newer notify-sharp is required
then.


Added:
   branches/banshee/stable/build/m4/banshee/notify-sharp.m4
Modified:
   branches/banshee/stable/ChangeLog
   branches/banshee/stable/configure.ac
   branches/banshee/stable/src/Core/Banshee.Base/Makefile.am
   branches/banshee/stable/src/Plugins/Banshee.Plugins.NotificationAreaIcon/Makefile.am

Added: branches/banshee/stable/build/m4/banshee/notify-sharp.m4
==============================================================================
--- (empty file)
+++ branches/banshee/stable/build/m4/banshee/notify-sharp.m4	Wed Mar 26 08:12:38 2008
@@ -0,0 +1,16 @@
+AC_DEFUN([BANSHEE_CHECK_NOTIFY_SHARP],
+[
+	AC_ARG_ENABLE(external_notify_sharp, AC_HELP_STRING([--enable-external-notify-sharp], 
+		[Use external Notify# instead of the bundled one]), 
+		enable_external_notify_sharp="yes", enable_external_notify_sharp="no")
+
+	if test "x$enable_external_notify_sharp" = "xyes"; then
+		PKG_CHECK_MODULES(NOTIFY_SHARP, notify-sharp)
+		AC_SUBST(NOTIFY_SHARP_LIBS)
+		AM_CONDITIONAL(EXTERNAL_NOTIFY_SHARP, true)
+	else
+		AC_MSG_RESULT([no])
+		AM_CONDITIONAL(EXTERNAL_NOTIFY_SHARP, false)
+	fi
+])
+

Modified: branches/banshee/stable/configure.ac
==============================================================================
--- branches/banshee/stable/configure.ac	(original)
+++ branches/banshee/stable/configure.ac	Wed Mar 26 08:12:38 2008
@@ -70,6 +70,9 @@
 dnl External TagLib# libraries (optional)
 BANSHEE_CHECK_TAGLIB_SHARP
 
+dnl External notify-sharp libraries (optional)
+BANSHEE_CHECK_NOTIFY_SHARP
+
 dnl Required dependencies (managed/core)
 BANSHEE_CHECK_GTK_SHARP
 PKG_CHECK_MODULES(SQLITE, sqlite3 >= 3.2)

Modified: branches/banshee/stable/src/Core/Banshee.Base/Makefile.am
==============================================================================
--- branches/banshee/stable/src/Core/Banshee.Base/Makefile.am	(original)
+++ branches/banshee/stable/src/Core/Banshee.Base/Makefile.am	Wed Mar 26 08:12:38 2008
@@ -245,9 +245,15 @@
 	$(srcdir)/MediaEngine/PlayerEngine.cs \
 	$(srcdir)/MediaEngine/IEqualizer.cs
 
+if EXTERNAL_NOTIFY_SHARP
+NOTIFICATIONS_SOURCES = 
+NOTIFICATIONS_LIBS = $(NOTIFY_SHARP_LIBS)
+else
 NOTIFICATIONS_SOURCES = \
 	$(srcdir)/Notifications/Notification.cs \
 	$(srcdir)/Notifications/Notifications.cs
+NOTIFICATIONS_LIBS =
+endif
 
 HYENA_SOURCES = \
 	$(srcdir)/Hyena/IUndoAction.cs \
@@ -376,7 +382,7 @@
 Banshee_Base_EXPANDED_RESOURCES_BUILD = $(foreach resource,$(Banshee_Base_EXPANDED_RESOURCES), $(addprefix -resource:,$(resource)),$(notdir $(resource)))
 
 $(ASSEMBLY): $(ASSEMBLY_SOURCES) $(Banshee_Base_EXPANDED_RESOURCES)
-	$(BUILD_LIB) $(LNB_CSFLAGS) -out:$@ $(LINK_TAGLIB) $(LINK_BANSHEE_WIDGETS) $(LINK_MUSICBRAINZ) $(LINK_LAST_FM) $(LINK_HAL) $(LINK_DBUS) $(LINK_GTK) $(LINK_MONO_UNIX) $(LINK_BOO) $(LINK_BOOBUDDY) -r:System.Data -r:Mono.Data.SqliteClient -r:Mono.Cairo $(Banshee_Base_EXPANDED_RESOURCES_BUILD) $(ASSEMBLY_SOURCES)
+	$(BUILD_LIB) $(LNB_CSFLAGS) -out:$@ $(LINK_TAGLIB) $(LINK_BANSHEE_WIDGETS) $(LINK_MUSICBRAINZ) $(LINK_LAST_FM) $(LINK_HAL) $(LINK_DBUS) $(LINK_GTK) $(LINK_MONO_UNIX) $(LINK_BOO) $(LINK_BOOBUDDY) $(NOTIFICATIONS_LIBS) -r:System.Data -r:Mono.Data.SqliteClient -r:Mono.Cairo $(Banshee_Base_EXPANDED_RESOURCES_BUILD) $(ASSEMBLY_SOURCES)
 
 include $(top_srcdir)/build/gconf-schema-rules
 

Modified: branches/banshee/stable/src/Plugins/Banshee.Plugins.NotificationAreaIcon/Makefile.am
==============================================================================
--- branches/banshee/stable/src/Plugins/Banshee.Plugins.NotificationAreaIcon/Makefile.am	(original)
+++ branches/banshee/stable/src/Plugins/Banshee.Plugins.NotificationAreaIcon/Makefile.am	Wed Mar 26 08:12:38 2008
@@ -9,6 +9,12 @@
 
 MENU_RESOURCE = NotificationAreaIconMenu.xml
 
+if EXTERNAL_NOTIFY_SHARP
+NOTIFY_SHARP_LIBS = $(NOTIFY_SHARP_LIBS)
+else
+NOTIFY_SHARP_LIBS =
+endif
+
 ASSEMBLY_SOURCES = \
 	$(top_srcdir)/src/AssemblyInfo.cs \
 	$(srcdir)/NotificationAreaIconPlugin.cs \
@@ -16,7 +22,7 @@
 	$(srcdir)/NotificationArea.cs
 
 $(ASSEMBLY): $(ASSEMBLY_SOURCES) $(MENU_RESOURCE)
-	$(BUILD_LIB_BANSHEE_CORE) -out:$@ $(LINK_GTK) $(LINK_MONO_UNIX) -resource:$(srcdir)/$(MENU_RESOURCE),$(MENU_RESOURCE) $(ASSEMBLY_SOURCES)
+	$(BUILD_LIB_BANSHEE_CORE) -out:$@ $(LINK_GTK) $(LINK_MONO_UNIX) $(NOTIFY_SHARP_LIBS) -resource:$(srcdir)/$(MENU_RESOURCE),$(MENU_RESOURCE) $(ASSEMBLY_SOURCES)
 
 include $(top_srcdir)/build/gconf-schema-rules