diff --git a/Makefile.in b/Makefile.in
index 6295068870f55c0b9d5db074ad25d2eb1cfc89c3..722214414d0759a6cdf7c01693668abe24b2c9b1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -424,9 +424,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/NEWS b/NEWS
index a72d4f23222300c4ad0af7435e1c81f045c246d6..644068ad3791367aa90e4d516dbfda9e8834d639 100644
--- a/NEWS
+++ b/NEWS
@@ -81,6 +81,12 @@ documents those changes that are of interest to users and administrators.
  -- burst_buffer/cray: Requeue, but do not hold a job which fails the pre_run
     operation.
  -- Insure reported expected job start time is not in the past for pending jobs.
+ -- Add support for PMIx v2.
+ -- mpi/pmix: support for passing TMPDIR path through info key
+ -- Cray: update slurmconfgen_smw.py script to correctly identify service nodes
+    versus compute nodes.
+ -- FreeBSD - fix build issue in knl_cray plugin.
+ -- Corrections to gres.conf parsing logic.
 
 * Changes in Slurm 16.05.4
 ==========================
diff --git a/auxdir/Makefile.in b/auxdir/Makefile.in
index 9ec37d77dc548447037112beba22d59de9dd6ec9..8d173bdc777008941814cbb09e8f2043a8369792 100644
--- a/auxdir/Makefile.in
+++ b/auxdir/Makefile.in
@@ -304,9 +304,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/auxdir/x_ac_pmix.m4 b/auxdir/x_ac_pmix.m4
index 8fbf873d65ce0e8ddb2782e62034052e1e49d084..1fafcd4c6865724380b129d3149e334a94a94e55 100644
--- a/auxdir/x_ac_pmix.m4
+++ b/auxdir/x_ac_pmix.m4
@@ -14,10 +14,14 @@ AC_DEFUN([X_AC_PMIX],
   _x_ac_pmix_dirs="/usr /usr/local"
   _x_ac_pmix_libs="lib64 lib"
 
+  _x_ac_pmix_v1_found="0"
+  _x_ac_pmix_v2_found="0"
+
   AC_ARG_WITH(
     [pmix],
-    AS_HELP_STRING(--with-pmix=PATH,Specify path to pmix installation),
-    [AS_IF([test "x$with_pmix" != xno],[_x_ac_pmix_dirs="$with_pmix $_x_ac_pmix_dirs"])])
+    AS_HELP_STRING(--with-pmix=PATH,Specify path to pmix installation(s).  Multiple version directories can be ':' delimited.),
+    [AS_IF([test "x$with_pmix" != xno],[with_pmix=`echo $with_pmix | sed "s/:/ /"`
+      _x_ac_pmix_dirs="$with_pmix $_x_ac_pmix_dirs"])])
 
   if [test "x$with_pmix" = xno]; then
     AC_MSG_WARN([support for pmix disabled])
@@ -39,51 +43,73 @@ AC_DEFUN([X_AC_PMIX],
             LIBS="-L$d/$d1 -lpmix $LIBS"
             AC_LINK_IFELSE(
               [AC_LANG_CALL([], PMIx_Get_version)],
-              AS_VAR_SET(x_ac_cv_pmix_dir, $d))
+              AS_VAR_SET(x_ac_cv_pmix_dir, $d)
+              AS_VAR_SET(x_ac_cv_pmix_libdir, $d/$d1))
+
+            if [test -z "$x_ac_cv_pmix_dir"] ||
+               [test -z "$x_ac_cv_pmix_libdir"]; then
+              AC_MSG_WARN([unable to locate pmix installation])
+              continue
+            fi
+
+            _x_ac_pmix_version="0"
+            AC_PREPROC_IFELSE([AC_LANG_PROGRAM([
+              #include<pmix_server.h>
+              #if (PMIX_VERSION_MAJOR != 2L)
+                #error "not version 2"
+              #endif
+            ], [ ] )],
+            [ _x_ac_pmix_version="2" ], [ _x_ac_pmix_version="1" ] )
+
             CPPFLAGS="$_x_ac_pmix_cppflags_save"
             LIBS="$_x_ac_pmix_libs_save"
-            test -n "$x_ac_cv_pmix_dir" && break
+
+            m4_define([err_pmix],[was already found if one of the previous paths])
+
+            if [test "$_x_ac_pmix_version" = "1"]; then
+              if [test "$_x_ac_pmix_v1_found" = "1" ]; then
+                m4_define([err_pmix_v1],[error processing $x_ac_cv_pmix_libdir: PMIx v1.x])
+                AC_MSG_ERROR(err_pmix_v1 err_pmix)
+              fi
+
+              _x_ac_pmix_v1_found="1"
+              PMIX_V1_CPPFLAGS="-I$x_ac_cv_pmix_dir/include"
+              if test "$ac_with_rpath" = "yes"; then
+                PMIX_V1_LDFLAGS="-Wl,-rpath -Wl,$x_ac_cv_pmix_libdir -L$x_ac_cv_pmix_libdir"
+              else
+                PMIX_V1_LDFLAGS="-L$x_ac_cv_pmix_libdir"
+              fi
+            fi
+
+            if [test "$_x_ac_pmix_version" = "2"]; then
+              if [test "$_x_ac_pmix_v2_found" = "1" ]; then
+                m4_define([err_pmix_v2],[error processing $x_ac_cv_pmix_libdir: PMIx v2.x])
+                AC_MSG_ERROR(err_pmix_v2 err_pmix)
+              fi
+              _x_ac_pmix_v2_found="1"
+              PMIX_V2_CPPFLAGS="-I$x_ac_cv_pmix_dir/include"
+              if test "$ac_with_rpath" = "yes"; then
+                PMIX_V2_LDFLAGS="-Wl,-rpath -Wl,$x_ac_cv_pmix_libdir -L$x_ac_cv_pmix_libdir"
+              else
+                PMIX_V2_LDFLAGS="-L$x_ac_cv_pmix_libdir"
+              fi
+            fi
           done
-          test -n "$x_ac_cv_pmix_dir" && break
         done
       ])
 
-    if test -z "$x_ac_cv_pmix_dir"; then
-      AC_MSG_WARN([unable to locate pmix installation])
-    else
-      AC_CACHE_CHECK(
-        [for pmix library directory],
-        [x_ac_cv_pmix_libdir],
-        [
-          for d1 in $_x_ac_pmix_libs; do
-            d="$x_ac_cv_pmix_dir/$d1"
-            test -d "$d" || continue
-            _x_ac_pmix_cppflags_save="$CPPFLAGS"
-            CPPFLAGS="-I$x_ac_cv_pmix_dir/include $CPPFLAGS"
-            _x_ac_pmix_libs_save="$LIBS"
-            LIBS="-L$d -lpmix $LIBS"
-            AC_LINK_IFELSE(
-              [AC_LANG_CALL([], PMIx_Get_version)],
-              AS_VAR_SET(x_ac_cv_pmix_libdir, $d))
-            CPPFLAGS="$_x_ac_pmix_cppflags_save"
-            LIBS="$_x_ac_pmix_libs_save"
-            test -n "$x_ac_cv_pmix_libdir" && break
-          done
-        ])
-      PMIX_CPPFLAGS="-I$x_ac_cv_pmix_dir/include"
-      if test "$ac_with_rpath" = "yes"; then
-        PMIX_LDFLAGS="-Wl,-rpath -Wl,$x_ac_cv_pmix_libdir -L$x_ac_cv_pmix_libdir"
-      else
-        PMIX_LDFLAGS="-L$x_ac_cv_pmix_libdir"
-      fi
-      PMIX_LIBS="-lpmix"
-      AC_DEFINE(HAVE_PMIX, 1, [Define to 1 if pmix library found])
-    fi
+    PMIX_LIBS="-lpmix"
+    AC_DEFINE(HAVE_PMIX, 1, [Define to 1 if pmix library found])
 
     AC_SUBST(PMIX_LIBS)
-    AC_SUBST(PMIX_CPPFLAGS)
-    AC_SUBST(PMIX_LDFLAGS)
+    AC_SUBST(PMIX_V1_CPPFLAGS)
+    AC_SUBST(PMIX_V1_LDFLAGS)
+    AC_SUBST(PMIX_V2_CPPFLAGS)
+    AC_SUBST(PMIX_V2_LDFLAGS)
   fi
 
-  AM_CONDITIONAL(HAVE_PMIX, test -n "$x_ac_cv_pmix_dir")
+  AM_CONDITIONAL(HAVE_PMIX, [test $_x_ac_pmix_v1_found = "1"] &&
+                [test $_x_ac_pmix_v2_found = "1"])
+  AM_CONDITIONAL(HAVE_PMIX_V1, [test $_x_ac_pmix_v1_found = "1"])
+  AM_CONDITIONAL(HAVE_PMIX_V2, [test $_x_ac_pmix_v2_found = "1"])
 ])
diff --git a/configure b/configure
index ffc4093cb0f0f7ca8d907b10f033481cdf9aadc9..2fdf4c6a1c5f850f186f152e9abeae7e77c1f972 100755
--- a/configure
+++ b/configure
@@ -745,10 +745,16 @@ BUILD_IPMI_TRUE
 FREEIPMI_LDFLAGS
 FREEIPMI_CPPFLAGS
 FREEIPMI_LIBS
+HAVE_PMIX_V2_FALSE
+HAVE_PMIX_V2_TRUE
+HAVE_PMIX_V1_FALSE
+HAVE_PMIX_V1_TRUE
 HAVE_PMIX_FALSE
 HAVE_PMIX_TRUE
-PMIX_LDFLAGS
-PMIX_CPPFLAGS
+PMIX_V2_LDFLAGS
+PMIX_V2_CPPFLAGS
+PMIX_V1_LDFLAGS
+PMIX_V1_CPPFLAGS
 PMIX_LIBS
 HWLOC_LDFLAGS
 HWLOC_CPPFLAGS
@@ -1774,7 +1780,8 @@ Optional Packages:
                       /usr/local or /usr if not found in /usr/local]
    --without-lz4      to disable lz4 usage completely
   --with-hwloc=PATH       Specify path to hwloc installation
-  --with-pmix=PATH        Specify path to pmix installation
+  --with-pmix=PATH        Specify path to pmix installation(s). Multiple
+                          version directories can be ':' delimited.
   --with-freeipmi=PATH    Specify path to freeipmi installation
   --with-rrdtool=PATH     Specify path to rrdtool-devel installation
   --with-mysql_config=PATH
@@ -21428,11 +21435,15 @@ $as_echo "#define HAVE_HWLOC_PCI 1" >>confdefs.h
   _x_ac_pmix_dirs="/usr /usr/local"
   _x_ac_pmix_libs="lib64 lib"
 
+  _x_ac_pmix_v1_found="0"
+  _x_ac_pmix_v2_found="0"
+
 
 # Check whether --with-pmix was given.
 if test "${with_pmix+set}" = set; then :
   withval=$with_pmix; if test "x$with_pmix" != xno; then :
-  _x_ac_pmix_dirs="$with_pmix $_x_ac_pmix_dirs"
+  with_pmix=`echo $with_pmix | sed "s/:/ /"`
+      _x_ac_pmix_dirs="$with_pmix $_x_ac_pmix_dirs"
 fi
 fi
 
@@ -21478,86 +21489,96 @@ return PMIx_Get_version ();
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
   x_ac_cv_pmix_dir=$d
+              x_ac_cv_pmix_libdir=$d/$d1
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-            CPPFLAGS="$_x_ac_pmix_cppflags_save"
-            LIBS="$_x_ac_pmix_libs_save"
-            test -n "$x_ac_cv_pmix_dir" && break
-          done
-          test -n "$x_ac_cv_pmix_dir" && break
-        done
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $x_ac_cv_pmix_dir" >&5
-$as_echo "$x_ac_cv_pmix_dir" >&6; }
 
-    if test -z "$x_ac_cv_pmix_dir"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unable to locate pmix installation" >&5
+            if test -z "$x_ac_cv_pmix_dir" ||
+               test -z "$x_ac_cv_pmix_libdir"; then
+              { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unable to locate pmix installation" >&5
 $as_echo "$as_me: WARNING: unable to locate pmix installation" >&2;}
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pmix library directory" >&5
-$as_echo_n "checking for pmix library directory... " >&6; }
-if ${x_ac_cv_pmix_libdir+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+              continue
+            fi
 
-          for d1 in $_x_ac_pmix_libs; do
-            d="$x_ac_cv_pmix_dir/$d1"
-            test -d "$d" || continue
-            _x_ac_pmix_cppflags_save="$CPPFLAGS"
-            CPPFLAGS="-I$x_ac_cv_pmix_dir/include $CPPFLAGS"
-            _x_ac_pmix_libs_save="$LIBS"
-            LIBS="-L$d -lpmix $LIBS"
+            _x_ac_pmix_version="0"
             cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char PMIx_Get_version ();
+              #include<pmix_server.h>
+              #if (PMIX_VERSION_MAJOR != 2L)
+                #error "not version 2"
+              #endif
+
 int
 main ()
 {
-return PMIx_Get_version ();
+
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  x_ac_cv_pmix_libdir=$d
+if ac_fn_c_try_cpp "$LINENO"; then :
+   _x_ac_pmix_version="2"
+else
+   _x_ac_pmix_version="1"
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
+
             CPPFLAGS="$_x_ac_pmix_cppflags_save"
             LIBS="$_x_ac_pmix_libs_save"
-            test -n "$x_ac_cv_pmix_libdir" && break
+
+
+
+            if test "$_x_ac_pmix_version" = "1"; then
+              if test "$_x_ac_pmix_v1_found" = "1" ; then
+
+                as_fn_error $? "error processing $x_ac_cv_pmix_libdir: PMIx v1.x was already found if one of the previous paths" "$LINENO" 5
+              fi
+
+              _x_ac_pmix_v1_found="1"
+              PMIX_V1_CPPFLAGS="-I$x_ac_cv_pmix_dir/include"
+              if test "$ac_with_rpath" = "yes"; then
+                PMIX_V1_LDFLAGS="-Wl,-rpath -Wl,$x_ac_cv_pmix_libdir -L$x_ac_cv_pmix_libdir"
+              else
+                PMIX_V1_LDFLAGS="-L$x_ac_cv_pmix_libdir"
+              fi
+            fi
+
+            if test "$_x_ac_pmix_version" = "2"; then
+              if test "$_x_ac_pmix_v2_found" = "1" ; then
+
+                as_fn_error $? "error processing $x_ac_cv_pmix_libdir: PMIx v2.x was already found if one of the previous paths" "$LINENO" 5
+              fi
+              _x_ac_pmix_v2_found="1"
+              PMIX_V2_CPPFLAGS="-I$x_ac_cv_pmix_dir/include"
+              if test "$ac_with_rpath" = "yes"; then
+                PMIX_V2_LDFLAGS="-Wl,-rpath -Wl,$x_ac_cv_pmix_libdir -L$x_ac_cv_pmix_libdir"
+              else
+                PMIX_V2_LDFLAGS="-L$x_ac_cv_pmix_libdir"
+              fi
+            fi
           done
+        done
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $x_ac_cv_pmix_libdir" >&5
-$as_echo "$x_ac_cv_pmix_libdir" >&6; }
-      PMIX_CPPFLAGS="-I$x_ac_cv_pmix_dir/include"
-      if test "$ac_with_rpath" = "yes"; then
-        PMIX_LDFLAGS="-Wl,-rpath -Wl,$x_ac_cv_pmix_libdir -L$x_ac_cv_pmix_libdir"
-      else
-        PMIX_LDFLAGS="-L$x_ac_cv_pmix_libdir"
-      fi
-      PMIX_LIBS="-lpmix"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $x_ac_cv_pmix_dir" >&5
+$as_echo "$x_ac_cv_pmix_dir" >&6; }
+
+    PMIX_LIBS="-lpmix"
 
 $as_echo "#define HAVE_PMIX 1" >>confdefs.h
 
-    fi
+
+
 
 
 
 
   fi
 
-   if test -n "$x_ac_cv_pmix_dir"; then
+   if test $_x_ac_pmix_v1_found = "1" &&
+                test $_x_ac_pmix_v2_found = "1"; then
   HAVE_PMIX_TRUE=
   HAVE_PMIX_FALSE='#'
 else
@@ -21565,6 +21586,22 @@ else
   HAVE_PMIX_FALSE=
 fi
 
+   if test $_x_ac_pmix_v1_found = "1"; then
+  HAVE_PMIX_V1_TRUE=
+  HAVE_PMIX_V1_FALSE='#'
+else
+  HAVE_PMIX_V1_TRUE='#'
+  HAVE_PMIX_V1_FALSE=
+fi
+
+   if test $_x_ac_pmix_v2_found = "1"; then
+  HAVE_PMIX_V2_TRUE=
+  HAVE_PMIX_V2_FALSE='#'
+else
+  HAVE_PMIX_V2_TRUE='#'
+  HAVE_PMIX_V2_FALSE=
+fi
+
 
 
   _x_ac_freeipmi_dirs="/usr /usr/local"
@@ -25621,6 +25658,14 @@ if test -z "${HAVE_PMIX_TRUE}" && test -z "${HAVE_PMIX_FALSE}"; then
   as_fn_error $? "conditional \"HAVE_PMIX\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${HAVE_PMIX_V1_TRUE}" && test -z "${HAVE_PMIX_V1_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_PMIX_V1\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAVE_PMIX_V2_TRUE}" && test -z "${HAVE_PMIX_V2_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_PMIX_V2\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${BUILD_IPMI_TRUE}" && test -z "${BUILD_IPMI_FALSE}"; then
   as_fn_error $? "conditional \"BUILD_IPMI\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
diff --git a/contribs/Makefile.in b/contribs/Makefile.in
index 5c2ec2f22efcb082626a95687283d4173a891f50..ab7c4e65b78e84b39db29ab3087a3e47fbbd4fac 100644
--- a/contribs/Makefile.in
+++ b/contribs/Makefile.in
@@ -363,9 +363,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/contribs/cray/Makefile.in b/contribs/cray/Makefile.in
index 639627cade3560818280da1e2a42ae4de231946d..0b130534632032bbd647cb7ea5d96f69a43133cb 100644
--- a/contribs/cray/Makefile.in
+++ b/contribs/cray/Makefile.in
@@ -452,9 +452,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/contribs/cray/csm/Makefile.in b/contribs/cray/csm/Makefile.in
index 5806aee28764c712310c19e39b4c13f0f8b44d72..aabb9a571f1cf8dc57f0a704de64e2e5d038b5fc 100644
--- a/contribs/cray/csm/Makefile.in
+++ b/contribs/cray/csm/Makefile.in
@@ -307,9 +307,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/contribs/cray/csm/slurmconfgen_smw.py b/contribs/cray/csm/slurmconfgen_smw.py
index 7ae670a6e8b6839d6a62a24163a32946322d353f..cf2bf56f826a455a89218c4ad4ea30185a0209e0 100644
--- a/contribs/cray/csm/slurmconfgen_smw.py
+++ b/contribs/cray/csm/slurmconfgen_smw.py
@@ -1,9 +1,11 @@
 #!/usr/bin/env python
 #
-# Copyright 2015 Cray Inc. All Rights Reserved
+# Copyright 2015-2016 Cray Inc. All Rights Reserved.
 """ A script to generate slurm.conf and gres.conf for a
     Cray system on the smw """
 
+from __future__ import print_function
+
 import argparse
 import os
 import re
@@ -65,22 +67,23 @@ def parse_args():
     return parser.parse_args()
 
 
-def get_repurposed_computes(partition):
-    """ Gets a list of repurposed compute nodes for the given partition. """
-    print 'Getting list of repurposed compute nodes...'
+def get_service_nodes(partition):
+    """ Gets a list of service nodes for the given partition. """
+    print('Getting list of service nodes...')
     try:
         xtcliout = subprocess.check_output(['/opt/cray/hss/default/bin/xtcli',
-                                            'status', '-m', partition],
+                                            'status', partition],
                                            stderr=subprocess.STDOUT)
-        repurposed = []
+        service = []
         for line in xtcliout.splitlines():
             cname = re.match(
                 r'\s*(c\d+-\d+c[0-2]s(?:\d|1[0-5])n[0-3]):\s+service',
                 line)
             if cname:
-                repurposed.append(cname.group(1))
+                service.append(cname.group(1))
 
-        return repurposed
+        print('Found {} service nodes.'.format(len(service)))
+        return service
     except subprocess.CalledProcessError:
         return []
 
@@ -95,7 +98,7 @@ def get_node(nodexml):
 
     # Skip disabled nodes
     if status != 'enabled':
-        print 'Skipping {} node {}'.format(status, cname)
+        print('Skipping {} node {}'.format(status, cname))
         return None
 
     cores = int(nodexml.find('cores').text)
@@ -121,8 +124,8 @@ def get_node(nodexml):
             mic += 1
             craynetwork = 2
         else:
-            print ('WARNING: accelerator type {0} unknown'
-                   .format(accelxml.text))
+            print('WARNING: accelerator type {0} unknown'
+                  .format(accelxml.text))
 
     node['Gres'] = [Gres('craynetwork', craynetwork)]
     if gpu > 0:
@@ -132,10 +135,10 @@ def get_node(nodexml):
     return node
 
 
-def get_inventory(partition, repurposed):
+def get_inventory(partition, service):
     """ Gets a hardware inventory for the given partition.
         Returns the node dictionary """
-    print 'Gathering hardware inventory...'
+    print('Gathering hardware inventory...')
     nodes = {}
 
     # Get an inventory and parse the XML
@@ -146,26 +149,16 @@ def get_inventory(partition, repurposed):
 
     # Loop through all modules
     for modulexml in inventoryxml.findall('module_list/module'):
-        # Skip service nodes
-        board_type = modulexml.find('board_type').text
-        if board_type == '10':
-            continue
-        elif board_type != '13':
-            print 'WARNING: board type {} unknown'.format(board_type)
-
         # Loop through nodes in this module
         for nodexml in modulexml.findall('node_list/node'):
             node = get_node(nodexml)
-            if node is None:
-                continue
-            if node['cname'] in repurposed:
-                print ('Skipping repurposed compute node {}'
-                       .format(node['cname']))
+            if node is None or node['cname'] in service:
                 continue
 
             # Add to output data structures
             nodes[node['nid']] = node
 
+    print('Found {} compute nodes.'.format(len(nodes)))
     return nodes
 
 
@@ -174,7 +167,7 @@ def compact_nodes(nodes):
     basenode = None
     toremove = []
 
-    print 'Compacting node configuration...'
+    print('Compacting node configuration...')
     for curnid in sorted(nodes):
         if basenode is None:
             basenode = nodes[curnid]
@@ -202,6 +195,8 @@ def compact_nodes(nodes):
     for nid in toremove:
         del nodes[nid]
 
+    print('Compacted into {} group(s).'.format(len(nodes)))
+
 
 def scale_mem(mem):
     """ Scale memory values back since available memory is
@@ -281,8 +276,8 @@ def main():
     args = parse_args()
 
     # Get info from cnode and xthwinv
-    repurposed = get_repurposed_computes(args.partition)
-    nodes = get_inventory(args.partition, repurposed)
+    service = get_service_nodes(args.partition)
+    nodes = get_inventory(args.partition, service)
     nodelist = rli_compress([int(nid) for nid in nodes])
     compact_nodes(nodes)
     defmem, maxmem = get_mem_per_cpu(nodes)
@@ -290,7 +285,7 @@ def main():
     # Write files from templates
     jinjaenv = Environment(loader=FileSystemLoader(args.templatedir))
     conffile = os.path.join(args.output, 'slurm.conf')
-    print 'Writing Slurm configuration to {0}...'.format(conffile)
+    print('Writing Slurm configuration to {0}...'.format(conffile))
     with open(conffile, 'w') as outfile:
         outfile.write(jinjaenv.get_template('slurm.conf.j2').render(
             script=sys.argv[0],
@@ -303,14 +298,14 @@ def main():
             nodelist=nodelist))
 
     gresfilename = os.path.join(args.output, 'gres.conf')
-    print 'Writing gres configuration to {0}...'.format(gresfilename)
+    print('Writing gres configuration to {0}...'.format(gresfilename))
     with open(gresfilename, 'w') as gresfile:
         gresfile.write(jinjaenv.get_template('gres.conf.j2').render(
             script=sys.argv[0],
             date=time.asctime(),
             nodes=nodes))
 
-    print 'Done.'
+    print('Done.')
 
 
 if __name__ == "__main__":
diff --git a/contribs/lua/Makefile.in b/contribs/lua/Makefile.in
index 9d8a5dda1bd3b13b27c444271831894650c6f41e..1307017ec65f076937a696f51cf9034e33af5653 100644
--- a/contribs/lua/Makefile.in
+++ b/contribs/lua/Makefile.in
@@ -303,9 +303,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/contribs/mic/Makefile.in b/contribs/mic/Makefile.in
index 0bb346810ded58287b3cbe29db525bc3206d344b..5ed3be291fdfdbae7888d8ed25d0b55fce4d13c8 100644
--- a/contribs/mic/Makefile.in
+++ b/contribs/mic/Makefile.in
@@ -303,9 +303,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/contribs/openlava/Makefile.in b/contribs/openlava/Makefile.in
index a7a6005eea5c7d6a3bbb4fc15313b9d4cfa1ce1e..ccec62bec3a00b57eb6e178d69d1bcef03095801 100644
--- a/contribs/openlava/Makefile.in
+++ b/contribs/openlava/Makefile.in
@@ -336,9 +336,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/contribs/pam/Makefile.in b/contribs/pam/Makefile.in
index 4a6d63a915f51d95c48837a4e32c88da5ff1df1a..b653b714be66469bfa87284d43cd4f710515d724 100644
--- a/contribs/pam/Makefile.in
+++ b/contribs/pam/Makefile.in
@@ -393,9 +393,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/contribs/pam_slurm_adopt/Makefile.in b/contribs/pam_slurm_adopt/Makefile.in
index b34a38c364c58c5eff133059fce292913285df62..3a5428629c5d02534a3b9eceb416c5e4a18b8912 100644
--- a/contribs/pam_slurm_adopt/Makefile.in
+++ b/contribs/pam_slurm_adopt/Makefile.in
@@ -397,9 +397,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/contribs/perlapi/Makefile.in b/contribs/perlapi/Makefile.in
index d601587e73f8ffc35250ce91f1b98eab822c88e6..65d7d63d4997e1ca3b1d0b8992c4eeaa50c4666e 100644
--- a/contribs/perlapi/Makefile.in
+++ b/contribs/perlapi/Makefile.in
@@ -363,9 +363,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/contribs/perlapi/libslurm/Makefile.in b/contribs/perlapi/libslurm/Makefile.in
index 9c470348b4f7ebdde62b6a6689d954166b59cee1..0e8154173b723fd42055d9161538a111d2b33dc1 100644
--- a/contribs/perlapi/libslurm/Makefile.in
+++ b/contribs/perlapi/libslurm/Makefile.in
@@ -303,9 +303,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/contribs/perlapi/libslurmdb/Makefile.in b/contribs/perlapi/libslurmdb/Makefile.in
index 8dffc7420a2d2873d2ccaf026efe68b0332a559f..d5f9733fcd261ec94b431485691a18ccf35cabed 100644
--- a/contribs/perlapi/libslurmdb/Makefile.in
+++ b/contribs/perlapi/libslurmdb/Makefile.in
@@ -303,9 +303,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/contribs/phpext/Makefile.in b/contribs/phpext/Makefile.in
index cc47aa71a6e99f8e2144446fa64f6132eea38953..f049361af8b62276446240efc5598575a84082e1 100644
--- a/contribs/phpext/Makefile.in
+++ b/contribs/phpext/Makefile.in
@@ -303,9 +303,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/contribs/pmi2/Makefile.in b/contribs/pmi2/Makefile.in
index 4d80d483f10996477b2d535fc419f942164b6ab9..ea894d4694bda9123b6543cc1cd85ddfac046bbd 100644
--- a/contribs/pmi2/Makefile.in
+++ b/contribs/pmi2/Makefile.in
@@ -390,9 +390,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/contribs/seff/Makefile.in b/contribs/seff/Makefile.in
index b2491bc85d0bec7e32684415d5083373113fa36f..164bbba7dc46ea721d9b1dff3ab77974b109c3ba 100644
--- a/contribs/seff/Makefile.in
+++ b/contribs/seff/Makefile.in
@@ -335,9 +335,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/contribs/sgather/Makefile.in b/contribs/sgather/Makefile.in
index b65d8bfa514790bd1156367938b21559741614db..45f03daa6d2ef71fe6df19c8473d4246ae362b4f 100644
--- a/contribs/sgather/Makefile.in
+++ b/contribs/sgather/Makefile.in
@@ -336,9 +336,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/contribs/sgi/Makefile.in b/contribs/sgi/Makefile.in
index 29dcc3475c6dd56d4eac9c2f2c58f879ea034ef2..de8dcffbe6bc76983ef8da76a0e588073b8c8f90 100644
--- a/contribs/sgi/Makefile.in
+++ b/contribs/sgi/Makefile.in
@@ -363,9 +363,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/contribs/sjobexit/Makefile.in b/contribs/sjobexit/Makefile.in
index aacbbb6033cb6ab7a48f319bc979c46fb7057728..2d2f9275c9190022af79696d75514544ed0332f5 100644
--- a/contribs/sjobexit/Makefile.in
+++ b/contribs/sjobexit/Makefile.in
@@ -336,9 +336,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/contribs/slurmdb-direct/Makefile.in b/contribs/slurmdb-direct/Makefile.in
index 533f9a6fdceec143eff1e6611e20223fe6e5637c..0d13c16f27761de6dd3265f9a8674cdcc84e92af 100644
--- a/contribs/slurmdb-direct/Makefile.in
+++ b/contribs/slurmdb-direct/Makefile.in
@@ -336,9 +336,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/contribs/torque/Makefile.in b/contribs/torque/Makefile.in
index a4ee904f57b921ebea82dbf1c8a73b81e915a55d..71593d8f53a36f2a5cc3241eaf0bc5b01a4c846c 100644
--- a/contribs/torque/Makefile.in
+++ b/contribs/torque/Makefile.in
@@ -336,9 +336,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/doc/Makefile.in b/doc/Makefile.in
index c8daea889561dde169f2ecc0568fbe961dd20964..70eb22d7093d1135c64bd6dc579cef2954373cba 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -363,9 +363,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/doc/html/Makefile.in b/doc/html/Makefile.in
index 5a15a6934233ea3445cfcded8b7ad1a4614119b4..66c210224c48d1d88831e584f3714a236b05d124 100644
--- a/doc/html/Makefile.in
+++ b/doc/html/Makefile.in
@@ -335,9 +335,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/doc/man/Makefile.in b/doc/man/Makefile.in
index 1e4848e1770f222b6fe91bf2670e1bf0c7e0b2fd..7786021fb0f0f11ae31e6008bb60199669a7fec1 100644
--- a/doc/man/Makefile.in
+++ b/doc/man/Makefile.in
@@ -363,9 +363,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/doc/man/man1/Makefile.in b/doc/man/man1/Makefile.in
index ec9911f8f228f99aa7c4bdc169087601cde1c5e7..3995d202c4f2d66565769913e6f444894f6d5b55 100644
--- a/doc/man/man1/Makefile.in
+++ b/doc/man/man1/Makefile.in
@@ -337,9 +337,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/doc/man/man3/Makefile.in b/doc/man/man3/Makefile.in
index 8d035fc8c2a752efbb556b4e9bdc75350b66d516..e26eeb6a3717a24fd293c1e4f99d02d04eef5cb4 100644
--- a/doc/man/man3/Makefile.in
+++ b/doc/man/man3/Makefile.in
@@ -334,9 +334,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/doc/man/man5/Makefile.in b/doc/man/man5/Makefile.in
index dab390bdc88439f193f02c343761d0e8b79ebad2..194479c71e0d748738bf9152fe9baab6ff9a0152 100644
--- a/doc/man/man5/Makefile.in
+++ b/doc/man/man5/Makefile.in
@@ -337,9 +337,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/doc/man/man8/Makefile.in b/doc/man/man8/Makefile.in
index d18b5eb2fc94c7785e2824e5ca2eb0dee1ed3aab..d35e62abef78ee084e99d4c8fc62062a8768b162 100644
--- a/doc/man/man8/Makefile.in
+++ b/doc/man/man8/Makefile.in
@@ -337,9 +337,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/etc/Makefile.in b/etc/Makefile.in
index fdfe3b5bde7b24aee6fa0b57ef06d660eef44645..2aa4d400092a9a2fd53f53c5b514e2e126542a0b 100644
--- a/etc/Makefile.in
+++ b/etc/Makefile.in
@@ -305,9 +305,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/Makefile.in b/src/Makefile.in
index f8a7f614094dad67ae07a719c26ca9aa029a3e87..2459fe9b3c38187767ba13b8ef18b39d3f2ddc5f 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -367,9 +367,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/api/Makefile.in b/src/api/Makefile.in
index c477582d1a0564b6303c8913c95a173ca271ffdf..05154e7696d0db52792650ac27e31843a26366bd 100644
--- a/src/api/Makefile.in
+++ b/src/api/Makefile.in
@@ -417,9 +417,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/bcast/Makefile.in b/src/bcast/Makefile.in
index d15467ed87972333d2dbf405f71e686e8aab905d..e186fe9360e8bd6895eac889436c868d9b917052 100644
--- a/src/bcast/Makefile.in
+++ b/src/bcast/Makefile.in
@@ -360,9 +360,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/common/Makefile.in b/src/common/Makefile.in
index 5463e08febcf47f8de8cf46be19d692b0381fb3b..d2a9d3a9ffaf981edccfbfb2ac80d933eef381ae 100644
--- a/src/common/Makefile.in
+++ b/src/common/Makefile.in
@@ -419,9 +419,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/common/gres.c b/src/common/gres.c
index 2ff3180c26999aa9980fcf6894862377fe590567..a3d40b30990ba8d6f2ad56ad2d62b7f64992f5e2 100644
--- a/src/common/gres.c
+++ b/src/common/gres.c
@@ -935,9 +935,8 @@ static void _validate_config(slurm_gres_context_t *context_ptr)
 	list_iterator_destroy(iter);
 }
 
-extern int gres_plugin_node_config_devices_path(char **dev_path,
-						char **gres_name,
-						int array_len,
+extern int gres_plugin_node_config_devices_path(char ***dev_path,
+						char ***gres_name,
 						char *node_name)
 {
 	static s_p_options_t _gres_options[] = {
@@ -951,7 +950,10 @@ extern int gres_plugin_node_config_devices_path(char **dev_path,
 	struct stat config_stat;
 	s_p_hashtbl_t *tbl;
 	gres_slurmd_conf_t **gres_array;
-	char *gres_conf_file;
+	char *gres_conf_file, *slash, *root_path, *one_name;
+	char **local_gres = NULL, **local_dev = NULL;
+	int array_len = 0;
+	hostlist_t hl;
 
 	gres_plugin_init();
 	gres_conf_file = get_extra_conf_path("gres.conf");
@@ -970,39 +972,93 @@ extern int gres_plugin_node_config_devices_path(char **dev_path,
 	FREE_NULL_LIST(gres_conf_list);
 	gres_conf_list = list_create(_destroy_gres_slurmd_conf);
 	if (s_p_get_array((void ***) &gres_array, &count, "Name", tbl)) {
-		if (count > array_len) {
-			error("GRES device count exceeds array size (%d > %d)",
-			      count, array_len);
-			count = array_len;
-		}
 		for (i = 0; i < count; i++) {
-			if ((gres_array[i]) && (gres_array[i]->file)) {
-				dev_path[ret_count]  = gres_array[i]->file;
-				gres_name[ret_count] = gres_array[i]->name;
-				gres_array[i] = NULL;
-				ret_count++;
+			if (!gres_array[i] || !gres_array[i]->file)
+				continue;
+			root_path = xstrdup(gres_array[i]->file);
+			slash = strrchr(root_path, '/');
+			if (slash) {
+				hl = hostlist_create(slash + 1);
+				slash[1] = '\0';
+			} else {
+				hl = hostlist_create(root_path);
+				root_path[0] = '\0';
+			}
+			if (hl == NULL) {
+				error("can't parse gres.conf file record (%s)",
+				      gres_array[i]->file);
+			} else {
+				while ((one_name = hostlist_shift(hl))) {
+					if ((ret_count + 1) > array_len) {
+						array_len += 128;
+						local_dev = xrealloc(local_dev,
+								(sizeof(char *)
+								* array_len));
+						local_gres = xrealloc(
+								local_gres,
+								(sizeof(char *)
+								* array_len));
+					}
+					xstrfmtcat(local_dev[ret_count], "%s%s",
+						   root_path, one_name);
+					local_gres[ret_count] =
+						gres_array[i]->name;
+					ret_count++;
+					free(one_name);
+				}
+				hostlist_destroy(hl);
 			}
+			xfree(root_path);
+			gres_array[i] = NULL;
 		}
 	}
 	if (s_p_get_array((void ***) &gres_array, &count, "NodeName", tbl)) {
-		if ((ret_count + count) > array_len) {
-			error("GRES device count exceeds array size (%d > %d)",
-			      (ret_count + count), array_len);
-			count = array_len - count;
-		}
 		for (i = 0; i < count; i++) {
-			if ((gres_array[i]) && (gres_array[i]->file)) {
-				dev_path[ret_count]  = gres_array[i]->file;
-				gres_name[ret_count] = gres_array[i]->name;
-				gres_array[i] = NULL;
-				ret_count++;
+			if (!gres_array[i] || !gres_array[i]->file)
+				continue;
+			root_path = xstrdup(gres_array[i]->file);
+			slash = strrchr(root_path, '/');
+			if (slash) {
+				hl = hostlist_create(slash + 1);
+				slash[1] = '\0';
+			} else {
+				hl = hostlist_create(root_path);
+				root_path[0] = '\0';
+			}
+			if (hl == NULL) {
+				error("can't parse gres.conf file record (%s)",
+				      gres_array[i]->file);
+			} else {
+				while ((one_name = hostlist_shift(hl))) {
+					if ((ret_count + 1) > array_len) {
+						array_len += 128;
+						local_dev = xrealloc(local_dev,
+								(sizeof(char *)
+								* array_len));
+						local_gres = xrealloc(
+								local_gres,
+								(sizeof(char *)
+								* array_len));
+					}
+					xstrfmtcat(local_dev[ret_count], "%s%s",
+						   root_path, one_name);
+					local_gres[ret_count] =
+						gres_array[i]->name;
+					ret_count++;
+					free(one_name);
+				}
+				hostlist_destroy(hl);
 			}
+			xfree(root_path);
+			gres_array[i] = NULL;
 		}
 	}
 	s_p_hashtbl_destroy(tbl);
 	slurm_mutex_unlock(&gres_context_lock);
-
 	xfree(gres_conf_file);
+	*dev_path = local_dev;
+	*gres_name = local_gres;
+
 	return ret_count;
 }
 
@@ -4673,7 +4729,7 @@ extern void gres_plugin_job_state_log(List gres_list, uint32_t job_id)
 extern void gres_plugin_job_state_file(List gres_list, int *gres_bit_alloc,
 				       int *gres_count)
 {
-	int i, j, gres_cnt=0, len, p, found=0;
+	int i, j, gres_cnt = 0, len, p, found = 0;
 	ListIterator gres_iter;
 	gres_state_t *gres_ptr;
 	gres_job_state_t *gres_job_ptr;
@@ -4684,15 +4740,12 @@ extern void gres_plugin_job_state_file(List gres_list, int *gres_bit_alloc,
 
 	slurm_mutex_lock(&gres_context_lock);
 	gres_iter = list_iterator_create(gres_list);
-
-	for (j=0; j<gres_context_cnt; j++) {
+	for (j = 0; j < gres_context_cnt; j++) {
 		found = 0;
 		list_iterator_reset(gres_iter);
-		while ((gres_ptr = (gres_state_t *) list_next(gres_iter))){
-			if (gres_ptr->plugin_id !=
-			    gres_context[j].plugin_id ) {
+		while ((gres_ptr = (gres_state_t *) list_next(gres_iter))) {
+			if (gres_ptr->plugin_id != gres_context[j].plugin_id)
 				continue;
-			}
 			found = 1;
 			gres_job_ptr = (gres_job_state_t *) gres_ptr->gres_data;
 			if ((gres_job_ptr != NULL) &&
@@ -4700,7 +4753,7 @@ extern void gres_plugin_job_state_file(List gres_list, int *gres_bit_alloc,
 			    (gres_job_ptr->gres_bit_alloc != NULL) &&
 			    (gres_job_ptr->gres_bit_alloc[0] != NULL)) {
 			     	len = bit_size(gres_job_ptr->gres_bit_alloc[0]);
-				for (i=0; i<len; i++) {
+				for (i = 0; i < len; i++) {
 					if (!bit_test(gres_job_ptr->
 						      gres_bit_alloc[0], i))
 						gres_bit_alloc[gres_cnt] = 0;
@@ -4712,7 +4765,7 @@ extern void gres_plugin_job_state_file(List gres_list, int *gres_bit_alloc,
 			break;
 		}
 		if (found == 0) {
-			for (p=0; p<gres_count[j]; p++){
+			for (p = 0; p < gres_count[j]; p++) {
 				gres_bit_alloc[gres_cnt] = 0;
 				gres_cnt++;
 			}
diff --git a/src/common/gres.h b/src/common/gres.h
index 145ed07350e068b0225bb1a702952bff94a1b07d..87a78a929a857b23fbd2b9c307db0835e64a6710 100644
--- a/src/common/gres.h
+++ b/src/common/gres.h
@@ -211,13 +211,11 @@ extern int gres_plugin_node_config_pack(Buf buffer);
  * Return information about the configured gres devices on the node
  * OUT dev_path - the devices paths as written on gres.conf file
  * OUT gres_name - the names of the devices (ex. gpu, nic,..)
- * IN array_len - count of elements in dev_path and gres_name
  * IN node_name - Name of this compute node
- * OUT int - number of lines of gres.conf file
+ * OUT int - number of records in dev_path and gres_name
  */
-extern int gres_plugin_node_config_devices_path(char **dev_path,
-						char **gres_name,
-						int array_len,
+extern int gres_plugin_node_config_devices_path(char ***dev_path,
+						char ***gres_name,
 						char *node_name);
 
 /*
diff --git a/src/database/Makefile.in b/src/database/Makefile.in
index 95b504eb88b6784399027b00031d5ae2e7947468..78d5986a0d64d51f709c637ae93fd13119b59bf7 100644
--- a/src/database/Makefile.in
+++ b/src/database/Makefile.in
@@ -367,9 +367,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/db_api/Makefile.in b/src/db_api/Makefile.in
index 802ecec8381ae7c84ecdb224316ff58b8642df78..2f8d987532001f4a1cdc97f0f07939316f8dbd63 100644
--- a/src/db_api/Makefile.in
+++ b/src/db_api/Makefile.in
@@ -401,9 +401,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/layouts/Makefile.in b/src/layouts/Makefile.in
index 16dd2e09f5b7d5819bbd530f95db4759a8362218..3387158a52e444ffc5ac34894d21641af06ad164 100644
--- a/src/layouts/Makefile.in
+++ b/src/layouts/Makefile.in
@@ -365,9 +365,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/layouts/power/Makefile.in b/src/layouts/power/Makefile.in
index c186534d112f928724e20895fd2f0a1f3ffa2efd..04b6c590aa7ec945fa12b15f87e623545ec174bd 100644
--- a/src/layouts/power/Makefile.in
+++ b/src/layouts/power/Makefile.in
@@ -395,9 +395,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/layouts/unit/Makefile.in b/src/layouts/unit/Makefile.in
index aeef4382a2e9dbc3a6f7aa3a60dc75c4901c2d36..e365474256df71cb5e36fa1b224c0ee023775a43 100644
--- a/src/layouts/unit/Makefile.in
+++ b/src/layouts/unit/Makefile.in
@@ -385,9 +385,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/Makefile.in b/src/plugins/Makefile.in
index a573e751f6b244e0b603dd62b930b7b0a35fc59f..907b175dc76d059a77df927067aded54e4e8e6ac 100644
--- a/src/plugins/Makefile.in
+++ b/src/plugins/Makefile.in
@@ -363,9 +363,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/accounting_storage/Makefile.in b/src/plugins/accounting_storage/Makefile.in
index 743e25a981a6d7100322f726d988a3f48b81cc18..db3ec261bb6823535fd7d58e17fc951f5a1e7fe3 100644
--- a/src/plugins/accounting_storage/Makefile.in
+++ b/src/plugins/accounting_storage/Makefile.in
@@ -365,9 +365,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/accounting_storage/common/Makefile.in b/src/plugins/accounting_storage/common/Makefile.in
index 613a330df963ef4276b06fd299e7033caec98785..a74ec48b9023651a1756bdd9fdaffb8aa90a6b8a 100644
--- a/src/plugins/accounting_storage/common/Makefile.in
+++ b/src/plugins/accounting_storage/common/Makefile.in
@@ -355,9 +355,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/accounting_storage/filetxt/Makefile.in b/src/plugins/accounting_storage/filetxt/Makefile.in
index cb9db2fdac744ce1f1934895f8dcf0b19d89d90b..72e1b90f1a3a54ebc4f23e7444135f1c3f7c1011 100644
--- a/src/plugins/accounting_storage/filetxt/Makefile.in
+++ b/src/plugins/accounting_storage/filetxt/Makefile.in
@@ -388,9 +388,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/accounting_storage/mysql/Makefile.in b/src/plugins/accounting_storage/mysql/Makefile.in
index 39378d806e6fee15d266e67929e6869c7359296b..7715c94d12a52075d65a0e7100560d1ce24c9caa 100644
--- a/src/plugins/accounting_storage/mysql/Makefile.in
+++ b/src/plugins/accounting_storage/mysql/Makefile.in
@@ -448,9 +448,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/accounting_storage/none/Makefile.in b/src/plugins/accounting_storage/none/Makefile.in
index da68a0b202cd7d26768b95d92b9897fb69c5d9e2..532d4f987df680081a1795c47896e17b80c74ff4 100644
--- a/src/plugins/accounting_storage/none/Makefile.in
+++ b/src/plugins/accounting_storage/none/Makefile.in
@@ -387,9 +387,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/accounting_storage/slurmdbd/Makefile.in b/src/plugins/accounting_storage/slurmdbd/Makefile.in
index ad7a8d4362e10b47b22d43a91c711488b3edd99c..53258b08c72a95c6822bbb962a0eb86407566b4e 100644
--- a/src/plugins/accounting_storage/slurmdbd/Makefile.in
+++ b/src/plugins/accounting_storage/slurmdbd/Makefile.in
@@ -388,9 +388,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/acct_gather_energy/Makefile.in b/src/plugins/acct_gather_energy/Makefile.in
index 9fdd1d4f22adca58bbdc4c88f3b1438a7e1fe11b..ced8a881185b64a8f16a0df9af062a5f732f3373 100644
--- a/src/plugins/acct_gather_energy/Makefile.in
+++ b/src/plugins/acct_gather_energy/Makefile.in
@@ -365,9 +365,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/acct_gather_energy/cray/Makefile.in b/src/plugins/acct_gather_energy/cray/Makefile.in
index ee048d0f95cb88ad4bd2959767fd8d026701bb51..d4e8950f83729afd801038b1e7bf2a11de97e005 100644
--- a/src/plugins/acct_gather_energy/cray/Makefile.in
+++ b/src/plugins/acct_gather_energy/cray/Makefile.in
@@ -387,9 +387,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/acct_gather_energy/ibmaem/Makefile.in b/src/plugins/acct_gather_energy/ibmaem/Makefile.in
index 1cd228097ca029d1cef76cbfd51ca8cc56c38e9a..4187db2da7c63b68d86d22a2c635d6d4b3b81091 100644
--- a/src/plugins/acct_gather_energy/ibmaem/Makefile.in
+++ b/src/plugins/acct_gather_energy/ibmaem/Makefile.in
@@ -388,9 +388,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/acct_gather_energy/ipmi/Makefile.in b/src/plugins/acct_gather_energy/ipmi/Makefile.in
index c8e7922704214f99ed1256a6b12bd49e566f6f1d..088e0dfe5b134d23d3b102bd3a2c540d9561706d 100644
--- a/src/plugins/acct_gather_energy/ipmi/Makefile.in
+++ b/src/plugins/acct_gather_energy/ipmi/Makefile.in
@@ -404,9 +404,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/acct_gather_energy/none/Makefile.in b/src/plugins/acct_gather_energy/none/Makefile.in
index 6434ed733c14830d7977a499015e9e193a3f37b2..fe5753da2cb588073ab53a4f875528e23f8b2f44 100644
--- a/src/plugins/acct_gather_energy/none/Makefile.in
+++ b/src/plugins/acct_gather_energy/none/Makefile.in
@@ -387,9 +387,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/acct_gather_energy/rapl/Makefile.in b/src/plugins/acct_gather_energy/rapl/Makefile.in
index 2ce3d55baa160290104863bbb4ccbe12e8cecb13..18a5db0cb9549ad49893d705cbf39f6cbb017f64 100644
--- a/src/plugins/acct_gather_energy/rapl/Makefile.in
+++ b/src/plugins/acct_gather_energy/rapl/Makefile.in
@@ -387,9 +387,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/acct_gather_filesystem/Makefile.in b/src/plugins/acct_gather_filesystem/Makefile.in
index d5302f46a59a02945a5da45c043b06f9750750b1..fcb4465e96cd8993a2b49d85f5a8c426761d0a9e 100644
--- a/src/plugins/acct_gather_filesystem/Makefile.in
+++ b/src/plugins/acct_gather_filesystem/Makefile.in
@@ -365,9 +365,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/acct_gather_filesystem/lustre/Makefile.in b/src/plugins/acct_gather_filesystem/lustre/Makefile.in
index 4b2930965fff76eb1071ec015e8c7ffae6bd1499..8cdeacea3cd55e748da4814474d3bba710d89d83 100644
--- a/src/plugins/acct_gather_filesystem/lustre/Makefile.in
+++ b/src/plugins/acct_gather_filesystem/lustre/Makefile.in
@@ -391,9 +391,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/acct_gather_filesystem/none/Makefile.in b/src/plugins/acct_gather_filesystem/none/Makefile.in
index 6e7f6bbbec71d1fd56268fca69d89e13bddc5c60..8e3349ea99359b87a2630a76838bd8fe786daf57 100644
--- a/src/plugins/acct_gather_filesystem/none/Makefile.in
+++ b/src/plugins/acct_gather_filesystem/none/Makefile.in
@@ -388,9 +388,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/acct_gather_infiniband/Makefile.in b/src/plugins/acct_gather_infiniband/Makefile.in
index be1f8e18e95801f291b2ebcbbf07bee24b7cdfb7..6d05ff82bb82d7384bc06e6761d7a47038db5b9d 100644
--- a/src/plugins/acct_gather_infiniband/Makefile.in
+++ b/src/plugins/acct_gather_infiniband/Makefile.in
@@ -365,9 +365,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/acct_gather_infiniband/none/Makefile.in b/src/plugins/acct_gather_infiniband/none/Makefile.in
index 8be571f2c01c26f1be5e22033dfb6fd342f77e04..b1ae2d81616df8827ee212e3198b2487e2409790 100644
--- a/src/plugins/acct_gather_infiniband/none/Makefile.in
+++ b/src/plugins/acct_gather_infiniband/none/Makefile.in
@@ -388,9 +388,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/acct_gather_infiniband/ofed/Makefile.in b/src/plugins/acct_gather_infiniband/ofed/Makefile.in
index 8d5c9247842ffdbf40ec59db65c7ef74b28fa855..22b81f0402d13c5c22bf22661b7d2644e40a5767 100644
--- a/src/plugins/acct_gather_infiniband/ofed/Makefile.in
+++ b/src/plugins/acct_gather_infiniband/ofed/Makefile.in
@@ -400,9 +400,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/acct_gather_profile/Makefile.in b/src/plugins/acct_gather_profile/Makefile.in
index 71d7d28b77dee6481ee19e345dbe13cefae80ac2..22ffaeb0f2721f083490cf45a813dd7df2c7fc43 100644
--- a/src/plugins/acct_gather_profile/Makefile.in
+++ b/src/plugins/acct_gather_profile/Makefile.in
@@ -366,9 +366,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/acct_gather_profile/hdf5/Makefile.in b/src/plugins/acct_gather_profile/hdf5/Makefile.in
index d2826391f4f57989fe8c7c88753dc7ecb8092f0a..98fe7fd986ccbafa4c42fe669b0d91323301a43c 100644
--- a/src/plugins/acct_gather_profile/hdf5/Makefile.in
+++ b/src/plugins/acct_gather_profile/hdf5/Makefile.in
@@ -455,9 +455,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/acct_gather_profile/hdf5/sh5util/Makefile.in b/src/plugins/acct_gather_profile/hdf5/sh5util/Makefile.in
index 797d8fa1831d4e270acf4d1587f3b8e807f0cf9a..02285f9d288ac707eee16ab8ddad6210aa70fc58 100644
--- a/src/plugins/acct_gather_profile/hdf5/sh5util/Makefile.in
+++ b/src/plugins/acct_gather_profile/hdf5/sh5util/Makefile.in
@@ -410,9 +410,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/acct_gather_profile/hdf5/sh5util/libsh5util_old/Makefile.in b/src/plugins/acct_gather_profile/hdf5/sh5util/libsh5util_old/Makefile.in
index d897a8cd71faca172510f21512dd50a22e354162..cf170a0aaf02d9817d84427d453738b764112bd4 100644
--- a/src/plugins/acct_gather_profile/hdf5/sh5util/libsh5util_old/Makefile.in
+++ b/src/plugins/acct_gather_profile/hdf5/sh5util/libsh5util_old/Makefile.in
@@ -360,9 +360,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/acct_gather_profile/none/Makefile.in b/src/plugins/acct_gather_profile/none/Makefile.in
index cb9fe51f54ab91876d8e1e168859232669556c85..5a033a6996fd5f5bebff22cbbf324923cee90ab9 100644
--- a/src/plugins/acct_gather_profile/none/Makefile.in
+++ b/src/plugins/acct_gather_profile/none/Makefile.in
@@ -387,9 +387,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/auth/Makefile.in b/src/plugins/auth/Makefile.in
index 815c5225219bbd4d17beef2d553b4c991b3828a8..1dc526a38de0be0d9d3c2b44ff0d8884f91b20de 100644
--- a/src/plugins/auth/Makefile.in
+++ b/src/plugins/auth/Makefile.in
@@ -365,9 +365,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/auth/munge/Makefile.in b/src/plugins/auth/munge/Makefile.in
index 94822e13cc6a2eac341cef188f97035ab4f36f6d..88f179f000e12c44926936c3a6cc28ef9677e4fc 100644
--- a/src/plugins/auth/munge/Makefile.in
+++ b/src/plugins/auth/munge/Makefile.in
@@ -387,9 +387,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/auth/none/Makefile.in b/src/plugins/auth/none/Makefile.in
index b963ba4a18887a3bc8279521bb42b11e2043da73..8568c69204b354083645387afd85b295ae0109d6 100644
--- a/src/plugins/auth/none/Makefile.in
+++ b/src/plugins/auth/none/Makefile.in
@@ -385,9 +385,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/burst_buffer/Makefile.in b/src/plugins/burst_buffer/Makefile.in
index 735619d7926bdab8a40fa8ea2afa0ab163941a5c..3ed44c15528370f7fd408427d9f41d255d34ec8b 100644
--- a/src/plugins/burst_buffer/Makefile.in
+++ b/src/plugins/burst_buffer/Makefile.in
@@ -365,9 +365,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/burst_buffer/common/Makefile.in b/src/plugins/burst_buffer/common/Makefile.in
index 6e109ed2a76855755ba4ef8e7eac4eae5c0140f3..7a41cfa76e4466c6c4863871d18fe023c731f39f 100644
--- a/src/plugins/burst_buffer/common/Makefile.in
+++ b/src/plugins/burst_buffer/common/Makefile.in
@@ -355,9 +355,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/burst_buffer/cray/Makefile.in b/src/plugins/burst_buffer/cray/Makefile.in
index acf4e403bfa488f337b1de4ba6b433e1db3036a7..b876ddb94cd90e0d9092739a6cd35d2ffa8f969f 100644
--- a/src/plugins/burst_buffer/cray/Makefile.in
+++ b/src/plugins/burst_buffer/cray/Makefile.in
@@ -394,9 +394,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/burst_buffer/generic/Makefile.in b/src/plugins/burst_buffer/generic/Makefile.in
index e2879a55bf3b7a1a2b0b13a039fb513f63111645..da40c49ea0da59e3092fce5a6b27ab6fff6896c8 100644
--- a/src/plugins/burst_buffer/generic/Makefile.in
+++ b/src/plugins/burst_buffer/generic/Makefile.in
@@ -388,9 +388,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/checkpoint/Makefile.in b/src/plugins/checkpoint/Makefile.in
index 2771daa005930ebfcafe0931c44af9d4d7fa69f2..a49d015eb65a6ab0af21b8b24b402d703066ee8a 100644
--- a/src/plugins/checkpoint/Makefile.in
+++ b/src/plugins/checkpoint/Makefile.in
@@ -365,9 +365,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/checkpoint/blcr/Makefile.in b/src/plugins/checkpoint/blcr/Makefile.in
index fe44580046e14b19202e82d8e26bdf9bc19cf881..9f1362b19a7658198bbaf61fbeb4ddc2a8a099bf 100644
--- a/src/plugins/checkpoint/blcr/Makefile.in
+++ b/src/plugins/checkpoint/blcr/Makefile.in
@@ -397,9 +397,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/checkpoint/none/Makefile.in b/src/plugins/checkpoint/none/Makefile.in
index 6c599daa5c32d0dd5dd104318f0768cfae58cfd3..537e550f6deba77b8c4c5ba73e03b81ff76511b3 100644
--- a/src/plugins/checkpoint/none/Makefile.in
+++ b/src/plugins/checkpoint/none/Makefile.in
@@ -386,9 +386,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/checkpoint/ompi/Makefile.in b/src/plugins/checkpoint/ompi/Makefile.in
index 687959c51adbe1a308cce9af261c68cda981be01..290bfb5815627742257f45a53afa1bc49dcc27cf 100644
--- a/src/plugins/checkpoint/ompi/Makefile.in
+++ b/src/plugins/checkpoint/ompi/Makefile.in
@@ -386,9 +386,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/checkpoint/poe/Makefile.in b/src/plugins/checkpoint/poe/Makefile.in
index 1f99d487d9f4e1b151f714a067528827a5404a9c..42d62e51f8cfe9050fbff935e6f10928b2256c44 100644
--- a/src/plugins/checkpoint/poe/Makefile.in
+++ b/src/plugins/checkpoint/poe/Makefile.in
@@ -391,9 +391,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/core_spec/Makefile.in b/src/plugins/core_spec/Makefile.in
index ec8a5523eba1543e187459d6bc4daf5322cab7ba..f551454333eb2d7821f710f57fabe1ab17215fad 100644
--- a/src/plugins/core_spec/Makefile.in
+++ b/src/plugins/core_spec/Makefile.in
@@ -365,9 +365,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/core_spec/cray/Makefile.in b/src/plugins/core_spec/cray/Makefile.in
index 516d951efc970fcc8bf5cf29d90ff4176169143a..fdea18f54236f34983710dbad6bd1f5d37d17243 100644
--- a/src/plugins/core_spec/cray/Makefile.in
+++ b/src/plugins/core_spec/cray/Makefile.in
@@ -386,9 +386,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/core_spec/none/Makefile.in b/src/plugins/core_spec/none/Makefile.in
index 4f777745c36d38326954d92ff2e84facbe6c9461..7b922637a76f26e138a6aefb9064e1fcfd131a37 100644
--- a/src/plugins/core_spec/none/Makefile.in
+++ b/src/plugins/core_spec/none/Makefile.in
@@ -386,9 +386,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/crypto/Makefile.in b/src/plugins/crypto/Makefile.in
index 09a2270ab8cff232be5bb1b8a01e2b1db2038705..b9346f9e53884886918a5c8f127086cc1de3a137 100644
--- a/src/plugins/crypto/Makefile.in
+++ b/src/plugins/crypto/Makefile.in
@@ -365,9 +365,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/crypto/munge/Makefile.in b/src/plugins/crypto/munge/Makefile.in
index 4b4747e95446d210e11f07e889715650c7e4f6eb..77554e40f06d69589ee04df8592f8034f97834a8 100644
--- a/src/plugins/crypto/munge/Makefile.in
+++ b/src/plugins/crypto/munge/Makefile.in
@@ -388,9 +388,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/crypto/openssl/Makefile.in b/src/plugins/crypto/openssl/Makefile.in
index bc635eb95ef9dd53398805d0f63ffa598ee64734..81023fa703163c07afcd0f03877749a5c0a04ca4 100644
--- a/src/plugins/crypto/openssl/Makefile.in
+++ b/src/plugins/crypto/openssl/Makefile.in
@@ -393,9 +393,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/ext_sensors/Makefile.in b/src/plugins/ext_sensors/Makefile.in
index 599747ed261fe5196c092dd2c2f9877712fadd59..909f7f0dc525b85ca05c2e855af1d584489d19df 100644
--- a/src/plugins/ext_sensors/Makefile.in
+++ b/src/plugins/ext_sensors/Makefile.in
@@ -365,9 +365,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/ext_sensors/none/Makefile.in b/src/plugins/ext_sensors/none/Makefile.in
index 88e4b4eb4765a968dc7448790861efc3c8a116d5..eb822bde8559accae2e24a3c90bd803477763aa1 100644
--- a/src/plugins/ext_sensors/none/Makefile.in
+++ b/src/plugins/ext_sensors/none/Makefile.in
@@ -386,9 +386,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/ext_sensors/rrd/Makefile.in b/src/plugins/ext_sensors/rrd/Makefile.in
index c52a852b96f01d2dfcf6e04b906d57c26394c011..a0a5e6f841b8b17495cff772f6806d1a241fa4fa 100644
--- a/src/plugins/ext_sensors/rrd/Makefile.in
+++ b/src/plugins/ext_sensors/rrd/Makefile.in
@@ -395,9 +395,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/gres/Makefile.in b/src/plugins/gres/Makefile.in
index 8b325c448b25d0a5348fb944e989856614896867..fc04dd375164ad943c4259d67b4da50cd70ebfce 100644
--- a/src/plugins/gres/Makefile.in
+++ b/src/plugins/gres/Makefile.in
@@ -365,9 +365,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/gres/gpu/Makefile.in b/src/plugins/gres/gpu/Makefile.in
index dd1bbcd7d7913abfdc98e83941689787b5beb27d..66d869b964fdde54a3eed9f3e0c9c72867c00d3c 100644
--- a/src/plugins/gres/gpu/Makefile.in
+++ b/src/plugins/gres/gpu/Makefile.in
@@ -385,9 +385,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/gres/mic/Makefile.in b/src/plugins/gres/mic/Makefile.in
index 355f4b3fa47cf998ae5476136f0c153c93e73365..da9307f1fc5ac72f989ba6cd2a868f4f097169f9 100644
--- a/src/plugins/gres/mic/Makefile.in
+++ b/src/plugins/gres/mic/Makefile.in
@@ -385,9 +385,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/gres/nic/Makefile.in b/src/plugins/gres/nic/Makefile.in
index 22126287fe25106cfce0ebb87c6f3d63933b3352..66e8597368c603d33f96c76531860561d75f48d3 100644
--- a/src/plugins/gres/nic/Makefile.in
+++ b/src/plugins/gres/nic/Makefile.in
@@ -385,9 +385,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/job_container/Makefile.in b/src/plugins/job_container/Makefile.in
index 2b603427247b7d3f53d3e1237f511e6f95444931..0e3bb7fd8c02c6007e0901963957a6a2405f0626 100644
--- a/src/plugins/job_container/Makefile.in
+++ b/src/plugins/job_container/Makefile.in
@@ -365,9 +365,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/job_container/cncu/Makefile.in b/src/plugins/job_container/cncu/Makefile.in
index 3ffa364151069a0d57649c1c736cf412f02b50d7..f6fe146a4ca63b6013d98acb9af1259098c2cc80 100644
--- a/src/plugins/job_container/cncu/Makefile.in
+++ b/src/plugins/job_container/cncu/Makefile.in
@@ -386,9 +386,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/job_container/none/Makefile.in b/src/plugins/job_container/none/Makefile.in
index 9023dd0fb8349035c8a4ebc162ff464471c7632f..c7f818d07ad15466120b57d115bb91c479b73488 100644
--- a/src/plugins/job_container/none/Makefile.in
+++ b/src/plugins/job_container/none/Makefile.in
@@ -386,9 +386,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/job_submit/Makefile.in b/src/plugins/job_submit/Makefile.in
index f825c541ff10681e4a8417f588da4eb1c1f4987d..d82eb132e16eeea5d3365f5bbe2df8be7ee3bf6e 100644
--- a/src/plugins/job_submit/Makefile.in
+++ b/src/plugins/job_submit/Makefile.in
@@ -365,9 +365,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/job_submit/all_partitions/Makefile.in b/src/plugins/job_submit/all_partitions/Makefile.in
index 612a48da398d01e6d431b530a5e6d05929cde345..49c6d966f2e9fd184c33d1d9b76d605af84e00db 100644
--- a/src/plugins/job_submit/all_partitions/Makefile.in
+++ b/src/plugins/job_submit/all_partitions/Makefile.in
@@ -388,9 +388,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/job_submit/cray/Makefile.in b/src/plugins/job_submit/cray/Makefile.in
index c1e8c33add4b7b70aaed5ab4140248c7544d5797..0ecaf81ecc263dfcdfd69dd9894b9b0b72718c92 100644
--- a/src/plugins/job_submit/cray/Makefile.in
+++ b/src/plugins/job_submit/cray/Makefile.in
@@ -386,9 +386,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/job_submit/defaults/Makefile.in b/src/plugins/job_submit/defaults/Makefile.in
index e14f93f3cd076b85c9c50376b8c4529add38628b..71de0d6e869fe8c7730f24a4f10045e2c7766f58 100644
--- a/src/plugins/job_submit/defaults/Makefile.in
+++ b/src/plugins/job_submit/defaults/Makefile.in
@@ -386,9 +386,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/job_submit/logging/Makefile.in b/src/plugins/job_submit/logging/Makefile.in
index 48fe1a36a948bfea8bf14d125acce518c02421db..be87b4ef496505d22dae5a0d90e62bb09b46210c 100644
--- a/src/plugins/job_submit/logging/Makefile.in
+++ b/src/plugins/job_submit/logging/Makefile.in
@@ -386,9 +386,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/job_submit/lua/Makefile.in b/src/plugins/job_submit/lua/Makefile.in
index 2cb1947aa840f311b137e1de47aff55b19923f24..56a777a41c4bd79792c1f2f1ccc0887238c896d1 100644
--- a/src/plugins/job_submit/lua/Makefile.in
+++ b/src/plugins/job_submit/lua/Makefile.in
@@ -391,9 +391,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/job_submit/partition/Makefile.in b/src/plugins/job_submit/partition/Makefile.in
index b07e364ce0a6ac6266ddedda26ab96d2e4aed18e..406d1befc018f341d9bd98d16c6a421ad8f9c3d3 100644
--- a/src/plugins/job_submit/partition/Makefile.in
+++ b/src/plugins/job_submit/partition/Makefile.in
@@ -387,9 +387,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/job_submit/pbs/Makefile.in b/src/plugins/job_submit/pbs/Makefile.in
index 0d2017f7cab7d74ab47a84b96d1160029661cbdb..2baa7e0e612f7ffec30bd3e58dbd13b2c5505325 100644
--- a/src/plugins/job_submit/pbs/Makefile.in
+++ b/src/plugins/job_submit/pbs/Makefile.in
@@ -392,9 +392,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/job_submit/require_timelimit/Makefile.in b/src/plugins/job_submit/require_timelimit/Makefile.in
index cfe26faa2ad702e6394fc227b8087bd24c6623af..e32ba42f4d75506ae9debacb801dcc2b4e830aad 100644
--- a/src/plugins/job_submit/require_timelimit/Makefile.in
+++ b/src/plugins/job_submit/require_timelimit/Makefile.in
@@ -388,9 +388,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/job_submit/throttle/Makefile.in b/src/plugins/job_submit/throttle/Makefile.in
index 124930fdc094e1f240e8cc5b1e02520364c77717..2f59660d3bd30659e78c3a7d0c341427c9e73e15 100644
--- a/src/plugins/job_submit/throttle/Makefile.in
+++ b/src/plugins/job_submit/throttle/Makefile.in
@@ -386,9 +386,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/jobacct_gather/Makefile.in b/src/plugins/jobacct_gather/Makefile.in
index 1aaafef91f2be918d6cedd7bd6b21eb8d66bf026..009bd761842985e626813c807c6d8e57f29c9220 100644
--- a/src/plugins/jobacct_gather/Makefile.in
+++ b/src/plugins/jobacct_gather/Makefile.in
@@ -365,9 +365,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/jobacct_gather/cgroup/Makefile.in b/src/plugins/jobacct_gather/cgroup/Makefile.in
index 467a00ef2471726e88aec08060148bc9aedb252c..9025b1e3d96643b47128153d83cdaeb68d35f74f 100644
--- a/src/plugins/jobacct_gather/cgroup/Makefile.in
+++ b/src/plugins/jobacct_gather/cgroup/Makefile.in
@@ -390,9 +390,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/jobacct_gather/common/Makefile.in b/src/plugins/jobacct_gather/common/Makefile.in
index 6e1e4384d5362f914a281c8584b09cf54480d0d0..dc854467782b0d964a76d0672f3cae61a033b414 100644
--- a/src/plugins/jobacct_gather/common/Makefile.in
+++ b/src/plugins/jobacct_gather/common/Makefile.in
@@ -355,9 +355,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/jobacct_gather/linux/Makefile.in b/src/plugins/jobacct_gather/linux/Makefile.in
index a7f9af0e9f5d266b2ae76dde5862f4674aeafeca..649cf3f8ca3b6efe7742387c22b8378661dbc121 100644
--- a/src/plugins/jobacct_gather/linux/Makefile.in
+++ b/src/plugins/jobacct_gather/linux/Makefile.in
@@ -388,9 +388,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/jobacct_gather/none/Makefile.in b/src/plugins/jobacct_gather/none/Makefile.in
index 8483b682eb6e9ac157b528b522376fe32b92f520..158a711cacfbe71273efdd7da7e9c9e01875e9e7 100644
--- a/src/plugins/jobacct_gather/none/Makefile.in
+++ b/src/plugins/jobacct_gather/none/Makefile.in
@@ -386,9 +386,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/jobcomp/Makefile.in b/src/plugins/jobcomp/Makefile.in
index 12cfcfdffbd01d8752b3805ec0ecdca9cd2ded8d..3f069fe898389c9ffc2a44f9481981aac8e364f2 100644
--- a/src/plugins/jobcomp/Makefile.in
+++ b/src/plugins/jobcomp/Makefile.in
@@ -365,9 +365,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/jobcomp/elasticsearch/Makefile.in b/src/plugins/jobcomp/elasticsearch/Makefile.in
index 4b1dddc1dd130788314e94bc7821ce8d9a540333..8bb35cb0e935534b9b538293d096ffb497e54db3 100644
--- a/src/plugins/jobcomp/elasticsearch/Makefile.in
+++ b/src/plugins/jobcomp/elasticsearch/Makefile.in
@@ -398,9 +398,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/jobcomp/filetxt/Makefile.in b/src/plugins/jobcomp/filetxt/Makefile.in
index 3572f8fbda3bb0f843cce513204cb5d0662c50e1..1b9e4e58d97d19ada1c22951aa8da8c2058f6bc5 100644
--- a/src/plugins/jobcomp/filetxt/Makefile.in
+++ b/src/plugins/jobcomp/filetxt/Makefile.in
@@ -387,9 +387,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/jobcomp/mysql/Makefile.in b/src/plugins/jobcomp/mysql/Makefile.in
index afe3acb39023a0bb895cbb8897b3ae3ed8187822..87f27f5c497ad9f38e692e0f12f01ad33e158a14 100644
--- a/src/plugins/jobcomp/mysql/Makefile.in
+++ b/src/plugins/jobcomp/mysql/Makefile.in
@@ -397,9 +397,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/jobcomp/none/Makefile.in b/src/plugins/jobcomp/none/Makefile.in
index 7d27c23a2a57de6f57ab524b738a08f303ecc16d..5be9587e4187669f91c06a35654270fa9d617cfc 100644
--- a/src/plugins/jobcomp/none/Makefile.in
+++ b/src/plugins/jobcomp/none/Makefile.in
@@ -386,9 +386,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/jobcomp/script/Makefile.in b/src/plugins/jobcomp/script/Makefile.in
index 94da565520fd6e610f6a5cd33774b4cef8aac706..13288199e4f98386afb7ad00a7fbe9a13b6efe18 100644
--- a/src/plugins/jobcomp/script/Makefile.in
+++ b/src/plugins/jobcomp/script/Makefile.in
@@ -387,9 +387,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/launch/Makefile.in b/src/plugins/launch/Makefile.in
index 87a6e0bc91b95ae084938d4019e68600a3bc088d..5120dc65d5489644332fed825fe44d24196cf934 100644
--- a/src/plugins/launch/Makefile.in
+++ b/src/plugins/launch/Makefile.in
@@ -367,9 +367,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/launch/aprun/Makefile.in b/src/plugins/launch/aprun/Makefile.in
index 6097a6db4381e2504f262a30bdede12ec90fc260..121c93462d83a3165fa63b7bb5c6f433df10df3d 100644
--- a/src/plugins/launch/aprun/Makefile.in
+++ b/src/plugins/launch/aprun/Makefile.in
@@ -386,9 +386,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/launch/poe/Makefile.in b/src/plugins/launch/poe/Makefile.in
index a5a56c6f9d5df4f57b9673d3e65fe4e28a9e6178..09d99ca65d91b5c29b685a87a066fc017e81990c 100644
--- a/src/plugins/launch/poe/Makefile.in
+++ b/src/plugins/launch/poe/Makefile.in
@@ -385,9 +385,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/launch/runjob/Makefile.in b/src/plugins/launch/runjob/Makefile.in
index 46bf7c487b95080b0c563661d2cad457efa53aba..3839193d9db3546e668eb36c3a4bce55bd08f35d 100644
--- a/src/plugins/launch/runjob/Makefile.in
+++ b/src/plugins/launch/runjob/Makefile.in
@@ -408,9 +408,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/launch/slurm/Makefile.in b/src/plugins/launch/slurm/Makefile.in
index aaf0731dba87a5da264e7b067f1bbad7a27dbe88..4ec3a60699cb7fc2f00a180a6a3d586c45c0a313 100644
--- a/src/plugins/launch/slurm/Makefile.in
+++ b/src/plugins/launch/slurm/Makefile.in
@@ -386,9 +386,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/mcs/Makefile.in b/src/plugins/mcs/Makefile.in
index 2a2e1aa85497e069271bed9eed99287f2a2c775c..3080d35af6be50c2e860b3b80eb3a55fd044d8ff 100644
--- a/src/plugins/mcs/Makefile.in
+++ b/src/plugins/mcs/Makefile.in
@@ -365,9 +365,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/mcs/group/Makefile.in b/src/plugins/mcs/group/Makefile.in
index e6d527ca0e40978c1270187b58f8136de7290817..53eb578667342531624a7733ee71ddb71118b523 100644
--- a/src/plugins/mcs/group/Makefile.in
+++ b/src/plugins/mcs/group/Makefile.in
@@ -385,9 +385,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/mcs/none/Makefile.in b/src/plugins/mcs/none/Makefile.in
index b6413671a855f868f2ec000a730d8c07c44d1c62..ff3350d6df46f5102ff62c3fd98e013766441a01 100644
--- a/src/plugins/mcs/none/Makefile.in
+++ b/src/plugins/mcs/none/Makefile.in
@@ -385,9 +385,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/mcs/user/Makefile.in b/src/plugins/mcs/user/Makefile.in
index bbd5b8b8c8b2602e31cf96ae02536d2f429f56b0..1c757663fd73e80032d504e0433cda367e0f76c4 100644
--- a/src/plugins/mcs/user/Makefile.in
+++ b/src/plugins/mcs/user/Makefile.in
@@ -385,9 +385,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/mpi/Makefile.in b/src/plugins/mpi/Makefile.in
index 898be41f476facb5cdb15561dd4079754b89c2f6..bebd776515536e27b1af9dc6792e05e5f12f5227 100644
--- a/src/plugins/mpi/Makefile.in
+++ b/src/plugins/mpi/Makefile.in
@@ -367,9 +367,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/mpi/lam/Makefile.in b/src/plugins/mpi/lam/Makefile.in
index fc8b68c90c761dad478242d802dfad280b73d3fb..7e85a9219ba9460e3b52f33a539e2157e218ace1 100644
--- a/src/plugins/mpi/lam/Makefile.in
+++ b/src/plugins/mpi/lam/Makefile.in
@@ -385,9 +385,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/mpi/mpich1_p4/Makefile.in b/src/plugins/mpi/mpich1_p4/Makefile.in
index 8ce283404dc46db12fd105470e86a3696decab31..cea4429e47e2270453dd8affeb0bd080cdf4045c 100644
--- a/src/plugins/mpi/mpich1_p4/Makefile.in
+++ b/src/plugins/mpi/mpich1_p4/Makefile.in
@@ -386,9 +386,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/mpi/mpich1_shmem/Makefile.in b/src/plugins/mpi/mpich1_shmem/Makefile.in
index 9f0d7c7e2d04a7faf3c85887d6b2c2dd49598f24..90f55e640f2890b9071b61370f4b3fe6005312ae 100644
--- a/src/plugins/mpi/mpich1_shmem/Makefile.in
+++ b/src/plugins/mpi/mpich1_shmem/Makefile.in
@@ -386,9 +386,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/mpi/mpichgm/Makefile.in b/src/plugins/mpi/mpichgm/Makefile.in
index fec6ce5bb99249ee7ff837aaf208b8dc04e8bb23..3153ec9fa924dfe9fd748948cb35a7dbb5db6ad7 100644
--- a/src/plugins/mpi/mpichgm/Makefile.in
+++ b/src/plugins/mpi/mpichgm/Makefile.in
@@ -386,9 +386,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/mpi/mpichmx/Makefile.in b/src/plugins/mpi/mpichmx/Makefile.in
index 3a4e0785ce559f5a2c25f4253b1d9f0b82bb2064..e5a47046bfa0cdcc82e53ee34a1ca3e6dc5b055d 100644
--- a/src/plugins/mpi/mpichmx/Makefile.in
+++ b/src/plugins/mpi/mpichmx/Makefile.in
@@ -386,9 +386,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/mpi/mvapich/Makefile.in b/src/plugins/mpi/mvapich/Makefile.in
index 3832463156491da2a4eeef95debbe25f4a8e8b27..05e3e76bcc9a8de382a6e2eaa422ff2917f9945f 100644
--- a/src/plugins/mpi/mvapich/Makefile.in
+++ b/src/plugins/mpi/mvapich/Makefile.in
@@ -387,9 +387,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/mpi/none/Makefile.in b/src/plugins/mpi/none/Makefile.in
index 0da9d572adb47697ddf891c166a544ef9d720002..704752352390cb203e70d8cc7881d6781c71c704 100644
--- a/src/plugins/mpi/none/Makefile.in
+++ b/src/plugins/mpi/none/Makefile.in
@@ -385,9 +385,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/mpi/openmpi/Makefile.in b/src/plugins/mpi/openmpi/Makefile.in
index a9b944c629fe7567239c09e9a0e1db5757860e9f..c70f3da22ff9beed27e392b1781e13aa540357a3 100644
--- a/src/plugins/mpi/openmpi/Makefile.in
+++ b/src/plugins/mpi/openmpi/Makefile.in
@@ -386,9 +386,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/mpi/pmi2/Makefile.in b/src/plugins/mpi/pmi2/Makefile.in
index 47588e407fe6b5f712fb09cb7685cf0803d002ef..76df86af08ae96463171b4ccabd9b77aec101dfc 100644
--- a/src/plugins/mpi/pmi2/Makefile.in
+++ b/src/plugins/mpi/pmi2/Makefile.in
@@ -386,9 +386,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/mpi/pmix/Makefile.am b/src/plugins/mpi/pmix/Makefile.am
index 1824c992d47ede379138d4d3b1727373e38a9701..872ba726d7773d99347c156619aca482de610579 100644
--- a/src/plugins/mpi/pmix/Makefile.am
+++ b/src/plugins/mpi/pmix/Makefile.am
@@ -4,19 +4,60 @@ AUTOMAKE_OPTIONS = foreign
 
 PLUGIN_FLAGS = -module -avoid-version --export-dynamic
 
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common $(PMIX_CPPFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common
 
-pkglib_LTLIBRARIES = mpi_pmix.la 
-
-# OpenMPI MPI plugin.
-mpi_pmix_la_SOURCES = mpi_pmix.c pmixp_agent.c pmixp_client.c pmixp_coll.c pmixp_nspaces.c pmixp_info.c \
+pmix_src = mpi_pmix.c pmixp_agent.c pmixp_client.c pmixp_coll.c pmixp_nspaces.c pmixp_info.c \
 			pmixp_server.c pmixp_state.c pmixp_io.c pmixp_utils.c pmixp_dmdx.c \
 			pmixp_agent.h pmixp_client.h pmixp_coll.h pmixp_nspaces.h pmixp_info.h \
 			pmixp_server.h pmixp_state.h pmixp_io.h pmixp_utils.h pmixp_common.h pmixp_dmdx.h
 
-mpi_pmix_la_LIBADD = \
-	$(top_builddir)/src/slurmd/common/libslurmd_reverse_tree_math.la $(PMIX_LDFLAGS) $(PMIX_LIBS)
+pmix_internal_libs = $(top_builddir)/src/slurmd/common/libslurmd_reverse_tree_math.la
+
+pmix_ldflags = $(SO_LDFLAGS) $(PLUGIN_FLAGS)
+
+# pkglib_v#dir is needed in each one of the below because of the way we
+# use pkglib_v#_LTLIBRARIES even though it is the same for each one it still
+# needs to be defined.
+
+if HAVE_PMIX_V1
+
+pkglib_v1dir=$(pkglibdir)
+pkglib_v1_LTLIBRARIES = mpi_pmix_v1.la
+mpi_pmix_v1_la_SOURCES = $(pmix_src)
+mpi_pmix_v1_la_LIBADD = $(pmix_internal_libs) $(PMIX_LIBS)
+mpi_pmix_v1_la_LDFLAGS = $(pmix_ldflags) $(PMIX_V1_LDFLAGS)
+mpi_pmix_v1_la_CPPFLAGS = $(AM_CPPFLAGS) $(PMIX_V1_CPPFLAGS) -DHAVE_PMIX_VER=1
+
+endif
+
+if HAVE_PMIX_V2
+
+pkglib_v2dir=$(pkglibdir)
+pkglib_v2_LTLIBRARIES = mpi_pmix_v2.la
+mpi_pmix_v2_la_SOURCES = $(pmix_src)
+mpi_pmix_v2_la_LIBADD = $(pmix_internal_libs) $(PMIX_LIBS)
+mpi_pmix_v2_la_LDFLAGS = $(pmix_ldflags) $(PMIX_V2_LDFLAGS)
+mpi_pmix_v2_la_CPPFLAGS = $(AM_CPPFLAGS) $(PMIX_V2_CPPFLAGS) -DHAVE_PMIX_VER=2
+
+endif
+
+if HAVE_PMIX_V2
+mpi_pmix_so := mpi_pmix_v2.so
+else
+
+if HAVE_PMIX_V1
+mpi_pmix_so := mpi_pmix_v1.so
+endif
+
+endif
 
-mpi_pmix_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS)
+force:
+$(pmix_internal_libs): force
+	@cd `dirname $@` && $(MAKE) `basename $@`
 
+install-exec-hook:
+	rm -rf $(pkglibdir)/mpi_pmix.so
+	$(LN_S) ./$(mpi_pmix_so)  $(pkglibdir)/mpi_pmix.so
 
+uninstall-hook:
+	rm -rf $(pkglibdir)/mpi_pmix.so
diff --git a/src/plugins/mpi/pmix/Makefile.in b/src/plugins/mpi/pmix/Makefile.in
index 7d49962dbe2daf1b9af4a6c1181fd132acdd8ba8..0a119544a6234bc17257d7a67a9242a84766e85e 100644
--- a/src/plugins/mpi/pmix/Makefile.in
+++ b/src/plugins/mpi/pmix/Makefile.in
@@ -169,22 +169,56 @@ am__uninstall_files_from_dir = { \
     || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
          $(am__cd) "$$dir" && rm -f $$files; }; \
   }
-am__installdirs = "$(DESTDIR)$(pkglibdir)"
-LTLIBRARIES = $(pkglib_LTLIBRARIES)
+am__installdirs = "$(DESTDIR)$(pkglib_v1dir)" \
+	"$(DESTDIR)$(pkglib_v2dir)"
+LTLIBRARIES = $(pkglib_v1_LTLIBRARIES) $(pkglib_v2_LTLIBRARIES)
 am__DEPENDENCIES_1 =
-mpi_pmix_la_DEPENDENCIES = $(top_builddir)/src/slurmd/common/libslurmd_reverse_tree_math.la \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-am_mpi_pmix_la_OBJECTS = mpi_pmix.lo pmixp_agent.lo pmixp_client.lo \
-	pmixp_coll.lo pmixp_nspaces.lo pmixp_info.lo pmixp_server.lo \
-	pmixp_state.lo pmixp_io.lo pmixp_utils.lo pmixp_dmdx.lo
-mpi_pmix_la_OBJECTS = $(am_mpi_pmix_la_OBJECTS)
+@HAVE_PMIX_V1_TRUE@mpi_pmix_v1_la_DEPENDENCIES =  \
+@HAVE_PMIX_V1_TRUE@	$(pmix_internal_libs) $(am__DEPENDENCIES_1)
+am__mpi_pmix_v1_la_SOURCES_DIST = mpi_pmix.c pmixp_agent.c \
+	pmixp_client.c pmixp_coll.c pmixp_nspaces.c pmixp_info.c \
+	pmixp_server.c pmixp_state.c pmixp_io.c pmixp_utils.c \
+	pmixp_dmdx.c pmixp_agent.h pmixp_client.h pmixp_coll.h \
+	pmixp_nspaces.h pmixp_info.h pmixp_server.h pmixp_state.h \
+	pmixp_io.h pmixp_utils.h pmixp_common.h pmixp_dmdx.h
+am__objects_1 = mpi_pmix_v1_la-mpi_pmix.lo \
+	mpi_pmix_v1_la-pmixp_agent.lo mpi_pmix_v1_la-pmixp_client.lo \
+	mpi_pmix_v1_la-pmixp_coll.lo mpi_pmix_v1_la-pmixp_nspaces.lo \
+	mpi_pmix_v1_la-pmixp_info.lo mpi_pmix_v1_la-pmixp_server.lo \
+	mpi_pmix_v1_la-pmixp_state.lo mpi_pmix_v1_la-pmixp_io.lo \
+	mpi_pmix_v1_la-pmixp_utils.lo mpi_pmix_v1_la-pmixp_dmdx.lo
+@HAVE_PMIX_V1_TRUE@am_mpi_pmix_v1_la_OBJECTS = $(am__objects_1)
+mpi_pmix_v1_la_OBJECTS = $(am_mpi_pmix_v1_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
 am__v_lt_1 = 
-mpi_pmix_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(mpi_pmix_la_LDFLAGS) $(LDFLAGS) -o $@
+mpi_pmix_v1_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(AM_CFLAGS) $(CFLAGS) $(mpi_pmix_v1_la_LDFLAGS) $(LDFLAGS) -o \
+	$@
+@HAVE_PMIX_V1_TRUE@am_mpi_pmix_v1_la_rpath = -rpath $(pkglib_v1dir)
+@HAVE_PMIX_V2_TRUE@mpi_pmix_v2_la_DEPENDENCIES =  \
+@HAVE_PMIX_V2_TRUE@	$(pmix_internal_libs) $(am__DEPENDENCIES_1)
+am__mpi_pmix_v2_la_SOURCES_DIST = mpi_pmix.c pmixp_agent.c \
+	pmixp_client.c pmixp_coll.c pmixp_nspaces.c pmixp_info.c \
+	pmixp_server.c pmixp_state.c pmixp_io.c pmixp_utils.c \
+	pmixp_dmdx.c pmixp_agent.h pmixp_client.h pmixp_coll.h \
+	pmixp_nspaces.h pmixp_info.h pmixp_server.h pmixp_state.h \
+	pmixp_io.h pmixp_utils.h pmixp_common.h pmixp_dmdx.h
+am__objects_2 = mpi_pmix_v2_la-mpi_pmix.lo \
+	mpi_pmix_v2_la-pmixp_agent.lo mpi_pmix_v2_la-pmixp_client.lo \
+	mpi_pmix_v2_la-pmixp_coll.lo mpi_pmix_v2_la-pmixp_nspaces.lo \
+	mpi_pmix_v2_la-pmixp_info.lo mpi_pmix_v2_la-pmixp_server.lo \
+	mpi_pmix_v2_la-pmixp_state.lo mpi_pmix_v2_la-pmixp_io.lo \
+	mpi_pmix_v2_la-pmixp_utils.lo mpi_pmix_v2_la-pmixp_dmdx.lo
+@HAVE_PMIX_V2_TRUE@am_mpi_pmix_v2_la_OBJECTS = $(am__objects_2)
+mpi_pmix_v2_la_OBJECTS = $(am_mpi_pmix_v2_la_OBJECTS)
+mpi_pmix_v2_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(AM_CFLAGS) $(CFLAGS) $(mpi_pmix_v2_la_LDFLAGS) $(LDFLAGS) -o \
+	$@
+@HAVE_PMIX_V2_TRUE@am_mpi_pmix_v2_la_rpath = -rpath $(pkglib_v2dir)
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
@@ -219,8 +253,9 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo "  CCLD    " $@;
 am__v_CCLD_1 = 
-SOURCES = $(mpi_pmix_la_SOURCES)
-DIST_SOURCES = $(mpi_pmix_la_SOURCES)
+SOURCES = $(mpi_pmix_v1_la_SOURCES) $(mpi_pmix_v2_la_SOURCES)
+DIST_SOURCES = $(am__mpi_pmix_v1_la_SOURCES_DIST) \
+	$(am__mpi_pmix_v2_la_SOURCES_DIST)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -390,9 +425,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
@@ -503,19 +540,32 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = foreign
 PLUGIN_FLAGS = -module -avoid-version --export-dynamic
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common $(PMIX_CPPFLAGS)
-pkglib_LTLIBRARIES = mpi_pmix.la 
-
-# OpenMPI MPI plugin.
-mpi_pmix_la_SOURCES = mpi_pmix.c pmixp_agent.c pmixp_client.c pmixp_coll.c pmixp_nspaces.c pmixp_info.c \
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common
+pmix_src = mpi_pmix.c pmixp_agent.c pmixp_client.c pmixp_coll.c pmixp_nspaces.c pmixp_info.c \
 			pmixp_server.c pmixp_state.c pmixp_io.c pmixp_utils.c pmixp_dmdx.c \
 			pmixp_agent.h pmixp_client.h pmixp_coll.h pmixp_nspaces.h pmixp_info.h \
 			pmixp_server.h pmixp_state.h pmixp_io.h pmixp_utils.h pmixp_common.h pmixp_dmdx.h
 
-mpi_pmix_la_LIBADD = \
-	$(top_builddir)/src/slurmd/common/libslurmd_reverse_tree_math.la $(PMIX_LDFLAGS) $(PMIX_LIBS)
-
-mpi_pmix_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS)
+pmix_internal_libs = $(top_builddir)/src/slurmd/common/libslurmd_reverse_tree_math.la
+pmix_ldflags = $(SO_LDFLAGS) $(PLUGIN_FLAGS)
+
+# pkglib_v#dir is needed in each one of the below because of the way we
+# use pkglib_v#_LTLIBRARIES even though it is the same for each one it still
+# needs to be defined.
+@HAVE_PMIX_V1_TRUE@pkglib_v1dir = $(pkglibdir)
+@HAVE_PMIX_V1_TRUE@pkglib_v1_LTLIBRARIES = mpi_pmix_v1.la
+@HAVE_PMIX_V1_TRUE@mpi_pmix_v1_la_SOURCES = $(pmix_src)
+@HAVE_PMIX_V1_TRUE@mpi_pmix_v1_la_LIBADD = $(pmix_internal_libs) $(PMIX_LIBS)
+@HAVE_PMIX_V1_TRUE@mpi_pmix_v1_la_LDFLAGS = $(pmix_ldflags) $(PMIX_V1_LDFLAGS)
+@HAVE_PMIX_V1_TRUE@mpi_pmix_v1_la_CPPFLAGS = $(AM_CPPFLAGS) $(PMIX_V1_CPPFLAGS) -DHAVE_PMIX_VER=1
+@HAVE_PMIX_V2_TRUE@pkglib_v2dir = $(pkglibdir)
+@HAVE_PMIX_V2_TRUE@pkglib_v2_LTLIBRARIES = mpi_pmix_v2.la
+@HAVE_PMIX_V2_TRUE@mpi_pmix_v2_la_SOURCES = $(pmix_src)
+@HAVE_PMIX_V2_TRUE@mpi_pmix_v2_la_LIBADD = $(pmix_internal_libs) $(PMIX_LIBS)
+@HAVE_PMIX_V2_TRUE@mpi_pmix_v2_la_LDFLAGS = $(pmix_ldflags) $(PMIX_V2_LDFLAGS)
+@HAVE_PMIX_V2_TRUE@mpi_pmix_v2_la_CPPFLAGS = $(AM_CPPFLAGS) $(PMIX_V2_CPPFLAGS) -DHAVE_PMIX_VER=2
+@HAVE_PMIX_V1_TRUE@@HAVE_PMIX_V2_FALSE@mpi_pmix_so := mpi_pmix_v1.so
+@HAVE_PMIX_V2_TRUE@mpi_pmix_so := mpi_pmix_v2.so
 all: all-am
 
 .SUFFIXES:
@@ -550,33 +600,33 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
 
-install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
+install-pkglib_v1LTLIBRARIES: $(pkglib_v1_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
+	@list='$(pkglib_v1_LTLIBRARIES)'; test -n "$(pkglib_v1dir)" || list=; \
 	list2=; for p in $$list; do \
 	  if test -f $$p; then \
 	    list2="$$list2 $$p"; \
 	  else :; fi; \
 	done; \
 	test -z "$$list2" || { \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(pkglib_v1dir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(pkglib_v1dir)" || exit 1; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglib_v1dir)'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglib_v1dir)"; \
 	}
 
-uninstall-pkglibLTLIBRARIES:
+uninstall-pkglib_v1LTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
+	@list='$(pkglib_v1_LTLIBRARIES)'; test -n "$(pkglib_v1dir)" || list=; \
 	for p in $$list; do \
 	  $(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglib_v1dir)/$$f'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglib_v1dir)/$$f"; \
 	done
 
-clean-pkglibLTLIBRARIES:
-	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
-	@list='$(pkglib_LTLIBRARIES)'; \
+clean-pkglib_v1LTLIBRARIES:
+	-test -z "$(pkglib_v1_LTLIBRARIES)" || rm -f $(pkglib_v1_LTLIBRARIES)
+	@list='$(pkglib_v1_LTLIBRARIES)'; \
 	locs=`for p in $$list; do echo $$p; done | \
 	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
 	      sort -u`; \
@@ -585,8 +635,46 @@ clean-pkglibLTLIBRARIES:
 	  rm -f $${locs}; \
 	}
 
-mpi_pmix.la: $(mpi_pmix_la_OBJECTS) $(mpi_pmix_la_DEPENDENCIES) $(EXTRA_mpi_pmix_la_DEPENDENCIES) 
-	$(AM_V_CCLD)$(mpi_pmix_la_LINK) -rpath $(pkglibdir) $(mpi_pmix_la_OBJECTS) $(mpi_pmix_la_LIBADD) $(LIBS)
+install-pkglib_v2LTLIBRARIES: $(pkglib_v2_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	@list='$(pkglib_v2_LTLIBRARIES)'; test -n "$(pkglib_v2dir)" || list=; \
+	list2=; for p in $$list; do \
+	  if test -f $$p; then \
+	    list2="$$list2 $$p"; \
+	  else :; fi; \
+	done; \
+	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(pkglib_v2dir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(pkglib_v2dir)" || exit 1; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglib_v2dir)'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglib_v2dir)"; \
+	}
+
+uninstall-pkglib_v2LTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(pkglib_v2_LTLIBRARIES)'; test -n "$(pkglib_v2dir)" || list=; \
+	for p in $$list; do \
+	  $(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglib_v2dir)/$$f'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglib_v2dir)/$$f"; \
+	done
+
+clean-pkglib_v2LTLIBRARIES:
+	-test -z "$(pkglib_v2_LTLIBRARIES)" || rm -f $(pkglib_v2_LTLIBRARIES)
+	@list='$(pkglib_v2_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
+mpi_pmix_v1.la: $(mpi_pmix_v1_la_OBJECTS) $(mpi_pmix_v1_la_DEPENDENCIES) $(EXTRA_mpi_pmix_v1_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(mpi_pmix_v1_la_LINK) $(am_mpi_pmix_v1_la_rpath) $(mpi_pmix_v1_la_OBJECTS) $(mpi_pmix_v1_la_LIBADD) $(LIBS)
+
+mpi_pmix_v2.la: $(mpi_pmix_v2_la_OBJECTS) $(mpi_pmix_v2_la_DEPENDENCIES) $(EXTRA_mpi_pmix_v2_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(mpi_pmix_v2_la_LINK) $(am_mpi_pmix_v2_la_rpath) $(mpi_pmix_v2_la_OBJECTS) $(mpi_pmix_v2_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -594,17 +682,28 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpi_pmix.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pmixp_agent.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pmixp_client.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pmixp_coll.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pmixp_dmdx.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pmixp_info.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pmixp_io.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pmixp_nspaces.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pmixp_server.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pmixp_state.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pmixp_utils.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpi_pmix_v1_la-mpi_pmix.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpi_pmix_v1_la-pmixp_agent.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpi_pmix_v1_la-pmixp_client.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpi_pmix_v1_la-pmixp_coll.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpi_pmix_v1_la-pmixp_dmdx.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpi_pmix_v1_la-pmixp_info.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpi_pmix_v1_la-pmixp_io.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpi_pmix_v1_la-pmixp_nspaces.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpi_pmix_v1_la-pmixp_server.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpi_pmix_v1_la-pmixp_state.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpi_pmix_v1_la-pmixp_utils.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpi_pmix_v2_la-mpi_pmix.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpi_pmix_v2_la-pmixp_agent.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpi_pmix_v2_la-pmixp_client.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpi_pmix_v2_la-pmixp_coll.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpi_pmix_v2_la-pmixp_dmdx.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpi_pmix_v2_la-pmixp_info.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpi_pmix_v2_la-pmixp_io.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpi_pmix_v2_la-pmixp_nspaces.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpi_pmix_v2_la-pmixp_server.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpi_pmix_v2_la-pmixp_state.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpi_pmix_v2_la-pmixp_utils.Plo@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -627,6 +726,160 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
+mpi_pmix_v1_la-mpi_pmix.lo: mpi_pmix.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mpi_pmix_v1_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mpi_pmix_v1_la-mpi_pmix.lo -MD -MP -MF $(DEPDIR)/mpi_pmix_v1_la-mpi_pmix.Tpo -c -o mpi_pmix_v1_la-mpi_pmix.lo `test -f 'mpi_pmix.c' || echo '$(srcdir)/'`mpi_pmix.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mpi_pmix_v1_la-mpi_pmix.Tpo $(DEPDIR)/mpi_pmix_v1_la-mpi_pmix.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='mpi_pmix.c' object='mpi_pmix_v1_la-mpi_pmix.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mpi_pmix_v1_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mpi_pmix_v1_la-mpi_pmix.lo `test -f 'mpi_pmix.c' || echo '$(srcdir)/'`mpi_pmix.c
+
+mpi_pmix_v1_la-pmixp_agent.lo: pmixp_agent.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mpi_pmix_v1_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mpi_pmix_v1_la-pmixp_agent.lo -MD -MP -MF $(DEPDIR)/mpi_pmix_v1_la-pmixp_agent.Tpo -c -o mpi_pmix_v1_la-pmixp_agent.lo `test -f 'pmixp_agent.c' || echo '$(srcdir)/'`pmixp_agent.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mpi_pmix_v1_la-pmixp_agent.Tpo $(DEPDIR)/mpi_pmix_v1_la-pmixp_agent.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='pmixp_agent.c' object='mpi_pmix_v1_la-pmixp_agent.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mpi_pmix_v1_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mpi_pmix_v1_la-pmixp_agent.lo `test -f 'pmixp_agent.c' || echo '$(srcdir)/'`pmixp_agent.c
+
+mpi_pmix_v1_la-pmixp_client.lo: pmixp_client.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mpi_pmix_v1_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mpi_pmix_v1_la-pmixp_client.lo -MD -MP -MF $(DEPDIR)/mpi_pmix_v1_la-pmixp_client.Tpo -c -o mpi_pmix_v1_la-pmixp_client.lo `test -f 'pmixp_client.c' || echo '$(srcdir)/'`pmixp_client.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mpi_pmix_v1_la-pmixp_client.Tpo $(DEPDIR)/mpi_pmix_v1_la-pmixp_client.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='pmixp_client.c' object='mpi_pmix_v1_la-pmixp_client.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mpi_pmix_v1_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mpi_pmix_v1_la-pmixp_client.lo `test -f 'pmixp_client.c' || echo '$(srcdir)/'`pmixp_client.c
+
+mpi_pmix_v1_la-pmixp_coll.lo: pmixp_coll.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mpi_pmix_v1_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mpi_pmix_v1_la-pmixp_coll.lo -MD -MP -MF $(DEPDIR)/mpi_pmix_v1_la-pmixp_coll.Tpo -c -o mpi_pmix_v1_la-pmixp_coll.lo `test -f 'pmixp_coll.c' || echo '$(srcdir)/'`pmixp_coll.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mpi_pmix_v1_la-pmixp_coll.Tpo $(DEPDIR)/mpi_pmix_v1_la-pmixp_coll.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='pmixp_coll.c' object='mpi_pmix_v1_la-pmixp_coll.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mpi_pmix_v1_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mpi_pmix_v1_la-pmixp_coll.lo `test -f 'pmixp_coll.c' || echo '$(srcdir)/'`pmixp_coll.c
+
+mpi_pmix_v1_la-pmixp_nspaces.lo: pmixp_nspaces.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mpi_pmix_v1_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mpi_pmix_v1_la-pmixp_nspaces.lo -MD -MP -MF $(DEPDIR)/mpi_pmix_v1_la-pmixp_nspaces.Tpo -c -o mpi_pmix_v1_la-pmixp_nspaces.lo `test -f 'pmixp_nspaces.c' || echo '$(srcdir)/'`pmixp_nspaces.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mpi_pmix_v1_la-pmixp_nspaces.Tpo $(DEPDIR)/mpi_pmix_v1_la-pmixp_nspaces.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='pmixp_nspaces.c' object='mpi_pmix_v1_la-pmixp_nspaces.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mpi_pmix_v1_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mpi_pmix_v1_la-pmixp_nspaces.lo `test -f 'pmixp_nspaces.c' || echo '$(srcdir)/'`pmixp_nspaces.c
+
+mpi_pmix_v1_la-pmixp_info.lo: pmixp_info.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mpi_pmix_v1_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mpi_pmix_v1_la-pmixp_info.lo -MD -MP -MF $(DEPDIR)/mpi_pmix_v1_la-pmixp_info.Tpo -c -o mpi_pmix_v1_la-pmixp_info.lo `test -f 'pmixp_info.c' || echo '$(srcdir)/'`pmixp_info.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mpi_pmix_v1_la-pmixp_info.Tpo $(DEPDIR)/mpi_pmix_v1_la-pmixp_info.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='pmixp_info.c' object='mpi_pmix_v1_la-pmixp_info.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mpi_pmix_v1_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mpi_pmix_v1_la-pmixp_info.lo `test -f 'pmixp_info.c' || echo '$(srcdir)/'`pmixp_info.c
+
+mpi_pmix_v1_la-pmixp_server.lo: pmixp_server.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mpi_pmix_v1_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mpi_pmix_v1_la-pmixp_server.lo -MD -MP -MF $(DEPDIR)/mpi_pmix_v1_la-pmixp_server.Tpo -c -o mpi_pmix_v1_la-pmixp_server.lo `test -f 'pmixp_server.c' || echo '$(srcdir)/'`pmixp_server.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mpi_pmix_v1_la-pmixp_server.Tpo $(DEPDIR)/mpi_pmix_v1_la-pmixp_server.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='pmixp_server.c' object='mpi_pmix_v1_la-pmixp_server.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mpi_pmix_v1_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mpi_pmix_v1_la-pmixp_server.lo `test -f 'pmixp_server.c' || echo '$(srcdir)/'`pmixp_server.c
+
+mpi_pmix_v1_la-pmixp_state.lo: pmixp_state.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mpi_pmix_v1_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mpi_pmix_v1_la-pmixp_state.lo -MD -MP -MF $(DEPDIR)/mpi_pmix_v1_la-pmixp_state.Tpo -c -o mpi_pmix_v1_la-pmixp_state.lo `test -f 'pmixp_state.c' || echo '$(srcdir)/'`pmixp_state.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mpi_pmix_v1_la-pmixp_state.Tpo $(DEPDIR)/mpi_pmix_v1_la-pmixp_state.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='pmixp_state.c' object='mpi_pmix_v1_la-pmixp_state.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mpi_pmix_v1_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mpi_pmix_v1_la-pmixp_state.lo `test -f 'pmixp_state.c' || echo '$(srcdir)/'`pmixp_state.c
+
+mpi_pmix_v1_la-pmixp_io.lo: pmixp_io.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mpi_pmix_v1_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mpi_pmix_v1_la-pmixp_io.lo -MD -MP -MF $(DEPDIR)/mpi_pmix_v1_la-pmixp_io.Tpo -c -o mpi_pmix_v1_la-pmixp_io.lo `test -f 'pmixp_io.c' || echo '$(srcdir)/'`pmixp_io.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mpi_pmix_v1_la-pmixp_io.Tpo $(DEPDIR)/mpi_pmix_v1_la-pmixp_io.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='pmixp_io.c' object='mpi_pmix_v1_la-pmixp_io.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mpi_pmix_v1_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mpi_pmix_v1_la-pmixp_io.lo `test -f 'pmixp_io.c' || echo '$(srcdir)/'`pmixp_io.c
+
+mpi_pmix_v1_la-pmixp_utils.lo: pmixp_utils.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mpi_pmix_v1_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mpi_pmix_v1_la-pmixp_utils.lo -MD -MP -MF $(DEPDIR)/mpi_pmix_v1_la-pmixp_utils.Tpo -c -o mpi_pmix_v1_la-pmixp_utils.lo `test -f 'pmixp_utils.c' || echo '$(srcdir)/'`pmixp_utils.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mpi_pmix_v1_la-pmixp_utils.Tpo $(DEPDIR)/mpi_pmix_v1_la-pmixp_utils.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='pmixp_utils.c' object='mpi_pmix_v1_la-pmixp_utils.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mpi_pmix_v1_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mpi_pmix_v1_la-pmixp_utils.lo `test -f 'pmixp_utils.c' || echo '$(srcdir)/'`pmixp_utils.c
+
+mpi_pmix_v1_la-pmixp_dmdx.lo: pmixp_dmdx.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mpi_pmix_v1_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mpi_pmix_v1_la-pmixp_dmdx.lo -MD -MP -MF $(DEPDIR)/mpi_pmix_v1_la-pmixp_dmdx.Tpo -c -o mpi_pmix_v1_la-pmixp_dmdx.lo `test -f 'pmixp_dmdx.c' || echo '$(srcdir)/'`pmixp_dmdx.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mpi_pmix_v1_la-pmixp_dmdx.Tpo $(DEPDIR)/mpi_pmix_v1_la-pmixp_dmdx.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='pmixp_dmdx.c' object='mpi_pmix_v1_la-pmixp_dmdx.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mpi_pmix_v1_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mpi_pmix_v1_la-pmixp_dmdx.lo `test -f 'pmixp_dmdx.c' || echo '$(srcdir)/'`pmixp_dmdx.c
+
+mpi_pmix_v2_la-mpi_pmix.lo: mpi_pmix.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mpi_pmix_v2_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mpi_pmix_v2_la-mpi_pmix.lo -MD -MP -MF $(DEPDIR)/mpi_pmix_v2_la-mpi_pmix.Tpo -c -o mpi_pmix_v2_la-mpi_pmix.lo `test -f 'mpi_pmix.c' || echo '$(srcdir)/'`mpi_pmix.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mpi_pmix_v2_la-mpi_pmix.Tpo $(DEPDIR)/mpi_pmix_v2_la-mpi_pmix.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='mpi_pmix.c' object='mpi_pmix_v2_la-mpi_pmix.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mpi_pmix_v2_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mpi_pmix_v2_la-mpi_pmix.lo `test -f 'mpi_pmix.c' || echo '$(srcdir)/'`mpi_pmix.c
+
+mpi_pmix_v2_la-pmixp_agent.lo: pmixp_agent.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mpi_pmix_v2_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mpi_pmix_v2_la-pmixp_agent.lo -MD -MP -MF $(DEPDIR)/mpi_pmix_v2_la-pmixp_agent.Tpo -c -o mpi_pmix_v2_la-pmixp_agent.lo `test -f 'pmixp_agent.c' || echo '$(srcdir)/'`pmixp_agent.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mpi_pmix_v2_la-pmixp_agent.Tpo $(DEPDIR)/mpi_pmix_v2_la-pmixp_agent.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='pmixp_agent.c' object='mpi_pmix_v2_la-pmixp_agent.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mpi_pmix_v2_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mpi_pmix_v2_la-pmixp_agent.lo `test -f 'pmixp_agent.c' || echo '$(srcdir)/'`pmixp_agent.c
+
+mpi_pmix_v2_la-pmixp_client.lo: pmixp_client.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mpi_pmix_v2_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mpi_pmix_v2_la-pmixp_client.lo -MD -MP -MF $(DEPDIR)/mpi_pmix_v2_la-pmixp_client.Tpo -c -o mpi_pmix_v2_la-pmixp_client.lo `test -f 'pmixp_client.c' || echo '$(srcdir)/'`pmixp_client.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mpi_pmix_v2_la-pmixp_client.Tpo $(DEPDIR)/mpi_pmix_v2_la-pmixp_client.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='pmixp_client.c' object='mpi_pmix_v2_la-pmixp_client.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mpi_pmix_v2_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mpi_pmix_v2_la-pmixp_client.lo `test -f 'pmixp_client.c' || echo '$(srcdir)/'`pmixp_client.c
+
+mpi_pmix_v2_la-pmixp_coll.lo: pmixp_coll.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mpi_pmix_v2_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mpi_pmix_v2_la-pmixp_coll.lo -MD -MP -MF $(DEPDIR)/mpi_pmix_v2_la-pmixp_coll.Tpo -c -o mpi_pmix_v2_la-pmixp_coll.lo `test -f 'pmixp_coll.c' || echo '$(srcdir)/'`pmixp_coll.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mpi_pmix_v2_la-pmixp_coll.Tpo $(DEPDIR)/mpi_pmix_v2_la-pmixp_coll.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='pmixp_coll.c' object='mpi_pmix_v2_la-pmixp_coll.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mpi_pmix_v2_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mpi_pmix_v2_la-pmixp_coll.lo `test -f 'pmixp_coll.c' || echo '$(srcdir)/'`pmixp_coll.c
+
+mpi_pmix_v2_la-pmixp_nspaces.lo: pmixp_nspaces.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mpi_pmix_v2_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mpi_pmix_v2_la-pmixp_nspaces.lo -MD -MP -MF $(DEPDIR)/mpi_pmix_v2_la-pmixp_nspaces.Tpo -c -o mpi_pmix_v2_la-pmixp_nspaces.lo `test -f 'pmixp_nspaces.c' || echo '$(srcdir)/'`pmixp_nspaces.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mpi_pmix_v2_la-pmixp_nspaces.Tpo $(DEPDIR)/mpi_pmix_v2_la-pmixp_nspaces.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='pmixp_nspaces.c' object='mpi_pmix_v2_la-pmixp_nspaces.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mpi_pmix_v2_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mpi_pmix_v2_la-pmixp_nspaces.lo `test -f 'pmixp_nspaces.c' || echo '$(srcdir)/'`pmixp_nspaces.c
+
+mpi_pmix_v2_la-pmixp_info.lo: pmixp_info.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mpi_pmix_v2_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mpi_pmix_v2_la-pmixp_info.lo -MD -MP -MF $(DEPDIR)/mpi_pmix_v2_la-pmixp_info.Tpo -c -o mpi_pmix_v2_la-pmixp_info.lo `test -f 'pmixp_info.c' || echo '$(srcdir)/'`pmixp_info.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mpi_pmix_v2_la-pmixp_info.Tpo $(DEPDIR)/mpi_pmix_v2_la-pmixp_info.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='pmixp_info.c' object='mpi_pmix_v2_la-pmixp_info.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mpi_pmix_v2_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mpi_pmix_v2_la-pmixp_info.lo `test -f 'pmixp_info.c' || echo '$(srcdir)/'`pmixp_info.c
+
+mpi_pmix_v2_la-pmixp_server.lo: pmixp_server.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mpi_pmix_v2_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mpi_pmix_v2_la-pmixp_server.lo -MD -MP -MF $(DEPDIR)/mpi_pmix_v2_la-pmixp_server.Tpo -c -o mpi_pmix_v2_la-pmixp_server.lo `test -f 'pmixp_server.c' || echo '$(srcdir)/'`pmixp_server.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mpi_pmix_v2_la-pmixp_server.Tpo $(DEPDIR)/mpi_pmix_v2_la-pmixp_server.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='pmixp_server.c' object='mpi_pmix_v2_la-pmixp_server.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mpi_pmix_v2_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mpi_pmix_v2_la-pmixp_server.lo `test -f 'pmixp_server.c' || echo '$(srcdir)/'`pmixp_server.c
+
+mpi_pmix_v2_la-pmixp_state.lo: pmixp_state.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mpi_pmix_v2_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mpi_pmix_v2_la-pmixp_state.lo -MD -MP -MF $(DEPDIR)/mpi_pmix_v2_la-pmixp_state.Tpo -c -o mpi_pmix_v2_la-pmixp_state.lo `test -f 'pmixp_state.c' || echo '$(srcdir)/'`pmixp_state.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mpi_pmix_v2_la-pmixp_state.Tpo $(DEPDIR)/mpi_pmix_v2_la-pmixp_state.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='pmixp_state.c' object='mpi_pmix_v2_la-pmixp_state.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mpi_pmix_v2_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mpi_pmix_v2_la-pmixp_state.lo `test -f 'pmixp_state.c' || echo '$(srcdir)/'`pmixp_state.c
+
+mpi_pmix_v2_la-pmixp_io.lo: pmixp_io.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mpi_pmix_v2_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mpi_pmix_v2_la-pmixp_io.lo -MD -MP -MF $(DEPDIR)/mpi_pmix_v2_la-pmixp_io.Tpo -c -o mpi_pmix_v2_la-pmixp_io.lo `test -f 'pmixp_io.c' || echo '$(srcdir)/'`pmixp_io.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mpi_pmix_v2_la-pmixp_io.Tpo $(DEPDIR)/mpi_pmix_v2_la-pmixp_io.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='pmixp_io.c' object='mpi_pmix_v2_la-pmixp_io.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mpi_pmix_v2_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mpi_pmix_v2_la-pmixp_io.lo `test -f 'pmixp_io.c' || echo '$(srcdir)/'`pmixp_io.c
+
+mpi_pmix_v2_la-pmixp_utils.lo: pmixp_utils.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mpi_pmix_v2_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mpi_pmix_v2_la-pmixp_utils.lo -MD -MP -MF $(DEPDIR)/mpi_pmix_v2_la-pmixp_utils.Tpo -c -o mpi_pmix_v2_la-pmixp_utils.lo `test -f 'pmixp_utils.c' || echo '$(srcdir)/'`pmixp_utils.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mpi_pmix_v2_la-pmixp_utils.Tpo $(DEPDIR)/mpi_pmix_v2_la-pmixp_utils.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='pmixp_utils.c' object='mpi_pmix_v2_la-pmixp_utils.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mpi_pmix_v2_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mpi_pmix_v2_la-pmixp_utils.lo `test -f 'pmixp_utils.c' || echo '$(srcdir)/'`pmixp_utils.c
+
+mpi_pmix_v2_la-pmixp_dmdx.lo: pmixp_dmdx.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mpi_pmix_v2_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mpi_pmix_v2_la-pmixp_dmdx.lo -MD -MP -MF $(DEPDIR)/mpi_pmix_v2_la-pmixp_dmdx.Tpo -c -o mpi_pmix_v2_la-pmixp_dmdx.lo `test -f 'pmixp_dmdx.c' || echo '$(srcdir)/'`pmixp_dmdx.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mpi_pmix_v2_la-pmixp_dmdx.Tpo $(DEPDIR)/mpi_pmix_v2_la-pmixp_dmdx.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='pmixp_dmdx.c' object='mpi_pmix_v2_la-pmixp_dmdx.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mpi_pmix_v2_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mpi_pmix_v2_la-pmixp_dmdx.lo `test -f 'pmixp_dmdx.c' || echo '$(srcdir)/'`pmixp_dmdx.c
+
 mostlyclean-libtool:
 	-rm -f *.lo
 
@@ -719,7 +972,7 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(LTLIBRARIES)
 installdirs:
-	for dir in "$(DESTDIR)$(pkglibdir)"; do \
+	for dir in "$(DESTDIR)$(pkglib_v1dir)" "$(DESTDIR)$(pkglib_v2dir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -754,8 +1007,8 @@ maintainer-clean-generic:
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-am
 
-clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \
-	mostlyclean-am
+clean-am: clean-generic clean-libtool clean-pkglib_v1LTLIBRARIES \
+	clean-pkglib_v2LTLIBRARIES mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
@@ -775,14 +1028,16 @@ info: info-am
 
 info-am:
 
-install-data-am:
+install-data-am: install-pkglib_v1LTLIBRARIES \
+	install-pkglib_v2LTLIBRARIES
 
 install-dvi: install-dvi-am
 
 install-dvi-am:
 
-install-exec-am: install-pkglibLTLIBRARIES
-
+install-exec-am:
+	@$(NORMAL_INSTALL)
+	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
 install-html: install-html-am
 
 install-html-am:
@@ -821,28 +1076,44 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-pkglibLTLIBRARIES
-
-.MAKE: install-am install-strip
+uninstall-am: uninstall-pkglib_v1LTLIBRARIES \
+	uninstall-pkglib_v2LTLIBRARIES
+	@$(NORMAL_INSTALL)
+	$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+.MAKE: install-am install-exec-am install-strip uninstall-am
 
 .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
-	ctags-am distclean distclean-compile distclean-generic \
+	clean-libtool clean-pkglib_v1LTLIBRARIES \
+	clean-pkglib_v2LTLIBRARIES cscopelist-am ctags ctags-am \
+	distclean distclean-compile distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
 	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-pkglibLTLIBRARIES install-ps install-ps-am \
+	install-exec-am install-exec-hook install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-pkglib_v1LTLIBRARIES \
+	install-pkglib_v2LTLIBRARIES install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
-	uninstall-pkglibLTLIBRARIES
+	uninstall-hook uninstall-pkglib_v1LTLIBRARIES \
+	uninstall-pkglib_v2LTLIBRARIES
 
 .PRECIOUS: Makefile
 
 
+force:
+$(pmix_internal_libs): force
+	@cd `dirname $@` && $(MAKE) `basename $@`
+
+install-exec-hook:
+	rm -rf $(pkglibdir)/mpi_pmix.so
+	$(LN_S) ./$(mpi_pmix_so)  $(pkglibdir)/mpi_pmix.so
+
+uninstall-hook:
+	rm -rf $(pkglibdir)/mpi_pmix.so
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/src/plugins/mpi/pmix/mpi_pmix.c b/src/plugins/mpi/pmix/mpi_pmix.c
index 1215999e6b851a3a105cd5054740c1dce4865175..a22c9d53d55126a4abf14e84eb63c941bc10f903 100644
--- a/src/plugins/mpi/pmix/mpi_pmix.c
+++ b/src/plugins/mpi/pmix/mpi_pmix.c
@@ -76,9 +76,32 @@
  * minimum version for their plugins as this API matures.
  */
 const char plugin_name[] = "PMIx plugin";
-const char plugin_type[] = "mpi/pmix";
+
+#if (HAVE_PMIX_VER == 1)
+const char plugin_type[] = "mpi/pmix_v1";
+#elif (HAVE_PMIX_VER == 2)
+const char plugin_type[] = "mpi/pmix_v2";
+#endif
+
 const uint32_t plugin_version = SLURM_VERSION_NUMBER;
 
+/*
+ * init() is called when the plugin is loaded, before any other functions
+ * are called.  Put global initialization here.
+ */
+extern int init(void)
+{
+	/* HAVE_PMIX_VER is what we were compiled against PMIX_VERSION_MAJOR is
+	 * found in the pmix source we are dynamically linking against.
+	 */
+	if (HAVE_PMIX_VER != PMIX_VERSION_MAJOR)
+		fatal("pmix_init: Slurm was compiled against PMIx v%d but we are now linking against v%ld. Please check your install.",
+		      HAVE_PMIX_VER, PMIX_VERSION_MAJOR);
+
+	return SLURM_SUCCESS;
+}
+
+
 int p_mpi_hook_slurmstepd_prefork(const stepd_step_rec_t *job, char ***env)
 {
 	int ret;
diff --git a/src/plugins/mpi/pmix/pmixp_client.c b/src/plugins/mpi/pmix/pmixp_client.c
index cf04dc6e6673bd2a5dcae5f4d3a87e721a92fc2f..0557c8b16edcc0943c485802ba4adde1dc8c2b50 100644
--- a/src/plugins/mpi/pmix/pmixp_client.c
+++ b/src/plugins/mpi/pmix/pmixp_client.c
@@ -48,6 +48,13 @@
 #include <sys/types.h>
 #include <pmix_server.h>
 
+/* Check PMIx version */
+#if (HAVE_PMIX_VER != PMIX_VERSION_MAJOR)
+#define VALUE_TO_STRING(x) #x
+#define VALUE(x) VALUE_TO_STRING(x)
+#pragma message "PMIx version mismatch: the major version seen during configuration was " VALUE(HAVE_PMIX_VER) "L but found " VALUE(PMIX_VERSION_MAJOR) " compilation will most likely fail.  Please reconfigure against the new version."
+#endif
+
 #define PMIXP_ALLOC_KEY(kvp, key_str)				\
 {								\
 	char *key = key_str;					\
@@ -55,28 +62,64 @@
 	(void)strncpy(kvp->key, key, PMIX_MAX_KEYLEN);		\
 }
 
+#define PMIXP_INFO_ADD(kvp, key_str, field, val) \
+({ \
+	int key_num = 0; \
+	char *key = key_str; \
+	if (kvp == NULL) \
+		kvp = (pmix_info_t *)xmalloc(sizeof(pmix_info_t)); \
+	else { \
+		key_num = xsize(kvp) / sizeof(pmix_info_t); \
+		kvp = (pmix_info_t *)xrealloc(kvp, (key_num + 1) * sizeof(pmix_info_t)); \
+	} \
+	(void)strncpy(kvp[key_num].key, key, PMIX_MAX_KEYLEN); \
+	PMIX_VAL_SET(&kvp[key_num].value, field, val); \
+})
+
+#define PMIXP_INFO_SIZE(kvp) (xsize(kvp) / sizeof(pmix_info_t))
+
 #define PMIXP_FREE_KEY(kvp)				\
 {								\
 	xfree(kvp);						\
 }
 
+#if (HAVE_PMIX_VER == 1)
 static int client_connected(const pmix_proc_t *proc, void *server_object)
 {
 	/* we don't do anything by now */
 	return PMIX_SUCCESS;
 }
+#elif (HAVE_PMIX_VER >= 2)
+static int client_connected(const pmix_proc_t *proc, void *server_object,
+		pmix_op_cbfunc_t cbfunc, void *cbdata)
+{
+	/* we don't do anything by now */
+	return PMIX_SUCCESS;
+}
+#endif
 
 static void op_callbk(pmix_status_t status, void *cbdata)
 {
 	PMIXP_DEBUG("op callback is called with status=%d", status);
 }
 
-static void errhandler_reg_callbk(pmix_status_t status, int errhandler_ref,
+#if (HAVE_PMIX_VER == 1)
+static void errhandler_reg_callbk(pmix_status_t status,
+		int errhandler_ref, void *cbdata)
+{
+	PMIXP_DEBUG("Error handler registration callback is called with "
+		"status=%d, ref=%d",
+		status, errhandler_ref);
+}
+#elif (HAVE_PMIX_VER >= 2)
+static void errhandler_reg_callbk(pmix_status_t status, size_t errhandler_ref,
 		void *cbdata)
 {
-	PMIXP_DEBUG("Error handler registration callback is called with status=%d, ref=%d",
-		    status, errhandler_ref);
+	PMIXP_DEBUG("Error handler registration callback is called with "
+		"status=%d, ref=%d",
+		status, (int)errhandler_ref);
 }
+#endif
 
 static pmix_status_t client_finalized(const pmix_proc_t *proc,
 		void *server_object, pmix_op_cbfunc_t cbfunc, void *cbdata)
@@ -151,14 +194,24 @@ pmix_server_module_t _slurm_pmix_cb = {
 	NULL
 };
 
-static void errhandler(pmix_status_t status, pmix_proc_t proc[], size_t nproc,
-		pmix_info_t info[], size_t ninfo);
+#if (HAVE_PMIX_VER == 1)
+static void errhandler(pmix_status_t status, pmix_proc_t proc[],
+		size_t nproc, pmix_info_t info[], size_t ninfo);
+#elif (HAVE_PMIX_VER >= 2)
+static void errhandler(size_t evhdlr_registration_id,
+		pmix_status_t status,
+		const pmix_proc_t *source,
+		pmix_info_t info[], size_t ninfo,
+		pmix_info_t *results, size_t nresults,
+		pmix_event_notification_cbfunc_fn_t cbfunc,
+		void *cbdata);
+#endif
 
 int pmixp_libpmix_init(void)
 {
 	int rc;
 	mode_t rights = (S_IRUSR | S_IWUSR | S_IXUSR) | (S_IRGRP | S_IWGRP | S_IXGRP);
-	pmix_info_t *kvp;
+	pmix_info_t *kvp = NULL;
 
 	/* NOTE: we need user who owns the job to access PMIx usock
 	 * file. According to 'man 7 unix':
@@ -185,20 +238,26 @@ int pmixp_libpmix_init(void)
 		error("chown(%s): %m", pmixp_info_tmpdir_lib());
 		return errno;
 	}
-	
+
+	/* TODO: must be deleted in future once info-key approach will harden */
 	setenv(PMIXP_PMIXLIB_TMPDIR, pmixp_info_tmpdir_lib(), 1);
 
-	PMIXP_ALLOC_KEY(kvp, PMIX_USERID);
-	PMIX_VAL_SET(&kvp->value, uint32_t, pmixp_info_jobuid());
+	PMIXP_INFO_ADD(kvp, PMIX_USERID, uint32_t, pmixp_info_jobuid());
+
+#ifdef PMIX_SERVER_TMPDIR
+	PMIXP_INFO_ADD(kvp, PMIX_SERVER_TMPDIR, string,
+		       pmixp_info_tmpdir_lib());
+#endif
 
 	/* setup the server library */
-	if (PMIX_SUCCESS != (rc = PMIx_server_init(&_slurm_pmix_cb, kvp, 1))) {
+	if (PMIX_SUCCESS != (rc = PMIx_server_init(&_slurm_pmix_cb, kvp,
+						   PMIXP_INFO_SIZE(kvp)))) {
 		PMIXP_ERROR_STD("PMIx_server_init failed with error %d\n", rc);
 		return SLURM_ERROR;
 	}
 
 	PMIXP_FREE_KEY(kvp);
-	
+
 	/*
 	if( pmixp_fixrights(pmixp_info_tmpdir_lib(),
 		(uid_t) pmixp_info_jobuid(), rights) ){
@@ -206,8 +265,13 @@ int pmixp_libpmix_init(void)
 	*/
 
 	/* register the errhandler */
-	PMIx_Register_errhandler(NULL, 0, errhandler, errhandler_reg_callbk,
-			NULL);
+#if (HAVE_PMIX_VER == 1)
+	PMIx_Register_errhandler(NULL, 0, errhandler,
+			errhandler_reg_callbk, NULL);
+#elif (HAVE_PMIX_VER >= 2)
+	PMIx_Register_event_handler(NULL, 0, NULL, 0, errhandler,
+			errhandler_reg_callbk, NULL);
+#endif
 
 	return 0;
 }
@@ -217,7 +281,11 @@ int pmixp_libpmix_finalize(void)
 	int rc = SLURM_SUCCESS, rc1;
 
 	/* deregister the errhandler */
+#if (HAVE_PMIX_VER == 1)
 	PMIx_Deregister_errhandler(0, op_callbk, NULL);
+#elif (HAVE_PMIX_VER >= 2)
+	PMIx_Deregister_event_handler(0, op_callbk, NULL);
+#endif
 
 	if (PMIX_SUCCESS != PMIx_server_finalize()) {
 		rc = SLURM_ERROR;
@@ -231,6 +299,7 @@ int pmixp_libpmix_finalize(void)
 	return rc;
 }
 
+#if (HAVE_PMIX_VER == 1)
 static void errhandler(pmix_status_t status,
 		       pmix_proc_t proc[], size_t nproc,
 		       pmix_info_t info[], size_t ninfo)
@@ -241,6 +310,22 @@ static void errhandler(pmix_status_t status,
 			status, (int) nproc);
 	slurm_kill_job_step(pmixp_info_jobid(), pmixp_info_stepid(), SIGKILL);
 }
+#elif (HAVE_PMIX_VER >= 2)
+static void errhandler(size_t evhdlr_registration_id,
+		pmix_status_t status,
+		const pmix_proc_t *source,
+		pmix_info_t info[], size_t ninfo,
+		pmix_info_t *results, size_t nresults,
+		pmix_event_notification_cbfunc_fn_t cbfunc,
+		void *cbdata)
+{
+	/* TODO: do something more sophisticated here */
+	/* FIXME: use proper specificator for nranges */
+	PMIXP_ERROR_STD("Error handler invoked: status = %d",
+			status);
+	slurm_kill_job_step(pmixp_info_jobid(), pmixp_info_stepid(), SIGKILL);
+}
+#endif
 
 /*
  * general proc-level attributes
@@ -671,7 +756,7 @@ static pmix_status_t publish_fn(const pmix_proc_t *proc,
 		void *cbdata)
 {
 	PMIXP_DEBUG("called");
-	return PMIX_ERR_NOT_IMPLEMENTED;
+	return PMIX_ERR_NOT_SUPPORTED;
 }
 
 static pmix_status_t lookup_fn(const pmix_proc_t *proc, char **keys,
@@ -679,7 +764,7 @@ static pmix_status_t lookup_fn(const pmix_proc_t *proc, char **keys,
 		pmix_lookup_cbfunc_t cbfunc, void *cbdata)
 {
 	PMIXP_DEBUG("called");
-	return PMIX_ERR_NOT_IMPLEMENTED;
+	return PMIX_ERR_NOT_SUPPORTED;
 }
 
 static pmix_status_t unpublish_fn(const pmix_proc_t *proc, char **keys,
@@ -687,7 +772,7 @@ static pmix_status_t unpublish_fn(const pmix_proc_t *proc, char **keys,
 		void *cbdata)
 {
 	PMIXP_DEBUG("called");
-	return PMIX_ERR_NOT_IMPLEMENTED;
+	return PMIX_ERR_NOT_SUPPORTED;
 }
 
 static pmix_status_t spawn_fn(const pmix_proc_t *proc,
@@ -696,7 +781,7 @@ static pmix_status_t spawn_fn(const pmix_proc_t *proc,
 		pmix_spawn_cbfunc_t cbfunc, void *cbdata)
 {
 	PMIXP_DEBUG("called");
-	return PMIX_ERR_NOT_IMPLEMENTED;
+	return PMIX_ERR_NOT_SUPPORTED;
 }
 
 static pmix_status_t connect_fn(const pmix_proc_t procs[], size_t nprocs,
@@ -704,7 +789,7 @@ static pmix_status_t connect_fn(const pmix_proc_t procs[], size_t nprocs,
 		void *cbdata)
 {
 	PMIXP_DEBUG("called");
-	return PMIX_ERR_NOT_IMPLEMENTED;
+	return PMIX_ERR_NOT_SUPPORTED;
 }
 
 static pmix_status_t disconnect_fn(const pmix_proc_t procs[], size_t nprocs,
@@ -712,5 +797,5 @@ static pmix_status_t disconnect_fn(const pmix_proc_t procs[], size_t nprocs,
 		void *cbdata)
 {
 	PMIXP_DEBUG("called");
-	return PMIX_ERR_NOT_IMPLEMENTED;
+	return PMIX_ERR_NOT_SUPPORTED;
 }
diff --git a/src/plugins/mpi/pmix/pmixp_common.h b/src/plugins/mpi/pmix/pmixp_common.h
index 594d69353090a3bc0a93071a4bd8a8ca1e5410cf..d8116310a06b081dab9e2afe5f7a0094863f3e69 100644
--- a/src/plugins/mpi/pmix/pmixp_common.h
+++ b/src/plugins/mpi/pmix/pmixp_common.h
@@ -65,6 +65,10 @@
 /* PMIx library header */
 #include <pmix_server.h>
 
+#ifndef PMIX_VERSION_MAJOR
+#define PMIX_VERSION_MAJOR 1L
+#endif
+
 /* TODO: use /tmp directory instead */
 #define MAX_USOCK_PATH							\
 	((size_t) &(((struct sockaddr_un *)0 + 1)->sun_family) -	\
diff --git a/src/plugins/mpi/pmix/pmixp_dmdx.c b/src/plugins/mpi/pmix/pmixp_dmdx.c
index ade5dd84a6240836466416f5b3ecc06e5d322f87..da13f209f17ff2c6a9bb3cb353ac762761c65584 100644
--- a/src/plugins/mpi/pmix/pmixp_dmdx.c
+++ b/src/plugins/mpi/pmix/pmixp_dmdx.c
@@ -282,7 +282,7 @@ int pmixp_dmdx_get(const char *nspace, int rank,
 	/* check the return status */
 	if (SLURM_SUCCESS != rc) {
 		PMIXP_ERROR("Cannot send direct modex request to %s", host);
-		cbfunc(PMIX_ERR_COMM_FAILURE, NULL, 0, cbdata, NULL, NULL);
+		cbfunc(PMIX_ERROR, NULL, 0, cbdata, NULL, NULL);
 		return SLURM_ERROR;
 	}
 
@@ -391,14 +391,14 @@ static void _dmdx_resp(Buf buf, char *sender_host, uint32_t seq_num)
 	rc = _read_info(buf, &ns, &rank, &sender_ns, &status);
 	if (SLURM_SUCCESS != rc) {
 		/* notify libpmix about an error */
-		req->cbfunc(PMIX_ERR_UNPACK_FAILURE, NULL, 0, req->cbdata, NULL, NULL);
+		req->cbfunc(PMIX_ERROR, NULL, 0, req->cbdata, NULL, NULL);
 		goto exit;
 	}
 
 	/* get the modex blob */
 	if (SLURM_SUCCESS != (rc = unpackmem_ptr(&data, &size, buf))) {
 		/* notify libpmix about an error */
-		req->cbfunc(PMIX_ERR_UNPACK_FAILURE, NULL, 0, req->cbdata, NULL,
+		req->cbfunc(PMIX_ERROR, NULL, 0, req->cbdata, NULL,
 				NULL);
 		goto exit;
 	}
diff --git a/src/plugins/node_features/Makefile.in b/src/plugins/node_features/Makefile.in
index 10180299e1f6bb1871b7f98db9367e203275885d..6baea5f90a8156ce8de3a87ea0357c6824f4cbb0 100644
--- a/src/plugins/node_features/Makefile.in
+++ b/src/plugins/node_features/Makefile.in
@@ -365,9 +365,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/node_features/knl_cray/Makefile.in b/src/plugins/node_features/knl_cray/Makefile.in
index ca4514102846c5497b02f7502721939f0c4d4763..2651d0c39f1d76199a5d8c3c70ab2a90b17d0921 100644
--- a/src/plugins/node_features/knl_cray/Makefile.in
+++ b/src/plugins/node_features/knl_cray/Makefile.in
@@ -395,9 +395,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/node_features/knl_cray/node_features_knl_cray.c b/src/plugins/node_features/knl_cray/node_features_knl_cray.c
index 9f0c745167aec7d2d54a02a196218ab648b48f9c..6c8ae55f6248d76fec220cbd667a3c77e8149199 100644
--- a/src/plugins/node_features/knl_cray/node_features_knl_cray.c
+++ b/src/plugins/node_features/knl_cray/node_features_knl_cray.c
@@ -51,6 +51,10 @@
 #  include <json/json.h>
 #endif
 
+#if defined(__FreeBSD__) || defined(__NetBSD__)
+#define POLLRDHUP POLLHUP
+#endif
+
 #include "slurm/slurm.h"
 
 #include "src/common/assoc_mgr.h"
diff --git a/src/plugins/power/Makefile.in b/src/plugins/power/Makefile.in
index 183fe49ac7afa45b1136942b1ccdebf93bacd801..890a719cace62561149d3260aea449c6d6011947 100644
--- a/src/plugins/power/Makefile.in
+++ b/src/plugins/power/Makefile.in
@@ -365,9 +365,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/power/common/Makefile.in b/src/plugins/power/common/Makefile.in
index b262ce954cc53bd6d170e632133e61c77312f8fd..3ccd288b007be56bf33724738b4bc925dec3d275 100644
--- a/src/plugins/power/common/Makefile.in
+++ b/src/plugins/power/common/Makefile.in
@@ -354,9 +354,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/power/cray/Makefile.in b/src/plugins/power/cray/Makefile.in
index 4c89f8355f5fa381c9c734933acb3608dcbc95a3..cce8b8b4be8e77efdfef3a1159761c8216447cc8 100644
--- a/src/plugins/power/cray/Makefile.in
+++ b/src/plugins/power/cray/Makefile.in
@@ -390,9 +390,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/power/none/Makefile.in b/src/plugins/power/none/Makefile.in
index 489a7063095ff34a81b15db20421e184732f5e28..880c22e69f0db9389e613fb4b3c4dc53364534fe 100644
--- a/src/plugins/power/none/Makefile.in
+++ b/src/plugins/power/none/Makefile.in
@@ -385,9 +385,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/preempt/Makefile.in b/src/plugins/preempt/Makefile.in
index 82416701972fc6bd0611a1b96549f6f73c8047d3..b193dc2e917e37e7c688f2b3180426f93d7faa3f 100644
--- a/src/plugins/preempt/Makefile.in
+++ b/src/plugins/preempt/Makefile.in
@@ -365,9 +365,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/preempt/job_prio/Makefile.in b/src/plugins/preempt/job_prio/Makefile.in
index b8c872edd0e936a6c8ec5fcd7dcd98a31c496903..ee7497bf3e0b0abaaa7d2f9916dfdf93802bb8e9 100644
--- a/src/plugins/preempt/job_prio/Makefile.in
+++ b/src/plugins/preempt/job_prio/Makefile.in
@@ -386,9 +386,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/preempt/none/Makefile.in b/src/plugins/preempt/none/Makefile.in
index 19304769ffa8891b1409af566d300854bb7f2a21..cc7b2ab4c657e7118a36fdd2103c4748ed05d3bf 100644
--- a/src/plugins/preempt/none/Makefile.in
+++ b/src/plugins/preempt/none/Makefile.in
@@ -386,9 +386,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/preempt/partition_prio/Makefile.in b/src/plugins/preempt/partition_prio/Makefile.in
index 4e1ab87ab77fffd1aa4cd2debd9caa24868bfab8..d6de25680c725ba23aa99627b0c00f0ee18f0d20 100644
--- a/src/plugins/preempt/partition_prio/Makefile.in
+++ b/src/plugins/preempt/partition_prio/Makefile.in
@@ -387,9 +387,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/preempt/qos/Makefile.in b/src/plugins/preempt/qos/Makefile.in
index b5aaa224e63f7caa29127b5d6de56f7983c5f5c3..63149412eeddc70238c93872450684e6b5d5d9b4 100644
--- a/src/plugins/preempt/qos/Makefile.in
+++ b/src/plugins/preempt/qos/Makefile.in
@@ -386,9 +386,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/priority/Makefile.in b/src/plugins/priority/Makefile.in
index 803e914d3620422a28b1c43f78351a3551a5b404..63da67194118575da02bbe582f5fcb7cf7f74ce0 100644
--- a/src/plugins/priority/Makefile.in
+++ b/src/plugins/priority/Makefile.in
@@ -363,9 +363,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/priority/basic/Makefile.in b/src/plugins/priority/basic/Makefile.in
index 0040640ab788959028f85fce5f686d828d28a6e5..631f4e75fe821a62658ae8ff5dab29b2e3013033 100644
--- a/src/plugins/priority/basic/Makefile.in
+++ b/src/plugins/priority/basic/Makefile.in
@@ -386,9 +386,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/priority/multifactor/Makefile.in b/src/plugins/priority/multifactor/Makefile.in
index 5b1bb890d6453d52afd6d20b2c41a892c390b07c..6aff3ae2ce265e5c903e35a3491d349c0cb5ddf6 100644
--- a/src/plugins/priority/multifactor/Makefile.in
+++ b/src/plugins/priority/multifactor/Makefile.in
@@ -388,9 +388,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/proctrack/Makefile.in b/src/plugins/proctrack/Makefile.in
index da434357b22fba5033c15734229798b3254f19fd..ab9242725ebf4d7ec264f0f602111165cc57ab3d 100644
--- a/src/plugins/proctrack/Makefile.in
+++ b/src/plugins/proctrack/Makefile.in
@@ -368,9 +368,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/proctrack/cgroup/Makefile.in b/src/plugins/proctrack/cgroup/Makefile.in
index 64538b3785db94962bc84cc5debfb92df6ea2f48..4f4aed07bfe9b27591f96b540ad6b4faa4563265 100644
--- a/src/plugins/proctrack/cgroup/Makefile.in
+++ b/src/plugins/proctrack/cgroup/Makefile.in
@@ -386,9 +386,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/proctrack/cray/Makefile.in b/src/plugins/proctrack/cray/Makefile.in
index 2334eb34a36f4b7c4ab9c72b5c469b5c210539f1..c0b407121ce83a004857d47703c63736e40bf399 100644
--- a/src/plugins/proctrack/cray/Makefile.in
+++ b/src/plugins/proctrack/cray/Makefile.in
@@ -387,9 +387,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/proctrack/linuxproc/Makefile.in b/src/plugins/proctrack/linuxproc/Makefile.in
index 6923021de8a35d80f83a0b291534cd166387b0fe..f4e6ed93ad581ccd569c96f494a60486b2936315 100644
--- a/src/plugins/proctrack/linuxproc/Makefile.in
+++ b/src/plugins/proctrack/linuxproc/Makefile.in
@@ -387,9 +387,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/proctrack/lua/Makefile.in b/src/plugins/proctrack/lua/Makefile.in
index 02f953651fe11154c8ab6a398a0ff4b4dfa6937f..ed4885b55ef4ede84e6df299a41ca04da4b11b5a 100644
--- a/src/plugins/proctrack/lua/Makefile.in
+++ b/src/plugins/proctrack/lua/Makefile.in
@@ -386,9 +386,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/proctrack/pgid/Makefile.in b/src/plugins/proctrack/pgid/Makefile.in
index 1fbfd7c35158661786b9e7cd687b6629c46b0b10..12db61e3d57f7e658f593a5aecac4af831094f9b 100644
--- a/src/plugins/proctrack/pgid/Makefile.in
+++ b/src/plugins/proctrack/pgid/Makefile.in
@@ -386,9 +386,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/proctrack/sgi_job/Makefile.in b/src/plugins/proctrack/sgi_job/Makefile.in
index ebb0fad4038a8b4bbeb29fb6a8a447bb8aebb03f..2a0395bfdccaa57e04ff707d543b90343bcce98f 100644
--- a/src/plugins/proctrack/sgi_job/Makefile.in
+++ b/src/plugins/proctrack/sgi_job/Makefile.in
@@ -386,9 +386,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/route/Makefile.in b/src/plugins/route/Makefile.in
index a5acba82da85aa02fe55fd1c7db38813ec0c3369..b899def8cd726451175fc49765c8417afcaf1087 100644
--- a/src/plugins/route/Makefile.in
+++ b/src/plugins/route/Makefile.in
@@ -365,9 +365,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/route/default/Makefile.in b/src/plugins/route/default/Makefile.in
index 7c3e0926d8a7a4a86dcc52a773e91527014057c4..20347783a932301e5e2bdf296d6bb08eb5e34ff3 100644
--- a/src/plugins/route/default/Makefile.in
+++ b/src/plugins/route/default/Makefile.in
@@ -386,9 +386,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/route/topology/Makefile.in b/src/plugins/route/topology/Makefile.in
index 290027909850a885806157b8cc645a3fddb0c189..ef18de8b9755fb147a7f6943aec3849cd1a3ab00 100644
--- a/src/plugins/route/topology/Makefile.in
+++ b/src/plugins/route/topology/Makefile.in
@@ -386,9 +386,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/sched/Makefile.in b/src/plugins/sched/Makefile.in
index 374bca404ea3d67f4c6066212ea39f2c41ad108e..54c4bb2ba06b954c793c6dcc4db324067fbccbfc 100644
--- a/src/plugins/sched/Makefile.in
+++ b/src/plugins/sched/Makefile.in
@@ -365,9 +365,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/sched/backfill/Makefile.in b/src/plugins/sched/backfill/Makefile.in
index 1b1e9c2b8678bac34a5d06387ae073675ec9e245..fb760fbfa90da9753d8e38f1a1eb8bc9f420b222 100644
--- a/src/plugins/sched/backfill/Makefile.in
+++ b/src/plugins/sched/backfill/Makefile.in
@@ -386,9 +386,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/sched/builtin/Makefile.in b/src/plugins/sched/builtin/Makefile.in
index 5c224719bfbcf20e97e17e3658c20828e3c0d6e1..e04d764fe70448baff9240ae8aaf129894ef1db8 100644
--- a/src/plugins/sched/builtin/Makefile.in
+++ b/src/plugins/sched/builtin/Makefile.in
@@ -386,9 +386,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/sched/hold/Makefile.in b/src/plugins/sched/hold/Makefile.in
index 3fec5071f9685075816dd955c763f10ce8fbc247..bbc4b603e6618f48cea06d9b83583d31a7851ed1 100644
--- a/src/plugins/sched/hold/Makefile.in
+++ b/src/plugins/sched/hold/Makefile.in
@@ -385,9 +385,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/sched/wiki/Makefile.in b/src/plugins/sched/wiki/Makefile.in
index 7d1086792b3f71bd1ef4718bbd830a9c77af19c5..13e244fddcdf64f4ffcf774ba0b1a7c84130db0d 100644
--- a/src/plugins/sched/wiki/Makefile.in
+++ b/src/plugins/sched/wiki/Makefile.in
@@ -387,9 +387,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/sched/wiki2/Makefile.in b/src/plugins/sched/wiki2/Makefile.in
index 651c9741870d220c2122f5560676f408bd14a357..3946a9cad88b3b2d504b6f8be78c43ca437538db 100644
--- a/src/plugins/sched/wiki2/Makefile.in
+++ b/src/plugins/sched/wiki2/Makefile.in
@@ -391,9 +391,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/select/Makefile.in b/src/plugins/select/Makefile.in
index ea6a4b5ea872733ea7bcca8e427696b233c16724..9d5f55b87f712b4ec653555defcfc509a6279848 100644
--- a/src/plugins/select/Makefile.in
+++ b/src/plugins/select/Makefile.in
@@ -365,9 +365,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/select/alps/Makefile.in b/src/plugins/select/alps/Makefile.in
index e912a0bc36420464ddad3caa898158601fc1706c..8d48ae90640b66dd163cac03541a6401ab7fdd94 100644
--- a/src/plugins/select/alps/Makefile.in
+++ b/src/plugins/select/alps/Makefile.in
@@ -439,9 +439,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/select/alps/libalps/Makefile.in b/src/plugins/select/alps/libalps/Makefile.in
index a06cdcc1ff1fed0dab3dafde3145dd27e3209f33..097466a3fdf51f474f91e943192bb495563e96c3 100644
--- a/src/plugins/select/alps/libalps/Makefile.in
+++ b/src/plugins/select/alps/libalps/Makefile.in
@@ -366,9 +366,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/select/alps/libemulate/Makefile.in b/src/plugins/select/alps/libemulate/Makefile.in
index 7e86b3c447dcbcbcf74c67597dffab52dd6c33d6..8deb86c36fcf0d597ed775d2a0df12dd0a7f191b 100644
--- a/src/plugins/select/alps/libemulate/Makefile.in
+++ b/src/plugins/select/alps/libemulate/Makefile.in
@@ -359,9 +359,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/select/bluegene/Makefile.in b/src/plugins/select/bluegene/Makefile.in
index 8edc356c2fc72c7dce779eea271fd59f1018603b..766edf81d5434f1c1b99ccbeb92f41433576942e 100644
--- a/src/plugins/select/bluegene/Makefile.in
+++ b/src/plugins/select/bluegene/Makefile.in
@@ -566,9 +566,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/select/bluegene/ba/Makefile.in b/src/plugins/select/bluegene/ba/Makefile.in
index a63a562ba6d8d756d1143a5a59389075ea8b3163..929457518ddadfef05bea107fdb5fee4b5ec000d 100644
--- a/src/plugins/select/bluegene/ba/Makefile.in
+++ b/src/plugins/select/bluegene/ba/Makefile.in
@@ -370,9 +370,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/select/bluegene/ba_bgq/Makefile.in b/src/plugins/select/bluegene/ba_bgq/Makefile.in
index 86627d41cc1451f785c133fc6117ed1a8f6070b9..196afc6b0da94bddfb68dd704fe6d37be86396bb 100644
--- a/src/plugins/select/bluegene/ba_bgq/Makefile.in
+++ b/src/plugins/select/bluegene/ba_bgq/Makefile.in
@@ -389,9 +389,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/select/bluegene/bl/Makefile.in b/src/plugins/select/bluegene/bl/Makefile.in
index db40607b39e09780305f79fb9b3b6a769c4ab5fd..9c72d64014a82e6dd56d1c13257d91f3bb234929 100644
--- a/src/plugins/select/bluegene/bl/Makefile.in
+++ b/src/plugins/select/bluegene/bl/Makefile.in
@@ -359,9 +359,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/select/bluegene/bl_bgq/Makefile.in b/src/plugins/select/bluegene/bl_bgq/Makefile.in
index 7d67d5362c1554b73526288bbb20bac89fde6efb..dfae0e458b9bc7bb8fc41a9570b0fe716de59d00 100644
--- a/src/plugins/select/bluegene/bl_bgq/Makefile.in
+++ b/src/plugins/select/bluegene/bl_bgq/Makefile.in
@@ -377,9 +377,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/select/bluegene/sfree/Makefile.in b/src/plugins/select/bluegene/sfree/Makefile.in
index 28c398ed44e3417e10af9af980d6c8c531d554ee..fe2f9e8c2bfa1c9f3456335fe0d4ef61c4bece4b 100644
--- a/src/plugins/select/bluegene/sfree/Makefile.in
+++ b/src/plugins/select/bluegene/sfree/Makefile.in
@@ -361,9 +361,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/select/cons_res/Makefile.in b/src/plugins/select/cons_res/Makefile.in
index 31cb121efa63dc773f1fd29626dc035f7903979e..e0e32e1082d699cf5aaa0b51f88bbfdcad398572 100644
--- a/src/plugins/select/cons_res/Makefile.in
+++ b/src/plugins/select/cons_res/Makefile.in
@@ -387,9 +387,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/select/cray/Makefile.in b/src/plugins/select/cray/Makefile.in
index 3dbeb094c9a0c186713b9b60be14f12e52833946..7ffe37d619c20ff62732a2b66fea12b15ddf908e 100644
--- a/src/plugins/select/cray/Makefile.in
+++ b/src/plugins/select/cray/Makefile.in
@@ -386,9 +386,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/select/linear/Makefile.in b/src/plugins/select/linear/Makefile.in
index acf9c8b0bb61f73ddddc4815c0127078f276bbbc..5ac97d62d95bc54e4083d6dcc8020e3af5acfc04 100644
--- a/src/plugins/select/linear/Makefile.in
+++ b/src/plugins/select/linear/Makefile.in
@@ -386,9 +386,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/select/other/Makefile.in b/src/plugins/select/other/Makefile.in
index 58c15f090b6dc3351957248fd8477917f0faf9fc..fb06305ba9774803a06b0d610d4b3cc577e428ed 100644
--- a/src/plugins/select/other/Makefile.in
+++ b/src/plugins/select/other/Makefile.in
@@ -354,9 +354,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/select/serial/Makefile.in b/src/plugins/select/serial/Makefile.in
index eaf69b09cffd0d0edafb91f048fdd3b511a14a07..716f9a284331d957e1f019e0254e816801d4ee9f 100644
--- a/src/plugins/select/serial/Makefile.in
+++ b/src/plugins/select/serial/Makefile.in
@@ -387,9 +387,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/slurmctld/Makefile.in b/src/plugins/slurmctld/Makefile.in
index fceb1a82dfc3eb7ebf7f3fefce54c80975fce9aa..5e4ca4406b04d9c5cdd9edf4f1ee4cce08b7e116 100644
--- a/src/plugins/slurmctld/Makefile.in
+++ b/src/plugins/slurmctld/Makefile.in
@@ -365,9 +365,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/slurmctld/nonstop/Makefile.in b/src/plugins/slurmctld/nonstop/Makefile.in
index 939cb124ad3222f277aac9ee8323924c94338510..7356029edb569196d5e133f58c0976bca928a824 100644
--- a/src/plugins/slurmctld/nonstop/Makefile.in
+++ b/src/plugins/slurmctld/nonstop/Makefile.in
@@ -389,9 +389,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/slurmd/Makefile.in b/src/plugins/slurmd/Makefile.in
index e93fd6d8065f73e92b528c7d1c6492eda8009dda..6957ebe8f0e1ef6a6f126d389f53abafa5139369 100644
--- a/src/plugins/slurmd/Makefile.in
+++ b/src/plugins/slurmd/Makefile.in
@@ -365,9 +365,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/switch/Makefile.in b/src/plugins/switch/Makefile.in
index 0bdbc766eb1fd52bc8fe14b36271ef2d5a4003a6..cae09bbe6283bb4a051ec65ab0853470f542815f 100644
--- a/src/plugins/switch/Makefile.in
+++ b/src/plugins/switch/Makefile.in
@@ -365,9 +365,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/switch/cray/Makefile.in b/src/plugins/switch/cray/Makefile.in
index 10593b4a37f377733d9fa2735d09a1d84b0fd714..593a2d2a1f534b40fc092411a98e24ea8d150745 100644
--- a/src/plugins/switch/cray/Makefile.in
+++ b/src/plugins/switch/cray/Makefile.in
@@ -389,9 +389,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/switch/generic/Makefile.in b/src/plugins/switch/generic/Makefile.in
index 9afd178f3131537bf2ecff17d1c54b4b0321e6af..840df57ee04e1179edcb886594003ae136dbf0c4 100644
--- a/src/plugins/switch/generic/Makefile.in
+++ b/src/plugins/switch/generic/Makefile.in
@@ -386,9 +386,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/switch/none/Makefile.in b/src/plugins/switch/none/Makefile.in
index 88f0932bf5f2da8444453c71efc23b895d1e3fc9..5d1b260c1c10dbad41991eacf883b0eed117c0b0 100644
--- a/src/plugins/switch/none/Makefile.in
+++ b/src/plugins/switch/none/Makefile.in
@@ -386,9 +386,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/switch/nrt/Makefile.in b/src/plugins/switch/nrt/Makefile.in
index cef3aad4aa7361c8efe61457fd096c6ba48e7689..65bfe0936cf9e7a9ab30d3b66ebabb8bf735816b 100644
--- a/src/plugins/switch/nrt/Makefile.in
+++ b/src/plugins/switch/nrt/Makefile.in
@@ -434,9 +434,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/switch/nrt/libpermapi/Makefile.in b/src/plugins/switch/nrt/libpermapi/Makefile.in
index ebb85ed6e0105169e59751d9f4372c6dbdd7caad..12693d9c719c9ddcd2f3fc6b41cd5f65c7588bd4 100644
--- a/src/plugins/switch/nrt/libpermapi/Makefile.in
+++ b/src/plugins/switch/nrt/libpermapi/Makefile.in
@@ -387,9 +387,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/task/Makefile.in b/src/plugins/task/Makefile.in
index 644ca3b30e8fc8f48d998193b30f59f9e2d4fddf..8a8f25e523ab6288677a708f84d4504731d43f0c 100644
--- a/src/plugins/task/Makefile.in
+++ b/src/plugins/task/Makefile.in
@@ -365,9 +365,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/task/affinity/Makefile.in b/src/plugins/task/affinity/Makefile.in
index b3d4013b92db2390a654c24a19f757739419a1a7..bbd8b507065b63fbda6d84be67857fef5e40198d 100644
--- a/src/plugins/task/affinity/Makefile.in
+++ b/src/plugins/task/affinity/Makefile.in
@@ -398,9 +398,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/task/cgroup/Makefile.in b/src/plugins/task/cgroup/Makefile.in
index 91befab2587f5eddeb24a7b67f11dfbbe9cf9a68..98735b2aa2adc1ae2edd2e92b1827501841a3ceb 100644
--- a/src/plugins/task/cgroup/Makefile.in
+++ b/src/plugins/task/cgroup/Makefile.in
@@ -387,9 +387,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/task/cgroup/task_cgroup_devices.c b/src/plugins/task/cgroup/task_cgroup_devices.c
index 583721449eac9ba3d546159fb322e2cc18510c57..bf89d09a34c089de208b5f5842b8be54e6188ac7 100644
--- a/src/plugins/task/cgroup/task_cgroup_devices.c
+++ b/src/plugins/task/cgroup/task_cgroup_devices.c
@@ -165,10 +165,10 @@ extern int task_cgroup_devices_create(stepd_step_rec_t *job)
 {
 	int f, k, rc, gres_conf_lines, allow_lines;
 	int fstatus = SLURM_ERROR;
-	char *gres_name[PATH_MAX];
-	char *gres_cgroup[PATH_MAX], *dev_path[PATH_MAX];
+	char **gres_name = NULL;
+	char **gres_cgroup = NULL, **dev_path = NULL;
 	char *allowed_devices[PATH_MAX], *allowed_dev_major[PATH_MAX];
-	int *gres_bit_alloc = NULL;
+	int *gres_job_bit_alloc = NULL;
 	int *gres_step_bit_alloc = NULL;
 	int *gres_count = NULL;
 	xcgroup_t devices_cg;
@@ -182,18 +182,17 @@ extern int task_cgroup_devices_create(stepd_step_rec_t *job)
 
 	char* slurm_cgpath ;
 
-	/* create slurm root cg in this cg namespace */
+	/* create slurm root cgroup in this cgroup namespace */
 	slurm_cgpath = task_cgroup_create_slurm_cg(&devices_ns);
-	if ( slurm_cgpath == NULL ) {
+	if (slurm_cgpath == NULL)
 		return SLURM_ERROR;
-	}
 
 	/* build user cgroup relative path if not set (should not be) */
 	if (*user_cgroup_path == '\0') {
-		if (snprintf(user_cgroup_path, PATH_MAX,
-			     "%s/uid_%u", slurm_cgpath, uid) >= PATH_MAX) {
-			error("unable to build uid %u cgroup relative "
-			      "path : %m", uid);
+		if (snprintf(user_cgroup_path, PATH_MAX, "%s/uid_%u",
+			     slurm_cgpath, uid) >= PATH_MAX) {
+			error("unable to build uid %u cgroup relative path : %m",
+			      uid);
 			xfree(slurm_cgpath);
 			return SLURM_ERROR;
 		}
@@ -201,17 +200,17 @@ extern int task_cgroup_devices_create(stepd_step_rec_t *job)
 	xfree(slurm_cgpath);
 
 	/* build job cgroup relative path if no set (should not be) */
-	if ( *job_cgroup_path == '\0' ) {
-		if ( snprintf(job_cgroup_path,PATH_MAX, "%s/job_%u",
-			      user_cgroup_path, jobid) >= PATH_MAX ) {
+	if (*job_cgroup_path == '\0') {
+		if (snprintf(job_cgroup_path, PATH_MAX, "%s/job_%u",
+			     user_cgroup_path, jobid) >= PATH_MAX) {
 			error("task/cgroup: unable to build job %u devices "
-			      "cg relative path : %m", jobid);
+			      "cgroup relative path : %m", jobid);
 			return SLURM_ERROR;
 		}
 	}
 
 	/* build job step cgroup relative path (should not be) */
-	if ( *jobstep_cgroup_path == '\0' ) {
+	if (*jobstep_cgroup_path == '\0') {
 		int cc;
 		if (stepid == SLURM_BATCH_SCRIPT) {
 			cc = snprintf(jobstep_cgroup_path, PATH_MAX,
@@ -224,74 +223,72 @@ extern int task_cgroup_devices_create(stepd_step_rec_t *job)
 				     "%s/step_%u",
 				     job_cgroup_path, stepid);
 		}
-		if (cc >= PATH_MAX ) {
+		if (cc >= PATH_MAX) {
 			error("task/cgroup: unable to build job step %u.%u "
-			      "devices cg relative path : %m", jobid, stepid);
+			      "devices cgroup relative path : %m",
+			      jobid, stepid);
 			return SLURM_ERROR;
 		}
 	}
 
 	/*
-	 * create devices root cg and lock it
+	 * create devices root cgroup and lock it
 	 *
 	 * we will keep the lock until the end to avoid the effect of a release
 	 * agent that would remove an existing cgroup hierarchy while we are
 	 * setting it up. As soon as the step cgroup is created, we can release
 	 * the lock.
-	 * Indeed, consecutive slurm steps could result in cg being removed
+	 * Indeed, consecutive slurm steps could result in cgroup being removed
 	 * between the next EEXIST instanciation and the first addition of
 	 * a task. The release_agent will have to lock the root devices cgroup
 	 * to avoid this scenario.
 	 */
-	if ( xcgroup_create(&devices_ns, &devices_cg, "", 0, 0) !=
-	     XCGROUP_SUCCESS ) {
-		error("task/cgroup: unable to create root devices xcgroup");
+	if (xcgroup_create(&devices_ns, &devices_cg, "", 0, 0) !=
+	    XCGROUP_SUCCESS ) {
+		error("task/cgroup: unable to create root devices cgroup");
 		return SLURM_ERROR;
 	}
-	if ( xcgroup_lock(&devices_cg) != XCGROUP_SUCCESS ) {
+	if (xcgroup_lock(&devices_cg) != XCGROUP_SUCCESS) {
 		xcgroup_destroy(&devices_cg);
-		error("task/cgroup: unable to lock root devices cg");
+		error("task/cgroup: unable to lock root devices cgroup");
 		return SLURM_ERROR;
 	}
 
-	info("task/cgroup: manage devices jor job '%u'",jobid);
+	info("task/cgroup: manage devices jor job '%u'", jobid);
 
 	 /*
 	  * collect info concerning the gres.conf file
-	  * the gres devices paths and the gres names
+	  * the GRES devices paths and the GRES names
 	  */
-	gres_conf_lines = gres_plugin_node_config_devices_path(dev_path,
-							       gres_name,
-							       PATH_MAX,
+	gres_conf_lines = gres_plugin_node_config_devices_path(&dev_path,
+							       &gres_name,
 							       job->node_name);
 
 	/*
 	 * create the entry for cgroup devices subsystem with major minor
 	 */
-	_calc_device_major(dev_path,gres_cgroup,gres_conf_lines);
-
-	allow_lines = read_allowed_devices_file(allowed_devices);
+	gres_cgroup = xmalloc(sizeof(char *) * gres_conf_lines);
+	_calc_device_major(dev_path, gres_cgroup, gres_conf_lines);
 
 	/*
          * create the entry with major minor for the default allowed devices
          * read from the file
          */
-	_calc_device_major(allowed_devices,allowed_dev_major,allow_lines);
-
-	gres_count = xmalloc ( sizeof (int) * (gres_conf_lines) );
+	allow_lines = read_allowed_devices_file(allowed_devices);
+	_calc_device_major(allowed_devices, allowed_dev_major, allow_lines);
 
 	/*
 	 * calculate the number of gres.conf records for each gres name
-	 *
 	 */
+	gres_count = xmalloc(sizeof(int) * gres_conf_lines);
 	f = 0;
 	gres_count[f] = 1;
 	for (k = 0; k < gres_conf_lines; k++) {
 		if ((k+1 < gres_conf_lines) &&
-		    (xstrcmp(gres_name[k],gres_name[k+1]) == 0))
+		    (xstrcmp(gres_name[k], gres_name[k+1]) == 0))
 			gres_count[f]++;
 		if ((k+1 < gres_conf_lines) &&
-		    (xstrcmp(gres_name[k],gres_name[k+1]) != 0)) {
+		    (xstrcmp(gres_name[k], gres_name[k+1]) != 0)) {
 			f++;
 			gres_count[f] = 1;
 		}
@@ -300,17 +297,15 @@ extern int task_cgroup_devices_create(stepd_step_rec_t *job)
 	/*
 	 * create user cgroup in the devices ns (it could already exist)
 	 */
-	if ( xcgroup_create(&devices_ns,&user_devices_cg,
-			    user_cgroup_path,
-			    getuid(),getgid()) != XCGROUP_SUCCESS ) {
+	if (xcgroup_create(&devices_ns, &user_devices_cg, user_cgroup_path,
+			   getuid(), getgid()) != XCGROUP_SUCCESS) {
 		goto error;
 	}
-	if ( xcgroup_instantiate(&user_devices_cg) != XCGROUP_SUCCESS ) {
+	if (xcgroup_instantiate(&user_devices_cg) != XCGROUP_SUCCESS) {
 		xcgroup_destroy(&user_devices_cg);
 		goto error;
 	}
 
-
 	/* TODO
 	 * check that user's devices cgroup is consistant and allow the
 	 * appropriate devices
@@ -320,39 +315,39 @@ extern int task_cgroup_devices_create(stepd_step_rec_t *job)
 	/*
 	 * create job cgroup in the devices ns (it could already exist)
 	 */
-	if ( xcgroup_create(&devices_ns,&job_devices_cg,
-			    job_cgroup_path,
-			    getuid(), getgid()) != XCGROUP_SUCCESS ) {
+	if (xcgroup_create(&devices_ns, &job_devices_cg, job_cgroup_path,
+			    getuid(), getgid()) != XCGROUP_SUCCESS) {
 		xcgroup_destroy(&user_devices_cg);
 		goto error;
 	}
-	if ( xcgroup_instantiate(&job_devices_cg) != XCGROUP_SUCCESS ) {
+	if (xcgroup_instantiate(&job_devices_cg) != XCGROUP_SUCCESS) {
 		xcgroup_destroy(&user_devices_cg);
 		xcgroup_destroy(&job_devices_cg);
 		goto error;
 	}
 
-	gres_bit_alloc = xmalloc ( sizeof (int) * (gres_conf_lines + 1));
-
 	/* fetch information concerning the gres devices allocation for the job */
-	gres_plugin_job_state_file(job_gres_list, gres_bit_alloc, gres_count);
+	gres_job_bit_alloc = xmalloc(sizeof (int) * (gres_conf_lines + 10));
+	gres_plugin_job_state_file(job_gres_list, gres_job_bit_alloc,
+				   gres_count);
 
 	/*
-	 * with the current cgroup devices subsystem design (whitelist only supported)
-	 * we need to allow all different devices that are supposed to be allowed by
-	 * default.
+	 * with the current cgroup devices subsystem design (whitelist only
+	 * supported) we need to allow all different devices that are supposed
+	 * to be allowed by* default.
 	 */
 	for (k = 0; k < allow_lines; k++) {
-		info("Default access allowed to device %s", allowed_dev_major[k]);
-		xcgroup_set_param(&job_devices_cg,"devices.allow",
-			allowed_dev_major[k]);
+		info("Default access allowed to device %s",
+		     allowed_dev_major[k]);
+		xcgroup_set_param(&job_devices_cg, "devices.allow",
+				  allowed_dev_major[k]);
 	}
 
 	/*
-         * allow or deny access to devices according to gres permissions for the job
+         * allow or deny access to devices according to job GRES permissions
          */
 	for (k = 0; k < gres_conf_lines; k++) {
-		if (gres_bit_alloc[k] == 1) {
+		if (gres_job_bit_alloc[k] == 1) {
 			info("Allowing access to device %s", gres_cgroup[k]);
 			xcgroup_set_param(&job_devices_cg, "devices.allow",
                                           gres_cgroup[k]);
@@ -368,9 +363,8 @@ extern int task_cgroup_devices_create(stepd_step_rec_t *job)
 	 * use job's user uid/gid to enable tasks cgroups creation by
 	 * the user inside the step cgroup owned by root
 	 */
-	if ( xcgroup_create(&devices_ns,&step_devices_cg,
-			    jobstep_cgroup_path,
-			    uid,gid) != XCGROUP_SUCCESS ) {
+	if (xcgroup_create(&devices_ns, &step_devices_cg, jobstep_cgroup_path,
+			   uid, gid) != XCGROUP_SUCCESS ) {
 		/* do not delete user/job cgroup as */
 		/* they can exist for other steps */
 		xcgroup_destroy(&user_devices_cg);
@@ -385,48 +379,50 @@ extern int task_cgroup_devices_create(stepd_step_rec_t *job)
 	}
 
 
-	if (job->stepid != SLURM_BATCH_SCRIPT &&
-	    job->stepid != SLURM_EXTERN_CONT) {
-
-		gres_step_bit_alloc = xmalloc ( sizeof (int) * (gres_conf_lines + 1));
+	if ((job->stepid != SLURM_BATCH_SCRIPT) &&
+	    (job->stepid != SLURM_EXTERN_CONT)) {
 
-		/* fetch information concerning the gres devices allocation for the step */
+		/* fetch information about step GRES devices allocation */
+		gres_step_bit_alloc = xmalloc(sizeof (int) * (gres_conf_lines + 10));
 		gres_plugin_step_state_file(step_gres_list, gres_step_bit_alloc,
-				    gres_count);
-
+					    gres_count);
 
 		/*
-		 * with the current cgroup devices subsystem design (whitelist only supported)
-		 * we need to allow all different devices that are supposed to be allowed by
-		 * default.
+		 * with the current cgroup devices subsystem design (whitelist
+		 * only supported) we need to allow all different devices that
+		 * are supposed to be allowed by default.
 		 */
 		for (k = 0; k < allow_lines; k++) {
-			info("Default access allowed to device %s", allowed_dev_major[k]);
-			xcgroup_set_param(&step_devices_cg,"devices.allow",
+			info("Default access allowed to device %s",
+			     allowed_dev_major[k]);
+			xcgroup_set_param(&step_devices_cg, "devices.allow",
 					  allowed_dev_major[k]);
 		}
 
 		/*
-		 * allow or deny access to devices according to gres permissions for the step
+		 * allow or deny access to devices according to GRES permissions
+		 * for the step
 		 */
 		for (k = 0; k < gres_conf_lines; k++) {
-			if (gres_step_bit_alloc[k] == 1){
+			if (gres_step_bit_alloc[k] == 1) {
 				info("Allowing access to device %s for step",
 				     gres_cgroup[k]);
-				xcgroup_set_param(&step_devices_cg, "devices.allow",
+				xcgroup_set_param(&step_devices_cg,
+						 "devices.allow",
 						  gres_cgroup[k]);
 			} else {
 				info("Not allowing access to device %s for step",
 				     gres_cgroup[k]);
-			xcgroup_set_param(&step_devices_cg, "devices.deny",
-					  gres_cgroup[k]);
+				xcgroup_set_param(&step_devices_cg,
+						 "devices.deny",
+						  gres_cgroup[k]);
 			}
 		}
 	}
 	/* attach the slurmstepd to the step devices cgroup */
 	pid_t pid = getpid();
-	rc = xcgroup_add_pids(&step_devices_cg,&pid,1);
-	if ( rc != XCGROUP_SUCCESS ) {
+	rc = xcgroup_add_pids(&step_devices_cg, &pid, 1);
+	if (rc != XCGROUP_SUCCESS) {
 		error("task/cgroup: unable to add slurmstepd to devices cg '%s'",
 		      step_devices_cg.path);
 		fstatus = SLURM_ERROR;
@@ -437,9 +433,12 @@ extern int task_cgroup_devices_create(stepd_step_rec_t *job)
 error:
 	xcgroup_unlock(&devices_cg);
 	xcgroup_destroy(&devices_cg);
-
 	xfree(gres_step_bit_alloc);
-	xfree(gres_bit_alloc);
+	xfree(gres_job_bit_alloc);
+	xfree(gres_name);
+	xfree(dev_path);
+	xfree(gres_cgroup);
+
 	return fstatus;
 }
 
diff --git a/src/plugins/task/cray/Makefile.in b/src/plugins/task/cray/Makefile.in
index 75a8f03ed3aeec53faf035ecf061d35af2c91843..4843a0d52529d13a778d802c0287c95f0e904da9 100644
--- a/src/plugins/task/cray/Makefile.in
+++ b/src/plugins/task/cray/Makefile.in
@@ -385,9 +385,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/task/none/Makefile.in b/src/plugins/task/none/Makefile.in
index 1b68f4dc49d8baebdfb8c36e463b55de49599332..598ce9ed2da019ffa325e8bc7d554f69ff9b3a90 100644
--- a/src/plugins/task/none/Makefile.in
+++ b/src/plugins/task/none/Makefile.in
@@ -385,9 +385,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/topology/3d_torus/Makefile.in b/src/plugins/topology/3d_torus/Makefile.in
index cb1ade5329df8cc0cd195e0cbfe510b344fd54af..79d4f66334b5dd3f3d4fb91fa04d49be99e564de 100644
--- a/src/plugins/topology/3d_torus/Makefile.in
+++ b/src/plugins/topology/3d_torus/Makefile.in
@@ -387,9 +387,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/topology/Makefile.in b/src/plugins/topology/Makefile.in
index 714b9575ad798ef25076e5166b46f5a2fd96f0ac..e65a6b2e71fa740d0e7f0aebde7ab6426c7eab6d 100644
--- a/src/plugins/topology/Makefile.in
+++ b/src/plugins/topology/Makefile.in
@@ -365,9 +365,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/topology/hypercube/Makefile.in b/src/plugins/topology/hypercube/Makefile.in
index fca5aa583482a1e386b961559a8a670cf3617df5..435e96e4aaf3298ecc3b0f7ced66950f820f8e78 100644
--- a/src/plugins/topology/hypercube/Makefile.in
+++ b/src/plugins/topology/hypercube/Makefile.in
@@ -386,9 +386,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/topology/node_rank/Makefile.in b/src/plugins/topology/node_rank/Makefile.in
index 9fdd1fa4c945f75ab26869b9e8bd19533c06fd40..27e59df3e9056f7db0eafaae45c7b008acb4125d 100644
--- a/src/plugins/topology/node_rank/Makefile.in
+++ b/src/plugins/topology/node_rank/Makefile.in
@@ -386,9 +386,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/topology/none/Makefile.in b/src/plugins/topology/none/Makefile.in
index 7cd56b126d524fc1494da0e9c46e45159540f248..fae199999d13b41e5d852704943666d63def97f0 100644
--- a/src/plugins/topology/none/Makefile.in
+++ b/src/plugins/topology/none/Makefile.in
@@ -386,9 +386,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/plugins/topology/tree/Makefile.in b/src/plugins/topology/tree/Makefile.in
index f0cd3be7a99e260f6b89613ad23d6b0c416524e7..1706947683e06a321fbc1f658bd63ac7547566d9 100644
--- a/src/plugins/topology/tree/Makefile.in
+++ b/src/plugins/topology/tree/Makefile.in
@@ -386,9 +386,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/sacct/Makefile.in b/src/sacct/Makefile.in
index 20ec07c7d23963d07ea97c3c21d045ccbe7a1629..a3fd0e3a33713e740edcdc844054d38a41b8929a 100644
--- a/src/sacct/Makefile.in
+++ b/src/sacct/Makefile.in
@@ -365,9 +365,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/sacctmgr/Makefile.in b/src/sacctmgr/Makefile.in
index e91809156b5d280f917a442671cd72e89a56d950..b8f2a43f1c5bd4d4df27c2080cd32b0dfda948a4 100644
--- a/src/sacctmgr/Makefile.in
+++ b/src/sacctmgr/Makefile.in
@@ -371,9 +371,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/salloc/Makefile.in b/src/salloc/Makefile.in
index 2e90f4f71fc4bded7f69c5cc74fcfd615224e606..2fc5935bee1bbf48e2ba572fee46b34de5def1c0 100644
--- a/src/salloc/Makefile.in
+++ b/src/salloc/Makefile.in
@@ -363,9 +363,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/sattach/Makefile.in b/src/sattach/Makefile.in
index 6426f4c7f00e510f68e227b46c78820b4586db7d..ca0876088228fc16e1327bffce5ffea70fe979f9 100644
--- a/src/sattach/Makefile.in
+++ b/src/sattach/Makefile.in
@@ -363,9 +363,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/sbatch/Makefile.in b/src/sbatch/Makefile.in
index 1971fd8e83d2401d08a18115f55cdb6fbabdc549..941df53ba20b09f0ce1863439215c75f128fb8cb 100644
--- a/src/sbatch/Makefile.in
+++ b/src/sbatch/Makefile.in
@@ -362,9 +362,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/sbcast/Makefile.in b/src/sbcast/Makefile.in
index 72dde77de375a1f47d31d6e6a87c57ba15290521..68eae0ee0ea914076a108a8bb34fbf2ee0a8b58b 100644
--- a/src/sbcast/Makefile.in
+++ b/src/sbcast/Makefile.in
@@ -366,9 +366,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/scancel/Makefile.in b/src/scancel/Makefile.in
index 7cea2093aab6646d8ef5e92b93c22ec9208f6319..6aa63f6980df7a4630cc08056dc54fe5b69cd24c 100644
--- a/src/scancel/Makefile.in
+++ b/src/scancel/Makefile.in
@@ -364,9 +364,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/scontrol/Makefile.in b/src/scontrol/Makefile.in
index fd52ae197fdaa0f82a0bb26bed20b79dcb90d6d6..8ebb6fe2d29fac66c4f3380f917f85acf22876cc 100644
--- a/src/scontrol/Makefile.in
+++ b/src/scontrol/Makefile.in
@@ -369,9 +369,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/sdiag/Makefile.in b/src/sdiag/Makefile.in
index 21422c1ee6bd464fb0c96a2647e3031420aa7fb3..97f05e94d009b6c91a43c9f7685b07d382169a0f 100644
--- a/src/sdiag/Makefile.in
+++ b/src/sdiag/Makefile.in
@@ -362,9 +362,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/sinfo/Makefile.in b/src/sinfo/Makefile.in
index 49220b361fea844a3c7c075314084735a3abef8b..063aaa83214ed5b5da905a3b9341328fae716407 100644
--- a/src/sinfo/Makefile.in
+++ b/src/sinfo/Makefile.in
@@ -366,9 +366,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/slurmctld/Makefile.in b/src/slurmctld/Makefile.in
index 55fab751361d30002f1a1bf0037a23a6db035e4c..86d37939f9d3237f743386da84bdd363589845e8 100644
--- a/src/slurmctld/Makefile.in
+++ b/src/slurmctld/Makefile.in
@@ -374,9 +374,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/slurmd/Makefile.in b/src/slurmd/Makefile.in
index 5e9d71798b93762674427d82c0421d8e2cb80fe7..dabdc65a7c386d8fecd42538286c54f8f076852c 100644
--- a/src/slurmd/Makefile.in
+++ b/src/slurmd/Makefile.in
@@ -363,9 +363,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/slurmd/common/Makefile.in b/src/slurmd/common/Makefile.in
index 7bc5693208522f1ffba5a5b9e770fab1fe8fc3f6..f3dce0afc881cc4a640a7f9020060f9edc7858a9 100644
--- a/src/slurmd/common/Makefile.in
+++ b/src/slurmd/common/Makefile.in
@@ -376,9 +376,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/slurmd/slurmd/Makefile.in b/src/slurmd/slurmd/Makefile.in
index bd8db233902d210876b4b47fab045c7916145e3f..b875727cde57273928b0e75585f2539440562aa8 100644
--- a/src/slurmd/slurmd/Makefile.in
+++ b/src/slurmd/slurmd/Makefile.in
@@ -367,9 +367,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/slurmd/slurmstepd/Makefile.in b/src/slurmd/slurmstepd/Makefile.in
index a2f09aa19a53cd3d20d3814f2fb5a732a2042e03..99a002f7eeac5d1e3aa90fda71ed8fd997cc2e28 100644
--- a/src/slurmd/slurmstepd/Makefile.in
+++ b/src/slurmd/slurmstepd/Makefile.in
@@ -369,9 +369,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/slurmdbd/Makefile.in b/src/slurmdbd/Makefile.in
index 2941710829da3c45f172ae51f324793f904ed89c..6291330d7571f0542f7a03d8636508f545493554 100644
--- a/src/slurmdbd/Makefile.in
+++ b/src/slurmdbd/Makefile.in
@@ -363,9 +363,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/smap/Makefile.in b/src/smap/Makefile.in
index ccf4b381ffd1ff85c593e24a4aca085e4588c820..a0b1fc8cc2c9897addb5b53674ca19c88812347d 100644
--- a/src/smap/Makefile.in
+++ b/src/smap/Makefile.in
@@ -385,9 +385,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/smd/Makefile.in b/src/smd/Makefile.in
index 42955dcc7fd849a24b660e5f27f6ff097e93ea8a..52dd3d8577a98040633188f6915dbc7458924195 100644
--- a/src/smd/Makefile.in
+++ b/src/smd/Makefile.in
@@ -303,9 +303,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/sprio/Makefile.in b/src/sprio/Makefile.in
index b1f9c7f1780895db2457877828b132c0f7ebc0d1..7ff9713e1419d5108f5358519567ac8469a6fc1a 100644
--- a/src/sprio/Makefile.in
+++ b/src/sprio/Makefile.in
@@ -365,9 +365,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/squeue/Makefile.in b/src/squeue/Makefile.in
index 4619d154e9f4523346e45f64eaab38dbe2934417..763baba23f4b1cac2fbe2d0acad9f77bb0ff8680 100644
--- a/src/squeue/Makefile.in
+++ b/src/squeue/Makefile.in
@@ -366,9 +366,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/sreport/Makefile.in b/src/sreport/Makefile.in
index d46ef67c54cfcfecdf32f2be27523e3cbdb2b646..2b03acd5502a8f1edb72e731d9aba95796010d49 100644
--- a/src/sreport/Makefile.in
+++ b/src/sreport/Makefile.in
@@ -363,9 +363,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/srun/Makefile.in b/src/srun/Makefile.in
index d6913c6ed45f90ad5a9d64067f159014baf73113..9042ac56e5fb6081b13778ea0e6ae84c65a5bb6a 100644
--- a/src/srun/Makefile.in
+++ b/src/srun/Makefile.in
@@ -407,9 +407,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/srun/libsrun/Makefile.in b/src/srun/libsrun/Makefile.in
index 9edec9fd3ef163caaac5fbca72ffc6a1e1221118..e4c21a0fc92bfa55a33c57f699ab84db97ea9eb6 100644
--- a/src/srun/libsrun/Makefile.in
+++ b/src/srun/libsrun/Makefile.in
@@ -359,9 +359,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/srun_cr/Makefile.in b/src/srun_cr/Makefile.in
index 64b783c75aa434872c9d33faa10372c408d3d32d..17693eab6de74ad495bf5bcffe6a5470094e357e 100644
--- a/src/srun_cr/Makefile.in
+++ b/src/srun_cr/Makefile.in
@@ -367,9 +367,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/sshare/Makefile.in b/src/sshare/Makefile.in
index 0aeeca094940efb49c0e12778082864b6a9010c6..2d0d6a1f58411205ccd6f2a0e0f1faddafc13919 100644
--- a/src/sshare/Makefile.in
+++ b/src/sshare/Makefile.in
@@ -361,9 +361,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/sstat/Makefile.in b/src/sstat/Makefile.in
index d2552fd7bee5f998a4caf07811cada1d73f0f653..bfecae1773cf55b807e1c7b58cc872902cacbb05 100644
--- a/src/sstat/Makefile.in
+++ b/src/sstat/Makefile.in
@@ -362,9 +362,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/strigger/Makefile.in b/src/strigger/Makefile.in
index f47653547b1653dd63d11e53a763e853271e8aad..17740745253c2486b2f22f0ff2afe27468b4b9f5 100644
--- a/src/strigger/Makefile.in
+++ b/src/strigger/Makefile.in
@@ -365,9 +365,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/src/sview/Makefile.in b/src/sview/Makefile.in
index 33cf3662ff330672b33b713ea6a87dca5e06a562..687d7095726722fec1aeabfb9468e9caaf748ba2 100644
--- a/src/sview/Makefile.in
+++ b/src/sview/Makefile.in
@@ -389,9 +389,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/testsuite/Makefile.in b/testsuite/Makefile.in
index 101d2fc157b155b0f8a3ae06233040a840338ab1..355fb1014f923810ebd3957441e01defc4a7824c 100644
--- a/testsuite/Makefile.in
+++ b/testsuite/Makefile.in
@@ -370,9 +370,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/testsuite/expect/Makefile.in b/testsuite/expect/Makefile.in
index 7177ef2e96c3379adea3a52c5f1acf4f9ffa11cb..1bf840021d0b50d4a925d8d802263f92fb953d1b 100644
--- a/testsuite/expect/Makefile.in
+++ b/testsuite/expect/Makefile.in
@@ -303,9 +303,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/testsuite/slurm_unit/Makefile.in b/testsuite/slurm_unit/Makefile.in
index e0a4721c2d350fad71559a0515fadec0b54b04d3..727391902ec5fc25fbcb9d7d3de0b8c1314f938a 100644
--- a/testsuite/slurm_unit/Makefile.in
+++ b/testsuite/slurm_unit/Makefile.in
@@ -363,9 +363,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/testsuite/slurm_unit/api/Makefile.in b/testsuite/slurm_unit/api/Makefile.in
index a7775564c9e97cac5b55ed9571446cd183469608..72af44543f2f2e8cd37640a3c2172d3a07b9cd20 100644
--- a/testsuite/slurm_unit/api/Makefile.in
+++ b/testsuite/slurm_unit/api/Makefile.in
@@ -601,9 +601,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/testsuite/slurm_unit/api/manual/Makefile.in b/testsuite/slurm_unit/api/manual/Makefile.in
index c2d0f92453af9ab84bdd4f487364f78974b50dd1..9f04110a3781bd8ab2a1c2ff90a00b567dab2b30 100644
--- a/testsuite/slurm_unit/api/manual/Makefile.in
+++ b/testsuite/slurm_unit/api/manual/Makefile.in
@@ -387,9 +387,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/testsuite/slurm_unit/common/Makefile.in b/testsuite/slurm_unit/common/Makefile.in
index ed52ea5d401c1431b9258fa1e13603872aeb354d..36871ed9daf6eded4446ab23c0ad4796c203a2ff 100644
--- a/testsuite/slurm_unit/common/Makefile.in
+++ b/testsuite/slurm_unit/common/Makefile.in
@@ -594,9 +594,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PMIX_CPPFLAGS = @PMIX_CPPFLAGS@
-PMIX_LDFLAGS = @PMIX_LDFLAGS@
 PMIX_LIBS = @PMIX_LIBS@
+PMIX_V1_CPPFLAGS = @PMIX_V1_CPPFLAGS@
+PMIX_V1_LDFLAGS = @PMIX_V1_LDFLAGS@
+PMIX_V2_CPPFLAGS = @PMIX_V2_CPPFLAGS@
+PMIX_V2_LDFLAGS = @PMIX_V2_LDFLAGS@
 PROJECT = @PROJECT@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@