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

diff --cc ChangeLog
index bdc72062f9e3bf77b1839d606c138c9a970ec5a2,0f8366253e13ede117a348b8af1f96518665b396..88dfc60df8dc5a9bb494995bedd49127b5ad5df4
--- 1/ChangeLog
--- 2/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 Makefile.am
Simple merge

diff --cc configure.ac
Simple merge

diff --cc src/bin/d2/Makefile.am
index b196ac042224cba17654e83d4cca4ec31d48006f,5059d106a8cea8873e6c69d5666b6907d4823f4a..aa8f5bb2769da40246cbab4c8d13233db26a02cc
--- 1/src/bin/d2/Makefile.am
--- 2/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 aaffb8fa25520b7c1ab763cb9efaf00b17b0ca90,0a9c5a9f2dd6459dc915a99de19f5c4da2bc4fce..b72f4578f6a13de91c60f2bb59ac63b6daf215ca
--- 1/src/bin/d2/tests/Makefile.am
--- 2/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 += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS) $(GTEST_LDADD)
 +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)
++d2_unittests_LDADD = $(BOOST_LIBS) $(GTEST_LDADD)
  
  endif
  

diff --cc src/bin/d2/tests/nc_trans_unittests.cc
Simple merge

diff --cc src/bin/dhcp4/Makefile.am
index 079e1bac80ee94218006f42e3700d2e6ae19cc7f,acc53e6c833f17cb77b1b7328152cf93843092fe..0512bb35017a95fc1bb17719b142ca7a5da05533
--- 1/src/bin/dhcp4/Makefile.am
--- 2/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/dhcp4_srv.cc
Simple merge

diff --cc src/bin/dhcp4/tests/Makefile.am
index 721cad3a7889f22b1ef25f4b343ac08b23cbc758,c0f638114bb8cc6b7c3dae14b153dbbe688eca13..1e02a015935f079b9dd08ac5174c4e85dcec465b
--- 1/src/bin/dhcp4/tests/Makefile.am
--- 2/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 04ba47e0b3222644dba36af9167cccff86f5fc18,96096b0f58cf96d32c0c41b89e57cb750d6f96d8..324aea80f21385fe75648cc872f2970dcdc29b50
--- 1/src/bin/dhcp6/Makefile.am
--- 2/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/dhcp6_srv.cc
Simple merge

diff --cc src/bin/dhcp6/tests/Makefile.am
index 2f4331da5cb0dc7eca53a924fb4db0db70d869af,904ad5627659a243b84bfd6c6a8b175547bb38a4..94feb5ac49e6a2f85a306fcee23a324301a30114
--- 1/src/bin/dhcp6/tests/Makefile.am
--- 2/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 6730564a083938a3163c50d8a396685bf57d4398,3d80082fd03d641d3f9b5330de72a700f1bc90c8..5e0dc8df0bbbc58f15e33cce1082ae2182fe7faf
--- 1/src/bin/lfc/Makefile.am
--- 2/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 d013cbbae7b134dbbe6571c88f147e9f854da630,ee40e060fe98163579b6b21aa1c6fd291cc0729a..b9b8b30d2ccb081517423cd880f26ddd213ad58a
--- 1/src/bin/lfc/tests/Makefile.am
--- 2/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 b384a8cbd2d7d7e93823a5b91031b745b08c5613,db6f47ad48c5afb768ce764d5ebd2b2829f6fc04..482b9cc81441357c79f653e4d9a8591ca52a5a40
--- 1/src/bin/perfdhcp/Makefile.am
--- 2/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 73adf44085eb3fe5ebd469baa7dff1d6500a2bf1,39ba81ece366582a6dc5cde2be292e53666df4d2..ab0a914fa3acd39d2086dbf28876d1b74e662638
--- 1/src/bin/perfdhcp/tests/Makefile.am
--- 2/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 09770b94aa58c51d1b06b8ff0443127079d9b53c,79ca93221720b23e1cca0e459a819cbe511faa4e..145e3b11794103e2ab57dce7638f362c7a8d2229
--- 1/src/hooks/dhcp/user_chk/tests/Makefile.am
--- 2/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 b317200c02e91fe0560132f013b1b12cedb4d7e6,8d1c867a2b9f2593dcd2b51eaa97eb5719b5b33a..66b9dd0a6c00534ca11d247006ae9b0419e10df6
--- 1/src/lib/asiodns/tests/Makefile.am
--- 2/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 7558c09db6ddd31b095e7ae4e166712236a17978,82083b057958260c0a9d5662c3215015e69f9e70..c3be47f887d756c85afbe6cfba714007fa6b5ba7
--- 1/src/lib/asiolink/tests/Makefile.am
--- 2/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 5e3c241b96d1fd7cd081ea12c71b21e0a6cf4561,f4453fdd7194b39f9aad5de59aed5e4a010ced8a..67d85bab2632699c89ccb6d6a1add53ea0799264
--- 1/src/lib/cc/tests/Makefile.am
--- 2/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 2e37186a3cdc08e408648b53f60c00e062a3e6d2,8c186511eefd65fa111147248dcc58d0ce49ee12..789e71bea15a7fc01da4e5c511c5c3486b6a5b3c
--- 1/src/lib/config/tests/Makefile.am
--- 2/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/duid.h
Simple merge

diff --cc src/lib/dhcp/iface_mgr.cc
index 019dff2a6c8efd10a86f8c6d631f8259df215905,5ff6ade8f5895ddf82b8d2a61dd96fffe91681ce..461ffd9eb5d780ee1dbfb355dc53cefa34271dcd
--- 1/src/lib/dhcp/iface_mgr.cc
--- 2/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.
-         sock.open(asio::ip::udp::v4(), err_code);
 +
 +        // zero out the errno to be safe
 +        errno = 0;
 +
+         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 2fd76974b3d18b377b84726dd3490b93d700caf0,6472cb4aa7d61b687980abd521433b1bd48fb90c..bfb23634eda26da409738569cdb2f48ec5495e78
--- 1/src/lib/dhcp/tests/Makefile.am
--- 2/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/ncr_udp.cc
Simple merge

diff --cc src/lib/dhcp_ddns/ncr_udp.h
Simple merge

diff --cc src/lib/dhcp_ddns/tests/Makefile.am
index 6ebdde978f8a923ad92cdea418a4598582e1798f,abf8cd9b0bf0ec2376ca26f7f6bc7c4e3d2c6fba..8a0731de312d59d2b56fa175896bc857d2fbda18
--- 1/src/lib/dhcp_ddns/tests/Makefile.am
--- 2/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/dhcp_ddns/tests/ncr_udp_unittests.cc
Simple merge

diff --cc src/lib/dhcpsrv/memfile_lease_mgr.h
Simple merge

diff --cc src/lib/dhcpsrv/tests/Makefile.am
index e7e51f23b6aa299cfb9003d6b8bde4499b945480,feefcda5ff3a3d4d156d747e261bac63af5b8c10..e8a14385596fdcd871fd26edbfe5a3157498105f
--- 1/src/lib/dhcpsrv/tests/Makefile.am
--- 2/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)

diff --cc src/lib/dhcpsrv/tests/memfile_lease_mgr_unittest.cc
Simple merge