beagle r4445 - in trunk/beagle: . Util beagled

[dbera svn gnome org]

Author: dbera
Date: Sun Feb  3 01:46:44 2008
New Revision: 4445
URL: http://svn.gnome.org/viewvc/beagle?rev=4445&view=rev

Log:
Require ndesk-dbus >= 0.5.2 (the first thread safe version).


Modified:
   trunk/beagle/Util/Makefile.am
   trunk/beagle/beagled/Makefile.am
   trunk/beagle/configure.in

Modified: trunk/beagle/Util/Makefile.am
==============================================================================
--- trunk/beagle/Util/Makefile.am	(original)
+++ trunk/beagle/Util/Makefile.am	Sun Feb  3 01:46:44 2008
@@ -149,7 +149,7 @@
 
 UTIL_ASSEMBLIES =				\
 	$(BEAGLED_LIBS)				\
-	$(NDESK_DBUS_LIBS)			\
+	$(NDESK_DBUS_GLIB_LIBS)			\
 	-r:System.Data				\
 	-r:Mono.Data.Sqlite			\
 	-r:Mono.Posix				\

Modified: trunk/beagle/beagled/Makefile.am
==============================================================================
--- trunk/beagle/beagled/Makefile.am	(original)
+++ trunk/beagle/beagled/Makefile.am	Sun Feb  3 01:46:44 2008
@@ -498,7 +498,7 @@
 	$(BEAGLED_LIBS)                 			\
 	$(DAEMON_DLL_LOCAL_ASSEMBLIES:%=-r:%)			\
 	$(SHARPZIPLIB_LIBS)					\
-	$(NDESK_DBUS_LIBS)					\
+	$(NDESK_DBUS_GLIB_LIBS)					\
 	-r:Mono.Data.Sqlite					\
 	-r:Mono.Posix
 
@@ -623,7 +623,7 @@
 DAEMON_ASSEMBLIES =				\
 	$(BEAGLED_LIBS)				\
 	$(SHARPZIPLIB_LIBS)			\
-	$(NDESK_DBUS_LIBS)			\
+	$(NDESK_DBUS_GLIB_LIBS)			\
 	$(DAEMON_LOCAL_ASSEMBLIES:%=-r:%)	\
 	-r:Mono.Posix
 
@@ -668,7 +668,7 @@
 	$(BEAGLED_LIBS)				\
 	$(SHARPZIPLIB_LIBS)			\
 	$(INDEX_HELPER_LOCAL_ASSEMBLIES:%=-r:%)	\
-	$(NDESK_DBUS_LIBS)			\
+	$(NDESK_DBUS_GLIB_LIBS)			\
 	-r:Mono.Posix
 
 $(INDEX_HELPER_TARGET): $(INDEX_HELPER_CSFILES) $(INDEX_HELPER_LOCAL_ASSEMBLIES)
@@ -821,7 +821,7 @@
 BUILD_INDEX_ASSEMBLIES = \
 	$(BEAGLED_LIBS)				\
 	$(DAEMON_LOCAL_ASSEMBLIES:%=-r:%)	\
-	$(NDESK_DBUS_LIBS)			\
+	$(NDESK_DBUS_GLIB_LIBS)			\
 	-r:Mono.Posix
 
 $(BUILD_INDEX_TARGET): $(BUILD_INDEX_CSFILES) $(BUILD_INDEX_LOCAL_ASSEMBLIES)

Modified: trunk/beagle/configure.in
==============================================================================
--- trunk/beagle/configure.in	(original)
+++ trunk/beagle/configure.in	Sun Feb  3 01:46:44 2008
@@ -14,7 +14,8 @@
 
 MONO_REQUIRED=1.2.4
 MONODOC_REQUIRED=1.2.4
-NDESK_DBUS_REQUIRED=0.3.0
+NDESK_DBUS_REQUIRED=0.5.2
+NDESK_DBUS_GLIB_REQUIRED=0.3.0
 GTK_SHARP_REQUIRED=2.4.0
 GMIME_SHARP_REQUIRED=2.2.0
 EVOLUTION_SHARP_REQUIRED=0.13.3
@@ -87,8 +88,10 @@
 AC_SUBST(SHARPZIPLIB_LIBS)
 
 # D-Bus libraries
-PKG_CHECK_MODULES(NDESK_DBUS, ndesk-dbus-glib-1.0 >= $NDESK_DBUS_REQUIRED)
-AC_SUBST(NDESK_DBUS_LIBS)
+PKG_CHECK_MODULES(NDESK_DBUS, ndesk-dbus-1.0 >= $NDESK_DBUS_REQUIRED)
+
+PKG_CHECK_MODULES(NDESK_DBUS_GLIB, ndesk-dbus-glib-1.0 >= $NDESK_DBUS_GLIB_REQUIRED)
+AC_SUBST(NDESK_DBUS_GLIB_LIBS)
 
 # check for OS
 case "$target" in