From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Sun, 16 Jan 2011 19:42:31 +0000 (+0100)
Subject: Merge branch 'maint'
X-Git-Tag: ng-0.5a~249
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5fa4dafb2a0b8fc8133697526a869cecccfeceed;p=thirdparty%2Fautomake.git

Merge branch 'maint'
---

5fa4dafb2a0b8fc8133697526a869cecccfeceed
diff --cc ChangeLog
index 0bb2f694c,0fe17aba7..1cc161b8d
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,10 -1,9 +1,16 @@@
+ 2011-01-16  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+ 	tests: remove useless requirements from cond36.test
+ 	* tests/cond36.test ($required): Remove.
+ 	Since we are at it, add a trailing `:' command.
+ 
 +2011-01-16  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 +
 +	tests: avoid failing command substitution in errexit mode.
 +	* tests/vartypo2.test, tests/vartypos.test: Rewrite to not use
 +	a command substitution with a nonzero exit status, that causes
 +	IRIX and Tru64/OSF sh to fail the whole test.
 +
  2011-01-16  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
  	    Stefano Lattarini  <stefano.lattarini@gmail.com>
  
diff --cc tests/cond36.test
index a39ead03d,6826cd58f..06d5a604e
--- a/tests/cond36.test
+++ b/tests/cond36.test
@@@ -16,9 -16,10 +16,8 @@@
  
  # Check rules output for parser defined conditionally.
  
- required='flex yacc gcc'
  . ./defs || Exit 1
  
 -set -e
 -
  cat >>configure.in <<'EOF'
  AM_CONDITIONAL([CASE_A], test -z "$case_B")
  AC_PROG_CC