banshee r3549 - in trunk/banshee: . build/m4/banshee src/Extensions/Banshee.NotificationArea
- From: sdroege svn gnome org
- To: svn-commits-list gnome org
- Subject: banshee r3549 - in trunk/banshee: . build/m4/banshee src/Extensions/Banshee.NotificationArea
- Date: Wed, 26 Mar 2008 07:57:50 +0000 (GMT)
Author: sdroege
Date: Wed Mar 26 07:57:50 2008
New Revision: 3549
URL: http://svn.gnome.org/viewvc/banshee?rev=3549&view=rev
Log:
* build/m4/banshee/notify-sharp.m4:
* src/Extensions/Banshee.NotificationArea/Makefile.am:
* configure.ac: 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:
trunk/banshee/build/m4/banshee/notify-sharp.m4
Modified:
trunk/banshee/ChangeLog
trunk/banshee/configure.ac
trunk/banshee/src/Extensions/Banshee.NotificationArea/Makefile.am
Added: trunk/banshee/build/m4/banshee/notify-sharp.m4
==============================================================================
--- (empty file)
+++ trunk/banshee/build/m4/banshee/notify-sharp.m4 Wed Mar 26 07:57:50 2008
@@ -0,0 +1,12 @@
+AC_DEFUN([BANSHEE_CHECK_NOTIFY_SHARP],
+[
+ PKG_CHECK_MODULES(NOTIFY_SHARP, notify-sharp, have_notify_sharp=yes, have_notify_sharp=no)
+ if test "x$have_notify_sharp" = "xyes"; then
+ AC_SUBST(NOTIFY_SHARP_LIBS)
+ AM_CONDITIONAL(EXTERNAL_NOTIFY_SHARP, true)
+ else
+ AM_CONDITIONAL(EXTERNAL_NOTIFY_SHARP, false)
+ AC_MSG_RESULT([no])
+ fi
+])
+
Modified: trunk/banshee/configure.ac
==============================================================================
--- trunk/banshee/configure.ac (original)
+++ trunk/banshee/configure.ac Wed Mar 26 07:57:50 2008
@@ -65,6 +65,9 @@
dnl Mono.Addins libraries
BANSHEE_CHECK_MONO_ADDINS
+dnl notify-sharp library
+BANSHEE_CHECK_NOTIFY_SHARP
+
dnl Monodoc (optional through --disable-docs)
SHAMROCK_CHECK_MONODOC
Modified: trunk/banshee/src/Extensions/Banshee.NotificationArea/Makefile.am
==============================================================================
--- trunk/banshee/src/Extensions/Banshee.NotificationArea/Makefile.am (original)
+++ trunk/banshee/src/Extensions/Banshee.NotificationArea/Makefile.am Wed Mar 26 07:57:50 2008
@@ -1,6 +1,14 @@
+if EXTERNAL_NOTIFY_SHARP
+NOTIFY_SHARP_SOURCES =
+NOTIFY_SHARP_LIBS = $(NOTIFY_SHARP_LIBS)
+else
+NOTIFY_SHARP_SOURCES = Notifications/Notifications.cs Notifications/Notification.cs
+NOTIFY_SHARP_LIBS =
+endif
+
ASSEMBLY = Banshee.NotificationArea
TARGET = library
-LINK = $(REF_EXTENSION_NOTIFICATIONAREA)
+LINK = $(REF_EXTENSION_NOTIFICATIONAREA) $(NOTIFY_SHARP_LIBS)
INSTALL_DIR = $(EXTENSIONS_INSTALL_DIR)
SOURCES = \
@@ -10,8 +18,7 @@
Banshee.NotificationArea/TrackInfoPopup.cs \
Banshee.NotificationArea/X11NotificationArea.cs \
Banshee.NotificationArea/X11NotificationAreaBox.cs \
- Notifications/Notification.cs \
- Notifications/Notifications.cs
+ $(NOTIFY_SHARP_SOURCES)
RESOURCES = \
Resources/Banshee.NotificationArea.addin.xml \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]