From fc53c53e9bffd6d12f059b75551b29c40137fb3e Mon Sep 17 00:00:00 2001 From: Christian Engwer <christi@dune-project.org> Date: Thu, 10 Feb 2011 22:09:13 +0000 Subject: [PATCH] fix FS#832 -- sync FC and F77 [[Imported from SVN: r6340]] --- m4/dune_all.m4 | 2 +- m4/dune_fortran.m4 | 31 +++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 m4/dune_fortran.m4 diff --git a/m4/dune_all.m4 b/m4/dune_all.m4 index 81ec8ff0b..64373b3ab 100644 --- a/m4/dune_all.m4 +++ b/m4/dune_all.m4 @@ -7,7 +7,6 @@ # the entries are more or less copied from an "autoscan"-run in the # dune-directory - AC_DEFUN([DUNE_CHECK_ALL],[ # doxygen and latex take a lot of time... AC_REQUIRE([DUNE_DOCUMENTATION]) @@ -18,6 +17,7 @@ AC_DEFUN([DUNE_CHECK_ALL],[ AC_REQUIRE([AC_PROG_CPP]) AC_REQUIRE([AC_PROG_CXX]) AC_REQUIRE([AC_PROG_CXXCPP]) + AC_REQUIRE([DUNE_SYNC_FC_F77]) AC_REQUIRE([AC_PROG_F77]) AC_REQUIRE([AC_PROG_FC]) # don't build shared libs per default, this is way better for debugging... diff --git a/m4/dune_fortran.m4 b/m4/dune_fortran.m4 new file mode 100644 index 000000000..872bfda81 --- /dev/null +++ b/m4/dune_fortran.m4 @@ -0,0 +1,31 @@ +# a trick to make life for the user easier. +# +# some libs need the fortran test, while other use the f77 test. This +# requires the user to provide two variables, usually with the same +# parameter. In most cases the F77 compiler will be the same as teh FC +# compiler. +# +# We test for FC and F77. If the user has specified both, we do +# nothing, if the user has specified only one of them, we assume that +# the compiler supports both and copy the value. Usually this should +# be the sane default. +# +AC_DEFUN([DUNE_SYNC_FC_F77],[ + # variant 1 + # FC is set, while F77 is not set + AS_IF([test -n "$FC" && test -z "$F77"], [ + AC_MSG_NOTICE([Fortran compiler FC (fortran 90) specified, + while F77 (fortran 77) wasn't set. + Trying to use FC as F77.]) + F77="$FC" + ]) + # variant 2 + # F77 is set, while FC is not set + AS_IF([test -z "$FC" && test -n "$F77"], [ + AC_MSG_NOTICE([Fortran compiler F77 (fortran 77) specified, + while FC (fortran 90) wasn't set. + Trying to use F77 as FC.]) + FC="$F77" + ]) +]) + -- GitLab