Update cppunit detection

diff --git a/Makefile.am b/Makefile.am
index a8adad37d22aec615d45d6634bef34fb65e5ae4c..b4a4371530261f6d50324d03413dcfb54d48a323 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -48,7 +48,7 @@ install-pinger:
 check: have-cppunit check-recursive
 
 have-cppunit:
-       @if test "$(SQUID_CPPUNIT_INC)$(SQUID_CPPUNIT_LA)$(SQUID_CPPUNIT_LIBS)" = "" ; then \
+       @if test "$(LIBCPPUNIT_CFLAGS)$(LIBCPPUNIT_LIBS)" = "" ; then \
                echo "FATAL: 'make check' requires cppunit and cppunit development packages. They do not appear to be installed." ; \
                exit 1 ; \
        fi

diff --git a/compat/Makefile.am b/compat/Makefile.am
index 15ab0634ef8adad72182b051f6c47d3a5e86ede7..626538d4cedfe985bc3339e810ee0630ecebb5b7 100644 (file)
--- a/compat/Makefile.am
+++ b/compat/Makefile.am
@@ -94,7 +94,7 @@ TESTS += testPreCompiler
 testPreCompiler_SOURCES= \
        testPreCompiler.h \
        testPreCompiler.cc
-testPreCompiler_LDADD= $(SQUID_CPPUNIT_LA) $(SQUID_CPPUNIT_LIBS)
+testPreCompiler_LDADD= $(LIBCPPUNIT_LIBS)
 testPreCompiler_LDFLAGS=
 
 # os/ subdir prevents us using src/TestHeaders.am

diff --git a/configure.ac b/configure.ac
index 86576f1443debec63680334390b6b7cab1ff0a54..e4003116f97b676d4867b1bae26c481fc4f064e0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -115,10 +115,11 @@ AC_PATH_PROG(LN, ln, cp)
 AC_PATH_PROG(CHMOD, chmod, $FALSE)
 AC_PATH_PROG(TR, tr, $FALSE)
 AC_PATH_PROG(RM, rm, $FALSE)
-AC_PATH_PROG(CPPUNITCONFIG, cppunit-config, false)
 dnl Libtool 2.2.6 requires: rm -f
 RM="$RM -f"
 
+PKG_PROG_PKG_CONFIG
+
 AC_PATH_PROG(PERL, perl, none)
 if test "x$ac_cv_path_PERL" = "xnone"; then
   AC_MSG_FAILURE([Perl is required to compile Squid. Please install Perl and then re-run configure ])
@@ -984,9 +985,6 @@ AC_MSG_RESULT([$squid_opt_use_ecap, explicitly])
     ]
 )
 
-dnl Necessary if the first PKG_CHECK_MODULES call is conditional
-PKG_PROG_PKG_CONFIG
-
 dnl Perform configuration consistency checks for eCAP
 if test "x$squid_opt_use_ecap" != "xno";
 then
@@ -2725,45 +2723,29 @@ SQUID_DEFINE_BOOL(X_ACCELERATOR_VARY,${enable_x_accelerator_vary:=no},
                       [Enable support for the X-Accelerator-Vary HTTP header])
 AC_MSG_NOTICE([X-Accelerator-Vary support enabled: $enable_x_accelerator_vary])
 
-
-if $CPPUNITCONFIG --help >/dev/null; then
-  squid_cv_cppunit_version="`$CPPUNITCONFIG --version`"
-  AC_MSG_NOTICE([using system installed cppunit version $squid_cv_cppunit_version])
-  unset squid_cv_cppunit_version
-  SQUID_CPPUNIT_LIBS="`$CPPUNITCONFIG --libs`"
-  SQUID_CPPUNIT_LA=''
-  SQUID_CPPUNIT_INC="`$CPPUNITCONFIG --cflags`"
-else
-  AC_MSG_WARN([cppunit does not appear to be installed. squid does not require this, but code testing with 'make check' will fail.])
-  SQUID_CPPUNIT_LA='' 
-  SQUID_CPPUNIT_LIBS=''
-  SQUID_CPPUNIT_INC=''
-fi
-
-AC_ARG_WITH(cppunit-basedir,
-  AS_HELP_STRING([--with-cppunit-basedir=PATH],
-              [Path where the cppunit headers are libraries can be found ]), [
-if test -f "$withval/include/cppunit/TestCase.h"; then
-  AC_MSG_NOTICE([Using cppunit includes from $withval])
-  SQUID_CPPUNIT_INC="-I${withval}/include"
-else
-  AC_MSG_ERROR(Cannot find cppunit at $withval)
-fi
-if test -f "$withval/lib/libcppunit.la"; then
-  AC_MSG_NOTICE([Using cppunit lib from $withval])
-  SQUID_CPPUNIT_LA="${withval}/lib/libcppunit.la"
-  SQUID_CPPUNIT_LIBS='$(SQUID_CPPUNIT_LA)'
-else
-  AC_MSG_ERROR(Cannot find cppunit at $withval)
-fi
+AC_ARG_WITH([cppunit], AS_HELP_STRING([--without-cppunit],[Do not use cppunit test framework]),[
+  AS_CASE($with_cppunit, [yes|no],[],
+   [
+    AS_IF([test ! -d "$withval"],AC_MSG_ERROR([--with-cppunit PATH does not point to a directory]))
+    LIBCPPUNIT_CFLAGS="-I$with_cppunit/include"
+    LIBCPPUNIT_LIBS="-L$with_cppunit/lib -lcppunit"
+  ])
+])
+AS_IF([test "x$with_cppunit" != "xno"],[
+  PKG_CHECK_MODULES([LIBCPPUNIT],[cppunit],[
+    squid_cv_cppunit_version="`pkg-config cppunit --version`"
+    AC_MSG_NOTICE([using system installed cppunit version $squid_cv_cppunit_version])
+    AS_UNSET(squid_cv_cppunit_version)
+
+    SQUID_STATE_SAVE(squid_cppunit_state)
+    AS_VAR_APPEND(CXXFLAGS,[$LIBCPPUNIT_CFLAGS])
+    AS_VAR_APPEND(LIBS,[$LIBCPPUNIT_LIBS])
+    AC_CHECK_HEADERS(cppunit/extensions/HelperMacros.h)
+    SQUID_STATE_ROLLBACK(squid_cppunit_state)
+  ],[
+    AC_MSG_WARN([cppunit does not appear to be installed. Squid does not require this, but code testing with 'make check' will fail.])
+  ])
 ])
-SQUID_STATE_SAVE(squid_cppunit_state)
-CXXFLAGS="$CXXFLAGS $SQUID_CPPUNIT_INC"
-AC_CHECK_HEADERS(cppunit/extensions/HelperMacros.h)
-SQUID_STATE_ROLLBACK(squid_cppunit_state)
-AC_SUBST(SQUID_CPPUNIT_LIBS)
-AC_SUBST(SQUID_CPPUNIT_LA)
-AC_SUBST(SQUID_CPPUNIT_INC)
 
 # Force some compilers to use ANSI features
 #

diff --git a/doc/release-notes/release-4.sgml b/doc/release-notes/release-4.sgml
index 397b8afda0f70dae225d85baa6cd955095f1ad3d..2c85ff6dd718e81bd1f593630bf374afe5f67e13 100644 (file)
--- a/doc/release-notes/release-4.sgml
+++ b/doc/release-notes/release-4.sgml
@@ -407,6 +407,10 @@ This section gives an account of those changes in three categories:
           certificate checks is provided for testing and as an example
           for writing custom helpers.
 
+       <tag>--without-cppunit</tag>
+       <p>The cppunit testing framework is auto-detected and used when available.
+          This option can be used to disable it explicitly.
+
 </descrip>
 
 <sect1>Changes to existing options<label id="modifiedoptions">
@@ -434,6 +438,9 @@ This section gives an account of those changes in three categories:
 <sect1>Removed options<label id="removedoptions">
 <p>
 <descrip>
+       <tag>--with-cppunit-basedir</tag>
+       <p>Replaced by <em>--with-cppunit=PATH</em>.
+          Please prefer the default auto-detection though.
 
 </descrip>
 

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 14886d7d420500dc4cfc9e937f7e74b092f0b7bf..9b01ffe080afe77871dd9ee0443721e876fb7a92 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -88,9 +88,9 @@ tests_testRFC1738_SOURCES= \
        tests/testRFC1738.cc
 
 tests_testRFC1738_LDADD= \
-       $(SQUID_CPPUNIT_LA) $(SQUID_CPPUNIT_LIBS) \
        $(top_builddir)/lib/libmiscencoding.la \
        $(top_builddir)/lib/libmiscutil.la \
+       $(LIBCPPUNIT_LIBS) \
        $(COMPAT_LIB)
 
 tests_testRFC1738_LDFLAGS = $(LIBADD_DL)

diff --git a/src/Common.am b/src/Common.am
index 47b9a02499c0b8b389f6ea7c0f26ba11aeaef1b4..a0ff68e40dbc26d3f90788344bcf58b66ca047dd 100644 (file)
--- a/src/Common.am
+++ b/src/Common.am
@@ -47,7 +47,7 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/lib \
        -I$(top_srcdir)/src \
        -I$(top_builddir)/include \
-       $(SQUID_CPPUNIT_INC)
+       $(LIBCPPUNIT_CFLAGS)
 
 ## Kerberos headers require their include path.
 ## Because we use libcompat for comm_err.h header protections ...

diff --git a/src/Makefile.am b/src/Makefile.am
index d33b3a4daa0fd98a485fbcb8caa1d4ca32bba9b8..563d5cdb8d4ec0a1339629d5512c73bde28d17bf 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -914,9 +914,9 @@ TESTS += $(check_PROGRAMS)
 #      $(TESTSOURCES)
 #tests_testX_LDFLAGS = $(LIBADD_DL)
 #tests_testX_LDADD=\
-#      $(SQUID_CPPUNIT_LIBS) \
-#      $(SQUID_CPPUNIT_LA) \
-#      $(COMPAT_LIB) 
+#      $(LIBCPPUNIT_LIBS) \
+#      $(COMPAT_LIB) \
+#      $(XTRA_LIBS)
 
 # - add other component .(h|cc) files needed to link and run tests
 tests_testHttpReply_SOURCES=\
@@ -1017,10 +1017,9 @@ tests_testHttpReply_LDADD=\
        $(top_builddir)/lib/libmisccontainers.la \
        $(top_builddir)/lib/libmiscencoding.la \
        $(top_builddir)/lib/libmiscutil.la \
-       $(SQUID_CPPUNIT_LIBS) \
-       $(SQUID_CPPUNIT_LA) \
        $(NETTLELIB) \
        $(SSLLIB) \
+       $(LIBCPPUNIT_LIBS) \
        $(COMPAT_LIB) \
        $(XTRA_LIBS)
 
@@ -1150,8 +1149,8 @@ tests_testACLMaxUserIP_LDADD= \
        $(top_builddir)/lib/libmiscutil.la \
        $(NETTLELIB) \
        $(REGEXLIB) \
-       $(SQUID_CPPUNIT_LIBS) \
        $(SSLLIB) \
+       $(LIBCPPUNIT_LIBS) \
        $(COMPAT_LIB) \
        $(XTRA_LIBS)
 tests_testACLMaxUserIP_LDFLAGS = $(LIBADD_DL)
@@ -1169,10 +1168,9 @@ nodist_tests_testBoilerplate_SOURCES = \
        tests/stub_MemBuf.cc \
        $(TESTSOURCES)
 tests_testBoilerplate_LDADD= \
-       $(SQUID_CPPUNIT_LIBS) \
-       $(SQUID_CPPUNIT_LA) \
        $(SSLLIB) \
        base/libbase.la \
+       $(LIBCPPUNIT_LIBS) \
        $(COMPAT_LIB) \
        $(XTRA_LIBS)
 tests_testBoilerplate_LDFLAGS = $(LIBADD_DL)
@@ -1191,9 +1189,8 @@ nodist_tests_testCharacterSet_SOURCES = \
 tests_testCharacterSet_LDFLAGS = $(LIBADD_DL)
 tests_testCharacterSet_LDADD= \
        base/libbase.la \
+       $(LIBCPPUNIT_LIBS) \
        $(COMPAT_LIB) \
-       $(SQUID_CPPUNIT_LA) \
-       $(SQUID_CPPUNIT_LIBS) \
        $(XTRA_LIBS)
 
 ## Tests of the CacheManager module.
@@ -1428,10 +1425,9 @@ tests_testCacheManager_LDADD = \
        $(top_builddir)/lib/libmiscutil.la \
        $(NETTLELIB) \
        $(REGEXLIB) \
-       $(SQUID_CPPUNIT_LIBS) \
-       $(SQUID_CPPUNIT_LA) \
        $(SSLLIB) \
        $(KRB5LIBS) \
+       $(LIBCPPUNIT_LIBS) \
        $(COMPAT_LIB) \
        $(XTRA_LIBS)
 tests_testCacheManager_LDFLAGS = $(LIBADD_DL)
@@ -1601,15 +1597,14 @@ tests_testDiskIO_LDADD = \
        $(top_builddir)/lib/libmiscutil.la \
        $(NETTLELIB) \
        $(REGEXLIB) \
-       $(SQUID_CPPUNIT_LIBS) \
        $(SSLLIB) \
+       $(LIBCPPUNIT_LIBS) \
        $(COMPAT_LIB) \
        $(XTRA_LIBS)
 tests_testDiskIO_LDFLAGS = $(LIBADD_DL)
 tests_testDiskIO_DEPENDENCIES = \
        DiskIO/libdiskio.la \
-       $(SWAP_TEST_DS) \
-       $(SQUID_CPPUNIT_LA)
+       $(SWAP_TEST_DS)
 
 tests_testDns_SOURCES= \
        tests/testRFC1035.cc \
@@ -1623,10 +1618,9 @@ tests_testDns_LDADD= \
        dns/libdns.la \
        base/libbase.la \
        $(top_builddir)/lib/libmiscutil.la \
+       $(LIBCPPUNIT_LIBS) \
        $(COMPAT_LIB) \
-       $(XTRA_LIBS) \
-       $(SQUID_CPPUNIT_LA) \
-       $(SQUID_CPPUNIT_LIBS)
+       $(XTRA_LIBS)
 tests_testDns_LDFLAGS= $(LIBADD_DL)
 
 tests_testEvent_SOURCES = \
@@ -1860,10 +1854,9 @@ tests_testEvent_LDADD = \
        $(SNMP_LIBS) \
        $(NETTLELIB) \
        $(REGEXLIB) \
-       $(SQUID_CPPUNIT_LIBS) \
-       $(SQUID_CPPUNIT_LA) \
        $(SSLLIB) \
        $(KRB5LIBS) \
+       $(LIBCPPUNIT_LIBS) \
        $(COMPAT_LIB) \
        $(XTRA_LIBS)
 tests_testEvent_LDFLAGS = $(LIBADD_DL)
@@ -2099,10 +2092,9 @@ tests_testEventLoop_LDADD = \
        $(SNMP_LIBS) \
        $(NETTLELIB) \
        $(REGEXLIB) \
-       $(SQUID_CPPUNIT_LIBS) \
-       $(SQUID_CPPUNIT_LA) \
        $(SSLLIB) \
        $(KRB5LIBS) \
+       $(LIBCPPUNIT_LIBS) \
        $(COMPAT_LIB) \
        $(XTRA_LIBS)
 tests_testEventLoop_LDFLAGS = $(LIBADD_DL)
@@ -2334,10 +2326,9 @@ tests_test_http_range_LDADD = \
        $(top_builddir)/lib/libmiscutil.la \
        $(NETTLELIB) \
        $(REGEXLIB) \
-       $(SQUID_CPPUNIT_LIBS) \
-       $(SQUID_CPPUNIT_LA) \
        $(SSLLIB) \
        $(KRB5LIBS) \
+       $(LIBCPPUNIT_LIBS) \
        $(COMPAT_LIB) \
        $(XTRA_LIBS)
 tests_test_http_range_LDFLAGS = $(LIBADD_DL)
@@ -2361,9 +2352,8 @@ tests_testTokenizer_LDADD = \
        base/libbase.la \
        sbuf/libsbuf.la \
        $(top_builddir)/lib/libmiscutil.la \
+       $(LIBCPPUNIT_LIBS) \
        $(COMPAT_LIB) \
-       $(SQUID_CPPUNIT_LA) \
-       $(SQUID_CPPUNIT_LIBS) \
        $(XTRA_LIBS)
 
 tests_testHttp1Parser_SOURCES = \
@@ -2406,9 +2396,8 @@ tests_testHttp1Parser_LDADD= \
        ip/libip.la \
        sbuf/libsbuf.la \
        $(top_builddir)/lib/libmiscutil.la \
-       $(SQUID_CPPUNIT_LIBS) \
-       $(SQUID_CPPUNIT_LA) \
        $(SSLLIB) \
+       $(LIBCPPUNIT_LIBS) \
        $(COMPAT_LIB) \
        $(XTRA_LIBS)
 tests_testHttp1Parser_LDFLAGS = $(LIBADD_DL)
@@ -2643,10 +2632,9 @@ tests_testHttpRequest_LDADD = \
        $(top_builddir)/lib/libmiscutil.la \
        $(NETTLELIB) \
        $(REGEXLIB) \
-       $(SQUID_CPPUNIT_LIBS) \
-       $(SQUID_CPPUNIT_LA) \
        $(SSLLIB) \
        $(KRB5LIBS) \
+       $(LIBCPPUNIT_LIBS) \
        $(COMPAT_LIB) \
        $(XTRA_LIBS)
 tests_testHttpRequest_LDFLAGS = $(LIBADD_DL)
@@ -2668,9 +2656,8 @@ tests_testIcmp_LDADD=\
        icmp/libicmpcore.la \
        ip/libip.la \
        base/libbase.la \
+       $(LIBCPPUNIT_LIBS) \
        $(COMPAT_LIB) \
-       $(SQUID_CPPUNIT_LA) \
-       $(SQUID_CPPUNIT_LIBS) \
        $(XTRA_LIBS)
 
 ## Tests for ip/* objects
@@ -2685,9 +2672,8 @@ nodist_tests_testIpAddress_SOURCES= \
 tests_testIpAddress_LDADD= \
        ip/libip.la \
        base/libbase.la \
+       $(LIBCPPUNIT_LIBS) \
        $(COMPAT_LIB) \
-       $(SQUID_CPPUNIT_LA) \
-       $(SQUID_CPPUNIT_LIBS) \
        $(XTRA_LIBS)
 tests_testIpAddress_LDFLAGS= $(LIBADD_DL)
 
@@ -2850,10 +2836,9 @@ tests_testStore_LDADD= \
        $(top_builddir)/lib/libmiscutil.la \
        $(NETTLELIB) \
        $(REGEXLIB) \
-       $(SQUID_CPPUNIT_LIBS) \
-       $(SQUID_CPPUNIT_LA) \
        $(SSLLIB) \
        CommCalls.o \
+       $(LIBCPPUNIT_LIBS) \
        $(COMPAT_LIB) \
        $(XTRA_LIBS)
 tests_testStore_LDFLAGS = $(LIBADD_DL)
@@ -2889,9 +2874,8 @@ tests_testString_LDADD = \
        sbuf/libsbuf.la \
        $(top_builddir)/lib/libmiscutil.la \
        $(REGEXLIB) \
-       $(SQUID_CPPUNIT_LIBS) \
-       $(SQUID_CPPUNIT_LA) \
        $(SSLLIB) \
+       $(LIBCPPUNIT_LIBS) \
        $(COMPAT_LIB) \
        $(XTRA_LIBS)
 tests_testString_LDFLAGS = $(LIBADD_DL)
@@ -2909,8 +2893,7 @@ SWAP_TEST_DS =\
        DiskIO/libdiskio.la \
        ipc/libipc.la \
        mgr/libmgr.la \
-       $(REPL_OBJS) \
-       $(SQUID_CPPUNIT_LA)
+       $(REPL_OBJS)
 
 tests_testUfs_SOURCES = \
        tests/testUfs.cc \
@@ -3076,8 +3059,8 @@ tests_testUfs_LDADD = \
        $(top_builddir)/lib/libmiscutil.la \
        $(NETTLELIB) \
        $(REGEXLIB) \
-       $(SQUID_CPPUNIT_LIBS) \
        $(SSLLIB) \
+       $(LIBCPPUNIT_LIBS) \
        $(COMPAT_LIB) \
        $(XTRA_LIBS)
 tests_testUfs_LDFLAGS = $(LIBADD_DL)
@@ -3249,8 +3232,8 @@ tests_testRock_LDADD = \
        $(top_builddir)/lib/libmiscutil.la \
        $(NETTLELIB) \
        $(REGEXLIB) \
-       $(SQUID_CPPUNIT_LIBS) \
        $(SSLLIB) \
+       $(LIBCPPUNIT_LIBS) \
        $(COMPAT_LIB) \
        $(XTRA_LIBS)
 tests_testRock_LDFLAGS = $(AM_CPPFLAGS) $(LIBADD_DL)
@@ -3490,11 +3473,9 @@ tests_testURL_LDADD = \
        $(top_builddir)/lib/libmiscencoding.la \
        $(top_builddir)/lib/libmiscutil.la \
        $(NETTLELIB) \
-       $(COMPAT_LIB) \
-       $(SQUID_CPPUNIT_LIBS) \
-       $(SQUID_CPPUNIT_LA) \
        $(SSLLIB) \
        $(KRB5LIBS) \
+       $(LIBCPPUNIT_LIBS) \
        $(COMPAT_LIB) \
        $(XTRA_LIBS)
 tests_testURL_LDFLAGS = $(LIBADD_DL)
@@ -3514,10 +3495,9 @@ tests_testSBuf_LDFLAGS = $(LIBADD_DL)
 tests_testSBuf_LDADD= \
        sbuf/libsbuf.la \
        base/libbase.la \
-       $(SQUID_CPPUNIT_LIBS) \
+       $(LIBCPPUNIT_LIBS) \
        $(COMPAT_LIB) \
-       $(XTRA_LIBS) \
-       $(SQUID_CPPUNIT_LA)
+       $(XTRA_LIBS)
 
 tests_testSBufList_SOURCES= \
        tests/testSBufList.h \
@@ -3532,10 +3512,9 @@ tests_testSBufList_LDFLAGS = $(LIBADD_DL)
 tests_testSBufList_LDADD=\
        sbuf/libsbuf.la \
        base/libbase.la \
-       $(SQUID_CPPUNIT_LIBS) \
+       $(LIBCPPUNIT_LIBS) \
        $(COMPAT_LIB) \
-       $(XTRA_LIBS) \
-       $(SQUID_CPPUNIT_LA)
+       $(XTRA_LIBS)
 
 tests_testConfigParser_SOURCES = \
        ClientInfo.h \
@@ -3567,13 +3546,12 @@ tests_testConfigParser_LDADD = \
        base/libbase.la \
        $(top_builddir)/lib/libmiscutil.la \
        $(REGEXLIB) \
-       $(SQUID_CPPUNIT_LIBS) \
-       $(SQUID_CPPUNIT_LA) \
        $(SSLLIB) \
+       $(LIBCPPUNIT_LIBS) \
        $(COMPAT_LIB) \
        $(XTRA_LIBS)
 tests_testConfigParser_LDFLAGS = $(LIBADD_DL)
-       
+
 tests_testStatHist_SOURCES = \
        tests/stub_cbdata.cc \
        fatal.h \
@@ -3610,8 +3588,7 @@ tests_testStatHist_LDADD = \
        base/libbase.la \
        $(top_builddir)/lib/libmiscutil.la \
        $(top_builddir)/lib/libmisccontainers.la \
-       $(SQUID_CPPUNIT_LIBS) \
-       $(SQUID_CPPUNIT_LA) \
+       $(LIBCPPUNIT_LIBS) \
        $(COMPAT_LIB)
 
 tests_testLookupTable_SOURCES = \
@@ -3626,10 +3603,9 @@ tests_testLookupTable_LDFLAGS = $(LIBADD_DL)
 tests_testLookupTable_LDADD = \
        sbuf/libsbuf.la \
        base/libbase.la \
-       $(SQUID_CPPUNIT_LIBS) \
+       $(LIBCPPUNIT_LIBS) \
        $(COMPAT_LIB) \
-       $(XTRA_LIBS) \
-       $(SQUID_CPPUNIT_LA)
+       $(XTRA_LIBS)
 
 tests_testEnumIterator_SOURCES = \
        base/EnumIterator.h \
@@ -3642,9 +3618,8 @@ nodist_tests_testEnumIterator_SOURCES = \
 tests_testEnumIterator_LDFLAGS = $(LIBADD_DL)
 tests_testEnumIterator_LDADD = \
        base/libbase.la \
-       $(SQUID_CPPUNIT_LIBS) \
+       $(LIBCPPUNIT_LIBS) \
        $(COMPAT_LIB) \
-       $(SQUID_CPPUNIT_LA) \
        $(XTRA_LIBS)
 
 tests_testYesNoNone_SOURCES = \
@@ -3657,7 +3632,7 @@ nodist_tests_testYesNoNone_SOURCES = \
        base/YesNoNone.h
 tests_testYesNoNone_LDADD= \
        base/libbase.la \
-       $(SQUID_CPPUNIT_LIBS) \
+       $(LIBCPPUNIT_LIBS) \
        $(COMPAT_LIB) \
        $(XTRA_LIBS)
 tests_testYesNoNone_LDFLAGS = $(LIBADD_DL)

diff --git a/test-suite/buildtests/layer-01-minimal.opts b/test-suite/buildtests/layer-01-minimal.opts
index 5c9bd19b911d6e93a525856b2793feeb1a6d0d2e..d03717443ec1153ee4bf81bfe34eaa2606f17816 100644 (file)
--- a/test-suite/buildtests/layer-01-minimal.opts
+++ b/test-suite/buildtests/layer-01-minimal.opts
@@ -28,7 +28,6 @@ MAKETEST="distcheck"
 #   --without-default-user \
 #   --without-aufs-threads \
 #   --without-filedescriptors \
-#   --without-cppunit-basedir \
 #   --without-build-environment \
 #
 #

diff --git a/test-suite/buildtests/layer-02-maximus.opts b/test-suite/buildtests/layer-02-maximus.opts
index 4ff366e3187dd581aa9f221f19257e34d378c38c..ef0cb00863bbf8d31ef904399375dde3817ed641 100644 (file)
--- a/test-suite/buildtests/layer-02-maximus.opts
+++ b/test-suite/buildtests/layer-02-maximus.opts
@@ -30,7 +30,6 @@ MAKETEST="distcheck"
 #   --with-default-user=NAME \
 #   --with-aufs-threads=N \
 #   --with-filedescriptors=N \
-#   --with-cppunit-basedir=PATH \
 #   --with-po2html=PATH \
 #   --with-tags=TAGS \
 #

diff --git a/test-suite/buildtests/layer-04-noauth-everything.opts b/test-suite/buildtests/layer-04-noauth-everything.opts
index bafa26d38500ee798caa429e919eeb75fd37fd2a..d29f6000c2d1e6ea649891a4ac696546a19f90d7 100644 (file)
--- a/test-suite/buildtests/layer-04-noauth-everything.opts
+++ b/test-suite/buildtests/layer-04-noauth-everything.opts
@@ -30,7 +30,6 @@ MAKETEST="distcheck"
 #   --with-default-user=NAME \
 #   --with-aufs-threads=N \
 #   --with-filedescriptors=N \
-#   --with-cppunit-basedir=PATH \
 #   --with-openssl=PATH \
 #   --with-po2html=PATH \
 #   --with-tags=TAGS \

diff --git a/test-suite/buildtests/os-debian.opts b/test-suite/buildtests/os-debian.opts
index e9af9fea7f81316cede1ab31daba58fd806a039c..52376553e07d0378c3afa9bf06ead3d912c9158d 100644 (file)
--- a/test-suite/buildtests/os-debian.opts
+++ b/test-suite/buildtests/os-debian.opts
@@ -31,7 +31,6 @@ DISTCHECK_CONFIGURE_FLAGS=" \
        --datadir=/usr/share/squid3 \
        --sysconfdir=/etc/squid3 \
        --mandir=/usr/share/man \
-       --with-cppunit-basedir=/usr \
        --with-default-user=proxy \
  \
        --disable-maintainer-mode \

diff --git a/test-suite/buildtests/os-ubuntu.opts b/test-suite/buildtests/os-ubuntu.opts
index 1128cffc5beb3fabad9f4f71e33c99abd82eee99..9200e8f0351eb5051d8a3352349c445ea49f7516 100644 (file)
--- a/test-suite/buildtests/os-ubuntu.opts
+++ b/test-suite/buildtests/os-ubuntu.opts
@@ -30,7 +30,6 @@ DISTCHECK_CONFIGURE_FLAGS=" \
        --datadir=/usr/share/squid3 \
        --sysconfdir=/etc/squid3 \
        --mandir=/usr/share/man \
-       --with-cppunit-basedir=/usr \
        --with-default-user=proxy \
  \
        --disable-maintainer-mode \