From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Mon, 20 Jun 2011 08:48:11 +0000 (+0200)
Subject: Merge branch 'master' into testsuite-work
X-Git-Tag: ng-0.5a~89^2~182
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=89b9f35abff0facb71f040444ff5653a8e98b58d;p=thirdparty%2Fautomake.git

Merge branch 'master' into testsuite-work

* master:
  check: don't use multi-line coloring for the report
  ansi2knr: deprecate, it will go away in the next major release
  docs: primary/prefix combination "pkglib_PROGRAMS" is now invalid
  docs: replace obsolete @vindex entry with a useful one
  tests: more checks on portable fd redirection in TESTS_ENVIRONMENT
  docs: AM_DISTCHECK_CONFIGURE_FLAGS is for corner cases
---

89b9f35abff0facb71f040444ff5653a8e98b58d
diff --cc tests/ansi3.test
index 4aca8a250,23d8194b3..dccc7f80f
--- a/tests/ansi3.test
+++ b/tests/ansi3.test
@@@ -41,11 -42,17 +41,11 @@@ main (int argc, char *argv[]
  }
  END
  
 -# Ignore user CFLAGS.
 -CFLAGS=
 -export CFLAGS
 -
 -# We use gcc and not gcc -traditional as the latter fails on some
 -# Linux boxes (Red Hat 5.1 in particular).
  $ACLOCAL
- $AUTOCONF
- $AUTOMAKE -a 2>stderr || { cat stderr >&2; Exit 1; }
+ $AUTOCONF -Wno-obsolete
+ $AUTOMAKE -Wno-obsolete -a 2>stderr || { cat stderr >&2; Exit 1; }
  cat stderr >&2
  grep 'Makefile.am:1:.*ansi2knr\.c' stderr
 -CC='gcc' ./configure
 +./configure
  ANSI2KNR=./ansi2knr U=_ $MAKE -e
  ./hello
diff --cc tests/ansi3b.test
index 48ca7cbe7,5b8f4721b..df9000ff8
--- a/tests/ansi3b.test
+++ b/tests/ansi3b.test
@@@ -43,11 -43,17 +43,11 @@@ main (int argc, char *argv[]
  }
  END
  
 -# Ignore user CFLAGS.
 -CFLAGS=
 -export CFLAGS
 -
 -# We use gcc and not gcc -traditional as the latter fails on some
 -# Linux boxes (Red Hat 5.1 in particular).
  $ACLOCAL
- $AUTOCONF
- $AUTOMAKE -a 2>stderr || { cat stderr >&2; Exit 1; }
+ $AUTOCONF -Wno-obsolete
+ $AUTOMAKE -Wno-obsolete -a 2>stderr || { cat stderr >&2; Exit 1; }
  cat stderr >&2
  grep 'configure.in:2:.*ansi2knr\.1' stderr
 -CC='gcc' ./configure
 +./configure
  ANSI2KNR=./ansi2knr U=_ $MAKE -e
  ./hello
diff --cc tests/ansi5.test
index 4490d8b5e,c9c0d234a..55c41f917
--- a/tests/ansi5.test
+++ b/tests/ansi5.test
@@@ -64,9 -64,12 +64,9 @@@ main (int argc, char *argv[]
  END
  
  $ACLOCAL
- $AUTOCONF
- $AUTOMAKE -a
+ $AUTOCONF -Wno-obsolete
+ $AUTOMAKE -Wno-obsolete -a
 -# Ignore user CFLAGS.
 -CFLAGS=
 -export CFLAGS
 -CC=gcc ./configure
 +./configure
  
  # This is ugly!  If we set U at make time then the "wrong" file gets
  # included.