From 1edddbd07cb14b00395498b9334a98ad72150844 Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Sun, 25 Feb 2024 15:35:06 -0500 Subject: [PATCH] ompi_setup_prrte.m4: fix uninitialized shell variable Ensure that $OMPI_HAVE_PRRTE_RST is always defined to 0 or 1. Signed-off-by: Jeff Squyres (cherry picked from commit 1ea4cb85173f0b1f5dec1a1658a67cd02e7752c9) --- config/ompi_setup_prrte.m4 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/config/ompi_setup_prrte.m4 b/config/ompi_setup_prrte.m4 index 97eba7a1bd2..f690a749780 100644 --- a/config/ompi_setup_prrte.m4 +++ b/config/ompi_setup_prrte.m4 @@ -19,7 +19,7 @@ dnl Copyright (c) 2019-2020 Intel, Inc. All rights reserved. dnl Copyright (c) 2020-2022 Amazon.com, Inc. or its affiliates. All Rights reserved. dnl Copyright (c) 2021 Nanook Consulting. All rights reserved. dnl Copyright (c) 2021-2022 IBM Corporation. All rights reserved. -dnl Copyright (c) 2023 Jeffrey M. Squyres. All rights reserved. +dnl Copyright (c) 2023-2024 Jeffrey M. Squyres. All rights reserved. dnl $COPYRIGHT$ dnl dnl Additional copyrights may follow @@ -238,6 +238,7 @@ AC_DEFUN([_OMPI_SETUP_PRRTE_INTERNAL], [ AS_IF([test "$internal_prrte_happy" = "no" -a "$enable_internal_rte" != "no"], [AC_MSG_ERROR([PRRTE configuration failed. Cannot continue.])]) + OMPI_HAVE_PRRTE_RST=0 AS_IF([test "$internal_prrte_happy" = "yes"], [AC_MSG_CHECKING([for internal PRRTE RST files]) AS_IF([test -n "$SPHINX_BUILD"], @@ -310,6 +311,7 @@ AC_DEFUN([_OMPI_SETUP_PRRTE_EXTERNAL], [ AS_IF([test -n "${prterun_path}"], [AC_DEFINE_UNQUOTED([OMPI_PRTERUN_PATH], ["${prterun_path}"], [Path to prterun])]) + OMPI_HAVE_PRRTE_RST=0 AS_IF([test "$setup_prrte_external_happy" = "yes"], [ # Determine if this external PRRTE has installed the RST # directories that we care about @@ -327,7 +329,6 @@ AC_DEFUN([_OMPI_SETUP_PRRTE_EXTERNAL], [ [ # This version of PRRTE doesn't have installed RST # files. AC_MSG_RESULT([not found]) - OMPI_HAVE_PRRTE_RST=0 ]) ]) $1],