Parcourir la source

[5055] Fixed build issues occuring after recent changes.

Marcin Siodelski il y a 8 ans
Parent
commit
6adc042b38

+ 1 - 0
src/bin/dhcp6/tests/dhcp6_srv_unittest.cc

@@ -30,6 +30,7 @@
 #include <dhcpsrv/utils.h>
 #include <dhcpsrv/utils.h>
 #include <util/buffer.h>
 #include <util/buffer.h>
 #include <util/range_utilities.h>
 #include <util/range_utilities.h>
+#include <util/encode/hex.h>
 #include <stats/stats_mgr.h>
 #include <stats/stats_mgr.h>
 
 
 #include <dhcp6/tests/dhcp6_test_utils.h>
 #include <dhcp6/tests/dhcp6_test_utils.h>

+ 1 - 0
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)
 libkea_dhcp_ddns_la_LIBADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS)
 
 
 # Specify the headers for copying into the installation directory tree.
 # Specify the headers for copying into the installation directory tree.
+libkea_dhcp_ddns_includedir = $(pkgincludedir)/dhcp_ddns
 libkea_dhcp_ddns_include_HEADERS = \
 libkea_dhcp_ddns_include_HEADERS = \
    ncr_io.h \
    ncr_io.h \
    ncr_msg.h \
    ncr_msg.h \

+ 2 - 1
src/lib/dhcpsrv/Makefile.am

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

+ 1 - 0
src/lib/dhcpsrv/client_class_def.h

@@ -8,6 +8,7 @@
 #define CLIENT_CLASS_DEF_H
 #define CLIENT_CLASS_DEF_H
 
 
 #include <dhcpsrv/cfg_option.h>
 #include <dhcpsrv/cfg_option.h>
+#include <eval/token.h>
 #include <exceptions/exceptions.h>
 #include <exceptions/exceptions.h>
 
 
 #include <string>
 #include <string>

+ 1 - 1
src/lib/dhcpsrv/subnet.h

@@ -15,7 +15,7 @@
 #include <dhcpsrv/cfg_4o6.h>
 #include <dhcpsrv/cfg_4o6.h>
 #include <dhcpsrv/lease.h>
 #include <dhcpsrv/lease.h>
 #include <dhcpsrv/pool.h>
 #include <dhcpsrv/pool.h>
-#include <dhcpsrv/subnet_id.h
+#include <dhcpsrv/subnet_id.h>
 #include <dhcpsrv/triplet.h>
 #include <dhcpsrv/triplet.h>
 
 
 #include <boost/shared_ptr.hpp>
 #include <boost/shared_ptr.hpp>