From: Amos Jeffries <amosjeffries@squid-cache.org>
Date: Wed, 28 Jul 2010 07:59:53 +0000 (-0600)
Subject: Add stub debug API.
X-Git-Tag: SQUID_3_1_5_1~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=198f2534a9136228b8c5f776fa4033c0843dd6fa;p=thirdparty%2Fsquid.git

Add stub debug API.

To resolve link dependency blowout from linking libip.la with debug.
---

diff --git a/src/Makefile.am b/src/Makefile.am
index 0abe1bc989..2c853cde1a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -661,6 +661,7 @@ EXTRA_DIST = \
 	mk-string-arrays.pl \
 	mk-string-arrays.awk \
 	repl_modules.sh \
+	stub_debug.cc \
 	mib.txt \
 	mime.conf.default
 
diff --git a/test-suite/buildtests/layer-01-minimal.opts b/test-suite/buildtests/layer-01-minimal.opts
index 07ab7b0b1c..456c8c0259 100644
--- a/test-suite/buildtests/layer-01-minimal.opts
+++ b/test-suite/buildtests/layer-01-minimal.opts
@@ -25,6 +25,8 @@ MAKETEST="distcheck"
 #   --without-cppunit-basedir \
 #   --without-build-environment \
 #
+# deprecated helper encounters link failure for ipv6
+#	--disable-internal-dns \
 #
 OPTS=" \
 	--disable-loadable-modules \
@@ -67,7 +69,6 @@ OPTS=" \
 	--disable-leakfinder \
 	--disable-follow-x-forwarded-for \
 	--disable-ident-lookups \
-	--disable-internal-dns \
 	--disable-default-hostsfile \
 	--disable-auth \
 	--disable-basic-auth-helpers \
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 23d6f4734c..52c663f94f 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -19,6 +19,8 @@ stub_debug.cc: $(top_srcdir)/src/stub_debug.cc
 time.cc: $(top_srcdir)/src/time.cc
 	cp $(top_srcdir)/src/time.cc .
 
+# Neither of these should be disted from here.
+TESTSOURCES= stub_debug.cc time.cc
 CLEANFILES += stub_debug.cc time.cc
 
 SUBDIRS		= 
@@ -34,14 +36,16 @@ man_MANS = \
 
 DEFAULT_CACHEMGR_CONFIG = $(sysconfdir)/cachemgr.conf
 
-squidclient_SOURCES = squidclient.cc time.cc stub_debug.cc
+squidclient_SOURCES = squidclient.cc
+nodist_squidclient_SOURCES=time.cc stub_debug.cc
 
-cachemgr__CGIEXT__SOURCES = cachemgr.cc time.cc stub_debug.cc
+cachemgr__CGIEXT__SOURCES = cachemgr.cc
+nodist_cachemgr__CGIEXT__SOURCES = time.cc stub_debug.cc
 cachemgr__CGIEXT__CXXFLAGS = -DDEFAULT_CACHEMGR_CONFIG=\"$(DEFAULT_CACHEMGR_CONFIG)\" $(AM_CXXFLAGS)
 
 LDADD = \
-	../compat/libcompat.la \
 	../src/ip/libip.la \
+	../compat/libcompat.la \
 	-L../lib -lmiscutil \
 	$(XTRA_LIBS)