]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Improve LDAP library detection (#1148)
authorAmos Jeffries <yadij@users.noreply.github.com>
Sat, 24 Sep 2022 11:52:35 +0000 (11:52 +0000)
committerSquid Anubis <squid-anubis@squid-cache.org>
Sat, 24 Sep 2022 13:53:27 +0000 (13:53 +0000)
Add --with-ldap and pkg-config support to speed up Squid builds
where LDAP is not to be used. This also adds support for custom
LDAP library locations like other --with-foo options.

'pkg-config --libs ldap' finds both -lldap and -llber. Stop using
different variables for them in Makefile.am.

Extract LDAP API tests into simpler dedicated macros and stop
polluting LIBS when running LDAP tests.

12 files changed:
acinclude/ldap.m4 [new file with mode: 0644]
configure.ac
doc/release-notes/release-5.sgml
src/acl/external/LDAP_group/Makefile.am
src/acl/external/eDirectory_userip/Makefile.am
src/acl/external/kerberos_ldap_group/Makefile.am
src/auth/basic/LDAP/Makefile.am
src/auth/digest/LDAP/Makefile.am
src/auth/digest/eDirectory/Makefile.am
test-suite/buildtests/layer-01-minimal.opts
test-suite/buildtests/layer-02-maximus.opts
test-suite/buildtests/layer-04-noauth-everything.opts

diff --git a/acinclude/ldap.m4 b/acinclude/ldap.m4
new file mode 100644 (file)
index 0000000..88cfd11
--- /dev/null
@@ -0,0 +1,98 @@
+# Copyright (C) 1996-2022 The Squid Software Foundation and contributors
+##
+## Squid software is distributed under GPLv2+ license and includes
+## contributions from numerous individuals and organizations.
+## Please see the COPYING and CONTRIBUTORS files for details.
+##
+
+dnl checks for LDAP functionality
+AC_DEFUN([SQUID_LDAP_TEST],[
+  AC_CACHE_CHECK([for $1],[squid_cv_$1],[
+    SQUID_STATE_SAVE(squid_ldap_test_state)
+    LIBS="$LIBLDAP_PATH $LIBLDAP_LIBS $LIBPTHREADS"
+    CPPFLAGS="-DLDAP_DEPRECATED=1 -DLDAP_REFERRALS $CPPFLAGS"
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+#       if HAVE_LDAP_H
+#       include <ldap.h>
+#       elif HAVE_MOZLDAP_LDAP_H
+#       include <mozldap/ldap.h>
+#       endif
+      ]],[[$2]])
+    ],[
+      squid_cv_$1=1
+    ],[
+      squid_cv_$1=0
+    ],[
+      squid_cv_$1=0
+    ])
+    SQUID_STATE_ROLLBACK(squid_ldap_test_state)
+  ])
+  AC_DEFINE_UNQUOTED([HAVE_$1],${squid_cv_$1},[Define to 1 if you have $1])
+])
+
+dnl similar to SQUID_LDAP_TEST but runs the test program
+AC_DEFUN([SQUID_LDAP_TEST_RUN],[
+  AC_CACHE_CHECK([for $1],[m4_translit([squid_cv_$1],[-+. ],[____])],[
+    SQUID_STATE_SAVE(squid_ldap_test_state)
+    LIBS="$LIBLDAP_PATH $LIBLDAP_LIBS $LIBPTHREADS"
+    CPPFLAGS="-DLDAP_DEPRECATED=1 -DLDAP_REFERRALS $CPPFLAGS"
+    AC_RUN_IFELSE([AC_LANG_PROGRAM([[
+#       if HAVE_LDAP_H
+#       include <ldap.h>
+#       elif HAVE_MOZLDAP_LDAP_H
+#       include <mozldap/ldap.h>
+#       endif
+#       include <string.h>
+      ]],[[$2]])
+    ],[
+      m4_translit([squid_cv_$1],[-+. ],[____])=1
+    ],[
+      m4_translit([squid_cv_$1],[-+. ],[____])=0
+    ],[
+      m4_translit([squid_cv_$1],[-+. ],[____])=0
+    ])
+    SQUID_STATE_ROLLBACK(squid_ldap_test_state)
+  ])
+  AC_DEFINE_UNQUOTED([m4_translit([m4_translit([HAVE_$1],[-+. abcdefghijklmnopqrstuvwxyz],[____ABCDEFGHIJKLMNOPQRSTUVWXYZ])],[-+. ],[____])],
+    ${m4_translit([squid_cv_$1],[-+. ],[____])},[Define to 1 if you have $1])
+])
+
+dnl find the LDAP library vendor and define relevant HAVE_(vendor name) macro
+AC_DEFUN([SQUID_LDAP_CHECK_VENDOR],[
+  SQUID_LDAP_TEST_RUN([OpenLDAP],[return strcmp(LDAP_VENDOR_NAME,"OpenLDAP")])
+  SQUID_LDAP_TEST_RUN([Sun LDAP SDK],[return strcmp(LDAP_VENDOR_NAME,"Sun Microsystems Inc.")])
+  SQUID_LDAP_TEST_RUN([Mozilla LDAP SDK],[return strcmp(LDAP_VENDOR_NAME,"mozilla.org")])
+])
+
+dnl check whether the LDAP library(s) provide the needed API and types
+dnl define HAVE_DAP_* macros for each checked item
+AC_DEFUN([SQUID_CHECK_LDAP_API],[
+  SQUID_LDAP_TEST([LDAP],[
+    char host[]="";
+    int port;
+    ldap_init((const char *)&host, port);
+  ])
+  SQUID_LDAP_CHECK_VENDOR
+  SQUID_LDAP_TEST([LDAP_OPT_DEBUG_LEVEL],[auto i=LDAP_OPT_DEBUG_LEVEL])
+  SQUID_LDAP_TEST([LDAP_SCOPE_DEFAULT],[auto i=LDAP_SCOPE_DEFAULT])
+  SQUID_LDAP_TEST([LDAP_REBIND_PROC],[LDAP_REBIND_PROC ldap_rebind])
+  SQUID_LDAP_TEST([LDAP_REBINDPROC_CALLBACK],[LDAP_REBINDPROC_CALLBACK ldap_rebind])
+  SQUID_LDAP_TEST([LDAP_REBIND_FUNCTION],[LDAP_REBIND_FUNCTION ldap_rebind])
+
+  dnl TODO check this test's code actually works, it looks broken
+  SQUID_LDAP_TEST([LDAP_URL_LUD_SCHEME],[struct ldap_url_desc.lud_scheme])
+
+  AC_CHECK_LIB(ldap,[ldapssl_client_init],[
+    AC_DEFINE(HAVE_LDAPSSL_CLIENT_INIT,1,[Define to 1 if you have ldapssl_client_init])
+  ])
+  AC_CHECK_LIB($LIBLDAP_LIBS,[ldap_url_desc2str],[
+    AC_DEFINE(HAVE_LDAP_URL_DESC2STR,1,[Define to 1 if you have ldap_url_desc2str])
+  ])
+  AC_CHECK_LIB($LIBLDAP_LIBS,[ldap_url_parse],[
+    AC_DEFINE(HAVE_LDAP_URL_PARSE,1,[Define to 1 if you have ldap_url_parse])
+  ])
+  AC_CHECK_LIB($LIBLDAP_LIBS,[ldap_start_tls_s],[
+    AC_DEFINE(HAVE_LDAP_START_TLS_S,1,[Define to 1 if you have ldap_start_tls_s])
+  ])
+  SQUID_STATE_ROLLBACK(squid_ldap_state)
+])
index ff5ef3495103aa3311444136ab6bd946213ad040..ecdfa46943912ae527296354747984ef7b200af5 100644 (file)
@@ -21,6 +21,7 @@ m4_include([acinclude/squid-util.m4])
 m4_include([acinclude/compiler-flags.m4])
 m4_include([acinclude/os-deps.m4])
 m4_include([acinclude/krb5.m4])
+m4_include([acinclude/ldap.m4])
 m4_include([acinclude/nettle.m4])
 m4_include([acinclude/pam.m4])
 m4_include([acinclude/pkg.m4])
@@ -1627,220 +1628,45 @@ AC_MSG_NOTICE([$KRB5_FLAVOUR Kerberos library support: ${with_krb5:=no} ${LIB_KR
 AC_SUBST(KRB5INCS)
 AC_SUBST(KRB5LIBS)
 
-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"],[
-  LDAPLIB="-lwldap32"
-  LBERLIB=""
-],[
-  AC_CHECK_LIB(ldap, ldap_init, [LDAPLIB="-lldap"])
-  AC_CHECK_LIB(lber, ber_init, [LBERLIB="-llber"])
-  dnl if no ldap lib found check for mozilla version
-  AS_IF([test "x$ac_cv_lib_ldap_ldap_init" != "xyes"],[
-    oLIBS=$LIBS
-    LIBS="$LIBPTHREADS"
-    AC_CHECK_LIB(ldap60, ldap_init, [LDAPLIB="-lldap60"])
-    LIBS="$LDAPLIB $LIBPTHREADS"
-    AC_CHECK_LIB(prldap60, prldap_init, [LDAPLIB="-lprldap60 $LDAPLIB"])
-    LIBS="$LDAPLIB $LIBPTHREADS"
-    AC_CHECK_LIB(ssldap60, ldapssl_init, [LDAPLIB="-lssldap60 $LDAPLIB"])
-    LIBS=$oLIBS
-  ])
-
-  AC_CHECK_HEADERS(ldap.h lber.h)
-  AC_CHECK_HEADERS(mozldap/ldap.h)
-
-  AC_MSG_CHECKING([for LDAP_OPT_DEBUG_LEVEL])
-  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-#include <ldap.h>
-  ]],[[
-    int i=LDAP_OPT_DEBUG_LEVEL
-  ]])],[
-    AC_MSG_RESULT(yes)
-  ],[
-    AC_MSG_RESULT(no)
-  ])
-
-  AC_MSG_CHECKING([for working ldap])
-  oLIBS=$LIBS
-  LIBS="$LDAPLIB $LBERLIB $LIBPTHREADS"
-  AC_RUN_IFELSE([AC_LANG_SOURCE([[
-#   define  LDAP_DEPRECATED 1
-#   if HAVE_LDAP_H
-#   include <ldap.h>
-#   elif HAVE_MOZLDAP_LDAP_H
-#   include <mozldap/ldap.h>
-#   endif
-    int
-    main(void)
-    {
-        char host[]="";
-        int port;
-        ldap_init((const char *)&host, port);
-        return 0;
-    }
-  ]])],[
-    AC_DEFINE(HAVE_LDAP, 1, [LDAP support])
-    AC_MSG_RESULT(yes)
-  ],[
-    AC_MSG_RESULT(no)
-  ],[
-     AC_MSG_RESULT(cross-compiler cant tell)
-  ])
-  LIBS=$oLIBS
-
-  AC_MSG_CHECKING([for OpenLDAP])
-  AC_RUN_IFELSE([AC_LANG_SOURCE([[
-#   if HAVE_LDAP_H
-#   include <ldap.h>
-#   endif
-#   include <string.h>
-    int
-    main(void)
-    {
-        return strcmp(LDAP_VENDOR_NAME,"OpenLDAP");
-    }
-  ]])],[
-    AC_DEFINE(HAVE_OPENLDAP, 1, [OpenLDAP support])
-    AC_MSG_RESULT(yes)
-  ],[
-    AC_MSG_RESULT(no)
-  ],[
-    AC_MSG_RESULT(cross-compiler cant tell)
-  ])
-
-  AC_MSG_CHECKING([for Sun LDAP SDK])
-  AC_RUN_IFELSE([AC_LANG_SOURCE([[
-#   if HAVE_LDAP_H
-#   include <ldap.h>
-#   endif
-#   include <string.h>
-    int
-    main(void)
-    {
-        return strcmp(LDAP_VENDOR_NAME,"Sun Microsystems Inc.");
-    }
-  ]])],[
-    AC_DEFINE(HAVE_SUN_LDAP_SDK, 1, [Sun LDAP SDK support])
-    AC_MSG_RESULT(yes)
-  ],[
-    AC_MSG_RESULT(no)
-  ],[
-    AC_MSG_RESULT(cross-compiler cant tell)
-  ])
-
-  AC_MSG_CHECKING([for Mozilla LDAP SDK])
-  AC_RUN_IFELSE([AC_LANG_SOURCE([[
-#   if HAVE_LDAP_H
-#   include <ldap.h>
-#   elif HAVE_MOZLDAP_LDAP_H
-#   include <mozldap/ldap.h>
-#   endif
-#   include <string.h>
-    int
-    main(void)
-    {
-        return strcmp(LDAP_VENDOR_NAME,"mozilla.org");
-    }
-  ]])],[
-    AC_DEFINE(HAVE_MOZILLA_LDAP_SDK, 1, [Mozilla LDAP SDK support])
-    AC_MSG_RESULT(yes)
-  ],[
-    AC_MSG_RESULT(no)
+SQUID_AUTO_LIB(ldap,[LDAP],[LIBLDAP])
+AS_IF([test "x$with_ldap" != "xno"],[
+  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"],[
+    LIBLDAP_LIBS="-lwldap32"
   ],[
-    AC_MSG_RESULT(cross-compiler cant tell)
-  ])
-
-  AC_MSG_CHECKING([for LDAP_REBINDPROC_CALLBACK])
-  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-#   if HAVE_LDAP_H
-#   include <ldap.h>
-#   elif HAVE_MOZLDAP_LDAP_H
-#   include <mozldap/ldap.h>
-#   endif
-  ]],[[
-    LDAP_REBINDPROC_CALLBACK ldap_rebind;
-  ]])],[
-    AC_DEFINE(HAVE_LDAP_REBINDPROC_CALLBACK,1,[Define to 1 if you have LDAP_REBINDPROC_CALLBACK])
-    AC_MSG_RESULT(yes)
-  ],[
-     AC_MSG_RESULT(no)
-  ])
-
-  AC_MSG_CHECKING([for LDAP_REBIND_PROC])
-  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-#   if HAVE_LDAP_H
-#   include <ldap.h>
-#   elif HAVE_MOZLDAP_LDAP_H
-#   include <mozldap/ldap.h>
-#   endif
-  ]],[[
-    LDAP_REBIND_PROC ldap_rebind;
-  ]])],[
-    AC_DEFINE(HAVE_LDAP_REBIND_PROC,1,[Define to 1 if you have LDAP_REBIND_PROC])
-    AC_MSG_RESULT(yes)
-  ],[
-    AC_MSG_RESULT(no)
-  ])
-
-  AC_MSG_CHECKING([for LDAP_REBIND_FUNCTION])
-  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-#   define LDAP_REFERRALS
-#   if HAVE_LDAP_H
-#   include <ldap.h>
-#   elif HAVE_MOZLDAP_LDAP_H
-#   include <mozldap/ldap.h>
-#   endif
-  ]],[[
-    LDAP_REBIND_FUNCTION ldap_rebind;
-  ]])],[
-    AC_DEFINE(HAVE_LDAP_REBIND_FUNCTION,1,[Define to 1 if you have LDAP_REBIND_FUNCTION])
-    AC_MSG_RESULT(yes)
-  ],[
-    AC_MSG_RESULT(no)
+    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_MSG_CHECKING([for LDAP_SCOPE_DEFAULT])
-  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-#   if HAVE_LDAP_H
-#   include <ldap.h>
-#   elif HAVE_MOZLDAP_LDAP_H
-#   include <mozldap/ldap.h>
-#   endif
-  ]],[[
-    int i=LDAP_SCOPE_DEFAULT;
-  ]])],[
-    AC_DEFINE(HAVE_LDAP_SCOPE_DEFAULT,1,[Define to 1 if you have LDAP_SCOPE_DEFAULT])
-    AC_MSG_RESULT(yes)
+  AS_IF([test "x$LIBLDAP_LIBS" != "x"],[
+    CPPFLAGS="$LIBLDAP_CFLAGS $CPPFLAGS"
+    LIBLDAP_LIBS="$LIBLDAP_PATH $LIBLDAP_LIBS"
+  ],[test "x$with_ldap" = "xyes"],[
+    AC_MSG_ERROR([Required library ldap not found])
   ],[
-    AC_MSG_RESULT(no)
+    AC_MSG_NOTICE([Library ldap not found.])
   ])
-
-  AC_CHECK_MEMBER([struct ldap_url_desc.lud_scheme],[
-    AC_DEFINE(HAVE_LDAP_URL_LUD_SCHEME,1,[Define to 1 if you have LDAPURLDesc.lud_scheme])
-  ],,[
-#include <ldap.h>
-  ])
-
-  AC_CHECK_LIB(ldap,ldapssl_client_init,[
-    AC_DEFINE(HAVE_LDAPSSL_CLIENT_INIT,1,[Define to 1 if you have ldapssl_client_init])
-  ],)
-
-  AC_CHECK_LIB(ldap,ldap_url_desc2str,[
-    AC_DEFINE(HAVE_LDAP_URL_DESC2STR,1,[Define to 1 if you have ldap_url_desc2str])
-  ],)
-
-  AC_CHECK_LIB(ldap,ldap_url_parse,[
-    AC_DEFINE(HAVE_LDAP_URL_PARSE,1,[Define to 1 if you have ldap_url_parse])
-  ],)
-
-  AC_CHECK_LIB(ldap,ldap_start_tls_s,[
-    AC_DEFINE(HAVE_LDAP_START_TLS_S,1,[Define to 1 if you have ldap_start_tls_s])
-  ],)
 ])
-
-AC_SUBST(LDAPLIB)
-AC_SUBST(LBERLIB)
+AC_SUBST(LIBLDAP_LIBS)
 
 SQUID_AUTO_LIB(systemd,[systemd API for start-up notification],[LIBSYSTEMD])
 AH_TEMPLATE(USE_SYSTEMD,[systemd support is available])
@@ -2438,8 +2264,6 @@ AC_CHECK_HEADERS( \
   gnumalloc.h \
   grp.h \
   ipl.h \
-  lber.h \
-  ldap.h \
   libc.h \
   limits.h \
   linux/posix_types.h \
index 466e9c3b01bd5205ebc50988e0be01462a11b559..7f922330c372816a0f5f62f87f6ad8a44e30c517 100644 (file)
@@ -342,6 +342,12 @@ This section gives an account of those changes in three categories:
 <sect1>New options<label id="newoptions">
 <p>
 <descrip>
+       <tag>--without-ldap</tag>
+       <p>New option to determine whether LDAP support is used, and
+          build against local custom installs.
+       <p>This will prevent all helper binaries depending on LDAP
+          from being auto-built.
+
        <tag>--without-tdb</tag>
        <p>New option to determine whether TrivialDB support is used, and
           build against local custom installs.
index 9d482f855cbecce7dc91ae992106ed1c512d71ee..c2607c5f9a071ed481712dfd9d633449598fbddd 100644 (file)
@@ -15,8 +15,7 @@ ext_ldap_group_acl_SOURCES = \
 ext_ldap_group_acl_LDADD= \
        $(top_builddir)/lib/libmiscencoding.la \
        $(COMPAT_LIB) \
-       $(LDAPLIB) \
-       $(LBERLIB) \
+       $(LIBLDAP_LIBS) \
        $(XTRA_LIBS)
 
 EXTRA_DIST= \
index 5f7077e9489b9bc9bf02623646f21dbc5d12fb92..37315d8f30ef759abee8585fe2b8f62b23ab1779 100644 (file)
@@ -14,8 +14,7 @@ ext_edirectory_userip_acl_SOURCES = \
 
 ext_edirectory_userip_acl_LDADD = \
        $(COMPAT_LIB) \
-       $(LDAPLIB) \
-       $(LBERLIB) \
+       $(LIBLDAP_LIBS) \
        $(XTRA_LIBS)
 
 man_MANS = ext_edirectory_userip_acl.8
index 44df7e365bab9322e3df2d6aa46bd00640e992de..41702588cd38e43d1f3aaa691bd7961d55fe0de1 100644 (file)
@@ -36,8 +36,7 @@ ext_kerberos_ldap_group_acl_LDFLAGS =
 ext_kerberos_ldap_group_acl_LDADD = \
        $(top_builddir)/lib/libmiscencoding.la \
        $(COMPAT_LIB) \
-       $(LDAPLIB) \
-       $(LBERLIB) \
+       $(LIBLDAP_LIBS) \
        $(LIBSASL) \
        $(KRB5LIBS) \
        $(XTRA_LIBS)
index 9e3b204a91bcbf011813fe10a65b851ee340f980..edb0bd32899412203637bcebc481479077591859 100644 (file)
@@ -15,5 +15,4 @@ basic_ldap_auth_SOURCES = basic_ldap_auth.cc
 basic_ldap_auth_LDADD = \
        $(top_builddir)/lib/libmiscencoding.la \
        $(COMPAT_LIB) \
-       $(LDAPLIB) \
-       $(LBERLIB)
+       $(LIBLDAP_LIBS)
index d2e95be3aaf3ddcd9961748ba46e5319501da9c2..f3e452eb5629412bcb6a339c0b13ffb0831ff1a7 100644 (file)
@@ -18,8 +18,7 @@ digest_ldap_auth_SOURCES = \
 digest_ldap_auth_LDADD= \
        $(top_builddir)/lib/libmiscencoding.la \
        $(COMPAT_LIB) \
-       $(LDAPLIB) \
-       $(LBERLIB) \
+       $(LIBLDAP_LIBS) \
        $(LIBNETTLE_LIBS) \
        $(CRYPTLIB) \
        $(SSLLIB) \
index 89a84127f539f560c6d11d9077cebb86a1e0d593..a4cecb5d390d709e214f4e22b93542da6bc3467a 100644 (file)
@@ -20,8 +20,7 @@ digest_edirectory_auth_SOURCES = \
 digest_edirectory_auth_LDADD = \
        $(top_builddir)/lib/libmiscencoding.la \
        $(COMPAT_LIB) \
-       $(LDAPLIB) \
-       $(LBERLIB) \
+       $(LIBLDAP_LIBS) \
        $(LIBNETTLE_LIBS) \
        $(CRYPTLIB) \
        $(SSLLIB) \
index 2cad1531989ea16d5742f3743501128e79233fe5..2c06b78f8a0327a047780a30016111678d129aab 100644 (file)
@@ -100,6 +100,7 @@ DISTCHECK_CONFIGURE_FLAGS=" \
        --without-cap \
        --without-dl \
        --without-large-files \
+       --without-ldap \
        --without-nettle \
        --without-valgrind-debug \
        --without-ipv6-split-stack \
index 46c7fdd25ee7cb92b098d14dc38f8f9e9bea1eea..fcf1b98db780ac83f497330d72c01a10982c98c5 100644 (file)
@@ -108,6 +108,7 @@ DISTCHECK_CONFIGURE_FLAGS=" \
        --with-gnu-ld \
        --with-ipv6-split-stack \
        --with-large-files \
+       --with-ldap \
        --with-pic \
        --with-pthreads \
        --enable-build-info=squid\ test\ build \
index a5e72c308fc2cf8cc96114c802027529001701ba..93f74f3d405fdc9d401060d2f4310e5a74349a3e 100644 (file)
@@ -110,6 +110,7 @@ DISTCHECK_CONFIGURE_FLAGS=" \
        --with-gnu-ld \
        --with-ipv6-split-stack \
        --with-large-files \
+       --with-ldap \
        --with-pic \
        --with-pthreads \
        --enable-build-info=squid\ test\ build \