From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Wed, 10 Nov 2010 18:20:01 +0000 (+0100)
Subject: Merge branch 'fix-yaccdry.test' into maint
X-Git-Tag: v1.11.1b~44^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e46935648e7c3b4d043b8a4cda231918ca636a89;p=thirdparty%2Fautomake.git

Merge branch 'fix-yaccdry.test' into maint

* fix-yaccdry.test:
  Fix yaccdry.test failure: require bison.
---

e46935648e7c3b4d043b8a4cda231918ca636a89
diff --cc ChangeLog
index a3569580c,c3b15be83..69fc42f55
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,24 -1,9 +1,30 @@@
+ 2010-11-10  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+ 
+ 	Fix yaccdry.test failure: require bison.
+ 	* tests/yaccdry.test: Require bison.
+ 	Found by NixOS Hydra.
+ 
 +2010-11-07  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +	Fix a bug in variable concatanation with `+='.
 +	* lib/Automake/VarDef.pm (append): Since the content of the
 +	"appended-to" variable is going to be unconditionally normalized
 +	later, simply separate the appended value with a single whitespace
 +	character, instead of trying to be uselesssly smarter by using
 +	escaped newlines.  This fixes a bug in which extra backslashes
 +	where erroneously inserted in the variable's final value.
 +	* tests/pluseq11.test: New test, exposing the bug.
 +	* tests/Makefile.am (TESTS): Update.
 +	Reported by Andy Wingo.
 +
 +2010-11-06  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +	Fix bug in rules for creating vala vapi/header files.
 +	* automake.in (lang_vala_finish_target): Add forgotten "fi" in an
 +	if control structure in a generated make rules.  Bug introduced
 +	by previous commit `v1.11-221-gd7c1679', and revealed by failure
 +	of test `vala2.test'.
 +
  2010-11-01  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
  
  	Fix and document rules to not touch the tree with `make -n'.