Merge branch 'fix-pr9890' into maint

* fix-pr9890:
  maint-mode: fix botched configure messages

diff --cc ChangeLog
index d6f4bfc,74e27dd..d780496
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,28 -1,21 +1,46 @@@
+ 2011-11-03  Zack Weinberg <zackw@panix.com>  (tiny change)
+           Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       maint-mode: fix botched configure messages
+       This change fixes automake bug#9890.
+       * m4/maintainer.m4 (AM_MAINTAINER_MODE): Fix the "checking ..."
+       configure message related to the enabling/disabling of maintainer
+       mode.
+       * tests/help-maintainer.test: Renamed ...
+       * tests/maintmode-configure-msg.test: ... to this, and extended
+       to cover the fixed bug.  Also, since we are at it, make grepping
+       of configure help screens stricter, and throw in some few other
+       changes to reduce code duplication and enhance readability.
+       * tests/Makefile.am (TESTS): Update.
+       * THANKS: Update with Zack's new e-mail address.
+       Report and initial patch by Zack Weinberg, test cases added by
+       Stefano Lattarini.
+ 
 +2011-10-23  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      info: allow user to inhibit creation/update of '${infodir}/dir'
 +      With this change, we allow the user to request the install-info
 +      rules not to update the `${infodir}/dir' file, by exporting the
 +      environment variable `AM_UPDATE_INFO_DIR' to the value "no".
 +      This is especially useful to distro packagers, and is a definite
 +      improvement over our previous hack of looking whether the
 +      `install-info' program was the Debian or GNU version -- hack
 +      which had been silently broken with recent versions of debian
 +      install-info BTW (probably since dpkg 1.15.4, 2009-09-06).
 +      This change fixes automake bug#9773.  See also Debian Bug#543992.
 +      * lib/am/texinfos.am: Don't look anymore at the output of
 +      `install-info --version' to decide whether to use it to update
 +      the `${infodir}/dir' or not; instead, honour the environment
 +      variable `AM_UPDATE_INFO_DIR'.
 +      * tests/install-info-dir.test: New test.
 +      * tests/Makefile.am (TESTS): Add it.
 +      * tests/defs: Also unset `AM_UPDATE_INFO_DIR', to avoid unwanted
 +      interferences from the environment.
 +      * doc/automake.texi (Texinfo): Update.
 +      * NEWS: Likewise.
 +      * THANKS: Likewise.
 +      Report by Jonathan Nieder.
 +
  2011-10-20  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
        deps: partially revert commit `v1.11-512-geeee551'

diff --cc THANKS
Simple merge

diff --cc tests/Makefile.am
Simple merge

diff --cc tests/Makefile.in
Simple merge