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

SITE_MACRO_DIR.
* configure.ac: Disable SITE_MACRO_DIR.

diff --git a/ChangeLog b/ChangeLog
index 147da25015d14e186aa56cbd5f2d14e54a40d67a..7f08f63d9c540ef0e812e7188726f76cc70fc9ec 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-09-02  Akim Demaille  <akim@epita.fr>
+
+       * bin/autom4te.in (parse_args): Don't honor AUTOM4TE_PATH and
+       SITE_MACRO_DIR.
+       * configure.ac: Disable SITE_MACRO_DIR.
+
 2002-09-02  Jim Meyering  <meyering@lucent.com>
 
        * doc/autoconf.texi (AC_SYS_POSIX_TERMIOS): Reflect renaming: s/am/ac/,

diff --git a/Makefile.in b/Makefile.in
index 24902cd4d72dde07397b2f2254f547a65c88b46a..0b1904813d5b6ad21415aa1844a6e5b28b7638e7 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -74,7 +74,6 @@ M4 = @M4@
 PACKAGE = @PACKAGE@
 PACKAGE_NAME = @PACKAGE_NAME@
 PERL = @PERL@
-SITE_MACRO_DIR = @SITE_MACRO_DIR@
 STRIP = @STRIP@
 VERSION = @VERSION@
 am__include = @am__include@

diff --git a/NEWS b/NEWS
index abfb0bbd206a5864af9b04b27bbbf450cb8524ee..0d8184bbbe88952796ccebaec20536c5c21fe301 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -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

diff --git a/aclocal.m4 b/aclocal.m4
index 4798e2e53266392bc2432d1f0ef77078d2d849f8..07ddf6fa8239c24e54ad27bf5539a55ccc2dcd0b 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-# aclocal.m4 generated automatically by aclocal 1.6.3 -*- Autoconf -*-
+# aclocal.m4t generated automatically by aclocal 1.6.3 -*- Autoconf -*-
 
 # Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
 # Free Software Foundation, Inc.

diff --git a/bin/Makefile.am b/bin/Makefile.am
index ee77975a9e1ced08422e12b85feeb032d878931b..16ec64c57fd1b7046037ab5be931ed72f9707100 100644 (file)
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -45,8 +45,7 @@ edit = sed \
        -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

diff --git a/bin/Makefile.in b/bin/Makefile.in
index 8eda281fc8fa4b47555d5dae6a4f515f751ff934..6d7d313151da540d90c696fe210f86053b095ba7 100644 (file)
--- a/bin/Makefile.in
+++ b/bin/Makefile.in
@@ -74,7 +74,6 @@ M4 = @M4@
 PACKAGE = @PACKAGE@
 PACKAGE_NAME = @PACKAGE_NAME@
 PERL = @PERL@
-SITE_MACRO_DIR = @SITE_MACRO_DIR@
 STRIP = @STRIP@
 VERSION = @VERSION@
 am__include = @am__include@
@@ -106,8 +105,7 @@ edit = sed \
        -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.

diff --git a/bin/autom4te.in b/bin/autom4te.in
index 26b68e29fc079c31a469ff9c03470bb0ecc1e765..86d3964b947960754d41f8589f287a2773ccf0ec 100644 (file)
--- a/bin/autom4te.in
+++ b/bin/autom4te.in
@@ -524,14 +524,6 @@ Try `$me --help' for more information."
   $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

diff --git a/config/Makefile.in b/config/Makefile.in
index 532b911262ae09a10fcc51ab936b2a574f5fbba5..d59e2a4a867e417ca672813aa8dc3326e11f3f17 100644 (file)
--- a/config/Makefile.in
+++ b/config/Makefile.in
@@ -74,7 +74,6 @@ M4 = @M4@
 PACKAGE = @PACKAGE@
 PACKAGE_NAME = @PACKAGE_NAME@
 PERL = @PERL@
-SITE_MACRO_DIR = @SITE_MACRO_DIR@
 STRIP = @STRIP@
 VERSION = @VERSION@
 am__include = @am__include@

diff --git a/configure b/configure
index fcb40f5d9a52789ed9f5101026990ac03667531d..fd4b94421818d03d7a113213692e564b74e53640 100755 (executable)
--- a/configure
+++ b/configure
@@ -270,7 +270,7 @@ PACKAGE_STRING='GNU Autoconf 2.53c'
 PACKAGE_BUGREPORT='bug-autoconf@gnu.org'
 
 ac_unique_file="ChangeLog"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE SITE_MACRO_DIR EXPR M4 HELP2MAN PERL EMACS lispdir LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE EXPR M4 HELP2MAN PERL EMACS lispdir LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -785,13 +785,6 @@ if test -n "$ac_init_help"; then
    esac
   cat <<\_ACEOF
 
-Optional Features:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-site-macro-dir=DIR
-                          use site macro directory DIR
-                          [DATADIR/autoconf/site_macros]
-
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
@@ -1570,16 +1563,6 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
 
 
 
-# Check whether --enable-site-macro-dir or --disable-site-macro-dir was given.
-if test "${enable_site_macro_dir+set}" = set; then
-  enableval="$enable_site_macro_dir"
-
-else
-  enable_site_macro_dir='${datadir}/autoconf/site_macros'
-fi;
-SITE_MACRO_DIR="${enable_site_macro_dir}"
-
-
 # Initialize the test suite and build position independent wrappers.
           ac_config_commands="$ac_config_commands tests/atconfig"
 
@@ -2563,7 +2546,6 @@ s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
 s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
 s,@AWK@,$AWK,;t t
 s,@SET_MAKE@,$SET_MAKE,;t t
-s,@SITE_MACRO_DIR@,$SITE_MACRO_DIR,;t t
 s,@EXPR@,$EXPR,;t t
 s,@M4@,$M4,;t t
 s,@HELP2MAN@,$HELP2MAN,;t t

diff --git a/configure.ac b/configure.ac
index 88495c3a50f08f073f7fe19edcc44a2591ce3387..783bea318c6f7fed150d48e6fd44753f5e65613c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -31,13 +31,6 @@ AC_CONFIG_FILES([config/Makefile])
 
 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])

diff --git a/doc/Makefile.in b/doc/Makefile.in
index cea20d20d6b302a0ea25cf6d7e02fbd4b2ed5e2e..9c3afc847bdc77914713c833063bf4ea77961318 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -74,7 +74,6 @@ M4 = @M4@
 PACKAGE = @PACKAGE@
 PACKAGE_NAME = @PACKAGE_NAME@
 PERL = @PERL@
-SITE_MACRO_DIR = @SITE_MACRO_DIR@
 STRIP = @STRIP@
 VERSION = @VERSION@
 am__include = @am__include@

diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index ce4309cc0db41e447b122cc5228539330b096109..1a44588dd15ab99824c23b3cca6a979f37edc1b3 100644 (file)
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -1183,13 +1183,6 @@ Append @var{dir} to the include path.  Multiple invocations accumulate.
 @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
-@samp{$@{datadir@}/autoconf/site_macros} by default.
-
 @item --output=@var{file}
 @itemx -o @var{file}
 Save output (script or trace) to @var{file}.  The file @option{-} stands

diff --git a/lib/Autom4te/Makefile.in b/lib/Autom4te/Makefile.in
index 6b58a7935d0ff1e448a14227fcd14ced7ed2ad6e..12b211c20827fefced4ec437257488c8aa9414d7 100644 (file)
--- a/lib/Autom4te/Makefile.in
+++ b/lib/Autom4te/Makefile.in
@@ -74,7 +74,6 @@ M4 = @M4@
 PACKAGE = @PACKAGE@
 PACKAGE_NAME = @PACKAGE_NAME@
 PERL = @PERL@
-SITE_MACRO_DIR = @SITE_MACRO_DIR@
 STRIP = @STRIP@
 VERSION = @VERSION@
 am__include = @am__include@

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 8961fe36fdc18360a461b6f8d691e46b2030b5e8..798cec1a25831cfb9a9ef0a464c089204c8042ca 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -74,7 +74,6 @@ M4 = @M4@
 PACKAGE = @PACKAGE@
 PACKAGE_NAME = @PACKAGE_NAME@
 PERL = @PERL@
-SITE_MACRO_DIR = @SITE_MACRO_DIR@
 STRIP = @STRIP@
 VERSION = @VERSION@
 am__include = @am__include@

diff --git a/lib/autoconf/Makefile.in b/lib/autoconf/Makefile.in
index c396cdbc1603cd6de16489667b426c62b8e424a9..d57ff31b4282318a4a41cd42f3d4711b73846a80 100644 (file)
--- a/lib/autoconf/Makefile.in
+++ b/lib/autoconf/Makefile.in
@@ -74,7 +74,6 @@ M4 = @M4@
 PACKAGE = @PACKAGE@
 PACKAGE_NAME = @PACKAGE_NAME@
 PERL = @PERL@
-SITE_MACRO_DIR = @SITE_MACRO_DIR@
 STRIP = @STRIP@
 VERSION = @VERSION@
 am__include = @am__include@

diff --git a/lib/autoscan/Makefile.in b/lib/autoscan/Makefile.in
index fb03137e6f1b2a0f52ebddd13e6cae34a6a9b04e..437872cd20bad5701e29e7ac2d32fe9f2d7d6540 100644 (file)
--- a/lib/autoscan/Makefile.in
+++ b/lib/autoscan/Makefile.in
@@ -74,7 +74,6 @@ M4 = @M4@
 PACKAGE = @PACKAGE@
 PACKAGE_NAME = @PACKAGE_NAME@
 PERL = @PERL@
-SITE_MACRO_DIR = @SITE_MACRO_DIR@
 STRIP = @STRIP@
 VERSION = @VERSION@
 am__include = @am__include@

diff --git a/lib/autotest/Makefile.in b/lib/autotest/Makefile.in
index ccf19407bfb534bfbc07452dfb297e3a71ae65ad..7777a13c6e26f436cd45678221cb09e1e803b7c8 100644 (file)
--- a/lib/autotest/Makefile.in
+++ b/lib/autotest/Makefile.in
@@ -74,7 +74,6 @@ M4 = @M4@
 PACKAGE = @PACKAGE@
 PACKAGE_NAME = @PACKAGE_NAME@
 PERL = @PERL@
-SITE_MACRO_DIR = @SITE_MACRO_DIR@
 STRIP = @STRIP@
 VERSION = @VERSION@
 am__include = @am__include@

diff --git a/lib/emacs/Makefile.in b/lib/emacs/Makefile.in
index 4ff676d571518ef958524e189c3fde88e92ba0e5..aad40f29bc3615bc7f8261ef140d1f703b59bee4 100644 (file)
--- a/lib/emacs/Makefile.in
+++ b/lib/emacs/Makefile.in
@@ -74,7 +74,6 @@ M4 = @M4@
 PACKAGE = @PACKAGE@
 PACKAGE_NAME = @PACKAGE_NAME@
 PERL = @PERL@
-SITE_MACRO_DIR = @SITE_MACRO_DIR@
 STRIP = @STRIP@
 VERSION = @VERSION@
 am__include = @am__include@

diff --git a/lib/m4sugar/Makefile.in b/lib/m4sugar/Makefile.in
index 2cff2f74d7bb14fa4a00678fd2e2f5b9d984a7a1..c03f8801e68f2d1f89724cf46edbfdb73bcb78cb 100644 (file)
--- a/lib/m4sugar/Makefile.in
+++ b/lib/m4sugar/Makefile.in
@@ -74,7 +74,6 @@ M4 = @M4@
 PACKAGE = @PACKAGE@
 PACKAGE_NAME = @PACKAGE_NAME@
 PERL = @PERL@
-SITE_MACRO_DIR = @SITE_MACRO_DIR@
 STRIP = @STRIP@
 VERSION = @VERSION@
 am__include = @am__include@

diff --git a/man/Makefile.in b/man/Makefile.in
index f2f0159cddfeb09704d914b03e7e3903ba83bfa6..ea16370cd69a42f6d0d362208d23faa7c224b3f6 100644 (file)
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -74,7 +74,6 @@ M4 = @M4@
 PACKAGE = @PACKAGE@
 PACKAGE_NAME = @PACKAGE_NAME@
 PERL = @PERL@
-SITE_MACRO_DIR = @SITE_MACRO_DIR@
 STRIP = @STRIP@
 VERSION = @VERSION@
 am__include = @am__include@

diff --git a/man/autom4te.1 b/man/autom4te.1
index b284621a3838189bc4fc3703a2d82a634f7db703..bd80b10b5ecd4e877a7171fb251243a604dfaaf5 100644 (file)
--- a/man/autom4te.1
+++ b/man/autom4te.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.28.
-.TH AUTOM4TE "1" "August 2002" "autom4te 2.53c" "User Commands"
+.TH AUTOM4TE "1" "September 2002" "autom4te 2.53c" "User Commands"
 .SH NAME
 autom4te \- Generate files and scripts thanks to M4
 .SH SYNOPSIS

diff --git a/man/ifnames.1 b/man/ifnames.1
index b09f88d6eca092b65fba84756dd586fd9104e6b3..a3eaf6d8dab18d2f2cc8b578a1da0952636ea582 100644 (file)
--- a/man/ifnames.1
+++ b/man/ifnames.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.28.
-.TH IFNAMES "1" "July 2002" "ifnames " "User Commands"
+.TH IFNAMES "1" "September 2002" "ifnames " "User Commands"
 .SH NAME
 ifnames \- Extract CPP conditionals from a set of files
 .SH SYNOPSIS

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 0326fe0633624205b79fe2372e717cefaf31a713..6e95bed15835e0d6bd0169ac6b73f1eca165f7ba 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -74,7 +74,6 @@ M4 = @M4@
 PACKAGE = @PACKAGE@
 PACKAGE_NAME = @PACKAGE_NAME@
 PERL = @PERL@
-SITE_MACRO_DIR = @SITE_MACRO_DIR@
 STRIP = @STRIP@
 VERSION = @VERSION@
 am__include = @am__include@