[5055] Fixed build issues occuring after recent changes.

diff --git a/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc b/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
index 99e83b774b0da7829425757c7d36fd710b8cddea..e6061b5c9462817c5b20f5a6c797030c35437451 100644 (file)
--- a/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
+++ b/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
@@ -30,6 +30,7 @@
 #include <dhcpsrv/utils.h>
 #include <util/buffer.h>
 #include <util/range_utilities.h>
+#include <util/encode/hex.h>
 #include <stats/stats_mgr.h>
 
 #include <dhcp6/tests/dhcp6_test_utils.h>

diff --git a/src/lib/dhcp_ddns/Makefile.am b/src/lib/dhcp_ddns/Makefile.am
index 306f65c2560a953c444b78cdf6dd078adadfaa2d..d510a8823a03ef11c59274a3c4546fbae174dbba 100644 (file)
--- a/src/lib/dhcp_ddns/Makefile.am
+++ b/src/lib/dhcp_ddns/Makefile.am
@@ -50,6 +50,7 @@ libkea_dhcp_ddns_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptio
 libkea_dhcp_ddns_la_LIBADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS)
 
 # Specify the headers for copying into the installation directory tree.
+libkea_dhcp_ddns_includedir = $(pkgincludedir)/dhcp_ddns
 libkea_dhcp_ddns_include_HEADERS = \
    ncr_io.h \
    ncr_msg.h \

diff --git a/src/lib/dhcpsrv/Makefile.am b/src/lib/dhcpsrv/Makefile.am
index 13cfde64fc33c9e5ab92f4138af1934676a52753..6c8f48bb0f3e2b1eba56f72a4be41f65f578b1ac 100644 (file)
--- a/src/lib/dhcpsrv/Makefile.am
+++ b/src/lib/dhcpsrv/Makefile.am
@@ -220,6 +220,7 @@ EXTRA_DIST += logging.spec
 
 # Specify the headers for copying into the installation directory tree. The
 # following headers are anticipated to be useful for the user libraries.
+libkea_dhcpsrv_includedir = $(pkgincludedir)/dhcpsrv
 libkea_dhcpsrv_include_HEADERS = \
     cfg_option.h \
     cfg_4o6.h \
@@ -231,7 +232,7 @@ libkea_dhcpsrv_include_HEADERS = \
     pool.h \
     subnet.h \
     subnet_id.h \
-    triplet.h \
+    triplet.h
 
 install-data-local:
        $(mkinstalldirs) $(DESTDIR)$(dhcp_data_dir)

diff --git a/src/lib/dhcpsrv/client_class_def.h b/src/lib/dhcpsrv/client_class_def.h
index 201b22c785d4a68530c4fbaa0da3db21f4e2fbdb..51fb7e2544f8a2aa3da823ece47cb5d3330992aa 100644 (file)
--- a/src/lib/dhcpsrv/client_class_def.h
+++ b/src/lib/dhcpsrv/client_class_def.h
@@ -8,6 +8,7 @@
 #define CLIENT_CLASS_DEF_H
 
 #include <dhcpsrv/cfg_option.h>
+#include <eval/token.h>
 #include <exceptions/exceptions.h>
 
 #include <string>

diff --git a/src/lib/dhcpsrv/subnet.h b/src/lib/dhcpsrv/subnet.h
index fe2e330e5140bd54fc20e7adec134dc937c04f83..484905688e05c8da9fe73d406ddd6474d63a33c0 100644 (file)
--- a/src/lib/dhcpsrv/subnet.h
+++ b/src/lib/dhcpsrv/subnet.h
@@ -15,7 +15,7 @@
 #include <dhcpsrv/cfg_4o6.h>
 #include <dhcpsrv/lease.h>
 #include <dhcpsrv/pool.h>
-#include <dhcpsrv/subnet_id.h
+#include <dhcpsrv/subnet_id.h>
 #include <dhcpsrv/triplet.h>
 
 #include <boost/shared_ptr.hpp>