Skip to content

Commit 5d1f8ba

Browse files
committed
config: allow internal for with-prrte option
per discussion at devel call today, allow for --with-prrte=internal (equivalent to --with-prrte=yes) for backwards compatibility with the 5.0.x releases. Signed-off-by: Howard Pritchard <[email protected]>
1 parent 761e2d7 commit 5d1f8ba

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

config/ompi_setup_prrte.m4

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ OPAL_VAR_SCOPE_PUSH([prrte_setup_internal_happy target_rst_dir])
5858
5959
AC_ARG_WITH([prrte],
6060
[AS_HELP_STRING([--with-prrte],
61-
[Enable/disable building with PRRTE. Supports 'yes' and 'no', defaulting to 'yes'])])
61+
[Enable/disable building with PRRTE. Supports 'yes', 'internal', and 'no', defaulting to 'yes'])])
6262
6363
AC_ARG_WITH([rte],
6464
[AS_HELP_STRING([--with-rte],
@@ -76,14 +76,16 @@ OPAL_VAR_SCOPE_PUSH([prrte_setup_internal_happy target_rst_dir])
7676
# If user does not specify, it defaults to 'yes'.
7777
# We no longer support external prrte builds.
7878
prrte_setup_internal_happy=0
79-
AS_IF([test "$with_prrte" != "yes" -a "$with_prrte" != "no" -a "$with_prrte" != ""],
80-
AC_MSG_ERROR(['--with-prrte' option defaults to 'yes' and supports 'yes' or 'no'. External PRRTE builds are no longer supported.]))
79+
AS_IF([test "$with_prrte" != "yes" -a "$with_prrte" != "no" -a "$with_prrte" != "" -a "$with_prrte" != "internal"],
80+
AC_MSG_ERROR(['--with-prrte' option defaults to 'yes' and supports 'yes', 'internal', or 'no'. Internal is equivalent to yes. External PRRTE builds are no longer supported.]))
8181
8282
# Determines if user wants to build with PRRTE.
8383
# Defaults to building with PRRTE if unspecified.
8484
AS_CASE([$with_prrte],
8585
["yes"], [prrte_setup_internal_happy=1
8686
opal_prrte_mode="internal"],
87+
["internal"], [prrte_setup_internal_happy=1
88+
opal_prrte_mode="internal"],
8789
["no"], [prrte_setup_internal_happy=0
8890
opal_prrte_mode="disabled"],
8991
[""], [prrte_setup_internal_happy=1

0 commit comments

Comments
 (0)