Commit 68b21515 authored Aug 24, 2007 by Guenter Knauf

added defines to build with OpenLDAP.

parent a892cf2c

lib/Makefile.m32

+10 −5

Original line number	Diff line number	Diff line
		@@ -80,11 +80,16 @@ ifdef IPV6
		endif
		ifdef LDAPS
		CFLAGS += -DHAVE_LDAP_SSL
		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)

lib/config-win32.h

+5 −1

Original line number	Diff line number	Diff line
		@@ -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

src/Makefile.m32

+8 −5

Original line number	Diff line number	Diff line
		@@ -90,11 +90,14 @@ ifdef IPV6
		endif
		ifdef LDAPS
		CFLAGS += -DHAVE_LDAP_SSL
		endif
		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
		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)