1
1

Fix bugs in both r27817 and r27821. For some reason, I removed the conditional

around OMPI_SETUP_MPI_FORTRAN in r27817 when removing the OPAL hacks for the
no-Fortran case.  Then r27821 worked around a build issue caused by
r27817 in a sub-optimal way.

This commit was SVN r27826.

The following SVN revision numbers were found above:
  r27817 --> open-mpi/ompi@fc3df11e08
  r27821 --> open-mpi/ompi@0ede5be003
Этот коммит содержится в:
Brian Barrett 2013-01-15 16:10:24 +00:00
родитель 0ede5be003
Коммит a25ccd98c9

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

@ -238,12 +238,7 @@ AC_SUBST(top_ompi_builddir)
OPAL_CONFIGURE_OPTIONS
m4_ifdef([project_orte], [ORTE_CONFIGURE_OPTIONS])
# The Fortran tests are still run, even if there's no OMPI project.
# So be sure to set a global variable (OMPI_WANT_FORTRAN_BINDINGS) to
# 0 if we have no OMPI project, which will make all the Fortran tests
# self-skip.
m4_ifdef([project_ompi], [OMPI_CONFIGURE_OPTIONS],
[OMPI_WANT_FORTRAN_BINDINGS=0])
m4_ifdef([project_ompi], [OMPI_CONFIGURE_OPTIONS])
if test "$enable_binaries" = "no" -a "$enable_dist" = "yes"; then
AC_MSG_WARN([--disable-binaries is incompatible with --enable dist])
@ -581,7 +576,7 @@ OPAL_CONFIG_ASM
# Fortran
##################################
OMPI_SETUP_MPI_FORTRAN
m4_ifdef([project_ompi], [OMPI_SETUP_MPI_FORTRAN])
# checkpoint results
AC_CACHE_SAVE