Skip to content

Commit 29cb25e

Browse files
alexandria-siskhppritcha
authored andcommitted
Adding a configure option, --with-rte, to be named something more obvious to a packages/installer
Signed-off-by: Alexandria Sisk <[email protected]>
1 parent e58f528 commit 29cb25e

File tree

1 file changed

+13
-5
lines changed

1 file changed

+13
-5
lines changed

config/ompi_setup_prrte.m4

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,17 +59,25 @@ OPAL_VAR_SCOPE_PUSH([prrte_setup_internal_happy target_rst_dir])
5959
AC_ARG_WITH([prrte],
6060
[AS_HELP_STRING([--with-prrte],
6161
[Enable/disable building with PRRTE. Supports 'yes' and 'no', defaulting to 'yes'])])
62+
63+
AC_ARG_WITH([rte],
64+
[AS_HELP_STRING([--with-rte],
65+
[Enable/disable building with RTE. Supports 'yes' and 'no', defaulting to 'yes'])])
66+
67+
# Checking if --with-prrte and --with-rte values differ.
68+
AS_IF([test -n "$with_prrte" -a -n "$with_rte" -a "$with_prrte" != "$with_rte"],
69+
AC_MSG_ERROR(['--with-prrte' and '--with-rte' are both defined but have differing values. Please specify one or the other.]))
70+
71+
# Setting --with-prrte to --with-rte's value to avoid duplicate code
72+
AS_IF([test -z "$with_prrte"],
73+
[with_prrte="$with_rte"])
6274
6375
# We only want to accept 'yes' or 'no' as args for --with-prrte.
6476
# If user does not specify, it defaults to 'yes'.
6577
# We no longer support external prrte builds.
6678
prrte_setup_internal_happy=0
6779
AS_IF([test "$with_prrte" != "yes" -a "$with_prrte" != "no" -a "$with_prrte" != ""],
68-
AC_MSG_ERROR(["--with-prrte option defaults to 'yes' and supports 'yes' or 'no'. External PRRTE builds are no longer supported.]))
69-
70-
AC_ARG_WITH([prrte-bindir],
71-
[AS_HELP_STRING([--with-prrte-bindir=DIR],
72-
[Search for PRRTE binaries in DIR. Defaults to PRRTE_DIR/bin if not specified])])
80+
AC_MSG_ERROR(['--with-prrte' option defaults to 'yes' and supports 'yes' or 'no'. External PRRTE builds are no longer supported.]))
7381
7482
# Determines if user wants to build with PRRTE.
7583
# Defaults to building with PRRTE if unspecified.

0 commit comments

Comments
 (0)