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 0abe1bc9894da02d1765f59d1b46fedf83cf6351..2c853cde1abc4a2948cce172287565ae5d4d5dae 100644 (file)
--- 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 07ab7b0b1c95590aac6054331ff6a26770974111..456c8c02599d91907f1fa84c8c3f19613db0fb75 100644 (file)
--- 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 23d6f4734cc135f688eecfc798fb021360759667..52c663f94f511f2e679a169f885a2ae98171b6cd 100644 (file)
--- 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)