1
1

configury: fix autogen-sh --no-ompi

This fixes a regression from open-mpi/ompi@dc5adc5a91

Fortran is only required by ompi, so m4_ifdef([project_ompi],...) protect Fortran related stuff in opal

Fixes open-mpi/ompi#1884
Этот коммит содержится в:
Gilles Gouaillardet 2016-07-20 09:10:27 +09:00
родитель 40f71f2d7a
Коммит f3d3633e74

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

@ -231,6 +231,7 @@ AC_DEFUN([OPAL_SETUP_RUNPATH],[
AC_MSG_RESULT([yes (-Wl,--enable-new-dtags)])],
[AC_MSG_RESULT([no])])
AC_LANG_POP([C])
m4_ifdef([project_ompi],[
# Output goes into globally-visible $rpath_args. Run this in a
# sub-process so that we don't pollute the current process
# environment.
@ -268,7 +269,7 @@ EOF
end program]])],
[runpath_fc_args="${wl_fc}--enable-new-dtags"],
[runpath_fc_args=""])
AC_LANG_POP([Fortran])
AC_LANG_POP([Fortran])])
LDFLAGS=$LDFLAGS_save
OPAL_VAR_SCOPE_POP
@ -301,7 +302,9 @@ AC_DEFUN([RPATHIFY_LDFLAGS_INTERNAL],[
AC_DEFUN([RPATHIFY_LDFLAGS],[RPATHIFY_LDFLAGS_INTERNAL([$1], [rpath_args], [runpath_args])])
AC_DEFUN([RPATHIFY_FC_LDFLAGS],[RPATHIFY_LDFLAGS_INTERNAL([$1], [rpath_fc_args], [runpath_fc_args])])
m4_ifdef([project_ompi],
[AC_DEFUN([RPATHIFY_FC_LDFLAGS],
[RPATHIFY_LDFLAGS_INTERNAL([$1], [rpath_fc_args], [runpath_fc_args])])])
dnl