evolution-data-server r9536 - branches/eds-dbus

[rbradford svn gnome org]

Author: rbradford
Date: Fri Sep 12 17:21:11 2008
New Revision: 9536
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=9536&view=rev

Log:
2008-09-12  Rob Bradford  <rob linux intel com>

	* configure.in:
	Add DBUS related gubbins to configure.

Modified:
   branches/eds-dbus/ChangeLog
   branches/eds-dbus/configure.in

Modified: branches/eds-dbus/configure.in
==============================================================================
--- branches/eds-dbus/configure.in	(original)
+++ branches/eds-dbus/configure.in	Fri Sep 12 17:21:11 2008
@@ -32,6 +32,7 @@
 m4_define([libsoup_minimum_version], [2.3.0])
 m4_define([gnome_keyring_minimum_version], [2.20.1])
 m4_define([sqlite_minimum_version], [3.5])
+m4_define([dbus_glib_minimum_version], [0.6])
 
 dnl *************************************************************************************************
 dnl Base Version
@@ -240,7 +241,8 @@
          libgnome-2.0 >= libgnome_minimum_version
          libxml-2.0 >= libxml_minimum_version
          libsoup-2.4 >= libsoup_minimum_version
-		 sqlite3 >= sqlite_minimum_version])
+         sqlite3 >= sqlite_minimum_version
+         dbus-glib-1 >= dbus_glib_minimum_version])
 
 dnl **************************************************
 dnl * regex checking
@@ -1366,6 +1368,9 @@
 ORBIT_REQUIRED=ORBit_minimum_version
 AC_SUBST(ORBIT_REQUIRED)
 
+DBUS_GLIB_REQUIRED=dbus_glib_minimum_version
+AC_SUBST(DBUS_GLIB_REQUIRED)
+
 dnl *******************
 dnl GObject marshalling
 dnl *******************
@@ -1430,6 +1435,10 @@
 AC_MSG_RESULT($IDL_INCLUDES)
 AC_SUBST(IDL_INCLUDES)
 
+PKG_CHECK_MODULES(DBUS_GLIB, dbus-glib-1 >= dbus_glib_minimum_version)
+AC_SUBST(DBUS_GLIB_CFLAGS)
+AC_SUBST(DBUS_GLIB_LIBS)
+
 AC_MSG_CHECKING(for libgnomeui server directory)
 GNOMEUI_SERVERDIR="`$PKG_CONFIG --variable=libgnomeui_serverdir libgnomeui-2.0`"
 AC_MSG_RESULT($GNOMEUI_SERVERDIR)
@@ -1449,7 +1458,7 @@
 
 dnl --- libedataserver, libedataserverui, libebackend flags
 
-E_DATA_SERVER_DEPS="libxml-2.0 libbonobo-2.0 libsoup-2.4 gconf-2.0 $mozilla_nspr sqlite3"
+E_DATA_SERVER_DEPS="libxml-2.0 libbonobo-2.0 libsoup-2.4 gconf-2.0 $mozilla_nspr sqlite3 dbus-glib-1"
 
 EVO_SET_COMPILE_FLAGS(E_DATA_SERVER, $E_DATA_SERVER_DEPS, $THREADS_CFLAGS $MANUAL_NSPR_CFLAGS, $THREADS_LIBS $MANUAL_NSPR_LIBS)
 AC_SUBST(E_DATA_SERVER_CFLAGS)
@@ -1632,6 +1641,13 @@
 AC_SUBST(EVO_SUBST_SERVER_RULE)
 AC_SUBST(EVO_NAME_SERVER_RULE)
 
+dnl *******************
+dnl D-BUS service stuff 
+dnl *******************
+EVO_SUBST_SERVICE_RULE='%.service: %.service.in Makefile ; sed -e "s|\ BINDIR\@|$(bindir)|" -e "s|\ LIBEXECDIR\@|$(libexecdir)|" -e "s|\ COMPONENTDIR\@|$(componentdir)|" -e "s|\ IMPORTERSDIR\@|$(importersdir)|" -e "s|\ VERSION\@|$(BASE_VERSION)|" -e "s|\ INTERFACE_VERSION\@|$(INTERFACE_VERSION)|" $< > $@'
+AC_SUBST(EVO_SUBST_SERVICE_RULE)
+
+
 dnl ***********
 dnl GConf stuff
 dnl ***********