From: Guenter Knauf <lists@gknw.net>
Date: Tue, 11 Jan 2011 17:32:38 +0000 (+0100)
Subject: Disable LDAP support since BCC headers are insufficient.
X-Git-Tag: curl-7_21_4~71
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b5cc77bd252db6ca1f083fa4357c52f83e888af8;p=thirdparty%2Fcurl.git

Disable LDAP support since BCC headers are insufficient.
---

diff --git a/lib/Makefile.b32 b/lib/Makefile.b32
index 77404a160e..26ddc2e62d 100644
--- a/lib/Makefile.b32
+++ b/lib/Makefile.b32
@@ -42,15 +42,21 @@ LDFLAGS  = -q -lq -laa -tWD
 INCDIRS  = -I.;../include
 LINKLIB  = $(BCCDIR)/lib/cw32mt.lib
 
-# If you build with SSL support, set WITH_SSL=1
 DEFINES  = -DNDEBUG -DWIN32 -D_CONSOLE -D_MBCS -DBUILDING_LIBCURL
 
+# By default we disable LDAP support here since BCC headers are insufficient.
+!ifndef WITH_LDAP
+DEFINES  = $(DEFINES) -DCURL_DISABLE_LDAP
+!endif
+
+# If you build with ZLIB support, set WITH_ZLIB=1
 !ifdef WITH_ZLIB
 DEFINES  = $(DEFINES) -DHAVE_LIBZ -DHAVE_ZLIB_H
 INCDIRS  = $(INCDIRS);$(ZLIB_PATH)
 LINKLIB  = $(LINKLIB) $(ZLIB_PATH)/zlib.lib
 !endif
 
+# If you build with SSL support, set WITH_SSL=1
 !ifdef WITH_SSL
 DEFINES  = $(DEFINES) -DUSE_SSLEAY
 INCDIRS  = $(INCDIRS);$(OPENSSL_PATH)/inc32;$(OPENSSL_PATH)/inc32/openssl
diff --git a/src/Makefile.b32 b/src/Makefile.b32
index e67c549bb5..4d9bfd4348 100644
--- a/src/Makefile.b32
+++ b/src/Makefile.b32
@@ -38,7 +38,6 @@ LDFLAGS  = -q -lq -lap
 INCDIRS  = -I.;../include;../lib
 LINKLIB  = $(BCCDIR)/lib/cw32mt.lib
 
-# If you build with SSL support, set WITH_SSL=1
 DEFINES  = -DNDEBUG -DWIN32
 
 !ifdef DYNAMIC
@@ -48,12 +47,14 @@ LIBCURL_LIB = ../lib/libcurl.lib
 DEFINES = $(DEFINES) -DCURL_STATICLIB
 !endif
 
+# If you build with ZLIB support, set WITH_ZLIB=1
 !ifdef WITH_ZLIB
 DEFINES  = $(DEFINES) -DHAVE_LIBZ -DHAVE_ZLIB_H
 INCDIRS  = $(INCDIRS);$(ZLIB_PATH)
 LINKLIB  = $(LINKLIB) $(ZLIB_PATH)/zlib.lib
 !endif
 
+# If you build with SSL support, set WITH_SSL=1
 !ifdef WITH_SSL
 DEFINES  = $(DEFINES) -DUSE_SSLEAY
 INCDIRS  = $(INCDIRS);$(OPENSSL_PATH)/inc32;$(OPENSSL_PATH)/inc32/openssl