From 1ef4ce17d0c48f4fb00bed06bb4935ff1f17a5df Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 6 Jan 1999 13:01:23 +0000 Subject: [PATCH] Fri Dec 11 10:20:42 1998 Matthew D. Langston * compile_f_c_cxx.test: Change to use F77 and F77LINK instead of FC and FLINK, respectively. * flibs.test: same * fnoc.test: same * fo.test: same * fonly.test: same * link_f_c.test: same * link_f_c_cxx.test: same * link_f_cxx.test: same * link_f_only.test: same Fri Dec 11 10:23:17 1998 Matthew D. Langston * automake.in, automake.texi: Change all of the Fortran 77 code to use the new `F77' prefix instead of the older `FC' prefix. Specifically this changed FC, FCOMPILE, LTFCOMPILE, FLINK and FLD to F77, F77COMPILE, LTF77COMPILE, F77LINK and F77LD, respectively. --- ChangeLog | 20 ++++++++++++ automake.in | 66 +++++++++++++++++++------------------- automake.texi | 20 ++++++------ stamp-vti | 2 +- tests/compile_f_c_cxx.test | 10 +++--- tests/flibs.test | 7 ++-- tests/fnoc.test | 2 +- tests/fo.test | 2 +- tests/fonly.test | 2 +- tests/link_f_c.test | 6 ++-- tests/link_f_c_cxx.test | 6 ++-- tests/link_f_cxx.test | 6 ++-- tests/link_f_only.test | 4 +-- version.texi | 2 +- 14 files changed, 87 insertions(+), 68 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9a31e781..6aa13db5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,23 @@ +Fri Dec 11 10:20:42 1998 Matthew D. Langston + + * compile_f_c_cxx.test: Change to use F77 and F77LINK instead of + FC and FLINK, respectively. + * flibs.test: same + * fnoc.test: same + * fo.test: same + * fonly.test: same + * link_f_c.test: same + * link_f_c_cxx.test: same + * link_f_cxx.test: same + * link_f_only.test: same + +Fri Dec 11 10:23:17 1998 Matthew D. Langston + + * automake.in, automake.texi: Change all of the Fortran 77 code to + use the new `F77' prefix instead of the older `FC' prefix. + Specifically this changed FC, FCOMPILE, LTFCOMPILE, FLINK and FLD + to F77, F77COMPILE, LTF77COMPILE, F77LINK and F77LD, respectively. + 1999-01-05 Tom Tromey * depend2.am (%.o): Use \012, not \n, to avoid losing `tr's. From diff --git a/automake.in b/automake.in index 20ef59bd..4efe3211 100755 --- a/automake.in +++ b/automake.in @@ -317,11 +317,11 @@ $obsolete_rx = '(' . join ('|', keys %obsolete_macros) . ')'; 'l++', 'll', 'lxx'); ®ister_language ('asm', '', 0, 's', 'S'); -®ister_language ('f77', 'FLINK', 0, +®ister_language ('f77', 'F77LINK', 0, 'f', 'for', 'f90'); -®ister_language ('ppf77', 'FLINK', 0, +®ister_language ('ppf77', 'F77LINK', 0, 'F'); -®ister_language ('ratfor', 'FLINK', 0, +®ister_language ('ratfor', 'F77LINK', 0, 'r'); @@ -4150,7 +4150,7 @@ sub scan_one_configure_file &am_conf_line_warning ($filename, $., "automake requires \`AM_PROG_LEX', not \`AC_PROG_LEX'"); } - if (/AC_PROG_(FC|YACC|RANLIB|CC|CXXCPP|CXX|LEX|AWK|CPP|LN_S)/) + if (/AC_PROG_(F77|YACC|RANLIB|CC|CXXCPP|CXX|LEX|AWK|CPP|LN_S)/) { $configure_vars{$1} = $filename . ':' . $.; } @@ -4705,31 +4705,31 @@ sub lang_f77_finish local ($ltcompile, $ltlink) = &libtool_compiler; &define_configure_variable ('FFLAGS'); - &define_variable ('FCOMPILE', '$(FC) $(AM_FFLAGS) $(FFLAGS)'); - &define_variable ('LTFCOMPILE', - $ltcompile . '$(FC) $(AM_FFLAGS) $(FFLAGS)') + &define_variable ('F77COMPILE', '$(F77) $(AM_FFLAGS) $(FFLAGS)'); + &define_variable ('LTF77COMPILE', + $ltcompile . '$(F77) $(AM_FFLAGS) $(FFLAGS)') if ($seen_libtool); - &define_variable ('FLD', '$(FC)'); - &define_variable ('FLINK', $ltlink . '$(FLD) $(AM_FFLAGS) $(FFLAGS) $(LDFLAGS) -o $@'); + &define_variable ('F77LD', '$(F77)'); + &define_variable ('F77LINK', $ltlink . '$(F77LD) $(AM_FFLAGS) $(FFLAGS) $(LDFLAGS) -o $@'); local ($ext); foreach $ext (@f77_list) { $output_rules .= ("$ext.o:\n" - . "\t\$(FCOMPILE) -c \$<\n"); + . "\t\$(F77COMPILE) -c \$<\n"); # FIXME: Using cygpath should be somehow conditional. $output_rules .= ("$ext.obj:\n" - . "\t\$(FCOMPILE) -c `cygpath -w \$<`\n") + . "\t\$(F77COMPILE) -c `cygpath -w \$<`\n") if ($seen_objext); $output_rules .= ("$ext.lo:\n" - . "\t\$(LTFCOMPILE) -c \$<\n") + . "\t\$(LTF77COMPILE) -c \$<\n") if ($seen_libtool); } - if (! defined $configure_vars{'FC'}) + if (! defined $configure_vars{'F77'}) { - &am_error ("Fortran source seen but \`FC' not defined in \`configure.in'"); + &am_error ("Fortran 77 source seen but \`F77' not defined in \`configure.in'"); } } } @@ -4757,32 +4757,32 @@ sub lang_ppf77_finish local ($ltcompile, $ltlink) = &libtool_compiler; &define_configure_variable ('FFLAGS'); - &define_variable ('FCOMPILE', '$(FC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS)'); - &define_variable ('LTFCOMPILE', - $ltcompile . '$(FC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS)') + &define_variable ('F77COMPILE', '$(F77) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS)'); + &define_variable ('LTF77COMPILE', + $ltcompile . '$(F77) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS)') if ($seen_libtool); - &define_variable ('FLD', '$(FC)'); - &define_variable ('FLINK', $ltlink . '$(FLD) $(AM_FFLAGS) $(FFLAGS) $(LDFLAGS) -o $@'); + &define_variable ('F77LD', '$(F77)'); + &define_variable ('F77LINK', $ltlink . '$(F77LD) $(AM_FFLAGS) $(FFLAGS) $(LDFLAGS) -o $@'); $output_rules .= ("$ext.o:\n" - . "\t\$(FCOMPILE) -c \$<\n"); + . "\t\$(F77COMPILE) -c \$<\n"); # FIXME: Using cygpath should be somehow conditional. $output_rules .= ("$ext.obj:\n" - . "\t\$(FCOMPILE) -c `cygpath -w \$<`\n") + . "\t\$(F77COMPILE) -c `cygpath -w \$<`\n") if ($seen_objext); $output_rules .= ("$ext.lo:\n" - . "\t\$(LTFCOMPILE) -c \$<\n") + . "\t\$(LTF77COMPILE) -c \$<\n") if ($seen_libtool); # We also handle the case of preprocessing `.F' files into `.f' # files. $output_rules .= ("$ext.f:\n" - . "\t\$(FCOMPILE) -F \$<\n"); + . "\t\$(F77COMPILE) -F \$<\n"); - if (! defined $configure_vars{'FC'}) + if (! defined $configure_vars{'F77'}) { - &am_error ("Fortran source seen but \`FC' not defined in \`configure.in'"); + &am_error ("Fortran 77 source seen but \`F77' not defined in \`configure.in'"); } } @@ -4796,13 +4796,13 @@ sub lang_ratfor_finish &define_configure_variable ('FFLAGS'); &define_configure_variable ('RFLAGS'); - &define_variable ('RCOMPILE', '$(FC) $(AM_FFLAGS) $(FFLAGS) $(AM_RFLAGS) $(RFLAGS)'); + &define_variable ('RCOMPILE', '$(F77) $(AM_FFLAGS) $(FFLAGS) $(AM_RFLAGS) $(RFLAGS)'); &define_variable ('LTRCOMPILE', - $ltcompile . '$(FC) $(AM_FFLAGS) $(FFLAGS) $(AM_RFLAGS) $(RFLAGS)') + $ltcompile . '$(F77) $(AM_FFLAGS) $(FFLAGS) $(AM_RFLAGS) $(RFLAGS)') if ($seen_libtool); - &define_variable ('FLD', '$(FC)'); - &define_variable ('FLINK', $ltlink . '$(FLD) $(AM_FFLAGS) $(FFLAGS) $(AM_RFLAGS) $(RFLAGS) $(LDFLAGS) -o $@'); + &define_variable ('F77LD', '$(F77)'); + &define_variable ('F77LINK', $ltlink . '$(F77LD) $(AM_FFLAGS) $(FFLAGS) $(AM_RFLAGS) $(RFLAGS) $(LDFLAGS) -o $@'); $output_rules .= ("$ext.o:\n" . "\t\$(RCOMPILE) -c \$<\n"); @@ -4819,9 +4819,9 @@ sub lang_ratfor_finish $output_rules .= ("$ext.f:\n" . "\t\$(RCOMPILE) -F \$<\n"); - if (! defined $configure_vars{'FC'}) + if (! defined $configure_vars{'F77'}) { - &am_error ("Fortran source seen but \`FC' not defined in \`configure.in'"); + &am_error ("Ratfor source seen but \`F77' not defined in \`configure.in'"); } } @@ -4849,8 +4849,8 @@ sub resolve_linker return 'CXXLINK' if defined $linkers{'CXXLINK'}; - return 'FLINK' - if defined $linkers{'FLINK'}; + return 'F77LINK' + if defined $linkers{'F77LINK'}; return 'LINK'; } diff --git a/automake.texi b/automake.texi index 546f4607..80008ce7 100644 --- a/automake.texi +++ b/automake.texi @@ -1099,11 +1099,11 @@ This is required if any C++ source is included. @xref{Particular Programs, , Particular Program Checks, autoconf, The Autoconf Manual}. @cvindex AC_PROG_CXX -@item AC_PROG_FC +@item AC_PROG_F77 This is required if any Fortran 77 source is included. This macro is distributed with Autoconf version 2.13 and later. @xref{Particular Programs, , Particular Program Checks, autoconf, The Autoconf Manual}. -@cvindex AC_PROG_FC +@cvindex AC_PROG_F77 @item AC_F77_LIBRARY_LDFLAGS This is required for programs and shared libraries that are a mixture of @@ -1963,7 +1963,7 @@ Automake includes full support for Fortran 77. Any package including Fortran 77 code must define the output variable @samp{F77} in @file{configure.in}; the simplest way to do this is to use -the @code{AC_PROG_FC} macro (@pxref{Particular Programs, , Particular +the @code{AC_PROG_F77} macro (@pxref{Particular Programs, , Particular Program Checks, autoconf, The Autoconf Manual}). @xref{Fortran 77 and Autoconf}. @@ -1972,7 +1972,7 @@ seen: @vtable @code -@item FC +@item F77 The name of the Fortran 77 compiler. @item FFLAGS @@ -1981,7 +1981,7 @@ Any flags to pass to the Fortran 77 compiler. @item RFLAGS Any flags to pass to the Ratfor compiler. -@item FCOMPILE +@item F77COMPILE The command used to actually compile a Fortran 77 source file. The file name is appended to form the complete command line. @@ -2026,10 +2026,10 @@ command used is as follows: @table @file @item .F -@code{$(FC) -F $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS)} +@code{$(F77) -F $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS)} @item .r -@code{$(FC) -F $(AM_FFLAGS) $(FFLAGS) $(AM_RFLAGS) $(RFLAGS)} +@code{$(F77) -F $(AM_FFLAGS) $(FFLAGS) $(AM_RFLAGS) $(RFLAGS)} @end table @@ -2045,13 +2045,13 @@ is as follows: @table @file @item .f -@code{$(FC) -c $(AM_FFLAGS) $(FFLAGS)} +@code{$(F77) -c $(AM_FFLAGS) $(FFLAGS)} @item .F -@code{$(FC) -c $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS)} +@code{$(F77) -c $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS)} @item .r -@code{$(FC) -c $(AM_FFLAGS) $(FFLAGS) $(AM_RFLAGS) $(RFLAGS)} +@code{$(F77) -c $(AM_FFLAGS) $(FFLAGS) $(AM_RFLAGS) $(RFLAGS)} @end table diff --git a/stamp-vti b/stamp-vti index 34d2946d..7fdc2167 100644 --- a/stamp-vti +++ b/stamp-vti @@ -1,3 +1,3 @@ -@set UPDATED 1 December 1998 +@set UPDATED 6 January 1999 @set EDITION 1.3e @set VERSION 1.3e diff --git a/tests/compile_f_c_cxx.test b/tests/compile_f_c_cxx.test index 6f0c6c8e..2ef19dcd 100755 --- a/tests/compile_f_c_cxx.test +++ b/tests/compile_f_c_cxx.test @@ -9,8 +9,8 @@ cat >> configure.in << 'END' AC_PROG_CC AC_PROG_CXX -AC_PROG_FC -MDL_F77_LIBRARY_LDFLAGS +AC_PROG_F77 +AC_F77_LIBRARY_LDFLAGS END cat > Makefile.am << 'END' @@ -28,8 +28,8 @@ $AUTOMAKE || exit 1 # Look for the macros at the beginning of rules. Be careful, as there # are literal tabs at the beginning of the search strings. -grep ' \$(COMPILE)' Makefile.in || exit 1 -grep ' \$(CXXCOMPILE)' Makefile.in || exit 1 -grep ' \$(FCOMPILE)' Makefile.in || exit 1 +grep ' \$(COMPILE)' Makefile.in || exit 1 +grep ' \$(CXXCOMPILE)' Makefile.in || exit 1 +grep ' \$(F77COMPILE)' Makefile.in || exit 1 exit 0 diff --git a/tests/flibs.test b/tests/flibs.test index 326fa6bb..a4978f95 100755 --- a/tests/flibs.test +++ b/tests/flibs.test @@ -1,14 +1,13 @@ #! /bin/sh -# Make sure `MDL_F77_LIBRARY_LDFLAGS' (form `m4/mdl_f77.m4') works -# properly. +# Make sure `AC_F77_LIBRARY_LDFLAGS' works properly. # Matthew D. Langston . $srcdir/defs || exit 1 cat >> configure.in << 'END' -AC_PROG_FC -MDL_F77_LIBRARY_LDFLAGS +AC_PROG_F77 +AC_F77_LIBRARY_LDFLAGS END # Tue Aug 11 09:50:48 1998 Matthew D. Langston diff --git a/tests/fnoc.test b/tests/fnoc.test index d2dc30eb..f264d390 100755 --- a/tests/fnoc.test +++ b/tests/fnoc.test @@ -7,7 +7,7 @@ . $srcdir/defs || exit 1 cat >> configure.in << 'END' -AC_PROG_FC +AC_PROG_F77 END cat > Makefile.am << 'END' diff --git a/tests/fo.test b/tests/fo.test index 10108328..8571b2d8 100755 --- a/tests/fo.test +++ b/tests/fo.test @@ -6,7 +6,7 @@ . $srcdir/defs || exit 1 cat >> configure.in << 'END' -AC_PROG_FC +AC_PROG_F77 END cat > Makefile.am << 'END' diff --git a/tests/fonly.test b/tests/fonly.test index dd1ebbec..392b6762 100755 --- a/tests/fonly.test +++ b/tests/fonly.test @@ -6,7 +6,7 @@ . $srcdir/defs || exit 1 cat >> configure.in << 'END' -AC_PROG_FC +AC_PROG_F77 END # Tue Aug 11 09:50:48 1998 Matthew D. Langston diff --git a/tests/link_f_c.test b/tests/link_f_c.test index 19281b5f..8dea51cc 100755 --- a/tests/link_f_c.test +++ b/tests/link_f_c.test @@ -7,7 +7,7 @@ cat >> configure.in << 'END' AC_PROG_CC -AC_PROG_FC +AC_PROG_F77 END cat > Makefile.am << 'END' @@ -26,10 +26,10 @@ $AUTOMAKE || exit 1 # Look for this macro not at the beginning of any line; that will have # to be good enough for now. -grep '.\$(FLINK)' Makefile.in || exit 1 +grep '.\$(F77LINK)' Makefile.in || exit 1 # We should not see these patterns: -grep '.\$(LINK)' Makefile.in && exit 1 +grep '.\$(LINK)' Makefile.in && exit 1 grep '.\$(CXXLINK)' Makefile.in && exit 1 exit 0 diff --git a/tests/link_f_c_cxx.test b/tests/link_f_c_cxx.test index 886c8cce..8155576a 100755 --- a/tests/link_f_c_cxx.test +++ b/tests/link_f_c_cxx.test @@ -8,7 +8,7 @@ cat >> configure.in << 'END' AC_PROG_CC AC_PROG_CXX -AC_PROG_FC +AC_PROG_F77 END cat > Makefile.am << 'END' @@ -30,7 +30,7 @@ $AUTOMAKE || exit 1 grep '.\$(CXXLINK)' Makefile.in || exit 1 # We should not see these patterns: -grep '.\$(FLINK)' Makefile.in && exit 1 -grep '.\$(LINK)' Makefile.in && exit 1 +grep '.\$(F77LINK)' Makefile.in && exit 1 +grep '.\$(LINK)' Makefile.in && exit 1 exit 0 diff --git a/tests/link_f_cxx.test b/tests/link_f_cxx.test index 96e2c357..c90b2631 100755 --- a/tests/link_f_cxx.test +++ b/tests/link_f_cxx.test @@ -7,7 +7,7 @@ cat >> configure.in << 'END' AC_PROG_CXX -AC_PROG_FC +AC_PROG_F77 END cat > Makefile.am << 'END' @@ -28,7 +28,7 @@ $AUTOMAKE || exit 1 grep '.\$(CXXLINK)' Makefile.in || exit 1 # We should not see these patterns: -grep '.\$(FLINK)' Makefile.in && exit 1 -grep '.\$(LINK)' Makefile.in && exit 1 +grep '.\$(F77LINK)' Makefile.in && exit 1 +grep '.\$(LINK)' Makefile.in && exit 1 exit 0 diff --git a/tests/link_f_only.test b/tests/link_f_only.test index 82d74eeb..ca577934 100755 --- a/tests/link_f_only.test +++ b/tests/link_f_only.test @@ -6,7 +6,7 @@ . $srcdir/defs || exit 1 cat >> configure.in << 'END' -AC_PROG_FC +AC_PROG_F77 END cat > Makefile.am << 'END' @@ -23,7 +23,7 @@ $AUTOMAKE || exit 1 # Look for this macro not at the beginning of any line; that will have # to be good enough for now. -grep '.\$(FLINK)' Makefile.in || exit 1 +grep '.\$(F77LINK)' Makefile.in || exit 1 # We should not see these patterns: grep '.\$(CXXLINK)' Makefile.in && exit 1 diff --git a/version.texi b/version.texi index 34d2946d..7fdc2167 100644 --- a/version.texi +++ b/version.texi @@ -1,3 +1,3 @@ -@set UPDATED 1 December 1998 +@set UPDATED 6 January 1999 @set EDITION 1.3e @set VERSION 1.3e -- 2.43.5