Skip to content

Commit d512ca1

Browse files
Adding a configure option, --with-rte, to be named something more obvious to a packages/installer
Signed-off-by: Alexandria Sisk <a0sisk02@louisville.edu>
1 parent e9f654b commit d512ca1

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
@@ -58,17 +58,25 @@ OPAL_VAR_SCOPE_PUSH([prrte_setup_internal_happy target_rst_dir])
5858
AC_ARG_WITH([prrte],
5959
[AS_HELP_STRING([--with-prrte],
6060
[Enable/disable building with PRRTE. Supports 'yes' and 'no', defaulting to 'yes'])])
61+
62+
AC_ARG_WITH([rte],
63+
[AS_HELP_STRING([--with-rte],
64+
[Enable/disable building with RTE. Supports 'yes' and 'no', defaulting to 'yes'])])
65+
66+
# Checking if --with-prrte and --with-rte values differ.
67+
AS_IF([test -n "$with_prrte" -a -n "$with_rte" -a "$with_prrte" != "$with_rte"],
68+
AC_MSG_ERROR(['--with-prrte' and '--with-rte' are both defined but have differing values. Please specify one or the other.]))
69+
70+
# Setting --with-prrte to --with-rte's value to avoid duplicate code
71+
AS_IF([test -z "$with_prrte"],
72+
[with_prrte="$with_rte"])
6173
6274
# We only want to accept 'yes' or 'no' as args for --with-prrte.
6375
# If user does not specify, it defaults to 'yes'.
6476
# We no longer support external prrte builds.
6577
prrte_setup_internal_happy=0
6678
AS_IF([test "$with_prrte" != "yes" -a "$with_prrte" != "no" -a "$with_prrte" != ""],
67-
AC_MSG_ERROR(["--with-prrte option defaults to 'yes' and supports 'yes' or 'no'. External PRRTE builds are no longer supported.]))
68-
69-
AC_ARG_WITH([prrte-bindir],
70-
[AS_HELP_STRING([--with-prrte-bindir=DIR],
71-
[Search for PRRTE binaries in DIR. Defaults to PRRTE_DIR/bin if not specified])])
79+
AC_MSG_ERROR(['--with-prrte' option defaults to 'yes' and supports 'yes' or 'no'. External PRRTE builds are no longer supported.]))
7280
7381
# Determines if user wants to build with PRRTE.
7482
# Defaults to building with PRRTE if unspecified.

0 commit comments

Comments
 (0)