cvs server: Diffing .
Index: ChangeLog
===================================================================
RCS file: /cvsroot/autoconf/autoconf/ChangeLog,v
retrieving revision 1.1943
diff -u -r1.1943 ChangeLog
--- ChangeLog	7 Jun 2002 11:20:19 -0000	1.1943
+++ ChangeLog	10 Jun 2002 03:19:33 -0000
@@ -1,3 +1,15 @@
+2002-06-09  Mark D. Roth  <address@hidden>
+
+	* configure.ac: add --enable-site-macro-dir option.
+	* bin/Makefile.am: expand @address@hidden
+	* bin/autoconf.in: add $AC_MACRO_PATH and site macro dir to
+	include path.
+	* bin/autom4te.in: add --prepend-include option.
+	* doc/autoconf.texi: document use of $AC_MACRO_PATH and site
+	macro directory, remove note that include path directories are
+	used in reverse order, and document autom4te --prepend-include.
+	* lib/autom4te.in: use --prepend-include instead of --include.
+
 2002-06-07  Akim Demaille  <address@hidden>
 
 	* tests/tools.at (autoconf: forbidden tokens, basic)
Index: configure.ac
===================================================================
RCS file: /cvsroot/autoconf/autoconf/configure.ac,v
retrieving revision 1.38
diff -u -r1.38 configure.ac
--- configure.ac	22 Apr 2002 14:33:05 -0000	1.38
+++ configure.ac	10 Jun 2002 03:19:33 -0000
@@ -31,6 +31,13 @@
 
 AM_INIT_AUTOMAKE
 
+AC_ARG_ENABLE([site-macro-dir],
+  AC_HELP_STRING([--enable-site-macro-dir=DIR],
+    [use site macro directory DIR @<:@DATADIR/autoconf/site_macros@:>@]),
+  ,
+  [enable_site_macro_dir='${datadir}/autoconf/site_macros'])
+AC_SUBST([SITE_MACRO_DIR], "${enable_site_macro_dir}")
+
 # Initialize the test suite and build position independent wrappers.
 AC_CONFIG_TESTDIR([tests])
 AC_CONFIG_FILES([tests/Makefile tests/atlocal])
cvs server: Diffing bin
Index: bin/Makefile.am
===================================================================
RCS file: /cvsroot/autoconf/autoconf/bin/Makefile.am,v
retrieving revision 1.5
diff -u -r1.5 Makefile.am
--- bin/Makefile.am	10 Apr 2002 15:58:19 -0000	1.5
+++ bin/Makefile.am	10 Jun 2002 03:19:33 -0000
@@ -45,7 +45,8 @@
 	-e 's,@M4\@,$(M4),g' \
 	-e 's,@AWK\@,$(AWK),g' \
 	-e 's,@VERSION\@,$(VERSION),g' \
-	-e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g'
+	-e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
+	-e 's,@SITE_MACRO_DIR\@,$(SITE_MACRO_DIR),g'
 
 # autoconf is written in M4sh.
 AUTOM4SH = $(top_builddir)/tests/autom4te --language M4sh
Index: bin/autoconf.in
===================================================================
RCS file: /cvsroot/autoconf/autoconf/bin/autoconf.in,v
retrieving revision 1.147
diff -u -r1.147 autoconf.in
--- bin/autoconf.in	22 Apr 2002 09:13:43 -0000	1.147
+++ bin/autoconf.in	10 Jun 2002 03:19:33 -0000
@@ -252,6 +252,16 @@
   esac
 done
 
+# Add $AC_MACRO_PATH
+if test -n "${AC_MACRO_PATH}"; then
+  AUTOM4TE="$AUTOM4TE -I `echo $AC_MACRO_PATH | sed 's/:/ -I /'`";
+fi
+
+# Add site macro dir
+if test "@SITE_MACRO_DIR@" != "no"; then
+  AUTOM4TE="$AUTOM4TE address@hidden@";
+fi
+
 # Find the input file.
 case $# in
   0)
Index: bin/autom4te.in
===================================================================
RCS file: /cvsroot/autoconf/autoconf/bin/autom4te.in,v
retrieving revision 1.63
diff -u -r1.63 autom4te.in
--- bin/autom4te.in	7 Jun 2002 08:03:55 -0000	1.63
+++ bin/autom4te.in	10 Jun 2002 03:19:33 -0000
@@ -389,7 +389,8 @@
 The environment variable \`WARNINGS\' is honored.
 
 Library directories:
-  -I, --include=DIR  look for FILES in DIR (cumulative)
+  -i, --prepend-include=DIR  prepend directory DIR to search path
+  -I, --include=DIR          append directory DIR to search path
 
 Tracing:
   -t, --trace=MACRO      report the MACRO invocations
@@ -484,6 +485,7 @@
 
   # Process the arguments for real this time.
   my @trace;
+  my @prepend_include;
   getopt
     (
      # Operation modes:
@@ -493,6 +495,7 @@
      "M|melt"       => \$melt,
 
      # Library directories:
+     "i|prepend-include=s" => address@hidden,
      "I|include=s" => address@hidden,
 
      # Tracing:
@@ -525,7 +528,7 @@
   # a pain since it introduces a useless difference in the path which
   # invalidates the cache.  And strip `.' which is implicit and always
   # first.
-  @include = grep { !/^\.$/ } uniq (@include);
+  @include = grep { !/^\.$/ } uniq (reverse(@prepend_include), @include);
 
   # Convert @trace to %trace, and work around the M4 builtins tracing
   # problem.
@@ -599,13 +602,10 @@
   #
   # Neutralize its stdin, so that GNU M4 1.5 doesn't neutralize SIGINT.
   #
-  # Be extremely cautious to reverse the includes when talking to M4:
-  # it doesn't speak the same --include as we do.
-  #
   # We don't output directly to the cache files, to avoid problems
   # when we are interrupted (that leaves corrupted files).
   my $command = ("$m4"
-		 . join (' --include=', '', reverse @include)
+		 . join (' --include=', '', @include)
 		 . " --define=m4_warnings=$m4_warnings"
 		 . ' --debug=aflq'
 		 . " --error-output=$tcache" . $req->id . "t"
@@ -1056,7 +1056,7 @@
   # output but comments and empty lines.
   my $command = ("$m4"
 		 . ' --fatal-warning'
-		 . join (' --include=', '', reverse @include)
+		 . join (' --include=', '', @include)
 		 . ' --define=divert'
 		 . " @ARGV"
 		 . ' </dev/null');
@@ -1079,7 +1079,7 @@
   # or an improper paren etc.
   $command = ("$m4"
 	      . ' --fatal-warning'
-	      . join (' --include=', '', reverse @include)
+	      . join (' --include=', '', @include)
 	      . " --freeze-state=$output"
 	      . " @ARGV"
 	      . ' </dev/null');
cvs server: Diffing config
cvs server: Diffing doc
Index: doc/autoconf.texi
===================================================================
RCS file: /cvsroot/autoconf/autoconf/doc/autoconf.texi,v
retrieving revision 1.633
diff -u -r1.633 autoconf.texi
--- doc/autoconf.texi	7 Jun 2002 09:30:24 -0000	1.633
+++ doc/autoconf.texi	10 Jun 2002 03:19:36 -0000
@@ -1083,7 +1083,7 @@
 @item address@hidden
 @itemx -I @var{dir}
 Also look for input files in @var{dir}.  Multiple invocations
-accumulate.  Directories are browsed from last to first.
+accumulate.
 @end table
 
 @node ifnames Invocation
@@ -1168,7 +1168,13 @@
 @item address@hidden
 @itemx -I @var{dir}
 Also look for input files in @var{dir}.  Multiple invocations
-accumulate.  Directories are browsed from last to first.
+accumulate.
+
+After searching any directories specified using @option{--include},
address@hidden will also search the directories specified in
+the @code{AC_MACRO_PATH} environment variable, if set.  And finally,
address@hidden will also search the system-wide site macro directory,
+which is set to @address@hidden@}/autoconf/site_macros} by default.
 
 @item address@hidden
 @itemx -o @var{file}
@@ -1441,7 +1447,7 @@
 @item address@hidden
 @itemx -I @var{dir}
 Also look for input files in @var{dir}.  Multiple invocations
-accumulate.  Directories are browsed from last to first.
+accumulate.
 @end table
 
 
@@ -2527,7 +2533,6 @@
 @item address@hidden
 @itemx -I @var{dir}
 Also look for input files in @var{dir}.  Multiple invocations accumulate.
-Directories are browsed from last to first.
 
 @item address@hidden
 @itemx -W @var{category}
@@ -7042,8 +7047,7 @@
 @item address@hidden
 @itemx -I @var{dir}
 Also look for input files in @var{dir}.  Multiple invocations
-accumulate.  Contrary to M4 but in agreement with common sense,
-directories are browsed from last to first.
+accumulate.
 
 @item address@hidden
 @itemx -o @var{file}
@@ -7303,18 +7307,23 @@
 @item Autoconf
 create Autoconf executable configure scripts.
 @end table
+
address@hidden address@hidden
address@hidden -i @var{dir}
+Prepend directory @var{dir} to the search path.  This is used to include
+the language-specific files before any third-party macros.
 @end table
 
 @cindex @file{autom4te.cfg}
 As an example, if Autoconf is installed in its default location,
address@hidden/usr/local}, running @samp{autom4te -l m4sugar foo.m4} is strictly
-equivalent to running @samp{autom4te --include /usr/local/share/autoconf
-m4sugar/m4sugar.m4f --warning syntax foo.m4}.  Recursive expansion
-applies: running @samp{autom4te -l m4sh foo.m4}, is the same as
address@hidden --language M4sugar m4sugar/m4sh.m4f foo.m4}, i.e.,
address@hidden --include /usr/local/share/autoconf m4sugar/m4sugar.m4f
-m4sugar/m4sh.m4f --mode 777 foo.m4}.  The definition of the languages is
-stored in @file{autom4te.cfg}.
address@hidden/usr/local}, running @samp{autom4te -l m4sugar foo.m4} is
+strictly equivalent to running @samp{autom4te --prepend-include
+/usr/local/share/autoconf m4sugar/m4sugar.m4f --warning syntax foo.m4}.
+Recursive expansion applies: running @samp{autom4te -l m4sh foo.m4},
+is the same as @samp{autom4te --language M4sugar m4sugar/m4sh.m4f
+foo.m4}, i.e., @samp{autom4te --prepend-include /usr/local/share/autoconf
+m4sugar/m4sugar.m4f m4sugar/m4sh.m4f --mode 777 foo.m4}.  The definition
+of the languages is stored in @file{autom4te.cfg}.
 
 
 @node Programming in M4sugar
cvs server: Diffing lib
Index: lib/autom4te.in
===================================================================
RCS file: /cvsroot/autoconf/autoconf/lib/autom4te.in,v
retrieving revision 1.11
diff -u -r1.11 autom4te.in
--- lib/autom4te.in	3 Apr 2002 13:35:59 -0000	1.11
+++ lib/autom4te.in	10 Jun 2002 03:19:36 -0000
@@ -126,7 +126,7 @@
 ## ---------- ##
 
 begin-language: "Autoconf"
-args: --include @datadir@
+args: --prepend-include @datadir@
 args: autoconf/autoconf.m4f
 args: acsite.m4?
 args: aclocal.m4?
@@ -144,7 +144,7 @@
 ## -------- ##
 
 begin-language: "Autotest"
-args: --include @datadir@
+args: --prepend-include @datadir@
 args: autotest/autotest.m4f
 args: package.m4?
 args: --mode 777
@@ -157,7 +157,7 @@
 ## ---- ##
 
 begin-language: "M4sh"
-args: --include @datadir@
+args: --prepend-include @datadir@
 args: m4sugar/m4sh.m4f
 args: --mode 777
 args: --language M4sugar
@@ -169,7 +169,7 @@
 ## ------- ##
 
 begin-language: "M4sugar"
-args: --include @datadir@
+args: --prepend-include @datadir@
 args: m4sugar/m4sugar.m4f
 args: --warning syntax
 end-language: "M4sugar"
cvs server: Diffing lib/Autom4te
cvs server: Diffing lib/autoconf
cvs server: Diffing lib/autoscan
cvs server: Diffing lib/autotest
cvs server: Diffing lib/emacs
cvs server: Diffing lib/m4sugar
cvs server: Diffing man
cvs server: Diffing tests