1.4.1 and libtool version fix

git-svn-id: file:///svn/unbound/trunk@1922 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/configure b/configure
index 5c88f8ec12e9c596c281abac94dfed293d35682f..dfd474e41c2ed34da75def30f8242f8d0ada6d84 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for unbound 1.4.0.
+# Generated by GNU Autoconf 2.63 for unbound 1.4.1.
 #
 # Report bugs to <unbound-bugs@nlnetlabs.nl>.
 #
@@ -745,8 +745,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='unbound'
 PACKAGE_TARNAME='unbound'
-PACKAGE_VERSION='1.4.0'
-PACKAGE_STRING='unbound 1.4.0'
+PACKAGE_VERSION='1.4.1'
+PACKAGE_STRING='unbound 1.4.1'
 PACKAGE_BUGREPORT='unbound-bugs@nlnetlabs.nl'
 
 # Factoring default headers for most tests.
@@ -1499,7 +1499,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 unbound 1.4.0 to adapt to many kinds of systems.
+\`configure' configures unbound 1.4.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1564,7 +1564,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of unbound 1.4.0:";;
+     short | recursive ) echo "Configuration of unbound 1.4.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1710,7 +1710,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-unbound configure 1.4.0
+unbound configure 1.4.1
 generated by GNU Autoconf 2.63
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1724,7 +1724,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 unbound $as_me 1.4.0, which was
+It was created by unbound $as_me 1.4.1, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   $ $0 $@
@@ -2093,8 +2093,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-LIBUNBOUND_CURRENT=1
-LIBUNBOUND_REVISION=5
+LIBUNBOUND_CURRENT=2
+LIBUNBOUND_REVISION=1
 LIBUNBOUND_AGE=0
 # 1.0.0 had 0:12:0
 # 1.0.1 had 0:13:0
@@ -2109,7 +2109,8 @@ LIBUNBOUND_AGE=0
 # 1.3.3 had 1:3:0
 # 1.3.4 had 1:4:0
 # 1.4.0-snapshots had 1:5:0
-# 1.4.0 had 2:0:0   # ub_result.why_bogus
+# 1.4.0 had 1:5:0 (not 2:0:0)   # ub_result.why_bogus
+# 1.4.1 had 2:1:0
 
 #   Current  -- the number of the binary API that we're implementing
 #   Revision -- which iteration of the implementation of the binary
@@ -7280,13 +7281,13 @@ if test "${lt_cv_nm_interface+set}" = set; then
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:7283: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:7284: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:7286: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:7287: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:7289: output\"" >&5)
+  (eval echo "\"\$as_me:7290: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -8491,7 +8492,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 8494 "configure"' > conftest.$ac_ext
+  echo '#line 8495 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -9858,11 +9859,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9861: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9862: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9865: \$? = $ac_status" >&5
+   echo "$as_me:9866: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -10197,11 +10198,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10200: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10201: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:10204: \$? = $ac_status" >&5
+   echo "$as_me:10205: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -10302,11 +10303,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10305: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10306: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:10309: \$? = $ac_status" >&5
+   echo "$as_me:10310: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -10357,11 +10358,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10360: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10361: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:10364: \$? = $ac_status" >&5
+   echo "$as_me:10365: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -13160,7 +13161,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 13163 "configure"
+#line 13164 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13256,7 +13257,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 13259 "configure"
+#line 13260 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -23303,7 +23304,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by unbound $as_me 1.4.0, which was
+This file was extended by unbound $as_me 1.4.1, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -23366,7 +23367,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-unbound config.status 1.4.0
+unbound config.status 1.4.1
 configured by $0, generated by GNU Autoconf 2.63,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 

diff --git a/configure.ac b/configure.ac
index 677c4c2452b7a9c0363e7ae0d9391e3564e056ee..49f2bae77e0bbc28ff6371d9ca22b4abd6491da0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -6,10 +6,10 @@ sinclude(acx_pthread.m4)
 sinclude(acx_python.m4)
 sinclude(ac_pkg_swig.m4)
 
-AC_INIT(unbound, 1.4.0, unbound-bugs@nlnetlabs.nl, unbound)
+AC_INIT(unbound, 1.4.1, unbound-bugs@nlnetlabs.nl, unbound)
 
-LIBUNBOUND_CURRENT=1
-LIBUNBOUND_REVISION=5
+LIBUNBOUND_CURRENT=2
+LIBUNBOUND_REVISION=1
 LIBUNBOUND_AGE=0
 # 1.0.0 had 0:12:0
 # 1.0.1 had 0:13:0
@@ -24,7 +24,8 @@ LIBUNBOUND_AGE=0
 # 1.3.3 had 1:3:0
 # 1.3.4 had 1:4:0
 # 1.4.0-snapshots had 1:5:0
-# 1.4.0 had 2:0:0   # ub_result.why_bogus
+# 1.4.0 had 1:5:0 (not 2:0:0)   # ub_result.why_bogus
+# 1.4.1 had 2:1:0
 
 #   Current  -- the number of the binary API that we're implementing
 #   Revision -- which iteration of the implementation of the binary

diff --git a/doc/Changelog b/doc/Changelog
index a143eab62010c0260fc4e267be1c8d293dac87fa..d84675c6bd104861377707e24ae9e605717a2cb8 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,6 +1,9 @@
 26 November 2009: Wouter
        - updated ldns with release candidate for version 1.6.3.
        - tag for 1.4.0 release.
+       - 1.4.1 version in trunk.
+       - Fixup major libtool version to 2 because of why_bogus change.
+         It was 1:5:0 but should have been 2:0:0.
 
 23 November 2009: Wouter
        - Patch from David Hubbard for libunbound manual page.