diff options
| -rw-r--r-- | lib/Makefile.m32 | 15 | ||||
| -rw-r--r-- | lib/config-win32.h | 6 | ||||
| -rw-r--r-- | src/Makefile.m32 | 13 |
3 files changed, 23 insertions, 11 deletions
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 diff --git a/src/Makefile.m32 b/src/Makefile.m32 index b2b33531d..2aea0a52a 100644 --- 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) |