--------------------- PatchSet 6110 Date: 2004/01/03 20:57:41 Author: serassio Branch: nt-2_5 Tag: (none) Log: Added LDAP helpers support for MinGW Members: helpers/basic_auth/LDAP/Makefile.am:1.2.8.2->1.2.8.3 helpers/basic_auth/LDAP/squid_ldap_auth.c:1.2.8.11->1.2.8.12 helpers/external_acl/ldap_group/Makefile.am:1.1.12.3->1.1.12.4 helpers/external_acl/ldap_group/squid_ldap_group.c:1.1.6.10->1.1.6.11 Index: squid/helpers/basic_auth/LDAP/Makefile.am =================================================================== RCS file: /cvsroot/squid-sf//squid/helpers/basic_auth/LDAP/Makefile.am,v retrieving revision 1.2.8.2 retrieving revision 1.2.8.3 diff -u -r1.2.8.2 -r1.2.8.3 --- squid/helpers/basic_auth/LDAP/Makefile.am 12 Aug 2002 19:21:20 -0000 1.2.8.2 +++ squid/helpers/basic_auth/LDAP/Makefile.am 3 Jan 2004 20:57:41 -0000 1.2.8.3 @@ -1,7 +1,7 @@ # # Makefile for the Squid LDAP authentication helper # -# $Id: Makefile.am,v 1.2.8.2 2002/08/12 19:21:20 serassio Exp $ +# $Id: Makefile.am,v 1.2.8.3 2004/01/03 20:57:41 serassio Exp $ # # Uncomment and customize the following to suit your needs: # @@ -11,5 +11,11 @@ EXTRA_DIST = squid_ldap_auth.8 squid_ldap_auth_SOURCES = squid_ldap_auth.c +if ENABLE_MINGW32SPECIFIC +LDADD = -L$(top_builddir)/lib -lmiscutil -lwldap32 $(XTRA_LIBS) +INCLUDES = -I$(top_srcdir)/port/win32/include -I$(top_builddir)/include \ + -I$(top_srcdir)/include +else LDADD = -L$(top_builddir)/lib -lmiscutil -lldap -llber $(XTRA_LIBS) INCLUDES = -I$(top_srcdir)/include +endif Index: squid/helpers/basic_auth/LDAP/squid_ldap_auth.c =================================================================== RCS file: /cvsroot/squid-sf//squid/helpers/basic_auth/LDAP/squid_ldap_auth.c,v retrieving revision 1.2.8.11 retrieving revision 1.2.8.12 diff -u -r1.2.8.11 -r1.2.8.12 --- squid/helpers/basic_auth/LDAP/squid_ldap_auth.c 3 Jan 2004 11:12:45 -0000 1.2.8.11 +++ squid/helpers/basic_auth/LDAP/squid_ldap_auth.c 3 Jan 2004 20:57:41 -0000 1.2.8.12 @@ -76,6 +76,9 @@ #define snprintf _snprintf #include #include +#ifndef LDAPAPI +#define LDAPAPI __cdecl +#endif #ifdef LDAP_VERSION3 #define LDAP_OPT_SUCCESS LDAP_SUCCESS /* Some tricks to allow dynamic bind with ldap_start_tls_s entry point at Index: squid/helpers/external_acl/ldap_group/Makefile.am =================================================================== RCS file: /cvsroot/squid-sf//squid/helpers/external_acl/ldap_group/Makefile.am,v retrieving revision 1.1.12.3 retrieving revision 1.1.12.4 diff -u -r1.1.12.3 -r1.1.12.4 --- squid/helpers/external_acl/ldap_group/Makefile.am 14 Dec 2002 21:47:23 -0000 1.1.12.3 +++ squid/helpers/external_acl/ldap_group/Makefile.am 3 Jan 2004 20:57:42 -0000 1.1.12.4 @@ -1,7 +1,7 @@ # # Makefile for the Squid LDAP authentication helper # -# $Id: Makefile.am,v 1.1.12.3 2002/12/14 21:47:23 serassio Exp $ +# $Id: Makefile.am,v 1.1.12.4 2004/01/03 20:57:42 serassio Exp $ # # Uncomment and customize the following to suit your needs: # @@ -11,4 +11,12 @@ EXTRA_DIST = squid_ldap_group.8 squid_ldap_group_SOURCES = squid_ldap_group.c -LDADD = -lldap -llber $(XTRA_LIBS) +if ENABLE_MINGW32SPECIFIC +LDADD = -L$(top_builddir)/lib -lwldap32 $(XTRA_LIBS) +INCLUDES = -I$(top_srcdir)/port/win32/include -I$(top_builddir)/include \ + -I$(top_srcdir)/include +else +LDADD = -L$(top_builddir)/lib -lldap -llber $(XTRA_LIBS) +INCLUDES = -I$(top_srcdir)/include +endif + Index: squid/helpers/external_acl/ldap_group/squid_ldap_group.c =================================================================== RCS file: /cvsroot/squid-sf//squid/helpers/external_acl/ldap_group/squid_ldap_group.c,v retrieving revision 1.1.6.10 retrieving revision 1.1.6.11 diff -u -r1.1.6.10 -r1.1.6.11 --- squid/helpers/external_acl/ldap_group/squid_ldap_group.c 3 Jan 2004 11:13:01 -0000 1.1.6.10 +++ squid/helpers/external_acl/ldap_group/squid_ldap_group.c 3 Jan 2004 20:57:42 -0000 1.1.6.11 @@ -41,6 +41,9 @@ #define snprintf _snprintf #include #include +#ifndef LDAPAPI +#define LDAPAPI __cdecl +#endif #ifdef LDAP_VERSION3 #define LDAP_OPT_SUCCESS LDAP_SUCCESS /* Some tricks to allow dynamic bind with ldap_start_tls_s entry point at