Merge branch 'maint' into yacc-work

* maint:
  news: update w.r.t. introduction of AM_DISTCHECK_CONFIGURE_FLAGS
  tests: optimize tests on primary/prefix mismatch for speed
  Warnings about primary/prefix mismatch fixed and extended.
  maintcheck: DISTCHECK_CONFIGURE_FLAGS can be defined on make cmdline
  distcheck: add support for AM_DISTCHECK_CONFIGURE_FLAGS
  docs: better documentation for silent make rules

diff --cc ChangeLog
Simple merge

diff --cc NEWS
index 3f8a357f7a87f4a1e63d7660cb1d4fbff56ab77e,fd7dd53d1d3e74f3a03d1d3d3021b2215b05882c..2b4dff791817bac2f009fe852a4b902ac83f2321
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -5,20 -5,14 +5,28 @@@ New in 1.11.0a
    - The `lzma' compression scheme and associated automake option `dist-lzma'
      is obsoleted by `xz' and `dist-xz' due to upstream changes.
  
+   - A developer that needs to pass specific flags to configure at "make
+     distcheck" time can now, and indeed he's advised to, do so by defining
+     the developer-reserved makefile variable AM_DISTCHECK_CONFIGURE_FLAGS,
+     instead of the old DISTCHECK_CONFIGURE_FLAGS.
+     The DISTCHECK_CONFIGURE_FLAGS variable should now be reserved for the
+     user; still, the old Makefile.am files that used to define it should
+     still continue to work as before.
+ 
 +* Changes to Yacc support:
 +
 +  - C source and header files derived from non-distributed Yacc and/or
 +    Lex sources are now removed by a simple "make clean" (while they were
 +    previously removed only "make maintainer-clean").
 +
 +  - Slightly backward-incompatible change, relevant only for use of Yacc
 +    with C++: the extensions of the header files produced by the Yacc
 +    rules are now modelled after extension of the sources corresponding
 +    sources.  For example, yacc files named "foo.y++" and "bar.yy" will
 +    produce header files named respectively "foo.h++" and "bar.hh", where
 +    they would have previously produced header files named simply "foo.h"
 +    and "bar.h".  This change offers better compatibility with `bison -o'.
 +
  Bugs fixed in 1.11.0a:
  
  * Bugs introduced by 1.11:

diff --cc automake.in
Simple merge

diff --cc doc/automake.texi
Simple merge

diff --cc tests/Makefile.am
index 95303b741e94fb881015125980ef129f5678644f,bd3f99c25166bdc035fe4817f80bce645ed2df77..fecc864a1cb30a82769d8d0e7bd8a7f505e35a8c
--- 1/tests/Makefile.am
--- 2/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -689,9 -687,11 +697,10 @@@ silentf77.test 
  silentf90.test \
  silent-many-gcc.test \
  silent-many-generic.test \
 -silent-lex-gcc.test \
 -silent-lex-generic.test \
 -silent-yacc-gcc.test \
 -silent-yacc-generic.test \
 +silent-lex.test \
 +silent-yacc.test \
 +silent-yacc-headers.test \
+ silent-configsite.test \
  srcsub.test \
  srcsub2.test \
  space.test \

diff --cc tests/Makefile.in
index c0c0d7ce992a91952c224585b0cd2c2836910a91,b8109637451b2fb66623c5277e3cc24b67e5d4f3..ae4528e527a068c0f6f609899196685e59424941
--- 1/tests/Makefile.in
--- 2/tests/Makefile.in
+++ b/tests/Makefile.in
@@@ -960,9 -958,11 +968,10 @@@ silentf77.test 
  silentf90.test \
  silent-many-gcc.test \
  silent-many-generic.test \
 -silent-lex-gcc.test \
 -silent-lex-generic.test \
 -silent-yacc-gcc.test \
 -silent-yacc-generic.test \
 +silent-lex.test \
 +silent-yacc.test \
 +silent-yacc-headers.test \
+ silent-configsite.test \
  srcsub.test \
  srcsub2.test \
  space.test \

diff --cc tests/defs.in
Simple merge