Merge pull request #6230 from ggouaillardet/topic/pmix_refresh

pmix/pmi4x: refresh to latest PMIx

Author: ggouaillardet

.gitignore

@@ -367,6 +367,8 @@ opal/mca/hwloc/base/static-components.h.new.struct
 
 opal/mca/installdirs/config/install_dirs.h
 
+!opal/mca/pmix/pmix*/pmix/AUTHORS
+!opal/mca/pmix/pmix*/pmix/contrib/perf_tools/Makefile
 opal/mca/pmix/pmix*/pmix/include/pmix/autogen/config.h
 opal/mca/pmix/pmix*/pmix/include/pmix/autogen/config.h.in
 opal/mca/pmix/pmix*/pmix/src/include/private/autogen/config.h.in

opal/mca/pmix/pmix4x/pmix/Makefile.am

@@ -37,10 +37,6 @@ dist_pmixdata_DATA =
 if ! PMIX_EMBEDDED_MODE
 dist_pmixdata_DATA += contrib/pmix-valgrind.supp
 
-if PMIX_HAVE_PANDOC
-SUBDIRS += man
-endif
-
 endif
 
 if PMIX_TESTS_EXAMPLES

opal/mca/pmix/pmix4x/pmix/VERSION

@@ -30,7 +30,7 @@ greek=
 # command, or with the date (if "git describe" fails) in the form of
 # "date<date>".
 
-repo_rev=git2d4c2874
+repo_rev=gitfae0ee7d
 
 # If tarball_version is not empty, it is used as the version string in
 # the tarball filename, regardless of all other versions listed in
@@ -44,7 +44,7 @@ tarball_version=
 
 # The date when this release was created
 
-date="Dec 18, 2018"
+date="Dec 28, 2018"
 
 # The shared library version of each of PMIx's public libraries.
 # These versions are maintained in accordance with the "Library

opal/mca/pmix/pmix4x/pmix/config/pmix.m4

@@ -679,10 +679,6 @@ AC_DEFUN([PMIX_SETUP_CORE],[
           [AC_DEFINE_UNQUOTED([HAVE_UNIX_BYTESWAP], [1],
                               [whether unix byteswap routines -- htonl, htons, nothl, ntohs -- are available])])
 
-    # check pandoc separately so we can setup an AM_CONDITIONAL off it
-    AC_CHECK_PROG([pmix_have_pandoc], [pandoc], [yes], [no])
-    AM_CONDITIONAL([PMIX_HAVE_PANDOC], [test "x$pmix_have_pandoc" = "xyes"])
-
     #
     # Make sure we can copy va_lists (need check declared, not linkable)
     #
@@ -1104,20 +1100,6 @@ AC_DEFINE_UNQUOTED([PMIX_ENABLE_TIMING], [$WANT_PMIX_TIMING],
                    [Whether we want developer-level timing support or not])
 
 #
-# Install header files
-#
-AC_MSG_CHECKING([if want to head developer-level header files])
-AC_ARG_WITH(devel-headers,
-              AC_HELP_STRING([--with-devel-headers],
-                             [also install developer-level header files (only for internal PMIx developers, default: disabled)]))
-if test "$with_devel_headers" = "yes"; then
-    AC_MSG_RESULT([yes])
-    WANT_INSTALL_HEADERS=1
-else
-    AC_MSG_RESULT([no])
-    WANT_INSTALL_HEADERS=0
-fi
-
 #
 # Install backward compatibility support for PMI-1 and PMI-2
 #

opal/mca/pmix/pmix4x/pmix/configure.ac

@@ -249,7 +249,6 @@ AC_SUBST([libmca_common_dstore_so_version])
 
 AC_CONFIG_FILES(pmix_config_prefix[contrib/Makefile]
                 pmix_config_prefix[examples/Makefile]
-                pmix_config_prefix[man/Makefile]
                 pmix_config_prefix[test/Makefile]
                 pmix_config_prefix[test/simple/Makefile])
 

opal/mca/pmix/pmix4x/pmix/contrib/Makefile.am

@@ -25,8 +25,6 @@
 EXTRA_DIST = \
 	make_dist_tarball \
 	buildrpm.sh \
-	cron-run-all-md2nroff.pl \
-        md2nroff.pl \
 	platform/optimized \
         pmix_jenkins.sh \
         pmix-release.sh \