From 68b215157fdf69612edebdb220b3804822277822 Mon Sep 17 00:00:00 2001
From: Gunter Knauf <gk@gknw.de>
Date: Fri, 24 Aug 2007 17:08:49 +0000
Subject: added defines to build with OpenLDAP.

---
 lib/Makefile.m32   | 15 ++++++++++-----
 lib/config-win32.h |  6 +++++-
 2 files changed, 15 insertions(+), 6 deletions(-)

(limited to 'lib')

diff --git a/lib/Makefile.m32 b/lib/Makefile.m32
index 672cc3312..96ca7754e 100644
--- 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 6a2500c37..91c63bf23 100644
--- 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
-- 
cgit v1.2.3