]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Fix detection of cppunit (#1695)
authorFrancesco Chemolli <5175948+kinkie@users.noreply.github.com>
Fri, 23 Feb 2024 11:25:11 +0000 (11:25 +0000)
committerSquid Anubis <squid-anubis@squid-cache.org>
Fri, 23 Feb 2024 11:25:20 +0000 (11:25 +0000)
On MacOS / Homebrew, libcppunit is not part of the system path.
pkg-config will report it; use it.

This change also ensures squid honours the promise made
in configure's help text to let administrators specify a
LIBCPPUNIT_LIBS environment variable to
override automatic detection

configure.ac

index 0028b9b0bfc20490732e59c41b9322435f59be8e..9250d73dc034ae7261af3afb2f36bd79cbfdab6a 100644 (file)
@@ -2172,7 +2172,6 @@ AC_MSG_NOTICE([X-Accelerator-Vary support enabled: $enable_x_accelerator_vary])
 
 SQUID_AUTO_LIB(cppunit,[cppunit test framework],[LIBCPPUNIT])
 SQUID_CHECK_LIB_WORKS(cppunit,[
-  LIBCPPUNIT_LIBS="$LIBCPPUNIT_PATH -lcppunit"
   PKG_CHECK_MODULES([LIBCPPUNIT],[cppunit],[
     squid_cv_cppunit_version="`pkg-config --modversion cppunit`"
     AC_MSG_NOTICE([using system installed cppunit version $squid_cv_cppunit_version])