[evolution-patches] Evolution/configure.in patch

[Sarfraaz Ahmed <asarfraaz novell com>]

Hi,

This enables building the exchange-operations plugin by default. But,
would silently remove it from the list of plugins if any dependency
checks fail. The user is given a warning about this failure.

Please let me know if this is ok to commit.

Thanks
-- Sarfraaz

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/ChangeLog,v
retrieving revision 1.1520
diff -u -p -u -p -r1.1520 ChangeLog
--- ChangeLog	22 Aug 2005 19:50:30 -0000	1.1520
+++ ChangeLog	24 Aug 2005 10:32:47 -0000
@@ -1,3 +1,7 @@
+2005-08-24  Sarfraaz Ahmed <asarfraaz novell com>
+
+	* configure.in : Enable building of exchange plugins by default.
+
 2005-08-23  Harish Krishnaswamy <kharish novell com>
 
 	* configure.in : Release 2.3.8
Index: configure.in
===================================================================
RCS file: /cvs/gnome/evolution/configure.in,v
retrieving revision 1.843
diff -u -p -u -p -r1.843 configure.in
--- configure.in	22 Aug 2005 19:41:59 -0000	1.843
+++ configure.in	24 Aug 2005 10:32:47 -0000
@@ -985,9 +985,10 @@ dnl ************************************
 dnl Exchange support.
 dnl **************************************************
 AC_ARG_ENABLE(exchange, 
-[  --enable-exchange=[no/yes]      Build Exchange plugins],enable_exchange="$enableval",enable_exchange=no)
+[  --enable-exchange=[no/yes]      Build Exchange plugins],enable_exchange="$enableval",enable_exchange=yes)
 if test "x$enable_exchange" = "xyes"; then
 	msg_exchange=yes
+	EXCHANGE_PLUGIN="exchange-operations"
 else
 	msg_exchange=no
 fi
@@ -1193,14 +1194,6 @@ EVO_SET_COMPILE_FLAGS(CAMEL_GROUPWISE, c
 AC_SUBST(CAMEL_GROUPWISE_CFLAGS)
 AC_SUBST(CAMEL_GROUPWISE_LIBS)
 
-if test "x$msg_exchange" != "xno"; then
-EVO_SET_COMPILE_FLAGS(CAMEL_EXCHANGE, camel-provider-$EDS_PACKAGE libedataserver-$EDS_PACKAGE libexchange-storage-$EDS_PACKAGE >= $EDS_REQUIRED)
-AC_SUBST(CAMEL_EXCHANGE_CFLAGS)
-AC_SUBST(CAMEL_EXCHANGE_LIBS)
-EXCHANGE_PLUGIN="exchange-operations"
-EXCHANGE_PLUGIN_DIR='plugins/exchange-operations/Makefile'
-fi
-
 if test "x$mozilla_nss" != "x"; then
    EVO_SET_COMPILE_FLAGS(MOZILLA_NSS, $mozilla_nss)
    MOZILLA_L_DIR=`pkg-config --libs-only-L $mozilla_nss`
@@ -1501,6 +1494,21 @@ if echo ${plugins_enabled} | grep -q "ne
 		echo "warning: dbus-glib-1 was not found, new-mail-notify plugin will not be built."
 	fi
 fi
+
+if echo ${plugins_enabled} | grep -q "exchange-operations" ; then
+	if ${PKG_CONFIG} --exists libexchange-storage-$EDS_PACKAGE ; then
+		dnl **************************************************
+		dnl * Exchange Operations plugin
+		dnl **************************************************
+		EVO_SET_COMPILE_FLAGS(CAMEL_EXCHANGE, camel-provider-$EDS_PACKAGE libedataserver-$EDS_PACKAGE libexchange-storage-$EDS_PACKAGE >= $EDS_REQUIRED)
+		AC_SUBST(CAMEL_EXCHANGE_CFLAGS)
+		AC_SUBST(CAMEL_EXCHANGE_LIBS)
+	else
+		plugins_enabled=`echo $plugins_enabled | sed -e "s/exchange-operations//g"`
+		echo "warning: libevolution-exchange-$EDS_PACKAGE was not found, Exchange Operations plugin will not be built."
+	fi
+fi
+
 
 ##################################################
 # Check for gtk-doc.