[master] Cleanup merge of trac4009 (use Boost Asio vs. ext/asio)

diff --git a/src/bin/d2/tests/Makefile.am b/src/bin/d2/tests/Makefile.am
index b72f4578f6a13de91c60f2bb59ac63b6daf215ca..d4c4e2df74f53c9bc2f34576c8c8b60fb365bf2b 100644 (file)
--- a/src/bin/d2/tests/Makefile.am
+++ b/src/bin/d2/tests/Makefile.am
@@ -96,7 +96,7 @@ d2_unittests_LDADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la
 d2_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
 d2_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 d2_unittests_LDADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS)
-d2_unittests_LDADD = $(BOOST_LIBS) $(GTEST_LDADD)
+d2_unittests_LDADD += $(BOOST_LIBS) $(GTEST_LDADD)
 
 endif
 

diff --git a/src/bin/dhcp4/tests/Makefile.am b/src/bin/dhcp4/tests/Makefile.am
index 1e02a015935f079b9dd08ac5174c4e85dcec465b..affc3634ef6b85cdaeb3cab42df0ba6c92812be8 100644 (file)
--- a/src/bin/dhcp4/tests/Makefile.am
+++ b/src/bin/dhcp4/tests/Makefile.am
@@ -124,7 +124,7 @@ dhcp4_unittests_LDADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la
 dhcp4_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
 dhcp4_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 dhcp4_unittests_LDADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS)
-dhcp4_unittests_LDADD = $(BOOST_LIBS) $(GTEST_LDADD)
+dhcp4_unittests_LDADD += $(BOOST_LIBS) $(GTEST_LDADD)
 endif
 
 noinst_EXTRA_DIST = configs-list.txt

diff --git a/src/bin/dhcp6/tests/Makefile.am b/src/bin/dhcp6/tests/Makefile.am
index 94feb5ac49e6a2f85a306fcee23a324301a30114..10fe4c35a878648173f7cf81dbd9af16973bb10e 100644 (file)
--- a/src/bin/dhcp6/tests/Makefile.am
+++ b/src/bin/dhcp6/tests/Makefile.am
@@ -128,7 +128,7 @@ dhcp6_unittests_LDADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la
 dhcp6_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
 dhcp6_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 dhcp6_unittests_LDADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS)
-dhcp6_unittests_LDADD = $(BOOST_LIBS) $(GTEST_LDADD)
+dhcp6_unittests_LDADD += $(BOOST_LIBS) $(GTEST_LDADD)
 endif
 
 noinst_PROGRAMS = $(TESTS)

diff --git a/src/lib/asiodns/tests/Makefile.am b/src/lib/asiodns/tests/Makefile.am
index 66b9dd0a6c00534ca11d247006ae9b0419e10df6..5befee90f0054854d2e891cf75023c252e051097 100644 (file)
--- a/src/lib/asiodns/tests/Makefile.am
+++ b/src/lib/asiodns/tests/Makefile.am
@@ -21,6 +21,8 @@ run_unittests_SOURCES += io_fetch_unittest.cc
 
 run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
 
+run_unittests_LDADD  = $(top_builddir)/src/lib/asiodns/libkea-asiodns.la
+run_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
 run_unittests_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
 run_unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
 run_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la

diff --git a/src/lib/config/tests/Makefile.am b/src/lib/config/tests/Makefile.am
index 789e71bea15a7fc01da4e5c511c5c3486b6a5b3c..b2e547ad44b65fc3eb0c330ac725d29ba5a323a8 100644 (file)
--- a/src/lib/config/tests/Makefile.am
+++ b/src/lib/config/tests/Makefile.am
@@ -38,7 +38,7 @@ run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.
 run_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
 run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 run_unittests_LDADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS)
-run_unittests_LDADD =  $(BOOST_LIBS) $(GTEST_LDADD)
+run_unittests_LDADD += $(BOOST_LIBS) $(GTEST_LDADD)
 
 endif