mirror/autoconf
2
0
Fork 0
mirror of git://git.sv.gnu.org/autoconf synced 2024-12-03 02:00:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

* doc/autoconf.texi (Fortran Compiler): Do not use `@ovar' in

Browse Source 
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.
This commit is contained in:
Ralf Wildenhues 2006-04-30 17:04:06 +00:00
parent c8fa79da58
commit 2775732faa
3 changed files with 34 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,14 @@
2006-04-30 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* doc/autoconf.texi (Fortran Compiler): Do not use `@ovar' 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.
2006-04-29 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* doc/autoconf.texi (Limitations of Make): Clean up markup.

18
doc/autoconf.texi
View File

@ -6633,7 +6633,7 @@ was found, and @code{none} when no such dummy main is needed.
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__})
@emph{if} it is required. @ovar{action-if-not-found} defaults to
@emph{if} 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
@ -6800,9 +6800,9 @@ foo.o: foo.f90
@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
@ -6823,8 +6823,8 @@ specify a different extension with @code{AC_FC_SRCEXT}, such as
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
@ -7661,7 +7661,7 @@ run it using @code{AC_RUN_IFELSE}. Avoid running test programs if
possible, because this prevents people from configuring your package for
cross-compiling.
@defmac AC_RUN_IFELSE (@var{input}, @ovar{action-if-found}, @ovar{action-if-not-found}, @ovar{action-if-cross-compiling})
@defmac 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}.
@ -15608,7 +15608,7 @@ typedef loff_t off_t;
Same as @samp{AC_MSG_NOTICE([checking @var{feature-description}@dots{}]}.
@end defmac
@defmac AC_COMPILE_CHECK (@var{echo-text}, @var{includes}, @var{function-body}, @var{action-if-found}, @ovar{action-if-not-found})
@defmac 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
@ -16210,7 +16210,7 @@ issue.
@code{AC_HEADER_TIME}
@end defmac
@defmac AC_TRY_COMPILE (@var{includes}, @var{function-body}, @ovar{action-if-found}, @ovar{action-if-not-found})
@defmac AC_TRY_COMPILE (@var{includes}, @var{function-body}, @ovar{action-if-true}, @ovar{action-if-false})
@acindex{TRY_COMPILE}
Same as:
@ -16251,7 +16251,7 @@ AC_PREPROC_IFELSE(
This macro double quotes the @var{input}.
@end defmac
@defmac AC_TRY_LINK (@var{includes}, @var{function-body}, @ovar{action-if-found}, @ovar{action-if-not-found})
@defmac AC_TRY_LINK (@var{includes}, @var{function-body}, @ovar{action-if-true}, @ovar{action-if-false})
@acindex{TRY_LINK}
Same as:

28
lib/autoconf/general.m4
View File

@ -2266,8 +2266,8 @@ AC_DEFUN([AC_EGREP_HEADER],
## ------------------ ##
# _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],
@ -2284,8 +2284,8 @@ rm -f conftest.err conftest.$ac_objext m4_ifval([$1], [conftest.$ac_ext])[]dnl
])# _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.
@ -2295,8 +2295,8 @@ _AC_COMPILE_IFELSE($@)])
# 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])])
@ -2307,8 +2307,8 @@ AU_DEFUN([AC_TRY_COMPILE],
## --------------------- ##
# _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],
@ -2326,8 +2326,8 @@ rm -f conftest.err conftest.$ac_objext \
])# _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.
@ -2337,16 +2337,16 @@ _AC_LINK_IFELSE($@)])
# 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])])