only link with -lwldap32 if we dont use other LDAP SDKs.

diff --git a/lib/Makefile.m32 b/lib/Makefile.m32
index 96ca7754ea65355f9a19e9903a74fd22c34e9140..e3e0569d7e23bb08a938875e4dcada0ad2410088 100644 (file)
--- a/lib/Makefile.m32
+++ b/lib/Makefile.m32
@@ -91,7 +91,12 @@ ifdef USE_LDAP_OPENLDAP
   CFLAGS += -DCURL_HAS_OPENLDAP_LDAPSDK
   DLL_LIBS += -L"$(LDAP_SDK)/lib" -lldap -llber
 endif
-DLL_LIBS += -lws2_32 -lwinmm -lwldap32
+ifndef USE_LDAP_NOVELL
+ifndef USE_LDAP_OPENLDAP
+DLL_LIBS += -lwldap32
+endif
+endif
+DLL_LIBS += -lws2_32 -lwinmm
 COMPILE = $(CC) $(INCLUDES) $(CFLAGS)
 
 # Makefile.inc provides the CSOURCES and HHEADERS defines

diff --git a/src/Makefile.m32 b/src/Makefile.m32
index 2aea0a52ad80965f1937b70a31f3fbb8c154b62f..30ba77bbdef6b82538ffa6675b5a3d6530295370 100644 (file)
--- a/src/Makefile.m32
+++ b/src/Makefile.m32
@@ -99,7 +99,12 @@ ifdef USE_LDAP_OPENLDAP
   CFLAGS += -DCURL_HAS_OPENLDAP_LDAPSDK
   curl_LDADD += -L"$(LDAP_SDK)/lib" -lldap -llber
 endif
-curl_LDADD += -lws2_32 -lwinmm -lwldap32
+ifndef USE_LDAP_NOVELL
+ifndef USE_LDAP_OPENLDAP
+curl_LDADD += -lwldap32
+endif
+endif
+curl_LDADD += -lws2_32 -lwinmm
 COMPILE = $(CC) $(INCLUDES) $(CFLAGS)
 
 # Makefile.inc provides the CSOURCES and HHEADERS defines