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

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
 

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

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)

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

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