From 065b65d3b78be0b6eb55690a01160eae069e7f15 Mon Sep 17 00:00:00 2001 From: Willem Toorop Date: Wed, 14 Jan 2015 14:16:41 +0100 Subject: [PATCH] Bump version to 0.1.6 (library version 1.1.1) --- aclocal.m4 | 55 +++++++++++++++++++++++++++++++++++++++++++++++++ configure | 44 ++++++++++++++++++++++++++++++--------- configure.ac | 27 ++++++++++++++++++++++-- src/Makefile.in | 15 +------------- 4 files changed, 115 insertions(+), 26 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 2a416518..df4ab554 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -172,6 +172,61 @@ else fi[]dnl ])# PKG_CHECK_MODULES + +# PKG_INSTALLDIR(DIRECTORY) +# ------------------------- +# Substitutes the variable pkgconfigdir as the location where a module +# should install pkg-config .pc files. By default the directory is +# $libdir/pkgconfig, but the default can be changed by passing +# DIRECTORY. The user can override through the --with-pkgconfigdir +# parameter. +AC_DEFUN([PKG_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([pkgconfigdir], + [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, + [with_pkgconfigdir=]pkg_default) +AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +]) dnl PKG_INSTALLDIR + + +# PKG_NOARCH_INSTALLDIR(DIRECTORY) +# ------------------------- +# Substitutes the variable noarch_pkgconfigdir as the location where a +# module should install arch-independent pkg-config .pc files. By +# default the directory is $datadir/pkgconfig, but the default can be +# changed by passing DIRECTORY. The user can override through the +# --with-noarch-pkgconfigdir parameter. +AC_DEFUN([PKG_NOARCH_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([noarch-pkgconfigdir], + [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, + [with_noarch_pkgconfigdir=]pkg_default) +AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +]) dnl PKG_NOARCH_INSTALLDIR + + +# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, +# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# ------------------------------------------- +# Retrieves the value of the pkg-config variable for the given module. +AC_DEFUN([PKG_CHECK_VAR], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl + +_PKG_CONFIG([$1], [variable="][$3]["], [$2]) +AS_VAR_COPY([$1], [pkg_cv_][$1]) + +AS_VAR_IF([$1], [""], [$5], [$4])dnl +])# PKG_CHECK_VAR + m4_include([m4/ax_check_compile_flag.m4]) m4_include([m4/libtool.m4]) m4_include([m4/ltoptions.m4]) diff --git a/configure b/configure index 9f9a8889..23e5cfb9 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for getdns 0.1.5. +# Generated by GNU Autoconf 2.69 for getdns 0.1.6. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='getdns' PACKAGE_TARNAME='getdns' -PACKAGE_VERSION='0.1.5' -PACKAGE_STRING='getdns 0.1.5' +PACKAGE_VERSION='0.1.6' +PACKAGE_STRING='getdns 0.1.6' PACKAGE_BUGREPORT='stub-resolver@verisignlabs.com' PACKAGE_URL='http://getdnsapi.net' @@ -701,6 +701,7 @@ CPPFLAGS LDFLAGS CFLAGS CC +GETDNS_LIBVERSION GETDNS_COMPILATION_COMMENT target_alias host_alias @@ -1314,7 +1315,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures getdns 0.1.5 to adapt to many kinds of systems. +\`configure' configures getdns 0.1.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1379,7 +1380,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of getdns 0.1.5:";; + short | recursive ) echo "Configuration of getdns 0.1.6:";; esac cat <<\_ACEOF @@ -1499,7 +1500,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -getdns configure 0.1.5 +getdns configure 0.1.6 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1931,7 +1932,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by getdns $as_me 0.1.5, which was +It was created by getdns $as_me 0.1.6, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2280,7 +2281,30 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu CURRENT_DATE=`LC_ALL=C date` -GETDNS_COMPILATION_COMMENT="getdns 0.1.5 configured on $CURRENT_DATE for the September 2014 version of the API" +GETDNS_COMPILATION_COMMENT="getdns 0.1.6 configured on $CURRENT_DATE for the January 2015 version of the API" + +# 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 +# if api unchanged: no changes +# if api broken: current++ ; revision = 0; age = 0 +# if programs compiled against existing library work and link with new +# version of library with new binary api: revision++; age++ +# +# getdns-0.1.4 had libversion 0:0:0 +# getdns-0.1.5 had libversion 1:0:0 +# getdns-0.1.6 has libversion 1:1:1 +# +GETDNS_LIBVERSION=1:1:0 + + # AM_INIT_AUTOMAKE @@ -13520,7 +13544,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by getdns $as_me 0.1.5, which was +This file was extended by getdns $as_me 0.1.6, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13587,7 +13611,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -getdns config.status 0.1.5 +getdns config.status 0.1.6 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 1f32b1ce..e63ad705 100755 --- a/configure.ac +++ b/configure.ac @@ -30,10 +30,33 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. AC_PREREQ([2.56]) -AC_INIT([getdns], [0.1.5], [stub-resolver@verisignlabs.com], [], [http://getdnsapi.net]) +AC_INIT([getdns], [0.1.6], [stub-resolver@verisignlabs.com], [], [http://getdnsapi.net]) CURRENT_DATE=`LC_ALL=C date` -GETDNS_COMPILATION_COMMENT="AC_PACKAGE_STRING configured on $CURRENT_DATE for the September 2014 version of the API" +GETDNS_COMPILATION_COMMENT="AC_PACKAGE_STRING configured on $CURRENT_DATE for the January 2015 version of the API" + +# 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 +# if api unchanged: no changes +# if api broken: current++ ; revision = 0; age = 0 +# if programs compiled against existing library work and link with new +# version of library with new binary api: revision++; age++ +# +# getdns-0.1.4 had libversion 0:0:0 +# getdns-0.1.5 had libversion 1:0:0 +# getdns-0.1.6 has libversion 1:1:1 +# +GETDNS_LIBVERSION=1:1:0 + AC_SUBST(GETDNS_COMPILATION_COMMENT) +AC_SUBST(GETDNS_LIBVERSION) AC_CONFIG_SRCDIR([src/getdns/getdns.h.in]) # AM_INIT_AUTOMAKE # LT_INIT diff --git a/src/Makefile.in b/src/Makefile.in index aed9dbcf..453d728e 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -30,20 +30,7 @@ package = @PACKAGE_NAME@ version = @PACKAGE_VERSION@ tarname = @PACKAGE_TARNAME@ distdir = $(tarname)-$(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 -# if api unchanged: no changes -# if api broken: current++ ; revision = 0; age = 0 -# if programs compiled against existing library work and link with new -# version of library with new binary api: revision++; age++ -libversion = 1:0:0 +libversion = @GETDNS_LIBVERSION@ prefix = @prefix@ exec_prefix = @exec_prefix@