summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@novell.com>2006-06-15 20:40:16 +0000
committerTor Lillqvist <tml@src.gnome.org>2006-06-15 20:40:16 +0000
commit4764296107f4694a24931379fd55fd12df8e0b6d (patch)
tree39d2c23f3130ba476cc2849d513e625d0882ad7d
parent38d469fa8a49ccb2ed18f9520acacfce181bd3e6 (diff)
downloadevolution-data-server-4764296107f4694a24931379fd55fd12df8e0b6d.tar.gz
Add AM_CONDITIONAL for SUNLDAP (as always false) also to the Win32 branch
2006-06-15 Tor Lillqvist <tml@novell.com> * configure.in: Add AM_CONDITIONAL for SUNLDAP (as always false) also to the Win32 branch of the if statement, to avoid error message when running the configure script.
-rw-r--r--ChangeLog6
-rw-r--r--configure.in1
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 4a8af1927..ba0ea121c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-06-15 Tor Lillqvist <tml@novell.com>
+
+ * configure.in: Add AM_CONDITIONAL for SUNLDAP (as always false)
+ also to the Win32 branch of the if statement, to avoid error
+ message when running the configure script.
+
2006-06-13 Andre Klapper <a9016009@gmx.de>
* src/server.c:
diff --git a/configure.in b/configure.in
index 76c37eafe..ba4557fce 100644
--- a/configure.in
+++ b/configure.in
@@ -1142,6 +1142,7 @@ AC_SUBST(LDAP_CFLAGS)
AC_SUBST(LDAP_LIBS)
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"