Maintenance: update --with-ldap detection (#1736)

diff --git a/acinclude/ldap.m4 b/acinclude/ldap.m4
index 660cc8deadf1e75b74cc989920535efc15e7b347..c1fae4d2cbb8b92e715be3f42e674782d9564a7f 100644 (file)
--- a/acinclude/ldap.m4
+++ b/acinclude/ldap.m4
@@ -99,5 +99,4 @@ AC_DEFUN([SQUID_CHECK_LDAP_API],[
   AC_SEARCH_LIBS([ldap_start_tls_s],[$LIBLDAP_NAMES],[
     AC_DEFINE(HAVE_LDAP_START_TLS_S,1,[Define to 1 if you have ldap_start_tls_s])
   ])
-  SQUID_STATE_ROLLBACK(squid_ldap_state)
 ])

diff --git a/configure.ac b/configure.ac
index 9f29dc85c8cf68b721d2eabad1578b68c4e68b74..4f0d7651cded572043da3aba3f61c67269e856d1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1193,32 +1193,18 @@ SQUID_CHECK_LIB_WORKS(gss,[
 
 SQUID_AUTO_LIB(ldap,[LDAP],[LIBLDAP])
 SQUID_CHECK_LIB_WORKS(ldap,[
-  dnl On MinGW OpenLDAP is not available, so LDAP helpers can be linked
-  dnl only with Windows LDAP libraries using -lwldap32
-  AS_IF([test "$squid_host_os" = "mingw"],[
+  SQUID_STATE_SAVE(squid_ldap_state)
+  PKG_CHECK_MODULES([LIBLDAP],[ldap],[:],[:])
+  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
     LIBLDAP_LIBS="-lwldap32"
-  ],[
-    SQUID_STATE_SAVE(squid_ldap_state)
-    LIBS="$LIBLDAP_PATH $LIBPTHREADS $LIBS"
-    PKG_CHECK_MODULES([LIBLDAP],[ldap],[],[
-      AC_CHECK_LIB(lber, ber_init, [LIBLBER="-llber"])
-      AC_CHECK_LIB(ldap, ldap_init, [LIBLDAP_LIBS="-lldap $LIBLBER"])
-      dnl if no ldap lib found check for mozilla version
-      AS_IF([test "x$ac_cv_lib_ldap_ldap_init" != "xyes"],[
-        SQUID_STATE_SAVE(squid_ldap_mozilla)
-        LIBS="$LIBLDAP_PATH $LIBPTHREADS"
-        AC_CHECK_LIB(ldap60, ldap_init, [LIBLDAP_LIBS="-lldap60 $LIBLBER"])
-        LIBS="$LIBLDAP_PATH $LIBLDAP_LIBS $LIBPTHREADS"
-        AC_CHECK_LIB(prldap60, prldap_init, [LIBLDAP_LIBS="-lprldap60 $LIBLDAP_LIBS"])
-        LIBS="$LIBLDAP_PATH $LIBLDAP_LIBS $LIBPTHREADS"
-        AC_CHECK_LIB(ssldap60, ldapssl_init, [LIBLDAP_LIBS="-lssldap60 $LIBLDAP_LIBS"])
-        SQUID_STATE_ROLLBACK(squid_ldap_mozilla)
-      ])
-    ])
-    AC_CHECK_HEADERS(ldap.h lber.h)
-    AC_CHECK_HEADERS(mozldap/ldap.h)
-    SQUID_CHECK_LDAP_API
+    AC_CHECK_HEADERS(winldap.h)
   ])
+  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(systemd,[systemd API for start-up notification],[LIBSYSTEMD])

diff --git a/src/acl/external/LDAP_group/required.m4 b/src/acl/external/LDAP_group/required.m4
index f57320fef260c9d911f305b3a90b84538fc60527..ce3589f06324f4db6497590271a2c933025553fc 100755 (executable)
--- a/src/acl/external/LDAP_group/required.m4
+++ b/src/acl/external/LDAP_group/required.m4
@@ -5,4 +5,4 @@
 ## Please see the COPYING and CONTRIBUTORS files for details.
 ##
 
-AC_CHECK_HEADERS([ldap.h winldap.h],[BUILD_HELPER="LDAP_group"])
+AS_IF([test "x$LIBLDAP_LIBS" != "x"],[BUILD_HELPER="LDAP_group"])

diff --git a/src/acl/external/eDirectory_userip/required.m4 b/src/acl/external/eDirectory_userip/required.m4
index 14ecf871d7a2e60bd198802ac7c98473fa1cc357..e7b3d8b6e559d259be5c80da04741e6ddd89134c 100644 (file)
--- a/src/acl/external/eDirectory_userip/required.m4
+++ b/src/acl/external/eDirectory_userip/required.m4
@@ -5,4 +5,4 @@
 ## Please see the COPYING and CONTRIBUTORS files for details.
 ##
 
-AC_CHECK_HEADERS([ldap.h winldap.h],[BUILD_HELPER="eDirectory_userip"])
+AS_IF([test "x$LIBLDAP_LIBS" != "x"],[BUILD_HELPER="eDirectory_userip"])

diff --git a/src/acl/external/kerberos_ldap_group/required.m4 b/src/acl/external/kerberos_ldap_group/required.m4
index df95bc8b6a7a2112b61795d412ba1d53c9079e38..0298bf2e34adf6e16181e0fc385866b359f9a472 100644 (file)
--- a/src/acl/external/kerberos_ldap_group/required.m4
+++ b/src/acl/external/kerberos_ldap_group/required.m4
@@ -6,6 +6,6 @@
 ##
 
 AS_IF([test "x$LIBMIT_KRB5_LIBS" != "x" -o "x$LIBHEIMDAL_KRB5_LIBS" != "x" -o "x$LIBGSS_LIBS" != "x"],[
-  BUILD_HELPER="kerberos_ldap_group"
   SQUID_CHECK_SASL
+  AS_IF([test "x$LIBLDAP_LIBS" != "x"],[BUILD_HELPER="kerberos_ldap_group"])
 ])

diff --git a/src/auth/basic/LDAP/required.m4 b/src/auth/basic/LDAP/required.m4
index 0b4fa4c0a4e1ff59ebc28a075860cebb20be6bc8..be661ed05204035f681461fab0a9a9f3aaa2e726 100755 (executable)
--- a/src/auth/basic/LDAP/required.m4
+++ b/src/auth/basic/LDAP/required.m4
@@ -5,4 +5,4 @@
 ## Please see the COPYING and CONTRIBUTORS files for details.
 ##
 
-AC_CHECK_HEADERS([ldap.h winldap.h],[BUILD_HELPER="LDAP"])
+AS_IF([test "x$LIBLDAP_LIBS" != "x"],[BUILD_HELPER="LDAP"])

diff --git a/src/auth/digest/LDAP/required.m4 b/src/auth/digest/LDAP/required.m4
index 0b4fa4c0a4e1ff59ebc28a075860cebb20be6bc8..be661ed05204035f681461fab0a9a9f3aaa2e726 100755 (executable)
--- a/src/auth/digest/LDAP/required.m4
+++ b/src/auth/digest/LDAP/required.m4
@@ -5,4 +5,4 @@
 ## Please see the COPYING and CONTRIBUTORS files for details.
 ##
 
-AC_CHECK_HEADERS([ldap.h winldap.h],[BUILD_HELPER="LDAP"])
+AS_IF([test "x$LIBLDAP_LIBS" != "x"],[BUILD_HELPER="LDAP"])

diff --git a/src/auth/digest/eDirectory/required.m4 b/src/auth/digest/eDirectory/required.m4
index 4f745b92b0cddbd0f8ff02b98e6ad3ddda987794..7d9f03bb9c216a55995e31136ae58ee4a20c4971 100755 (executable)
--- a/src/auth/digest/eDirectory/required.m4
+++ b/src/auth/digest/eDirectory/required.m4
@@ -5,4 +5,4 @@
 ## Please see the COPYING and CONTRIBUTORS files for details.
 ##
 
-AC_CHECK_HEADERS([ldap.h winldap.h],[BUILD_HELPER="eDirectory"])
+AS_IF([test "x$LIBLDAP_LIBS" != "x"],[BUILD_HELPER="eDirectory"])