Use ccpunit-config to get information about the system installed ccpunit

instead of hardwired probes

diff --git a/configure b/configure
index d1986ea069188a848a40679baf41f75e06a41e45..ffc0251638948a84ef3a16bddff68a811e2f01f5 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.415 .
+# From configure.in Revision.
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59 for squid 3.0-PRE3-CVS.
 #
@@ -467,7 +467,7 @@ ac_includes_default="\
 
 ac_subdirs_all="$ac_subdirs_all lib/libTrie"
 ac_subdirs_all="$ac_subdirs_all lib/cppunit-1.10.0"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBADD_DL CGIEXT ENABLE_WIN32SPECIFIC_TRUE ENABLE_WIN32SPECIFIC_FALSE WIN32_PSAPI MINGW_LIBS CACHE_HTTP_PORT CACHE_ICP_PORT SQUID_CFLAGS SQUID_CXXFLAGS LIBDLMALLOC LIB_MALLOC STORE_OBJS STORE_LIBS STORE_LINKOBJS STORE_TESTS DISK_LIBS DISK_PROGRAMS DISK_LINKOBJS REPL_POLICIES REPL_OBJS REPL_LIBS ENABLE_PINGER_TRUE ENABLE_PINGER_FALSE USE_DELAY_POOLS_TRUE USE_DELAY_POOLS_FALSE USE_ESI_TRUE USE_ESI_FALSE USE_ICAP_CLIENT_TRUE USE_ICAP_CLIENT_FALSE ICAP_LIBS USE_SNMP_TRUE USE_SNMP_FALSE SNMPLIB makesnmplib ENABLE_ARP_ACL_TRUE ENABLE_ARP_ACL_FALSE ENABLE_HTCP_TRUE ENABLE_HTCP_FALSE ENABLE_SSL_TRUE ENABLE_SSL_FALSE NEED_OWN_MD5_TRUE NEED_OWN_MD5_FALSE SSLLIB ERR_DEFAULT_LANGUAGE ERR_LANGUAGES MAKE_LEAKFINDER_TRUE MAKE_LEAKFINDER_FALSE ENABLE_IDENT_TRUE ENABLE_IDENT_FALSE USE_DNSSERVER_TRUE USE_DNSSERVER_FALSE OPT_DEFAULT_HOSTS AUTH_MODULES AUTH_LIBS AUTH_LINKOBJS AUTH_OBJS BASIC_AUTH_HELPERS NTLM_AUTH_HELPERS NEGOTIATE_AUTH_HELPERS DIGEST_AUTH_HELPERS EXTERNAL_ACL_HELPERS LIBSASL ENABLE_UNLINKD_TRUE ENABLE_UNLINKD_FALSE ENABLE_XPROF_STATS_TRUE ENABLE_XPROF_STATS_FALSE SQUID_CPPUNIT_LA SQUID_CPPUNIT_INC SQUID_CPPUNIT_DIR SH FALSE TRUE RM MV MKDIR LN PERL AR_R ALLOCA CRYPTLIB LIB_LDAP LIB_LBER LIB_DB EPOLL_LIBS NEED_OWN_SNPRINTF_TRUE NEED_OWN_SNPRINTF_FALSE REGEXLIB LIBREGEX LIBOBJS XTRA_OBJS XTRA_LIBS subdirs LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBADD_DL CGIEXT ENABLE_WIN32SPECIFIC_TRUE ENABLE_WIN32SPECIFIC_FALSE WIN32_PSAPI MINGW_LIBS CACHE_HTTP_PORT CACHE_ICP_PORT SQUID_CFLAGS SQUID_CXXFLAGS LIBDLMALLOC LIB_MALLOC STORE_OBJS STORE_LIBS STORE_LINKOBJS STORE_TESTS DISK_LIBS DISK_PROGRAMS DISK_LINKOBJS REPL_POLICIES REPL_OBJS REPL_LIBS ENABLE_PINGER_TRUE ENABLE_PINGER_FALSE USE_DELAY_POOLS_TRUE USE_DELAY_POOLS_FALSE USE_ESI_TRUE USE_ESI_FALSE USE_ICAP_CLIENT_TRUE USE_ICAP_CLIENT_FALSE ICAP_LIBS USE_SNMP_TRUE USE_SNMP_FALSE SNMPLIB makesnmplib ENABLE_ARP_ACL_TRUE ENABLE_ARP_ACL_FALSE ENABLE_HTCP_TRUE ENABLE_HTCP_FALSE ENABLE_SSL_TRUE ENABLE_SSL_FALSE NEED_OWN_MD5_TRUE NEED_OWN_MD5_FALSE SSLLIB ERR_DEFAULT_LANGUAGE ERR_LANGUAGES MAKE_LEAKFINDER_TRUE MAKE_LEAKFINDER_FALSE ENABLE_IDENT_TRUE ENABLE_IDENT_FALSE USE_DNSSERVER_TRUE USE_DNSSERVER_FALSE OPT_DEFAULT_HOSTS AUTH_MODULES AUTH_LIBS AUTH_LINKOBJS AUTH_OBJS BASIC_AUTH_HELPERS NTLM_AUTH_HELPERS NEGOTIATE_AUTH_HELPERS DIGEST_AUTH_HELPERS EXTERNAL_ACL_HELPERS LIBSASL ENABLE_UNLINKD_TRUE ENABLE_UNLINKD_FALSE ENABLE_XPROF_STATS_TRUE ENABLE_XPROF_STATS_FALSE CPPUNITCONFIG SQUID_CPPUNIT_LIBS SQUID_CPPUNIT_LA SQUID_CPPUNIT_INC SQUID_CPPUNIT_DIR SH FALSE TRUE RM MV MKDIR LN PERL AR_R ALLOCA CRYPTLIB LIB_LDAP LIB_LBER LIB_DB EPOLL_LIBS NEED_OWN_SNPRINTF_TRUE NEED_OWN_SNPRINTF_FALSE REGEXLIB LIBREGEX LIBOBJS XTRA_OBJS XTRA_LIBS subdirs LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -22023,17 +22023,60 @@ if test "${with_filedescriptors+set}" = set; then
    squid_filedescriptors_num=$withval
 fi;
 
-# FIXME, try linking in a test program first, then if that fails try probing etc.
-SQUID_CPPUNIT_DIR='cppunit-1.10.0'
-SQUID_CPPUNIT_LA='$(top_builddir)/lib/cppunit-1.10.0/src/cppunit/libcppunit.la'
-SQUID_CPPUNIT_INC='-I$(top_builddir)/lib/cppunit-1.10.0/include -I $(top_srcdir)/lib/cppunit-1.10.0/include'
-if test -f /usr/include/cppunit/TestCase.h; then
+# Extract the first word of "cppunit-config", so it can be a program name with args.
+set dummy cppunit-config; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_CPPUNITCONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $CPPUNITCONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_CPPUNITCONFIG="$CPPUNITCONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_CPPUNITCONFIG="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  test -z "$ac_cv_path_CPPUNITCONFIG" && ac_cv_path_CPPUNITCONFIG="false"
+  ;;
+esac
+fi
+CPPUNITCONFIG=$ac_cv_path_CPPUNITCONFIG
+
+if test -n "$CPPUNITCONFIG"; then
+  echo "$as_me:$LINENO: result: $CPPUNITCONFIG" >&5
+echo "${ECHO_T}$CPPUNITCONFIG" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+if $CPPUNITCONFIG --help >/dev/null; then
   echo "using system installed cppunit"
   SQUID_CPPUNIT_DIR=''
-  SQUID_CPPUNIT_LA='/usr/lib/libcppunit.la'
-  SQUID_CPPUNIT_INC=''
+  SQUID_CPPUNIT_LIBS="`$CPPUNITCONFIG --libs`"
+  SQUID_CPPUNIT_LA=''
+  SQUID_CPPUNIT_INC="`$CPPUNITCONFIG --cflags`"
+else
+  SQUID_CPPUNIT_DIR='cppunit-1.10.0'
+  SQUID_CPPUNIT_LA='$(top_builddir)/lib/cppunit-1.10.0/src/cppunit/libcppunit.la'
+  SQUID_CPPUNIT_LIBS='$(SQUID_CPPUNIT_LA)'
+  SQUID_CPPUNIT_INC='-I$(top_builddir)/lib/cppunit-1.10.0/include -I $(top_srcdir)/lib/cppunit-1.10.0/include'
 fi
 
+
 # Check whether --with-cppunit-basedir or --without-cppunit-basedir was given.
 if test "${with_cppunit_basedir+set}" = set; then
   withval="$with_cppunit_basedir"
@@ -22047,6 +22090,7 @@ if test "${with_cppunit_basedir+set}" = set; then
   if test -f $withval/lib/libcppunit.la; then
        echo "Using cppunit lib from $withval"
        SQUID_CPPUNIT_LA="-I${withval}/lib/libcppunit.la"
+       SQUID_CPPUNIT_LIBS='$(SQUID_CPPUNIT_LA)'
     else
        echo "ERROR: Cannot find cppunit at $withval"
        exit 1
@@ -22058,6 +22102,7 @@ fi;
 
 
 
+
 # Force some compilers to use ANSI features
 #
 case "$host" in
@@ -41985,6 +42030,8 @@ s,@ENABLE_UNLINKD_TRUE@,$ENABLE_UNLINKD_TRUE,;t t
 s,@ENABLE_UNLINKD_FALSE@,$ENABLE_UNLINKD_FALSE,;t t
 s,@ENABLE_XPROF_STATS_TRUE@,$ENABLE_XPROF_STATS_TRUE,;t t
 s,@ENABLE_XPROF_STATS_FALSE@,$ENABLE_XPROF_STATS_FALSE,;t t
+s,@CPPUNITCONFIG@,$CPPUNITCONFIG,;t t
+s,@SQUID_CPPUNIT_LIBS@,$SQUID_CPPUNIT_LIBS,;t t
 s,@SQUID_CPPUNIT_LA@,$SQUID_CPPUNIT_LA,;t t
 s,@SQUID_CPPUNIT_INC@,$SQUID_CPPUNIT_INC,;t t
 s,@SQUID_CPPUNIT_DIR@,$SQUID_CPPUNIT_DIR,;t t

diff --git a/configure.in b/configure.in
index b9273537992bd457d855a18e743aba39d3834869..d174489dc03991b43556a0d252e4e0befee8ceab 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@ dnl  Configuration input file for Squid
 dnl
 dnl  Duane Wessels, wessels@nlanr.net, February 1996 (autoconf v2.9)
 dnl
-dnl  $Id: configure.in,v 1.415 2006/05/23 13:33:58 hno Exp $
+dnl  $Id: configure.in,v 1.416 2006/05/27 00:58:15 hno Exp $
 dnl
 dnl
 dnl
@@ -13,7 +13,7 @@ AC_CONFIG_SRCDIR([src/main.cc])
 AC_CONFIG_AUX_DIR(cfgaux)
 AM_INIT_AUTOMAKE([tar-ustar])
 AM_CONFIG_HEADER(include/autoconf.h)
-AC_REVISION($Revision: 1.415 $)dnl
+AC_REVISION($Revision: 1.416 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AM_MAINTAINER_MODE
 
@@ -1722,16 +1722,20 @@ AC_ARG_WITH(filedescriptors,
 [  --with-filedescriptors=NUMBER Force squid to support NUMBER filedescriptors],
 [ squid_filedescriptors_num=$withval ])
 
-# FIXME, try linking in a test program first, then if that fails try probing etc.
-SQUID_CPPUNIT_DIR='cppunit-1.10.0'
-SQUID_CPPUNIT_LA='$(top_builddir)/lib/cppunit-1.10.0/src/cppunit/libcppunit.la' 
-SQUID_CPPUNIT_INC='-I$(top_builddir)/lib/cppunit-1.10.0/include -I $(top_srcdir)/lib/cppunit-1.10.0/include'
-if test -f /usr/include/cppunit/TestCase.h; then
+AC_PATH_PROG(CPPUNITCONFIG, cppunit-config, false)
+if $CPPUNITCONFIG --help >/dev/null; then
   echo "using system installed cppunit"
   SQUID_CPPUNIT_DIR=''
-  SQUID_CPPUNIT_LA='/usr/lib/libcppunit.la'
-  SQUID_CPPUNIT_INC=''
+  SQUID_CPPUNIT_LIBS="`$CPPUNITCONFIG --libs`"
+  SQUID_CPPUNIT_LA=''
+  SQUID_CPPUNIT_INC="`$CPPUNITCONFIG --cflags`"
+else
+  SQUID_CPPUNIT_DIR='cppunit-1.10.0'
+  SQUID_CPPUNIT_LA='$(top_builddir)/lib/cppunit-1.10.0/src/cppunit/libcppunit.la' 
+  SQUID_CPPUNIT_LIBS='$(SQUID_CPPUNIT_LA)'
+  SQUID_CPPUNIT_INC='-I$(top_builddir)/lib/cppunit-1.10.0/include -I $(top_srcdir)/lib/cppunit-1.10.0/include'
 fi
+
 AC_ARG_WITH(cppunit-basedir,
 [  --with-cppunit-basedir=/path/to/cppunit-base
                           Path where the cppunit headers are libraries are found
@@ -1748,12 +1752,14 @@ AC_ARG_WITH(cppunit-basedir,
   if test -f $withval/lib/libcppunit.la; then
        echo "Using cppunit lib from $withval"
        SQUID_CPPUNIT_LA="-I${withval}/lib/libcppunit.la"
+       SQUID_CPPUNIT_LIBS='$(SQUID_CPPUNIT_LA)'
     else
        echo "ERROR: Cannot find cppunit at $withval"
        exit 1
     fi
   SQUID_CPPUNIT_DIR=''
 ])
+AC_SUBST(SQUID_CPPUNIT_LIBS)
 AC_SUBST(SQUID_CPPUNIT_LA)
 AC_SUBST(SQUID_CPPUNIT_INC)
 AC_SUBST(SQUID_CPPUNIT_DIR)

diff --git a/lib/Makefile.am b/lib/Makefile.am
index a45842a2bf18b9260e073047cf87129ebc137bf0..901fe024cc108fcf744e3d8bbb97acf4b491f2d7 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 #
-#  $Id: Makefile.am,v 1.20 2006/05/10 22:11:34 hno Exp $
+#  $Id: Makefile.am,v 1.21 2006/05/27 00:58:15 hno Exp $
 #
 
 DIST_SUBDIRS = libTrie cppunit-1.10.0
@@ -97,6 +97,6 @@ tests_testAll_SOURCES= tests/testArray.cc tests/testMain.cc  tests/testArray.h \
        $(XPROF_STATS_SOURCE) \
        util.c assert.c
 
-tests_testAll_LDADD= @SQUID_CPPUNIT_LA@
+tests_testAll_LDADD= @SQUID_CPPUNIT_LA@ @SQUID_CPPUNIT_LIBS@
 
 tests_testAll_LDFLAGS = $(LIBADD_DL)

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 2bedb6f1f9329e7145357cd5d3d3e711e7c060e4..bb8dc43a6340f57dbb3fbaf5596338490cb1883c 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -15,7 +15,7 @@
 @SET_MAKE@
 
 #
-#  $Id: Makefile.in,v 1.119 2006/05/10 22:29:21 hno Exp $
+#  $Id: Makefile.in,v 1.120 2006/05/27 00:58:15 hno Exp $
 #
 
 srcdir = @srcdir@
@@ -49,7 +49,7 @@ am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
        $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/cfgaux/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/autoconf.h
 CONFIG_CLEAN_FILES =
 LIBRARIES = $(noinst_LIBRARIES)
@@ -158,6 +158,7 @@ CFLAGS = @CFLAGS@
 CGIEXT = @CGIEXT@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CPPUNITCONFIG = @CPPUNITCONFIG@
 CRYPTLIB = @CRYPTLIB@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -258,6 +259,7 @@ SQUID_CFLAGS = @SQUID_CFLAGS@
 SQUID_CPPUNIT_DIR = @SQUID_CPPUNIT_DIR@
 SQUID_CPPUNIT_INC = @SQUID_CPPUNIT_INC@
 SQUID_CPPUNIT_LA = @SQUID_CPPUNIT_LA@
+SQUID_CPPUNIT_LIBS = @SQUID_CPPUNIT_LIBS@
 SQUID_CXXFLAGS = @SQUID_CXXFLAGS@
 SSLLIB = @SSLLIB@
 STORE_LIBS = @STORE_LIBS@
@@ -404,7 +406,7 @@ tests_testAll_SOURCES = tests/testArray.cc tests/testMain.cc  tests/testArray.h
        $(XPROF_STATS_SOURCE) \
        util.c assert.c
 
-tests_testAll_LDADD = @SQUID_CPPUNIT_LA@
+tests_testAll_LDADD = @SQUID_CPPUNIT_LA@ @SQUID_CPPUNIT_LIBS@
 tests_testAll_LDFLAGS = $(LIBADD_DL)
 all: all-recursive
 

diff --git a/src/Makefile.am b/src/Makefile.am
index 867513a0f5eb25632a5900976fec7e48be9b35d2..4e7dbe5d1342e63b4a1b7e5f7d3f9c35aaf0d468 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.am,v 1.146 2006/05/21 14:35:11 robertc Exp $
+#  $Id: Makefile.am,v 1.147 2006/05/27 00:58:16 hno Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -1078,7 +1078,7 @@ tests_testAuth_LDADD= \
        @AUTH_LINKOBJS@ @AUTH_OBJS@ \
        -L../lib -lmiscutil \
        @REGEXLIB@ \
-       @SQUID_CPPUNIT_LA@ \
+       @SQUID_CPPUNIT_LIBS@ \
        @SSLLIB@
 tests_testAuth_LDFLAGS = $(LIBADD_DL)
 tests_testAuth_DEPENDENCIES = $(top_builddir)/lib/libmiscutil.a \
@@ -1147,7 +1147,7 @@ tests_testACLMaxUserIP_LDADD= \
        libauth.la \
        -L../lib -lmiscutil \
        @REGEXLIB@ \
-       @SQUID_CPPUNIT_LA@ \
+       @SQUID_CPPUNIT_LIBS@ \
        @SSLLIB@
 tests_testACLMaxUserIP_LDFLAGS = $(LIBADD_DL)
 tests_testACLMaxUserIP_DEPENDENCIES = \
@@ -1163,7 +1163,7 @@ tests_testBoilerplate_SOURCES = \
        time.cc
 tests_testBoilerplate_LDADD= \
        -L../lib -lmiscutil \
-       @SQUID_CPPUNIT_LA@ \
+       @SQUID_CPPUNIT_LIBS@ \
        @SSLLIB@
 tests_testBoilerplate_LDFLAGS = $(LIBADD_DL)
 tests_testBoilerplate_DEPENDENCIES = \
@@ -1190,7 +1190,7 @@ HEADERS_TO_TEST = \
        tests/testHeader_wordlist.cc
 tests_testHeaders_SOURCES= tests/testMain.cc $(HEADERS_TO_TEST)
 tests_testHeaders_LDADD= \
-       @SQUID_CPPUNIT_LA@ \
+       @SQUID_CPPUNIT_LIBS@ \
        @SSLLIB@
 tests_testHeaders_LDFLAGS = $(LIBADD_DL)
 tests_testHeaders_DEPENDENCIES = \
@@ -1332,7 +1332,7 @@ tests_test_http_range_LDADD = \
        @SSLLIB@ \
        -L../lib -lmiscutil \
        @XTRA_LIBS@ \
-       @SQUID_CPPUNIT_LA@ \
+       @SQUID_CPPUNIT_LIBS@ \
        @SNMPLIB@ 
 tests_test_http_range_DEPENDENCIES = \
        @SQUID_CPPUNIT_LA@
@@ -1478,7 +1478,7 @@ tests_testHttpRequest_LDADD = \
        @SSLLIB@ \
        -L../lib -lmiscutil \
        @XTRA_LIBS@ \
-       @SQUID_CPPUNIT_LA@ \
+       @SQUID_CPPUNIT_LIBS@ \
        @SNMPLIB@ 
 tests_testHttpRequest_LDFLAGS = $(LIBADD_DL)
 tests_testHttpRequest_DEPENDENCIES =  $(top_builddir)/lib/libmiscutil.a \
@@ -1551,7 +1551,7 @@ tests_testStore_LDADD= \
        libauth.la \
        -L../lib -lmiscutil \
        @REGEXLIB@ \
-       @SQUID_CPPUNIT_LA@ \
+       @SQUID_CPPUNIT_LIBS@ \
        @SSLLIB@
 tests_testStore_LDFLAGS = $(LIBADD_DL)
 tests_testStore_DEPENDENCIES = $(top_builddir)/lib/libmiscutil.a \
@@ -1571,7 +1571,7 @@ tests_testString_SOURCES= \
 tests_testString_LDADD= \
        -L../lib -lmiscutil \
        @REGEXLIB@ \
-       @SQUID_CPPUNIT_LA@ \
+       @SQUID_CPPUNIT_LIBS@ \
        @SSLLIB@
 tests_testString_LDFLAGS = $(LIBADD_DL)
 tests_testString_DEPENDENCIES = $(top_builddir)/lib/libmiscutil.a \
@@ -1616,7 +1616,7 @@ SWAP_TEST_LDADD = \
        @REPL_OBJS@ \
        @DISK_LIBS@ \
        -L../lib -lmiscutil \
-       @SQUID_CPPUNIT_LA@
+       @SQUID_CPPUNITLIBS@
 SWAP_TEST_DS =\
        $(top_builddir)/lib/libmiscutil.a \
        DiskIO/Blocking/BlockingDiskIOModule.o \
@@ -1801,7 +1801,7 @@ tests_testURL_LDADD = \
        @SSLLIB@ \
        -L../lib -lmiscutil \
        @XTRA_LIBS@ \
-       @SQUID_CPPUNIT_LA@ \
+       @SQUID_CPPUNIT_LIBS@ \
        @SNMPLIB@ 
 tests_testURL_LDFLAGS = $(LIBADD_DL)
 tests_testURL_DEPENDENCIES =  $(top_builddir)/lib/libmiscutil.a \

diff --git a/src/Makefile.in b/src/Makefile.in
index 7d08bd8913f02f00a813ef227d4678d117b7e38f..a0e7067ef715ecc32fbffb50980227dc02e62d73 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -17,7 +17,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.385 2006/05/22 00:10:58 hno Exp $
+#  $Id: Makefile.in,v 1.386 2006/05/27 00:58:16 hno Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -70,7 +70,7 @@ am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
        $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/cfgaux/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/autoconf.h
 CONFIG_CLEAN_FILES =
 LIBRARIES = $(noinst_LIBRARIES)
@@ -1086,6 +1086,7 @@ CFLAGS = @CFLAGS@
 CGIEXT = @CGIEXT@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CPPUNITCONFIG = @CPPUNITCONFIG@
 CRYPTLIB = @CRYPTLIB@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -1186,6 +1187,7 @@ SQUID_CFLAGS = @SQUID_CFLAGS@
 SQUID_CPPUNIT_DIR = @SQUID_CPPUNIT_DIR@
 SQUID_CPPUNIT_INC = @SQUID_CPPUNIT_INC@
 SQUID_CPPUNIT_LA = @SQUID_CPPUNIT_LA@
+SQUID_CPPUNIT_LIBS = @SQUID_CPPUNIT_LIBS@
 SQUID_CXXFLAGS = @SQUID_CXXFLAGS@
 SSLLIB = @SSLLIB@
 STORE_LIBS = @STORE_LIBS@
@@ -2118,7 +2120,7 @@ tests_testAuth_LDADD = \
        @AUTH_LINKOBJS@ @AUTH_OBJS@ \
        -L../lib -lmiscutil \
        @REGEXLIB@ \
-       @SQUID_CPPUNIT_LA@ \
+       @SQUID_CPPUNIT_LIBS@ \
        @SSLLIB@
 
 tests_testAuth_LDFLAGS = $(LIBADD_DL)
@@ -2170,7 +2172,7 @@ tests_testACLMaxUserIP_LDADD = \
        libauth.la \
        -L../lib -lmiscutil \
        @REGEXLIB@ \
-       @SQUID_CPPUNIT_LA@ \
+       @SQUID_CPPUNIT_LIBS@ \
        @SSLLIB@
 
 tests_testACLMaxUserIP_LDFLAGS = $(LIBADD_DL)
@@ -2186,7 +2188,7 @@ tests_testBoilerplate_SOURCES = \
 
 tests_testBoilerplate_LDADD = \
        -L../lib -lmiscutil \
-       @SQUID_CPPUNIT_LA@ \
+       @SQUID_CPPUNIT_LIBS@ \
        @SSLLIB@
 
 tests_testBoilerplate_LDFLAGS = $(LIBADD_DL)
@@ -2209,7 +2211,7 @@ HEADERS_TO_TEST = \
 
 tests_testHeaders_SOURCES = tests/testMain.cc $(HEADERS_TO_TEST)
 tests_testHeaders_LDADD = \
-       @SQUID_CPPUNIT_LA@ \
+       @SQUID_CPPUNIT_LIBS@ \
        @SSLLIB@
 
 tests_testHeaders_LDFLAGS = $(LIBADD_DL)
@@ -2354,7 +2356,7 @@ tests_test_http_range_LDADD = \
        @SSLLIB@ \
        -L../lib -lmiscutil \
        @XTRA_LIBS@ \
-       @SQUID_CPPUNIT_LA@ \
+       @SQUID_CPPUNIT_LIBS@ \
        @SNMPLIB@ 
 
 tests_test_http_range_DEPENDENCIES = \
@@ -2501,7 +2503,7 @@ tests_testHttpRequest_LDADD = \
        @SSLLIB@ \
        -L../lib -lmiscutil \
        @XTRA_LIBS@ \
-       @SQUID_CPPUNIT_LA@ \
+       @SQUID_CPPUNIT_LIBS@ \
        @SNMPLIB@ 
 
 tests_testHttpRequest_LDFLAGS = $(LIBADD_DL)
@@ -2573,7 +2575,7 @@ tests_testStore_LDADD = \
        libauth.la \
        -L../lib -lmiscutil \
        @REGEXLIB@ \
-       @SQUID_CPPUNIT_LA@ \
+       @SQUID_CPPUNIT_LIBS@ \
        @SSLLIB@
 
 tests_testStore_LDFLAGS = $(LIBADD_DL)
@@ -2595,7 +2597,7 @@ tests_testString_SOURCES = \
 tests_testString_LDADD = \
        -L../lib -lmiscutil \
        @REGEXLIB@ \
-       @SQUID_CPPUNIT_LA@ \
+       @SQUID_CPPUNIT_LIBS@ \
        @SSLLIB@
 
 tests_testString_LDFLAGS = $(LIBADD_DL)
@@ -2641,7 +2643,7 @@ SWAP_TEST_LDADD = \
        @REPL_OBJS@ \
        @DISK_LIBS@ \
        -L../lib -lmiscutil \
-       @SQUID_CPPUNIT_LA@
+       @SQUID_CPPUNITLIBS@
 
 SWAP_TEST_DS = \
        $(top_builddir)/lib/libmiscutil.a \
@@ -2833,7 +2835,7 @@ tests_testURL_LDADD = \
        @SSLLIB@ \
        -L../lib -lmiscutil \
        @XTRA_LIBS@ \
-       @SQUID_CPPUNIT_LA@ \
+       @SQUID_CPPUNIT_LIBS@ \
        @SNMPLIB@ 
 
 tests_testURL_LDFLAGS = $(LIBADD_DL)