Merge branch 'aclocal-lookup-order'

* aclocal-lookup-order:
  aclocal: allow third-party macros take precedence over automake ones

diff --cc NEWS
index bdafaedddfcffd85182cae153134deea493021ed,bc86fed5094ca360a3e8cec128f1f3113eca6dff..250749947a0197c06e2c04e958cacc303a4e5180
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,74 -1,26 +1,89 @@@
+ New in 1.14:
+ 
+ * Aclocal search path:
+ 
+   - Third-party m4 files located in the system-wide aclocal directory,
+     as well as in any directory listed in the ACLOCAL_PATH environment
+     variable, now take precedence over "built-in" Automake macros.
+     For example, assuming Automake is installed in the '/usr/local'
+     hierarchy, a definition of the AM_PROG_VALAC macro found in file
+     (say) '/usr/local/share/aclocal/my-vala.m4' should take precedence
+     over the same-named automake-provided macro, as defined in file
+     '/usr/local/share/aclocal-1.14/vala.m4'.
+ 
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ 
  New in 1.13:
  
 +* WARNING: Future backward-incompatibilities!
 +
 +  - Automake 1.14 will likely require Autoconf 2.70 or later (which is
 +    still unreleased at the moment of writing, but is planned to be
 +    released before Automake 1.14 is).
 +
 +  - Automake 1.14 will likely drop support for the long-deprecated
 +    'configure.in' name for the Autoconf input file.  You are advised
 +    to use the recommended name 'configure.ac' instead.
 +
 +  - The long-obsolete (since automake 1.10) AM_PROG_MKDIR m4 macro will
 +    be removed in Automake 1.14.  The $(mkdir_p) make variable and the
 +    @mkdir_p@ substitution will still remain available (as aliases of
 +    $(MKDIR_P)) for the moment, for better backward compatibility; but
 +    you are advised to stop using ASAP.
 +
 +  - The ACLOCAL_AMFLAGS special make variable will be fully deprecated
 +    in Automake 1.14 (where it will raise warnings in the "obsolete"
 +    category).  You are advised to start relying on the new Automake
 +    support for AC_CONFIG_MACRO_DIRS instead (which is introduced with
 +    this release; see below for more information).
 +
 +  - Support for IRIX and the SGI C/C++ compilers will be removed in
 +    Automake 1.14: they have seen their last release in 2006, and SGI
 +    is expected to retire support from them in December 2013; see
 +    <http://www.sgi.com/services/support/irix_mips_support.html> for
 +    more information.
 +
 +  - Future versions of Automake might remove support for MS-DOS and
 +    Windows 95/98/ME (support for them was offered by relying on the
 +    DJGPP project).  Note however that both Cygwin and MSYS/MinGW on
 +    modern Windows versions will continue to be fully supported.
 +
 +  - Support for the long-deprecated INCLUDES variable will be removed
 +    altogether in Automake 1.14.  The AM_CPPFLAGS variable should be
 +    used instead.
 +
 +  - Automake-provided scripts and makefile recipes might (finally!)
 +    start assuming a POSIX shell in Automake 1.14.
 +
 +  - Starting from Automake 1.14, third-party m4 files located in the
 +    system-wide aclocal directory, as well as in any directory listed
 +    in the ACLOCAL_PATH environment variable, will take precedence
 +    over "built-in" Automake macros.  For example (assuming Automake
 +    is installed in the /usr/local hierarchy), a definition of the
 +    AM_PROG_VALAC macro found in '/usr/local/share/aclocal/my-vala.m4'
 +    should take precedence over the same-named automake-provided macro
 +    (defined in '/usr/local/share/aclocal-1.14/vala.m4').
 +
 +* Bugs fixed:
 +
 +  - ylwrap renames properly header guards in generated header files
 +    (*.h), instead of leaving Y_TAB_H.
 +
 +  - ylwrap now also converts header guards in implementation files
 +    (*.c).  Because ylwrap failed to rename properly #include in the
 +    implementation files, current versions of Bison (e.g., 2.7)
 +    duplicate the generated header file in the implementation file.
 +    The header guard then protects the implementation file from
 +    duplicate definitions from the header file.
 +
  * Version requirements:
  
 -  - Autoconf 2.65 or greater is required.
 +  - Autoconf 2.65 or greater is now required.
  
    - The rules to build PDF and DVI output from Texinfo input now
 -    requires Texinfo 4.9 or later.
 +    require Texinfo 4.9 or later.
 +
 +* Obsolete features:
  
    - Support for the "Cygnus-style" trees (once enabled by the 'cygnus'
      option) has been removed.  See discussion about automake bug#11034

diff --cc doc/automake.texi
Simple merge

diff --cc t/aclocal-dirlist.sh
Simple merge