[gitlab9] Minor conflict resolution

diff --git a/src/bin/netconf/Makefile.am b/src/bin/netconf/Makefile.am
index 0cd10c7c53c944d09767b4ca94e1fb4ace0145f5..e75f6d3b847ac4c2dfc3bcc63ec4003c21451c1e 100644 (file)
--- a/src/bin/netconf/Makefile.am
+++ b/src/bin/netconf/Makefile.am
@@ -75,7 +75,7 @@ kea_netconf_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
 kea_netconf_LDADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la
 kea_netconf_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
 kea_netconf_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
-kea_netconf_LDADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS) $(BOOST_LIBS)
+kea_netconf_LDADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS) $(BOOST_LIBS) $(SYSREPO_LIBS)
 
 
 kea_netconfdir = $(pkgdatadir)

diff --git a/src/bin/netconf/main.cc b/src/bin/netconf/main.cc
index ebc04c4f9d464736c4a22f4814190b4e3c22223c..623859075ce5e48b46f47128069db71b9762af80 100644 (file)
--- a/src/bin/netconf/main.cc
+++ b/src/bin/netconf/main.cc
@@ -7,6 +7,10 @@
 #include <config.h>
 
 #include <netconf/agent.h>
+#include <netconf/netconf_log.h>
+#include <dhcpsrv/cfgmgr.h>
+#include <exceptions/exceptions.h>
+#include <iostream>
 
 int main(