Skip to content

Commit abd0536

Browse files
committed
build: Fix missing argument list in enable-mpi-ext
Because of some weird evaluation behaviors in AS_HELP_STRING, ompi_mpiext_list was not being expanded in the help string for --enable-mpi-ext. Fix the quoting so that the list appears again. Check that ompi_mpiext_list is defined before we use it. Signed-off-by: Brian Barrett <bbarrett@amazon.com> (cherry picked from commit 5470db0)
1 parent b58ad5e commit abd0536

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

config/ompi_ext.m4

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@ AC_DEFUN([OMPI_EXT],[
3434
dnl for OPAL_CONFIGURE_USER env variable
3535
AC_REQUIRE([OPAL_CONFIGURE_SETUP])
3636

37+
m4_ifdef([ompi_mpiext_list], [],
38+
[m4_fatal([Could not find MPI Extensions list. Aborting.])])
39+
3740
# Note that we do not build DSO's here -- we *only* build convenience
3841
# libraries that get slurped into higher-level libraries
3942
#
@@ -42,7 +45,7 @@ AC_DEFUN([OMPI_EXT],[
4245
#
4346
AC_ARG_ENABLE([mpi-ext],
4447
[AS_HELP_STRING([--enable-mpi-ext[=LIST]],
45-
[Comma-separated list of extensions that should be built. Possible values: ompi_mpiext_list. Example: "--enable-mpi-ext=foo,bar" will enable building the MPI extensions "foo" and "bar". If LIST is empty or the special value "all", then all available MPI extensions will be built (default: all).])])
48+
[Comma-separated list of extensions that should be built. Possible values: ]m4_quote(ompi_mpiext_list)[. Example: "--enable-mpi-ext=foo,bar" will enable building the MPI extensions "foo" and "bar". If LIST is empty or the special value "all", then all available MPI extensions will be built (default: all).])])
4649

4750
# print some nice messages about what we're about to do...
4851
AC_MSG_CHECKING([for available MPI Extensions])
@@ -74,9 +77,6 @@ AC_DEFUN([OMPI_EXT],[
7477
AC_MSG_RESULT([$msg])
7578
unset msg
7679

77-
m4_ifdef([ompi_mpiext_list], [],
78-
[m4_fatal([Could not find MPI Extensions list. Aborting.])])
79-
8080
EXT_CONFIGURE
8181
])
8282

0 commit comments

Comments
 (0)