Skip to content

Commit f3d3633

Browse files
committed
configury: fix autogen-sh --no-ompi
This fixes a regression from dc5adc5 Fortran is only required by ompi, so m4_ifdef([project_ompi],...) protect Fortran related stuff in opal Fixes #1884
1 parent 40f71f2 commit f3d3633

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

config/opal_setup_wrappers.m4

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,7 @@ AC_DEFUN([OPAL_SETUP_RUNPATH],[
231231
AC_MSG_RESULT([yes (-Wl,--enable-new-dtags)])],
232232
[AC_MSG_RESULT([no])])
233233
AC_LANG_POP([C])
234+
m4_ifdef([project_ompi],[
234235
# Output goes into globally-visible $rpath_args. Run this in a
235236
# sub-process so that we don't pollute the current process
236237
# environment.
@@ -268,7 +269,7 @@ EOF
268269
end program]])],
269270
[runpath_fc_args="${wl_fc}--enable-new-dtags"],
270271
[runpath_fc_args=""])
271-
AC_LANG_POP([Fortran])
272+
AC_LANG_POP([Fortran])])
272273
LDFLAGS=$LDFLAGS_save
273274

274275
OPAL_VAR_SCOPE_POP
@@ -301,7 +302,9 @@ AC_DEFUN([RPATHIFY_LDFLAGS_INTERNAL],[
301302

302303
AC_DEFUN([RPATHIFY_LDFLAGS],[RPATHIFY_LDFLAGS_INTERNAL([$1], [rpath_args], [runpath_args])])
303304

304-
AC_DEFUN([RPATHIFY_FC_LDFLAGS],[RPATHIFY_LDFLAGS_INTERNAL([$1], [rpath_fc_args], [runpath_fc_args])])
305+
m4_ifdef([project_ompi],
306+
[AC_DEFUN([RPATHIFY_FC_LDFLAGS],
307+
[RPATHIFY_LDFLAGS_INTERNAL([$1], [rpath_fc_args], [runpath_fc_args])])])
305308

306309

307310
dnl

0 commit comments

Comments
 (0)