aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES4
-rw-r--r--configure.ac25
2 files changed, 26 insertions, 3 deletions
diff --git a/CHANGES b/CHANGES
index 3175ee212..b7c19d078 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,10 @@
Changelog
+Yang Tse (21 Jan 2008)
+- Disable ldap support for cygwin builds, since it breaks whole build process.
+ Fixing it will affect other platforms, so it is postponed for another release.
+
Daniel S (18 Jan 2008)
- Lau Hang Kin found and fixed a problem with the multi interface when doing
CONNECT over a proxy. curl_multi_fdset() didn't report back the socket
diff --git a/configure.ac b/configure.ac
index 58a3a9a78..5f2e99055 100644
--- a/configure.ac
+++ b/configure.ac
@@ -323,10 +323,29 @@ AC_HELP_STRING([--disable-ldap],[Disable LDAP support]),
AC_DEFINE(CURL_DISABLE_LDAP, 1, [to disable LDAP])
AC_SUBST(CURL_DISABLE_LDAP, [1])
;;
- *) AC_MSG_RESULT(yes)
+ *)
+ case $host in
+ *-*-cygwin*)
+ # Force no ldap. config/build process is broken for cygwin
+ AC_DEFINE(CURL_DISABLE_LDAP, 1, [to disable LDAP])
+ AC_SUBST(CURL_DISABLE_LDAP, [1])
+ AC_MSG_RESULT(no)
+ ;;
+ *)
+ AC_MSG_RESULT(yes)
+ esac
;;
- esac ],
- AC_MSG_RESULT(yes)
+ esac ],[
+ case $host in
+ *-*-cygwin*)
+ # Force no ldap. config/build process is broken for cygwin
+ AC_DEFINE(CURL_DISABLE_LDAP, 1, [to disable LDAP])
+ AC_SUBST(CURL_DISABLE_LDAP, [1])
+ AC_MSG_RESULT(no)
+ ;;
+ *)
+ AC_MSG_RESULT(yes)
+ esac ]
)
AC_MSG_CHECKING([whether to support ldaps])
AC_ARG_ENABLE(ldaps,