Disabling site macros

[Akim Demaille]

This patch is on the road to the release.

Index: ChangeLog
from  Akim Demaille  <address@hidden>

        * bin/autom4te.in (parse_args): Don't honor AUTOM4TE_PATH and
        SITE_MACRO_DIR.
        * configure.ac: Disable SITE_MACRO_DIR.

Index: NEWS
===================================================================
RCS file: /cvsroot/autoconf/autoconf/NEWS,v
retrieving revision 1.254
diff -u -u -r1.254 NEWS
--- NEWS 29 Aug 2002 08:24:39 -0000 1.254
+++ NEWS 2 Sep 2002 15:13:36 -0000
@@ -18,11 +18,6 @@
   instead of prepending; this is for consistency with other GNU tools.
   The new -B DIR or --prepend-include=DIR option has the old behavior.

-- Autoconf now normally appends ${datadir}/autoconf/site_macros to the
-  include path.  The new --disable-site-macro-dir configure-time
-  option inhibits this, and the new --enable-site-macro-dir=DIR
-  configure-time option causes it to append DIR instead.
-
 ** Macros

 - AC_OUTPUT
Index: configure.ac
===================================================================
RCS file: /cvsroot/autoconf/autoconf/configure.ac,v
retrieving revision 1.41
diff -u -u -r1.41 configure.ac
--- configure.ac 18 Jul 2002 15:37:49 -0000 1.41
+++ configure.ac 2 Sep 2002 15:13:38 -0000
@@ -31,13 +31,6 @@

 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])
Index: bin/Makefile.am
===================================================================
RCS file: /cvsroot/autoconf/autoconf/bin/Makefile.am,v
retrieving revision 1.6
diff -u -u -r1.6 Makefile.am
--- bin/Makefile.am 17 Jul 2002 08:30:43 -0000 1.6
+++ bin/Makefile.am 2 Sep 2002 15:13:38 -0000
@@ -45,8 +45,7 @@
        -e 's,@M4\@,$(M4),g' \
        -e 's,@AWK\@,$(AWK),g' \
        -e 's,@VERSION\@,$(VERSION),g' \
-       -e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
-       -e 's,@SITE_MACRO_DIR\@,$(SITE_MACRO_DIR),g'
+       -e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g'

 # autoconf is written in M4sh.
 AUTOM4SH = $(top_builddir)/tests/autom4te --language M4sh
Index: bin/autom4te.in
===================================================================
RCS file: /cvsroot/autoconf/autoconf/bin/autom4te.in,v
retrieving revision 1.69
diff -u -u -r1.69 autom4te.in
--- bin/autom4te.in 29 Aug 2002 08:13:24 -0000 1.69
+++ bin/autom4te.in 2 Sep 2002 15:13:41 -0000
@@ -524,14 +524,6 @@
   $melt = 1
     if $freeze;

-  # Add directories from the appropriate env var to the include path.
-  @include = (@include, split(/:/, $ENV{'AUTOM4TE_PATH'}))
-    if exists($ENV{'AUTOM4TE_PATH'});
-
-  # Also add the site macro directory, if applicable.
-  @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
   # invalidates the cache.  And strip `.' which is implicit and always
Index: doc/autoconf.texi
===================================================================
RCS file: /cvsroot/autoconf/autoconf/doc/autoconf.texi,v
retrieving revision 1.659
diff -u -u -r1.659 autoconf.texi
--- doc/autoconf.texi 1 Sep 2002 10:26:58 -0000 1.659
+++ doc/autoconf.texi 2 Sep 2002 15:13:56 -0000
@@ -1183,13 +1183,6 @@
 @item -B @var{dir}
 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{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} by default.
-
 @item address@hidden
 @itemx -o @var{file}
 Save output (script or trace) to @var{file}.  The file @option{-} stands