Skip to content

Commit 19a1837

Browse files
author
Ralph Castain
committed
Revert "configury: fix autogen-sh --no-ompi"
This reverts commit f3d3633.
1 parent 36a9063 commit 19a1837

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

config/opal_setup_wrappers.m4

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,6 @@ 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],[
235234
# Output goes into globally-visible $rpath_args. Run this in a
236235
# sub-process so that we don't pollute the current process
237236
# environment.
@@ -269,7 +268,7 @@ EOF
269268
end program]])],
270269
[runpath_fc_args="${wl_fc}--enable-new-dtags"],
271270
[runpath_fc_args=""])
272-
AC_LANG_POP([Fortran])])
271+
AC_LANG_POP([Fortran])
273272
LDFLAGS=$LDFLAGS_save
274273

275274
OPAL_VAR_SCOPE_POP
@@ -302,9 +301,7 @@ AC_DEFUN([RPATHIFY_LDFLAGS_INTERNAL],[
302301

303302
AC_DEFUN([RPATHIFY_LDFLAGS],[RPATHIFY_LDFLAGS_INTERNAL([$1], [rpath_args], [runpath_args])])
304303

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

309306

310307
dnl

0 commit comments

Comments
 (0)