Fix library dependency issue in rev.13604

TODO: build true library dependency map and re-order all LDADD
statements according to the hierarchy found.

diff --git a/src/Makefile.am b/src/Makefile.am
index 98358b4cc66e8ceee18cef9a1c2ea5123b3cbc43..91e05fc343c1b6dc7542b73711c2d85bc0f5a075 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1344,6 +1344,7 @@ tests_testACLMaxUserIP_SOURCES= \
 nodist_tests_testACLMaxUserIP_SOURCES= \
        $(TESTSOURCES)
 tests_testACLMaxUserIP_LDADD= \
+       libsquid.la \
        helper/libhelper.la \
        http/libsquid-http.la \
        $(AUTH_ACL_LIBS) \
@@ -1354,7 +1355,6 @@ tests_testACLMaxUserIP_LDADD= \
        acl/libapi.la \
        anyp/libanyp.la \
        base/libbase.la \
-       libsquid.la \
        ip/libip.la \
        ipc/libipc.la \
        mgr/libmgr.la \
@@ -1597,6 +1597,7 @@ nodist_tests_testCacheManager_SOURCES = \
        $(DISKIO_GEN_SOURCE)
 # comm.cc only requires comm/libcomm.la until fdc_table is dead.
 tests_testCacheManager_LDADD = \
+       libsquid.la \
        clients/libclients.la \
        servers/libservers.la \
        helper/libhelper.la \
@@ -1608,7 +1609,6 @@ tests_testCacheManager_LDADD = \
        acl/libapi.la \
        parser/libsquid-parser.la \
        base/libbase.la \
-       libsquid.la \
        ip/libip.la \
        fs/libfs.la \
        comm/libcomm.la \
@@ -1788,6 +1788,7 @@ nodist_tests_testDiskIO_SOURCES= \
        SquidMath.h \
        swap_log_op.cc
 tests_testDiskIO_LDADD = \
+       libsquid.la \
        http/libsquid-http.la \
        SquidConfig.o \
        CommCalls.o \
@@ -1795,7 +1796,6 @@ tests_testDiskIO_LDADD = \
        ident/libident.la \
        acl/libacls.la \
        acl/libstate.la \
-       libsquid.la \
        comm/libcomm.la \
        ip/libip.la \
        fs/libfs.la \
@@ -2029,6 +2029,7 @@ nodist_tests_testEvent_SOURCES = \
        $(BUILT_SOURCES) \
        $(DISKIO_GEN_SOURCE)
 tests_testEvent_LDADD = \
+       libsquid.la \
        clients/libclients.la \
        servers/libservers.la \
        helper/libhelper.la \
@@ -2040,7 +2041,6 @@ tests_testEvent_LDADD = \
        acl/libapi.la \
        parser/libsquid-parser.la \
        base/libbase.la \
-       libsquid.la \
        ip/libip.la \
        fs/libfs.la \
        anyp/libanyp.la \
@@ -2277,6 +2277,7 @@ nodist_tests_testEventLoop_SOURCES = \
        $(BUILT_SOURCES) \
        $(DISKIO_GEN_SOURCE)
 tests_testEventLoop_LDADD = \
+       libsquid.la \
        clients/libclients.la \
        servers/libservers.la \
        helper/libhelper.la \
@@ -2288,7 +2289,6 @@ tests_testEventLoop_LDADD = \
        acl/libapi.la \
        parser/libsquid-parser.la \
        base/libbase.la \
-       libsquid.la \
        ip/libip.la \
        fs/libfs.la \
        anyp/libanyp.la \
@@ -2518,6 +2518,7 @@ nodist_tests_test_http_range_SOURCES = \
        $(BUILT_SOURCES) \
        $(DISKIO_GEN_SOURCE)
 tests_test_http_range_LDADD = \
+       libsquid.la \
        clients/libclients.la \
        servers/libservers.la \
        helper/libhelper.la \
@@ -2528,7 +2529,6 @@ tests_test_http_range_LDADD = \
        acl/libstate.la \
        acl/libapi.la \
        parser/libsquid-parser.la \
-       libsquid.la \
        ip/libip.la \
        fs/libfs.la \
        anyp/libanyp.la \
@@ -2808,6 +2808,7 @@ tests_testHttpRequest_SOURCES = \
 nodist_tests_testHttpRequest_SOURCES = \
        $(BUILT_SOURCES)
 tests_testHttpRequest_LDADD = \
+       libsquid.la \
        clients/libclients.la \
        servers/libservers.la \
        helper/libhelper.la \
@@ -2817,7 +2818,6 @@ tests_testHttpRequest_LDADD = \
        acl/libstate.la \
        acl/libapi.la \
        parser/libsquid-parser.la \
-       libsquid.la \
        ip/libip.la \
        fs/libfs.la \
        $(SSL_LIBS) \
@@ -2998,13 +2998,13 @@ nodist_tests_testStore_SOURCES= \
        swap_log_op.cc
 
 tests_testStore_LDADD= \
+       libsquid.la \
        http/libsquid-http.la \
        ident/libident.la \
        acl/libacls.la \
        acl/libstate.la \
        acl/libapi.la \
        base/libbase.la \
-       libsquid.la \
        ip/libip.la \
        fs/libfs.la \
        mgr/libmgr.la \
@@ -3647,6 +3647,7 @@ tests_testURL_SOURCES = \
 nodist_tests_testURL_SOURCES = \
        $(BUILT_SOURCES)
 tests_testURL_LDADD = \
+       libsquid.la \
        clients/libclients.la \
        servers/libservers.la \
        helper/libhelper.la \
@@ -3660,7 +3661,6 @@ tests_testURL_LDADD = \
        acl/libapi.la \
        parser/libsquid-parser.la \
        base/libbase.la \
-       libsquid.la \
        ip/libip.la \
        fs/libfs.la \
        $(SSL_LIBS) \

diff --git a/src/helper/ChildConfig.h b/src/helper/ChildConfig.h
index aa68e657987621d6a4adfc9242880b344a303a91..ecdff316d5ffc30939780cdbf9e594a533027ab7 100644 (file)
--- a/src/helper/ChildConfig.h
+++ b/src/helper/ChildConfig.h
@@ -21,7 +21,8 @@ namespace Helper
 class ChildConfig
 {
 public:
-    explicit ChildConfig(const unsigned int m = 0);
+    ChildConfig() : ChildConfig(0) {}
+    explicit ChildConfig(const unsigned int m);
 
     /**
      * When new helpers are needed call this to find out how many more