[evolution-patches] connector ldap detection patch

[Dan Winship <danw novell com>]

This should fix connector to work with non-Ximian ldap packages, but not
require any changes to our build setup.


Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-exchange/ChangeLog,v
retrieving revision 1.1.1.1.2.2
diff -u -r1.1.1.1.2.2 ChangeLog
--- ChangeLog	11 May 2004 16:36:21 -0000	1.1.1.1.2.2
+++ ChangeLog	11 May 2004 16:56:45 -0000
@@ -1,4 +1,11 @@
 2004-05-11  Dan Winship  <danw ximian com>
 
+	* configure.in: Bump version to 1.4.7.1
+
+	* acinclude.m4 (EVO_LDAP_CHECK): Fix this so it works with
+	non-Ximian OpenLDAP packages. (Problem noted by Frederic Crozat)
+
+2004-05-11  Dan Winship  <danw ximian com>
+
 	* Ximian Connector 1.4.7, first GPL release.
 
Index: acinclude.m4
===================================================================
RCS file: /cvs/gnome/evolution-exchange/acinclude.m4,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 acinclude.m4
--- acinclude.m4	11 May 2004 15:09:03 -0000	1.1.1.1
+++ acinclude.m4	11 May 2004 16:56:45 -0000
@@ -53,9 +53,9 @@
 		case $with_static_ldap in
 		no|"")
 			if test -f $with_openldap/lib/libldap.la; then
-				with_static_ldap=yes
-			else
 				with_static_ldap=no
+			else
+				with_static_ldap=yes
 			fi
 			;;
 		*)
@@ -84,13 +84,6 @@
 		AC_CHECK_LIB(lber, ber_get_tag, [
 			if test "$with_static_ldap" = "yes"; then
 				LDAP_LIBS="$with_openldap/lib/liblber.a $LDAP_LIBS"
-
-				# libldap might depend on OpenSSL... We need to pull
-				# in the dependency libs explicitly here since we're
-				# not using libtool for the configure test.
-				if test -f $with_openldap/lib/libldap.la; then
-					LDAP_LIBS="`. $with_openldap/lib/libldap.la; echo $dependency_libs` $LDAP_LIBS"
-				fi
 			else
 				LDAP_LIBS="-llber $LDAP_LIBS"
 			fi
Index: configure.in
===================================================================
RCS file: /cvs/gnome/evolution-exchange/configure.in,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 configure.in
--- configure.in	11 May 2004 15:09:03 -0000	1.1.1.1
+++ configure.in	11 May 2004 16:56:45 -0000
@@ -1,7 +1,7 @@
 # Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.52)
 
-AC_INIT(ximian-connector, 1.4.7, http://bugzilla.ximian.com/enter_bug.cgi?product=Evolution)
+AC_INIT(ximian-connector, 1.4.7.1, http://bugzilla.ximian.com/enter_bug.cgi?product=Evolution)
 AC_CONFIG_SRCDIR(storage)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)