[evolution-data-server/dbus-calendar: 1/10] Remove ORBit references, switch calendar to DBus

[Ross Burton <rburton src gnome org>]

commit 7c476d94b436e21a1783d16ac65d422ebd1de2a5
Author: Ross Burton <ross linux intel com>
Date:   Mon Jun 29 15:38:34 2009 +0100

    Remove ORBit references, switch calendar to DBus

 configure.ac |   35 ++---------------------------------
 1 files changed, 2 insertions(+), 33 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 53b4bee..06db799 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1429,12 +1429,6 @@ 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)
 
@@ -1472,21 +1466,6 @@ 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)
 AC_DEFUN([EVO_SET_COMPILE_FLAGS], [
@@ -1501,7 +1480,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 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)
@@ -1529,7 +1508,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. 
@@ -1548,16 +1527,6 @@ AC_SUBST(LIBICAL_EXTRA_LIBS)
 	AC_SUBST(EVOLUTION_CALENDAR_LIBS)
 fi
 
-dnl --- factory flags
-
-E_FACTORY_DEPS="$mozilla_nspr"
-if test "x${enable_calendar}" = "xyes"; then
-   E_FACTORY_DEPS="$E_FACTORY_DEPS libical"
-fi
-EVO_SET_COMPILE_FLAGS(E_FACTORY, $E_FACTORY_DEPS, $THREADS_CFLAGS $MANUAL_NSPR_CFLAGS $LIBICAL_EXTRA_CFLAGS, $THREADS_LIBS $MANUAL_NSPR_LIBS $LIBICAL_EXTRA_LIBS)
-AC_SUBST(E_FACTORY_CFLAGS)
-AC_SUBST(E_FACTORY_LIBS)
-
 dnl --- Google flags
 GDATA_DEPS="libsoup-2.4 libxml-2.0"
 EVO_SET_COMPILE_FLAGS(GDATA, $GDATA_DEPS)