Merge branch 'master' into ng/master

* master:
  build: don't enable 'color-tests' automake option explicitly
  build: enable all warnings as fatal in our own build system
  texi: Texinfo sources and CLEANFILES definition should co-exist peacefully
  tests: make two new test executable
  runtest: better command line API
  tests: move runtest.in away from the top-lever directory
  maint: move more maintainer files in the 'maint/' subdir
  tests: more significant names for some tests
  maint: add some of my maintainer-specific scripts
  texi: deprecate hack about info files in CLEANFILES variables
  texi: info files can be generated in the builddir

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>

diff --cc GNUmakefile
Simple merge

diff --cc Makefile.am
index 13f4194391d139ed562b2084d2a21ea5e3185c9d,78aabbf4aad7c0d6045cfbfab92c27686eea63cd..2ab657a507ae9143058f7fcfa9fd19e44116839f
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -60,11 -69,7 +60,9 @@@ EXTRA_DIST += 
    $(AUTOMAKESOURCES) \
    bootstrap.sh \
    GNUmakefile \
-   maint.mk \
-   syntax-checks.mk \
 -  HACKING
 +  HACKING \
 +  NG-NEWS \
 +  $(gitlog_to_changelog_fixes)
  
  # Make versioned links.  We only run the transform on the root name;
  # then we make a versioned link with the transformed base name.  This
@@@ -452,12 -442,14 +450,12 @@@ EXTRA_DIST += t/ax/shell-no-trail-bslas
  CLEANFILES += t/ax/shell-no-trail-bslash
  noinst_SCRIPTS += t/ax/shell-no-trail-bslash
  
- runtest: runtest.in Makefile
+ runtest: t/ax/runtest.in Makefile
        $(AM_V_at)rm -f $@ $@-t
 -      $(AM_V_GEN)in=t/ax/runtest.in \
 -        && $(MKDIR_P) t/ax \
 -        && $(do_subst) <$(srcdir)/$$in >$@-t \
 -        && chmod a+x $@-t
 +      $(AM_V_GEN)$(do_subst)
 +      $(AM_V_at)chmod a+x $@-t
        $(generated_file_finalize)
- EXTRA_DIST += runtest.in
+ EXTRA_DIST += t/ax/runtest.in
  CLEANFILES += runtest
  noinst_SCRIPTS += runtest
  
@@@ -658,5 -663,25 +656,16 @@@ EXTRA_DIST += 
  ## --------------------------------------------------- ##
  
  EXTRA_DIST += \
 -  old/ChangeLog-tests \
 -  old/ChangeLog.96 \
 -  old/ChangeLog.98 \
 -  old/ChangeLog.00 \
 -  old/ChangeLog.01 \
 -  old/ChangeLog.02 \
 -  old/ChangeLog.03 \
 -  old/ChangeLog.04 \
 -  old/ChangeLog.09 \
 -  old/ChangeLog.11 \
 -  old/TODO
 +  $(addprefix old/ChangeLog., 96 98 00 01 02 03 04 09 11) \
 +  old/ChangeLog-tests old/TODO
+ 
+ ## ---------------------------------------- ##
+ ##  Maintainer-specific files and scripts.  ##
+ ## ---------------------------------------- ##
+   
+ EXTRA_DIST += \
+   maint/am-ft \
+   maint/am-xft \
+   maint/rename-tests \
+   maint/maint.mk \
+   maint/syntax-checks.mk

diff --cc automake.in
index 2bb3e1f602be2e04279fa01bc4eb30acb0392840,d2e12a9533aa1da9dabc434804291cdcdd130901..2649d3a56c8828f939c733f6edd6fd75ed456724
--- 1/automake.in
--- 2/automake.in
+++ b/automake.in
@@@ -2895,8 -3362,10 +2922,8 @@@ EO
                                          new Automake::Location,
                                          TEXI     => $texi,
                                          VTI      => $vti,
-                                         STAMPVTI => "${soutdir}stamp-$vti",
-                                         VTEXI    => "$soutdir$vtexi");
+                                         STAMPVTI => "${outdir}stamp-$vti",
 -                                        VTEXI    => "$outdir$vtexi",
 -                                        MDDIR    => $conf_dir,
 -                                        DIRSTAMP => $dirstamp);
++                                        VTEXI    => "$outdir$vtexi");
        }
      }
  

diff --cc bootstrap.sh
index 9a1b668cad840e074eb1170d1da0a3fd404a8a49,7704fc11e9762a556306a3aa55b82522764a6581..580143629c2342a68b36341521daa120cc1d4437
--- 1/bootstrap.sh
--- 2/bootstrap.sh
+++ b/bootstrap.sh
@@@ -98,16 -100,17 +98,17 @@@ dosubst m4/amversion.in m4/amversion.m
  dosubst automake.in automake.tmp
  
  # Create required makefile snippets.
 -$PERL ./gen-testsuite-part > t/testsuite-part.tmp
 -chmod a-w t/testsuite-part.tmp
 -mv -f t/testsuite-part.tmp t/testsuite-part.am
 +$PERL ./gen-testsuite-part > testsuite-autodeps.tmp
 +chmod a-w testsuite-autodeps.tmp
 +mv -f testsuite-autodeps.tmp testsuite-autodeps.am
  
- # Run the autotools.
+ # Run the autotools.  Bail out if any warning is triggered.
  # Use '-I' here so that our own *.m4 files in m4/ gets included,
  # not copied, in aclocal.m4.
- $PERL ./aclocal.tmp -I m4 --automake-acdir m4 --system-acdir m4/acdir
- $AUTOCONF
- $PERL ./automake.tmp
+ $PERL ./aclocal.tmp -Wall -Werror -I m4 \
+                     --automake-acdir=m4 --system-acdir=m4/acdir
+ $AUTOCONF -Wall -Werror
+ $PERL ./automake.tmp -Wall -Werror
  
  # Remove temporary files and directories.
  rm -rf aclocal-$APIVERSION automake-$APIVERSION

diff --cc configure.ac
index 4fbbf8297e11ceecd1371f59f1ee8ac4203d85ed,f066e34bf9811e9ac39e3bfd6f10ead885e8d4bd..f05d39275795c9dcf80753721f62603d6c6b534b
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -39,7 -39,8 +39,8 @@@ AC_SUBST([am_AUTOUPDATE], ["${AUTOUPDAT
  dnl We call AC_PROG_CC in an unusual way, and only for use in our
  dnl testsuite, so also use 'no-dependencies' and 'no-define' among
  dnl the automake options to avoid bloating and potential problems.
- AM_INIT_AUTOMAKE([filename-length-max=99 ng no-define no-dependencies])
 -AM_INIT_AUTOMAKE([-Wall -Werror dist-xz filename-length-max=99
++AM_INIT_AUTOMAKE([ng -Wall -Werror filename-length-max=99 
+                   no-define no-dependencies])
  
  ## Keep this on a line of its own, since it must be found and processed
  ## by the 'update-copyright' rule in our Makefile.

diff --cc doc/automake-ng.texi
index a67457398f951a29d08c889aa639d24cc63ce0db,b1e3a8c752eba0218802959dea79de2bd8421b9f..69178c2d36dedf2281a3cadaa2b57244c84c45ab
--- 1/doc/automake-ng.texi
--- 2/doc/automake.texi
+++ b/doc/automake-ng.texi
@@@ -9970,15 -10046,14 +9975,23 @@@ options below.  This option should be u
  @file{configure.ac}, it will be ignored otherwise.  It will also be
  ignored in sub-packages of nested packages (@pxref{Subpackages}).
  
+ @item @option{info-in-builddir}
+ @cindex Option, @option{info-in-builddir}
+ @opindex info-in-builddir
+ Instruct Automake to place the generated @file{.info} files in the
+ @code{builddir} rather than in the @code{srcdir}.  Note that this
+ might make VPATH builds with some non-GNU make implementations more
+ brittle.
+ 
 +@item @option{ng}
 +@cindex Option, @option{ng}
 +@opindex ng
 +This is a no-op option, whose only purpose it to be recognized by
 +Automake-NG but @emph{not} by mainstream Automake.  It can be
 +used by developers to declare that their build system requires
 +Automake-NG, and in a way that will ensure a clear error if
 +mainstream Automake is used by mistake.
 +
  @item @option{no-define}
  @cindex Option, @option{no-define}
  @opindex no-define

diff --cc lib/Automake/Options.pm
index 49a307f6ac57b9d0f888b636182da8089c93b735,39327981a230d18ef1a61727155dc96fb08c5048..8782c790ed5acd9ecd092807336d6b7555c69879
--- 1/lib/Automake/Options.pm
--- 2/lib/Automake/Options.pm
+++ b/lib/Automake/Options.pm
@@@ -270,7 -270,13 +270,8 @@@ sub _is_valid_easy_option ($
      check-news
      color-tests
      dejagnu
 -    dist-bzip2
 -    dist-lzip
 -    dist-shar
 -    dist-tarZ
 -    dist-xz
 -    dist-zip
+     info-in-builddir
 +    ng
      no-define
      no-dependencies
      no-dist

diff --cc maint/maint.mk
Simple merge

diff --cc maint/syntax-checks.mk
Simple merge

diff --cc t/ax/runtest.in
Simple merge

diff --cc t/backslash-issues.sh
index 6b0a9a198f72dd658bcd47e05068415fb577c6cf,9dae7155aaa9e79607342ccd977e9a3dce28a4e4..6b0a9a198f72dd658bcd47e05068415fb577c6cf
mode 100644,100755..100755
--- 1/t/backslash-issues.sh
--- 2/t/backslash-issues.sh
+++ b/t/backslash-issues.sh