Merge branch 'master' into ng/master

* master:
  tests: make 't/aclocal-macrodir.tap' executable
  maintcheck: fix spurious failure in 'maintainer-check-list-of-tests'
  build: fix cleaning of test directories in contrib (and in t/perf)
  aclocal: deprecate ACLOCAL_AMFLAGS, trace AC_CONFIG_MACRO_DIR instead

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

diff --cc Makefile.am
Simple merge

diff --cc aclocal.in
Simple merge

diff --cc doc/automake-ng.texi
index 03cca927a5706532d89889bce8f61bfc20397097,9ef7e9fed99d3b34eb1e68944309a22da55a98c7..1acb622a88d405d2cdf501966268ac9a67a74269
--- 1/doc/automake-ng.texi
--- 2/doc/automake.texi
+++ b/doc/automake-ng.texi
@@@ -12208,11 -12278,11 +12178,6 @@@ DejaGnu tests (@pxref{DejaGnu Tests}) u
  (@pxref{Java}) use @code{JAVACFLAGS} and @code{AM_JAVACFLAGS}.  None
  of these rules support per-target flags (yet).
  
- However you should not think that all variables ending with @code{FLAGS}
- follow this convention.  For instance, @code{ACLOCAL_AMFLAGS} (see
- @ref{Rebuilding} and @ref{Local Macros}) is a variable that is only
- useful to the maintainer and has no user counterpart.
 -To some extent, even @code{AM_MAKEFLAGS} (@pxref{Subdirectories})
 -obeys this naming scheme.  The slight difference is that
 -@code{MAKEFLAGS} is passed to sub-@command{make}s implicitly by
 -@command{make} itself.
--
  @code{ARFLAGS} (@pxref{A Library}) is usually defined by Automake and
  has neither @code{AM_} nor per-target cousin.
  

diff --cc lib/am/configure.am
index ec276b920d17924b54c6277219c83e6985194e59,95332fae9312079f435c15a7c6888b52cba8a30b..9c55e6e3bb51d0164f12de3b9dc9772757249081
--- 1/lib/am/configure.am
--- 2/lib/am/configure.am
+++ b/lib/am/configure.am
@@@ -106,10 -117,13 +103,13 @@@ $(top_srcdir)/configure: %MAINTAINER-MO
  ## aclocal.m4 too.  Changing configure.ac, or any file included by
  ## aclocal.m4 might require adding more files to aclocal.m4.  Hence
  ## the $(am__configure_deps) dependency.
+ ## We still need $(ACLOCAL_AMFLAGS) for sake of backward-compatibility;
+ ## we should hopefully be able to get rid of it in a not-so-distant
+ ## future.
  if %?REGEN-ACLOCAL-M4%
  $(ACLOCAL_M4): %MAINTAINER-MODE% $(am__aclocal_m4_deps)
 -?TOPDIR_P?    $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 -?!TOPDIR_P?   cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +?TOPDIR_P?    cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 +?!TOPDIR_P?   cd $(top_builddir) && $(MAKE) .am/nil
  
  ## Avoid the "deleted header file" problem for the dependencies.
  $(am__aclocal_m4_deps):

diff --cc t/aclocal4.sh
Simple merge

diff --cc t/remake10c.sh
index 739d7a73a5429df25a812028f7ee9167ea1e60dc,97c8745c0cfe814fab6f192320ad2defaa44b068..5c221778ae8b5caf58a7db97c5c887708d6950ac
--- 1/t/remake10c.sh
--- 2/t/remake10c.sh
+++ b/t/remake10c.sh
@@@ -24,9 -24,14 +24,10 @@@ magic1=::MagicStringOne:
  magic2=__MagicStringTwo__
  magic3=%%MagicStringThree%%
  
 -if using_gmake; then
 -  remake="$MAKE nil"
 -else
 -  remake="$MAKE Makefile"
 -fi
 +remake="$MAKE nil"
  
  cat >> configure.ac <<END
+ AC_CONFIG_MACRO_DIR([m4])
  FINGERPRINT='my_fingerprint'
  AC_SUBST([FINGERPRINT])
  AC_OUTPUT

diff --cc t/remake8a.sh
Simple merge

diff --cc t/remake8b.sh
Simple merge

diff --cc t/subpkg.sh
index 79c51dae768b11fddf234d3cceebfac6f07e2dd1,d1c5ed3b65c9c36ab0c42a8ea76e570cda824aab..0548f9882da4559b0b303efaf72b2bd4012b6fac
--- 1/t/subpkg.sh
--- 2/t/subpkg.sh
+++ b/t/subpkg.sh
@@@ -93,9 -90,7 +91,9 @@@ int lib (void
  }
  EOF
  
- $ACLOCAL -I m4
 +cp "$am_scriptdir"/compile .
 +
+ $ACLOCAL
  $AUTOCONF
  $AUTOMAKE -Wno-override