cvs server: Diffing .
Index: ChangeLog
===================================================================
RCS file: /cvsroot/autoconf/autoconf/ChangeLog,v
retrieving revision 1.1973
diff -u -r1.1973 ChangeLog
--- ChangeLog	25 Jul 2002 21:00:45 -0000	1.1973
+++ ChangeLog	27 Jul 2002 21:35:31 -0000
@@ -1,3 +1,13 @@
+2002-07-27  Mark D. Roth  <address@hidden>
+
+	* bin/autom4te.in: Remove --include-envvar and --site-macro-subdir
+	options and use $AUTOM4TE_PATH.
+	* doc/autoconf.texi: Remove documentation of autom4te
+	--include-envvar and --site-macro-subdir options and document
+	use of $AUTOM4TE_PATH.
+	* lib/autom4te.in: Remove --include-envvar and --site-macro-subdir
+	arguments from each language section.
+
 2002-07-25  Alexandre Duret-Lutz  <address@hidden>
 
 	* doc/autoconf.texi (Limitations of Make): Escaped newlines in
cvs server: Diffing bin
Index: bin/autom4te.in
===================================================================
RCS file: /cvsroot/autoconf/autoconf/bin/autom4te.in,v
retrieving revision 1.66
diff -u -r1.66 autom4te.in
--- bin/autom4te.in	17 Jul 2002 08:30:43 -0000	1.66
+++ bin/autom4te.in	27 Jul 2002 21:35:33 -0000
@@ -486,8 +486,6 @@
   # Process the arguments for real this time.
   my @trace;
   my @prepend_include;
-  my $include_envvar;
-  my @site_macro_subdirs;
   getopt
     (
      # Operation modes:
@@ -499,8 +497,6 @@
      # Library directories:
      "B|prepend-include=s" => address@hidden,
      "I|include=s" => address@hidden,
-     "include-envvar=s" => \$include_envvar,
-     "site-macro-subdir=s" => address@hidden,
 
      # Tracing:
      # Using a hash for traces is seducing.  Unfortunately, upon `-t FOO',
@@ -529,12 +525,12 @@
     if $freeze;
 
   # Add directories from the appropriate env var to the include path.
-  @include = (@include, split(/:/, $ENV{$include_envvar}))
-    if defined($include_envvar) && exists($ENV{$include_envvar});
+  @include = (@include, split(/:/, $ENV{'AUTOM4TE_PATH'}))
+    if exists($ENV{'AUTOM4TE_PATH'});
 
   # Also add the site macro directory, if applicable.
-  map { @include = (@include, "@SITE_MACRO_DIR@/$_"); } @site_macro_subdirs
-    if ('@SITE_MACRO_DIR@' ne 'no') && @site_macro_subdirs;
+  @include = (@include, '@SITE_MACRO_DIR@')
+    if ('@SITE_MACRO_DIR@' ne 'no');
 
   # Normalize the includes: the first occurrence is enough, several is
   # a pain since it introduces a useless difference in the path which
cvs server: Diffing config
cvs server: Diffing doc
Index: doc/autoconf.texi
===================================================================
RCS file: /cvsroot/autoconf/autoconf/doc/autoconf.texi,v
retrieving revision 1.652
diff -u -r1.652 autoconf.texi
--- doc/autoconf.texi	25 Jul 2002 21:00:45 -0000	1.652
+++ doc/autoconf.texi	27 Jul 2002 21:36:05 -0000
@@ -1185,10 +1185,10 @@
 
 After searching any directories specified using @option{--prepend-include}
 or @option{--include}, @command{autoconf} will also search the directories
-specified in the @code{AC_MACRO_PATH} environment variable, if set.
+specified in the @code{AUTOM4TE_PATH} environment variable, if set.
 And finally, @command{autoconf} will also search the system-wide site
 macro directory, which is set to
address@hidden@address@hidden/autoconf/site_macros/autoconf} by default.
address@hidden@address@hidden/autoconf/site_macros} by default.
 
 @item address@hidden
 @itemx -o @var{file}
@@ -7404,15 +7404,6 @@
 @item -B @var{dir}
 Prepend directory @var{dir} to the search path.  This is used to include
 the language-specific files before any third-party macros.
-
address@hidden address@hidden
-Add directories specified in the environment variable @var{envvar} to
-the search path.
-
address@hidden address@hidden
-If the site macro directory is set, add the subdirectory @var{subdir}
-of the site macro directory to the search path.
address@hidden table
 
 @cindex @file{autom4te.cfg}
 As an example, if Autoconf is installed in its default location,
cvs server: Diffing lib
Index: lib/autom4te.in
===================================================================
RCS file: /cvsroot/autoconf/autoconf/lib/autom4te.in,v
retrieving revision 1.12
diff -u -r1.12 autom4te.in
--- lib/autom4te.in	17 Jul 2002 08:30:44 -0000	1.12
+++ lib/autom4te.in	27 Jul 2002 21:36:06 -0000
@@ -127,8 +127,6 @@
 
 begin-language: "Autoconf"
 args: --prepend-include @datadir@
-args: --site-macro-subdir autoconf
-args: --include-envvar AC_MACRO_PATH
 args: autoconf/autoconf.m4f
 args: acsite.m4?
 args: aclocal.m4?
@@ -147,8 +145,6 @@
 
 begin-language: "Autotest"
 args: --prepend-include @datadir@
-args: --site-macro-subdir autotest
-args: --include-envvar AT_MACRO_PATH
 args: autotest/autotest.m4f
 args: package.m4?
 args: --mode 777
@@ -162,8 +158,6 @@
 
 begin-language: "M4sh"
 args: --prepend-include @datadir@
-args: --site-macro-subdir m4sh
-args: --include-envvar M4SH_MACRO_PATH
 args: m4sugar/m4sh.m4f
 args: --mode 777
 args: --language M4sugar
@@ -176,8 +170,6 @@
 
 begin-language: "M4sugar"
 args: --prepend-include @datadir@
-args: --site-macro-subdir m4sugar
-args: --include-envvar M4SUGAR_MACRO_PATH
 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