[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.12-28-g99dc7ac

[Stefano Lattarini]

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=99dc7acd670f31595dae28ff0a3970e5b484e1e4

The branch, maint has been updated
       via  99dc7acd670f31595dae28ff0a3970e5b484e1e4 (commit)
       via  c5efa2704646803fadd4f42d9985c0c714d85f3c (commit)
       via  22e26c6f413402afbfb0536566db03119d59ed83 (commit)
       via  06ed2f31cdf18dfcd12b5c79475d3288bcf19648 (commit)
       via  f44ae9eaac3e22bd318dcca0cb37e23d0feb6ee8 (commit)
       via  b105d40dc70fde616dd222c03ae642317fa205a6 (commit)
      from  d6294a1283a3d88665ca9ec1592e959517172e59 (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 99dc7acd670f31595dae28ff0a3970e5b484e1e4
Author: Stefano Lattarini <address@hidden>
Date:   Mon Apr 30 21:43:21 2012 +0200

    news: Automake 1.13 will require Autoconf >= 2.65
    
    Autoconf 2.65 is almost three years old now, so requiring it is
    acceptable.  Also, the soon-to-appear support for Objective C++
    in Automake will be simplified if we can assume that Autoconf
    version (which is the one that introduced support for Objective
    C++).
    
    * NEWS (Planned future backward-incompatibilities): Automake 1.13
    will require Autoconf 2.65 or later.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit c5efa2704646803fadd4f42d9985c0c714d85f3c
Author: Stefano Lattarini <address@hidden>
Date:   Mon Apr 30 21:29:34 2012 +0200

    news: put planned future backward-incompatibilities on top
    
    * NEWS (New in 1.12): List of planned future backward-incompatibilities
    moved from here ...
    (New in 1.12.1): ... to here.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit 22e26c6f413402afbfb0536566db03119d59ed83
Author: Stefano Lattarini <address@hidden>
Date:   Mon Apr 30 21:25:37 2012 +0200

    readme: update INSTALL to latest version from Autoconf
    
    * INSTALL: Updated to the version coming with Autoconf 2.69.  This
    is warranted now that we use and require that same Autoconf version
    in our build system.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit 06ed2f31cdf18dfcd12b5c79475d3288bcf19648
Author: Stefano Lattarini <address@hidden>
Date:   Mon Apr 30 21:18:36 2012 +0200

    sync: some auxiliary files synced from upstream
    
    * lib/config.sub: Synced from upstream, by "make fetch".
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit f44ae9eaac3e22bd318dcca0cb37e23d0feb6ee8
Author: Stefano Lattarini <address@hidden>
Date:   Mon Apr 30 21:17:06 2012 +0200

    hacking: copyright notices must be updated before releasing
    
    * HACKING (Release procedure): Suggest to use "make update-copyright".
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit b105d40dc70fde616dd222c03ae642317fa205a6
Author: Stefano Lattarini <address@hidden>
Date:   Mon Apr 30 20:44:50 2012 +0200

    color-tests: coloring can be forced on non-ANSI terminals as well
    
    Before this change, colorization of testsuite output was suppressed
    whenever the terminal was recognized to be a "dumb" one, incapable
    of handling ANSI coloring (i.e., when the environment variable TERM
    had a value of "dumb").  This happened even when the AM_COLOR_TESTS
    variable was set to a value of "always".
    
    Such a behaviour was suboptimal and slightly confusing; in fact, if
    a user wants to force coloring of testsuite output that is being
    redirected to a regular file, he should be able to do so even if his
    terminal is not capable of handling ANSI colors -- in fact, such
    terminal wouldn't be involved with the testsuite output in any way,
    so why should it be allowed to influence it?
    
    Thus, we now enable coloring of test output whenever AM_COLOR_TESTS
    is set to "always", irrespective of the value of the TERM environment
    variable.
    
    * NEWS: Update.
    * lib/am/check.am [%?COLOR%] (am__tty_colors): Activate colorization
    of testsuite output whenever AM_COLOR_TESTS has the value of "always".
    * t/ax/tap-summary-aux.sh: Export the TERM environment variable to
    "dumb" when forcing colorization of the testsuite output; this should
    *not* prevent such colorization from taking place, and we want to
    check that this expectation really holds.
    * t/ax/testsuite-summary-checks.sh: Likewise.
    * t/color.sh: Likewise, and adjust some grepping checks.
    * t/tap-color.sh: Likewise.  Also, remove redundant "make check"
    invocation since we are at it.
    * t/color2.sh: Likewise, and check that exporting TERM=dumb actually
    prevents testsuite output colorization when AM_COLOR_TESTS is unset.
    * t/parallel-tests-reset-term.sh: Relax, to prevent it from failing
    spuriously due to the new semantic.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

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

Summary of changes:
 HACKING                          |    4 ++++
 INSTALL                          |    8 ++++----
 NEWS                             |   35 ++++++++++++++++++++++++-----------
 lib/am/check.am                  |   38 +++++++++++++++++++++-----------------
 lib/config.sub                   |    8 +++++++-
 t/ax/tap-summary-aux.sh          |    4 +++-
 t/ax/testsuite-summary-checks.sh |    4 +++-
 t/color.sh                       |    9 ++++++---
 t/color2.sh                      |   12 +++++++-----
 t/parallel-tests-reset-term.sh   |   21 ++++-----------------
 t/tap-color.sh                   |   15 +++++++--------
 11 files changed, 90 insertions(+), 68 deletions(-)

diff --git a/HACKING b/HACKING
index e3153cc..7ab4e7f 100644
--- a/HACKING
+++ b/HACKING
@@ -223,6 +223,10 @@
   running "make fetch".  In case any file in the automake repository
   has been updated, commit and re-run the testsuite.
 
+* Ensure that the copyright notices of the distributed files is up to
+  date.  The maintainer-only target "update-copyright" can help with
+  this.
+
 * Update NEWS.
 
 * Update the version number in configure.ac.
diff --git a/INSTALL b/INSTALL
index a1e89e1..6e90e07 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,7 +1,7 @@
 Installation Instructions
 *************************
 
-Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation,
+Copyright (C) 1994-1996, 1999-2002, 2004-2012 Free Software Foundation,
 Inc.
 
    Copying and distribution of this file, with or without modification,
@@ -309,9 +309,10 @@ causes the specified `gcc' to be used as the C compiler 
(unless it is
 overridden in the site shell script).
 
 Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf bug.  Until the bug is fixed you can use this workaround:
+an Autoconf limitation.  Until the limitation is lifted, you can use
+this workaround:
 
-     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+     CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
 
 `configure' Invocation
 ======================
@@ -367,4 +368,3 @@ operates.
 
 `configure' also accepts some other, not widely useful, options.  Run
 `configure --help' for more details.
-
diff --git a/NEWS b/NEWS
index b415be6..f2181f6 100644
--- a/NEWS
+++ b/NEWS
@@ -1,18 +1,11 @@
 New in 1.12.1:
 
-* Deprecated obsolescent features:
-
-  - The long-obsolete (since 1.10) automake-provided $(mkdir_p) make
-    variable, @mkdir_p@ configure-time substitution and AM_PROG_MKDIR
-    m4 macro are deprecated, eliciting a warning in the 'obsolete'
-    category.  They will be removed in the next major version (1.13).
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-New in 1.12:
-
 * WARNING: Future backward-incompatibilities!
 
+  - Autoconf 2.65 or later will be required by the next major Automake
+    version (1.13).  Until now, Automake has been working with any
+    Autoconf version up to 2.62.
+
   - Starting from the next major Automake version (1.13), the rules to
     build pdf, ps and dvi output from Texinfo input will use the '--tidy'
     option by default.  Since such an option was introduced in Texinfo
@@ -60,6 +53,26 @@ New in 1.12:
     search path are looked up is probably going to be changed in the
     next Automake release (1.13).
 
+* Deprecated obsolescent features:
+
+  - The long-obsolete (since 1.10) automake-provided $(mkdir_p) make
+    variable, @mkdir_p@ configure-time substitution and AM_PROG_MKDIR
+    m4 macro are deprecated, eliciting a warning in the 'obsolete'
+    category.  They will be removed in the next major version (1.13).
+
+Bugs fixed in 1.12.1:
+
+* Long-standing bugs:
+
+  - When the 'color-tests' option is in use, forcing of colored testsuite
+    output through "AM_COLOR_TESTS=always" works even if the terminal is
+    a non-ANSI one, i.e., if the TERM environment variable has a value of
+    "dumb".
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+New in 1.12:
+
 * Obsolete features removed:
 
   - The never documented nor truly used script 'acinstall' has been
diff --git a/lib/am/check.am b/lib/am/check.am
index 7866570..73febb1 100644
--- a/lib/am/check.am
+++ b/lib/am/check.am
@@ -18,23 +18,27 @@ am__tty_colors_dummy = \
   mgn= red= grn= lgn= blu= brg= std=; \
   am__color_tests=no
 if %?COLOR%
-# If stdout is a non-dumb tty, use colors.  If test -t is not supported,
-# then this fails; a conservative approach.  Of course do not redirect
-# stdout here, just stderr.
-am__tty_colors = \
-$(am__tty_colors_dummy); \
-test "X$(AM_COLOR_TESTS)" != Xno \
-&& test "X$$TERM" != Xdumb \
-&& { test "X$(AM_COLOR_TESTS)" = Xalways || test -t 1 2>/dev/null; } \
-&& { \
-  am__color_tests=yes; \
-  red=''; \
-  grn=''; \
-  lgn=''; \
-  blu=''; \
-  mgn=''; \
-  brg=''; \
-  std=''; \
+am__tty_colors = { \
+  $(am__tty_colors_dummy); \
+  if test "X$(AM_COLOR_TESTS)" = Xno; then \
+    am__color_tests=no; \
+  elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
+    am__color_tests=yes; \
+## If stdout is a non-dumb tty, use colors.  If test -t is not supported,
+## then this check fails; a conservative approach.  Of course do not
+## redirect stdout here, just stderr.
+  elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
+    am__color_tests=yes; \
+  fi; \
+  if test $$am__color_tests = yes; then \
+    red=''; \
+    grn=''; \
+    lgn=''; \
+    blu=''; \
+    mgn=''; \
+    brg=''; \
+    std=''; \
+  fi; \
 }
 else !%?COLOR%
 am__tty_colors = $(am__tty_colors_dummy)
diff --git a/lib/config.sub b/lib/config.sub
index c894da4..59bb593 100755
--- a/lib/config.sub
+++ b/lib/config.sub
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
 #   2011, 2012 Free Software Foundation, Inc.
 
-timestamp='2012-02-10'
+timestamp='2012-04-18'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -225,6 +225,12 @@ case $os in
        -isc*)
                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
                ;;
+       -lynx*178)
+               os=-lynxos178
+               ;;
+       -lynx*5)
+               os=-lynxos5
+               ;;
        -lynx*)
                os=-lynxos
                ;;
diff --git a/t/ax/tap-summary-aux.sh b/t/ax/tap-summary-aux.sh
index 6e6a74a..3848fd1 100644
--- a/t/ax/tap-summary-aux.sh
+++ b/t/ax/tap-summary-aux.sh
@@ -56,7 +56,9 @@ do_check ()
   cat all.test
   st=0
   if test $use_colors = yes; then
-    make_cmd="env TERM=ansi AM_COLOR_TESTS=always $MAKE -e"
+    # Forced colorization should take place also with non-ANSI terminals;
+    # hence the "TERM=dumb" definition.
+    make_cmd="env TERM=dumb AM_COLOR_TESTS=always $MAKE -e"
   else
     make_cmd=$MAKE
   fi
diff --git a/t/ax/testsuite-summary-checks.sh b/t/ax/testsuite-summary-checks.sh
index 309d473..aed0000 100644
--- a/t/ax/testsuite-summary-checks.sh
+++ b/t/ax/testsuite-summary-checks.sh
@@ -26,7 +26,9 @@ am_parallel_tests=yes
 case $use_colors in
   yes)
     AM_COLOR_TESTS=always; export AM_COLOR_TESTS
-    TERM=ansi; export TERM
+    # Forced colorization should take place also with non-ANSI
+    # terminals; hence this setting.
+    TERM=dumb; export TERM
     am_opts='parallel-tests color-tests'
     ;;
   no)
diff --git a/t/color.sh b/t/color.sh
index 6db4454..c9fe302 100755
--- a/t/color.sh
+++ b/t/color.sh
@@ -102,7 +102,7 @@ test_no_color ()
   # print the whole failing recipe on standard output, we should content
   # ourselves with a laxer check, to avoid false positives.
   # Keep this in sync with lib/am/check.am:$(am__color_tests).
-  if $FGREP '= Xalways || test -t 1 ' stdout; then
+  if $FGREP '= Xalways; then' stdout; then
     # Extra verbose make, resort to laxer checks.
     # Note that we also want to check that the testsuite summary is
     # not unduly colorized.
@@ -141,11 +141,14 @@ for vpath in false :; do
 
   $srcdir/configure
 
-  AM_COLOR_TESTS=always $MAKE -e check >stdout && { cat stdout; Exit 1; }
+  # Forced colorization should take place also with non-ANSI terminals;
+  # hence the "TERM=dumb" definition.
+  TERM=dumb AM_COLOR_TESTS=always $MAKE -e check >stdout \
+    && { cat stdout; Exit 1; }
   cat stdout
   test_color
 
-  $MAKE -e check >stdout && { cat stdout; Exit 1; }
+  TERM=ansi $MAKE -e check >stdout && { cat stdout; Exit 1; }
   cat stdout
   test_no_color
 
diff --git a/t/color2.sh b/t/color2.sh
index b1c8830..75f5034 100755
--- a/t/color2.sh
+++ b/t/color2.sh
@@ -19,9 +19,6 @@
 
 . ./defs || Exit 1
 
-TERM=ansi
-export TERM
-
 esc=''
 # Escape '[' for grep, below.
 red="$esc\[0;31m"
@@ -132,7 +129,7 @@ test_no_color ()
   # print the whole failing recipe on standard output, we should content
   # ourselves with a laxer check, to avoid false positives.
   # Keep this in sync with lib/am/check.am:$(am__color_tests).
-  if $FGREP '= Xalways || test -t 1 ' stdout; then
+  if $FGREP '= Xalways; then' stdout; then
     # Extra verbose make, resort to laxer checks.
     # Note that we also want to check that the testsuite summary is
     # not unduly colorized.
@@ -176,11 +173,16 @@ for vpath in false :; do
 
   $srcdir/configure
 
-  MAKE=$MAKE expect -f $srcdir/expect-make >stdout \
+  TERM=ansi MAKE=$MAKE expect -f $srcdir/expect-make >stdout \
     || { cat stdout; Exit 1; }
   cat stdout
   test_color
 
+  TERM=dumb MAKE=$MAKE expect -f $srcdir/expect-make >stdout \
+    || { cat stdout; Exit 1; }
+  cat stdout
+  test_no_color
+
   AM_COLOR_TESTS=no MAKE=$MAKE expect -f $srcdir/expect-make >stdout \
     || { cat stdout; Exit 1; }
   cat stdout
diff --git a/t/parallel-tests-reset-term.sh b/t/parallel-tests-reset-term.sh
index 6307f6e..53e542c 100755
--- a/t/parallel-tests-reset-term.sh
+++ b/t/parallel-tests-reset-term.sh
@@ -22,6 +22,8 @@ am_parallel_tests=yes
 
 esc='['
 
+TERM=ansi; export TERM
+
 # Check that grep can parse nonprinting characters.
 # BSD 'grep' works from a pipe, but not a seekable file.
 # GNU or BSD 'grep -a' works on files, but is not portable.
@@ -43,14 +45,13 @@ END
 cat > foobar << 'END'
 #!/bin/sh
 echo "TERM='$TERM'"
-echo "expected_term='$expected_term'"
-test x"$TERM" = x"$expected_term"
+test x"$TERM" = x"dumb"
 END
 chmod a+x foobar
 
 mkcheck ()
 {
-  if env AM_COLOR_TESTS=always $* $MAKE check > stdout; then
+  if $MAKE "$@" check > stdout; then
     rc=0
   else
     rc=1
@@ -66,24 +67,10 @@ $AUTOCONF
 $AUTOMAKE -a
 ./configure
 
-TERM=ansi; export TERM
-expected_term=dumb; export expected_term
 mkcheck TESTS_ENVIRONMENT='TERM=dumb'
 cat stdout | grep "PASS.*foobar" | $FGREP "$esc"
 
-TERM=dumb; export TERM
-expected_term=ansi; export expected_term
-mkcheck TESTS_ENVIRONMENT='TERM=ansi'
-cat stdout | $FGREP "$esc" && Exit 1
-
-TERM=ansi; export TERM
-expected_term=dumb; export expected_term
 mkcheck AM_TESTS_ENVIRONMENT='TERM=dumb'
 cat stdout | grep "PASS.*foobar" | $FGREP "$esc"
 
-TERM=dumb; export TERM
-expected_term=ansi; export expected_term
-mkcheck AM_TESTS_ENVIRONMENT='TERM=ansi'
-cat stdout | $FGREP "$esc" && Exit 1
-
 :
diff --git a/t/tap-color.sh b/t/tap-color.sh
index b8c4004..b803306 100755
--- a/t/tap-color.sh
+++ b/t/tap-color.sh
@@ -20,8 +20,6 @@
 am_parallel_tests=yes
 . ./defs || Exit 1
 
-TERM=ansi; export TERM
-
 esc=''
 # Escape '[' for grep, below.
 red="$esc\[0;31m"
@@ -102,9 +100,6 @@ ok 1
 ok 2
 END
 
-AM_COLOR_TESTS=always $MAKE check >stdout && { cat stdout; Exit 1; }
-cat stdout
-
 test_color ()
 {
   # Not a useless use of cat; see above comments about grep.
@@ -134,7 +129,7 @@ test_no_color ()
   # print the whole failing recipe on standard output, we should content
   # ourselves with a laxer check, to avoid false positives.
   # Keep this in sync with lib/am/check.am:$(am__color_tests).
-  if $FGREP '= Xalways || test -t 1 ' stdout; then
+  if $FGREP '= Xalways; then' stdout; then
     # Extra verbose make, resort to laxer checks.
     # But we also want to check that the testsuite summary is not unduly
     # colorized.
@@ -162,11 +157,15 @@ test_no_color ()
   fi
 }
 
-AM_COLOR_TESTS=always $MAKE check >stdout && { cat stdout; Exit 1; }
+# Forced colorization should take place also with non-ANSI terminals;
+# hence the "TERM=dumb" definition.
+TERM=dumb AM_COLOR_TESTS=always $MAKE check >stdout \
+  && { cat stdout; Exit 1; }
 cat stdout
 test_color
 
-$MAKE -e check >stdout && { cat stdout; Exit 1; }
+TERM=ansi $MAKE -e check >stdout \
+  && { cat stdout; Exit 1; }
 cat stdout
 test_no_color
 


hooks/post-receive
-- 
GNU Automake