Created
January 19, 2012 19:57
-
-
Save goodell/1642198 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
commit c3df97ff29d52547d5ef65aae31c403d04d411b1 | |
Author: Dave Goodell <[email protected]> | |
Date: Wed Jan 18 17:42:54 2012 -0600 | |
tt#1569: mismatched F77/F90 compilers should be an error | |
Also clean up some useless commented-out code. | |
No reviewer. | |
--- | |
configure.in | 9 +-------- | |
1 files changed, 1 insertions(+), 8 deletions(-) | |
diff --git a/configure.in b/configure.in | |
index 3623096..806bac0 100644 | |
--- a/configure.in | |
+++ b/configure.in | |
@@ -1965,13 +1965,6 @@ fc_with_f77=yes | |
if test "$enable_fc" = "yes" -a "$enable_f77" = yes ; then | |
enable_fc=no | |
if test -n "$FC" ; then | |
- if test -z "$F77" ; then | |
- dnl FIXME this logic needs to happen at the early spot where we | |
- dnl invoke AC_PROG_F77 and AC_PROG_FC | |
- dnl PAC_PROG_F77 | |
- : | |
- fi | |
- # | |
# If we allow multiple weak symbols, we should test a name | |
# that does not contain an underscore. The Fortran binding uses | |
# this rule for enabling multiple weak symbols: | |
@@ -1988,7 +1981,7 @@ if test "$enable_fc" = "yes" -a "$enable_f77" = yes ; then | |
PAC_FC_AND_F77_COMPATIBLE(fc_with_f77=yes,fc_with_f77=no,$testRoutine) | |
if test "$fc_with_f77" != yes ; then | |
enable_fc=no | |
- AC_MSG_WARN([The selected Fortran 90 compiler $FC does not work with the selected Fortran 77 compiler $F77. Use the environment variables FC and F77 respectively to select compatible Fortran compilers. The check here tests to see if a main program compiled with the Fortran 90 compiler can link with a subroutine compiled with the Fortran 77 compiler.]) | |
+ AC_MSG_ERROR([The selected Fortran 90 compiler $FC does not work with the selected Fortran 77 compiler $F77. Use the environment variables FC and F77 respectively to select compatible Fortran compilers. The check here tests to see if a main program compiled with the Fortran 90 compiler can link with a subroutine compiled with the Fortran 77 compiler.]) | |
elif test "$fc_with_f77" = "yes" ; then | |
# If we got here, there is a Fortran 90 compiler that we can use | |
enable_fc=yes |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment