diff options
| author | Yang Tse <yangsita@gmail.com> | 2010-06-04 15:14:31 +0200 |
|---|---|---|
| committer | Yang Tse <yangsita@gmail.com> | 2010-06-04 15:14:31 +0200 |
| commit | 43d20d81a55a0e30becea04b7e607775093ce6eb (patch) | |
| tree | 4bff0680c51839d1d494befaa2e66230021b2ae4 /configure.ac | |
| parent | bc0f3dd15e99db189ae38c04ac660a174b7c27ec (diff) | |
Enable OpenLDAP support for cygwin builds.
Enable OpenLDAP support for cygwin builds. This support was disabled back
in 2008 due to incompatibilities between OpenSSL and OpenLDAP headers.
cygwin's OpenSSL 0.9.8l and OpenLDAP 2.3.43 versions on cygwin 1.5.25
allow building an OpenLDAP enabled libcurl supporting back to Windows 95.
Remove non-functional CURL_LDAP_HYBRID code and references.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 41 |
1 files changed, 8 insertions, 33 deletions
diff --git a/configure.ac b/configure.ac index 9af5316cb..af30b8a69 100644 --- a/configure.ac +++ b/configure.ac @@ -371,28 +371,10 @@ AC_HELP_STRING([--disable-ldap],[Disable LDAP support]), AC_SUBST(CURL_DISABLE_LDAP, [1]) ;; *) - 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_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_RESULT(yes) ] ) AC_MSG_CHECKING([whether to support ldaps]) AC_ARG_ENABLE(ldaps, @@ -810,13 +792,11 @@ if test x$CURL_DISABLE_LDAP != x1 ; then CURL_CHECK_HEADER_LDAP_SSL if test -z "$LDAPLIBNAME" ; then - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32*) - dnl Windows uses a single and unique OpenLDAP DLL name - LDAPLIBNAME="wldap32" - LBERLIBNAME="no" - ;; - esac + if test "$ac_cv_native_windows" = "yes"; then + dnl Windows uses a single and unique LDAP library name + LDAPLIBNAME="wldap32" + LBERLIBNAME="no" + fi fi if test "$LDAPLIBNAME" ; then @@ -862,12 +842,7 @@ if test x$CURL_DISABLE_LDAP != x1 ; then if test "$LDAPLIBNAME" = "wldap32"; then curl_ldap_msg="enabled (winldap)" - AC_DEFINE(CURL_LDAP_WIN, 1, [Use W$ LDAP implementation]) - case $host in - *-*-cygwin* | *-*-pw32*) - AC_DEFINE(CURL_LDAP_HYBRID, 1, [W$ LDAP with non-W$ compiler]) - ;; - esac + AC_DEFINE(CURL_LDAP_WIN, 1, [Use Windows LDAP implementation]) else curl_ldap_msg="enabled (OpenLDAP)" if test "x$ac_cv_func_ldap_init_fd" = "xyes"; then |