From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Fri, 7 Oct 2011 11:11:37 +0000 (+0200)
Subject: Merge branch 'maint'
X-Git-Tag: ng-0.5a~110
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=64aebd615605c46e9b969aab0e6fbfb58863cb81;p=thirdparty%2Fautomake.git

Merge branch 'maint'

* maint:
  parallel-tests: warn on conditional TEST_EXTENSIONS definition
---

64aebd615605c46e9b969aab0e6fbfb58863cb81
diff --cc automake.in
index b69884a97,516e594c1..00fcbf19f
mode 100644,100755..100644
--- a/automake.in
+++ b/automake.in
diff --cc tests/Makefile.am
index 530024b19,884ea65a9..6b14a3056
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -753,10 -633,9 +753,11 @@@ parallel-tests-harderror.test 
  parallel-tests-log-override-1.test \
  parallel-tests-log-override-2.test \
  parallel-tests-log-override-recheck.test \
 +parallel-tests-cmdline-override.test \
  parallel-tests-log-compiler-example.test \
 +parallel-tests-fork-bomb.test \
  test-extensions.test \
+ test-extensions-cond.test \
  parse.test \
  percent.test \
  percent2.test \
diff --cc tests/Makefile.in
index 5f78d77ae,f1bfcddef..2bc73d706
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@@ -1029,10 -917,9 +1029,11 @@@ parallel-tests-harderror.test 
  parallel-tests-log-override-1.test \
  parallel-tests-log-override-2.test \
  parallel-tests-log-override-recheck.test \
 +parallel-tests-cmdline-override.test \
  parallel-tests-log-compiler-example.test \
 +parallel-tests-fork-bomb.test \
  test-extensions.test \
+ test-extensions-cond.test \
  parse.test \
  percent.test \
  percent2.test \