+@@ -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 @@