Merge branch 'fix-yaccdry.test' into maint

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

diff --cc ChangeLog
index a356958,c3b15be..69fc42f
--- 1/ChangeLog
--- 2/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'.