From: Francis Dupont <fdupont@isc.org>
Date: Thu, 24 Sep 2015 13:53:10 +0000 (+0200)
Subject: [master] Finished merge of trac4009 (use Boost Asio vs. ext/asio)
X-Git-Tag: trac4074_base~31
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=96294e8cf5e2d7a2a32606b77128486efa38d0e4;p=thirdparty%2Fkea.git

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

96294e8cf5e2d7a2a32606b77128486efa38d0e4
diff --cc ChangeLog
index bdc72062f9,0f8366253e..88dfc60df8
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,91 -1,3 +1,99 @@@
++1008.	[build]		fdupont
++	Removed the included header-only ASIO code.  Kea is now built
++	against the installed copy of Boost.  The build by default
++	attempts to use the header-only error code (ASIO dependency), but
++	may also use the version in the boost system library.  The
++	location of this library can be specified.
++	(Trac #4009, git xxx)
++
 +1007.	[func]		tomek
 +	DECLINE message in DHCPv6 is now supported. The server is able
 +	to receive it, check its correctness and move the lease to
 +	DECLINED state. Currently there is no way to recover the lease
 +	before 'decline-probation-period' time.
 +	(Trac #3982, git 11e2c4366d8624601172c01e95cff6a8b95833b3)
 +
 +1006.	[bug]		marcin
 +	Fixed issues with threads concurrency in the TimerMgr.
 +	(Trac #4047, git 48297af6e0443808a482536b61436a42bc6a5b38)
 +
 +1005.	[func]		tomek
 +	DHCPDECLINE message in DHCPv4 is now supported. The server is able
 +	to receive it, check its correctness and move the lease to
 +	DECLINED state. Currently there is no way to recover the lease
 +	before 'decline-probation-period' time.
 +	(Trac #3981, git c14a63c0d3a56ea3e880e874f854adc0077de75e)
 +
 +1004.	[bug]		fdupont
 +	Incoming Confirm, Rebind and Information-Request messages are
 +	now more thoroughly checked against presence of client-id
 +	and server-id options.
 +	(Trac #3773, git fd2889b9de45e2822b6713663bee06b75259c6dc)
 +
 +1003.	[build]		fdupont
 +	Updated Makefiles to ensure that all required dynamic libraries
 +	are included in the link command line as some systems are unable
 +	handle implied library dependencies.
 +	(Trac #3911, git 4d13f5234da33df03c0989829a0e1c1056e53a4e)
 +
 +1002.	[func]		marcin
 +	MySQL lease database backend has been extended with new
 +	functions to obtain expired leases and to delete expired
 +	reclaimed leases.
 +	(Trac #3966, git 419832a6279c70b5db04b1cab10737e31f2c99f9)
 +
 +1001.	[build]		fdupont
 +	Fixed critical C++ issues in the Kea code. This does not cover
 +	auto_ptr warnings (just ignore them) or the gtest 1.7.0 bug with
 +	EXPECT_TRUE() and ASSERT_TRUE() macros (we recommend to download
 +	last subversion souces at http://googletest.googlecode.com/svn/trunk
 +	and use the --with-gtest-source configuration argument when
 +	you'd like to build unit tests).
 +	(Trac #4024, git 55afd98fead0c16bb81107dfc1a5f49a5e295aa6)
 +
 +1000.	[func]		marcin
 +	Implemented Timer Manager which holds the pool of interval
 +	timers used by the DHCP servers.
 +	(Trac #3970, git bc8503055338da36d07a2b67c64087f645c9a9e3)
 +
 +999.	[func]*		tmark
 +	The DHCPv4 server will now honor DHCPRELEASEs for leased addresses
 +	which cannot be matched to subnet.  This allows leases to be
 +	released after configuration changes have eliminated their subnet.
 +	Prior to this the server would reject the release and emit a
 +	DHCP4_RELEASE_FAIL_NO_SUBNET log message.
 +	(Trac #2615, git eeebf9f68cf5be6a0f7eefc78832d664361c4990)
 +
 +998.	[func]		tomek
 +	'decline-probation-period' parameter has been added to DHCPv4
 +	and DHCPv6 configuration. It can be configured, but is not yet
 +	used, as the DECLINE message support is still pending implementation.
 +	(Trac #3983, git 6b10d119c89685476335f268181c9982f6fa6161)
 +
 +997.	[build]		jreed
 +	Removed obsolete Python coverage build options.
 +	(Trac #3483, git a08cbbecbd3b11d0b73f68a40986a353b22ed3be)
 +
 +996.	[func]		marcin
 +	Memfile lease database backend has been extended with new
 +	functions to obtain expired leases and to delete expired
 +	reclaimed leases.
 +	(Trac #3965, git dd5b95453528416f22e961e6ebb3051bc2ae788c)
 +
 +995.	[build]		fdupont
 +	Removed additional files left over from BIND 10 (headers,
 +	src/lib/{asiodns,testutils,asiolink}).
 +	(Trac #40{28,29,31}, git 78ff0fb0a97731a8b3c055b1cbb4faebcd115f7c)
 +
 +994.	[func]*		marcin
 +	DHCPv6 server fully supports RFC 7550.
 +	(Trac #3947, git c06ab97a4e068c4b4b11f4685c56dd402b2385dc)
 +
 +993.	[bug]		fdupont
 +	The logging spec file was searched in the build tree when it
 +	was in the source tree so distcheck (where they differ) failed.
 +	(Trac #4026, git 5eb213647d7ac0a707530d57af2c6dbd725ac1b3)
 +
  992.	[func]		fdupont
  	A 'flush' parameter has been added to logging configuration. It is
  	now possible to disable automatic immediate flushing to achieve
diff --cc src/bin/d2/Makefile.am
index b196ac0422,5059d106a8..aa8f5bb276
--- a/src/bin/d2/Makefile.am
+++ b/src/bin/d2/Makefile.am
@@@ -93,31 -93,21 +93,31 @@@ sbin_PROGRAMS = kea-dhcp-ddn
  kea_dhcp_ddns_SOURCES  = main.cc
  
  kea_dhcp_ddns_LDADD  = libd2.la
 -kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
 -kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 -kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
 +kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
 +kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
 +kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
  kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/asiodns/libkea-asiodns.la
 -kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
 +kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la
  kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
 -kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
  kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
 -kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
 +kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
 +kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
  kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
 -kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
 -kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
  kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
 -kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
 -kea_dhcp_ddns_LDADD += $(BOOST_LIBS)
 +kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
 +kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
 +kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la
 +kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
 +kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
- kea_dhcp_ddns_LDADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS)
++kea_dhcp_ddns_LDADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS) $(BOOST_LIBS)
 +
 +kea_dhcp_ddns_LDFLAGS = $(AM_LDFLAGS) $(CRYPTO_LDFLAGS)
 +if HAVE_MYSQL
 +kea_dhcp_ddns_LDFLAGS += $(MYSQL_LIBS)
 +endif
 +if HAVE_PGSQL
 +kea_dhcp_ddns_LDFLAGS += $(PGSQL_LIBS)
 +endif
  
  kea_dhcp_ddnsdir = $(pkgdatadir)
  kea_dhcp_ddns_DATA = dhcp-ddns.spec
diff --cc src/bin/d2/tests/Makefile.am
index aaffb8fa25,0a9c5a9f2d..b72f4578f6
--- a/src/bin/d2/tests/Makefile.am
+++ b/src/bin/d2/tests/Makefile.am
@@@ -68,34 -70,24 +68,35 @@@ d2_unittests_SOURCES += d2_controller_u
  d2_unittests_SOURCES += d_controller_unittests.cc
  
  d2_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
 -d2_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
 -d2_unittests_LDADD = $(BOOST_LIBS) $(GTEST_LDADD)
 -d2_unittests_LDADD += $(top_builddir)/src/bin/d2/libd2.la
 -d2_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 -d2_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
 +d2_unittests_LDFLAGS = $(AM_LDFLAGS) $(CRYPTO_LDFLAGS)
 +if HAVE_MYSQL
 +d2_unittests_LDFLAGS += $(MYSQL_LIBS)
 +endif
 +if HAVE_PGSQL
 +d2_unittests_LDFLAGS += $(PGSQL_LIBS)
 +endif
 +d2_unittests_LDFLAGS += $(GTEST_LDFLAGS)
 +
 +d2_unittests_LDADD = $(top_builddir)/src/bin/d2/libd2.la
 +d2_unittests_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
 +d2_unittests_LDADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
 +d2_unittests_LDADD += $(top_builddir)/src/lib/dhcpsrv/testutils/libdhcpsrvtest.la
 +d2_unittests_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
  d2_unittests_LDADD += $(top_builddir)/src/lib/asiodns/libkea-asiodns.la
 -d2_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
 -d2_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
 +d2_unittests_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la
  d2_unittests_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
 -d2_unittests_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
  d2_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
 -d2_unittests_LDADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
 -d2_unittests_LDADD += $(top_builddir)/src/lib/dhcpsrv/testutils/libdhcpsrvtest.la
 +d2_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
 +d2_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
  d2_unittests_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
 -d2_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
 -d2_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
 -d2_unittests_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
  d2_unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
 +d2_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
 +d2_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
 +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) $(GTEST_LDADD)
++d2_unittests_LDADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS)
++d2_unittests_LDADD = $(BOOST_LIBS) $(GTEST_LDADD)
  
  endif
  
diff --cc src/bin/dhcp4/Makefile.am
index 079e1bac80,acc53e6c83..0512bb3501
--- a/src/bin/dhcp4/Makefile.am
+++ b/src/bin/dhcp4/Makefile.am
@@@ -73,30 -72,21 +73,30 @@@ sbin_PROGRAMS = kea-dhcp
  kea_dhcp4_SOURCES  = main.cc
  
  kea_dhcp4_LDADD  = libdhcp4.la
 -kea_dhcp4_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
 -kea_dhcp4_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
 -kea_dhcp4_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
 +kea_dhcp4_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
  kea_dhcp4_LDADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
 -kea_dhcp4_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 -kea_dhcp4_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
 -kea_dhcp4_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
 +kea_dhcp4_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
 +kea_dhcp4_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la
  kea_dhcp4_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
 +kea_dhcp4_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
 +kea_dhcp4_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
  kea_dhcp4_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
 -kea_dhcp4_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la
 -kea_dhcp4_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
 -kea_dhcp4_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la
 +kea_dhcp4_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
  kea_dhcp4_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
 -kea_dhcp4_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
 -kea_dhcp4_LDADD += $(BOOST_LIBS)
 +kea_dhcp4_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
 +kea_dhcp4_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
 +kea_dhcp4_LDADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la
 +kea_dhcp4_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
 +kea_dhcp4_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
- kea_dhcp4_LDADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS)
++kea_dhcp4_LDADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS) $(BOOST_LIBS)
 +
 +kea_dhcp4_LDFLAGS = $(AM_LDFLAGS) $(CRYPTO_LDFLAGS)
 +if HAVE_MYSQL
 +kea_dhcp4_LDFLAGS += $(MYSQL_LIBS)
 +endif
 +if HAVE_PGSQL
 +kea_dhcp4_LDFLAGS += $(PGSQL_LIBS)
 +endif
  
  kea_dhcp4dir = $(pkgdatadir)
  kea_dhcp4_DATA = dhcp4.spec
diff --cc src/bin/dhcp4/tests/Makefile.am
index 721cad3a78,c0f638114b..1e02a01593
--- a/src/bin/dhcp4/tests/Makefile.am
+++ b/src/bin/dhcp4/tests/Makefile.am
@@@ -114,16 -99,18 +114,17 @@@ dhcp4_unittests_LDADD += $(top_builddir
  dhcp4_unittests_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
  dhcp4_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
  dhcp4_unittests_LDADD += $(top_builddir)/src/lib/dhcp/tests/libdhcptest.la
 -dhcp4_unittests_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
 -dhcp4_unittests_LDADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
 -dhcp4_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 +dhcp4_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
 +dhcp4_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
 +dhcp4_unittests_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
 +dhcp4_unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
 +dhcp4_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
  dhcp4_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
 +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/hooks/libkea-hooks.la
 -dhcp4_unittests_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la
 -dhcp4_unittests_LDADD += $(top_builddir)/src/lib/dhcpsrv/testutils/libdhcpsrvtest.la
 -dhcp4_unittests_LDADD += $(top_builddir)/src/lib/util/io/libkea-util-io.la
 -dhcp4_unittests_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
 -dhcp4_unittests_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la
 -dhcp4_unittests_LDADD += $(top_builddir)/src/lib/testutils/libkea-testutils.la
 +dhcp4_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
- dhcp4_unittests_LDADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS) $(GTEST_LDADD)
++dhcp4_unittests_LDADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS)
++dhcp4_unittests_LDADD = $(BOOST_LIBS) $(GTEST_LDADD)
  endif
  
  noinst_EXTRA_DIST = configs-list.txt
diff --cc src/bin/dhcp6/Makefile.am
index 04ba47e0b3,96096b0f58..324aea80f2
--- a/src/bin/dhcp6/Makefile.am
+++ b/src/bin/dhcp6/Makefile.am
@@@ -74,30 -74,20 +74,30 @@@ sbin_PROGRAMS = kea-dhcp
  kea_dhcp6_SOURCES  = main.cc
  
  kea_dhcp6_LDADD  = libdhcp6.la
 -kea_dhcp6_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
 -kea_dhcp6_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
 +kea_dhcp6_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
 +kea_dhcp6_LDADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
 +kea_dhcp6_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
 +kea_dhcp6_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la
  kea_dhcp6_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
  kea_dhcp6_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
 -kea_dhcp6_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
 -kea_dhcp6_LDADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
 -kea_dhcp6_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 +kea_dhcp6_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
 +kea_dhcp6_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
 +kea_dhcp6_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
 +kea_dhcp6_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
 +kea_dhcp6_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
  kea_dhcp6_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
 +kea_dhcp6_LDADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la
  kea_dhcp6_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
 -kea_dhcp6_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
 -kea_dhcp6_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
 -kea_dhcp6_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
 -kea_dhcp6_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la
 -kea_dhcp6_LDADD += $(BOOST_LIBS)
 +kea_dhcp6_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
- kea_dhcp6_LDADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS)
++kea_dhcp6_LDADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS) $(BOOST_LIBS)
 +
 +kea_dhcp6_LDFLAGS = $(AM_LDFLAGS) $(CRYPTO_LDFLAGS)
 +if HAVE_MYSQL
 +kea_dhcp6_LDFLAGS += $(MYSQL_LIBS)
 +endif
 +if HAVE_PGSQL
 +kea_dhcp6_LDFLAGS += $(PGSQL_LIBS)
 +endif
  
  kea_dhcp6dir = $(pkgdatadir)
  kea_dhcp6_DATA = dhcp6.spec
diff --cc src/bin/dhcp6/tests/Makefile.am
index 2f4331da5c,904ad56276..94feb5ac49
--- a/src/bin/dhcp6/tests/Makefile.am
+++ b/src/bin/dhcp6/tests/Makefile.am
@@@ -118,16 -102,18 +118,17 @@@ dhcp6_unittests_LDADD += $(top_builddir
  dhcp6_unittests_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
  dhcp6_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
  dhcp6_unittests_LDADD += $(top_builddir)/src/lib/dhcp/tests/libdhcptest.la
 -dhcp6_unittests_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
 -dhcp6_unittests_LDADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
 -dhcp6_unittests_LDADD += $(top_builddir)/src/lib/dhcpsrv/testutils/libdhcpsrvtest.la
 +dhcp6_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
 +dhcp6_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
 +dhcp6_unittests_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
 +dhcp6_unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
  dhcp6_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
 -dhcp6_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
  dhcp6_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
 +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/util/io/libkea-util-io.la
 -dhcp6_unittests_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
 -dhcp6_unittests_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la
 -dhcp6_unittests_LDADD += $(top_builddir)/src/lib/testutils/libkea-testutils.la
 -
 +dhcp6_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
- dhcp6_unittests_LDADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS) $(GTEST_LDADD)
++dhcp6_unittests_LDADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS)
++dhcp6_unittests_LDADD = $(BOOST_LIBS) $(GTEST_LDADD)
  endif
  
  noinst_PROGRAMS = $(TESTS)
diff --cc src/bin/lfc/Makefile.am
index 6730564a08,3d80082fd0..5e0dc8df0b
--- a/src/bin/lfc/Makefile.am
+++ b/src/bin/lfc/Makefile.am
@@@ -58,29 -58,14 +58,29 @@@ sbin_PROGRAMS = kea-lf
  kea_lfc_SOURCES  = main.cc
  
  kea_lfc_LDADD  = liblfc.la
 -kea_lfc_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
 -kea_lfc_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 -kea_lfc_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
 -kea_lfc_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
 +kea_lfc_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
  kea_lfc_LDADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
 -kea_lfc_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
 +kea_lfc_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
 +kea_lfc_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la
 +kea_lfc_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
 +kea_lfc_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
 +kea_lfc_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
  kea_lfc_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
 -kea_lfc_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
 -kea_lfc_LDADD += $(BOOST_LIBS)
 +kea_lfc_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
 +kea_lfc_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
 +kea_lfc_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
 +kea_lfc_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
 +kea_lfc_LDADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la
 +kea_lfc_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
 +kea_lfc_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
- kea_lfc_LDADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS)
++kea_lfc_LDADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS) $(BOOST_LIBS)
 +
 +kea_lfc_LDFLAGS = $(AM_LDFLAGS) $(CRYPTO_LDFLAGS)
 +if HAVE_MYSQL
 +kea_lfc_LDFLAGS += $(MYSQL_LIBS)
 +endif
 +if HAVE_PGSQL
 +kea_lfc_LDFLAGS += $(PGSQL_LIBS)
 +endif
  
  kea_lfcdir = $(pkgdatadir)
diff --cc src/bin/lfc/tests/Makefile.am
index d013cbbae7,ee40e060fe..b9b8b30d2c
--- a/src/bin/lfc/tests/Makefile.am
+++ b/src/bin/lfc/tests/Makefile.am
@@@ -45,32 -47,17 +45,33 @@@ lfc_unittests_SOURCES = lfc_unittests.c
  lfc_unittests_SOURCES += lfc_controller_unittests.cc
  
  lfc_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
 -lfc_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
 -lfc_unittests_LDADD  = $(top_builddir)/src/bin/lfc/liblfc.la
 -lfc_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 -lfc_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
 -lfc_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
 -lfc_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
 +lfc_unittests_LDFLAGS = $(AM_LDFLAGS) $(CRYPTO_LDFLAGS)
 +if HAVE_MYSQL
 +lfc_unittests_LDFLAGS += $(MYSQL_LIBS)
 +endif
 +if HAVE_PGSQL
 +lfc_unittests_LDFLAGS += $(PGSQL_LIBS)
 +endif
 +lfc_unittests_LDFLAGS += $(GTEST_LDFLAGS)
 +
 +lfc_unittests_LDADD = $(top_builddir)/src/bin/lfc/liblfc.la
 +lfc_unittests_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
  lfc_unittests_LDADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
 -lfc_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
 +lfc_unittests_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
 +lfc_unittests_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la
 +lfc_unittests_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
 +lfc_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
 +lfc_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
  lfc_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
 -lfc_unittests_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
 +lfc_unittests_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
 +lfc_unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
 +lfc_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
 +lfc_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
 +lfc_unittests_LDADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la
 +lfc_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
 +lfc_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
- lfc_unittests_LDADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS) $(GTEST_LDADD)
++lfc_unittests_LDADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS)
+ lfc_unittests_LDADD += $(BOOST_LIBS) $(GTEST_LDADD)
  
  endif
  
diff --cc src/bin/perfdhcp/Makefile.am
index b384a8cbd2,db6f47ad48..482b9cc814
--- a/src/bin/perfdhcp/Makefile.am
+++ b/src/bin/perfdhcp/Makefile.am
@@@ -43,17 -44,12 +43,18 @@@ sbin_PROGRAMS = perfdhc
  perfdhcp_SOURCES = main.cc
  libkea_perfdhcp___la_CXXFLAGS = $(AM_CXXFLAGS)
  
 +perfdhcp_LDFLAGS = $(AM_LDFLAGS) $(CRYPTO_LDFLAGS)
 +
  perfdhcp_LDADD = libperfdhcp.la
 -perfdhcp_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 +perfdhcp_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
  perfdhcp_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
  perfdhcp_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
 -perfdhcp_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
 +perfdhcp_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
 +perfdhcp_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
 +perfdhcp_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
 +perfdhcp_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 +perfdhcp_LDADD += $(CRYPTO_LIBS)
+ perfdhcp_LDADD += $(BOOST_LIBS)
  
  # ... and the documentation
  EXTRA_DIST = perfdhcp_internals.dox
diff --cc src/bin/perfdhcp/tests/Makefile.am
index 73adf44085,39ba81ece3..ab0a914fa3
--- a/src/bin/perfdhcp/tests/Makefile.am
+++ b/src/bin/perfdhcp/tests/Makefile.am
@@@ -42,15 -42,13 +42,15 @@@ run_unittests_CXXFLAGS = -Wno-unused-pa
  endif
  
  run_unittests_LDADD  = $(top_builddir)/src/bin/perfdhcp/libperfdhcp.la
 -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 += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
 +run_unittests_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
  run_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.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/util/unittests/libutil_unittests.la
 -run_unittests_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
 -run_unittests_LDADD += $(BOOST_LIBS) $(GTEST_LDADD)
 +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 += $(CRYPTO_LIBS) $(GTEST_LDADD)
++run_unittests_LDADD += $(CRYPTO_LIBS) $(BOOST_LIBS) $(GTEST_LDADD)
  endif
  
  noinst_PROGRAMS = $(TESTS)
diff --cc src/hooks/dhcp/user_chk/tests/Makefile.am
index 09770b94aa,79ca932217..145e3b1179
--- a/src/hooks/dhcp/user_chk/tests/Makefile.am
+++ b/src/hooks/dhcp/user_chk/tests/Makefile.am
@@@ -52,18 -52,14 +52,19 @@@ libdhcp_user_chk_unittests_CXXFLAGS += 
  endif
  
  libdhcp_user_chk_unittests_LDADD = $(top_builddir)/src/hooks/dhcp/user_chk/libduc.la
 +libdhcp_user_chk_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
 +libdhcp_user_chk_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
 +libdhcp_user_chk_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
 +libdhcp_user_chk_unittests_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
 +libdhcp_user_chk_unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
 +libdhcp_user_chk_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
  libdhcp_user_chk_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
 +libdhcp_user_chk_unittests_LDADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la
  libdhcp_user_chk_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
 -libdhcp_user_chk_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
 -libdhcp_user_chk_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
  libdhcp_user_chk_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 -libdhcp_user_chk_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
 -libdhcp_user_chk_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
 -libdhcp_user_chk_unittests_LDADD += ${CRYPTO_LIBS} ${CRYPTO_RPATH}
 -libdhcp_user_chk_unittests_LDADD += $(BOOST_LIBS) $(GTEST_LDADD)
 +libdhcp_user_chk_unittests_LDADD += $(LOG4CPLUS_LIBS)
 +libdhcp_user_chk_unittests_LDADD += $(CRYPTO_LIBS)
++libdhcp_user_chk_unittests_LDADD += $(BOOST_LIBS)
 +libdhcp_user_chk_unittests_LDADD += $(GTEST_LDADD)
  endif
  noinst_PROGRAMS = $(TESTS)
diff --cc src/lib/asiodns/tests/Makefile.am
index b317200c02,8d1c867a2b..66b9dd0a6c
--- a/src/lib/asiodns/tests/Makefile.am
+++ b/src/lib/asiodns/tests/Makefile.am
@@@ -21,18 -20,16 +21,17 @@@ run_unittests_SOURCES += io_fetch_unitt
  
  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  = $(BOOST_LIBS) $(GTEST_LDADD)
  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
 +run_unittests_LDADD += $(top_builddir)/src/lib/util/threads/libkea-threads.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/asiolink/libkea-asiolink.la
 -run_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
  run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
- run_unittests_LDADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS) $(GTEST_LDADD)
 -run_unittests_LDADD += $(top_builddir)/src/lib/asiodns/libkea-asiodns.la
++run_unittests_LDADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS)
++run_unittests_LDADD += $(BOOST_LIBS) $(GTEST_LDADD)
  
 -run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
 +run_unittests_LDFLAGS = $(AM_LDFLAGS) $(CRYPTO_LDFLAGS) $(GTEST_LDFLAGS)
  
  # Note: the ordering matters: -Wno-... must follow -Wextra (defined in
  # KEA_CXXFLAGS)
diff --cc src/lib/asiolink/tests/Makefile.am
index 7558c09db6,82083b0579..c3be47f887
--- a/src/lib/asiolink/tests/Makefile.am
+++ b/src/lib/asiolink/tests/Makefile.am
@@@ -38,11 -40,9 +38,11 @@@ run_unittests_CPPFLAGS = $(AM_CPPFLAGS
  
  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/threads/libkea-threads.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
- run_unittests_LDADD += $(LOG4CPLUS_LIBS) $(GTEST_LDADD)
 -run_unittests_LDADD += $(BOOST_LIBS) $(GTEST_LDADD)
++run_unittests_LDADD += $(LOG4CPLUS_LIBS) $(BOOST_LIBS) $(GTEST_LDADD)
  
  run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
  
diff --cc src/lib/cc/tests/Makefile.am
index 5e3c241b96,f4453fdd71..67d85bab26
--- a/src/lib/cc/tests/Makefile.am
+++ b/src/lib/cc/tests/Makefile.am
@@@ -19,13 -25,14 +19,13 @@@ run_unittests_SOURCES += data_file_unit
  run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
  run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
  
 -# We need to put our libs first, in case gtest (or any dependency, really)
 -# is installed in the same location as a different version of bind10
 -# Otherwise the linker may not use the source tree libs
  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/util/unittests/libutil_unittests.la
 -run_unittests_LDADD +=  $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 -run_unittests_LDADD += $(BOOST_LIBS) $(GTEST_LDADD)
 +run_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
 +run_unittests_LDADD += $(top_builddir)/src/lib/util/threads/libkea-threads.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
- run_unittests_LDADD += $(LOG4CPLUS_LIBS) $(GTEST_LDADD)
++run_unittests_LDADD += $(LOG4CPLUS_LIBS) $(BOOST_LIBS) $(GTEST_LDADD)
  
  endif
  
diff --cc src/lib/config/tests/Makefile.am
index 2e37186a3c,8c186511ee..789e71bea1
--- a/src/lib/config/tests/Makefile.am
+++ b/src/lib/config/tests/Makefile.am
@@@ -24,20 -24,14 +24,21 @@@ run_unittests_SOURCES += config_data_un
  run_unittests_SOURCES += command_mgr_unittests.cc
  
  run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
 -run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
 -run_unittests_LDADD =  $(BOOST_LIBS) $(GTEST_LDADD)
 +run_unittests_LDFLAGS = $(AM_LDFLAGS) $(CRYPTO_LDFLAGS) $(GTEST_LDFLAGS)
 +
 +run_unittests_LDADD = $(top_builddir)/src/lib/config/libkea-cfgclient.la
 +run_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
 +run_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
  run_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
 -run_unittests_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
 -run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.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
 +run_unittests_LDADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la
  run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
 -run_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
 +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) $(GTEST_LDADD)
++run_unittests_LDADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS)
++run_unittests_LDADD =  $(BOOST_LIBS) $(GTEST_LDADD)
  
  endif
  
diff --cc src/lib/dhcp/iface_mgr.cc
index 019dff2a6c,5ff6ade8f5..461ffd9eb5
--- a/src/lib/dhcp/iface_mgr.cc
+++ b/src/lib/dhcp/iface_mgr.cc
@@@ -815,11 -811,7 +816,11 @@@ IfaceMgr::getLocalAddress(const IOAddre
          // @todo: We don't specify interface in any way here. 255.255.255.255
          // We can very easily end up with a socket working on a different
          // interface.
 +
 +        // zero out the errno to be safe
 +        errno = 0;
 +
-         sock.open(asio::ip::udp::v4(), err_code);
+         sock.open(boost::asio::ip::udp::v4(), err_code);
          if (err_code) {
              const char* errstr = strerror(errno);
              isc_throw(Unexpected, "failed to open UDPv4 socket, reason:"
diff --cc src/lib/dhcp/tests/Makefile.am
index 2fd76974b3,6472cb4aa7..bfb23634ed
--- a/src/lib/dhcp/tests/Makefile.am
+++ b/src/lib/dhcp/tests/Makefile.am
@@@ -107,14 -107,12 +107,15 @@@ libdhcp___unittests_CXXFLAGS += -Wno-un
  endif
  
  libdhcp___unittests_LDADD  = $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
 +libdhcp___unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
 +libdhcp___unittests_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
 +libdhcp___unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
  libdhcp___unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
 +libdhcp___unittests_LDADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la
  libdhcp___unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
 -libdhcp___unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
  libdhcp___unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
- libdhcp___unittests_LDADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS) $(GTEST_LDADD)
 -libdhcp___unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
++libdhcp___unittests_LDADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS)
+ libdhcp___unittests_LDADD += $(BOOST_LIBS) $(GTEST_LDADD)
  endif
  
  noinst_PROGRAMS = $(TESTS)
diff --cc src/lib/dhcp_ddns/tests/Makefile.am
index 6ebdde978f,abf8cd9b0b..8a0731de31
--- a/src/lib/dhcp_ddns/tests/Makefile.am
+++ b/src/lib/dhcp_ddns/tests/Makefile.am
@@@ -43,20 -44,17 +43,19 @@@ if USE_CLANGP
  libdhcp_ddns_unittests_CXXFLAGS += -Wno-unused-parameter
  endif
  
 -libdhcp_ddns_unittests_LDADD = $(top_builddir)/src/lib/log/libkea-log.la
 -libdhcp_ddns_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
 +libdhcp_ddns_unittests_LDADD = $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
 +libdhcp_ddns_unittests_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
 +libdhcp_ddns_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
  libdhcp_ddns_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
 +libdhcp_ddns_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
 +libdhcp_ddns_unittests_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
  libdhcp_ddns_unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
 -libdhcp_ddns_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
 -libdhcp_ddns_unittests_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
 +libdhcp_ddns_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
 +libdhcp_ddns_unittests_LDADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la
 +libdhcp_ddns_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
  libdhcp_ddns_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
- libdhcp_ddns_unittests_LDADD += $(LOG4CPLUS_LIBS)
- libdhcp_ddns_unittests_LDADD += $(CRYPTO_LIBS)
- libdhcp_ddns_unittests_LDADD += $(GTEST_LDADD)
 -libdhcp_ddns_unittests_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
 -libdhcp_ddns_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
 -libdhcp_ddns_unittests_LDADD += ${CRYPTO_LIBS} ${CRYPTO_RPATH}
++libdhcp_ddns_unittests_LDADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS)
+ libdhcp_ddns_unittests_LDADD += $(BOOST_LIBS) $(GTEST_LDADD)
  endif
  
  noinst_PROGRAMS = $(TESTS)
diff --cc src/lib/dhcpsrv/tests/Makefile.am
index e7e51f23b6,feefcda5ff..e8a1438559
--- a/src/lib/dhcpsrv/tests/Makefile.am
+++ b/src/lib/dhcpsrv/tests/Makefile.am
@@@ -135,23 -128,20 +135,24 @@@ if USE_CLANGP
  libdhcpsrv_unittests_CXXFLAGS += -Wno-unused-variable -Wno-unused-parameter
  endif
  
 -libdhcpsrv_unittests_LDADD  = $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
 +libdhcpsrv_unittests_LDADD  = $(top_builddir)/src/lib/dhcpsrv/testutils/libdhcpsrvtest.la
  libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
 -libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/dhcpsrv/testutils/libdhcpsrvtest.la
 -libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/dhcp/tests/libdhcptest.la
 -libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
  libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
 +libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la
  libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
 -libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
 +libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
 +libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/dhcp/tests/libdhcptest.la
  libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
 +libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
 +libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
 +libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
  libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
  libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
 -libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la
 +libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la
 +libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
  libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
- libdhcpsrv_unittests_LDADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS) $(GTEST_LDADD)
++libdhcpsrv_unittests_LDADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS)
+ libdhcpsrv_unittests_LDADD += $(BOOST_LIBS) $(GTEST_LDADD)
  endif
  
  noinst_PROGRAMS = $(TESTS)