Skip to content

Commit

Permalink
Improve LDAP library detection (#1148)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
yadij authored and kinkie committed Oct 31, 2024
1 parent 1a9b083 commit 7712ec9
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 1 deletion.
1 change: 0 additions & 1 deletion acinclude/ldap.m4
Original file line number Diff line number Diff line change
Expand Up @@ -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)
])
1 change: 1 addition & 0 deletions test-suite/buildtests/layer-02-maximus.opts
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,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 \
Expand Down
1 change: 1 addition & 0 deletions test-suite/buildtests/layer-04-noauth-everything.opts
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,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 \
Expand Down

0 comments on commit 7712ec9

Please sign in to comment.