* Fix issue when a type existed but we didn't have a corresponding C type -
the failure wasn't being properly propogated up from ompi_find_type and resulting in bad #define values in ompi_config.h * Fix issue where we could emit illegal sh code if we were checking for a type with no corresponding C types listed. Thanks to Ralf for tracking this one down. * Fix a couple more messages to match all the others. This commit was SVN r8685.
Этот коммит содержится в:
родитель
48f82db838
Коммит
92aaaad611
@ -43,7 +43,7 @@ AC_DEFUN([OMPI_F77_CHECK], [
|
||||
if test "$OMPI_WANT_F77_BINDINGS" = "1"; then
|
||||
OMPI_F77_CHECK_TYPE([$1], [ofc_have_type=1], [ofc_have_type=0])
|
||||
else
|
||||
AC_MSG_CHECKING([if FORTRAN compiler supports $1])
|
||||
AC_MSG_CHECKING([if Fortran compiler supports $1])
|
||||
AC_MSG_RESULT([skipped])
|
||||
fi
|
||||
|
||||
@ -70,12 +70,11 @@ AC_DEFUN([OMPI_F77_CHECK], [
|
||||
else
|
||||
# Look for a corresponding C type (will abort by itself if the
|
||||
# type isn't found and we need it)
|
||||
if test "$3" != ""; then
|
||||
OMPI_FIND_TYPE([$1], [$3], [$2], [$ofc_type_size], [ofc_c_type])
|
||||
if test -z "$ofc_c_type"; then
|
||||
ofc_have_type=
|
||||
fi
|
||||
fi
|
||||
ofc_c_type=
|
||||
m4_ifval([$3], [OMPI_FIND_TYPE([$1], [$3], [$2], [$ofc_type_size], [ofc_c_type])
|
||||
if test -z "$ofc_c_type" ; then
|
||||
ofc_have_type=0
|
||||
fi])
|
||||
|
||||
# Get the alignment of the type
|
||||
if test "$ofc_have_type" = "1"; then
|
||||
|
@ -22,7 +22,7 @@ dnl
|
||||
AC_DEFUN([OMPI_F77_GET_ALIGNMENT],[
|
||||
AS_VAR_PUSHDEF([type_var], [ompi_cv_f77_alignment_$1])
|
||||
|
||||
AC_CACHE_CHECK([alignment of FORTRAN $1], type_var,
|
||||
AC_CACHE_CHECK([alignment of Fortran $1], type_var,
|
||||
[OMPI_F77_MAKE_C_FUNCTION([ompi_ac_align_fn], [align])
|
||||
# Fortran module
|
||||
cat > conftestf.f <<EOF
|
||||
|
@ -20,7 +20,7 @@ dnl
|
||||
AC_DEFUN([OMPI_F77_PURGE_UNSUPPORTED_KIND],[
|
||||
# Purge F77 types (such as INTEGER*16) that don't match exptected datatype size.
|
||||
# First arg is type, 2nd arg is config var to define.
|
||||
AC_MSG_CHECKING([whether FORTRAN $1 has expected size])
|
||||
AC_MSG_CHECKING([whether Fortran $1 has expected size])
|
||||
|
||||
val=`echo $1 | cut -f2 -d'*'`
|
||||
type=`echo $1 | cut -f1 -d'*'`
|
||||
|
@ -46,7 +46,11 @@ AC_DEFUN([OMPI_FIND_TYPE],[
|
||||
AS_IF([test "$oft_abort_on_fail" != "no"],
|
||||
[AC_MSG_ERROR([Cannot continue])])])
|
||||
|
||||
$5=AS_VAR_GET(type_var)
|
||||
if test "AS_VAR_GET(type_var)" = "not found" ; then
|
||||
$5=
|
||||
else
|
||||
$5=AS_VAR_GET(type_var)
|
||||
fi
|
||||
|
||||
unset oft_real_type oft_target_size
|
||||
|
||||
|
Загрузка…
Ссылка в новой задаче
Block a user