last-exit r168 - in trunk: . notify-sharp src

[sdroege svn gnome org]

Author: sdroege
Date: Wed Mar 26 08:08:52 2008
New Revision: 168
URL: http://svn.gnome.org/viewvc/last-exit?rev=168&view=rev

Log:
* configure.ac:
* notify-sharp/Makefile.am:
* src/Makefile.am: Use an external notify-sharp if available. This
is most important as the DBus interface of notification-daemon changes
soonish and a notify-sharp is required for this.


Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/notify-sharp/Makefile.am
   trunk/src/Makefile.am

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Wed Mar 26 08:08:52 2008
@@ -50,6 +50,13 @@
 fi
 AM_CONDITIONAL(EXTERNAL_DBUS, test "x$have_external_dbus" = "xyes")
 
+PKG_CHECK_MODULES(NOTIFY_SHARP, notify-sharp, have_external_notify_sharp="yes", have_external_notify_sharp="no")
+if test "x$have_external_notify_sharp" != "xyes"; then
+	AC_MSG_RESULT([using internal copy])
+fi
+AM_CONDITIONAL(EXTERNAL_NOTIFY_SHARP, test "x$have_external_notify_sharp" = "xyes")
+
+
 AC_PATH_PROG(MCS, gmcs)
 if test x$MCS = x; then
 	AC_MSG_ERROR(You need mcs)

Modified: trunk/notify-sharp/Makefile.am
==============================================================================
--- trunk/notify-sharp/Makefile.am	(original)
+++ trunk/notify-sharp/Makefile.am	Wed Mar 26 08:08:52 2008
@@ -1,13 +1,13 @@
 NOTIFY_ASSEMBLY = notify-sharp.dll
+NOTIFY_SRC = \
+		$(srcdir)/Global.cs \
+		$(srcdir)/Notification.cs
 
+if !EXTERNAL_NOTIFY_SHARP
 notifydir = $(pkglibdir)
 notify_SCRIPTS = \
 	$(NOTIFY_ASSEMBLY)
 
-NOTIFY_SRC = 				\
-		$(srcdir)/Global.cs \
-		$(srcdir)/Notification.cs
-
 if EXTERNAL_DBUS
 DBUS_ASSEMBLIES = $(DBUS_LIBS)
 else
@@ -21,6 +21,8 @@
 $(NOTIFY_ASSEMBLY): $(NOTIFY_SRC)
 	$(MCS) -target:library -out:$@ $(DBUS_ASSEMBLIES) $(GTKSHARP_LIBS) $(NOTIFY_SRC)
 
+endif
+
 EXTRA_DIST = $(NOTIFY_SRC)
 DISTCLEANFILES = $(NOTIFY_ASSEMBLY) $(NOTIFY_ASSEMBLY).mdb
 MAINTAINERCLEANFILES = Makefile.in

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Wed Mar 26 08:08:52 2008
@@ -72,8 +72,12 @@
 XMLRPC_ASSEMBLIES = 				\
 	-r:${DIR_XMLRPC}/XmlRpcCS.dll
 
+if EXTERNAL_NOTIFY_SHARP
+NOTIFY_ASSEMBLIES = $(NOTIFY_SHARP_LIBS)
+else
 NOTIFY_ASSEMBLIES =				\
 	-r:$(DIR_NOTIFY)/notify-sharp.dll
+endif
 
 LASTEXIT_RESOURCES =				\
 	-resource:$(top_srcdir)/data/glade/FindStation.glade	\