[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-183-g9bd82c3

[Ralf Wildenhues]

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 Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=9bd82c3443fe456fc6c81564e13595eab50621bb

The branch, master has been updated
       via  9bd82c3443fe456fc6c81564e13595eab50621bb (commit)
       via  979fc44efcd4dbd42932974772c185bd97ef86cc (commit)
       via  3e5290d9200825c5f1353e60796131045bba4cb6 (commit)
       via  cc43aab4af3c4b1b3428938f73ea1aa241a48f69 (commit)
       via  6491203472057e9314bf654d3874a21b80771ea0 (commit)
      from  7c96a2cd2144a44cfb326ff56fb8822f5be198a5 (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 -----------------------------------------------------------------
commit 9bd82c3443fe456fc6c81564e13595eab50621bb
Merge: 979fc44efcd4dbd42932974772c185bd97ef86cc 
3e5290d9200825c5f1353e60796131045bba4cb6
Author: Ralf Wildenhues <address@hidden>
Date:   Sun May 23 17:22:29 2010 +0200

    Merge branch 'maint'

commit 979fc44efcd4dbd42932974772c185bd97ef86cc
Author: Ralf Wildenhues <address@hidden>
Date:   Sun May 23 14:44:56 2010 +0200

    Fix truncated comment in Makefile.am.
    
    * Makefile.am (sc_tests_logs_duplicate_prefixes): Fix unfinished
    sentence in comment.
    Report by Stefano Lattarini.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

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

Summary of changes:
 ChangeLog           |   33 +++++++++++++++++++++++++++++++++
 Makefile.am         |    2 +-
 THANKS              |    1 +
 configure           |    7 ++++---
 configure.ac        |   10 ++++++----
 lib/gnupload        |    7 +++++--
 tests/nostdinc.test |   26 ++++++++++++++++++++++----
 7 files changed, 72 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8fc9b2c..f8c2dc3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,38 @@
+2010-05-23  Stefano Lattarini  <address@hidden>
+
+       Extend test on `nostdinc' automake option.
+       * tests/nostdinc.test: Enable `errexit' shell flag.  Related and
+       unrelated minor changes.  Make the grepping of the generated
+       Makefile.in slighty stricter.  Generate and run configure, so that
+       the generated Makefile can be grepped too.
+
+2010-05-23  Ralf Wildenhues  <address@hidden>
+
+       Make gnupload portable to EBCDIC hosts.
+       * lib/gnupload: Use literal newline as argument for 'tr' rather
+       than \015, for EBCDIC hosts.  Also, avoid unportable nested
+       double-quotes and backquotes.
+       * THANKS: Update.
+       Report from Eric Blake and Steve Goetze via gnulib.
+
+2010-05-23  Stefano Lattarini  <address@hidden>
+
+       Fix Autoconf version required by Automake's configure.
+       Automake configure script used to tell that automake required
+       autoconf 2.60 or later, but then it checked for autoconf >= 2.62,
+       and if that was not found, it gave an error saying that Automake
+       required configure 2.61a-341 or later.  This change should
+       eliminate such inconsistencies.
+       * configure.ac ($required_autoconf_version): New variable.
+       Use it throughout.
+
 2010-05-23  Ralf Wildenhues  <address@hidden>
 
+       Fix truncated comment in Makefile.am.
+       * Makefile.am (sc_tests_logs_duplicate_prefixes): Fix unfinished
+       sentence in comment.
+       Report by Stefano Lattarini.
+
        Relax silent8.test for NetBSD make.
        * tests/silent8.test: Accept ./foo.info in output as well.
 
diff --git a/Makefile.am b/Makefile.am
index 2f1901e..87091bc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -471,7 +471,7 @@ sc_ensure_testsuite_has_run:
 .PHONY: sc_ensure_testsuite_has_run
 
 ## Ensure our warning and error messages do not contain duplicate 'warning:' 
prefixes.
-## This test actually depends on the testsuite having been run before; but it 
would be
+## This test actually depends on the testsuite having been run before.
 sc_tests_logs_duplicate_prefixes: sc_ensure_testsuite_has_run
        @if grep -E '(warning|error):.*(warning|error):' tests/*.log; then \
          echo 'Duplicate warning/error message prefixes seen in above tests.' 
>&2; \
diff --git a/THANKS b/THANKS
index 91d0f4b..1550cc4 100644
--- a/THANKS
+++ b/THANKS
@@ -323,6 +323,7 @@ Stefan Nordhausen   address@hidden
 Stefano Lattarini      address@hidden
 Stepan Kasal           address@hidden
 Steve M. Robbins       address@hidden
+Steve Goetze           address@hidden
 Steven G. Johnson      address@hidden
 Sven Verdoolaege       address@hidden
 Tamara L. Dahlgren     address@hidden
diff --git a/configure b/configure
index 6bb1f12..2637fe3 100755
--- a/configure
+++ b/configure
@@ -2419,6 +2419,7 @@ HELP2MAN=${HELP2MAN-"${am_missing_run}help2man"}
 # following tests, but some users were unable to figure out that their
 # installation was broken since --version appeared to work.
 
+required_autoconf_version=2.62
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether autoconf is 
installed" >&5
 $as_echo_n "checking whether autoconf is installed... " >&6; }
 if test "${am_cv_autoconf_installed+set}" = set; then :
@@ -2438,7 +2439,7 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_autoconf_installed" >&5
 $as_echo "$am_cv_autoconf_installed" >&6; }
 if test "$am_cv_autoconf_installed" = no; then
-  as_fn_error "Autoconf 2.60 or better is required.
+  as_fn_error "Autoconf $required_autoconf_version or better is required.
     Please make sure it is installed and in your PATH." "$LINENO" 5
 fi
 
@@ -2474,7 +2475,7 @@ if test "${am_cv_autoconf_version+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   mkdir conftest
-echo 'AC''_PREREQ([2.62])' > conftest/conftest.ac
+echo 'AC'"_PREREQ([$required_autoconf_version])" > conftest/conftest.ac
 if { echo "$as_me:$LINENO: cd conftest && eval $am_AUTOCONF -o /dev/null 
conftest.ac" >&5
    (cd conftest && eval $am_AUTOCONF -o /dev/null conftest.ac) >&5 2>&5
    ac_status=$?
@@ -2490,7 +2491,7 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_autoconf_version" >&5
 $as_echo "$am_cv_autoconf_version" >&6; }
 if test "$am_cv_autoconf_version" = no; then
-  as_fn_error "Autoconf 2.61a-341 or better is required." "$LINENO" 5
+  as_fn_error "Autoconf $required_autoconf_version or better is required." 
"$LINENO" 5
 fi
 
 # Test for ln.  We need use it to install the versioned binaries.
diff --git a/configure.ac b/configure.ac
index 9f8eabe..bb22e1c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 # Process this file with autoconf to produce a configure script.
 
 # Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-# 2004, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
+# 2004, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -100,6 +100,7 @@ AM_MISSING_PROG([HELP2MAN], [help2man])
 # following tests, but some users were unable to figure out that their
 # installation was broken since --version appeared to work.
 
+required_autoconf_version=2.62
 AC_CACHE_CHECK([whether autoconf is installed], [am_cv_autoconf_installed],
 [if AM_RUN_LOG([eval $am_AUTOCONF --version]);
 then
@@ -108,7 +109,7 @@ else
   am_cv_autoconf_installed=no
 fi])
 if test "$am_cv_autoconf_installed" = no; then
-  AC_MSG_ERROR([Autoconf 2.60 or better is required.
+  AC_MSG_ERROR([Autoconf $required_autoconf_version or better is required.
     Please make sure it is installed and in your PATH.])
 fi
 
@@ -129,7 +130,8 @@ fi
 
 AC_CACHE_CHECK([whether autoconf is recent enough], [am_cv_autoconf_version],
 [mkdir conftest
-echo 'AC''_PREREQ([[2.62]])' > conftest/conftest.ac
+dnl Creative quoting required to avoid spurious expansion of AC_PREREQ macro
+echo 'AC'"_PREREQ([[$required_autoconf_version]])" > conftest/conftest.ac
 if AM_RUN_LOG([cd conftest && eval $am_AUTOCONF -o /dev/null conftest.ac]);
 then
   am_cv_autoconf_version=yes
@@ -138,7 +140,7 @@ else
 fi
 rm -rf conftest])
 if test "$am_cv_autoconf_version" = no; then
-  AC_MSG_ERROR([Autoconf 2.61a-341 or better is required.])
+  AC_MSG_ERROR([Autoconf $required_autoconf_version or better is required.])
 fi
 
 # Test for ln.  We need use it to install the versioned binaries.
diff --git a/lib/gnupload b/lib/gnupload
index 08cb842..edb4b56 100755
--- a/lib/gnupload
+++ b/lib/gnupload
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Sign files and upload them.
 
-scriptversion=2010-04-25.17; # UTC
+scriptversion=2010-05-23.15; # UTC
 
 # Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
 # Foundation, Inc.
@@ -32,6 +32,8 @@ delete_files=
 delete_symlinks=
 collect_var=
 dbg=
+nl='
+'
 
 usage="Usage: $0 [OPTION]... [CMD] FILE... [[CMD] FILE...]
 
@@ -109,7 +111,8 @@ Send patches to <address@hidden>."
 # Read local configuration file
 if test -r "$conffile"; then
   echo "$0: Reading configuration file $conffile"
-  eval set x "`sed 's/#.*$//;/^$/d' \"$conffile\" | tr '\012\015' '  '` 
\"address@hidden""
+  conf=`sed 's/#.*$//;/^$/d' "$conffile" | tr "\015$nl" '  '`
+  eval set x "$conf \"address@hidden""
   shift
 fi
 
diff --git a/tests/nostdinc.test b/tests/nostdinc.test
index 96e30c5..43535ef 100755
--- a/tests/nostdinc.test
+++ b/tests/nostdinc.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 1999, 2001, 2002  Free Software Foundation, Inc.
+# Copyright (C) 1999, 2001, 2002, 2010 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,8 +18,11 @@
 
 . ./defs || Exit 1
 
+set -e
+
 cat >> configure.in << 'END'
 AC_PROG_CC
+AC_OUTPUT
 END
 
 cat > Makefile.am << 'END'
@@ -28,8 +31,23 @@ bin_PROGRAMS = foo
 foo_SOURCES = foo.c
 END
 
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
+
+grep '.*-I *\.' Makefile.in && Exit 1
+
+# We'll test the fully-processed Makefile too.
+$AUTOCONF
+
+# Test with $builddir != $srcdir
+mkdir build
+cd build
+../configure
+$EGREP '.*-I *(\.|\$.srcdir.)' Makefile && Exit 1
+
+# Test with $builddir = $srcdir
+cd ..
+./configure
+$EGREP '.*-I *(\.|\$.srcdir.)' Makefile && Exit 1
 
-$FGREP -e '-I.' Makefile.in && Exit 1
 Exit 0


hooks/post-receive
-- 
GNU Automake