Merge branch 'aclocal-path' into maint

* aclocal-path:
  docs: document planned precedence changes in aclocal search path
  aclocal: handle ACLOCAL_PATH environment variable

diff --cc ChangeLog
index 72b7dad,05baf76..2f58f1b
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,37 -1,32 +1,66 @@@
+ 2011-09-20  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       docs: document planned precedence changes in aclocal search path
+       * doc/automake.texi (Macro Search Path): Explicitly state that the
+       lookup order for extra directories of `.m4' files will be changed
+       in the next major release.
+       * NEWS: Likewise.
+ 
+ 2011-09-19  Paolo Bonzini  <bonzini@gnu.org>
+           Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       aclocal: handle ACLOCAL_PATH environment variable
+       * aclocal.in (parse_ACLOCAL_PATH): New function, parse ACLOCAL_PATH
+       as a colon-separated list of directories to be included in the
+       search path.
+       * doc/automake.texi (Macro Search Path): Document new behavior and
+       the precedence rules for various elements of the search path.
+       * tests/aclocal-path.test: New test.
+       * tests/aclocal-path-install.test: Likewise.
+       * tests/aclocal-path-install-serial.test: Likewise.
+       * tests/aclocal-path-precedence.test: Likewise.
+       * tests/aclocal-path-nonexistent.test: Likewise.
+       * tests/Makefile.am (TESTS): Add them.
+       * NEWS: Update.
+       * tests/distcheck-missing-m4.test: Extend by also checking
+       interactions with ACLOCAL_PATH.
+       * tests/distcheck-outdated-m4.test: Likewise, and fix a couple
+       of botched comments since we are at it.
+ 
 +2011-09-19  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      tests: fix spurious failure in 'primary-prefix-valid-couples.test'
 +      * tests/primary-prefix-valid-couples.test: After commit
 +      v1.11-464-gc9dfc36, `java_JAVA' is not a valid prefix/primary
 +      combination by default anymore: one has to explicitly define
 +      $(javadir) to make it so.  So just drop `java_JAVA' from our
 +      Makefile.am  Also, since we are at it, ...
 +      (configure.in): ... remove AM_PROG_GCJ from here, as it's not
 +      really required.
 +
 +2011-09-19  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      docs: deprecate JAVA primary
 +      * doc/automake.texi (Java): Deprecate the JAVA primary, stating
 +      that it will become obsolete in automake 1.12 and probably removed
 +      altogether in automake 1.13.  Reflect this in the section title,
 +      by appending the string "(deprecated feature)".
 +      (@menu, @detailmenu): Update.
 +      (Java Support with gcj): The cross-referenced support for bytecode
 +      compilation with the JAVA primary is rudimentary and deprecated.
 +      State that explicitly.
 +
 +2011-09-19  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      docs: clearer distinction between `.java' with javac and with gcj
 +      * doc/automake.texi (Java support): Rename this node ...
 +      (Java support with gcj): ... to this, and change its title from
 +      "Compiling Java sources" to "Compiling Java sources using gcj".
 +      (@detailmenu, @menu, @cindex): Update and make more precise.
 +      (Java): Change the title of this node from simply "Java" to
 +      "Java bytecode compilation".
 +      (@detailmenu, @menu, @cindex): Update and make more precise.
 +
  2011-09-18  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
        java: complain if java_JAVA is used but $(javadir) is undefined

diff --cc doc/automake.texi
Simple merge