From c5d2a0fd1dfd3945e18f339020d34fb99c4f65de Mon Sep 17 00:00:00 2001 From: Mike Lothian Date: Tue, 7 Oct 2025 11:48:09 +0100 Subject: [PATCH 1/2] Fix OpenLDAP detection --- configure.ac | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 12a984c682f..2ba1a2bf134 100644 --- a/configure.ac +++ b/configure.ac @@ -1199,7 +1199,11 @@ SQUID_CHECK_LIB_WORKS(gss,[ SQUID_AUTO_LIB(ldap,[LDAP],[LIBLDAP]) SQUID_CHECK_LIB_WORKS(ldap,[ - PKG_CHECK_MODULES([LIBLDAP],[ldap],[:],[:]) + SQUID_STATE_SAVE(squid_ldap_state) + PKG_CHECK_MODULES([LIBLDAP],[ldap],[:],[ + AC_CHECK_LIB(lber, ber_init, [LIBLBER="-llber"]) + AC_CHECK_LIB(ldap, ldap_init, [LIBLDAP_LIBS="-lldap $LIBLBER"]) + ]) AS_IF([test "$squid_host_os" = "mingw" -a "x$LIBLDAP_LIBS" = "x"],[ dnl On MinGW OpenLDAP is not available, try Windows LDAP libraries dnl TODO: use AC_CHECK_LIB @@ -1213,6 +1217,7 @@ SQUID_CHECK_LIB_WORKS(ldap,[ AC_CHECK_HEADERS(ldap.h lber.h) AC_CHECK_HEADERS(mozldap/ldap.h) SQUID_CHECK_LDAP_API + SQUID_STATE_ROLLBACK(squid_ldap_state) ]) SQUID_AUTO_LIB(sasl,[Cyrus SASL],[LIBSASL]) From 36bbe8b42b04802405e61ec5e373b1de9c22e934 Mon Sep 17 00:00:00 2001 From: Amos Jeffries Date: Thu, 13 Nov 2025 21:15:54 +1300 Subject: [PATCH 2/2] Update configure.ac merging after third-party confirmation that it works. --- configure.ac | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 2ba1a2bf134..0ee150b8606 100644 --- a/configure.ac +++ b/configure.ac @@ -1200,7 +1200,9 @@ SQUID_CHECK_LIB_WORKS(gss,[ SQUID_AUTO_LIB(ldap,[LDAP],[LIBLDAP]) SQUID_CHECK_LIB_WORKS(ldap,[ SQUID_STATE_SAVE(squid_ldap_state) - PKG_CHECK_MODULES([LIBLDAP],[ldap],[:],[ + PKG_CHECK_MODULES([LIBLDAP],[ldap],[:],[:]) + AS_IF([test "x$LIBLDAP_LIBS" = "x"],[ + dnl hack for detecting OpenLDAP older than 2.5 AC_CHECK_LIB(lber, ber_init, [LIBLBER="-llber"]) AC_CHECK_LIB(ldap, ldap_init, [LIBLDAP_LIBS="-lldap $LIBLBER"]) ])