Merge from trunk

diff --cc src/Makefile.am
index 594e4328a75dd5f1aeac4f78bc3d073a1e043f7d,f515ce8ee1eb45aae7ac1ffec08345dec872e259..196e57c335fac7adbab8d3500655f815ace1f17a
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -1487,15 -1492,16 +1503,17 @@@ tests_testDiskIO_SOURCES = 
        tests/testDiskIO.cc \
        tests/testDiskIO.h \
        tests/testMain.cc \
 -      tests/stub_cache_manager.cc
 +      tests/stub_cache_manager.cc \
 +      stubQosConfig.cc
- 
- tests_testDiskIO_LDADD= \
+ nodist_tests_testDiskIO_SOURCES= \
+       $(SWAP_TEST_GEN_SOURCES)
+ tests_testDiskIO_LDADD = \
+       @DISK_LIBS@ \
        $(SWAP_TEST_LDADD) \
-       libsquid.la \
-       @SSLLIB@
+       SquidConfig.o
  tests_testDiskIO_LDFLAGS = $(LIBADD_DL)
  tests_testDiskIO_DEPENDENCIES = $(top_builddir)/lib/libmiscutil.a \
+       @DISK_LIBS@ \
        $(SWAP_TEST_DS) \
        @SQUID_CPPUNIT_LA@
  
@@@ -2203,18 -2209,17 +2226,19 @@@ tests_testStore_DEPENDENCIES = $(top_bu
        @SQUID_CPPUNIT_LA@
  
  # string needs mem.cc.
- tests_testString_SOURCES= \
 +# libsquid pulls in SquidConfig and children. stub them.
+ tests_testString_SOURCES = \
        mem.cc \
 +      stubQosConfig.cc \
        String.cc \
        tests/testMain.cc \
        tests/testString.cc \
        tests/testString.h \
        tests/stub_cache_manager.cc \
-       $(TESTSOURCES) \
 -      time.cc 
 +      time.cc
- tests_testString_LDADD= \
+ nodist_tests_testString_SOURCES = \
+       $(TESTSOURCES)
+ tests_testString_LDADD = \
        libsquid.la \
        -L../lib -lmiscutil \
        @REGEXLIB@ \

diff --cc src/icmp/Makefile.am
index 66a2a59a266ef858314298d31ccd36bce0680d04,790b3eefad40ac2037267f113de1655fa5932930..af3d78929c7ae8c989d64c7dde0d94817f5ce056
--- 1/src/icmp/Makefile.am
--- 2/src/icmp/Makefile.am
+++ b/src/icmp/Makefile.am
@@@ -59,9 -61,7 +61,8 @@@ pinger_SOURCES = 
  # depends on these but install/dist is done elsewhere.
  # TODO: remove when these are cleaned up in their own way.
  nodist_pinger_SOURCES = \
-       Icmp.h \
        ../debug.cc \
 +      ../globals.cc \
        ../time.cc \
        ../SquidConfig.cc \
        ../SquidNew.cc \