Merge branch 'maint'

* maint:
  maint-mode: fix botched configure messages
  fix: regenerate Makefiles
  info: allow user to inhibit creation/update of '${infodir}/dir'

diff --cc ChangeLog
Simple merge

diff --cc NEWS
index c645962652a6a18fc1ae8f663269635e296c9d8b,fe1dc9729091b467f237e82aa89dee5667144666..3852abfab81b4754c191ea1a91667f2e5d83dc19
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -75,11 -44,11 +75,15 @@@ New in 1.11a
      file generated by automake-provided rules by defining the special make
      variable `$(EXTRA_DEJAGNU_SITE_CONFIG)'.
  
 -Bugs fixed in 1.11.0a:
+   - The `install-info' rule can now be instructed not to create/update
+     the `${infodir}/dir' file, by exporting the new environment variable
+     `AM_UPDATE_INFO_DIR' to the value "no".
+ 
 +  - Support for automatic de-ANSI-fication has been removed.
 +
 +Bugs fixed in 1.11a:
 +
 +  - Lots of minor bugfixes.
  
  * Bugs introduced by 1.11:
  

diff --cc THANKS
Simple merge

diff --cc doc/Makefile.in
Simple merge

diff --cc doc/automake.texi
Simple merge

diff --cc lib/am/texinfos.am
Simple merge

diff --cc m4/maintainer.m4
index 0d0bf7f3bb69066c0399f86e651a344f97c7bb71,085e96cdf5f24a4c0ca1e3f0d41451dae88670e4..b8f02bddbcdc25c5fd0a5fd845ea255ffae455ac
--- 1/m4/maintainer.m4
--- 2/m4/maintainer.m4
+++ b/m4/maintainer.m4
@@@ -22,14 -22,13 +22,14 @@@ AC_DEFUN([AM_MAINTAINER_MODE]
         [disable], [m4_define([am_maintainer_other], [enable])],
         [m4_define([am_maintainer_other], [enable])
          m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])])
- AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles])
+ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
    dnl maintainer-mode's default is 'disable' unless 'enable' is passed
    AC_ARG_ENABLE([maintainer-mode],
 -[  --][am_maintainer_other][-maintainer-mode  am_maintainer_other make rules and dependencies not useful
 -                        (and sometimes confusing) to the casual installer],
 -      [USE_MAINTAINER_MODE=$enableval],
 -      [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
 +    [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode],
 +      am_maintainer_other[ make rules and dependencies not useful
 +      (and sometimes confusing) to the casual installer])],
 +    [USE_MAINTAINER_MODE=$enableval],
 +    [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
    AC_MSG_RESULT([$USE_MAINTAINER_MODE])
    AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
    MAINT=$MAINTAINER_MODE_TRUE

diff --cc tests/Makefile.am
Simple merge

diff --cc tests/Makefile.in
Simple merge