[evolution-data-server/dbus: 1/13] Add DBUS related gubbins to configure.

[Ross Burton <rburton src gnome org>]

commit 42da1f53d06b1a33948570f4189fb032afda2d23
Author: Rob Bradford <rob linux intel com>
Date:   Fri Sep 12 17:21:11 2008 +0000

    Add DBUS related gubbins to configure.

 configure.ac |   45 ++++++++++++++++-----------------------------
 1 files changed, 16 insertions(+), 29 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 8956f46..159c693 100644
--- a/configure.ac
+++ b/configure.ac
@@ -33,6 +33,7 @@ m4_define([gnome_keyring_minimum_version], [2.20.1])
 m4_define([sqlite_minimum_version], [3.5])
 m4_define([gweather_minimum_version], [2.25.4])
 m4_define([libical_minimum_version], [0.43])
+m4_define([dbus_glib_minimum_version], [0.6])
 
 dnl *************************************************************************************************
 dnl Base Version
@@ -258,17 +259,6 @@ AC_CHECK_FUNCS(fsync strptime strtok_r)
 dnl alloca()
 AC_CHECK_HEADERS(alloca.h)
 
-# Check for base dependencies early.
-PKG_CHECK_MODULES(GNOME_PLATFORM,
-        [glib-2.0 >= glib_minimum_version
-         gtk+-2.0 >= gtk_minimum_version
-         ORBit-2.0 >= ORBit_minimum_version
-         libbonobo-2.0 >= libbonobo_minimum_version
-         gconf-2.0 >= gconf_minimum_version
-         libglade-2.0 >= libglade_minimum_version
-         libxml-2.0 >= libxml_minimum_version
-         libsoup-2.4 >= libsoup_minimum_version])
-
 LIBICAL_REQUIRED=libical_minimum_version
 AC_SUBST(LIBICAL_REQUIRED)
 
@@ -1443,11 +1433,8 @@ msg_no_ntlm="no"
 msg_exchange="yes"
 fi # Win32
 
-LIBBONOBO_REQUIRED=libbonobo_minimum_version
-AC_SUBST(LIBBONOBO_REQUIRED)
-
-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
@@ -1483,16 +1470,9 @@ AC_SUBST(THREADS_LIBS)
 AC_SUBST(THREADS_CFLAGS)
 AC_DEFINE(ENABLE_THREADS,1,[Required])
 
-PKG_CHECK_MODULES(ORBIT, ORBit-2.0 >= ORBit_minimum_version)
-test x$ORBIT_IDL = x && ORBIT_IDL=`$PKG_CONFIG --variable=orbit_idl ORBit-2.0`
-AC_SUBST(ORBIT_CFLAGS)
-AC_SUBST(ORBIT_LIBS)
-AC_SUBST(ORBIT_IDL)
-
-AC_MSG_CHECKING(for CORBA include paths)
-IDL_INCLUDES="-I"`pkg-config --variable=idldir libbonobo-2.0`" -I"`pkg-config --variable=idldir bonobo-activation-2.0`
-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)
 
 dnl Utility macro to set compiler flags for a specific lib.
 dnl  EVO_SET_COMPILE_FLAGS(VAR-PREFIX, DEPS, EXTRA-CFLAGS, EXTRA-LIBS)
@@ -1508,7 +1488,7 @@ dnl ****************************************
 
 dnl --- libedataserver, libedataserverui, libebackend flags
 
-E_DATA_SERVER_DEPS="libxml-2.0 libbonobo-2.0 libsoup-2.4 gconf-2.0 $mozilla_nspr"
+E_DATA_SERVER_DEPS="libxml-2.0 dbus-glib-1 libsoup-2.4 gconf-2.0 $mozilla_nspr"
 
 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)
@@ -1528,7 +1508,7 @@ AC_SUBST(E_BACKEND_LIBS)
 
 dnl --- evolution-addressbook flags
 
-EVOLUTION_ADDRESSBOOK_DEPS="libxml-2.0 libbonobo-2.0 gobject-2.0 gthread-2.0 gconf-2.0"
+EVOLUTION_ADDRESSBOOK_DEPS="libxml-2.0 dbus-glib-1 gobject-2.0 gthread-2.0 gconf-2.0"
 
 EVO_SET_COMPILE_FLAGS(EVOLUTION_ADDRESSBOOK, $EVOLUTION_ADDRESSBOOK_DEPS)
 AC_SUBST(EVOLUTION_ADDRESSBOOK_CFLAGS)
@@ -1536,7 +1516,7 @@ AC_SUBST(EVOLUTION_ADDRESSBOOK_LIBS)
 
 dnl --- evolution-calendar flags
 if test "x${enable_calendar}" = "xyes"; then
-	EVOLUTION_CALENDAR_DEPS="libical >= libical_minimum_version libxml-2.0 libbonobo-2.0 gio-2.0 gobject-2.0 gthread-2.0 gconf-2.0"
+	EVOLUTION_CALENDAR_DEPS="libical >= libical_minimum_version libxml-2.0 dbus-glib-1 gio-2.0 gobject-2.0 gthread-2.0 gconf-2.0"
 
 dnl *****
 dnl libical.pc from libical-0.43 has a bug in it's CFlags. 
@@ -1713,6 +1693,13 @@ EVO_NAME_SERVER_RULE='%_$(API_VERSION).server: %.server ; mv $< $@'
 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 ***********