diff options
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | lib/Makefile.netware | 2 | ||||
| -rw-r--r-- | lib/config-win32.h | 9 | ||||
| -rw-r--r-- | src/Makefile.netware | 2 |
4 files changed, 13 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index f03a81c78..e0d0bd47e 100644 --- a/configure.ac +++ b/configure.ac @@ -1728,6 +1728,7 @@ AC_CHECK_HEADERS( assert.h \ unistd.h \ stdlib.h \ + ldap_ssl.h \ limits.h \ arpa/inet.h \ net/if.h \ diff --git a/lib/Makefile.netware b/lib/Makefile.netware index 6aa38c49d..c30a1e0f5 100644 --- a/lib/Makefile.netware +++ b/lib/Makefile.netware @@ -456,6 +456,8 @@ endif ifdef DISABLE_LDAP @echo $(DL)#define CURL_DISABLE_LDAP 1$(DL) >> $@ else + @echo $(DL)#define CURL_HAS_NOVELL_LDAPSDK 1$(DL) >> $@ + @echo $(DL)#define HAVE_LDAP_SSL_H 1$(DL) >> $@ @echo $(DL)#define HAVE_LDAP_URL_PARSE 1$(DL) >> $@ endif ifdef NW_WINSOCK diff --git a/lib/config-win32.h b/lib/config-win32.h index 91e76e974..6a2500c37 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -353,9 +353,16 @@ /* LDAP SUPPORT */ /* ---------------------------------------------------------------- */ -#define CURL_LDAP_WIN 1 +#ifdef CURL_HAS_NOVELL_LDAPSDK +#undef CURL_LDAP_HYBRID +#undef CURL_LDAP_WIN +#define HAVE_LDAP_SSL_H 1 +#define HAVE_LDAP_URL_PARSE 1 +#else #undef CURL_LDAP_HYBRID #undef HAVE_LDAP_URL_PARSE +#define CURL_LDAP_WIN 1 +#endif /* ---------------------------------------------------------------- */ /* ADDITIONAL DEFINITIONS */ diff --git a/src/Makefile.netware b/src/Makefile.netware index f9107730e..9515c23c9 100644 --- a/src/Makefile.netware +++ b/src/Makefile.netware @@ -433,6 +433,8 @@ endif ifdef DISABLE_LDAP @echo $(DL)#define CURL_DISABLE_LDAP 1$(DL) >> $@ else + @echo $(DL)#define CURL_HAS_NOVELL_LDAPSDK 1$(DL) >> $@ + @echo $(DL)#define HAVE_LDAP_SSL_H 1$(DL) >> $@ @echo $(DL)#define HAVE_LDAP_URL_PARSE 1$(DL) >> $@ endif ifdef NW_WINSOCK |