From: Alex Rousskov <rousskov@measurement-factory.com>
Date: Tue, 11 Oct 2022 15:29:42 +0000 (+0000)
Subject: Avoid negative test-builds.sh results due to lack of LDAP (#1158)
X-Git-Tag: SQUID_6_0_1~89
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b686961ee95f48fc102acf9bf8e666553b4603a5;p=thirdparty%2Fsquid.git

Avoid negative test-builds.sh results due to lack of LDAP (#1158)

    TESTING: layer-02-maximus
    BUILD: test-suite/buildtests/layer-02-maximus.opts
    configure: error: Required library ldap not found

Broken by commit 0d57ed2.
---

diff --git a/.github/workflows/default.yaml b/.github/workflows/default.yaml
index 2b078abdbd..8e69cf0ab9 100644
--- a/.github/workflows/default.yaml
+++ b/.github/workflows/default.yaml
@@ -105,7 +105,6 @@ jobs:
           sudo apt-get --quiet=2 update
           sudo apt-get --quiet=2 install libtool-bin
           sudo apt-get --quiet=2 install libcppunit-dev
-          sudo apt-get --quiet=2 install libldap2-dev
           # TODO: Add some deb-src URI to sources.list and do build-dep
           # instead of the above installs?
           # sudo apt-get --quiet=2 build-dep squid
diff --git a/test-suite/buildtests/layer-02-maximus.opts b/test-suite/buildtests/layer-02-maximus.opts
index c24cfd72ce..22874e9723 100644
--- a/test-suite/buildtests/layer-02-maximus.opts
+++ b/test-suite/buildtests/layer-02-maximus.opts
@@ -48,6 +48,7 @@ MAKETEST="distcheck"
 #   --with-gnugss \
 #   --with-heimdal-krb5 \
 #   --with-mit-krb5 \
+#   --with-ldap \
 #
 #   --enable-cpu-profiling \  Requires CPU support.
 #
@@ -111,7 +112,6 @@ 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 \
diff --git a/test-suite/buildtests/layer-04-noauth-everything.opts b/test-suite/buildtests/layer-04-noauth-everything.opts
index b01df312ed..34972050f8 100644
--- a/test-suite/buildtests/layer-04-noauth-everything.opts
+++ b/test-suite/buildtests/layer-04-noauth-everything.opts
@@ -47,6 +47,7 @@ MAKETEST="distcheck"
 #   --enable-kqueue \
 #   --enable-win32-service \
 #   --with-valgrind-debug \
+#   --with-ldap \
 #
 #   --enable-cpu-profiling \  Requires CPU support.
 #
@@ -113,7 +114,6 @@ 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 \