Commit 440a5e40 authored by Francis Dupont's avatar Francis Dupont
Browse files

[master] Merge branch 'master' of ssh://git.kea.isc.org/git/kea

parents 932b6689 1c04aa97
1327. [build] marcin
Updated Kea libraries' version numbers and hooks version for
the 1.3.0 release.
(Trac #5375, git 70c0fc164c89716419b6ee42da3ca0d4be938a30)
1326. [func] fdupont
server-hostname and boot-file-name are now allowed in global,
subnet4 and shared network scopes in DHCPv4.
......
......@@ -17,6 +17,9 @@ s-messages: asiodns_messages.mes
BUILT_SOURCES = asiodns_messages.h asiodns_messages.cc
lib_LTLIBRARIES = libkea-asiodns.la
libkea_asiodns_la_LDFLAGS = -no-undefined -version-info 0:1:0
libkea_asiodns_la_SOURCES = io_fetch.cc io_fetch.h
libkea_asiodns_la_SOURCES += logger.h logger.cc
......
......@@ -15,7 +15,7 @@ CLEANFILES = *.gcno *.gcda
lib_LTLIBRARIES = libkea-asiolink.la
libkea_asiolink_la_LDFLAGS = -no-undefined -version-info 4:0:0
libkea_asiolink_la_LDFLAGS = -no-undefined -version-info 5:0:0
libkea_asiolink_la_SOURCES = asiolink.h
libkea_asiolink_la_SOURCES += asio_wrapper.h
......
......@@ -16,7 +16,7 @@ libkea_cc_la_LIBADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
libkea_cc_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
libkea_cc_la_LIBADD += $(BOOST_LIBS)
libkea_cc_la_LDFLAGS = -no-undefined -version-info 2:0:0
libkea_cc_la_LDFLAGS = -no-undefined -version-info 3:0:0
# Specify the headers for copying into the installation directory tree.
libkea_cc_includedir = $(pkgincludedir)/cc
......
......@@ -34,7 +34,7 @@ libkea_cfgclient_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la
libkea_cfgclient_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
libkea_cfgclient_la_LIBADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS) $(BOOST_LIBS)
libkea_cfgclient_la_LDFLAGS = -no-undefined -version-info 3:0:0
libkea_cfgclient_la_LDFLAGS = -no-undefined -version-info 4:0:0
libkea_cfgclient_la_LDFLAGS += $(CRYPTO_LDFLAGS)
nodist_libkea_cfgclient_la_SOURCES = config_messages.h config_messages.cc
......
......@@ -73,7 +73,7 @@ libkea_dhcp___la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la
libkea_dhcp___la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
libkea_dhcp___la_LIBADD += $(BOOST_LIBS)
libkea_dhcp___la_LIBADD += $(CRYPTO_LIBS)
libkea_dhcp___la_LDFLAGS = -no-undefined -version-info 5:0:0
libkea_dhcp___la_LDFLAGS = -no-undefined -version-info 6:0:0
libkea_dhcp___la_LDFLAGS += $(CRYPTO_LDFLAGS)
EXTRA_DIST = README libdhcp++.dox
......
......@@ -211,7 +211,7 @@ libkea_dhcpsrv_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la
libkea_dhcpsrv_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
libkea_dhcpsrv_la_LIBADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS) $(BOOST_LIBS)
libkea_dhcpsrv_la_LDFLAGS = -no-undefined -version-info 7:0:0
libkea_dhcpsrv_la_LDFLAGS = -no-undefined -version-info 8:0:0
libkea_dhcpsrv_la_LDFLAGS += $(CRYPTO_LDFLAGS)
if HAVE_MYSQL
libkea_dhcpsrv_la_LDFLAGS += $(MYSQL_LIBS)
......
......@@ -103,7 +103,7 @@ BUILT_SOURCES += rdataclass.h rdataclass.cc
lib_LTLIBRARIES = libkea-dns++.la
libkea_dns___la_LDFLAGS = -no-undefined -version-info 1:1:1
libkea_dns___la_LDFLAGS = -no-undefined -version-info 2:0:0
libkea_dns___la_LDFLAGS += $(AM_LDFLAGS) $(CRYPTO_LDFLAGS)
libkea_dns___la_SOURCES =
......
......@@ -36,7 +36,7 @@ libkea_eval_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la
libkea_eval_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
libkea_eval_la_LIBADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS) $(BOOST_LIBS)
libkea_eval_la_LDFLAGS = -no-undefined -version-info 5:0:0
libkea_eval_la_LDFLAGS = -no-undefined -version-info 6:0:0
libkea_eval_la_LDFLAGS += $(CRYPTO_LDFLAGS)
EXTRA_DIST = eval.dox
......
......@@ -4,7 +4,9 @@ AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
AM_CXXFLAGS=$(KEA_CXXFLAGS)
lib_LTLIBRARIES = libkea-exceptions.la
libkea_exceptions_la_SOURCES = exceptions.h exceptions.cc
libkea_exceptions_la_LDFLAGS = -no-undefined -version-info 0:0:0
CLEANFILES = *.gcno *.gcda
......
......@@ -49,7 +49,7 @@ nodist_libkea_hooks_la_SOURCES = hooks_messages.cc hooks_messages.h
libkea_hooks_la_CXXFLAGS = $(AM_CXXFLAGS)
libkea_hooks_la_CPPFLAGS = $(AM_CPPFLAGS)
libkea_hooks_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined -version-info 3:0:0
libkea_hooks_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined -version-info 4:0:1
libkea_hooks_la_LIBADD =
libkea_hooks_la_LIBADD += $(top_builddir)/src/lib/log/libkea-log.la
libkea_hooks_la_LIBADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la
......
......@@ -12,8 +12,8 @@
namespace {
// Version 4 of the hooks framework, set for Kea 1.1.
const int KEA_HOOKS_VERSION = 4;
// Version 5 of the hooks framework, set for Kea 1.3.
const int KEA_HOOKS_VERSION = 5;
// Names of the framework functions.
const char* const LOAD_FUNCTION_NAME = "load";
......
......@@ -45,7 +45,7 @@ nodist_libkea_http_la_SOURCES = http_messages.cc http_messages.h
libkea_http_la_CXXFLAGS = $(AM_CXXFLAGS)
libkea_http_la_CPPFLAGS = $(AM_CPPFLAGS)
libkea_http_la_LDFLAGS = $(AM_LDFLAGS)
libkea_http_la_LDFLAGS += -no-undefined -version-info 0:0:0
libkea_http_la_LDFLAGS += -no-undefined -version-info 0:1:0
libkea_http_la_LIBADD =
libkea_http_la_LIBADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
......
......@@ -50,7 +50,7 @@ nodist_libkea_process_la_SOURCES = process_messages.cc process_messages.h
libkea_process_la_CXXFLAGS = $(AM_CXXFLAGS)
libkea_process_la_CPPFLAGS = $(AM_CPPFLAGS)
libkea_process_la_LDFLAGS = $(AM_LDFLAGS)
libkea_process_la_LDFLAGS += -no-undefined -version-info 0:0:0
libkea_process_la_LDFLAGS += -no-undefined -version-info 1:0:0
libkea_process_la_LIBADD =
libkea_process_la_LIBADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
......
......@@ -10,7 +10,7 @@ libkea_stats_la_SOURCES += context.h context.cc
libkea_stats_la_SOURCES += stats_mgr.h stats_mgr.cc
libkea_stats_la_CPPFLAGS = $(AM_CPPFLAGS)
libkea_stats_la_LDFLAGS = -no-undefined -version-info 1:0:0
libkea_stats_la_LDFLAGS = -no-undefined -version-info 2:0:0
libkea_stats_la_LIBADD = $(top_builddir)/src/lib/cc/libkea-cc.la
libkea_stats_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la
......
......@@ -9,5 +9,6 @@ libkea_util_io_la_SOURCES = fd.h fd.cc fd_share.h fd_share.cc
libkea_util_io_la_SOURCES += socketsession.h socketsession.cc sockaddr_util.h
libkea_util_io_la_SOURCES += pktinfo_utilities.h
libkea_util_io_la_LIBADD = $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
libkea_util_io_la_LDFLAGS = -no-undefined -version-info 0:0:0
CLEANFILES = *.gcno *.gcda
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment