[#194,!104] Removed libkea-process dependency on MySQL, Postgres and CQL.

diff --git a/src/bin/agent/Makefile.am b/src/bin/agent/Makefile.am
index 31a2798d884cfa14c644236c4f109e1f3953f15c..eb303392a68121c0253c418d3c4b465a81d1292d 100644 (file)
--- a/src/bin/agent/Makefile.am
+++ b/src/bin/agent/Makefile.am
@@ -87,11 +87,6 @@ kea_ctrl_agent_LDADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS) $(BOOST_LIBS)
 
 kea_ctrl_agent_LDFLAGS = $(AM_LDFLAGS) $(CRYPTO_LDFLAGS)
 
-if HAVE_CQL
-kea_ctrl_agent_LDFLAGS += $(CQL_LIBS)
-endif
-
-
 if GENERATE_PARSER
 
 parser: agent_lexer.cc location.hh position.hh stack.hh agent_parser.cc agent_parser.h

diff --git a/src/bin/d2/Makefile.am b/src/bin/d2/Makefile.am
index 56b180c8de9157688d279e50aeda226866636b9c..7da230336a66946d0f14a4bc64552e7066c38b53 100644 (file)
--- a/src/bin/d2/Makefile.am
+++ b/src/bin/d2/Makefile.am
@@ -3,15 +3,6 @@ SUBDIRS = . tests
 AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
 AM_CPPFLAGS += -I$(top_srcdir)/src/bin -I$(top_builddir)/src/bin
 AM_CPPFLAGS += $(BOOST_INCLUDES)
-if HAVE_MYSQL
-AM_CPPFLAGS += $(MYSQL_CPPFLAGS)
-endif
-if HAVE_PGSQL
-AM_CPPFLAGS += $(PGSQL_CPPFLAGS)
-endif
-if HAVE_CQL
-AM_CPPFLAGS += $(CQL_CPPFLAGS)
-endif
 
 AM_CXXFLAGS = $(KEA_CXXFLAGS)
 
@@ -95,17 +86,6 @@ kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/asiodns/libkea-asiodns.la
 kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la
 kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
 kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
-
-if HAVE_MYSQL
-kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/mysql/libkea-mysql.la
-endif
-if HAVE_PGSQL
-kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/pgsql/libkea-pgsql.la
-endif
-if HAVE_CQL
-kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/cql/libkea-cql.la
-endif
-
 kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/database/libkea-database.la
 kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
 kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
@@ -119,15 +99,6 @@ kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 kea_dhcp_ddns_LDADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS) $(BOOST_LIBS)
 
 kea_dhcp_ddns_LDFLAGS = $(AM_LDFLAGS) $(CRYPTO_LDFLAGS)
-if HAVE_MYSQL
-kea_dhcp_ddns_LDFLAGS += $(MYSQL_LIBS)
-endif
-if HAVE_PGSQL
-kea_dhcp_ddns_LDFLAGS += $(PGSQL_LIBS)
-endif
-if HAVE_CQL
-kea_dhcp_ddns_LDFLAGS += $(CQL_LIBS)
-endif
 
 kea_dhcp_ddnsdir = $(pkgdatadir)
 

diff --git a/src/bin/d2/tests/Makefile.am b/src/bin/d2/tests/Makefile.am
index 3b9635a6917123e777d2eca803c17feeb25a698f..44dd2e9493c2880525ddb5f22f624d38cf0e458f 100644 (file)
--- a/src/bin/d2/tests/Makefile.am
+++ b/src/bin/d2/tests/Makefile.am
@@ -83,17 +83,6 @@ d2_unittests_LDADD += $(top_builddir)/src/lib/asiodns/libkea-asiodns.la
 d2_unittests_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la
 d2_unittests_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
 d2_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
-
-if HAVE_MYSQL
-d2_unittests_LDADD += $(top_builddir)/src/lib/mysql/libkea-mysql.la
-endif
-if HAVE_PGSQL
-d2_unittests_LDADD += $(top_builddir)/src/lib/pgsql/libkea-pgsql.la
-endif
-if HAVE_CQL
-d2_unittests_LDADD += $(top_builddir)/src/lib/cql/libkea-cql.la
-endif
-
 d2_unittests_LDADD += $(top_builddir)/src/lib/database/libkea-database.la
 d2_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
 d2_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la

diff --git a/src/hooks/dhcp/stat_cmds/tests/Makefile.am b/src/hooks/dhcp/stat_cmds/tests/Makefile.am
index 9d17e66532d5cd9d3b9abd9761d3b6952a3fe8a3..fa87d653ad1a18f95c0002d90e1ef6dde4f3e7bc 100644 (file)
--- a/src/hooks/dhcp/stat_cmds/tests/Makefile.am
+++ b/src/hooks/dhcp/stat_cmds/tests/Makefile.am
@@ -6,6 +6,17 @@ AM_CPPFLAGS += $(BOOST_INCLUDES)
 AM_CPPFLAGS += -DSTAT_CMDS_LIB_SO=\"$(abs_top_builddir)/src/hooks/dhcp/stat_cmds/.libs/libdhcp_stat_cmds.so\"
 AM_CPPFLAGS += -DINSTALL_PROG=\"$(abs_top_srcdir)/install-sh\"
 
+if HAVE_MYSQL
+AM_CPPFLAGS += $(MYSQL_CPPFLAGS)
+endif
+if HAVE_PGSQL
+AM_CPPFLAGS += $(PGSQL_CPPFLAGS)
+endif
+if HAVE_CQL
+AM_CPPFLAGS += $(CQL_CPPFLAGS)
+endif
+
+
 AM_CXXFLAGS = $(KEA_CXXFLAGS)
 
 if USE_STATIC_LINK
@@ -55,6 +66,12 @@ stat_cmds_unittests_LDADD += $(CRYPTO_LIBS)
 stat_cmds_unittests_LDADD += $(BOOST_LIBS)
 stat_cmds_unittests_LDADD += $(GTEST_LDADD)
 
+if HAVE_MYSQL
+stat_cmds_unittests_LDFLAGS += $(MYSQL_LIBS)
+endif
+if HAVE_PGSQL
+stat_cmds_unittests_LDFLAGS += $(PGSQL_LIBS)
+endif
 if HAVE_CQL
 stat_cmds_unittests_LDFLAGS += $(CQL_LIBS)
 endif

diff --git a/src/lib/process/Makefile.am b/src/lib/process/Makefile.am
index 1a3a588fd70e3f2f0cc330e8fd54af72908ff4db..f2d838cf56e01c7032291375fc4566aa4947256d 100644 (file)
--- a/src/lib/process/Makefile.am
+++ b/src/lib/process/Makefile.am
@@ -4,17 +4,6 @@ AM_CPPFLAGS  = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
 AM_CPPFLAGS += -DDATA_DIR="\"$(dhcp_data_dir)\""
 
 AM_CPPFLAGS += $(BOOST_INCLUDES)
-
-if HAVE_MYSQL
-AM_CPPFLAGS += $(MYSQL_CPPFLAGS)
-endif
-if HAVE_PGSQL
-AM_CPPFLAGS += $(PGSQL_CPPFLAGS)
-endif
-if HAVE_CQL
-AM_CPPFLAGS += $(CQL_CPPFLAGS)
-endif
-
 AM_CXXFLAGS  = $(KEA_CXXFLAGS)
 
 # Define rule to build logging source files from message file
@@ -61,17 +50,6 @@ libkea_process_la_LIBADD  =
 libkea_process_la_LIBADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
 libkea_process_la_LIBADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
 libkea_process_la_LIBADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
-
-if HAVE_MYSQL
-libkea_process_la_LIBADD += $(top_builddir)/src/lib/mysql/libkea-mysql.la
-endif
-if HAVE_PGSQL
-libkea_process_la_LIBADD += $(top_builddir)/src/lib/pgsql/libkea-pgsql.la
-endif
-if HAVE_CQL
-libkea_process_la_LIBADD += $(top_builddir)/src/lib/cql/libkea-cql.la
-endif
-
 libkea_process_la_LIBADD += $(top_builddir)/src/lib/database/libkea-database.la
 libkea_process_la_LIBADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
 libkea_process_la_LIBADD += $(top_builddir)/src/lib/cc/libkea-cc.la

diff --git a/src/lib/process/d_controller.cc b/src/lib/process/d_controller.cc
index b35578a0730a22fd516972939c870c9e75d51c61..02c4d909635ba25980da3122e04528d515dbe5ec 100644 (file)
--- a/src/lib/process/d_controller.cc
+++ b/src/lib/process/d_controller.cc
@@ -15,18 +15,7 @@
 #include <process/d_controller.h>
 #include <process/config_base.h>
 #include <kea_version.h>
-
-#ifdef HAVE_MYSQL
-#include <dhcpsrv/mysql_lease_mgr.h>
-#endif
-#ifdef HAVE_PGSQL
-#include <dhcpsrv/pgsql_lease_mgr.h>
-#endif
-#ifdef HAVE_CQL
-#include <dhcpsrv/cql_lease_mgr.h>
-#endif
-#include <dhcpsrv/memfile_lease_mgr.h>
-
+#include <boost/bind.hpp>
 #include <sstream>
 #include <unistd.h>