Resume tracking PMIx/PRRTE master branches

Update our calls to PMIX/PRRTE configure when using internal
versions of the packages to support more recent versions of
the packages.  Bump the pmix/prrte submodule pointers to
resume tracking their master branches.

Signed-off-by: Brian Barrett <bbarrett@amazon.com>

Author: bwbarrett

3rd-party/openpmix

@@ -147,7 +147,6 @@ AC_DEFUN([_OMPI_SETUP_PRRTE_INTERNAL], [
 
     internal_prrte_CPPFLAGS=
     internal_prrte_args="--with-proxy-version-string=$OPAL_VERSION --with-proxy-package-name=\"Open MPI\" --with-proxy-bugreport=\"https://www.open-mpi.org/community/help/\""
-    internal_prrte_libs=
 
     # Set --enable-prte-prefix-by-default to the deprecated options,
     # if they were specified.  Otherwise, set it to enabled if the
@@ -159,19 +158,19 @@ AC_DEFUN([_OMPI_SETUP_PRRTE_INTERNAL], [
               [internal_prrte_args="$internal_prrte_args --enable-prte-prefix-by-default"])
 
     AS_IF([test "$opal_libevent_mode" = "internal"],
-          [internal_prrte_args="$internal_prrte_args --with-libevent-header=$opal_libevent_header"
-           internal_prrte_CPPFLAGS="$internal_prrte_CPPFLAGS $opal_libevent_CPPFLAGS"
-           internal_prrte_libs="$internal_prrte_libs $opal_libevent_LIBS"])
+          [internal_prrte_args="$internal_prrte_args --with-libevent --disable-libevent-lib-checks"
+           internal_prrte_args="$internal_prrte_args --with-libevent-extra-libs=\"$opal_libevent_LIBS\""
+           internal_prrte_CPPFLAGS="$internal_prrte_CPPFLAGS $opal_libevent_CPPFLAGS"])
 
     AS_IF([test "$opal_hwloc_mode" = "internal"],
-          [internal_prrte_args="$internal_prrte_args --with-hwloc-header=$opal_hwloc_header"
-           internal_prrte_CPPFLAGS="$internal_prrte_CPPFLAGS $opal_hwloc_CPPFLAGS"
-           internal_prrte_libs="$internal_prrte_libs $opal_hwloc_LIBS"])
+          [internal_prrte_args="$internal_prrte_args --disable-hwloc-lib-checks"
+           internal_prrte_args="$internal_prrte_args --with-hwloc-extra-libs=\"$opal_hwloc_LIBS\""
+           internal_prrte_CPPFLAGS="$internal_prrte_CPPFLAGS $opal_hwloc_CPPFLAGS"])
 
     AS_IF([test "$opal_pmix_mode" = "internal"],
-          [internal_prrte_args="$internal_prrte_args --with-pmix-header=$opal_pmix_header"
-           internal_prrte_CPPFLAGS="$internal_prrte_CPPFLAGS $opal_pmix_CPPFLAGS"
-           internal_prrte_libs="$internal_prrte_libs $opal_pmix_LIBS"])
+          [internal_prrte_args="$internal_prrte_args --disable-pmix-lib-checks"
+           internal_prrte_args="$internal_prrte_args --with-pmix-extra-libs=\"$opal_pmix_LIBS\""
+           internal_prrte_CPPFLAGS="$internal_prrte_CPPFLAGS $opal_pmix_CPPFLAGS"])
 
     AC_MSG_CHECKING([if PMIx version is 4.0.0 or greater])
     AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <pmix_version.h>]],
@@ -190,8 +189,6 @@ AC_DEFUN([_OMPI_SETUP_PRRTE_INTERNAL], [
              AC_MSG_WARN([--without-prrte option.])
              AC_MSG_ERROR([Cannot continue])])
 
-    # add the extra libs
-    internal_prrte_args="$internal_prrte_args --with-prte-extra-lib=\"$internal_prrte_libs\" --with-prte-extra-ltlib=\"$internal_prrte_libs\""
     AS_IF([test "$with_ft" != "no"],
           [internal_prrte_args="--enable-prte-ft $internal_prrte_args"],
           [])

3rd-party/prrte

@@ -64,7 +64,7 @@ dnl         application when opal is built as a static library.
 dnl   * CPPFLAGS, LDFLAGS - Updated opal_pmix_CPPFLAGS and
 dnl         opal_pmix_LDFLAGS.
 AC_DEFUN([OPAL_CONFIG_PMIX], [
-    OPAL_VAR_SCOPE_PUSH([external_pmix_happy internal_pmix_happy internal_pmix_args internal_pmix_libs internal_pmix_CPPFLAGS])
+    OPAL_VAR_SCOPE_PUSH([external_pmix_happy internal_pmix_happy internal_pmix_args internal_pmix_wrapper_libs internal_pmix_CPPFLAGS])
 
     opal_show_subtitle "Configuring PMIx"
 
@@ -87,21 +87,20 @@ AC_DEFUN([OPAL_CONFIG_PMIX], [
 		# desired.
 
                 internal_pmix_args="--without-tests-examples --enable-pmix-binaries --disable-pmix-backward-compatibility --disable-visibility"
-                internal_pmix_libs=
+                internal_pmix_wrapper_libs=
                 internal_pmix_CPPFLAGS=
 
                 AS_IF([test "$opal_libevent_mode" = "internal"],
-                      [internal_pmix_args="$internal_pmix_args --with-libevent=cobuild"
-                       internal_pmix_CPPFLAGS="$internal_pmix_CPPFLAGS $opal_libevent_CPPFLAGS"
-                       internal_pmix_libs="$internal_pmix_libs $opal_libevent_LIBS"])
+                      [internal_pmix_args="$internal_pmix_args --with-libevent --disable-libevent-lib-checks"
+                       internal_pmix_args="$internal_pmix_args --with-libevent-extra-libs=\"$opal_libevent_LIBS\""
+                       internal_pmix_wrapper_libs="$internal_pmix_wrapper_libs \"$opal_libevent_WRAPPER_LIBS\""
+                       internal_pmix_CPPFLAGS="$internal_pmix_CPPFLAGS $opal_libevent_CPPFLAGS"])
 
                 AS_IF([test "$opal_hwloc_mode" = "internal"],
-                      [internal_pmix_args="$internal_pmix_args --with-hwloc=cobuild"
-                      internal_pmix_CPPFLAGS="$internal_pmix_CPPFLAGS $opal_hwloc_CPPFLAGS"
-                      internal_pmix_libs="$internal_pmix_libs $opal_hwloc_LIBS"])
-
-                AS_IF([test ! -z "$internal_pmix_libs"],
-                      [internal_pmix_args="$internal_pmix_args --with-pmix-extra-lib=\"$internal_pmix_libs\""])
+                      [internal_pmix_args="$internal_pmix_args --disable-hwloc-lib-checks"
+                       internal_pmix_args="$internal_pmix_args --with-hwloc-extra-libs=\"$opal_hwloc_LIBS\""
+                       internal_pmix_wrapper_libs="$internal_pmix_wrapper_libs \"$opal_hwloc_WRAPPER_LIBS\""
+                       internal_pmix_CPPFLAGS="$internal_pmix_CPPFLAGS $opal_hwloc_CPPFLAGS"])
 
                 if test "$WANT_DEBUG" = "1"; then
                      internal_pmix_args="$internal_pmix_args --enable-debug"
@@ -114,6 +113,8 @@ AC_DEFUN([OPAL_CONFIG_PMIX], [
                 OPAL_SUBDIR_ENV_CLEAN([opal_pmix_configure])
                 AS_IF([test -n "$internal_pmix_CPPFLAGS"],
                       [OPAL_SUBDIR_ENV_APPEND([CPPFLAGS], [$internal_pmix_CPPFLAGS])])
+                AS_IF([test -n "$internal_pmix_wrapper_libs"],
+                      [inernal_pmix_args="$internal_pmix_args --with-wrapper-libs=\"$internal_pmix_wrapper_libs\""])
                 PAC_CONFIG_SUBDIR_ARGS([3rd-party/openpmix], [$internal_pmix_args],
                                        [[--with-libevent=internal], [--with-hwloc=internal],
                                         [--with-libevent=external], [--with-hwloc=external],