[PATCH 0/3] Add ACLOCAL_PATH to aclocal

[Paolo Bonzini]

This series is v2 of the patch to add a per-user search path to aclocal.
v2 includes Stefano's testcases, and implements his suggestions about
search path ordering.

However, careful analysis of what happens during the automake build
showed that the resulting order is a bit more tricky than what Stefano
likely anticipated.  Patch 1 presents what would happen (basically,
ACLOCAL_PATH would be sandwiched between the versioned and unversioned
system directories).  While understandable, this is complicated and also
makes testing with --acdir not fully representative of what would happen
after automake has been installed.

For this reason, patch 2 simplifies the rules by letting ACLOCAL_PATH
override the versioned system directory as well.  This patch can be
omitted if you decide that the more complex ordering is actually
preferrable.  Finally, patch 3 renames the concepts of "user" and
"system" directories to "local" and "global", as discussed in the v1
thread as well.

Paolo Bonzini (3):
  aclocal: handle ACLOCAL_PATH environment variable
  aclocal: remove @automake_includes
  aclocal: rename search path variables

 ChangeLog           |   41 +++++++++++++++++++++++
 NEWS                |    6 +++
 aclocal.in          |   88 +++++++++++++++++++++++++++++++-------------------
 doc/automake.texi   |   13 +++++++
 tests/Makefile.am   |    2 +
 tests/Makefile.in   |    2 +
 tests/acloca24.test |   56 ++++++++++++++++++++++++++++++++
 tests/acloca25.test |   67 ++++++++++++++++++++++++++++++++++++++
 tests/aclocal.in    |   14 ++++++--
 9 files changed, 251 insertions(+), 38 deletions(-)
 create mode 100755 tests/acloca24.test
 create mode 100755 tests/acloca25.test

-- 
1.7.3.2