Bumb version (including .so version)

diff --git a/Makefile.in b/Makefile.in
index 7d544d18d8e1effe0b8cc5842d4b22b0ce8f87aa..fb96eee2d0c47d7e84de779f45c64730e648b66c 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -101,11 +101,10 @@ LDNS_DANE_LOBJS   = examples/ldns-dane.lo
 EX_SSL_PROGS   = examples/ldns-nsec3-hash examples/ldns-revoke examples/ldns-signzone examples/ldns-verify-zone
 EX_SSL_LOBJS   = examples/ldns-nsec3-hash.lo examples/ldns-revoke.lo examples/ldns-signzone.lo examples/ldns-verify-zone.lo
 
-
 COMPILE                = $(CC) $(CPPFLAGS) $(CFLAGS)
 COMP_LIB       = $(LIBTOOL) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS)
 LINK           = $(CC) $(CFLAGS) $(LDFLAGS) $(LIBS)
-LINK_LIB       = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -version-number $(version_info) -no-undefined
+LINK_LIB       = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -version-info $(version_info) -no-undefined
 LINK_EXE       = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $(LIBSSL_LDFLAGS)
 
 .PHONY:        clean realclean docclean manpages doc lint all lib pyldns test
@@ -287,7 +286,7 @@ ldns_wrapper.lo: $(pywrapdir)/ldns_wrapper.c ldns/config.h
        $(COMP_LIB) -I./include/ldns $(PYTHON_CPPFLAGS) $(PYTHON_X_CFLAGS) -c $(pywrapdir)/ldns_wrapper.c -o $@
 
 _ldns.la: ldns_wrapper.lo libldns.la 
-       $(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) $(PYTHON_CFLAGS) $(LDFLAGS) $(PYTHON_LDFLAGS) -module -version-number $(version_info) -no-undefined -o $@ ldns_wrapper.lo -rpath $(python_site) -L. -L.libs -lldns $(LIBS)
+       $(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) $(PYTHON_CFLAGS) $(LDFLAGS) $(PYTHON_LDFLAGS) -module -version-info $(version_info) -no-undefined -o $@ ldns_wrapper.lo -rpath $(python_site) -L. -L.libs -lldns $(LIBS)
 
 $(p5_dns_ldns_dir)/Makefile: $(p5_dns_ldns_dir)/Makefile.PL
        BUILDDIR=`pwd`; cd $(p5_dns_ldns_dir); $(PERL) Makefile.PL PREFIX="$(prefix)" LIBS="-L$$BUILDDIR/.libs -lldns" INC="-I$$BUILDDIR"

diff --git a/configure.ac b/configure.ac
index 5387312664bc32ffdbab35a521e20beaf4d12132..cf404f602bb6e4dfa4eb037b84c84274465df157 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -5,15 +5,30 @@ sinclude(acx_nlnetlabs.m4)
 
 # must be numbers. ac_defun because of later processing.
 m4_define([VERSION_MAJOR],[1])
-m4_define([VERSION_MINOR],[6])
-m4_define([VERSION_MICRO],[17])
+m4_define([VERSION_MINOR],[7])
+m4_define([VERSION_MICRO],[0])
 AC_INIT(ldns, m4_defn([VERSION_MAJOR]).m4_defn([VERSION_MINOR]).m4_defn([VERSION_MICRO]), libdns@nlnetlabs.nl, libdns)
 AC_CONFIG_SRCDIR([packet.c])
 # needed to build correct soname
 AC_SUBST(LDNS_VERSION_MAJOR, [VERSION_MAJOR])
 AC_SUBST(LDNS_VERSION_MINOR, [VERSION_MINOR])
 AC_SUBST(LDNS_VERSION_MICRO, [VERSION_MICRO])
-AC_SUBST(VERSION_INFO, [VERSION_MAJOR:VERSION_MINOR:VERSION_MICRO])
+
+# Library version
+# ---------------
+# current:revision:age
+# (binary-api-number):(which-binary-api-version):(how-many-nrs-backwardscompat)
+# if source code changes increment revision
+# if any interfaces have been added/removed/changed since last update then
+#   increment current and set revision to 0
+# if any interfaces have been added since the last public release then increment age
+# if any interfaces have been removed or changed since the last public release then
+#   set age to 0
+#
+# ldns-1.6.17 and before had a .so with version same as VERSION_INFO
+# ldns-1.7.0 will have libversion 2:0:0
+#
+AC_SUBST(VERSION_INFO, [2:0:0])
 
 AC_AIX
 if test "$ac_cv_header_minix_config_h" = "yes"; then

diff --git a/drill/configure.ac b/drill/configure.ac
index a11d131fffdf59c684327809549e48104c3b7f5e..7a726da2a6470ace8c27e53a976c9e46dececc54 100644 (file)
--- a/drill/configure.ac
+++ b/drill/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.56)
-AC_INIT(ldns, 1.6.17, libdns@nlnetlabs.nl,libdns)
+AC_INIT(ldns, 1.7.0, libdns@nlnetlabs.nl,libdns)
 AC_CONFIG_SRCDIR([drill.c])
 sinclude(../acx_nlnetlabs.m4)
 

diff --git a/examples/configure.ac b/examples/configure.ac
index e33983e771854a86e523eabad47e1552cb98caac..f692a4dceca38cde344f3b97c58bc33d4b86cde2 100644 (file)
--- a/examples/configure.ac
+++ b/examples/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.56)
-AC_INIT(ldns, 1.6.17, libdns@nlnetlabs.nl,libdns)
+AC_INIT(ldns, 1.7.0, libdns@nlnetlabs.nl,libdns)
 AC_CONFIG_SRCDIR([ldns-read-zone.c])
 sinclude(../acx_nlnetlabs.m4)
 

diff --git a/examples/nsd-test/configure.ac b/examples/nsd-test/configure.ac
index a129a2bd3ca7c9065aede77057a3149360e761d1..5cd62ca6811a899e0f560bdb41a2c969b2f6728c 100644 (file)
--- a/examples/nsd-test/configure.ac
+++ b/examples/nsd-test/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.57)
-AC_INIT(ldns, 1.6.17, libdns@nlnetlabs.nl,libdns)
+AC_INIT(ldns, 1.7.0, libdns@nlnetlabs.nl,libdns)
 AC_CONFIG_SRCDIR([nsd-ldnsd.c])
 
 OURCPPFLAGS='-D_POSIX_C_SOURCE=200112 -D_XOPEN_SOURCE=600 -D__EXTENSIONS__ -D__BSD_VISIBLE'

diff --git a/lua/configure.ac b/lua/configure.ac
index eb3bb8ea10a1fe0baa7619e8cca0c5669fa0b821..c31ec46f068e82906ec87290a9999965ebc8d901 100644 (file)
--- a/lua/configure.ac
+++ b/lua/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.57)
-AC_INIT(ldns-tests, 1.6.17, libdns@nlnetlabs.nl, ldns-tests-1.0)
+AC_INIT(ldns-tests, 1.7.0, libdns@nlnetlabs.nl, ldns-tests-1.0)
 AC_CONFIG_SRCDIR([../ldns/config.h])
 
 AC_AIX

diff --git a/pcat/configure.ac b/pcat/configure.ac
index f9c7679b1181f773652613917acea1ed17154964..61c68f73dda222b2195ab2ed339519e3b92a54e5 100644 (file)
--- a/pcat/configure.ac
+++ b/pcat/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.57)
-AC_INIT(pcat, 1.6.17, libdns@nlnetlabs.nl,pcat)
+AC_INIT(pcat, 1.7.0, libdns@nlnetlabs.nl,pcat)
 AC_CONFIG_SRCDIR([pcat.c])
 
 OURCPPFLAGS=''