Refactored --with-prrte configure option to no longer support external PRRTE builds

Signed-off-by: Alexandria Sisk <[email protected]>

Author: alexandria-sisk

config/ompi_setup_prrte.m4

@@ -55,16 +55,34 @@ OPAL_VAR_SCOPE_PUSH([prrte_setup_internal_happy prrte_setup_external_happy targe
     rm -rf "$target_rst_dir/prrte-rst-content"
     rm -rf "$target_rst_dir/schizo-ompi-rst-content"
 
-    OPAL_3RDPARTY_WITH([prrte], [prrte], [package_prrte], [1])
+    AC_ARG_WITH([prrte],
+       [AS_HELP_STRING([--with-prrte],
+           [Enable/disable building with PRRTE. Supports 'yes' and 'no', defaulting to 'yes'])])
+
+    # We only want to accept 'yes' or 'no' as args for --with-prrte. 
+    # If user does not specify, it defaults to 'yes'.
+    # We no longer support external prrte builds.
+    AS_IF([test "$with_prrte" != "yes" -a "$with_prrte" != "no" -a "$with_prrte" != ""],
+         AC_MSG_ERROR(["--with-prrte option defaults to "yes" and supports 'yes' or 'no'. External PRRTE builds are no longer supported.]))
 
     AC_ARG_WITH([prrte-bindir],
        [AS_HELP_STRING([--with-prrte-bindir=DIR],
            [Search for PRRTE binaries in DIR.  Defaults to PRRTE_DIR/bin if not specified])])
-
-    prrte_setup_internal_happy=0
+    
+    # Determines if user wants to build with PRRTE. 
+    # Defaults to building with PRRTE if unspecified.
+    AS_CASE([$with_prrte],
+            ["yes"],      [prrte_setup_internal_happy=1
+                           opal_prrte_mode="internal"],
+            ["no"],       [prrte_setup_internal_happy=0
+                           opal_prrte_mode="disable"],
+            [""],         [prrte_setup_internal_happy=1
+                           opal_prrte_mode="internal"]
+            [opal_prrte_mode="internal"])
+    
     m4_ifdef([package_prrte],
         [OMPI_PRRTE_ADD_ARGS
-         AS_IF([test "$opal_prrte_mode" = "unspecified" -o "$opal_prrte_mode" = "internal"],
+         AS_IF([test "opal_prrte_mode" = "internal"],
                [# Run PRRTE's configure script unless the user
                 # explicitly asked us to use an external PMIX, so that
                 # "make dist" includes PRRTE in the dist tarball.  This
@@ -77,34 +95,16 @@ OPAL_VAR_SCOPE_PUSH([prrte_setup_internal_happy prrte_setup_external_happy targe
                 _OMPI_SETUP_PRRTE_INTERNAL([prrte_setup_internal_happy=1],
                                            [prrte_setup_internal_happy=0])])
 
-         # if we have a pmix package and configure did not complete
-         # successfully (or wasn't started), then disable make dist.
-         AS_IF([test $prrte_setup_internal_happy != 1],
-               [OPAL_MAKEDIST_DISABLE="$OPAL_MAKEDIST_DISABLE PRRTE"])])
-
-    # unless internal specifically requested by the user, try to find
-    # an external that works.
-    prrte_setup_external_happy=0
-    AS_IF([test "$opal_prrte_mode" != "internal" -o "$opal_prrte_mode" != "disabled"],
-          [_OMPI_SETUP_PRRTE_EXTERNAL(
-              [prrte_setup_external_happy=1
-               opal_prrte_mode="external"],
-              [AS_IF([test "$opal_prrte_mode" = "external"],
-                     [AC_MSG_ERROR([External PRRTE requested but not found.])])])])
-
-    # external did not work out and customer did not specify external,
-    # so try the internal version.
-    AS_IF([test "$prrte_setup_external_happy" = "0" -a "$prrte_setup_internal_happy" = "1"],
-          [opal_prrte_mode="internal"
-           OMPI_USING_INTERNAL_PRRTE=1
-           _OMPI_SETUP_PRRTE_INTERNAL_POST()],
-          [OMPI_USING_INTERNAL_PRRTE=0])
-
-    AS_IF([test "$opal_prrte_mode" != "disabled"],
-          [AS_IF([test "$prrte_setup_external_happy" = "0" -a "$prrte_setup_internal_happy" = "0"],
-                 [AC_MSG_ERROR([Could not find viable prrte build.])])
-           OMPI_HAVE_PRRTE=1],
-          [OMPI_HAVE_PRRTE=0])
+    # if we have a pmix package and configure did not complete
+    # successfully (or wasn't started), then disable make dist.
+    AS_IF([test $prrte_setup_internal_happy != 1],
+          [OPAL_MAKEDIST_DISABLE="$OPAL_MAKEDIST_DISABLE PRRTE"])])
+    
+    AS_IF([test "$prrte_setup_internal_happy" = "1"],
+          [OMPI_HAVE_PRRTE=1
+          OMPI_USING_INTERNAL_PRRTE=1],
+          [OMPI_HAVE_PRRTE=0
+          OMPI_USING_INTERNAL_PRRTE=0])
 
     AM_CONDITIONAL([OMPI_WANT_PRRTE],
            [test "$prrte_setup_internal_happy" = "1" -o "$prrte_setup_external_happy" = "1"])