From db8481b543e1c3c6279a07dcb42172838767d2d6 Mon Sep 17 00:00:00 2001
From: Akim Demaille <akim@epita.fr>
Date: Fri, 31 Aug 2001 13:33:47 +0000
Subject: [PATCH] * doc/autoconf.texi: Catch up -I, --include changes.

---
 ChangeLog         |  4 ++++
 NEWS              |  7 ++++---
 doc/autoconf.texi | 52 ++++++++---------------------------------------
 3 files changed, 17 insertions(+), 46 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8c3b4b47..d406ca12 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-08-31  Akim Demaille  <akim@epita.fr>
+
+	* doc/autoconf.texi: Catch up -I, --include changes.
+
 2001-08-31  Akim Demaille  <akim@epita.fr>
 
 	* bin/autom4te.in (&parse_args): Die on unknown languages.
diff --git a/NEWS b/NEWS
index 1a20bf23..d7d1c627 100644
--- a/NEWS
+++ b/NEWS
@@ -13,10 +13,11 @@
 ** autom4te
   New executable, used by the Autoconf suite to cache and speed up
   some processing.
-** autoconf
-- --force, -f
-** autoheader
+** Standardization of the executables options
 - --force, -f
+  Supported by autom4te, autoconf and autoheader.
+- --include, -I
+  Replaces --autoconf-dir and --localdir in autoconf and autoheader.
 ** Bug fixes
 - The top level $prefix is propagated to the AC_CONFIG_SUBDIRS configures.
 ** C Macros
diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index a7529331..8958d774 100644
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -1151,20 +1151,9 @@ Don't remove the temporary files.
 @itemx -f
 Remake @file{configure} even if newer than its input files.
 
-@item --autoconf-dir=@var{dir}
-@itemx -A @var{dir}
-@evindex AC_MACRODIR
-Override the location where the installed Autoconf data files are looked
-for.  You can also set the @code{AC_MACRODIR} environment variable to a
-directory; this option overrides the environment variable.
-
-This option is rarely needed and dangerous; it is only used when one
-plays with different versions of Autoconf simultaneously.
-
-@item --localdir=@var{dir}
-@itemx -l @var{dir}
-Look for the package file @file{aclocal.m4} in directory @var{dir}
-instead of in the current directory.
+@item --include=@var{dir}
+@itemx -I @var{dir}
+Also look for input files in @var{dir}.  Multiple invocations accumulate.
 
 @item --output=@var{file}
 @itemx -o @var{file}
@@ -2518,21 +2507,9 @@ Don't remove the temporary files.
 @itemx -f
 Remake the template file even if newer than its input files.
 
-@item --autoconf-dir=@var{dir}
-@itemx -A @var{dir}
-@evindex AC_MACRODIR
-Override the location where the installed Autoconf data files are looked
-for.  You can also set the @code{AC_MACRODIR} environment variable to a
-directory; this option overrides the environment variable.
-
-This option is rarely needed and dangerous; it is only used when one
-plays with different versions of Autoconf simultaneously.
-
-@item --localdir=@var{dir}
-@itemx -l @var{dir}
-Look for the package files @file{aclocal.m4} and @file{acconfig.h} (but
-not @file{@var{file}.top} and @file{@var{file}.bot}) in directory
-@var{dir} instead of in the current directory.
+@item --include=@var{dir}
+@itemx -I @var{dir}
+Also look for input files in @var{dir}.  Multiple invocations accumulate.
 
 @item --warnings=@var{category}
 @itemx -W @var{category}
@@ -10089,20 +10066,9 @@ Report processing steps.
 @itemx -d
 Don't remove the temporary files.
 
-@item --autoconf-dir=@var{dir}
-@itemx -A @var{dir}
-@evindex AC_MACRODIR
-Override the location where the installed Autoconf data files are looked
-for.  You can also set the @code{AC_MACRODIR} environment variable to a
-directory; this option overrides the environment variable.
-
-This option is rarely needed and dangerous; it is only used when one
-plays with different versions of Autoconf simultaneously.
-
-@item --localdir=@var{dir}
-@itemx -l @var{dir}
-Look for the package file @file{aclocal.m4} in directory @var{dir}
-instead of in the current directory.
+@item --include=@var{dir}
+@itemx -I @var{dir}
+Also look for input files in @var{dir}.  Multiple invocations accumulate.
 @end table
 
 @node Obsolete Macros