[master] Merge branch 'trac4632'

9 files changed, 11 insertions, 11 deletions

diff --git a/src/lib/asiolink/Makefile.am b/src/lib/asiolink/Makefile.am
index 806aef7c0f..e81b5c1152 100644
--- a/src/lib/asiolink/Makefile.am
+++ b/src/lib/asiolink/Makefile.am
@@ -15,7 +15,7 @@ CLEANFILES = *.gcno *.gcda
 
 lib_LTLIBRARIES = libkea-asiolink.la
 
-libkea_asiolink_la_LDFLAGS = -no-undefined -version-info 2:0:0
+libkea_asiolink_la_LDFLAGS = -no-undefined -version-info 2:1:0
 
 libkea_asiolink_la_SOURCES  = asiolink.h
 libkea_asiolink_la_SOURCES += asio_wrapper.h
diff --git a/src/lib/dhcp/Makefile.am b/src/lib/dhcp/Makefile.am
index ccdb74b2ab..5ed40028ee 100644
--- a/src/lib/dhcp/Makefile.am
+++ b/src/lib/dhcp/Makefile.am
@@ -71,7 +71,7 @@ libkea_dhcp___la_LIBADD  += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink
 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  += $(CRYPTO_LIBS)
-libkea_dhcp___la_LDFLAGS  = -no-undefined -version-info 3:0:0
+libkea_dhcp___la_LDFLAGS  = -no-undefined -version-info 4:0:0
 libkea_dhcp___la_LDFLAGS += $(CRYPTO_LDFLAGS)
 
 EXTRA_DIST  = README libdhcp++.dox
diff --git a/src/lib/dhcp_ddns/Makefile.am b/src/lib/dhcp_ddns/Makefile.am
index b909bd50b8..820f448e72 100644
--- a/src/lib/dhcp_ddns/Makefile.am
+++ b/src/lib/dhcp_ddns/Makefile.am
@@ -34,7 +34,7 @@ libkea_dhcp_ddns_la_CXXFLAGS = $(AM_CXXFLAGS)
 libkea_dhcp_ddns_la_CPPFLAGS = $(AM_CPPFLAGS)
 libkea_dhcp_ddns_la_LDFLAGS  = $(AM_LDFLAGS)
 libkea_dhcp_ddns_la_LDFLAGS += $(CRYPTO_LDFLAGS)
-libkea_dhcp_ddns_la_LDFLAGS += -no-undefined -version-info 1:0:0
+libkea_dhcp_ddns_la_LDFLAGS += -no-undefined -version-info 1:1:0
 
 libkea_dhcp_ddns_la_LIBADD  =
 libkea_dhcp_ddns_la_LIBADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
diff --git a/src/lib/dhcpsrv/Makefile.am b/src/lib/dhcpsrv/Makefile.am
index 7c4574235d..db95dbd5cf 100644
--- a/src/lib/dhcpsrv/Makefile.am
+++ b/src/lib/dhcpsrv/Makefile.am
@@ -194,7 +194,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)
 
-libkea_dhcpsrv_la_LDFLAGS  = -no-undefined -version-info 4:0:0
+libkea_dhcpsrv_la_LDFLAGS  = -no-undefined -version-info 5:0:0
 libkea_dhcpsrv_la_LDFLAGS += $(CRYPTO_LDFLAGS)
 if HAVE_MYSQL
 libkea_dhcpsrv_la_LDFLAGS += $(MYSQL_LIBS)
diff --git a/src/lib/eval/Makefile.am b/src/lib/eval/Makefile.am
index 95cbba0c40..e4968c1a78 100644
--- a/src/lib/eval/Makefile.am
+++ b/src/lib/eval/Makefile.am
@@ -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)
 
-libkea_eval_la_LDFLAGS  = -no-undefined -version-info 3:0:0
+libkea_eval_la_LDFLAGS  = -no-undefined -version-info 4:0:0
 libkea_eval_la_LDFLAGS += $(CRYPTO_LDFLAGS)
 
 EXTRA_DIST  = eval.dox
diff --git a/src/lib/hooks/Makefile.am b/src/lib/hooks/Makefile.am
index de4c5d6635..624e227205 100644
--- a/src/lib/hooks/Makefile.am
+++ b/src/lib/hooks/Makefile.am
@@ -47,7 +47,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 1:0:0
+libkea_hooks_la_LDFLAGS  = $(AM_LDFLAGS) -no-undefined -version-info 2:0:0
 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
diff --git a/src/lib/hooks/hooks.h b/src/lib/hooks/hooks.h
index a851431abd..1f19998d94 100644
--- a/src/lib/hooks/hooks.h
+++ b/src/lib/hooks/hooks.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2013-2015 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2013-2016 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -12,8 +12,8 @@
 
 namespace {
 
-// Version 3 of the hooks framework, set for Kea 1.0.
-const int KEA_HOOKS_VERSION = 3;
+// Version 4 of the hooks framework, set for Kea 1.1.
+const int KEA_HOOKS_VERSION = 4;
 
 // Names of the framework functions.
 const char* const LOAD_FUNCTION_NAME = "load";
diff --git a/src/lib/log/Makefile.am b/src/lib/log/Makefile.am
index c919ea2757..e1185cd1f0 100644
--- a/src/lib/log/Makefile.am
+++ b/src/lib/log/Makefile.am
@@ -48,7 +48,7 @@ libkea_log_la_LIBADD  += $(top_builddir)/src/lib/util/threads/libkea-threads.la
 libkea_log_la_LIBADD  += $(top_builddir)/src/lib/util/libkea-util.la
 libkea_log_la_LIBADD  += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 libkea_log_la_LIBADD  += $(LOG4CPLUS_LIBS)
-libkea_log_la_LDFLAGS = -no-undefined -version-info 1:0:1
+libkea_log_la_LDFLAGS = -no-undefined -version-info 2:0:0
 
 # Specify the headers for copying into the installation directory tree. User-
 # written libraries only need the definitions for logger.h and dependencies.
diff --git a/src/lib/util/Makefile.am b/src/lib/util/Makefile.am
index b6ba4a095a..ff2220a9a6 100644
--- a/src/lib/util/Makefile.am
+++ b/src/lib/util/Makefile.am
@@ -37,7 +37,7 @@ libkea_util_la_SOURCES += random/random_number_generator.h
 
 libkea_util_la_LIBADD = $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 
-libkea_util_la_LDFLAGS  = -no-undefined -version-info 1:0:0
+libkea_util_la_LDFLAGS  = -no-undefined -version-info 2:0:0
 
 CLEANFILES = *.gcno *.gcda