2002-07-29 Mark D. Roth <roth@feep.net>

        * 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.

diff --git a/ChangeLog b/ChangeLog
index c0ae96434fee577d832749056ab5c848d80554e6..9f95558ae69d90eeef383c2ffcfb3c6d2c528b54 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2002-07-29  Mark D. Roth  <roth@feep.net>
+
+       * 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-29  Paul Eggert  <eggert@twinsun.com>
 
        * doc/install.texi: Include copyright symbol in copyright notice.

diff --git a/bin/autom4te.in b/bin/autom4te.in
index 90d377bf85e0c0a3e215278a6d74629c7ebd34fc..963a7bfaade152ce20735df872e5bd00f94d4f8b 100644 (file)
--- a/bin/autom4te.in
+++ b/bin/autom4te.in
@@ -486,8 +486,6 @@ sub parse_args ()
   # 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 @@ sub parse_args ()
      # Library directories:
      "B|prepend-include=s" => \@prepend_include,
      "I|include=s" => \@include,
-     "include-envvar=s" => \$include_envvar,
-     "site-macro-subdir=s" => \@site_macro_subdirs,
 
      # Tracing:
      # Using a hash for traces is seducing.  Unfortunately, upon `-t FOO',
@@ -529,12 +525,12 @@ Try `$me --help' for more information.\n"
     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

diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index d99f8c8a8d22bdb2ea33e6d2b85b2464ec17b1d8..040064de9b737c1cfe81efdc53be7c6cace11ec9 100644 (file)
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -1185,10 +1185,10 @@ Prepend @var{dir} to the include path.  Multiple invocations accumulate.
 
 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
-@samp{$@{datadir@}/autoconf/site_macros/autoconf} by default.
+@samp{$@{datadir@}/autoconf/site_macros} by default.
 
 @item --output=@var{file}
 @itemx -o @var{file}
@@ -7405,15 +7405,6 @@ create Autoconf executable configure scripts.
 Prepend directory @var{dir} to the search path.  This is used to include
 the language-specific files before any third-party macros.
 
-@item --include-envvar=@var{envvar}
-Add directories specified in the environment variable @var{envvar} to
-the search path.
-
-@item --site-macro-subdir=@var{subdir}
-If the site macro directory is set, add the subdirectory @var{subdir}
-of the site macro directory to the search path.
-@end table
-
 @cindex @file{autom4te.cfg}
 As an example, if Autoconf is installed in its default location,
 @file{/usr/local}, running @samp{autom4te -l m4sugar foo.m4} is

diff --git a/lib/autom4te.in b/lib/autom4te.in
index c156a89c7f9a27a4f8e5cd54d3d7968636a56d26..8543bdfff9f67f83a81050675d349ba2ffcc730d 100644 (file)
--- a/lib/autom4te.in
+++ b/lib/autom4te.in
@@ -127,8 +127,6 @@ end-language: "Autoscan-preselections"
 
 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 @@ end-language: "Autoconf"
 
 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 @@ end-language: "Autotest"
 
 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 @@ end-language: "M4sh"
 
 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"