* doc/autoconf.texi (Fortran Compiler): Do not use address@hidden' in continuous text. (Runtime): Fix macro argument names to match description: `action-if-found' -> `action-if-true' and similarly. (Obsolete Macros): Likewise. * lib/autoconf/general.m4 (_AC_COMPILE_IFELSE): Likewise. (AC_COMPILE_IFELSE, AC_TRY_COMPILE, _AC_LINK_IFELSE) (AC_LINK_IFELSE, AC_TRY_LINK, AC_COMPILE_CHECK): Likewise. Index: doc/autoconf.texi =================================================================== RCS file: /cvsroot/autoconf/autoconf/doc/autoconf.texi,v retrieving revision 1.1000 diff -u -r1.1000 autoconf.texi --- doc/autoconf.texi 24 Apr 2006 19:36:01 -0000 1.1000 +++ doc/autoconf.texi 25 Apr 2006 17:07:07 -0000 @@ -6623,7 +6623,7 @@ By default, @var{action-if-found} defines @code{F77_DUMMY_MAIN} or @code{FC_DUMMY_MAIN} to the name of this routine (e.g., @code{MAIN__}) address@hidden it is required. @ovar{action-if-not-found} defaults to address@hidden it is required. @var{action-if-not-found} defaults to exiting with an error. In order to link with Fortran routines, the user's C/C++ program should @@ -6790,9 +6790,9 @@ @end example If @code{AC_FC_SRCEXT} succeeds in compiling files with the @var{ext} -extension, it calls @ovar{action-if-success} (defaults to nothing). If +extension, it calls @var{action-if-success} (defaults to nothing). If it fails, and cannot find a way to make the @code{FC} compiler accept such -files, it calls @ovar{action-if-failure} (defaults to exiting with an +files, it calls @var{action-if-failure} (defaults to exiting with an error message). @end defmac @@ -6813,8 +6813,8 @@ succeed without modifying @code{FCFLAGS}. If @code{AC_FC_FREEFORM} succeeds in compiling free-form source, it -calls @ovar{action-if-success} (defaults to nothing). If it fails, it -calls @ovar{action-if-failure} (defaults to exiting with an error +calls @var{action-if-success} (defaults to nothing). If it fails, it +calls @var{action-if-failure} (defaults to exiting with an error message). @end defmac @@ -7650,7 +7650,7 @@ possible, because this prevents people from configuring your package for cross-compiling. address@hidden AC_RUN_IFELSE (@var{input}, @ovar{action-if-found}, @ovar{action-if-not-found}, @ovar{action-if-cross-compiling}) address@hidden AC_RUN_IFELSE (@var{input}, @ovar{action-if-true}, @ovar{action-if-false}, @ovar{action-if-cross-compiling}) @acindex{RUN_IFELSE} If @var{program} compiles and links successfully and returns an exit status of 0 when executed, run shell commands @var{action-if-true}. @@ -15407,7 +15414,7 @@ Same as @samp{AC_MSG_NOTICE([checking @address@hidden @end defmac address@hidden AC_COMPILE_CHECK (@var{echo-text}, @var{includes}, @var{function-body}, @var{action-if-found}, @ovar{action-if-not-found}) address@hidden AC_COMPILE_CHECK (@var{echo-text}, @var{includes}, @var{function-body}, @var{action-if-true}, @ovar{action-if-false}) @acindex{COMPILE_CHECK} This is an obsolete version of @code{AC_TRY_COMPILE} itself replaced by @code{AC_COMPILE_IFELSE} (@pxref{Running the Compiler}), with the @@ -16009,7 +16016,7 @@ @code{AC_HEADER_TIME} @end defmac address@hidden AC_TRY_COMPILE (@var{includes}, @var{function-body}, @ovar{action-if-found}, @ovar{action-if-not-found}) address@hidden AC_TRY_COMPILE (@var{includes}, @var{function-body}, @ovar{action-if-true}, @ovar{action-if-false}) @acindex{TRY_COMPILE} Same as: @@ -16050,7 +16057,7 @@ This macro double quotes the @var{input}. @end defmac address@hidden AC_TRY_LINK (@var{includes}, @var{function-body}, @ovar{action-if-found}, @ovar{action-if-not-found}) address@hidden AC_TRY_LINK (@var{includes}, @var{function-body}, @ovar{action-if-true}, @ovar{action-if-false}) @acindex{TRY_LINK} Same as: Index: lib/autoconf/general.m4 =================================================================== RCS file: /cvsroot/autoconf/autoconf/lib/autoconf/general.m4,v retrieving revision 1.912 diff -u -r1.912 general.m4 --- lib/autoconf/general.m4 24 Apr 2006 19:36:02 -0000 1.912 +++ lib/autoconf/general.m4 25 Apr 2006 17:07:07 -0000 @@ -2265,8 +2265,8 @@ ## ------------------ ## -# _AC_COMPILE_IFELSE(PROGRAM, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# --------------------------------------------------------------------- +# _AC_COMPILE_IFELSE(PROGRAM, [ACTION-IF-TRUE], [ACTION-IF-FALSE]) +# ---------------------------------------------------------------- # Try to compile PROGRAM. # This macro can be used during the selection of a compiler. m4_define([_AC_COMPILE_IFELSE], @@ -2283,8 +2283,8 @@ ])# _AC_COMPILE_IFELSE -# AC_COMPILE_IFELSE(PROGRAM, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# -------------------------------------------------------------------- +# AC_COMPILE_IFELSE(PROGRAM, [ACTION-IF-TRUE], [ACTION-IF-FALSE]) +# --------------------------------------------------------------- # Try to compile PROGRAM. Requires that the compiler for the current # language was checked for, hence do not use this macro in macros looking # for a compiler. @@ -2294,8 +2294,8 @@ # AC_TRY_COMPILE(INCLUDES, FUNCTION-BODY, -# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# -------------------------------------------------------- +# [ACTION-IF-TRUE], [ACTION-IF-FALSE]) +# --------------------------------------------------- AU_DEFUN([AC_TRY_COMPILE], [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[$1]], [[$2]])], [$3], [$4])]) @@ -2306,8 +2306,8 @@ ## --------------------- ## -# _AC_LINK_IFELSE(PROGRAM, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# ------------------------------------------------------------------ +# _AC_LINK_IFELSE(PROGRAM, [ACTION-IF-TRUE], [ACTION-IF-FALSE]) +# ------------------------------------------------------------- # Try to link PROGRAM. # This macro can be used during the selection of a compiler. m4_define([_AC_LINK_IFELSE], @@ -2325,8 +2325,8 @@ ])# _AC_LINK_IFELSE -# AC_LINK_IFELSE(PROGRAM, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# ----------------------------------------------------------------- +# AC_LINK_IFELSE(PROGRAM, [ACTION-IF-TRUE], [ACTION-IF-FALSE]) +# ------------------------------------------------------------ # Try to link PROGRAM. Requires that the compiler for the current # language was checked for, hence do not use this macro in macros looking # for a compiler. @@ -2336,16 +2336,16 @@ # AC_TRY_LINK(INCLUDES, FUNCTION-BODY, -# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# ----------------------------------------------------- +# [ACTION-IF-TRUE], [ACTION-IF-FALSE]) +# ------------------------------------------------ # Contrarily to AC_LINK_IFELSE, this macro double quote its first two args. AU_DEFUN([AC_TRY_LINK], [AC_LINK_IFELSE([AC_LANG_PROGRAM([[$1]], [[$2]])], [$3], [$4])]) # AC_COMPILE_CHECK(ECHO-TEXT, INCLUDES, FUNCTION-BODY, -# ACTION-IF-FOUND, [ACTION-IF-NOT-FOUND]) -# -------------------------------------------------------- +# ACTION-IF-TRUE, [ACTION-IF-FALSE]) +# --------------------------------------------------- AU_DEFUN([AC_COMPILE_CHECK], [m4_ifvaln([$1], [AC_MSG_CHECKING([for $1])])dnl AC_LINK_IFELSE([AC_LANG_PROGRAM([[$2]], [[$3]])], [$4], [$5])])