]> git.ipfire.org Git - thirdparty/automake.git/commitdiff
Merge branch 'master' into ng/master
authorStefano Lattarini <stefano.lattarini@gmail.com>
Wed, 16 May 2012 13:20:28 +0000 (15:20 +0200)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Wed, 16 May 2012 13:20:28 +0000 (15:20 +0200)
* master:
  tests: fix spurious failure due to i18n issue
  tests: add few missing 'cc' and 'c++' requirements

1  2 
t/lex-depend.sh
t/lex-line.sh
t/parallel-tests-fork-bomb.sh
t/yacc-bison-skeleton-cxx.sh
t/yacc-bison-skeleton.sh
t/yacc-cxx.sh
t/yacc-d-cxx.sh
t/yacc-depend2.sh
t/yacc-dist-nobuild-subdir.sh
t/yacc-line.sh
t/yacc-mix-c-cxx.sh

diff --cc t/lex-depend.sh
Simple merge
diff --cc t/lex-line.sh
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc t/yacc-cxx.sh
Simple merge
diff --cc t/yacc-d-cxx.sh
Simple merge
index 7b5cd1ce18bbb7749860a6c1e9c454039af4619b,df48a0b871a9cb59ad6d699d06ec98b7b7145241..245a946f9411f0c793fe316b093041e4f4ac7687
  # 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'
index 5181cb57bcfe5c889fcd446bcd096ef0590339ca,6cb11eebe5d9f4df7e3977f5260896c1f41deadc..94fb07ce1084fb65e2ca38b8bcfe1bd6958bc602
  # 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
diff --cc t/yacc-line.sh
Simple merge
Simple merge