From 3a32c7d8b6db7e5378cf0d9c97d7abe6a765d1a3 Mon Sep 17 00:00:00 2001 From: Gilles Gouaillardet Date: Wed, 20 Jul 2016 09:10:27 +0900 Subject: [PATCH] configury: fix autogen-sh --no-ompi This fixes a regression from open-mpi/ompi@dc5adc5a91b4682a8e0de492350745eb01fa37d0 Fortran is only required by ompi, so m4_ifdef([project_ompi],...) protect Fortran related stuff in opal Fixes open-mpi/ompi#1884 --- config/opal_setup_wrappers.m4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/opal_setup_wrappers.m4 b/config/opal_setup_wrappers.m4 index 9b5052b5cc..61c1311aa3 100644 --- a/config/opal_setup_wrappers.m4 +++ b/config/opal_setup_wrappers.m4 @@ -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 @@ -303,7 +304,6 @@ AC_DEFUN([RPATHIFY_LDFLAGS],[RPATHIFY_LDFLAGS_INTERNAL([$1], [rpath_args], [runp AC_DEFUN([RPATHIFY_FC_LDFLAGS],[RPATHIFY_LDFLAGS_INTERNAL([$1], [rpath_fc_args], [runpath_fc_args])]) - dnl dnl Avoid some repetitive code below dnl