Use OPAL_3RDPARTY_WITH with PRRTE

Extend the OPAL_3RDPARTY_WITH code to support packages which can
be disabled (notably, PRRTE) and remove a bunch of duplicated
code in the PRRTE configure check.

Signed-off-by: Brian Barrett <bbarrett@amazon.com>
(cherry picked from commit 880ba67)

Author: bwbarrett

config/ompi_setup_prrte.m4

@@ -16,7 +16,7 @@ dnl Copyright (c) 2006-2007 Los Alamos National Security, LLC.  All rights
 dnl                         reserved.
 dnl Copyright (c) 2009      Oak Ridge National Labs.  All rights reserved.
 dnl Copyright (c) 2019-2020 Intel, Inc.  All rights reserved.
-dnl Copyright (c) 2020      Amazon.com, Inc. or its affiliates.
+dnl Copyright (c) 2020-2021 Amazon.com, Inc. or its affiliates.
 dnl                         All Rights reserved.
 dnl Copyright (c) 2021      Nanook Consulting.  All rights reserved.
 dnl Copyright (c) 2021      IBM Corporation.  All rights reserved.
@@ -43,40 +43,11 @@ AC_DEFUN([OMPI_SETUP_PRRTE],[
 
     opal_show_subtitle "Configuring PRRTE"
 
-    # Don't use OPAL_3RDPARTY_WITH because it will not allow packages
-    # to be disabled
-    m4_ifdef([package_prrte],
-        [AC_ARG_WITH([prrte],
-            [AS_HELP_STRING([--with-prrte(=DIR)],
-                           [Build PRTE support.  DIR can take one of four values: "internal", "external", "no", or a valid directory name.  "internal" forces Open MPI to use its internal copy of PRRTE.  "external" forces Open MPI to use an external installation of PRRTE.  Supplying a valid directory name also forces Open MPI to use an external installation of PRRTE, and adds DIR/include, DIR/lib, and DIR/lib64 to the search path for headers and libraries. If no argument is specified, Open MPI will search default locations for PRRTE and fall back to an internal version if one is not found.])])],
-        [AC_ARG_WITH([prrte],
-            [AS_HELP_STRING([--with-prrte(=DIR)],
-                           [Build PRRTE support.  DIR can take one of three values:  "external", "no", or a valid directory name.  "external" forces Open MPI to use an external installation of PRRTE.  Supplying a valid directory name also forces Open MPI to use an external installation of PRRTE, and adds DIR/include, DIR/lib, and DIR/lib64 to the search path for headers and libraries. If no argument is specified, Open MPI will search default locations for PRRTE and disable creating mpirun symlinks if one is not found.])])])
+    OPAL_3RDPARTY_WITH([prrte], [prrte], [package_prrte], [1])
 
     m4_ifdef([package_prrte],
          [OMPI_PRRTE_ADD_ARGS])
 
-    # clean up $with_prrte so that it contains only a path or empty
-    # string.  To determine internal or external preferences, use
-    # $opal_prrte_mode.
-    AS_IF([test "$with_prrte" = "yes"], [with_prrte=])
-    AS_CASE([$with_prrte],
-            ["internal"], [with_prrte=""
-                           opal_prrte_mode="internal"],
-            ["external"], [with_prrte=""
-                           opal_prrte_mode="external"],
-            [""], [opal_prrte_mode="unspecified"],
-            ["no"], [opal_prrte_mode="disabled"],
-            [opal_prrte_mode="external"])
-
-    echo "with_prrte: $with_prrte"
-    echo "opal_prrte_mode: $opal_prrte_mode"
-
-    m4_ifdef([package_prrte], [],
-             [AS_IF([test "$opal_prrte_mode" = "internal"],
-                    [AC_MSG_WARN([Invalid argument to --with-prrte: internal.])
-                     AC_MSG_ERROR([Cannot continue])])])
-
     prrte_setup_internal_happy=0
     m4_ifdef([package_prrte], [
          # always configure the internal prrte, so that

config/opal_config_3rdparty.m4

@@ -4,7 +4,7 @@ dnl Copyright (c) 2009-2018 Cisco Systems, Inc.  All rights reserved
 dnl Copyright (c) 2013      Los Alamos National Security, LLC.  All rights reserved.
 dnl Copyright (c) 2015-2018 Research Organization for Information Science
 dnl                         and Technology (RIST). All rights reserved.
-dnl Copyright (c) 2020      Amazon.com, Inc. or its affiliates.  All Rights
+dnl Copyright (c) 2020-2021 Amazon.com, Inc. or its affiliates.  All Rights
 dnl                         reserved.
 dnl $COPYRIGHT$
 dnl
@@ -13,44 +13,58 @@ dnl
 dnl $HEADER$
 dnl
 
-dnl OPAL_3RDPARTY_WITH(short package name, long package name, internal supported)
+dnl OPAL_3RDPARTY_WITH(short package name, long package name,
+dnl                    internal supported, disabled ok)
 dnl
 dnl Basic --with-pkg/--with-pkg-libdir handling for 3rd party
 dnl packages, with the big long description of internal/external/path
 dnl handling.
 dnl
 dnl At the end of this macro, with_pkg will contain an empty string or
-dnl a path (implying external).  Further, the shell variable opal_pkg_mode
-dnl will be set to "internal", "external", or "unspecified".  If a path is
-dnl given to --with-pkg, then opal_pkg_mode will be set to external.
+dnl a path (the later implying external).  Further, the shell variable
+dnl opal_pkg_mode will be set to "internal", "external",
+dnl "unspecified", or "disabled".  If a path is given to --with-pkg, then
+dnl opal_pkg_mode will be set to external.  If "internal supported" is
+dnl not defined, then opal_pkg_mode will not be internal.  If
+dnl "disabled ok" is not defined, then opal_pkg_mode will not be
+dnl "disabled".
 dnl
 dnl If m4_ifdef(internal support) does not evaluate to true (ie, at
 dnl autogen time), the references to internal in the help strings will
 dnl be removed and internal will not be a supported option.
 dnl
+dnl If m4_ifval(ddisbaled ok) does not evaluete to true (ie, at autogen
+dnl time), then --without-pkg will not be a valid configure option and
+dnl will raise an error.
+dnl
 dnl $1: short package name
 dnl $2: long pacakage name
 AC_DEFUN([OPAL_3RDPARTY_WITH], [
-    m4_ifdef([$3],
-        [AC_ARG_WITH([$1],
-            [AS_HELP_STRING([--with-$1(=DIR)],
-                           [Build $2 support.  DIR can take one of three values: "internal", "external", or a valid directory name.  "internal" forces Open MPI to use its internal copy of $2.  "external" forces Open MPI to use an external installation of $2.  Supplying a valid directory name also forces Open MPI to use an external installation of $2, and adds DIR/include, DIR/lib, and DIR/lib64 to the search path for headers and libraries. Note that Open MPI no longer supports --without-$1.  If no argument is specified, Open MPI will search default locations for $2 and fall back to an internal version if one is not found.])])
-
-         AC_ARG_WITH([$1-libdir],
-            [AS_HELP_STRING([--with-$1-libdir=DIR],
-             [Search for $2 libraries in DIR.  Should only be used if an external copy of $2 is being used.])])],
-        [AC_ARG_WITH([$1],
-            [AS_HELP_STRING([--with-$1(=DIR)],
-                           [Build $2 support.  DIR can take one of two values:  "external" or a valid directory name.  "external" forces Open MPI to use an external installation of $2.  Supplying a valid directory name also forces Open MPI to use an external installation of $2, and adds DIR/include, DIR/lib, and DIR/lib64 to the search path for headers and libraries. Note that Open MPI no longer supports --without-$1.  If no argument is specified, Open MPI will search default locations for $2 and error if one is not found.])])
+    m4_ifval([$4],
+        [m4_ifdef([$3],
+            [AC_ARG_WITH([$1],
+                [AS_HELP_STRING([--with-$1(=DIR)],
+                                [Build $2 support.  DIR can take one of four values: "internal", "external", "no", or a valid directory name.  "internal" forces Open MPI to use its internal copy of $2.  "external" forces Open MPI to use an external installation of $2.  Supplying a valid directory name also forces Open MPI to use an external installation of $2, and adds DIR/include, DIR/lib, and DIR/lib64 to the search path for headers and libraries. "no" means that Open MPI will not build components that require this package.  If no argument is specified, Open MPI will search default locations for $2 and fall back to an internal version if one is not found.])])],
+            [AC_ARG_WITH([$1],
+                [AS_HELP_STRING([--with-$1(=DIR)],
+                                [Build $2 support.  DIR can take one of three values: "external", "no", or a valid directory name.  "external" forces Open MPI to use an external installation of $2.  Supplying a valid directory name also forces Open MPI to use an external installation of $2, and adds DIR/include, DIR/lib, and DIR/lib64 to the search path for headers and libraries. "no" means that Open MPI will not build components that require this package.  If no argument is specified, Open MPI will search default locations for $2 and error if one is not found.])])])],
+        [m4_ifdef([$3],
+            [AC_ARG_WITH([$1],
+                [AS_HELP_STRING([--with-$1(=DIR)],
+                                [Build $2 support.  DIR can take one of three values: "internal", "external", or a valid directory name.  "internal" forces Open MPI to use its internal copy of $2.  "external" forces Open MPI to use an external installation of $2.  Supplying a valid directory name also forces Open MPI to use an external installation of $2, and adds DIR/include, DIR/lib, and DIR/lib64 to the search path for headers and libraries. Note that Open MPI no longer supports --without-$1.  If no argument is specified, Open MPI will search default locations for $2 and fall back to an internal version if one is not found.])])],
+            [AC_ARG_WITH([$1],
+                [AS_HELP_STRING([--with-$1(=DIR)],
+                                [Build $2 support.  DIR can take one of two values: "external" or a valid directory name.  "external" forces Open MPI to use an external installation of $2.  Supplying a valid directory name also forces Open MPI to use an external installation of $2, and adds DIR/include, DIR/lib, and DIR/lib64 to the search path for headers and libraries. Note that Open MPI no longer supports --without-$1.  If no argument is specified, Open MPI will search default locations for $2 and error if one is not found.])])])])
 
-         AC_ARG_WITH([$1-libdir],
-            [AS_HELP_STRING([--with-$1-libdir=DIR],
-             [Search for $2 libraries in DIR.  Should only be used if an external copy of $2 is being used.])])])
+    AC_ARG_WITH([$1-libdir],
+       [AS_HELP_STRING([--with-$1-libdir=DIR],
+           [Search for $2 libraries in DIR.  Should only be used if an external copy of $2 is being used.])])
 
     # Bozo check
-    AS_IF([test "$with_$1" = "no"],
-          [AC_MSG_WARN([It is not possible to configure Open MPI --without-$1])
-           AC_MSG_ERROR([Cannot continue])])
+    m4_ifval([$4], [],
+        [AS_IF([test "$with_$1" = "no"],
+               [AC_MSG_WARN([It is not possible to configure Open MPI --without-$1])
+                AC_MSG_ERROR([Cannot continue])])])
 
     AS_IF([test "$with_$1_libdir" = "no" -o "$with_$1_libdir" = "yes"],
           [AC_MSG_WARN([yes/no are invalid responses for --with-$1-libdir.  Please specify a path.])
@@ -73,6 +87,8 @@ AC_DEFUN([OPAL_3RDPARTY_WITH], [
                            opal_$1_mode="internal"],
             ["external"], [with_$1=""
                            opal_$1_mode="external"],
+            ["no"],       [with_$1=""
+                           opal_$1_mode="disabled"],
             [""], [opal_$1_mode="unspecified"],
             [opal_$1_mode="external"])