moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

added defines to build with OpenLDAP.

This commit is contained in:
Gunter Knauf 2007-08-24 17:08:49 +00:00
parent a892cf2c12
commit 68b215157f
3 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/Makefile.m32
View File

@ -80,11 +80,16 @@ ifdef IPV6
endif endif
ifdef LDAPS ifdef LDAPS
CFLAGS += -DHAVE_LDAP_SSL CFLAGS += -DHAVE_LDAP_SSL
ifdef USE_LDAP_NOVELL endif
INCLUDES += -I"$(LDAP_SDK)/inc" ifdef USE_LDAP_NOVELL
CFLAGS += -DCURL_HAS_NOVELL_LDAPSDK INCLUDES += -I"$(LDAP_SDK)/inc"
DLL_LIBS += -L"$(LDAP_SDK)/lib/mscvc" -lldapsdk -lldapssl -lldapx CFLAGS += -DCURL_HAS_NOVELL_LDAPSDK
endif 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 endif
DLL_LIBS += -lws2_32 -lwinmm -lwldap32 DLL_LIBS += -lws2_32 -lwinmm -lwldap32
COMPILE = $(CC) $(INCLUDES) $(CFLAGS) COMPILE = $(CC) $(INCLUDES) $(CFLAGS)

6
lib/config-win32.h
View File

@ -353,11 +353,15 @@
/* LDAP SUPPORT */ /* 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_HYBRID
#undef CURL_LDAP_WIN #undef CURL_LDAP_WIN
#define HAVE_LDAP_SSL_H 1 #define HAVE_LDAP_SSL_H 1
#define HAVE_LDAP_URL_PARSE 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 #else
#undef CURL_LDAP_HYBRID #undef CURL_LDAP_HYBRID
#undef HAVE_LDAP_URL_PARSE #undef HAVE_LDAP_URL_PARSE

13
src/Makefile.m32
View File

@ -90,11 +90,14 @@ ifdef IPV6
endif endif
ifdef LDAPS ifdef LDAPS
CFLAGS += -DHAVE_LDAP_SSL CFLAGS += -DHAVE_LDAP_SSL
ifdef USE_LDAP_NOVELL endif
# INCLUDES += -I"$(LDAP_SDK)/inc" ifdef USE_LDAP_NOVELL
CFLAGS += -DCURL_HAS_NOVELL_LDAPSDK CFLAGS += -DCURL_HAS_NOVELL_LDAPSDK
curl_LDADD += -L"$(LDAP_SDK)/lib/mscvc" -lldapsdk -lldapssl -lldapx curl_LDADD += -L"$(LDAP_SDK)/lib/mscvc" -lldapsdk -lldapssl -lldapx
endif endif
ifdef USE_LDAP_OPENLDAP
CFLAGS += -DCURL_HAS_OPENLDAP_LDAPSDK
curl_LDADD += -L"$(LDAP_SDK)/lib" -lldap -llber
endif endif
curl_LDADD += -lws2_32 -lwinmm -lwldap32 curl_LDADD += -lws2_32 -lwinmm -lwldap32
COMPILE = $(CC) $(INCLUDES) $(CFLAGS) COMPILE = $(CC) $(INCLUDES) $(CFLAGS)