* skip some F90 tests if we aren't compilng F90
* Make sure to invalidate the cache on a couple of tests when we don't want F77/F90 This commit was SVN r8994.
Этот коммит содержится в:
родитель
e5ac52c246
Коммит
74860649bc
@ -21,6 +21,11 @@ dnl
|
|||||||
AC_DEFUN([OMPI_F77_FIND_EXT_SYMBOL_CONVENTION], [
|
AC_DEFUN([OMPI_F77_FIND_EXT_SYMBOL_CONVENTION], [
|
||||||
AC_REQUIRE([AC_PROG_NM])
|
AC_REQUIRE([AC_PROG_NM])
|
||||||
|
|
||||||
|
# invalidate cache if result came from a run where F77 was disabled
|
||||||
|
if test "$ompi_cv_f77_external_symbol" = "skipped" ; then
|
||||||
|
unset ompi_cv_f77_external_symbol
|
||||||
|
fi
|
||||||
|
|
||||||
AC_CACHE_CHECK([$F77 external symbol convention],
|
AC_CACHE_CHECK([$F77 external symbol convention],
|
||||||
[ompi_cv_f77_external_symbol],
|
[ompi_cv_f77_external_symbol],
|
||||||
[if test "$F77" = "none" -o "$OMPI_WANT_F77_BINDINGS" = "0"; then
|
[if test "$F77" = "none" -o "$OMPI_WANT_F77_BINDINGS" = "0"; then
|
||||||
|
@ -20,6 +20,11 @@ dnl
|
|||||||
# -------------------------------------------------------
|
# -------------------------------------------------------
|
||||||
# Determine the value of .TRUE. of this FORTRAN compiler.
|
# Determine the value of .TRUE. of this FORTRAN compiler.
|
||||||
AC_DEFUN([OMPI_F77_GET_VALUE_TRUE],[
|
AC_DEFUN([OMPI_F77_GET_VALUE_TRUE],[
|
||||||
|
# invalidate cache if result came from a run where F77 was disabled
|
||||||
|
if test "$ompi_cv_f77_true_value" = "0" ; then
|
||||||
|
unset ompi_cv_f77_true_value
|
||||||
|
fi
|
||||||
|
|
||||||
AC_CACHE_CHECK([FORTRAN value for .TRUE. logical type],
|
AC_CACHE_CHECK([FORTRAN value for .TRUE. logical type],
|
||||||
[ompi_cv_f77_true_value],
|
[ompi_cv_f77_true_value],
|
||||||
[if test "$1" = "none" -o "$OMPI_WANT_F77_BINDINGS" = "0" ; then
|
[if test "$1" = "none" -o "$OMPI_WANT_F77_BINDINGS" = "0" ; then
|
||||||
|
@ -20,16 +20,14 @@ dnl
|
|||||||
AC_DEFUN([OMPI_F90_FIND_MODULE_INCLUDE_FLAG],[
|
AC_DEFUN([OMPI_F90_FIND_MODULE_INCLUDE_FLAG],[
|
||||||
AS_VAR_PUSHDEF([f90_inc_var], [ompi_cv_f90_module_include_flag])
|
AS_VAR_PUSHDEF([f90_inc_var], [ompi_cv_f90_module_include_flag])
|
||||||
|
|
||||||
AC_CACHE_CHECK([for Fortran 90 compiler module include flag], f90_inc_var,
|
if test "$OMPI_WANT_F90_BINDINGS" -eq 1 ; then
|
||||||
|
AC_CACHE_CHECK([for Fortran 90 compiler module include flag],
|
||||||
|
f90_inc_var,
|
||||||
[ofi_possible_flags="-I -p -M"
|
[ofi_possible_flags="-I -p -M"
|
||||||
|
|
||||||
mkdir conftest.$$
|
mkdir conftest.$$
|
||||||
cd conftest.$$
|
cd conftest.$$
|
||||||
|
|
||||||
#
|
|
||||||
# Try to compile an F90 module
|
# Try to compile an F90 module
|
||||||
#
|
|
||||||
|
|
||||||
mkdir subdir
|
mkdir subdir
|
||||||
cd subdir
|
cd subdir
|
||||||
cat > conftest-module.f90 <<EOF
|
cat > conftest-module.f90 <<EOF
|
||||||
@ -43,9 +41,11 @@ end module OMPI_MOD_FLAG
|
|||||||
EOF
|
EOF
|
||||||
|
|
||||||
OMPI_LOG_COMMAND([$FC $FCFLAGS $FCFLAGS_f90 -c conftest-module.f90 $LDFLAGS $LIBS], ,
|
OMPI_LOG_COMMAND([$FC $FCFLAGS $FCFLAGS_f90 -c conftest-module.f90 $LDFLAGS $LIBS], ,
|
||||||
|
[cd ..
|
||||||
|
rm -rf conftest.$$
|
||||||
AC_MSG_RESULT([Whoops!])
|
AC_MSG_RESULT([Whoops!])
|
||||||
AC_MSG_WARN([*** Cannot seem to compile an f90 module])
|
AC_MSG_WARN([*** Cannot seem to compile an f90 module])
|
||||||
AC_MSG_ERROR([Cannot continue]))
|
AC_MSG_ERROR([Cannot continue])])
|
||||||
cd ..
|
cd ..
|
||||||
|
|
||||||
#
|
#
|
||||||
@ -76,6 +76,9 @@ EOF
|
|||||||
AC_MSG_WARN([*** Could not determine the f90 compiler flag to indicate where modules reside])
|
AC_MSG_WARN([*** Could not determine the f90 compiler flag to indicate where modules reside])
|
||||||
AC_MSG_ERROR([*** Cannot continue])
|
AC_MSG_ERROR([*** Cannot continue])
|
||||||
fi
|
fi
|
||||||
|
else
|
||||||
|
OMPI_FC_MODULE_FLAG=
|
||||||
|
fi
|
||||||
AC_SUBST(OMPI_FC_MODULE_FLAG)
|
AC_SUBST(OMPI_FC_MODULE_FLAG)
|
||||||
AS_VAR_POPDEF([f90_inc_var])
|
AS_VAR_POPDEF([f90_inc_var])
|
||||||
])dnl
|
])dnl
|
||||||
|
@ -22,6 +22,7 @@ dnl
|
|||||||
AC_DEFUN([OMPI_F90_GET_INT_KIND],[
|
AC_DEFUN([OMPI_F90_GET_INT_KIND],[
|
||||||
AS_VAR_PUSHDEF([type_var], [ompi_cv_f90_int_kind_$2])
|
AS_VAR_PUSHDEF([type_var], [ompi_cv_f90_int_kind_$2])
|
||||||
|
|
||||||
|
if test "$OMPI_WANT_F90_BINDINGS" -eq 1 ; then
|
||||||
AC_CACHE_CHECK([Fortran 90 kind of $1 (selected_int_kind($2))],
|
AC_CACHE_CHECK([Fortran 90 kind of $1 (selected_int_kind($2))],
|
||||||
type_var,
|
type_var,
|
||||||
[cat > conftestf.f90 <<EOF
|
[cat > conftestf.f90 <<EOF
|
||||||
@ -54,5 +55,8 @@ EOF
|
|||||||
rm -f conftest*])
|
rm -f conftest*])
|
||||||
|
|
||||||
$3=AS_VAR_GET(type_var)
|
$3=AS_VAR_GET(type_var)
|
||||||
|
else
|
||||||
|
$3=0
|
||||||
|
fi
|
||||||
AS_VAR_POPDEF([type_var])dnl
|
AS_VAR_POPDEF([type_var])dnl
|
||||||
])
|
])
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user