From: Gunter Knauf <gk@gknw.de>
Date: Sat, 25 Aug 2007 12:08:38 +0000 (+0000)
Subject: only link with -lwldap32 if we dont use other LDAP SDKs.
X-Git-Tag: curl-7_17_0~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=870842ccee5bb9c116547f29dbb1c548979e0728;p=thirdparty%2Fcurl.git

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

diff --git a/lib/Makefile.m32 b/lib/Makefile.m32
index 96ca7754ea..e3e0569d7e 100644
--- 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 2aea0a52ad..30ba77bbde 100644
--- 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