Here is what I get working and passing the default test level.
It is currently running in the 3.ALPHA-patches job so you can see the
results of a full test.
Amos
--
Please be using
Current Stable Squid 2.7.STABLE9 or 3.1.10
Beta testers wanted for 3.2.0.4
=== modified file 'src/Makefile.am'
--- src/Makefile.am 2011-02-03 10:59:09 +0000
+++ src/Makefile.am 2011-02-04 15:43:28 +0000
@@ -48,7 +48,7 @@
if ENABLE_SNMP
SNMP_SOURCE = $(SNMP_ALL_SOURCE)
SUBDIRS += snmp
-SNMP_LIBS = snmp/libsnmp.la
+SNMP_LIBS = snmp/libsnmp.la $(SNMPLIB)
else
SNMP_SOURCE =
endif
@@ -176,8 +176,7 @@
ip/libip.la \
fs/libfs.la \
ipc/libipc.la \
- mgr/libmgr.la \
- $(SNMP_LIBS)
+ mgr/libmgr.la
EXTRA_PROGRAMS = \
DiskIO/DiskDaemon/diskd \
@@ -550,10 +549,10 @@
$(DISK_OS_LIBS) \
$(CRYPTLIB) \
$(REGEXLIB) \
- $(SNMPLIB) \
- ${ADAPTATION_LIBS} \
+ $(ADAPTATION_LIBS) \
$(ESI_LIBS) \
$(SSL_LIBS) \
+ $(SNMP_LIBS) \
$(top_builddir)/lib/libmisccontainers.la \
$(top_builddir)/lib/libmiscencoding.la \
$(top_builddir)/lib/libmiscutil.la \
@@ -567,8 +566,7 @@
$(DISK_LIBS) \
$(DISK_LINKOBJS) \
$(REPL_OBJS) \
- $(SNMPLIB) \
- ${ADAPTATION_LIBS} \
+ $(ADAPTATION_LIBS) \
$(ESI_LOCAL_LIBS) \
$(SSL_LIBS) \
$(COMMON_LIBS)
@@ -650,7 +648,6 @@
$(REPL_OBJS) \
$(CRYPTLIB) \
$(REGEXLIB) \
- $(SNMPLIB) \
$(SSLLIB) \
$(COMPAT_LIB) \
$(EPOLL_LIBS) \
@@ -820,7 +817,7 @@
sed \
-e "s%[@]DEFAULT_HTTP_PORT[@]%$(DEFAULT_HTTP_PORT)%g" \
-e "s%[@]DEFAULT_ICP_PORT[@]%$(DEFAULT_ICP_PORT)%g" \
- -e "s%[@]DEFAULT_CACHE_EFFECTIVE_USER[@]%${CACHE_EFFECTIVE_USER}%g" \
+ -e "s%[@]DEFAULT_CACHE_EFFECTIVE_USER[@]%$(CACHE_EFFECTIVE_USER)%g" \
-e "s%[@]DEFAULT_MIME_TABLE[@]%$(DEFAULT_MIME_TABLE)%g" \
-e "s%[@]DEFAULT_DNSSERVER[@]%$(DEFAULT_DNSSERVER)%g" \
-e "s%[@]DEFAULT_SSL_CRTD[@]%$(DEFAULT_SSL_CRTD)%g" \
@@ -1101,7 +1098,17 @@
nodist_tests_testACLMaxUserIP_SOURCES= \
$(TESTSOURCES)
tests_testACLMaxUserIP_LDADD= \
- $(COMMON_LIBS) \
+ auth/libacls.la \
+ ident/libident.la \
+ acl/libacls.la \
+ eui/libeui.la \
+ acl/libstate.la \
+ auth/libauth.la \
+ acl/libapi.la \
+ base/libbase.la \
+ libsquid.la \
+ ip/libip.la \
+ fs/libfs.la \
$(top_builddir)/lib/libmisccontainers.la \
$(top_builddir)/lib/libmiscencoding.la \
$(top_builddir)/lib/libmiscutil.la \
@@ -1268,19 +1275,31 @@
$(BUILT_SOURCES)
# comm.cc only requires comm/libcomm.la until fdc_table is dead.
tests_testCacheManager_LDADD = \
- $(COMMON_LIBS) \
+ auth/libacls.la \
+ ident/libident.la \
+ acl/libacls.la \
+ eui/libeui.la \
+ acl/libstate.la \
+ auth/libauth.la \
+ acl/libapi.la \
+ base/libbase.la \
+ libsquid.la \
+ ip/libip.la \
+ fs/libfs.la \
+ ipc/libipc.la \
+ mgr/libmgr.la \
+ $(SNMP_LIBS) \
comm/libcomm.la \
icmp/libicmp.la icmp/libicmp-core.la \
log/liblog.la \
$(REPL_OBJS) \
- ${ADAPTATION_LIBS} \
+ $(ADAPTATION_LIBS) \
$(ESI_LIBS) \
$(SSL_LIBS) \
$(top_builddir)/lib/libmisccontainers.la \
$(top_builddir)/lib/libmiscencoding.la \
$(top_builddir)/lib/libmiscutil.la \
$(REGEXLIB) \
- $(SNMPLIB) \
$(SQUID_CPPUNIT_LIBS) \
$(SQUID_CPPUNIT_LA) \
$(SSLLIB) \
@@ -1311,11 +1330,21 @@
SquidConfig.o \
CommCalls.o \
DnsLookupDetails.o \
- $(COMMON_LIBS) \
+ auth/libacls.la \
+ ident/libident.la \
+ acl/libacls.la \
+ eui/libeui.la \
+ acl/libstate.la \
+ auth/libauth.la \
+ base/libbase.la \
+ libsquid.la \
+ ip/libip.la \
+ fs/libfs.la \
$(REPL_OBJS) \
$(DISK_LIBS) \
$(DISK_OS_LIBS) \
acl/libapi.la \
+ mgr/libmgr.la \
$(top_builddir)/lib/libmisccontainers.la \
$(top_builddir)/lib/libmiscencoding.la \
$(top_builddir)/lib/libmiscutil.la \
@@ -1470,18 +1499,18 @@
$(BUILT_SOURCES)
tests_testEvent_LDADD = \
$(COMMON_LIBS) \
+ $(SNMP_LIBS) \
icmp/libicmp.la icmp/libicmp-core.la \
comm/libcomm.la \
log/liblog.la \
$(REPL_OBJS) \
- ${ADAPTATION_LIBS} \
+ $(ADAPTATION_LIBS) \
$(ESI_LIBS) \
$(SSL_LIBS) \
$(top_builddir)/lib/libmisccontainers.la \
$(top_builddir)/lib/libmiscencoding.la \
$(top_builddir)/lib/libmiscutil.la \
$(REGEXLIB) \
- $(SNMPLIB) \
$(SQUID_CPPUNIT_LIBS) \
$(SQUID_CPPUNIT_LA) \
$(SSLLIB) \
@@ -1631,18 +1660,18 @@
$(BUILT_SOURCES)
tests_testEventLoop_LDADD = \
$(COMMON_LIBS) \
+ $(SNMP_LIBS) \
icmp/libicmp.la icmp/libicmp-core.la \
comm/libcomm.la \
log/liblog.la \
$(REPL_OBJS) \
- ${ADAPTATION_LIBS} \
+ $(ADAPTATION_LIBS) \
$(ESI_LIBS) \
$(SSL_LIBS) \
$(top_builddir)/lib/libmisccontainers.la \
$(top_builddir)/lib/libmiscencoding.la \
$(top_builddir)/lib/libmiscutil.la \
$(REGEXLIB) \
- $(SNMPLIB) \
$(SQUID_CPPUNIT_LIBS) \
$(SQUID_CPPUNIT_LA) \
$(SSLLIB) \
@@ -1787,18 +1816,18 @@
$(BUILT_SOURCES)
tests_test_http_range_LDADD = \
$(COMMON_LIBS) \
+ $(SNMP_LIBS) \
icmp/libicmp.la icmp/libicmp-core.la \
comm/libcomm.la \
log/liblog.la \
$(REPL_OBJS) \
- ${ADAPTATION_LIBS} \
+ $(ADAPTATION_LIBS) \
$(ESI_LIBS) \
$(SSL_LIBS) \
$(top_builddir)/lib/libmisccontainers.la \
$(top_builddir)/lib/libmiscencoding.la \
$(top_builddir)/lib/libmiscutil.la \
$(REGEXLIB) \
- $(SNMPLIB) \
$(SQUID_CPPUNIT_LIBS) \
$(SQUID_CPPUNIT_LA) \
$(SSLLIB) \
@@ -1948,18 +1977,18 @@
$(BUILT_SOURCES)
tests_testHttpRequest_LDADD = \
$(COMMON_LIBS) \
+ $(SNMP_LIBS) \
icmp/libicmp.la icmp/libicmp-core.la \
comm/libcomm.la \
log/liblog.la \
$(REPL_OBJS) \
- ${ADAPTATION_LIBS} \
+ $(ADAPTATION_LIBS) \
$(ESI_LIBS) \
$(SSL_LIBS) \
$(top_builddir)/lib/libmisccontainers.la \
$(top_builddir)/lib/libmiscencoding.la \
$(top_builddir)/lib/libmiscutil.la \
$(REGEXLIB) \
- $(SNMPLIB) \
$(SQUID_CPPUNIT_LIBS) \
$(SQUID_CPPUNIT_LA) \
$(SSLLIB) \
@@ -2077,7 +2106,9 @@
nodist_tests_testString_SOURCES = \
$(TESTSOURCES)
tests_testString_LDADD = \
- $(COMMON_LIBS) \
+ base/libbase.la \
+ libsquid.la \
+ ip/libip.la \
$(top_builddir)/lib/libmiscutil.la \
$(REGEXLIB) \
$(SQUID_CPPUNIT_LIBS) \
@@ -2361,15 +2392,15 @@
$(BUILT_SOURCES)
tests_testURL_LDADD = \
$(COMMON_LIBS) \
+ $(SNMP_LIBS) \
icmp/libicmp.la icmp/libicmp-core.la \
comm/libcomm.la \
log/liblog.la \
$(REGEXLIB) \
$(REPL_OBJS) \
- ${ADAPTATION_LIBS} \
+ $(ADAPTATION_LIBS) \
$(ESI_LIBS) \
$(SSL_LIBS) \
- $(SNMPLIB) \
$(top_builddir)/lib/libmisccontainers.la \
$(top_builddir)/lib/libmiscencoding.la \
$(top_builddir)/lib/libmiscutil.la \
