From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Tue, 24 Apr 2012 08:52:34 +0000 (+0200)
Subject: Merge branch 'master' into ng/master
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3eec8e2434a34d673e66eae1817f8a88960656db;p=thirdparty%2Fautomake.git

Merge branch 'master' into ng/master

* master:
  coverage: test the internal $(am__relativize) variable
  coverage: parallel make with vala
  vala: configure exit with status 77, not 1, if valac version is too old
---

3eec8e2434a34d673e66eae1817f8a88960656db
diff --cc t/list-of-tests.mk
index 5c67db567,fef716517..57bb8adbe
--- a/t/list-of-tests.mk
+++ b/t/list-of-tests.mk
@@@ -1195,8 -1203,9 +1196,9 @@@ t/vala-libs.sh 
  t/vala-vpath.sh \
  t/vala-mix.sh \
  t/vala-mix2.sh \
+ t/vala-parallel.sh \
  t/vars.sh \
 -t/vars3.sh \
 +t/vars-assign.sh \
  t/vartar.sh \
  t/vartypos.sh \
  t/vartypo2.sh \