From: Tomek Mrugalski <tomasz@isc.org>
Date: Fri, 10 Aug 2018 14:38:21 +0000 (+0200)
Subject: [gitlab9] Minor conflict resolution
X-Git-Tag: gitlab29-base~38
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=85fec0c435447d5179a8ab2e69b049fb4393b4f3;p=thirdparty%2Fkea.git

[gitlab9] Minor conflict resolution
---

diff --git a/src/bin/netconf/Makefile.am b/src/bin/netconf/Makefile.am
index 0cd10c7c53..e75f6d3b84 100644
--- 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 ebc04c4f9d..623859075c 100644
--- 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(