From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Mon, 30 Apr 2012 21:34:17 +0000 (+0200)
Subject: Merge branch 'master' into ng/master
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4980dc1f15c5516d46c434f21784d1d4e9707c40;p=thirdparty%2Fautomake.git

Merge branch 'master' into ng/master

* master:
  news: Automake 1.13 will require Autoconf >= 2.65
  news: put planned future backward-incompatibilities on top
  readme: update INSTALL to latest version from Autoconf
  sync: some auxiliary files synced from upstream
  hacking: copyright notices must be updated before releasing
  color-tests: coloring can be forced on non-ANSI terminals as well
  tests: root can write on files without write perms; cater for this
  tests: require lex, not yacc, in a lex test case
  AM_PROG_MKDIR_P: remove as obsolete
  AM_PROG_MKDIR_P: deprecate, to be removed in Automake 1.13
  maint: fix a comment typo

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
---

4980dc1f15c5516d46c434f21784d1d4e9707c40
diff --cc Makefile.am
index bc8d5575f,5fb8fe320..5e901092a
--- a/Makefile.am
+++ b/Makefile.am
@@@ -285,9 -273,9 +285,8 @@@ dist_automake_ac_DATA = 
    m4/lex.m4 \
    m4/lispdir.m4 \
    m4/maintainer.m4 \
 -  m4/make.m4 \
    m4/minuso.m4 \
    m4/missing.m4 \
-   m4/mkdirp.m4 \
    m4/options.m4 \
    m4/protos.m4 \
    m4/python.m4 \
diff --cc configure.ac
index 25208bded,6c4208a18..f92902a1f
--- a/configure.ac
+++ b/configure.ac
@@@ -40,10 -40,10 +40,10 @@@ dnl We call AC_PROG_CC in an unusual wa
  dnl testsuite, so also use 'no-dependencies' and 'no-define' among
  dnl the automake options to avoid bloating and potential problems.
  AM_INIT_AUTOMAKE([dist-xz filename-length-max=99 color-tests
 -		  parallel-tests silent-rules no-define no-dependencies])
 +                  parallel-tests no-define no-dependencies])
  
  ## Keep this on a line of its own, since it must be found and processed
- ## by the 'update-copyright' rule in out Makefile.
+ ## by the 'update-copyright' rule in our Makefile.
  RELEASE_YEAR=2012
  AC_SUBST([RELEASE_YEAR])
  
diff --cc t/ax/tap-summary-aux.sh
index 49b86f287,3848fd1b4..77dd09820
--- a/t/ax/tap-summary-aux.sh
+++ b/t/ax/tap-summary-aux.sh
@@@ -56,7 -56,9 +56,9 @@@ do_check (
    cat all.test
    st=0
    if test $use_colors = yes; then
-     make_cmd="$MAKE TERM=ansi AM_COLOR_TESTS=always"
+     # 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"
++    make_cmd="$MAKE TERM=dumb AM_COLOR_TESTS=always"
    else
      make_cmd=$MAKE
    fi
diff --cc t/color.sh
index edae625e0,c9fe302d0..a08ea1913
--- a/t/color.sh
+++ b/t/color.sh
@@@ -114,11 -141,14 +114,14 @@@ for vpath in false :; d
  
    $srcdir/configure
  
-   $MAKE check AM_COLOR_TESTS=always >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 \
++  $MAKE check AM_COLOR_TESTS=always TERM=dumb >stdout \
+     && { cat stdout; Exit 1; }
    cat stdout
    test_color
  
-   $MAKE check >stdout && { cat stdout; Exit 1; }
 -  TERM=ansi $MAKE -e check >stdout && { cat stdout; Exit 1; }
++  $MAKE check TERM=ansi >stdout && { cat stdout; Exit 1; }
    cat stdout
    test_no_color
  
diff --cc t/tap-color.sh
index 794f45908,b803306df..64f85a3a4
--- a/t/tap-color.sh
+++ b/t/tap-color.sh
@@@ -130,17 -125,47 +125,20 @@@ test_color (
  
  test_no_color ()
  {
 -  # With make implementations that, like Solaris make, in case of errors
 -  # 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; then' stdout; then
 -    # Extra verbose make, resort to laxer checks.
 -    # But we also want to check that the testsuite summary is not unduly
 -    # colorized.
 -    (
 -      set +e # In case some grepped regex below isn't matched.
 -      # Not a useless use of cat; see above comments about grep.
 -      cat stdout | grep "TOTAL.*:"
 -      cat stdout | grep "PASS.*:"
 -      cat stdout | grep "FAIL.*:"
 -      cat stdout | grep "SKIP.*:"
 -      cat stdout | grep "XFAIL.*:"
 -      cat stdout | grep "XPASS.*:"
 -      cat stdout | grep "ERROR.*:"
 -      cat stdout | grep "^#"
 -      cat stdout | grep 'test.*expected'
 -      cat stdout | grep 'test.*not run'
 -      cat stdout | grep '===='
 -      cat stdout | grep '[Ss]ee .*test-suite\.log'
 -      cat stdout | grep '[Tt]estsuite summary'
 -    ) | grep "$esc" && Exit 1
 -    : For shells with broken 'set -e'
 -  else
 -    cat stdout | grep "$esc" && Exit 1
 -    : For shells with broken 'set -e'
 -  fi
 +  cat stdout | grep "$esc" && Exit 1
 +  :
  }
  
 +# It should be possible to override AM_COLOR_TESTS also from the
 +# environment.
- 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 check >stdout && { cat stdout; Exit 1; }
 -TERM=ansi $MAKE -e check >stdout \
 -  && { cat stdout; Exit 1; }
++$MAKE check TERM=ansi >stdout && { cat stdout; Exit 1; }
  cat stdout
  test_no_color