diff options
| author | Tomek Mrugalski <tomek@isc.org> | 2021-10-29 12:41:53 +0200 |
|---|---|---|
| committer | Tomek Mrugalski <tomek@isc.org> | 2021-11-17 15:35:19 +0100 |
| commit | 4a3e22b242be44db95d7d9d5f643f43a8cf86124 (patch) | |
| tree | e48ec45b3d911b3808970c471be87717f865b57e /src/hooks | |
| parent | [#1848] v6 CB removed (diff) | |
| download | kea-4a3e22b242be44db95d7d9d5f643f43a8cf86124.tar.xz kea-4a3e22b242be44db95d7d9d5f643f43a8cf86124.zip | |
[#1848] Makefiles updated after v6 removal
Diffstat (limited to 'src/hooks')
| -rw-r--r-- | src/hooks/dhcp/pgsql_cb/Makefile.am | 5 | ||||
| -rw-r--r-- | src/hooks/dhcp/pgsql_cb/pgsql_cb_callouts.cc | 7 | ||||
| -rw-r--r-- | src/hooks/dhcp/pgsql_cb/tests/Makefile.am | 6 |
3 files changed, 12 insertions, 6 deletions
diff --git a/src/hooks/dhcp/pgsql_cb/Makefile.am b/src/hooks/dhcp/pgsql_cb/Makefile.am index 90a0d9ac76..55f8ff11ab 100644 --- a/src/hooks/dhcp/pgsql_cb/Makefile.am +++ b/src/hooks/dhcp/pgsql_cb/Makefile.am @@ -17,7 +17,10 @@ libpgsqlcb_la_SOURCES = pgsql_cb_callouts.cc # Commented out for now - see kea#95 #libpgsqlcb_la_SOURCES += pgsql_cb_dhcp4.cc pgsql_cb_dhcp4.h -libpgsqlcb_la_SOURCES += pgsql_cb_dhcp6.cc pgsql_cb_dhcp6.h + +# Commented out for now - to be added back in #96 +#libpgsqlcb_la_SOURCES += pgsql_cb_dhcp6.cc pgsql_cb_dhcp6.h + libpgsqlcb_la_SOURCES += pgsql_cb_impl.cc pgsql_cb_impl.h libpgsqlcb_la_SOURCES += pgsql_cb_messages.cc pgsql_cb_messages.h libpgsqlcb_la_SOURCES += pgsql_cb_log.cc pgsql_cb_log.h diff --git a/src/hooks/dhcp/pgsql_cb/pgsql_cb_callouts.cc b/src/hooks/dhcp/pgsql_cb/pgsql_cb_callouts.cc index 9a049b752f..acf8367dbd 100644 --- a/src/hooks/dhcp/pgsql_cb/pgsql_cb_callouts.cc +++ b/src/hooks/dhcp/pgsql_cb/pgsql_cb_callouts.cc @@ -11,9 +11,10 @@ #include <config.h> #include <hooks/hooks.h> +#include <pgsql_cb_impl.h> // #include <pgsql_cb_dhcp4.h> // disabled for now, to be added in #95 -#include <pgsql_cb_dhcp6.h> +// #include <pgsql_cb_dhcp6.h> // disabled for now, to be added in #96 #include <pgsql_cb_log.h> using namespace isc::cb; @@ -34,7 +35,7 @@ load(LibraryHandle& /* handle */) { // Register Postgres CB factories with CB Managers //isc::dhcp::PgSqlConfigBackendDHCPv4::registerBackendType(); // disabled for now, to be added in #95 - isc::dhcp::PgSqlConfigBackendDHCPv6::registerBackendType(); + //isc::dhcp::PgSqlConfigBackendDHCPv6::registerBackendType(); // disabled for now, to be added in #96 return (0); } @@ -75,7 +76,7 @@ unload() { LOG_INFO(pgsql_cb_logger, PGSQL_CB_DEINIT_OK); // Unregister the factories and remove Postgres backends //isc::dhcp::PgSqlConfigBackendDHCPv4::unregisterBackendType(); // disabled for now, to be added in #95 - isc::dhcp::PgSqlConfigBackendDHCPv6::unregisterBackendType(); + //isc::dhcp::PgSqlConfigBackendDHCPv6::unregisterBackendType(); // disabled for now, to be added in #96 return (0); } diff --git a/src/hooks/dhcp/pgsql_cb/tests/Makefile.am b/src/hooks/dhcp/pgsql_cb/tests/Makefile.am index e448a9b05f..b014bca13d 100644 --- a/src/hooks/dhcp/pgsql_cb/tests/Makefile.am +++ b/src/hooks/dhcp/pgsql_cb/tests/Makefile.am @@ -28,8 +28,10 @@ pgsql_cb_unittests_SOURCES = pgsql_cb_impl_unittest.cc # disabled for now, to be added in #95 #pgsql_cb_unittests_SOURCES = pgsql_cb_dhcp4_unittest.cc #pgsql_cb_unittests_SOURCES += pgsql_cb_dhcp4_mgr_unittest.cc -pgsql_cb_unittests_SOURCES += pgsql_cb_dhcp6_unittest.cc -pgsql_cb_unittests_SOURCES += pgsql_cb_dhcp6_mgr_unittest.cc + +# disabled for now, to be added in #96 +#pgsql_cb_unittests_SOURCES += pgsql_cb_dhcp6_unittest.cc +#pgsql_cb_unittests_SOURCES += pgsql_cb_dhcp6_mgr_unittest.cc pgsql_cb_unittests_SOURCES += run_unittests.cc pgsql_cb_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES) $(LOG4CPLUS_INCLUDES) |