added define for ldap_ssl.h.

diff --git a/configure.ac b/configure.ac
index f03a81c78a7800cd2d422d8ef7aff23760402dd7..e0d0bd47eb155db39232b2a799c66475b1050c67 100644 (file)
--- 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 6aa38c49dd42e5d40fd8c1cd837131f2bbe04438..c30a1e0f556eee483f77a7708d4ade27d304c894 100644 (file)
--- 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 91e76e974d06399d7b0417b2147a17ffb2f50ecd..6a2500c378540f47a6c157cf8d1ff58c37a6dce4 100644 (file)
--- 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 f9107730e34cd6f61340277b34728b632264fea1..9515c23c9e58c86249ff7b9d0e021fc65ea996eb 100644 (file)
--- 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