Merge branch 'sl-yacc-work'

* sl-yacc-work:
  Fix minor testsuite issues, update docs, for Yacc/Lex changes.
  Bugfix: $(AM_FLAGS)/$(FLAGS) precedence in Yacc/Lex.
  New tests, for bugs in Yacc/Lex AM_FLAGS and FLAGS precedence.

diff --cc ChangeLog
Simple merge

diff --cc NEWS
Simple merge

diff --cc automake.in
index be336a19847da358e16d94db483896265521d863,3b67405a05ea0ed982d497a554fd1311baa93a09..baab7216708b369c62c225174626fcdf0543d9b4
mode 100644,100755..100644
--- 1/automake.in
--- 2/automake.in
+++ b/automake.in

diff --cc doc/automake.texi
Simple merge

diff --cc tests/Makefile.am
Simple merge

diff --cc tests/Makefile.in
Simple merge