commit de2db8494c670a165a10f12918502708e15881e0
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Sun Jun 28 10:15:00 2009 -0400

    Remove exchange-storage remnants.

diff --git a/configure.ac b/configure.ac
index 83598db..81422f3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -79,10 +79,6 @@ LIBCAMEL_CURRENT=14
 LIBCAMEL_REVISION=1
 LIBCAMEL_AGE=0
 
-LIBEXCHANGE_STORAGE_CURRENT=3
-LIBEXCHANGE_STORAGE_REVISION=0
-LIBEXCHANGE_STORAGE_AGE=0
-
 LIBGDATA_CURRENT=1
 LIBGDATA_REVISION=0
 LIBGDATA_AGE=0
@@ -122,9 +118,6 @@ AC_SUBST(LIBEGROUPWISE_AGE)
 AC_SUBST(LIBCAMEL_CURRENT)
 AC_SUBST(LIBCAMEL_REVISION)
 AC_SUBST(LIBCAMEL_AGE)
-AC_SUBST(LIBEXCHANGE_STORAGE_CURRENT)
-AC_SUBST(LIBEXCHANGE_STORAGE_REVISION)
-AC_SUBST(LIBEXCHANGE_STORAGE_AGE)
 AC_SUBST(LIBGDATA_CURRENT)
 AC_SUBST(LIBGDATA_REVISION)
 AC_SUBST(LIBGDATA_AGE)
@@ -1403,26 +1396,7 @@ else
 fi
 AM_CONDITIONAL(SUNLDAP, test "$with_sunldap" != no)
 
-SAVE_CFLAGS="$CFLAGS"
-SAVE_LIBS="$LIBS"
 LDAP_CFLAGS="$LDAP_CFLAGS -DLDAP_DEPRECATED"
-CFLAGS="$CFLAGS $LDAP_CFLAGS"
-LIBS="$LIBS $LDAP_LIBS"
-AC_CHECK_FUNCS(ldap_ntlm_bind)
-CFLAGS="$SAVE_CFLAGS"
-LIBS="$SAVE_LIBS"
-dnl You need to enable LDAP and Kerberos to enable Exchange support in e-d-s
-msg_no_ntlm="no"
-msg_exchange="no"
-if test "$msg_ldap" != "no" ; then
-	if test "$ac_cv_func_ldap_ntlm_bind" != no ; then
-		msg_exchange="yes"
-	else
-dnl The user wanted to build with openldap, but his openldap did not have NTLM
-dnl support. Make him aware of this with a warning message at the end.
-		msg_no_ntlm="yes"
-	fi
-fi
 else # Win32
 LDAP_CFLAGS="-DLDAP_DEPRECATED"
 LDAP_LIBS="-lwldap32"
@@ -1432,8 +1406,6 @@ AC_DEFINE(HAVE_LDAP,1,[Define if you have LDAP support])
 AM_CONDITIONAL(ENABLE_LDAP, true)
 AM_CONDITIONAL(SUNLDAP, false)
 msg_ldap="yes"
-msg_no_ntlm="no"
-msg_exchange="yes"
 fi # Win32
 
 LIBBONOBO_REQUIRED=libbonobo_minimum_version
@@ -1798,11 +1770,6 @@ libedataserverui/libedataserverui.pc
 servers/Makefile
 servers/groupwise/Makefile
 servers/groupwise/libegroupwise.pc
-servers/exchange/Makefile
-servers/exchange/xntlm/Makefile
-servers/exchange/lib/Makefile
-servers/exchange/storage/Makefile
-servers/exchange/storage/libexchange-storage.pc
 servers/google/Makefile
 servers/google/libgdata/Makefile
 servers/google/libgdata/libgdata.pc
@@ -1853,18 +1820,8 @@ echo "\
 	SMIME support:    $msg_smime
 	IPv6 support:     $msg_ipv6
 	Berkeley DB:      $msg_libdb
-	Exchange support: $msg_exchange
 	Dot Locking:	  $msg_dot
 	File Locking:	  $msg_file
 	Large files:      $largefile_support
 	Gtk Doc:          $enable_gtk_doc
 "
-if test "$msg_no_ntlm" != "no" ; then
-	echo ""
-	AC_MSG_WARN([
-No NTLM support in OpenLDAP; Plaintext password authentication will be
-used when connecting to the Exchange Global Catalog server. Consider
-installing the evo-openldap package, or building OpenLDAP with the
-patch in servers/exchange/docs/openldap-ntlm.diff
-])
-fi
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 3605c2d..99d86c9 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -213,12 +213,6 @@ libedataserverui/e-name-selector-entry.c
 libedataserverui/e-name-selector-list.c
 libedataserverui/e-passwords.c
 libedataserverui/e-source-selector-dialog.c
-servers/exchange/lib/e2k-autoconfig.c
-servers/exchange/lib/e2k-security-descriptor.c
-servers/exchange/lib/e2k-sid.c
-servers/exchange/storage/e-storage.c
-servers/exchange/storage/exchange-account.c
-servers/exchange/storage/exchange-hierarchy-foreign.c
 servers/groupwise/e-gw-connection.c
 src/GNOME_Evolution_DataServer.server.in.in
 src/server.c
diff --git a/servers/Makefile.am b/servers/Makefile.am
index 54906a8..04bb2e0 100644
--- a/servers/Makefile.am
+++ b/servers/Makefile.am
@@ -1,7 +1 @@
-if ENABLE_LDAP
-EXCHANGE = exchange
-else
-EXCHANGE =
-endif
-
-SUBDIRS = groupwise $(EXCHANGE) google
+SUBDIRS = groupwise google
