Patch from David Daniel to add $LDFLAGS and $LIBS into the f90 tests
so that they're just like the f77 tests. This commit was SVN r8348.
Этот коммит содержится в:
родитель
f301d06fd4
Коммит
0fc36a016f
@ -33,7 +33,7 @@ EOF
|
|||||||
# Try the compilation and run.
|
# Try the compilation and run.
|
||||||
#
|
#
|
||||||
|
|
||||||
OMPI_LOG_COMMAND([$FC $FCFLAGS $FCFLAGS_f90 -o conftest conftestf.f90],
|
OMPI_LOG_COMMAND([$FC $FCFLAGS $FCFLAGS_f90 -o conftest conftestf.f90 $LDFLAGS $LIBS],
|
||||||
[HAPPY=1
|
[HAPPY=1
|
||||||
AC_MSG_RESULT([yes])],
|
AC_MSG_RESULT([yes])],
|
||||||
[HAPPY=0
|
[HAPPY=0
|
||||||
|
@ -41,7 +41,7 @@ module OMPI_MOD_FLAG
|
|||||||
end module OMPI_MOD_FLAG
|
end module OMPI_MOD_FLAG
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
OMPI_LOG_COMMAND([$FC $FCFLAGS $FCFLAGS_f90 -c conftest-module.f90], ,
|
OMPI_LOG_COMMAND([$FC $FCFLAGS $FCFLAGS_f90 -c conftest-module.f90 $LDFLAGS $LIBS], ,
|
||||||
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]))
|
||||||
@ -61,7 +61,7 @@ EOF
|
|||||||
OMPI_FC_MODULE_FLAG=
|
OMPI_FC_MODULE_FLAG=
|
||||||
for flag in $possible_flags; do
|
for flag in $possible_flags; do
|
||||||
if test "$OMPI_FC_MODULE_FLAG" = ""; then
|
if test "$OMPI_FC_MODULE_FLAG" = ""; then
|
||||||
OMPI_LOG_COMMAND([$FC $FCFLAGS $FCFLAGS_f90 conftest.f90 ${flag}subdir],
|
OMPI_LOG_COMMAND([$FC $FCFLAGS $FCFLAGS_f90 conftest.f90 ${flag}subdir $LDFLAGS $LIBS],
|
||||||
[OMPI_FC_MODULE_FLAG="$flag"])
|
[OMPI_FC_MODULE_FLAG="$flag"])
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
@ -90,7 +90,7 @@ EOF
|
|||||||
#
|
#
|
||||||
|
|
||||||
OMPI_LOG_COMMAND([$CC $CFLAGS -I. -c conftest.c],
|
OMPI_LOG_COMMAND([$CC $CFLAGS -I. -c conftest.c],
|
||||||
OMPI_LOG_COMMAND([$FC $FCFLAGS $FCFLAGS_f90 conftestf.f90 conftest.o -o conftest],
|
OMPI_LOG_COMMAND([$FC $FCFLAGS $FCFLAGS_f90 conftestf.f90 conftest.o -o conftest $LDFLAGS $LIBS],
|
||||||
OMPI_LOG_COMMAND([./conftest],[HAPPY=1],[HAPPY=0]),
|
OMPI_LOG_COMMAND([./conftest],[HAPPY=1],[HAPPY=0]),
|
||||||
[HAPPY=0]),
|
[HAPPY=0]),
|
||||||
[HAPPY=0])
|
[HAPPY=0])
|
||||||
|
@ -35,7 +35,7 @@ EOF
|
|||||||
# Try the compilation and run.
|
# Try the compilation and run.
|
||||||
#
|
#
|
||||||
|
|
||||||
OMPI_LOG_COMMAND([$FC $FCFLAGS $FCFLAGS_f90 -o conftest conftestf.f90],
|
OMPI_LOG_COMMAND([$FC $FCFLAGS $FCFLAGS_f90 -o conftest conftestf.f90 $LDFLAGS $LIBS],
|
||||||
OMPI_LOG_COMMAND([./conftest], [HAPPY=1], [HAPPY=0]), [HAPPY=0])
|
OMPI_LOG_COMMAND([./conftest], [HAPPY=1], [HAPPY=0]), [HAPPY=0])
|
||||||
|
|
||||||
ompi_ac_int_kind=-1
|
ompi_ac_int_kind=-1
|
||||||
|
@ -36,7 +36,7 @@ EOF
|
|||||||
# Try the compilation and run.
|
# Try the compilation and run.
|
||||||
#
|
#
|
||||||
|
|
||||||
OMPI_LOG_COMMAND([$FC $FCFLAGS $FCFLAGS_f90 -o conftest conftestf.f90],
|
OMPI_LOG_COMMAND([$FC $FCFLAGS $FCFLAGS_f90 -o conftest conftestf.f90 $LDFLAGS $LIBS],
|
||||||
OMPI_LOG_COMMAND([./conftest], [HAPPY=1], [HAPPY=0]), [HAPPY=0])
|
OMPI_LOG_COMMAND([./conftest], [HAPPY=1], [HAPPY=0]), [HAPPY=0])
|
||||||
|
|
||||||
ompi_ac_precision=-1
|
ompi_ac_precision=-1
|
||||||
|
@ -36,7 +36,7 @@ EOF
|
|||||||
# Try the compilation and run.
|
# Try the compilation and run.
|
||||||
#
|
#
|
||||||
|
|
||||||
OMPI_LOG_COMMAND([$FC $FCFLAGS $FCFLAGS_f90 -o conftest conftestf.f90],
|
OMPI_LOG_COMMAND([$FC $FCFLAGS $FCFLAGS_f90 -o conftest conftestf.f90 $LDFLAGS $LIBS],
|
||||||
OMPI_LOG_COMMAND([./conftest], [HAPPY=1], [HAPPY=0]), [HAPPY=0])
|
OMPI_LOG_COMMAND([./conftest], [HAPPY=1], [HAPPY=0]), [HAPPY=0])
|
||||||
|
|
||||||
ompi_ac_range=-1
|
ompi_ac_range=-1
|
||||||
|
@ -89,7 +89,7 @@ EOF
|
|||||||
#
|
#
|
||||||
|
|
||||||
OMPI_LOG_COMMAND([$CC $CFLAGS -I. -c conftest.c],
|
OMPI_LOG_COMMAND([$CC $CFLAGS -I. -c conftest.c],
|
||||||
OMPI_LOG_COMMAND([$FC $FCFLAGS $FCFLAGS_f90 conftestf.f90 conftest.o -o conftest],
|
OMPI_LOG_COMMAND([$FC $FCFLAGS $FCFLAGS_f90 conftestf.f90 conftest.o -o conftest $LDFLAGS $LIBS],
|
||||||
OMPI_LOG_COMMAND([./conftest],[HAPPY=1],[HAPPY=0]),
|
OMPI_LOG_COMMAND([./conftest],[HAPPY=1],[HAPPY=0]),
|
||||||
[HAPPY=0]),
|
[HAPPY=0]),
|
||||||
[HAPPY=0])
|
[HAPPY=0])
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user