Merge branch 'aclocal-trace-macrodir'

* aclocal-trace-macrodir:
  aclocal: deprecate ACLOCAL_AMFLAGS, trace AC_CONFIG_MACRO_DIR instead

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

diff --cc NEWS
index 292f628,15e43a9..dc2fdb3
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -81,13 -81,17 +81,24 @@@ New in 1.13
      script to avoid such issues; a simple example is provided in the
      "CVS and generated files" chapter of the automake manual.
  
 +* Recursive targets:
 +
 +  The user can now define his own recursive targets that recurse
 +  in the directories specified in $(SUBDIRS).  This can be done by
 +  specifying the name of such targets in invocations of the new
 +  'AM_EXTRA_RECURSIVE_TARGETS' m4 macro.
 +
+ * Improvements to aclocal and related rebuilds rules:
+ 
+   - The Autoconf-provided macro AC_CONFIG_MACRO_DIR is now traced by
+     aclocal, and can be used to declare the local m4 include directory.
+     Formerly, one had to specify it with an explicit '-I' option to the
+     'aclocal' invocation.
+ 
+   - The special make variable ACLOCAL_AMFLAGS is deprecated; future
+     Automake versions will warn about its use, and later version will
+     remove support for it altogether.
+ 
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  
  New in 1.12.2:

diff --cc doc/automake.texi
Simple merge

diff --cc t/list-of-tests.mk
Simple merge