added defines to build with OpenLDAP.

diff --git a/lib/Makefile.m32 b/lib/Makefile.m32
index 672cc3312d42937de4c3a7d7fc55039a3ef0f146..96ca7754ea65355f9a19e9903a74fd22c34e9140 100644 (file)
--- a/lib/Makefile.m32
+++ b/lib/Makefile.m32
@@ -80,11 +80,16 @@ ifdef IPV6
 endif
 ifdef LDAPS
   CFLAGS += -DHAVE_LDAP_SSL
-  ifdef USE_LDAP_NOVELL
-    INCLUDES += -I"$(LDAP_SDK)/inc"
-    CFLAGS += -DCURL_HAS_NOVELL_LDAPSDK
-    DLL_LIBS += -L"$(LDAP_SDK)/lib/mscvc" -lldapsdk -lldapssl -lldapx
-  endif
+endif
+ifdef USE_LDAP_NOVELL
+  INCLUDES += -I"$(LDAP_SDK)/inc"
+  CFLAGS += -DCURL_HAS_NOVELL_LDAPSDK
+  DLL_LIBS += -L"$(LDAP_SDK)/lib/mscvc" -lldapsdk -lldapssl -lldapx
+endif
+ifdef USE_LDAP_OPENLDAP
+  INCLUDES += -I"$(LDAP_SDK)/include"
+  CFLAGS += -DCURL_HAS_OPENLDAP_LDAPSDK
+  DLL_LIBS += -L"$(LDAP_SDK)/lib" -lldap -llber
 endif
 DLL_LIBS += -lws2_32 -lwinmm -lwldap32
 COMPILE = $(CC) $(INCLUDES) $(CFLAGS)

diff --git a/lib/config-win32.h b/lib/config-win32.h
index 6a2500c378540f47a6c157cf8d1ff58c37a6dce4..91c63bf2322c30607bb9bd4f4255761f6e866b93 100644 (file)
--- a/lib/config-win32.h
+++ b/lib/config-win32.h
@@ -353,11 +353,15 @@
 /*                           LDAP SUPPORT                           */
 /* ---------------------------------------------------------------- */
 
-#ifdef CURL_HAS_NOVELL_LDAPSDK
+#if defined(CURL_HAS_NOVELL_LDAPSDK) || defined(CURL_HAS_MOZILLA_LDAPSDK)
 #undef CURL_LDAP_HYBRID
 #undef CURL_LDAP_WIN
 #define HAVE_LDAP_SSL_H 1
 #define HAVE_LDAP_URL_PARSE 1
+#elif defined(CURL_HAS_OPENLDAP_LDAPSDK)
+#undef CURL_LDAP_HYBRID
+#undef CURL_LDAP_WIN
+#define HAVE_LDAP_URL_PARSE 1
 #else
 #undef CURL_LDAP_HYBRID
 #undef HAVE_LDAP_URL_PARSE

diff --git a/src/Makefile.m32 b/src/Makefile.m32
index b2b33531d76b5462a4ef06a92f6f174803da6346..2aea0a52ad80965f1937b70a31f3fbb8c154b62f 100644 (file)
--- a/src/Makefile.m32
+++ b/src/Makefile.m32
@@ -90,11 +90,14 @@ ifdef IPV6
 endif
 ifdef LDAPS
   CFLAGS += -DHAVE_LDAP_SSL
-  ifdef USE_LDAP_NOVELL
-    # INCLUDES += -I"$(LDAP_SDK)/inc"
-    CFLAGS += -DCURL_HAS_NOVELL_LDAPSDK
-    curl_LDADD += -L"$(LDAP_SDK)/lib/mscvc" -lldapsdk -lldapssl -lldapx
-  endif
+endif
+ifdef USE_LDAP_NOVELL
+  CFLAGS += -DCURL_HAS_NOVELL_LDAPSDK
+  curl_LDADD += -L"$(LDAP_SDK)/lib/mscvc" -lldapsdk -lldapssl -lldapx
+endif
+ifdef USE_LDAP_OPENLDAP
+  CFLAGS += -DCURL_HAS_OPENLDAP_LDAPSDK
+  curl_LDADD += -L"$(LDAP_SDK)/lib" -lldap -llber
 endif
 curl_LDADD += -lws2_32 -lwinmm -lwldap32
 COMPILE = $(CC) $(INCLUDES) $(CFLAGS)