[SCM] GNU Inetutils branch, master, updated. inetutils-1_8-199-gb1c19ec

[Alfred M. Szmidt]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

The branch, master has been updated
       via  b1c19ecb2408659f68b5cae8eaa1c6c938d35112 (commit)
      from  5051e7b67b04324d26186d39b1954a524e74f7d3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=b1c19ecb2408659f68b5cae8eaa1c6c938d35112


commit b1c19ecb2408659f68b5cae8eaa1c6c938d35112
Author: Alfred M. Szmidt <address@hidden>
Date:   Tue Dec 13 21:07:48 2011 +0100

    Require automake 1.11.1.

diff --git a/ChangeLog b/ChangeLog
index 3ec4e7b..27b948c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-12-13  Alfred M. Szmidt  <address@hidden>
+
+       Require automake 1.11.1.
+
+       * bootstrap: Updated from gnulib.
+
+       * bootstrap.conf (buildreq): Require automake 1.11.1.
+       * configure.ac: Likewise.
+
 2011-12-13  Mats Erik Andersson <address@hidden>
 
        * am/libcurses.m4 (IU_LIB_TERMCAP): Check libtermcap before libcurses.
diff --git a/bootstrap b/bootstrap
index f76db9a..3c39f4a 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Print a version string.
-scriptversion=2011-08-11.17; # UTC
+scriptversion=2011-12-07.20; # UTC
 
 # Bootstrap this package from checked-out sources.
 
@@ -473,6 +473,26 @@ if test $use_libtool = 1; then
   find_tool LIBTOOLIZE glibtoolize libtoolize
 fi
 
+case $buildreq in
+  automake) ;;
+  *) buildreq="automake 1.9
+$buildreq" ;;
+esac
+case $buildreq in
+  autoconf) ;;
+  *) buildreq="autoconf 2.59
+$buildreq" ;;
+esac
+if test ! -d "$local_gl_dir" \
+    || find "$local_gl_dir" -name '*.diff' -exec false {} +; then
+  :
+else
+  case $buildreq in
+    patch) ;;
+    *) buildreq="patch -
+$buildreq" ;;
+  esac
+fi
 if ! printf "$buildreq" | check_versions; then
   echo >&2
   if test -f README-prereq; then
diff --git a/bootstrap.conf b/bootstrap.conf
index 02235c1..5b9020c 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -20,7 +20,7 @@
 # Build prerequisites.
 buildreq="\
 autoconf   2.59
-automake   1.11
+automake   1.11.1
 bison      2.3
 m4         -
 makeinfo   -
diff --git a/configure.ac b/configure.ac
index 817fecc..f418175 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,7 +29,7 @@ AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_HEADER([config.h:config.hin])
 AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE([1.11])
+AM_INIT_AUTOMAKE([1.11.1])
 
 # config.h turns this on, so make sure it's on for our tests too
 #CPPFLAGS=-D_BSD_SOURCE

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog      |    9 +++++++++
 bootstrap      |   22 +++++++++++++++++++++-
 bootstrap.conf |    2 +-
 configure.ac   |    2 +-
 4 files changed, 32 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
GNU Inetutils