1
1
This commit was SVN r30351.
Этот коммит содержится в:
Mike Dubman 2014-01-21 17:56:01 +00:00
родитель 9a2dc54311
Коммит 34b3718042
2 изменённых файлов: 3 добавлений и 8 удалений

Просмотреть файл

@ -93,7 +93,7 @@ AC_MSG_CHECKING([if want to build OSHMEM fortran bindings])
AC_ARG_ENABLE(oshmem-fortran, AC_ARG_ENABLE(oshmem-fortran,
AC_HELP_STRING([--enable-oshmem-fortran], AC_HELP_STRING([--enable-oshmem-fortran],
[enable OSHMEM Fortran bindings (default: enabled if Fortran compiler found)])) [enable OSHMEM Fortran bindings (default: enabled if Fortran compiler found)]))
if test "$enable_oshmem_fortran" != "no"; then if test "$enable_oshmem_fortran" != "no" -a "$ompi_fortran_happy" = 1; then
# If no OMPI FORTRAN, bail # If no OMPI FORTRAN, bail
AS_IF([test $OMPI_WANT_FORTRAN_BINDINGS -eq 0], AS_IF([test $OMPI_WANT_FORTRAN_BINDINGS -eq 0],
[AC_MSG_RESULT([bad value OMPI_WANT_FORTRAN_BINDINGS: ($OMPI_WANT_FORTRAN_BINDINGS)]) [AC_MSG_RESULT([bad value OMPI_WANT_FORTRAN_BINDINGS: ($OMPI_WANT_FORTRAN_BINDINGS)])
@ -107,9 +107,7 @@ else
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
OSHMEM_FORTRAN_BINDINGS=0 OSHMEM_FORTRAN_BINDINGS=0
fi fi
AM_CONDITIONAL(OSHMEM_WANT_FORTRAN_BINDINGS,
[test $OSHMEM_FORTRAN_BINDINGS -eq 1])
#
# We can't set am_conditional here since it's yet unknown if there is valid Fortran compiler avaliable
#
#
]) dnl ]) dnl

Просмотреть файл

@ -1273,9 +1273,6 @@ fi
# a C++ compiler. # a C++ compiler.
AS_IF([test "$OMPI_WANT_FORTRAN_BINDINGS" != "1"],[F77=no FC=no]) AS_IF([test "$OMPI_WANT_FORTRAN_BINDINGS" != "1"],[F77=no FC=no])
AM_CONDITIONAL(OSHMEM_WANT_FORTRAN_BINDINGS,
[test "$ompi_fortran_happy" == "1" -a "$OSHMEM_FORTRAN_BINDINGS" == "1"])
LT_CONFIG_LTDL_DIR([opal/libltdl], [subproject]) LT_CONFIG_LTDL_DIR([opal/libltdl], [subproject])
LTDL_CONVENIENCE LTDL_CONVENIENCE
LT_INIT([dlopen win32-dll]) LT_INIT([dlopen win32-dll])