X-Git-Url: http://git.pld-linux.org/?p=packages%2Fautoconf.git;a=blobdiff_plain;f=autoconf-info.patch;h=5857312b56d5bafb8a7cc09fab2523ef4925831b;hp=4c82677cf830aefaa5061f774e8e1e0796c56619;hb=1a2cddf914f1eb30105ec9c737c9db64b652aab8;hpb=b9aefd7e17a8e1fca437d37d0e20d2798a486fa1 diff --git a/autoconf-info.patch b/autoconf-info.patch index 4c82677..5857312 100644 --- a/autoconf-info.patch +++ b/autoconf-info.patch @@ -1,6 +1,6 @@ ---- autoconf-2.66/doc/autoconf.texi.orig 2010-07-06 19:37:13.069390901 +0200 -+++ autoconf-2.66/doc/autoconf.texi 2010-07-07 09:32:22.977390901 +0200 -@@ -220,29 +220,19 @@ +--- autoconf-2.69/doc/autoconf.texi.orig 2013-10-15 07:44:41.594844773 +0200 ++++ autoconf-2.69/doc/autoconf.texi 2013-10-15 07:45:45.782179984 +0200 +@@ -217,29 +217,19 @@ @@ -42,7 +42,7 @@ @end direntry @titlepage -@@ -285,7 +275,7 @@ +@@ -282,7 +272,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 @@ -51,7 +51,7 @@ * Obsolete Constructs:: Kept for backward compatibility * Using Autotest:: Creating portable test suites * FAQ:: Frequent Autoconf Questions, with answers -@@ -306,10 +296,10 @@ +@@ -303,10 +293,10 @@ Making @command{configure} Scripts * Writing Autoconf Input:: What to put in an Autoconf input file @@ -66,7 +66,7 @@ Writing @file{configure.ac} -@@ -344,7 +334,7 @@ +@@ -341,7 +331,7 @@ Configuration Header Files * Header Templates:: Input for the configuration headers @@ -75,7 +75,7 @@ * Autoheader Macros:: How to specify CPP templates Existing Tests -@@ -469,7 +459,7 @@ +@@ -460,7 +450,7 @@ Using @command{autom4te} @@ -84,7 +84,7 @@ * Customizing autom4te:: Customizing the Autoconf package Programming in M4sugar -@@ -590,13 +580,13 @@ +@@ -601,13 +591,13 @@ * System Type:: Specifying the system type * Sharing Defaults:: Setting site-wide defaults for @command{configure} * Defining Variables:: Specifying the compiler etc. @@ -100,7 +100,7 @@ * Obsolete Macros:: Backward compatibility macros * Autoconf 1:: Tips for upgrading your files * Autoconf 2.13:: Some fresher tips -@@ -621,7 +611,7 @@ +@@ -632,7 +622,7 @@ * Using an Autotest Test Suite:: Autotest and the user * Writing Testsuites:: Autotest macros @@ -109,7 +109,7 @@ * Making testsuite Scripts:: Using autom4te to create @command{testsuite} Using an Autotest Test Suite -@@ -980,7 +970,7 @@ +@@ -992,7 +982,7 @@ @item a shell script called @file{config.status} that, when run, recreates @@ -118,7 +118,7 @@ @item an optional shell script normally called @file{config.cache} -@@ -1061,10 +1051,10 @@ +@@ -1073,10 +1063,10 @@ @menu * Writing Autoconf Input:: What to put in an Autoconf input file @@ -133,7 +133,7 @@ @end menu @node Writing Autoconf Input -@@ -1080,7 +1070,7 @@ +@@ -1092,7 +1082,7 @@ or specialized features, @file{configure.ac} might need to contain some hand-crafted shell commands; see @ref{Portable Shell, , Portable Shell Programming}. The @command{autoscan} program can give you a good start @@ -142,7 +142,7 @@ information). Previous versions of Autoconf promoted the name @file{configure.in}, -@@ -1361,7 +1351,7 @@ +@@ -1380,7 +1370,7 @@ @end display @@ -151,7 +151,7 @@ @section Using @command{autoscan} to Create @file{configure.ac} @cindex @command{autoscan} -@@ -1383,7 +1373,7 @@ +@@ -1402,7 +1392,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 -@@ -1426,7 +1416,7 @@ +@@ -1445,7 +1435,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} -@@ -1435,8 +1425,7 @@ +@@ -1454,8 +1444,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 -@@ -1458,7 +1447,7 @@ +@@ -1477,7 +1466,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} -@@ -1552,8 +1541,7 @@ +@@ -1571,8 +1560,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}] -@@ -1565,7 +1553,7 @@ +@@ -1584,7 +1572,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 -@@ -1639,7 +1627,7 @@ +@@ -1658,7 +1646,7 @@ @end group @end example @@ -216,7 +216,7 @@ @section Using @command{autoreconf} to Update @command{configure} Scripts @cindex @command{autoreconf} -@@ -1676,8 +1664,8 @@ +@@ -1695,8 +1683,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 @@ -227,7 +227,7 @@ GNU @code{gettext} utilities}, for further details. @noindent -@@ -2005,8 +1993,8 @@ +@@ -2032,8 +2020,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 @@ -238,7 +238,7 @@ @end defmac -@@ -2220,7 +2208,7 @@ +@@ -2247,7 +2235,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 @@ -247,7 +247,7 @@ for more details. The @var{inputs} may be absolute or relative file names. In the latter -@@ -3143,7 +3131,7 @@ +@@ -3182,7 +3170,7 @@ so @file{config.status} ensures that @file{config.h} is considered up to date. @xref{Output}, for more information about @code{AC_OUTPUT}. @@ -256,7 +256,7 @@ configuration-related dependencies. @node Configuration Headers -@@ -3223,7 +3211,7 @@ +@@ -3262,7 +3250,7 @@ @menu * Header Templates:: Input for the configuration headers @@ -265,7 +265,7 @@ * Autoheader Macros:: How to specify CPP templates @end menu -@@ -3265,7 +3253,7 @@ +@@ -3304,7 +3292,7 @@ generated header. Since it is a tedious task to keep a template header up to date, you may @@ -274,7 +274,7 @@ During the instantiation of the header, each @samp{#undef} line in the template file for each symbol defined by @samp{AC_DEFINE} is changed to an -@@ -3303,7 +3291,7 @@ +@@ -3342,7 +3330,7 @@ probably use @samp{AH_BOTTOM} to append the @samp{#include} directive. @@ -283,7 +283,7 @@ @subsection Using @command{autoheader} to Create @file{config.h.in} @cindex @command{autoheader} -@@ -7312,7 +7300,7 @@ +@@ -7424,7 +7412,7 @@ And finally, the default for @var{action-if-universal} is to ensure that @samp{WORDS_BIGENDIAN} is defined if and only if a universal build is detected and the current code is big-endian; this default works only if @@ -292,7 +292,76 @@ If you use this macro without specifying @var{action-if-universal}, you should also use @code{AC_CONFIG_HEADERS}; otherwise -@@ -9473,7 +9461,7 @@ +@@ -8013,10 +8001,8 @@ + @code{ac_cv_f77_libs} or @code{ac_cv_fc_libs}, respectively. + @end defmac + +-@defmac AC_F77_DUMMY_MAIN (@ovar{action-if-found}, @dvar{action-if-not-found, @ +- AC_MSG_FAILURE}) +-@defmacx AC_FC_DUMMY_MAIN (@ovar{action-if-found}, @dvar{action-if-not-found, @ +- AC_MSG_FAILURE}) ++@defmac AC_F77_DUMMY_MAIN (@ovar{action-if-found}, @dvar{action-if-not-found, @AC_MSG_FAILURE}) ++@defmacx AC_FC_DUMMY_MAIN (@ovar{action-if-found}, @dvar{action-if-not-found, @AC_MSG_FAILURE}) + @acindex{F77_DUMMY_MAIN} + @cvindex F77_DUMMY_MAIN + @acindex{FC_DUMMY_MAIN} +@@ -8201,10 +8187,8 @@ + to call Fortran routines from some language other than C/C++. + @end defmac + +-@defmac AC_FC_SRCEXT (@var{ext}, @ovar{action-if-success}, @ +- @dvar{action-if-failure, AC_MSG_FAILURE}) +-@defmacx AC_FC_PP_SRCEXT (@var{ext}, @ovar{action-if-success}, @ +- @dvar{action-if-failure, AC_MSG_FAILURE}) ++@defmac AC_FC_SRCEXT (@var{ext}, @ovar{action-if-success}, @@dvar{action-if-failure, AC_MSG_FAILURE}) ++@defmacx AC_FC_PP_SRCEXT (@var{ext}, @ovar{action-if-success}, @@dvar{action-if-failure, AC_MSG_FAILURE}) + @acindex{FC_SRCEXT} + @acindex{FC_PP_SRCEXT} + @caindex fc_srcext_@var{ext} +@@ -8267,8 +8251,7 @@ + @code{ac_cv_fc_pp_srcext_@var{ext}} variables, respectively. + @end defmac + +-@defmac AC_FC_PP_DEFINE (@ovar{action-if-success}, @dvar{action-if-failure, @ +- AC_MSG_FAILURE}) ++@defmac AC_FC_PP_DEFINE (@ovar{action-if-success}, @dvar{action-if-failure, @AC_MSG_FAILURE}) + @acindex{FC_PP_DEFINE} + @caindex fc_pp_define + +@@ -8286,8 +8269,7 @@ + variable. + @end defmac + +-@defmac AC_FC_FREEFORM (@ovar{action-if-success}, @dvar{action-if-failure, @ +- AC_MSG_FAILURE}) ++@defmac AC_FC_FREEFORM (@ovar{action-if-success}, @dvar{action-if-failure, @AC_MSG_FAILURE}) + @acindex{FC_FREEFORM} + @caindex fc_freeform + +@@ -8313,8 +8295,7 @@ + the @code{ac_cv_fc_freeform} variable. + @end defmac + +-@defmac AC_FC_FIXEDFORM (@ovar{action-if-success}, @dvar{action-if-failure, @ +- AC_MSG_FAILURE}) ++@defmac AC_FC_FIXEDFORM (@ovar{action-if-success}, @dvar{action-if-failure, @AC_MSG_FAILURE}) + @acindex{FC_FIXEDFORM} + @caindex fc_fixedform + +@@ -8375,10 +8356,8 @@ + variable. + @end defmac + +-@defmac AC_F77_IMPLICIT_NONE (@ovar{action-if-success}, @ +- @dvar{action-if-failure, AC_MSG_FAILURE}) +-@defmacx AC_FC_IMPLICIT_NONE (@ovar{action-if-success}, @ +- @dvar{action-if-failure, AC_MSG_FAILURE}) ++@defmac AC_F77_IMPLICIT_NONE (@ovar{action-if-success}, @@dvar{action-if-failure, AC_MSG_FAILURE}) ++@defmacx AC_FC_IMPLICIT_NONE (@ovar{action-if-success}, @@dvar{action-if-failure, AC_MSG_FAILURE}) + @acindex{F77_IMPLICIT_NONE} + @acindex{FC_IMPLICIT_NONE} + @caindex f77_implicit_none +@@ -9914,7 +9893,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}, @@ -301,7 +370,7 @@ inconsistent, composed of results depending upon two different compilers. -@@ -9526,7 +9514,7 @@ +@@ -9967,7 +9946,7 @@ @item @var{variable} is kept during automatic reconfiguration @@ -310,7 +379,7 @@ line argument, including when no cache is used: @example -@@ -10666,11 +10654,11 @@ +@@ -11113,11 +11092,11 @@ It supports M4 extensions designed for use in tools like Autoconf. @menu @@ -324,7 +393,7 @@ @subsection Invoking @command{autom4te} The command line arguments are modeled after M4's: -@@ -10929,7 +10917,7 @@ +@@ -11376,7 +11355,7 @@ not. @end table @@ -333,7 +402,7 @@ @item --preselect=@var{macro} @itemx -p @var{macro} -@@ -11017,8 +11005,8 @@ +@@ -11464,8 +11443,8 @@ wrapped in between a @samp{begin-language: "@var{language}"}, @samp{end-language: "@var{language}"} pair. @@ -344,7 +413,17 @@ more generally arguments, are introduced by @samp{args: @var{arguments}}. You may use the traditional shell syntax to quote the @var{arguments}. -@@ -13957,7 +13945,7 @@ +@@ -13793,8 +13772,7 @@ + undefined if expansion of an indirect variable does not result in a + literal variable name. + +-@defmac AS_LITERAL_IF (@var{expression}, @ovar{if-literal}, @ovar{if-not}, @ +- @dvar{if-simple-ref, @var{if-not}}) ++@defmac AS_LITERAL_IF (@var{expression}, @ovar{if-literal}, @ovar{if-not}, @@dvar{if-simple-ref, @var{if-not}}) + @defmacx AS_LITERAL_WORD_IF (@var{expression}, @ovar{if-literal}, @ + @ovar{if-not}, @dvar{if-simple-ref, @var{if-not}}) + @asindex{LITERAL_IF} +@@ -14446,7 +14424,7 @@ When the user runs @samp{autoconf -W error}, warnings from @code{m4_warn} (including those issued through @code{AC_DIAGNOSE} and @@ -353,7 +432,7 @@ @node Dependencies Between Macros @section Dependencies Between Macros -@@ -21307,16 +21295,16 @@ +@@ -22640,16 +22618,16 @@ * System Type:: Specifying the system type * Sharing Defaults:: Setting site-wide defaults for @command{configure} * Defining Variables:: Specifying the compiler etc. @@ -373,7 +452,7 @@ @chapter config.status Invocation @cindex @command{config.status} -@@ -21488,7 +21476,7 @@ +@@ -22818,7 +22796,7 @@ @menu * Obsolete config.status Use:: Obsolete convention for @command{config.status} * acconfig Header:: Additional entries in @file{config.h.in} @@ -382,7 +461,7 @@ * Obsolete Macros:: Backward compatibility macros * Autoconf 1:: Tips for upgrading your files * Autoconf 2.13:: Some fresher tips -@@ -21498,7 +21486,7 @@ +@@ -22828,7 +22806,7 @@ @section Obsolete @file{config.status} Invocation @file{config.status} now supports arguments to specify the files to @@ -391,7 +470,7 @@ Before, environment variables had to be used. @defvar CONFIG_COMMANDS -@@ -21529,7 +21517,7 @@ +@@ -22859,7 +22837,7 @@ @file{config.status} ignores this variable. @end defvar @@ -400,7 +479,7 @@ would be: @example -@@ -21603,7 +21591,7 @@ +@@ -22933,7 +22911,7 @@ self-contained, and should not depend upon @file{acconfig.h} etc. @@ -409,7 +488,7 @@ @section Using @command{autoupdate} to Modernize @file{configure.ac} @cindex @command{autoupdate} -@@ -22781,7 +22769,7 @@ +@@ -24111,7 +24089,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 @@ -418,7 +497,7 @@ If you distribute @file{install.sh} with your package, rename it to @file{install-sh} so @command{make} builtin rules don't inadvertently -@@ -22836,7 +22824,7 @@ +@@ -24166,7 +24144,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. @@ -427,7 +506,7 @@ 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 -@@ -23376,7 +23364,7 @@ +@@ -24703,7 +24681,7 @@ @menu * Using an Autotest Test Suite:: Autotest and the user * Writing Testsuites:: Autotest macros @@ -436,7 +515,7 @@ * Making testsuite Scripts:: Using autom4te to create @command{testsuite} @end menu -@@ -23438,7 +23426,7 @@ +@@ -24765,7 +24743,7 @@ @itemize @bullet @item a debugging script named @file{run} which reruns the test in @@ -445,7 +524,17 @@ of debugging scripts has the purpose of easing the chase for bugs. @item all the files created with @code{AT_DATA} -@@ -23935,7 +23923,7 @@ +@@ -25125,8 +25103,7 @@ + be a single shell word that expands into a single file name. + @end defmac + +-@defmac AT_CHECK (@var{commands}, @dvar{status, 0}, @ovar{stdout}, @ +- @ovar{stderr}, @ovar{run-if-fail}, @ovar{run-if-pass}) ++@defmac AT_CHECK (@var{commands}, @dvar{status, 0}, @ovar{stdout}, @@ovar{stderr}, @ovar{run-if-fail}, @ovar{run-if-pass}) + @defmacx AT_CHECK_UNQUOTED (@var{commands}, @dvar{status, 0}, @ovar{stdout}, @ + @ovar{stderr}, @ovar{run-if-fail}, @ovar{run-if-pass}) + @atindex{CHECK} +@@ -25270,7 +25247,7 @@ @end defmac @@ -453,8 +542,8 @@ +@node testsuite @section Running @command{testsuite} Scripts @cindex @command{testsuite} - -@@ -24560,7 +24560,7 @@ + +@@ -25465,7 +25442,7 @@ An Autotest test suite is to be configured in @var{directory}. This macro causes @file{@var{directory}/atconfig} to be created by @command{config.status} and sets the default @code{AUTOTEST_PATH} to @@ -463,7 +552,7 @@ @end defmac @item -@@ -24518,7 +24506,7 @@ +@@ -25858,7 +25835,7 @@ which can be a long process for complex @file{configure.ac}. This is why all these tools, instead of running directly M4, invoke