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



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

    Add DBUS related gubbins to configure.
    
    2008-09-12  Rob Bradford  <rob linux intel com>
    
    	* configure.in:
    	Add DBUS related gubbins to configure.
    
    svn path=/branches/eds-dbus/; revision=9536
---
 configure.in |   20 ++++++++++++++++++--
 1 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/configure.in b/configure.in
index 29813aa..1d4224c 100644
--- a/configure.in
+++ b/configure.in
@@ -34,6 +34,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
@@ -241,7 +242,8 @@ PKG_CHECK_MODULES(GNOME_PLATFORM,
          libglade-2.0 >= libglade_minimum_version
          libgnome-2.0 >= libgnome_minimum_version
          libxml-2.0 >= libxml_minimum_version
-         libsoup-2.4 >= libsoup_minimum_version])
+         libsoup-2.4 >= libsoup_minimum_version
+         dbus-glib-1 >= dbus_glib_minimum_version])
 
 LIBICAL_REQUIRED=libical_minimum_version
 AC_SUBST(LIBICAL_REQUIRED)
@@ -1423,6 +1425,9 @@ 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
 dnl *******************
@@ -1487,6 +1492,10 @@ IDL_INCLUDES="-I"`pkg-config --variable=idldir libbonobo-2.0`" -I"`pkg-config --
 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)
@@ -1506,7 +1515,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 libbonobo-2.0 libsoup-2.4 gconf-2.0 $mozilla_nspr 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)
@@ -1711,6 +1720,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 ***********



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]