GNOME.org
 

[evolution-data-server] Move servers/exchange to evolution-exchange.

commit 418fe0489c7dcccb5e98efe28f9c5b3071e18e4b
Author: Matthew Barnes <mbarnes redhat com>
Date:   Wed Oct 7 22:06:45 2009 -0500

    Move servers/exchange to evolution-exchange.

 configure.ac                                       |   45 -
 po/POTFILES.in                                     |    6 -
 servers/Makefile.am                                |    8 +-
 servers/exchange/ChangeLog                         | 1262 ---------
 servers/exchange/Makefile.am                       |    1 -
 servers/exchange/docs/ChangeLog                    |    3 -
 servers/exchange/docs/openldap-ntlm.diff           |  199 --
 servers/exchange/lib/Makefile.am                   |  150 --
 servers/exchange/lib/actest.c                      |  201 --
 servers/exchange/lib/cptest.c                      |  120 -
 servers/exchange/lib/davcat.c                      |  184 --
 servers/exchange/lib/e2k-action.c                  |  800 ------
 servers/exchange/lib/e2k-action.h                  |   53 -
 servers/exchange/lib/e2k-autoconfig.c              | 1750 -------------
 servers/exchange/lib/e2k-autoconfig.h              |   81 -
 servers/exchange/lib/e2k-context.c                 | 2764 --------------------
 servers/exchange/lib/e2k-context.h                 |  213 --
 servers/exchange/lib/e2k-freebusy.c                |  555 ----
 servers/exchange/lib/e2k-freebusy.h                |   64 -
 servers/exchange/lib/e2k-global-catalog-ldap.h     |   31 -
 servers/exchange/lib/e2k-global-catalog.c          | 1247 ---------
 servers/exchange/lib/e2k-global-catalog.h          |  117 -
 servers/exchange/lib/e2k-http-utils.c              |  185 --
 servers/exchange/lib/e2k-http-utils.h              |   62 -
 servers/exchange/lib/e2k-kerberos.c                |  183 --
 servers/exchange/lib/e2k-kerberos.h                |   33 -
 servers/exchange/lib/e2k-marshal.list              |    2 -
 servers/exchange/lib/e2k-operation.c               |  171 --
 servers/exchange/lib/e2k-operation.h               |   38 -
 servers/exchange/lib/e2k-path.c                    |  251 --
 servers/exchange/lib/e2k-path.h                    |   39 -
 servers/exchange/lib/e2k-properties.c              |  798 ------
 servers/exchange/lib/e2k-properties.h              |  121 -
 servers/exchange/lib/e2k-propnames.c.in            |   26 -
 servers/exchange/lib/e2k-propnames.h.in            |  224 --
 servers/exchange/lib/e2k-proptags.h.in             |    9 -
 servers/exchange/lib/e2k-restriction.c             | 1068 --------
 servers/exchange/lib/e2k-restriction.h             |   97 -
 servers/exchange/lib/e2k-result.c                  |  629 -----
 servers/exchange/lib/e2k-result.h                  |   62 -
 servers/exchange/lib/e2k-rule-xml.c                |  932 -------
 servers/exchange/lib/e2k-rule-xml.h                |   12 -
 servers/exchange/lib/e2k-rule.c                    |  686 -----
 servers/exchange/lib/e2k-rule.h                    |  251 --
 servers/exchange/lib/e2k-security-descriptor.c     |  959 -------
 servers/exchange/lib/e2k-security-descriptor.h     |   80 -
 servers/exchange/lib/e2k-sid.c                     |  317 ---
 servers/exchange/lib/e2k-sid.h                     |   68 -
 servers/exchange/lib/e2k-types.h                   |   93 -
 servers/exchange/lib/e2k-uri.c                     |  418 ---
 servers/exchange/lib/e2k-uri.h                     |   41 -
 servers/exchange/lib/e2k-utils.c                   |  668 -----
 servers/exchange/lib/e2k-utils.h                   |   46 -
 servers/exchange/lib/e2k-validate.h                |   55 -
 servers/exchange/lib/e2k-xml-utils.c               |  255 --
 servers/exchange/lib/e2k-xml-utils.h               |   26 -
 servers/exchange/lib/ebrowse.c                     |  713 -----
 servers/exchange/lib/fbtest.c                      |  146 -
 servers/exchange/lib/gctest.c                      |  250 --
 servers/exchange/lib/mapi-properties               | 1549 -----------
 servers/exchange/lib/mapi.h                        |  122 -
 servers/exchange/lib/ruletest.c                    |   90 -
 servers/exchange/lib/test-utils.c                  |  259 --
 servers/exchange/lib/test-utils.h                  |   24 -
 servers/exchange/lib/urltest.c                     |  158 --
 servers/exchange/storage/Makefile.am               |  104 -
 servers/exchange/storage/e-folder-exchange.c       | 1039 --------
 servers/exchange/storage/e-folder-exchange.h       |  153 --
 servers/exchange/storage/e-folder-tree.c           |  449 ----
 servers/exchange/storage/e-folder-tree.h           |   58 -
 servers/exchange/storage/e-folder-type-registry.c  |  409 ---
 servers/exchange/storage/e-folder-type-registry.h  |   89 -
 servers/exchange/storage/e-folder.c                |  462 ----
 servers/exchange/storage/e-folder.h                |  100 -
 servers/exchange/storage/e-storage.c               |  828 ------
 servers/exchange/storage/e-storage.h               |  208 --
 servers/exchange/storage/exchange-account.c        | 2398 -----------------
 servers/exchange/storage/exchange-account.h        |  202 --
 servers/exchange/storage/exchange-constants.h      |   30 -
 servers/exchange/storage/exchange-esource.c        |  422 ---
 servers/exchange/storage/exchange-esource.h        |   24 -
 servers/exchange/storage/exchange-folder-size.c    |  251 --
 servers/exchange/storage/exchange-folder-size.h    |   49 -
 .../storage/exchange-hierarchy-favorites.c         |  341 ---
 .../storage/exchange-hierarchy-favorites.h         |   47 -
 .../exchange/storage/exchange-hierarchy-foreign.c  |  598 -----
 .../exchange/storage/exchange-hierarchy-foreign.h  |   51 -
 servers/exchange/storage/exchange-hierarchy-gal.c  |   68 -
 servers/exchange/storage/exchange-hierarchy-gal.h  |   35 -
 .../exchange/storage/exchange-hierarchy-somedav.c  |  259 --
 .../exchange/storage/exchange-hierarchy-somedav.h  |   46 -
 .../exchange/storage/exchange-hierarchy-webdav.c   |  944 -------
 .../exchange/storage/exchange-hierarchy-webdav.h   |   69 -
 servers/exchange/storage/exchange-hierarchy.c      |  377 ---
 servers/exchange/storage/exchange-hierarchy.h      |  101 -
 servers/exchange/storage/exchange-oof.c            |  206 --
 servers/exchange/storage/exchange-oof.h            |   21 -
 servers/exchange/storage/exchange-types.h          |   66 -
 servers/exchange/storage/libexchange-storage.pc.in |   18 -
 servers/exchange/xntlm/ChangeLog                   |   61 -
 servers/exchange/xntlm/Makefile.am                 |   14 -
 servers/exchange/xntlm/xntlm-des.c                 |  346 ---
 servers/exchange/xntlm/xntlm-des.h                 |   20 -
 servers/exchange/xntlm/xntlm-md4.c                 |  175 --
 servers/exchange/xntlm/xntlm-md4.h                 |   10 -
 servers/exchange/xntlm/xntlm.c                     |  323 ---
 servers/exchange/xntlm/xntlm.h                     |   16 -
 107 files changed, 1 insertions(+), 33556 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 5844e43..6bd8607 100644
--- a/configure.ac
+++ b/configure.ac
@@ -87,10 +87,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
@@ -130,9 +126,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)
@@ -1238,26 +1231,6 @@ dnl SunLDAP support, but if OpenLDAP support, skip check SunLDAP.
 	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
 	dnl Win32 LDAP support
 	LDAP_CFLAGS="-DLDAP_DEPRECATED"
@@ -1268,8 +1241,6 @@ else
 	AM_CONDITIONAL(ENABLE_LDAP, true)
 	AM_CONDITIONAL(SUNLDAP, false)
 	msg_ldap="yes"
-	msg_no_ntlm="no"
-	msg_exchange="yes"
 fi
 
 DBUS_GLIB_REQUIRED=dbus_glib_minimum_version
@@ -1630,11 +1601,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
@@ -1669,7 +1635,6 @@ echo "
 	SSL support:		$msg_ssl
 	SMIME support:		$msg_smime
 	IPv6 support:		$msg_ipv6
-	Exchange support:	$msg_exchange
 	Dot Locking:		$msg_dot
 	File Locking:		$msg_file
 	Large files:		$enable_largefile
@@ -1684,13 +1649,3 @@ if test "$msg_imapx" = "yes"; then
 	IMAPX support:		$msg_imapx
 "
 fi
-
-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 3a0450e..e761bfc 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -215,10 +215,4 @@ 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
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
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]