From 3fad2c6c2359f3c9d0662b3acd5ffe6d00a73d59 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Wed, 16 Apr 2008 19:01:46 +0000 Subject: [PATCH] - updated for 2.62 Changed files: autoconf-info.patch -> 1.17 --- autoconf-info.patch | 149 ++++++++++++++++++++++++-------------------- 1 file changed, 80 insertions(+), 69 deletions(-) diff --git a/autoconf-info.patch b/autoconf-info.patch index e27c99d..4a3749d 100644 --- a/autoconf-info.patch +++ b/autoconf-info.patch @@ -1,5 +1,5 @@ ---- 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 +--- autoconf-2.62/doc/autoconf.texi.orig 2008-04-16 20:34:45.377155963 +0200 ++++ autoconf-2.62/doc/autoconf.texi 2008-04-16 20:39:04.079896078 +0200 @@ -203,29 +203,19 @@ @@ -15,7 +15,7 @@ -* autoscan: (autoconf)autoscan Invocation. - Semi-automatic @file{configure.ac} writing -* ifnames: (autoconf)ifnames Invocation. Listing conditionals in source. --* autoconf: (autoconf)autoconf Invocation. +-* autoconf-invocation: (autoconf)autoconf Invocation. - How to create configuration scripts -* autoreconf: (autoconf)autoreconf Invocation. - Remaking multiple @command{configure} scripts @@ -37,8 +37,8 @@ +* 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 configurations -+* testsuite: (autoconf)testsuite. Running an Autotest test suite ++* config.status: (autoconf)config.status. Recreating configurations. ++* testsuite: (autoconf)testsuite. Running an Autotest test suite. @end direntry @titlepage @@ -54,7 +54,7 @@ @@ -288,10 +278,10 @@ Making @command{configure} Scripts - * Writing configure.ac:: What to put in an Autoconf input file + * Writing Autoconf Input:: What to put in an Autoconf input file -* autoscan Invocation:: Semi-automatic @file{configure.ac} writing -* ifnames Invocation:: Listing the conditionals in source code -* autoconf Invocation:: How to create configuration scripts @@ -66,7 +66,7 @@ Writing @file{configure.ac} -@@ -325,7 +315,7 @@ +@@ -326,7 +316,7 @@ Configuration Header Files * Header Templates:: Input for the configuration headers @@ -75,7 +75,7 @@ * Autoheader Macros:: How to specify CPP templates Existing Tests -@@ -441,7 +431,7 @@ +@@ -443,7 +433,7 @@ Using @command{autom4te} @@ -84,7 +84,7 @@ * Customizing autom4te:: Customizing the Autoconf package Programming in M4sugar -@@ -548,13 +538,13 @@ +@@ -559,13 +549,13 @@ * System Type:: Specifying the system type * Sharing Defaults:: Setting site-wide defaults for @command{configure} * Defining Variables:: Specifying the compiler etc. @@ -93,23 +93,23 @@ Obsolete Constructs - * Obsolete config.status Use:: Different calling convention - * acconfig.h:: Additional entries in @file{config.h.in} + * Obsolete config.status Use:: Obsolete convention for @command{config.status} + * acconfig Header:: Additional entries in @file{config.h.in} -* autoupdate Invocation:: Automatic update of @file{configure.ac} +* autoupdate:: Automatic update of @file{configure.ac} * Obsolete Macros:: Backward compatibility macros * Autoconf 1:: Tips for upgrading your files * Autoconf 2.13:: Some fresher tips -@@ -579,7 +569,7 @@ +@@ -590,7 +580,7 @@ * Using an Autotest Test Suite:: Autotest and the user - * Writing testsuite.at:: Autotest macros + * Writing Testsuites:: Autotest macros -* testsuite Invocation:: Running @command{testsuite} scripts +* testsuite:: Running @command{testsuite} scripts * Making testsuite Scripts:: Using autom4te to create @command{testsuite} Using an Autotest Test Suite -@@ -911,7 +901,7 @@ +@@ -946,7 +936,7 @@ @item a shell script called @file{config.status} that, when run, recreates @@ -118,10 +118,10 @@ @item an optional shell script normally called @file{config.cache} -@@ -971,10 +961,10 @@ +@@ -1006,10 +996,10 @@ @menu - * Writing configure.ac:: What to put in an Autoconf input file + * Writing Autoconf Input:: What to put in an Autoconf input file -* autoscan Invocation:: Semi-automatic @file{configure.ac} writing -* ifnames Invocation:: Listing the conditionals in source code -* autoconf Invocation:: How to create configuration scripts @@ -132,8 +132,8 @@ +* autoreconf:: Remaking multiple @command{configure} scripts @end menu - @node Writing configure.ac -@@ -990,7 +980,7 @@ + @node Writing Autoconf Input +@@ -1025,7 +1015,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 @@ -142,7 +142,7 @@ Previous versions of Autoconf promoted the name @file{configure.in}, which is somewhat ambiguous (the tool needed to process this file is not -@@ -1244,7 +1234,7 @@ +@@ -1281,7 +1271,7 @@ @end display @@ -151,7 +151,7 @@ @section Using @command{autoscan} to Create @file{configure.ac} @cindex @command{autoscan} -@@ -1266,7 +1256,7 @@ +@@ -1303,7 +1293,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 @@ -160,7 +160,7 @@ information about a program that can help with that job). When using @command{autoscan} to maintain a @file{configure.ac}, simply -@@ -1305,7 +1295,7 @@ +@@ -1342,7 +1332,7 @@ Prepend @var{dir} to the include path. Multiple invocations accumulate. @end table @@ -169,7 +169,7 @@ @section Using @command{ifnames} to List Conditionals @cindex @command{ifnames} -@@ -1314,8 +1304,7 @@ +@@ -1351,8 +1341,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 @@ -179,7 +179,7 @@ @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 -@@ -1337,7 +1326,7 @@ +@@ -1374,7 +1363,7 @@ Print the version number of Autoconf and exit. @end table @@ -188,7 +188,7 @@ @section Using @command{autoconf} to Create @command{configure} @cindex @command{autoconf} -@@ -1431,8 +1420,7 @@ +@@ -1468,8 +1457,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 @@ -198,7 +198,7 @@ @item --trace=@var{macro}[:@var{format}] @itemx -t @var{macro}[:@var{format}] -@@ -1444,7 +1432,7 @@ +@@ -1481,7 +1469,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 @@ -207,7 +207,7 @@ @item --initialization @itemx -i -@@ -1518,7 +1506,7 @@ +@@ -1555,7 +1543,7 @@ @end group @end example @@ -216,7 +216,18 @@ @section Using @command{autoreconf} to Update @command{configure} Scripts @cindex @command{autoreconf} -@@ -1831,8 +1819,8 @@ +@@ -1592,8 +1580,8 @@ + Gettext supplies the @command{autopoint} command to add translation + infrastructure to a source package. If you use @command{autopoint}, + your @file{configure.ac} should invoke both @code{AM_GNU_GETTEXT} and +-@code{AM_GNU_GETTEXT_VERSION(@var{gettext-version})}. @xref{autopoint +-Invocation, , Invoking the @code{autopoint} Program, gettext, ++@code{AM_GNU_GETTEXT_VERSION(@var{gettext-version})}. ++@xref{autopoint, , Invoking the @code{autopoint} Program, gettext, + @acronym{GNU} @code{gettext} utilities}, for further details. + + @noindent +@@ -1897,8 +1885,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 @@ -227,7 +238,7 @@ @end defmac -@@ -2037,7 +2025,7 @@ +@@ -2111,7 +2099,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 @@ -236,7 +247,7 @@ for more details. The @var{inputs} may be absolute or relative file names. In the latter -@@ -2857,7 +2845,7 @@ +@@ -2971,7 +2959,7 @@ so @file{config.status} ensures that @file{config.h} is considered up to date. @xref{Output}, for more information about @code{AC_OUTPUT}. @@ -245,7 +256,7 @@ configuration-related dependencies. @node Configuration Headers -@@ -2941,7 +2929,7 @@ +@@ -3051,7 +3039,7 @@ @menu * Header Templates:: Input for the configuration headers @@ -254,7 +265,7 @@ * Autoheader Macros:: How to specify CPP templates @end menu -@@ -2996,10 +2984,10 @@ +@@ -3106,10 +3094,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 @@ -267,7 +278,7 @@ @subsection Using @command{autoheader} to Create @file{config.h.in} @cindex @command{autoheader} -@@ -8289,7 +8277,7 @@ +@@ -8749,7 +8737,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}, @@ -276,7 +287,7 @@ inconsistent, composed of results depending upon two different compilers. -@@ -8341,7 +8329,7 @@ +@@ -8802,7 +8790,7 @@ @item @var{variable} is kept during automatic reconfiguration @@ -285,7 +296,7 @@ line argument, including when no cache is used: @example -@@ -9258,11 +9246,11 @@ +@@ -9790,11 +9778,11 @@ It supports M4 extensions designed for use in tools like Autoconf. @menu @@ -299,7 +310,7 @@ @subsection Invoking @command{autom4te} The command line arguments are modeled after M4's: -@@ -9520,7 +9508,7 @@ +@@ -10052,7 +10040,7 @@ not. @end table @@ -308,7 +319,7 @@ @item --preselect=@var{macro} @itemx -p @var{macro} -@@ -9608,8 +9596,8 @@ +@@ -10140,8 +10128,8 @@ wrapped in between a @samp{begin-language: "@var{language}"}, @samp{end-language: "@var{language}"} pair. @@ -319,16 +330,16 @@ more generally arguments, are introduced by @samp{args: @var{arguments}}. You may use the traditional shell syntax to quote the @var{arguments}. -@@ -10305,7 +10293,7 @@ +@@ -11785,7 +11773,7 @@ When the user runs @samp{autoconf -W error}, warnings from - @code{AC_DIAGNOSE} and @code{AC_WARNING} are reported as error, see --@ref{autoconf Invocation}. -+@ref{autoconf}. + @code{m4_warn} (including those issued through @code{AC_DIAGNOSE} and +-@code{AC_WARNING}) are reported as errors, see @ref{autoconf Invocation}. ++@code{AC_WARNING}) are reported as errors, see @ref{autoconf}. @node Dependencies Between Macros @section Dependencies Between Macros -@@ -15688,7 +15676,7 @@ +@@ -17974,16 +17962,16 @@ * System Type:: Specifying the system type * Sharing Defaults:: Setting site-wide defaults for @command{configure} * Defining Variables:: Specifying the compiler etc. @@ -337,25 +348,27 @@ @end menu @set autoconf -@@ -15697,7 +15685,7 @@ + @include install.texi - @c ============================================== Recreating a Configuration + +-@c ============================================== config.status Invocation ++@c ============================================== config.status -@node config.status Invocation +@node config.status - @chapter Recreating a Configuration + @chapter config.status Invocation @cindex @command{config.status} -@@ -15842,7 +15830,7 @@ +@@ -18129,7 +18117,7 @@ @menu - * Obsolete config.status Use:: Different calling convention - * acconfig.h:: Additional entries in @file{config.h.in} + * Obsolete config.status Use:: Obsolete convention for @command{config.status} + * acconfig Header:: Additional entries in @file{config.h.in} -* autoupdate Invocation:: Automatic update of @file{configure.ac} +* autoupdate:: Automatic update of @file{configure.ac} * Obsolete Macros:: Backward compatibility macros * Autoconf 1:: Tips for upgrading your files * Autoconf 2.13:: Some fresher tips -@@ -15852,7 +15840,7 @@ +@@ -18139,7 +18127,7 @@ @section Obsolete @file{config.status} Invocation @file{config.status} now supports arguments to specify the files to @@ -364,7 +377,7 @@ Before, environment variables had to be used. @defvar CONFIG_COMMANDS -@@ -15883,7 +15871,7 @@ +@@ -18170,7 +18158,7 @@ @file{config.status} ignores this variable. @end defvar @@ -373,7 +386,7 @@ would be: @example -@@ -15957,7 +15945,7 @@ +@@ -18244,7 +18232,7 @@ self-contained, and should not depend upon @file{acconfig.h} etc. @@ -382,7 +395,7 @@ @section Using @command{autoupdate} to Modernize @file{configure.ac} @cindex @command{autoupdate} -@@ -16944,7 +16932,7 @@ +@@ -19389,7 +19377,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 @@ -391,7 +404,7 @@ If you distribute @file{install.sh} with your package, rename it to @file{install-sh} so @code{make} builtin rules don't inadvertently -@@ -16999,7 +16987,7 @@ +@@ -19444,7 +19432,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. @@ -400,16 +413,16 @@ 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 -@@ -17535,7 +17523,7 @@ +@@ -19980,7 +19968,7 @@ @menu * Using an Autotest Test Suite:: Autotest and the user - * Writing testsuite.at:: Autotest macros + * Writing Testsuites:: Autotest macros -* testsuite Invocation:: Running @command{testsuite} scripts +* testsuite:: Running @command{testsuite} scripts * Making testsuite Scripts:: Using autom4te to create @command{testsuite} @end menu -@@ -17597,7 +17585,7 @@ +@@ -20042,7 +20030,7 @@ @itemize @bullet @item a debugging script named @file{run} which reruns the test in @@ -418,7 +431,7 @@ 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 @@ +@@ -20304,7 +20292,7 @@ @end defmac @@ -427,7 +440,7 @@ @section Running @command{testsuite} Scripts @cindex @command{testsuite} -@@ -17996,7 +17984,7 @@ +@@ -20471,7 +20459,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 @@ -436,7 +449,7 @@ @end defmac @item -@@ -18346,7 +18334,7 @@ +@@ -20825,7 +20813,7 @@ which can be a long process for complex @file{configure.ac}. This is why all these tools, instead of running directly M4, invoke @@ -445,29 +458,27 @@ 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} 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). - +--- autoconf-2.62/doc/install.texi.orig 2007-12-08 14:58:52.000000000 +0100 ++++ autoconf-2.62/doc/install.texi 2008-04-16 20:34:45.697178391 +0200 +@@ -239,7 +239,7 @@ + CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + @end example -@node configure Invocation +@node configure @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 +--- autoconf-2.62/doc/standards.texi.orig 2008-04-04 15:16:45.000000000 +0200 ++++ autoconf-2.62/doc/standards.texi 2008-04-16 20:39:27.317224488 +0200 @@ -6,9 +6,9 @@ - @set lastupdate April 29, 2003 + @set lastupdate February 23, 2008 @c %**end of header -@dircategory GNU organization +@dircategory Miscellaneous: @direntry --* Standards: (standards). GNU coding standards. +-* Standards: (standards). GNU coding standards. +* Standards: (standards). GNU coding standards @end direntry -- 2.44.0