From: Akim Demaille Date: Thu, 4 Sep 2003 12:52:35 +0000 (+0000) Subject: * tests/mktests.sh (ac_exclude_list): Add AC_FC_FUNC. X-Git-Tag: AUTOCONF-2.57c~15 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e99011cfd5048c45b648e0769d13ce5aaf74c2e2;p=thirdparty%2Fautoconf.git * tests/mktests.sh (ac_exclude_list): Add AC_FC_FUNC. --- diff --git a/ChangeLog b/ChangeLog index 300a6ba7..3e13df63 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2003-09-04 Akim Demaille + + * tests/mktests.sh (ac_exclude_list): Add AC_FC_FUNC. + 2003-09-02 Steven G. Johnson Add support for newer Fortran dialects. The F77 interface is diff --git a/lib/autoconf/fortran.m4 b/lib/autoconf/fortran.m4 index 006b5884..50916370 100644 --- a/lib/autoconf/fortran.m4 +++ b/lib/autoconf/fortran.m4 @@ -1057,8 +1057,9 @@ m4_if(m4_index([$1],[_]),-1,[], m4_default([$2],[$1])="$ac_val" ])# _AC_FC_FUNC + # AC_F77_FUNC(NAME, [SHELLVAR = NAME]) -# ---------------------- +# ------------------------------------ AC_DEFUN([AC_F77_FUNC], [AC_REQUIRE([_AC_F77_NAME_MANGLING])dnl AC_LANG_PUSH(Fortran 77)dnl @@ -1066,8 +1067,9 @@ _AC_FC_FUNC([$1],[$2]) AC_LANG_POP(Fortran 77)dnl ])# AC_F77_FUNC + # AC_FC_FUNC(NAME, [SHELLVAR = NAME]) -# ---------------------- +# ----------------------------------- AC_DEFUN([AC_FC_FUNC], [AC_REQUIRE([_AC_FC_NAME_MANGLING])dnl AC_LANG_PUSH(Fortran)dnl @@ -1075,12 +1077,13 @@ _AC_FC_FUNC([$1],[$2]) AC_LANG_POP(Fortran)dnl ])# AC_FC_FUNC + # AC_FC_SRCEXT(EXT, [ACTION-IF-SUCCESS], [ACTION-IF-FAILURE]) -# ---------------------- +# ----------------------------------------------------------- # Set the source-code extension used in Fortran (FC) tests to EXT (which # defaults to f). Also, look for any necessary additional FCFLAGS needed # to allow this extension, and store them in the output variable -# FCFLAGS_ (e.g. FCFLAGS_f90 for EXT=f90). If successful, +# FCFLAGS_ (e.g. FCFLAGS_f90 for EXT=f90). If successful, # call ACTION-IF-SUCCESS. If unable to compile source code with EXT, # call ACTION-IF-FAILURE, which defaults to failing with an error # message. @@ -1162,7 +1165,7 @@ if test "x$ac_cv_fc_freeform" = xunknown; then else if test "x$ac_cv_fc_freeform" != xnone; then FCFLAGS="$FCFLAGS $ac_cv_fc_freeform" - fi + fi $1 fi ])# AC_FC_FREEFORM diff --git a/tests/acfortran.at b/tests/acfortran.at index d212170d..a9eb1841 100644 --- a/tests/acfortran.at +++ b/tests/acfortran.at @@ -7,7 +7,6 @@ AT_BANNER([Testing autoconf/fortran macros.]) AT_CHECK_MACRO([AC_F77_MAIN]) AT_CHECK_MACRO([AC_F77_WRAPPERS]) AT_CHECK_MACRO([AC_FC_FREEFORM]) -AT_CHECK_MACRO([AC_FC_FUNC]) AT_CHECK_MACRO([AC_FC_MAIN]) AT_CHECK_MACRO([AC_FC_SRCEXT]) AT_CHECK_MACRO([AC_FC_WRAPPERS]) diff --git a/tests/acfunctions.at b/tests/acfunctions.at index c02b2cf6..f5cfb276 100644 --- a/tests/acfunctions.at +++ b/tests/acfunctions.at @@ -31,5 +31,6 @@ AT_CHECK_MACRO([AC_FUNC_STRNLEN]) AT_CHECK_MACRO([AC_FUNC_STRTOD]) AT_CHECK_MACRO([AC_FUNC_UTIME_NULL]) AT_CHECK_MACRO([AC_FUNC_VPRINTF]) +AT_CHECK_MACRO([AC_FUNC_WAIT3]) # Obsolete macros. diff --git a/tests/mktests.sh b/tests/mktests.sh index db09225e..9176f13c 100755 --- a/tests/mktests.sh +++ b/tests/mktests.sh @@ -98,7 +98,7 @@ exclude_list='^ac_cv_prog_(gcc|gxx|g77)$ # - AC_LANG* # Heavily used by other macros. # -# - AC_PATH_PROGS?, AC_F77_FUNC +# - AC_PATH_PROGS?, AC_F77_FUNC, AC_FC_FUNC # They produce `= val' because $1, the variable used to store the result, # is empty. # @@ -130,8 +130,9 @@ ac_exclude_list='^AC_ARG_VAR$ ^AC_CANONICALIZE|AC_PREFIX_PROGRAM|AC_PREREQ$ ^AC_CHECK_(DECL|FILE|FUNC|HEADER|LIB|MEMBER|PROG|SIZEOF|TOOL|TYPE)S?$ ^AC_CONFIG -^AC_F77_FUNC$ -^AC_(FUNC_GETLOADAVG|REPLACE_FNMATCH|FUNC_FNMATCH_GNU)$ +^AC_(F77|FC)_FUNC$ +^AC_FD_CC$ +^AC_(FUNC_GETLOADAVG|REPLACE_FNMATCH|FUNC_FNMATCH_GNU|WAIT3)$ ^AC_INIT ^AC_LANG ^AC_LINKER_OPTION$ @@ -143,12 +144,10 @@ ac_exclude_list='^AC_ARG_VAR$ ^AC_SEARCH_LIBS$ ^(AC_TRY.*|AC_RUN_LOG)$ ^AC_.*_IFELSE$ -^AC_FD_CC$ ^(AC_(PROG_CC|C_CONST|C_INLINE|C_RESTRICT|C_VOLATILE))$ ^AC_(CYGWIN|CYGWIN32|EMXOS2|MING32|EXEEXT|OBJEXT)$ ^AC_PATH_XTRA$ ^AC_SYS_RESTARTABLE_SYSCALLS$ -^AC_FUNC_WAIT3$ _AC_'