[3880] Compilation fixes after rebase

diff --git a/src/lib/config/Makefile.am b/src/lib/config/Makefile.am
index 89ff5efa5b5a54839585d468ab2abb664fb88da0..e2b897a4da31fa630b0e54e93f9968b56293b1d1 100644 (file)
--- a/src/lib/config/Makefile.am
+++ b/src/lib/config/Makefile.am
@@ -19,7 +19,6 @@ BUILT_SOURCES = config_messages.h config_messages.cc
 lib_LTLIBRARIES = libkea-cfgclient.la
 libkea_cfgclient_la_SOURCES = config_data.h config_data.cc
 libkea_cfgclient_la_SOURCES += module_spec.h module_spec.cc
-libkea_cfgclient_la_SOURCES += command_interpreter.cc command_interpreter.h
 libkea_cfgclient_la_SOURCES += command_mgr.cc command_mgr.h
 libkea_cfgclient_la_SOURCES += command_socket_factory.cc command_socket_factory.h
 libkea_cfgclient_la_SOURCES += config_log.h config_log.cc

diff --git a/src/lib/config/command_mgr.cc b/src/lib/config/command_mgr.cc
index 184dfbb2aae7a2fd657d7797aa60958ac6fee619..1a69fb70a94b65bcaab3278dcc20947097a411aa 100644 (file)
--- a/src/lib/config/command_mgr.cc
+++ b/src/lib/config/command_mgr.cc
@@ -15,6 +15,7 @@
 #include <config/command_mgr.h>
 #include <config/command_socket_factory.h>
 #include <cc/data.h>
+#include <cc/command_interpreter.h>
 #include <dhcp/iface_mgr.h>
 #include <config/config_log.h>
 #include <boost/bind.hpp>

diff --git a/src/lib/config/command_mgr.h b/src/lib/config/command_mgr.h
index 3eb64e0e9881da94012661ee64df0a362c00d39b..5b20959100eac4b664a2c3387444b2c4456450b5 100644 (file)
--- a/src/lib/config/command_mgr.h
+++ b/src/lib/config/command_mgr.h
@@ -15,11 +15,11 @@
 #ifndef COMMAND_MGR_H
 #define COMMAND_MGR_H
 
-#include <config/command_interpreter.h>
 #include <cc/data.h>
 #include <boost/noncopyable.hpp>
-#include <boost/any.hpp>
+#include <boost/function.hpp>
 #include <string>
+#include <list>
 #include <map>
 
 namespace isc {

diff --git a/src/lib/config/tests/command_mgr_unittests.cc b/src/lib/config/tests/command_mgr_unittests.cc
index 8a3b8bdd89997053a50b87a89d04b6ca5c8761c2..fd2e682c2d942c9267cba7440c7e8b54e3727bc9 100644 (file)
--- a/src/lib/config/tests/command_mgr_unittests.cc
+++ b/src/lib/config/tests/command_mgr_unittests.cc
@@ -15,7 +15,7 @@
 #include <gtest/gtest.h>
 
 #include <config/command_mgr.h>
-#include <config/command_interpreter.h>
+#include <cc/command_interpreter.h>
 
 using namespace isc::data;
 using namespace isc::config;

diff --git a/src/lib/stats/Makefile.am b/src/lib/stats/Makefile.am
index 0556c18348d4f93c28dbb0bd5d034488db454495..4ff2abbf44a521072165c754f1459f44bb6e8e22 100644 (file)
--- a/src/lib/stats/Makefile.am
+++ b/src/lib/stats/Makefile.am
@@ -11,7 +11,6 @@ libkea_stats_la_SOURCES += stats_mgr.h stats_mgr.cc
 
 libkea_stats_la_CPPFLAGS = $(AM_CPPFLAGS)
 libkea_stats_la_LIBADD  = $(top_builddir)/src/lib/cc/libkea-cc.la
-libkea_stats_la_LIBADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
 libkea_stats_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la
 
 libkea_stats_includedir = $(includedir)/$(PACKAGE_NAME)/stats

diff --git a/src/lib/stats/stats_mgr.cc b/src/lib/stats/stats_mgr.cc
index aab05231d8ab9bbd3b365becfd743614e557683f..ec879dbdc794383a02f8a5c37ab0c33859c0c1f0 100644 (file)
--- a/src/lib/stats/stats_mgr.cc
+++ b/src/lib/stats/stats_mgr.cc
@@ -15,7 +15,7 @@
 #include <exceptions/exceptions.h>
 #include <stats/stats_mgr.h>
 #include <cc/data.h>
-#include <config/command_interpreter.h>
+#include <cc/command_interpreter.h>
 
 using namespace std;
 using namespace isc::data;

diff --git a/src/lib/stats/tests/Makefile.am b/src/lib/stats/tests/Makefile.am
index 0b41a1555c80b1d922f1b2fc99409f0aa0cc4a75..e42f4c17162cc81ae332722bfe4888896722b5bd 100644 (file)
--- a/src/lib/stats/tests/Makefile.am
+++ b/src/lib/stats/tests/Makefile.am
@@ -24,7 +24,6 @@ libstats_unittests_CXXFLAGS = $(AM_CXXFLAGS)
 
 libstats_unittests_LDADD  = $(top_builddir)/src/lib/stats/libkea-stats.la
 libstats_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
-libstats_unittests_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
 libstats_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
 libstats_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
 libstats_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la

diff --git a/src/lib/stats/tests/stats_mgr_unittest.cc b/src/lib/stats/tests/stats_mgr_unittest.cc
index f7226f6509a52bc89f7660a07cc4e85c2d6eb5ec..27aaa7deded6329414e7fea3a8125e0767b74379 100644 (file)
--- a/src/lib/stats/tests/stats_mgr_unittest.cc
+++ b/src/lib/stats/tests/stats_mgr_unittest.cc
@@ -17,7 +17,7 @@
 #include <stats/stats_mgr.h>
 #include <exceptions/exceptions.h>
 #include <cc/data.h>
-#include <config/command_interpreter.h>
+#include <cc/command_interpreter.h>
 #include <util/boost_time_utils.h>
 #include <boost/date_time/posix_time/posix_time_types.hpp>
 #include <boost/shared_ptr.hpp>