Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ISC Open Source Projects
Kea
Commits
85fec0c4
Commit
85fec0c4
authored
Aug 10, 2018
by
Tomek Mrugalski
🛰
Browse files
[gitlab9] Minor conflict resolution
parent
08b34394
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/bin/netconf/Makefile.am
View file @
85fec0c4
...
...
@@ -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)
...
...
src/bin/netconf/main.cc
View file @
85fec0c4
...
...
@@ -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
(
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment