Index: ChangeLog
===================================================================
RCS file: /cvs/automake/automake/ChangeLog,v
retrieving revision 1.1938
diff -u -u -w -r1.1938 ChangeLog
--- ChangeLog	1 Aug 2002 22:24:33 -0000	1.1938
+++ ChangeLog	2 Aug 2002 23:38:48 -0000
@@ -1,3 +1,8 @@
+2002-08-02  Mattias Amnefelt <address@hidden>
+
+	* aclocal.in: (parse_arguments) Add ACLOCAL_PATH to
+	@dirlist. Originaly from Måns Rullgård <address@hidden>
+
 2002-08-01  Alexandre Duret-Lutz  <address@hidden>
 
 	* aclocal.in (parse_arguments): Add `dirlist' paths add the
Index: NEWS
===================================================================
RCS file: /cvs/automake/automake/NEWS,v
retrieving revision 1.190
diff -u -u -w -r1.190 NEWS
--- NEWS	31 Jul 2002 19:58:25 -0000	1.190
+++ NEWS	2 Aug 2002 23:38:48 -0000
@@ -1,4 +1,6 @@
 New in 1.6c:
+* `aclocal' now searches elements in enviroment variable ACLOCAL_PATH to 
+  find macros.
 * Autoconf 2.53b is required.
 * `aclocal' and `automake' will no longer warn about obsolete
   configure macros.  This is done by `autoconf -Wobsolete'.
Index: aclocal.in
===================================================================
RCS file: /cvs/automake/automake/aclocal.in,v
retrieving revision 1.73
diff -u -u -w -r1.73 aclocal.in
--- aclocal.in	1 Aug 2002 22:24:33 -0000	1.73
+++ aclocal.in	2 Aug 2002 23:38:48 -0000
@@ -175,6 +175,9 @@
 	shift (@arglist);
     }
 
+    # Add directories from ACLOCAL_PATH
+    push @dirlist, split ':', $ENV{ACLOCAL_PATH};
+
     if ($print_and_exit)
     {
 	print $acdir, "\n";
Index: automake.texi
===================================================================
RCS file: /cvs/automake/automake/automake.texi,v
retrieving revision 1.294
diff -u -u -w -r1.294 automake.texi
--- automake.texi	1 Aug 2002 22:24:33 -0000	1.294
+++ automake.texi	2 Aug 2002 23:38:53 -0000
@@ -1405,6 +1405,10 @@
 Print the version number of Automake and exit.
 @end table
 
+You can also supply a colon-separated list of directories trough the
+environment variable @code{ACLOCAL_PATH}. This list will be added to the
+list of directories where @code{aclocal} searches for @code{.m4} files.
+
 @node Macro search path, , aclocal options, Invoking aclocal
 @section Macro search path