---- autoconf-2.54/doc/autoconf.texi.orig Fri Oct 4 23:19:09 2002
-+++ autoconf-2.54/doc/autoconf.texi Fri Oct 4 23:24:43 2002
-@@ -94,33 +94,19 @@
+diff -Nur autoconf-2.58.orig/doc/autoconf.texi autoconf-2.58/doc/autoconf.texi
+--- autoconf-2.58.orig/doc/autoconf.texi 2003-11-05 19:26:28.000000000 +0100
++++ autoconf-2.58/doc/autoconf.texi 2003-11-05 19:29:40.054405552 +0100
+@@ -208,29 +208,19 @@
--@dircategory GNU programming tools
+-@dircategory Software development
+@dircategory Programming tools:
@direntry
--* Autoconf: (autoconf). Create source code configuration scripts
+-* Autoconf: (autoconf). Create source code configuration scripts.
-@end direntry
-
-@dircategory Individual utilities
-@direntry
-* autoscan: (autoconf)autoscan Invocation.
- Semi-automatic @file{configure.ac} writing
--* ifnames: (autoconf)ifnames Invocation.
-- Listing the conditionals in source code
+-* ifnames: (autoconf)ifnames Invocation. Listing conditionals in source.
-* autoconf: (autoconf)autoconf Invocation.
- How to create configuration scripts
-* autoreconf: (autoconf)autoreconf Invocation.
- Remaking multiple @command{configure} scripts
-* autoheader: (autoconf)autoheader Invocation.
- How to create configuration templates
--* autom4te: (autoconf)Invoking autom4te.
+-* autom4te: (autoconf)autom4te Invocation.
- The Autoconf executables backbone
--* configure: (autoconf)configure Invocation.
-- Configuring a package
+-* configure: (autoconf)configure Invocation. Configuring a package.
-* autoupdate: (autoconf)autoupdate Invocation.
- Automatic update of @file{configure.ac}
--* config.status: (autoconf)config.status Invocation.
-- Recreating a configuration
--* testsuite: (autoconf)testsuite Invocation.
-- Running an Autotest test suite
+-* config.status: (autoconf)config.status Invocation. Recreating configurations.
+-* testsuite: (autoconf)testsuite Invocation. Running an Autotest test suite.
+* Autoconf: (autoconf). Create source code configuration scripts
+* autoscan: (autoconf)autoscan. Semi-automatic @file{configure.ac} writing
-+* ifnames: (autoconf)ifnames. Listing the conditionals in source code
++* ifnames: (autoconf)ifnames. Listing conditionals in source
+* autoconf: (autoconf)autoconf. How to create configuration scripts
+* autoreconf: (autoconf)autoreconf. Remaking multiple @command{configure} scripts
+* autoheader: (autoconf)autoheader. How to create configuration templates
+* autom4te: (autoconf)autom4te. The Autoconf executables backbone
+* configure: (autoconf)configure. Configuring a package
+* autoupdate: (autoconf)autoupdate. Automatic update of @file{configure.ac}
-+* config.status: (autoconf)config.status. Recreating a configuration
++* config.status: (autoconf)config.status. Recreating configurations
+* testsuite: (autoconf)testsuite. Running an Autotest test suite
@end direntry
@titlepage
-@@ -160,7 +146,7 @@
+@@ -270,7 +260,7 @@
* Manual Configuration:: Selecting features that can't be guessed
* Site Configuration:: Local defaults for @command{configure}
* Running configure Scripts:: How to use the Autoconf output
* Obsolete Constructs:: Kept for backward compatibility
* Using Autotest:: Creating portable test suites
* FAQ:: Frequent Autoconf Questions, with answers
-@@ -180,10 +166,10 @@
+@@ -290,10 +280,10 @@
Making @command{configure} Scripts
* Writing configure.ac:: What to put in an Autoconf input file
Writing @file{configure.ac}
-@@ -216,7 +202,7 @@
+@@ -326,7 +316,7 @@
Configuration Header Files
* Header Templates:: Input for the configuration headers
* Autoheader Macros:: How to specify CPP templates
Existing Tests
-@@ -388,13 +374,13 @@
+@@ -437,7 +427,7 @@
+
+ Using @command{autom4te}
+
+-* autom4te Invocation:: A @acronym{GNU} M4 wrapper
++* autom4te:: A @acronym{GNU} M4 wrapper
+ * Customizing autom4te:: Customizing the Autoconf package
+
+ Programming in M4sugar
+@@ -505,13 +495,13 @@
* System Type:: Specifying the system type
* Sharing Defaults:: Setting site-wide defaults for @command{configure}
* Defining Variables:: Specifying the compiler etc.
* Obsolete Macros:: Backward compatibility macros
* Autoconf 1:: Tips for upgrading your files
* Autoconf 2.13:: Some fresher tips
-@@ -418,7 +404,7 @@
+@@ -536,7 +526,7 @@
* Using an Autotest Test Suite:: Autotest and the user
* Writing testsuite.at:: Autotest macros
* Making testsuite Scripts:: Using autom4te to create @command{testsuite}
Using an Autotest Test Suite
-@@ -729,7 +715,7 @@
+@@ -843,7 +833,7 @@
@item
a shell script called @file{config.status} that, when run, will recreate
@item
an optional shell script normally called @file{config.cache}
-@@ -789,10 +775,10 @@
+@@ -903,10 +893,10 @@
@menu
* Writing configure.ac:: What to put in an Autoconf input file
@end menu
@node Writing configure.ac
-@@ -808,7 +794,7 @@
+@@ -922,7 +912,7 @@
or specialized features, @file{configure.ac} might need to contain some
hand-crafted shell commands; see @ref{Portable Shell}. The
@command{autoscan} program can give you a good start in writing
Previous versions of Autoconf promoted the name @file{configure.in},
which is somewhat ambiguous (the tool needed to process this file is not
-@@ -1036,7 +1022,7 @@
+@@ -1150,7 +1140,7 @@
@end display
@section Using @command{autoscan} to Create @file{configure.ac}
@cindex @command{autoscan}
-@@ -1058,7 +1044,7 @@
+@@ -1172,7 +1162,7 @@
use a configuration header file, you must add a call to
@code{AC_CONFIG_HEADERS} (@pxref{Configuration Headers}). You might
also have to change or add some @code{#if} directives to your program in
information about a program that can help with that job).
When using @command{autoscan} to maintain a @file{configure.ac}, simply
-@@ -1097,7 +1083,7 @@
+@@ -1211,7 +1201,7 @@
Prepend @var{dir} to the include path. Multiple invocations accumulate.
@end table
@section Using @command{ifnames} to List Conditionals
@cindex @command{ifnames}
-@@ -1106,8 +1092,7 @@
+@@ -1220,8 +1210,7 @@
preprocessor conditionals. If a package has already been set up to have
some portability, @command{ifnames} can thus help you figure out what its
@command{configure} needs to check for. It may help fill in some gaps in a
@command{ifnames} scans all of the C source files named on the command line
(or the standard input, if none are given) and writes to the standard
-@@ -1129,7 +1114,7 @@
+@@ -1243,7 +1232,7 @@
Print the version number of Autoconf and exit.
@end table
@section Using @command{autoconf} to Create @command{configure}
@cindex @command{autoconf}
-@@ -1389,7 +1374,7 @@
+@@ -1337,8 +1326,7 @@
+ @cindex Macro invocation stack
+ Because @command{autoconf} uses @command{autom4te} behind the scenes, it
+ displays a back trace for errors, but not for warnings; if you want
+-them, just pass @option{-W error}. @xref{autom4te Invocation}, for some
+-examples.
++them, just pass @option{-W error}. @xref{autom4te}, for some examples.
+
+ @item --trace=@var{macro}[:@var{format}]
+ @itemx -t @var{macro}[:@var{format}]
+@@ -1350,7 +1338,7 @@
+
+ The @var{format} is a regular string, with newlines if desired, and
+ several special escape codes. It defaults to @samp{$f:$l:$n:$%}; see
+-@ref{autom4te Invocation}, for details on the @var{format}.
++@ref{autom4te}, for details on the @var{format}.
+
+ @item --initialization
+ @itemx -i
+@@ -1424,7 +1412,7 @@
@end group
@end example
@section Using @command{autoreconf} to Update @command{configure} Scripts
@cindex @command{autoreconf}
-@@ -1623,8 +1608,8 @@
+@@ -1709,8 +1697,8 @@
source directory; @command{configure} checks for this file's existence to
make sure that the directory that it is told contains the source code in
fact does. Occasionally people accidentally specify the wrong directory
@end defmac
-@@ -1790,7 +1775,7 @@
+@@ -1898,7 +1886,7 @@
when used in @var{output}, or the standard input when used in the
@var{inputs}. You most probably don't need to use this in
@file{configure.ac}, but it is convenient when using the command line
for more details.
The @var{inputs} may be absolute or relative filenames. In the latter
-@@ -2387,7 +2372,7 @@
+@@ -2521,7 +2509,7 @@
@file{config.h} is considered up to date. @xref{Output}, for more
information about @code{AC_OUTPUT}.
configuration-related dependencies.
@node Configuration Headers
-@@ -2448,7 +2433,7 @@
+@@ -2583,7 +2571,7 @@
@menu
* Header Templates:: Input for the configuration headers
* Autoheader Macros:: How to specify CPP templates
@end menu
-@@ -2499,10 +2484,10 @@
- @samp{#undef} is strongly discouraged.
+@@ -2637,10 +2625,10 @@
+ comments in preprocessor macros has never been a good idea.
Since it is a tedious task to keep a template header up to date, you may
-use @command{autoheader} to generate it, see @ref{autoheader Invocation}.
@subsection Using @command{autoheader} to Create @file{config.h.in}
@cindex @command{autoheader}
-@@ -6215,7 +6200,7 @@
+@@ -6948,7 +6936,7 @@
files will depend upon @command{bizarre-cc} being the C compiler. If
for some reason the user runs @command{./configure} again, or if it is
run via @samp{./config.status --recheck}, (@xref{Automatic Remaking},
inconsistent, composed of results depending upon two different
compilers.
-@@ -6267,7 +6252,7 @@
+@@ -7000,7 +6988,7 @@
@item
@var{variable} is kept during automatic reconfiguration
line argument, including when no cache is used:
@example
-@@ -7394,7 +7379,7 @@
+@@ -7871,11 +7859,11 @@
+ It supports M4 extensions designed for use in tools like Autoconf.
+
+ @menu
+-* autom4te Invocation:: A @acronym{GNU} M4 wrapper
++* autom4te:: A @acronym{GNU} M4 wrapper
+ * Customizing autom4te:: Customizing the Autoconf package
+ @end menu
+
+-@node autom4te Invocation
++@node autom4te
+ @subsection Invoking @command{autom4te}
+
+ The command line arguments are modeled after M4's:
+@@ -8158,7 +8146,7 @@
not.
@end table
@item --preselect=@var{macro}
@itemx -p @var{macro}
-@@ -7845,7 +7830,7 @@
+@@ -8232,8 +8220,8 @@
+ wrapped in between a @samp{begin-language: "@var{language}"},
+ @samp{end-language: "@var{language}"} pair.
+
+-Customizing a language stands for appending options (@pxref{autom4te
+-Invocation}) to the current definition of the language. Options, and
++Customizing a language stands for appending options (@pxref{autom4te})
++to the current definition of the language. Options, and
+ more generally arguments, are introduced by @samp{args:
+ @var{arguments}}. You may use the traditional shell syntax to quote the
+ @var{arguments}.
+@@ -8662,7 +8650,7 @@
When the user runs @samp{autoconf -W error}, warnings from
@code{AC_DIAGNOSE} and @code{AC_WARNING} are reported as error, see
@node Dependencies Between Macros
@section Dependencies Between Macros
-@@ -11642,7 +11627,7 @@
+@@ -12729,7 +12717,7 @@
* System Type:: Specifying the system type
* Sharing Defaults:: Setting site-wide defaults for @command{configure}
* Defining Variables:: Specifying the compiler etc.
@end menu
@set autoconf
-@@ -11651,7 +11636,7 @@
+@@ -12738,7 +12726,7 @@
@c ============================================== Recreating a Configuration
@chapter Recreating a Configuration
@cindex @command{config.status}
-@@ -11785,7 +11770,7 @@
+@@ -12878,7 +12866,7 @@
@menu
* Obsolete config.status Use:: Different calling convention
* acconfig.h:: Additional entries in @file{config.h.in}
* Obsolete Macros:: Backward compatibility macros
* Autoconf 1:: Tips for upgrading your files
* Autoconf 2.13:: Some fresher tips
-@@ -11795,7 +11780,7 @@
+@@ -12888,7 +12876,7 @@
@section Obsolete @file{config.status} Invocation
@file{config.status} now supports arguments to specify the files to
Before, environment variables had to be used.
@defvar CONFIG_COMMANDS
-@@ -11826,7 +11811,7 @@
+@@ -12919,7 +12907,7 @@
@file{config.status} ignores this variable.
@end defvar
would be:
@example
-@@ -11900,7 +11885,7 @@
+@@ -12993,7 +12981,7 @@
self-contained, and should not depend upon @file{acconfig.h} etc.
@section Using @command{autoupdate} to Modernize @file{configure.ac}
@cindex @command{autoupdate}
-@@ -12750,7 +12735,7 @@
+@@ -13929,7 +13917,7 @@
If you have an @file{aclocal.m4} installed with Autoconf (as opposed to
in a particular package's source directory), you must rename it to
If you distribute @file{install.sh} with your package, rename it to
@file{install-sh} so @code{make} builtin rules won't inadvertently
-@@ -12805,7 +12790,7 @@
+@@ -13984,7 +13972,7 @@
the documentation for them. @xref{Obsolete Macros}, for a table showing the
new names for the old macros. Use the @command{autoupdate} program to
convert your @file{configure.ac} to using the new macro names.
Some macros have been superseded by similar ones that do the job better,
but are not call-compatible. If you get warnings about calling obsolete
-@@ -13302,7 +13287,7 @@
+@@ -14549,7 +14537,7 @@
@menu
* Using an Autotest Test Suite:: Autotest and the user
* Writing testsuite.at:: Autotest macros
* Making testsuite Scripts:: Using autom4te to create @command{testsuite}
@end menu
-@@ -13564,7 +13549,7 @@
+@@ -14611,7 +14599,7 @@
+
+ @itemize @bullet
+ @item a debugging script named @file{run} which reruns the test in
+-@dfn{debug mode} (@pxref{testsuite Invocation}). The automatic generation
++@dfn{debug mode} (@pxref{testsuite}). The automatic generation
+ of debugging scripts has the purpose of easing the chase for bugs.
+
+ @item all the files created with @code{AT_DATA}
+@@ -14833,7 +14821,7 @@
@end defmac
@section Running @command{testsuite} Scripts
@cindex @command{testsuite}
-@@ -13706,7 +13691,7 @@
+@@ -14976,7 +14964,7 @@
An Autotest test suite is to be configured in @var{directory}. This
macro requires the instantiation of @file{@var{directory}/atconfig} from
@file{@var{directory}/atconfig.in}, and sets the default
@end defmac
@item
---- autoconf-2.54/doc/install.texi.orig Tue Aug 27 10:28:06 2002
-+++ autoconf-2.54/doc/install.texi Fri Oct 4 23:27:28 2002
+@@ -15306,7 +15294,7 @@
+ which can be a very long process for complex @file{configure.ac}.
+
+ This is why all these tools, instead of running directly M4, invoke
+-@command{autom4te} (@pxref{autom4te Invocation}) which, while answering to
++@command{autom4te} (@pxref{autom4te}) which, while answering to
+ a specific demand, stores additional information in
+ @file{autom4te.cache} for future runs. For instance, if you run
+ @command{autoconf}, behind the scenes, @command{autom4te} will also
+diff -Nur autoconf-2.58.orig/doc/install.texi autoconf-2.58/doc/install.texi
+--- autoconf-2.58.orig/doc/install.texi 2002-08-27 10:28:06.000000000 +0200
++++ autoconf-2.58/doc/install.texi 2003-11-05 19:26:39.414866936 +0100
@@ -225,7 +225,7 @@
overridden in the site shell script).
@section @command{configure} Invocation
@command{configure} recognizes the following options to control how it
+diff -Nur autoconf-2.58.orig/doc/standards.texi autoconf-2.58/doc/standards.texi
+--- autoconf-2.58.orig/doc/standards.texi 2003-09-15 03:33:44.000000000 +0200
++++ autoconf-2.58/doc/standards.texi 2003-11-05 19:26:39.427864960 +0100
+@@ -6,9 +6,9 @@
+ @set lastupdate April 29, 2003
+ @c %**end of header
+
+-@dircategory GNU organization
++@dircategory Miscellaneous:
+ @direntry
+-* Standards: (standards). GNU coding standards.
++* Standards: (standards). GNU coding standards
+ @end direntry
+
+ @c @setchapternewpage odd