From: Amos Jeffries <squid3@treenet.co.nz>
Date: Thu, 11 Dec 2008 22:12:59 +0000 (+1300)
Subject: Merge from trunk
X-Git-Tag: SQUID_3_2_0_1~1289^2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8de3fb34122e5e59f02ce11136b220608065301a;p=thirdparty%2Fsquid.git

Merge from trunk
---

8de3fb34122e5e59f02ce11136b220608065301a
diff --cc src/Makefile.am
index 594e4328a7,f515ce8ee1..196e57c335
--- a/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.
 +# libsquid pulls in SquidConfig and children. stub them.
- tests_testString_SOURCES= \
+ 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 66a2a59a26,790b3eefad..af3d78929c
--- a/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 \