From: Francis Dupont <fdupont@isc.org>
Date: Mon, 6 Jul 2020 07:47:47 +0000 (+0200)
Subject: [#1223] Updated configure and some Makefiles
X-Git-Tag: Kea-1.7.10~55
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a00426be8c57512e64839e0df58e860e8a17ff50;p=thirdparty%2Fkea.git

[#1223] Updated configure and some Makefiles
---

diff --git a/configure.ac b/configure.ac
index a6b9123785..c4ed915a8d 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1098,9 +1098,11 @@ if test "x$enable_benchmark" = "xyes" ; then
             if test ! -d $BENCHMARK_SOURCE/src; then
                 BENCHMARK_SOURCE=$BENCHMARK_SOURCE/benchmark
             fi
-            AC_CHECK_FILES([$BENCHMARK_SOURCE/src/benchmark.cc],
-                [have_benchmark_source=yes],
-                [AC_MSG_ERROR([no benchmark source at $BENCHMARK_SOURCE])])
+            if test -f $BENCHMARK_SOURCE/src/benchmark.cc; then
+                have_benchmark_source=yes
+            else
+                AC_MSG_ERROR([no benchmark source at $BENCHMARK_SOURCE])
+            fi
         fi
         have_benchmark_source=yes
         BENCHMARK_CPPFLAGS=`cat \${BENCHMARK_SOURCE}/build/src/CMakeFiles/benchmark.dir/flags.make | grep CXX_DEFINES | cut -d "=" -f 2`
diff --git a/m4macros/ax_gtest.m4 b/m4macros/ax_gtest.m4
index 3c4a84121a..edd729dd90 100644
--- a/m4macros/ax_gtest.m4
+++ b/m4macros/ax_gtest.m4
@@ -85,10 +85,11 @@ if test "x$enable_gtest" = "xyes" ; then
             if test ! -d $GTEST_SOURCE/src -a -d $GTEST_SOURCE/googletest; then
                 GTEST_SOURCE=$GTEST_SOURCE/googletest
             fi
-            AC_CHECK_FILES([$GTEST_SOURCE/src/gtest-all.cc]
-                [$GTEST_SOURCE/src/gtest_main.cc],
-                [have_gtest_source=yes],
-                [AC_MSG_ERROR([no gtest source at $GTEST_SOURCE])])
+            if test -f $GTEST_SOURCE/src/gtest-all.cc -a $GTEST_SOURCE/src/gtest_main.cc; then
+                have_gtest_source=yes
+            else
+                AC_MSG_ERROR([no gtest source at $GTEST_SOURCE])
+            fi
         fi
         have_gtest_source=yes
 
diff --git a/src/hooks/dhcp/flex_option/Makefile.am b/src/hooks/dhcp/flex_option/Makefile.am
index c5c8d45dc0..153e3afdbe 100644
--- a/src/hooks/dhcp/flex_option/Makefile.am
+++ b/src/hooks/dhcp/flex_option/Makefile.am
@@ -32,7 +32,11 @@ libdhcp_flex_option_la_LDFLAGS  = $(AM_LDFLAGS)
 libdhcp_flex_option_la_LDFLAGS  += -avoid-version -export-dynamic -module
 libdhcp_flex_option_la_LIBADD = libflex_option.la
 libdhcp_flex_option_la_LIBADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
+libdhcp_flex_option_la_LIBADD += $(top_builddir)/src/lib/process/libkea-process.la
 libdhcp_flex_option_la_LIBADD += $(top_builddir)/src/lib/eval/libkea-eval.la
+libdhcp_flex_option_la_LIBADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
+libdhcp_flex_option_la_LIBADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
+libdhcp_flex_option_la_LIBADD += $(top_builddir)/src/lib/stats/libkea-stats.la
 libdhcp_flex_option_la_LIBADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
 libdhcp_flex_option_la_LIBADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
 libdhcp_flex_option_la_LIBADD += $(top_builddir)/src/lib/database/libkea-database.la
diff --git a/src/hooks/dhcp/flex_option/libloadtests/Makefile.am b/src/hooks/dhcp/flex_option/libloadtests/Makefile.am
index 1623fe888d..b0c3f0bacb 100644
--- a/src/hooks/dhcp/flex_option/libloadtests/Makefile.am
+++ b/src/hooks/dhcp/flex_option/libloadtests/Makefile.am
@@ -36,7 +36,11 @@ flex_option_unittests_LDFLAGS  = $(AM_LDFLAGS) $(CRYPTO_LDFLAGS) $(GTEST_LDFLAGS
 flex_option_unittests_CXXFLAGS = $(AM_CXXFLAGS)
 
 flex_option_unittests_LDADD  = $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
+flex_option_unittests_LDADD += $(top_builddir)/src/lib/process/libkea-process.la
 flex_option_unittests_LDADD += $(top_builddir)/src/lib/eval/libkea-eval.la
+flex_option_unittests_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
+flex_option_unittests_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
+flex_option_unittests_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la
 flex_option_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
 flex_option_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
 flex_option_unittests_LDADD += $(top_builddir)/src/lib/database/libkea-database.la
diff --git a/src/hooks/dhcp/flex_option/tests/Makefile.am b/src/hooks/dhcp/flex_option/tests/Makefile.am
index dbeedf69ed..70f80188d9 100644
--- a/src/hooks/dhcp/flex_option/tests/Makefile.am
+++ b/src/hooks/dhcp/flex_option/tests/Makefile.am
@@ -36,7 +36,11 @@ flex_option_unittests_CXXFLAGS = $(AM_CXXFLAGS)
 
 flex_option_unittests_LDADD  = $(top_builddir)/src/hooks/dhcp/flex_option/libflex_option.la
 flex_option_unittests_LDADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
+flex_option_unittests_LDADD += $(top_builddir)/src/lib/process/libkea-process.la
 flex_option_unittests_LDADD += $(top_builddir)/src/lib/eval/libkea-eval.la
+flex_option_unittests_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
+flex_option_unittests_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
+flex_option_unittests_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la
 flex_option_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
 flex_option_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
 flex_option_unittests_LDADD += $(top_builddir)/src/lib/database/libkea-database.la
diff --git a/src/hooks/dhcp/high_availability/Makefile.am b/src/hooks/dhcp/high_availability/Makefile.am
index e9507da833..6333a39485 100644
--- a/src/hooks/dhcp/high_availability/Makefile.am
+++ b/src/hooks/dhcp/high_availability/Makefile.am
@@ -40,15 +40,16 @@ libdhcp_ha_la_LDFLAGS  = $(AM_LDFLAGS)
 libdhcp_ha_la_LDFLAGS  += -avoid-version -export-dynamic -module
 
 libdhcp_ha_la_LIBADD  = libha.la
+libdhcp_ha_la_LIBADD += $(top_builddir)/src/lib/http/libkea-http.la
 libdhcp_ha_la_LIBADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
 libdhcp_ha_la_LIBADD += $(top_builddir)/src/lib/process/libkea-process.la
 libdhcp_ha_la_LIBADD += $(top_builddir)/src/lib/eval/libkea-eval.la
 libdhcp_ha_la_LIBADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
 libdhcp_ha_la_LIBADD += $(top_builddir)/src/lib/stats/libkea-stats.la
 libdhcp_ha_la_LIBADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
-libdhcp_ha_la_LIBADD += $(top_builddir)/src/lib/http/libkea-http.la
 libdhcp_ha_la_LIBADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
 libdhcp_ha_la_LIBADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
+libdhcp_ha_la_LIBADD += $(top_builddir)/src/lib/database/libkea-database.la
 libdhcp_ha_la_LIBADD += $(top_builddir)/src/lib/cc/libkea-cc.la
 libdhcp_ha_la_LIBADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
 libdhcp_ha_la_LIBADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
diff --git a/src/hooks/dhcp/high_availability/libloadtests/Makefile.am b/src/hooks/dhcp/high_availability/libloadtests/Makefile.am
index a96eafc16f..cc99e1a487 100644
--- a/src/hooks/dhcp/high_availability/libloadtests/Makefile.am
+++ b/src/hooks/dhcp/high_availability/libloadtests/Makefile.am
@@ -35,15 +35,16 @@ ha_unittests_LDFLAGS  = $(AM_LDFLAGS) $(CRYPTO_LDFLAGS) $(GTEST_LDFLAGS)
 
 ha_unittests_CXXFLAGS = $(AM_CXXFLAGS)
 
-ha_unittests_LDADD  = $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
+ha_unittests_LDADD  = $(top_builddir)/src/lib/http/libkea-http.la
+ha_unittests_LDADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
 ha_unittests_LDADD += $(top_builddir)/src/lib/process/libkea-process.la
 ha_unittests_LDADD += $(top_builddir)/src/lib/eval/libkea-eval.la
 ha_unittests_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
 ha_unittests_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la
 ha_unittests_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
-ha_unittests_LDADD += $(top_builddir)/src/lib/http/libkea-http.la
 ha_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
 ha_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
+ha_unittests_LDADD += $(top_builddir)/src/lib/database/libkea-database.la
 ha_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
 ha_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
 ha_unittests_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
diff --git a/src/hooks/dhcp/high_availability/tests/Makefile.am b/src/hooks/dhcp/high_availability/tests/Makefile.am
index 62db4c6eb8..2e25b5a2f9 100644
--- a/src/hooks/dhcp/high_availability/tests/Makefile.am
+++ b/src/hooks/dhcp/high_availability/tests/Makefile.am
@@ -40,6 +40,7 @@ ha_unittests_LDFLAGS  = $(AM_LDFLAGS) $(CRYPTO_LDFLAGS) $(GTEST_LDFLAGS)
 ha_unittests_CXXFLAGS = $(AM_CXXFLAGS)
 
 ha_unittests_LDADD  = $(top_builddir)/src/hooks/dhcp/high_availability/libha.la
+ha_unittests_LDADD += $(top_builddir)/src/lib/http/libkea-http.la
 ha_unittests_LDADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
 ha_unittests_LDADD += $(top_builddir)/src/lib/process/libkea-process.la
 ha_unittests_LDADD += $(top_builddir)/src/lib/eval/libkea-eval.la
@@ -47,7 +48,6 @@ ha_unittests_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
 ha_unittests_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la
 ha_unittests_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
 ha_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
-ha_unittests_LDADD += $(top_builddir)/src/lib/http/libkea-http.la
 ha_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
 ha_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
 ha_unittests_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
diff --git a/src/hooks/dhcp/lease_cmds/Makefile.am b/src/hooks/dhcp/lease_cmds/Makefile.am
index 808728e406..ea7c177caf 100644
--- a/src/hooks/dhcp/lease_cmds/Makefile.am
+++ b/src/hooks/dhcp/lease_cmds/Makefile.am
@@ -34,14 +34,15 @@ libdhcp_lease_cmds_la_LDFLAGS  += -avoid-version -export-dynamic -module
 libdhcp_lease_cmds_la_LIBADD  = liblease_cmds.la
 libdhcp_lease_cmds_la_LIBADD  += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
 libdhcp_lease_cmds_la_LIBADD  += $(top_builddir)/src/lib/process/libkea-process.la
-libdhcp_lease_cmds_la_LIBADD  += $(top_builddir)/src/lib/config/libkea-cfgclient.la
-libdhcp_lease_cmds_la_LIBADD  += $(top_builddir)/src/lib/cc/libkea-cc.la
-libdhcp_lease_cmds_la_LIBADD  += $(top_builddir)/src/lib/hooks/libkea-hooks.la
-libdhcp_lease_cmds_la_LIBADD  += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
-libdhcp_lease_cmds_la_LIBADD  += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
 libdhcp_lease_cmds_la_LIBADD  += $(top_builddir)/src/lib/eval/libkea-eval.la
 libdhcp_lease_cmds_la_LIBADD  += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
 libdhcp_lease_cmds_la_LIBADD  += $(top_builddir)/src/lib/stats/libkea-stats.la
+libdhcp_lease_cmds_la_LIBADD  += $(top_builddir)/src/lib/config/libkea-cfgclient.la
+libdhcp_lease_cmds_la_LIBADD  += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
+libdhcp_lease_cmds_la_LIBADD  += $(top_builddir)/src/lib/hooks/libkea-hooks.la
+libdhcp_lease_cmds_la_LIBADD  += $(top_builddir)/src/lib/database/libkea-database.la
+libdhcp_lease_cmds_la_LIBADD  += $(top_builddir)/src/lib/cc/libkea-cc.la
+libdhcp_lease_cmds_la_LIBADD  += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
 libdhcp_lease_cmds_la_LIBADD  += $(top_builddir)/src/lib/dns/libkea-dns++.la
 libdhcp_lease_cmds_la_LIBADD  += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
 libdhcp_lease_cmds_la_LIBADD  += $(top_builddir)/src/lib/log/libkea-log.la
diff --git a/src/hooks/dhcp/lease_cmds/tests/Makefile.am b/src/hooks/dhcp/lease_cmds/tests/Makefile.am
index bb0fa3d372..bc00c3e4d2 100644
--- a/src/hooks/dhcp/lease_cmds/tests/Makefile.am
+++ b/src/hooks/dhcp/lease_cmds/tests/Makefile.am
@@ -36,14 +36,16 @@ lease_cmds_unittests_CXXFLAGS = $(AM_CXXFLAGS)
 
 lease_cmds_unittests_LDADD  = $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
 lease_cmds_unittests_LDADD += $(top_builddir)/src/lib/process/libkea-process.la
-lease_cmds_unittests_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
-lease_cmds_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
-lease_cmds_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
-lease_cmds_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
-lease_cmds_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
 lease_cmds_unittests_LDADD += $(top_builddir)/src/lib/eval/libkea-eval.la
 lease_cmds_unittests_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
 lease_cmds_unittests_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la
+lease_cmds_unittests_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
+lease_cmds_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
+lease_cmds_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
+lease_cmds_unittests_LDADD += $(top_builddir)/src/lib/database/libkea-database.la
+lease_cmds_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
+lease_cmds_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
+
 lease_cmds_unittests_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
 lease_cmds_unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
 lease_cmds_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
diff --git a/src/hooks/dhcp/stat_cmds/Makefile.am b/src/hooks/dhcp/stat_cmds/Makefile.am
index b95a6d63c5..e159f85632 100644
--- a/src/hooks/dhcp/stat_cmds/Makefile.am
+++ b/src/hooks/dhcp/stat_cmds/Makefile.am
@@ -32,14 +32,16 @@ libdhcp_stat_cmds_la_LDFLAGS  = $(AM_LDFLAGS)
 libdhcp_stat_cmds_la_LDFLAGS  += -avoid-version -export-dynamic -module
 libdhcp_stat_cmds_la_LIBADD  = libstat_cmds.la
 libdhcp_stat_cmds_la_LIBADD  += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
-libdhcp_stat_cmds_la_LIBADD  += $(top_builddir)/src/lib/config/libkea-cfgclient.la
-libdhcp_stat_cmds_la_LIBADD  += $(top_builddir)/src/lib/cc/libkea-cc.la
-libdhcp_stat_cmds_la_LIBADD  += $(top_builddir)/src/lib/hooks/libkea-hooks.la
-libdhcp_stat_cmds_la_LIBADD  += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
-libdhcp_stat_cmds_la_LIBADD  += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
+libdhcp_stat_cmds_la_LIBADD  += $(top_builddir)/src/lib/process/libkea-process.la
 libdhcp_stat_cmds_la_LIBADD  += $(top_builddir)/src/lib/eval/libkea-eval.la
 libdhcp_stat_cmds_la_LIBADD  += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
 libdhcp_stat_cmds_la_LIBADD  += $(top_builddir)/src/lib/stats/libkea-stats.la
+libdhcp_stat_cmds_la_LIBADD  += $(top_builddir)/src/lib/config/libkea-cfgclient.la
+libdhcp_stat_cmds_la_LIBADD  += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
+libdhcp_stat_cmds_la_LIBADD  += $(top_builddir)/src/lib/hooks/libkea-hooks.la
+libdhcp_stat_cmds_la_LIBADD  += $(top_builddir)/src/lib/database/libkea-database.la
+libdhcp_stat_cmds_la_LIBADD  += $(top_builddir)/src/lib/cc/libkea-cc.la
+libdhcp_stat_cmds_la_LIBADD  += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
 libdhcp_stat_cmds_la_LIBADD  += $(top_builddir)/src/lib/dns/libkea-dns++.la
 libdhcp_stat_cmds_la_LIBADD  += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
 libdhcp_stat_cmds_la_LIBADD  += $(top_builddir)/src/lib/log/libkea-log.la
diff --git a/src/hooks/dhcp/stat_cmds/tests/Makefile.am b/src/hooks/dhcp/stat_cmds/tests/Makefile.am
index aa9d1c3a1a..59b5a73b9b 100644
--- a/src/hooks/dhcp/stat_cmds/tests/Makefile.am
+++ b/src/hooks/dhcp/stat_cmds/tests/Makefile.am
@@ -47,15 +47,16 @@ stat_cmds_unittests_CXXFLAGS = $(AM_CXXFLAGS)
 
 stat_cmds_unittests_LDADD = $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
 stat_cmds_unittests_LDADD += $(top_builddir)/src/lib/process/libkea-process.la
-stat_cmds_unittests_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
-stat_cmds_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
-stat_cmds_unittests_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
-stat_cmds_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
-stat_cmds_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
-stat_cmds_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
 stat_cmds_unittests_LDADD += $(top_builddir)/src/lib/eval/libkea-eval.la
 stat_cmds_unittests_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
 stat_cmds_unittests_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la
+stat_cmds_unittests_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
+stat_cmds_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
+stat_cmds_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
+stat_cmds_unittests_LDADD += $(top_builddir)/src/lib/database/libkea-database.la
+stat_cmds_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
+stat_cmds_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
+stat_cmds_unittests_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
 stat_cmds_unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
 stat_cmds_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
 stat_cmds_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
diff --git a/src/lib/cc/Makefile.am b/src/lib/cc/Makefile.am
index 0b0c7d3149..a0de7eb22c 100644
--- a/src/lib/cc/Makefile.am
+++ b/src/lib/cc/Makefile.am
@@ -17,8 +17,8 @@ libkea_cc_la_SOURCES += stamped_element.cc stamped_element.h
 libkea_cc_la_SOURCES += stamped_value.cc stamped_value.h
 libkea_cc_la_SOURCES += user_context.cc user_context.h
 
-libkea_cc_la_LIBADD  = $(top_builddir)/src/lib/util/libkea-util.la
-libkea_cc_la_LIBADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
+libkea_cc_la_LIBADD  = $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
+libkea_cc_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la
 libkea_cc_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 libkea_cc_la_LIBADD += $(BOOST_LIBS)
 
diff --git a/src/lib/cc/tests/Makefile.am b/src/lib/cc/tests/Makefile.am
index 8c7f7788e4..2abfb8c328 100644
--- a/src/lib/cc/tests/Makefile.am
+++ b/src/lib/cc/tests/Makefile.am
@@ -29,8 +29,8 @@ run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
 run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
 
 run_unittests_LDADD =  $(top_builddir)/src/lib/cc/libkea-cc.la
-run_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
 run_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
+run_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
 run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
 run_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
 run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
diff --git a/src/lib/hooks/Makefile.am b/src/lib/hooks/Makefile.am
index 2e64bd199a..d601857110 100644
--- a/src/lib/hooks/Makefile.am
+++ b/src/lib/hooks/Makefile.am
@@ -40,9 +40,10 @@ libkea_hooks_la_CXXFLAGS = $(AM_CXXFLAGS)
 libkea_hooks_la_CPPFLAGS = $(AM_CPPFLAGS)
 libkea_hooks_la_LDFLAGS  = $(AM_LDFLAGS) -no-undefined -version-info 14:0:0
 libkea_hooks_la_LIBADD  =
+libkea_hooks_la_LIBADD += $(top_builddir)/src/lib/cc/libkea-cc.la
+libkea_hooks_la_LIBADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
 libkea_hooks_la_LIBADD += $(top_builddir)/src/lib/log/libkea-log.la
 libkea_hooks_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la
-libkea_hooks_la_LIBADD += $(top_builddir)/src/lib/cc/libkea-cc.la
 libkea_hooks_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 libkea_hooks_la_LIBADD += $(BOOST_LIBS)
 libkea_hooks_la_LIBADD += $(LOG4CPLUS_LIBS)
diff --git a/src/lib/hooks/tests/Makefile.am b/src/lib/hooks/tests/Makefile.am
index a84aef361e..b6fe8b9a8f 100644
--- a/src/lib/hooks/tests/Makefile.am
+++ b/src/lib/hooks/tests/Makefile.am
@@ -132,8 +132,9 @@ endif
 
 run_unittests_LDADD     = $(AM_LDADD)
 run_unittests_LDADD    += $(ALL_LIBS)
-run_unittests_LDADD    += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
 run_unittests_LDADD    += $(top_builddir)/src/lib/cc/libkea-cc.la
+run_unittests_LDADD    += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
+run_unittests_LDADD    += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
 run_unittests_LDADD    += $(GTEST_LDADD) $(LOG4CPLUS_LIBS) $(BOOST_LIBS)
 # As noted in configure.ac, libtool doesn't work perfectly with Darwin: it
 # embeds the final install path in dynamic libraries and loadable modules refer
diff --git a/src/lib/stats/Makefile.am b/src/lib/stats/Makefile.am
index b995658a81..b3630c7b81 100644
--- a/src/lib/stats/Makefile.am
+++ b/src/lib/stats/Makefile.am
@@ -13,6 +13,7 @@ libkea_stats_la_CPPFLAGS = $(AM_CPPFLAGS)
 libkea_stats_la_LDFLAGS = -no-undefined -version-info 6:1:1
 
 libkea_stats_la_LIBADD  = $(top_builddir)/src/lib/cc/libkea-cc.la
+libkea_stats_la_LIBADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
 libkea_stats_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la
 libkea_stats_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 libkea_stats_la_LIBADD += $(BOOST_LIBS)
diff --git a/src/lib/stats/tests/Makefile.am b/src/lib/stats/tests/Makefile.am
index 8d32baaa06..c8f53aa179 100644
--- a/src/lib/stats/tests/Makefile.am
+++ b/src/lib/stats/tests/Makefile.am
@@ -24,6 +24,7 @@ libstats_unittests_CXXFLAGS = $(AM_CXXFLAGS)
 
 libstats_unittests_LDADD  = $(top_builddir)/src/lib/stats/libkea-stats.la
 libstats_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
+libstats_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
 libstats_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
 libstats_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
 libstats_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la