-diff -Nur autoconf-2.56.orig/doc/autoconf.texi autoconf-2.56/doc/autoconf.texi
---- autoconf-2.56.orig/doc/autoconf.texi Mon Nov 18 21:47:10 2002
-+++ autoconf-2.56/doc/autoconf.texi Mon Nov 18 21:52:44 2002
-@@ -95,33 +95,19 @@
+--- autoconf-2.60/doc/autoconf.texi.orig 2006-06-27 23:03:21.858011250 +0200
++++ autoconf-2.60/doc/autoconf.texi 2006-06-27 23:04:06.268786750 +0200
+@@ -203,29 +203,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.
- How to create configuration templates
-* 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
-@@ -161,7 +147,7 @@
+@@ -267,7 +257,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
-@@ -181,10 +167,10 @@
+@@ -288,10 +278,10 @@
Making @command{configure} Scripts
* Writing configure.ac:: What to put in an Autoconf input file
Writing @file{configure.ac}
-@@ -217,7 +203,7 @@
+@@ -325,7 +315,7 @@
Configuration Header Files
* Header Templates:: Input for the configuration headers
* Autoheader Macros:: How to specify CPP templates
Existing Tests
-@@ -328,7 +314,7 @@
+@@ -441,7 +431,7 @@
Using @command{autom4te}
* Customizing autom4te:: Customizing the Autoconf package
Programming in M4sugar
-@@ -395,13 +381,13 @@
+@@ -548,13 +538,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
-@@ -426,7 +412,7 @@
+@@ -579,7 +569,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
-@@ -740,7 +726,7 @@
+@@ -911,7 +901,7 @@
@item
- a shell script called @file{config.status} that, when run, will recreate
+ a shell script called @file{config.status} that, when run, recreates
-the files listed above (@pxref{config.status Invocation});
+the files listed above (@pxref{config.status});
@item
an optional shell script normally called @file{config.cache}
-@@ -800,10 +786,10 @@
+@@ -971,10 +961,10 @@
@menu
* Writing configure.ac:: What to put in an Autoconf input file
@end menu
@node Writing configure.ac
-@@ -819,7 +805,7 @@
+@@ -990,7 +980,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
-@@ -1047,7 +1033,7 @@
+@@ -1244,7 +1234,7 @@
@end display
@section Using @command{autoscan} to Create @file{configure.ac}
@cindex @command{autoscan}
-@@ -1069,7 +1055,7 @@
+@@ -1266,7 +1256,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
-@@ -1108,7 +1094,7 @@
+@@ -1305,7 +1295,7 @@
Prepend @var{dir} to the include path. Multiple invocations accumulate.
@end table
@section Using @command{ifnames} to List Conditionals
@cindex @command{ifnames}
-@@ -1117,8 +1103,7 @@
+@@ -1314,8 +1304,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
-@@ -1140,7 +1125,7 @@
+@@ -1337,7 +1326,7 @@
Print the version number of Autoconf and exit.
@end table
@section Using @command{autoconf} to Create @command{configure}
@cindex @command{autoconf}
-@@ -1234,8 +1219,7 @@
+@@ -1431,8 +1420,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
@item --trace=@var{macro}[:@var{format}]
@itemx -t @var{macro}[:@var{format}]
-@@ -1247,7 +1231,7 @@
+@@ -1444,7 +1432,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
@item --initialization
@itemx -i
-@@ -1321,7 +1305,7 @@
+@@ -1518,7 +1506,7 @@
@end group
@end example
@section Using @command{autoreconf} to Update @command{configure} Scripts
@cindex @command{autoreconf}
-@@ -1606,8 +1590,8 @@
+@@ -1831,8 +1819,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
-@@ -1774,7 +1758,7 @@
+@@ -2037,7 +2025,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
+interface of @file{./config.status}, see @ref{config.status},
for more details.
- The @var{inputs} may be absolute or relative filenames. In the latter
-@@ -2388,7 +2372,7 @@
- @file{config.h} is considered up to date. @xref{Output}, for more
- information about @code{AC_OUTPUT}.
+ The @var{inputs} may be absolute or relative file names. In the latter
+@@ -2857,7 +2845,7 @@
+ so @file{config.status} ensures that @file{config.h} is considered up to
+ date. @xref{Output}, for more information about @code{AC_OUTPUT}.
-@xref{config.status Invocation}, for more examples of handling
+@xref{config.status}, for more examples of handling
configuration-related dependencies.
@node Configuration Headers
-@@ -2450,7 +2434,7 @@
+@@ -2941,7 +2929,7 @@
@menu
* Header Templates:: Input for the configuration headers
* Autoheader Macros:: How to specify CPP templates
@end menu
-@@ -2504,10 +2488,10 @@
+@@ -2996,10 +2984,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
@subsection Using @command{autoheader} to Create @file{config.h.in}
@cindex @command{autoheader}
-@@ -6447,7 +6431,7 @@
- files will depend upon @command{bizarre-cc} being the C compiler. If
+@@ -8289,7 +8277,7 @@
+ files 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},
-and @pxref{config.status Invocation}), then the configuration can be
inconsistent, composed of results depending upon two different
compilers.
-@@ -6499,7 +6483,7 @@
+@@ -8341,7 +8329,7 @@
@item
@var{variable} is kept during automatic reconfiguration
line argument, including when no cache is used:
@example
-@@ -7370,11 +7354,11 @@
- @command{m4} itself.
+@@ -9258,11 +9246,11 @@
+ It supports M4 extensions designed for use in tools like Autoconf.
@menu
-* autom4te Invocation:: A @acronym{GNU} M4 wrapper
@subsection Invoking @command{autom4te}
The command line arguments are modeled after M4's:
-@@ -7657,7 +7641,7 @@
+@@ -9520,7 +9508,7 @@
not.
@end table
@item --preselect=@var{macro}
@itemx -p @var{macro}
-@@ -7727,8 +7711,8 @@
+@@ -9608,8 +9596,8 @@
wrapped in between a @samp{begin-language: "@var{language}"},
@samp{end-language: "@var{language}"} pair.
more generally arguments, are introduced by @samp{args:
@var{arguments}}. You may use the traditional shell syntax to quote the
@var{arguments}.
-@@ -8141,7 +8125,7 @@
+@@ -10305,7 +10293,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
-@@ -12054,7 +12038,7 @@
+@@ -15688,7 +15676,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
-@@ -12063,7 +12047,7 @@
+@@ -15697,7 +15685,7 @@
@c ============================================== Recreating a Configuration
@chapter Recreating a Configuration
@cindex @command{config.status}
-@@ -12203,7 +12187,7 @@
+@@ -15842,7 +15830,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
-@@ -12213,7 +12197,7 @@
+@@ -15852,7 +15840,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
-@@ -12244,7 +12228,7 @@
+@@ -15883,7 +15871,7 @@
@file{config.status} ignores this variable.
@end defvar
would be:
@example
-@@ -12318,7 +12302,7 @@
+@@ -15957,7 +15945,7 @@
self-contained, and should not depend upon @file{acconfig.h} etc.
@section Using @command{autoupdate} to Modernize @file{configure.ac}
@cindex @command{autoupdate}
-@@ -13243,7 +13227,7 @@
+@@ -16944,7 +16932,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
+@file{acsite.m4}. @xref{autoconf}.
If you distribute @file{install.sh} with your package, rename it to
- @file{install-sh} so @code{make} builtin rules won't inadvertently
-@@ -13298,7 +13282,7 @@
+ @file{install-sh} so @code{make} builtin rules don't inadvertently
+@@ -16999,7 +16987,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
-@@ -13863,7 +13847,7 @@
+@@ -17535,7 +17523,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
-@@ -14125,7 +14109,7 @@
+@@ -17597,7 +17585,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}
+@@ -17836,7 +17824,7 @@
@end defmac
@section Running @command{testsuite} Scripts
@cindex @command{testsuite}
-@@ -14267,7 +14251,7 @@
+@@ -17996,7 +17984,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
-@@ -14596,7 +14580,7 @@
- which can be a very long process for complex @file{configure.ac}.
+@@ -18346,7 +18334,7 @@
+ which can be a 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.56.orig/doc/install.texi autoconf-2.56/doc/install.texi
---- autoconf-2.56.orig/doc/install.texi Tue Aug 27 10:28:06 2002
-+++ autoconf-2.56/doc/install.texi Mon Nov 18 21:48:00 2002
+ @command{autoconf}, behind the scenes, @command{autom4te} 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.56.orig/doc/standards.texi autoconf-2.56/doc/standards.texi
---- autoconf-2.56.orig/doc/standards.texi Thu Nov 7 15:22:24 2002
-+++ autoconf-2.56/doc/standards.texi Mon Nov 18 21:48:00 2002
-@@ -8,9 +8,10 @@
-
- @ifinfo
- @format
--START-INFO-DIR-ENTRY
--* Standards: (standards). GNU coding standards.
--END-INFO-DIR-ENTRY
+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.
-+@end direntry
- @end format
- @end ifinfo
+ @direntry
+-* Standards: (standards). GNU coding standards.
++* Standards: (standards). GNU coding standards
+ @end direntry
+ @c @setchapternewpage odd