Index: evolution-data-server/configure.in
===================================================================
RCS file: /cvs/gnome/evolution-data-server/configure.in,v
retrieving revision 1.161
diff -u -p -r1.161 configure.in
--- evolution-data-server/configure.in	22 Mar 2006 11:18:44 -0000	1.161
+++ evolution-data-server/configure.in	24 Mar 2006 08:15:30 -0000
@@ -1038,6 +1038,7 @@ esac
 
 SAVE_CFLAGS="$CFLAGS"
 SAVE_LIBS="$LIBS"
+LDAP_CFLAGS="-DLDAP_DEPRECATED"
 CFLAGS="$CFLAGS $LDAP_CFLAGS"
 LIBS="$LIBS $LDAP_LIBS"
 AC_CHECK_FUNCS(ldap_ntlm_bind)
@@ -1056,7 +1057,7 @@ dnl support. Make him aware of this with
 	fi
 fi
 else # Win32
-LDAP_CFLAGS=""
+LDAP_CFLAGS="-DLDAP_DEPRECATED"
 LDAP_LIBS="-lwldap32"
 AC_SUBST(LDAP_CFLAGS)
 AC_SUBST(LDAP_LIBS)
Index: evolution/configure.in
===================================================================
RCS file: /cvs/gnome/evolution/configure.in,v
retrieving revision 1.891
diff -u -p -r1.891 configure.in
--- evolution/configure.in	22 Mar 2006 11:15:13 -0000	1.891
+++ evolution/configure.in	24 Mar 2006 08:15:55 -0000
@@ -422,8 +422,18 @@ no)
 		;;
 	esac
 esac
+
+SAVE_CFLAGS="$CFLAGS"
+SAVE_LIBS="$LIBS"
+LDAP_CFLAGS="-DLDAP_DEPRECATED"
+CFLAGS="$CFLAGS $LDAP_CFLAGS"
+LIBS="$LIBS $LDAP_LIBS"
+AC_CHECK_FUNCS(ldap_ntlm_bind)
+CFLAGS="$SAVE_CFLAGS"
+LIBS="$SAVE_LIBS"
+
 else # Win32
-LDAP_CFLAGS=""
+LDAP_CFLAGS="-DLDAP_DEPRECATED"
 LDAP_LIBS="-lwldap32"
 AC_SUBST(LDAP_CFLAGS)
 AC_SUBST(LDAP_LIBS)
Index: evolution-exchange/configure.in
===================================================================
RCS file: /cvs/gnome/evolution-exchange/configure.in,v
retrieving revision 1.105
diff -u -p -r1.105 configure.in
--- evolution-exchange/configure.in	27 Feb 2006 14:57:09 -0000	1.105
+++ evolution-exchange/configure.in	24 Mar 2006 08:16:19 -0000
@@ -1,7 +1,7 @@
 # Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.52)
 
-AC_INIT(evolution-exchange, 2.5.92, http://bugzilla.gnome.org/enter_bug.cgi?product=Connector)
+AC_INIT(evolution-exchange, 2.6.0, http://bugzilla.gnome.org/enter_bug.cgi?product=Connector)
 AC_CONFIG_SRCDIR(storage)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 
@@ -223,13 +223,14 @@ esac
 
 SAVE_CFLAGS="$CFLAGS"
 SAVE_LIBS="$LIBS"
+LDAP_CFLAGS="-DLDAP_DEPRECATED"
 CFLAGS="$CFLAGS $LDAP_CFLAGS"
 LIBS="$LIBS $LDAP_LIBS"
 AC_CHECK_FUNCS(ldap_ntlm_bind)
 CFLAGS="$SAVE_CFLAGS"
 LIBS="$SAVE_LIBS"
 else # Win32
-LDAP_CFLAGS=""
+LDAP_CFLAGS="-DLDAP_DEPRECATED"
 LDAP_LIBS="-lwldap32"
 AC_SUBST(LDAP_CFLAGS)
 AC_SUBST(LDAP_LIBS)
