From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Wed, 16 May 2012 13:20:28 +0000 (+0200)
Subject: Merge branch 'master' into ng/master
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d899acbab58dd806deda03862d64cbafff2cb6a;p=thirdparty%2Fautomake.git

Merge branch 'master' into ng/master

* master:
  tests: fix spurious failure due to i18n issue
  tests: add few missing 'cc' and 'c++' requirements
---

8d899acbab58dd806deda03862d64cbafff2cb6a
diff --cc t/yacc-depend2.sh
index 7b5cd1ce1,df48a0b87..245a946f9
--- a/t/yacc-depend2.sh
+++ b/t/yacc-depend2.sh
@@@ -15,9 -15,10 +15,9 @@@
  # along with this program.  If not, see <http://www.gnu.org/licenses/>.
  
  # Make sure depcomp does not needlessly update headers and objects
 -# for yacc rules.  This test still fails with FreeBSD make (but passes
 -# with NetBSD make).
 +# for yacc rules.
  
- required=yacc
+ required='cc yacc'
  . ./defs || Exit 1
  
  cat >> configure.ac << 'END'
diff --cc t/yacc-dist-nobuild-subdir.sh
index 5181cb57b,6cb11eebe..94fb07ce1
--- a/t/yacc-dist-nobuild-subdir.sh
+++ b/t/yacc-dist-nobuild-subdir.sh
@@@ -18,9 -18,13 +18,9 @@@
  # using yacc and the automake 'subdir-objects' option.
  # Exposes automake bug#8485.
  
- required=yacc
+ required='cc yacc'
  . ./defs || Exit 1
  
 -# This test is bounded to fail for any implementation that
 -# triggers automake bug#7884.
 -useless_vpath_rebuild && skip_ "would trip on automake bug#7884"
 -
  cat >> configure.ac << 'END'
  AC_PROG_CC
  AM_PROG_CC_C_O