[pmix] 01/16: Upstream release 2.0.1

Alastair McKinstry mckinstry at moszumanska.debian.org
Wed Oct 25 13:55:30 UTC 2017


This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to branch debian/master
in repository pmix.

commit ebc8c9feab0701fd1388e19241b28ed03d4c7368
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon Sep 18 15:37:58 2017 +0100

    Upstream release 2.0.1
---
 AUTHORS                                            |    39 +
 INSTALL                                            |    87 +
 LICENSE                                            |    93 +
 Makefile.am                                        |    64 +
 Makefile.in                                        |  1112 +
 NEWS                                               |   207 +
 README                                             |   315 +
 VERSION                                            |    78 +
 aclocal.m4                                         |  1284 +
 autogen.pl                                         |   739 +
 config/Makefile.am                                 |    51 +
 config/Makefile.in                                 |   654 +
 config/ar-lib                                      |   270 +
 config/autogen_found_items.m4                      |    72 +
 config/c_get_alignment.m4                          |    72 +
 config/compile                                     |   347 +
 config/config.guess                                |  1421 +
 config/config.sub                                  |  1807 +
 config/depcomp                                     |   791 +
 config/distscript.sh                               |    56 +
 config/install-sh                                  |   501 +
 config/libtool.m4                                  |  8369 +++
 config/ltmain.sh                                   | 11147 ++++
 config/ltoptions.m4                                |   437 +
 config/ltsugar.m4                                  |   124 +
 config/ltversion.m4                                |    23 +
 config/lt~obsolete.m4                              |    99 +
 config/missing                                     |   215 +
 config/pmix.m4                                     |  1052 +
 config/pmix_check_attributes.m4                    |   539 +
 config/pmix_check_broken_qsort.m4                  |    55 +
 config/pmix_check_compiler_version.m4              |    90 +
 config/pmix_check_icc.m4                           |    62 +
 config/pmix_check_ident.m4                         |   103 +
 config/pmix_check_lock.m4                          |    61 +
 config/pmix_check_os_flavors.m4                    |    69 +
 config/pmix_check_package.m4                       |   186 +
 config/pmix_check_psm2.m4                          |    89 +
 config/pmix_check_pthread_pids.m4                  |   109 +
 config/pmix_check_vendor.m4                        |   252 +
 config/pmix_check_visibility.m4                    |    93 +
 config/pmix_check_withdir.m4                       |    39 +
 config/pmix_config_asm.m4                          |  1197 +
 config/pmix_config_pthreads.m4                     |   669 +
 config/pmix_config_subdir.m4                       |   147 +
 config/pmix_config_subdir_args.m4                  |    84 +
 config/pmix_config_threads.m4                      |    71 +
 config/pmix_ensure_contains_optflags.m4            |    67 +
 config/pmix_functions.m4                           |   670 +
 config/pmix_get_version.sh                         |   161 +
 config/pmix_load_platform.m4                       |    81 +
 config/pmix_mca.m4                                 |   918 +
 config/pmix_mca_priority_sort.pl                   |    31 +
 config/pmix_search_libs.m4                         |    34 +
 config/pmix_setup_cc.m4                            |   333 +
 config/pmix_setup_libevent.m4                      |   122 +
 config/pmix_setup_zlib.m4                          |    88 +
 config/pmix_try_assemble.m4                        |    52 +
 config/ylwrap                                      |   247 +
 configure                                          | 57108 +++++++++++++++++++
 configure.ac                                       |   236 +
 contrib/Makefile.am                                |    39 +
 contrib/Makefile.in                                |   715 +
 contrib/buildrpm.sh                                |   288 +
 contrib/cron-run-all-md2nroff.pl                   |   187 +
 contrib/make_dist_tarball                          |   428 +
 contrib/md2nroff.pl                                |   164 +
 contrib/perf_tools/Makefile                        |    21 +
 contrib/perf_tools/Makefile.include                |    36 +
 contrib/perf_tools/README                          |    35 +
 contrib/perf_tools/pmi.h                           |    28 +
 contrib/perf_tools/pmi2.c                          |   186 +
 contrib/perf_tools/pmi2_pmap_parser.c              |   244 +
 contrib/perf_tools/pmi2_pmap_parser.h              |    24 +
 contrib/perf_tools/pmi2_utils.c                    |   132 +
 contrib/perf_tools/pmi2_utils.h                    |    11 +
 contrib/perf_tools/pmi_intra_perf.c                |   517 +
 contrib/perf_tools/pmix.c                          |   236 +
 contrib/perf_tools/run.sh                          |    13 +
 contrib/platform/optimized                         |     3 +
 contrib/pmix-release.sh                            |    52 +
 contrib/pmix-valgrind.supp                         |    48 +
 contrib/pmix.spec                                  |   686 +
 contrib/pmix_jenkins.sh                            |   398 +
 contrib/update-my-copyright.pl                     |   347 +
 contrib/whitespace-purge.sh                        |    25 +
 examples/Makefile.am                               |    78 +
 examples/Makefile.in                               |   935 +
 examples/alloc.c                                   |   235 +
 examples/client.c                                  |   284 +
 examples/debugger.c                                |   543 +
 examples/debuggerd.c                               |   227 +
 examples/dmodex.c                                  |   234 +
 examples/dynamic.c                                 |   203 +
 examples/fault.c                                   |   131 +
 examples/jctrl.c                                   |   229 +
 examples/pub.c                                     |   164 +
 examples/server.c                                  |   893 +
 examples/tool.c                                    |    86 +
 include/Makefile.am                                |    30 +
 include/Makefile.in                                |   773 +
 include/pmi.h                                      |   836 +
 include/pmi2.h                                     |   569 +
 include/pmix.h                                     |   539 +
 include/pmix_common.h                              |  1823 +
 include/pmix_rename.h.in                           |    74 +
 include/pmix_server.h                              |   541 +
 include/pmix_tool.h                                |   105 +
 include/pmix_version.h.in                          |    19 +
 man/Makefile.am                                    |    60 +
 man/Makefile.in                                    |   780 +
 man/README                                         |   186 +
 man/man3/pmix_abort.3                              |    62 +
 man/man3/pmix_commit.3                             |    35 +
 man/man3/pmix_finalize.3                           |    45 +
 man/man3/pmix_init.3                               |    52 +
 man/man3/pmix_initialized.3                        |    30 +
 man/man3/pmix_put.3                                |    60 +
 man/man7/pmix.7                                    |    35 +
 man/man7/pmix_constants.7                          |    79 +
 src/Makefile.am                                    |    95 +
 src/Makefile.in                                    |  2088 +
 src/atomics/sys/Makefile.include                   |    44 +
 src/atomics/sys/architecture.h                     |    57 +
 src/atomics/sys/arm/Makefile.include               |    24 +
 src/atomics/sys/arm/atomic.h                       |   277 +
 src/atomics/sys/arm/timer.h                        |    33 +
 src/atomics/sys/arm64/Makefile.include             |    24 +
 src/atomics/sys/arm64/atomic.h                     |   302 +
 src/atomics/sys/arm64/timer.h                      |    45 +
 src/atomics/sys/atomic.h                           |   615 +
 src/atomics/sys/atomic_impl.h                      |   438 +
 src/atomics/sys/cma.h                              |   125 +
 src/atomics/sys/gcc_builtin/Makefile.include       |    26 +
 src/atomics/sys/gcc_builtin/atomic.h               |   231 +
 src/atomics/sys/ia32/Makefile.include              |    24 +
 src/atomics/sys/ia32/atomic.h                      |   223 +
 src/atomics/sys/ia32/timer.h                       |    58 +
 src/atomics/sys/ia64/Makefile.include              |    24 +
 src/atomics/sys/ia64/atomic.h                      |   146 +
 src/atomics/sys/ia64/timer.h                       |    48 +
 src/atomics/sys/mips/Makefile.include              |    24 +
 src/atomics/sys/mips/atomic.h                      |   199 +
 src/atomics/sys/mips/timer.h                       |    33 +
 src/atomics/sys/powerpc/Makefile.include           |    24 +
 src/atomics/sys/powerpc/atomic.h                   |   462 +
 src/atomics/sys/powerpc/timer.h                    |    52 +
 src/atomics/sys/sparcv9/Makefile.include           |    24 +
 src/atomics/sys/sparcv9/atomic.h                   |   198 +
 src/atomics/sys/sparcv9/timer.h                    |    67 +
 src/atomics/sys/sync_builtin/Makefile.include      |    24 +
 src/atomics/sys/sync_builtin/atomic.h              |   137 +
 src/atomics/sys/timer.h                            |   117 +
 src/atomics/sys/x86_64/Makefile.include            |    26 +
 src/atomics/sys/x86_64/atomic.h                    |   281 +
 src/atomics/sys/x86_64/timer.h                     |    75 +
 src/buffer_ops/Makefile.am                         |    36 +
 src/buffer_ops/buffer_ops.h                        |   315 +
 src/buffer_ops/copy.c                              |  1465 +
 src/buffer_ops/internal.h                          |   538 +
 src/buffer_ops/internal_functions.c                |   117 +
 src/buffer_ops/open_close.c                        |   755 +
 src/buffer_ops/pack.c                              |  1046 +
 src/buffer_ops/print.c                             |  1493 +
 src/buffer_ops/types.h                             |   105 +
 src/buffer_ops/unpack.c                            |  1415 +
 src/class/Makefile.include                         |    42 +
 src/class/pmix_hash_table.c                        |   796 +
 src/class/pmix_hash_table.h                        |   399 +
 src/class/pmix_hotel.c                             |   137 +
 src/class/pmix_hotel.h                             |   355 +
 src/class/pmix_list.c                              |   259 +
 src/class/pmix_list.h                              |   909 +
 src/class/pmix_object.c                            |   226 +
 src/class/pmix_object.h                            |   506 +
 src/class/pmix_pointer_array.c                     |   439 +
 src/class/pmix_pointer_array.h                     |   205 +
 src/class/pmix_ring_buffer.c                       |   154 +
 src/class/pmix_ring_buffer.h                       |   102 +
 src/class/pmix_value_array.c                       |    66 +
 src/class/pmix_value_array.h                       |   280 +
 src/client/Makefile.include                        |    29 +
 src/client/pmi1.c                                  |   856 +
 src/client/pmi2.c                                  |   801 +
 src/client/pmix_client.c                           |  1119 +
 src/client/pmix_client_connect.c                   |   368 +
 src/client/pmix_client_fence.c                     |   265 +
 src/client/pmix_client_get.c                       |   809 +
 src/client/pmix_client_ops.h                       |    31 +
 src/client/pmix_client_pub.c                       |   596 +
 src/client/pmix_client_spawn.c                     |   256 +
 src/common/Makefile.include                        |    18 +
 src/common/pmix_control.c                          |   285 +
 src/common/pmix_data.c                             |   159 +
 src/common/pmix_jobdata.c                          |   415 +
 src/common/pmix_log.c                              |   145 +
 src/common/pmix_query.c                            |   254 +
 src/common/pmix_strings.c                          |   224 +
 src/dstore/Makefile.include                        |    16 +
 src/dstore/pmix_dstore.c                           |   100 +
 src/dstore/pmix_dstore.h                           |   137 +
 src/dstore/pmix_esh.c                              |  2539 +
 src/dstore/pmix_esh.h                              |   126 +
 src/event/Makefile.include                         |    16 +
 src/event/pmix_event.h                             |   195 +
 src/event/pmix_event_notification.c                |  1196 +
 src/event/pmix_event_registration.c                |  1000 +
 src/include/Makefile.include                       |    48 +
 src/include/align.h                                |    29 +
 src/include/hash_string.h                          |    69 +
 src/include/pmix_config.h                          |   825 +
 src/include/pmix_config.h.in                       |   824 +
 src/include/pmix_config_bottom.h                   |   564 +
 src/include/pmix_config_top.h                      |    40 +
 src/include/pmix_globals.c                         |   300 +
 src/include/pmix_globals.h                         |   408 +
 src/include/pmix_jobdata.h                         |    24 +
 src/include/pmix_socket_errno.h                    |    26 +
 src/include/pmix_stdint.h                          |   127 +
 src/include/prefetch.h                             |    39 +
 src/include/types.h                                |   268 +
 src/mca/Makefile.include                           |    26 +
 src/mca/base/Makefile.am                           |    66 +
 src/mca/base/Makefile.in                           |   920 +
 src/mca/base/base.h                                |   246 +
 src/mca/base/help-mca-base.txt                     |    61 +
 src/mca/base/help-mca-var.txt                      |   139 +
 src/mca/base/pmix_mca_base_close.c                 |    68 +
 src/mca/base/pmix_mca_base_component_compare.c     |   152 +
 src/mca/base/pmix_mca_base_component_find.c        |   389 +
 src/mca/base/pmix_mca_base_component_repository.c  |   572 +
 src/mca/base/pmix_mca_base_component_repository.h  |   133 +
 src/mca/base/pmix_mca_base_components_close.c      |    94 +
 src/mca/base/pmix_mca_base_components_open.c       |   164 +
 src/mca/base/pmix_mca_base_components_register.c   |   163 +
 src/mca/base/pmix_mca_base_components_select.c     |   147 +
 src/mca/base/pmix_mca_base_framework.c             |   242 +
 src/mca/base/pmix_mca_base_framework.h             |   244 +
 src/mca/base/pmix_mca_base_list.c                  |    65 +
 src/mca/base/pmix_mca_base_open.c                  |   253 +
 src/mca/base/pmix_mca_base_parse_paramfile.c       |    85 +
 src/mca/base/pmix_mca_base_var.c                   |  2255 +
 src/mca/base/pmix_mca_base_var.h                   |   740 +
 src/mca/base/pmix_mca_base_var_enum.c              |   623 +
 src/mca/base/pmix_mca_base_var_enum.h              |   246 +
 src/mca/base/pmix_mca_base_var_group.c             |   477 +
 src/mca/base/pmix_mca_base_var_group.h             |   173 +
 src/mca/base/pmix_mca_base_vari.h                  |   165 +
 src/mca/mca.h                                      |   324 +
 src/mca/pdl/Makefile.am                            |    36 +
 src/mca/pdl/Makefile.in                            |   881 +
 src/mca/pdl/base/Makefile.am                       |    17 +
 src/mca/pdl/base/base.h                            |   105 +
 src/mca/pdl/base/pdl_base_close.c                  |    26 +
 src/mca/pdl/base/pdl_base_fns.c                    |    70 +
 src/mca/pdl/base/pdl_base_open.c                   |    55 +
 src/mca/pdl/base/pdl_base_select.c                 |    55 +
 src/mca/pdl/configure.m4                           |    80 +
 src/mca/pdl/pdl.h                                  |   186 +
 src/mca/pdl/pdlopen/Makefile.am                    |    23 +
 src/mca/pdl/pdlopen/Makefile.in                    |   778 +
 src/mca/pdl/pdlopen/configure.m4                   |    71 +
 src/mca/pdl/pdlopen/pdl_pdlopen.h                  |    41 +
 src/mca/pdl/pdlopen/pdl_pdlopen_component.c        |   127 +
 src/mca/pdl/pdlopen/pdl_pdlopen_module.c           |   276 +
 src/mca/pdl/plibltdl/Makefile.am                   |    27 +
 src/mca/pdl/plibltdl/Makefile.in                   |   798 +
 src/mca/pdl/plibltdl/configure.m4                  |   124 +
 src/mca/pdl/plibltdl/pdl_libltdl.h                 |    51 +
 src/mca/pdl/plibltdl/pdl_libltdl_component.c       |   158 +
 src/mca/pdl/plibltdl/pdl_libltdl_module.c          |   134 +
 src/mca/pif/Makefile.am                            |    27 +
 src/mca/pif/Makefile.in                            |   861 +
 src/mca/pif/base/Makefile.am                       |    15 +
 src/mca/pif/base/base.h                            |    30 +
 src/mca/pif/base/pif_base_components.c             |   105 +
 src/mca/pif/bsdx_ipv4/Makefile.am                  |    13 +
 src/mca/pif/bsdx_ipv4/Makefile.in                  |   762 +
 src/mca/pif/bsdx_ipv4/configure.m4                 |    46 +
 src/mca/pif/bsdx_ipv4/pif_bsdx.c                   |   192 +
 src/mca/pif/bsdx_ipv6/Makefile.am                  |    13 +
 src/mca/pif/bsdx_ipv6/Makefile.in                  |   762 +
 src/mca/pif/bsdx_ipv6/configure.m4                 |    48 +
 src/mca/pif/bsdx_ipv6/pif_bsdx_ipv6.c              |   228 +
 src/mca/pif/linux_ipv6/Makefile.am                 |    13 +
 src/mca/pif/linux_ipv6/Makefile.in                 |   762 +
 src/mca/pif/linux_ipv6/configure.m4                |    36 +
 src/mca/pif/linux_ipv6/pif_linux_ipv6.c            |   172 +
 src/mca/pif/pif.h                                  |   137 +
 src/mca/pif/posix_ipv4/Makefile.am                 |    13 +
 src/mca/pif/posix_ipv4/Makefile.in                 |   762 +
 src/mca/pif/posix_ipv4/configure.m4                |    55 +
 src/mca/pif/posix_ipv4/pif_posix.c                 |   343 +
 src/mca/pif/solaris_ipv6/Makefile.am               |    13 +
 src/mca/pif/solaris_ipv6/Makefile.in               |   762 +
 src/mca/pif/solaris_ipv6/configure.m4              |    32 +
 src/mca/pif/solaris_ipv6/pif_solaris_ipv6.c        |   212 +
 src/mca/pinstalldirs/Makefile.am                   |    30 +
 src/mca/pinstalldirs/Makefile.in                   |   870 +
 src/mca/pinstalldirs/base/Makefile.am              |    16 +
 src/mca/pinstalldirs/base/base.h                   |    40 +
 .../base/pinstalldirs_base_components.c            |   177 +
 .../pinstalldirs/base/pinstalldirs_base_expand.c   |   174 +
 src/mca/pinstalldirs/config/Makefile.am            |    22 +
 src/mca/pinstalldirs/config/Makefile.in            |   780 +
 src/mca/pinstalldirs/config/configure.m4           |    32 +
 src/mca/pinstalldirs/config/pinstall_dirs.h.in     |   129 +
 .../pinstalldirs/config/pmix_pinstalldirs_config.c |    57 +
 src/mca/pinstalldirs/configure.m4                  |    12 +
 src/mca/pinstalldirs/env/Makefile.am               |    16 +
 src/mca/pinstalldirs/env/Makefile.in               |   766 +
 src/mca/pinstalldirs/env/configure.m4              |    30 +
 src/mca/pinstalldirs/env/pmix_pinstalldirs_env.c   |    84 +
 src/mca/pinstalldirs/pinstalldirs.h                |    98 +
 src/mca/pnet/Makefile.am                           |    44 +
 src/mca/pnet/Makefile.in                           |   899 +
 src/mca/pnet/base/Makefile.include                 |    32 +
 src/mca/pnet/base/base.h                           |    91 +
 src/mca/pnet/base/pnet_base_fns.c                  |   146 +
 src/mca/pnet/base/pnet_base_frame.c                |    93 +
 src/mca/pnet/base/pnet_base_select.c               |   116 +
 src/mca/pnet/opa/Makefile.am                       |    56 +
 src/mca/pnet/opa/Makefile.in                       |   897 +
 src/mca/pnet/opa/configure.m4                      |    42 +
 src/mca/pnet/opa/pnet_opa.c                        |   238 +
 src/mca/pnet/opa/pnet_opa.h                        |    27 +
 src/mca/pnet/opa/pnet_opa_component.c              |    84 +
 src/mca/pnet/pnet.h                                |   122 +
 src/mca/psec/Makefile.am                           |    44 +
 src/mca/psec/Makefile.in                           |   899 +
 src/mca/psec/base/Makefile.include                 |    32 +
 src/mca/psec/base/base.h                           |    94 +
 src/mca/psec/base/psec_base_fns.c                  |   152 +
 src/mca/psec/base/psec_base_frame.c                |    93 +
 src/mca/psec/base/psec_base_select.c               |   112 +
 src/mca/psec/munge/Makefile.am                     |    50 +
 src/mca/psec/munge/Makefile.in                     |   891 +
 src/mca/psec/munge/configure.m4                    |    88 +
 src/mca/psec/munge/psec_munge.c                    |   149 +
 src/mca/psec/munge/psec_munge.h                    |    25 +
 src/mca/psec/munge/psec_munge_component.c          |    91 +
 src/mca/psec/native/Makefile.am                    |    50 +
 src/mca/psec/native/Makefile.in                    |   893 +
 src/mca/psec/native/psec_native.c                  |   213 +
 src/mca/psec/native/psec_native.h                  |    27 +
 src/mca/psec/native/psec_native_component.c        |    91 +
 src/mca/psec/none/Makefile.am                      |    50 +
 src/mca/psec/none/Makefile.in                      |   891 +
 src/mca/psec/none/psec_none.c                      |    63 +
 src/mca/psec/none/psec_none.h                      |    27 +
 src/mca/psec/none/psec_none_component.c            |    91 +
 src/mca/psec/psec.h                                |   183 +
 src/mca/psensor/Makefile.am                        |    32 +
 src/mca/psensor/Makefile.in                        |   874 +
 src/mca/psensor/base/Makefile.am                   |    19 +
 src/mca/psensor/base/base.h                        |    59 +
 src/mca/psensor/base/psensor_base_frame.c          |   103 +
 src/mca/psensor/base/psensor_base_select.c         |    94 +
 src/mca/psensor/base/psensor_base_stubs.c          |    66 +
 src/mca/psensor/file/Makefile.am                   |    37 +
 src/mca/psensor/file/Makefile.in                   |   898 +
 src/mca/psensor/file/help-pmix-psensor-file.txt    |    19 +
 src/mca/psensor/file/psensor_file.c                |   358 +
 src/mca/psensor/file/psensor_file.h                |    38 +
 src/mca/psensor/file/psensor_file_component.c      |    69 +
 src/mca/psensor/heartbeat/Makefile.am              |    38 +
 src/mca/psensor/heartbeat/Makefile.in              |   901 +
 .../heartbeat/help-pmix-psensor-heartbeat.txt      |    20 +
 src/mca/psensor/heartbeat/psensor_heartbeat.c      |   341 +
 src/mca/psensor/heartbeat/psensor_heartbeat.h      |    43 +
 .../heartbeat/psensor_heartbeat_component.c        |    81 +
 src/mca/psensor/psensor.h                          |    86 +
 src/mca/ptl/Makefile.am                            |    44 +
 src/mca/ptl/Makefile.in                            |   910 +
 src/mca/ptl/base/Makefile.include                  |    35 +
 src/mca/ptl/base/base.h                            |   126 +
 src/mca/ptl/base/ptl_base_connect.c                |   249 +
 src/mca/ptl/base/ptl_base_frame.c                  |   259 +
 src/mca/ptl/base/ptl_base_listener.c               |   299 +
 src/mca/ptl/base/ptl_base_select.c                 |    94 +
 src/mca/ptl/base/ptl_base_sendrecv.c               |   729 +
 src/mca/ptl/base/ptl_base_stubs.c                  |   196 +
 src/mca/ptl/ptl.h                                  |   212 +
 src/mca/ptl/ptl_types.h                            |   270 +
 src/mca/ptl/tcp/Makefile.am                        |    50 +
 src/mca/ptl/tcp/Makefile.in                        |   891 +
 src/mca/ptl/tcp/ptl_tcp.c                          |   883 +
 src/mca/ptl/tcp/ptl_tcp.h                          |    59 +
 src/mca/ptl/tcp/ptl_tcp_component.c                |  1270 +
 src/mca/ptl/usock/Makefile.am                      |    50 +
 src/mca/ptl/usock/Makefile.in                      |   891 +
 src/mca/ptl/usock/ptl_usock.c                      |   358 +
 src/mca/ptl/usock/ptl_usock.h                      |    47 +
 src/mca/ptl/usock/ptl_usock_component.c            |   630 +
 src/runtime/Makefile.include                       |    36 +
 src/runtime/help-pmix-runtime.txt                  |    42 +
 src/runtime/pmix_finalize.c                        |   130 +
 src/runtime/pmix_init.c                            |   255 +
 src/runtime/pmix_params.c                          |   117 +
 src/runtime/pmix_progress_threads.c                |   328 +
 src/runtime/pmix_progress_threads.h                |    84 +
 src/runtime/pmix_rte.h                             |    80 +
 src/server/Makefile.include                        |    23 +
 src/server/help-pmix-server.txt                    |    38 +
 src/server/pmix_server.c                           |  2553 +
 src/server/pmix_server_get.c                       |   716 +
 src/server/pmix_server_ops.c                       |  1843 +
 src/server/pmix_server_ops.h                       |   222 +
 src/server/pmix_server_regex.c                     |   553 +
 src/sm/Makefile.include                            |    17 +
 src/sm/pmix_mmap.c                                 |   191 +
 src/sm/pmix_mmap.h                                 |    25 +
 src/sm/pmix_sm.c                                   |    82 +
 src/sm/pmix_sm.h                                   |   121 +
 src/threads/Makefile.include                       |    38 +
 src/threads/mutex.c                                |    94 +
 src/threads/mutex.h                                |   103 +
 src/threads/mutex_unix.h                           |   215 +
 src/threads/thread.c                               |   134 +
 src/threads/thread_usage.h                         |   109 +
 src/threads/threads.h                              |   204 +
 src/threads/tsd.h                                  |   179 +
 src/threads/wait_sync.c                            |   102 +
 src/threads/wait_sync.h                            |   119 +
 src/tool/Makefile.include                          |    11 +
 src/tool/pmix_tool.c                               |   599 +
 src/util/Makefile.include                          |    81 +
 src/util/alfg.c                                    |   136 +
 src/util/alfg.h                                    |    38 +
 src/util/argv.c                                    |   588 +
 src/util/argv.h                                    |   306 +
 src/util/basename.c                                |   139 +
 src/util/basename.h                                |   114 +
 src/util/compress.c                                |   148 +
 src/util/compress.h                                |    57 +
 src/util/crc.c                                     |  1205 +
 src/util/crc.h                                     |   185 +
 src/util/error.c                                   |   177 +
 src/util/error.h                                   |    52 +
 src/util/fd.c                                      |    95 +
 src/util/fd.h                                      |    72 +
 src/util/getid.c                                   |    86 +
 src/util/getid.h                                   |    31 +
 src/util/hash.c                                    |   367 +
 src/util/hash.h                                    |    55 +
 src/util/keyval/Makefile.am                        |    32 +
 src/util/keyval/Makefile.in                        |   791 +
 src/util/keyval/keyval_lex.c                       |  2069 +
 src/util/keyval/keyval_lex.h                       |    74 +
 src/util/keyval/keyval_lex.l                       |   137 +
 src/util/keyval_parse.c                            |   363 +
 src/util/keyval_parse.h                            |    60 +
 src/util/net.c                                     |   486 +
 src/util/net.h                                     |   150 +
 src/util/os_path.c                                 |   106 +
 src/util/os_path.h                                 |    78 +
 src/util/output.c                                  |   956 +
 src/util/output.h                                  |   546 +
 src/util/parse_options.c                           |   143 +
 src/util/parse_options.h                           |    37 +
 src/util/path.c                                    |   717 +
 src/util/path.h                                    |   162 +
 src/util/pif.c                                     |   831 +
 src/util/pif.h                                     |   231 +
 src/util/pmix_environ.c                            |   241 +
 src/util/pmix_environ.h                            |   151 +
 src/util/printf.c                                  |   323 +
 src/util/printf.h                                  |   131 +
 src/util/show_help.c                               |   372 +
 src/util/show_help.h                               |   178 +
 src/util/show_help_lex.c                           |  1863 +
 src/util/show_help_lex.h                           |    67 +
 src/util/show_help_lex.l                           |   114 +
 src/util/strnlen.h                                 |    38 +
 src/util/timings.c                                 |   645 +
 src/util/timings.h                                 |   421 +
 src/util/tsd.h                                     |   172 +
 test/Makefile.am                                   |    76 +
 test/Makefile.in                                   |  1023 +
 test/README                                        |    32 +
 test/cli_stages.c                                  |   277 +
 test/cli_stages.h                                  |    79 +
 test/pmi2_client.c                                 |   572 +
 test/pmi_client.c                                  |   438 +
 test/pmix_client.c                                 |   236 +
 test/pmix_client_otheruser.sh                      |    19 +
 test/pmix_regex.c                                  |    90 +
 test/pmix_test.c                                   |   206 +
 test/server_callbacks.c                            |   348 +
 test/server_callbacks.h                            |    60 +
 test/simple/Makefile.am                            |    78 +
 test/simple/Makefile.in                            |   934 +
 test/simple/simpclient.c                           |   351 +
 test/simple/simpdie.c                              |   159 +
 test/simple/simpdmodex.c                           |   218 +
 test/simple/simpdyn.c                              |   198 +
 test/simple/simpft.c                               |   139 +
 test/simple/simppub.c                              |   169 +
 test/simple/simptest.c                             |   938 +
 test/simple/simptool.c                             |   117 +
 test/simple/test_pmix.c                            |    67 +
 test/test_cd.c                                     |    87 +
 test/test_cd.h                                     |    17 +
 test/test_common.c                                 |   634 +
 test/test_common.h                                 |   335 +
 test/test_error.c                                  |   115 +
 test/test_error.h                                  |    16 +
 test/test_fence.c                                  |   439 +
 test/test_fence.h                                  |    20 +
 test/test_internal.c                               |    87 +
 test/test_internal.h                               |    17 +
 test/test_publish.c                                |   196 +
 test/test_publish.h                                |    18 +
 test/test_replace.c                                |   135 +
 test/test_replace.h                                |    17 +
 test/test_resolve_peers.c                          |   125 +
 test/test_resolve_peers.h                          |    18 +
 test/test_spawn.c                                  |    79 +
 test/test_spawn.h                                  |    18 +
 test/utils.c                                       |   263 +
 test/utils.h                                       |    22 +
 521 files changed, 225297 insertions(+)

diff --git a/AUTHORS b/AUTHORS
new file mode 100644
index 0000000..581a22e
--- /dev/null
+++ b/AUTHORS
@@ -0,0 +1,39 @@
+PMIx Authors
+================
+
+The following cumulative list contains the names and GitHub IDs of
+all individuals who have committed code to the PMIx repository.
+
+Email                           Name                        Affiliation(s)
+------------------------------- --------------------------- -------------------
+alinask                         Elena Shipunova             Mellanox
+annu13                          Annapurna Dasari            Intel
+artpol84                        Artem Polyakov              Mellanox
+ashleypittman                   Ashley Pittman              Intel
+dsolt                           Dave Solt                   IBM
+garlick                         Jim Garlick                 LLNL
+ggouaillardet                   Gilles Gouaillardet         RIST
+hjelmn                          Nathan Hjelm                LANL
+igor-ivanov                     Igor Ivanov                 Mellanox
+jladd-mlnx                      Joshua Ladd                 Mellanox
+jjhursey                        Joshua Hursey               IBM
+jsquyres                        Jeff Squyres                Cisco
+karasevb                        Boris Karasev               Mellanox
+kawashima-fj                    Takahiro Kawashima          Fujitsu
+nkogteva                        Nadezhda Kogteva            Mellanox
+nysal                           Nysal Jan KA                IBM
+PHHargrove                      Paul Hargrove               LBNL
+rhc54                           Ralph Castain               Intel
+------------------------------- --------------------------- -------------------
+
+Affiliation abbreviations:
+--------------------------
+Cisco = Cisco Systems, Inc.
+Fujitsu = Fujitsu
+IBM = International Business Machines, Inc.
+Intel = Intel, Inc.
+LANL = Los Alamos National Laboratory
+LBNL = Lawrence Berkeley National Laboratory
+LLNL = Lawrence Livermore National Laboratory
+Mellanox = Mellanox
+RIST = Research Organization for Information Science and Technology
diff --git a/INSTALL b/INSTALL
new file mode 100644
index 0000000..e1fc5e3
--- /dev/null
+++ b/INSTALL
@@ -0,0 +1,87 @@
+Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+                        University Research and Technology
+                        Corporation.  All rights reserved.
+Copyright (c) 2004-2005 The University of Tennessee and The University
+                        of Tennessee Research Foundation.  All rights
+                        reserved.
+Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+                        University of Stuttgart.  All rights reserved.
+Copyright (c) 2004-2005 The Regents of the University of California.
+                        All rights reserved.
+Copyright (c) 2008-2015 Cisco Systems, Inc.  All rights reserved.
+Copyright (c) 2013-2017 Intel, Inc. All rights reserved.
+$COPYRIGHT$
+
+Additional copyrights may follow
+
+$HEADER$
+
+
+For More Information
+====================
+
+This file is a *very* short overview of building and installing
+the PMIx library.  Much more information is available on the
+PMIx web site (e.g., see the FAQ section):
+
+    http://pmix.github.io/pmix/pmix
+
+
+Developer Builds
+================
+
+If you have checked out a DEVELOPER'S COPY of PMIx (i.e., you checked
+out from Git), you should read the HACKING file before attempting to
+build PMIx.  You must then run:
+
+shell$ ./autogen.pl
+
+You will need very recent versions of GNU Autoconf, Automake, and
+Libtool.  If autogen.sh fails, read the HACKING file.  If anything
+else fails, read the HACKING file.  Finally, we suggest reading the
+HACKING file.
+
+*** NOTE: Developer's copies of PMIx typically include a large
+performance penalty at run-time because of extra debugging overhead.
+
+
+User Builds
+===========
+
+Building PMIx is typically a combination of running "configure"
+and "make".  Execute the following commands to install the PMIx
+system from within the directory at the top of the tree:
+
+shell$ ./configure --prefix=/where/to/install
+[...lots of output...]
+shell$ make all install
+
+If you need special access to install, then you can execute "make
+all" as a user with write permissions in the build tree, and a
+separate "make install" as a user with write permissions to the
+install tree.
+
+Compiling support for specific compilers and environments may
+require additional command line flags when running configure.  See the
+README file for more details.  Note that VPATH builds are fully
+supported.  For example:
+
+shell$ gtar zxf pmix-X.Y.Z.tar.gz
+shell$ cd pmix-X.Y.Z
+shell$ mkdir build
+shell$ cd build
+shell$ ../configure ...your options...
+[...lots of output...]
+shell$ make all install
+
+Parallel builds are also supported (although some versions of "make",
+such as GNU make, will only use the first target listed on the command
+line when executable parallel builds).  For example (assume GNU make):
+
+shell$ make -j 4 all
+[...lots of output...]
+shell$ make install
+
+Parallel make is generally only helpful in the build phase; the
+installation process is mostly serial and does not benefit much from
+parallel make.
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..f9e6f04
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,93 @@
+Most files in this release are marked with the copyrights of the
+organizations who have edited them.  The copyrights below are in no
+particular order and generally reflect members of the Open MPI core
+team who have contributed code that may or may not have been ported
+to PMIx. Per the terms of that LICENSE, we include the list here.
+The copyrights for code used under license from other parties
+are included in the corresponding files.
+
+Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
+                        University Research and Technology
+                        Corporation.  All rights reserved.
+Copyright (c) 2004-2010 The University of Tennessee and The University
+                        of Tennessee Research Foundation.  All rights
+                        reserved.
+Copyright (c) 2004-2010 High Performance Computing Center Stuttgart,
+                        University of Stuttgart.  All rights reserved.
+Copyright (c) 2004-2008 The Regents of the University of California.
+                        All rights reserved.
+Copyright (c) 2006-2010 Los Alamos National Security, LLC.  All rights
+                        reserved.
+Copyright (c) 2006-2010 Cisco Systems, Inc.  All rights reserved.
+Copyright (c) 2006-2010 Voltaire, Inc. All rights reserved.
+Copyright (c) 2006-2011 Sandia National Laboratories. All rights reserved.
+Copyright (c) 2006-2010 Sun Microsystems, Inc.  All rights reserved.
+                        Use is subject to license terms.
+Copyright (c) 2006-2010 The University of Houston. All rights reserved.
+Copyright (c) 2006-2009 Myricom, Inc.  All rights reserved.
+Copyright (c) 2007-2008 UT-Battelle, LLC. All rights reserved.
+Copyright (c) 2007-2010 IBM Corporation.  All rights reserved.
+Copyright (c) 1998-2005 Forschungszentrum Juelich, Juelich Supercomputing
+                        Centre, Federal Republic of Germany
+Copyright (c) 2005-2008 ZIH, TU Dresden, Federal Republic of Germany
+Copyright (c) 2007      Evergrid, Inc. All rights reserved.
+Copyright (c) 2008      Chelsio, Inc.  All rights reserved.
+Copyright (c) 2008-2009 Institut National de Recherche en
+                        Informatique.  All rights reserved.
+Copyright (c) 2007      Lawrence Livermore National Security, LLC.
+                        All rights reserved.
+Copyright (c) 2007-2009 Mellanox Technologies.  All rights reserved.
+Copyright (c) 2006-2010 QLogic Corporation.  All rights reserved.
+Copyright (c) 2008-2010 Oak Ridge National Labs.  All rights reserved.
+Copyright (c) 2006-2010 Oracle and/or its affiliates.  All rights reserved.
+Copyright (c) 2009      Bull SAS.  All rights reserved.
+Copyright (c) 2010      ARM ltd.  All rights reserved.
+Copyright (c) 2010-2011 Alex Brick <bricka at ccs.neu.edu>.  All rights reserved.
+Copyright (c) 2012      The University of Wisconsin-La Crosse. All rights
+                        reserved.
+Copyright (c) 2013-2014 Intel, Inc. All rights reserved.
+Copyright (c) 2011-2014 NVIDIA Corporation.  All rights reserved.
+
+$COPYRIGHT$
+
+Additional copyrights may follow
+
+$HEADER$
+
+The following LICENSE pertains to both PMIx and any code ported
+from Open MPI.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+- Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+
+- Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer listed
+  in this license in the documentation and/or other materials
+  provided with the distribution.
+
+- Neither the name of the copyright holders nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+
+The copyright holders provide no reassurances that the source code
+provided does not infringe any patent, copyright, or any other
+intellectual property rights of third parties.  The copyright holders
+disclaim any liability to any recipient for claims brought against
+recipient by any third party for infringement of that parties
+intellectual property rights.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 0000000..3c74e4a
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,64 @@
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2006-2016 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2012-2013 Los Alamos National Security, Inc.  All rights reserved.
+# Copyright (c) 2013-2016 Intel, Inc. All rights reserved
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# Note that the -I directory must *exactly* match what was specified
+# via AC_CONFIG_MACRO_DIR in configure.ac.
+ACLOCAL_AMFLAGS = -I ./config
+
+SUBDIRS = config contrib include src
+
+
+headers =
+sources =
+nodist_headers =
+EXTRA_DIST = AUTHORS README INSTALL VERSION LICENSE autogen.pl
+
+# Only install the valgrind suppressions file and man pages
+# if we're building in standalone mode
+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
+SUBDIRS += . test examples
+endif
+
+if WANT_INSTALL_HEADERS
+pmixdir = $(pmixincludedir)/$(subdir)
+nobase_pmix_HEADERS = $(headers)
+
+else
+
+noinst_HEADERS = $(headers)
+endif
+
+nroff:
+	(cd man; $(MAKE) nroff)
+
+dist-hook:
+	env LS_COLORS= sh "$(top_srcdir)/config/distscript.sh" "$(top_srcdir)" "$(distdir)" "$(PMIX_VERSION)" "$(PMIX_REPO_REV)"
+
diff --git a/Makefile.in b/Makefile.in
new file mode 100644
index 0000000..6d0305f
--- /dev/null
+++ b/Makefile.in
@@ -0,0 +1,1112 @@
+# Makefile.in generated by automake 1.15 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2006-2016 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2012-2013 Los Alamos National Security, Inc.  All rights reserved.
+# Copyright (c) 2013-2016 Intel, Inc. All rights reserved
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+ at PMIX_EMBEDDED_MODE_FALSE@am__append_1 = contrib/pmix-valgrind.supp
+ at PMIX_EMBEDDED_MODE_FALSE@@PMIX_HAVE_PANDOC_TRUE at am__append_2 = man
+ at PMIX_TESTS_EXAMPLES_TRUE@am__append_3 = . test examples
+subdir = .
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/config/c_get_alignment.m4 \
+	$(top_srcdir)/config/libtool.m4 \
+	$(top_srcdir)/config/ltoptions.m4 \
+	$(top_srcdir)/config/ltsugar.m4 \
+	$(top_srcdir)/config/ltversion.m4 \
+	$(top_srcdir)/config/lt~obsolete.m4 \
+	$(top_srcdir)/config/pmix.m4 \
+	$(top_srcdir)/config/pmix_check_attributes.m4 \
+	$(top_srcdir)/config/pmix_check_broken_qsort.m4 \
+	$(top_srcdir)/config/pmix_check_compiler_version.m4 \
+	$(top_srcdir)/config/pmix_check_icc.m4 \
+	$(top_srcdir)/config/pmix_check_ident.m4 \
+	$(top_srcdir)/config/pmix_check_lock.m4 \
+	$(top_srcdir)/config/pmix_check_os_flavors.m4 \
+	$(top_srcdir)/config/pmix_check_package.m4 \
+	$(top_srcdir)/config/pmix_check_psm2.m4 \
+	$(top_srcdir)/config/pmix_check_pthread_pids.m4 \
+	$(top_srcdir)/config/pmix_check_vendor.m4 \
+	$(top_srcdir)/config/pmix_check_visibility.m4 \
+	$(top_srcdir)/config/pmix_check_withdir.m4 \
+	$(top_srcdir)/config/pmix_config_asm.m4 \
+	$(top_srcdir)/config/pmix_config_pthreads.m4 \
+	$(top_srcdir)/config/pmix_config_subdir.m4 \
+	$(top_srcdir)/config/pmix_config_subdir_args.m4 \
+	$(top_srcdir)/config/pmix_config_threads.m4 \
+	$(top_srcdir)/config/pmix_ensure_contains_optflags.m4 \
+	$(top_srcdir)/config/pmix_functions.m4 \
+	$(top_srcdir)/config/pmix_load_platform.m4 \
+	$(top_srcdir)/config/pmix_mca.m4 \
+	$(top_srcdir)/config/pmix_search_libs.m4 \
+	$(top_srcdir)/config/pmix_setup_cc.m4 \
+	$(top_srcdir)/config/pmix_setup_libevent.m4 \
+	$(top_srcdir)/config/pmix_setup_zlib.m4 \
+	$(top_srcdir)/config/pmix_try_assemble.m4 \
+	$(top_srcdir)/config/autogen_found_items.m4 \
+	$(top_srcdir)/src/mca/pdl/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/configure.m4 \
+	$(top_srcdir)/src/mca/pdl/pdlopen/configure.m4 \
+	$(top_srcdir)/src/mca/pdl/plibltdl/configure.m4 \
+	$(top_srcdir)/src/mca/pif/bsdx_ipv4/configure.m4 \
+	$(top_srcdir)/src/mca/pif/bsdx_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pif/linux_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pif/posix_ipv4/configure.m4 \
+	$(top_srcdir)/src/mca/pif/solaris_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/config/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/env/configure.m4 \
+	$(top_srcdir)/src/mca/pnet/opa/configure.m4 \
+	$(top_srcdir)/src/mca/psec/munge/configure.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
+	$(am__configure_deps) $(am__dist_pmixdata_DATA_DIST) \
+	$(nobase_pmix_HEADERS) $(noinst_HEADERS) $(am__DIST_COMMON)
+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+ configure.lineno config.status.lineno
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/src/include/pmix_config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__dist_pmixdata_DATA_DIST = contrib/pmix-valgrind.supp
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(pmixdatadir)" "$(DESTDIR)$(pmixdir)"
+DATA = $(dist_pmixdata_DATA)
+HEADERS = $(nobase_pmix_HEADERS) $(noinst_HEADERS)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+	cscope distdir dist dist-all distcheck
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+CSCOPE = cscope
+DIST_SUBDIRS = config contrib include src man . test examples
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/./config/ar-lib \
+	$(top_srcdir)/./config/compile \
+	$(top_srcdir)/./config/config.guess \
+	$(top_srcdir)/./config/config.sub \
+	$(top_srcdir)/./config/install-sh \
+	$(top_srcdir)/./config/ltmain.sh \
+	$(top_srcdir)/./config/missing \
+	$(top_srcdir)/src/include/pmix_config.h.in ./config/ar-lib \
+	./config/compile ./config/config.guess ./config/config.sub \
+	./config/install-sh ./config/ltmain.sh ./config/missing \
+	./config/ylwrap AUTHORS INSTALL NEWS README
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+distdir = $(PACKAGE)-$(VERSION)
+top_distdir = $(distdir)
+am__remove_distdir = \
+  if test -d "$(distdir)"; then \
+    find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+      && rm -rf "$(distdir)" \
+      || { sleep 5 && rm -rf "$(distdir)"; }; \
+  else :; fi
+am__post_remove_distdir = $(am__remove_distdir)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
+DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
+GZIP_ENV = --best
+DIST_TARGETS = dist-bzip2 dist-gzip
+distuninstallcheck_listfiles = find . -type f -print
+am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
+  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
+distcleancheck_listfiles = find . -type f -print
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CFLAGS = @CFLAGS@
+CLEANFILES = @CLEANFILES@
+CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MCA_PROJECT_SUBDIRS = @MCA_PROJECT_SUBDIRS@
+MCA_pmix_FRAMEWORKS = @MCA_pmix_FRAMEWORKS@
+MCA_pmix_FRAMEWORKS_SUBDIRS = @MCA_pmix_FRAMEWORKS_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS@
+MCA_pmix_FRAMEWORK_LIBS = @MCA_pmix_FRAMEWORK_LIBS@
+MCA_pmix_pdl_ALL_COMPONENTS = @MCA_pmix_pdl_ALL_COMPONENTS@
+MCA_pmix_pdl_ALL_SUBDIRS = @MCA_pmix_pdl_ALL_SUBDIRS@
+MCA_pmix_pdl_DSO_COMPONENTS = @MCA_pmix_pdl_DSO_COMPONENTS@
+MCA_pmix_pdl_DSO_SUBDIRS = @MCA_pmix_pdl_DSO_SUBDIRS@
+MCA_pmix_pdl_STATIC_COMPONENTS = @MCA_pmix_pdl_STATIC_COMPONENTS@
+MCA_pmix_pdl_STATIC_LTLIBS = @MCA_pmix_pdl_STATIC_LTLIBS@
+MCA_pmix_pdl_STATIC_SUBDIRS = @MCA_pmix_pdl_STATIC_SUBDIRS@
+MCA_pmix_pif_ALL_COMPONENTS = @MCA_pmix_pif_ALL_COMPONENTS@
+MCA_pmix_pif_ALL_SUBDIRS = @MCA_pmix_pif_ALL_SUBDIRS@
+MCA_pmix_pif_DSO_COMPONENTS = @MCA_pmix_pif_DSO_COMPONENTS@
+MCA_pmix_pif_DSO_SUBDIRS = @MCA_pmix_pif_DSO_SUBDIRS@
+MCA_pmix_pif_STATIC_COMPONENTS = @MCA_pmix_pif_STATIC_COMPONENTS@
+MCA_pmix_pif_STATIC_LTLIBS = @MCA_pmix_pif_STATIC_LTLIBS@
+MCA_pmix_pif_STATIC_SUBDIRS = @MCA_pmix_pif_STATIC_SUBDIRS@
+MCA_pmix_pinstalldirs_ALL_COMPONENTS = @MCA_pmix_pinstalldirs_ALL_COMPONENTS@
+MCA_pmix_pinstalldirs_ALL_SUBDIRS = @MCA_pmix_pinstalldirs_ALL_SUBDIRS@
+MCA_pmix_pinstalldirs_DSO_COMPONENTS = @MCA_pmix_pinstalldirs_DSO_COMPONENTS@
+MCA_pmix_pinstalldirs_DSO_SUBDIRS = @MCA_pmix_pinstalldirs_DSO_SUBDIRS@
+MCA_pmix_pinstalldirs_STATIC_COMPONENTS = @MCA_pmix_pinstalldirs_STATIC_COMPONENTS@
+MCA_pmix_pinstalldirs_STATIC_LTLIBS = @MCA_pmix_pinstalldirs_STATIC_LTLIBS@
+MCA_pmix_pinstalldirs_STATIC_SUBDIRS = @MCA_pmix_pinstalldirs_STATIC_SUBDIRS@
+MCA_pmix_pnet_ALL_COMPONENTS = @MCA_pmix_pnet_ALL_COMPONENTS@
+MCA_pmix_pnet_ALL_SUBDIRS = @MCA_pmix_pnet_ALL_SUBDIRS@
+MCA_pmix_pnet_DSO_COMPONENTS = @MCA_pmix_pnet_DSO_COMPONENTS@
+MCA_pmix_pnet_DSO_SUBDIRS = @MCA_pmix_pnet_DSO_SUBDIRS@
+MCA_pmix_pnet_STATIC_COMPONENTS = @MCA_pmix_pnet_STATIC_COMPONENTS@
+MCA_pmix_pnet_STATIC_LTLIBS = @MCA_pmix_pnet_STATIC_LTLIBS@
+MCA_pmix_pnet_STATIC_SUBDIRS = @MCA_pmix_pnet_STATIC_SUBDIRS@
+MCA_pmix_psec_ALL_COMPONENTS = @MCA_pmix_psec_ALL_COMPONENTS@
+MCA_pmix_psec_ALL_SUBDIRS = @MCA_pmix_psec_ALL_SUBDIRS@
+MCA_pmix_psec_DSO_COMPONENTS = @MCA_pmix_psec_DSO_COMPONENTS@
+MCA_pmix_psec_DSO_SUBDIRS = @MCA_pmix_psec_DSO_SUBDIRS@
+MCA_pmix_psec_STATIC_COMPONENTS = @MCA_pmix_psec_STATIC_COMPONENTS@
+MCA_pmix_psec_STATIC_LTLIBS = @MCA_pmix_psec_STATIC_LTLIBS@
+MCA_pmix_psec_STATIC_SUBDIRS = @MCA_pmix_psec_STATIC_SUBDIRS@
+MCA_pmix_psensor_ALL_COMPONENTS = @MCA_pmix_psensor_ALL_COMPONENTS@
+MCA_pmix_psensor_ALL_SUBDIRS = @MCA_pmix_psensor_ALL_SUBDIRS@
+MCA_pmix_psensor_DSO_COMPONENTS = @MCA_pmix_psensor_DSO_COMPONENTS@
+MCA_pmix_psensor_DSO_SUBDIRS = @MCA_pmix_psensor_DSO_SUBDIRS@
+MCA_pmix_psensor_STATIC_COMPONENTS = @MCA_pmix_psensor_STATIC_COMPONENTS@
+MCA_pmix_psensor_STATIC_LTLIBS = @MCA_pmix_psensor_STATIC_LTLIBS@
+MCA_pmix_psensor_STATIC_SUBDIRS = @MCA_pmix_psensor_STATIC_SUBDIRS@
+MCA_pmix_ptl_ALL_COMPONENTS = @MCA_pmix_ptl_ALL_COMPONENTS@
+MCA_pmix_ptl_ALL_SUBDIRS = @MCA_pmix_ptl_ALL_SUBDIRS@
+MCA_pmix_ptl_DSO_COMPONENTS = @MCA_pmix_ptl_DSO_COMPONENTS@
+MCA_pmix_ptl_DSO_SUBDIRS = @MCA_pmix_ptl_DSO_SUBDIRS@
+MCA_pmix_ptl_STATIC_COMPONENTS = @MCA_pmix_ptl_STATIC_COMPONENTS@
+MCA_pmix_ptl_STATIC_LTLIBS = @MCA_pmix_ptl_STATIC_LTLIBS@
+MCA_pmix_ptl_STATIC_SUBDIRS = @MCA_pmix_ptl_STATIC_SUBDIRS@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PMIX_ASM_GSYM = @PMIX_ASM_GSYM@
+PMIX_ASM_LSYM = @PMIX_ASM_LSYM@
+PMIX_ASM_SUPPORT_64BIT = @PMIX_ASM_SUPPORT_64BIT@
+PMIX_ASM_TEXT = @PMIX_ASM_TEXT@
+PMIX_ASM_TYPE = @PMIX_ASM_TYPE@
+PMIX_ASSEMBLY_ARCH = @PMIX_ASSEMBLY_ARCH@
+PMIX_ASSEMBLY_BUILTIN = @PMIX_ASSEMBLY_BUILTIN@
+PMIX_ASSEMBLY_FORMAT = @PMIX_ASSEMBLY_FORMAT@
+PMIX_AS_GLOBAL = @PMIX_AS_GLOBAL@
+PMIX_AS_LABEL_SUFFIX = @PMIX_AS_LABEL_SUFFIX@
+PMIX_CC_ABSOLUTE = @PMIX_CC_ABSOLUTE@
+PMIX_CONFIGURE_DATE = @PMIX_CONFIGURE_DATE@
+PMIX_CONFIGURE_HOST = @PMIX_CONFIGURE_HOST@
+PMIX_CONFIGURE_USER = @PMIX_CONFIGURE_USER@
+PMIX_EMBEDDED_CPPFLAGS = @PMIX_EMBEDDED_CPPFLAGS@
+PMIX_EMBEDDED_LDFLAGS = @PMIX_EMBEDDED_LDFLAGS@
+PMIX_EMBEDDED_LIBS = @PMIX_EMBEDDED_LIBS@
+PMIX_MAJOR_VERSION = @PMIX_MAJOR_VERSION@
+PMIX_MINOR_VERSION = @PMIX_MINOR_VERSION@
+PMIX_RELEASE_DATE = @PMIX_RELEASE_DATE@
+PMIX_RELEASE_VERSION = @PMIX_RELEASE_VERSION@
+PMIX_RENAME = @PMIX_RENAME@
+PMIX_VERSION = @PMIX_VERSION@
+PMIX_top_builddir = @PMIX_top_builddir@
+PMIX_top_srcdir = @PMIX_top_srcdir@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_prefix_program = @ac_prefix_program@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+libpmix_so_version = @libpmix_so_version@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pmix_have_pandoc = @pmix_have_pandoc@
+pmix_pdl_pdlopen_LIBS = @pmix_pdl_pdlopen_LIBS@
+pmix_pdl_plibltdl_CPPFLAGS = @pmix_pdl_plibltdl_CPPFLAGS@
+pmix_pdl_plibltdl_LDFLAGS = @pmix_pdl_plibltdl_LDFLAGS@
+pmix_pdl_plibltdl_LIBS = @pmix_pdl_plibltdl_LIBS@
+pmixdatadir = @pmixdatadir@
+pmixincludedir = @pmixincludedir@
+pmixlibdir = @pmixlibdir@
+pmixmajor = @pmixmajor@
+pmixminor = @pmixminor@
+pnet_opa_CFLAGS = @pnet_opa_CFLAGS@
+pnet_opa_CPPFLAGS = @pnet_opa_CPPFLAGS@
+pnet_opa_LDFLAGS = @pnet_opa_LDFLAGS@
+pnet_opa_LIBS = @pnet_opa_LIBS@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+psec_munge_CPPFLAGS = @psec_munge_CPPFLAGS@
+psec_munge_LDFLAGS = @psec_munge_LDFLAGS@
+psec_munge_LIBS = @psec_munge_LIBS@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+
+# Note that the -I directory must *exactly* match what was specified
+# via AC_CONFIG_MACRO_DIR in configure.ac.
+ACLOCAL_AMFLAGS = -I ./config
+SUBDIRS = config contrib include src $(am__append_2) $(am__append_3)
+headers = 
+sources = 
+nodist_headers = 
+EXTRA_DIST = AUTHORS README INSTALL VERSION LICENSE autogen.pl
+
+# Only install the valgrind suppressions file and man pages
+# if we're building in standalone mode
+dist_pmixdata_DATA = $(am__append_1)
+ at WANT_INSTALL_HEADERS_TRUE@pmixdir = $(pmixincludedir)/$(subdir)
+ at WANT_INSTALL_HEADERS_TRUE@nobase_pmix_HEADERS = $(headers)
+ at WANT_INSTALL_HEADERS_FALSE@noinst_HEADERS = $(headers)
+all: all-recursive
+
+.SUFFIXES:
+am--refresh: Makefile
+	@:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
+	      $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    echo ' $(SHELL) ./config.status'; \
+	    $(SHELL) ./config.status;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	$(SHELL) ./config.status --recheck
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	$(am__cd) $(srcdir) && $(AUTOCONF)
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+$(am__aclocal_m4_deps):
+
+src/include/pmix_config.h: src/include/stamp-h1
+	@test -f $@ || rm -f src/include/stamp-h1
+	@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) src/include/stamp-h1
+
+src/include/stamp-h1: $(top_srcdir)/src/include/pmix_config.h.in $(top_builddir)/config.status
+	@rm -f src/include/stamp-h1
+	cd $(top_builddir) && $(SHELL) ./config.status src/include/pmix_config.h
+$(top_srcdir)/src/include/pmix_config.h.in:  $(am__configure_deps) 
+	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
+	rm -f src/include/stamp-h1
+	touch $@
+
+distclean-hdr:
+	-rm -f src/include/pmix_config.h src/include/stamp-h1
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool config.lt
+install-dist_pmixdataDATA: $(dist_pmixdata_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(dist_pmixdata_DATA)'; test -n "$(pmixdatadir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(pmixdatadir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(pmixdatadir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pmixdatadir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pmixdatadir)" || exit $$?; \
+	done
+
+uninstall-dist_pmixdataDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_pmixdata_DATA)'; test -n "$(pmixdatadir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(pmixdatadir)'; $(am__uninstall_files_from_dir)
+install-nobase_pmixHEADERS: $(nobase_pmix_HEADERS)
+	@$(NORMAL_INSTALL)
+	@list='$(nobase_pmix_HEADERS)'; test -n "$(pmixdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(pmixdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(pmixdir)" || exit 1; \
+	fi; \
+	$(am__nobase_list) | while read dir files; do \
+	  xfiles=; for file in $$files; do \
+	    if test -f "$$file"; then xfiles="$$xfiles $$file"; \
+	    else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \
+	  test -z "$$xfiles" || { \
+	    test "x$$dir" = x. || { \
+	      echo " $(MKDIR_P) '$(DESTDIR)$(pmixdir)/$$dir'"; \
+	      $(MKDIR_P) "$(DESTDIR)$(pmixdir)/$$dir"; }; \
+	    echo " $(INSTALL_HEADER) $$xfiles '$(DESTDIR)$(pmixdir)/$$dir'"; \
+	    $(INSTALL_HEADER) $$xfiles "$(DESTDIR)$(pmixdir)/$$dir" || exit $$?; }; \
+	done
+
+uninstall-nobase_pmixHEADERS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(nobase_pmix_HEADERS)'; test -n "$(pmixdir)" || list=; \
+	$(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \
+	dir='$(DESTDIR)$(pmixdir)'; $(am__uninstall_files_from_dir)
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscope: cscope.files
+	test ! -s cscope.files \
+	  || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
+clean-cscope:
+	-rm -f cscope.files
+cscope.files: clean-cscope cscopelist
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
+
+distdir: $(DISTFILES)
+	$(am__remove_distdir)
+	test -d "$(distdir)" || mkdir "$(distdir)"
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+		am__skip_mode_fix=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+	$(MAKE) $(AM_MAKEFLAGS) \
+	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
+	  dist-hook
+	-test -n "$(am__skip_mode_fix)" \
+	|| find "$(distdir)" -type d ! -perm -755 \
+		-exec chmod u+rwx,go+rx {} \; -o \
+	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
+	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
+	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
+	|| chmod -R a+r "$(distdir)"
+dist-gzip: distdir
+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	$(am__post_remove_distdir)
+dist-bzip2: distdir
+	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
+	$(am__post_remove_distdir)
+
+dist-lzip: distdir
+	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
+	$(am__post_remove_distdir)
+
+dist-xz: distdir
+	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
+	$(am__post_remove_distdir)
+
+dist-tarZ: distdir
+	@echo WARNING: "Support for distribution archives compressed with" \
+		       "legacy program 'compress' is deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
+	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
+	$(am__post_remove_distdir)
+
+dist-shar: distdir
+	@echo WARNING: "Support for shar distribution archives is" \
+	               "deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
+	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+	$(am__post_remove_distdir)
+
+dist-zip: distdir
+	-rm -f $(distdir).zip
+	zip -rq $(distdir).zip $(distdir)
+	$(am__post_remove_distdir)
+
+dist dist-all:
+	$(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
+	$(am__post_remove_distdir)
+
+# This target untars the dist file and tries a VPATH configuration.  Then
+# it guarantees that the distribution is self-contained by making another
+# tarfile.
+distcheck: dist
+	case '$(DIST_ARCHIVES)' in \
+	*.tar.gz*) \
+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
+	*.tar.bz2*) \
+	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
+	*.tar.lz*) \
+	  lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
+	*.tar.xz*) \
+	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
+	*.tar.Z*) \
+	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
+	*.shar.gz*) \
+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
+	*.zip*) \
+	  unzip $(distdir).zip ;;\
+	esac
+	chmod -R a-w $(distdir)
+	chmod u+w $(distdir)
+	mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
+	chmod a-w $(distdir)
+	test -d $(distdir)/_build || exit 0; \
+	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
+	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
+	  && am__cwd=`pwd` \
+	  && $(am__cd) $(distdir)/_build/sub \
+	  && ../../configure \
+	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
+	    $(DISTCHECK_CONFIGURE_FLAGS) \
+	    --srcdir=../.. --prefix="$$dc_install_base" \
+	  && $(MAKE) $(AM_MAKEFLAGS) \
+	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
+	  && $(MAKE) $(AM_MAKEFLAGS) check \
+	  && $(MAKE) $(AM_MAKEFLAGS) install \
+	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
+	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
+	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
+	        distuninstallcheck \
+	  && chmod -R a-w "$$dc_install_base" \
+	  && ({ \
+	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
+	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
+	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
+	  && rm -rf "$$dc_destdir" \
+	  && $(MAKE) $(AM_MAKEFLAGS) dist \
+	  && rm -rf $(DIST_ARCHIVES) \
+	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
+	  && cd "$$am__cwd" \
+	  || exit 1
+	$(am__post_remove_distdir)
+	@(echo "$(distdir) archives ready for distribution: "; \
+	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
+	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
+distuninstallcheck:
+	@test -n '$(distuninstallcheck_dir)' || { \
+	  echo 'ERROR: trying to run $@ with an empty' \
+	       '$$(distuninstallcheck_dir)' >&2; \
+	  exit 1; \
+	}; \
+	$(am__cd) '$(distuninstallcheck_dir)' || { \
+	  echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
+	  exit 1; \
+	}; \
+	test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
+	   || { echo "ERROR: files left after uninstall:" ; \
+	        if test -n "$(DESTDIR)"; then \
+	          echo "  (check DESTDIR support)"; \
+	        fi ; \
+	        $(distuninstallcheck_listfiles) ; \
+	        exit 1; } >&2
+distcleancheck: distclean
+	@if test '$(srcdir)' = . ; then \
+	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
+	  exit 1 ; \
+	fi
+	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
+	  || { echo "ERROR: files left in build directory after distclean:" ; \
+	       $(distcleancheck_listfiles) ; \
+	       exit 1; } >&2
+check-am: all-am
+check: check-recursive
+all-am: Makefile $(DATA) $(HEADERS)
+installdirs: installdirs-recursive
+installdirs-am:
+	for dir in "$(DESTDIR)$(pmixdatadir)" "$(DESTDIR)$(pmixdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-hdr \
+	distclean-libtool distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+html-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am: install-dist_pmixdataDATA install-nobase_pmixHEADERS
+
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-recursive
+
+install-html-am:
+
+install-info: install-info-recursive
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+	-rm -rf $(top_srcdir)/autom4te.cache
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-dist_pmixdataDATA uninstall-nobase_pmixHEADERS
+
+.MAKE: $(am__recursive_targets) install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
+	am--refresh check check-am clean clean-cscope clean-generic \
+	clean-libtool cscope cscopelist-am ctags ctags-am dist \
+	dist-all dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar \
+	dist-tarZ dist-xz dist-zip distcheck distclean \
+	distclean-generic distclean-hdr distclean-libtool \
+	distclean-tags distcleancheck distdir distuninstallcheck dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dist_pmixdataDATA \
+	install-dvi install-dvi-am install-exec install-exec-am \
+	install-html install-html-am install-info install-info-am \
+	install-man install-nobase_pmixHEADERS install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs installdirs-am \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am \
+	uninstall-dist_pmixdataDATA uninstall-nobase_pmixHEADERS
+
+.PRECIOUS: Makefile
+
+
+nroff:
+	(cd man; $(MAKE) nroff)
+
+dist-hook:
+	env LS_COLORS= sh "$(top_srcdir)/config/distscript.sh" "$(top_srcdir)" "$(distdir)" "$(PMIX_VERSION)" "$(PMIX_REPO_REV)"
+
+# 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/NEWS b/NEWS
new file mode 100644
index 0000000..1caf0b7
--- /dev/null
+++ b/NEWS
@@ -0,0 +1,207 @@
+Copyright (c) 2015-2017 Intel, Inc. All rights reserved.
+Copyright (c) 2017      IBM Corporation.  All rights reserved.
+$COPYRIGHT$
+
+Additional copyrights may follow
+
+$HEADER$
+
+===========================================================================
+
+This file contains the main features as well as overviews of specific
+bug fixes (and other actions) for each version of PMIx since
+version 1.0.
+
+As more fully described in the "Software Version Number" section in
+the README file, PMIx typically maintains two separate version
+series simultaneously - the current release and one that is locked
+to only bug fixes.  Since these series are semi-independent of each
+other, a single NEWS-worthy item might apply to different series. For
+example, a bug might be fixed in the master, and then moved to the
+current release as well as the "stable" bug fix release branch.
+
+
+2.0.1 -- 24 Aug. 2017
+----------------------
+- Protect PMIX_INFO_FREE macro from NULL data arrays
+- Added attributes to support HWLOC shared memory regions
+- Fixed several syntax errors in configure code
+- Fixed several visibility errors
+- Correctly return status from PMIx_Fence operation
+- Restore tool connection support and implement search
+  operations to discover rendezvous files
+
+
+2.0.0 -- 22 Jun 2017
+----------------------
+**** NOTE: This release implements the complete PMIX v2.0 Standard
+**** and therefore includes a number of new APIs and features. These
+**** can be tracked by their RFC's in the RFC repository at:
+**** https://github.com/pmix/RFCs. A formal standards document will
+**** be included in a later v2.x release. Some of the changes are
+**** identified below.
+- Added the Modular Component Architecture (MCA) plugin manager and
+  converted a number of operations to plugins, thereby allowing easy
+  customization and extension (including proprietary offerings)
+- Added support for TCP sockets instead of Unix domain sockets for
+  client-server communications
+- Added support for on-the-fly Allocation requests, including requests
+  for additional resources, extension of time for currently allocated
+  resources, and return of identified allocated resources to the scheduler
+  (RFC 0005 - https://github.com/pmix/RFCs/blob/master/RFC0005.md)
+- Tightened rules on the processing of PMIx_Get requests, including
+  reservation of the "pmix" prefix for attribute keys and specifying
+  behaviors associated with the PMIX_RANK_WILDCARD value
+  (RFC 0009 - https://github.com/pmix/RFCs/blob/master/RFC0009.md)
+- Extended support for tool interactions with a PMIx server aimed at
+  meeting the needs of debuggers and other tools. Includes support
+  for rendezvousing with a system-level PMIx server for interacting
+  with the system management stack (SMS) outside of an allocated
+  session, and adds two new APIs:
+  - PMIx_Query: request general information such as the process
+    table for a specified job, and available SMS capabilities
+  - PMIx_Log: log messages (e.g., application progress) to a
+    system-hosted persistent store
+  (RFC 0010 - https://github.com/pmix/RFCs/blob/master/RFC0010.md)
+- Added support for fabric/network interactions associated with
+  "instant on" application startup
+  (RFC 0012 - https://github.com/pmix/RFCs/blob/master/RFC0012.md)
+- Added an attribute to support getting the time remaining in an
+  allocation via the PMIx_Query interface
+  (RFC 0013 - https://github.com/pmix/RFCs/blob/master/RFC0013.md)
+- Added interfaces to support job control and monitoring requests,
+  including heartbeat and file monitors to detect stalled applications.
+  Job control interface supports standard signal-related operations
+  (pause, kill, resume, etc.) as well as checkpoint/restart requests.
+  The interface can also be used by an application to indicate it is
+  willing to be pre-empted, with the host RM providing an event
+  notification when the preemption is desired.
+  (RFC 0015 - https://github.com/pmix/RFCs/blob/master/RFC0015.md)
+- Extended the event notification system to support notifications
+  across threads in the same process, and the ability to direct
+  ordering of notifications when registering event handlers.
+  (RFC 0018 - https://github.com/pmix/RFCs/blob/master/RFC0018.md)
+- Expose the buffer manipulation functions via a new set of APIs
+  to support heterogeneous data transfers within the host RM
+  environment
+  (RFC 0020 - https://github.com/pmix/RFCs/blob/master/RFC0020.md)
+- Fix a number of race condition issues that arose at scale
+- Enable PMIx servers to generate notifications to the host RM
+  and to themselves
+
+
+1.2.3 -- 24 Aug. 2017
+----------------------
+- Resolve visibility issues for public APIs (PR #451)
+- Atomics update - remove custom ASM atomics (PR #458)
+- Fix job-fence test (PR #423)
+- Replace stale PMIX_DECLSPEC with PMIX_EXPORT (PR #448)
+- Memory barrier fixes for thread shifting (PR #387)
+- Fix race condition in dmodex (PR #346)
+- Allow disable backward compatability for PMI-1/2 (PR #350)
+- Fix segv in PMIx_server_deregister_nspace (PR #343)
+- Fix possible hang in PMIx_Abort (PR #339)
+
+
+1.2.2 -- 21 March 2017
+----------------------
+- Compiler fix for Sun/Oracle CC (PR #322)
+- Fix missing include (PR #326)
+- Improve error checking around posix_fallocate (PR #329)
+- Fix possible memory corruption (PR #331)
+
+
+1.2.1 -- 21 Feb. 2017
+----------------------
+- dstore: Fix data corruption bug in key overwrite cases
+- dstore: Performance and scalability fixes
+- sm: Use posix_fallocate() before mmap
+- pmi1/pmi2: Restore support
+- dstore: Fix extension slot size allocation (Issue #280)
+
+
+1.2.0 -- 14 Dec. 2016
+----------------------
+- Add shared memory data storage (dstore) option. Default: enabled
+  Configure option: --disable-dstore
+- PMIx_Commit performance improvements
+- Disable errhandler support
+- Keep job info in the shared memory dstore
+- PMIx_Get performance and memory improvements
+
+1.1.5
+-----
+- Add pmix_version.h to support direct detection of PMIx library version
+- Fix support for Solaris 10 by using abstract version of strnlen
+- Fix native security module for Solaris by using getpeerucred in
+  that environment
+- Ensure man pages don't get installed in embedded builds
+- Pass temporary directory locations in info keys instead of
+  the environment
+
+1.1.4
+-----
+- Properly increment the reference count for PMIx_Init
+- Fix examples so all run properly
+- Fix/complete PMI2 backward compatibility support to handle
+  keys that are not associated with a specific rank
+- Do a better job of hiding non-API symbols
+- Correct handling of semi-colon terminations on macros.
+  Thanks to Ashley Pittman for the patch
+- Add more man pages
+- Improve error checking and messages for connection
+  attempts from client to server
+- If the tmpdir name is too long, provide an appropriate
+  help message to the user (particularly relevant on
+  Mac OSX). Thanks to Rainer Keller for the patch.
+- Fix some C++ compatibility issues
+- Fix/complete PMI-1 backward compatibility support
+- Do not install internal headers unless specifically
+  requested to do so
+- Add support for multiple calls to Put/Commit
+
+
+1.1.3
+-----
+- Update the symbol hiding file to cover all symbols
+- Fix examples and test directory Makefile.am's so
+  the Makefiles are automatically built and the
+  code compiled, but not installed
+- Do not install the pmix library in embedded use-cases
+
+
+1.1.2
+-----
+- Provide a check for hwloc support - if not found, then
+  don't pass any topology info down to the client as it
+  won't know how to unpack it anyway.
+- Fix a few places where thread safety wasn't provided
+- Fix several issues identified by Paul Hargrove:
+    * PMIx_Init(NULL) is supported
+    * Incomplete PMIx_constants man page had some lingering cruft
+    * Missing prototype for pmix_value_load
+- Fix race condition in PMIx_Get/PMIx_Get_nb
+- Fix double-free error in pmix_server_commit.
+- Fix PMIX_LOAD_BUFFER to be safe.
+
+
+1.1.1
+-----
+- Fix an issue where the example and test programs
+  were incorrectly being installed. Thanks to Orion
+  Poplawski for reporting it
+
+
+1.1.0
+-----
+- major update of APIs to reflect comments received from 1.0.0
+  non-production release
+- fixed thread-safety issues
+- fixed a range of pack/unpack issues
+- added unit tests for all APIs
+
+
+1.0.0
+------
+Initial public release of draft APIs for comment - not production
+intended
diff --git a/README b/README
new file mode 100644
index 0000000..55b7c61
--- /dev/null
+++ b/README
@@ -0,0 +1,315 @@
+Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
+                        University Research and Technology
+                        Corporation.  All rights reserved.
+Copyright (c) 2004-2007 The University of Tennessee and The University
+                        of Tennessee Research Foundation.  All rights
+                        reserved.
+Copyright (c) 2004-2008 High Performance Computing Center Stuttgart,
+                        University of Stuttgart.  All rights reserved.
+Copyright (c) 2004-2007 The Regents of the University of California.
+                        All rights reserved.
+Copyright (c) 2006-2015 Cisco Systems, Inc.  All rights reserved.
+Copyright (c) 2006-2011 Mellanox Technologies. All rights reserved.
+Copyright (c) 2006-2012 Oracle and/or its affiliates.  All rights reserved.
+Copyright (c) 2007      Myricom, Inc.  All rights reserved.
+Copyright (c) 2008      IBM Corporation.  All rights reserved.
+Copyright (c) 2010      Oak Ridge National Labs.  All rights reserved.
+Copyright (c) 2011      University of Houston. All rights reserved.
+Copyright (c) 2013-2015 Intel, Inc. All rights reserved
+$COPYRIGHT$
+
+Additional copyrights may follow
+
+$HEADER$
+
+===========================================================================
+
+When submitting questions and problems, be sure to include as much
+extra information as possible.  This web page details all the
+information that we request in order to provide assistance:
+
+     http://pmix.github.io/master/community/help/
+
+The best way to report bugs, send comments, or ask questions is to
+sign up on the PMIx mailing list, which is hosted by GoogleGroups:
+
+        pmix at googlegroups.com
+
+Because of spam, only subscribers are allowed to post to this list
+(ensure that you subscribe with and post from exactly the same e-mail
+address -- joe at example.com is considered different than
+joe at mycomputer.example.com!).  You can subscribe to the list here:
+
+     https://groups.google.com/d/forum/pmix
+
+Thanks for your time.
+
+===========================================================================
+
+More information is available in the PMIx FAQ:
+
+    http://pmix.github.io/master/faq/
+
+We are in early days, so please be patient - info will grow as questions
+are addressed.
+
+===========================================================================
+
+The following abbreviated list of release notes applies to this code
+base as of this writing (12 November 2015):
+
+General notes
+-------------
+
+- The majority of PMIx's documentation is here in this file, the
+  included man pages, and on the web site FAQ
+  (http://pmix.github.io/master/faq).  This will eventually be
+  supplemented with cohesive installation and user documentation files.
+
+- Systems that have been tested are:
+  - Linux (various flavors/distros), 32 bit, with gcc
+  - Linux (various flavors/distros), 64 bit (x86), with gcc, Intel,
+    and Portland (*)
+  - OS X (10.7 and above), 32 and 64 bit (x86_64), with gcc (*)
+
+(*) Compiler Notes
+--------------
+
+- The Portland Group compilers prior to version 7.0 require the
+  "-Msignextend" compiler flag to extend the sign bit when converting
+  from a shorter to longer integer.  This is is different than other
+  compilers (such as GNU).  When compiling PMIx with the Portland
+  compiler suite, the following flags should be passed to PMIx's
+  configure script:
+
+  shell$ ./configure CFLAGS=-Msignextend ...
+
+  This will compile PMIx with the proper compile flags
+
+- Running on nodes with different endian and/or different datatype
+  sizes within a single parallel job is supported in this release.
+  However, PMIx does not resize data when datatypes differ in size
+  (for example, sending a 4 byte double and receiving an 8 byte
+  double will fail).
+
+
+===========================================================================
+
+Building PMIx
+-----------------
+
+PMIx uses a traditional configure script paired with "make" to
+build.  Typical installs can be of the pattern:
+
+---------------------------------------------------------------------------
+shell$ ./configure [...options...]
+shell$ make all install
+---------------------------------------------------------------------------
+
+There are many available configure options (see "./configure --help"
+for a full list); a summary of the more commonly used ones follows:
+
+INSTALLATION OPTIONS
+
+--prefix=<directory>
+  Install PMIx into the base directory named <directory>.  Hence,
+  PMIx will place its executables in <directory>/bin, its header
+  files in <directory>/include, its libraries in <directory>/lib, etc.
+
+--disable-shared
+  By default, libpmix is built as a shared library.  This switch disables
+  this default; it is really only useful when used with
+  --enable-static.  Specifically, this option does *not* imply
+  --enable-static; enabling static libraries and disabling shared
+  libraries are two independent options.
+
+--enable-static
+  Build libpmix as a static library.  Note that this option does *not* imply
+  --disable-shared; enabling static libraries and disabling shared
+  libraries are two independent options.
+
+--with-platform=FILE
+  Load configure options for the build from FILE.  Options on the
+  command line that are not in FILE are also used.  Options on the
+  command line and in FILE are replaced by what is in FILE.
+
+Once PMIx has been built and installed, it is safe to run "make
+clean" and/or remove the entire build tree.
+
+VPATH and parallel builds are fully supported.
+
+Generally speaking, the only thing that users need to do to use PMIx
+is ensure that <prefix>/lib is in their LD_LIBRARY_PATH.  Users may
+need to ensure to set LD_LIBRARY_PATH in their shell setup files (e.g.,
+.bashrc, .cshrc) so that non-interactive rsh/ssh-based logins will
+be able to find the PMIx library.
+
+===========================================================================
+
+PMIx Version Numbers and Binary Compatibility
+-------------------------------------------------
+
+PMIx has two sets of version numbers that are likely of interest
+to end users / system administrator:
+
+    * Software version number
+    * Shared library version numbers
+
+Both are described below, followed by a discussion of application
+binary interface (ABI) compatibility implications.
+
+Software Version Number
+-----------------------
+
+PMIx's version numbers are the union of several different values:
+major, minor, release, and an optional quantifier.
+
+  * Major: The major number is the first integer in the version string
+    (e.g., v1.2.3). Changes in the major number typically indicate a
+    significant change in the code base and/or end-user
+    functionality. The major number is always included in the version
+    number.
+
+  * Minor: The minor number is the second integer in the version
+    string (e.g., v1.2.3). Changes in the minor number typically
+    indicate a incremental change in the code base and/or end-user
+    functionality. The minor number is always included in the version
+    number:
+
+  * Release: The release number is the third integer in the version
+    string (e.g., v1.2.3). Changes in the release number typically
+    indicate a bug fix in the code base and/or end-user
+    functionality.
+
+  * Quantifier: PMIx version numbers sometimes have an arbitrary
+    string affixed to the end of the version number. Common strings
+    include:
+
+    o aX: Indicates an alpha release. X is an integer indicating
+      the number of the alpha release (e.g., v1.2.3a5 indicates the
+      5th alpha release of version 1.2.3).
+    o bX: Indicates a beta release. X is an integer indicating
+      the number of the beta release (e.g., v1.2.3b3 indicates the 3rd
+      beta release of version 1.2.3).
+    o rcX: Indicates a release candidate. X is an integer
+      indicating the number of the release candidate (e.g., v1.2.3rc4
+      indicates the 4th release candidate of version 1.2.3).
+
+Although the major, minor, and release values (and optional
+quantifiers) are reported in PMIx nightly snapshot tarballs, the
+filenames of these snapshot tarballs follow a slightly different
+convention.
+
+Specifically, the snapshot tarball filename contains three distinct
+values:
+
+   * Most recent Git tag name on the branch from which the tarball was
+     created.
+
+   * An integer indicating how many Git commits have occurred since
+     that Git tag.
+
+   * The Git hash of the tip of the branch.
+
+For example, a snapshot tarball filename of
+"pmix-v1.0.2-57-gb9f1fd9.tar.bz2" indicates that this tarball was
+created from the v1.0 branch, 57 Git commits after the "v1.0.2" tag,
+specifically at Git hash gb9f1fd9.
+
+PMIx's Git master branch contains a single "dev" tag.  For example,
+"pmix-dev-8-gf21c349.tar.bz2" represents a snapshot tarball created
+from the master branch, 8 Git commits after the "dev" tag,
+specifically at Git hash gf21c349.
+
+The exact value of the "number of Git commits past a tag" integer is
+fairly meaningless; its sole purpose is to provide an easy,
+human-recognizable ordering for snapshot tarballs.
+
+Shared Library Version Number
+-----------------------------
+
+PMIx uses the GNU Libtool shared library versioning scheme.
+
+NOTE: Only official releases of PMIx adhere to this versioning
+      scheme. "Beta" releases, release candidates, and nightly
+      tarballs, developer snapshots, and Git snapshot tarballs likely
+      will all have arbitrary/meaningless shared library version
+      numbers.
+
+The GNU Libtool official documentation details how the versioning
+scheme works.  The quick version is that the shared library versions
+are a triple of integers: (current,revision,age), or "c:r:a".  This
+triple is not related to the PMIx software version number.  There
+are six simple rules for updating the values (taken almost verbatim
+from the Libtool docs):
+
+ 1. Start with version information of "0:0:0" for each shared library.
+
+ 2. Update the version information only immediately before a public
+    release of your software. More frequent updates are unnecessary,
+    and only guarantee that the current interface number gets larger
+    faster.
+
+ 3. If the library source code has changed at all since the last
+    update, then increment revision ("c:r:a" becomes "c:r+1:a").
+
+ 4. If any interfaces have been added, removed, or changed since the
+    last update, increment current, and set revision to 0.
+
+ 5. If any interfaces have been added since the last public release,
+    then increment age.
+
+ 6. If any interfaces have been removed since the last public release,
+    then set age to 0.
+
+Application Binary Interface (ABI) Compatibility
+------------------------------------------------
+
+PMIx provides forward ABI compatibility in all versions of a given
+feature release series and its corresponding
+super stable series.  For example, on a single platform, an pmix
+application linked against PMIx v1.3.2 shared libraries can be
+updated to point to the shared libraries in any successive v1.3.x or
+v1.4 release and still work properly (e.g., via the LD_LIBRARY_PATH
+environment variable or other operating system mechanism).
+
+PMIx reserves the right to break ABI compatibility at new feature
+release series.  For example, the same pmix application from above
+(linked against PMIx v1.3.2 shared libraries) will *not* work with
+PMIx v1.5 shared libraries.
+
+===========================================================================
+
+Common Questions
+----------------
+
+Many common questions about building and using PMIx are answered
+on the FAQ:
+
+    http://pmix.github.io/master/faq/
+
+===========================================================================
+
+Got more questions?
+-------------------
+
+Found a bug?  Got a question?  Want to make a suggestion?  Want to
+contribute to PMIx?  Please let us know!
+
+When submitting questions and problems, be sure to include as much
+extra information as possible.  This web page details all the
+information that we request in order to provide assistance:
+
+     http://pmix.github.io/master/community/help/
+
+Questions and comments should generally be sent to the PMIx mailing
+list (pmix at googlegroups.com).  Because of spam, only
+subscribers are allowed to post to this list (ensure that you
+subscribe with and post from *exactly* the same e-mail address --
+joe at example.com is considered different than
+joe at mycomputer.example.com!).  Visit this page to subscribe to the
+user's list:
+
+     https://groups.google.com/d/forum/pmix
+
+Make today an PMIx day!
diff --git a/VERSION b/VERSION
new file mode 100644
index 0000000..6497107
--- /dev/null
+++ b/VERSION
@@ -0,0 +1,78 @@
+# Copyright (c) 2008      Sun Microsystems, Inc.  All rights reserved.
+# Copyright (c) 2008-2011 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2011      NVIDIA Corporation.  All rights reserved.
+# Copyright (c) 2013      Mellanox Technologies, Inc.
+#                         All rights reserved.
+# Copyright (c) 2014-2016 Intel, Inc. All rights reserved.
+
+# This is the VERSION file for PMIx, describing the precise
+# version of PMIx in this distribution.  The various components of
+# the version number below are combined to form a single version
+# number string.
+
+# major, minor, and release are generally combined in the form
+# <major>.<minor>.<release>.
+
+major=2
+minor=0
+release=1
+
+# greek is used for alpha or beta release tags.  If it is non-empty,
+# it will be appended to the version number.  It does not have to be
+# numeric.  Common examples include a1 (alpha release 1), b1 or (beta release 1).
+# The only requirement is that it must be entirely printable ASCII
+# characters and have no white space.
+
+greek=
+
+# If repo_rev is empty, then the repository version number will be
+# obtained during "make dist" via the "git describe --tags --always"
+# command, or with the date (if "git describe" fails) in the form of
+# "date<date>".
+
+repo_rev=git1bb9e25
+
+# If tarball_version is not empty, it is used as the version string in
+# the tarball filename, regardless of all other versions listed in
+# this file.  For example, if tarball_version is empty, the tarball
+# filename will be of the form
+# openmpi-<major>.<minor>.<release><greek>.tar.*.  However, if
+# tarball_version is not empty, the tarball filename will be of the
+# form openmpi-<tarball_version>.tar.*.
+
+tarball_version=
+
+# The date when this release was created
+
+date="Aug 22, 2017"
+
+# The shared library version of each of PMIx's public libraries.
+# These versions are maintained in accordance with the "Library
+# Interface Versions" chapter from the GNU Libtool documentation:
+#
+# - If the library source code has changed at all since the last
+#   update, then increment revision (`c:r:a' becomes `c:r+1:a').
+#
+# - If any interfaces have been added, removed, or changed since
+#   the last update, increment current, and set revision to 0.
+#
+# - If any interfaces have been added since the last public release,
+#   then increment age.
+#
+# - If any interfaces have been removed since the last public release,
+#   then set age to 0.
+#
+# All changes in these version numbers are dictated by the PMIx
+# release managers (not individual developers).  Notes:
+
+# 1. Since these version numbers are associated with *releases*, the
+# version numbers maintained on the PMIx Github trunk (and developer
+# branches) is always 0:0:0 for all libraries.
+
+# 2. The version number of libpmix refers to the public pmix interfaces.
+# It does not refer to any internal interfaces.
+
+# Version numbers are described in the Libtool current:revision:age
+# format.
+
+libpmix_so_version=3:1:1
diff --git a/aclocal.m4 b/aclocal.m4
new file mode 100644
index 0000000..91550cd
--- /dev/null
+++ b/aclocal.m4
@@ -0,0 +1,1284 @@
+# generated automatically by aclocal 1.15 -*- Autoconf -*-
+
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
+[m4_warning([this file was generated for autoconf 2.69.
+You have another version of autoconf.  It may work, but is not guaranteed to.
+If you have problems, you may need to regenerate the build system entirely.
+To do so, use the procedure documented by the package, typically 'autoreconf'.])])
+
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_AUTOMAKE_VERSION(VERSION)
+# ----------------------------
+# Automake X.Y traces this macro to ensure aclocal.m4 has been
+# generated from the m4 files accompanying Automake X.Y.
+# (This private macro should not be called outside this file.)
+AC_DEFUN([AM_AUTOMAKE_VERSION],
+[am__api_version='1.15'
+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+dnl require some minimum version.  Point them to the right macro.
+m4_if([$1], [1.15], [],
+      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+])
+
+# _AM_AUTOCONF_VERSION(VERSION)
+# -----------------------------
+# aclocal traces this macro to find the Autoconf version.
+# This is a private macro too.  Using m4_define simplifies
+# the logic in aclocal, which can simply ignore this definition.
+m4_define([_AM_AUTOCONF_VERSION], [])
+
+# AM_SET_CURRENT_AUTOMAKE_VERSION
+# -------------------------------
+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+[AM_AUTOMAKE_VERSION([1.15])dnl
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
+
+# Copyright (C) 2011-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_PROG_AR([ACT-IF-FAIL])
+# -------------------------
+# Try to determine the archiver interface, and trigger the ar-lib wrapper
+# if it is needed.  If the detection of archiver interface fails, run
+# ACT-IF-FAIL (default is to abort configure with a proper error message).
+AC_DEFUN([AM_PROG_AR],
+[AC_BEFORE([$0], [LT_INIT])dnl
+AC_BEFORE([$0], [AC_PROG_LIBTOOL])dnl
+AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([ar-lib])dnl
+AC_CHECK_TOOLS([AR], [ar lib "link -lib"], [false])
+: ${AR=ar}
+
+AC_CACHE_CHECK([the archiver ($AR) interface], [am_cv_ar_interface],
+  [AC_LANG_PUSH([C])
+   am_cv_ar_interface=ar
+   AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int some_variable = 0;]])],
+     [am_ar_try='$AR cru libconftest.a conftest.$ac_objext >&AS_MESSAGE_LOG_FD'
+      AC_TRY_EVAL([am_ar_try])
+      if test "$ac_status" -eq 0; then
+        am_cv_ar_interface=ar
+      else
+        am_ar_try='$AR -NOLOGO -OUT:conftest.lib conftest.$ac_objext >&AS_MESSAGE_LOG_FD'
+        AC_TRY_EVAL([am_ar_try])
+        if test "$ac_status" -eq 0; then
+          am_cv_ar_interface=lib
+        else
+          am_cv_ar_interface=unknown
+        fi
+      fi
+      rm -f conftest.lib libconftest.a
+     ])
+   AC_LANG_POP([C])])
+
+case $am_cv_ar_interface in
+ar)
+  ;;
+lib)
+  # Microsoft lib, so override with the ar-lib wrapper script.
+  # FIXME: It is wrong to rewrite AR.
+  # But if we don't then we get into trouble of one sort or another.
+  # A longer-term fix would be to have automake use am__AR in this case,
+  # and then we could set am__AR="$am_aux_dir/ar-lib \$(AR)" or something
+  # similar.
+  AR="$am_aux_dir/ar-lib $AR"
+  ;;
+unknown)
+  m4_default([$1],
+             [AC_MSG_ERROR([could not determine $AR interface])])
+  ;;
+esac
+AC_SUBST([AR])dnl
+])
+
+# Figure out how to run the assembler.                      -*- Autoconf -*-
+
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_PROG_AS
+# ----------
+AC_DEFUN([AM_PROG_AS],
+[# By default we simply use the C compiler to build assembly code.
+AC_REQUIRE([AC_PROG_CC])
+test "${CCAS+set}" = set || CCAS=$CC
+test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS
+AC_ARG_VAR([CCAS],      [assembler compiler command (defaults to CC)])
+AC_ARG_VAR([CCASFLAGS], [assembler compiler flags (defaults to CFLAGS)])
+_AM_IF_OPTION([no-dependencies],, [_AM_DEPENDENCIES([CCAS])])dnl
+])
+
+# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
+
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
+# $ac_aux_dir to '$srcdir/foo'.  In other projects, it is set to
+# '$srcdir', '$srcdir/..', or '$srcdir/../..'.
+#
+# Of course, Automake must honor this variable whenever it calls a
+# tool from the auxiliary directory.  The problem is that $srcdir (and
+# therefore $ac_aux_dir as well) can be either absolute or relative,
+# depending on how configure is run.  This is pretty annoying, since
+# it makes $ac_aux_dir quite unusable in subdirectories: in the top
+# source directory, any form will work fine, but in subdirectories a
+# relative path needs to be adjusted first.
+#
+# $ac_aux_dir/missing
+#    fails when called from a subdirectory if $ac_aux_dir is relative
+# $top_srcdir/$ac_aux_dir/missing
+#    fails if $ac_aux_dir is absolute,
+#    fails when called from a subdirectory in a VPATH build with
+#          a relative $ac_aux_dir
+#
+# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
+# are both prefixed by $srcdir.  In an in-source build this is usually
+# harmless because $srcdir is '.', but things will broke when you
+# start a VPATH build or use an absolute $srcdir.
+#
+# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
+# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
+#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
+# and then we would define $MISSING as
+#   MISSING="\${SHELL} $am_aux_dir/missing"
+# This will work as long as MISSING is not called from configure, because
+# unfortunately $(top_srcdir) has no meaning in configure.
+# However there are other variables, like CC, which are often used in
+# configure, and could therefore not use this "fixed" $ac_aux_dir.
+#
+# Another solution, used here, is to always expand $ac_aux_dir to an
+# absolute PATH.  The drawback is that using absolute paths prevent a
+# configured tree to be moved without reconfiguration.
+
+AC_DEFUN([AM_AUX_DIR_EXPAND],
+[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
+])
+
+# AM_CONDITIONAL                                            -*- Autoconf -*-
+
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_CONDITIONAL(NAME, SHELL-CONDITION)
+# -------------------------------------
+# Define a conditional.
+AC_DEFUN([AM_CONDITIONAL],
+[AC_PREREQ([2.52])dnl
+ m4_if([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
+       [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+AC_SUBST([$1_TRUE])dnl
+AC_SUBST([$1_FALSE])dnl
+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
+m4_define([_AM_COND_VALUE_$1], [$2])dnl
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi
+AC_CONFIG_COMMANDS_PRE(
+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
+  AC_MSG_ERROR([[conditional "$1" was never defined.
+Usually this means the macro was only invoked conditionally.]])
+fi])])
+
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+
+# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
+# written in clear, in which case automake, when reading aclocal.m4,
+# will think it sees a *use*, and therefore will trigger all it's
+# C support machinery.  Also note that it means that autoscan, seeing
+# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
+
+
+# _AM_DEPENDENCIES(NAME)
+# ----------------------
+# See how the compiler implements dependency checking.
+# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
+# We try a few techniques and use that to set a single cache variable.
+#
+# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
+# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
+# dependency, and given that the user is not expected to run this macro,
+# just rely on AC_PROG_CC.
+AC_DEFUN([_AM_DEPENDENCIES],
+[AC_REQUIRE([AM_SET_DEPDIR])dnl
+AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
+AC_REQUIRE([AM_MAKE_INCLUDE])dnl
+AC_REQUIRE([AM_DEP_TRACK])dnl
+
+m4_if([$1], [CC],   [depcc="$CC"   am_compiler_list=],
+      [$1], [CXX],  [depcc="$CXX"  am_compiler_list=],
+      [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+      [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],
+      [$1], [UPC],  [depcc="$UPC"  am_compiler_list=],
+      [$1], [GCJ],  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
+                    [depcc="$$1"   am_compiler_list=])
+
+AC_CACHE_CHECK([dependency style of $depcc],
+               [am_cv_$1_dependencies_compiler_type],
+[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+  # We make a subdir and do the tests there.  Otherwise we can end up
+  # making bogus files that we don't know about and never remove.  For
+  # instance it was reported that on HP-UX the gcc test will end up
+  # making a dummy file named 'D' -- because '-MD' means "put the output
+  # in D".
+  rm -rf conftest.dir
+  mkdir conftest.dir
+  # Copy depcomp to subdir because otherwise we won't find it if we're
+  # using a relative directory.
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
+
+  am_cv_$1_dependencies_compiler_type=none
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
+  fi
+  am__universal=false
+  m4_case([$1], [CC],
+    [case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac],
+    [CXX],
+    [case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac])
+
+  for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
+    # We need to recreate these files for each test, as the compiler may
+    # overwrite some of them when testing with obscure command lines.
+    # This happens at least with the AIX C compiler.
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle '-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs.
+    am__obj=sub/conftest.${OBJEXT-o}
+    am__minus_obj="-o $am__obj"
+    case $depmode in
+    gcc)
+      # This depmode causes a compiler race in universal mode.
+      test "$am__universal" = false || continue
+      ;;
+    nosideeffect)
+      # After this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested.
+      if test "x$enable_dependency_tracking" = xyes; then
+	continue
+      else
+	break
+      fi
+      ;;
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+      # This compiler won't grok '-c -o', but also, the minuso test has
+      # not run yet.  These depmodes are late enough in the game, and
+      # so weak that their functioning should not be impacted.
+      am__obj=conftest.${OBJEXT-o}
+      am__minus_obj=
+      ;;
+    none) break ;;
+    esac
+    if depmode=$depmode \
+       source=sub/conftest.c object=$am__obj \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+        am_cv_$1_dependencies_compiler_type=$depmode
+        break
+      fi
+    fi
+  done
+
+  cd ..
+  rm -rf conftest.dir
+else
+  am_cv_$1_dependencies_compiler_type=none
+fi
+])
+AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
+AM_CONDITIONAL([am__fastdep$1], [
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
+])
+
+
+# AM_SET_DEPDIR
+# -------------
+# Choose a directory name for dependency files.
+# This macro is AC_REQUIREd in _AM_DEPENDENCIES.
+AC_DEFUN([AM_SET_DEPDIR],
+[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
+])
+
+
+# AM_DEP_TRACK
+# ------------
+AC_DEFUN([AM_DEP_TRACK],
+[AC_ARG_ENABLE([dependency-tracking], [dnl
+AS_HELP_STRING(
+  [--enable-dependency-tracking],
+  [do not reject slow dependency extractors])
+AS_HELP_STRING(
+  [--disable-dependency-tracking],
+  [speeds up one-time build])])
+if test "x$enable_dependency_tracking" != xno; then
+  am_depcomp="$ac_aux_dir/depcomp"
+  AMDEPBACKSLASH='\'
+  am__nodep='_no'
+fi
+AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
+AC_SUBST([AMDEPBACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+AC_SUBST([am__nodep])dnl
+_AM_SUBST_NOTMAKE([am__nodep])dnl
+])
+
+# Generate code to set up dependency tracking.              -*- Autoconf -*-
+
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+
+# _AM_OUTPUT_DEPENDENCY_COMMANDS
+# ------------------------------
+AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
+[{
+  # Older Autoconf quotes --file arguments for eval, but not when files
+  # are listed without --file.  Let's play safe and only enable the eval
+  # if we detect the quoting.
+  case $CONFIG_FILES in
+  *\'*) eval set x "$CONFIG_FILES" ;;
+  *)   set x $CONFIG_FILES ;;
+  esac
+  shift
+  for mf
+  do
+    # Strip MF so we end up with the name of the file.
+    mf=`echo "$mf" | sed -e 's/:.*$//'`
+    # Check whether this is an Automake generated Makefile or not.
+    # We used to match only the files named 'Makefile.in', but
+    # some people rename them; so instead we look at the file content.
+    # Grep'ing the first line is not enough: some people post-process
+    # each Makefile.in and add a new line on top of each file to say so.
+    # Grep'ing the whole file is not good either: AIX grep has a line
+    # limit of 2048, but all sed's we know have understand at least 4000.
+    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+      dirpart=`AS_DIRNAME("$mf")`
+    else
+      continue
+    fi
+    # Extract the definition of DEPDIR, am__include, and am__quote
+    # from the Makefile without running 'make'.
+    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+    test -z "$DEPDIR" && continue
+    am__include=`sed -n 's/^am__include = //p' < "$mf"`
+    test -z "$am__include" && continue
+    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+    # Find all dependency output files, they are included files with
+    # $(DEPDIR) in their names.  We invoke sed twice because it is the
+    # simplest approach to changing $(DEPDIR) to its actual value in the
+    # expansion.
+    for file in `sed -n "
+      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
+      # Make sure the directory exists.
+      test -f "$dirpart/$file" && continue
+      fdir=`AS_DIRNAME(["$file"])`
+      AS_MKDIR_P([$dirpart/$fdir])
+      # echo "creating $dirpart/$file"
+      echo '# dummy' > "$dirpart/$file"
+    done
+  done
+}
+])# _AM_OUTPUT_DEPENDENCY_COMMANDS
+
+
+# AM_OUTPUT_DEPENDENCY_COMMANDS
+# -----------------------------
+# This macro should only be invoked once -- use via AC_REQUIRE.
+#
+# This code is only required when automatic dependency tracking
+# is enabled.  FIXME.  This creates each '.P' file that we will
+# need in order to bootstrap the dependency handling code.
+AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
+[AC_CONFIG_COMMANDS([depfiles],
+     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
+     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
+])
+
+# Do all the work for Automake.                             -*- Autoconf -*-
+
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This macro actually does too much.  Some checks are only needed if
+# your package does certain things.  But this isn't really a big deal.
+
+dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
+m4_define([AC_PROG_CC],
+m4_defn([AC_PROG_CC])
+[_AM_PROG_CC_C_O
+])
+
+# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
+# AM_INIT_AUTOMAKE([OPTIONS])
+# -----------------------------------------------
+# The call with PACKAGE and VERSION arguments is the old style
+# call (pre autoconf-2.50), which is being phased out.  PACKAGE
+# and VERSION should now be passed to AC_INIT and removed from
+# the call to AM_INIT_AUTOMAKE.
+# We support both call styles for the transition.  After
+# the next Automake release, Autoconf can make the AC_INIT
+# arguments mandatory, and then we can depend on a new Autoconf
+# release and drop the old call support.
+AC_DEFUN([AM_INIT_AUTOMAKE],
+[AC_PREREQ([2.65])dnl
+dnl Autoconf wants to disallow AM_ names.  We explicitly allow
+dnl the ones we care about.
+m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
+AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
+AC_REQUIRE([AC_PROG_INSTALL])dnl
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+  # is not polluted with repeated "-I."
+  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
+  # test to see if srcdir already configured
+  if test -f $srcdir/config.status; then
+    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+  fi
+fi
+
+# test whether we have cygpath
+if test -z "$CYGPATH_W"; then
+  if (cygpath --version) >/dev/null 2>/dev/null; then
+    CYGPATH_W='cygpath -w'
+  else
+    CYGPATH_W=echo
+  fi
+fi
+AC_SUBST([CYGPATH_W])
+
+# Define the identity of the package.
+dnl Distinguish between old-style and new-style calls.
+m4_ifval([$2],
+[AC_DIAGNOSE([obsolete],
+             [$0: two- and three-arguments forms are deprecated.])
+m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+ AC_SUBST([PACKAGE], [$1])dnl
+ AC_SUBST([VERSION], [$2])],
+[_AM_SET_OPTIONS([$1])dnl
+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
+m4_if(
+  m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
+  [ok:ok],,
+  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
+
+_AM_IF_OPTION([no-define],,
+[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
+ AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl
+
+# Some tools Automake needs.
+AC_REQUIRE([AM_SANITY_CHECK])dnl
+AC_REQUIRE([AC_ARG_PROGRAM])dnl
+AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
+AM_MISSING_PROG([AUTOCONF], [autoconf])
+AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
+AM_MISSING_PROG([AUTOHEADER], [autoheader])
+AM_MISSING_PROG([MAKEINFO], [makeinfo])
+AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+# For better backward compatibility.  To be removed once Automake 1.9.x
+# dies out for good.  For more background, see:
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
+# We need awk for the "check" target (and possibly the TAP driver).  The
+# system "awk" is bad on some platforms.
+AC_REQUIRE([AC_PROG_AWK])dnl
+AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
+	      [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
+			     [_AM_PROG_TAR([v7])])])
+_AM_IF_OPTION([no-dependencies],,
+[AC_PROVIDE_IFELSE([AC_PROG_CC],
+		  [_AM_DEPENDENCIES([CC])],
+		  [m4_define([AC_PROG_CC],
+			     m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_CXX],
+		  [_AM_DEPENDENCIES([CXX])],
+		  [m4_define([AC_PROG_CXX],
+			     m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJC],
+		  [_AM_DEPENDENCIES([OBJC])],
+		  [m4_define([AC_PROG_OBJC],
+			     m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
+		  [_AM_DEPENDENCIES([OBJCXX])],
+		  [m4_define([AC_PROG_OBJCXX],
+			     m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
+])
+AC_REQUIRE([AM_SILENT_RULES])dnl
+dnl The testsuite driver may need to know about EXEEXT, so add the
+dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This
+dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
+AC_CONFIG_COMMANDS_PRE(dnl
+[m4_provide_if([_AM_COMPILER_EXEEXT],
+  [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
+
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes.  So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+  cat >&2 <<'END'
+Oops!
+
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present.  This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+
+Please tell bug-automake at gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message.  This
+can help us improve future automake versions.
+
+END
+  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+    echo 'Configuration will proceed anyway, since you have set the' >&2
+    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+    echo >&2
+  else
+    cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <http://www.gnu.org/software/coreutils/>.
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+    AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
+  fi
+fi
+dnl The trailing newline in this macro's definition is deliberate, for
+dnl backward compatibility and to allow trailing 'dnl'-style comments
+dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
+])
+
+dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
+dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
+dnl mangled by Autoconf and run in a shell conditional statement.
+m4_define([_AC_COMPILER_EXEEXT],
+m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
+
+# When config.status generates a header, we must update the stamp-h file.
+# This file resides in the same directory as the config header
+# that is generated.  The stamp files are numbered to have different names.
+
+# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
+# loop where config.status creates the headers, so we can generate
+# our stamp files there.
+AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
+[# Compute $1's index in $config_headers.
+_am_arg=$1
+_am_stamp_count=1
+for _am_header in $config_headers :; do
+  case $_am_header in
+    $_am_arg | $_am_arg:* )
+      break ;;
+    * )
+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+  esac
+done
+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
+
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_PROG_INSTALL_SH
+# ------------------
+# Define $install_sh.
+AC_DEFUN([AM_PROG_INSTALL_SH],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+if test x"${install_sh+set}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
+  *)
+    install_sh="\${SHELL} $am_aux_dir/install-sh"
+  esac
+fi
+AC_SUBST([install_sh])])
+
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# Check whether the underlying file-system supports filenames
+# with a leading dot.  For instance MS-DOS doesn't.
+AC_DEFUN([AM_SET_LEADING_DOT],
+[rm -rf .tst 2>/dev/null
+mkdir .tst 2>/dev/null
+if test -d .tst; then
+  am__leading_dot=.
+else
+  am__leading_dot=_
+fi
+rmdir .tst 2>/dev/null
+AC_SUBST([am__leading_dot])])
+
+# Copyright (C) 1998-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_PROG_LEX
+# -----------
+# Autoconf leaves LEX=: if lex or flex can't be found.  Change that to a
+# "missing" invocation, for better error output.
+AC_DEFUN([AM_PROG_LEX],
+[AC_PREREQ([2.50])dnl
+AC_REQUIRE([AM_MISSING_HAS_RUN])dnl
+AC_REQUIRE([AC_PROG_LEX])dnl
+if test "$LEX" = :; then
+  LEX=${am_missing_run}flex
+fi])
+
+# Check to see how 'make' treats includes.	            -*- Autoconf -*-
+
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_MAKE_INCLUDE()
+# -----------------
+# Check to see how make treats includes.
+AC_DEFUN([AM_MAKE_INCLUDE],
+[am_make=${MAKE-make}
+cat > confinc << 'END'
+am__doit:
+	@echo this is the am__doit target
+.PHONY: am__doit
+END
+# If we don't find an include directive, just comment out the code.
+AC_MSG_CHECKING([for style of include used by $am_make])
+am__include="#"
+am__quote=
+_am_result=none
+# First try GNU make style include.
+echo "include confinc" > confmf
+# Ignore all kinds of additional output from 'make'.
+case `$am_make -s -f confmf 2> /dev/null` in #(
+*the\ am__doit\ target*)
+  am__include=include
+  am__quote=
+  _am_result=GNU
+  ;;
+esac
+# Now try BSD make style include.
+if test "$am__include" = "#"; then
+   echo '.include "confinc"' > confmf
+   case `$am_make -s -f confmf 2> /dev/null` in #(
+   *the\ am__doit\ target*)
+     am__include=.include
+     am__quote="\""
+     _am_result=BSD
+     ;;
+   esac
+fi
+AC_SUBST([am__include])
+AC_SUBST([am__quote])
+AC_MSG_RESULT([$_am_result])
+rm -f confinc confmf
+])
+
+# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
+
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_MISSING_PROG(NAME, PROGRAM)
+# ------------------------------
+AC_DEFUN([AM_MISSING_PROG],
+[AC_REQUIRE([AM_MISSING_HAS_RUN])
+$1=${$1-"${am_missing_run}$2"}
+AC_SUBST($1)])
+
+# AM_MISSING_HAS_RUN
+# ------------------
+# Define MISSING if not defined so far and test if it is modern enough.
+# If it is, set am_missing_run to use it, otherwise, to nothing.
+AC_DEFUN([AM_MISSING_HAS_RUN],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([missing])dnl
+if test x"${MISSING+set}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+  *)
+    MISSING="\${SHELL} $am_aux_dir/missing" ;;
+  esac
+fi
+# Use eval to expand $SHELL
+if eval "$MISSING --is-lightweight"; then
+  am_missing_run="$MISSING "
+else
+  am_missing_run=
+  AC_MSG_WARN(['missing' script is too old or missing])
+fi
+])
+
+# Helper functions for option handling.                     -*- Autoconf -*-
+
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_MANGLE_OPTION(NAME)
+# -----------------------
+AC_DEFUN([_AM_MANGLE_OPTION],
+[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
+
+# _AM_SET_OPTION(NAME)
+# --------------------
+# Set option NAME.  Presently that only means defining a flag for this option.
+AC_DEFUN([_AM_SET_OPTION],
+[m4_define(_AM_MANGLE_OPTION([$1]), [1])])
+
+# _AM_SET_OPTIONS(OPTIONS)
+# ------------------------
+# OPTIONS is a space-separated list of Automake options.
+AC_DEFUN([_AM_SET_OPTIONS],
+[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
+
+# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
+# -------------------------------------------
+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+AC_DEFUN([_AM_IF_OPTION],
+[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
+
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_PROG_CC_C_O
+# ---------------
+# Like AC_PROG_CC_C_O, but changed for automake.  We rewrite AC_PROG_CC
+# to automatically call this.
+AC_DEFUN([_AM_PROG_CC_C_O],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([compile])dnl
+AC_LANG_PUSH([C])dnl
+AC_CACHE_CHECK(
+  [whether $CC understands -c and -o together],
+  [am_cv_prog_cc_c_o],
+  [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i])
+if test "$am_cv_prog_cc_c_o" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+AC_LANG_POP([C])])
+
+# For backward compatibility.
+AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
+
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_RUN_LOG(COMMAND)
+# -------------------
+# Run COMMAND, save the exit status in ac_status, and log it.
+# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
+AC_DEFUN([AM_RUN_LOG],
+[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
+   ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   (exit $ac_status); }])
+
+# Check to make sure that the build environment is sane.    -*- Autoconf -*-
+
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_SANITY_CHECK
+# ---------------
+AC_DEFUN([AM_SANITY_CHECK],
+[AC_MSG_CHECKING([whether build environment is sane])
+# Reject unsafe characters in $srcdir or the absolute working directory
+# name.  Accept space and tab only in the latter.
+am_lf='
+'
+case `pwd` in
+  *[[\\\"\#\$\&\'\`$am_lf]]*)
+    AC_MSG_ERROR([unsafe absolute working directory name]);;
+esac
+case $srcdir in
+  *[[\\\"\#\$\&\'\`$am_lf\ \	]]*)
+    AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
+esac
+
+# Do 'set' in a subshell so we don't clobber the current shell's
+# arguments.  Must try -L first in case configure is actually a
+# symlink; some systems play weird games with the mod time of symlinks
+# (eg FreeBSD returns the mod time of the symlink's containing
+# directory).
+if (
+   am_has_slept=no
+   for am_try in 1 2; do
+     echo "timestamp, slept: $am_has_slept" > conftest.file
+     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+     if test "$[*]" = "X"; then
+	# -L didn't work.
+	set X `ls -t "$srcdir/configure" conftest.file`
+     fi
+     if test "$[*]" != "X $srcdir/configure conftest.file" \
+	&& test "$[*]" != "X conftest.file $srcdir/configure"; then
+
+	# If neither matched, then we have a broken ls.  This can happen
+	# if, for instance, CONFIG_SHELL is bash and it inherits a
+	# broken ls alias from the environment.  This has actually
+	# happened.  Such a system could not be considered "sane".
+	AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
+  alias in your environment])
+     fi
+     if test "$[2]" = conftest.file || test $am_try -eq 2; then
+       break
+     fi
+     # Just in case.
+     sleep 1
+     am_has_slept=yes
+   done
+   test "$[2]" = conftest.file
+   )
+then
+   # Ok.
+   :
+else
+   AC_MSG_ERROR([newly created file is older than distributed files!
+Check your system clock])
+fi
+AC_MSG_RESULT([yes])
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+  ( sleep 1 ) &
+  am_sleep_pid=$!
+fi
+AC_CONFIG_COMMANDS_PRE(
+  [AC_MSG_CHECKING([that generated files are newer than configure])
+   if test -n "$am_sleep_pid"; then
+     # Hide warnings about reused PIDs.
+     wait $am_sleep_pid 2>/dev/null
+   fi
+   AC_MSG_RESULT([done])])
+rm -f conftest.file
+])
+
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_SILENT_RULES([DEFAULT])
+# --------------------------
+# Enable less verbose build rules; with the default set to DEFAULT
+# ("yes" being less verbose, "no" or empty being verbose).
+AC_DEFUN([AM_SILENT_RULES],
+[AC_ARG_ENABLE([silent-rules], [dnl
+AS_HELP_STRING(
+  [--enable-silent-rules],
+  [less verbose build output (undo: "make V=1")])
+AS_HELP_STRING(
+  [--disable-silent-rules],
+  [verbose build output (undo: "make V=0")])dnl
+])
+case $enable_silent_rules in @%:@ (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
+esac
+dnl
+dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
+dnl do not support nested variable expansions.
+dnl See automake bug#9928 and bug#10237.
+am_make=${MAKE-make}
+AC_CACHE_CHECK([whether $am_make supports nested variables],
+   [am_cv_make_support_nested_variables],
+   [if AS_ECHO([['TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi])
+if test $am_cv_make_support_nested_variables = yes; then
+  dnl Using '$V' instead of '$(V)' breaks IRIX make.
+  AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AC_SUBST([AM_V])dnl
+AM_SUBST_NOTMAKE([AM_V])dnl
+AC_SUBST([AM_DEFAULT_V])dnl
+AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
+AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
+AM_BACKSLASH='\'
+AC_SUBST([AM_BACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
+])
+
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_PROG_INSTALL_STRIP
+# ---------------------
+# One issue with vendor 'install' (even GNU) is that you can't
+# specify the program used to strip binaries.  This is especially
+# annoying in cross-compiling environments, where the build's strip
+# is unlikely to handle the host's binaries.
+# Fortunately install-sh will honor a STRIPPROG variable, so we
+# always use install-sh in "make install-strip", and initialize
+# STRIPPROG with the value of the STRIP variable (set by the user).
+AC_DEFUN([AM_PROG_INSTALL_STRIP],
+[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+# Installed binaries are usually stripped using 'strip' when the user
+# run "make install-strip".  However 'strip' might not be the right
+# tool to use in cross-compilation environments, therefore Automake
+# will honor the 'STRIP' environment variable to overrule this program.
+dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
+if test "$cross_compiling" != no; then
+  AC_CHECK_TOOL([STRIP], [strip], :)
+fi
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+AC_SUBST([INSTALL_STRIP_PROGRAM])])
+
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_SUBST_NOTMAKE(VARIABLE)
+# ---------------------------
+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
+# This macro is traced by Automake.
+AC_DEFUN([_AM_SUBST_NOTMAKE])
+
+# AM_SUBST_NOTMAKE(VARIABLE)
+# --------------------------
+# Public sister of _AM_SUBST_NOTMAKE.
+AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
+
+# Check how to create a tarball.                            -*- Autoconf -*-
+
+# Copyright (C) 2004-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_PROG_TAR(FORMAT)
+# --------------------
+# Check how to create a tarball in format FORMAT.
+# FORMAT should be one of 'v7', 'ustar', or 'pax'.
+#
+# Substitute a variable $(am__tar) that is a command
+# writing to stdout a FORMAT-tarball containing the directory
+# $tardir.
+#     tardir=directory && $(am__tar) > result.tar
+#
+# Substitute a variable $(am__untar) that extract such
+# a tarball read from stdin.
+#     $(am__untar) < result.tar
+#
+AC_DEFUN([_AM_PROG_TAR],
+[# Always define AMTAR for backward compatibility.  Yes, it's still used
+# in the wild :-(  We should find a proper way to deprecate it ...
+AC_SUBST([AMTAR], ['$${TAR-tar}'])
+
+# We'll loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
+
+m4_if([$1], [v7],
+  [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
+
+  [m4_case([$1],
+    [ustar],
+     [# The POSIX 1988 'ustar' format is defined with fixed-size fields.
+      # There is notably a 21 bits limit for the UID and the GID.  In fact,
+      # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
+      # and bug#13588).
+      am_max_uid=2097151 # 2^21 - 1
+      am_max_gid=$am_max_uid
+      # The $UID and $GID variables are not portable, so we need to resort
+      # to the POSIX-mandated id(1) utility.  Errors in the 'id' calls
+      # below are definitely unexpected, so allow the users to see them
+      # (that is, avoid stderr redirection).
+      am_uid=`id -u || echo unknown`
+      am_gid=`id -g || echo unknown`
+      AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
+      if test $am_uid -le $am_max_uid; then
+         AC_MSG_RESULT([yes])
+      else
+         AC_MSG_RESULT([no])
+         _am_tools=none
+      fi
+      AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
+      if test $am_gid -le $am_max_gid; then
+         AC_MSG_RESULT([yes])
+      else
+        AC_MSG_RESULT([no])
+        _am_tools=none
+      fi],
+
+  [pax],
+    [],
+
+  [m4_fatal([Unknown tar format])])
+
+  AC_MSG_CHECKING([how to create a $1 tar archive])
+
+  # Go ahead even if we have the value already cached.  We do so because we
+  # need to set the values for the 'am__tar' and 'am__untar' variables.
+  _am_tools=${am_cv_prog_tar_$1-$_am_tools}
+
+  for _am_tool in $_am_tools; do
+    case $_am_tool in
+    gnutar)
+      for _am_tar in tar gnutar gtar; do
+        AM_RUN_LOG([$_am_tar --version]) && break
+      done
+      am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+      am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+      am__untar="$_am_tar -xf -"
+      ;;
+    plaintar)
+      # Must skip GNU tar: if it does not support --format= it doesn't create
+      # ustar tarball either.
+      (tar --version) >/dev/null 2>&1 && continue
+      am__tar='tar chf - "$$tardir"'
+      am__tar_='tar chf - "$tardir"'
+      am__untar='tar xf -'
+      ;;
+    pax)
+      am__tar='pax -L -x $1 -w "$$tardir"'
+      am__tar_='pax -L -x $1 -w "$tardir"'
+      am__untar='pax -r'
+      ;;
+    cpio)
+      am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+      am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+      am__untar='cpio -i -H $1 -d'
+      ;;
+    none)
+      am__tar=false
+      am__tar_=false
+      am__untar=false
+      ;;
+    esac
+
+    # If the value was cached, stop now.  We just wanted to have am__tar
+    # and am__untar set.
+    test -n "${am_cv_prog_tar_$1}" && break
+
+    # tar/untar a dummy directory, and stop if the command works.
+    rm -rf conftest.dir
+    mkdir conftest.dir
+    echo GrepMe > conftest.dir/file
+    AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+    rm -rf conftest.dir
+    if test -s conftest.tar; then
+      AM_RUN_LOG([$am__untar <conftest.tar])
+      AM_RUN_LOG([cat conftest.dir/file])
+      grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+    fi
+  done
+  rm -rf conftest.dir
+
+  AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+  AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+
+AC_SUBST([am__tar])
+AC_SUBST([am__untar])
+]) # _AM_PROG_TAR
+
+m4_include([config/c_get_alignment.m4])
+m4_include([config/libtool.m4])
+m4_include([config/ltoptions.m4])
+m4_include([config/ltsugar.m4])
+m4_include([config/ltversion.m4])
+m4_include([config/lt~obsolete.m4])
+m4_include([config/pmix.m4])
+m4_include([config/pmix_check_attributes.m4])
+m4_include([config/pmix_check_broken_qsort.m4])
+m4_include([config/pmix_check_compiler_version.m4])
+m4_include([config/pmix_check_icc.m4])
+m4_include([config/pmix_check_ident.m4])
+m4_include([config/pmix_check_lock.m4])
+m4_include([config/pmix_check_os_flavors.m4])
+m4_include([config/pmix_check_package.m4])
+m4_include([config/pmix_check_psm2.m4])
+m4_include([config/pmix_check_pthread_pids.m4])
+m4_include([config/pmix_check_vendor.m4])
+m4_include([config/pmix_check_visibility.m4])
+m4_include([config/pmix_check_withdir.m4])
+m4_include([config/pmix_config_asm.m4])
+m4_include([config/pmix_config_pthreads.m4])
+m4_include([config/pmix_config_subdir.m4])
+m4_include([config/pmix_config_subdir_args.m4])
+m4_include([config/pmix_config_threads.m4])
+m4_include([config/pmix_ensure_contains_optflags.m4])
+m4_include([config/pmix_functions.m4])
+m4_include([config/pmix_load_platform.m4])
+m4_include([config/pmix_mca.m4])
+m4_include([config/pmix_search_libs.m4])
+m4_include([config/pmix_setup_cc.m4])
+m4_include([config/pmix_setup_libevent.m4])
+m4_include([config/pmix_setup_zlib.m4])
+m4_include([config/pmix_try_assemble.m4])
diff --git a/autogen.pl b/autogen.pl
new file mode 100755
index 0000000..be66633
--- /dev/null
+++ b/autogen.pl
@@ -0,0 +1,739 @@
+#!/usr/bin/env perl
+#
+# Copyright (c) 2009-2016 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2010      Oracle and/or its affiliates.  All rights reserved.
+# Copyright (c) 2013      Mellanox Technologies, Inc.
+#                         All rights reserved.
+# Copyright (c) 2013-2017 Intel, Inc. All rights reserved.
+# Copyright (c) 2015      Research Organization for Information Science
+#                         and Technology (RIST). All rights reserved.
+# Copyright (c) 2015      IBM Corporation.  All rights reserved.
+#
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+use strict;
+
+use Cwd;
+use File::Basename;
+use File::Find;
+use Data::Dumper;
+use Getopt::Long;
+
+#
+# Global variables
+#
+
+# Sentinel file to remove if we fail
+my $sentinel;
+
+# The m4 file we'll write at the end
+my $m4_output_file = "config/autogen_found_items.m4";
+my $m4;
+# Sanity check file
+my $topdir_file = "include/pmix.h";
+my $dnl_line = "dnl ---------------------------------------------------------------------------";
+
+# Data structures to fill up with all the stuff we find
+my $mca_found;
+my @subdirs;
+
+# Command line parameters
+my $quiet_arg = 0;
+my $debug_arg = 0;
+my $help_arg = 0;
+my $include_arg = 0;
+my $exclude_arg = 0;
+my $force_arg = 0;
+
+# Include/exclude lists
+my $include_list;
+my $exclude_list;
+
+# Minimum versions
+my $pmix_automake_version = "1.13.4";
+my $pmix_autoconf_version = "2.69";
+my $pmix_libtool_version = "2.4.2";
+
+# Search paths
+my $pmix_autoconf_search = "autoconf";
+my $pmix_automake_search = "automake";
+my $pmix_libtoolize_search = "libtoolize;glibtoolize";
+
+# One-time setup
+my $username;
+my $hostname;
+my $full_hostname;
+
+$username = getpwuid($>);
+$full_hostname = `hostname`;
+chomp($full_hostname);
+$hostname = $full_hostname;
+$hostname =~ s/^([\w\-]+)\..+/\1/;
+
+##############################################################################
+
+sub my_die {
+    unlink($sentinel)
+        if ($sentinel);
+    die @_;
+}
+
+sub my_exit {
+    my ($ret) = @_;
+    unlink($sentinel)
+        if ($sentinel && $ret != 0);
+    exit($ret);
+}
+
+##############################################################################
+
+sub verbose {
+    print @_
+        if (!$quiet_arg);
+}
+
+sub debug {
+    print @_
+        if ($debug_arg);
+}
+
+sub debug_dump {
+    my $d = new Data::Dumper([@_]);
+    $d->Purity(1)->Indent(1);
+    debug $d->Dump;
+}
+
+##############################################################################
+
+sub mca_process_component {
+    my ($framework, $component) = @_;
+
+    my $cdir = "src/mca/$framework/$component";
+
+    return
+        if (! -d $cdir);
+
+    # Process this directory
+    my $found_component;
+
+    $found_component = {
+        name => $component,
+        framework_name => $framework,
+        abs_dir => $cdir,
+    };
+
+    # Does this directory have a configure.m4 file?
+    if (-f "$cdir/configure.m4") {
+        $found_component->{"configure.m4"} = 1;
+        verbose "    Found configure.m4 file\n";
+    }
+
+    # Push the results onto the $mca_found hash array
+    push(@{$mca_found->{$framework}->{"components"}},
+         $found_component);
+
+}
+
+##############################################################################
+
+sub ignored {
+    my ($dir) = @_;
+
+    # If this directory does not have .pmix_ignore, or if it has a
+    # .pmix_unignore that has my username in it, then add it to the
+    # list of components.
+    my $ignored = 0;
+
+    if (-f "$dir/.pmix_ignore") {
+        $ignored = 1;
+    }
+    if (-f "$dir/.pmix_unignore") {
+        open(UNIGNORE, "$dir/.pmix_unignore") ||
+            my_die "Can't open $dir/.pmix_unignore file";
+        my $unignore;
+        $unignore .= $_
+            while (<UNIGNORE>);
+        close(UNIGNORE);
+
+        $ignored = 0
+            if ($unignore =~ /^$username$/m ||
+                $unignore =~ /^$username\@$hostname$/m ||
+                $unignore =~ /^$username\@$full_hostname$/m);
+    }
+
+    return $ignored;
+}
+
+##############################################################################
+
+sub mca_process_framework {
+    my ($framework) = @_;
+
+    # Does this framework have a configure.m4 file?
+    my $dir = "src/mca/$framework";
+    if (-f "$dir/configure.m4") {
+        $mca_found->{$framework}->{"configure.m4"} = 1;
+        verbose "    Found framework configure.m4 file\n";
+    }
+
+    # Did we exclude all components for this framework?
+    if (exists($exclude_list->{$framework}) &&
+        $exclude_list->{$framework}[0] eq "AGEN_EXCLUDE_ALL") {
+        verbose "    => Excluded\n";
+    } else {
+        # Look for component directories in this framework
+        if (-d $dir) {
+            $mca_found->{$framework}->{found} = 1;
+            opendir(DIR, $dir) ||
+                my_die "Can't open $dir directory";
+            foreach my $d (sort(readdir(DIR))) {
+                # Skip any non-directory, "base", or any dir that
+                # begins with "."
+                next
+                    if (! -d "$dir/$d" || $d eq "base" ||
+                        substr($d, 0, 1) eq ".");
+
+                # Skip any component that doesn't have a configure.m4
+                # or Makefile.am as we couldn't build it anyway
+                if (! -f "$dir/$d/configure.m4" &&
+                    ! -f "$dir/$d/Makefile.am" &&
+                    ! -f "$dir/$d/configure.ac" &&
+                    ! -f "$dir/$d/configure.in") {
+                     verbose "    => No sentinel file found in $dir/$d -> Excluded\n";
+                     next;
+                }
+
+                verbose "--- Found pmix / $framework / $d component: src/mca/$framework/$d\n";
+
+                # Skip if specifically excluded
+                if (exists($exclude_list->{$framework}) &&
+                    $exclude_list->{$framework}[0] eq $d) {
+                    verbose "    => Excluded\n";
+                    next;
+                }
+
+                # Skip if the framework is on the include list, but
+                # doesn't contain this component
+                if (exists($include_list->{$framework})) {
+                    my $tst = 0;
+                    foreach my $ck (@{$include_list->{$framework}}) {
+                        if ($ck ne $d) {
+                            verbose "    => Not included\n";
+                            $tst = 1;
+                            last;
+                        }
+                    }
+                    if ($tst) {
+                        next;
+                    }
+                }
+
+                # Check ignore status
+                if (ignored("$dir/$d")) {
+                    verbose "    => Ignored (found .pmix_ignore file)\n";
+                } else {
+                    mca_process_component($framework, $d);
+                }
+            }
+        }
+        closedir(DIR);
+    }
+}
+
+##############################################################################
+
+sub mca_generate_framework_header(\$\@) {
+    my (@frameworks) = @_;
+    my $framework_array_output="";
+    my $framework_decl_output="";
+
+    foreach my $framework (@frameworks) {
+        # There is no common framework object
+        if ($framework ne "common") {
+            my $framework_name = "pmix_${framework}_base_framework";
+            $framework_array_output .= "    &$framework_name,\n";
+            $framework_decl_output .= "extern pmix_mca_base_framework_t $framework_name;\n";
+        }
+    }
+
+    my $ifdef_string = uc "pmix_FRAMEWORKS_H";
+    open(FRAMEWORKS_OUT, ">src/include/frameworks.h");
+    printf FRAMEWORKS_OUT "%s", "/*
+ * This file is autogenerated by autogen.pl. Do not edit this file by hand.
+ */
+#ifndef $ifdef_string
+#define $ifdef_string
+
+#include <pmix/mca/base/mca_base_framework.h>
+
+$framework_decl_output
+static pmix_mca_base_framework_t *pmix_frameworks[] = {
+$framework_array_output    NULL
+};
+
+#endif /* $ifdef_string */\n\n";
+    close(FRAMEWORKS_OUT);
+}
+
+##############################################################################
+
+sub mca_process_project {
+
+    # Look for framework directories
+    my $dir = "src/mca";
+    opendir(DIR, $dir) ||
+        my_die "Can't open $dir directory";
+    my @my_dirs = readdir(DIR);
+    @my_dirs = sort(@my_dirs);
+
+    foreach my $d (@my_dirs) {
+        # Skip any non-directory, "base", or any dir that begins with "."
+        next
+            if (! -d "$dir/$d" || $d eq "base" || substr($d, 0, 1) eq ".");
+
+        # If this directory has a $dir.h file and a base/
+        # subdirectory, or its name is "common", then it's a
+        # framework.
+        if ("common" eq $d ||
+            (-f "$dir/$d/$d.h" && -d "$dir/$d/base")) {
+            verbose "\n=== Found pmix framework: src/mca/$d\n";
+            mca_process_framework($d);
+        }
+    }
+    closedir(DIR);
+}
+
+##############################################################################
+
+sub mca_run_global {
+
+    # Go find a list of frameworks, and for each of
+    # those, go find a list of components.
+    mca_process_project();
+
+    # Debugging output
+    debug_dump($mca_found);
+
+    $m4 .= "\n$dnl_line
+$dnl_line
+$dnl_line
+
+dnl MCA information\n";
+
+    # Array for all the m4_includes that we'll need to pick up the
+    # configure.m4's.
+    my @includes;
+
+    # Write the list of frameworks
+    my $frameworks_comma;
+
+    # Print out project-level info
+    my @mykeys = keys(%{$mca_found});
+    @mykeys = sort(@mykeys);
+
+    # Ensure that the "common" framework is listed first
+    # (if it exists)
+    my @tmp;
+    push(@tmp, "common")
+        if (grep(/common/, @mykeys));
+    foreach my $f (@mykeys) {
+        push(@tmp, $f)
+            if ($f ne "common");
+    }
+    @mykeys = @tmp;
+
+    foreach my $f (@mykeys) {
+        $frameworks_comma .= ", $f";
+
+        # Does this framework have a configure.m4 file?
+        push(@includes, "src/mca/$f/configure.m4")
+            if (exists($mca_found->{$f}->{"configure.m4"}));
+
+        # This framework does have a Makefile.am (or at least,
+        # it should!)
+        my_die "Missing src/mca/$f/Makefile.am"
+            if (! -f "src/mca/$f/Makefile.am");
+    }
+    $frameworks_comma =~ s/^, //;
+
+    &mca_generate_framework_header("src", @mykeys);
+
+    $m4 .= "$dnl_line
+
+dnl Frameworks in the pmix project and their corresponding directories
+m4_define([mca_pmix_framework_list], [$frameworks_comma])
+
+";
+
+    # Print out framework-level info
+    foreach my $f (@mykeys) {
+        my $components;
+        my $m4_config_component_list;
+        my $no_config_component_list;
+
+        # Troll through each of the found components
+        foreach my $comp (@{$mca_found->{$f}->{components}}) {
+            my $c = $comp->{name};
+            $components .= "$c ";
+
+            # Does this component have a configure.m4 file?
+            if (exists($comp->{"configure.m4"})) {
+                push(@includes, "src/mca/$f/$c/configure.m4");
+                $m4_config_component_list .= ", $c";
+            } else {
+                $no_config_component_list .= ", $c";
+            }
+        }
+        $m4_config_component_list =~ s/^, //;
+        $no_config_component_list =~ s/^, //;
+
+        $m4 .= "dnl Components in the pmix / $f framework
+m4_define([mca_pmix_${f}_m4_config_component_list], [$m4_config_component_list])
+m4_define([mca_pmix_${f}_no_config_component_list], [$no_config_component_list])
+
+";
+    }
+
+    # List out all the m4_include
+    $m4 .= "$dnl_line
+
+dnl List of configure.m4 files to include\n";
+    foreach my $i (@includes) {
+        $m4 .= "m4_include([$i])\n";
+    }
+}
+
+
+##############################################################################
+# Find and remove stale files
+
+sub find_and_delete {
+    foreach my $file (@_) {
+        my $removed = 0;
+        if (-f $file) {
+            unlink($file);
+            $removed = 1;
+        }
+        if (-f "config/$file") {
+            unlink("config/$file");
+            $removed = 1;
+        }
+        debug "    Removed stale copy of $file\n"
+            if ($removed);
+    }
+}
+
+##############################################################################
+# Find a specific executable and ensure that it is a recent enough
+# version.
+
+sub find_and_check {
+    my ($app, $app_name, $req_version) = @_;
+
+    my @search_path = split(/;/, $app_name);
+    my @min_version = split(/\./, $req_version);
+    my @versions_found = ();
+
+    foreach (@search_path) {
+        verbose "   Searching for $_\n";
+        my $version = `$_ --version`;
+        if (!defined($version)) {
+            verbose "  $_ not found\n";
+            next;
+        }
+
+	# Matches a version string with 1 or more parts possibly prefixed with a letter (ex:
+	# v2.2) or followed by a letter (ex: 2.2.6b). This regex assumes there is a space
+	# before the version string and that the version is ok if there is no version.
+	if (!($version =~ m/\s[vV]?(\d[\d\.]*\w?)/m)) {
+	    verbose "  WARNING: $_ does not appear to support --version. Assuming it is ok\n";
+
+	    return;
+	}
+
+	$version = $1;
+
+        verbose "     Found $_ version $version; checking version...\n";
+        push(@versions_found, $version);
+
+        my @parts = split(/\./, $version);
+        my $i = 0;
+        # Check every component of the version number
+        while ($i <= $#min_version) {
+            verbose "       Found version component $parts[$i] -- need $min_version[$i]\n";
+
+            # Check to see if there are any characters (!) in the
+            # version number (e.g., Libtool's "2.2.6b" -- #%@#$%!!!).
+            # Do separate comparisons between the number and any
+            # trailing digits.  You can't just "lt" compare the whole
+            # string because "10 lt 2b" will return true.  #@$@#$#@$
+            # Libtool!!
+            $parts[$i] =~ m/(\d+)([a-z]*)/i;
+            my $pn = $1;
+            my $pa = $2;
+            $min_version[$i] =~ m/(\d+)([a-z]*)/i;
+            my $mn = $1;
+            my $ma = $2;
+
+            # If the version is higher, we're done.
+            if ($pn > $mn) {
+                verbose "     ==> ACCEPTED\n";
+                return;
+            }
+            # If the version is lower, we're done.
+            elsif ($pn < $mn ||
+                ($pn == $mn && $pa lt $ma)) {
+                verbose "     ==> Too low!  Skipping this version\n";
+                last;
+            }
+
+            # If the version was equal, keep checking.
+            ++$i;
+        }
+
+        # If we found a good version, return.
+        if ($i > $#min_version) {
+            verbose "     ==> ACCEPTED\n";
+            return;
+        }
+    }
+
+    # if no acceptable version found, reject it
+    print "
+=================================================================
+I could not find a recent enough copy of $app.
+I need at least $req_version, but only found the following versions:\n\n";
+
+    my $i = 0;
+    foreach (@search_path) {
+        print "    $_: $versions_found[$i]\n";
+        $i++;
+    }
+
+    print "\nI am gonna abort.  :-(
+
+Please make sure you are using at least the following versions of the
+tools:
+
+    GNU Autoconf: $pmix_autoconf_version
+    GNU Automake: $pmix_automake_version
+    GNU Libtool: $pmix_libtool_version
+=================================================================\n";
+    my_exit(1);
+}
+
+##############################################################################
+
+sub safe_system {
+    print "Running: " . join(/ /, @_) . "\n";
+    my $ret = system(@_);
+    $ret >>= 8;
+    if (0 != $ret) {
+        print "Command failed: @_\n";
+        my_exit($ret);
+    }
+    $ret;
+}
+
+##############################################################################
+
+sub in_tarball {
+    my $tarball = 0;
+    open(IN, "VERSION") || my_die "Can't open VERSION";
+    # If repo_rev is not an empty string, we are in a tarball
+    while (<IN>) {
+          my $line = $_;
+          my @fields = split(/=/,$line);
+          if ($fields[0] eq "repo_rev") {
+              if ($fields[1] ne "\n") {
+                  $tarball = 1;
+                  last;
+              }
+          }
+    }
+    close(IN);
+    return $tarball;
+}
+
+##############################################################################
+##############################################################################
+## main - do the real work...
+##############################################################################
+##############################################################################
+
+# Command line parameters
+
+my $ok = Getopt::Long::GetOptions("quiet|q" => \$quiet_arg,
+                                  "debug|d" => \$debug_arg,
+                                  "help|h" => \$help_arg,
+                                  "include=s" => \$include_arg,
+                                  "exclude=s" => \$exclude_arg,
+                                  "force|f" => \$force_arg,
+    );
+
+if (!$ok || $help_arg) {
+    print "Invalid command line argument.\n\n"
+        if (!$ok);
+    print "Options:
+  --quiet | -q                  Do not display normal verbose output
+  --debug | -d                  Output lots of debug information
+  --help | -h                   This help list
+  --include | -i                Comma-separated list of framework-component pairs
+                                to be exclusively built - i.e., all other components
+                                will be ignored and only those specified will be marked
+                                to build
+  --exclude | -e                Comma-separated list of framework or framework-component
+                                to be excluded from the build
+  --force | -f                  Run even if invoked from the source tree of an expanded
+                                distribution tarball\n";
+    my_exit($ok ? 0 : 1);
+}
+
+#---------------------------------------------------------------------------
+
+# Check for project existence
+my $project_name_long = "PMIx";
+my $project_name_short = "PMIx";
+
+#---------------------------------------------------------------------------
+
+$full_hostname = `hostname`;
+chomp($full_hostname);
+
+$m4 = "dnl
+dnl \$HEADER\$
+dnl
+$dnl_line
+dnl This file is automatically created by autogen.pl; it should not
+dnl be edited by hand!!
+dnl
+dnl Generated by $username at " . localtime(time) . "
+dnl on $full_hostname.
+$dnl_line\n\n";
+
+#---------------------------------------------------------------------------
+
+# Verify that we're in the PMIx root directory by checking for a token file.
+
+my_die "Not at the root directory of an PMIx source tree"
+    if (! -f "config/pmix_mca.m4");
+
+$force_arg = 1;
+
+my_die "autogen.pl has been invoked in the source tree of a PMIx distribution tarball; aborting...
+You likely do not need to invoke \"autogen.pl\" -- you can probably run \"configure\" directly.
+If you really know what you are doing, and really need to run autogen.pl, use the \"--force\" flag."
+    if (!$force_arg && in_tarball());
+
+# Now that we've verified that we're in the top-level OMPI directory,
+# set the sentinel file to remove if we abort.
+$sentinel = Cwd::cwd() . "/configure";
+
+#---------------------------------------------------------------------------
+
+my $step = 1;
+verbose "PMIx autogen (buckle up!)
+
+$step. Checking tool versions\n\n";
+
+# Check the autotools revision levels
+&find_and_check("autoconf", $pmix_autoconf_search, $pmix_autoconf_version);
+&find_and_check("libtool", $pmix_libtoolize_search, $pmix_libtool_version);
+&find_and_check("automake", $pmix_automake_search, $pmix_automake_version);
+
+#---------------------------------------------------------------------------
+
+# No platform file -- write an empty list
+$m4 .= "m4_define([autogen_platform_file], [])\n\n";
+
+if ($exclude_arg) {
+    debug "Using exclude list: $exclude_arg";
+    my @list = split(/,/, $exclude_arg);
+    foreach (@list) {
+        my @pairs = split(/-/, $_);
+        if (exists($pairs[1])) {
+        # Remove any trailing newlines
+            chomp($pairs[1]);
+            debug "    Adding ".$pairs[0]."->".$pairs[1]." to exclude list\n";
+            push(@{$exclude_list->{$pairs[0]}}, $pairs[1]);
+        } else {
+            debug "    Adding $pairs[0] to exclude list\n";
+            push(@{$exclude_list->{$pairs[0]}}, "AGEN_EXCLUDE_ALL");
+        }
+    }
+}
+if ($include_arg) {
+    debug "Using include list: $include_arg";
+    my @list = split(/,/, $include_arg);
+    foreach (@list) {
+        my @pairs = split(/-/, $_);
+        if (exists($pairs[1])) {
+        # Remove any trailing newlines
+            chomp($pairs[1]);
+            debug "    Adding ".$pairs[0]."->".$pairs[1]." to include list\n";
+            push(@{$include_list->{$pairs[0]}}, $pairs[1]);
+        }
+        # NOTE: it makes no sense to include all as that is the default
+        # so ignore that scenario here, if given
+    }
+}
+
+#---------------------------------------------------------------------------
+
+# Find frameworks, components
+++$step;
+verbose "\n$step. Searching for MCA frameworks and components\n";
+
+my $ret;
+
+# Figure out if we're at the top level of the PMIx tree or not.
+if (! (-f "VERSION" && -f "configure.ac" && -f $topdir_file)) {
+    print("\n\nYou must run this script from the top-level directory of the PMIx tree.\n\n");
+    my_exit(1);
+}
+
+$m4 .= "\ndnl Project names
+m4_define([project_name_long], [$project_name_long])
+m4_define([project_name_short], [$project_name_short])\n";
+
+# Setup MCA
+mca_run_global();
+
+#---------------------------------------------------------------------------
+
+# If we got here, all was good.  Run the auto tools.
+++$step;
+verbose "\n$step. Running autotools on top-level tree\n\n";
+
+# Remove old versions of the files (this is probably overkill, but...)
+verbose "==> Remove stale files\n";
+find_and_delete(qw/config.guess config.sub depcomp compile install-sh ltconfig
+    ltmain.sh missing mkinstalldirs libtool/);
+
+# Remove the old m4 file and write the new one
+verbose "==> Writing m4 file with autogen.pl results\n";
+unlink($m4_output_file);
+open(M4, ">$m4_output_file") ||
+    my_die "Can't open $m4_output_file";
+print M4 $m4;
+close(M4);
+
+# Run autoreconf
+verbose "==> Running autoreconf\n";
+my $cmd = "autoreconf -ivf --warnings=all,no-obsolete,no-override -I config";
+safe_system($cmd);
+
+#---------------------------------------------------------------------------
+
+verbose "
+================================================
+PMIx autogen: completed successfully.  w00t!
+================================================\n\n";
+
+# Done!
+exit(0);
diff --git a/config/Makefile.am b/config/Makefile.am
new file mode 100644
index 0000000..3793162
--- /dev/null
+++ b/config/Makefile.am
@@ -0,0 +1,51 @@
+# Copyright (c) 2013-2016 Intel, Inc. All rights reserved
+# Copyright (c) 2016      Research Organization for Information Science
+#                         and Technology (RIST). All rights reserved.
+# Copyright (c) 2006-2016 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2010      Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2010      Oracle and/or its affiliates.  All rights
+#                         reserved.
+# Copyright (c) 2016      Intel, Inc. All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+EXTRA_DIST = \
+	c_get_alignment.m4 \
+	pmix_get_version.sh \
+	distscript.sh \
+	pmix_check_attributes.m4 \
+	pmix_check_broken_qsort.m4 \
+	pmix_check_compiler_version.m4 \
+	pmix_check_icc.m4 \
+	pmix_check_ident.m4 \
+	pmix_check_package.m4 \
+	pmix_check_vendor.m4 \
+	pmix_check_visibility.m4 \
+	pmix_check_lock.m4 \
+	pmix_config_subdir.m4 \
+	pmix_ensure_contains_optflags.m4 \
+	pmix_functions.m4 \
+	pmix.m4 \
+	pmix_search_libs.m4 \
+	pmix_setup_cc.m4 \
+	pmix_setup_zlib.m4 \
+	pmix_setup_libevent.m4 \
+	pmix_mca_priority_sort.pl
+
+
+maintainer-clean-local:
+	rm -f pmix_get_version.sh
diff --git a/config/Makefile.in b/config/Makefile.in
new file mode 100644
index 0000000..6adc5ac
--- /dev/null
+++ b/config/Makefile.in
@@ -0,0 +1,654 @@
+# Makefile.in generated by automake 1.15 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+# Copyright (c) 2013-2016 Intel, Inc. All rights reserved
+# Copyright (c) 2016      Research Organization for Information Science
+#                         and Technology (RIST). All rights reserved.
+# Copyright (c) 2006-2016 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2010      Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2010      Oracle and/or its affiliates.  All rights
+#                         reserved.
+# Copyright (c) 2016      Intel, Inc. All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+subdir = config
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/config/c_get_alignment.m4 \
+	$(top_srcdir)/config/libtool.m4 \
+	$(top_srcdir)/config/ltoptions.m4 \
+	$(top_srcdir)/config/ltsugar.m4 \
+	$(top_srcdir)/config/ltversion.m4 \
+	$(top_srcdir)/config/lt~obsolete.m4 \
+	$(top_srcdir)/config/pmix.m4 \
+	$(top_srcdir)/config/pmix_check_attributes.m4 \
+	$(top_srcdir)/config/pmix_check_broken_qsort.m4 \
+	$(top_srcdir)/config/pmix_check_compiler_version.m4 \
+	$(top_srcdir)/config/pmix_check_icc.m4 \
+	$(top_srcdir)/config/pmix_check_ident.m4 \
+	$(top_srcdir)/config/pmix_check_lock.m4 \
+	$(top_srcdir)/config/pmix_check_os_flavors.m4 \
+	$(top_srcdir)/config/pmix_check_package.m4 \
+	$(top_srcdir)/config/pmix_check_psm2.m4 \
+	$(top_srcdir)/config/pmix_check_pthread_pids.m4 \
+	$(top_srcdir)/config/pmix_check_vendor.m4 \
+	$(top_srcdir)/config/pmix_check_visibility.m4 \
+	$(top_srcdir)/config/pmix_check_withdir.m4 \
+	$(top_srcdir)/config/pmix_config_asm.m4 \
+	$(top_srcdir)/config/pmix_config_pthreads.m4 \
+	$(top_srcdir)/config/pmix_config_subdir.m4 \
+	$(top_srcdir)/config/pmix_config_subdir_args.m4 \
+	$(top_srcdir)/config/pmix_config_threads.m4 \
+	$(top_srcdir)/config/pmix_ensure_contains_optflags.m4 \
+	$(top_srcdir)/config/pmix_functions.m4 \
+	$(top_srcdir)/config/pmix_load_platform.m4 \
+	$(top_srcdir)/config/pmix_mca.m4 \
+	$(top_srcdir)/config/pmix_search_libs.m4 \
+	$(top_srcdir)/config/pmix_setup_cc.m4 \
+	$(top_srcdir)/config/pmix_setup_libevent.m4 \
+	$(top_srcdir)/config/pmix_setup_zlib.m4 \
+	$(top_srcdir)/config/pmix_try_assemble.m4 \
+	$(top_srcdir)/config/autogen_found_items.m4 \
+	$(top_srcdir)/src/mca/pdl/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/configure.m4 \
+	$(top_srcdir)/src/mca/pdl/pdlopen/configure.m4 \
+	$(top_srcdir)/src/mca/pdl/plibltdl/configure.m4 \
+	$(top_srcdir)/src/mca/pif/bsdx_ipv4/configure.m4 \
+	$(top_srcdir)/src/mca/pif/bsdx_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pif/linux_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pif/posix_ipv4/configure.m4 \
+	$(top_srcdir)/src/mca/pif/solaris_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/config/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/env/configure.m4 \
+	$(top_srcdir)/src/mca/pnet/opa/configure.m4 \
+	$(top_srcdir)/src/mca/psec/munge/configure.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/src/include/pmix_config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+SOURCES =
+DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in ar-lib compile config.guess \
+	config.sub install-sh ltmain.sh missing ylwrap
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CFLAGS = @CFLAGS@
+CLEANFILES = @CLEANFILES@
+CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MCA_PROJECT_SUBDIRS = @MCA_PROJECT_SUBDIRS@
+MCA_pmix_FRAMEWORKS = @MCA_pmix_FRAMEWORKS@
+MCA_pmix_FRAMEWORKS_SUBDIRS = @MCA_pmix_FRAMEWORKS_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS@
+MCA_pmix_FRAMEWORK_LIBS = @MCA_pmix_FRAMEWORK_LIBS@
+MCA_pmix_pdl_ALL_COMPONENTS = @MCA_pmix_pdl_ALL_COMPONENTS@
+MCA_pmix_pdl_ALL_SUBDIRS = @MCA_pmix_pdl_ALL_SUBDIRS@
+MCA_pmix_pdl_DSO_COMPONENTS = @MCA_pmix_pdl_DSO_COMPONENTS@
+MCA_pmix_pdl_DSO_SUBDIRS = @MCA_pmix_pdl_DSO_SUBDIRS@
+MCA_pmix_pdl_STATIC_COMPONENTS = @MCA_pmix_pdl_STATIC_COMPONENTS@
+MCA_pmix_pdl_STATIC_LTLIBS = @MCA_pmix_pdl_STATIC_LTLIBS@
+MCA_pmix_pdl_STATIC_SUBDIRS = @MCA_pmix_pdl_STATIC_SUBDIRS@
+MCA_pmix_pif_ALL_COMPONENTS = @MCA_pmix_pif_ALL_COMPONENTS@
+MCA_pmix_pif_ALL_SUBDIRS = @MCA_pmix_pif_ALL_SUBDIRS@
+MCA_pmix_pif_DSO_COMPONENTS = @MCA_pmix_pif_DSO_COMPONENTS@
+MCA_pmix_pif_DSO_SUBDIRS = @MCA_pmix_pif_DSO_SUBDIRS@
+MCA_pmix_pif_STATIC_COMPONENTS = @MCA_pmix_pif_STATIC_COMPONENTS@
+MCA_pmix_pif_STATIC_LTLIBS = @MCA_pmix_pif_STATIC_LTLIBS@
+MCA_pmix_pif_STATIC_SUBDIRS = @MCA_pmix_pif_STATIC_SUBDIRS@
+MCA_pmix_pinstalldirs_ALL_COMPONENTS = @MCA_pmix_pinstalldirs_ALL_COMPONENTS@
+MCA_pmix_pinstalldirs_ALL_SUBDIRS = @MCA_pmix_pinstalldirs_ALL_SUBDIRS@
+MCA_pmix_pinstalldirs_DSO_COMPONENTS = @MCA_pmix_pinstalldirs_DSO_COMPONENTS@
+MCA_pmix_pinstalldirs_DSO_SUBDIRS = @MCA_pmix_pinstalldirs_DSO_SUBDIRS@
+MCA_pmix_pinstalldirs_STATIC_COMPONENTS = @MCA_pmix_pinstalldirs_STATIC_COMPONENTS@
+MCA_pmix_pinstalldirs_STATIC_LTLIBS = @MCA_pmix_pinstalldirs_STATIC_LTLIBS@
+MCA_pmix_pinstalldirs_STATIC_SUBDIRS = @MCA_pmix_pinstalldirs_STATIC_SUBDIRS@
+MCA_pmix_pnet_ALL_COMPONENTS = @MCA_pmix_pnet_ALL_COMPONENTS@
+MCA_pmix_pnet_ALL_SUBDIRS = @MCA_pmix_pnet_ALL_SUBDIRS@
+MCA_pmix_pnet_DSO_COMPONENTS = @MCA_pmix_pnet_DSO_COMPONENTS@
+MCA_pmix_pnet_DSO_SUBDIRS = @MCA_pmix_pnet_DSO_SUBDIRS@
+MCA_pmix_pnet_STATIC_COMPONENTS = @MCA_pmix_pnet_STATIC_COMPONENTS@
+MCA_pmix_pnet_STATIC_LTLIBS = @MCA_pmix_pnet_STATIC_LTLIBS@
+MCA_pmix_pnet_STATIC_SUBDIRS = @MCA_pmix_pnet_STATIC_SUBDIRS@
+MCA_pmix_psec_ALL_COMPONENTS = @MCA_pmix_psec_ALL_COMPONENTS@
+MCA_pmix_psec_ALL_SUBDIRS = @MCA_pmix_psec_ALL_SUBDIRS@
+MCA_pmix_psec_DSO_COMPONENTS = @MCA_pmix_psec_DSO_COMPONENTS@
+MCA_pmix_psec_DSO_SUBDIRS = @MCA_pmix_psec_DSO_SUBDIRS@
+MCA_pmix_psec_STATIC_COMPONENTS = @MCA_pmix_psec_STATIC_COMPONENTS@
+MCA_pmix_psec_STATIC_LTLIBS = @MCA_pmix_psec_STATIC_LTLIBS@
+MCA_pmix_psec_STATIC_SUBDIRS = @MCA_pmix_psec_STATIC_SUBDIRS@
+MCA_pmix_psensor_ALL_COMPONENTS = @MCA_pmix_psensor_ALL_COMPONENTS@
+MCA_pmix_psensor_ALL_SUBDIRS = @MCA_pmix_psensor_ALL_SUBDIRS@
+MCA_pmix_psensor_DSO_COMPONENTS = @MCA_pmix_psensor_DSO_COMPONENTS@
+MCA_pmix_psensor_DSO_SUBDIRS = @MCA_pmix_psensor_DSO_SUBDIRS@
+MCA_pmix_psensor_STATIC_COMPONENTS = @MCA_pmix_psensor_STATIC_COMPONENTS@
+MCA_pmix_psensor_STATIC_LTLIBS = @MCA_pmix_psensor_STATIC_LTLIBS@
+MCA_pmix_psensor_STATIC_SUBDIRS = @MCA_pmix_psensor_STATIC_SUBDIRS@
+MCA_pmix_ptl_ALL_COMPONENTS = @MCA_pmix_ptl_ALL_COMPONENTS@
+MCA_pmix_ptl_ALL_SUBDIRS = @MCA_pmix_ptl_ALL_SUBDIRS@
+MCA_pmix_ptl_DSO_COMPONENTS = @MCA_pmix_ptl_DSO_COMPONENTS@
+MCA_pmix_ptl_DSO_SUBDIRS = @MCA_pmix_ptl_DSO_SUBDIRS@
+MCA_pmix_ptl_STATIC_COMPONENTS = @MCA_pmix_ptl_STATIC_COMPONENTS@
+MCA_pmix_ptl_STATIC_LTLIBS = @MCA_pmix_ptl_STATIC_LTLIBS@
+MCA_pmix_ptl_STATIC_SUBDIRS = @MCA_pmix_ptl_STATIC_SUBDIRS@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PMIX_ASM_GSYM = @PMIX_ASM_GSYM@
+PMIX_ASM_LSYM = @PMIX_ASM_LSYM@
+PMIX_ASM_SUPPORT_64BIT = @PMIX_ASM_SUPPORT_64BIT@
+PMIX_ASM_TEXT = @PMIX_ASM_TEXT@
+PMIX_ASM_TYPE = @PMIX_ASM_TYPE@
+PMIX_ASSEMBLY_ARCH = @PMIX_ASSEMBLY_ARCH@
+PMIX_ASSEMBLY_BUILTIN = @PMIX_ASSEMBLY_BUILTIN@
+PMIX_ASSEMBLY_FORMAT = @PMIX_ASSEMBLY_FORMAT@
+PMIX_AS_GLOBAL = @PMIX_AS_GLOBAL@
+PMIX_AS_LABEL_SUFFIX = @PMIX_AS_LABEL_SUFFIX@
+PMIX_CC_ABSOLUTE = @PMIX_CC_ABSOLUTE@
+PMIX_CONFIGURE_DATE = @PMIX_CONFIGURE_DATE@
+PMIX_CONFIGURE_HOST = @PMIX_CONFIGURE_HOST@
+PMIX_CONFIGURE_USER = @PMIX_CONFIGURE_USER@
+PMIX_EMBEDDED_CPPFLAGS = @PMIX_EMBEDDED_CPPFLAGS@
+PMIX_EMBEDDED_LDFLAGS = @PMIX_EMBEDDED_LDFLAGS@
+PMIX_EMBEDDED_LIBS = @PMIX_EMBEDDED_LIBS@
+PMIX_MAJOR_VERSION = @PMIX_MAJOR_VERSION@
+PMIX_MINOR_VERSION = @PMIX_MINOR_VERSION@
+PMIX_RELEASE_DATE = @PMIX_RELEASE_DATE@
+PMIX_RELEASE_VERSION = @PMIX_RELEASE_VERSION@
+PMIX_RENAME = @PMIX_RENAME@
+PMIX_VERSION = @PMIX_VERSION@
+PMIX_top_builddir = @PMIX_top_builddir@
+PMIX_top_srcdir = @PMIX_top_srcdir@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_prefix_program = @ac_prefix_program@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+libpmix_so_version = @libpmix_so_version@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pmix_have_pandoc = @pmix_have_pandoc@
+pmix_pdl_pdlopen_LIBS = @pmix_pdl_pdlopen_LIBS@
+pmix_pdl_plibltdl_CPPFLAGS = @pmix_pdl_plibltdl_CPPFLAGS@
+pmix_pdl_plibltdl_LDFLAGS = @pmix_pdl_plibltdl_LDFLAGS@
+pmix_pdl_plibltdl_LIBS = @pmix_pdl_plibltdl_LIBS@
+pmixdatadir = @pmixdatadir@
+pmixincludedir = @pmixincludedir@
+pmixlibdir = @pmixlibdir@
+pmixmajor = @pmixmajor@
+pmixminor = @pmixminor@
+pnet_opa_CFLAGS = @pnet_opa_CFLAGS@
+pnet_opa_CPPFLAGS = @pnet_opa_CPPFLAGS@
+pnet_opa_LDFLAGS = @pnet_opa_LDFLAGS@
+pnet_opa_LIBS = @pnet_opa_LIBS@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+psec_munge_CPPFLAGS = @psec_munge_CPPFLAGS@
+psec_munge_LDFLAGS = @psec_munge_LDFLAGS@
+psec_munge_LIBS = @psec_munge_LIBS@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+EXTRA_DIST = \
+	c_get_alignment.m4 \
+	pmix_get_version.sh \
+	distscript.sh \
+	pmix_check_attributes.m4 \
+	pmix_check_broken_qsort.m4 \
+	pmix_check_compiler_version.m4 \
+	pmix_check_icc.m4 \
+	pmix_check_ident.m4 \
+	pmix_check_package.m4 \
+	pmix_check_vendor.m4 \
+	pmix_check_visibility.m4 \
+	pmix_check_lock.m4 \
+	pmix_config_subdir.m4 \
+	pmix_ensure_contains_optflags.m4 \
+	pmix_functions.m4 \
+	pmix.m4 \
+	pmix_search_libs.m4 \
+	pmix_setup_cc.m4 \
+	pmix_setup_zlib.m4 \
+	pmix_setup_libevent.m4 \
+	pmix_mca_priority_sort.pl
+
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign config/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign config/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+tags TAGS:
+
+ctags CTAGS:
+
+cscope cscopelist:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic \
+	maintainer-clean-local
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool 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-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic \
+	maintainer-clean-local mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
+	uninstall-am
+
+.PRECIOUS: Makefile
+
+
+maintainer-clean-local:
+	rm -f pmix_get_version.sh
+
+# 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/config/ar-lib b/config/ar-lib
new file mode 100755
index 0000000..463b9ec
--- /dev/null
+++ b/config/ar-lib
@@ -0,0 +1,270 @@
+#! /bin/sh
+# Wrapper for Microsoft lib.exe
+
+me=ar-lib
+scriptversion=2012-03-01.08; # UTC
+
+# Copyright (C) 2010-2014 Free Software Foundation, Inc.
+# Written by Peter Rosin <peda at lysator.liu.se>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <bug-automake at gnu.org> or send patches to
+# <automake-patches at gnu.org>.
+
+
+# func_error message
+func_error ()
+{
+  echo "$me: $1" 1>&2
+  exit 1
+}
+
+file_conv=
+
+# func_file_conv build_file
+# Convert a $build file to $host form and store it in $file
+# Currently only supports Windows hosts.
+func_file_conv ()
+{
+  file=$1
+  case $file in
+    / | /[!/]*) # absolute file, and not a UNC file
+      if test -z "$file_conv"; then
+	# lazily determine how to convert abs files
+	case `uname -s` in
+	  MINGW*)
+	    file_conv=mingw
+	    ;;
+	  CYGWIN*)
+	    file_conv=cygwin
+	    ;;
+	  *)
+	    file_conv=wine
+	    ;;
+	esac
+      fi
+      case $file_conv in
+	mingw)
+	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
+	  ;;
+	cygwin)
+	  file=`cygpath -m "$file" || echo "$file"`
+	  ;;
+	wine)
+	  file=`winepath -w "$file" || echo "$file"`
+	  ;;
+      esac
+      ;;
+  esac
+}
+
+# func_at_file at_file operation archive
+# Iterate over all members in AT_FILE performing OPERATION on ARCHIVE
+# for each of them.
+# When interpreting the content of the @FILE, do NOT use func_file_conv,
+# since the user would need to supply preconverted file names to
+# binutils ar, at least for MinGW.
+func_at_file ()
+{
+  operation=$2
+  archive=$3
+  at_file_contents=`cat "$1"`
+  eval set x "$at_file_contents"
+  shift
+
+  for member
+  do
+    $AR -NOLOGO $operation:"$member" "$archive" || exit $?
+  done
+}
+
+case $1 in
+  '')
+     func_error "no command.  Try '$0 --help' for more information."
+     ;;
+  -h | --h*)
+    cat <<EOF
+Usage: $me [--help] [--version] PROGRAM ACTION ARCHIVE [MEMBER...]
+
+Members may be specified in a file named with @FILE.
+EOF
+    exit $?
+    ;;
+  -v | --v*)
+    echo "$me, version $scriptversion"
+    exit $?
+    ;;
+esac
+
+if test $# -lt 3; then
+  func_error "you must specify a program, an action and an archive"
+fi
+
+AR=$1
+shift
+while :
+do
+  if test $# -lt 2; then
+    func_error "you must specify a program, an action and an archive"
+  fi
+  case $1 in
+    -lib | -LIB \
+    | -ltcg | -LTCG \
+    | -machine* | -MACHINE* \
+    | -subsystem* | -SUBSYSTEM* \
+    | -verbose | -VERBOSE \
+    | -wx* | -WX* )
+      AR="$AR $1"
+      shift
+      ;;
+    *)
+      action=$1
+      shift
+      break
+      ;;
+  esac
+done
+orig_archive=$1
+shift
+func_file_conv "$orig_archive"
+archive=$file
+
+# strip leading dash in $action
+action=${action#-}
+
+delete=
+extract=
+list=
+quick=
+replace=
+index=
+create=
+
+while test -n "$action"
+do
+  case $action in
+    d*) delete=yes  ;;
+    x*) extract=yes ;;
+    t*) list=yes    ;;
+    q*) quick=yes   ;;
+    r*) replace=yes ;;
+    s*) index=yes   ;;
+    S*)             ;; # the index is always updated implicitly
+    c*) create=yes  ;;
+    u*)             ;; # TODO: don't ignore the update modifier
+    v*)             ;; # TODO: don't ignore the verbose modifier
+    *)
+      func_error "unknown action specified"
+      ;;
+  esac
+  action=${action#?}
+done
+
+case $delete$extract$list$quick$replace,$index in
+  yes,* | ,yes)
+    ;;
+  yesyes*)
+    func_error "more than one action specified"
+    ;;
+  *)
+    func_error "no action specified"
+    ;;
+esac
+
+if test -n "$delete"; then
+  if test ! -f "$orig_archive"; then
+    func_error "archive not found"
+  fi
+  for member
+  do
+    case $1 in
+      @*)
+        func_at_file "${1#@}" -REMOVE "$archive"
+        ;;
+      *)
+        func_file_conv "$1"
+        $AR -NOLOGO -REMOVE:"$file" "$archive" || exit $?
+        ;;
+    esac
+  done
+
+elif test -n "$extract"; then
+  if test ! -f "$orig_archive"; then
+    func_error "archive not found"
+  fi
+  if test $# -gt 0; then
+    for member
+    do
+      case $1 in
+        @*)
+          func_at_file "${1#@}" -EXTRACT "$archive"
+          ;;
+        *)
+          func_file_conv "$1"
+          $AR -NOLOGO -EXTRACT:"$file" "$archive" || exit $?
+          ;;
+      esac
+    done
+  else
+    $AR -NOLOGO -LIST "$archive" | sed -e 's/\\/\\\\/g' | while read member
+    do
+      $AR -NOLOGO -EXTRACT:"$member" "$archive" || exit $?
+    done
+  fi
+
+elif test -n "$quick$replace"; then
+  if test ! -f "$orig_archive"; then
+    if test -z "$create"; then
+      echo "$me: creating $orig_archive"
+    fi
+    orig_archive=
+  else
+    orig_archive=$archive
+  fi
+
+  for member
+  do
+    case $1 in
+    @*)
+      func_file_conv "${1#@}"
+      set x "$@" "@$file"
+      ;;
+    *)
+      func_file_conv "$1"
+      set x "$@" "$file"
+      ;;
+    esac
+    shift
+    shift
+  done
+
+  if test -n "$orig_archive"; then
+    $AR -NOLOGO -OUT:"$archive" "$orig_archive" "$@" || exit $?
+  else
+    $AR -NOLOGO -OUT:"$archive" "$@" || exit $?
+  fi
+
+elif test -n "$list"; then
+  if test ! -f "$orig_archive"; then
+    func_error "archive not found"
+  fi
+  $AR -NOLOGO -LIST "$archive" || exit $?
+fi
diff --git a/config/autogen_found_items.m4 b/config/autogen_found_items.m4
new file mode 100644
index 0000000..2b08e85
--- /dev/null
+++ b/config/autogen_found_items.m4
@@ -0,0 +1,72 @@
+dnl
+dnl $HEADER$
+dnl
+dnl ---------------------------------------------------------------------------
+dnl This file is automatically created by autogen.pl; it should not
+dnl be edited by hand!!
+dnl
+dnl Generated by rhc at Tue Aug 22 12:34:28 2017
+dnl on rhc001.
+dnl ---------------------------------------------------------------------------
+
+m4_define([autogen_platform_file], [])
+
+
+dnl Project names
+m4_define([project_name_long], [PMIx])
+m4_define([project_name_short], [PMIx])
+
+dnl ---------------------------------------------------------------------------
+dnl ---------------------------------------------------------------------------
+dnl ---------------------------------------------------------------------------
+
+dnl MCA information
+dnl ---------------------------------------------------------------------------
+
+dnl Frameworks in the pmix project and their corresponding directories
+m4_define([mca_pmix_framework_list], [pdl, pif, pinstalldirs, pnet, psec, psensor, ptl])
+
+dnl Components in the pmix / pdl framework
+m4_define([mca_pmix_pdl_m4_config_component_list], [pdlopen, plibltdl])
+m4_define([mca_pmix_pdl_no_config_component_list], [])
+
+dnl Components in the pmix / pif framework
+m4_define([mca_pmix_pif_m4_config_component_list], [bsdx_ipv4, bsdx_ipv6, linux_ipv6, posix_ipv4, solaris_ipv6])
+m4_define([mca_pmix_pif_no_config_component_list], [])
+
+dnl Components in the pmix / pinstalldirs framework
+m4_define([mca_pmix_pinstalldirs_m4_config_component_list], [config, env])
+m4_define([mca_pmix_pinstalldirs_no_config_component_list], [])
+
+dnl Components in the pmix / pnet framework
+m4_define([mca_pmix_pnet_m4_config_component_list], [opa])
+m4_define([mca_pmix_pnet_no_config_component_list], [])
+
+dnl Components in the pmix / psec framework
+m4_define([mca_pmix_psec_m4_config_component_list], [munge])
+m4_define([mca_pmix_psec_no_config_component_list], [native, none])
+
+dnl Components in the pmix / psensor framework
+m4_define([mca_pmix_psensor_m4_config_component_list], [])
+m4_define([mca_pmix_psensor_no_config_component_list], [file, heartbeat])
+
+dnl Components in the pmix / ptl framework
+m4_define([mca_pmix_ptl_m4_config_component_list], [])
+m4_define([mca_pmix_ptl_no_config_component_list], [tcp, usock])
+
+dnl ---------------------------------------------------------------------------
+
+dnl List of configure.m4 files to include
+m4_include([src/mca/pdl/configure.m4])
+m4_include([src/mca/pinstalldirs/configure.m4])
+m4_include([src/mca/pdl/pdlopen/configure.m4])
+m4_include([src/mca/pdl/plibltdl/configure.m4])
+m4_include([src/mca/pif/bsdx_ipv4/configure.m4])
+m4_include([src/mca/pif/bsdx_ipv6/configure.m4])
+m4_include([src/mca/pif/linux_ipv6/configure.m4])
+m4_include([src/mca/pif/posix_ipv4/configure.m4])
+m4_include([src/mca/pif/solaris_ipv6/configure.m4])
+m4_include([src/mca/pinstalldirs/config/configure.m4])
+m4_include([src/mca/pinstalldirs/env/configure.m4])
+m4_include([src/mca/pnet/opa/configure.m4])
+m4_include([src/mca/psec/munge/configure.m4])
diff --git a/config/c_get_alignment.m4 b/config/c_get_alignment.m4
new file mode 100644
index 0000000..db37910
--- /dev/null
+++ b/config/c_get_alignment.m4
@@ -0,0 +1,72 @@
+dnl -*- shell-script -*-
+dnl
+dnl Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+dnl                         University Research and Technology
+dnl                         Corporation.  All rights reserved.
+dnl Copyright (c) 2004-2005 The University of Tennessee and The University
+dnl                         of Tennessee Research Foundation.  All rights
+dnl                         reserved.
+dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+dnl                         University of Stuttgart.  All rights reserved.
+dnl Copyright (c) 2004-2005 The Regents of the University of California.
+dnl                         All rights reserved.
+dnl Copyright (c) 2009      Sun Microsystems, Inc.  All rights reserved.
+dnl Copyright (c) 2014-2015 Intel, Inc. All rights reserved.
+dnl Copyright (c) 2015      Research Organization for Information Science
+dnl                         and Technology (RIST). All rights reserved.
+dnl $COPYRIGHT$
+dnl
+dnl Additional copyrights may follow
+dnl
+dnl $HEADER$
+dnl
+
+# PMIX_C_GET_ALIGN(type, config_var)
+# ----------------------------------
+# Determine datatype alignment.
+# First arg is type, 2nd arg is config var to define.
+# Now that we require C99 compilers, we include stdbool.h
+# in the alignment test so that we can find the definition
+# of "bool" when we test for its alignment. We might be able
+# to avoid this if we test for alignment of _Bool, but
+# since we use "bool" in the code, let's be safe and check
+# what we use. Yes, they should be the same - but "should" and
+# "are" frequently differ
+AC_DEFUN([PMIX_C_GET_ALIGNMENT],[
+    AC_CACHE_CHECK([alignment of $1],
+                   [AS_TR_SH([pmix_cv_c_align_$1])],
+		   [AC_RUN_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT
+                                                    #include <stdbool.h> ],
+[[
+    struct foo { char c; $1 x; };
+    struct foo *p = (struct foo *) malloc(sizeof(struct foo));
+    int diff;
+    FILE *f=fopen("conftestval", "w");
+    if (!f) exit(1);
+    diff = ((char *)&p->x) - ((char *)&p->c);
+    fprintf(f, "%d\n", (diff >= 0) ? diff : -diff);
+]])],                         [AS_TR_SH([pmix_cv_c_align_$1])=`cat conftestval`],
+                               [AC_MSG_WARN([*** Problem running configure test!])
+                                AC_MSG_WARN([*** See config.log for details.])
+                                AC_MSG_ERROR([*** Cannot continue.])],
+                               [ # cross compile - do a non-executable test.  Trick
+                                 # taken from the Autoconf 2.59c.  Switch to using
+                                 # AC_CHECK_ALIGNOF when we can require Autoconf 2.60.
+                                 _AC_COMPUTE_INT([(long int) offsetof (pmix__type_alignof_, y)],
+                                                 [AS_TR_SH([pmix_cv_c_align_$1])],
+                                                 [AC_INCLUDES_DEFAULT
+#include <stdbool.h>
+
+#ifndef offsetof
+# define offsetof(type, member) ((char *) &((type *) 0)->member - (char *) 0)
+#endif
+typedef struct { char x; $1 y; } pmix__type_alignof_;
+],
+                                                 [AC_MSG_WARN([*** Problem running configure test!])
+                                                  AC_MSG_WARN([*** See config.log for details.])
+                                                  AC_MSG_ERROR([*** Cannot continue.])])])])
+
+AC_DEFINE_UNQUOTED([$2], [$AS_TR_SH([pmix_cv_c_align_$1])], [Alignment of type $1])
+eval "$2=$AS_TR_SH([pmix_cv_c_align_$1])"
+
+rm -rf conftest* ]) dnl
diff --git a/config/compile b/config/compile
new file mode 100755
index 0000000..a85b723
--- /dev/null
+++ b/config/compile
@@ -0,0 +1,347 @@
+#! /bin/sh
+# Wrapper for compilers which do not understand '-c -o'.
+
+scriptversion=2012-10-14.11; # UTC
+
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Written by Tom Tromey <tromey at cygnus.com>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <bug-automake at gnu.org> or send patches to
+# <automake-patches at gnu.org>.
+
+nl='
+'
+
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent tools from complaining about whitespace usage.
+IFS=" ""	$nl"
+
+file_conv=
+
+# func_file_conv build_file lazy
+# Convert a $build file to $host form and store it in $file
+# Currently only supports Windows hosts. If the determined conversion
+# type is listed in (the comma separated) LAZY, no conversion will
+# take place.
+func_file_conv ()
+{
+  file=$1
+  case $file in
+    / | /[!/]*) # absolute file, and not a UNC file
+      if test -z "$file_conv"; then
+	# lazily determine how to convert abs files
+	case `uname -s` in
+	  MINGW*)
+	    file_conv=mingw
+	    ;;
+	  CYGWIN*)
+	    file_conv=cygwin
+	    ;;
+	  *)
+	    file_conv=wine
+	    ;;
+	esac
+      fi
+      case $file_conv/,$2, in
+	*,$file_conv,*)
+	  ;;
+	mingw/*)
+	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
+	  ;;
+	cygwin/*)
+	  file=`cygpath -m "$file" || echo "$file"`
+	  ;;
+	wine/*)
+	  file=`winepath -w "$file" || echo "$file"`
+	  ;;
+      esac
+      ;;
+  esac
+}
+
+# func_cl_dashL linkdir
+# Make cl look for libraries in LINKDIR
+func_cl_dashL ()
+{
+  func_file_conv "$1"
+  if test -z "$lib_path"; then
+    lib_path=$file
+  else
+    lib_path="$lib_path;$file"
+  fi
+  linker_opts="$linker_opts -LIBPATH:$file"
+}
+
+# func_cl_dashl library
+# Do a library search-path lookup for cl
+func_cl_dashl ()
+{
+  lib=$1
+  found=no
+  save_IFS=$IFS
+  IFS=';'
+  for dir in $lib_path $LIB
+  do
+    IFS=$save_IFS
+    if $shared && test -f "$dir/$lib.dll.lib"; then
+      found=yes
+      lib=$dir/$lib.dll.lib
+      break
+    fi
+    if test -f "$dir/$lib.lib"; then
+      found=yes
+      lib=$dir/$lib.lib
+      break
+    fi
+    if test -f "$dir/lib$lib.a"; then
+      found=yes
+      lib=$dir/lib$lib.a
+      break
+    fi
+  done
+  IFS=$save_IFS
+
+  if test "$found" != yes; then
+    lib=$lib.lib
+  fi
+}
+
+# func_cl_wrapper cl arg...
+# Adjust compile command to suit cl
+func_cl_wrapper ()
+{
+  # Assume a capable shell
+  lib_path=
+  shared=:
+  linker_opts=
+  for arg
+  do
+    if test -n "$eat"; then
+      eat=
+    else
+      case $1 in
+	-o)
+	  # configure might choose to run compile as 'compile cc -o foo foo.c'.
+	  eat=1
+	  case $2 in
+	    *.o | *.[oO][bB][jJ])
+	      func_file_conv "$2"
+	      set x "$@" -Fo"$file"
+	      shift
+	      ;;
+	    *)
+	      func_file_conv "$2"
+	      set x "$@" -Fe"$file"
+	      shift
+	      ;;
+	  esac
+	  ;;
+	-I)
+	  eat=1
+	  func_file_conv "$2" mingw
+	  set x "$@" -I"$file"
+	  shift
+	  ;;
+	-I*)
+	  func_file_conv "${1#-I}" mingw
+	  set x "$@" -I"$file"
+	  shift
+	  ;;
+	-l)
+	  eat=1
+	  func_cl_dashl "$2"
+	  set x "$@" "$lib"
+	  shift
+	  ;;
+	-l*)
+	  func_cl_dashl "${1#-l}"
+	  set x "$@" "$lib"
+	  shift
+	  ;;
+	-L)
+	  eat=1
+	  func_cl_dashL "$2"
+	  ;;
+	-L*)
+	  func_cl_dashL "${1#-L}"
+	  ;;
+	-static)
+	  shared=false
+	  ;;
+	-Wl,*)
+	  arg=${1#-Wl,}
+	  save_ifs="$IFS"; IFS=','
+	  for flag in $arg; do
+	    IFS="$save_ifs"
+	    linker_opts="$linker_opts $flag"
+	  done
+	  IFS="$save_ifs"
+	  ;;
+	-Xlinker)
+	  eat=1
+	  linker_opts="$linker_opts $2"
+	  ;;
+	-*)
+	  set x "$@" "$1"
+	  shift
+	  ;;
+	*.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
+	  func_file_conv "$1"
+	  set x "$@" -Tp"$file"
+	  shift
+	  ;;
+	*.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
+	  func_file_conv "$1" mingw
+	  set x "$@" "$file"
+	  shift
+	  ;;
+	*)
+	  set x "$@" "$1"
+	  shift
+	  ;;
+      esac
+    fi
+    shift
+  done
+  if test -n "$linker_opts"; then
+    linker_opts="-link$linker_opts"
+  fi
+  exec "$@" $linker_opts
+  exit 1
+}
+
+eat=
+
+case $1 in
+  '')
+     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
+     exit 1;
+     ;;
+  -h | --h*)
+    cat <<\EOF
+Usage: compile [--help] [--version] PROGRAM [ARGS]
+
+Wrapper for compilers which do not understand '-c -o'.
+Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
+arguments, and rename the output as expected.
+
+If you are trying to build a whole package this is not the
+right script to run: please start by reading the file 'INSTALL'.
+
+Report bugs to <bug-automake at gnu.org>.
+EOF
+    exit $?
+    ;;
+  -v | --v*)
+    echo "compile $scriptversion"
+    exit $?
+    ;;
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+    func_cl_wrapper "$@"      # Doesn't return...
+    ;;
+esac
+
+ofile=
+cfile=
+
+for arg
+do
+  if test -n "$eat"; then
+    eat=
+  else
+    case $1 in
+      -o)
+	# configure might choose to run compile as 'compile cc -o foo foo.c'.
+	# So we strip '-o arg' only if arg is an object.
+	eat=1
+	case $2 in
+	  *.o | *.obj)
+	    ofile=$2
+	    ;;
+	  *)
+	    set x "$@" -o "$2"
+	    shift
+	    ;;
+	esac
+	;;
+      *.c)
+	cfile=$1
+	set x "$@" "$1"
+	shift
+	;;
+      *)
+	set x "$@" "$1"
+	shift
+	;;
+    esac
+  fi
+  shift
+done
+
+if test -z "$ofile" || test -z "$cfile"; then
+  # If no '-o' option was seen then we might have been invoked from a
+  # pattern rule where we don't need one.  That is ok -- this is a
+  # normal compilation that the losing compiler can handle.  If no
+  # '.c' file was seen then we are probably linking.  That is also
+  # ok.
+  exec "$@"
+fi
+
+# Name of file we expect compiler to create.
+cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
+
+# Create the lock directory.
+# Note: use '[/\\:.-]' here to ensure that we don't use the same name
+# that we are using for the .o file.  Also, base the name on the expected
+# object file name, since that is what matters with a parallel build.
+lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
+while true; do
+  if mkdir "$lockdir" >/dev/null 2>&1; then
+    break
+  fi
+  sleep 1
+done
+# FIXME: race condition here if user kills between mkdir and trap.
+trap "rmdir '$lockdir'; exit 1" 1 2 15
+
+# Run the compile.
+"$@"
+ret=$?
+
+if test -f "$cofile"; then
+  test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
+elif test -f "${cofile}bj"; then
+  test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
+fi
+
+rmdir "$lockdir"
+exit $ret
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/config/config.guess b/config/config.guess
new file mode 100755
index 0000000..6c32c86
--- /dev/null
+++ b/config/config.guess
@@ -0,0 +1,1421 @@
+#! /bin/sh
+# Attempt to guess a canonical system name.
+#   Copyright 1992-2014 Free Software Foundation, Inc.
+
+timestamp='2014-11-04'
+
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that
+# program.  This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
+#
+# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
+#
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+#
+# Please send patches to <config-patches at gnu.org>.
+
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION]
+
+Output the configuration name of the system \`$me' is run on.
+
+Operation modes:
+  -h, --help         print this help, then exit
+  -t, --time-stamp   print date of last modification, then exit
+  -v, --version      print version number, then exit
+
+Report bugs and patches to <config-patches at gnu.org>."
+
+version="\
+GNU config.guess ($timestamp)
+
+Originally written by Per Bothner.
+Copyright 1992-2014 Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit ;;
+    --version | -v )
+       echo "$version" ; exit ;;
+    --help | --h* | -h )
+       echo "$usage"; exit ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - )	# Use stdin as input.
+       break ;;
+    -* )
+       echo "$me: invalid option $1$help" >&2
+       exit 1 ;;
+    * )
+       break ;;
+  esac
+done
+
+if test $# != 0; then
+  echo "$me: too many arguments$help" >&2
+  exit 1
+fi
+
+trap 'exit 1' 1 2 15
+
+# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
+# compiler to aid in system detection is discouraged as it requires
+# temporary files to be created and, as you can see below, it is a
+# headache to deal with in a portable fashion.
+
+# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
+# use `HOST_CC' if defined, but it is deprecated.
+
+# Portable tmp directory creation inspired by the Autoconf team.
+
+set_cc_for_build='
+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
+: ${TMPDIR=/tmp} ;
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
+dummy=$tmp/dummy ;
+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
+case $CC_FOR_BUILD,$HOST_CC,$CC in
+ ,,)    echo "int x;" > $dummy.c ;
+	for c in cc gcc c89 c99 ; do
+	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
+	     CC_FOR_BUILD="$c"; break ;
+	  fi ;
+	done ;
+	if test x"$CC_FOR_BUILD" = x ; then
+	  CC_FOR_BUILD=no_compiler_found ;
+	fi
+	;;
+ ,,*)   CC_FOR_BUILD=$CC ;;
+ ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
+esac ; set_cc_for_build= ;'
+
+# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
+# (ghazi at noc.rutgers.edu 1994-08-24)
+if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
+	PATH=$PATH:/.attbin ; export PATH
+fi
+
+UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
+UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
+UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
+UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+
+case "${UNAME_SYSTEM}" in
+Linux|GNU|GNU/*)
+	# If the system lacks a compiler, then just pick glibc.
+	# We could probably try harder.
+	LIBC=gnu
+
+	eval $set_cc_for_build
+	cat <<-EOF > $dummy.c
+	#include <features.h>
+	#if defined(__UCLIBC__)
+	LIBC=uclibc
+	#elif defined(__dietlibc__)
+	LIBC=dietlibc
+	#else
+	LIBC=gnu
+	#endif
+	EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
+	;;
+esac
+
+# Note: order is significant - the case branches are not exclusive.
+
+case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+    *:NetBSD:*:*)
+	# NetBSD (nbsd) targets should (where applicable) match one or
+	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
+	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
+	# switched to ELF, *-*-netbsd* would select the old
+	# object file format.  This provides both forward
+	# compatibility and a consistent mechanism for selecting the
+	# object file format.
+	#
+	# Note: NetBSD doesn't particularly care about the vendor
+	# portion of the name.  We always set it to "unknown".
+	sysctl="sysctl -n hw.machine_arch"
+	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
+	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
+	case "${UNAME_MACHINE_ARCH}" in
+	    armeb) machine=armeb-unknown ;;
+	    arm*) machine=arm-unknown ;;
+	    sh3el) machine=shl-unknown ;;
+	    sh3eb) machine=sh-unknown ;;
+	    sh5el) machine=sh5le-unknown ;;
+	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+	esac
+	# The Operating System including object format, if it has switched
+	# to ELF recently, or will in the future.
+	case "${UNAME_MACHINE_ARCH}" in
+	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+		eval $set_cc_for_build
+		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+			| grep -q __ELF__
+		then
+		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+		    # Return netbsd for either.  FIX?
+		    os=netbsd
+		else
+		    os=netbsdelf
+		fi
+		;;
+	    *)
+		os=netbsd
+		;;
+	esac
+	# The OS release
+	# Debian GNU/NetBSD machines have a different userland, and
+	# thus, need a distinct triplet. However, they do not need
+	# kernel version information, so it can be replaced with a
+	# suitable tag, in the style of linux-gnu.
+	case "${UNAME_VERSION}" in
+	    Debian*)
+		release='-gnu'
+		;;
+	    *)
+		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+		;;
+	esac
+	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
+	# contains redundant information, the shorter form:
+	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+	echo "${machine}-${os}${release}"
+	exit ;;
+    *:Bitrig:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
+	exit ;;
+    *:OpenBSD:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+	exit ;;
+    *:ekkoBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+	exit ;;
+    *:SolidBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+	exit ;;
+    macppc:MirBSD:*:*)
+	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
+	exit ;;
+    *:MirBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+	exit ;;
+    alpha:OSF1:*:*)
+	case $UNAME_RELEASE in
+	*4.0)
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+		;;
+	*5.*)
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+		;;
+	esac
+	# According to Compaq, /usr/sbin/psrinfo has been available on
+	# OSF/1 and Tru64 systems produced since 1995.  I hope that
+	# covers most systems running today.  This code pipes the CPU
+	# types through head -n 1, so we only detect the type of CPU 0.
+	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
+	case "$ALPHA_CPU_TYPE" in
+	    "EV4 (21064)")
+		UNAME_MACHINE="alpha" ;;
+	    "EV4.5 (21064)")
+		UNAME_MACHINE="alpha" ;;
+	    "LCA4 (21066/21068)")
+		UNAME_MACHINE="alpha" ;;
+	    "EV5 (21164)")
+		UNAME_MACHINE="alphaev5" ;;
+	    "EV5.6 (21164A)")
+		UNAME_MACHINE="alphaev56" ;;
+	    "EV5.6 (21164PC)")
+		UNAME_MACHINE="alphapca56" ;;
+	    "EV5.7 (21164PC)")
+		UNAME_MACHINE="alphapca57" ;;
+	    "EV6 (21264)")
+		UNAME_MACHINE="alphaev6" ;;
+	    "EV6.7 (21264A)")
+		UNAME_MACHINE="alphaev67" ;;
+	    "EV6.8CB (21264C)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.8AL (21264B)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.8CX (21264D)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.9A (21264/EV69A)")
+		UNAME_MACHINE="alphaev69" ;;
+	    "EV7 (21364)")
+		UNAME_MACHINE="alphaev7" ;;
+	    "EV7.9 (21364A)")
+		UNAME_MACHINE="alphaev79" ;;
+	esac
+	# A Pn.n version is a patched version.
+	# A Vn.n version is a released version.
+	# A Tn.n version is a released field test version.
+	# A Xn.n version is an unreleased experimental baselevel.
+	# 1.2 uses "1.2" for uname -r.
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+	exitcode=$?
+	trap '' 0
+	exit $exitcode ;;
+    Alpha\ *:Windows_NT*:*)
+	# How do we know it's Interix rather than the generic POSIX subsystem?
+	# Should we change UNAME_MACHINE based on the output of uname instead
+	# of the specific Alpha model?
+	echo alpha-pc-interix
+	exit ;;
+    21064:Windows_NT:50:3)
+	echo alpha-dec-winnt3.5
+	exit ;;
+    Amiga*:UNIX_System_V:4.0:*)
+	echo m68k-unknown-sysv4
+	exit ;;
+    *:[Aa]miga[Oo][Ss]:*:*)
+	echo ${UNAME_MACHINE}-unknown-amigaos
+	exit ;;
+    *:[Mm]orph[Oo][Ss]:*:*)
+	echo ${UNAME_MACHINE}-unknown-morphos
+	exit ;;
+    *:OS/390:*:*)
+	echo i370-ibm-openedition
+	exit ;;
+    *:z/VM:*:*)
+	echo s390-ibm-zvmoe
+	exit ;;
+    *:OS400:*:*)
+	echo powerpc-ibm-os400
+	exit ;;
+    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+	echo arm-acorn-riscix${UNAME_RELEASE}
+	exit ;;
+    arm*:riscos:*:*|arm*:RISCOS:*:*)
+	echo arm-unknown-riscos
+	exit ;;
+    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
+	echo hppa1.1-hitachi-hiuxmpp
+	exit ;;
+    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
+	# akee at wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
+	if test "`(/bin/universe) 2>/dev/null`" = att ; then
+		echo pyramid-pyramid-sysv3
+	else
+		echo pyramid-pyramid-bsd
+	fi
+	exit ;;
+    NILE*:*:*:dcosx)
+	echo pyramid-pyramid-svr4
+	exit ;;
+    DRS?6000:unix:4.0:6*)
+	echo sparc-icl-nx6
+	exit ;;
+    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
+	case `/usr/bin/uname -p` in
+	    sparc) echo sparc-icl-nx7; exit ;;
+	esac ;;
+    s390x:SunOS:*:*)
+	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4H:SunOS:5.*:*)
+	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+	echo i386-pc-auroraux${UNAME_RELEASE}
+	exit ;;
+    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+	eval $set_cc_for_build
+	SUN_ARCH="i386"
+	# If there is a compiler, see if it is configured for 64-bit objects.
+	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
+	# This test works for both compilers.
+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		grep IS_64BIT_ARCH >/dev/null
+	    then
+		SUN_ARCH="x86_64"
+	    fi
+	fi
+	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4*:SunOS:6*:*)
+	# According to config.sub, this is the proper way to canonicalize
+	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
+	# it's likely to be more like Solaris than SunOS4.
+	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4*:SunOS:*:*)
+	case "`/usr/bin/arch -k`" in
+	    Series*|S4*)
+		UNAME_RELEASE=`uname -v`
+		;;
+	esac
+	# Japanese Language versions have a version number like `4.1.3-JL'.
+	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
+	exit ;;
+    sun3*:SunOS:*:*)
+	echo m68k-sun-sunos${UNAME_RELEASE}
+	exit ;;
+    sun*:*:4.2BSD:*)
+	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
+	case "`/bin/arch`" in
+	    sun3)
+		echo m68k-sun-sunos${UNAME_RELEASE}
+		;;
+	    sun4)
+		echo sparc-sun-sunos${UNAME_RELEASE}
+		;;
+	esac
+	exit ;;
+    aushp:SunOS:*:*)
+	echo sparc-auspex-sunos${UNAME_RELEASE}
+	exit ;;
+    # The situation for MiNT is a little confusing.  The machine name
+    # can be virtually everything (everything which is not
+    # "atarist" or "atariste" at least should have a processor
+    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
+    # to the lowercase version "mint" (or "freemint").  Finally
+    # the system name "TOS" denotes a system which is actually not
+    # MiNT.  But MiNT is downward compatible to TOS, so this should
+    # be no problem.
+    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
+	echo m68k-atari-mint${UNAME_RELEASE}
+	exit ;;
+    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
+	echo m68k-atari-mint${UNAME_RELEASE}
+	exit ;;
+    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
+	echo m68k-atari-mint${UNAME_RELEASE}
+	exit ;;
+    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
+	echo m68k-milan-mint${UNAME_RELEASE}
+	exit ;;
+    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
+	echo m68k-hades-mint${UNAME_RELEASE}
+	exit ;;
+    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+	echo m68k-unknown-mint${UNAME_RELEASE}
+	exit ;;
+    m68k:machten:*:*)
+	echo m68k-apple-machten${UNAME_RELEASE}
+	exit ;;
+    powerpc:machten:*:*)
+	echo powerpc-apple-machten${UNAME_RELEASE}
+	exit ;;
+    RISC*:Mach:*:*)
+	echo mips-dec-mach_bsd4.3
+	exit ;;
+    RISC*:ULTRIX:*:*)
+	echo mips-dec-ultrix${UNAME_RELEASE}
+	exit ;;
+    VAX*:ULTRIX*:*:*)
+	echo vax-dec-ultrix${UNAME_RELEASE}
+	exit ;;
+    2020:CLIX:*:* | 2430:CLIX:*:*)
+	echo clipper-intergraph-clix${UNAME_RELEASE}
+	exit ;;
+    mips:*:*:UMIPS | mips:*:*:RISCos)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+#ifdef __cplusplus
+#include <stdio.h>  /* for printf() prototype */
+	int main (int argc, char *argv[]) {
+#else
+	int main (argc, argv) int argc; char *argv[]; {
+#endif
+	#if defined (host_mips) && defined (MIPSEB)
+	#if defined (SYSTYPE_SYSV)
+	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_SVR4)
+	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
+	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
+	#endif
+	#endif
+	  exit (-1);
+	}
+EOF
+	$CC_FOR_BUILD -o $dummy $dummy.c &&
+	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
+	  SYSTEM_NAME=`$dummy $dummyarg` &&
+	    { echo "$SYSTEM_NAME"; exit; }
+	echo mips-mips-riscos${UNAME_RELEASE}
+	exit ;;
+    Motorola:PowerMAX_OS:*:*)
+	echo powerpc-motorola-powermax
+	exit ;;
+    Motorola:*:4.3:PL8-*)
+	echo powerpc-harris-powermax
+	exit ;;
+    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
+	echo powerpc-harris-powermax
+	exit ;;
+    Night_Hawk:Power_UNIX:*:*)
+	echo powerpc-harris-powerunix
+	exit ;;
+    m88k:CX/UX:7*:*)
+	echo m88k-harris-cxux7
+	exit ;;
+    m88k:*:4*:R4*)
+	echo m88k-motorola-sysv4
+	exit ;;
+    m88k:*:3*:R3*)
+	echo m88k-motorola-sysv3
+	exit ;;
+    AViiON:dgux:*:*)
+	# DG/UX returns AViiON for all architectures
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
+	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
+	then
+	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
+	       [ ${TARGET_BINARY_INTERFACE}x = x ]
+	    then
+		echo m88k-dg-dgux${UNAME_RELEASE}
+	    else
+		echo m88k-dg-dguxbcs${UNAME_RELEASE}
+	    fi
+	else
+	    echo i586-dg-dgux${UNAME_RELEASE}
+	fi
+	exit ;;
+    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
+	echo m88k-dolphin-sysv3
+	exit ;;
+    M88*:*:R3*:*)
+	# Delta 88k system running SVR3
+	echo m88k-motorola-sysv3
+	exit ;;
+    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
+	echo m88k-tektronix-sysv3
+	exit ;;
+    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
+	echo m68k-tektronix-bsd
+	exit ;;
+    *:IRIX*:*:*)
+	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
+	exit ;;
+    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
+	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
+	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
+    i*86:AIX:*:*)
+	echo i386-ibm-aix
+	exit ;;
+    ia64:AIX:*:*)
+	if [ -x /usr/bin/oslevel ] ; then
+		IBM_REV=`/usr/bin/oslevel`
+	else
+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+	fi
+	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
+	exit ;;
+    *:AIX:2:3)
+	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+		eval $set_cc_for_build
+		sed 's/^		//' << EOF >$dummy.c
+		#include <sys/systemcfg.h>
+
+		main()
+			{
+			if (!__power_pc())
+				exit(1);
+			puts("powerpc-ibm-aix3.2.5");
+			exit(0);
+			}
+EOF
+		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
+		then
+			echo "$SYSTEM_NAME"
+		else
+			echo rs6000-ibm-aix3.2.5
+		fi
+	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
+		echo rs6000-ibm-aix3.2.4
+	else
+		echo rs6000-ibm-aix3.2
+	fi
+	exit ;;
+    *:AIX:*:[4567])
+	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+		IBM_ARCH=rs6000
+	else
+		IBM_ARCH=powerpc
+	fi
+	if [ -x /usr/bin/lslpp ] ; then
+		IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
+			   awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
+	else
+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+	fi
+	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
+	exit ;;
+    *:AIX:*:*)
+	echo rs6000-ibm-aix
+	exit ;;
+    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
+	echo romp-ibm-bsd4.4
+	exit ;;
+    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
+	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
+	exit ;;                             # report: romp-ibm BSD 4.3
+    *:BOSX:*:*)
+	echo rs6000-bull-bosx
+	exit ;;
+    DPX/2?00:B.O.S.:*:*)
+	echo m68k-bull-sysv3
+	exit ;;
+    9000/[34]??:4.3bsd:1.*:*)
+	echo m68k-hp-bsd
+	exit ;;
+    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
+	echo m68k-hp-bsd4.4
+	exit ;;
+    9000/[34678]??:HP-UX:*:*)
+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+	case "${UNAME_MACHINE}" in
+	    9000/31? )            HP_ARCH=m68000 ;;
+	    9000/[34]?? )         HP_ARCH=m68k ;;
+	    9000/[678][0-9][0-9])
+		if [ -x /usr/bin/getconf ]; then
+		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+		    case "${sc_cpu_version}" in
+		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+		      532)                      # CPU_PA_RISC2_0
+			case "${sc_kernel_bits}" in
+			  32) HP_ARCH="hppa2.0n" ;;
+			  64) HP_ARCH="hppa2.0w" ;;
+			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
+			esac ;;
+		    esac
+		fi
+		if [ "${HP_ARCH}" = "" ]; then
+		    eval $set_cc_for_build
+		    sed 's/^		//' << EOF >$dummy.c
+
+		#define _HPUX_SOURCE
+		#include <stdlib.h>
+		#include <unistd.h>
+
+		int main ()
+		{
+		#if defined(_SC_KERNEL_BITS)
+		    long bits = sysconf(_SC_KERNEL_BITS);
+		#endif
+		    long cpu  = sysconf (_SC_CPU_VERSION);
+
+		    switch (cpu)
+			{
+			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+			case CPU_PA_RISC2_0:
+		#if defined(_SC_KERNEL_BITS)
+			    switch (bits)
+				{
+				case 64: puts ("hppa2.0w"); break;
+				case 32: puts ("hppa2.0n"); break;
+				default: puts ("hppa2.0"); break;
+				} break;
+		#else  /* !defined(_SC_KERNEL_BITS) */
+			    puts ("hppa2.0"); break;
+		#endif
+			default: puts ("hppa1.0"); break;
+			}
+		    exit (0);
+		}
+EOF
+		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+		    test -z "$HP_ARCH" && HP_ARCH=hppa
+		fi ;;
+	esac
+	if [ ${HP_ARCH} = "hppa2.0w" ]
+	then
+	    eval $set_cc_for_build
+
+	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
+	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
+	    # generating 64-bit code.  GNU and HP use different nomenclature:
+	    #
+	    # $ CC_FOR_BUILD=cc ./config.guess
+	    # => hppa2.0w-hp-hpux11.23
+	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
+	    # => hppa64-hp-hpux11.23
+
+	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+		grep -q __LP64__
+	    then
+		HP_ARCH="hppa2.0w"
+	    else
+		HP_ARCH="hppa64"
+	    fi
+	fi
+	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
+	exit ;;
+    ia64:HP-UX:*:*)
+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+	echo ia64-hp-hpux${HPUX_REV}
+	exit ;;
+    3050*:HI-UX:*:*)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#include <unistd.h>
+	int
+	main ()
+	{
+	  long cpu = sysconf (_SC_CPU_VERSION);
+	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
+	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
+	     results, however.  */
+	  if (CPU_IS_PA_RISC (cpu))
+	    {
+	      switch (cpu)
+		{
+		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
+		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
+		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
+		  default: puts ("hppa-hitachi-hiuxwe2"); break;
+		}
+	    }
+	  else if (CPU_IS_HP_MC68K (cpu))
+	    puts ("m68k-hitachi-hiuxwe2");
+	  else puts ("unknown-hitachi-hiuxwe2");
+	  exit (0);
+	}
+EOF
+	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
+		{ echo "$SYSTEM_NAME"; exit; }
+	echo unknown-hitachi-hiuxwe2
+	exit ;;
+    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
+	echo hppa1.1-hp-bsd
+	exit ;;
+    9000/8??:4.3bsd:*:*)
+	echo hppa1.0-hp-bsd
+	exit ;;
+    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
+	echo hppa1.0-hp-mpeix
+	exit ;;
+    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
+	echo hppa1.1-hp-osf
+	exit ;;
+    hp8??:OSF1:*:*)
+	echo hppa1.0-hp-osf
+	exit ;;
+    i*86:OSF1:*:*)
+	if [ -x /usr/sbin/sysversion ] ; then
+	    echo ${UNAME_MACHINE}-unknown-osf1mk
+	else
+	    echo ${UNAME_MACHINE}-unknown-osf1
+	fi
+	exit ;;
+    parisc*:Lites*:*:*)
+	echo hppa1.1-hp-lites
+	exit ;;
+    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
+	echo c1-convex-bsd
+	exit ;;
+    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
+	if getsysinfo -f scalar_acc
+	then echo c32-convex-bsd
+	else echo c2-convex-bsd
+	fi
+	exit ;;
+    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
+	echo c34-convex-bsd
+	exit ;;
+    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
+	echo c38-convex-bsd
+	exit ;;
+    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
+	echo c4-convex-bsd
+	exit ;;
+    CRAY*Y-MP:*:*:*)
+	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*[A-Z]90:*:*:*)
+	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
+	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
+	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
+	      -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*TS:*:*:*)
+	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*T3E:*:*:*)
+	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*SV1:*:*:*)
+	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    *:UNICOS/mp:*:*)
+	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
+	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit ;;
+    5000:UNIX_System_V:4.*:*)
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit ;;
+    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+	exit ;;
+    sparc*:BSD/OS:*:*)
+	echo sparc-unknown-bsdi${UNAME_RELEASE}
+	exit ;;
+    *:BSD/OS:*:*)
+	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+	exit ;;
+    *:FreeBSD:*:*)
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
+	case ${UNAME_PROCESSOR} in
+	    amd64)
+		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	    *)
+		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	esac
+	exit ;;
+    i*:CYGWIN*:*)
+	echo ${UNAME_MACHINE}-pc-cygwin
+	exit ;;
+    *:MINGW64*:*)
+	echo ${UNAME_MACHINE}-pc-mingw64
+	exit ;;
+    *:MINGW*:*)
+	echo ${UNAME_MACHINE}-pc-mingw32
+	exit ;;
+    *:MSYS*:*)
+	echo ${UNAME_MACHINE}-pc-msys
+	exit ;;
+    i*:windows32*:*)
+	# uname -m includes "-pc" on this system.
+	echo ${UNAME_MACHINE}-mingw32
+	exit ;;
+    i*:PW*:*)
+	echo ${UNAME_MACHINE}-pc-pw32
+	exit ;;
+    *:Interix*:*)
+	case ${UNAME_MACHINE} in
+	    x86)
+		echo i586-pc-interix${UNAME_RELEASE}
+		exit ;;
+	    authenticamd | genuineintel | EM64T)
+		echo x86_64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	    IA64)
+		echo ia64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	esac ;;
+    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+	echo i${UNAME_MACHINE}-pc-mks
+	exit ;;
+    8664:Windows_NT:*)
+	echo x86_64-pc-mks
+	exit ;;
+    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
+	# How do we know it's Interix rather than the generic POSIX subsystem?
+	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
+	# UNAME_MACHINE based on the output of uname instead of i386?
+	echo i586-pc-interix
+	exit ;;
+    i*:UWIN*:*)
+	echo ${UNAME_MACHINE}-pc-uwin
+	exit ;;
+    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
+	echo x86_64-unknown-cygwin
+	exit ;;
+    p*:CYGWIN*:*)
+	echo powerpcle-unknown-cygwin
+	exit ;;
+    prep*:SunOS:5.*:*)
+	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    *:GNU:*:*)
+	# the GNU system
+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+	exit ;;
+    *:GNU/*:*:*)
+	# other systems with GNU libc and userland
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
+	exit ;;
+    i*86:Minix:*:*)
+	echo ${UNAME_MACHINE}-pc-minix
+	exit ;;
+    aarch64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    aarch64_be:Linux:*:*)
+	UNAME_MACHINE=aarch64_be
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    alpha:Linux:*:*)
+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+	  EV5)   UNAME_MACHINE=alphaev5 ;;
+	  EV56)  UNAME_MACHINE=alphaev56 ;;
+	  PCA56) UNAME_MACHINE=alphapca56 ;;
+	  PCA57) UNAME_MACHINE=alphapca56 ;;
+	  EV6)   UNAME_MACHINE=alphaev6 ;;
+	  EV67)  UNAME_MACHINE=alphaev67 ;;
+	  EV68*) UNAME_MACHINE=alphaev68 ;;
+	esac
+	objdump --private-headers /bin/sh | grep -q ld.so.1
+	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    arc:Linux:*:* | arceb:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    arm*:Linux:*:*)
+	eval $set_cc_for_build
+	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+	    | grep -q __ARM_EABI__
+	then
+	    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	else
+	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+		| grep -q __ARM_PCS_VFP
+	    then
+		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
+	    else
+		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
+	    fi
+	fi
+	exit ;;
+    avr32*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    cris:Linux:*:*)
+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
+	exit ;;
+    crisv32:Linux:*:*)
+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
+	exit ;;
+    frv:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    hexagon:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    i*86:Linux:*:*)
+	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
+	exit ;;
+    ia64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    m32r*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    m68*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    mips:Linux:*:* | mips64:Linux:*:*)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#undef CPU
+	#undef ${UNAME_MACHINE}
+	#undef ${UNAME_MACHINE}el
+	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+	CPU=${UNAME_MACHINE}el
+	#else
+	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+	CPU=${UNAME_MACHINE}
+	#else
+	CPU=
+	#endif
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
+	;;
+    openrisc*:Linux:*:*)
+	echo or1k-unknown-linux-${LIBC}
+	exit ;;
+    or32:Linux:*:* | or1k*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    padre:Linux:*:*)
+	echo sparc-unknown-linux-${LIBC}
+	exit ;;
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
+	echo hppa64-unknown-linux-${LIBC}
+	exit ;;
+    parisc:Linux:*:* | hppa:Linux:*:*)
+	# Look for CPU level
+	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+	  PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
+	  PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
+	  *)    echo hppa-unknown-linux-${LIBC} ;;
+	esac
+	exit ;;
+    ppc64:Linux:*:*)
+	echo powerpc64-unknown-linux-${LIBC}
+	exit ;;
+    ppc:Linux:*:*)
+	echo powerpc-unknown-linux-${LIBC}
+	exit ;;
+    ppc64le:Linux:*:*)
+	echo powerpc64le-unknown-linux-${LIBC}
+	exit ;;
+    ppcle:Linux:*:*)
+	echo powerpcle-unknown-linux-${LIBC}
+	exit ;;
+    s390:Linux:*:* | s390x:Linux:*:*)
+	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
+	exit ;;
+    sh64*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    sh*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    sparc:Linux:*:* | sparc64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    tile*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    vax:Linux:*:*)
+	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
+	exit ;;
+    x86_64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    xtensa*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    i*86:DYNIX/ptx:4*:*)
+	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+	# earlier versions are messed up and put the nodename in both
+	# sysname and nodename.
+	echo i386-sequent-sysv4
+	exit ;;
+    i*86:UNIX_SV:4.2MP:2.*)
+	# Unixware is an offshoot of SVR4, but it has its own version
+	# number series starting with 2...
+	# I am not positive that other SVR4 systems won't match this,
+	# I just have to hope.  -- rms.
+	# Use sysv4.2uw... so that sysv4* matches it.
+	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+	exit ;;
+    i*86:OS/2:*:*)
+	# If we were able to find `uname', then EMX Unix compatibility
+	# is probably installed.
+	echo ${UNAME_MACHINE}-pc-os2-emx
+	exit ;;
+    i*86:XTS-300:*:STOP)
+	echo ${UNAME_MACHINE}-unknown-stop
+	exit ;;
+    i*86:atheos:*:*)
+	echo ${UNAME_MACHINE}-unknown-atheos
+	exit ;;
+    i*86:syllable:*:*)
+	echo ${UNAME_MACHINE}-pc-syllable
+	exit ;;
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
+	echo i386-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    i*86:*DOS:*:*)
+	echo ${UNAME_MACHINE}-pc-msdosdjgpp
+	exit ;;
+    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
+	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
+	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
+		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
+	else
+		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
+	fi
+	exit ;;
+    i*86:*:5:[678]*)
+	# UnixWare 7.x, OpenUNIX and OpenServer 6.
+	case `/bin/uname -X | grep "^Machine"` in
+	    *486*)	     UNAME_MACHINE=i486 ;;
+	    *Pentium)	     UNAME_MACHINE=i586 ;;
+	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
+	esac
+	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+	exit ;;
+    i*86:*:3.2:*)
+	if test -f /usr/options/cb.name; then
+		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
+		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
+	elif /bin/uname -X 2>/dev/null >/dev/null ; then
+		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
+		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
+		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
+			&& UNAME_MACHINE=i586
+		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
+			&& UNAME_MACHINE=i686
+		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
+			&& UNAME_MACHINE=i686
+		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
+	else
+		echo ${UNAME_MACHINE}-pc-sysv32
+	fi
+	exit ;;
+    pc:*:*:*)
+	# Left here for compatibility:
+	# uname -m prints for DJGPP always 'pc', but it prints nothing about
+	# the processor, so we play safe by assuming i586.
+	# Note: whatever this is, it MUST be the same as what config.sub
+	# prints for the "djgpp" host, or else GDB configury will decide that
+	# this is a cross-build.
+	echo i586-pc-msdosdjgpp
+	exit ;;
+    Intel:Mach:3*:*)
+	echo i386-pc-mach3
+	exit ;;
+    paragon:*:*:*)
+	echo i860-intel-osf1
+	exit ;;
+    i860:*:4.*:*) # i860-SVR4
+	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
+	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
+	else # Add other i860-SVR4 vendors below as they are discovered.
+	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
+	fi
+	exit ;;
+    mini*:CTIX:SYS*5:*)
+	# "miniframe"
+	echo m68010-convergent-sysv
+	exit ;;
+    mc68k:UNIX:SYSTEM5:3.51m)
+	echo m68k-convergent-sysv
+	exit ;;
+    M680?0:D-NIX:5.3:*)
+	echo m68k-diab-dnix
+	exit ;;
+    M68*:*:R3V[5678]*:*)
+	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
+    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
+	OS_REL=''
+	test -r /etc/.relid \
+	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && { echo i486-ncr-sysv4; exit; } ;;
+    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
+	OS_REL='.3'
+	test -r /etc/.relid \
+	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
+	echo m68k-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    mc68030:UNIX_System_V:4.*:*)
+	echo m68k-atari-sysv4
+	exit ;;
+    TSUNAMI:LynxOS:2.*:*)
+	echo sparc-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    rs6000:LynxOS:2.*:*)
+	echo rs6000-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
+	echo powerpc-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    SM[BE]S:UNIX_SV:*:*)
+	echo mips-dde-sysv${UNAME_RELEASE}
+	exit ;;
+    RM*:ReliantUNIX-*:*:*)
+	echo mips-sni-sysv4
+	exit ;;
+    RM*:SINIX-*:*:*)
+	echo mips-sni-sysv4
+	exit ;;
+    *:SINIX-*:*:*)
+	if uname -p 2>/dev/null >/dev/null ; then
+		UNAME_MACHINE=`(uname -p) 2>/dev/null`
+		echo ${UNAME_MACHINE}-sni-sysv4
+	else
+		echo ns32k-sni-sysv
+	fi
+	exit ;;
+    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+			# says <Richard.M.Bartel at ccMail.Census.GOV>
+	echo i586-unisys-sysv4
+	exit ;;
+    *:UNIX_System_V:4*:FTX*)
+	# From Gerald Hewes <hewes at openmarket.com>.
+	# How about differentiating between stratus architectures? -djm
+	echo hppa1.1-stratus-sysv4
+	exit ;;
+    *:*:*:FTX*)
+	# From seanf at swdc.stratus.com.
+	echo i860-stratus-sysv4
+	exit ;;
+    i*86:VOS:*:*)
+	# From Paul.Green at stratus.com.
+	echo ${UNAME_MACHINE}-stratus-vos
+	exit ;;
+    *:VOS:*:*)
+	# From Paul.Green at stratus.com.
+	echo hppa1.1-stratus-vos
+	exit ;;
+    mc68*:A/UX:*:*)
+	echo m68k-apple-aux${UNAME_RELEASE}
+	exit ;;
+    news*:NEWS-OS:6*:*)
+	echo mips-sony-newsos6
+	exit ;;
+    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
+	if [ -d /usr/nec ]; then
+		echo mips-nec-sysv${UNAME_RELEASE}
+	else
+		echo mips-unknown-sysv${UNAME_RELEASE}
+	fi
+	exit ;;
+    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
+	echo powerpc-be-beos
+	exit ;;
+    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
+	echo powerpc-apple-beos
+	exit ;;
+    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
+	echo i586-pc-beos
+	exit ;;
+    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
+	echo i586-pc-haiku
+	exit ;;
+    x86_64:Haiku:*:*)
+	echo x86_64-unknown-haiku
+	exit ;;
+    SX-4:SUPER-UX:*:*)
+	echo sx4-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-5:SUPER-UX:*:*)
+	echo sx5-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-6:SUPER-UX:*:*)
+	echo sx6-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-7:SUPER-UX:*:*)
+	echo sx7-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8:SUPER-UX:*:*)
+	echo sx8-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8R:SUPER-UX:*:*)
+	echo sx8r-nec-superux${UNAME_RELEASE}
+	exit ;;
+    Power*:Rhapsody:*:*)
+	echo powerpc-apple-rhapsody${UNAME_RELEASE}
+	exit ;;
+    *:Rhapsody:*:*)
+	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
+	exit ;;
+    *:Darwin:*:*)
+	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+	eval $set_cc_for_build
+	if test "$UNAME_PROCESSOR" = unknown ; then
+	    UNAME_PROCESSOR=powerpc
+	fi
+	if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
+	    if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+		if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+		    (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		    grep IS_64BIT_ARCH >/dev/null
+		then
+		    case $UNAME_PROCESSOR in
+			i386) UNAME_PROCESSOR=x86_64 ;;
+			powerpc) UNAME_PROCESSOR=powerpc64 ;;
+		    esac
+		fi
+	    fi
+	elif test "$UNAME_PROCESSOR" = i386 ; then
+	    # Avoid executing cc on OS X 10.9, as it ships with a stub
+	    # that puts up a graphical alert prompting to install
+	    # developer tools.  Any system running Mac OS X 10.7 or
+	    # later (Darwin 11 and later) is required to have a 64-bit
+	    # processor. This is not true of the ARM version of Darwin
+	    # that Apple uses in portable devices.
+	    UNAME_PROCESSOR=x86_64
+	fi
+	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+	exit ;;
+    *:procnto*:*:* | *:QNX:[0123456789]*:*)
+	UNAME_PROCESSOR=`uname -p`
+	if test "$UNAME_PROCESSOR" = "x86"; then
+		UNAME_PROCESSOR=i386
+		UNAME_MACHINE=pc
+	fi
+	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
+	exit ;;
+    *:QNX:*:4*)
+	echo i386-pc-qnx
+	exit ;;
+    NEO-?:NONSTOP_KERNEL:*:*)
+	echo neo-tandem-nsk${UNAME_RELEASE}
+	exit ;;
+    NSE-*:NONSTOP_KERNEL:*:*)
+	echo nse-tandem-nsk${UNAME_RELEASE}
+	exit ;;
+    NSR-?:NONSTOP_KERNEL:*:*)
+	echo nsr-tandem-nsk${UNAME_RELEASE}
+	exit ;;
+    *:NonStop-UX:*:*)
+	echo mips-compaq-nonstopux
+	exit ;;
+    BS2000:POSIX*:*:*)
+	echo bs2000-siemens-sysv
+	exit ;;
+    DS/*:UNIX_System_V:*:*)
+	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
+	exit ;;
+    *:Plan9:*:*)
+	# "uname -m" is not consistent, so use $cputype instead. 386
+	# is converted to i386 for consistency with other x86
+	# operating systems.
+	if test "$cputype" = "386"; then
+	    UNAME_MACHINE=i386
+	else
+	    UNAME_MACHINE="$cputype"
+	fi
+	echo ${UNAME_MACHINE}-unknown-plan9
+	exit ;;
+    *:TOPS-10:*:*)
+	echo pdp10-unknown-tops10
+	exit ;;
+    *:TENEX:*:*)
+	echo pdp10-unknown-tenex
+	exit ;;
+    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
+	echo pdp10-dec-tops20
+	exit ;;
+    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
+	echo pdp10-xkl-tops20
+	exit ;;
+    *:TOPS-20:*:*)
+	echo pdp10-unknown-tops20
+	exit ;;
+    *:ITS:*:*)
+	echo pdp10-unknown-its
+	exit ;;
+    SEI:*:*:SEIUX)
+	echo mips-sei-seiux${UNAME_RELEASE}
+	exit ;;
+    *:DragonFly:*:*)
+	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+	exit ;;
+    *:*VMS:*:*)
+	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+	case "${UNAME_MACHINE}" in
+	    A*) echo alpha-dec-vms ; exit ;;
+	    I*) echo ia64-dec-vms ; exit ;;
+	    V*) echo vax-dec-vms ; exit ;;
+	esac ;;
+    *:XENIX:*:SysV)
+	echo i386-pc-xenix
+	exit ;;
+    i*86:skyos:*:*)
+	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
+	exit ;;
+    i*86:rdos:*:*)
+	echo ${UNAME_MACHINE}-pc-rdos
+	exit ;;
+    i*86:AROS:*:*)
+	echo ${UNAME_MACHINE}-pc-aros
+	exit ;;
+    x86_64:VMkernel:*:*)
+	echo ${UNAME_MACHINE}-unknown-esx
+	exit ;;
+esac
+
+cat >&2 <<EOF
+$0: unable to guess system type
+
+This script, last modified $timestamp, has failed to recognize
+the operating system you are using. It is advised that you
+download the most up to date version of the config scripts from
+
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+and
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
+If the version you run ($0) is already up to date, please
+send the following data and any information you think might be
+pertinent to <config-patches at gnu.org> in order to provide the needed
+information to handle your system.
+
+config.guess timestamp = $timestamp
+
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
+
+hostinfo               = `(hostinfo) 2>/dev/null`
+/bin/universe          = `(/bin/universe) 2>/dev/null`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
+/bin/arch              = `(/bin/arch) 2>/dev/null`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
+
+UNAME_MACHINE = ${UNAME_MACHINE}
+UNAME_RELEASE = ${UNAME_RELEASE}
+UNAME_SYSTEM  = ${UNAME_SYSTEM}
+UNAME_VERSION = ${UNAME_VERSION}
+EOF
+
+exit 1
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
diff --git a/config/config.sub b/config/config.sub
new file mode 100755
index 0000000..7ffe373
--- /dev/null
+++ b/config/config.sub
@@ -0,0 +1,1807 @@
+#! /bin/sh
+# Configuration validation subroutine script.
+#   Copyright 1992-2014 Free Software Foundation, Inc.
+
+timestamp='2014-12-03'
+
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that
+# program.  This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
+
+
+# Please send patches to <config-patches at gnu.org>.
+#
+# Configuration subroutine to validate and canonicalize a configuration type.
+# Supply the specified configuration type as an argument.
+# If it is invalid, we print an error message on stderr and exit with code 1.
+# Otherwise, we print the canonical config type on stdout and succeed.
+
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
+# This file is supposed to be the same for all GNU packages
+# and recognize all the CPU types, system types and aliases
+# that are meaningful with *any* GNU software.
+# Each package is responsible for reporting which valid configurations
+# it does not support.  The user should be able to distinguish
+# a failure to support a valid configuration from a meaningless
+# configuration.
+
+# The goal of this file is to map all the various variations of a given
+# machine specification into a single specification in the form:
+#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or in some cases, the newer four-part form:
+#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+# It is wrong to echo any other type of specification.
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION] CPU-MFR-OPSYS
+       $0 [OPTION] ALIAS
+
+Canonicalize a configuration name.
+
+Operation modes:
+  -h, --help         print this help, then exit
+  -t, --time-stamp   print date of last modification, then exit
+  -v, --version      print version number, then exit
+
+Report bugs and patches to <config-patches at gnu.org>."
+
+version="\
+GNU config.sub ($timestamp)
+
+Copyright 1992-2014 Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit ;;
+    --version | -v )
+       echo "$version" ; exit ;;
+    --help | --h* | -h )
+       echo "$usage"; exit ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - )	# Use stdin as input.
+       break ;;
+    -* )
+       echo "$me: invalid option $1$help"
+       exit 1 ;;
+
+    *local*)
+       # First pass through any local machine types.
+       echo $1
+       exit ;;
+
+    * )
+       break ;;
+  esac
+done
+
+case $# in
+ 0) echo "$me: missing argument$help" >&2
+    exit 1;;
+ 1) ;;
+ *) echo "$me: too many arguments$help" >&2
+    exit 1;;
+esac
+
+# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
+# Here we must recognize all the valid KERNEL-OS combinations.
+maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+case $maybe_os in
+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
+  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+  knetbsd*-gnu* | netbsd*-gnu* | \
+  kopensolaris*-gnu* | \
+  storm-chaos* | os2-emx* | rtmk-nova*)
+    os=-$maybe_os
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+    ;;
+  android-linux)
+    os=-linux-android
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
+    ;;
+  *)
+    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+    if [ $basic_machine != $1 ]
+    then os=`echo $1 | sed 's/.*-/-/'`
+    else os=; fi
+    ;;
+esac
+
+### Let's recognize common machines as not being operating systems so
+### that things like config.sub decstation-3100 work.  We also
+### recognize some manufacturers as not being operating systems, so we
+### can provide default operating systems below.
+case $os in
+	-sun*os*)
+		# Prevent following clause from handling this invalid input.
+		;;
+	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
+	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
+	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
+	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+	-apple | -axis | -knuth | -cray | -microblaze*)
+		os=
+		basic_machine=$1
+		;;
+	-bluegene*)
+		os=-cnk
+		;;
+	-sim | -cisco | -oki | -wec | -winbond)
+		os=
+		basic_machine=$1
+		;;
+	-scout)
+		;;
+	-wrs)
+		os=-vxworks
+		basic_machine=$1
+		;;
+	-chorusos*)
+		os=-chorusos
+		basic_machine=$1
+		;;
+	-chorusrdb)
+		os=-chorusrdb
+		basic_machine=$1
+		;;
+	-hiux*)
+		os=-hiuxwe2
+		;;
+	-sco6)
+		os=-sco5v6
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco5)
+		os=-sco3.2v5
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco4)
+		os=-sco3.2v4
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco3.2.[4-9]*)
+		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco3.2v[4-9]*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco5v6*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco*)
+		os=-sco3.2v2
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-udk*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-isc)
+		os=-isc2.2
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-clix*)
+		basic_machine=clipper-intergraph
+		;;
+	-isc*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-lynx*178)
+		os=-lynxos178
+		;;
+	-lynx*5)
+		os=-lynxos5
+		;;
+	-lynx*)
+		os=-lynxos
+		;;
+	-ptx*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
+		;;
+	-windowsnt*)
+		os=`echo $os | sed -e 's/windowsnt/winnt/'`
+		;;
+	-psos*)
+		os=-psos
+		;;
+	-mint | -mint[0-9]*)
+		basic_machine=m68k-atari
+		os=-mint
+		;;
+esac
+
+# Decode aliases for certain CPU-COMPANY combinations.
+case $basic_machine in
+	# Recognize the basic CPU types without company name.
+	# Some are omitted here because they have special meanings below.
+	1750a | 580 \
+	| a29k \
+	| aarch64 | aarch64_be \
+	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+	| am33_2.0 \
+	| arc | arceb \
+	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
+	| avr | avr32 \
+	| be32 | be64 \
+	| bfin \
+	| c4x | c8051 | clipper \
+	| d10v | d30v | dlx | dsp16xx \
+	| epiphany \
+	| fido | fr30 | frv \
+	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+	| hexagon \
+	| i370 | i860 | i960 | ia64 \
+	| ip2k | iq2000 \
+	| k1om \
+	| le32 | le64 \
+	| lm32 \
+	| m32c | m32r | m32rle | m68000 | m68k | m88k \
+	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
+	| mips | mipsbe | mipseb | mipsel | mipsle \
+	| mips16 \
+	| mips64 | mips64el \
+	| mips64octeon | mips64octeonel \
+	| mips64orion | mips64orionel \
+	| mips64r5900 | mips64r5900el \
+	| mips64vr | mips64vrel \
+	| mips64vr4100 | mips64vr4100el \
+	| mips64vr4300 | mips64vr4300el \
+	| mips64vr5000 | mips64vr5000el \
+	| mips64vr5900 | mips64vr5900el \
+	| mipsisa32 | mipsisa32el \
+	| mipsisa32r2 | mipsisa32r2el \
+	| mipsisa32r6 | mipsisa32r6el \
+	| mipsisa64 | mipsisa64el \
+	| mipsisa64r2 | mipsisa64r2el \
+	| mipsisa64r6 | mipsisa64r6el \
+	| mipsisa64sb1 | mipsisa64sb1el \
+	| mipsisa64sr71k | mipsisa64sr71kel \
+	| mipsr5900 | mipsr5900el \
+	| mipstx39 | mipstx39el \
+	| mn10200 | mn10300 \
+	| moxie \
+	| mt \
+	| msp430 \
+	| nds32 | nds32le | nds32be \
+	| nios | nios2 | nios2eb | nios2el \
+	| ns16k | ns32k \
+	| open8 | or1k | or1knd | or32 \
+	| pdp10 | pdp11 | pj | pjl \
+	| powerpc | powerpc64 | powerpc64le | powerpcle \
+	| pyramid \
+	| riscv32 | riscv64 \
+	| rl78 | rx \
+	| score \
+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+	| sh64 | sh64le \
+	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+	| spu \
+	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
+	| ubicom32 \
+	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
+	| visium \
+	| we32k \
+	| x86 | xc16x | xstormy16 | xtensa \
+	| z8k | z80)
+		basic_machine=$basic_machine-unknown
+		;;
+	c54x)
+		basic_machine=tic54x-unknown
+		;;
+	c55x)
+		basic_machine=tic55x-unknown
+		;;
+	c6x)
+		basic_machine=tic6x-unknown
+		;;
+	leon|leon[3-9])
+		basic_machine=sparc-$basic_machine
+		;;
+	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
+		basic_machine=$basic_machine-unknown
+		os=-none
+		;;
+	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
+		;;
+	ms1)
+		basic_machine=mt-unknown
+		;;
+
+	strongarm | thumb | xscale)
+		basic_machine=arm-unknown
+		;;
+	xgate)
+		basic_machine=$basic_machine-unknown
+		os=-none
+		;;
+	xscaleeb)
+		basic_machine=armeb-unknown
+		;;
+
+	xscaleel)
+		basic_machine=armel-unknown
+		;;
+
+	# We use `pc' rather than `unknown'
+	# because (1) that's what they normally are, and
+	# (2) the word "unknown" tends to confuse beginning users.
+	i*86 | x86_64)
+	  basic_machine=$basic_machine-pc
+	  ;;
+	# Object if more than one company name word.
+	*-*-*)
+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		exit 1
+		;;
+	# Recognize the basic CPU types with company name.
+	580-* \
+	| a29k-* \
+	| aarch64-* | aarch64_be-* \
+	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
+	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
+	| avr-* | avr32-* \
+	| be32-* | be64-* \
+	| bfin-* | bs2000-* \
+	| c[123]* | c30-* | [cjt]90-* | c4x-* \
+	| c8051-* | clipper-* | craynv-* | cydra-* \
+	| d10v-* | d30v-* | dlx-* \
+	| elxsi-* \
+	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+	| h8300-* | h8500-* \
+	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+	| hexagon-* \
+	| i*86-* | i860-* | i960-* | ia64-* \
+	| ip2k-* | iq2000-* \
+	| k1om-* \
+	| le32-* | le64-* \
+	| lm32-* \
+	| m32c-* | m32r-* | m32rle-* \
+	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+	| microblaze-* | microblazeel-* \
+	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+	| mips16-* \
+	| mips64-* | mips64el-* \
+	| mips64octeon-* | mips64octeonel-* \
+	| mips64orion-* | mips64orionel-* \
+	| mips64r5900-* | mips64r5900el-* \
+	| mips64vr-* | mips64vrel-* \
+	| mips64vr4100-* | mips64vr4100el-* \
+	| mips64vr4300-* | mips64vr4300el-* \
+	| mips64vr5000-* | mips64vr5000el-* \
+	| mips64vr5900-* | mips64vr5900el-* \
+	| mipsisa32-* | mipsisa32el-* \
+	| mipsisa32r2-* | mipsisa32r2el-* \
+	| mipsisa32r6-* | mipsisa32r6el-* \
+	| mipsisa64-* | mipsisa64el-* \
+	| mipsisa64r2-* | mipsisa64r2el-* \
+	| mipsisa64r6-* | mipsisa64r6el-* \
+	| mipsisa64sb1-* | mipsisa64sb1el-* \
+	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
+	| mipsr5900-* | mipsr5900el-* \
+	| mipstx39-* | mipstx39el-* \
+	| mmix-* \
+	| mt-* \
+	| msp430-* \
+	| nds32-* | nds32le-* | nds32be-* \
+	| nios-* | nios2-* | nios2eb-* | nios2el-* \
+	| none-* | np1-* | ns16k-* | ns32k-* \
+	| open8-* \
+	| or1k*-* \
+	| orion-* \
+	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
+	| pyramid-* \
+	| rl78-* | romp-* | rs6000-* | rx-* \
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+	| sparclite-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+	| tahoe-* \
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+	| tile*-* \
+	| tron-* \
+	| ubicom32-* \
+	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
+	| vax-* \
+	| visium-* \
+	| we32k-* \
+	| x86-* | x86_64-* | xc16x-* | xps100-* \
+	| xstormy16-* | xtensa*-* \
+	| ymp-* \
+	| z8k-* | z80-*)
+		;;
+	# Recognize the basic CPU types without company name, with glob match.
+	xtensa*)
+		basic_machine=$basic_machine-unknown
+		;;
+	# Recognize the various machine names and aliases which stand
+	# for a CPU type and a company and sometimes even an OS.
+	386bsd)
+		basic_machine=i386-unknown
+		os=-bsd
+		;;
+	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
+		basic_machine=m68000-att
+		;;
+	3b*)
+		basic_machine=we32k-att
+		;;
+	a29khif)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	abacus)
+		basic_machine=abacus-unknown
+		;;
+	adobe68k)
+		basic_machine=m68010-adobe
+		os=-scout
+		;;
+	alliant | fx80)
+		basic_machine=fx80-alliant
+		;;
+	altos | altos3068)
+		basic_machine=m68k-altos
+		;;
+	am29k)
+		basic_machine=a29k-none
+		os=-bsd
+		;;
+	amd64)
+		basic_machine=x86_64-pc
+		;;
+	amd64-*)
+		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	amdahl)
+		basic_machine=580-amdahl
+		os=-sysv
+		;;
+	amiga | amiga-*)
+		basic_machine=m68k-unknown
+		;;
+	amigaos | amigados)
+		basic_machine=m68k-unknown
+		os=-amigaos
+		;;
+	amigaunix | amix)
+		basic_machine=m68k-unknown
+		os=-sysv4
+		;;
+	apollo68)
+		basic_machine=m68k-apollo
+		os=-sysv
+		;;
+	apollo68bsd)
+		basic_machine=m68k-apollo
+		os=-bsd
+		;;
+	aros)
+		basic_machine=i386-pc
+		os=-aros
+		;;
+	aux)
+		basic_machine=m68k-apple
+		os=-aux
+		;;
+	balance)
+		basic_machine=ns32k-sequent
+		os=-dynix
+		;;
+	blackfin)
+		basic_machine=bfin-unknown
+		os=-linux
+		;;
+	blackfin-*)
+		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
+	bluegene*)
+		basic_machine=powerpc-ibm
+		os=-cnk
+		;;
+	c54x-*)
+		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c55x-*)
+		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c6x-*)
+		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c90)
+		basic_machine=c90-cray
+		os=-unicos
+		;;
+	cegcc)
+		basic_machine=arm-unknown
+		os=-cegcc
+		;;
+	convex-c1)
+		basic_machine=c1-convex
+		os=-bsd
+		;;
+	convex-c2)
+		basic_machine=c2-convex
+		os=-bsd
+		;;
+	convex-c32)
+		basic_machine=c32-convex
+		os=-bsd
+		;;
+	convex-c34)
+		basic_machine=c34-convex
+		os=-bsd
+		;;
+	convex-c38)
+		basic_machine=c38-convex
+		os=-bsd
+		;;
+	cray | j90)
+		basic_machine=j90-cray
+		os=-unicos
+		;;
+	craynv)
+		basic_machine=craynv-cray
+		os=-unicosmp
+		;;
+	cr16 | cr16-*)
+		basic_machine=cr16-unknown
+		os=-elf
+		;;
+	crds | unos)
+		basic_machine=m68k-crds
+		;;
+	crisv32 | crisv32-* | etraxfs*)
+		basic_machine=crisv32-axis
+		;;
+	cris | cris-* | etrax*)
+		basic_machine=cris-axis
+		;;
+	crx)
+		basic_machine=crx-unknown
+		os=-elf
+		;;
+	da30 | da30-*)
+		basic_machine=m68k-da30
+		;;
+	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
+		basic_machine=mips-dec
+		;;
+	decsystem10* | dec10*)
+		basic_machine=pdp10-dec
+		os=-tops10
+		;;
+	decsystem20* | dec20*)
+		basic_machine=pdp10-dec
+		os=-tops20
+		;;
+	delta | 3300 | motorola-3300 | motorola-delta \
+	      | 3300-motorola | delta-motorola)
+		basic_machine=m68k-motorola
+		;;
+	delta88)
+		basic_machine=m88k-motorola
+		os=-sysv3
+		;;
+	dicos)
+		basic_machine=i686-pc
+		os=-dicos
+		;;
+	djgpp)
+		basic_machine=i586-pc
+		os=-msdosdjgpp
+		;;
+	dpx20 | dpx20-*)
+		basic_machine=rs6000-bull
+		os=-bosx
+		;;
+	dpx2* | dpx2*-bull)
+		basic_machine=m68k-bull
+		os=-sysv3
+		;;
+	ebmon29k)
+		basic_machine=a29k-amd
+		os=-ebmon
+		;;
+	elxsi)
+		basic_machine=elxsi-elxsi
+		os=-bsd
+		;;
+	encore | umax | mmax)
+		basic_machine=ns32k-encore
+		;;
+	es1800 | OSE68k | ose68k | ose | OSE)
+		basic_machine=m68k-ericsson
+		os=-ose
+		;;
+	fx2800)
+		basic_machine=i860-alliant
+		;;
+	genix)
+		basic_machine=ns32k-ns
+		;;
+	gmicro)
+		basic_machine=tron-gmicro
+		os=-sysv
+		;;
+	go32)
+		basic_machine=i386-pc
+		os=-go32
+		;;
+	h3050r* | hiux*)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
+		;;
+	h8300hms)
+		basic_machine=h8300-hitachi
+		os=-hms
+		;;
+	h8300xray)
+		basic_machine=h8300-hitachi
+		os=-xray
+		;;
+	h8500hms)
+		basic_machine=h8500-hitachi
+		os=-hms
+		;;
+	harris)
+		basic_machine=m88k-harris
+		os=-sysv3
+		;;
+	hp300-*)
+		basic_machine=m68k-hp
+		;;
+	hp300bsd)
+		basic_machine=m68k-hp
+		os=-bsd
+		;;
+	hp300hpux)
+		basic_machine=m68k-hp
+		os=-hpux
+		;;
+	hp3k9[0-9][0-9] | hp9[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hp9k2[0-9][0-9] | hp9k31[0-9])
+		basic_machine=m68000-hp
+		;;
+	hp9k3[2-9][0-9])
+		basic_machine=m68k-hp
+		;;
+	hp9k6[0-9][0-9] | hp6[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hp9k7[0-79][0-9] | hp7[0-79][0-9])
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k78[0-9] | hp78[0-9])
+		# FIXME: really hppa2.0-hp
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
+		# FIXME: really hppa2.0-hp
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[0-9][13679] | hp8[0-9][13679])
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[0-9][0-9] | hp8[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hppa-next)
+		os=-nextstep3
+		;;
+	hppaosf)
+		basic_machine=hppa1.1-hp
+		os=-osf
+		;;
+	hppro)
+		basic_machine=hppa1.1-hp
+		os=-proelf
+		;;
+	i370-ibm* | ibm*)
+		basic_machine=i370-ibm
+		;;
+	i*86v32)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv32
+		;;
+	i*86v4*)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv4
+		;;
+	i*86v)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv
+		;;
+	i*86sol2)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-solaris2
+		;;
+	i386mach)
+		basic_machine=i386-mach
+		os=-mach
+		;;
+	i386-vsta | vsta)
+		basic_machine=i386-unknown
+		os=-vsta
+		;;
+	iris | iris4d)
+		basic_machine=mips-sgi
+		case $os in
+		    -irix*)
+			;;
+		    *)
+			os=-irix4
+			;;
+		esac
+		;;
+	isi68 | isi)
+		basic_machine=m68k-isi
+		os=-sysv
+		;;
+	leon-*|leon[3-9]-*)
+		basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
+		;;
+	m68knommu)
+		basic_machine=m68k-unknown
+		os=-linux
+		;;
+	m68knommu-*)
+		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
+	m88k-omron*)
+		basic_machine=m88k-omron
+		;;
+	magnum | m3230)
+		basic_machine=mips-mips
+		os=-sysv
+		;;
+	merlin)
+		basic_machine=ns32k-utek
+		os=-sysv
+		;;
+	microblaze*)
+		basic_machine=microblaze-xilinx
+		;;
+	mingw64)
+		basic_machine=x86_64-pc
+		os=-mingw64
+		;;
+	mingw32)
+		basic_machine=i686-pc
+		os=-mingw32
+		;;
+	mingw32ce)
+		basic_machine=arm-unknown
+		os=-mingw32ce
+		;;
+	miniframe)
+		basic_machine=m68000-convergent
+		;;
+	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
+		basic_machine=m68k-atari
+		os=-mint
+		;;
+	mips3*-*)
+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
+		;;
+	mips3*)
+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
+		;;
+	monitor)
+		basic_machine=m68k-rom68k
+		os=-coff
+		;;
+	morphos)
+		basic_machine=powerpc-unknown
+		os=-morphos
+		;;
+	moxiebox)
+		basic_machine=moxie-unknown
+		os=-moxiebox
+		;;
+	msdos)
+		basic_machine=i386-pc
+		os=-msdos
+		;;
+	ms1-*)
+		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+		;;
+	msys)
+		basic_machine=i686-pc
+		os=-msys
+		;;
+	mvs)
+		basic_machine=i370-ibm
+		os=-mvs
+		;;
+	nacl)
+		basic_machine=le32-unknown
+		os=-nacl
+		;;
+	ncr3000)
+		basic_machine=i486-ncr
+		os=-sysv4
+		;;
+	netbsd386)
+		basic_machine=i386-unknown
+		os=-netbsd
+		;;
+	netwinder)
+		basic_machine=armv4l-rebel
+		os=-linux
+		;;
+	news | news700 | news800 | news900)
+		basic_machine=m68k-sony
+		os=-newsos
+		;;
+	news1000)
+		basic_machine=m68030-sony
+		os=-newsos
+		;;
+	news-3600 | risc-news)
+		basic_machine=mips-sony
+		os=-newsos
+		;;
+	necv70)
+		basic_machine=v70-nec
+		os=-sysv
+		;;
+	next | m*-next )
+		basic_machine=m68k-next
+		case $os in
+		    -nextstep* )
+			;;
+		    -ns2*)
+		      os=-nextstep2
+			;;
+		    *)
+		      os=-nextstep3
+			;;
+		esac
+		;;
+	nh3000)
+		basic_machine=m68k-harris
+		os=-cxux
+		;;
+	nh[45]000)
+		basic_machine=m88k-harris
+		os=-cxux
+		;;
+	nindy960)
+		basic_machine=i960-intel
+		os=-nindy
+		;;
+	mon960)
+		basic_machine=i960-intel
+		os=-mon960
+		;;
+	nonstopux)
+		basic_machine=mips-compaq
+		os=-nonstopux
+		;;
+	np1)
+		basic_machine=np1-gould
+		;;
+	neo-tandem)
+		basic_machine=neo-tandem
+		;;
+	nse-tandem)
+		basic_machine=nse-tandem
+		;;
+	nsr-tandem)
+		basic_machine=nsr-tandem
+		;;
+	op50n-* | op60c-*)
+		basic_machine=hppa1.1-oki
+		os=-proelf
+		;;
+	openrisc | openrisc-*)
+		basic_machine=or32-unknown
+		;;
+	os400)
+		basic_machine=powerpc-ibm
+		os=-os400
+		;;
+	OSE68000 | ose68000)
+		basic_machine=m68000-ericsson
+		os=-ose
+		;;
+	os68k)
+		basic_machine=m68k-none
+		os=-os68k
+		;;
+	pa-hitachi)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
+		;;
+	paragon)
+		basic_machine=i860-intel
+		os=-osf
+		;;
+	parisc)
+		basic_machine=hppa-unknown
+		os=-linux
+		;;
+	parisc-*)
+		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
+	pbd)
+		basic_machine=sparc-tti
+		;;
+	pbb)
+		basic_machine=m68k-tti
+		;;
+	pc532 | pc532-*)
+		basic_machine=ns32k-pc532
+		;;
+	pc98)
+		basic_machine=i386-pc
+		;;
+	pc98-*)
+		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentium | p5 | k5 | k6 | nexgen | viac3)
+		basic_machine=i586-pc
+		;;
+	pentiumpro | p6 | 6x86 | athlon | athlon_*)
+		basic_machine=i686-pc
+		;;
+	pentiumii | pentium2 | pentiumiii | pentium3)
+		basic_machine=i686-pc
+		;;
+	pentium4)
+		basic_machine=i786-pc
+		;;
+	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
+		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentiumpro-* | p6-* | 6x86-* | athlon-*)
+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentium4-*)
+		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pn)
+		basic_machine=pn-gould
+		;;
+	power)	basic_machine=power-ibm
+		;;
+	ppc | ppcbe)	basic_machine=powerpc-unknown
+		;;
+	ppc-* | ppcbe-*)
+		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppcle | powerpclittle | ppc-le | powerpc-little)
+		basic_machine=powerpcle-unknown
+		;;
+	ppcle-* | powerpclittle-*)
+		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppc64)	basic_machine=powerpc64-unknown
+		;;
+	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
+		basic_machine=powerpc64le-unknown
+		;;
+	ppc64le-* | powerpc64little-*)
+		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ps2)
+		basic_machine=i386-ibm
+		;;
+	pw32)
+		basic_machine=i586-unknown
+		os=-pw32
+		;;
+	rdos | rdos64)
+		basic_machine=x86_64-pc
+		os=-rdos
+		;;
+	rdos32)
+		basic_machine=i386-pc
+		os=-rdos
+		;;
+	rom68k)
+		basic_machine=m68k-rom68k
+		os=-coff
+		;;
+	rm[46]00)
+		basic_machine=mips-siemens
+		;;
+	rtpc | rtpc-*)
+		basic_machine=romp-ibm
+		;;
+	s390 | s390-*)
+		basic_machine=s390-ibm
+		;;
+	s390x | s390x-*)
+		basic_machine=s390x-ibm
+		;;
+	sa29200)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	sb1)
+		basic_machine=mipsisa64sb1-unknown
+		;;
+	sb1el)
+		basic_machine=mipsisa64sb1el-unknown
+		;;
+	sde)
+		basic_machine=mipsisa32-sde
+		os=-elf
+		;;
+	sei)
+		basic_machine=mips-sei
+		os=-seiux
+		;;
+	sequent)
+		basic_machine=i386-sequent
+		;;
+	sh)
+		basic_machine=sh-hitachi
+		os=-hms
+		;;
+	sh5el)
+		basic_machine=sh5le-unknown
+		;;
+	sh64)
+		basic_machine=sh64-unknown
+		;;
+	sparclite-wrs | simso-wrs)
+		basic_machine=sparclite-wrs
+		os=-vxworks
+		;;
+	sps7)
+		basic_machine=m68k-bull
+		os=-sysv2
+		;;
+	spur)
+		basic_machine=spur-unknown
+		;;
+	st2000)
+		basic_machine=m68k-tandem
+		;;
+	stratus)
+		basic_machine=i860-stratus
+		os=-sysv4
+		;;
+	strongarm-* | thumb-*)
+		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	sun2)
+		basic_machine=m68000-sun
+		;;
+	sun2os3)
+		basic_machine=m68000-sun
+		os=-sunos3
+		;;
+	sun2os4)
+		basic_machine=m68000-sun
+		os=-sunos4
+		;;
+	sun3os3)
+		basic_machine=m68k-sun
+		os=-sunos3
+		;;
+	sun3os4)
+		basic_machine=m68k-sun
+		os=-sunos4
+		;;
+	sun4os3)
+		basic_machine=sparc-sun
+		os=-sunos3
+		;;
+	sun4os4)
+		basic_machine=sparc-sun
+		os=-sunos4
+		;;
+	sun4sol2)
+		basic_machine=sparc-sun
+		os=-solaris2
+		;;
+	sun3 | sun3-*)
+		basic_machine=m68k-sun
+		;;
+	sun4)
+		basic_machine=sparc-sun
+		;;
+	sun386 | sun386i | roadrunner)
+		basic_machine=i386-sun
+		;;
+	sv1)
+		basic_machine=sv1-cray
+		os=-unicos
+		;;
+	symmetry)
+		basic_machine=i386-sequent
+		os=-dynix
+		;;
+	t3e)
+		basic_machine=alphaev5-cray
+		os=-unicos
+		;;
+	t90)
+		basic_machine=t90-cray
+		os=-unicos
+		;;
+	tile*)
+		basic_machine=$basic_machine-unknown
+		os=-linux-gnu
+		;;
+	tx39)
+		basic_machine=mipstx39-unknown
+		;;
+	tx39el)
+		basic_machine=mipstx39el-unknown
+		;;
+	toad1)
+		basic_machine=pdp10-xkl
+		os=-tops20
+		;;
+	tower | tower-32)
+		basic_machine=m68k-ncr
+		;;
+	tpf)
+		basic_machine=s390x-ibm
+		os=-tpf
+		;;
+	udi29k)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	ultra3)
+		basic_machine=a29k-nyu
+		os=-sym1
+		;;
+	v810 | necv810)
+		basic_machine=v810-nec
+		os=-none
+		;;
+	vaxv)
+		basic_machine=vax-dec
+		os=-sysv
+		;;
+	vms)
+		basic_machine=vax-dec
+		os=-vms
+		;;
+	vpp*|vx|vx-*)
+		basic_machine=f301-fujitsu
+		;;
+	vxworks960)
+		basic_machine=i960-wrs
+		os=-vxworks
+		;;
+	vxworks68)
+		basic_machine=m68k-wrs
+		os=-vxworks
+		;;
+	vxworks29k)
+		basic_machine=a29k-wrs
+		os=-vxworks
+		;;
+	w65*)
+		basic_machine=w65-wdc
+		os=-none
+		;;
+	w89k-*)
+		basic_machine=hppa1.1-winbond
+		os=-proelf
+		;;
+	xbox)
+		basic_machine=i686-pc
+		os=-mingw32
+		;;
+	xps | xps100)
+		basic_machine=xps100-honeywell
+		;;
+	xscale-* | xscalee[bl]-*)
+		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
+		;;
+	ymp)
+		basic_machine=ymp-cray
+		os=-unicos
+		;;
+	z8k-*-coff)
+		basic_machine=z8k-unknown
+		os=-sim
+		;;
+	z80-*-coff)
+		basic_machine=z80-unknown
+		os=-sim
+		;;
+	none)
+		basic_machine=none-none
+		os=-none
+		;;
+
+# Here we handle the default manufacturer of certain CPU types.  It is in
+# some cases the only manufacturer, in others, it is the most popular.
+	w89k)
+		basic_machine=hppa1.1-winbond
+		;;
+	op50n)
+		basic_machine=hppa1.1-oki
+		;;
+	op60c)
+		basic_machine=hppa1.1-oki
+		;;
+	romp)
+		basic_machine=romp-ibm
+		;;
+	mmix)
+		basic_machine=mmix-knuth
+		;;
+	rs6000)
+		basic_machine=rs6000-ibm
+		;;
+	vax)
+		basic_machine=vax-dec
+		;;
+	pdp10)
+		# there are many clones, so DEC is not a safe bet
+		basic_machine=pdp10-unknown
+		;;
+	pdp11)
+		basic_machine=pdp11-dec
+		;;
+	we32k)
+		basic_machine=we32k-att
+		;;
+	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
+		basic_machine=sh-unknown
+		;;
+	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
+		basic_machine=sparc-sun
+		;;
+	cydra)
+		basic_machine=cydra-cydrome
+		;;
+	orion)
+		basic_machine=orion-highlevel
+		;;
+	orion105)
+		basic_machine=clipper-highlevel
+		;;
+	mac | mpw | mac-mpw)
+		basic_machine=m68k-apple
+		;;
+	pmac | pmac-mpw)
+		basic_machine=powerpc-apple
+		;;
+	*-unknown)
+		# Make sure to match an already-canonicalized machine name.
+		;;
+	*)
+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		exit 1
+		;;
+esac
+
+# Here we canonicalize certain aliases for manufacturers.
+case $basic_machine in
+	*-digital*)
+		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
+		;;
+	*-commodore*)
+		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
+		;;
+	*)
+		;;
+esac
+
+# Decode manufacturer-specific aliases for certain operating systems.
+
+if [ x"$os" != x"" ]
+then
+case $os in
+	# First match some system type aliases
+	# that might get confused with valid system types.
+	# -solaris* is a basic system type, with this one exception.
+	-auroraux)
+		os=-auroraux
+		;;
+	-solaris1 | -solaris1.*)
+		os=`echo $os | sed -e 's|solaris1|sunos4|'`
+		;;
+	-solaris)
+		os=-solaris2
+		;;
+	-svr4*)
+		os=-sysv4
+		;;
+	-unixware*)
+		os=-sysv4.2uw
+		;;
+	-gnu/linux*)
+		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
+		;;
+	# First accept the basic system types.
+	# The portable systems comes first.
+	# Each alternative MUST END IN A *, to match a version number.
+	# -sysv* is not here because it comes later, after sysvr4.
+	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
+	      | -sym* | -kopensolaris* | -plan9* \
+	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+	      | -aos* | -aros* \
+	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+	      | -bitrig* | -openbsd* | -solidbsd* \
+	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+	      | -chorusos* | -chorusrdb* | -cegcc* \
+	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
+	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
+	      | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
+	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
+	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
+	# Remember, each alternative MUST END IN *, to match a version number.
+		;;
+	-qnx*)
+		case $basic_machine in
+		    x86-* | i*86-*)
+			;;
+		    *)
+			os=-nto$os
+			;;
+		esac
+		;;
+	-nto-qnx*)
+		;;
+	-nto*)
+		os=`echo $os | sed -e 's|nto|nto-qnx|'`
+		;;
+	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
+	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
+		;;
+	-mac*)
+		os=`echo $os | sed -e 's|mac|macos|'`
+		;;
+	-linux-dietlibc)
+		os=-linux-dietlibc
+		;;
+	-linux*)
+		os=`echo $os | sed -e 's|linux|linux-gnu|'`
+		;;
+	-sunos5*)
+		os=`echo $os | sed -e 's|sunos5|solaris2|'`
+		;;
+	-sunos6*)
+		os=`echo $os | sed -e 's|sunos6|solaris3|'`
+		;;
+	-opened*)
+		os=-openedition
+		;;
+	-os400*)
+		os=-os400
+		;;
+	-wince*)
+		os=-wince
+		;;
+	-osfrose*)
+		os=-osfrose
+		;;
+	-osf*)
+		os=-osf
+		;;
+	-utek*)
+		os=-bsd
+		;;
+	-dynix*)
+		os=-bsd
+		;;
+	-acis*)
+		os=-aos
+		;;
+	-atheos*)
+		os=-atheos
+		;;
+	-syllable*)
+		os=-syllable
+		;;
+	-386bsd)
+		os=-bsd
+		;;
+	-ctix* | -uts*)
+		os=-sysv
+		;;
+	-nova*)
+		os=-rtmk-nova
+		;;
+	-ns2 )
+		os=-nextstep2
+		;;
+	-nsk*)
+		os=-nsk
+		;;
+	# Preserve the version number of sinix5.
+	-sinix5.*)
+		os=`echo $os | sed -e 's|sinix|sysv|'`
+		;;
+	-sinix*)
+		os=-sysv4
+		;;
+	-tpf*)
+		os=-tpf
+		;;
+	-triton*)
+		os=-sysv3
+		;;
+	-oss*)
+		os=-sysv3
+		;;
+	-svr4)
+		os=-sysv4
+		;;
+	-svr3)
+		os=-sysv3
+		;;
+	-sysvr4)
+		os=-sysv4
+		;;
+	# This must come after -sysvr4.
+	-sysv*)
+		;;
+	-ose*)
+		os=-ose
+		;;
+	-es1800*)
+		os=-ose
+		;;
+	-xenix)
+		os=-xenix
+		;;
+	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+		os=-mint
+		;;
+	-aros*)
+		os=-aros
+		;;
+	-zvmoe)
+		os=-zvmoe
+		;;
+	-dicos*)
+		os=-dicos
+		;;
+	-nacl*)
+		;;
+	-none)
+		;;
+	*)
+		# Get rid of the `-' at the beginning of $os.
+		os=`echo $os | sed 's/[^-]*-//'`
+		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
+		exit 1
+		;;
+esac
+else
+
+# Here we handle the default operating systems that come with various machines.
+# The value should be what the vendor currently ships out the door with their
+# machine or put another way, the most popular os provided with the machine.
+
+# Note that if you're going to try to match "-MANUFACTURER" here (say,
+# "-sun"), then you have to tell the case statement up towards the top
+# that MANUFACTURER isn't an operating system.  Otherwise, code above
+# will signal an error saying that MANUFACTURER isn't an operating
+# system, and we'll never get to this point.
+
+case $basic_machine in
+	score-*)
+		os=-elf
+		;;
+	spu-*)
+		os=-elf
+		;;
+	*-acorn)
+		os=-riscix1.2
+		;;
+	arm*-rebel)
+		os=-linux
+		;;
+	arm*-semi)
+		os=-aout
+		;;
+	c4x-* | tic4x-*)
+		os=-coff
+		;;
+	c8051-*)
+		os=-elf
+		;;
+	hexagon-*)
+		os=-elf
+		;;
+	tic54x-*)
+		os=-coff
+		;;
+	tic55x-*)
+		os=-coff
+		;;
+	tic6x-*)
+		os=-coff
+		;;
+	# This must come before the *-dec entry.
+	pdp10-*)
+		os=-tops20
+		;;
+	pdp11-*)
+		os=-none
+		;;
+	*-dec | vax-*)
+		os=-ultrix4.2
+		;;
+	m68*-apollo)
+		os=-domain
+		;;
+	i386-sun)
+		os=-sunos4.0.2
+		;;
+	m68000-sun)
+		os=-sunos3
+		;;
+	m68*-cisco)
+		os=-aout
+		;;
+	mep-*)
+		os=-elf
+		;;
+	mips*-cisco)
+		os=-elf
+		;;
+	mips*-*)
+		os=-elf
+		;;
+	or32-*)
+		os=-coff
+		;;
+	*-tti)	# must be before sparc entry or we get the wrong os.
+		os=-sysv3
+		;;
+	sparc-* | *-sun)
+		os=-sunos4.1.1
+		;;
+	*-be)
+		os=-beos
+		;;
+	*-haiku)
+		os=-haiku
+		;;
+	*-ibm)
+		os=-aix
+		;;
+	*-knuth)
+		os=-mmixware
+		;;
+	*-wec)
+		os=-proelf
+		;;
+	*-winbond)
+		os=-proelf
+		;;
+	*-oki)
+		os=-proelf
+		;;
+	*-hp)
+		os=-hpux
+		;;
+	*-hitachi)
+		os=-hiux
+		;;
+	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
+		os=-sysv
+		;;
+	*-cbm)
+		os=-amigaos
+		;;
+	*-dg)
+		os=-dgux
+		;;
+	*-dolphin)
+		os=-sysv3
+		;;
+	m68k-ccur)
+		os=-rtu
+		;;
+	m88k-omron*)
+		os=-luna
+		;;
+	*-next )
+		os=-nextstep
+		;;
+	*-sequent)
+		os=-ptx
+		;;
+	*-crds)
+		os=-unos
+		;;
+	*-ns)
+		os=-genix
+		;;
+	i370-*)
+		os=-mvs
+		;;
+	*-next)
+		os=-nextstep3
+		;;
+	*-gould)
+		os=-sysv
+		;;
+	*-highlevel)
+		os=-bsd
+		;;
+	*-encore)
+		os=-bsd
+		;;
+	*-sgi)
+		os=-irix
+		;;
+	*-siemens)
+		os=-sysv4
+		;;
+	*-masscomp)
+		os=-rtu
+		;;
+	f30[01]-fujitsu | f700-fujitsu)
+		os=-uxpv
+		;;
+	*-rom68k)
+		os=-coff
+		;;
+	*-*bug)
+		os=-coff
+		;;
+	*-apple)
+		os=-macos
+		;;
+	*-atari*)
+		os=-mint
+		;;
+	*)
+		os=-none
+		;;
+esac
+fi
+
+# Here we handle the case where we know the os, and the CPU type, but not the
+# manufacturer.  We pick the logical manufacturer.
+vendor=unknown
+case $basic_machine in
+	*-unknown)
+		case $os in
+			-riscix*)
+				vendor=acorn
+				;;
+			-sunos*)
+				vendor=sun
+				;;
+			-cnk*|-aix*)
+				vendor=ibm
+				;;
+			-beos*)
+				vendor=be
+				;;
+			-hpux*)
+				vendor=hp
+				;;
+			-mpeix*)
+				vendor=hp
+				;;
+			-hiux*)
+				vendor=hitachi
+				;;
+			-unos*)
+				vendor=crds
+				;;
+			-dgux*)
+				vendor=dg
+				;;
+			-luna*)
+				vendor=omron
+				;;
+			-genix*)
+				vendor=ns
+				;;
+			-mvs* | -opened*)
+				vendor=ibm
+				;;
+			-os400*)
+				vendor=ibm
+				;;
+			-ptx*)
+				vendor=sequent
+				;;
+			-tpf*)
+				vendor=ibm
+				;;
+			-vxsim* | -vxworks* | -windiss*)
+				vendor=wrs
+				;;
+			-aux*)
+				vendor=apple
+				;;
+			-hms*)
+				vendor=hitachi
+				;;
+			-mpw* | -macos*)
+				vendor=apple
+				;;
+			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+				vendor=atari
+				;;
+			-vos*)
+				vendor=stratus
+				;;
+		esac
+		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
+		;;
+esac
+
+echo $basic_machine$os
+exit
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
diff --git a/config/depcomp b/config/depcomp
new file mode 100755
index 0000000..fc98710
--- /dev/null
+++ b/config/depcomp
@@ -0,0 +1,791 @@
+#! /bin/sh
+# depcomp - compile a program generating dependencies as side-effects
+
+scriptversion=2013-05-30.07; # UTC
+
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Originally written by Alexandre Oliva <oliva at dcc.unicamp.br>.
+
+case $1 in
+  '')
+    echo "$0: No command.  Try '$0 --help' for more information." 1>&2
+    exit 1;
+    ;;
+  -h | --h*)
+    cat <<\EOF
+Usage: depcomp [--help] [--version] PROGRAM [ARGS]
+
+Run PROGRAMS ARGS to compile a file, generating dependencies
+as side-effects.
+
+Environment variables:
+  depmode     Dependency tracking mode.
+  source      Source file read by 'PROGRAMS ARGS'.
+  object      Object file output by 'PROGRAMS ARGS'.
+  DEPDIR      directory where to store dependencies.
+  depfile     Dependency file to output.
+  tmpdepfile  Temporary file to use when outputting dependencies.
+  libtool     Whether libtool is used (yes/no).
+
+Report bugs to <bug-automake at gnu.org>.
+EOF
+    exit $?
+    ;;
+  -v | --v*)
+    echo "depcomp $scriptversion"
+    exit $?
+    ;;
+esac
+
+# Get the directory component of the given path, and save it in the
+# global variables '$dir'.  Note that this directory component will
+# be either empty or ending with a '/' character.  This is deliberate.
+set_dir_from ()
+{
+  case $1 in
+    */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;;
+      *) dir=;;
+  esac
+}
+
+# Get the suffix-stripped basename of the given path, and save it the
+# global variable '$base'.
+set_base_from ()
+{
+  base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'`
+}
+
+# If no dependency file was actually created by the compiler invocation,
+# we still have to create a dummy depfile, to avoid errors with the
+# Makefile "include basename.Plo" scheme.
+make_dummy_depfile ()
+{
+  echo "#dummy" > "$depfile"
+}
+
+# Factor out some common post-processing of the generated depfile.
+# Requires the auxiliary global variable '$tmpdepfile' to be set.
+aix_post_process_depfile ()
+{
+  # If the compiler actually managed to produce a dependency file,
+  # post-process it.
+  if test -f "$tmpdepfile"; then
+    # Each line is of the form 'foo.o: dependency.h'.
+    # Do two passes, one to just change these to
+    #   $object: dependency.h
+    # and one to simply output
+    #   dependency.h:
+    # which is needed to avoid the deleted-header problem.
+    { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile"
+      sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile"
+    } > "$depfile"
+    rm -f "$tmpdepfile"
+  else
+    make_dummy_depfile
+  fi
+}
+
+# A tabulation character.
+tab='	'
+# A newline character.
+nl='
+'
+# Character ranges might be problematic outside the C locale.
+# These definitions help.
+upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ
+lower=abcdefghijklmnopqrstuvwxyz
+digits=0123456789
+alpha=${upper}${lower}
+
+if test -z "$depmode" || test -z "$source" || test -z "$object"; then
+  echo "depcomp: Variables source, object and depmode must be set" 1>&2
+  exit 1
+fi
+
+# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
+depfile=${depfile-`echo "$object" |
+  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
+tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
+
+rm -f "$tmpdepfile"
+
+# Avoid interferences from the environment.
+gccflag= dashmflag=
+
+# Some modes work just like other modes, but use different flags.  We
+# parameterize here, but still list the modes in the big case below,
+# to make depend.m4 easier to write.  Note that we *cannot* use a case
+# here, because this file can only contain one case statement.
+if test "$depmode" = hp; then
+  # HP compiler uses -M and no extra arg.
+  gccflag=-M
+  depmode=gcc
+fi
+
+if test "$depmode" = dashXmstdout; then
+  # This is just like dashmstdout with a different argument.
+  dashmflag=-xM
+  depmode=dashmstdout
+fi
+
+cygpath_u="cygpath -u -f -"
+if test "$depmode" = msvcmsys; then
+  # This is just like msvisualcpp but w/o cygpath translation.
+  # Just convert the backslash-escaped backslashes to single forward
+  # slashes to satisfy depend.m4
+  cygpath_u='sed s,\\\\,/,g'
+  depmode=msvisualcpp
+fi
+
+if test "$depmode" = msvc7msys; then
+  # This is just like msvc7 but w/o cygpath translation.
+  # Just convert the backslash-escaped backslashes to single forward
+  # slashes to satisfy depend.m4
+  cygpath_u='sed s,\\\\,/,g'
+  depmode=msvc7
+fi
+
+if test "$depmode" = xlc; then
+  # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information.
+  gccflag=-qmakedep=gcc,-MF
+  depmode=gcc
+fi
+
+case "$depmode" in
+gcc3)
+## gcc 3 implements dependency tracking that does exactly what
+## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
+## it if -MD -MP comes after the -MF stuff.  Hmm.
+## Unfortunately, FreeBSD c89 acceptance of flags depends upon
+## the command line argument order; so add the flags where they
+## appear in depend2.am.  Note that the slowdown incurred here
+## affects only configure: in makefiles, %FASTDEP% shortcuts this.
+  for arg
+  do
+    case $arg in
+    -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
+    *)  set fnord "$@" "$arg" ;;
+    esac
+    shift # fnord
+    shift # $arg
+  done
+  "$@"
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  mv "$tmpdepfile" "$depfile"
+  ;;
+
+gcc)
+## Note that this doesn't just cater to obsosete pre-3.x GCC compilers.
+## but also to in-use compilers like IMB xlc/xlC and the HP C compiler.
+## (see the conditional assignment to $gccflag above).
+## There are various ways to get dependency output from gcc.  Here's
+## why we pick this rather obscure method:
+## - Don't want to use -MD because we'd like the dependencies to end
+##   up in a subdir.  Having to rename by hand is ugly.
+##   (We might end up doing this anyway to support other compilers.)
+## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
+##   -MM, not -M (despite what the docs say).  Also, it might not be
+##   supported by the other compilers which use the 'gcc' depmode.
+## - Using -M directly means running the compiler twice (even worse
+##   than renaming).
+  if test -z "$gccflag"; then
+    gccflag=-MD,
+  fi
+  "$@" -Wp,"$gccflag$tmpdepfile"
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  # The second -e expression handles DOS-style file names with drive
+  # letters.
+  sed -e 's/^[^:]*: / /' \
+      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
+## This next piece of magic avoids the "deleted header file" problem.
+## The problem is that when a header file which appears in a .P file
+## is deleted, the dependency causes make to die (because there is
+## typically no way to rebuild the header).  We avoid this by adding
+## dummy dependencies for each header file.  Too bad gcc doesn't do
+## this for us directly.
+## Some versions of gcc put a space before the ':'.  On the theory
+## that the space means something, we add a space to the output as
+## well.  hp depmode also adds that space, but also prefixes the VPATH
+## to the object.  Take care to not repeat it in the output.
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly.  Breaking it into two sed invocations is a workaround.
+  tr ' ' "$nl" < "$tmpdepfile" \
+    | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
+    | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+hp)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
+sgi)
+  if test "$libtool" = yes; then
+    "$@" "-Wp,-MDupdate,$tmpdepfile"
+  else
+    "$@" -MDupdate "$tmpdepfile"
+  fi
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+
+  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
+    echo "$object : \\" > "$depfile"
+    # Clip off the initial element (the dependent).  Don't try to be
+    # clever and replace this with sed code, as IRIX sed won't handle
+    # lines with more than a fixed number of characters (4096 in
+    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
+    # the IRIX cc adds comments like '#:fec' to the end of the
+    # dependency line.
+    tr ' ' "$nl" < "$tmpdepfile" \
+      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \
+      | tr "$nl" ' ' >> "$depfile"
+    echo >> "$depfile"
+    # The second pass generates a dummy entry for each header file.
+    tr ' ' "$nl" < "$tmpdepfile" \
+      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
+      >> "$depfile"
+  else
+    make_dummy_depfile
+  fi
+  rm -f "$tmpdepfile"
+  ;;
+
+xlc)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
+aix)
+  # The C for AIX Compiler uses -M and outputs the dependencies
+  # in a .u file.  In older versions, this file always lives in the
+  # current directory.  Also, the AIX compiler puts '$object:' at the
+  # start of each line; $object doesn't have directory information.
+  # Version 6 uses the directory in both cases.
+  set_dir_from "$object"
+  set_base_from "$object"
+  if test "$libtool" = yes; then
+    tmpdepfile1=$dir$base.u
+    tmpdepfile2=$base.u
+    tmpdepfile3=$dir.libs/$base.u
+    "$@" -Wc,-M
+  else
+    tmpdepfile1=$dir$base.u
+    tmpdepfile2=$dir$base.u
+    tmpdepfile3=$dir$base.u
+    "$@" -M
+  fi
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+    exit $stat
+  fi
+
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  aix_post_process_depfile
+  ;;
+
+tcc)
+  # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26
+  # FIXME: That version still under development at the moment of writing.
+  #        Make that this statement remains true also for stable, released
+  #        versions.
+  # It will wrap lines (doesn't matter whether long or short) with a
+  # trailing '\', as in:
+  #
+  #   foo.o : \
+  #    foo.c \
+  #    foo.h \
+  #
+  # It will put a trailing '\' even on the last line, and will use leading
+  # spaces rather than leading tabs (at least since its commit 0394caf7
+  # "Emit spaces for -MD").
+  "$@" -MD -MF "$tmpdepfile"
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'.
+  # We have to change lines of the first kind to '$object: \'.
+  sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile"
+  # And for each line of the second kind, we have to emit a 'dep.h:'
+  # dummy dependency, to avoid the deleted-header problem.
+  sed -n -e 's|^  *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+## The order of this option in the case statement is important, since the
+## shell code in configure will try each of these formats in the order
+## listed in this file.  A plain '-MD' option would be understood by many
+## compilers, so we must ensure this comes after the gcc and icc options.
+pgcc)
+  # Portland's C compiler understands '-MD'.
+  # Will always output deps to 'file.d' where file is the root name of the
+  # source file under compilation, even if file resides in a subdirectory.
+  # The object file name does not affect the name of the '.d' file.
+  # pgcc 10.2 will output
+  #    foo.o: sub/foo.c sub/foo.h
+  # and will wrap long lines using '\' :
+  #    foo.o: sub/foo.c ... \
+  #     sub/foo.h ... \
+  #     ...
+  set_dir_from "$object"
+  # Use the source, not the object, to determine the base name, since
+  # that's sadly what pgcc will do too.
+  set_base_from "$source"
+  tmpdepfile=$base.d
+
+  # For projects that build the same source file twice into different object
+  # files, the pgcc approach of using the *source* file root name can cause
+  # problems in parallel builds.  Use a locking strategy to avoid stomping on
+  # the same $tmpdepfile.
+  lockdir=$base.d-lock
+  trap "
+    echo '$0: caught signal, cleaning up...' >&2
+    rmdir '$lockdir'
+    exit 1
+  " 1 2 13 15
+  numtries=100
+  i=$numtries
+  while test $i -gt 0; do
+    # mkdir is a portable test-and-set.
+    if mkdir "$lockdir" 2>/dev/null; then
+      # This process acquired the lock.
+      "$@" -MD
+      stat=$?
+      # Release the lock.
+      rmdir "$lockdir"
+      break
+    else
+      # If the lock is being held by a different process, wait
+      # until the winning process is done or we timeout.
+      while test -d "$lockdir" && test $i -gt 0; do
+        sleep 1
+        i=`expr $i - 1`
+      done
+    fi
+    i=`expr $i - 1`
+  done
+  trap - 1 2 13 15
+  if test $i -le 0; then
+    echo "$0: failed to acquire lock after $numtries attempts" >&2
+    echo "$0: check lockdir '$lockdir'" >&2
+    exit 1
+  fi
+
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  # Each line is of the form `foo.o: dependent.h',
+  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
+  # Do two passes, one to just change these to
+  # `$object: dependent.h' and one to simply `dependent.h:'.
+  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process this invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \
+    | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+hp2)
+  # The "hp" stanza above does not work with aCC (C++) and HP's ia64
+  # compilers, which have integrated preprocessors.  The correct option
+  # to use with these is +Maked; it writes dependencies to a file named
+  # 'foo.d', which lands next to the object file, wherever that
+  # happens to be.
+  # Much of this is similar to the tru64 case; see comments there.
+  set_dir_from  "$object"
+  set_base_from "$object"
+  if test "$libtool" = yes; then
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir.libs/$base.d
+    "$@" -Wc,+Maked
+  else
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir$base.d
+    "$@" +Maked
+  fi
+  stat=$?
+  if test $stat -ne 0; then
+     rm -f "$tmpdepfile1" "$tmpdepfile2"
+     exit $stat
+  fi
+
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  if test -f "$tmpdepfile"; then
+    sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile"
+    # Add 'dependent.h:' lines.
+    sed -ne '2,${
+               s/^ *//
+               s/ \\*$//
+               s/$/:/
+               p
+             }' "$tmpdepfile" >> "$depfile"
+  else
+    make_dummy_depfile
+  fi
+  rm -f "$tmpdepfile" "$tmpdepfile2"
+  ;;
+
+tru64)
+  # The Tru64 compiler uses -MD to generate dependencies as a side
+  # effect.  'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
+  # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
+  # dependencies in 'foo.d' instead, so we check for that too.
+  # Subdirectories are respected.
+  set_dir_from  "$object"
+  set_base_from "$object"
+
+  if test "$libtool" = yes; then
+    # Libtool generates 2 separate objects for the 2 libraries.  These
+    # two compilations output dependencies in $dir.libs/$base.o.d and
+    # in $dir$base.o.d.  We have to check for both files, because
+    # one of the two compilations can be disabled.  We should prefer
+    # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
+    # automatically cleaned when .libs/ is deleted, while ignoring
+    # the former would cause a distcleancheck panic.
+    tmpdepfile1=$dir$base.o.d          # libtool 1.5
+    tmpdepfile2=$dir.libs/$base.o.d    # Likewise.
+    tmpdepfile3=$dir.libs/$base.d      # Compaq CCC V6.2-504
+    "$@" -Wc,-MD
+  else
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir$base.d
+    tmpdepfile3=$dir$base.d
+    "$@" -MD
+  fi
+
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+    exit $stat
+  fi
+
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  # Same post-processing that is required for AIX mode.
+  aix_post_process_depfile
+  ;;
+
+msvc7)
+  if test "$libtool" = yes; then
+    showIncludes=-Wc,-showIncludes
+  else
+    showIncludes=-showIncludes
+  fi
+  "$@" $showIncludes > "$tmpdepfile"
+  stat=$?
+  grep -v '^Note: including file: ' "$tmpdepfile"
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  # The first sed program below extracts the file names and escapes
+  # backslashes for cygpath.  The second sed program outputs the file
+  # name when reading, but also accumulates all include files in the
+  # hold buffer in order to output them again at the end.  This only
+  # works with sed implementations that can handle large buffers.
+  sed < "$tmpdepfile" -n '
+/^Note: including file:  *\(.*\)/ {
+  s//\1/
+  s/\\/\\\\/g
+  p
+}' | $cygpath_u | sort -u | sed -n '
+s/ /\\ /g
+s/\(.*\)/'"$tab"'\1 \\/p
+s/.\(.*\) \\/\1:/
+H
+$ {
+  s/.*/'"$tab"'/
+  G
+  p
+}' >> "$depfile"
+  echo >> "$depfile" # make sure the fragment doesn't end with a backslash
+  rm -f "$tmpdepfile"
+  ;;
+
+msvc7msys)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
+#nosideeffect)
+  # This comment above is used by automake to tell side-effect
+  # dependency tracking mechanisms from slower ones.
+
+dashmstdout)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout, regardless of -o.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  # Remove '-o $object'.
+  IFS=" "
+  for arg
+  do
+    case $arg in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    *)
+      set fnord "$@" "$arg"
+      shift # fnord
+      shift # $arg
+      ;;
+    esac
+  done
+
+  test -z "$dashmflag" && dashmflag=-M
+  # Require at least two characters before searching for ':'
+  # in the target name.  This is to cope with DOS-style filenames:
+  # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise.
+  "$@" $dashmflag |
+    sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile"
+  rm -f "$depfile"
+  cat < "$tmpdepfile" > "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process this sed invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  tr ' ' "$nl" < "$tmpdepfile" \
+    | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
+    | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+dashXmstdout)
+  # This case only exists to satisfy depend.m4.  It is never actually
+  # run, as this mode is specially recognized in the preamble.
+  exit 1
+  ;;
+
+makedepend)
+  "$@" || exit $?
+  # Remove any Libtool call
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+  # X makedepend
+  shift
+  cleared=no eat=no
+  for arg
+  do
+    case $cleared in
+    no)
+      set ""; shift
+      cleared=yes ;;
+    esac
+    if test $eat = yes; then
+      eat=no
+      continue
+    fi
+    case "$arg" in
+    -D*|-I*)
+      set fnord "$@" "$arg"; shift ;;
+    # Strip any option that makedepend may not understand.  Remove
+    # the object too, otherwise makedepend will parse it as a source file.
+    -arch)
+      eat=yes ;;
+    -*|$object)
+      ;;
+    *)
+      set fnord "$@" "$arg"; shift ;;
+    esac
+  done
+  obj_suffix=`echo "$object" | sed 's/^.*\././'`
+  touch "$tmpdepfile"
+  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
+  rm -f "$depfile"
+  # makedepend may prepend the VPATH from the source file name to the object.
+  # No need to regex-escape $object, excess matching of '.' is harmless.
+  sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process the last invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  sed '1,2d' "$tmpdepfile" \
+    | tr ' ' "$nl" \
+    | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
+    | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile" "$tmpdepfile".bak
+  ;;
+
+cpp)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  # Remove '-o $object'.
+  IFS=" "
+  for arg
+  do
+    case $arg in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    *)
+      set fnord "$@" "$arg"
+      shift # fnord
+      shift # $arg
+      ;;
+    esac
+  done
+
+  "$@" -E \
+    | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+             -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+    | sed '$ s: \\$::' > "$tmpdepfile"
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  cat < "$tmpdepfile" >> "$depfile"
+  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+msvisualcpp)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  IFS=" "
+  for arg
+  do
+    case "$arg" in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
+        set fnord "$@"
+        shift
+        shift
+        ;;
+    *)
+        set fnord "$@" "$arg"
+        shift
+        shift
+        ;;
+    esac
+  done
+  "$@" -E 2>/dev/null |
+  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile"
+  echo "$tab" >> "$depfile"
+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+msvcmsys)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
+none)
+  exec "$@"
+  ;;
+
+*)
+  echo "Unknown depmode $depmode" 1>&2
+  exit 1
+  ;;
+esac
+
+exit 0
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/config/distscript.sh b/config/distscript.sh
new file mode 100755
index 0000000..fbb37a7
--- /dev/null
+++ b/config/distscript.sh
@@ -0,0 +1,56 @@
+#!/bin/sh
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2009-2015 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2015      Research Organization for Information Science
+#                         and Technology (RIST). All rights reserved.
+# Copyright (c) 2015      Los Alamos National Security, LLC. All rights
+#                         reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+srcdir=$1
+builddir=$PWD
+distdir=$builddir/$2
+PMIX_REPO_REV=$3
+
+if test x"$2" = x ; then
+    echo "*** ERROR: Must supply relative distdir as argv[2] -- aborting"
+    exit 1
+elif test ! -d "$distdir" ; then
+    echo "*** ERROR: dist dir does not exist"
+    echo "*** ERROR:   $distdir"
+    exit 1
+fi
+
+# We can catch some hard (but possible) to do mistakes by looking at
+# our repo's revision, but only if we are in the source tree.
+# Otherwise, use what configure told us, at the cost of allowing one
+# or two corner cases in (but otherwise VPATH builds won't work).
+repo_rev=$PMIX_REPO_REV
+if test -d .git ; then
+    repo_rev=$(config/pmix_get_version.sh VERSION --repo-rev)
+fi
+
+#
+# Update VERSION:repo_rev with the best value we have.
+#
+perl -pi -e 's/^repo_rev=.*/repo_rev='$repo_rev'/' -- "${distdir}/VERSION"
+# need to reset the timestamp to not annoy AM dependencies
+touch -r "${srcdir}/VERSION" "${distdir}/VERSION"
+
+echo "*** Updated VERSION file with repo rev: $repo_rev"
+echo "*** (via dist-hook / config/distscript.sh)"
diff --git a/config/install-sh b/config/install-sh
new file mode 100755
index 0000000..0b0fdcb
--- /dev/null
+++ b/config/install-sh
@@ -0,0 +1,501 @@
+#!/bin/sh
+# install - install a program, script, or datafile
+
+scriptversion=2013-12-25.23; # UTC
+
+# This originates from X11R5 (mit/util/scripts/install.sh), which was
+# later released in X11R6 (xc/config/util/install.sh) with the
+# following copyright and license.
+#
+# Copyright (C) 1994 X Consortium
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+# Except as contained in this notice, the name of the X Consortium shall not
+# be used in advertising or otherwise to promote the sale, use or other deal-
+# ings in this Software without prior written authorization from the X Consor-
+# tium.
+#
+#
+# FSF changes to this file are in the public domain.
+#
+# Calling this script install-sh is preferred over install.sh, to prevent
+# 'make' implicit rules from creating a file called install from it
+# when there is no Makefile.
+#
+# This script is compatible with the BSD install script, but was written
+# from scratch.
+
+tab='	'
+nl='
+'
+IFS=" $tab$nl"
+
+# Set DOITPROG to "echo" to test this script.
+
+doit=${DOITPROG-}
+doit_exec=${doit:-exec}
+
+# Put in absolute file names if you don't have them in your path;
+# or use environment vars.
+
+chgrpprog=${CHGRPPROG-chgrp}
+chmodprog=${CHMODPROG-chmod}
+chownprog=${CHOWNPROG-chown}
+cmpprog=${CMPPROG-cmp}
+cpprog=${CPPROG-cp}
+mkdirprog=${MKDIRPROG-mkdir}
+mvprog=${MVPROG-mv}
+rmprog=${RMPROG-rm}
+stripprog=${STRIPPROG-strip}
+
+posix_mkdir=
+
+# Desired mode of installed file.
+mode=0755
+
+chgrpcmd=
+chmodcmd=$chmodprog
+chowncmd=
+mvcmd=$mvprog
+rmcmd="$rmprog -f"
+stripcmd=
+
+src=
+dst=
+dir_arg=
+dst_arg=
+
+copy_on_change=false
+is_target_a_directory=possibly
+
+usage="\
+Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+   or: $0 [OPTION]... SRCFILES... DIRECTORY
+   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
+   or: $0 [OPTION]... -d DIRECTORIES...
+
+In the 1st form, copy SRCFILE to DSTFILE.
+In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
+In the 4th, create DIRECTORIES.
+
+Options:
+     --help     display this help and exit.
+     --version  display version info and exit.
+
+  -c            (ignored)
+  -C            install only if different (preserve the last data modification time)
+  -d            create directories instead of installing files.
+  -g GROUP      $chgrpprog installed files to GROUP.
+  -m MODE       $chmodprog installed files to MODE.
+  -o USER       $chownprog installed files to USER.
+  -s            $stripprog installed files.
+  -t DIRECTORY  install into DIRECTORY.
+  -T            report an error if DSTFILE is a directory.
+
+Environment variables override the default commands:
+  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
+  RMPROG STRIPPROG
+"
+
+while test $# -ne 0; do
+  case $1 in
+    -c) ;;
+
+    -C) copy_on_change=true;;
+
+    -d) dir_arg=true;;
+
+    -g) chgrpcmd="$chgrpprog $2"
+        shift;;
+
+    --help) echo "$usage"; exit $?;;
+
+    -m) mode=$2
+        case $mode in
+          *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*)
+            echo "$0: invalid mode: $mode" >&2
+            exit 1;;
+        esac
+        shift;;
+
+    -o) chowncmd="$chownprog $2"
+        shift;;
+
+    -s) stripcmd=$stripprog;;
+
+    -t)
+        is_target_a_directory=always
+        dst_arg=$2
+        # Protect names problematic for 'test' and other utilities.
+        case $dst_arg in
+          -* | [=\(\)!]) dst_arg=./$dst_arg;;
+        esac
+        shift;;
+
+    -T) is_target_a_directory=never;;
+
+    --version) echo "$0 $scriptversion"; exit $?;;
+
+    --) shift
+        break;;
+
+    -*) echo "$0: invalid option: $1" >&2
+        exit 1;;
+
+    *)  break;;
+  esac
+  shift
+done
+
+# We allow the use of options -d and -T together, by making -d
+# take the precedence; this is for compatibility with GNU install.
+
+if test -n "$dir_arg"; then
+  if test -n "$dst_arg"; then
+    echo "$0: target directory not allowed when installing a directory." >&2
+    exit 1
+  fi
+fi
+
+if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
+  # When -d is used, all remaining arguments are directories to create.
+  # When -t is used, the destination is already specified.
+  # Otherwise, the last argument is the destination.  Remove it from $@.
+  for arg
+  do
+    if test -n "$dst_arg"; then
+      # $@ is not empty: it contains at least $arg.
+      set fnord "$@" "$dst_arg"
+      shift # fnord
+    fi
+    shift # arg
+    dst_arg=$arg
+    # Protect names problematic for 'test' and other utilities.
+    case $dst_arg in
+      -* | [=\(\)!]) dst_arg=./$dst_arg;;
+    esac
+  done
+fi
+
+if test $# -eq 0; then
+  if test -z "$dir_arg"; then
+    echo "$0: no input file specified." >&2
+    exit 1
+  fi
+  # It's OK to call 'install-sh -d' without argument.
+  # This can happen when creating conditional directories.
+  exit 0
+fi
+
+if test -z "$dir_arg"; then
+  if test $# -gt 1 || test "$is_target_a_directory" = always; then
+    if test ! -d "$dst_arg"; then
+      echo "$0: $dst_arg: Is not a directory." >&2
+      exit 1
+    fi
+  fi
+fi
+
+if test -z "$dir_arg"; then
+  do_exit='(exit $ret); exit $ret'
+  trap "ret=129; $do_exit" 1
+  trap "ret=130; $do_exit" 2
+  trap "ret=141; $do_exit" 13
+  trap "ret=143; $do_exit" 15
+
+  # Set umask so as not to create temps with too-generous modes.
+  # However, 'strip' requires both read and write access to temps.
+  case $mode in
+    # Optimize common cases.
+    *644) cp_umask=133;;
+    *755) cp_umask=22;;
+
+    *[0-7])
+      if test -z "$stripcmd"; then
+        u_plus_rw=
+      else
+        u_plus_rw='% 200'
+      fi
+      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
+    *)
+      if test -z "$stripcmd"; then
+        u_plus_rw=
+      else
+        u_plus_rw=,u+rw
+      fi
+      cp_umask=$mode$u_plus_rw;;
+  esac
+fi
+
+for src
+do
+  # Protect names problematic for 'test' and other utilities.
+  case $src in
+    -* | [=\(\)!]) src=./$src;;
+  esac
+
+  if test -n "$dir_arg"; then
+    dst=$src
+    dstdir=$dst
+    test -d "$dstdir"
+    dstdir_status=$?
+  else
+
+    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
+    # might cause directories to be created, which would be especially bad
+    # if $src (and thus $dsttmp) contains '*'.
+    if test ! -f "$src" && test ! -d "$src"; then
+      echo "$0: $src does not exist." >&2
+      exit 1
+    fi
+
+    if test -z "$dst_arg"; then
+      echo "$0: no destination specified." >&2
+      exit 1
+    fi
+    dst=$dst_arg
+
+    # If destination is a directory, append the input filename; won't work
+    # if double slashes aren't ignored.
+    if test -d "$dst"; then
+      if test "$is_target_a_directory" = never; then
+        echo "$0: $dst_arg: Is a directory" >&2
+        exit 1
+      fi
+      dstdir=$dst
+      dst=$dstdir/`basename "$src"`
+      dstdir_status=0
+    else
+      dstdir=`dirname "$dst"`
+      test -d "$dstdir"
+      dstdir_status=$?
+    fi
+  fi
+
+  obsolete_mkdir_used=false
+
+  if test $dstdir_status != 0; then
+    case $posix_mkdir in
+      '')
+        # Create intermediate dirs using mode 755 as modified by the umask.
+        # This is like FreeBSD 'install' as of 1997-10-28.
+        umask=`umask`
+        case $stripcmd.$umask in
+          # Optimize common cases.
+          *[2367][2367]) mkdir_umask=$umask;;
+          .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
+
+          *[0-7])
+            mkdir_umask=`expr $umask + 22 \
+              - $umask % 100 % 40 + $umask % 20 \
+              - $umask % 10 % 4 + $umask % 2
+            `;;
+          *) mkdir_umask=$umask,go-w;;
+        esac
+
+        # With -d, create the new directory with the user-specified mode.
+        # Otherwise, rely on $mkdir_umask.
+        if test -n "$dir_arg"; then
+          mkdir_mode=-m$mode
+        else
+          mkdir_mode=
+        fi
+
+        posix_mkdir=false
+        case $umask in
+          *[123567][0-7][0-7])
+            # POSIX mkdir -p sets u+wx bits regardless of umask, which
+            # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
+            ;;
+          *)
+            tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+            trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
+
+            if (umask $mkdir_umask &&
+                exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
+            then
+              if test -z "$dir_arg" || {
+                   # Check for POSIX incompatibilities with -m.
+                   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+                   # other-writable bit of parent directory when it shouldn't.
+                   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+                   ls_ld_tmpdir=`ls -ld "$tmpdir"`
+                   case $ls_ld_tmpdir in
+                     d????-?r-*) different_mode=700;;
+                     d????-?--*) different_mode=755;;
+                     *) false;;
+                   esac &&
+                   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
+                     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
+                     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+                   }
+                 }
+              then posix_mkdir=:
+              fi
+              rmdir "$tmpdir/d" "$tmpdir"
+            else
+              # Remove any dirs left behind by ancient mkdir implementations.
+              rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
+            fi
+            trap '' 0;;
+        esac;;
+    esac
+
+    if
+      $posix_mkdir && (
+        umask $mkdir_umask &&
+        $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
+      )
+    then :
+    else
+
+      # The umask is ridiculous, or mkdir does not conform to POSIX,
+      # or it failed possibly due to a race condition.  Create the
+      # directory the slow way, step by step, checking for races as we go.
+
+      case $dstdir in
+        /*) prefix='/';;
+        [-=\(\)!]*) prefix='./';;
+        *)  prefix='';;
+      esac
+
+      oIFS=$IFS
+      IFS=/
+      set -f
+      set fnord $dstdir
+      shift
+      set +f
+      IFS=$oIFS
+
+      prefixes=
+
+      for d
+      do
+        test X"$d" = X && continue
+
+        prefix=$prefix$d
+        if test -d "$prefix"; then
+          prefixes=
+        else
+          if $posix_mkdir; then
+            (umask=$mkdir_umask &&
+             $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+            # Don't fail if two instances are running concurrently.
+            test -d "$prefix" || exit 1
+          else
+            case $prefix in
+              *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
+              *) qprefix=$prefix;;
+            esac
+            prefixes="$prefixes '$qprefix'"
+          fi
+        fi
+        prefix=$prefix/
+      done
+
+      if test -n "$prefixes"; then
+        # Don't fail if two instances are running concurrently.
+        (umask $mkdir_umask &&
+         eval "\$doit_exec \$mkdirprog $prefixes") ||
+          test -d "$dstdir" || exit 1
+        obsolete_mkdir_used=true
+      fi
+    fi
+  fi
+
+  if test -n "$dir_arg"; then
+    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
+    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
+      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
+  else
+
+    # Make a couple of temp file names in the proper directory.
+    dsttmp=$dstdir/_inst.$$_
+    rmtmp=$dstdir/_rm.$$_
+
+    # Trap to clean up those temp files at exit.
+    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
+
+    # Copy the file name to the temp name.
+    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
+
+    # and set any options; do chmod last to preserve setuid bits.
+    #
+    # If any of these fail, we abort the whole thing.  If we want to
+    # ignore errors from any of these, just make sure not to ignore
+    # errors from the above "$doit $cpprog $src $dsttmp" command.
+    #
+    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
+    { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
+    { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
+
+    # If -C, don't bother to copy if it wouldn't change the file.
+    if $copy_on_change &&
+       old=`LC_ALL=C ls -dlL "$dst"     2>/dev/null` &&
+       new=`LC_ALL=C ls -dlL "$dsttmp"  2>/dev/null` &&
+       set -f &&
+       set X $old && old=:$2:$4:$5:$6 &&
+       set X $new && new=:$2:$4:$5:$6 &&
+       set +f &&
+       test "$old" = "$new" &&
+       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
+    then
+      rm -f "$dsttmp"
+    else
+      # Rename the file to the real destination.
+      $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
+
+      # The rename failed, perhaps because mv can't rename something else
+      # to itself, or perhaps because mv is so ancient that it does not
+      # support -f.
+      {
+        # Now remove or move aside any old file at destination location.
+        # We try this two ways since rm can't unlink itself on some
+        # systems and the destination file might be busy for other
+        # reasons.  In this case, the final cleanup might fail but the new
+        # file should still install successfully.
+        {
+          test ! -f "$dst" ||
+          $doit $rmcmd -f "$dst" 2>/dev/null ||
+          { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+            { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
+          } ||
+          { echo "$0: cannot unlink or rename $dst" >&2
+            (exit 1); exit 1
+          }
+        } &&
+
+        # Now rename the file to the real destination.
+        $doit $mvcmd "$dsttmp" "$dst"
+      }
+    fi || exit 1
+
+    trap '' 0
+  fi
+done
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/config/libtool.m4 b/config/libtool.m4
new file mode 100644
index 0000000..a3bc337
--- /dev/null
+++ b/config/libtool.m4
@@ -0,0 +1,8369 @@
+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+#
+#   Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc.
+#   Written by Gordon Matzigkeit, 1996
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+m4_define([_LT_COPYING], [dnl
+# Copyright (C) 2014 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions.  There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# GNU Libtool is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of of the License, or
+# (at your option) any later version.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program or library that is built
+# using GNU Libtool, you may include this file under the  same
+# distribution terms that you use for the rest of that program.
+#
+# GNU Libtool is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+])
+
+# serial 58 LT_INIT
+
+
+# LT_PREREQ(VERSION)
+# ------------------
+# Complain and exit if this libtool version is less that VERSION.
+m4_defun([LT_PREREQ],
+[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1,
+       [m4_default([$3],
+		   [m4_fatal([Libtool version $1 or higher is required],
+		             63)])],
+       [$2])])
+
+
+# _LT_CHECK_BUILDDIR
+# ------------------
+# Complain if the absolute build directory name contains unusual characters
+m4_defun([_LT_CHECK_BUILDDIR],
+[case `pwd` in
+  *\ * | *\	*)
+    AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;;
+esac
+])
+
+
+# LT_INIT([OPTIONS])
+# ------------------
+AC_DEFUN([LT_INIT],
+[AC_PREREQ([2.62])dnl We use AC_PATH_PROGS_FEATURE_CHECK
+AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+AC_BEFORE([$0], [LT_LANG])dnl
+AC_BEFORE([$0], [LT_OUTPUT])dnl
+AC_BEFORE([$0], [LTDL_INIT])dnl
+m4_require([_LT_CHECK_BUILDDIR])dnl
+
+dnl Autoconf doesn't catch unexpanded LT_ macros by default:
+m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl
+m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl
+dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4
+dnl unless we require an AC_DEFUNed macro:
+AC_REQUIRE([LTOPTIONS_VERSION])dnl
+AC_REQUIRE([LTSUGAR_VERSION])dnl
+AC_REQUIRE([LTVERSION_VERSION])dnl
+AC_REQUIRE([LTOBSOLETE_VERSION])dnl
+m4_require([_LT_PROG_LTMAIN])dnl
+
+_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
+
+dnl Parse OPTIONS
+_LT_SET_OPTIONS([$0], [$1])
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS=$ltmain
+
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+AC_SUBST(LIBTOOL)dnl
+
+_LT_SETUP
+
+# Only expand once:
+m4_define([LT_INIT])
+])# LT_INIT
+
+# Old names:
+AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT])
+AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
+dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
+
+
+# _LT_PREPARE_CC_BASENAME
+# -----------------------
+m4_defun([_LT_PREPARE_CC_BASENAME], [
+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+func_cc_basename ()
+{
+    for cc_temp in @S|@*""; do
+      case $cc_temp in
+        compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
+        distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
+        \-*) ;;
+        *) break;;
+      esac
+    done
+    func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+}
+])# _LT_PREPARE_CC_BASENAME
+
+
+# _LT_CC_BASENAME(CC)
+# -------------------
+# It would be clearer to call AC_REQUIREs from _LT_PREPARE_CC_BASENAME,
+# but that macro is also expanded into generated libtool script, which
+# arranges for $SED and $ECHO to be set by different means.
+m4_defun([_LT_CC_BASENAME],
+[m4_require([_LT_PREPARE_CC_BASENAME])dnl
+AC_REQUIRE([_LT_DECL_SED])dnl
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
+func_cc_basename $1
+cc_basename=$func_cc_basename_result
+])
+
+
+# _LT_FILEUTILS_DEFAULTS
+# ----------------------
+# It is okay to use these file commands and assume they have been set
+# sensibly after 'm4_require([_LT_FILEUTILS_DEFAULTS])'.
+m4_defun([_LT_FILEUTILS_DEFAULTS],
+[: ${CP="cp -f"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
+])# _LT_FILEUTILS_DEFAULTS
+
+
+# _LT_SETUP
+# ---------
+m4_defun([_LT_SETUP],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
+
+_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl
+dnl
+_LT_DECL([], [host_alias], [0], [The host system])dnl
+_LT_DECL([], [host], [0])dnl
+_LT_DECL([], [host_os], [0])dnl
+dnl
+_LT_DECL([], [build_alias], [0], [The build system])dnl
+_LT_DECL([], [build], [0])dnl
+_LT_DECL([], [build_os], [0])dnl
+dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([LT_PATH_LD])dnl
+AC_REQUIRE([LT_PATH_NM])dnl
+dnl
+AC_REQUIRE([AC_PROG_LN_S])dnl
+test -z "$LN_S" && LN_S="ln -s"
+_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl
+dnl
+AC_REQUIRE([LT_CMD_MAX_LEN])dnl
+_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl
+_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
+dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_CHECK_SHELL_FEATURES])dnl
+m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
+m4_require([_LT_CMD_RELOAD])dnl
+m4_require([_LT_CHECK_MAGIC_METHOD])dnl
+m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
+m4_require([_LT_CMD_OLD_ARCHIVE])dnl
+m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
+m4_require([_LT_WITH_SYSROOT])dnl
+m4_require([_LT_CMD_TRUNCATE])dnl
+
+_LT_CONFIG_LIBTOOL_INIT([
+# See if we are running on zsh, and set the options that allow our
+# commands through without removal of \ escapes INIT.
+if test -n "\${ZSH_VERSION+set}"; then
+   setopt NO_GLOB_SUBST
+fi
+])
+if test -n "${ZSH_VERSION+set}"; then
+   setopt NO_GLOB_SUBST
+fi
+
+_LT_CHECK_OBJDIR
+
+m4_require([_LT_TAG_COMPILER])dnl
+
+case $host_os in
+aix3*)
+  # AIX sometimes has problems with the GCC collect2 program.  For some
+  # reason, if we set the COLLECT_NAMES environment variable, the problems
+  # vanish in a puff of smoke.
+  if test set != "${COLLECT_NAMES+set}"; then
+    COLLECT_NAMES=
+    export COLLECT_NAMES
+  fi
+  ;;
+esac
+
+# Global variables:
+ofile=libtool
+can_build_shared=yes
+
+# All known linkers require a '.a' archive for static linking (except MSVC,
+# which needs '.lib').
+libext=a
+
+with_gnu_ld=$lt_cv_prog_gnu_ld
+
+old_CC=$CC
+old_CFLAGS=$CFLAGS
+
+# Set sane defaults for various variables
+test -z "$CC" && CC=cc
+test -z "$LTCC" && LTCC=$CC
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+test -z "$LD" && LD=ld
+test -z "$ac_objext" && ac_objext=o
+
+_LT_CC_BASENAME([$compiler])
+
+# Only perform the check for file, if the check method requires it
+test -z "$MAGIC_CMD" && MAGIC_CMD=file
+case $deplibs_check_method in
+file_magic*)
+  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+    _LT_PATH_MAGIC
+  fi
+  ;;
+esac
+
+# Use C for the default configuration in the libtool script
+LT_SUPPORTED_TAG([CC])
+_LT_LANG_C_CONFIG
+_LT_LANG_DEFAULT_CONFIG
+_LT_CONFIG_COMMANDS
+])# _LT_SETUP
+
+
+# _LT_PREPARE_SED_QUOTE_VARS
+# --------------------------
+# Define a few sed substitution that help us do robust quoting.
+m4_defun([_LT_PREPARE_SED_QUOTE_VARS],
+[# Backslashify metacharacters that are still active within
+# double-quoted strings.
+sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\([["`\\]]\)/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+])
+
+# _LT_PROG_LTMAIN
+# ---------------
+# Note that this code is called both from 'configure', and 'config.status'
+# now that we use AC_CONFIG_COMMANDS to generate libtool.  Notably,
+# 'config.status' has no value for ac_aux_dir unless we are using Automake,
+# so we pass a copy along to make sure it has a sensible value anyway.
+m4_defun([_LT_PROG_LTMAIN],
+[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
+_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
+ltmain=$ac_aux_dir/ltmain.sh
+])# _LT_PROG_LTMAIN
+
+
+## ------------------------------------- ##
+## Accumulate code for creating libtool. ##
+## ------------------------------------- ##
+
+# So that we can recreate a full libtool script including additional
+# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
+# in macros and then make a single call at the end using the 'libtool'
+# label.
+
+
+# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS])
+# ----------------------------------------
+# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later.
+m4_define([_LT_CONFIG_LIBTOOL_INIT],
+[m4_ifval([$1],
+          [m4_append([_LT_OUTPUT_LIBTOOL_INIT],
+                     [$1
+])])])
+
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_INIT])
+
+
+# _LT_CONFIG_LIBTOOL([COMMANDS])
+# ------------------------------
+# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later.
+m4_define([_LT_CONFIG_LIBTOOL],
+[m4_ifval([$1],
+          [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS],
+                     [$1
+])])])
+
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS])
+
+
+# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS])
+# -----------------------------------------------------
+m4_defun([_LT_CONFIG_SAVE_COMMANDS],
+[_LT_CONFIG_LIBTOOL([$1])
+_LT_CONFIG_LIBTOOL_INIT([$2])
+])
+
+
+# _LT_FORMAT_COMMENT([COMMENT])
+# -----------------------------
+# Add leading comment marks to the start of each line, and a trailing
+# full-stop to the whole comment if one is not present already.
+m4_define([_LT_FORMAT_COMMENT],
+[m4_ifval([$1], [
+m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])],
+              [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.])
+)])
+
+
+
+## ------------------------ ##
+## FIXME: Eliminate VARNAME ##
+## ------------------------ ##
+
+
+# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?])
+# -------------------------------------------------------------------
+# CONFIGNAME is the name given to the value in the libtool script.
+# VARNAME is the (base) name used in the configure script.
+# VALUE may be 0, 1 or 2 for a computed quote escaped value based on
+# VARNAME.  Any other value will be used directly.
+m4_define([_LT_DECL],
+[lt_if_append_uniq([lt_decl_varnames], [$2], [, ],
+    [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name],
+	[m4_ifval([$1], [$1], [$2])])
+    lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3])
+    m4_ifval([$4],
+	[lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])])
+    lt_dict_add_subkey([lt_decl_dict], [$2],
+	[tagged?], [m4_ifval([$5], [yes], [no])])])
+])
+
+
+# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION])
+# --------------------------------------------------------
+m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])])
+
+
+# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...])
+# ------------------------------------------------
+m4_define([lt_decl_tag_varnames],
+[_lt_decl_filter([tagged?], [yes], $@)])
+
+
+# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..])
+# ---------------------------------------------------------
+m4_define([_lt_decl_filter],
+[m4_case([$#],
+  [0], [m4_fatal([$0: too few arguments: $#])],
+  [1], [m4_fatal([$0: too few arguments: $#: $1])],
+  [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)],
+  [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)],
+  [lt_dict_filter([lt_decl_dict], $@)])[]dnl
+])
+
+
+# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...])
+# --------------------------------------------------
+m4_define([lt_decl_quote_varnames],
+[_lt_decl_filter([value], [1], $@)])
+
+
+# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...])
+# ---------------------------------------------------
+m4_define([lt_decl_dquote_varnames],
+[_lt_decl_filter([value], [2], $@)])
+
+
+# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
+# ---------------------------------------------------
+m4_define([lt_decl_varnames_tagged],
+[m4_assert([$# <= 2])dnl
+_$0(m4_quote(m4_default([$1], [[, ]])),
+    m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]),
+    m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))])
+m4_define([_lt_decl_varnames_tagged],
+[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])])
+
+
+# lt_decl_all_varnames([SEPARATOR], [VARNAME1...])
+# ------------------------------------------------
+m4_define([lt_decl_all_varnames],
+[_$0(m4_quote(m4_default([$1], [[, ]])),
+     m4_if([$2], [],
+	   m4_quote(lt_decl_varnames),
+	m4_quote(m4_shift($@))))[]dnl
+])
+m4_define([_lt_decl_all_varnames],
+[lt_join($@, lt_decl_varnames_tagged([$1],
+			lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl
+])
+
+
+# _LT_CONFIG_STATUS_DECLARE([VARNAME])
+# ------------------------------------
+# Quote a variable value, and forward it to 'config.status' so that its
+# declaration there will have the same value as in 'configure'.  VARNAME
+# must have a single quote delimited value for this to work.
+m4_define([_LT_CONFIG_STATUS_DECLARE],
+[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
+
+
+# _LT_CONFIG_STATUS_DECLARATIONS
+# ------------------------------
+# We delimit libtool config variables with single quotes, so when
+# we write them to config.status, we have to be sure to quote all
+# embedded single quotes properly.  In configure, this macro expands
+# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
+#
+#    <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`'
+m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
+[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
+    [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
+
+
+# _LT_LIBTOOL_TAGS
+# ----------------
+# Output comment and list of tags supported by the script
+m4_defun([_LT_LIBTOOL_TAGS],
+[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
+available_tags='_LT_TAGS'dnl
+])
+
+
+# _LT_LIBTOOL_DECLARE(VARNAME, [TAG])
+# -----------------------------------
+# Extract the dictionary values for VARNAME (optionally with TAG) and
+# expand to a commented shell variable setting:
+#
+#    # Some comment about what VAR is for.
+#    visible_name=$lt_internal_name
+m4_define([_LT_LIBTOOL_DECLARE],
+[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1],
+					   [description])))[]dnl
+m4_pushdef([_libtool_name],
+    m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl
+m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])),
+    [0], [_libtool_name=[$]$1],
+    [1], [_libtool_name=$lt_[]$1],
+    [2], [_libtool_name=$lt_[]$1],
+    [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl
+m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl
+])
+
+
+# _LT_LIBTOOL_CONFIG_VARS
+# -----------------------
+# Produce commented declarations of non-tagged libtool config variables
+# suitable for insertion in the LIBTOOL CONFIG section of the 'libtool'
+# script.  Tagged libtool config variables (even for the LIBTOOL CONFIG
+# section) are produced by _LT_LIBTOOL_TAG_VARS.
+m4_defun([_LT_LIBTOOL_CONFIG_VARS],
+[m4_foreach([_lt_var],
+    m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)),
+    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])])
+
+
+# _LT_LIBTOOL_TAG_VARS(TAG)
+# -------------------------
+m4_define([_LT_LIBTOOL_TAG_VARS],
+[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames),
+    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])])
+
+
+# _LT_TAGVAR(VARNAME, [TAGNAME])
+# ------------------------------
+m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
+
+
+# _LT_CONFIG_COMMANDS
+# -------------------
+# Send accumulated output to $CONFIG_STATUS.  Thanks to the lists of
+# variables for single and double quote escaping we saved from calls
+# to _LT_DECL, we can put quote escaped variables declarations
+# into 'config.status', and then the shell code to quote escape them in
+# for loops in 'config.status'.  Finally, any additional code accumulated
+# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
+m4_defun([_LT_CONFIG_COMMANDS],
+[AC_PROVIDE_IFELSE([LT_OUTPUT],
+	dnl If the libtool generation code has been placed in $CONFIG_LT,
+	dnl instead of duplicating it all over again into config.status,
+	dnl then we will have config.status run $CONFIG_LT later, so it
+	dnl needs to know what name is stored there:
+        [AC_CONFIG_COMMANDS([libtool],
+            [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])],
+    dnl If the libtool generation code is destined for config.status,
+    dnl expand the accumulated commands and init code now:
+    [AC_CONFIG_COMMANDS([libtool],
+        [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])])
+])#_LT_CONFIG_COMMANDS
+
+
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT],
+[
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+sed_quote_subst='$sed_quote_subst'
+double_quote_subst='$double_quote_subst'
+delay_variable_subst='$delay_variable_subst'
+_LT_CONFIG_STATUS_DECLARATIONS
+LTCC='$LTCC'
+LTCFLAGS='$LTCFLAGS'
+compiler='$compiler_DEFAULT'
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+\$[]1
+_LTECHO_EOF'
+}
+
+# Quote evaled strings.
+for var in lt_decl_all_varnames([[ \
+]], lt_decl_quote_varnames); do
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+    *[[\\\\\\\`\\"\\\$]]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+# Double-quote double-evaled strings.
+for var in lt_decl_all_varnames([[ \
+]], lt_decl_dquote_varnames); do
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+    *[[\\\\\\\`\\"\\\$]]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+_LT_OUTPUT_LIBTOOL_INIT
+])
+
+# _LT_GENERATED_FILE_INIT(FILE, [COMMENT])
+# ------------------------------------
+# Generate a child script FILE with all initialization necessary to
+# reuse the environment learned by the parent script, and make the
+# file executable.  If COMMENT is supplied, it is inserted after the
+# '#!' sequence but before initialization text begins.  After this
+# macro, additional text can be appended to FILE to form the body of
+# the child script.  The macro ends with non-zero status if the
+# file could not be fully written (such as if the disk is full).
+m4_ifdef([AS_INIT_GENERATED],
+[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])],
+[m4_defun([_LT_GENERATED_FILE_INIT],
+[m4_require([AS_PREPARE])]dnl
+[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl
+[lt_write_fail=0
+cat >$1 <<_ASEOF || lt_write_fail=1
+#! $SHELL
+# Generated by $as_me.
+$2
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$1 <<\_ASEOF || lt_write_fail=1
+AS_SHELL_SANITIZE
+_AS_PREPARE
+exec AS_MESSAGE_FD>&1
+_ASEOF
+test 0 = "$lt_write_fail" && chmod +x $1[]dnl
+m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
+
+# LT_OUTPUT
+# ---------
+# This macro allows early generation of the libtool script (before
+# AC_OUTPUT is called), incase it is used in configure for compilation
+# tests.
+AC_DEFUN([LT_OUTPUT],
+[: ${CONFIG_LT=./config.lt}
+AC_MSG_NOTICE([creating $CONFIG_LT])
+_LT_GENERATED_FILE_INIT(["$CONFIG_LT"],
+[# Run this file to recreate a libtool stub with the current configuration.])
+
+cat >>"$CONFIG_LT" <<\_LTEOF
+lt_cl_silent=false
+exec AS_MESSAGE_LOG_FD>>config.log
+{
+  echo
+  AS_BOX([Running $as_me.])
+} >&AS_MESSAGE_LOG_FD
+
+lt_cl_help="\
+'$as_me' creates a local libtool stub from the current configuration,
+for use in further configure time tests before the real libtool is
+generated.
+
+Usage: $[0] [[OPTIONS]]
+
+  -h, --help      print this help, then exit
+  -V, --version   print version number, then exit
+  -q, --quiet     do not print progress messages
+  -d, --debug     don't remove temporary files
+
+Report bugs to <bug-libtool at gnu.org>."
+
+lt_cl_version="\
+m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
+m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
+configured by $[0], generated by m4_PACKAGE_STRING.
+
+Copyright (C) 2011 Free Software Foundation, Inc.
+This config.lt script is free software; the Free Software Foundation
+gives unlimited permision to copy, distribute and modify it."
+
+while test 0 != $[#]
+do
+  case $[1] in
+    --version | --v* | -V )
+      echo "$lt_cl_version"; exit 0 ;;
+    --help | --h* | -h )
+      echo "$lt_cl_help"; exit 0 ;;
+    --debug | --d* | -d )
+      debug=: ;;
+    --quiet | --q* | --silent | --s* | -q )
+      lt_cl_silent=: ;;
+
+    -*) AC_MSG_ERROR([unrecognized option: $[1]
+Try '$[0] --help' for more information.]) ;;
+
+    *) AC_MSG_ERROR([unrecognized argument: $[1]
+Try '$[0] --help' for more information.]) ;;
+  esac
+  shift
+done
+
+if $lt_cl_silent; then
+  exec AS_MESSAGE_FD>/dev/null
+fi
+_LTEOF
+
+cat >>"$CONFIG_LT" <<_LTEOF
+_LT_OUTPUT_LIBTOOL_COMMANDS_INIT
+_LTEOF
+
+cat >>"$CONFIG_LT" <<\_LTEOF
+AC_MSG_NOTICE([creating $ofile])
+_LT_OUTPUT_LIBTOOL_COMMANDS
+AS_EXIT(0)
+_LTEOF
+chmod +x "$CONFIG_LT"
+
+# configure is writing to config.log, but config.lt does its own redirection,
+# appending to config.log, which fails on DOS, as config.log is still kept
+# open by configure.  Here we exec the FD to /dev/null, effectively closing
+# config.log, so it can be properly (re)opened and appended to by config.lt.
+lt_cl_success=:
+test yes = "$silent" &&
+  lt_config_lt_args="$lt_config_lt_args --quiet"
+exec AS_MESSAGE_LOG_FD>/dev/null
+$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
+exec AS_MESSAGE_LOG_FD>>config.log
+$lt_cl_success || AS_EXIT(1)
+])# LT_OUTPUT
+
+
+# _LT_CONFIG(TAG)
+# ---------------
+# If TAG is the built-in tag, create an initial libtool script with a
+# default configuration from the untagged config vars.  Otherwise add code
+# to config.status for appending the configuration named by TAG from the
+# matching tagged config vars.
+m4_defun([_LT_CONFIG],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+_LT_CONFIG_SAVE_COMMANDS([
+  m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl
+  m4_if(_LT_TAG, [C], [
+    # See if we are running on zsh, and set the options that allow our
+    # commands through without removal of \ escapes.
+    if test -n "${ZSH_VERSION+set}"; then
+      setopt NO_GLOB_SUBST
+    fi
+
+    cfgfile=${ofile}T
+    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
+    $RM "$cfgfile"
+
+    cat <<_LT_EOF >> "$cfgfile"
+#! $SHELL
+# Generated automatically by $as_me ($PACKAGE) $VERSION
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+
+# Provide generalized library-building support services.
+# Written by Gordon Matzigkeit, 1996
+
+_LT_COPYING
+_LT_LIBTOOL_TAGS
+
+# Configured defaults for sys_lib_dlsearch_path munging.
+: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"}
+
+# ### BEGIN LIBTOOL CONFIG
+_LT_LIBTOOL_CONFIG_VARS
+_LT_LIBTOOL_TAG_VARS
+# ### END LIBTOOL CONFIG
+
+_LT_EOF
+
+    cat <<'_LT_EOF' >> "$cfgfile"
+
+# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE
+
+_LT_PREPARE_MUNGE_PATH_LIST
+_LT_PREPARE_CC_BASENAME
+
+# ### END FUNCTIONS SHARED WITH CONFIGURE
+
+_LT_EOF
+
+  case $host_os in
+  aix3*)
+    cat <<\_LT_EOF >> "$cfgfile"
+# AIX sometimes has problems with the GCC collect2 program.  For some
+# reason, if we set the COLLECT_NAMES environment variable, the problems
+# vanish in a puff of smoke.
+if test set != "${COLLECT_NAMES+set}"; then
+  COLLECT_NAMES=
+  export COLLECT_NAMES
+fi
+_LT_EOF
+    ;;
+  esac
+
+  _LT_PROG_LTMAIN
+
+  # We use sed instead of cat because bash on DJGPP gets confused if
+  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
+  # text mode, it properly converts lines to CR/LF.  This bash problem
+  # is reportedly fixed, but why not run on old versions too?
+  sed '$q' "$ltmain" >> "$cfgfile" \
+     || (rm -f "$cfgfile"; exit 1)
+
+   mv -f "$cfgfile" "$ofile" ||
+    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+  chmod +x "$ofile"
+],
+[cat <<_LT_EOF >> "$ofile"
+
+dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded
+dnl in a comment (ie after a #).
+# ### BEGIN LIBTOOL TAG CONFIG: $1
+_LT_LIBTOOL_TAG_VARS(_LT_TAG)
+# ### END LIBTOOL TAG CONFIG: $1
+_LT_EOF
+])dnl /m4_if
+],
+[m4_if([$1], [], [
+    PACKAGE='$PACKAGE'
+    VERSION='$VERSION'
+    RM='$RM'
+    ofile='$ofile'], [])
+])dnl /_LT_CONFIG_SAVE_COMMANDS
+])# _LT_CONFIG
+
+
+# LT_SUPPORTED_TAG(TAG)
+# ---------------------
+# Trace this macro to discover what tags are supported by the libtool
+# --tag option, using:
+#    autoconf --trace 'LT_SUPPORTED_TAG:$1'
+AC_DEFUN([LT_SUPPORTED_TAG], [])
+
+
+# C support is built-in for now
+m4_define([_LT_LANG_C_enabled], [])
+m4_define([_LT_TAGS], [])
+
+
+# LT_LANG(LANG)
+# -------------
+# Enable libtool support for the given language if not already enabled.
+AC_DEFUN([LT_LANG],
+[AC_BEFORE([$0], [LT_OUTPUT])dnl
+m4_case([$1],
+  [C],			[_LT_LANG(C)],
+  [C++],		[_LT_LANG(CXX)],
+  [Go],			[_LT_LANG(GO)],
+  [Java],		[_LT_LANG(GCJ)],
+  [Fortran 77],		[_LT_LANG(F77)],
+  [Fortran],		[_LT_LANG(FC)],
+  [Windows Resource],	[_LT_LANG(RC)],
+  [m4_ifdef([_LT_LANG_]$1[_CONFIG],
+    [_LT_LANG($1)],
+    [m4_fatal([$0: unsupported language: "$1"])])])dnl
+])# LT_LANG
+
+
+# _LT_LANG(LANGNAME)
+# ------------------
+m4_defun([_LT_LANG],
+[m4_ifdef([_LT_LANG_]$1[_enabled], [],
+  [LT_SUPPORTED_TAG([$1])dnl
+  m4_append([_LT_TAGS], [$1 ])dnl
+  m4_define([_LT_LANG_]$1[_enabled], [])dnl
+  _LT_LANG_$1_CONFIG($1)])dnl
+])# _LT_LANG
+
+
+m4_ifndef([AC_PROG_GO], [
+############################################################
+# NOTE: This macro has been submitted for inclusion into   #
+#  GNU Autoconf as AC_PROG_GO.  When it is available in    #
+#  a released version of Autoconf we should remove this    #
+#  macro and use it instead.                               #
+############################################################
+m4_defun([AC_PROG_GO],
+[AC_LANG_PUSH(Go)dnl
+AC_ARG_VAR([GOC],     [Go compiler command])dnl
+AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl
+_AC_ARG_VAR_LDFLAGS()dnl
+AC_CHECK_TOOL(GOC, gccgo)
+if test -z "$GOC"; then
+  if test -n "$ac_tool_prefix"; then
+    AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo])
+  fi
+fi
+if test -z "$GOC"; then
+  AC_CHECK_PROG(GOC, gccgo, gccgo, false)
+fi
+])#m4_defun
+])#m4_ifndef
+
+
+# _LT_LANG_DEFAULT_CONFIG
+# -----------------------
+m4_defun([_LT_LANG_DEFAULT_CONFIG],
+[AC_PROVIDE_IFELSE([AC_PROG_CXX],
+  [LT_LANG(CXX)],
+  [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])])
+
+AC_PROVIDE_IFELSE([AC_PROG_F77],
+  [LT_LANG(F77)],
+  [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])])
+
+AC_PROVIDE_IFELSE([AC_PROG_FC],
+  [LT_LANG(FC)],
+  [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])])
+
+dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal
+dnl pulling things in needlessly.
+AC_PROVIDE_IFELSE([AC_PROG_GCJ],
+  [LT_LANG(GCJ)],
+  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
+    [LT_LANG(GCJ)],
+    [AC_PROVIDE_IFELSE([LT_PROG_GCJ],
+      [LT_LANG(GCJ)],
+      [m4_ifdef([AC_PROG_GCJ],
+	[m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])])
+       m4_ifdef([A][M_PROG_GCJ],
+	[m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])])
+       m4_ifdef([LT_PROG_GCJ],
+	[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
+
+AC_PROVIDE_IFELSE([AC_PROG_GO],
+  [LT_LANG(GO)],
+  [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])])
+
+AC_PROVIDE_IFELSE([LT_PROG_RC],
+  [LT_LANG(RC)],
+  [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
+])# _LT_LANG_DEFAULT_CONFIG
+
+# Obsolete macros:
+AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])
+AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
+AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
+AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
+AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
+dnl AC_DEFUN([AC_LIBTOOL_F77], [])
+dnl AC_DEFUN([AC_LIBTOOL_FC], [])
+dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
+dnl AC_DEFUN([AC_LIBTOOL_RC], [])
+
+
+# _LT_TAG_COMPILER
+# ----------------
+m4_defun([_LT_TAG_COMPILER],
+[AC_REQUIRE([AC_PROG_CC])dnl
+
+_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl
+_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl
+_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl
+_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+])# _LT_TAG_COMPILER
+
+
+# _LT_COMPILER_BOILERPLATE
+# ------------------------
+# Check for compiler boilerplate output or warnings with
+# the simple compiler test code.
+m4_defun([_LT_COMPILER_BOILERPLATE],
+[m4_require([_LT_DECL_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$RM conftest*
+])# _LT_COMPILER_BOILERPLATE
+
+
+# _LT_LINKER_BOILERPLATE
+# ----------------------
+# Check for linker boilerplate output or warnings with
+# the simple link test code.
+m4_defun([_LT_LINKER_BOILERPLATE],
+[m4_require([_LT_DECL_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$RM -r conftest*
+])# _LT_LINKER_BOILERPLATE
+
+# _LT_REQUIRED_DARWIN_CHECKS
+# -------------------------
+m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
+  case $host_os in
+    rhapsody* | darwin*)
+    AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
+    AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
+    AC_CHECK_TOOL([LIPO], [lipo], [:])
+    AC_CHECK_TOOL([OTOOL], [otool], [:])
+    AC_CHECK_TOOL([OTOOL64], [otool64], [:])
+    _LT_DECL([], [DSYMUTIL], [1],
+      [Tool to manipulate archived DWARF debug symbol files on Mac OS X])
+    _LT_DECL([], [NMEDIT], [1],
+      [Tool to change global to local symbols on Mac OS X])
+    _LT_DECL([], [LIPO], [1],
+      [Tool to manipulate fat objects and archives on Mac OS X])
+    _LT_DECL([], [OTOOL], [1],
+      [ldd/readelf like tool for Mach-O binaries on Mac OS X])
+    _LT_DECL([], [OTOOL64], [1],
+      [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4])
+
+    AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
+      [lt_cv_apple_cc_single_mod=no
+      if test -z "$LT_MULTI_MODULE"; then
+	# By default we will add the -single_module flag. You can override
+	# by either setting the environment variable LT_MULTI_MODULE
+	# non-empty at configure time, or by adding -multi_module to the
+	# link flags.
+	rm -rf libconftest.dylib*
+	echo "int foo(void){return 1;}" > conftest.c
+	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+-dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD
+	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
+        _lt_result=$?
+	# If there is a non-empty error log, and "single_module"
+	# appears in it, assume the flag caused a linker warning
+        if test -s conftest.err && $GREP single_module conftest.err; then
+	  cat conftest.err >&AS_MESSAGE_LOG_FD
+	# Otherwise, if the output was created with a 0 exit code from
+	# the compiler, it worked.
+	elif test -f libconftest.dylib && test 0 = "$_lt_result"; then
+	  lt_cv_apple_cc_single_mod=yes
+	else
+	  cat conftest.err >&AS_MESSAGE_LOG_FD
+	fi
+	rm -rf libconftest.dylib*
+	rm -f conftest.*
+      fi])
+
+    AC_CACHE_CHECK([for -exported_symbols_list linker flag],
+      [lt_cv_ld_exported_symbols_list],
+      [lt_cv_ld_exported_symbols_list=no
+      save_LDFLAGS=$LDFLAGS
+      echo "_main" > conftest.sym
+      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+      AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+	[lt_cv_ld_exported_symbols_list=yes],
+	[lt_cv_ld_exported_symbols_list=no])
+	LDFLAGS=$save_LDFLAGS
+    ])
+
+    AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
+      [lt_cv_ld_force_load=no
+      cat > conftest.c << _LT_EOF
+int forced_loaded() { return 2;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
+      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
+      echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
+      $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
+      echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
+      $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
+      cat > conftest.c << _LT_EOF
+int main() { return 0;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
+      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
+      _lt_result=$?
+      if test -s conftest.err && $GREP force_load conftest.err; then
+	cat conftest.err >&AS_MESSAGE_LOG_FD
+      elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then
+	lt_cv_ld_force_load=yes
+      else
+	cat conftest.err >&AS_MESSAGE_LOG_FD
+      fi
+        rm -f conftest.err libconftest.a conftest conftest.c
+        rm -rf conftest.dSYM
+    ])
+    case $host_os in
+    rhapsody* | darwin1.[[012]])
+      _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
+    darwin1.*)
+      _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
+    darwin*) # darwin 5.x on
+      # if running on 10.5 or later, the deployment target defaults
+      # to the OS version, if on x86, and 10.4, the deployment
+      # target defaults to 10.4. Don't you love it?
+      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+	10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
+	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
+	10.[[012]][[,.]]*)
+	  _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
+	10.*)
+	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
+      esac
+    ;;
+  esac
+    if test yes = "$lt_cv_apple_cc_single_mod"; then
+      _lt_dar_single_mod='$single_module'
+    fi
+    if test yes = "$lt_cv_ld_exported_symbols_list"; then
+      _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym'
+    else
+      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib'
+    fi
+    if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then
+      _lt_dsymutil='~$DSYMUTIL $lib || :'
+    else
+      _lt_dsymutil=
+    fi
+    ;;
+  esac
+])
+
+
+# _LT_DARWIN_LINKER_FEATURES([TAG])
+# ---------------------------------
+# Checks for linker and compiler features on darwin
+m4_defun([_LT_DARWIN_LINKER_FEATURES],
+[
+  m4_require([_LT_REQUIRED_DARWIN_CHECKS])
+  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+  _LT_TAGVAR(hardcode_direct, $1)=no
+  _LT_TAGVAR(hardcode_automatic, $1)=yes
+  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+  if test yes = "$lt_cv_ld_force_load"; then
+    _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+    m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
+                  [FC],  [_LT_TAGVAR(compiler_needs_object, $1)=yes])
+  else
+    _LT_TAGVAR(whole_archive_flag_spec, $1)=''
+  fi
+  _LT_TAGVAR(link_all_deplibs, $1)=yes
+  _LT_TAGVAR(allow_undefined_flag, $1)=$_lt_dar_allow_undefined
+  case $cc_basename in
+     ifort*|nagfor*) _lt_dar_can_shared=yes ;;
+     *) _lt_dar_can_shared=$GCC ;;
+  esac
+  if test yes = "$_lt_dar_can_shared"; then
+    output_verbose_link_cmd=func_echo_all
+    _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
+    _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
+    _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
+    _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
+    m4_if([$1], [CXX],
+[   if test yes != "$lt_cv_apple_cc_single_mod"; then
+      _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil"
+      _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil"
+    fi
+],[])
+  else
+  _LT_TAGVAR(ld_shlibs, $1)=no
+  fi
+])
+
+# _LT_SYS_MODULE_PATH_AIX([TAGNAME])
+# ----------------------------------
+# Links a minimal program and checks the executable
+# for the system default hardcoded library path. In most cases,
+# this is /usr/lib:/lib, but when the MPI compilers are used
+# the location of the communication and MPI libs are included too.
+# If we don't find anything, use the default library path according
+# to the aix ld manual.
+# Store the results from the different compilers for each TAGNAME.
+# Allow to override them for all tags through lt_cv_aix_libpath.
+m4_defun([_LT_SYS_MODULE_PATH_AIX],
+[m4_require([_LT_DECL_SED])dnl
+if test set = "${lt_cv_aix_libpath+set}"; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
+  [AC_LINK_IFELSE([AC_LANG_PROGRAM],[
+  lt_aix_libpath_sed='[
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *\([^ ]*\) *$/\1/
+	      p
+	  }
+      }]'
+  _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
+    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi],[])
+  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
+    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=/usr/lib:/lib
+  fi
+  ])
+  aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
+fi
+])# _LT_SYS_MODULE_PATH_AIX
+
+
+# _LT_SHELL_INIT(ARG)
+# -------------------
+m4_define([_LT_SHELL_INIT],
+[m4_divert_text([M4SH-INIT], [$1
+])])# _LT_SHELL_INIT
+
+
+
+# _LT_PROG_ECHO_BACKSLASH
+# -----------------------
+# Find how we can fake an echo command that does not interpret backslash.
+# In particular, with Autoconf 2.60 or later we add some code to the start
+# of the generated configure script that will find a shell with a builtin
+# printf (that we can use as an echo command).
+m4_defun([_LT_PROG_ECHO_BACKSLASH],
+[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+
+AC_MSG_CHECKING([how to print strings])
+# Test print first, because it will be a builtin if present.
+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
+   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='print -r --'
+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='printf %s\n'
+else
+  # Use this function as a fallback that always works.
+  func_fallback_echo ()
+  {
+    eval 'cat <<_LTECHO_EOF
+$[]1
+_LTECHO_EOF'
+  }
+  ECHO='func_fallback_echo'
+fi
+
+# func_echo_all arg...
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+    $ECHO "$*"
+}
+
+case $ECHO in
+  printf*) AC_MSG_RESULT([printf]) ;;
+  print*) AC_MSG_RESULT([print -r]) ;;
+  *) AC_MSG_RESULT([cat]) ;;
+esac
+
+m4_ifdef([_AS_DETECT_SUGGESTED],
+[_AS_DETECT_SUGGESTED([
+  test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || (
+    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+    PATH=/empty FPATH=/empty; export PATH FPATH
+    test "X`printf %s $ECHO`" = "X$ECHO" \
+      || test "X`print -r -- $ECHO`" = "X$ECHO" )])])
+
+_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
+_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
+])# _LT_PROG_ECHO_BACKSLASH
+
+
+# _LT_WITH_SYSROOT
+# ----------------
+AC_DEFUN([_LT_WITH_SYSROOT],
+[AC_MSG_CHECKING([for sysroot])
+AC_ARG_WITH([sysroot],
+[AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@],
+  [Search for dependent libraries within DIR (or the compiler's sysroot
+   if not specified).])],
+[], [with_sysroot=no])
+
+dnl lt_sysroot will always be passed unquoted.  We quote it here
+dnl in case the user passed a directory name.
+lt_sysroot=
+case $with_sysroot in #(
+ yes)
+   if test yes = "$GCC"; then
+     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
+   fi
+   ;; #(
+ /*)
+   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
+   ;; #(
+ no|'')
+   ;; #(
+ *)
+   AC_MSG_RESULT([$with_sysroot])
+   AC_MSG_ERROR([The sysroot must be an absolute path.])
+   ;;
+esac
+
+ AC_MSG_RESULT([${lt_sysroot:-no}])
+_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
+[dependent libraries, and where our libraries should be installed.])])
+
+# _LT_ENABLE_LOCK
+# ---------------
+m4_defun([_LT_ENABLE_LOCK],
+[AC_ARG_ENABLE([libtool-lock],
+  [AS_HELP_STRING([--disable-libtool-lock],
+    [avoid locking (might break parallel builds)])])
+test no = "$enable_libtool_lock" || enable_libtool_lock=yes
+
+# Some flags need to be propagated to the compiler or linker for good
+# libtool support.
+case $host in
+ia64-*-hpux*)
+  # Find out what ABI is being produced by ac_compile, and set mode
+  # options accordingly.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.$ac_objext` in
+      *ELF-32*)
+	HPUX_IA64_MODE=32
+	;;
+      *ELF-64*)
+	HPUX_IA64_MODE=64
+	;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+*-*-irix6*)
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.
+  echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    if test yes = "$lt_cv_prog_gnu_ld"; then
+      case `/usr/bin/file conftest.$ac_objext` in
+	*32-bit*)
+	  LD="${LD-ld} -melf32bsmip"
+	  ;;
+	*N32*)
+	  LD="${LD-ld} -melf32bmipn32"
+	  ;;
+	*64-bit*)
+	  LD="${LD-ld} -melf64bmip"
+	;;
+      esac
+    else
+      case `/usr/bin/file conftest.$ac_objext` in
+	*32-bit*)
+	  LD="${LD-ld} -32"
+	  ;;
+	*N32*)
+	  LD="${LD-ld} -n32"
+	  ;;
+	*64-bit*)
+	  LD="${LD-ld} -64"
+	  ;;
+      esac
+    fi
+  fi
+  rm -rf conftest*
+  ;;
+
+mips64*-*linux*)
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.
+  echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    emul=elf
+    case `/usr/bin/file conftest.$ac_objext` in
+      *32-bit*)
+	emul="${emul}32"
+	;;
+      *64-bit*)
+	emul="${emul}64"
+	;;
+    esac
+    case `/usr/bin/file conftest.$ac_objext` in
+      *MSB*)
+	emul="${emul}btsmip"
+	;;
+      *LSB*)
+	emul="${emul}ltsmip"
+	;;
+    esac
+    case `/usr/bin/file conftest.$ac_objext` in
+      *N32*)
+	emul="${emul}n32"
+	;;
+    esac
+    LD="${LD-ld} -m $emul"
+  fi
+  rm -rf conftest*
+  ;;
+
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
+s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.  Note that the listed cases only cover the
+  # situations where additional linker options are needed (such as when
+  # doing 32-bit compilation for a host where ld defaults to 64-bit, or
+  # vice versa); the common cases where no linker options are needed do
+  # not appear in the list.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.o` in
+      *32-bit*)
+	case $host in
+	  x86_64-*kfreebsd*-gnu)
+	    LD="${LD-ld} -m elf_i386_fbsd"
+	    ;;
+	  x86_64-*linux*)
+	    case `/usr/bin/file conftest.o` in
+	      *x86-64*)
+		LD="${LD-ld} -m elf32_x86_64"
+		;;
+	      *)
+		LD="${LD-ld} -m elf_i386"
+		;;
+	    esac
+	    ;;
+	  powerpc64le-*linux*)
+	    LD="${LD-ld} -m elf32lppclinux"
+	    ;;
+	  powerpc64-*linux*)
+	    LD="${LD-ld} -m elf32ppclinux"
+	    ;;
+	  s390x-*linux*)
+	    LD="${LD-ld} -m elf_s390"
+	    ;;
+	  sparc64-*linux*)
+	    LD="${LD-ld} -m elf32_sparc"
+	    ;;
+	esac
+	;;
+      *64-bit*)
+	case $host in
+	  x86_64-*kfreebsd*-gnu)
+	    LD="${LD-ld} -m elf_x86_64_fbsd"
+	    ;;
+	  x86_64-*linux*)
+	    LD="${LD-ld} -m elf_x86_64"
+	    ;;
+	  powerpcle-*linux*)
+	    LD="${LD-ld} -m elf64lppc"
+	    ;;
+	  powerpc-*linux*)
+	    LD="${LD-ld} -m elf64ppc"
+	    ;;
+	  s390*-*linux*|s390*-*tpf*)
+	    LD="${LD-ld} -m elf64_s390"
+	    ;;
+	  sparc*-*linux*)
+	    LD="${LD-ld} -m elf64_sparc"
+	    ;;
+	esac
+	;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+
+*-*-sco3.2v5*)
+  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+  SAVE_CFLAGS=$CFLAGS
+  CFLAGS="$CFLAGS -belf"
+  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
+    [AC_LANG_PUSH(C)
+     AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
+     AC_LANG_POP])
+  if test yes != "$lt_cv_cc_needs_belf"; then
+    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+    CFLAGS=$SAVE_CFLAGS
+  fi
+  ;;
+*-*solaris*)
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.o` in
+    *64-bit*)
+      case $lt_cv_prog_gnu_ld in
+      yes*)
+        case $host in
+        i?86-*-solaris*|x86_64-*-solaris*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        sparc*-*-solaris*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+        esac
+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+          LD=${LD-ld}_sol2
+        fi
+        ;;
+      *)
+	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+	  LD="${LD-ld} -64"
+	fi
+	;;
+      esac
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+esac
+
+need_locks=$enable_libtool_lock
+])# _LT_ENABLE_LOCK
+
+
+# _LT_PROG_AR
+# -----------
+m4_defun([_LT_PROG_AR],
+[AC_CHECK_TOOLS(AR, [ar], false)
+: ${AR=ar}
+: ${AR_FLAGS=cru}
+_LT_DECL([], [AR], [1], [The archiver])
+_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
+
+AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
+  [lt_cv_ar_at_file=no
+   AC_COMPILE_IFELSE([AC_LANG_PROGRAM],
+     [echo conftest.$ac_objext > conftest.lst
+      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
+      AC_TRY_EVAL([lt_ar_try])
+      if test 0 -eq "$ac_status"; then
+	# Ensure the archiver fails upon bogus file names.
+	rm -f conftest.$ac_objext libconftest.a
+	AC_TRY_EVAL([lt_ar_try])
+	if test 0 -ne "$ac_status"; then
+          lt_cv_ar_at_file=@
+        fi
+      fi
+      rm -f conftest.* libconftest.a
+     ])
+  ])
+
+if test no = "$lt_cv_ar_at_file"; then
+  archiver_list_spec=
+else
+  archiver_list_spec=$lt_cv_ar_at_file
+fi
+_LT_DECL([], [archiver_list_spec], [1],
+  [How to feed a file listing to the archiver])
+])# _LT_PROG_AR
+
+
+# _LT_CMD_OLD_ARCHIVE
+# -------------------
+m4_defun([_LT_CMD_OLD_ARCHIVE],
+[_LT_PROG_AR
+
+AC_CHECK_TOOL(STRIP, strip, :)
+test -z "$STRIP" && STRIP=:
+_LT_DECL([], [STRIP], [1], [A symbol stripping program])
+
+AC_CHECK_TOOL(RANLIB, ranlib, :)
+test -z "$RANLIB" && RANLIB=:
+_LT_DECL([], [RANLIB], [1],
+    [Commands used to install an old-style archive])
+
+# Determine commands to create old-style static archives.
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
+old_postinstall_cmds='chmod 644 $oldlib'
+old_postuninstall_cmds=
+
+if test -n "$RANLIB"; then
+  case $host_os in
+  bitrig* | openbsd*)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
+    ;;
+  *)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
+    ;;
+  esac
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
+fi
+
+case $host_os in
+  darwin*)
+    lock_old_archive_extraction=yes ;;
+  *)
+    lock_old_archive_extraction=no ;;
+esac
+_LT_DECL([], [old_postinstall_cmds], [2])
+_LT_DECL([], [old_postuninstall_cmds], [2])
+_LT_TAGDECL([], [old_archive_cmds], [2],
+    [Commands used to build an old-style archive])
+_LT_DECL([], [lock_old_archive_extraction], [0],
+    [Whether to use a lock for old archive extraction])
+])# _LT_CMD_OLD_ARCHIVE
+
+
+# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
+# ----------------------------------------------------------------
+# Check whether the given compiler option works
+AC_DEFUN([_LT_COMPILER_OPTION],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_SED])dnl
+AC_CACHE_CHECK([$1], [$2],
+  [$2=no
+   m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="$3"  ## exclude from sc_useless_quotes_in_assignment
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&AS_MESSAGE_LOG_FD
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings other than the usual output.
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       $2=yes
+     fi
+   fi
+   $RM conftest*
+])
+
+if test yes = "[$]$2"; then
+    m4_if([$5], , :, [$5])
+else
+    m4_if([$6], , :, [$6])
+fi
+])# _LT_COMPILER_OPTION
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [])
+
+
+# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+#                  [ACTION-SUCCESS], [ACTION-FAILURE])
+# ----------------------------------------------------
+# Check whether the given linker option works
+AC_DEFUN([_LT_LINKER_OPTION],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_SED])dnl
+AC_CACHE_CHECK([$1], [$2],
+  [$2=no
+   save_LDFLAGS=$LDFLAGS
+   LDFLAGS="$LDFLAGS $3"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&AS_MESSAGE_LOG_FD
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         $2=yes
+       fi
+     else
+       $2=yes
+     fi
+   fi
+   $RM -r conftest*
+   LDFLAGS=$save_LDFLAGS
+])
+
+if test yes = "[$]$2"; then
+    m4_if([$4], , :, [$4])
+else
+    m4_if([$5], , :, [$5])
+fi
+])# _LT_LINKER_OPTION
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], [])
+
+
+# LT_CMD_MAX_LEN
+#---------------
+AC_DEFUN([LT_CMD_MAX_LEN],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+# find the maximum length of command line arguments
+AC_MSG_CHECKING([the maximum length of command line arguments])
+AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
+  i=0
+  teststring=ABCD
+
+  case $build_os in
+  msdosdjgpp*)
+    # On DJGPP, this test can blow up pretty badly due to problems in libc
+    # (any single argument exceeding 2000 bytes causes a buffer overrun
+    # during glob expansion).  Even if it were fixed, the result of this
+    # check would be larger than it should be.
+    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
+    ;;
+
+  gnu*)
+    # Under GNU Hurd, this test is not required because there is
+    # no limit to the length of command line arguments.
+    # Libtool will interpret -1 as no limit whatsoever
+    lt_cv_sys_max_cmd_len=-1;
+    ;;
+
+  cygwin* | mingw* | cegcc*)
+    # On Win9x/ME, this test blows up -- it succeeds, but takes
+    # about 5 minutes as the teststring grows exponentially.
+    # Worse, since 9x/ME are not pre-emptively multitasking,
+    # you end up with a "frozen" computer, even though with patience
+    # the test eventually succeeds (with a max line length of 256k).
+    # Instead, let's just punt: use the minimum linelength reported by
+    # all of the supported platforms: 8192 (on NT/2K/XP).
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  mint*)
+    # On MiNT this can take a long time and run out of memory.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  amigaos*)
+    # On AmigaOS with pdksh, this test takes hours, literally.
+    # So we just punt and use a minimum line length of 8192.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*)
+    # This has been around since 386BSD, at least.  Likely further.
+    if test -x /sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+    elif test -x /usr/sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
+    else
+      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
+    fi
+    # And add a safety zone
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    ;;
+
+  interix*)
+    # We know the value 262144 and hardcode it with a safety zone (like BSD)
+    lt_cv_sys_max_cmd_len=196608
+    ;;
+
+  os2*)
+    # The test takes a long time on OS/2.
+    lt_cv_sys_max_cmd_len=8192
+    ;;
+
+  osf*)
+    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
+    # nice to cause kernel panics so lets avoid the loop below.
+    # First set a reasonable default.
+    lt_cv_sys_max_cmd_len=16384
+    #
+    if test -x /sbin/sysconfig; then
+      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
+        *1*) lt_cv_sys_max_cmd_len=-1 ;;
+      esac
+    fi
+    ;;
+  sco3.2v5*)
+    lt_cv_sys_max_cmd_len=102400
+    ;;
+  sysv5* | sco5v6* | sysv4.2uw2*)
+    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
+    if test -n "$kargmax"; then
+      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[	 ]]//'`
+    else
+      lt_cv_sys_max_cmd_len=32768
+    fi
+    ;;
+  *)
+    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+    if test -n "$lt_cv_sys_max_cmd_len" && \
+       test undefined != "$lt_cv_sys_max_cmd_len"; then
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    else
+      # Make teststring a little bigger before we do anything with it.
+      # a 1K string should be a reasonable start.
+      for i in 1 2 3 4 5 6 7 8; do
+        teststring=$teststring$teststring
+      done
+      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+      # If test is not a shell built-in, we'll probably end up computing a
+      # maximum length that is only half of the actual maximum length, but
+      # we can't tell.
+      while { test X`env echo "$teststring$teststring" 2>/dev/null` \
+	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
+	      test 17 != "$i" # 1/2 MB should be enough
+      do
+        i=`expr $i + 1`
+        teststring=$teststring$teststring
+      done
+      # Only check the string length outside the loop.
+      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
+      teststring=
+      # Add a significant safety factor because C++ compilers can tack on
+      # massive amounts of additional arguments before passing them to the
+      # linker.  It appears as though 1/2 is a usable value.
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+    fi
+    ;;
+  esac
+])
+if test -n "$lt_cv_sys_max_cmd_len"; then
+  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
+else
+  AC_MSG_RESULT(none)
+fi
+max_cmd_len=$lt_cv_sys_max_cmd_len
+_LT_DECL([], [max_cmd_len], [0],
+    [What is the maximum length of a command?])
+])# LT_CMD_MAX_LEN
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], [])
+
+
+# _LT_HEADER_DLFCN
+# ----------------
+m4_defun([_LT_HEADER_DLFCN],
+[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl
+])# _LT_HEADER_DLFCN
+
+
+# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
+#                      ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
+# ----------------------------------------------------------------
+m4_defun([_LT_TRY_DLOPEN_SELF],
+[m4_require([_LT_HEADER_DLFCN])dnl
+if test yes = "$cross_compiling"; then :
+  [$4]
+else
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<_LT_EOF
+[#line $LINENO "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL		RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL		DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL		0
+#  endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW		DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW	DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW	0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+/* When -fvisibility=hidden is used, assume the code has been annotated
+   correspondingly for the symbols needed.  */
+#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+int fnord () __attribute__((visibility("default")));
+#endif
+
+int fnord () { return 42; }
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
+
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else
+        {
+	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
+          else puts (dlerror ());
+	}
+      /* dlclose (self); */
+    }
+  else
+    puts (dlerror ());
+
+  return status;
+}]
+_LT_EOF
+  if AC_TRY_EVAL(ac_link) && test -s "conftest$ac_exeext" 2>/dev/null; then
+    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) $1 ;;
+      x$lt_dlneed_uscore) $2 ;;
+      x$lt_dlunknown|x*) $3 ;;
+    esac
+  else :
+    # compilation failed
+    $3
+  fi
+fi
+rm -fr conftest*
+])# _LT_TRY_DLOPEN_SELF
+
+
+# LT_SYS_DLOPEN_SELF
+# ------------------
+AC_DEFUN([LT_SYS_DLOPEN_SELF],
+[m4_require([_LT_HEADER_DLFCN])dnl
+if test yes != "$enable_dlopen"; then
+  enable_dlopen=unknown
+  enable_dlopen_self=unknown
+  enable_dlopen_self_static=unknown
+else
+  lt_cv_dlopen=no
+  lt_cv_dlopen_libs=
+
+  case $host_os in
+  beos*)
+    lt_cv_dlopen=load_add_on
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ;;
+
+  mingw* | pw32* | cegcc*)
+    lt_cv_dlopen=LoadLibrary
+    lt_cv_dlopen_libs=
+    ;;
+
+  cygwin*)
+    lt_cv_dlopen=dlopen
+    lt_cv_dlopen_libs=
+    ;;
+
+  darwin*)
+    # if libdl is installed we need to link against it
+    AC_CHECK_LIB([dl], [dlopen],
+		[lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl],[
+    lt_cv_dlopen=dyld
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ])
+    ;;
+
+  tpf*)
+    # Don't try to run any link tests for TPF.  We know it's impossible
+    # because TPF is a cross-compiler, and we know how we open DSOs.
+    lt_cv_dlopen=dlopen
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=no
+    ;;
+
+  *)
+    AC_CHECK_FUNC([shl_load],
+	  [lt_cv_dlopen=shl_load],
+      [AC_CHECK_LIB([dld], [shl_load],
+	    [lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld],
+	[AC_CHECK_FUNC([dlopen],
+	      [lt_cv_dlopen=dlopen],
+	  [AC_CHECK_LIB([dl], [dlopen],
+		[lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl],
+	    [AC_CHECK_LIB([svld], [dlopen],
+		  [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld],
+	      [AC_CHECK_LIB([dld], [dld_link],
+		    [lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld])
+	      ])
+	    ])
+	  ])
+	])
+      ])
+    ;;
+  esac
+
+  if test no = "$lt_cv_dlopen"; then
+    enable_dlopen=no
+  else
+    enable_dlopen=yes
+  fi
+
+  case $lt_cv_dlopen in
+  dlopen)
+    save_CPPFLAGS=$CPPFLAGS
+    test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+
+    save_LDFLAGS=$LDFLAGS
+    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+
+    save_LIBS=$LIBS
+    LIBS="$lt_cv_dlopen_libs $LIBS"
+
+    AC_CACHE_CHECK([whether a program can dlopen itself],
+	  lt_cv_dlopen_self, [dnl
+	  _LT_TRY_DLOPEN_SELF(
+	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
+	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
+    ])
+
+    if test yes = "$lt_cv_dlopen_self"; then
+      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
+	  lt_cv_dlopen_self_static, [dnl
+	  _LT_TRY_DLOPEN_SELF(
+	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
+	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
+      ])
+    fi
+
+    CPPFLAGS=$save_CPPFLAGS
+    LDFLAGS=$save_LDFLAGS
+    LIBS=$save_LIBS
+    ;;
+  esac
+
+  case $lt_cv_dlopen_self in
+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+  *) enable_dlopen_self=unknown ;;
+  esac
+
+  case $lt_cv_dlopen_self_static in
+  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+  *) enable_dlopen_self_static=unknown ;;
+  esac
+fi
+_LT_DECL([dlopen_support], [enable_dlopen], [0],
+	 [Whether dlopen is supported])
+_LT_DECL([dlopen_self], [enable_dlopen_self], [0],
+	 [Whether dlopen of programs is supported])
+_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0],
+	 [Whether dlopen of statically linked programs is supported])
+])# LT_SYS_DLOPEN_SELF
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [])
+
+
+# _LT_COMPILER_C_O([TAGNAME])
+# ---------------------------
+# Check to see if options -c and -o are simultaneously supported by compiler.
+# This macro does not hard code the compiler like AC_PROG_CC_C_O.
+m4_defun([_LT_COMPILER_C_O],
+[m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_TAG_COMPILER])dnl
+AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
+  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
+  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&AS_MESSAGE_LOG_FD
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+     fi
+   fi
+   chmod u+w . 2>&AS_MESSAGE_LOG_FD
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
+])
+_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1],
+	[Does compiler simultaneously support -c and -o options?])
+])# _LT_COMPILER_C_O
+
+
+# _LT_COMPILER_FILE_LOCKS([TAGNAME])
+# ----------------------------------
+# Check to see if we can do hard links to lock some files if needed
+m4_defun([_LT_COMPILER_FILE_LOCKS],
+[m4_require([_LT_ENABLE_LOCK])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+_LT_COMPILER_C_O([$1])
+
+hard_links=nottested
+if test no = "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" && test no != "$need_locks"; then
+  # do not overwrite the value of need_locks provided by the user
+  AC_MSG_CHECKING([if we can lock with hard links])
+  hard_links=yes
+  $RM conftest*
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  touch conftest.a
+  ln conftest.a conftest.b 2>&5 || hard_links=no
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  AC_MSG_RESULT([$hard_links])
+  if test no = "$hard_links"; then
+    AC_MSG_WARN(['$CC' does not support '-c -o', so 'make -j' may be unsafe])
+    need_locks=warn
+  fi
+else
+  need_locks=no
+fi
+_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?])
+])# _LT_COMPILER_FILE_LOCKS
+
+
+# _LT_CHECK_OBJDIR
+# ----------------
+m4_defun([_LT_CHECK_OBJDIR],
+[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
+[rm -f .libs 2>/dev/null
+mkdir .libs 2>/dev/null
+if test -d .libs; then
+  lt_cv_objdir=.libs
+else
+  # MS-DOS does not allow filenames that begin with a dot.
+  lt_cv_objdir=_libs
+fi
+rmdir .libs 2>/dev/null])
+objdir=$lt_cv_objdir
+_LT_DECL([], [objdir], [0],
+         [The name of the directory that contains temporary libtool files])dnl
+m4_pattern_allow([LT_OBJDIR])dnl
+AC_DEFINE_UNQUOTED([LT_OBJDIR], "$lt_cv_objdir/",
+  [Define to the sub-directory where libtool stores uninstalled libraries.])
+])# _LT_CHECK_OBJDIR
+
+
+# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME])
+# --------------------------------------
+# Check hardcoding attributes.
+m4_defun([_LT_LINKER_HARDCODE_LIBPATH],
+[AC_MSG_CHECKING([how to hardcode library paths into programs])
+_LT_TAGVAR(hardcode_action, $1)=
+if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
+   test -n "$_LT_TAGVAR(runpath_var, $1)" ||
+   test yes = "$_LT_TAGVAR(hardcode_automatic, $1)"; then
+
+  # We can hardcode non-existent directories.
+  if test no != "$_LT_TAGVAR(hardcode_direct, $1)" &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" &&
+     test no != "$_LT_TAGVAR(hardcode_minus_L, $1)"; then
+    # Linking always hardcodes the temporary library directory.
+    _LT_TAGVAR(hardcode_action, $1)=relink
+  else
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    _LT_TAGVAR(hardcode_action, $1)=immediate
+  fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  _LT_TAGVAR(hardcode_action, $1)=unsupported
+fi
+AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)])
+
+if test relink = "$_LT_TAGVAR(hardcode_action, $1)" ||
+   test yes = "$_LT_TAGVAR(inherit_rpath, $1)"; then
+  # Fast installation is not supported
+  enable_fast_install=no
+elif test yes = "$shlibpath_overrides_runpath" ||
+     test no = "$enable_shared"; then
+  # Fast installation is not necessary
+  enable_fast_install=needless
+fi
+_LT_TAGDECL([], [hardcode_action], [0],
+    [How to hardcode a shared library path into an executable])
+])# _LT_LINKER_HARDCODE_LIBPATH
+
+
+# _LT_CMD_STRIPLIB
+# ----------------
+m4_defun([_LT_CMD_STRIPLIB],
+[m4_require([_LT_DECL_EGREP])
+striplib=
+old_striplib=
+AC_MSG_CHECKING([whether stripping libraries is possible])
+if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+  AC_MSG_RESULT([yes])
+else
+# FIXME - insert some real tests, host_os isn't really good enough
+  case $host_os in
+  darwin*)
+    if test -n "$STRIP"; then
+      striplib="$STRIP -x"
+      old_striplib="$STRIP -S"
+      AC_MSG_RESULT([yes])
+    else
+      AC_MSG_RESULT([no])
+    fi
+    ;;
+  *)
+    AC_MSG_RESULT([no])
+    ;;
+  esac
+fi
+_LT_DECL([], [old_striplib], [1], [Commands to strip libraries])
+_LT_DECL([], [striplib], [1])
+])# _LT_CMD_STRIPLIB
+
+
+# _LT_PREPARE_MUNGE_PATH_LIST
+# ---------------------------
+# Make sure func_munge_path_list() is defined correctly.
+m4_defun([_LT_PREPARE_MUNGE_PATH_LIST],
+[[# func_munge_path_list VARIABLE PATH
+# -----------------------------------
+# VARIABLE is name of variable containing _space_ separated list of
+# directories to be munged by the contents of PATH, which is string
+# having a format:
+# "DIR[:DIR]:"
+#       string "DIR[ DIR]" will be prepended to VARIABLE
+# ":DIR[:DIR]"
+#       string "DIR[ DIR]" will be appended to VARIABLE
+# "DIRP[:DIRP]::[DIRA:]DIRA"
+#       string "DIRP[ DIRP]" will be prepended to VARIABLE and string
+#       "DIRA[ DIRA]" will be appended to VARIABLE
+# "DIR[:DIR]"
+#       VARIABLE will be replaced by "DIR[ DIR]"
+func_munge_path_list ()
+{
+    case x at S|@2 in
+    x)
+        ;;
+    *:)
+        eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'` \@S|@@S|@1\"
+        ;;
+    x:*)
+        eval @S|@1=\"\@S|@@S|@1 `$ECHO @S|@2 | $SED 's/:/ /g'`\"
+        ;;
+    *::*)
+        eval @S|@1=\"\@S|@@S|@1\ `$ECHO @S|@2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
+        eval @S|@1=\"`$ECHO @S|@2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \@S|@@S|@1\"
+        ;;
+    *)
+        eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'`\"
+        ;;
+    esac
+}
+]])# _LT_PREPARE_PATH_LIST
+
+
+# _LT_SYS_DYNAMIC_LINKER([TAG])
+# -----------------------------
+# PORTME Fill in your ld.so characteristics
+m4_defun([_LT_SYS_DYNAMIC_LINKER],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_OBJDUMP])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_CHECK_SHELL_FEATURES])dnl
+m4_require([_LT_PREPARE_MUNGE_PATH_LIST])dnl
+AC_MSG_CHECKING([dynamic linker characteristics])
+m4_if([$1],
+	[], [
+if test yes = "$GCC"; then
+  case $host_os in
+    darwin*) lt_awk_arg='/^libraries:/,/LR/' ;;
+    *) lt_awk_arg='/^libraries:/' ;;
+  esac
+  case $host_os in
+    mingw* | cegcc*) lt_sed_strip_eq='s|=\([[A-Za-z]]:\)|\1|g' ;;
+    *) lt_sed_strip_eq='s|=/|/|g' ;;
+  esac
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
+  case $lt_search_path_spec in
+  *\;*)
+    # if the path contains ";" then we assume it to be the separator
+    # otherwise default to the standard path separator (i.e. ":") - it is
+    # assumed that no part of a normal pathname contains ";" but that should
+    # okay in the real world where ";" in dirpaths is itself problematic.
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
+    ;;
+  *)
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
+    ;;
+  esac
+  # Ok, now we have the path, separated by spaces, we can step through it
+  # and add multilib dir if necessary...
+  lt_tmp_lt_search_path_spec=
+  lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  # ...but if some path component already ends with the multilib dir we assume
+  # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer).
+  case "$lt_multi_os_dir; $lt_search_path_spec " in
+  "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*)
+    lt_multi_os_dir=
+    ;;
+  esac
+  for lt_sys_path in $lt_search_path_spec; do
+    if test -d "$lt_sys_path$lt_multi_os_dir"; then
+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir"
+    elif test -n "$lt_multi_os_dir"; then
+      test -d "$lt_sys_path" && \
+	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+    fi
+  done
+  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
+BEGIN {RS = " "; FS = "/|\n";} {
+  lt_foo = "";
+  lt_count = 0;
+  for (lt_i = NF; lt_i > 0; lt_i--) {
+    if ($lt_i != "" && $lt_i != ".") {
+      if ($lt_i == "..") {
+        lt_count++;
+      } else {
+        if (lt_count == 0) {
+          lt_foo = "/" $lt_i lt_foo;
+        } else {
+          lt_count--;
+        }
+      }
+    }
+  }
+  if (lt_foo != "") { lt_freq[[lt_foo]]++; }
+  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
+}'`
+  # AWK program above erroneously prepends '/' to C:/dos/paths
+  # for these hosts.
+  case $host_os in
+    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
+      $SED 's|/\([[A-Za-z]]:\)|\1|g'` ;;
+  esac
+  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
+else
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+fi])
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
+shrext_cmds=.so
+postinstall_cmds=
+postuninstall_cmds=
+finish_cmds=
+finish_eval=
+shlibpath_var=
+shlibpath_overrides_runpath=unknown
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+need_lib_prefix=unknown
+hardcode_into_libs=no
+
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+need_version=unknown
+
+AC_ARG_VAR([LT_SYS_LIBRARY_PATH],
+[User-defined run-time library search path.])
+
+case $host_os in
+aix3*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname.a'
+  shlibpath_var=LIBPATH
+
+  # AIX 3 has no versioning support, so we append a major version to the name.
+  soname_spec='$libname$release$shared_ext$major'
+  ;;
+
+aix[[4-9]]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  hardcode_into_libs=yes
+  if test ia64 = "$host_cpu"; then
+    # AIX 5 supports IA64
+    library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext'
+    shlibpath_var=LD_LIBRARY_PATH
+  else
+    # With GCC up to 2.95.x, collect2 would create an import file
+    # for dependence libraries.  The import file would start with
+    # the line '#! .'.  This would cause the generated library to
+    # depend on '.', always an invalid library.  This was fixed in
+    # development snapshots of GCC prior to 3.0.
+    case $host_os in
+      aix4 | aix4.[[01]] | aix4.[[01]].*)
+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+	   echo ' yes '
+	   echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then
+	:
+      else
+	can_build_shared=no
+      fi
+      ;;
+    esac
+    # Using Import Files as archive members, it is possible to support
+    # filename-based versioning of shared library archives on AIX. While
+    # this would work for both with and without runtime linking, it will
+    # prevent static linking of such archives. So we do filename-based
+    # shared library versioning with .so extension only, which is used
+    # when both runtime linking and shared linking is enabled.
+    # Unfortunately, runtime linking may impact performance, so we do
+    # not want this to be the default eventually. Also, we use the
+    # versioned .so libs for executables only if there is the -brtl
+    # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
+    # To allow for filename-based versioning support, we need to create
+    # libNAME.so.V as an archive file, containing:
+    # *) an Import File, referring to the versioned filename of the
+    #    archive as well as the shared archive member, telling the
+    #    bitwidth (32 or 64) of that shared object, and providing the
+    #    list of exported symbols of that shared object, eventually
+    #    decorated with the 'weak' keyword
+    # *) the shared object with the F_LOADONLY flag set, to really avoid
+    #    it being seen by the linker.
+    # At run time we better use the real file rather than another symlink,
+    # but for link time we create the symlink libNAME.so -> libNAME.so.V
+
+    case $with_aix_soname,$aix_use_runtimelinking in
+    # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
+    # soname into executable. Probably we can add versioning support to
+    # collect2, so additional links can be useful in future.
+    aix,yes) # traditional libtool
+      dynamic_linker='AIX unversionable lib.so'
+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+      # instead of lib<name>.a to let people know that these are not
+      # typical AIX shared libraries.
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+      ;;
+    aix,no) # traditional AIX only
+      dynamic_linker='AIX lib.a[(]lib.so.V[)]'
+      # We preserve .a as extension for shared libraries through AIX4.2
+      # and later when we are not doing run time linking.
+      library_names_spec='$libname$release.a $libname.a'
+      soname_spec='$libname$release$shared_ext$major'
+      ;;
+    svr4,*) # full svr4 only
+      dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)]"
+      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+      # We do not specify a path in Import Files, so LIBPATH fires.
+      shlibpath_overrides_runpath=yes
+      ;;
+    *,yes) # both, prefer svr4
+      dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)], lib.a[(]lib.so.V[)]"
+      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+      # unpreferred sharedlib libNAME.a needs extra handling
+      postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
+      postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
+      # We do not specify a path in Import Files, so LIBPATH fires.
+      shlibpath_overrides_runpath=yes
+      ;;
+    *,no) # both, prefer aix
+      dynamic_linker="AIX lib.a[(]lib.so.V[)], lib.so.V[(]$shared_archive_member_spec.o[)]"
+      library_names_spec='$libname$release.a $libname.a'
+      soname_spec='$libname$release$shared_ext$major'
+      # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
+      postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
+      postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
+      ;;
+    esac
+    shlibpath_var=LIBPATH
+  fi
+  ;;
+
+amigaos*)
+  case $host_cpu in
+  powerpc)
+    # Since July 2007 AmigaOS4 officially supports .so libraries.
+    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    ;;
+  m68k)
+    library_names_spec='$libname.ixlibrary $libname.a'
+    # Create ${libname}_ixlibrary.a entries in /sys/libs.
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    ;;
+  esac
+  ;;
+
+beos*)
+  library_names_spec='$libname$shared_ext'
+  dynamic_linker="$host_os ld.so"
+  shlibpath_var=LIBRARY_PATH
+  ;;
+
+bsdi[[45]]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+  # the default ld.so.conf also contains /usr/contrib/lib and
+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+  # libtool to hard-code these into programs
+  ;;
+
+cygwin* | mingw* | pw32* | cegcc*)
+  version_type=windows
+  shrext_cmds=.dll
+  need_version=no
+  need_lib_prefix=no
+
+  case $GCC,$cc_basename in
+  yes,*)
+    # gcc
+    library_names_spec='$libname.dll.a'
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \$file`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname~
+      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+      fi'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+
+    case $host_os in
+    cygwin*)
+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+      soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
+m4_if([$1], [],[
+      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
+      ;;
+    mingw* | cegcc*)
+      # MinGW DLLs use traditional 'lib' prefix
+      soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
+      ;;
+    esac
+    dynamic_linker='Win32 ld.exe'
+    ;;
+
+  *,cl*)
+    # Native MSVC
+    libname_spec='$name'
+    soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
+    library_names_spec='$libname.dll.lib'
+
+    case $build_os in
+    mingw*)
+      sys_lib_search_path_spec=
+      lt_save_ifs=$IFS
+      IFS=';'
+      for lt_path in $LIB
+      do
+        IFS=$lt_save_ifs
+        # Let DOS variable expansion print the short 8.3 style file name.
+        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
+        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
+      done
+      IFS=$lt_save_ifs
+      # Convert to MSYS style.
+      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
+      ;;
+    cygwin*)
+      # Convert to unix form, then to dos form, then back to unix form
+      # but this time dos style (no spaces!) so that the unix form looks
+      # like /cygdrive/c/PROGRA~1:/cygdr...
+      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
+      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
+      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      ;;
+    *)
+      sys_lib_search_path_spec=$LIB
+      if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
+        # It is most probably a Windows format PATH.
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      fi
+      # FIXME: find the short name or the path components, as spaces are
+      # common. (e.g. "Program Files" -> "PROGRA~1")
+      ;;
+    esac
+
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \$file`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+    dynamic_linker='Win32 link.exe'
+    ;;
+
+  *)
+    # Assume MSVC wrapper
+    library_names_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext $libname.lib'
+    dynamic_linker='Win32 ld.exe'
+    ;;
+  esac
+  # FIXME: first we should search . and the directory the executable is in
+  shlibpath_var=PATH
+  ;;
+
+darwin* | rhapsody*)
+  dynamic_linker="$host_os dyld"
+  version_type=darwin
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$major$shared_ext $libname$shared_ext'
+  soname_spec='$libname$release$major$shared_ext'
+  shlibpath_overrides_runpath=yes
+  shlibpath_var=DYLD_LIBRARY_PATH
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+m4_if([$1], [],[
+  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+  ;;
+
+dgux*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+freebsd* | dragonfly*)
+  # DragonFly does not have aout.  When/if they implement a new
+  # versioning mechanism, adjust this.
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[[23]].*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
+  version_type=freebsd-$objformat
+  case $version_type in
+    freebsd-elf*)
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+      soname_spec='$libname$release$shared_ext$major'
+      need_version=no
+      need_lib_prefix=no
+      ;;
+    freebsd-*)
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+      need_version=yes
+      ;;
+  esac
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_os in
+  freebsd2.*)
+    shlibpath_overrides_runpath=yes
+    ;;
+  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
+  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
+    shlibpath_overrides_runpath=no
+    hardcode_into_libs=yes
+    ;;
+  *) # from 4.6 on, and DragonFly
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  esac
+  ;;
+
+haiku*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  dynamic_linker="$host_os runtime_loader"
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
+  hardcode_into_libs=yes
+  ;;
+
+hpux9* | hpux10* | hpux11*)
+  # Give a soname corresponding to the major version so that dld.sl refuses to
+  # link against other versions.
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  case $host_cpu in
+  ia64*)
+    shrext_cmds='.so'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.so"
+    shlibpath_var=LD_LIBRARY_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    if test 32 = "$HPUX_IA64_MODE"; then
+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+      sys_lib_dlsearch_path_spec=/usr/lib/hpux32
+    else
+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+      sys_lib_dlsearch_path_spec=/usr/lib/hpux64
+    fi
+    ;;
+  hppa*64*)
+    shrext_cmds='.sl'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  *)
+    shrext_cmds='.sl'
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=SHLIB_PATH
+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    ;;
+  esac
+  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
+  postinstall_cmds='chmod 555 $lib'
+  # or fails outright, so override atomically:
+  install_override_mode=555
+  ;;
+
+interix[[3-9]]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $host_os in
+    nonstopux*) version_type=nonstopux ;;
+    *)
+	if test yes = "$lt_cv_prog_gnu_ld"; then
+		version_type=linux # correct to gnu/linux during the next big refactor
+	else
+		version_type=irix
+	fi ;;
+  esac
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='$libname$release$shared_ext$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext'
+  case $host_os in
+  irix5* | nonstopux*)
+    libsuff= shlibsuff=
+    ;;
+  *)
+    case $LD in # libtool.m4 will add one of these switches to LD
+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+      libsuff= shlibsuff= libmagic=32-bit;;
+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+      libsuff=32 shlibsuff=N32 libmagic=N32;;
+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+    *) libsuff= shlibsuff= libmagic=never-match;;
+    esac
+    ;;
+  esac
+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff"
+  sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff"
+  hardcode_into_libs=yes
+  ;;
+
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+  dynamic_linker=no
+  ;;
+
+linux*android*)
+  version_type=none # Android doesn't support versioned libraries.
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext'
+  soname_spec='$libname$release$shared_ext'
+  finish_cmds=
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  dynamic_linker='Android linker'
+  # Don't embed -rpath directories since the linker doesn't support them.
+  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+  ;;
+
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+
+  # Some binutils ld are patched to set DT_RUNPATH
+  AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath],
+    [lt_cv_shlibpath_overrides_runpath=no
+    save_LDFLAGS=$LDFLAGS
+    save_libdir=$libdir
+    eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
+	 LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
+    AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+      [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
+	 [lt_cv_shlibpath_overrides_runpath=yes])])
+    LDFLAGS=$save_LDFLAGS
+    libdir=$save_libdir
+    ])
+  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
+
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  # Ideally, we could use ldconfig to report *all* directores which are
+  # searched for libraries, however this is still not possible.  Aside from not
+  # being certain /sbin/ldconfig is available, command
+  # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
+  # even though it is searched at run-time.  Try to do the best guess by
+  # appending ld.so.conf contents (and includes) to the search path.
+  if test -f /etc/ld.so.conf; then
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+  fi
+
+  # We used to test for /lib/ld.so.1 and disable shared libraries on
+  # powerpc, because MkLinux only supported shared libraries with the
+  # GNU dynamic linker.  Since this was broken with cross compilers,
+  # most powerpc-linux boxes support dynamic linking these days and
+  # people can always --disable-shared, the test was removed, and we
+  # assume the GNU/Linux dynamic linker is in use.
+  dynamic_linker='GNU/Linux ld.so'
+  ;;
+
+netbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+    dynamic_linker='NetBSD (a.out) ld.so'
+  else
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    dynamic_linker='NetBSD ld.elf_so'
+  fi
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  ;;
+
+newsos6)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+*nto* | *qnx*)
+  version_type=qnx
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='ldqnx.so'
+  ;;
+
+openbsd* | bitrig*)
+  version_type=sunos
+  sys_lib_dlsearch_path_spec=/usr/lib
+  need_lib_prefix=no
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+    need_version=no
+  else
+    need_version=yes
+  fi
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+os2*)
+  libname_spec='$name'
+  version_type=windows
+  shrext_cmds=.dll
+  need_version=no
+  need_lib_prefix=no
+  # OS/2 can only load a DLL with a base name of 8 characters or less.
+  soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
+    v=$($ECHO $release$versuffix | tr -d .-);
+    n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
+    $ECHO $n$v`$shared_ext'
+  library_names_spec='${libname}_dll.$libext'
+  dynamic_linker='OS/2 ld.exe'
+  shlibpath_var=BEGINLIBPATH
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+  postinstall_cmds='base_file=`basename \$file`~
+    dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~
+    dldir=$destdir/`dirname \$dlpath`~
+    test -d \$dldir || mkdir -p \$dldir~
+    $install_prog $dir/$dlname \$dldir/$dlname~
+    chmod a+x \$dldir/$dlname~
+    if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+      eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+    fi'
+  postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
+    dlpath=$dir/\$dldll~
+    $RM \$dlpath'
+  ;;
+
+osf3* | osf4* | osf5*)
+  version_type=osf
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='$libname$release$shared_ext$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+  ;;
+
+rdos*)
+  dynamic_linker=no
+  ;;
+
+solaris*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  # ldd complains unless libraries are executable
+  postinstall_cmds='chmod +x $lib'
+  ;;
+
+sunos4*)
+  version_type=sunos
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  if test yes = "$with_gnu_ld"; then
+    need_lib_prefix=no
+  fi
+  need_version=yes
+  ;;
+
+sysv4 | sysv4.3*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_vendor in
+    sni)
+      shlibpath_overrides_runpath=no
+      need_lib_prefix=no
+      runpath_var=LD_RUN_PATH
+      ;;
+    siemens)
+      need_lib_prefix=no
+      ;;
+    motorola)
+      need_lib_prefix=no
+      need_version=no
+      shlibpath_overrides_runpath=no
+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+      ;;
+  esac
+  ;;
+
+sysv4*MP*)
+  if test -d /usr/nec; then
+    version_type=linux # correct to gnu/linux during the next big refactor
+    library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext'
+    soname_spec='$libname$shared_ext.$major'
+    shlibpath_var=LD_LIBRARY_PATH
+  fi
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  version_type=sco
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  if test yes = "$with_gnu_ld"; then
+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+  else
+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+    case $host_os in
+      sco3.2v5*)
+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+	;;
+    esac
+  fi
+  sys_lib_dlsearch_path_spec='/usr/lib'
+  ;;
+
+tpf*)
+  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+uts4*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+*)
+  dynamic_linker=no
+  ;;
+esac
+AC_MSG_RESULT([$dynamic_linker])
+test no = "$dynamic_linker" && can_build_shared=no
+
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test yes = "$GCC"; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
+if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
+  sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
+fi
+
+if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
+  sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
+fi
+
+# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
+configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
+
+# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
+func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
+
+# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
+configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
+
+_LT_DECL([], [variables_saved_for_relink], [1],
+    [Variables whose values should be saved in libtool wrapper scripts and
+    restored at link time])
+_LT_DECL([], [need_lib_prefix], [0],
+    [Do we need the "lib" prefix for modules?])
+_LT_DECL([], [need_version], [0], [Do we need a version for libraries?])
+_LT_DECL([], [version_type], [0], [Library versioning type])
+_LT_DECL([], [runpath_var], [0],  [Shared library runtime path variable])
+_LT_DECL([], [shlibpath_var], [0],[Shared library path variable])
+_LT_DECL([], [shlibpath_overrides_runpath], [0],
+    [Is shlibpath searched before the hard-coded library search path?])
+_LT_DECL([], [libname_spec], [1], [Format of library name prefix])
+_LT_DECL([], [library_names_spec], [1],
+    [[List of archive names.  First name is the real one, the rest are links.
+    The last name is the one that the linker finds with -lNAME]])
+_LT_DECL([], [soname_spec], [1],
+    [[The coded name of the library, if different from the real name]])
+_LT_DECL([], [install_override_mode], [1],
+    [Permission mode override for installation of shared libraries])
+_LT_DECL([], [postinstall_cmds], [2],
+    [Command to use after installation of a shared archive])
+_LT_DECL([], [postuninstall_cmds], [2],
+    [Command to use after uninstallation of a shared archive])
+_LT_DECL([], [finish_cmds], [2],
+    [Commands used to finish a libtool library installation in a directory])
+_LT_DECL([], [finish_eval], [1],
+    [[As "finish_cmds", except a single script fragment to be evaled but
+    not shown]])
+_LT_DECL([], [hardcode_into_libs], [0],
+    [Whether we should hardcode library paths into libraries])
+_LT_DECL([], [sys_lib_search_path_spec], [2],
+    [Compile-time system search path for libraries])
+_LT_DECL([sys_lib_dlsearch_path_spec], [configure_time_dlsearch_path], [2],
+    [Detected run-time system search path for libraries])
+_LT_DECL([], [configure_time_lt_sys_library_path], [2],
+    [Explicit LT_SYS_LIBRARY_PATH set during ./configure time])
+])# _LT_SYS_DYNAMIC_LINKER
+
+
+# _LT_PATH_TOOL_PREFIX(TOOL)
+# --------------------------
+# find a file program that can recognize shared library
+AC_DEFUN([_LT_PATH_TOOL_PREFIX],
+[m4_require([_LT_DECL_EGREP])dnl
+AC_MSG_CHECKING([for $1])
+AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
+[case $MAGIC_CMD in
+[[\\/*] |  ?:[\\/]*])
+  lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
+  ;;
+*)
+  lt_save_MAGIC_CMD=$MAGIC_CMD
+  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
+dnl $ac_dummy forces splitting on constant user-supplied paths.
+dnl POSIX.2 word splitting is done only on the output of word expansions,
+dnl not every word.  This closes a longstanding sh security hole.
+  ac_dummy="m4_if([$2], , $PATH, [$2])"
+  for ac_dir in $ac_dummy; do
+    IFS=$lt_save_ifs
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$1"; then
+      lt_cv_path_MAGIC_CMD=$ac_dir/"$1"
+      if test -n "$file_magic_test_file"; then
+	case $deplibs_check_method in
+	"file_magic "*)
+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+	  MAGIC_CMD=$lt_cv_path_MAGIC_CMD
+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+	    $EGREP "$file_magic_regex" > /dev/null; then
+	    :
+	  else
+	    cat <<_LT_EOF 1>&2
+
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such.  This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem.  Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool at gnu.org
+
+_LT_EOF
+	  fi ;;
+	esac
+      fi
+      break
+    fi
+  done
+  IFS=$lt_save_ifs
+  MAGIC_CMD=$lt_save_MAGIC_CMD
+  ;;
+esac])
+MAGIC_CMD=$lt_cv_path_MAGIC_CMD
+if test -n "$MAGIC_CMD"; then
+  AC_MSG_RESULT($MAGIC_CMD)
+else
+  AC_MSG_RESULT(no)
+fi
+_LT_DECL([], [MAGIC_CMD], [0],
+	 [Used to examine libraries when file_magic_cmd begins with "file"])dnl
+])# _LT_PATH_TOOL_PREFIX
+
+# Old name:
+AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], [])
+
+
+# _LT_PATH_MAGIC
+# --------------
+# find a file program that can recognize a shared library
+m4_defun([_LT_PATH_MAGIC],
+[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
+if test -z "$lt_cv_path_MAGIC_CMD"; then
+  if test -n "$ac_tool_prefix"; then
+    _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
+  else
+    MAGIC_CMD=:
+  fi
+fi
+])# _LT_PATH_MAGIC
+
+
+# LT_PATH_LD
+# ----------
+# find the pathname to the GNU or non-GNU linker
+AC_DEFUN([LT_PATH_LD],
+[AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_PROG_ECHO_BACKSLASH])dnl
+
+AC_ARG_WITH([gnu-ld],
+    [AS_HELP_STRING([--with-gnu-ld],
+	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
+    [test no = "$withval" || with_gnu_ld=yes],
+    [with_gnu_ld=no])dnl
+
+ac_prog=ld
+if test yes = "$GCC"; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  AC_MSG_CHECKING([for ld used by $CC])
+  case $host in
+  *-*-mingw*)
+    # gcc leaves a trailing carriage return, which upsets mingw
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+  *)
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  esac
+  case $ac_prog in
+    # Accept absolute paths.
+    [[\\/]]* | ?:[[\\/]]*)
+      re_direlt='/[[^/]][[^/]]*/\.\./'
+      # Canonicalize the pathname of ld
+      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
+      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
+	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
+      done
+      test -z "$LD" && LD=$ac_prog
+      ;;
+  "")
+    # If it fails, then pretend we aren't using GCC.
+    ac_prog=ld
+    ;;
+  *)
+    # If it is relative, then search for the first ld in PATH.
+    with_gnu_ld=unknown
+    ;;
+  esac
+elif test yes = "$with_gnu_ld"; then
+  AC_MSG_CHECKING([for GNU ld])
+else
+  AC_MSG_CHECKING([for non-GNU ld])
+fi
+AC_CACHE_VAL(lt_cv_path_LD,
+[if test -z "$LD"; then
+  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
+  for ac_dir in $PATH; do
+    IFS=$lt_save_ifs
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      lt_cv_path_LD=$ac_dir/$ac_prog
+      # Check to see if the program is GNU ld.  I'd rather use --version,
+      # but apparently some variants of GNU ld only accept -v.
+      # Break only if it was the GNU/non-GNU ld that we prefer.
+      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+      *GNU* | *'with BFD'*)
+	test no != "$with_gnu_ld" && break
+	;;
+      *)
+	test yes != "$with_gnu_ld" && break
+	;;
+      esac
+    fi
+  done
+  IFS=$lt_save_ifs
+else
+  lt_cv_path_LD=$LD # Let the user override the test with a path.
+fi])
+LD=$lt_cv_path_LD
+if test -n "$LD"; then
+  AC_MSG_RESULT($LD)
+else
+  AC_MSG_RESULT(no)
+fi
+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
+_LT_PATH_LD_GNU
+AC_SUBST([LD])
+
+_LT_TAGDECL([], [LD], [1], [The linker used to build libraries])
+])# LT_PATH_LD
+
+# Old names:
+AU_ALIAS([AM_PROG_LD], [LT_PATH_LD])
+AU_ALIAS([AC_PROG_LD], [LT_PATH_LD])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_PROG_LD], [])
+dnl AC_DEFUN([AC_PROG_LD], [])
+
+
+# _LT_PATH_LD_GNU
+#- --------------
+m4_defun([_LT_PATH_LD_GNU],
+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
+[# I'd rather use --version here, but apparently some GNU lds only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  lt_cv_prog_gnu_ld=yes
+  ;;
+*)
+  lt_cv_prog_gnu_ld=no
+  ;;
+esac])
+with_gnu_ld=$lt_cv_prog_gnu_ld
+])# _LT_PATH_LD_GNU
+
+
+# _LT_CMD_RELOAD
+# --------------
+# find reload flag for linker
+#   -- PORTME Some linkers may need a different reload flag.
+m4_defun([_LT_CMD_RELOAD],
+[AC_CACHE_CHECK([for $LD option to reload object files],
+  lt_cv_ld_reload_flag,
+  [lt_cv_ld_reload_flag='-r'])
+reload_flag=$lt_cv_ld_reload_flag
+case $reload_flag in
+"" | " "*) ;;
+*) reload_flag=" $reload_flag" ;;
+esac
+reload_cmds='$LD$reload_flag -o $output$reload_objs'
+case $host_os in
+  cygwin* | mingw* | pw32* | cegcc*)
+    if test yes != "$GCC"; then
+      reload_cmds=false
+    fi
+    ;;
+  darwin*)
+    if test yes = "$GCC"; then
+      reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs'
+    else
+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
+    fi
+    ;;
+esac
+_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl
+_LT_TAGDECL([], [reload_cmds], [2])dnl
+])# _LT_CMD_RELOAD
+
+
+# _LT_PATH_DD
+# -----------
+# find a working dd
+m4_defun([_LT_PATH_DD],
+[AC_CACHE_CHECK([for a working dd], [ac_cv_path_lt_DD],
+[printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+: ${lt_DD:=$DD}
+AC_PATH_PROGS_FEATURE_CHECK([lt_DD], [dd],
+[if "$ac_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+  cmp -s conftest.i conftest.out \
+  && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=:
+fi])
+rm -f conftest.i conftest2.i conftest.out])
+])# _LT_PATH_DD
+
+
+# _LT_CMD_TRUNCATE
+# ----------------
+# find command to truncate a binary pipe
+m4_defun([_LT_CMD_TRUNCATE],
+[m4_require([_LT_PATH_DD])
+AC_CACHE_CHECK([how to truncate binary pipes], [lt_cv_truncate_bin],
+[printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+lt_cv_truncate_bin=
+if "$ac_cv_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+  cmp -s conftest.i conftest.out \
+  && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1"
+fi
+rm -f conftest.i conftest2.i conftest.out
+test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"])
+_LT_DECL([lt_truncate_bin], [lt_cv_truncate_bin], [1],
+  [Command to truncate a binary pipe])
+])# _LT_CMD_TRUNCATE
+
+
+# _LT_CHECK_MAGIC_METHOD
+# ----------------------
+# how to check for library dependencies
+#  -- PORTME fill in with the dynamic library characteristics
+m4_defun([_LT_CHECK_MAGIC_METHOD],
+[m4_require([_LT_DECL_EGREP])
+m4_require([_LT_DECL_OBJDUMP])
+AC_CACHE_CHECK([how to recognize dependent libraries],
+lt_cv_deplibs_check_method,
+[lt_cv_file_magic_cmd='$MAGIC_CMD'
+lt_cv_file_magic_test_file=
+lt_cv_deplibs_check_method='unknown'
+# Need to set the preceding variable on all platforms that support
+# interlibrary dependencies.
+# 'none' -- dependencies not supported.
+# 'unknown' -- same as none, but documents that we really don't know.
+# 'pass_all' -- all dependencies passed with no checks.
+# 'test_compile' -- check by making test program.
+# 'file_magic [[regex]]' -- check by looking for files in library path
+# that responds to the $file_magic_cmd with a given extended regex.
+# If you have 'file' or equivalent on your system and you're not sure
+# whether 'pass_all' will *always* work, you probably want this one.
+
+case $host_os in
+aix[[4-9]]*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+beos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+bsdi[[45]]*)
+  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
+  lt_cv_file_magic_cmd='/usr/bin/file -L'
+  lt_cv_file_magic_test_file=/shlib/libc.so
+  ;;
+
+cygwin*)
+  # func_win32_libid is a shell function defined in ltmain.sh
+  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+  lt_cv_file_magic_cmd='func_win32_libid'
+  ;;
+
+mingw* | pw32*)
+  # Base MSYS/MinGW do not provide the 'file' command needed by
+  # func_win32_libid shell function, so use a weaker test based on 'objdump',
+  # unless we find 'file', for example because we are cross-compiling.
+  if ( file / ) >/dev/null 2>&1; then
+    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+    lt_cv_file_magic_cmd='func_win32_libid'
+  else
+    # Keep this pattern in sync with the one in func_win32_libid.
+    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
+    lt_cv_file_magic_cmd='$OBJDUMP -f'
+  fi
+  ;;
+
+cegcc*)
+  # use the weaker test based on 'objdump'. See mingw*.
+  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
+  lt_cv_file_magic_cmd='$OBJDUMP -f'
+  ;;
+
+darwin* | rhapsody*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+freebsd* | dragonfly*)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    case $host_cpu in
+    i*86 )
+      # Not sure whether the presence of OpenBSD here was a mistake.
+      # Let's accept both of them until this is cleared up.
+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
+      lt_cv_file_magic_cmd=/usr/bin/file
+      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+      ;;
+    esac
+  else
+    lt_cv_deplibs_check_method=pass_all
+  fi
+  ;;
+
+haiku*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+hpux10.20* | hpux11*)
+  lt_cv_file_magic_cmd=/usr/bin/file
+  case $host_cpu in
+  ia64*)
+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
+    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+    ;;
+  hppa*64*)
+    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]']
+    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
+    ;;
+  *)
+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library'
+    lt_cv_file_magic_test_file=/usr/lib/libc.sl
+    ;;
+  esac
+  ;;
+
+interix[[3-9]]*)
+  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $LD in
+  *-32|*"-32 ") libmagic=32-bit;;
+  *-n32|*"-n32 ") libmagic=N32;;
+  *-64|*"-64 ") libmagic=64-bit;;
+  *) libmagic=never-match;;
+  esac
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+netbsd*)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
+  fi
+  ;;
+
+newos6*)
+  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
+  lt_cv_file_magic_cmd=/usr/bin/file
+  lt_cv_file_magic_test_file=/usr/lib/libnls.so
+  ;;
+
+*nto* | *qnx*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+openbsd* | bitrig*)
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+  fi
+  ;;
+
+osf3* | osf4* | osf5*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+rdos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+solaris*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv4 | sysv4.3*)
+  case $host_vendor in
+  motorola)
+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
+    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+    ;;
+  ncr)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  sequent)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
+    ;;
+  sni)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
+    lt_cv_file_magic_test_file=/lib/libc.so
+    ;;
+  siemens)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  pc)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  esac
+  ;;
+
+tpf*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+os2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+esac
+])
+
+file_magic_glob=
+want_nocaseglob=no
+if test "$build" = "$host"; then
+  case $host_os in
+  mingw* | pw32*)
+    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
+      want_nocaseglob=yes
+    else
+      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"`
+    fi
+    ;;
+  esac
+fi
+
+file_magic_cmd=$lt_cv_file_magic_cmd
+deplibs_check_method=$lt_cv_deplibs_check_method
+test -z "$deplibs_check_method" && deplibs_check_method=unknown
+
+_LT_DECL([], [deplibs_check_method], [1],
+    [Method to check whether dependent libraries are shared objects])
+_LT_DECL([], [file_magic_cmd], [1],
+    [Command to use when deplibs_check_method = "file_magic"])
+_LT_DECL([], [file_magic_glob], [1],
+    [How to find potential files when deplibs_check_method = "file_magic"])
+_LT_DECL([], [want_nocaseglob], [1],
+    [Find potential files using nocaseglob when deplibs_check_method = "file_magic"])
+])# _LT_CHECK_MAGIC_METHOD
+
+
+# LT_PATH_NM
+# ----------
+# find the pathname to a BSD- or MS-compatible name lister
+AC_DEFUN([LT_PATH_NM],
+[AC_REQUIRE([AC_PROG_CC])dnl
+AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM,
+[if test -n "$NM"; then
+  # Let the user override the test.
+  lt_cv_path_NM=$NM
+else
+  lt_nm_to_check=${ac_tool_prefix}nm
+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+    lt_nm_to_check="$lt_nm_to_check nm"
+  fi
+  for lt_tmp_nm in $lt_nm_to_check; do
+    lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+      IFS=$lt_save_ifs
+      test -z "$ac_dir" && ac_dir=.
+      tmp_nm=$ac_dir/$lt_tmp_nm
+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then
+	# Check to see if the nm accepts a BSD-compat flag.
+	# Adding the 'sed 1q' prevents false positives on HP-UX, which says:
+	#   nm: unknown option "B" ignored
+	# Tru64's nm complains that /dev/null is an invalid object file
+	# MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty
+	case $build_os in
+	mingw*) lt_bad_file=conftest.nm/nofile ;;
+	*) lt_bad_file=/dev/null ;;
+	esac
+	case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in
+	*$lt_bad_file* | *'Invalid file or object type'*)
+	  lt_cv_path_NM="$tmp_nm -B"
+	  break 2
+	  ;;
+	*)
+	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+	  */dev/null*)
+	    lt_cv_path_NM="$tmp_nm -p"
+	    break 2
+	    ;;
+	  *)
+	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	    continue # so that we can try to find one that supports BSD flags
+	    ;;
+	  esac
+	  ;;
+	esac
+      fi
+    done
+    IFS=$lt_save_ifs
+  done
+  : ${lt_cv_path_NM=no}
+fi])
+if test no != "$lt_cv_path_NM"; then
+  NM=$lt_cv_path_NM
+else
+  # Didn't find any BSD compatible name lister, look for dumpbin.
+  if test -n "$DUMPBIN"; then :
+    # Let the user override the test.
+  else
+    AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)
+    case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in
+    *COFF*)
+      DUMPBIN="$DUMPBIN -symbols -headers"
+      ;;
+    *)
+      DUMPBIN=:
+      ;;
+    esac
+  fi
+  AC_SUBST([DUMPBIN])
+  if test : != "$DUMPBIN"; then
+    NM=$DUMPBIN
+  fi
+fi
+test -z "$NM" && NM=nm
+AC_SUBST([NM])
+_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl
+
+AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
+  [lt_cv_nm_interface="BSD nm"
+  echo "int some_variable = 0;" > conftest.$ac_ext
+  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
+  (eval "$ac_compile" 2>conftest.err)
+  cat conftest.err >&AS_MESSAGE_LOG_FD
+  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
+  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+  cat conftest.err >&AS_MESSAGE_LOG_FD
+  (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD)
+  cat conftest.out >&AS_MESSAGE_LOG_FD
+  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+    lt_cv_nm_interface="MS dumpbin"
+  fi
+  rm -f conftest*])
+])# LT_PATH_NM
+
+# Old names:
+AU_ALIAS([AM_PROG_NM], [LT_PATH_NM])
+AU_ALIAS([AC_PROG_NM], [LT_PATH_NM])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_PROG_NM], [])
+dnl AC_DEFUN([AC_PROG_NM], [])
+
+# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
+# --------------------------------
+# how to determine the name of the shared library
+# associated with a specific link library.
+#  -- PORTME fill in with the dynamic library characteristics
+m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB],
+[m4_require([_LT_DECL_EGREP])
+m4_require([_LT_DECL_OBJDUMP])
+m4_require([_LT_DECL_DLLTOOL])
+AC_CACHE_CHECK([how to associate runtime and link libraries],
+lt_cv_sharedlib_from_linklib_cmd,
+[lt_cv_sharedlib_from_linklib_cmd='unknown'
+
+case $host_os in
+cygwin* | mingw* | pw32* | cegcc*)
+  # two different shell functions defined in ltmain.sh;
+  # decide which one to use based on capabilities of $DLLTOOL
+  case `$DLLTOOL --help 2>&1` in
+  *--identify-strict*)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
+    ;;
+  *)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
+    ;;
+  esac
+  ;;
+*)
+  # fallback: assume linklib IS sharedlib
+  lt_cv_sharedlib_from_linklib_cmd=$ECHO
+  ;;
+esac
+])
+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
+
+_LT_DECL([], [sharedlib_from_linklib_cmd], [1],
+    [Command to associate shared and link libraries])
+])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
+
+
+# _LT_PATH_MANIFEST_TOOL
+# ----------------------
+# locate the manifest tool
+m4_defun([_LT_PATH_MANIFEST_TOOL],
+[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
+AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],
+  [lt_cv_path_mainfest_tool=no
+  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
+  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
+  cat conftest.err >&AS_MESSAGE_LOG_FD
+  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
+    lt_cv_path_mainfest_tool=yes
+  fi
+  rm -f conftest*])
+if test yes != "$lt_cv_path_mainfest_tool"; then
+  MANIFEST_TOOL=:
+fi
+_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
+])# _LT_PATH_MANIFEST_TOOL
+
+
+# _LT_DLL_DEF_P([FILE])
+# ---------------------
+# True iff FILE is a Windows DLL '.def' file.
+# Keep in sync with func_dll_def_p in the libtool script
+AC_DEFUN([_LT_DLL_DEF_P],
+[dnl
+  test DEF = "`$SED -n dnl
+    -e '\''s/^[[	 ]]*//'\'' dnl Strip leading whitespace
+    -e '\''/^\(;.*\)*$/d'\'' dnl      Delete empty lines and comments
+    -e '\''s/^\(EXPORTS\|LIBRARY\)\([[	 ]].*\)*$/DEF/p'\'' dnl
+    -e q dnl                          Only consider the first "real" line
+    $1`" dnl
+])# _LT_DLL_DEF_P
+
+
+# LT_LIB_M
+# --------
+# check for math library
+AC_DEFUN([LT_LIB_M],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+LIBM=
+case $host in
+*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
+  # These system don't have libm, or don't need it
+  ;;
+*-ncr-sysv4.3*)
+  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM=-lmw)
+  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
+  ;;
+*)
+  AC_CHECK_LIB(m, cos, LIBM=-lm)
+  ;;
+esac
+AC_SUBST([LIBM])
+])# LT_LIB_M
+
+# Old name:
+AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_CHECK_LIBM], [])
+
+
+# _LT_COMPILER_NO_RTTI([TAGNAME])
+# -------------------------------
+m4_defun([_LT_COMPILER_NO_RTTI],
+[m4_require([_LT_TAG_COMPILER])dnl
+
+_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+
+if test yes = "$GCC"; then
+  case $cc_basename in
+  nvcc*)
+    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
+  *)
+    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;;
+  esac
+
+  _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
+    lt_cv_prog_compiler_rtti_exceptions,
+    [-fno-rtti -fno-exceptions], [],
+    [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
+fi
+_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1],
+	[Compiler flag to turn off builtin functions])
+])# _LT_COMPILER_NO_RTTI
+
+
+# _LT_CMD_GLOBAL_SYMBOLS
+# ----------------------
+m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_PROG_AWK])dnl
+AC_REQUIRE([LT_PATH_NM])dnl
+AC_REQUIRE([LT_PATH_LD])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_TAG_COMPILER])dnl
+
+# Check for command to grab the raw symbol name followed by C symbol from nm.
+AC_MSG_CHECKING([command to parse $NM output from $compiler object])
+AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
+[
+# These are sane defaults that work on at least a few old systems.
+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
+
+# Character class describing NM global symbol codes.
+symcode='[[BCDEGRST]]'
+
+# Regexp to match symbols that can be accessed directly from C.
+sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
+
+# Define system-specific variables.
+case $host_os in
+aix*)
+  symcode='[[BCDT]]'
+  ;;
+cygwin* | mingw* | pw32* | cegcc*)
+  symcode='[[ABCDGISTW]]'
+  ;;
+hpux*)
+  if test ia64 = "$host_cpu"; then
+    symcode='[[ABCDEGRST]]'
+  fi
+  ;;
+irix* | nonstopux*)
+  symcode='[[BCDEGRST]]'
+  ;;
+osf*)
+  symcode='[[BCDEGQRST]]'
+  ;;
+solaris*)
+  symcode='[[BDRT]]'
+  ;;
+sco3.2v5*)
+  symcode='[[DT]]'
+  ;;
+sysv4.2uw2*)
+  symcode='[[DT]]'
+  ;;
+sysv5* | sco5v6* | unixware* | OpenUNIX*)
+  symcode='[[ABDT]]'
+  ;;
+sysv4)
+  symcode='[[DFNSTU]]'
+  ;;
+esac
+
+# If we're using GNU nm, then use its standard symbol codes.
+case `$NM -V 2>&1` in
+*GNU* | *'with BFD'*)
+  symcode='[[ABCDGIRSTW]]' ;;
+esac
+
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+  # Gets list of data symbols to import.
+  lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'"
+  # Adjust the below global symbol transforms to fixup imported variables.
+  lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'"
+  lt_c_name_hook=" -e 's/^I .* \(.*\)$/  {\"\1\", (void *) 0},/p'"
+  lt_c_name_lib_hook="\
+  -e 's/^I .* \(lib.*\)$/  {\"\1\", (void *) 0},/p'\
+  -e 's/^I .* \(.*\)$/  {\"lib\1\", (void *) 0},/p'"
+else
+  # Disable hooks by default.
+  lt_cv_sys_global_symbol_to_import=
+  lt_cdecl_hook=
+  lt_c_name_hook=
+  lt_c_name_lib_hook=
+fi
+
+# Transform an extracted symbol line into a proper C declaration.
+# Some systems (esp. on ia64) link data and code symbols differently,
+# so use this general approach.
+lt_cv_sys_global_symbol_to_cdecl="sed -n"\
+$lt_cdecl_hook\
+" -e 's/^T .* \(.*\)$/extern int \1();/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'"
+
+# Transform an extracted symbol line into symbol name and symbol address
+lt_cv_sys_global_symbol_to_c_name_address="sed -n"\
+$lt_c_name_hook\
+" -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/p'"
+
+# Transform an extracted symbol line into symbol name with lib prefix and
+# symbol address.
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\
+$lt_c_name_lib_hook\
+" -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* \(lib.*\)$/  {\"\1\", (void *) \&\1},/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"lib\1\", (void *) \&\1},/p'"
+
+# Handle CRLF in mingw tool chain
+opt_cr=
+case $build_os in
+mingw*)
+  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
+  ;;
+esac
+
+# Try without a prefix underscore, then with it.
+for ac_symprfx in "" "_"; do
+
+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
+  symxfrm="\\1 $ac_symprfx\\2 \\2"
+
+  # Write the raw and C identifiers.
+  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+    # Fake it for dumpbin and say T for any non-static function,
+    # D for any global variable and I for any imported variable.
+    # Also find C++ and __fastcall symbols from MSVC++,
+    # which start with @ or ?.
+    lt_cv_sys_global_symbol_pipe="$AWK ['"\
+"     {last_section=section; section=\$ 3};"\
+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
+"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
+"     /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\
+"     /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\
+"     /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\
+"     \$ 0!~/External *\|/{next};"\
+"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
+"     {if(hide[section]) next};"\
+"     {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\
+"     {split(\$ 0,a,/\||\r/); split(a[2],s)};"\
+"     s[1]~/^[@?]/{print f,s[1],s[1]; next};"\
+"     s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\
+"     ' prfx=^$ac_symprfx]"
+  else
+    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[	 ]]\($symcode$symcode*\)[[	 ]][[	 ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+  fi
+  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
+
+  # Check to see that the pipe works correctly.
+  pipe_works=no
+
+  rm -f conftest*
+  cat > conftest.$ac_ext <<_LT_EOF
+#ifdef __cplusplus
+extern "C" {
+#endif
+char nm_test_var;
+void nm_test_func(void);
+void nm_test_func(void){}
+#ifdef __cplusplus
+}
+#endif
+int main(){nm_test_var='a';nm_test_func();return(0);}
+_LT_EOF
+
+  if AC_TRY_EVAL(ac_compile); then
+    # Now try to grab the symbols.
+    nlist=conftest.nm
+    if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
+      # Try sorting and uniquifying the output.
+      if sort "$nlist" | uniq > "$nlist"T; then
+	mv -f "$nlist"T "$nlist"
+      else
+	rm -f "$nlist"T
+      fi
+
+      # Make sure that we snagged all the symbols we need.
+      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
+	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
+	  cat <<_LT_EOF > conftest.$ac_ext
+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
+#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
+/* DATA imports from DLLs on WIN32 can't be const, because runtime
+   relocations are performed -- see ld's documentation on pseudo-relocs.  */
+# define LT@&t at _DLSYM_CONST
+#elif defined __osf__
+/* This system does not cope well with relocations in const data.  */
+# define LT@&t at _DLSYM_CONST
+#else
+# define LT@&t at _DLSYM_CONST const
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+_LT_EOF
+	  # Now generate the symbol file.
+	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
+
+	  cat <<_LT_EOF >> conftest.$ac_ext
+
+/* The mapping between symbol names and symbols.  */
+LT@&t at _DLSYM_CONST struct {
+  const char *name;
+  void       *address;
+}
+lt__PROGRAM__LTX_preloaded_symbols[[]] =
+{
+  { "@PROGRAM@", (void *) 0 },
+_LT_EOF
+	  $SED "s/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
+	  cat <<\_LT_EOF >> conftest.$ac_ext
+  {0, (void *) 0}
+};
+
+/* This works around a problem in FreeBSD linker */
+#ifdef FREEBSD_WORKAROUND
+static const void *lt_preloaded_setup() {
+  return lt__PROGRAM__LTX_preloaded_symbols;
+}
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+_LT_EOF
+	  # Now try linking the two files.
+	  mv conftest.$ac_objext conftstm.$ac_objext
+	  lt_globsym_save_LIBS=$LIBS
+	  lt_globsym_save_CFLAGS=$CFLAGS
+	  LIBS=conftstm.$ac_objext
+	  CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
+	  if AC_TRY_EVAL(ac_link) && test -s conftest$ac_exeext; then
+	    pipe_works=yes
+	  fi
+	  LIBS=$lt_globsym_save_LIBS
+	  CFLAGS=$lt_globsym_save_CFLAGS
+	else
+	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
+	fi
+      else
+	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
+      fi
+    else
+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
+    fi
+  else
+    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
+    cat conftest.$ac_ext >&5
+  fi
+  rm -rf conftest* conftst*
+
+  # Do not use the global_symbol_pipe unless it works.
+  if test yes = "$pipe_works"; then
+    break
+  else
+    lt_cv_sys_global_symbol_pipe=
+  fi
+done
+])
+if test -z "$lt_cv_sys_global_symbol_pipe"; then
+  lt_cv_sys_global_symbol_to_cdecl=
+fi
+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
+  AC_MSG_RESULT(failed)
+else
+  AC_MSG_RESULT(ok)
+fi
+
+# Response file support.
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+  nm_file_list_spec='@'
+elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then
+  nm_file_list_spec='@'
+fi
+
+_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
+    [Take the output of nm and produce a listing of raw symbols and C names])
+_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
+    [Transform the output of nm in a proper C declaration])
+_LT_DECL([global_symbol_to_import], [lt_cv_sys_global_symbol_to_import], [1],
+    [Transform the output of nm into a list of symbols to manually relocate])
+_LT_DECL([global_symbol_to_c_name_address],
+    [lt_cv_sys_global_symbol_to_c_name_address], [1],
+    [Transform the output of nm in a C name address pair])
+_LT_DECL([global_symbol_to_c_name_address_lib_prefix],
+    [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
+    [Transform the output of nm in a C name address pair when lib prefix is needed])
+_LT_DECL([nm_interface], [lt_cv_nm_interface], [1],
+    [The name lister interface])
+_LT_DECL([], [nm_file_list_spec], [1],
+    [Specify filename containing input files for $NM])
+]) # _LT_CMD_GLOBAL_SYMBOLS
+
+
+# _LT_COMPILER_PIC([TAGNAME])
+# ---------------------------
+m4_defun([_LT_COMPILER_PIC],
+[m4_require([_LT_TAG_COMPILER])dnl
+_LT_TAGVAR(lt_prog_compiler_wl, $1)=
+_LT_TAGVAR(lt_prog_compiler_pic, $1)=
+_LT_TAGVAR(lt_prog_compiler_static, $1)=
+
+m4_if([$1], [CXX], [
+  # C++ specific cases for pic, static, wl, etc.
+  if test yes = "$GXX"; then
+    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+
+    case $host_os in
+    aix*)
+      # All AIX code is PIC.
+      if test ia64 = "$host_cpu"; then
+	# AIX 5 now supports IA64 processor
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the '-m68020' flag to GCC prevents building anything better,
+            # like '-m68040'.
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
+      ;;
+
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+    mingw* | cygwin* | os2* | pw32* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      m4_if([$1], [GCJ], [],
+	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      case $host_os in
+      os2*)
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
+	;;
+      esac
+      ;;
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+      ;;
+    *djgpp*)
+      # DJGPP does not support shared libraries at all
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+      ;;
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)=
+      ;;
+    interix[[3-9]]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+      fi
+      ;;
+    hpux*)
+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
+      # sets the default TLS model and affects inlining.
+      case $host_cpu in
+      hppa*64*)
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	;;
+      esac
+      ;;
+    *qnx* | *nto*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+      ;;
+    *)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      ;;
+    esac
+  else
+    case $host_os in
+      aix[[4-9]]*)
+	# All AIX code is PIC.
+	if test ia64 = "$host_cpu"; then
+	  # AIX 5 now supports IA64 processor
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	else
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+	fi
+	;;
+      chorus*)
+	case $cc_basename in
+	cxch68*)
+	  # Green Hills C++ Compiler
+	  # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
+	  ;;
+	esac
+	;;
+      mingw* | cygwin* | os2* | pw32* | cegcc*)
+	# This hack is so that the source file can tell whether it is being
+	# built for inclusion in a dll (and should export symbols for example).
+	m4_if([$1], [GCJ], [],
+	  [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+	;;
+      dgux*)
+	case $cc_basename in
+	  ec++*)
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    ;;
+	  ghcx*)
+	    # Green Hills C++ Compiler
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      freebsd* | dragonfly*)
+	# FreeBSD uses GNU C++
+	;;
+      hpux9* | hpux10* | hpux11*)
+	case $cc_basename in
+	  CC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
+	    if test ia64 != "$host_cpu"; then
+	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	    fi
+	    ;;
+	  aCC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
+	    case $host_cpu in
+	    hppa*64*|ia64*)
+	      # +Z the default
+	      ;;
+	    *)
+	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	      ;;
+	    esac
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      interix*)
+	# This is c89, which is MS Visual C++ (no shared libs)
+	# Anyone wants to do a port?
+	;;
+      irix5* | irix6* | nonstopux*)
+	case $cc_basename in
+	  CC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    # CC pic flag -KPIC is the default.
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+	case $cc_basename in
+	  KCC*)
+	    # KAI C++ Compiler
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	    ;;
+	  ecpc* )
+	    # old Intel C++ for x86_64, which still supported -KPIC.
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	    ;;
+	  icpc* )
+	    # Intel C++, used to be incompatible with GCC.
+	    # ICC 10 doesn't accept -KPIC any more.
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	    ;;
+	  pgCC* | pgcpp*)
+	    # Portland Group C++ compiler
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	  cxx*)
+	    # Compaq C++
+	    # Make sure the PIC flag is empty.  It appears that all Alpha
+	    # Linux and Compaq Tru64 Unix objects are PIC.
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    ;;
+	  xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*)
+	    # IBM XL 8.0, 9.0 on PPC and BlueGene
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
+	    ;;
+	  *)
+	    case `$CC -V 2>&1 | sed 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	      ;;
+	    esac
+	    ;;
+	esac
+	;;
+      lynxos*)
+	;;
+      m88k*)
+	;;
+      mvs*)
+	case $cc_basename in
+	  cxx*)
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      netbsd*)
+	;;
+      *qnx* | *nto*)
+        # QNX uses GNU C++, but need to define -shared option too, otherwise
+        # it will coredump.
+        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+        ;;
+      osf3* | osf4* | osf5*)
+	case $cc_basename in
+	  KCC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+	    ;;
+	  RCC*)
+	    # Rational C++ 2.4.1
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  cxx*)
+	    # Digital/Compaq C++
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    # Make sure the PIC flag is empty.  It appears that all Alpha
+	    # Linux and Compaq Tru64 Unix objects are PIC.
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      psos*)
+	;;
+      solaris*)
+	case $cc_basename in
+	  CC* | sunCC*)
+	    # Sun C++ 4.2, 5.x and Centerline C++
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	    ;;
+	  gcx*)
+	    # Green Hills C++ Compiler
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      sunos4*)
+	case $cc_basename in
+	  CC*)
+	    # Sun C++ 4.x
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	  lcc*)
+	    # Lucid
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+	case $cc_basename in
+	  CC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	esac
+	;;
+      tandem*)
+	case $cc_basename in
+	  NCC*)
+	    # NonStop-UX NCC 3.20
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      vxworks*)
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+	;;
+    esac
+  fi
+],
+[
+  if test yes = "$GCC"; then
+    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+
+    case $host_os in
+      aix*)
+      # All AIX code is PIC.
+      if test ia64 = "$host_cpu"; then
+	# AIX 5 now supports IA64 processor
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the '-m68020' flag to GCC prevents building anything better,
+            # like '-m68040'.
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
+      ;;
+
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      m4_if([$1], [GCJ], [],
+	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      case $host_os in
+      os2*)
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
+	;;
+      esac
+      ;;
+
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+      ;;
+
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)=
+      ;;
+
+    hpux*)
+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
+      # sets the default TLS model and affects inlining.
+      case $host_cpu in
+      hppa*64*)
+	# +Z the default
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	;;
+      esac
+      ;;
+
+    interix[[3-9]]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+
+    msdosdjgpp*)
+      # Just because we use GCC doesn't mean we suddenly get shared libraries
+      # on systems that don't support them.
+      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      enable_shared=no
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+      fi
+      ;;
+
+    *)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      ;;
+    esac
+
+    case $cc_basename in
+    nvcc*) # Cuda Compiler Driver 2.2
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
+      if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
+        _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)"
+      fi
+      ;;
+    esac
+  else
+    # PORTME Check for flag to pass linker flags through the system compiler.
+    case $host_os in
+    aix*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      if test ia64 = "$host_cpu"; then
+	# AIX 5 now supports IA64 processor
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      else
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+      fi
+      ;;
+
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+      case $cc_basename in
+      nagfor*)
+        # NAG Fortran compiler
+        _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
+        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+        _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+        ;;
+      esac
+      ;;
+
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      m4_if([$1], [GCJ], [],
+	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      case $host_os in
+      os2*)
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
+	;;
+      esac
+      ;;
+
+    hpux9* | hpux10* | hpux11*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case $host_cpu in
+      hppa*64*|ia64*)
+	# +Z the default
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	;;
+      esac
+      # Is there a better lt_prog_compiler_static that works with the bundled CC?
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # PIC (with -KPIC) is the default.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+      case $cc_basename in
+      # old Intel for x86_64, which still supported -KPIC.
+      ecc*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+        ;;
+      # icc used to be incompatible with GCC.
+      # ICC 10 doesn't accept -KPIC any more.
+      icc* | ifort*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+        ;;
+      # Lahey Fortran 8.1.
+      lf95*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
+	;;
+      nagfor*)
+	# NAG Fortran compiler
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	;;
+      tcc*)
+	# Fabrice Bellard et al's Tiny C Compiler
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	;;
+      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
+        # Portland Group compilers (*not* the Pentium gcc compiler,
+	# which looks to be a dead project)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+        ;;
+      ccc*)
+        _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+        # All Alpha code is PIC.
+        _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+        ;;
+      xl* | bgxl* | bgf* | mpixl*)
+	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
+	;;
+      *)
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
+	  ;;
+	*Sun\ F* | *Sun*Fortran*)
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	  ;;
+	*Sun\ C*)
+	  # Sun C 5.9
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  ;;
+        *Intel*\ [[CF]]*Compiler*)
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	  ;;
+	*Portland\ Group*)
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  ;;
+	esac
+	;;
+      esac
+      ;;
+
+    newsos6)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+      ;;
+
+    osf3* | osf4* | osf5*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # All OSF/1 code is PIC.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    rdos*)
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    solaris*)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      case $cc_basename in
+      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
+      esac
+      ;;
+
+    sunos4*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    sysv4 | sysv4.2uw2* | sysv4.3*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      ;;
+
+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    unicos*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      ;;
+
+    uts4*)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    *)
+      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      ;;
+    esac
+  fi
+])
+case $host_os in
+  # For platforms that do not support PIC, -DPIC is meaningless:
+  *djgpp*)
+    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+    ;;
+  *)
+    _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t at m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
+    ;;
+esac
+
+AC_CACHE_CHECK([for $compiler option to produce PIC],
+  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)],
+  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
+_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
+
+#
+# Check to make sure the PIC flag actually works.
+#
+if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
+  _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works],
+    [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)],
+    [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t at m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [],
+    [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in
+     "" | " "*) ;;
+     *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;;
+     esac],
+    [_LT_TAGVAR(lt_prog_compiler_pic, $1)=
+     _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
+fi
+_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
+	[Additional compiler flags for building library objects])
+
+_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
+	[How to pass a linker flag through the compiler])
+#
+# Check to make sure the static flag actually works.
+#
+wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\"
+_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
+  _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1),
+  $lt_tmp_static_flag,
+  [],
+  [_LT_TAGVAR(lt_prog_compiler_static, $1)=])
+_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
+	[Compiler flag to prevent dynamic linking])
+])# _LT_COMPILER_PIC
+
+
+# _LT_LINKER_SHLIBS([TAGNAME])
+# ----------------------------
+# See if the linker supports building shared libraries.
+m4_defun([_LT_LINKER_SHLIBS],
+[AC_REQUIRE([LT_PATH_LD])dnl
+AC_REQUIRE([LT_PATH_NM])dnl
+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
+m4_require([_LT_TAG_COMPILER])dnl
+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+m4_if([$1], [CXX], [
+  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+  case $host_os in
+  aix[[4-9]]*)
+    # If we're using GNU nm, then we don't want the "-C" option.
+    # -C means demangle to GNU nm, but means don't demangle to AIX nm.
+    # Without the "-l" option, or with the "-B" option, AIX nm treats
+    # weak defined symbols like other global defined symbols, whereas
+    # GNU nm marks them as "W".
+    # While the 'weak' keyword is ignored in the Export File, we need
+    # it in the Import File for the 'aix-soname' feature, so we have
+    # to replace the "-B" option with "-P" for AIX nm.
+    if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
+    else
+      _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
+    fi
+    ;;
+  pw32*)
+    _LT_TAGVAR(export_symbols_cmds, $1)=$ltdll_cmds
+    ;;
+  cygwin* | mingw* | cegcc*)
+    case $cc_basename in
+    cl*)
+      _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+      ;;
+    *)
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
+      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
+      ;;
+    esac
+    ;;
+  *)
+    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+    ;;
+  esac
+], [
+  runpath_var=
+  _LT_TAGVAR(allow_undefined_flag, $1)=
+  _LT_TAGVAR(always_export_symbols, $1)=no
+  _LT_TAGVAR(archive_cmds, $1)=
+  _LT_TAGVAR(archive_expsym_cmds, $1)=
+  _LT_TAGVAR(compiler_needs_object, $1)=no
+  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+  _LT_TAGVAR(export_dynamic_flag_spec, $1)=
+  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  _LT_TAGVAR(hardcode_automatic, $1)=no
+  _LT_TAGVAR(hardcode_direct, $1)=no
+  _LT_TAGVAR(hardcode_direct_absolute, $1)=no
+  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+  _LT_TAGVAR(hardcode_libdir_separator, $1)=
+  _LT_TAGVAR(hardcode_minus_L, $1)=no
+  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+  _LT_TAGVAR(inherit_rpath, $1)=no
+  _LT_TAGVAR(link_all_deplibs, $1)=unknown
+  _LT_TAGVAR(module_cmds, $1)=
+  _LT_TAGVAR(module_expsym_cmds, $1)=
+  _LT_TAGVAR(old_archive_from_new_cmds, $1)=
+  _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)=
+  _LT_TAGVAR(thread_safe_flag_spec, $1)=
+  _LT_TAGVAR(whole_archive_flag_spec, $1)=
+  # include_expsyms should be a list of space-separated symbols to be *always*
+  # included in the symbol list
+  _LT_TAGVAR(include_expsyms, $1)=
+  # exclude_expsyms can be an extended regexp of symbols to exclude
+  # it will be wrapped by ' (' and ')$', so one must not match beginning or
+  # end of line.  Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc',
+  # as well as any symbol that contains 'd'.
+  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+  # platforms (ab)use it in PIC code, but their linkers get confused if
+  # the symbol is explicitly referenced.  Since portable code cannot
+  # rely on this symbol name, it's probably fine to never include it in
+  # preloaded symbol tables.
+  # Exclude shared library initialization/finalization symbols.
+dnl Note also adjust exclude_expsyms for C++ above.
+  extract_expsyms_cmds=
+
+  case $host_os in
+  cygwin* | mingw* | pw32* | cegcc*)
+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+    # When not using gcc, we currently assume that we are using
+    # Microsoft Visual C++.
+    if test yes != "$GCC"; then
+      with_gnu_ld=no
+    fi
+    ;;
+  interix*)
+    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    with_gnu_ld=yes
+    ;;
+  openbsd* | bitrig*)
+    with_gnu_ld=no
+    ;;
+  esac
+
+  _LT_TAGVAR(ld_shlibs, $1)=yes
+
+  # On some targets, GNU ld is compatible enough with the native linker
+  # that we're better off using the native interface for both.
+  lt_use_gnu_ld_interface=no
+  if test yes = "$with_gnu_ld"; then
+    case $host_os in
+      aix*)
+	# The AIX port of GNU ld has always aspired to compatibility
+	# with the native linker.  However, as the warning in the GNU ld
+	# block says, versions before 2.19.5* couldn't really create working
+	# shared libraries, regardless of the interface used.
+	case `$LD -v 2>&1` in
+	  *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
+	  *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;;
+	  *\ \(GNU\ Binutils\)\ [[3-9]]*) ;;
+	  *)
+	    lt_use_gnu_ld_interface=yes
+	    ;;
+	esac
+	;;
+      *)
+	lt_use_gnu_ld_interface=yes
+	;;
+    esac
+  fi
+
+  if test yes = "$lt_use_gnu_ld_interface"; then
+    # If archive_cmds runs LD, not CC, wlarc should be empty
+    wlarc='$wl'
+
+    # Set some defaults for GNU ld with shared library support. These
+    # are reset later if shared libraries are not supported. Putting them
+    # here allows them to be overridden if necessary.
+    runpath_var=LD_RUN_PATH
+    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+    # ancient GNU ld didn't support --whole-archive et. al.
+    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
+      _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
+    else
+      _LT_TAGVAR(whole_archive_flag_spec, $1)=
+    fi
+    supports_anon_versioning=no
+    case `$LD -v | $SED -e 's/([^)]\+)\s\+//' 2>&1` in
+      *GNU\ gold*) supports_anon_versioning=yes ;;
+      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+      *\ 2.11.*) ;; # other 2.11 versions
+      *) supports_anon_versioning=yes ;;
+    esac
+
+    # See if GNU ld supports shared libraries.
+    case $host_os in
+    aix[[3-9]]*)
+      # On AIX/PPC, the GNU linker is very broken
+      if test ia64 != "$host_cpu"; then
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: the GNU linker, at least up to release 2.19, is reported
+*** to be unable to reliably create shared libraries on AIX.
+*** Therefore, libtool is disabling shared libraries support.  If you
+*** really care for shared libraries, you may want to install binutils
+*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
+*** You will then need to restart the configuration process.
+
+_LT_EOF
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+            _LT_TAGVAR(archive_expsym_cmds, $1)=''
+        ;;
+      m68k)
+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+            _LT_TAGVAR(hardcode_minus_L, $1)=yes
+        ;;
+      esac
+      ;;
+
+    beos*)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
+	# support --undefined.  This deserves some investigation.  FIXME
+	_LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    cygwin* | mingw* | pw32* | cegcc*)
+      # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+      # as there is no search path for DLLs.
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols'
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_TAGVAR(always_export_symbols, $1)=no
+      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
+      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
+
+      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	# If the export-symbols file already is a .def file, use it as
+	# is; otherwise, prepend EXPORTS...
+	_LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
+          cp $export_symbols $output_objdir/$soname.def;
+        else
+          echo EXPORTS > $output_objdir/$soname.def;
+          cat $export_symbols >> $output_objdir/$soname.def;
+        fi~
+        $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    haiku*)
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    os2*)
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      shrext_cmds=.dll
+      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	prefix_cmds="$SED"~
+	if test EXPORTS = "`$SED 1q $export_symbols`"; then
+	  prefix_cmds="$prefix_cmds -e 1d";
+	fi~
+	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+      ;;
+
+    interix[[3-9]]*)
+      _LT_TAGVAR(hardcode_direct, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+      # Instead, shared libraries are loaded at an image base (0x10000000 by
+      # default) and relocated if they conflict, which is a slow very memory
+      # consuming and fragmenting process.  To avoid this, we pick a random,
+      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      ;;
+
+    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+      tmp_diet=no
+      if test linux-dietlibc = "$host_os"; then
+	case $cc_basename in
+	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
+	esac
+      fi
+      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
+	 && test no = "$tmp_diet"
+      then
+	tmp_addflag=' $pic_flag'
+	tmp_sharedflag='-shared'
+	case $cc_basename,$host_cpu in
+        pgcc*)				# Portland Group C compiler
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+	  tmp_addflag=' $pic_flag'
+	  ;;
+	pgf77* | pgf90* | pgf95* | pgfortran*)
+					# Portland Group f77 and f90 compilers
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+	  tmp_addflag=' $pic_flag -Mnomain' ;;
+	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
+	  tmp_addflag=' -i_dynamic' ;;
+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
+	ifc* | ifort*)			# Intel Fortran compiler
+	  tmp_addflag=' -nofor_main' ;;
+	lf95*)				# Lahey Fortran 8.1
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)=
+	  tmp_sharedflag='--shared' ;;
+        nagfor*)                        # NAGFOR 5.3
+          tmp_sharedflag='-Wl,-shared' ;;
+	xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
+	  tmp_sharedflag='-qmkshrobj'
+	  tmp_addflag= ;;
+	nvcc*)	# Cuda Compiler Driver 2.2
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+	  _LT_TAGVAR(compiler_needs_object, $1)=yes
+	  ;;
+	esac
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)			# Sun C 5.9
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+	  _LT_TAGVAR(compiler_needs_object, $1)=yes
+	  tmp_sharedflag='-G' ;;
+	*Sun\ F*)			# Sun Fortran 8.3
+	  tmp_sharedflag='-G' ;;
+	esac
+	_LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+
+        if test yes = "$supports_anon_versioning"; then
+          _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+            cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+            echo "local: *; };" >> $output_objdir/$libname.ver~
+            $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
+        fi
+
+	case $cc_basename in
+	tcc*)
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='-rdynamic'
+	  ;;
+	xlf* | bgf* | bgxlf* | mpixlf*)
+	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
+	  if test yes = "$supports_anon_versioning"; then
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+              cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+              echo "local: *; };" >> $output_objdir/$libname.ver~
+              $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+	  fi
+	  ;;
+	esac
+      else
+        _LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    netbsd*)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+	wlarc=
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+      fi
+      ;;
+
+    solaris*)
+      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+*** create shared libraries on Solaris systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.9.1 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+      case `$LD -v 2>&1` in
+        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot
+*** reliably create shared libraries on SCO systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+	;;
+	*)
+	  # For security reasons, it is highly recommended that you always
+	  # use absolute paths for naming shared libraries, and exclude the
+	  # DT_RUNPATH tag from executables and libraries.  But doing so
+	  # requires that you compile everything twice, which is a pain.
+	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+	  else
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	  fi
+	;;
+      esac
+      ;;
+
+    sunos4*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      wlarc=
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+    esac
+
+    if test no = "$_LT_TAGVAR(ld_shlibs, $1)"; then
+      runpath_var=
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)=
+      _LT_TAGVAR(whole_archive_flag_spec, $1)=
+    fi
+  else
+    # PORTME fill in a description of your system's linker (not GNU ld)
+    case $host_os in
+    aix3*)
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_TAGVAR(always_export_symbols, $1)=yes
+      _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+      # Note: this linker hardcodes the directories in LIBPATH if there
+      # are no directories specified by -L.
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then
+	# Neither direct hardcoding nor static linking is supported with a
+	# broken collect2.
+	_LT_TAGVAR(hardcode_direct, $1)=unsupported
+      fi
+      ;;
+
+    aix[[4-9]]*)
+      if test ia64 = "$host_cpu"; then
+	# On IA64, the linker does run time linking by default, so we don't
+	# have to do anything special.
+	aix_use_runtimelinking=no
+	exp_sym_flag='-Bexport'
+	no_entry_flag=
+      else
+	# If we're using GNU nm, then we don't want the "-C" option.
+	# -C means demangle to GNU nm, but means don't demangle to AIX nm.
+	# Without the "-l" option, or with the "-B" option, AIX nm treats
+	# weak defined symbols like other global defined symbols, whereas
+	# GNU nm marks them as "W".
+	# While the 'weak' keyword is ignored in the Export File, we need
+	# it in the Import File for the 'aix-soname' feature, so we have
+	# to replace the "-B" option with "-P" for AIX nm.
+	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
+	else
+	  _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
+	fi
+	aix_use_runtimelinking=no
+
+	# Test if we are trying to use run time linking or normal
+	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
+	# have runtime linking enabled, and use it for executables.
+	# For shared libraries, we enable/disable runtime linking
+	# depending on the kind of the shared library created -
+	# when "with_aix_soname,aix_use_runtimelinking" is:
+	# "aix,no"   lib.a(lib.so.V) shared, rtl:no,  for executables
+	# "aix,yes"  lib.so          shared, rtl:yes, for executables
+	#            lib.a           static archive
+	# "both,no"  lib.so.V(shr.o) shared, rtl:yes
+	#            lib.a(lib.so.V) shared, rtl:no,  for executables
+	# "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+	#            lib.a(lib.so.V) shared, rtl:no
+	# "svr4,*"   lib.so.V(shr.o) shared, rtl:yes, for executables
+	#            lib.a           static archive
+	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+	  for ld_flag in $LDFLAGS; do
+	  if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then
+	    aix_use_runtimelinking=yes
+	    break
+	  fi
+	  done
+	  if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+	    # With aix-soname=svr4, we create the lib.so.V shared archives only,
+	    # so we don't have lib.a shared libs to link our executables.
+	    # We have to force runtime linking in this case.
+	    aix_use_runtimelinking=yes
+	    LDFLAGS="$LDFLAGS -Wl,-brtl"
+	  fi
+	  ;;
+	esac
+
+	exp_sym_flag='-bexport'
+	no_entry_flag='-bnoentry'
+      fi
+
+      # When large executables or shared objects are built, AIX ld can
+      # have problems creating the table of contents.  If linking a library
+      # or program results in "error TOC overflow" add -mminimal-toc to
+      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+      _LT_TAGVAR(archive_cmds, $1)=''
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      _LT_TAGVAR(file_list_spec, $1)='$wl-f,'
+      case $with_aix_soname,$aix_use_runtimelinking in
+      aix,*) ;; # traditional, no import file
+      svr4,* | *,yes) # use import file
+	# The Import File defines what to hardcode.
+	_LT_TAGVAR(hardcode_direct, $1)=no
+	_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+	;;
+      esac
+
+      if test yes = "$GCC"; then
+	case $host_os in aix4.[[012]]|aix4.[[012]].*)
+	# We only want to do this on AIX 4.2 and lower, the check
+	# below for broken collect2 doesn't work under 4.3+
+	  collect2name=`$CC -print-prog-name=collect2`
+	  if test -f "$collect2name" &&
+	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+	  then
+	  # We have reworked collect2
+	  :
+	  else
+	  # We have old collect2
+	  _LT_TAGVAR(hardcode_direct, $1)=unsupported
+	  # It fails to find uninstalled libraries when the uninstalled
+	  # path is not listed in the libpath.  Setting hardcode_minus_L
+	  # to unsupported forces relinking
+	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	  _LT_TAGVAR(hardcode_libdir_separator, $1)=
+	  fi
+	  ;;
+	esac
+	shared_flag='-shared'
+	if test yes = "$aix_use_runtimelinking"; then
+	  shared_flag="$shared_flag "'$wl-G'
+	fi
+	# Need to ensure runtime linking is disabled for the traditional
+	# shared library, or the linker may eventually find shared libraries
+	# /with/ Import File - we do not want to mix them.
+	shared_flag_aix='-shared'
+	shared_flag_svr4='-shared $wl-G'
+      else
+	# not using gcc
+	if test ia64 = "$host_cpu"; then
+	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	# chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+	else
+	  if test yes = "$aix_use_runtimelinking"; then
+	    shared_flag='$wl-G'
+	  else
+	    shared_flag='$wl-bM:SRE'
+	  fi
+	  shared_flag_aix='$wl-bM:SRE'
+	  shared_flag_svr4='$wl-G'
+	fi
+      fi
+
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall'
+      # It seems that -bexpall does not export symbols beginning with
+      # underscore (_), so it is better to generate a list of symbols to export.
+      _LT_TAGVAR(always_export_symbols, $1)=yes
+      if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
+	# Warning - without using the other runtime loading flags (-brtl),
+	# -berok will link without error, but may produce a broken library.
+	_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
+        # Determine the default libpath from the value encoded in an
+        # empty executable.
+        _LT_SYS_MODULE_PATH_AIX([$1])
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
+        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
+      else
+	if test ia64 = "$host_cpu"; then
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib'
+	  _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
+	else
+	 # Determine the default libpath from the value encoded in an
+	 # empty executable.
+	 _LT_SYS_MODULE_PATH_AIX([$1])
+	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
+	  # Warning - without using the other run time loading flags,
+	  # -berok will link without error, but may produce a broken library.
+	  _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok'
+	  _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok'
+	  if test yes = "$with_gnu_ld"; then
+	    # We only use this code for GNU lds that support --whole-archive.
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive'
+	  else
+	    # Exported symbols can be pulled into shared objects from archives
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+	  fi
+	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+	  # -brtl affects multiple linker settings, -berok does not and is overridden later
+	  compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`'
+	  if test svr4 != "$with_aix_soname"; then
+	    # This is similar to how AIX traditionally builds its shared libraries.
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+	  fi
+	  if test aix != "$with_aix_soname"; then
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 3 [...]
+	  else
+	    # used by -dlpreopen to get the symbols
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV  $output_objdir/$realname.d/$soname $output_objdir'
+	  fi
+	  _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d'
+	fi
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+            _LT_TAGVAR(archive_expsym_cmds, $1)=''
+        ;;
+      m68k)
+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+            _LT_TAGVAR(hardcode_minus_L, $1)=yes
+        ;;
+      esac
+      ;;
+
+    bsdi[[45]]*)
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
+      ;;
+
+    cygwin* | mingw* | pw32* | cegcc*)
+      # When not using gcc, we currently assume that we are using
+      # Microsoft Visual C++.
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      case $cc_basename in
+      cl*)
+	# Native MSVC
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	_LT_TAGVAR(always_export_symbols, $1)=yes
+	_LT_TAGVAR(file_list_spec, $1)='@'
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=.dll
+	# FIXME: Setting linknames here is a bad hack.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+	_LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
+            cp "$export_symbols" "$output_objdir/$soname.def";
+            echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+          else
+            $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
+          fi~
+          $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+          linknames='
+	# The linker will not automatically build a static lib if we build a DLL.
+	# _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	_LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+	_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+	# Don't use ranlib
+	_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
+	_LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
+          lt_tool_outputfile="@TOOL_OUTPUT@"~
+          case $lt_outputfile in
+            *.exe|*.EXE) ;;
+            *)
+              lt_outputfile=$lt_outputfile.exe
+              lt_tool_outputfile=$lt_tool_outputfile.exe
+              ;;
+          esac~
+          if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
+            $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+            $RM "$lt_outputfile.manifest";
+          fi'
+	;;
+      *)
+	# Assume MSVC wrapper
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=.dll
+	# FIXME: Setting linknames here is a bad hack.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
+	# The linker will automatically build a .lib file if we build a DLL.
+	_LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+	# FIXME: Should let the user specify the lib program.
+	_LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
+	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	;;
+      esac
+      ;;
+
+    darwin* | rhapsody*)
+      _LT_DARWIN_LINKER_FEATURES($1)
+      ;;
+
+    dgux*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+    # support.  Future versions do this automatically, but an explicit c++rt0.o
+    # does not break anything, and helps significantly (at the cost of a little
+    # extra space).
+    freebsd2.2*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+    freebsd2.*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+    freebsd* | dragonfly*)
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    hpux9*)
+      if test yes = "$GCC"; then
+	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+
+      # hardcode_minus_L: Not really in the search PATH,
+      # but as the default location of the library.
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+      ;;
+
+    hpux10*)
+      if test yes,no = "$GCC,$with_gnu_ld"; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      if test no = "$with_gnu_ld"; then
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
+	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
+	_LT_TAGVAR(hardcode_direct, $1)=yes
+	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+	# hardcode_minus_L: Not really in the search PATH,
+	# but as the default location of the library.
+	_LT_TAGVAR(hardcode_minus_L, $1)=yes
+      fi
+      ;;
+
+    hpux11*)
+      if test yes,no = "$GCC,$with_gnu_ld"; then
+	case $host_cpu in
+	hppa*64*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	esac
+      else
+	case $host_cpu in
+	hppa*64*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	m4_if($1, [], [
+	  # Older versions of the 11.00 compiler do not understand -b yet
+	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
+	  _LT_LINKER_OPTION([if $CC understands -b],
+	    _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b],
+	    [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
+	    [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])],
+	  [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'])
+	  ;;
+	esac
+      fi
+      if test no = "$with_gnu_ld"; then
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
+	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	case $host_cpu in
+	hppa*64*|ia64*)
+	  _LT_TAGVAR(hardcode_direct, $1)=no
+	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	  ;;
+	*)
+	  _LT_TAGVAR(hardcode_direct, $1)=yes
+	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+
+	  # hardcode_minus_L: Not really in the search PATH,
+	  # but as the default location of the library.
+	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
+	  ;;
+	esac
+      fi
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      if test yes = "$GCC"; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+	# Try to use the -exported_symbol ld option, if it does not
+	# work, assume that -exports_file does not work either and
+	# implicitly export all symbols.
+	# This should be the same for all languages, so no per-tag cache variable.
+	AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol],
+	  [lt_cv_irix_exported_symbol],
+	  [save_LDFLAGS=$LDFLAGS
+	   LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null"
+	   AC_LINK_IFELSE(
+	     [AC_LANG_SOURCE(
+	        [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
+			      [C++], [[int foo (void) { return 0; }]],
+			      [Fortran 77], [[
+      subroutine foo
+      end]],
+			      [Fortran], [[
+      subroutine foo
+      end]])])],
+	      [lt_cv_irix_exported_symbol=yes],
+	      [lt_cv_irix_exported_symbol=no])
+           LDFLAGS=$save_LDFLAGS])
+	if test yes = "$lt_cv_irix_exported_symbol"; then
+          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
+	fi
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'
+      fi
+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_TAGVAR(inherit_rpath, $1)=yes
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    linux*)
+      case $cc_basename in
+      tcc*)
+	# Fabrice Bellard et al's Tiny C Compiler
+	_LT_TAGVAR(ld_shlibs, $1)=yes
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	;;
+      esac
+      ;;
+
+    netbsd*)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    newsos6)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *nto* | *qnx*)
+      ;;
+
+    openbsd* | bitrig*)
+      if test -f /usr/libexec/ld.so; then
+	_LT_TAGVAR(hardcode_direct, $1)=yes
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+	else
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+	fi
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    os2*)
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      shrext_cmds=.dll
+      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	prefix_cmds="$SED"~
+	if test EXPORTS = "`$SED 1q $export_symbols`"; then
+	  prefix_cmds="$prefix_cmds -e 1d";
+	fi~
+	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+      ;;
+
+    osf3*)
+      if test yes = "$GCC"; then
+	_LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+      else
+	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+      fi
+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      ;;
+
+    osf4* | osf5*)	# as osf3* with the addition of -msym flag
+      if test yes = "$GCC"; then
+	_LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+      else
+	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
+          $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp'
+
+	# Both c and cxx compiler support -rpath directly
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+      fi
+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      ;;
+
+    solaris*)
+      _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
+      if test yes = "$GCC"; then
+	wlarc='$wl'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+          $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+      else
+	case `$CC -V 2>&1` in
+	*"Compilers 5.0"*)
+	  wlarc=''
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+            $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+	  ;;
+	*)
+	  wlarc='$wl'
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+            $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+	  ;;
+	esac
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      case $host_os in
+      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+      *)
+	# The compiler driver will combine and reorder linker options,
+	# but understands '-z linker_flag'.  GCC discards it without '$wl',
+	# but is careful enough not to reorder.
+	# Supported since Solaris 2.6 (maybe 2.5.1?)
+	if test yes = "$GCC"; then
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
+	else
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+	fi
+	;;
+      esac
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    sunos4*)
+      if test sequent = "$host_vendor"; then
+	# Use $CC to link under sequent, because it throws in some extra .o
+	# files that make .init and .fini sections work.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    sysv4)
+      case $host_vendor in
+	sni)
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true???
+	;;
+	siemens)
+	  ## LD is ld it makes a PLAMLIB
+	  ## CC just makes a GrossModule.
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
+	  _LT_TAGVAR(hardcode_direct, $1)=no
+        ;;
+	motorola)
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
+	;;
+      esac
+      runpath_var='LD_RUN_PATH'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    sysv4.3*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	runpath_var=LD_RUN_PATH
+	hardcode_runpath_var=yes
+	_LT_TAGVAR(ld_shlibs, $1)=yes
+      fi
+      ;;
+
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+      _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      runpath_var='LD_RUN_PATH'
+
+      if test yes = "$GCC"; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6*)
+      # Note: We CANNOT use -z defs as we might desire, because we do not
+      # link with -lc, and that would cause any symbols used from libc to
+      # always be unresolved, which means just about no library would
+      # ever link correctly.  If we're not using GNU ld we use -z text
+      # though, which does catch some bad symbols but isn't as heavy-handed
+      # as -z defs.
+      _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
+      _LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs'
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport'
+      runpath_var='LD_RUN_PATH'
+
+      if test yes = "$GCC"; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    uts4*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *)
+      _LT_TAGVAR(ld_shlibs, $1)=no
+      ;;
+    esac
+
+    if test sni = "$host_vendor"; then
+      case $host in
+      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Blargedynsym'
+	;;
+      esac
+    fi
+  fi
+])
+AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
+test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no
+
+_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld
+
+_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl
+_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl
+_LT_DECL([], [extract_expsyms_cmds], [2],
+    [The commands to extract the exported symbol list from a shared archive])
+
+#
+# Do we need to explicitly link libc?
+#
+case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in
+x|xyes)
+  # Assume -lc should be added
+  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+
+  if test yes,yes = "$GCC,$enable_shared"; then
+    case $_LT_TAGVAR(archive_cmds, $1) in
+    *'~'*)
+      # FIXME: we may have to deal with multi-command sequences.
+      ;;
+    '$CC '*)
+      # Test whether the compiler implicitly links with -lc since on some
+      # systems, -lgcc has to come before -lc. If gcc already passes -lc
+      # to ld, don't add -lc before -lgcc.
+      AC_CACHE_CHECK([whether -lc should be explicitly linked in],
+	[lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1),
+	[$RM conftest*
+	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+	if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
+	  soname=conftest
+	  lib=conftest
+	  libobjs=conftest.$ac_objext
+	  deplibs=
+	  wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
+	  pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
+	  compiler_flags=-v
+	  linker_flags=-v
+	  verstring=
+	  output_objdir=.
+	  libname=conftest
+	  lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
+	  _LT_TAGVAR(allow_undefined_flag, $1)=
+	  if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
+	  then
+	    lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+	  else
+	    lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+	  fi
+	  _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
+	else
+	  cat conftest.err 1>&5
+	fi
+	$RM conftest*
+	])
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)
+      ;;
+    esac
+  fi
+  ;;
+esac
+
+_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0],
+    [Whether or not to add -lc for building shared libraries])
+_LT_TAGDECL([allow_libtool_libs_with_static_runtimes],
+    [enable_shared_with_static_runtimes], [0],
+    [Whether or not to disallow shared libs when runtime libs are static])
+_LT_TAGDECL([], [export_dynamic_flag_spec], [1],
+    [Compiler flag to allow reflexive dlopens])
+_LT_TAGDECL([], [whole_archive_flag_spec], [1],
+    [Compiler flag to generate shared objects directly from archives])
+_LT_TAGDECL([], [compiler_needs_object], [1],
+    [Whether the compiler copes with passing no objects directly])
+_LT_TAGDECL([], [old_archive_from_new_cmds], [2],
+    [Create an old-style archive from a shared archive])
+_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2],
+    [Create a temporary old-style archive to link instead of a shared archive])
+_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive])
+_LT_TAGDECL([], [archive_expsym_cmds], [2])
+_LT_TAGDECL([], [module_cmds], [2],
+    [Commands used to build a loadable module if different from building
+    a shared archive.])
+_LT_TAGDECL([], [module_expsym_cmds], [2])
+_LT_TAGDECL([], [with_gnu_ld], [1],
+    [Whether we are building with GNU ld or not])
+_LT_TAGDECL([], [allow_undefined_flag], [1],
+    [Flag that allows shared libraries with undefined symbols to be built])
+_LT_TAGDECL([], [no_undefined_flag], [1],
+    [Flag that enforces no undefined symbols])
+_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
+    [Flag to hardcode $libdir into a binary during linking.
+    This must work even if $libdir does not exist])
+_LT_TAGDECL([], [hardcode_libdir_separator], [1],
+    [Whether we need a single "-rpath" flag with a separated argument])
+_LT_TAGDECL([], [hardcode_direct], [0],
+    [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes
+    DIR into the resulting binary])
+_LT_TAGDECL([], [hardcode_direct_absolute], [0],
+    [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes
+    DIR into the resulting binary and the resulting library dependency is
+    "absolute", i.e impossible to change by setting $shlibpath_var if the
+    library is relocated])
+_LT_TAGDECL([], [hardcode_minus_L], [0],
+    [Set to "yes" if using the -LDIR flag during linking hardcodes DIR
+    into the resulting binary])
+_LT_TAGDECL([], [hardcode_shlibpath_var], [0],
+    [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
+    into the resulting binary])
+_LT_TAGDECL([], [hardcode_automatic], [0],
+    [Set to "yes" if building a shared library automatically hardcodes DIR
+    into the library and all subsequent libraries and executables linked
+    against it])
+_LT_TAGDECL([], [inherit_rpath], [0],
+    [Set to yes if linker adds runtime paths of dependent libraries
+    to runtime path list])
+_LT_TAGDECL([], [link_all_deplibs], [0],
+    [Whether libtool must link a program against all its dependency libraries])
+_LT_TAGDECL([], [always_export_symbols], [0],
+    [Set to "yes" if exported symbols are required])
+_LT_TAGDECL([], [export_symbols_cmds], [2],
+    [The commands to list exported symbols])
+_LT_TAGDECL([], [exclude_expsyms], [1],
+    [Symbols that should not be listed in the preloaded symbols])
+_LT_TAGDECL([], [include_expsyms], [1],
+    [Symbols that must always be exported])
+_LT_TAGDECL([], [prelink_cmds], [2],
+    [Commands necessary for linking programs (against libraries) with templates])
+_LT_TAGDECL([], [postlink_cmds], [2],
+    [Commands necessary for finishing linking programs])
+_LT_TAGDECL([], [file_list_spec], [1],
+    [Specify filename containing input files])
+dnl FIXME: Not yet implemented
+dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1],
+dnl    [Compiler flag to generate thread safe objects])
+])# _LT_LINKER_SHLIBS
+
+
+# _LT_LANG_C_CONFIG([TAG])
+# ------------------------
+# Ensure that the configuration variables for a C compiler are suitably
+# defined.  These variables are subsequently used by _LT_CONFIG to write
+# the compiler configuration to 'libtool'.
+m4_defun([_LT_LANG_C_CONFIG],
+[m4_require([_LT_DECL_EGREP])dnl
+lt_save_CC=$CC
+AC_LANG_PUSH(C)
+
+# Source file extension for C test sources.
+ac_ext=c
+
+# Object file extension for compiled C test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="int some_variable = 0;"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='int main(){return(0);}'
+
+_LT_TAG_COMPILER
+# Save the default compiler, since it gets overwritten when the other
+# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
+compiler_DEFAULT=$CC
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_SYS_DYNAMIC_LINKER($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+  LT_SYS_DLOPEN_SELF
+  _LT_CMD_STRIPLIB
+
+  # Report what library types will actually be built
+  AC_MSG_CHECKING([if libtool supports shared libraries])
+  AC_MSG_RESULT([$can_build_shared])
+
+  AC_MSG_CHECKING([whether to build shared libraries])
+  test no = "$can_build_shared" && enable_shared=no
+
+  # On AIX, shared libraries and static libraries use the same namespace, and
+  # are all built from PIC.
+  case $host_os in
+  aix3*)
+    test yes = "$enable_shared" && enable_static=no
+    if test -n "$RANLIB"; then
+      archive_cmds="$archive_cmds~\$RANLIB \$lib"
+      postinstall_cmds='$RANLIB $lib'
+    fi
+    ;;
+
+  aix[[4-9]]*)
+    if test ia64 != "$host_cpu"; then
+      case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+      yes,aix,yes) ;;			# shared object as lib.so file only
+      yes,svr4,*) ;;			# shared object as lib.so archive member only
+      yes,*) enable_static=no ;;	# shared object in lib.a archive as well
+      esac
+    fi
+    ;;
+  esac
+  AC_MSG_RESULT([$enable_shared])
+
+  AC_MSG_CHECKING([whether to build static libraries])
+  # Make sure either enable_shared or enable_static is yes.
+  test yes = "$enable_shared" || enable_static=yes
+  AC_MSG_RESULT([$enable_static])
+
+  _LT_CONFIG($1)
+fi
+AC_LANG_POP
+CC=$lt_save_CC
+])# _LT_LANG_C_CONFIG
+
+
+# _LT_LANG_CXX_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for a C++ compiler are suitably
+# defined.  These variables are subsequently used by _LT_CONFIG to write
+# the compiler configuration to 'libtool'.
+m4_defun([_LT_LANG_CXX_CONFIG],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
+if test -n "$CXX" && ( test no != "$CXX" &&
+    ( (test g++ = "$CXX" && `g++ -v >/dev/null 2>&1` ) ||
+    (test g++ != "$CXX"))); then
+  AC_PROG_CXXCPP
+else
+  _lt_caught_CXX_error=yes
+fi
+
+AC_LANG_PUSH(C++)
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
+_LT_TAGVAR(always_export_symbols, $1)=no
+_LT_TAGVAR(archive_expsym_cmds, $1)=
+_LT_TAGVAR(compiler_needs_object, $1)=no
+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_TAGVAR(hardcode_direct, $1)=no
+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_TAGVAR(hardcode_minus_L, $1)=no
+_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+_LT_TAGVAR(hardcode_automatic, $1)=no
+_LT_TAGVAR(inherit_rpath, $1)=no
+_LT_TAGVAR(module_cmds, $1)=
+_LT_TAGVAR(module_expsym_cmds, $1)=
+_LT_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+_LT_TAGVAR(no_undefined_flag, $1)=
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for C++ test sources.
+ac_ext=cpp
+
+# Object file extension for compiled C++ test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# No sense in running all these tests if we already determined that
+# the CXX compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test yes != "$_lt_caught_CXX_error"; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="int some_variable = 0;"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+  _LT_TAG_COMPILER
+
+  # save warnings/boilerplate of simple test code
+  _LT_COMPILER_BOILERPLATE
+  _LT_LINKER_BOILERPLATE
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC=$CC
+  lt_save_CFLAGS=$CFLAGS
+  lt_save_LD=$LD
+  lt_save_GCC=$GCC
+  GCC=$GXX
+  lt_save_with_gnu_ld=$with_gnu_ld
+  lt_save_path_LD=$lt_cv_path_LD
+  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
+    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
+  else
+    $as_unset lt_cv_prog_gnu_ld
+  fi
+  if test -n "${lt_cv_path_LDCXX+set}"; then
+    lt_cv_path_LD=$lt_cv_path_LDCXX
+  else
+    $as_unset lt_cv_path_LD
+  fi
+  test -z "${LDCXX+set}" || LD=$LDCXX
+  CC=${CXX-"c++"}
+  CFLAGS=$CXXFLAGS
+  compiler=$CC
+  _LT_TAGVAR(compiler, $1)=$CC
+  _LT_CC_BASENAME([$compiler])
+
+  if test -n "$compiler"; then
+    # We don't want -fno-exception when compiling C++ code, so set the
+    # no_builtin_flag separately
+    if test yes = "$GXX"; then
+      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+    else
+      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+    fi
+
+    if test yes = "$GXX"; then
+      # Set up default GNU C++ configuration
+
+      LT_PATH_LD
+
+      # Check if GNU C++ uses GNU ld as the underlying linker, since the
+      # archiving commands below assume that GNU ld is being used.
+      if test yes = "$with_gnu_ld"; then
+        _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+
+        # If archive_cmds runs LD, not CC, wlarc should be empty
+        # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
+        #     investigate it a little bit more. (MM)
+        wlarc='$wl'
+
+        # ancient GNU ld didn't support --whole-archive et. al.
+        if eval "`$CC -print-prog-name=ld` --help 2>&1" |
+	  $GREP 'no-whole-archive' > /dev/null; then
+          _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
+        else
+          _LT_TAGVAR(whole_archive_flag_spec, $1)=
+        fi
+      else
+        with_gnu_ld=no
+        wlarc=
+
+        # A generic and very simple default shared library creation
+        # command for GNU C++ for the case where it uses the native
+        # linker, instead of GNU ld.  If possible, this setting should
+        # overridden to take advantage of the native linker features on
+        # the platform it is being used on.
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+      fi
+
+      # Commands to make compiler produce verbose output that lists
+      # what "hidden" libraries, object files and flags are used when
+      # linking a shared library.
+      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+
+    else
+      GXX=no
+      with_gnu_ld=no
+      wlarc=
+    fi
+
+    # PORTME: fill in a description of your system's C++ link characteristics
+    AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+    _LT_TAGVAR(ld_shlibs, $1)=yes
+    case $host_os in
+      aix3*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+      aix[[4-9]]*)
+        if test ia64 = "$host_cpu"; then
+          # On IA64, the linker does run time linking by default, so we don't
+          # have to do anything special.
+          aix_use_runtimelinking=no
+          exp_sym_flag='-Bexport'
+          no_entry_flag=
+        else
+          aix_use_runtimelinking=no
+
+          # Test if we are trying to use run time linking or normal
+          # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+          # have runtime linking enabled, and use it for executables.
+          # For shared libraries, we enable/disable runtime linking
+          # depending on the kind of the shared library created -
+          # when "with_aix_soname,aix_use_runtimelinking" is:
+          # "aix,no"   lib.a(lib.so.V) shared, rtl:no,  for executables
+          # "aix,yes"  lib.so          shared, rtl:yes, for executables
+          #            lib.a           static archive
+          # "both,no"  lib.so.V(shr.o) shared, rtl:yes
+          #            lib.a(lib.so.V) shared, rtl:no,  for executables
+          # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+          #            lib.a(lib.so.V) shared, rtl:no
+          # "svr4,*"   lib.so.V(shr.o) shared, rtl:yes, for executables
+          #            lib.a           static archive
+          case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+	    for ld_flag in $LDFLAGS; do
+	      case $ld_flag in
+	      *-brtl*)
+	        aix_use_runtimelinking=yes
+	        break
+	        ;;
+	      esac
+	    done
+	    if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+	      # With aix-soname=svr4, we create the lib.so.V shared archives only,
+	      # so we don't have lib.a shared libs to link our executables.
+	      # We have to force runtime linking in this case.
+	      aix_use_runtimelinking=yes
+	      LDFLAGS="$LDFLAGS -Wl,-brtl"
+	    fi
+	    ;;
+          esac
+
+          exp_sym_flag='-bexport'
+          no_entry_flag='-bnoentry'
+        fi
+
+        # When large executables or shared objects are built, AIX ld can
+        # have problems creating the table of contents.  If linking a library
+        # or program results in "error TOC overflow" add -mminimal-toc to
+        # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+        # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+        _LT_TAGVAR(archive_cmds, $1)=''
+        _LT_TAGVAR(hardcode_direct, $1)=yes
+        _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+        _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+        _LT_TAGVAR(link_all_deplibs, $1)=yes
+        _LT_TAGVAR(file_list_spec, $1)='$wl-f,'
+        case $with_aix_soname,$aix_use_runtimelinking in
+        aix,*) ;;	# no import file
+        svr4,* | *,yes) # use import file
+          # The Import File defines what to hardcode.
+          _LT_TAGVAR(hardcode_direct, $1)=no
+          _LT_TAGVAR(hardcode_direct_absolute, $1)=no
+          ;;
+        esac
+
+        if test yes = "$GXX"; then
+          case $host_os in aix4.[[012]]|aix4.[[012]].*)
+          # We only want to do this on AIX 4.2 and lower, the check
+          # below for broken collect2 doesn't work under 4.3+
+	  collect2name=`$CC -print-prog-name=collect2`
+	  if test -f "$collect2name" &&
+	     strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+	  then
+	    # We have reworked collect2
+	    :
+	  else
+	    # We have old collect2
+	    _LT_TAGVAR(hardcode_direct, $1)=unsupported
+	    # It fails to find uninstalled libraries when the uninstalled
+	    # path is not listed in the libpath.  Setting hardcode_minus_L
+	    # to unsupported forces relinking
+	    _LT_TAGVAR(hardcode_minus_L, $1)=yes
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=
+	  fi
+          esac
+          shared_flag='-shared'
+	  if test yes = "$aix_use_runtimelinking"; then
+	    shared_flag=$shared_flag' $wl-G'
+	  fi
+	  # Need to ensure runtime linking is disabled for the traditional
+	  # shared library, or the linker may eventually find shared libraries
+	  # /with/ Import File - we do not want to mix them.
+	  shared_flag_aix='-shared'
+	  shared_flag_svr4='-shared $wl-G'
+        else
+          # not using gcc
+          if test ia64 = "$host_cpu"; then
+	  # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	  # chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+          else
+	    if test yes = "$aix_use_runtimelinking"; then
+	      shared_flag='$wl-G'
+	    else
+	      shared_flag='$wl-bM:SRE'
+	    fi
+	    shared_flag_aix='$wl-bM:SRE'
+	    shared_flag_svr4='$wl-G'
+          fi
+        fi
+
+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall'
+        # It seems that -bexpall does not export symbols beginning with
+        # underscore (_), so it is better to generate a list of symbols to
+	# export.
+        _LT_TAGVAR(always_export_symbols, $1)=yes
+	if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
+          # Warning - without using the other runtime loading flags (-brtl),
+          # -berok will link without error, but may produce a broken library.
+          # The "-G" linker flag allows undefined symbols.
+          _LT_TAGVAR(no_undefined_flag, $1)='-bernotok'
+          # Determine the default libpath from the value encoded in an empty
+          # executable.
+          _LT_SYS_MODULE_PATH_AIX([$1])
+          _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
+
+          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
+        else
+          if test ia64 = "$host_cpu"; then
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib'
+	    _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
+          else
+	    # Determine the default libpath from the value encoded in an
+	    # empty executable.
+	    _LT_SYS_MODULE_PATH_AIX([$1])
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
+	    # Warning - without using the other run time loading flags,
+	    # -berok will link without error, but may produce a broken library.
+	    _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok'
+	    _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok'
+	    if test yes = "$with_gnu_ld"; then
+	      # We only use this code for GNU lds that support --whole-archive.
+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive'
+	    else
+	      # Exported symbols can be pulled into shared objects from archives
+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+	    fi
+	    _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+	    # -brtl affects multiple linker settings, -berok does not and is overridden later
+	    compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`'
+	    if test svr4 != "$with_aix_soname"; then
+	      # This is similar to how AIX traditionally builds its shared
+	      # libraries. Need -bnortl late, we may have -brtl in LDFLAGS.
+	      _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+	    fi
+	    if test aix != "$with_aix_soname"; then
+	      _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# [...]
+	    else
+	      # used by -dlpreopen to get the symbols
+	      _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV  $output_objdir/$realname.d/$soname $output_objdir'
+	    fi
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d'
+          fi
+        fi
+        ;;
+
+      beos*)
+	if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	  # Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
+	  # support --undefined.  This deserves some investigation.  FIXME
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	else
+	  _LT_TAGVAR(ld_shlibs, $1)=no
+	fi
+	;;
+
+      chorus*)
+        case $cc_basename in
+          *)
+	  # FIXME: insert proper C++ library support
+	  _LT_TAGVAR(ld_shlibs, $1)=no
+	  ;;
+        esac
+        ;;
+
+      cygwin* | mingw* | pw32* | cegcc*)
+	case $GXX,$cc_basename in
+	,cl* | no,cl*)
+	  # Native MSVC
+	  # hardcode_libdir_flag_spec is actually meaningless, as there is
+	  # no search path for DLLs.
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	  _LT_TAGVAR(always_export_symbols, $1)=yes
+	  _LT_TAGVAR(file_list_spec, $1)='@'
+	  # Tell ltmain to make .lib files, not .a files.
+	  libext=lib
+	  # Tell ltmain to make .dll files, not .so files.
+	  shrext_cmds=.dll
+	  # FIXME: Setting linknames here is a bad hack.
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
+              cp "$export_symbols" "$output_objdir/$soname.def";
+              echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+            else
+              $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
+            fi~
+            $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+            linknames='
+	  # The linker will not automatically build a static lib if we build a DLL.
+	  # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	  # Don't use ranlib
+	  _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
+	  _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
+            lt_tool_outputfile="@TOOL_OUTPUT@"~
+            case $lt_outputfile in
+              *.exe|*.EXE) ;;
+              *)
+                lt_outputfile=$lt_outputfile.exe
+                lt_tool_outputfile=$lt_tool_outputfile.exe
+                ;;
+            esac~
+            func_to_tool_file "$lt_outputfile"~
+            if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
+              $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+              $RM "$lt_outputfile.manifest";
+            fi'
+	  ;;
+	*)
+	  # g++
+	  # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+	  # as there is no search path for DLLs.
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols'
+	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	  _LT_TAGVAR(always_export_symbols, $1)=no
+	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+
+	  if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	    # If the export-symbols file already is a .def file, use it as
+	    # is; otherwise, prepend EXPORTS...
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
+              cp $export_symbols $output_objdir/$soname.def;
+            else
+              echo EXPORTS > $output_objdir/$soname.def;
+              cat $export_symbols >> $output_objdir/$soname.def;
+            fi~
+            $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	  else
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	  fi
+	  ;;
+	esac
+	;;
+      darwin* | rhapsody*)
+        _LT_DARWIN_LINKER_FEATURES($1)
+	;;
+
+      os2*)
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	_LT_TAGVAR(hardcode_minus_L, $1)=yes
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	shrext_cmds=.dll
+	_LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	  $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	  $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	  $ECHO EXPORTS >> $output_objdir/$libname.def~
+	  emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+	  $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	  emximp -o $lib $output_objdir/$libname.def'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	  $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	  $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	  $ECHO EXPORTS >> $output_objdir/$libname.def~
+	  prefix_cmds="$SED"~
+	  if test EXPORTS = "`$SED 1q $export_symbols`"; then
+	    prefix_cmds="$prefix_cmds -e 1d";
+	  fi~
+	  prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+	  cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+	  $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	  emximp -o $lib $output_objdir/$libname.def'
+	_LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	;;
+
+      dgux*)
+        case $cc_basename in
+          ec++*)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          ghcx*)
+	    # Green Hills C++ Compiler
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+        esac
+        ;;
+
+      freebsd2.*)
+        # C++ shared libraries reported to be fairly broken before
+	# switch to ELF
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+
+      freebsd-elf*)
+        _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+        ;;
+
+      freebsd* | dragonfly*)
+        # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+        # conventions
+        _LT_TAGVAR(ld_shlibs, $1)=yes
+        ;;
+
+      haiku*)
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+        _LT_TAGVAR(link_all_deplibs, $1)=yes
+        ;;
+
+      hpux9*)
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
+        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+        _LT_TAGVAR(hardcode_direct, $1)=yes
+        _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+				             # but as the default
+				             # location of the library.
+
+        case $cc_basename in
+          CC*)
+            # FIXME: insert proper C++ library support
+            _LT_TAGVAR(ld_shlibs, $1)=no
+            ;;
+          aCC*)
+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
+            # Commands to make compiler produce verbose output that lists
+            # what "hidden" libraries, object files and flags are used when
+            # linking a shared library.
+            #
+            # There doesn't appear to be a way to prevent this compiler from
+            # explicitly linking system object files so we need to strip them
+            # from the output so that they don't get included in the library
+            # dependencies.
+            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+            ;;
+          *)
+            if test yes = "$GXX"; then
+              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
+            else
+              # FIXME: insert proper C++ library support
+              _LT_TAGVAR(ld_shlibs, $1)=no
+            fi
+            ;;
+        esac
+        ;;
+
+      hpux10*|hpux11*)
+        if test no = "$with_gnu_ld"; then
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
+	  _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+          case $host_cpu in
+            hppa*64*|ia64*)
+              ;;
+            *)
+	      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+              ;;
+          esac
+        fi
+        case $host_cpu in
+          hppa*64*|ia64*)
+            _LT_TAGVAR(hardcode_direct, $1)=no
+            _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+            ;;
+          *)
+            _LT_TAGVAR(hardcode_direct, $1)=yes
+            _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+            _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+					         # but as the default
+					         # location of the library.
+            ;;
+        esac
+
+        case $cc_basename in
+          CC*)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          aCC*)
+	    case $host_cpu in
+	      hppa*64*)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	      ia64*)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	      *)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	    esac
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+	    ;;
+          *)
+	    if test yes = "$GXX"; then
+	      if test no = "$with_gnu_ld"; then
+	        case $host_cpu in
+	          hppa*64*)
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	          ia64*)
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	          *)
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	        esac
+	      fi
+	    else
+	      # FIXME: insert proper C++ library support
+	      _LT_TAGVAR(ld_shlibs, $1)=no
+	    fi
+	    ;;
+        esac
+        ;;
+
+      interix[[3-9]]*)
+	_LT_TAGVAR(hardcode_direct, $1)=no
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+	# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+	# Instead, shared libraries are loaded at an image base (0x10000000 by
+	# default) and relocated if they conflict, which is a slow very memory
+	# consuming and fragmenting process.  To avoid this, we pick a random,
+	# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+	# time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+	;;
+      irix5* | irix6*)
+        case $cc_basename in
+          CC*)
+	    # SGI C++
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
+	    # necessary to make sure instantiated templates are included
+	    # in the archive.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
+	    ;;
+          *)
+	    if test yes = "$GXX"; then
+	      if test no = "$with_gnu_ld"; then
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+	      else
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` -o $lib'
+	      fi
+	    fi
+	    _LT_TAGVAR(link_all_deplibs, $1)=yes
+	    ;;
+        esac
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+        _LT_TAGVAR(inherit_rpath, $1)=yes
+        ;;
+
+      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+        case $cc_basename in
+          KCC*)
+	    # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	    # KCC will only create a shared library if the output file
+	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
+	    # to its proper name (with version) after linking.
+	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib $wl-retain-symbols-file,$export_symbols; mv \$templib $lib'
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -Bstatic", where "CC" is the KAI C++ compiler.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+	    ;;
+	  icpc* | ecpc* )
+	    # Intel C++
+	    with_gnu_ld=yes
+	    # version 8.0 and above of icpc choke on multiply defined symbols
+	    # if we add $predep_objects and $postdep_objects, however 7.1 and
+	    # earlier do not add the objects themselves.
+	    case `$CC -V 2>&1` in
+	      *"Version 7."*)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+		;;
+	      *)  # Version 8.0 or newer
+	        tmp_idyn=
+	        case $host_cpu in
+		  ia64*) tmp_idyn=' -i_dynamic';;
+		esac
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+		;;
+	    esac
+	    _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive'
+	    ;;
+          pgCC* | pgcpp*)
+            # Portland Group C++ compiler
+	    case `$CC -V` in
+	    *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*)
+	      _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
+               rm -rf $tpldir~
+               $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
+               compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
+	      _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
+                rm -rf $tpldir~
+                $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
+                $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
+                $RANLIB $oldlib'
+	      _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
+                rm -rf $tpldir~
+                $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+                $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
+                rm -rf $tpldir~
+                $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+                $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+	      ;;
+	    *) # Version 6 and above use weak symbols
+	      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+	      ;;
+	    esac
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl--rpath $wl$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+            ;;
+	  cxx*)
+	    # Compaq C++
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname  -o $lib $wl-retain-symbols-file $wl$export_symbols'
+
+	    runpath_var=LD_RUN_PATH
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
+	    ;;
+	  xl* | mpixl* | bgxl*)
+	    # IBM XL 8.0 on PPC, with GNU ld
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	    if test yes = "$supports_anon_versioning"; then
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+                cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+                echo "local: *; };" >> $output_objdir/$libname.ver~
+                $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
+	    fi
+	    ;;
+	  *)
+	    case `$CC -V 2>&1 | sed 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+	      _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file $wl$export_symbols'
+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+	      _LT_TAGVAR(compiler_needs_object, $1)=yes
+
+	      # Not sure whether something based on
+	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
+	      # would be better.
+	      output_verbose_link_cmd='func_echo_all'
+
+	      # Archives containing C++ object files must be created using
+	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	      # necessary to make sure instantiated templates are included
+	      # in the archive.
+	      _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+	      ;;
+	    esac
+	    ;;
+	esac
+	;;
+
+      lynxos*)
+        # FIXME: insert proper C++ library support
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	;;
+
+      m88k*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+	;;
+
+      mvs*)
+        case $cc_basename in
+          cxx*)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+	  *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+	esac
+	;;
+
+      netbsd*)
+        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+	  wlarc=
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	  _LT_TAGVAR(hardcode_direct, $1)=yes
+	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	fi
+	# Workaround some broken pre-1.5 toolchains
+	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+	;;
+
+      *nto* | *qnx*)
+        _LT_TAGVAR(ld_shlibs, $1)=yes
+	;;
+
+      openbsd* | bitrig*)
+	if test -f /usr/libexec/ld.so; then
+	  _LT_TAGVAR(hardcode_direct, $1)=yes
+	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file,$export_symbols -o $lib'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
+	  fi
+	  output_verbose_link_cmd=func_echo_all
+	else
+	  _LT_TAGVAR(ld_shlibs, $1)=no
+	fi
+	;;
+
+      osf3* | osf4* | osf5*)
+        case $cc_basename in
+          KCC*)
+	    # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	    # KCC will only create a shared library if the output file
+	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
+	    # to its proper name (with version) after linking.
+	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	    # Archives containing C++ object files must be created using
+	    # the KAI C++ compiler.
+	    case $host in
+	      osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;;
+	      *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;;
+	    esac
+	    ;;
+          RCC*)
+	    # Rational C++ 2.4.1
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          cxx*)
+	    case $host in
+	      osf3*)
+	        _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $soname `test -n "$verstring" && func_echo_all "$wl-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+		;;
+	      *)
+	        _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+	        _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
+                  echo "-hidden">> $lib.exp~
+                  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname $wl-input $wl$lib.exp  `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~
+                  $RM $lib.exp'
+	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+		;;
+	    esac
+
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+	    ;;
+	  *)
+	    if test yes,no = "$GXX,$with_gnu_ld"; then
+	      _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
+	      case $host in
+	        osf3*)
+	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+		  ;;
+	        *)
+	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+		  ;;
+	      esac
+
+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+	      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	      # Commands to make compiler produce verbose output that lists
+	      # what "hidden" libraries, object files and flags are used when
+	      # linking a shared library.
+	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+
+	    else
+	      # FIXME: insert proper C++ library support
+	      _LT_TAGVAR(ld_shlibs, $1)=no
+	    fi
+	    ;;
+        esac
+        ;;
+
+      psos*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+
+      sunos4*)
+        case $cc_basename in
+          CC*)
+	    # Sun C++ 4.x
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          lcc*)
+	    # Lucid
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+        esac
+        ;;
+
+      solaris*)
+        case $cc_basename in
+          CC* | sunCC*)
+	    # Sun C++ 4.2, 5.x and Centerline C++
+            _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
+	    _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+              $CC -G$allow_undefined_flag $wl-M $wl$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	    _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	    case $host_os in
+	      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+	      *)
+		# The compiler driver will combine and reorder linker options,
+		# but understands '-z linker_flag'.
+	        # Supported since Solaris 2.6 (maybe 2.5.1?)
+		_LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+	        ;;
+	    esac
+	    _LT_TAGVAR(link_all_deplibs, $1)=yes
+
+	    output_verbose_link_cmd='func_echo_all'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	    # necessary to make sure instantiated templates are included
+	    # in the archive.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+	    ;;
+          gcx*)
+	    # Green Hills C++ Compiler
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
+
+	    # The C++ compiler must be used to create the archive.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
+	    ;;
+          *)
+	    # GNU C++ compiler with Solaris linker
+	    if test yes,no = "$GXX,$with_gnu_ld"; then
+	      _LT_TAGVAR(no_undefined_flag, $1)=' $wl-z ${wl}defs'
+	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
+	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+                  $CC -shared $pic_flag -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	        # Commands to make compiler produce verbose output that lists
+	        # what "hidden" libraries, object files and flags are used when
+	        # linking a shared library.
+	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+	      else
+	        # g++ 2.7 appears to require '-G' NOT '-shared' on this
+	        # platform.
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
+	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+                  $CC -G -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	        # Commands to make compiler produce verbose output that lists
+	        # what "hidden" libraries, object files and flags are used when
+	        # linking a shared library.
+	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+	      fi
+
+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir'
+	      case $host_os in
+		solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+		*)
+		  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
+		  ;;
+	      esac
+	    fi
+	    ;;
+        esac
+        ;;
+
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+      _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      runpath_var='LD_RUN_PATH'
+
+      case $cc_basename in
+        CC*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+      esac
+      ;;
+
+      sysv5* | sco3.2v5* | sco5v6*)
+	# Note: We CANNOT use -z defs as we might desire, because we do not
+	# link with -lc, and that would cause any symbols used from libc to
+	# always be unresolved, which means just about no library would
+	# ever link correctly.  If we're not using GNU ld we use -z text
+	# though, which does catch some bad symbols but isn't as heavy-handed
+	# as -z defs.
+	_LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
+	_LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs'
+	_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir'
+	_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+	_LT_TAGVAR(link_all_deplibs, $1)=yes
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport'
+	runpath_var='LD_RUN_PATH'
+
+	case $cc_basename in
+          CC*)
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
+              '"$_LT_TAGVAR(old_archive_cmds, $1)"
+	    _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
+              '"$_LT_TAGVAR(reload_cmds, $1)"
+	    ;;
+	  *)
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    ;;
+	esac
+      ;;
+
+      tandem*)
+        case $cc_basename in
+          NCC*)
+	    # NonStop-UX NCC 3.20
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+        esac
+        ;;
+
+      vxworks*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+
+      *)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+    esac
+
+    AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
+    test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no
+
+    _LT_TAGVAR(GCC, $1)=$GXX
+    _LT_TAGVAR(LD, $1)=$LD
+
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    _LT_SYS_HIDDEN_LIBDEPS($1)
+    _LT_COMPILER_PIC($1)
+    _LT_COMPILER_C_O($1)
+    _LT_COMPILER_FILE_LOCKS($1)
+    _LT_LINKER_SHLIBS($1)
+    _LT_SYS_DYNAMIC_LINKER($1)
+    _LT_LINKER_HARDCODE_LIBPATH($1)
+
+    _LT_CONFIG($1)
+  fi # test -n "$compiler"
+
+  CC=$lt_save_CC
+  CFLAGS=$lt_save_CFLAGS
+  LDCXX=$LD
+  LD=$lt_save_LD
+  GCC=$lt_save_GCC
+  with_gnu_ld=$lt_save_with_gnu_ld
+  lt_cv_path_LDCXX=$lt_cv_path_LD
+  lt_cv_path_LD=$lt_save_path_LD
+  lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
+  lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
+fi # test yes != "$_lt_caught_CXX_error"
+
+AC_LANG_POP
+])# _LT_LANG_CXX_CONFIG
+
+
+# _LT_FUNC_STRIPNAME_CNF
+# ----------------------
+# func_stripname_cnf prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+#
+# This function is identical to the (non-XSI) version of func_stripname,
+# except this one can be used by m4 code that may be executed by configure,
+# rather than the libtool script.
+m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl
+AC_REQUIRE([_LT_DECL_SED])
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
+func_stripname_cnf ()
+{
+  case @S|@2 in
+  .*) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%\\\\@S|@2\$%%"`;;
+  *)  func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%@S|@2\$%%"`;;
+  esac
+} # func_stripname_cnf
+])# _LT_FUNC_STRIPNAME_CNF
+
+
+# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
+# ---------------------------------
+# Figure out "hidden" library dependencies from verbose
+# compiler output when linking a shared library.
+# Parse the compiler output and extract the necessary
+# objects, libraries and library flags.
+m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl
+# Dependencies to place before and after the object being linked:
+_LT_TAGVAR(predep_objects, $1)=
+_LT_TAGVAR(postdep_objects, $1)=
+_LT_TAGVAR(predeps, $1)=
+_LT_TAGVAR(postdeps, $1)=
+_LT_TAGVAR(compiler_lib_search_path, $1)=
+
+dnl we can't use the lt_simple_compile_test_code here,
+dnl because it contains code intended for an executable,
+dnl not a library.  It's possible we should let each
+dnl tag define a new lt_????_link_test_code variable,
+dnl but it's only used here...
+m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF
+int a;
+void foo (void) { a = 0; }
+_LT_EOF
+], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF
+class Foo
+{
+public:
+  Foo (void) { a = 0; }
+private:
+  int a;
+};
+_LT_EOF
+], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF
+      subroutine foo
+      implicit none
+      integer*4 a
+      a=0
+      return
+      end
+_LT_EOF
+], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF
+      subroutine foo
+      implicit none
+      integer a
+      a=0
+      return
+      end
+_LT_EOF
+], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF
+public class foo {
+  private int a;
+  public void bar (void) {
+    a = 0;
+  }
+};
+_LT_EOF
+], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF
+package foo
+func foo() {
+}
+_LT_EOF
+])
+
+_lt_libdeps_save_CFLAGS=$CFLAGS
+case "$CC $CFLAGS " in #(
+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
+esac
+
+dnl Parse the compiler output and extract the necessary
+dnl objects, libraries and library flags.
+if AC_TRY_EVAL(ac_compile); then
+  # Parse the compiler output and extract the necessary
+  # objects, libraries and library flags.
+
+  # Sentinel used to keep track of whether or not we are before
+  # the conftest object file.
+  pre_test_object_deps_done=no
+
+  for p in `eval "$output_verbose_link_cmd"`; do
+    case $prev$p in
+
+    -L* | -R* | -l*)
+       # Some compilers place space between "-{L,R}" and the path.
+       # Remove the space.
+       if test x-L = "$p" ||
+          test x-R = "$p"; then
+	 prev=$p
+	 continue
+       fi
+
+       # Expand the sysroot to ease extracting the directories later.
+       if test -z "$prev"; then
+         case $p in
+         -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
+         -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
+         -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
+         esac
+       fi
+       case $p in
+       =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
+       esac
+       if test no = "$pre_test_object_deps_done"; then
+	 case $prev in
+	 -L | -R)
+	   # Internal compiler library paths should come after those
+	   # provided the user.  The postdeps already come after the
+	   # user supplied libs so there is no need to process them.
+	   if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then
+	     _LT_TAGVAR(compiler_lib_search_path, $1)=$prev$p
+	   else
+	     _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} $prev$p"
+	   fi
+	   ;;
+	 # The "-l" case would never come before the object being
+	 # linked, so don't bother handling this case.
+	 esac
+       else
+	 if test -z "$_LT_TAGVAR(postdeps, $1)"; then
+	   _LT_TAGVAR(postdeps, $1)=$prev$p
+	 else
+	   _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} $prev$p"
+	 fi
+       fi
+       prev=
+       ;;
+
+    *.lto.$objext) ;; # Ignore GCC LTO objects
+    *.$objext)
+       # This assumes that the test object file only shows up
+       # once in the compiler output.
+       if test "$p" = "conftest.$objext"; then
+	 pre_test_object_deps_done=yes
+	 continue
+       fi
+
+       if test no = "$pre_test_object_deps_done"; then
+	 if test -z "$_LT_TAGVAR(predep_objects, $1)"; then
+	   _LT_TAGVAR(predep_objects, $1)=$p
+	 else
+	   _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p"
+	 fi
+       else
+	 if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then
+	   _LT_TAGVAR(postdep_objects, $1)=$p
+	 else
+	   _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p"
+	 fi
+       fi
+       ;;
+
+    *) ;; # Ignore the rest.
+
+    esac
+  done
+
+  # Clean up.
+  rm -f a.out a.exe
+else
+  echo "libtool.m4: error: problem compiling $1 test program"
+fi
+
+$RM -f confest.$objext
+CFLAGS=$_lt_libdeps_save_CFLAGS
+
+# PORTME: override above test on systems where it is broken
+m4_if([$1], [CXX],
+[case $host_os in
+interix[[3-9]]*)
+  # Interix 3.5 installs completely hosed .la files for C++, so rather than
+  # hack all around it, let's just trust "g++" to DTRT.
+  _LT_TAGVAR(predep_objects,$1)=
+  _LT_TAGVAR(postdep_objects,$1)=
+  _LT_TAGVAR(postdeps,$1)=
+  ;;
+esac
+])
+
+case " $_LT_TAGVAR(postdeps, $1) " in
+*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;;
+esac
+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=
+if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then
+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | $SED -e 's! -L! !g' -e 's!^ !!'`
+fi
+_LT_TAGDECL([], [compiler_lib_search_dirs], [1],
+    [The directories searched by this compiler when creating a shared library])
+_LT_TAGDECL([], [predep_objects], [1],
+    [Dependencies to place before and after the objects being linked to
+    create a shared library])
+_LT_TAGDECL([], [postdep_objects], [1])
+_LT_TAGDECL([], [predeps], [1])
+_LT_TAGDECL([], [postdeps], [1])
+_LT_TAGDECL([], [compiler_lib_search_path], [1],
+    [The library search path used internally by the compiler when linking
+    a shared library])
+])# _LT_SYS_HIDDEN_LIBDEPS
+
+
+# _LT_LANG_F77_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for a Fortran 77 compiler are
+# suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to 'libtool'.
+m4_defun([_LT_LANG_F77_CONFIG],
+[AC_LANG_PUSH(Fortran 77)
+if test -z "$F77" || test no = "$F77"; then
+  _lt_disable_F77=yes
+fi
+
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
+_LT_TAGVAR(always_export_symbols, $1)=no
+_LT_TAGVAR(archive_expsym_cmds, $1)=
+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_TAGVAR(hardcode_direct, $1)=no
+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_TAGVAR(hardcode_minus_L, $1)=no
+_LT_TAGVAR(hardcode_automatic, $1)=no
+_LT_TAGVAR(inherit_rpath, $1)=no
+_LT_TAGVAR(module_cmds, $1)=
+_LT_TAGVAR(module_expsym_cmds, $1)=
+_LT_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+_LT_TAGVAR(no_undefined_flag, $1)=
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for f77 test sources.
+ac_ext=f
+
+# Object file extension for compiled f77 test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# No sense in running all these tests if we already determined that
+# the F77 compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test yes != "$_lt_disable_F77"; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="\
+      subroutine t
+      return
+      end
+"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code="\
+      program t
+      end
+"
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+  _LT_TAG_COMPILER
+
+  # save warnings/boilerplate of simple test code
+  _LT_COMPILER_BOILERPLATE
+  _LT_LINKER_BOILERPLATE
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC=$CC
+  lt_save_GCC=$GCC
+  lt_save_CFLAGS=$CFLAGS
+  CC=${F77-"f77"}
+  CFLAGS=$FFLAGS
+  compiler=$CC
+  _LT_TAGVAR(compiler, $1)=$CC
+  _LT_CC_BASENAME([$compiler])
+  GCC=$G77
+  if test -n "$compiler"; then
+    AC_MSG_CHECKING([if libtool supports shared libraries])
+    AC_MSG_RESULT([$can_build_shared])
+
+    AC_MSG_CHECKING([whether to build shared libraries])
+    test no = "$can_build_shared" && enable_shared=no
+
+    # On AIX, shared libraries and static libraries use the same namespace, and
+    # are all built from PIC.
+    case $host_os in
+      aix3*)
+        test yes = "$enable_shared" && enable_static=no
+        if test -n "$RANLIB"; then
+          archive_cmds="$archive_cmds~\$RANLIB \$lib"
+          postinstall_cmds='$RANLIB $lib'
+        fi
+        ;;
+      aix[[4-9]]*)
+	if test ia64 != "$host_cpu"; then
+	  case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+	  yes,aix,yes) ;;		# shared object as lib.so file only
+	  yes,svr4,*) ;;		# shared object as lib.so archive member only
+	  yes,*) enable_static=no ;;	# shared object in lib.a archive as well
+	  esac
+	fi
+        ;;
+    esac
+    AC_MSG_RESULT([$enable_shared])
+
+    AC_MSG_CHECKING([whether to build static libraries])
+    # Make sure either enable_shared or enable_static is yes.
+    test yes = "$enable_shared" || enable_static=yes
+    AC_MSG_RESULT([$enable_static])
+
+    _LT_TAGVAR(GCC, $1)=$G77
+    _LT_TAGVAR(LD, $1)=$LD
+
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    _LT_COMPILER_PIC($1)
+    _LT_COMPILER_C_O($1)
+    _LT_COMPILER_FILE_LOCKS($1)
+    _LT_LINKER_SHLIBS($1)
+    _LT_SYS_DYNAMIC_LINKER($1)
+    _LT_LINKER_HARDCODE_LIBPATH($1)
+
+    _LT_CONFIG($1)
+  fi # test -n "$compiler"
+
+  GCC=$lt_save_GCC
+  CC=$lt_save_CC
+  CFLAGS=$lt_save_CFLAGS
+fi # test yes != "$_lt_disable_F77"
+
+AC_LANG_POP
+])# _LT_LANG_F77_CONFIG
+
+
+# _LT_LANG_FC_CONFIG([TAG])
+# -------------------------
+# Ensure that the configuration variables for a Fortran compiler are
+# suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to 'libtool'.
+m4_defun([_LT_LANG_FC_CONFIG],
+[AC_LANG_PUSH(Fortran)
+
+if test -z "$FC" || test no = "$FC"; then
+  _lt_disable_FC=yes
+fi
+
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
+_LT_TAGVAR(always_export_symbols, $1)=no
+_LT_TAGVAR(archive_expsym_cmds, $1)=
+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_TAGVAR(hardcode_direct, $1)=no
+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_TAGVAR(hardcode_minus_L, $1)=no
+_LT_TAGVAR(hardcode_automatic, $1)=no
+_LT_TAGVAR(inherit_rpath, $1)=no
+_LT_TAGVAR(module_cmds, $1)=
+_LT_TAGVAR(module_expsym_cmds, $1)=
+_LT_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+_LT_TAGVAR(no_undefined_flag, $1)=
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for fc test sources.
+ac_ext=${ac_fc_srcext-f}
+
+# Object file extension for compiled fc test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# No sense in running all these tests if we already determined that
+# the FC compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test yes != "$_lt_disable_FC"; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="\
+      subroutine t
+      return
+      end
+"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code="\
+      program t
+      end
+"
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+  _LT_TAG_COMPILER
+
+  # save warnings/boilerplate of simple test code
+  _LT_COMPILER_BOILERPLATE
+  _LT_LINKER_BOILERPLATE
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC=$CC
+  lt_save_GCC=$GCC
+  lt_save_CFLAGS=$CFLAGS
+  CC=${FC-"f95"}
+  CFLAGS=$FCFLAGS
+  compiler=$CC
+  GCC=$ac_cv_fc_compiler_gnu
+
+  _LT_TAGVAR(compiler, $1)=$CC
+  _LT_CC_BASENAME([$compiler])
+
+  if test -n "$compiler"; then
+    AC_MSG_CHECKING([if libtool supports shared libraries])
+    AC_MSG_RESULT([$can_build_shared])
+
+    AC_MSG_CHECKING([whether to build shared libraries])
+    test no = "$can_build_shared" && enable_shared=no
+
+    # On AIX, shared libraries and static libraries use the same namespace, and
+    # are all built from PIC.
+    case $host_os in
+      aix3*)
+        test yes = "$enable_shared" && enable_static=no
+        if test -n "$RANLIB"; then
+          archive_cmds="$archive_cmds~\$RANLIB \$lib"
+          postinstall_cmds='$RANLIB $lib'
+        fi
+        ;;
+      aix[[4-9]]*)
+	if test ia64 != "$host_cpu"; then
+	  case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+	  yes,aix,yes) ;;		# shared object as lib.so file only
+	  yes,svr4,*) ;;		# shared object as lib.so archive member only
+	  yes,*) enable_static=no ;;	# shared object in lib.a archive as well
+	  esac
+	fi
+        ;;
+    esac
+    AC_MSG_RESULT([$enable_shared])
+
+    AC_MSG_CHECKING([whether to build static libraries])
+    # Make sure either enable_shared or enable_static is yes.
+    test yes = "$enable_shared" || enable_static=yes
+    AC_MSG_RESULT([$enable_static])
+
+    _LT_TAGVAR(GCC, $1)=$ac_cv_fc_compiler_gnu
+    _LT_TAGVAR(LD, $1)=$LD
+
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    _LT_SYS_HIDDEN_LIBDEPS($1)
+    _LT_COMPILER_PIC($1)
+    _LT_COMPILER_C_O($1)
+    _LT_COMPILER_FILE_LOCKS($1)
+    _LT_LINKER_SHLIBS($1)
+    _LT_SYS_DYNAMIC_LINKER($1)
+    _LT_LINKER_HARDCODE_LIBPATH($1)
+
+    _LT_CONFIG($1)
+  fi # test -n "$compiler"
+
+  GCC=$lt_save_GCC
+  CC=$lt_save_CC
+  CFLAGS=$lt_save_CFLAGS
+fi # test yes != "$_lt_disable_FC"
+
+AC_LANG_POP
+])# _LT_LANG_FC_CONFIG
+
+
+# _LT_LANG_GCJ_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for the GNU Java Compiler compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to 'libtool'.
+m4_defun([_LT_LANG_GCJ_CONFIG],
+[AC_REQUIRE([LT_PROG_GCJ])dnl
+AC_LANG_SAVE
+
+# Source file extension for Java test sources.
+ac_ext=java
+
+# Object file extension for compiled Java test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="class foo {}"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=yes
+CC=${GCJ-"gcj"}
+CFLAGS=$GCJFLAGS
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_TAGVAR(LD, $1)=$LD
+_LT_CC_BASENAME([$compiler])
+
+# GCJ did not exist at the time GCC didn't implicitly link libc in.
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+
+  _LT_CONFIG($1)
+fi
+
+AC_LANG_RESTORE
+
+GCC=$lt_save_GCC
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_GCJ_CONFIG
+
+
+# _LT_LANG_GO_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for the GNU Go compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to 'libtool'.
+m4_defun([_LT_LANG_GO_CONFIG],
+[AC_REQUIRE([LT_PROG_GO])dnl
+AC_LANG_SAVE
+
+# Source file extension for Go test sources.
+ac_ext=go
+
+# Object file extension for compiled Go test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="package main; func main() { }"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='package main; func main() { }'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=yes
+CC=${GOC-"gccgo"}
+CFLAGS=$GOFLAGS
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_TAGVAR(LD, $1)=$LD
+_LT_CC_BASENAME([$compiler])
+
+# Go did not exist at the time GCC didn't implicitly link libc in.
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+
+  _LT_CONFIG($1)
+fi
+
+AC_LANG_RESTORE
+
+GCC=$lt_save_GCC
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_GO_CONFIG
+
+
+# _LT_LANG_RC_CONFIG([TAG])
+# -------------------------
+# Ensure that the configuration variables for the Windows resource compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to 'libtool'.
+m4_defun([_LT_LANG_RC_CONFIG],
+[AC_REQUIRE([LT_PROG_RC])dnl
+AC_LANG_SAVE
+
+# Source file extension for RC test sources.
+ac_ext=rc
+
+# Object file extension for compiled RC test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
+
+# Code to be used in simple link tests
+lt_simple_link_test_code=$lt_simple_compile_test_code
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=
+CC=${RC-"windres"}
+CFLAGS=
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_CC_BASENAME([$compiler])
+_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+
+if test -n "$compiler"; then
+  :
+  _LT_CONFIG($1)
+fi
+
+GCC=$lt_save_GCC
+AC_LANG_RESTORE
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_RC_CONFIG
+
+
+# LT_PROG_GCJ
+# -----------
+AC_DEFUN([LT_PROG_GCJ],
+[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],
+  [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],
+    [AC_CHECK_TOOL(GCJ, gcj,)
+      test set = "${GCJFLAGS+set}" || GCJFLAGS="-g -O2"
+      AC_SUBST(GCJFLAGS)])])[]dnl
+])
+
+# Old name:
+AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
+
+
+# LT_PROG_GO
+# ----------
+AC_DEFUN([LT_PROG_GO],
+[AC_CHECK_TOOL(GOC, gccgo,)
+])
+
+
+# LT_PROG_RC
+# ----------
+AC_DEFUN([LT_PROG_RC],
+[AC_CHECK_TOOL(RC, windres,)
+])
+
+# Old name:
+AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([LT_AC_PROG_RC], [])
+
+
+# _LT_DECL_EGREP
+# --------------
+# If we don't have a new enough Autoconf to choose the best grep
+# available, choose the one first in the user's PATH.
+m4_defun([_LT_DECL_EGREP],
+[AC_REQUIRE([AC_PROG_EGREP])dnl
+AC_REQUIRE([AC_PROG_FGREP])dnl
+test -z "$GREP" && GREP=grep
+_LT_DECL([], [GREP], [1], [A grep program that handles long lines])
+_LT_DECL([], [EGREP], [1], [An ERE matcher])
+_LT_DECL([], [FGREP], [1], [A literal string matcher])
+dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too
+AC_SUBST([GREP])
+])
+
+
+# _LT_DECL_OBJDUMP
+# --------------
+# If we don't have a new enough Autoconf to choose the best objdump
+# available, choose the one first in the user's PATH.
+m4_defun([_LT_DECL_OBJDUMP],
+[AC_CHECK_TOOL(OBJDUMP, objdump, false)
+test -z "$OBJDUMP" && OBJDUMP=objdump
+_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
+AC_SUBST([OBJDUMP])
+])
+
+# _LT_DECL_DLLTOOL
+# ----------------
+# Ensure DLLTOOL variable is set.
+m4_defun([_LT_DECL_DLLTOOL],
+[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])
+AC_SUBST([DLLTOOL])
+])
+
+# _LT_DECL_SED
+# ------------
+# Check for a fully-functional sed program, that truncates
+# as few characters as possible.  Prefer GNU sed if found.
+m4_defun([_LT_DECL_SED],
+[AC_PROG_SED
+test -z "$SED" && SED=sed
+Xsed="$SED -e 1s/^X//"
+_LT_DECL([], [SED], [1], [A sed program that does not truncate output])
+_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"],
+    [Sed that helps us avoid accidentally triggering echo(1) options like -n])
+])# _LT_DECL_SED
+
+m4_ifndef([AC_PROG_SED], [
+############################################################
+# NOTE: This macro has been submitted for inclusion into   #
+#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
+#  a released version of Autoconf we should remove this    #
+#  macro and use it instead.                               #
+############################################################
+
+m4_defun([AC_PROG_SED],
+[AC_MSG_CHECKING([for a sed that does not truncate output])
+AC_CACHE_VAL(lt_cv_path_SED,
+[# Loop through the user's path and test for sed and gsed.
+# Then use that list of sed's as ones to test for truncation.
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for lt_ac_prog in sed gsed; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
+        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
+      fi
+    done
+  done
+done
+IFS=$as_save_IFS
+lt_ac_max=0
+lt_ac_count=0
+# Add /usr/xpg4/bin/sed as it is typically found on Solaris
+# along with /bin/sed that truncates output.
+for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
+  test ! -f "$lt_ac_sed" && continue
+  cat /dev/null > conftest.in
+  lt_ac_count=0
+  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
+  # Check for GNU sed and select it if it is found.
+  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
+    lt_cv_path_SED=$lt_ac_sed
+    break
+  fi
+  while true; do
+    cat conftest.in conftest.in >conftest.tmp
+    mv conftest.tmp conftest.in
+    cp conftest.in conftest.nl
+    echo >>conftest.nl
+    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
+    cmp -s conftest.out conftest.nl || break
+    # 10000 chars as input seems more than enough
+    test 10 -lt "$lt_ac_count" && break
+    lt_ac_count=`expr $lt_ac_count + 1`
+    if test "$lt_ac_count" -gt "$lt_ac_max"; then
+      lt_ac_max=$lt_ac_count
+      lt_cv_path_SED=$lt_ac_sed
+    fi
+  done
+done
+])
+SED=$lt_cv_path_SED
+AC_SUBST([SED])
+AC_MSG_RESULT([$SED])
+])#AC_PROG_SED
+])#m4_ifndef
+
+# Old name:
+AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([LT_AC_PROG_SED], [])
+
+
+# _LT_CHECK_SHELL_FEATURES
+# ------------------------
+# Find out whether the shell is Bourne or XSI compatible,
+# or has some other useful features.
+m4_defun([_LT_CHECK_SHELL_FEATURES],
+[if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  lt_unset=unset
+else
+  lt_unset=false
+fi
+_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl
+
+# test EBCDIC or ASCII
+case `echo X|tr X '\101'` in
+ A) # ASCII based system
+    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
+  lt_SP2NL='tr \040 \012'
+  lt_NL2SP='tr \015\012 \040\040'
+  ;;
+ *) # EBCDIC based system
+  lt_SP2NL='tr \100 \n'
+  lt_NL2SP='tr \r\n \100\100'
+  ;;
+esac
+_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl
+_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
+])# _LT_CHECK_SHELL_FEATURES
+
+
+# _LT_PATH_CONVERSION_FUNCTIONS
+# -----------------------------
+# Determine what file name conversion functions should be used by
+# func_to_host_file (and, implicitly, by func_to_host_path).  These are needed
+# for certain cross-compile configurations and native mingw.
+m4_defun([_LT_PATH_CONVERSION_FUNCTIONS],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_MSG_CHECKING([how to convert $build file names to $host format])
+AC_CACHE_VAL(lt_cv_to_host_file_cmd,
+[case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
+        ;;
+    esac
+    ;;
+  *-*-cygwin* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_noop
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
+        ;;
+    esac
+    ;;
+  * ) # unhandled hosts (and "normal" native builds)
+    lt_cv_to_host_file_cmd=func_convert_file_noop
+    ;;
+esac
+])
+to_host_file_cmd=$lt_cv_to_host_file_cmd
+AC_MSG_RESULT([$lt_cv_to_host_file_cmd])
+_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd],
+         [0], [convert $build file names to $host format])dnl
+
+AC_MSG_CHECKING([how to convert $build file names to toolchain format])
+AC_CACHE_VAL(lt_cv_to_tool_file_cmd,
+[#assume ordinary cross tools, or native build.
+lt_cv_to_tool_file_cmd=func_convert_file_noop
+case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
+        ;;
+    esac
+    ;;
+esac
+])
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
+AC_MSG_RESULT([$lt_cv_to_tool_file_cmd])
+_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
+         [0], [convert $build files to toolchain format])dnl
+])# _LT_PATH_CONVERSION_FUNCTIONS
diff --git a/config/ltmain.sh b/config/ltmain.sh
new file mode 100644
index 0000000..0f0a2da
--- /dev/null
+++ b/config/ltmain.sh
@@ -0,0 +1,11147 @@
+#! /bin/sh
+## DO NOT EDIT - This file generated from ./build-aux/ltmain.in
+##               by inline-source v2014-01-03.01
+
+# libtool (GNU libtool) 2.4.6
+# Provide generalized library-building support services.
+# Written by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
+
+# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions.  There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# GNU Libtool is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# As a special exception to the GNU General Public License,
+# if you distribute this file as part of a program or library that
+# is built using GNU Libtool, you may include this file under the
+# same distribution terms that you use for the rest of that program.
+#
+# GNU Libtool is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+PROGRAM=libtool
+PACKAGE=libtool
+VERSION=2.4.6
+package_revision=2.4.6
+
+
+## ------ ##
+## Usage. ##
+## ------ ##
+
+# Run './libtool --help' for help with using this script from the
+# command line.
+
+
+## ------------------------------- ##
+## User overridable command paths. ##
+## ------------------------------- ##
+
+# After configure completes, it has a better idea of some of the
+# shell tools we need than the defaults used by the functions shared
+# with bootstrap, so set those here where they can still be over-
+# ridden by the user, but otherwise take precedence.
+
+: ${AUTOCONF="autoconf"}
+: ${AUTOMAKE="automake"}
+
+
+## -------------------------- ##
+## Source external libraries. ##
+## -------------------------- ##
+
+# Much of our low-level functionality needs to be sourced from external
+# libraries, which are installed to $pkgauxdir.
+
+# Set a version string for this script.
+scriptversion=2015-01-20.17; # UTC
+
+# General shell script boiler plate, and helper functions.
+# Written by Gary V. Vaughan, 2004
+
+# Copyright (C) 2004-2015 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions.  There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+
+# As a special exception to the GNU General Public License, if you distribute
+# this file as part of a program or library that is built using GNU Libtool,
+# you may include this file under the same distribution terms that you use
+# for the rest of that program.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNES FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# Please report bugs or propose patches to gary at gnu.org.
+
+
+## ------ ##
+## Usage. ##
+## ------ ##
+
+# Evaluate this file near the top of your script to gain access to
+# the functions and variables defined here:
+#
+#   . `echo "$0" | ${SED-sed} 's|[^/]*$||'`/build-aux/funclib.sh
+#
+# If you need to override any of the default environment variable
+# settings, do that before evaluating this file.
+
+
+## -------------------- ##
+## Shell normalisation. ##
+## -------------------- ##
+
+# Some shells need a little help to be as Bourne compatible as possible.
+# Before doing anything else, make sure all that help has been provided!
+
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in *posix*) set -o posix ;; esac
+fi
+
+# NLS nuisances: We save the old values in case they are required later.
+_G_user_locale=
+_G_safe_locale=
+for _G_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+do
+  eval "if test set = \"\${$_G_var+set}\"; then
+          save_$_G_var=\$$_G_var
+          $_G_var=C
+	  export $_G_var
+	  _G_user_locale=\"$_G_var=\\\$save_\$_G_var; \$_G_user_locale\"
+	  _G_safe_locale=\"$_G_var=C; \$_G_safe_locale\"
+	fi"
+done
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+# Make sure IFS has a sensible default
+sp=' '
+nl='
+'
+IFS="$sp	$nl"
+
+# There are apparently some retarded systems that use ';' as a PATH separator!
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
+fi
+
+
+
+## ------------------------- ##
+## Locate command utilities. ##
+## ------------------------- ##
+
+
+# func_executable_p FILE
+# ----------------------
+# Check that FILE is an executable regular file.
+func_executable_p ()
+{
+    test -f "$1" && test -x "$1"
+}
+
+
+# func_path_progs PROGS_LIST CHECK_FUNC [PATH]
+# --------------------------------------------
+# Search for either a program that responds to --version with output
+# containing "GNU", or else returned by CHECK_FUNC otherwise, by
+# trying all the directories in PATH with each of the elements of
+# PROGS_LIST.
+#
+# CHECK_FUNC should accept the path to a candidate program, and
+# set $func_check_prog_result if it truncates its output less than
+# $_G_path_prog_max characters.
+func_path_progs ()
+{
+    _G_progs_list=$1
+    _G_check_func=$2
+    _G_PATH=${3-"$PATH"}
+
+    _G_path_prog_max=0
+    _G_path_prog_found=false
+    _G_save_IFS=$IFS; IFS=${PATH_SEPARATOR-:}
+    for _G_dir in $_G_PATH; do
+      IFS=$_G_save_IFS
+      test -z "$_G_dir" && _G_dir=.
+      for _G_prog_name in $_G_progs_list; do
+        for _exeext in '' .EXE; do
+          _G_path_prog=$_G_dir/$_G_prog_name$_exeext
+          func_executable_p "$_G_path_prog" || continue
+          case `"$_G_path_prog" --version 2>&1` in
+            *GNU*) func_path_progs_result=$_G_path_prog _G_path_prog_found=: ;;
+            *)     $_G_check_func $_G_path_prog
+		   func_path_progs_result=$func_check_prog_result
+		   ;;
+          esac
+          $_G_path_prog_found && break 3
+        done
+      done
+    done
+    IFS=$_G_save_IFS
+    test -z "$func_path_progs_result" && {
+      echo "no acceptable sed could be found in \$PATH" >&2
+      exit 1
+    }
+}
+
+
+# We want to be able to use the functions in this file before configure
+# has figured out where the best binaries are kept, which means we have
+# to search for them ourselves - except when the results are already set
+# where we skip the searches.
+
+# Unless the user overrides by setting SED, search the path for either GNU
+# sed, or the sed that truncates its output the least.
+test -z "$SED" && {
+  _G_sed_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+  for _G_i in 1 2 3 4 5 6 7; do
+    _G_sed_script=$_G_sed_script$nl$_G_sed_script
+  done
+  echo "$_G_sed_script" 2>/dev/null | sed 99q >conftest.sed
+  _G_sed_script=
+
+  func_check_prog_sed ()
+  {
+    _G_path_prog=$1
+
+    _G_count=0
+    printf 0123456789 >conftest.in
+    while :
+    do
+      cat conftest.in conftest.in >conftest.tmp
+      mv conftest.tmp conftest.in
+      cp conftest.in conftest.nl
+      echo '' >> conftest.nl
+      "$_G_path_prog" -f conftest.sed <conftest.nl >conftest.out 2>/dev/null || break
+      diff conftest.out conftest.nl >/dev/null 2>&1 || break
+      _G_count=`expr $_G_count + 1`
+      if test "$_G_count" -gt "$_G_path_prog_max"; then
+        # Best one so far, save it but keep looking for a better one
+        func_check_prog_result=$_G_path_prog
+        _G_path_prog_max=$_G_count
+      fi
+      # 10*(2^10) chars as input seems more than enough
+      test 10 -lt "$_G_count" && break
+    done
+    rm -f conftest.in conftest.tmp conftest.nl conftest.out
+  }
+
+  func_path_progs "sed gsed" func_check_prog_sed $PATH:/usr/xpg4/bin
+  rm -f conftest.sed
+  SED=$func_path_progs_result
+}
+
+
+# Unless the user overrides by setting GREP, search the path for either GNU
+# grep, or the grep that truncates its output the least.
+test -z "$GREP" && {
+  func_check_prog_grep ()
+  {
+    _G_path_prog=$1
+
+    _G_count=0
+    _G_path_prog_max=0
+    printf 0123456789 >conftest.in
+    while :
+    do
+      cat conftest.in conftest.in >conftest.tmp
+      mv conftest.tmp conftest.in
+      cp conftest.in conftest.nl
+      echo 'GREP' >> conftest.nl
+      "$_G_path_prog" -e 'GREP$' -e '-(cannot match)-' <conftest.nl >conftest.out 2>/dev/null || break
+      diff conftest.out conftest.nl >/dev/null 2>&1 || break
+      _G_count=`expr $_G_count + 1`
+      if test "$_G_count" -gt "$_G_path_prog_max"; then
+        # Best one so far, save it but keep looking for a better one
+        func_check_prog_result=$_G_path_prog
+        _G_path_prog_max=$_G_count
+      fi
+      # 10*(2^10) chars as input seems more than enough
+      test 10 -lt "$_G_count" && break
+    done
+    rm -f conftest.in conftest.tmp conftest.nl conftest.out
+  }
+
+  func_path_progs "grep ggrep" func_check_prog_grep $PATH:/usr/xpg4/bin
+  GREP=$func_path_progs_result
+}
+
+
+## ------------------------------- ##
+## User overridable command paths. ##
+## ------------------------------- ##
+
+# All uppercase variable names are used for environment variables.  These
+# variables can be overridden by the user before calling a script that
+# uses them if a suitable command of that name is not already available
+# in the command search PATH.
+
+: ${CP="cp -f"}
+: ${ECHO="printf %s\n"}
+: ${EGREP="$GREP -E"}
+: ${FGREP="$GREP -F"}
+: ${LN_S="ln -s"}
+: ${MAKE="make"}
+: ${MKDIR="mkdir"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
+: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
+
+
+## -------------------- ##
+## Useful sed snippets. ##
+## -------------------- ##
+
+sed_dirname='s|/[^/]*$||'
+sed_basename='s|^.*/||'
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+sed_quote_subst='s|\([`"$\\]\)|\\\1|g'
+
+# Same as above, but do not quote variable references.
+sed_double_quote_subst='s/\(["`\\]\)/\\\1/g'
+
+# Sed substitution that turns a string into a regex matching for the
+# string literally.
+sed_make_literal_regex='s|[].[^$\\*\/]|\\&|g'
+
+# Sed substitution that converts a w32 file name or path
+# that contains forward slashes, into one that contains
+# (escaped) backslashes.  A very naive implementation.
+sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
+
+# Re-'\' parameter expansions in output of sed_double_quote_subst that
+# were '\'-ed in input to the same.  If an odd number of '\' preceded a
+# '$' in input to sed_double_quote_subst, that '$' was protected from
+# expansion.  Since each input '\' is now two '\'s, look for any number
+# of runs of four '\'s followed by two '\'s and then a '$'.  '\' that '$'.
+_G_bs='\\'
+_G_bs2='\\\\'
+_G_bs4='\\\\\\\\'
+_G_dollar='\$'
+sed_double_backslash="\
+  s/$_G_bs4/&\\
+/g
+  s/^$_G_bs2$_G_dollar/$_G_bs&/
+  s/\\([^$_G_bs]\\)$_G_bs2$_G_dollar/\\1$_G_bs2$_G_bs$_G_dollar/g
+  s/\n//g"
+
+
+## ----------------- ##
+## Global variables. ##
+## ----------------- ##
+
+# Except for the global variables explicitly listed below, the following
+# functions in the '^func_' namespace, and the '^require_' namespace
+# variables initialised in the 'Resource management' section, sourcing
+# this file will not pollute your global namespace with anything
+# else. There's no portable way to scope variables in Bourne shell
+# though, so actually running these functions will sometimes place
+# results into a variable named after the function, and often use
+# temporary variables in the '^_G_' namespace. If you are careful to
+# avoid using those namespaces casually in your sourcing script, things
+# should continue to work as you expect. And, of course, you can freely
+# overwrite any of the functions or variables defined here before
+# calling anything to customize them.
+
+EXIT_SUCCESS=0
+EXIT_FAILURE=1
+EXIT_MISMATCH=63  # $? = 63 is used to indicate version mismatch to missing.
+EXIT_SKIP=77	  # $? = 77 is used to indicate a skipped test to automake.
+
+# Allow overriding, eg assuming that you follow the convention of
+# putting '$debug_cmd' at the start of all your functions, you can get
+# bash to show function call trace with:
+#
+#    debug_cmd='eval echo "${FUNCNAME[0]} $*" >&2' bash your-script-name
+debug_cmd=${debug_cmd-":"}
+exit_cmd=:
+
+# By convention, finish your script with:
+#
+#    exit $exit_status
+#
+# so that you can set exit_status to non-zero if you want to indicate
+# something went wrong during execution without actually bailing out at
+# the point of failure.
+exit_status=$EXIT_SUCCESS
+
+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
+# is ksh but when the shell is invoked as "sh" and the current value of
+# the _XPG environment variable is not equal to 1 (one), the special
+# positional parameter $0, within a function call, is the name of the
+# function.
+progpath=$0
+
+# The name of this program.
+progname=`$ECHO "$progpath" |$SED "$sed_basename"`
+
+# Make sure we have an absolute progpath for reexecution:
+case $progpath in
+  [\\/]*|[A-Za-z]:\\*) ;;
+  *[\\/]*)
+     progdir=`$ECHO "$progpath" |$SED "$sed_dirname"`
+     progdir=`cd "$progdir" && pwd`
+     progpath=$progdir/$progname
+     ;;
+  *)
+     _G_IFS=$IFS
+     IFS=${PATH_SEPARATOR-:}
+     for progdir in $PATH; do
+       IFS=$_G_IFS
+       test -x "$progdir/$progname" && break
+     done
+     IFS=$_G_IFS
+     test -n "$progdir" || progdir=`pwd`
+     progpath=$progdir/$progname
+     ;;
+esac
+
+
+## ----------------- ##
+## Standard options. ##
+## ----------------- ##
+
+# The following options affect the operation of the functions defined
+# below, and should be set appropriately depending on run-time para-
+# meters passed on the command line.
+
+opt_dry_run=false
+opt_quiet=false
+opt_verbose=false
+
+# Categories 'all' and 'none' are always available.  Append any others
+# you will pass as the first argument to func_warning from your own
+# code.
+warning_categories=
+
+# By default, display warnings according to 'opt_warning_types'.  Set
+# 'warning_func'  to ':' to elide all warnings, or func_fatal_error to
+# treat the next displayed warning as a fatal error.
+warning_func=func_warn_and_continue
+
+# Set to 'all' to display all warnings, 'none' to suppress all
+# warnings, or a space delimited list of some subset of
+# 'warning_categories' to display only the listed warnings.
+opt_warning_types=all
+
+
+## -------------------- ##
+## Resource management. ##
+## -------------------- ##
+
+# This section contains definitions for functions that each ensure a
+# particular resource (a file, or a non-empty configuration variable for
+# example) is available, and if appropriate to extract default values
+# from pertinent package files. Call them using their associated
+# 'require_*' variable to ensure that they are executed, at most, once.
+#
+# It's entirely deliberate that calling these functions can set
+# variables that don't obey the namespace limitations obeyed by the rest
+# of this file, in order that that they be as useful as possible to
+# callers.
+
+
+# require_term_colors
+# -------------------
+# Allow display of bold text on terminals that support it.
+require_term_colors=func_require_term_colors
+func_require_term_colors ()
+{
+    $debug_cmd
+
+    test -t 1 && {
+      # COLORTERM and USE_ANSI_COLORS environment variables take
+      # precedence, because most terminfo databases neglect to describe
+      # whether color sequences are supported.
+      test -n "${COLORTERM+set}" && : ${USE_ANSI_COLORS="1"}
+
+      if test 1 = "$USE_ANSI_COLORS"; then
+        # Standard ANSI escape sequences
+        tc_reset=''
+        tc_bold='';   tc_standout=''
+        tc_red='';   tc_green=''
+        tc_blue='';  tc_cyan=''
+      else
+        # Otherwise trust the terminfo database after all.
+        test -n "`tput sgr0 2>/dev/null`" && {
+          tc_reset=`tput sgr0`
+          test -n "`tput bold 2>/dev/null`" && tc_bold=`tput bold`
+          tc_standout=$tc_bold
+          test -n "`tput smso 2>/dev/null`" && tc_standout=`tput smso`
+          test -n "`tput setaf 1 2>/dev/null`" && tc_red=`tput setaf 1`
+          test -n "`tput setaf 2 2>/dev/null`" && tc_green=`tput setaf 2`
+          test -n "`tput setaf 4 2>/dev/null`" && tc_blue=`tput setaf 4`
+          test -n "`tput setaf 5 2>/dev/null`" && tc_cyan=`tput setaf 5`
+        }
+      fi
+    }
+
+    require_term_colors=:
+}
+
+
+## ----------------- ##
+## Function library. ##
+## ----------------- ##
+
+# This section contains a variety of useful functions to call in your
+# scripts. Take note of the portable wrappers for features provided by
+# some modern shells, which will fall back to slower equivalents on
+# less featureful shells.
+
+
+# func_append VAR VALUE
+# ---------------------
+# Append VALUE onto the existing contents of VAR.
+
+  # We should try to minimise forks, especially on Windows where they are
+  # unreasonably slow, so skip the feature probes when bash or zsh are
+  # being used:
+  if test set = "${BASH_VERSION+set}${ZSH_VERSION+set}"; then
+    : ${_G_HAVE_ARITH_OP="yes"}
+    : ${_G_HAVE_XSI_OPS="yes"}
+    # The += operator was introduced in bash 3.1
+    case $BASH_VERSION in
+      [12].* | 3.0 | 3.0*) ;;
+      *)
+        : ${_G_HAVE_PLUSEQ_OP="yes"}
+        ;;
+    esac
+  fi
+
+  # _G_HAVE_PLUSEQ_OP
+  # Can be empty, in which case the shell is probed, "yes" if += is
+  # useable or anything else if it does not work.
+  test -z "$_G_HAVE_PLUSEQ_OP" \
+    && (eval 'x=a; x+=" b"; test "a b" = "$x"') 2>/dev/null \
+    && _G_HAVE_PLUSEQ_OP=yes
+
+if test yes = "$_G_HAVE_PLUSEQ_OP"
+then
+  # This is an XSI compatible shell, allowing a faster implementation...
+  eval 'func_append ()
+  {
+    $debug_cmd
+
+    eval "$1+=\$2"
+  }'
+else
+  # ...otherwise fall back to using expr, which is often a shell builtin.
+  func_append ()
+  {
+    $debug_cmd
+
+    eval "$1=\$$1\$2"
+  }
+fi
+
+
+# func_append_quoted VAR VALUE
+# ----------------------------
+# Quote VALUE and append to the end of shell variable VAR, separated
+# by a space.
+if test yes = "$_G_HAVE_PLUSEQ_OP"; then
+  eval 'func_append_quoted ()
+  {
+    $debug_cmd
+
+    func_quote_for_eval "$2"
+    eval "$1+=\\ \$func_quote_for_eval_result"
+  }'
+else
+  func_append_quoted ()
+  {
+    $debug_cmd
+
+    func_quote_for_eval "$2"
+    eval "$1=\$$1\\ \$func_quote_for_eval_result"
+  }
+fi
+
+
+# func_append_uniq VAR VALUE
+# --------------------------
+# Append unique VALUE onto the existing contents of VAR, assuming
+# entries are delimited by the first character of VALUE.  For example:
+#
+#   func_append_uniq options " --another-option option-argument"
+#
+# will only append to $options if " --another-option option-argument "
+# is not already present somewhere in $options already (note spaces at
+# each end implied by leading space in second argument).
+func_append_uniq ()
+{
+    $debug_cmd
+
+    eval _G_current_value='`$ECHO $'$1'`'
+    _G_delim=`expr "$2" : '\(.\)'`
+
+    case $_G_delim$_G_current_value$_G_delim in
+      *"$2$_G_delim"*) ;;
+      *) func_append "$@" ;;
+    esac
+}
+
+
+# func_arith TERM...
+# ------------------
+# Set func_arith_result to the result of evaluating TERMs.
+  test -z "$_G_HAVE_ARITH_OP" \
+    && (eval 'test 2 = $(( 1 + 1 ))') 2>/dev/null \
+    && _G_HAVE_ARITH_OP=yes
+
+if test yes = "$_G_HAVE_ARITH_OP"; then
+  eval 'func_arith ()
+  {
+    $debug_cmd
+
+    func_arith_result=$(( $* ))
+  }'
+else
+  func_arith ()
+  {
+    $debug_cmd
+
+    func_arith_result=`expr "$@"`
+  }
+fi
+
+
+# func_basename FILE
+# ------------------
+# Set func_basename_result to FILE with everything up to and including
+# the last / stripped.
+if test yes = "$_G_HAVE_XSI_OPS"; then
+  # If this shell supports suffix pattern removal, then use it to avoid
+  # forking. Hide the definitions single quotes in case the shell chokes
+  # on unsupported syntax...
+  _b='func_basename_result=${1##*/}'
+  _d='case $1 in
+        */*) func_dirname_result=${1%/*}$2 ;;
+        *  ) func_dirname_result=$3        ;;
+      esac'
+
+else
+  # ...otherwise fall back to using sed.
+  _b='func_basename_result=`$ECHO "$1" |$SED "$sed_basename"`'
+  _d='func_dirname_result=`$ECHO "$1"  |$SED "$sed_dirname"`
+      if test "X$func_dirname_result" = "X$1"; then
+        func_dirname_result=$3
+      else
+        func_append func_dirname_result "$2"
+      fi'
+fi
+
+eval 'func_basename ()
+{
+    $debug_cmd
+
+    '"$_b"'
+}'
+
+
+# func_dirname FILE APPEND NONDIR_REPLACEMENT
+# -------------------------------------------
+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+eval 'func_dirname ()
+{
+    $debug_cmd
+
+    '"$_d"'
+}'
+
+
+# func_dirname_and_basename FILE APPEND NONDIR_REPLACEMENT
+# --------------------------------------------------------
+# Perform func_basename and func_dirname in a single function
+# call:
+#   dirname:  Compute the dirname of FILE.  If nonempty,
+#             add APPEND to the result, otherwise set result
+#             to NONDIR_REPLACEMENT.
+#             value returned in "$func_dirname_result"
+#   basename: Compute filename of FILE.
+#             value retuned in "$func_basename_result"
+# For efficiency, we do not delegate to the functions above but instead
+# duplicate the functionality here.
+eval 'func_dirname_and_basename ()
+{
+    $debug_cmd
+
+    '"$_b"'
+    '"$_d"'
+}'
+
+
+# func_echo ARG...
+# ----------------
+# Echo program name prefixed message.
+func_echo ()
+{
+    $debug_cmd
+
+    _G_message=$*
+
+    func_echo_IFS=$IFS
+    IFS=$nl
+    for _G_line in $_G_message; do
+      IFS=$func_echo_IFS
+      $ECHO "$progname: $_G_line"
+    done
+    IFS=$func_echo_IFS
+}
+
+
+# func_echo_all ARG...
+# --------------------
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+    $ECHO "$*"
+}
+
+
+# func_echo_infix_1 INFIX ARG...
+# ------------------------------
+# Echo program name, followed by INFIX on the first line, with any
+# additional lines not showing INFIX.
+func_echo_infix_1 ()
+{
+    $debug_cmd
+
+    $require_term_colors
+
+    _G_infix=$1; shift
+    _G_indent=$_G_infix
+    _G_prefix="$progname: $_G_infix: "
+    _G_message=$*
+
+    # Strip color escape sequences before counting printable length
+    for _G_tc in "$tc_reset" "$tc_bold" "$tc_standout" "$tc_red" "$tc_green" "$tc_blue" "$tc_cyan"
+    do
+      test -n "$_G_tc" && {
+        _G_esc_tc=`$ECHO "$_G_tc" | $SED "$sed_make_literal_regex"`
+        _G_indent=`$ECHO "$_G_indent" | $SED "s|$_G_esc_tc||g"`
+      }
+    done
+    _G_indent="$progname: "`echo "$_G_indent" | $SED 's|.| |g'`"  " ## exclude from sc_prohibit_nested_quotes
+
+    func_echo_infix_1_IFS=$IFS
+    IFS=$nl
+    for _G_line in $_G_message; do
+      IFS=$func_echo_infix_1_IFS
+      $ECHO "$_G_prefix$tc_bold$_G_line$tc_reset" >&2
+      _G_prefix=$_G_indent
+    done
+    IFS=$func_echo_infix_1_IFS
+}
+
+
+# func_error ARG...
+# -----------------
+# Echo program name prefixed message to standard error.
+func_error ()
+{
+    $debug_cmd
+
+    $require_term_colors
+
+    func_echo_infix_1 "  $tc_standout${tc_red}error$tc_reset" "$*" >&2
+}
+
+
+# func_fatal_error ARG...
+# -----------------------
+# Echo program name prefixed message to standard error, and exit.
+func_fatal_error ()
+{
+    $debug_cmd
+
+    func_error "$*"
+    exit $EXIT_FAILURE
+}
+
+
+# func_grep EXPRESSION FILENAME
+# -----------------------------
+# Check whether EXPRESSION matches any line of FILENAME, without output.
+func_grep ()
+{
+    $debug_cmd
+
+    $GREP "$1" "$2" >/dev/null 2>&1
+}
+
+
+# func_len STRING
+# ---------------
+# Set func_len_result to the length of STRING. STRING may not
+# start with a hyphen.
+  test -z "$_G_HAVE_XSI_OPS" \
+    && (eval 'x=a/b/c;
+      test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \
+    && _G_HAVE_XSI_OPS=yes
+
+if test yes = "$_G_HAVE_XSI_OPS"; then
+  eval 'func_len ()
+  {
+    $debug_cmd
+
+    func_len_result=${#1}
+  }'
+else
+  func_len ()
+  {
+    $debug_cmd
+
+    func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
+  }
+fi
+
+
+# func_mkdir_p DIRECTORY-PATH
+# ---------------------------
+# Make sure the entire path to DIRECTORY-PATH is available.
+func_mkdir_p ()
+{
+    $debug_cmd
+
+    _G_directory_path=$1
+    _G_dir_list=
+
+    if test -n "$_G_directory_path" && test : != "$opt_dry_run"; then
+
+      # Protect directory names starting with '-'
+      case $_G_directory_path in
+        -*) _G_directory_path=./$_G_directory_path ;;
+      esac
+
+      # While some portion of DIR does not yet exist...
+      while test ! -d "$_G_directory_path"; do
+        # ...make a list in topmost first order.  Use a colon delimited
+	# list incase some portion of path contains whitespace.
+        _G_dir_list=$_G_directory_path:$_G_dir_list
+
+        # If the last portion added has no slash in it, the list is done
+        case $_G_directory_path in */*) ;; *) break ;; esac
+
+        # ...otherwise throw away the child directory and loop
+        _G_directory_path=`$ECHO "$_G_directory_path" | $SED -e "$sed_dirname"`
+      done
+      _G_dir_list=`$ECHO "$_G_dir_list" | $SED 's|:*$||'`
+
+      func_mkdir_p_IFS=$IFS; IFS=:
+      for _G_dir in $_G_dir_list; do
+	IFS=$func_mkdir_p_IFS
+        # mkdir can fail with a 'File exist' error if two processes
+        # try to create one of the directories concurrently.  Don't
+        # stop in that case!
+        $MKDIR "$_G_dir" 2>/dev/null || :
+      done
+      IFS=$func_mkdir_p_IFS
+
+      # Bail out if we (or some other process) failed to create a directory.
+      test -d "$_G_directory_path" || \
+        func_fatal_error "Failed to create '$1'"
+    fi
+}
+
+
+# func_mktempdir [BASENAME]
+# -------------------------
+# Make a temporary directory that won't clash with other running
+# libtool processes, and avoids race conditions if possible.  If
+# given, BASENAME is the basename for that directory.
+func_mktempdir ()
+{
+    $debug_cmd
+
+    _G_template=${TMPDIR-/tmp}/${1-$progname}
+
+    if test : = "$opt_dry_run"; then
+      # Return a directory name, but don't create it in dry-run mode
+      _G_tmpdir=$_G_template-$$
+    else
+
+      # If mktemp works, use that first and foremost
+      _G_tmpdir=`mktemp -d "$_G_template-XXXXXXXX" 2>/dev/null`
+
+      if test ! -d "$_G_tmpdir"; then
+        # Failing that, at least try and use $RANDOM to avoid a race
+        _G_tmpdir=$_G_template-${RANDOM-0}$$
+
+        func_mktempdir_umask=`umask`
+        umask 0077
+        $MKDIR "$_G_tmpdir"
+        umask $func_mktempdir_umask
+      fi
+
+      # If we're not in dry-run mode, bomb out on failure
+      test -d "$_G_tmpdir" || \
+        func_fatal_error "cannot create temporary directory '$_G_tmpdir'"
+    fi
+
+    $ECHO "$_G_tmpdir"
+}
+
+
+# func_normal_abspath PATH
+# ------------------------
+# Remove doubled-up and trailing slashes, "." path components,
+# and cancel out any ".." path components in PATH after making
+# it an absolute path.
+func_normal_abspath ()
+{
+    $debug_cmd
+
+    # These SED scripts presuppose an absolute path with a trailing slash.
+    _G_pathcar='s|^/\([^/]*\).*$|\1|'
+    _G_pathcdr='s|^/[^/]*||'
+    _G_removedotparts=':dotsl
+		s|/\./|/|g
+		t dotsl
+		s|/\.$|/|'
+    _G_collapseslashes='s|/\{1,\}|/|g'
+    _G_finalslash='s|/*$|/|'
+
+    # Start from root dir and reassemble the path.
+    func_normal_abspath_result=
+    func_normal_abspath_tpath=$1
+    func_normal_abspath_altnamespace=
+    case $func_normal_abspath_tpath in
+      "")
+        # Empty path, that just means $cwd.
+        func_stripname '' '/' "`pwd`"
+        func_normal_abspath_result=$func_stripname_result
+        return
+        ;;
+      # The next three entries are used to spot a run of precisely
+      # two leading slashes without using negated character classes;
+      # we take advantage of case's first-match behaviour.
+      ///*)
+        # Unusual form of absolute path, do nothing.
+        ;;
+      //*)
+        # Not necessarily an ordinary path; POSIX reserves leading '//'
+        # and for example Cygwin uses it to access remote file shares
+        # over CIFS/SMB, so we conserve a leading double slash if found.
+        func_normal_abspath_altnamespace=/
+        ;;
+      /*)
+        # Absolute path, do nothing.
+        ;;
+      *)
+        # Relative path, prepend $cwd.
+        func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
+        ;;
+    esac
+
+    # Cancel out all the simple stuff to save iterations.  We also want
+    # the path to end with a slash for ease of parsing, so make sure
+    # there is one (and only one) here.
+    func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
+          -e "$_G_removedotparts" -e "$_G_collapseslashes" -e "$_G_finalslash"`
+    while :; do
+      # Processed it all yet?
+      if test / = "$func_normal_abspath_tpath"; then
+        # If we ascended to the root using ".." the result may be empty now.
+        if test -z "$func_normal_abspath_result"; then
+          func_normal_abspath_result=/
+        fi
+        break
+      fi
+      func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
+          -e "$_G_pathcar"`
+      func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
+          -e "$_G_pathcdr"`
+      # Figure out what to do with it
+      case $func_normal_abspath_tcomponent in
+        "")
+          # Trailing empty path component, ignore it.
+          ;;
+        ..)
+          # Parent dir; strip last assembled component from result.
+          func_dirname "$func_normal_abspath_result"
+          func_normal_abspath_result=$func_dirname_result
+          ;;
+        *)
+          # Actual path component, append it.
+          func_append func_normal_abspath_result "/$func_normal_abspath_tcomponent"
+          ;;
+      esac
+    done
+    # Restore leading double-slash if one was found on entry.
+    func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
+}
+
+
+# func_notquiet ARG...
+# --------------------
+# Echo program name prefixed message only when not in quiet mode.
+func_notquiet ()
+{
+    $debug_cmd
+
+    $opt_quiet || func_echo ${1+"$@"}
+
+    # A bug in bash halts the script if the last line of a function
+    # fails when set -e is in force, so we need another command to
+    # work around that:
+    :
+}
+
+
+# func_relative_path SRCDIR DSTDIR
+# --------------------------------
+# Set func_relative_path_result to the relative path from SRCDIR to DSTDIR.
+func_relative_path ()
+{
+    $debug_cmd
+
+    func_relative_path_result=
+    func_normal_abspath "$1"
+    func_relative_path_tlibdir=$func_normal_abspath_result
+    func_normal_abspath "$2"
+    func_relative_path_tbindir=$func_normal_abspath_result
+
+    # Ascend the tree starting from libdir
+    while :; do
+      # check if we have found a prefix of bindir
+      case $func_relative_path_tbindir in
+        $func_relative_path_tlibdir)
+          # found an exact match
+          func_relative_path_tcancelled=
+          break
+          ;;
+        $func_relative_path_tlibdir*)
+          # found a matching prefix
+          func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
+          func_relative_path_tcancelled=$func_stripname_result
+          if test -z "$func_relative_path_result"; then
+            func_relative_path_result=.
+          fi
+          break
+          ;;
+        *)
+          func_dirname $func_relative_path_tlibdir
+          func_relative_path_tlibdir=$func_dirname_result
+          if test -z "$func_relative_path_tlibdir"; then
+            # Have to descend all the way to the root!
+            func_relative_path_result=../$func_relative_path_result
+            func_relative_path_tcancelled=$func_relative_path_tbindir
+            break
+          fi
+          func_relative_path_result=../$func_relative_path_result
+          ;;
+      esac
+    done
+
+    # Now calculate path; take care to avoid doubling-up slashes.
+    func_stripname '' '/' "$func_relative_path_result"
+    func_relative_path_result=$func_stripname_result
+    func_stripname '/' '/' "$func_relative_path_tcancelled"
+    if test -n "$func_stripname_result"; then
+      func_append func_relative_path_result "/$func_stripname_result"
+    fi
+
+    # Normalisation. If bindir is libdir, return '.' else relative path.
+    if test -n "$func_relative_path_result"; then
+      func_stripname './' '' "$func_relative_path_result"
+      func_relative_path_result=$func_stripname_result
+    fi
+
+    test -n "$func_relative_path_result" || func_relative_path_result=.
+
+    :
+}
+
+
+# func_quote_for_eval ARG...
+# --------------------------
+# Aesthetically quote ARGs to be evaled later.
+# This function returns two values:
+#   i) func_quote_for_eval_result
+#      double-quoted, suitable for a subsequent eval
+#  ii) func_quote_for_eval_unquoted_result
+#      has all characters that are still active within double
+#      quotes backslashified.
+func_quote_for_eval ()
+{
+    $debug_cmd
+
+    func_quote_for_eval_unquoted_result=
+    func_quote_for_eval_result=
+    while test 0 -lt $#; do
+      case $1 in
+        *[\\\`\"\$]*)
+	  _G_unquoted_arg=`printf '%s\n' "$1" |$SED "$sed_quote_subst"` ;;
+        *)
+          _G_unquoted_arg=$1 ;;
+      esac
+      if test -n "$func_quote_for_eval_unquoted_result"; then
+	func_append func_quote_for_eval_unquoted_result " $_G_unquoted_arg"
+      else
+        func_append func_quote_for_eval_unquoted_result "$_G_unquoted_arg"
+      fi
+
+      case $_G_unquoted_arg in
+        # Double-quote args containing shell metacharacters to delay
+        # word splitting, command substitution and variable expansion
+        # for a subsequent eval.
+        # Many Bourne shells cannot handle close brackets correctly
+        # in scan sets, so we specify it separately.
+        *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+          _G_quoted_arg=\"$_G_unquoted_arg\"
+          ;;
+        *)
+          _G_quoted_arg=$_G_unquoted_arg
+	  ;;
+      esac
+
+      if test -n "$func_quote_for_eval_result"; then
+	func_append func_quote_for_eval_result " $_G_quoted_arg"
+      else
+        func_append func_quote_for_eval_result "$_G_quoted_arg"
+      fi
+      shift
+    done
+}
+
+
+# func_quote_for_expand ARG
+# -------------------------
+# Aesthetically quote ARG to be evaled later; same as above,
+# but do not quote variable references.
+func_quote_for_expand ()
+{
+    $debug_cmd
+
+    case $1 in
+      *[\\\`\"]*)
+	_G_arg=`$ECHO "$1" | $SED \
+	    -e "$sed_double_quote_subst" -e "$sed_double_backslash"` ;;
+      *)
+        _G_arg=$1 ;;
+    esac
+
+    case $_G_arg in
+      # Double-quote args containing shell metacharacters to delay
+      # word splitting and command substitution for a subsequent eval.
+      # Many Bourne shells cannot handle close brackets correctly
+      # in scan sets, so we specify it separately.
+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+        _G_arg=\"$_G_arg\"
+        ;;
+    esac
+
+    func_quote_for_expand_result=$_G_arg
+}
+
+
+# func_stripname PREFIX SUFFIX NAME
+# ---------------------------------
+# strip PREFIX and SUFFIX from NAME, and store in func_stripname_result.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+if test yes = "$_G_HAVE_XSI_OPS"; then
+  eval 'func_stripname ()
+  {
+    $debug_cmd
+
+    # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
+    # positional parameters, so assign one to ordinary variable first.
+    func_stripname_result=$3
+    func_stripname_result=${func_stripname_result#"$1"}
+    func_stripname_result=${func_stripname_result%"$2"}
+  }'
+else
+  func_stripname ()
+  {
+    $debug_cmd
+
+    case $2 in
+      .*) func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%\\\\$2\$%%"`;;
+      *)  func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%$2\$%%"`;;
+    esac
+  }
+fi
+
+
+# func_show_eval CMD [FAIL_EXP]
+# -----------------------------
+# Unless opt_quiet is true, then output CMD.  Then, if opt_dryrun is
+# not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
+# is given, then evaluate it.
+func_show_eval ()
+{
+    $debug_cmd
+
+    _G_cmd=$1
+    _G_fail_exp=${2-':'}
+
+    func_quote_for_expand "$_G_cmd"
+    eval "func_notquiet $func_quote_for_expand_result"
+
+    $opt_dry_run || {
+      eval "$_G_cmd"
+      _G_status=$?
+      if test 0 -ne "$_G_status"; then
+	eval "(exit $_G_status); $_G_fail_exp"
+      fi
+    }
+}
+
+
+# func_show_eval_locale CMD [FAIL_EXP]
+# ------------------------------------
+# Unless opt_quiet is true, then output CMD.  Then, if opt_dryrun is
+# not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
+# is given, then evaluate it.  Use the saved locale for evaluation.
+func_show_eval_locale ()
+{
+    $debug_cmd
+
+    _G_cmd=$1
+    _G_fail_exp=${2-':'}
+
+    $opt_quiet || {
+      func_quote_for_expand "$_G_cmd"
+      eval "func_echo $func_quote_for_expand_result"
+    }
+
+    $opt_dry_run || {
+      eval "$_G_user_locale
+	    $_G_cmd"
+      _G_status=$?
+      eval "$_G_safe_locale"
+      if test 0 -ne "$_G_status"; then
+	eval "(exit $_G_status); $_G_fail_exp"
+      fi
+    }
+}
+
+
+# func_tr_sh
+# ----------
+# Turn $1 into a string suitable for a shell variable name.
+# Result is stored in $func_tr_sh_result.  All characters
+# not in the set a-zA-Z0-9_ are replaced with '_'. Further,
+# if $1 begins with a digit, a '_' is prepended as well.
+func_tr_sh ()
+{
+    $debug_cmd
+
+    case $1 in
+    [0-9]* | *[!a-zA-Z0-9_]*)
+      func_tr_sh_result=`$ECHO "$1" | $SED -e 's/^\([0-9]\)/_\1/' -e 's/[^a-zA-Z0-9_]/_/g'`
+      ;;
+    * )
+      func_tr_sh_result=$1
+      ;;
+    esac
+}
+
+
+# func_verbose ARG...
+# -------------------
+# Echo program name prefixed message in verbose mode only.
+func_verbose ()
+{
+    $debug_cmd
+
+    $opt_verbose && func_echo "$*"
+
+    :
+}
+
+
+# func_warn_and_continue ARG...
+# -----------------------------
+# Echo program name prefixed warning message to standard error.
+func_warn_and_continue ()
+{
+    $debug_cmd
+
+    $require_term_colors
+
+    func_echo_infix_1 "${tc_red}warning$tc_reset" "$*" >&2
+}
+
+
+# func_warning CATEGORY ARG...
+# ----------------------------
+# Echo program name prefixed warning message to standard error. Warning
+# messages can be filtered according to CATEGORY, where this function
+# elides messages where CATEGORY is not listed in the global variable
+# 'opt_warning_types'.
+func_warning ()
+{
+    $debug_cmd
+
+    # CATEGORY must be in the warning_categories list!
+    case " $warning_categories " in
+      *" $1 "*) ;;
+      *) func_internal_error "invalid warning category '$1'" ;;
+    esac
+
+    _G_category=$1
+    shift
+
+    case " $opt_warning_types " in
+      *" $_G_category "*) $warning_func ${1+"$@"} ;;
+    esac
+}
+
+
+# func_sort_ver VER1 VER2
+# -----------------------
+# 'sort -V' is not generally available.
+# Note this deviates from the version comparison in automake
+# in that it treats 1.5 < 1.5.0, and treats 1.4.4a < 1.4-p3a
+# but this should suffice as we won't be specifying old
+# version formats or redundant trailing .0 in bootstrap.conf.
+# If we did want full compatibility then we should probably
+# use m4_version_compare from autoconf.
+func_sort_ver ()
+{
+    $debug_cmd
+
+    printf '%s\n%s\n' "$1" "$2" \
+      | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n -k 5,5n -k 6,6n -k 7,7n -k 8,8n -k 9,9n
+}
+
+# func_lt_ver PREV CURR
+# ---------------------
+# Return true if PREV and CURR are in the correct order according to
+# func_sort_ver, otherwise false.  Use it like this:
+#
+#  func_lt_ver "$prev_ver" "$proposed_ver" || func_fatal_error "..."
+func_lt_ver ()
+{
+    $debug_cmd
+
+    test "x$1" = x`func_sort_ver "$1" "$2" | $SED 1q`
+}
+
+
+# Local variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'before-save-hook 'time-stamp)
+# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC"
+# time-stamp-time-zone: "UTC"
+# End:
+#! /bin/sh
+
+# Set a version string for this script.
+scriptversion=2014-01-07.03; # UTC
+
+# A portable, pluggable option parser for Bourne shell.
+# Written by Gary V. Vaughan, 2010
+
+# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions.  There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Please report bugs or propose patches to gary at gnu.org.
+
+
+## ------ ##
+## Usage. ##
+## ------ ##
+
+# This file is a library for parsing options in your shell scripts along
+# with assorted other useful supporting features that you can make use
+# of too.
+#
+# For the simplest scripts you might need only:
+#
+#   #!/bin/sh
+#   . relative/path/to/funclib.sh
+#   . relative/path/to/options-parser
+#   scriptversion=1.0
+#   func_options ${1+"$@"}
+#   eval set dummy "$func_options_result"; shift
+#   ...rest of your script...
+#
+# In order for the '--version' option to work, you will need to have a
+# suitably formatted comment like the one at the top of this file
+# starting with '# Written by ' and ending with '# warranty; '.
+#
+# For '-h' and '--help' to work, you will also need a one line
+# description of your script's purpose in a comment directly above the
+# '# Written by ' line, like the one at the top of this file.
+#
+# The default options also support '--debug', which will turn on shell
+# execution tracing (see the comment above debug_cmd below for another
+# use), and '--verbose' and the func_verbose function to allow your script
+# to display verbose messages only when your user has specified
+# '--verbose'.
+#
+# After sourcing this file, you can plug processing for additional
+# options by amending the variables from the 'Configuration' section
+# below, and following the instructions in the 'Option parsing'
+# section further down.
+
+## -------------- ##
+## Configuration. ##
+## -------------- ##
+
+# You should override these variables in your script after sourcing this
+# file so that they reflect the customisations you have added to the
+# option parser.
+
+# The usage line for option parsing errors and the start of '-h' and
+# '--help' output messages. You can embed shell variables for delayed
+# expansion at the time the message is displayed, but you will need to
+# quote other shell meta-characters carefully to prevent them being
+# expanded when the contents are evaled.
+usage='$progpath [OPTION]...'
+
+# Short help message in response to '-h' and '--help'.  Add to this or
+# override it after sourcing this library to reflect the full set of
+# options your script accepts.
+usage_message="\
+       --debug        enable verbose shell tracing
+   -W, --warnings=CATEGORY
+                      report the warnings falling in CATEGORY [all]
+   -v, --verbose      verbosely report processing
+       --version      print version information and exit
+   -h, --help         print short or long help message and exit
+"
+
+# Additional text appended to 'usage_message' in response to '--help'.
+long_help_message="
+Warning categories include:
+       'all'          show all warnings
+       'none'         turn off all the warnings
+       'error'        warnings are treated as fatal errors"
+
+# Help message printed before fatal option parsing errors.
+fatal_help="Try '\$progname --help' for more information."
+
+
+
+## ------------------------- ##
+## Hook function management. ##
+## ------------------------- ##
+
+# This section contains functions for adding, removing, and running hooks
+# to the main code.  A hook is just a named list of of function, that can
+# be run in order later on.
+
+# func_hookable FUNC_NAME
+# -----------------------
+# Declare that FUNC_NAME will run hooks added with
+# 'func_add_hook FUNC_NAME ...'.
+func_hookable ()
+{
+    $debug_cmd
+
+    func_append hookable_fns " $1"
+}
+
+
+# func_add_hook FUNC_NAME HOOK_FUNC
+# ---------------------------------
+# Request that FUNC_NAME call HOOK_FUNC before it returns.  FUNC_NAME must
+# first have been declared "hookable" by a call to 'func_hookable'.
+func_add_hook ()
+{
+    $debug_cmd
+
+    case " $hookable_fns " in
+      *" $1 "*) ;;
+      *) func_fatal_error "'$1' does not accept hook functions." ;;
+    esac
+
+    eval func_append ${1}_hooks '" $2"'
+}
+
+
+# func_remove_hook FUNC_NAME HOOK_FUNC
+# ------------------------------------
+# Remove HOOK_FUNC from the list of functions called by FUNC_NAME.
+func_remove_hook ()
+{
+    $debug_cmd
+
+    eval ${1}_hooks='`$ECHO "\$'$1'_hooks" |$SED "s| '$2'||"`'
+}
+
+
+# func_run_hooks FUNC_NAME [ARG]...
+# ---------------------------------
+# Run all hook functions registered to FUNC_NAME.
+# It is assumed that the list of hook functions contains nothing more
+# than a whitespace-delimited list of legal shell function names, and
+# no effort is wasted trying to catch shell meta-characters or preserve
+# whitespace.
+func_run_hooks ()
+{
+    $debug_cmd
+
+    case " $hookable_fns " in
+      *" $1 "*) ;;
+      *) func_fatal_error "'$1' does not support hook funcions.n" ;;
+    esac
+
+    eval _G_hook_fns=\$$1_hooks; shift
+
+    for _G_hook in $_G_hook_fns; do
+      eval $_G_hook '"$@"'
+
+      # store returned options list back into positional
+      # parameters for next 'cmd' execution.
+      eval _G_hook_result=\$${_G_hook}_result
+      eval set dummy "$_G_hook_result"; shift
+    done
+
+    func_quote_for_eval ${1+"$@"}
+    func_run_hooks_result=$func_quote_for_eval_result
+}
+
+
+
+## --------------- ##
+## Option parsing. ##
+## --------------- ##
+
+# In order to add your own option parsing hooks, you must accept the
+# full positional parameter list in your hook function, remove any
+# options that you action, and then pass back the remaining unprocessed
+# options in '<hooked_function_name>_result', escaped suitably for
+# 'eval'.  Like this:
+#
+#    my_options_prep ()
+#    {
+#        $debug_cmd
+#
+#        # Extend the existing usage message.
+#        usage_message=$usage_message'
+#      -s, --silent       don'\''t print informational messages
+#    '
+#
+#        func_quote_for_eval ${1+"$@"}
+#        my_options_prep_result=$func_quote_for_eval_result
+#    }
+#    func_add_hook func_options_prep my_options_prep
+#
+#
+#    my_silent_option ()
+#    {
+#        $debug_cmd
+#
+#        # Note that for efficiency, we parse as many options as we can
+#        # recognise in a loop before passing the remainder back to the
+#        # caller on the first unrecognised argument we encounter.
+#        while test $# -gt 0; do
+#          opt=$1; shift
+#          case $opt in
+#            --silent|-s) opt_silent=: ;;
+#            # Separate non-argument short options:
+#            -s*)         func_split_short_opt "$_G_opt"
+#                         set dummy "$func_split_short_opt_name" \
+#                             "-$func_split_short_opt_arg" ${1+"$@"}
+#                         shift
+#                         ;;
+#            *)            set dummy "$_G_opt" "$*"; shift; break ;;
+#          esac
+#        done
+#
+#        func_quote_for_eval ${1+"$@"}
+#        my_silent_option_result=$func_quote_for_eval_result
+#    }
+#    func_add_hook func_parse_options my_silent_option
+#
+#
+#    my_option_validation ()
+#    {
+#        $debug_cmd
+#
+#        $opt_silent && $opt_verbose && func_fatal_help "\
+#    '--silent' and '--verbose' options are mutually exclusive."
+#
+#        func_quote_for_eval ${1+"$@"}
+#        my_option_validation_result=$func_quote_for_eval_result
+#    }
+#    func_add_hook func_validate_options my_option_validation
+#
+# You'll alse need to manually amend $usage_message to reflect the extra
+# options you parse.  It's preferable to append if you can, so that
+# multiple option parsing hooks can be added safely.
+
+
+# func_options [ARG]...
+# ---------------------
+# All the functions called inside func_options are hookable. See the
+# individual implementations for details.
+func_hookable func_options
+func_options ()
+{
+    $debug_cmd
+
+    func_options_prep ${1+"$@"}
+    eval func_parse_options \
+        ${func_options_prep_result+"$func_options_prep_result"}
+    eval func_validate_options \
+        ${func_parse_options_result+"$func_parse_options_result"}
+
+    eval func_run_hooks func_options \
+        ${func_validate_options_result+"$func_validate_options_result"}
+
+    # save modified positional parameters for caller
+    func_options_result=$func_run_hooks_result
+}
+
+
+# func_options_prep [ARG]...
+# --------------------------
+# All initialisations required before starting the option parse loop.
+# Note that when calling hook functions, we pass through the list of
+# positional parameters.  If a hook function modifies that list, and
+# needs to propogate that back to rest of this script, then the complete
+# modified list must be put in 'func_run_hooks_result' before
+# returning.
+func_hookable func_options_prep
+func_options_prep ()
+{
+    $debug_cmd
+
+    # Option defaults:
+    opt_verbose=false
+    opt_warning_types=
+
+    func_run_hooks func_options_prep ${1+"$@"}
+
+    # save modified positional parameters for caller
+    func_options_prep_result=$func_run_hooks_result
+}
+
+
+# func_parse_options [ARG]...
+# ---------------------------
+# The main option parsing loop.
+func_hookable func_parse_options
+func_parse_options ()
+{
+    $debug_cmd
+
+    func_parse_options_result=
+
+    # this just eases exit handling
+    while test $# -gt 0; do
+      # Defer to hook functions for initial option parsing, so they
+      # get priority in the event of reusing an option name.
+      func_run_hooks func_parse_options ${1+"$@"}
+
+      # Adjust func_parse_options positional parameters to match
+      eval set dummy "$func_run_hooks_result"; shift
+
+      # Break out of the loop if we already parsed every option.
+      test $# -gt 0 || break
+
+      _G_opt=$1
+      shift
+      case $_G_opt in
+        --debug|-x)   debug_cmd='set -x'
+                      func_echo "enabling shell trace mode"
+                      $debug_cmd
+                      ;;
+
+        --no-warnings|--no-warning|--no-warn)
+                      set dummy --warnings none ${1+"$@"}
+                      shift
+		      ;;
+
+        --warnings|--warning|-W)
+                      test $# = 0 && func_missing_arg $_G_opt && break
+                      case " $warning_categories $1" in
+                        *" $1 "*)
+                          # trailing space prevents matching last $1 above
+                          func_append_uniq opt_warning_types " $1"
+                          ;;
+                        *all)
+                          opt_warning_types=$warning_categories
+                          ;;
+                        *none)
+                          opt_warning_types=none
+                          warning_func=:
+                          ;;
+                        *error)
+                          opt_warning_types=$warning_categories
+                          warning_func=func_fatal_error
+                          ;;
+                        *)
+                          func_fatal_error \
+                             "unsupported warning category: '$1'"
+                          ;;
+                      esac
+                      shift
+                      ;;
+
+        --verbose|-v) opt_verbose=: ;;
+        --version)    func_version ;;
+        -\?|-h)       func_usage ;;
+        --help)       func_help ;;
+
+	# Separate optargs to long options (plugins may need this):
+	--*=*)        func_split_equals "$_G_opt"
+	              set dummy "$func_split_equals_lhs" \
+                          "$func_split_equals_rhs" ${1+"$@"}
+                      shift
+                      ;;
+
+       # Separate optargs to short options:
+        -W*)
+                      func_split_short_opt "$_G_opt"
+                      set dummy "$func_split_short_opt_name" \
+                          "$func_split_short_opt_arg" ${1+"$@"}
+                      shift
+                      ;;
+
+        # Separate non-argument short options:
+        -\?*|-h*|-v*|-x*)
+                      func_split_short_opt "$_G_opt"
+                      set dummy "$func_split_short_opt_name" \
+                          "-$func_split_short_opt_arg" ${1+"$@"}
+                      shift
+                      ;;
+
+        --)           break ;;
+        -*)           func_fatal_help "unrecognised option: '$_G_opt'" ;;
+        *)            set dummy "$_G_opt" ${1+"$@"}; shift; break ;;
+      esac
+    done
+
+    # save modified positional parameters for caller
+    func_quote_for_eval ${1+"$@"}
+    func_parse_options_result=$func_quote_for_eval_result
+}
+
+
+# func_validate_options [ARG]...
+# ------------------------------
+# Perform any sanity checks on option settings and/or unconsumed
+# arguments.
+func_hookable func_validate_options
+func_validate_options ()
+{
+    $debug_cmd
+
+    # Display all warnings if -W was not given.
+    test -n "$opt_warning_types" || opt_warning_types=" $warning_categories"
+
+    func_run_hooks func_validate_options ${1+"$@"}
+
+    # Bail if the options were screwed!
+    $exit_cmd $EXIT_FAILURE
+
+    # save modified positional parameters for caller
+    func_validate_options_result=$func_run_hooks_result
+}
+
+
+
+## ----------------- ##
+## Helper functions. ##
+## ----------------- ##
+
+# This section contains the helper functions used by the rest of the
+# hookable option parser framework in ascii-betical order.
+
+
+# func_fatal_help ARG...
+# ----------------------
+# Echo program name prefixed message to standard error, followed by
+# a help hint, and exit.
+func_fatal_help ()
+{
+    $debug_cmd
+
+    eval \$ECHO \""Usage: $usage"\"
+    eval \$ECHO \""$fatal_help"\"
+    func_error ${1+"$@"}
+    exit $EXIT_FAILURE
+}
+
+
+# func_help
+# ---------
+# Echo long help message to standard output and exit.
+func_help ()
+{
+    $debug_cmd
+
+    func_usage_message
+    $ECHO "$long_help_message"
+    exit 0
+}
+
+
+# func_missing_arg ARGNAME
+# ------------------------
+# Echo program name prefixed message to standard error and set global
+# exit_cmd.
+func_missing_arg ()
+{
+    $debug_cmd
+
+    func_error "Missing argument for '$1'."
+    exit_cmd=exit
+}
+
+
+# func_split_equals STRING
+# ------------------------
+# Set func_split_equals_lhs and func_split_equals_rhs shell variables after
+# splitting STRING at the '=' sign.
+test -z "$_G_HAVE_XSI_OPS" \
+    && (eval 'x=a/b/c;
+      test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \
+    && _G_HAVE_XSI_OPS=yes
+
+if test yes = "$_G_HAVE_XSI_OPS"
+then
+  # This is an XSI compatible shell, allowing a faster implementation...
+  eval 'func_split_equals ()
+  {
+      $debug_cmd
+
+      func_split_equals_lhs=${1%%=*}
+      func_split_equals_rhs=${1#*=}
+      test "x$func_split_equals_lhs" = "x$1" \
+        && func_split_equals_rhs=
+  }'
+else
+  # ...otherwise fall back to using expr, which is often a shell builtin.
+  func_split_equals ()
+  {
+      $debug_cmd
+
+      func_split_equals_lhs=`expr "x$1" : 'x\([^=]*\)'`
+      func_split_equals_rhs=
+      test "x$func_split_equals_lhs" = "x$1" \
+        || func_split_equals_rhs=`expr "x$1" : 'x[^=]*=\(.*\)$'`
+  }
+fi #func_split_equals
+
+
+# func_split_short_opt SHORTOPT
+# -----------------------------
+# Set func_split_short_opt_name and func_split_short_opt_arg shell
+# variables after splitting SHORTOPT after the 2nd character.
+if test yes = "$_G_HAVE_XSI_OPS"
+then
+  # This is an XSI compatible shell, allowing a faster implementation...
+  eval 'func_split_short_opt ()
+  {
+      $debug_cmd
+
+      func_split_short_opt_arg=${1#??}
+      func_split_short_opt_name=${1%"$func_split_short_opt_arg"}
+  }'
+else
+  # ...otherwise fall back to using expr, which is often a shell builtin.
+  func_split_short_opt ()
+  {
+      $debug_cmd
+
+      func_split_short_opt_name=`expr "x$1" : 'x-\(.\)'`
+      func_split_short_opt_arg=`expr "x$1" : 'x-.\(.*\)$'`
+  }
+fi #func_split_short_opt
+
+
+# func_usage
+# ----------
+# Echo short help message to standard output and exit.
+func_usage ()
+{
+    $debug_cmd
+
+    func_usage_message
+    $ECHO "Run '$progname --help |${PAGER-more}' for full usage"
+    exit 0
+}
+
+
+# func_usage_message
+# ------------------
+# Echo short help message to standard output.
+func_usage_message ()
+{
+    $debug_cmd
+
+    eval \$ECHO \""Usage: $usage"\"
+    echo
+    $SED -n 's|^# ||
+        /^Written by/{
+          x;p;x
+        }
+	h
+	/^Written by/q' < "$progpath"
+    echo
+    eval \$ECHO \""$usage_message"\"
+}
+
+
+# func_version
+# ------------
+# Echo version message to standard output and exit.
+func_version ()
+{
+    $debug_cmd
+
+    printf '%s\n' "$progname $scriptversion"
+    $SED -n '
+        /(C)/!b go
+        :more
+        /\./!{
+          N
+          s|\n# | |
+          b more
+        }
+        :go
+        /^# Written by /,/# warranty; / {
+          s|^# ||
+          s|^# *$||
+          s|\((C)\)[ 0-9,-]*[ ,-]\([1-9][0-9]* \)|\1 \2|
+          p
+        }
+        /^# Written by / {
+          s|^# ||
+          p
+        }
+        /^warranty; /q' < "$progpath"
+
+    exit $?
+}
+
+
+# Local variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'before-save-hook 'time-stamp)
+# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC"
+# time-stamp-time-zone: "UTC"
+# End:
+
+# Set a version string.
+scriptversion='(GNU libtool) 2.4.6'
+
+
+# func_echo ARG...
+# ----------------
+# Libtool also displays the current mode in messages, so override
+# funclib.sh func_echo with this custom definition.
+func_echo ()
+{
+    $debug_cmd
+
+    _G_message=$*
+
+    func_echo_IFS=$IFS
+    IFS=$nl
+    for _G_line in $_G_message; do
+      IFS=$func_echo_IFS
+      $ECHO "$progname${opt_mode+: $opt_mode}: $_G_line"
+    done
+    IFS=$func_echo_IFS
+}
+
+
+# func_warning ARG...
+# -------------------
+# Libtool warnings are not categorized, so override funclib.sh
+# func_warning with this simpler definition.
+func_warning ()
+{
+    $debug_cmd
+
+    $warning_func ${1+"$@"}
+}
+
+
+## ---------------- ##
+## Options parsing. ##
+## ---------------- ##
+
+# Hook in the functions to make sure our own options are parsed during
+# the option parsing loop.
+
+usage='$progpath [OPTION]... [MODE-ARG]...'
+
+# Short help message in response to '-h'.
+usage_message="Options:
+       --config             show all configuration variables
+       --debug              enable verbose shell tracing
+   -n, --dry-run            display commands without modifying any files
+       --features           display basic configuration information and exit
+       --mode=MODE          use operation mode MODE
+       --no-warnings        equivalent to '-Wnone'
+       --preserve-dup-deps  don't remove duplicate dependency libraries
+       --quiet, --silent    don't print informational messages
+       --tag=TAG            use configuration variables from tag TAG
+   -v, --verbose            print more informational messages than default
+       --version            print version information
+   -W, --warnings=CATEGORY  report the warnings falling in CATEGORY [all]
+   -h, --help, --help-all   print short, long, or detailed help message
+"
+
+# Additional text appended to 'usage_message' in response to '--help'.
+func_help ()
+{
+    $debug_cmd
+
+    func_usage_message
+    $ECHO "$long_help_message
+
+MODE must be one of the following:
+
+       clean           remove files from the build directory
+       compile         compile a source file into a libtool object
+       execute         automatically set library path, then run a program
+       finish          complete the installation of libtool libraries
+       install         install libraries or executables
+       link            create a library or an executable
+       uninstall       remove libraries from an installed directory
+
+MODE-ARGS vary depending on the MODE.  When passed as first option,
+'--mode=MODE' may be abbreviated as 'MODE' or a unique abbreviation of that.
+Try '$progname --help --mode=MODE' for a more detailed description of MODE.
+
+When reporting a bug, please describe a test case to reproduce it and
+include the following information:
+
+       host-triplet:   $host
+       shell:          $SHELL
+       compiler:       $LTCC
+       compiler flags: $LTCFLAGS
+       linker:         $LD (gnu? $with_gnu_ld)
+       version:        $progname (GNU libtool) 2.4.6
+       automake:       `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
+       autoconf:       `($AUTOCONF --version) 2>/dev/null |$SED 1q`
+
+Report bugs to <bug-libtool at gnu.org>.
+GNU libtool home page: <http://www.gnu.org/software/libtool/>.
+General help using GNU software: <http://www.gnu.org/gethelp/>."
+    exit 0
+}
+
+
+# func_lo2o OBJECT-NAME
+# ---------------------
+# Transform OBJECT-NAME from a '.lo' suffix to the platform specific
+# object suffix.
+
+lo2o=s/\\.lo\$/.$objext/
+o2lo=s/\\.$objext\$/.lo/
+
+if test yes = "$_G_HAVE_XSI_OPS"; then
+  eval 'func_lo2o ()
+  {
+    case $1 in
+      *.lo) func_lo2o_result=${1%.lo}.$objext ;;
+      *   ) func_lo2o_result=$1               ;;
+    esac
+  }'
+
+  # func_xform LIBOBJ-OR-SOURCE
+  # ---------------------------
+  # Transform LIBOBJ-OR-SOURCE from a '.o' or '.c' (or otherwise)
+  # suffix to a '.lo' libtool-object suffix.
+  eval 'func_xform ()
+  {
+    func_xform_result=${1%.*}.lo
+  }'
+else
+  # ...otherwise fall back to using sed.
+  func_lo2o ()
+  {
+    func_lo2o_result=`$ECHO "$1" | $SED "$lo2o"`
+  }
+
+  func_xform ()
+  {
+    func_xform_result=`$ECHO "$1" | $SED 's|\.[^.]*$|.lo|'`
+  }
+fi
+
+
+# func_fatal_configuration ARG...
+# -------------------------------
+# Echo program name prefixed message to standard error, followed by
+# a configuration failure hint, and exit.
+func_fatal_configuration ()
+{
+    func__fatal_error ${1+"$@"} \
+      "See the $PACKAGE documentation for more information." \
+      "Fatal configuration error."
+}
+
+
+# func_config
+# -----------
+# Display the configuration for all the tags in this script.
+func_config ()
+{
+    re_begincf='^# ### BEGIN LIBTOOL'
+    re_endcf='^# ### END LIBTOOL'
+
+    # Default configuration.
+    $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$progpath"
+
+    # Now print the configurations for the tags.
+    for tagname in $taglist; do
+      $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$progpath"
+    done
+
+    exit $?
+}
+
+
+# func_features
+# -------------
+# Display the features supported by this script.
+func_features ()
+{
+    echo "host: $host"
+    if test yes = "$build_libtool_libs"; then
+      echo "enable shared libraries"
+    else
+      echo "disable shared libraries"
+    fi
+    if test yes = "$build_old_libs"; then
+      echo "enable static libraries"
+    else
+      echo "disable static libraries"
+    fi
+
+    exit $?
+}
+
+
+# func_enable_tag TAGNAME
+# -----------------------
+# Verify that TAGNAME is valid, and either flag an error and exit, or
+# enable the TAGNAME tag.  We also add TAGNAME to the global $taglist
+# variable here.
+func_enable_tag ()
+{
+    # Global variable:
+    tagname=$1
+
+    re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$"
+    re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$"
+    sed_extractcf=/$re_begincf/,/$re_endcf/p
+
+    # Validate tagname.
+    case $tagname in
+      *[!-_A-Za-z0-9,/]*)
+        func_fatal_error "invalid tag name: $tagname"
+        ;;
+    esac
+
+    # Don't test for the "default" C tag, as we know it's
+    # there but not specially marked.
+    case $tagname in
+        CC) ;;
+    *)
+        if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then
+	  taglist="$taglist $tagname"
+
+	  # Evaluate the configuration.  Be careful to quote the path
+	  # and the sed script, to avoid splitting on whitespace, but
+	  # also don't use non-portable quotes within backquotes within
+	  # quotes we have to do it in 2 steps:
+	  extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"`
+	  eval "$extractedcf"
+        else
+	  func_error "ignoring unknown tag $tagname"
+        fi
+        ;;
+    esac
+}
+
+
+# func_check_version_match
+# ------------------------
+# Ensure that we are using m4 macros, and libtool script from the same
+# release of libtool.
+func_check_version_match ()
+{
+    if test "$package_revision" != "$macro_revision"; then
+      if test "$VERSION" != "$macro_version"; then
+        if test -z "$macro_version"; then
+          cat >&2 <<_LT_EOF
+$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
+$progname: definition of this LT_INIT comes from an older release.
+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
+$progname: and run autoconf again.
+_LT_EOF
+        else
+          cat >&2 <<_LT_EOF
+$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
+$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
+$progname: and run autoconf again.
+_LT_EOF
+        fi
+      else
+        cat >&2 <<_LT_EOF
+$progname: Version mismatch error.  This is $PACKAGE $VERSION, revision $package_revision,
+$progname: but the definition of this LT_INIT comes from revision $macro_revision.
+$progname: You should recreate aclocal.m4 with macros from revision $package_revision
+$progname: of $PACKAGE $VERSION and run autoconf again.
+_LT_EOF
+      fi
+
+      exit $EXIT_MISMATCH
+    fi
+}
+
+
+# libtool_options_prep [ARG]...
+# -----------------------------
+# Preparation for options parsed by libtool.
+libtool_options_prep ()
+{
+    $debug_mode
+
+    # Option defaults:
+    opt_config=false
+    opt_dlopen=
+    opt_dry_run=false
+    opt_help=false
+    opt_mode=
+    opt_preserve_dup_deps=false
+    opt_quiet=false
+
+    nonopt=
+    preserve_args=
+
+    # Shorthand for --mode=foo, only valid as the first argument
+    case $1 in
+    clean|clea|cle|cl)
+      shift; set dummy --mode clean ${1+"$@"}; shift
+      ;;
+    compile|compil|compi|comp|com|co|c)
+      shift; set dummy --mode compile ${1+"$@"}; shift
+      ;;
+    execute|execut|execu|exec|exe|ex|e)
+      shift; set dummy --mode execute ${1+"$@"}; shift
+      ;;
+    finish|finis|fini|fin|fi|f)
+      shift; set dummy --mode finish ${1+"$@"}; shift
+      ;;
+    install|instal|insta|inst|ins|in|i)
+      shift; set dummy --mode install ${1+"$@"}; shift
+      ;;
+    link|lin|li|l)
+      shift; set dummy --mode link ${1+"$@"}; shift
+      ;;
+    uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
+      shift; set dummy --mode uninstall ${1+"$@"}; shift
+      ;;
+    esac
+
+    # Pass back the list of options.
+    func_quote_for_eval ${1+"$@"}
+    libtool_options_prep_result=$func_quote_for_eval_result
+}
+func_add_hook func_options_prep libtool_options_prep
+
+
+# libtool_parse_options [ARG]...
+# ---------------------------------
+# Provide handling for libtool specific options.
+libtool_parse_options ()
+{
+    $debug_cmd
+
+    # Perform our own loop to consume as many options as possible in
+    # each iteration.
+    while test $# -gt 0; do
+      _G_opt=$1
+      shift
+      case $_G_opt in
+        --dry-run|--dryrun|-n)
+                        opt_dry_run=:
+                        ;;
+
+        --config)       func_config ;;
+
+        --dlopen|-dlopen)
+                        opt_dlopen="${opt_dlopen+$opt_dlopen
+}$1"
+                        shift
+                        ;;
+
+        --preserve-dup-deps)
+                        opt_preserve_dup_deps=: ;;
+
+        --features)     func_features ;;
+
+        --finish)       set dummy --mode finish ${1+"$@"}; shift ;;
+
+        --help)         opt_help=: ;;
+
+        --help-all)     opt_help=': help-all' ;;
+
+        --mode)         test $# = 0 && func_missing_arg $_G_opt && break
+                        opt_mode=$1
+                        case $1 in
+                          # Valid mode arguments:
+                          clean|compile|execute|finish|install|link|relink|uninstall) ;;
+
+                          # Catch anything else as an error
+                          *) func_error "invalid argument for $_G_opt"
+                             exit_cmd=exit
+                             break
+                             ;;
+                        esac
+                        shift
+                        ;;
+
+        --no-silent|--no-quiet)
+                        opt_quiet=false
+                        func_append preserve_args " $_G_opt"
+                        ;;
+
+        --no-warnings|--no-warning|--no-warn)
+                        opt_warning=false
+                        func_append preserve_args " $_G_opt"
+                        ;;
+
+        --no-verbose)
+                        opt_verbose=false
+                        func_append preserve_args " $_G_opt"
+                        ;;
+
+        --silent|--quiet)
+                        opt_quiet=:
+                        opt_verbose=false
+                        func_append preserve_args " $_G_opt"
+                        ;;
+
+        --tag)          test $# = 0 && func_missing_arg $_G_opt && break
+                        opt_tag=$1
+                        func_append preserve_args " $_G_opt $1"
+                        func_enable_tag "$1"
+                        shift
+                        ;;
+
+        --verbose|-v)   opt_quiet=false
+                        opt_verbose=:
+                        func_append preserve_args " $_G_opt"
+                        ;;
+
+	# An option not handled by this hook function:
+        *)		set dummy "$_G_opt" ${1+"$@"};	shift; break  ;;
+      esac
+    done
+
+
+    # save modified positional parameters for caller
+    func_quote_for_eval ${1+"$@"}
+    libtool_parse_options_result=$func_quote_for_eval_result
+}
+func_add_hook func_parse_options libtool_parse_options
+
+
+
+# libtool_validate_options [ARG]...
+# ---------------------------------
+# Perform any sanity checks on option settings and/or unconsumed
+# arguments.
+libtool_validate_options ()
+{
+    # save first non-option argument
+    if test 0 -lt $#; then
+      nonopt=$1
+      shift
+    fi
+
+    # preserve --debug
+    test : = "$debug_cmd" || func_append preserve_args " --debug"
+
+    case $host in
+      # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452
+      # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788
+      *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*)
+        # don't eliminate duplications in $postdeps and $predeps
+        opt_duplicate_compiler_generated_deps=:
+        ;;
+      *)
+        opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
+        ;;
+    esac
+
+    $opt_help || {
+      # Sanity checks first:
+      func_check_version_match
+
+      test yes != "$build_libtool_libs" \
+        && test yes != "$build_old_libs" \
+        && func_fatal_configuration "not configured to build any kind of library"
+
+      # Darwin sucks
+      eval std_shrext=\"$shrext_cmds\"
+
+      # Only execute mode is allowed to have -dlopen flags.
+      if test -n "$opt_dlopen" && test execute != "$opt_mode"; then
+        func_error "unrecognized option '-dlopen'"
+        $ECHO "$help" 1>&2
+        exit $EXIT_FAILURE
+      fi
+
+      # Change the help message to a mode-specific one.
+      generic_help=$help
+      help="Try '$progname --help --mode=$opt_mode' for more information."
+    }
+
+    # Pass back the unparsed argument list
+    func_quote_for_eval ${1+"$@"}
+    libtool_validate_options_result=$func_quote_for_eval_result
+}
+func_add_hook func_validate_options libtool_validate_options
+
+
+# Process options as early as possible so that --help and --version
+# can return quickly.
+func_options ${1+"$@"}
+eval set dummy "$func_options_result"; shift
+
+
+
+## ----------- ##
+##    Main.    ##
+## ----------- ##
+
+magic='%%%MAGIC variable%%%'
+magic_exe='%%%MAGIC EXE variable%%%'
+
+# Global variables.
+extracted_archives=
+extracted_serial=0
+
+# If this variable is set in any of the actions, the command in it
+# will be execed at the end.  This prevents here-documents from being
+# left over by shells.
+exec_cmd=
+
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+$1
+_LTECHO_EOF'
+}
+
+# func_generated_by_libtool
+# True iff stdin has been generated by Libtool. This function is only
+# a basic sanity check; it will hardly flush out determined imposters.
+func_generated_by_libtool_p ()
+{
+  $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
+}
+
+# func_lalib_p file
+# True iff FILE is a libtool '.la' library or '.lo' object file.
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_lalib_p ()
+{
+    test -f "$1" &&
+      $SED -e 4q "$1" 2>/dev/null | func_generated_by_libtool_p
+}
+
+# func_lalib_unsafe_p file
+# True iff FILE is a libtool '.la' library or '.lo' object file.
+# This function implements the same check as func_lalib_p without
+# resorting to external programs.  To this end, it redirects stdin and
+# closes it afterwards, without saving the original file descriptor.
+# As a safety measure, use it only where a negative result would be
+# fatal anyway.  Works if 'file' does not exist.
+func_lalib_unsafe_p ()
+{
+    lalib_p=no
+    if test -f "$1" && test -r "$1" && exec 5<&0 <"$1"; then
+	for lalib_p_l in 1 2 3 4
+	do
+	    read lalib_p_line
+	    case $lalib_p_line in
+		\#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;;
+	    esac
+	done
+	exec 0<&5 5<&-
+    fi
+    test yes = "$lalib_p"
+}
+
+# func_ltwrapper_script_p file
+# True iff FILE is a libtool wrapper script
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_ltwrapper_script_p ()
+{
+    test -f "$1" &&
+      $lt_truncate_bin < "$1" 2>/dev/null | func_generated_by_libtool_p
+}
+
+# func_ltwrapper_executable_p file
+# True iff FILE is a libtool wrapper executable
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_ltwrapper_executable_p ()
+{
+    func_ltwrapper_exec_suffix=
+    case $1 in
+    *.exe) ;;
+    *) func_ltwrapper_exec_suffix=.exe ;;
+    esac
+    $GREP "$magic_exe" "$1$func_ltwrapper_exec_suffix" >/dev/null 2>&1
+}
+
+# func_ltwrapper_scriptname file
+# Assumes file is an ltwrapper_executable
+# uses $file to determine the appropriate filename for a
+# temporary ltwrapper_script.
+func_ltwrapper_scriptname ()
+{
+    func_dirname_and_basename "$1" "" "."
+    func_stripname '' '.exe' "$func_basename_result"
+    func_ltwrapper_scriptname_result=$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper
+}
+
+# func_ltwrapper_p file
+# True iff FILE is a libtool wrapper script or wrapper executable
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_ltwrapper_p ()
+{
+    func_ltwrapper_script_p "$1" || func_ltwrapper_executable_p "$1"
+}
+
+
+# func_execute_cmds commands fail_cmd
+# Execute tilde-delimited COMMANDS.
+# If FAIL_CMD is given, eval that upon failure.
+# FAIL_CMD may read-access the current command in variable CMD!
+func_execute_cmds ()
+{
+    $debug_cmd
+
+    save_ifs=$IFS; IFS='~'
+    for cmd in $1; do
+      IFS=$sp$nl
+      eval cmd=\"$cmd\"
+      IFS=$save_ifs
+      func_show_eval "$cmd" "${2-:}"
+    done
+    IFS=$save_ifs
+}
+
+
+# func_source file
+# Source FILE, adding directory component if necessary.
+# Note that it is not necessary on cygwin/mingw to append a dot to
+# FILE even if both FILE and FILE.exe exist: automatic-append-.exe
+# behavior happens only for exec(3), not for open(2)!  Also, sourcing
+# 'FILE.' does not work on cygwin managed mounts.
+func_source ()
+{
+    $debug_cmd
+
+    case $1 in
+    */* | *\\*)	. "$1" ;;
+    *)		. "./$1" ;;
+    esac
+}
+
+
+# func_resolve_sysroot PATH
+# Replace a leading = in PATH with a sysroot.  Store the result into
+# func_resolve_sysroot_result
+func_resolve_sysroot ()
+{
+  func_resolve_sysroot_result=$1
+  case $func_resolve_sysroot_result in
+  =*)
+    func_stripname '=' '' "$func_resolve_sysroot_result"
+    func_resolve_sysroot_result=$lt_sysroot$func_stripname_result
+    ;;
+  esac
+}
+
+# func_replace_sysroot PATH
+# If PATH begins with the sysroot, replace it with = and
+# store the result into func_replace_sysroot_result.
+func_replace_sysroot ()
+{
+  case $lt_sysroot:$1 in
+  ?*:"$lt_sysroot"*)
+    func_stripname "$lt_sysroot" '' "$1"
+    func_replace_sysroot_result='='$func_stripname_result
+    ;;
+  *)
+    # Including no sysroot.
+    func_replace_sysroot_result=$1
+    ;;
+  esac
+}
+
+# func_infer_tag arg
+# Infer tagged configuration to use if any are available and
+# if one wasn't chosen via the "--tag" command line option.
+# Only attempt this if the compiler in the base compile
+# command doesn't match the default compiler.
+# arg is usually of the form 'gcc ...'
+func_infer_tag ()
+{
+    $debug_cmd
+
+    if test -n "$available_tags" && test -z "$tagname"; then
+      CC_quoted=
+      for arg in $CC; do
+	func_append_quoted CC_quoted "$arg"
+      done
+      CC_expanded=`func_echo_all $CC`
+      CC_quoted_expanded=`func_echo_all $CC_quoted`
+      case $@ in
+      # Blanks in the command may have been stripped by the calling shell,
+      # but not from the CC environment variable when configure was run.
+      " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
+      " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;;
+      # Blanks at the start of $base_compile will cause this to fail
+      # if we don't check for them as well.
+      *)
+	for z in $available_tags; do
+	  if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
+	    # Evaluate the configuration.
+	    eval "`$SED -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
+	    CC_quoted=
+	    for arg in $CC; do
+	      # Double-quote args containing other shell metacharacters.
+	      func_append_quoted CC_quoted "$arg"
+	    done
+	    CC_expanded=`func_echo_all $CC`
+	    CC_quoted_expanded=`func_echo_all $CC_quoted`
+	    case "$@ " in
+	    " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
+	    " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*)
+	      # The compiler in the base compile command matches
+	      # the one in the tagged configuration.
+	      # Assume this is the tagged configuration we want.
+	      tagname=$z
+	      break
+	      ;;
+	    esac
+	  fi
+	done
+	# If $tagname still isn't set, then no tagged configuration
+	# was found and let the user know that the "--tag" command
+	# line option must be used.
+	if test -z "$tagname"; then
+	  func_echo "unable to infer tagged configuration"
+	  func_fatal_error "specify a tag with '--tag'"
+#	else
+#	  func_verbose "using $tagname tagged configuration"
+	fi
+	;;
+      esac
+    fi
+}
+
+
+
+# func_write_libtool_object output_name pic_name nonpic_name
+# Create a libtool object file (analogous to a ".la" file),
+# but don't create it if we're doing a dry run.
+func_write_libtool_object ()
+{
+    write_libobj=$1
+    if test yes = "$build_libtool_libs"; then
+      write_lobj=\'$2\'
+    else
+      write_lobj=none
+    fi
+
+    if test yes = "$build_old_libs"; then
+      write_oldobj=\'$3\'
+    else
+      write_oldobj=none
+    fi
+
+    $opt_dry_run || {
+      cat >${write_libobj}T <<EOF
+# $write_libobj - a libtool object file
+# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# Name of the PIC object.
+pic_object=$write_lobj
+
+# Name of the non-PIC object
+non_pic_object=$write_oldobj
+
+EOF
+      $MV "${write_libobj}T" "$write_libobj"
+    }
+}
+
+
+##################################################
+# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS #
+##################################################
+
+# func_convert_core_file_wine_to_w32 ARG
+# Helper function used by file name conversion functions when $build is *nix,
+# and $host is mingw, cygwin, or some other w32 environment. Relies on a
+# correctly configured wine environment available, with the winepath program
+# in $build's $PATH.
+#
+# ARG is the $build file name to be converted to w32 format.
+# Result is available in $func_convert_core_file_wine_to_w32_result, and will
+# be empty on error (or when ARG is empty)
+func_convert_core_file_wine_to_w32 ()
+{
+  $debug_cmd
+
+  func_convert_core_file_wine_to_w32_result=$1
+  if test -n "$1"; then
+    # Unfortunately, winepath does not exit with a non-zero error code, so we
+    # are forced to check the contents of stdout. On the other hand, if the
+    # command is not found, the shell will set an exit code of 127 and print
+    # *an error message* to stdout. So we must check for both error code of
+    # zero AND non-empty stdout, which explains the odd construction:
+    func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null`
+    if test "$?" -eq 0 && test -n "$func_convert_core_file_wine_to_w32_tmp"; then
+      func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |
+        $SED -e "$sed_naive_backslashify"`
+    else
+      func_convert_core_file_wine_to_w32_result=
+    fi
+  fi
+}
+# end: func_convert_core_file_wine_to_w32
+
+
+# func_convert_core_path_wine_to_w32 ARG
+# Helper function used by path conversion functions when $build is *nix, and
+# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly
+# configured wine environment available, with the winepath program in $build's
+# $PATH. Assumes ARG has no leading or trailing path separator characters.
+#
+# ARG is path to be converted from $build format to win32.
+# Result is available in $func_convert_core_path_wine_to_w32_result.
+# Unconvertible file (directory) names in ARG are skipped; if no directory names
+# are convertible, then the result may be empty.
+func_convert_core_path_wine_to_w32 ()
+{
+  $debug_cmd
+
+  # unfortunately, winepath doesn't convert paths, only file names
+  func_convert_core_path_wine_to_w32_result=
+  if test -n "$1"; then
+    oldIFS=$IFS
+    IFS=:
+    for func_convert_core_path_wine_to_w32_f in $1; do
+      IFS=$oldIFS
+      func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f"
+      if test -n "$func_convert_core_file_wine_to_w32_result"; then
+        if test -z "$func_convert_core_path_wine_to_w32_result"; then
+          func_convert_core_path_wine_to_w32_result=$func_convert_core_file_wine_to_w32_result
+        else
+          func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"
+        fi
+      fi
+    done
+    IFS=$oldIFS
+  fi
+}
+# end: func_convert_core_path_wine_to_w32
+
+
+# func_cygpath ARGS...
+# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when
+# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2)
+# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or
+# (2), returns the Cygwin file name or path in func_cygpath_result (input
+# file name or path is assumed to be in w32 format, as previously converted
+# from $build's *nix or MSYS format). In case (3), returns the w32 file name
+# or path in func_cygpath_result (input file name or path is assumed to be in
+# Cygwin format). Returns an empty string on error.
+#
+# ARGS are passed to cygpath, with the last one being the file name or path to
+# be converted.
+#
+# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH
+# environment variable; do not put it in $PATH.
+func_cygpath ()
+{
+  $debug_cmd
+
+  if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then
+    func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`
+    if test "$?" -ne 0; then
+      # on failure, ensure result is empty
+      func_cygpath_result=
+    fi
+  else
+    func_cygpath_result=
+    func_error "LT_CYGPATH is empty or specifies non-existent file: '$LT_CYGPATH'"
+  fi
+}
+#end: func_cygpath
+
+
+# func_convert_core_msys_to_w32 ARG
+# Convert file name or path ARG from MSYS format to w32 format.  Return
+# result in func_convert_core_msys_to_w32_result.
+func_convert_core_msys_to_w32 ()
+{
+  $debug_cmd
+
+  # awkward: cmd appends spaces to result
+  func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |
+    $SED -e 's/[ ]*$//' -e "$sed_naive_backslashify"`
+}
+#end: func_convert_core_msys_to_w32
+
+
+# func_convert_file_check ARG1 ARG2
+# Verify that ARG1 (a file name in $build format) was converted to $host
+# format in ARG2. Otherwise, emit an error message, but continue (resetting
+# func_to_host_file_result to ARG1).
+func_convert_file_check ()
+{
+  $debug_cmd
+
+  if test -z "$2" && test -n "$1"; then
+    func_error "Could not determine host file name corresponding to"
+    func_error "  '$1'"
+    func_error "Continuing, but uninstalled executables may not work."
+    # Fallback:
+    func_to_host_file_result=$1
+  fi
+}
+# end func_convert_file_check
+
+
+# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH
+# Verify that FROM_PATH (a path in $build format) was converted to $host
+# format in TO_PATH. Otherwise, emit an error message, but continue, resetting
+# func_to_host_file_result to a simplistic fallback value (see below).
+func_convert_path_check ()
+{
+  $debug_cmd
+
+  if test -z "$4" && test -n "$3"; then
+    func_error "Could not determine the host path corresponding to"
+    func_error "  '$3'"
+    func_error "Continuing, but uninstalled executables may not work."
+    # Fallback.  This is a deliberately simplistic "conversion" and
+    # should not be "improved".  See libtool.info.
+    if test "x$1" != "x$2"; then
+      lt_replace_pathsep_chars="s|$1|$2|g"
+      func_to_host_path_result=`echo "$3" |
+        $SED -e "$lt_replace_pathsep_chars"`
+    else
+      func_to_host_path_result=$3
+    fi
+  fi
+}
+# end func_convert_path_check
+
+
+# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG
+# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT
+# and appending REPL if ORIG matches BACKPAT.
+func_convert_path_front_back_pathsep ()
+{
+  $debug_cmd
+
+  case $4 in
+  $1 ) func_to_host_path_result=$3$func_to_host_path_result
+    ;;
+  esac
+  case $4 in
+  $2 ) func_append func_to_host_path_result "$3"
+    ;;
+  esac
+}
+# end func_convert_path_front_back_pathsep
+
+
+##################################################
+# $build to $host FILE NAME CONVERSION FUNCTIONS #
+##################################################
+# invoked via '$to_host_file_cmd ARG'
+#
+# In each case, ARG is the path to be converted from $build to $host format.
+# Result will be available in $func_to_host_file_result.
+
+
+# func_to_host_file ARG
+# Converts the file name ARG from $build format to $host format. Return result
+# in func_to_host_file_result.
+func_to_host_file ()
+{
+  $debug_cmd
+
+  $to_host_file_cmd "$1"
+}
+# end func_to_host_file
+
+
+# func_to_tool_file ARG LAZY
+# converts the file name ARG from $build format to toolchain format. Return
+# result in func_to_tool_file_result.  If the conversion in use is listed
+# in (the comma separated) LAZY, no conversion takes place.
+func_to_tool_file ()
+{
+  $debug_cmd
+
+  case ,$2, in
+    *,"$to_tool_file_cmd",*)
+      func_to_tool_file_result=$1
+      ;;
+    *)
+      $to_tool_file_cmd "$1"
+      func_to_tool_file_result=$func_to_host_file_result
+      ;;
+  esac
+}
+# end func_to_tool_file
+
+
+# func_convert_file_noop ARG
+# Copy ARG to func_to_host_file_result.
+func_convert_file_noop ()
+{
+  func_to_host_file_result=$1
+}
+# end func_convert_file_noop
+
+
+# func_convert_file_msys_to_w32 ARG
+# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic
+# conversion to w32 is not available inside the cwrapper.  Returns result in
+# func_to_host_file_result.
+func_convert_file_msys_to_w32 ()
+{
+  $debug_cmd
+
+  func_to_host_file_result=$1
+  if test -n "$1"; then
+    func_convert_core_msys_to_w32 "$1"
+    func_to_host_file_result=$func_convert_core_msys_to_w32_result
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_msys_to_w32
+
+
+# func_convert_file_cygwin_to_w32 ARG
+# Convert file name ARG from Cygwin to w32 format.  Returns result in
+# func_to_host_file_result.
+func_convert_file_cygwin_to_w32 ()
+{
+  $debug_cmd
+
+  func_to_host_file_result=$1
+  if test -n "$1"; then
+    # because $build is cygwin, we call "the" cygpath in $PATH; no need to use
+    # LT_CYGPATH in this case.
+    func_to_host_file_result=`cygpath -m "$1"`
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_cygwin_to_w32
+
+
+# func_convert_file_nix_to_w32 ARG
+# Convert file name ARG from *nix to w32 format.  Requires a wine environment
+# and a working winepath. Returns result in func_to_host_file_result.
+func_convert_file_nix_to_w32 ()
+{
+  $debug_cmd
+
+  func_to_host_file_result=$1
+  if test -n "$1"; then
+    func_convert_core_file_wine_to_w32 "$1"
+    func_to_host_file_result=$func_convert_core_file_wine_to_w32_result
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_nix_to_w32
+
+
+# func_convert_file_msys_to_cygwin ARG
+# Convert file name ARG from MSYS to Cygwin format.  Requires LT_CYGPATH set.
+# Returns result in func_to_host_file_result.
+func_convert_file_msys_to_cygwin ()
+{
+  $debug_cmd
+
+  func_to_host_file_result=$1
+  if test -n "$1"; then
+    func_convert_core_msys_to_w32 "$1"
+    func_cygpath -u "$func_convert_core_msys_to_w32_result"
+    func_to_host_file_result=$func_cygpath_result
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_msys_to_cygwin
+
+
+# func_convert_file_nix_to_cygwin ARG
+# Convert file name ARG from *nix to Cygwin format.  Requires Cygwin installed
+# in a wine environment, working winepath, and LT_CYGPATH set.  Returns result
+# in func_to_host_file_result.
+func_convert_file_nix_to_cygwin ()
+{
+  $debug_cmd
+
+  func_to_host_file_result=$1
+  if test -n "$1"; then
+    # convert from *nix to w32, then use cygpath to convert from w32 to cygwin.
+    func_convert_core_file_wine_to_w32 "$1"
+    func_cygpath -u "$func_convert_core_file_wine_to_w32_result"
+    func_to_host_file_result=$func_cygpath_result
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_nix_to_cygwin
+
+
+#############################################
+# $build to $host PATH CONVERSION FUNCTIONS #
+#############################################
+# invoked via '$to_host_path_cmd ARG'
+#
+# In each case, ARG is the path to be converted from $build to $host format.
+# The result will be available in $func_to_host_path_result.
+#
+# Path separators are also converted from $build format to $host format.  If
+# ARG begins or ends with a path separator character, it is preserved (but
+# converted to $host format) on output.
+#
+# All path conversion functions are named using the following convention:
+#   file name conversion function    : func_convert_file_X_to_Y ()
+#   path conversion function         : func_convert_path_X_to_Y ()
+# where, for any given $build/$host combination the 'X_to_Y' value is the
+# same.  If conversion functions are added for new $build/$host combinations,
+# the two new functions must follow this pattern, or func_init_to_host_path_cmd
+# will break.
+
+
+# func_init_to_host_path_cmd
+# Ensures that function "pointer" variable $to_host_path_cmd is set to the
+# appropriate value, based on the value of $to_host_file_cmd.
+to_host_path_cmd=
+func_init_to_host_path_cmd ()
+{
+  $debug_cmd
+
+  if test -z "$to_host_path_cmd"; then
+    func_stripname 'func_convert_file_' '' "$to_host_file_cmd"
+    to_host_path_cmd=func_convert_path_$func_stripname_result
+  fi
+}
+
+
+# func_to_host_path ARG
+# Converts the path ARG from $build format to $host format. Return result
+# in func_to_host_path_result.
+func_to_host_path ()
+{
+  $debug_cmd
+
+  func_init_to_host_path_cmd
+  $to_host_path_cmd "$1"
+}
+# end func_to_host_path
+
+
+# func_convert_path_noop ARG
+# Copy ARG to func_to_host_path_result.
+func_convert_path_noop ()
+{
+  func_to_host_path_result=$1
+}
+# end func_convert_path_noop
+
+
+# func_convert_path_msys_to_w32 ARG
+# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic
+# conversion to w32 is not available inside the cwrapper.  Returns result in
+# func_to_host_path_result.
+func_convert_path_msys_to_w32 ()
+{
+  $debug_cmd
+
+  func_to_host_path_result=$1
+  if test -n "$1"; then
+    # Remove leading and trailing path separator characters from ARG.  MSYS
+    # behavior is inconsistent here; cygpath turns them into '.;' and ';.';
+    # and winepath ignores them completely.
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
+    func_to_host_path_result=$func_convert_core_msys_to_w32_result
+    func_convert_path_check : ";" \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
+  fi
+}
+# end func_convert_path_msys_to_w32
+
+
+# func_convert_path_cygwin_to_w32 ARG
+# Convert path ARG from Cygwin to w32 format.  Returns result in
+# func_to_host_file_result.
+func_convert_path_cygwin_to_w32 ()
+{
+  $debug_cmd
+
+  func_to_host_path_result=$1
+  if test -n "$1"; then
+    # See func_convert_path_msys_to_w32:
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"`
+    func_convert_path_check : ";" \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
+  fi
+}
+# end func_convert_path_cygwin_to_w32
+
+
+# func_convert_path_nix_to_w32 ARG
+# Convert path ARG from *nix to w32 format.  Requires a wine environment and
+# a working winepath.  Returns result in func_to_host_file_result.
+func_convert_path_nix_to_w32 ()
+{
+  $debug_cmd
+
+  func_to_host_path_result=$1
+  if test -n "$1"; then
+    # See func_convert_path_msys_to_w32:
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
+    func_to_host_path_result=$func_convert_core_path_wine_to_w32_result
+    func_convert_path_check : ";" \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
+  fi
+}
+# end func_convert_path_nix_to_w32
+
+
+# func_convert_path_msys_to_cygwin ARG
+# Convert path ARG from MSYS to Cygwin format.  Requires LT_CYGPATH set.
+# Returns result in func_to_host_file_result.
+func_convert_path_msys_to_cygwin ()
+{
+  $debug_cmd
+
+  func_to_host_path_result=$1
+  if test -n "$1"; then
+    # See func_convert_path_msys_to_w32:
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
+    func_cygpath -u -p "$func_convert_core_msys_to_w32_result"
+    func_to_host_path_result=$func_cygpath_result
+    func_convert_path_check : : \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" : "$1"
+  fi
+}
+# end func_convert_path_msys_to_cygwin
+
+
+# func_convert_path_nix_to_cygwin ARG
+# Convert path ARG from *nix to Cygwin format.  Requires Cygwin installed in a
+# a wine environment, working winepath, and LT_CYGPATH set.  Returns result in
+# func_to_host_file_result.
+func_convert_path_nix_to_cygwin ()
+{
+  $debug_cmd
+
+  func_to_host_path_result=$1
+  if test -n "$1"; then
+    # Remove leading and trailing path separator characters from
+    # ARG. msys behavior is inconsistent here, cygpath turns them
+    # into '.;' and ';.', and winepath ignores them completely.
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
+    func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result"
+    func_to_host_path_result=$func_cygpath_result
+    func_convert_path_check : : \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" : "$1"
+  fi
+}
+# end func_convert_path_nix_to_cygwin
+
+
+# func_dll_def_p FILE
+# True iff FILE is a Windows DLL '.def' file.
+# Keep in sync with _LT_DLL_DEF_P in libtool.m4
+func_dll_def_p ()
+{
+  $debug_cmd
+
+  func_dll_def_p_tmp=`$SED -n \
+    -e 's/^[	 ]*//' \
+    -e '/^\(;.*\)*$/d' \
+    -e 's/^\(EXPORTS\|LIBRARY\)\([	 ].*\)*$/DEF/p' \
+    -e q \
+    "$1"`
+  test DEF = "$func_dll_def_p_tmp"
+}
+
+
+# func_mode_compile arg...
+func_mode_compile ()
+{
+    $debug_cmd
+
+    # Get the compilation command and the source file.
+    base_compile=
+    srcfile=$nonopt  #  always keep a non-empty value in "srcfile"
+    suppress_opt=yes
+    suppress_output=
+    arg_mode=normal
+    libobj=
+    later=
+    pie_flag=
+
+    for arg
+    do
+      case $arg_mode in
+      arg  )
+	# do not "continue".  Instead, add this to base_compile
+	lastarg=$arg
+	arg_mode=normal
+	;;
+
+      target )
+	libobj=$arg
+	arg_mode=normal
+	continue
+	;;
+
+      normal )
+	# Accept any command-line options.
+	case $arg in
+	-o)
+	  test -n "$libobj" && \
+	    func_fatal_error "you cannot specify '-o' more than once"
+	  arg_mode=target
+	  continue
+	  ;;
+
+	-pie | -fpie | -fPIE)
+          func_append pie_flag " $arg"
+	  continue
+	  ;;
+
+	-shared | -static | -prefer-pic | -prefer-non-pic)
+	  func_append later " $arg"
+	  continue
+	  ;;
+
+	-no-suppress)
+	  suppress_opt=no
+	  continue
+	  ;;
+
+	-Xcompiler)
+	  arg_mode=arg  #  the next one goes into the "base_compile" arg list
+	  continue      #  The current "srcfile" will either be retained or
+	  ;;            #  replaced later.  I would guess that would be a bug.
+
+	-Wc,*)
+	  func_stripname '-Wc,' '' "$arg"
+	  args=$func_stripname_result
+	  lastarg=
+	  save_ifs=$IFS; IFS=,
+	  for arg in $args; do
+	    IFS=$save_ifs
+	    func_append_quoted lastarg "$arg"
+	  done
+	  IFS=$save_ifs
+	  func_stripname ' ' '' "$lastarg"
+	  lastarg=$func_stripname_result
+
+	  # Add the arguments to base_compile.
+	  func_append base_compile " $lastarg"
+	  continue
+	  ;;
+
+	*)
+	  # Accept the current argument as the source file.
+	  # The previous "srcfile" becomes the current argument.
+	  #
+	  lastarg=$srcfile
+	  srcfile=$arg
+	  ;;
+	esac  #  case $arg
+	;;
+      esac    #  case $arg_mode
+
+      # Aesthetically quote the previous argument.
+      func_append_quoted base_compile "$lastarg"
+    done # for arg
+
+    case $arg_mode in
+    arg)
+      func_fatal_error "you must specify an argument for -Xcompile"
+      ;;
+    target)
+      func_fatal_error "you must specify a target with '-o'"
+      ;;
+    *)
+      # Get the name of the library object.
+      test -z "$libobj" && {
+	func_basename "$srcfile"
+	libobj=$func_basename_result
+      }
+      ;;
+    esac
+
+    # Recognize several different file suffixes.
+    # If the user specifies -o file.o, it is replaced with file.lo
+    case $libobj in
+    *.[cCFSifmso] | \
+    *.ada | *.adb | *.ads | *.asm | \
+    *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
+    *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup)
+      func_xform "$libobj"
+      libobj=$func_xform_result
+      ;;
+    esac
+
+    case $libobj in
+    *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;;
+    *)
+      func_fatal_error "cannot determine name of library object from '$libobj'"
+      ;;
+    esac
+
+    func_infer_tag $base_compile
+
+    for arg in $later; do
+      case $arg in
+      -shared)
+	test yes = "$build_libtool_libs" \
+	  || func_fatal_configuration "cannot build a shared library"
+	build_old_libs=no
+	continue
+	;;
+
+      -static)
+	build_libtool_libs=no
+	build_old_libs=yes
+	continue
+	;;
+
+      -prefer-pic)
+	pic_mode=yes
+	continue
+	;;
+
+      -prefer-non-pic)
+	pic_mode=no
+	continue
+	;;
+      esac
+    done
+
+    func_quote_for_eval "$libobj"
+    test "X$libobj" != "X$func_quote_for_eval_result" \
+      && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"'	 &()|`$[]' \
+      && func_warning "libobj name '$libobj' may not contain shell special characters."
+    func_dirname_and_basename "$obj" "/" ""
+    objname=$func_basename_result
+    xdir=$func_dirname_result
+    lobj=$xdir$objdir/$objname
+
+    test -z "$base_compile" && \
+      func_fatal_help "you must specify a compilation command"
+
+    # Delete any leftover library objects.
+    if test yes = "$build_old_libs"; then
+      removelist="$obj $lobj $libobj ${libobj}T"
+    else
+      removelist="$lobj $libobj ${libobj}T"
+    fi
+
+    # On Cygwin there's no "real" PIC flag so we must build both object types
+    case $host_os in
+    cygwin* | mingw* | pw32* | os2* | cegcc*)
+      pic_mode=default
+      ;;
+    esac
+    if test no = "$pic_mode" && test pass_all != "$deplibs_check_method"; then
+      # non-PIC code in shared libraries is not supported
+      pic_mode=default
+    fi
+
+    # Calculate the filename of the output object if compiler does
+    # not support -o with -c
+    if test no = "$compiler_c_o"; then
+      output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.$objext
+      lockfile=$output_obj.lock
+    else
+      output_obj=
+      need_locks=no
+      lockfile=
+    fi
+
+    # Lock this critical section if it is needed
+    # We use this script file to make the link, it avoids creating a new file
+    if test yes = "$need_locks"; then
+      until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
+	func_echo "Waiting for $lockfile to be removed"
+	sleep 2
+      done
+    elif test warn = "$need_locks"; then
+      if test -f "$lockfile"; then
+	$ECHO "\
+*** ERROR, $lockfile exists and contains:
+`cat $lockfile 2>/dev/null`
+
+This indicates that another process is trying to use the same
+temporary object file, and libtool could not work around it because
+your compiler does not support '-c' and '-o' together.  If you
+repeat this compilation, it may succeed, by chance, but you had better
+avoid parallel builds (make -j) in this platform, or get a better
+compiler."
+
+	$opt_dry_run || $RM $removelist
+	exit $EXIT_FAILURE
+      fi
+      func_append removelist " $output_obj"
+      $ECHO "$srcfile" > "$lockfile"
+    fi
+
+    $opt_dry_run || $RM $removelist
+    func_append removelist " $lockfile"
+    trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
+
+    func_to_tool_file "$srcfile" func_convert_file_msys_to_w32
+    srcfile=$func_to_tool_file_result
+    func_quote_for_eval "$srcfile"
+    qsrcfile=$func_quote_for_eval_result
+
+    # Only build a PIC object if we are building libtool libraries.
+    if test yes = "$build_libtool_libs"; then
+      # Without this assignment, base_compile gets emptied.
+      fbsd_hideous_sh_bug=$base_compile
+
+      if test no != "$pic_mode"; then
+	command="$base_compile $qsrcfile $pic_flag"
+      else
+	# Don't build PIC code
+	command="$base_compile $qsrcfile"
+      fi
+
+      func_mkdir_p "$xdir$objdir"
+
+      if test -z "$output_obj"; then
+	# Place PIC objects in $objdir
+	func_append command " -o $lobj"
+      fi
+
+      func_show_eval_locale "$command"	\
+          'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE'
+
+      if test warn = "$need_locks" &&
+	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
+	$ECHO "\
+*** ERROR, $lockfile contains:
+`cat $lockfile 2>/dev/null`
+
+but it should contain:
+$srcfile
+
+This indicates that another process is trying to use the same
+temporary object file, and libtool could not work around it because
+your compiler does not support '-c' and '-o' together.  If you
+repeat this compilation, it may succeed, by chance, but you had better
+avoid parallel builds (make -j) in this platform, or get a better
+compiler."
+
+	$opt_dry_run || $RM $removelist
+	exit $EXIT_FAILURE
+      fi
+
+      # Just move the object if needed, then go on to compile the next one
+      if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then
+	func_show_eval '$MV "$output_obj" "$lobj"' \
+	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'
+      fi
+
+      # Allow error messages only from the first compilation.
+      if test yes = "$suppress_opt"; then
+	suppress_output=' >/dev/null 2>&1'
+      fi
+    fi
+
+    # Only build a position-dependent object if we build old libraries.
+    if test yes = "$build_old_libs"; then
+      if test yes != "$pic_mode"; then
+	# Don't build PIC code
+	command="$base_compile $qsrcfile$pie_flag"
+      else
+	command="$base_compile $qsrcfile $pic_flag"
+      fi
+      if test yes = "$compiler_c_o"; then
+	func_append command " -o $obj"
+      fi
+
+      # Suppress compiler output if we already did a PIC compilation.
+      func_append command "$suppress_output"
+      func_show_eval_locale "$command" \
+        '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
+
+      if test warn = "$need_locks" &&
+	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
+	$ECHO "\
+*** ERROR, $lockfile contains:
+`cat $lockfile 2>/dev/null`
+
+but it should contain:
+$srcfile
+
+This indicates that another process is trying to use the same
+temporary object file, and libtool could not work around it because
+your compiler does not support '-c' and '-o' together.  If you
+repeat this compilation, it may succeed, by chance, but you had better
+avoid parallel builds (make -j) in this platform, or get a better
+compiler."
+
+	$opt_dry_run || $RM $removelist
+	exit $EXIT_FAILURE
+      fi
+
+      # Just move the object if needed
+      if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then
+	func_show_eval '$MV "$output_obj" "$obj"' \
+	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'
+      fi
+    fi
+
+    $opt_dry_run || {
+      func_write_libtool_object "$libobj" "$objdir/$objname" "$objname"
+
+      # Unlock the critical section if it was locked
+      if test no != "$need_locks"; then
+	removelist=$lockfile
+        $RM "$lockfile"
+      fi
+    }
+
+    exit $EXIT_SUCCESS
+}
+
+$opt_help || {
+  test compile = "$opt_mode" && func_mode_compile ${1+"$@"}
+}
+
+func_mode_help ()
+{
+    # We need to display help for each of the modes.
+    case $opt_mode in
+      "")
+        # Generic help is extracted from the usage comments
+        # at the start of this file.
+        func_help
+        ;;
+
+      clean)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
+
+Remove files from the build directory.
+
+RM is the name of the program to use to delete files associated with each FILE
+(typically '/bin/rm').  RM-OPTIONS are options (such as '-f') to be passed
+to RM.
+
+If FILE is a libtool library, object or program, all the files associated
+with it are deleted. Otherwise, only FILE itself is deleted using RM."
+        ;;
+
+      compile)
+      $ECHO \
+"Usage: $progname [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
+
+Compile a source file into a libtool library object.
+
+This mode accepts the following additional options:
+
+  -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
+  -no-suppress      do not suppress compiler output for multiple passes
+  -prefer-pic       try to build PIC objects only
+  -prefer-non-pic   try to build non-PIC objects only
+  -shared           do not build a '.o' file suitable for static linking
+  -static           only build a '.o' file suitable for static linking
+  -Wc,FLAG          pass FLAG directly to the compiler
+
+COMPILE-COMMAND is a command to be used in creating a 'standard' object file
+from the given SOURCEFILE.
+
+The output file name is determined by removing the directory component from
+SOURCEFILE, then substituting the C source code suffix '.c' with the
+library object suffix, '.lo'."
+        ;;
+
+      execute)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=execute COMMAND [ARGS]...
+
+Automatically set library path, then run a program.
+
+This mode accepts the following additional options:
+
+  -dlopen FILE      add the directory containing FILE to the library path
+
+This mode sets the library path environment variable according to '-dlopen'
+flags.
+
+If any of the ARGS are libtool executable wrappers, then they are translated
+into their corresponding uninstalled binary, and any of their required library
+directories are added to the library path.
+
+Then, COMMAND is executed, with ARGS as arguments."
+        ;;
+
+      finish)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=finish [LIBDIR]...
+
+Complete the installation of libtool libraries.
+
+Each LIBDIR is a directory that contains libtool libraries.
+
+The commands that this mode executes may require superuser privileges.  Use
+the '--dry-run' option if you just want to see what would be executed."
+        ;;
+
+      install)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=install INSTALL-COMMAND...
+
+Install executables or libraries.
+
+INSTALL-COMMAND is the installation command.  The first component should be
+either the 'install' or 'cp' program.
+
+The following components of INSTALL-COMMAND are treated specially:
+
+  -inst-prefix-dir PREFIX-DIR  Use PREFIX-DIR as a staging area for installation
+
+The rest of the components are interpreted as arguments to that command (only
+BSD-compatible install options are recognized)."
+        ;;
+
+      link)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=link LINK-COMMAND...
+
+Link object files or libraries together to form another library, or to
+create an executable program.
+
+LINK-COMMAND is a command using the C compiler that you would use to create
+a program from several object files.
+
+The following components of LINK-COMMAND are treated specially:
+
+  -all-static       do not do any dynamic linking at all
+  -avoid-version    do not add a version suffix if possible
+  -bindir BINDIR    specify path to binaries directory (for systems where
+                    libraries must be found in the PATH setting at runtime)
+  -dlopen FILE      '-dlpreopen' FILE if it cannot be dlopened at runtime
+  -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
+  -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
+  -export-symbols SYMFILE
+                    try to export only the symbols listed in SYMFILE
+  -export-symbols-regex REGEX
+                    try to export only the symbols matching REGEX
+  -LLIBDIR          search LIBDIR for required installed libraries
+  -lNAME            OUTPUT-FILE requires the installed library libNAME
+  -module           build a library that can dlopened
+  -no-fast-install  disable the fast-install mode
+  -no-install       link a not-installable executable
+  -no-undefined     declare that a library does not refer to external symbols
+  -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
+  -objectlist FILE  use a list of object files found in FILE to specify objects
+  -os2dllname NAME  force a short DLL name on OS/2 (no effect on other OSes)
+  -precious-files-regex REGEX
+                    don't remove output files matching REGEX
+  -release RELEASE  specify package release information
+  -rpath LIBDIR     the created library will eventually be installed in LIBDIR
+  -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
+  -shared           only do dynamic linking of libtool libraries
+  -shrext SUFFIX    override the standard shared library file extension
+  -static           do not do any dynamic linking of uninstalled libtool libraries
+  -static-libtool-libs
+                    do not do any dynamic linking of libtool libraries
+  -version-info CURRENT[:REVISION[:AGE]]
+                    specify library version info [each variable defaults to 0]
+  -weak LIBNAME     declare that the target provides the LIBNAME interface
+  -Wc,FLAG
+  -Xcompiler FLAG   pass linker-specific FLAG directly to the compiler
+  -Wl,FLAG
+  -Xlinker FLAG     pass linker-specific FLAG directly to the linker
+  -XCClinker FLAG   pass link-specific FLAG to the compiler driver (CC)
+
+All other options (arguments beginning with '-') are ignored.
+
+Every other argument is treated as a filename.  Files ending in '.la' are
+treated as uninstalled libtool libraries, other files are standard or library
+object files.
+
+If the OUTPUT-FILE ends in '.la', then a libtool library is created,
+only library objects ('.lo' files) may be specified, and '-rpath' is
+required, except when creating a convenience library.
+
+If OUTPUT-FILE ends in '.a' or '.lib', then a standard library is created
+using 'ar' and 'ranlib', or on Windows using 'lib'.
+
+If OUTPUT-FILE ends in '.lo' or '.$objext', then a reloadable object file
+is created, otherwise an executable program is created."
+        ;;
+
+      uninstall)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
+
+Remove libraries from an installation directory.
+
+RM is the name of the program to use to delete files associated with each FILE
+(typically '/bin/rm').  RM-OPTIONS are options (such as '-f') to be passed
+to RM.
+
+If FILE is a libtool library, all the files associated with it are deleted.
+Otherwise, only FILE itself is deleted using RM."
+        ;;
+
+      *)
+        func_fatal_help "invalid operation mode '$opt_mode'"
+        ;;
+    esac
+
+    echo
+    $ECHO "Try '$progname --help' for more information about other modes."
+}
+
+# Now that we've collected a possible --mode arg, show help if necessary
+if $opt_help; then
+  if test : = "$opt_help"; then
+    func_mode_help
+  else
+    {
+      func_help noexit
+      for opt_mode in compile link execute install finish uninstall clean; do
+	func_mode_help
+      done
+    } | $SED -n '1p; 2,$s/^Usage:/  or: /p'
+    {
+      func_help noexit
+      for opt_mode in compile link execute install finish uninstall clean; do
+	echo
+	func_mode_help
+      done
+    } |
+    $SED '1d
+      /^When reporting/,/^Report/{
+	H
+	d
+      }
+      $x
+      /information about other modes/d
+      /more detailed .*MODE/d
+      s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/'
+  fi
+  exit $?
+fi
+
+
+# func_mode_execute arg...
+func_mode_execute ()
+{
+    $debug_cmd
+
+    # The first argument is the command name.
+    cmd=$nonopt
+    test -z "$cmd" && \
+      func_fatal_help "you must specify a COMMAND"
+
+    # Handle -dlopen flags immediately.
+    for file in $opt_dlopen; do
+      test -f "$file" \
+	|| func_fatal_help "'$file' is not a file"
+
+      dir=
+      case $file in
+      *.la)
+	func_resolve_sysroot "$file"
+	file=$func_resolve_sysroot_result
+
+	# Check to see that this really is a libtool archive.
+	func_lalib_unsafe_p "$file" \
+	  || func_fatal_help "'$lib' is not a valid libtool archive"
+
+	# Read the libtool library.
+	dlname=
+	library_names=
+	func_source "$file"
+
+	# Skip this library if it cannot be dlopened.
+	if test -z "$dlname"; then
+	  # Warn if it was a shared library.
+	  test -n "$library_names" && \
+	    func_warning "'$file' was not linked with '-export-dynamic'"
+	  continue
+	fi
+
+	func_dirname "$file" "" "."
+	dir=$func_dirname_result
+
+	if test -f "$dir/$objdir/$dlname"; then
+	  func_append dir "/$objdir"
+	else
+	  if test ! -f "$dir/$dlname"; then
+	    func_fatal_error "cannot find '$dlname' in '$dir' or '$dir/$objdir'"
+	  fi
+	fi
+	;;
+
+      *.lo)
+	# Just add the directory containing the .lo file.
+	func_dirname "$file" "" "."
+	dir=$func_dirname_result
+	;;
+
+      *)
+	func_warning "'-dlopen' is ignored for non-libtool libraries and objects"
+	continue
+	;;
+      esac
+
+      # Get the absolute pathname.
+      absdir=`cd "$dir" && pwd`
+      test -n "$absdir" && dir=$absdir
+
+      # Now add the directory to shlibpath_var.
+      if eval "test -z \"\$$shlibpath_var\""; then
+	eval "$shlibpath_var=\"\$dir\""
+      else
+	eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
+      fi
+    done
+
+    # This variable tells wrapper scripts just to set shlibpath_var
+    # rather than running their programs.
+    libtool_execute_magic=$magic
+
+    # Check if any of the arguments is a wrapper script.
+    args=
+    for file
+    do
+      case $file in
+      -* | *.la | *.lo ) ;;
+      *)
+	# Do a test to see if this is really a libtool program.
+	if func_ltwrapper_script_p "$file"; then
+	  func_source "$file"
+	  # Transform arg to wrapped name.
+	  file=$progdir/$program
+	elif func_ltwrapper_executable_p "$file"; then
+	  func_ltwrapper_scriptname "$file"
+	  func_source "$func_ltwrapper_scriptname_result"
+	  # Transform arg to wrapped name.
+	  file=$progdir/$program
+	fi
+	;;
+      esac
+      # Quote arguments (to preserve shell metacharacters).
+      func_append_quoted args "$file"
+    done
+
+    if $opt_dry_run; then
+      # Display what would be done.
+      if test -n "$shlibpath_var"; then
+	eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
+	echo "export $shlibpath_var"
+      fi
+      $ECHO "$cmd$args"
+      exit $EXIT_SUCCESS
+    else
+      if test -n "$shlibpath_var"; then
+	# Export the shlibpath_var.
+	eval "export $shlibpath_var"
+      fi
+
+      # Restore saved environment variables
+      for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+      do
+	eval "if test \"\${save_$lt_var+set}\" = set; then
+                $lt_var=\$save_$lt_var; export $lt_var
+	      else
+		$lt_unset $lt_var
+	      fi"
+      done
+
+      # Now prepare to actually exec the command.
+      exec_cmd=\$cmd$args
+    fi
+}
+
+test execute = "$opt_mode" && func_mode_execute ${1+"$@"}
+
+
+# func_mode_finish arg...
+func_mode_finish ()
+{
+    $debug_cmd
+
+    libs=
+    libdirs=
+    admincmds=
+
+    for opt in "$nonopt" ${1+"$@"}
+    do
+      if test -d "$opt"; then
+	func_append libdirs " $opt"
+
+      elif test -f "$opt"; then
+	if func_lalib_unsafe_p "$opt"; then
+	  func_append libs " $opt"
+	else
+	  func_warning "'$opt' is not a valid libtool archive"
+	fi
+
+      else
+	func_fatal_error "invalid argument '$opt'"
+      fi
+    done
+
+    if test -n "$libs"; then
+      if test -n "$lt_sysroot"; then
+        sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"`
+        sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;"
+      else
+        sysroot_cmd=
+      fi
+
+      # Remove sysroot references
+      if $opt_dry_run; then
+        for lib in $libs; do
+          echo "removing references to $lt_sysroot and '=' prefixes from $lib"
+        done
+      else
+        tmpdir=`func_mktempdir`
+        for lib in $libs; do
+	  $SED -e "$sysroot_cmd s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
+	    > $tmpdir/tmp-la
+	  mv -f $tmpdir/tmp-la $lib
+	done
+        ${RM}r "$tmpdir"
+      fi
+    fi
+
+    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
+      for libdir in $libdirs; do
+	if test -n "$finish_cmds"; then
+	  # Do each command in the finish commands.
+	  func_execute_cmds "$finish_cmds" 'admincmds="$admincmds
+'"$cmd"'"'
+	fi
+	if test -n "$finish_eval"; then
+	  # Do the single finish_eval.
+	  eval cmds=\"$finish_eval\"
+	  $opt_dry_run || eval "$cmds" || func_append admincmds "
+       $cmds"
+	fi
+      done
+    fi
+
+    # Exit here if they wanted silent mode.
+    $opt_quiet && exit $EXIT_SUCCESS
+
+    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
+      echo "----------------------------------------------------------------------"
+      echo "Libraries have been installed in:"
+      for libdir in $libdirs; do
+	$ECHO "   $libdir"
+      done
+      echo
+      echo "If you ever happen to want to link against installed libraries"
+      echo "in a given directory, LIBDIR, you must either use libtool, and"
+      echo "specify the full pathname of the library, or use the '-LLIBDIR'"
+      echo "flag during linking and do at least one of the following:"
+      if test -n "$shlibpath_var"; then
+	echo "   - add LIBDIR to the '$shlibpath_var' environment variable"
+	echo "     during execution"
+      fi
+      if test -n "$runpath_var"; then
+	echo "   - add LIBDIR to the '$runpath_var' environment variable"
+	echo "     during linking"
+      fi
+      if test -n "$hardcode_libdir_flag_spec"; then
+	libdir=LIBDIR
+	eval flag=\"$hardcode_libdir_flag_spec\"
+
+	$ECHO "   - use the '$flag' linker flag"
+      fi
+      if test -n "$admincmds"; then
+	$ECHO "   - have your system administrator run these commands:$admincmds"
+      fi
+      if test -f /etc/ld.so.conf; then
+	echo "   - have your system administrator add LIBDIR to '/etc/ld.so.conf'"
+      fi
+      echo
+
+      echo "See any operating system documentation about shared libraries for"
+      case $host in
+	solaris2.[6789]|solaris2.1[0-9])
+	  echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
+	  echo "pages."
+	  ;;
+	*)
+	  echo "more information, such as the ld(1) and ld.so(8) manual pages."
+	  ;;
+      esac
+      echo "----------------------------------------------------------------------"
+    fi
+    exit $EXIT_SUCCESS
+}
+
+test finish = "$opt_mode" && func_mode_finish ${1+"$@"}
+
+
+# func_mode_install arg...
+func_mode_install ()
+{
+    $debug_cmd
+
+    # There may be an optional sh(1) argument at the beginning of
+    # install_prog (especially on Windows NT).
+    if test "$SHELL" = "$nonopt" || test /bin/sh = "$nonopt" ||
+       # Allow the use of GNU shtool's install command.
+       case $nonopt in *shtool*) :;; *) false;; esac
+    then
+      # Aesthetically quote it.
+      func_quote_for_eval "$nonopt"
+      install_prog="$func_quote_for_eval_result "
+      arg=$1
+      shift
+    else
+      install_prog=
+      arg=$nonopt
+    fi
+
+    # The real first argument should be the name of the installation program.
+    # Aesthetically quote it.
+    func_quote_for_eval "$arg"
+    func_append install_prog "$func_quote_for_eval_result"
+    install_shared_prog=$install_prog
+    case " $install_prog " in
+      *[\\\ /]cp\ *) install_cp=: ;;
+      *) install_cp=false ;;
+    esac
+
+    # We need to accept at least all the BSD install flags.
+    dest=
+    files=
+    opts=
+    prev=
+    install_type=
+    isdir=false
+    stripme=
+    no_mode=:
+    for arg
+    do
+      arg2=
+      if test -n "$dest"; then
+	func_append files " $dest"
+	dest=$arg
+	continue
+      fi
+
+      case $arg in
+      -d) isdir=: ;;
+      -f)
+	if $install_cp; then :; else
+	  prev=$arg
+	fi
+	;;
+      -g | -m | -o)
+	prev=$arg
+	;;
+      -s)
+	stripme=" -s"
+	continue
+	;;
+      -*)
+	;;
+      *)
+	# If the previous option needed an argument, then skip it.
+	if test -n "$prev"; then
+	  if test X-m = "X$prev" && test -n "$install_override_mode"; then
+	    arg2=$install_override_mode
+	    no_mode=false
+	  fi
+	  prev=
+	else
+	  dest=$arg
+	  continue
+	fi
+	;;
+      esac
+
+      # Aesthetically quote the argument.
+      func_quote_for_eval "$arg"
+      func_append install_prog " $func_quote_for_eval_result"
+      if test -n "$arg2"; then
+	func_quote_for_eval "$arg2"
+      fi
+      func_append install_shared_prog " $func_quote_for_eval_result"
+    done
+
+    test -z "$install_prog" && \
+      func_fatal_help "you must specify an install program"
+
+    test -n "$prev" && \
+      func_fatal_help "the '$prev' option requires an argument"
+
+    if test -n "$install_override_mode" && $no_mode; then
+      if $install_cp; then :; else
+	func_quote_for_eval "$install_override_mode"
+	func_append install_shared_prog " -m $func_quote_for_eval_result"
+      fi
+    fi
+
+    if test -z "$files"; then
+      if test -z "$dest"; then
+	func_fatal_help "no file or destination specified"
+      else
+	func_fatal_help "you must specify a destination"
+      fi
+    fi
+
+    # Strip any trailing slash from the destination.
+    func_stripname '' '/' "$dest"
+    dest=$func_stripname_result
+
+    # Check to see that the destination is a directory.
+    test -d "$dest" && isdir=:
+    if $isdir; then
+      destdir=$dest
+      destname=
+    else
+      func_dirname_and_basename "$dest" "" "."
+      destdir=$func_dirname_result
+      destname=$func_basename_result
+
+      # Not a directory, so check to see that there is only one file specified.
+      set dummy $files; shift
+      test "$#" -gt 1 && \
+	func_fatal_help "'$dest' is not a directory"
+    fi
+    case $destdir in
+    [\\/]* | [A-Za-z]:[\\/]*) ;;
+    *)
+      for file in $files; do
+	case $file in
+	*.lo) ;;
+	*)
+	  func_fatal_help "'$destdir' must be an absolute directory name"
+	  ;;
+	esac
+      done
+      ;;
+    esac
+
+    # This variable tells wrapper scripts just to set variables rather
+    # than running their programs.
+    libtool_install_magic=$magic
+
+    staticlibs=
+    future_libdirs=
+    current_libdirs=
+    for file in $files; do
+
+      # Do each installation.
+      case $file in
+      *.$libext)
+	# Do the static libraries later.
+	func_append staticlibs " $file"
+	;;
+
+      *.la)
+	func_resolve_sysroot "$file"
+	file=$func_resolve_sysroot_result
+
+	# Check to see that this really is a libtool archive.
+	func_lalib_unsafe_p "$file" \
+	  || func_fatal_help "'$file' is not a valid libtool archive"
+
+	library_names=
+	old_library=
+	relink_command=
+	func_source "$file"
+
+	# Add the libdir to current_libdirs if it is the destination.
+	if test "X$destdir" = "X$libdir"; then
+	  case "$current_libdirs " in
+	  *" $libdir "*) ;;
+	  *) func_append current_libdirs " $libdir" ;;
+	  esac
+	else
+	  # Note the libdir as a future libdir.
+	  case "$future_libdirs " in
+	  *" $libdir "*) ;;
+	  *) func_append future_libdirs " $libdir" ;;
+	  esac
+	fi
+
+	func_dirname "$file" "/" ""
+	dir=$func_dirname_result
+	func_append dir "$objdir"
+
+	if test -n "$relink_command"; then
+	  # Determine the prefix the user has applied to our future dir.
+	  inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
+
+	  # Don't allow the user to place us outside of our expected
+	  # location b/c this prevents finding dependent libraries that
+	  # are installed to the same prefix.
+	  # At present, this check doesn't affect windows .dll's that
+	  # are installed into $libdir/../bin (currently, that works fine)
+	  # but it's something to keep an eye on.
+	  test "$inst_prefix_dir" = "$destdir" && \
+	    func_fatal_error "error: cannot install '$file' to a directory not ending in $libdir"
+
+	  if test -n "$inst_prefix_dir"; then
+	    # Stick the inst_prefix_dir data into the link command.
+	    relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+	  else
+	    relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
+	  fi
+
+	  func_warning "relinking '$file'"
+	  func_show_eval "$relink_command" \
+	    'func_fatal_error "error: relink '\''$file'\'' with the above command before installing it"'
+	fi
+
+	# See the names of the shared library.
+	set dummy $library_names; shift
+	if test -n "$1"; then
+	  realname=$1
+	  shift
+
+	  srcname=$realname
+	  test -n "$relink_command" && srcname=${realname}T
+
+	  # Install the shared library and build the symlinks.
+	  func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \
+	      'exit $?'
+	  tstripme=$stripme
+	  case $host_os in
+	  cygwin* | mingw* | pw32* | cegcc*)
+	    case $realname in
+	    *.dll.a)
+	      tstripme=
+	      ;;
+	    esac
+	    ;;
+	  os2*)
+	    case $realname in
+	    *_dll.a)
+	      tstripme=
+	      ;;
+	    esac
+	    ;;
+	  esac
+	  if test -n "$tstripme" && test -n "$striplib"; then
+	    func_show_eval "$striplib $destdir/$realname" 'exit $?'
+	  fi
+
+	  if test "$#" -gt 0; then
+	    # Delete the old symlinks, and create new ones.
+	    # Try 'ln -sf' first, because the 'ln' binary might depend on
+	    # the symlink we replace!  Solaris /bin/ln does not understand -f,
+	    # so we also need to try rm && ln -s.
+	    for linkname
+	    do
+	      test "$linkname" != "$realname" \
+		&& func_show_eval "(cd $destdir && { $LN_S -f $realname $linkname || { $RM $linkname && $LN_S $realname $linkname; }; })"
+	    done
+	  fi
+
+	  # Do each command in the postinstall commands.
+	  lib=$destdir/$realname
+	  func_execute_cmds "$postinstall_cmds" 'exit $?'
+	fi
+
+	# Install the pseudo-library for information purposes.
+	func_basename "$file"
+	name=$func_basename_result
+	instname=$dir/${name}i
+	func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
+
+	# Maybe install the static library, too.
+	test -n "$old_library" && func_append staticlibs " $dir/$old_library"
+	;;
+
+      *.lo)
+	# Install (i.e. copy) a libtool object.
+
+	# Figure out destination file name, if it wasn't already specified.
+	if test -n "$destname"; then
+	  destfile=$destdir/$destname
+	else
+	  func_basename "$file"
+	  destfile=$func_basename_result
+	  destfile=$destdir/$destfile
+	fi
+
+	# Deduce the name of the destination old-style object file.
+	case $destfile in
+	*.lo)
+	  func_lo2o "$destfile"
+	  staticdest=$func_lo2o_result
+	  ;;
+	*.$objext)
+	  staticdest=$destfile
+	  destfile=
+	  ;;
+	*)
+	  func_fatal_help "cannot copy a libtool object to '$destfile'"
+	  ;;
+	esac
+
+	# Install the libtool object if requested.
+	test -n "$destfile" && \
+	  func_show_eval "$install_prog $file $destfile" 'exit $?'
+
+	# Install the old object if enabled.
+	if test yes = "$build_old_libs"; then
+	  # Deduce the name of the old-style object file.
+	  func_lo2o "$file"
+	  staticobj=$func_lo2o_result
+	  func_show_eval "$install_prog \$staticobj \$staticdest" 'exit $?'
+	fi
+	exit $EXIT_SUCCESS
+	;;
+
+      *)
+	# Figure out destination file name, if it wasn't already specified.
+	if test -n "$destname"; then
+	  destfile=$destdir/$destname
+	else
+	  func_basename "$file"
+	  destfile=$func_basename_result
+	  destfile=$destdir/$destfile
+	fi
+
+	# If the file is missing, and there is a .exe on the end, strip it
+	# because it is most likely a libtool script we actually want to
+	# install
+	stripped_ext=
+	case $file in
+	  *.exe)
+	    if test ! -f "$file"; then
+	      func_stripname '' '.exe' "$file"
+	      file=$func_stripname_result
+	      stripped_ext=.exe
+	    fi
+	    ;;
+	esac
+
+	# Do a test to see if this is really a libtool program.
+	case $host in
+	*cygwin* | *mingw*)
+	    if func_ltwrapper_executable_p "$file"; then
+	      func_ltwrapper_scriptname "$file"
+	      wrapper=$func_ltwrapper_scriptname_result
+	    else
+	      func_stripname '' '.exe' "$file"
+	      wrapper=$func_stripname_result
+	    fi
+	    ;;
+	*)
+	    wrapper=$file
+	    ;;
+	esac
+	if func_ltwrapper_script_p "$wrapper"; then
+	  notinst_deplibs=
+	  relink_command=
+
+	  func_source "$wrapper"
+
+	  # Check the variables that should have been set.
+	  test -z "$generated_by_libtool_version" && \
+	    func_fatal_error "invalid libtool wrapper script '$wrapper'"
+
+	  finalize=:
+	  for lib in $notinst_deplibs; do
+	    # Check to see that each library is installed.
+	    libdir=
+	    if test -f "$lib"; then
+	      func_source "$lib"
+	    fi
+	    libfile=$libdir/`$ECHO "$lib" | $SED 's%^.*/%%g'`
+	    if test -n "$libdir" && test ! -f "$libfile"; then
+	      func_warning "'$lib' has not been installed in '$libdir'"
+	      finalize=false
+	    fi
+	  done
+
+	  relink_command=
+	  func_source "$wrapper"
+
+	  outputname=
+	  if test no = "$fast_install" && test -n "$relink_command"; then
+	    $opt_dry_run || {
+	      if $finalize; then
+	        tmpdir=`func_mktempdir`
+		func_basename "$file$stripped_ext"
+		file=$func_basename_result
+	        outputname=$tmpdir/$file
+	        # Replace the output file specification.
+	        relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'`
+
+	        $opt_quiet || {
+	          func_quote_for_expand "$relink_command"
+		  eval "func_echo $func_quote_for_expand_result"
+	        }
+	        if eval "$relink_command"; then :
+	          else
+		  func_error "error: relink '$file' with the above command before installing it"
+		  $opt_dry_run || ${RM}r "$tmpdir"
+		  continue
+	        fi
+	        file=$outputname
+	      else
+	        func_warning "cannot relink '$file'"
+	      fi
+	    }
+	  else
+	    # Install the binary that we compiled earlier.
+	    file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"`
+	  fi
+	fi
+
+	# remove .exe since cygwin /usr/bin/install will append another
+	# one anyway
+	case $install_prog,$host in
+	*/usr/bin/install*,*cygwin*)
+	  case $file:$destfile in
+	  *.exe:*.exe)
+	    # this is ok
+	    ;;
+	  *.exe:*)
+	    destfile=$destfile.exe
+	    ;;
+	  *:*.exe)
+	    func_stripname '' '.exe' "$destfile"
+	    destfile=$func_stripname_result
+	    ;;
+	  esac
+	  ;;
+	esac
+	func_show_eval "$install_prog\$stripme \$file \$destfile" 'exit $?'
+	$opt_dry_run || if test -n "$outputname"; then
+	  ${RM}r "$tmpdir"
+	fi
+	;;
+      esac
+    done
+
+    for file in $staticlibs; do
+      func_basename "$file"
+      name=$func_basename_result
+
+      # Set up the ranlib parameters.
+      oldlib=$destdir/$name
+      func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+      tool_oldlib=$func_to_tool_file_result
+
+      func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
+
+      if test -n "$stripme" && test -n "$old_striplib"; then
+	func_show_eval "$old_striplib $tool_oldlib" 'exit $?'
+      fi
+
+      # Do each command in the postinstall commands.
+      func_execute_cmds "$old_postinstall_cmds" 'exit $?'
+    done
+
+    test -n "$future_libdirs" && \
+      func_warning "remember to run '$progname --finish$future_libdirs'"
+
+    if test -n "$current_libdirs"; then
+      # Maybe just do a dry run.
+      $opt_dry_run && current_libdirs=" -n$current_libdirs"
+      exec_cmd='$SHELL "$progpath" $preserve_args --finish$current_libdirs'
+    else
+      exit $EXIT_SUCCESS
+    fi
+}
+
+test install = "$opt_mode" && func_mode_install ${1+"$@"}
+
+
+# func_generate_dlsyms outputname originator pic_p
+# Extract symbols from dlprefiles and create ${outputname}S.o with
+# a dlpreopen symbol table.
+func_generate_dlsyms ()
+{
+    $debug_cmd
+
+    my_outputname=$1
+    my_originator=$2
+    my_pic_p=${3-false}
+    my_prefix=`$ECHO "$my_originator" | $SED 's%[^a-zA-Z0-9]%_%g'`
+    my_dlsyms=
+
+    if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
+      if test -n "$NM" && test -n "$global_symbol_pipe"; then
+	my_dlsyms=${my_outputname}S.c
+      else
+	func_error "not configured to extract global symbols from dlpreopened files"
+      fi
+    fi
+
+    if test -n "$my_dlsyms"; then
+      case $my_dlsyms in
+      "") ;;
+      *.c)
+	# Discover the nlist of each of the dlfiles.
+	nlist=$output_objdir/$my_outputname.nm
+
+	func_show_eval "$RM $nlist ${nlist}S ${nlist}T"
+
+	# Parse the name list into a source file.
+	func_verbose "creating $output_objdir/$my_dlsyms"
+
+	$opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\
+/* $my_dlsyms - symbol resolution table for '$my_outputname' dlsym emulation. */
+/* Generated by $PROGRAM (GNU $PACKAGE) $VERSION */
+
+#ifdef __cplusplus
+extern \"C\" {
+#endif
+
+#if defined __GNUC__ && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
+#pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
+#endif
+
+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
+#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
+/* DATA imports from DLLs on WIN32 can't be const, because runtime
+   relocations are performed -- see ld's documentation on pseudo-relocs.  */
+# define LT_DLSYM_CONST
+#elif defined __osf__
+/* This system does not cope well with relocations in const data.  */
+# define LT_DLSYM_CONST
+#else
+# define LT_DLSYM_CONST const
+#endif
+
+#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0)
+
+/* External symbol declarations for the compiler. */\
+"
+
+	if test yes = "$dlself"; then
+	  func_verbose "generating symbol list for '$output'"
+
+	  $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
+
+	  # Add our own program objects to the symbol list.
+	  progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
+	  for progfile in $progfiles; do
+	    func_to_tool_file "$progfile" func_convert_file_msys_to_w32
+	    func_verbose "extracting global C symbols from '$func_to_tool_file_result'"
+	    $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'"
+	  done
+
+	  if test -n "$exclude_expsyms"; then
+	    $opt_dry_run || {
+	      eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
+	      eval '$MV "$nlist"T "$nlist"'
+	    }
+	  fi
+
+	  if test -n "$export_symbols_regex"; then
+	    $opt_dry_run || {
+	      eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
+	      eval '$MV "$nlist"T "$nlist"'
+	    }
+	  fi
+
+	  # Prepare the list of exported symbols
+	  if test -z "$export_symbols"; then
+	    export_symbols=$output_objdir/$outputname.exp
+	    $opt_dry_run || {
+	      $RM $export_symbols
+	      eval "$SED -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
+	      case $host in
+	      *cygwin* | *mingw* | *cegcc* )
+                eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
+                eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
+	        ;;
+	      esac
+	    }
+	  else
+	    $opt_dry_run || {
+	      eval "$SED -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
+	      eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
+	      eval '$MV "$nlist"T "$nlist"'
+	      case $host in
+	        *cygwin* | *mingw* | *cegcc* )
+	          eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
+	          eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
+	          ;;
+	      esac
+	    }
+	  fi
+	fi
+
+	for dlprefile in $dlprefiles; do
+	  func_verbose "extracting global C symbols from '$dlprefile'"
+	  func_basename "$dlprefile"
+	  name=$func_basename_result
+          case $host in
+	    *cygwin* | *mingw* | *cegcc* )
+	      # if an import library, we need to obtain dlname
+	      if func_win32_import_lib_p "$dlprefile"; then
+	        func_tr_sh "$dlprefile"
+	        eval "curr_lafile=\$libfile_$func_tr_sh_result"
+	        dlprefile_dlbasename=
+	        if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then
+	          # Use subshell, to avoid clobbering current variable values
+	          dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`
+	          if test -n "$dlprefile_dlname"; then
+	            func_basename "$dlprefile_dlname"
+	            dlprefile_dlbasename=$func_basename_result
+	          else
+	            # no lafile. user explicitly requested -dlpreopen <import library>.
+	            $sharedlib_from_linklib_cmd "$dlprefile"
+	            dlprefile_dlbasename=$sharedlib_from_linklib_result
+	          fi
+	        fi
+	        $opt_dry_run || {
+	          if test -n "$dlprefile_dlbasename"; then
+	            eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
+	          else
+	            func_warning "Could not compute DLL name from $name"
+	            eval '$ECHO ": $name " >> "$nlist"'
+	          fi
+	          func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
+	          eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe |
+	            $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'"
+	        }
+	      else # not an import lib
+	        $opt_dry_run || {
+	          eval '$ECHO ": $name " >> "$nlist"'
+	          func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
+	          eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
+	        }
+	      fi
+	    ;;
+	    *)
+	      $opt_dry_run || {
+	        eval '$ECHO ": $name " >> "$nlist"'
+	        func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
+	        eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
+	      }
+	    ;;
+          esac
+	done
+
+	$opt_dry_run || {
+	  # Make sure we have at least an empty file.
+	  test -f "$nlist" || : > "$nlist"
+
+	  if test -n "$exclude_expsyms"; then
+	    $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
+	    $MV "$nlist"T "$nlist"
+	  fi
+
+	  # Try sorting and uniquifying the output.
+	  if $GREP -v "^: " < "$nlist" |
+	      if sort -k 3 </dev/null >/dev/null 2>&1; then
+		sort -k 3
+	      else
+		sort +2
+	      fi |
+	      uniq > "$nlist"S; then
+	    :
+	  else
+	    $GREP -v "^: " < "$nlist" > "$nlist"S
+	  fi
+
+	  if test -f "$nlist"S; then
+	    eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'
+	  else
+	    echo '/* NONE */' >> "$output_objdir/$my_dlsyms"
+	  fi
+
+	  func_show_eval '$RM "${nlist}I"'
+	  if test -n "$global_symbol_to_import"; then
+	    eval "$global_symbol_to_import"' < "$nlist"S > "$nlist"I'
+	  fi
+
+	  echo >> "$output_objdir/$my_dlsyms" "\
+
+/* The mapping between symbol names and symbols.  */
+typedef struct {
+  const char *name;
+  void *address;
+} lt_dlsymlist;
+extern LT_DLSYM_CONST lt_dlsymlist
+lt_${my_prefix}_LTX_preloaded_symbols[];\
+"
+
+	  if test -s "$nlist"I; then
+	    echo >> "$output_objdir/$my_dlsyms" "\
+static void lt_syminit(void)
+{
+  LT_DLSYM_CONST lt_dlsymlist *symbol = lt_${my_prefix}_LTX_preloaded_symbols;
+  for (; symbol->name; ++symbol)
+    {"
+	    $SED 's/.*/      if (STREQ (symbol->name, \"&\")) symbol->address = (void *) \&&;/' < "$nlist"I >> "$output_objdir/$my_dlsyms"
+	    echo >> "$output_objdir/$my_dlsyms" "\
+    }
+}"
+	  fi
+	  echo >> "$output_objdir/$my_dlsyms" "\
+LT_DLSYM_CONST lt_dlsymlist
+lt_${my_prefix}_LTX_preloaded_symbols[] =
+{ {\"$my_originator\", (void *) 0},"
+
+	  if test -s "$nlist"I; then
+	    echo >> "$output_objdir/$my_dlsyms" "\
+  {\"@INIT@\", (void *) &lt_syminit},"
+	  fi
+
+	  case $need_lib_prefix in
+	  no)
+	    eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$my_dlsyms"
+	    ;;
+	  *)
+	    eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms"
+	    ;;
+	  esac
+	  echo >> "$output_objdir/$my_dlsyms" "\
+  {0, (void *) 0}
+};
+
+/* This works around a problem in FreeBSD linker */
+#ifdef FREEBSD_WORKAROUND
+static const void *lt_preloaded_setup() {
+  return lt_${my_prefix}_LTX_preloaded_symbols;
+}
+#endif
+
+#ifdef __cplusplus
+}
+#endif\
+"
+	} # !$opt_dry_run
+
+	pic_flag_for_symtable=
+	case "$compile_command " in
+	*" -static "*) ;;
+	*)
+	  case $host in
+	  # compiling the symbol table file with pic_flag works around
+	  # a FreeBSD bug that causes programs to crash when -lm is
+	  # linked before any other PIC object.  But we must not use
+	  # pic_flag when linking with -static.  The problem exists in
+	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
+	  *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
+	    pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
+	  *-*-hpux*)
+	    pic_flag_for_symtable=" $pic_flag"  ;;
+	  *)
+	    $my_pic_p && pic_flag_for_symtable=" $pic_flag"
+	    ;;
+	  esac
+	  ;;
+	esac
+	symtab_cflags=
+	for arg in $LTCFLAGS; do
+	  case $arg in
+	  -pie | -fpie | -fPIE) ;;
+	  *) func_append symtab_cflags " $arg" ;;
+	  esac
+	done
+
+	# Now compile the dynamic symbol file.
+	func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?'
+
+	# Clean up the generated files.
+	func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T" "${nlist}I"'
+
+	# Transform the symbol file into the correct name.
+	symfileobj=$output_objdir/${my_outputname}S.$objext
+	case $host in
+	*cygwin* | *mingw* | *cegcc* )
+	  if test -f "$output_objdir/$my_outputname.def"; then
+	    compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
+	    finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
+	  else
+	    compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+	    finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+	  fi
+	  ;;
+	*)
+	  compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+	  finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+	  ;;
+	esac
+	;;
+      *)
+	func_fatal_error "unknown suffix for '$my_dlsyms'"
+	;;
+      esac
+    else
+      # We keep going just in case the user didn't refer to
+      # lt_preloaded_symbols.  The linker will fail if global_symbol_pipe
+      # really was required.
+
+      # Nullify the symbol file.
+      compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"`
+      finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"`
+    fi
+}
+
+# func_cygming_gnu_implib_p ARG
+# This predicate returns with zero status (TRUE) if
+# ARG is a GNU/binutils-style import library. Returns
+# with nonzero status (FALSE) otherwise.
+func_cygming_gnu_implib_p ()
+{
+  $debug_cmd
+
+  func_to_tool_file "$1" func_convert_file_msys_to_w32
+  func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'`
+  test -n "$func_cygming_gnu_implib_tmp"
+}
+
+# func_cygming_ms_implib_p ARG
+# This predicate returns with zero status (TRUE) if
+# ARG is an MS-style import library. Returns
+# with nonzero status (FALSE) otherwise.
+func_cygming_ms_implib_p ()
+{
+  $debug_cmd
+
+  func_to_tool_file "$1" func_convert_file_msys_to_w32
+  func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
+  test -n "$func_cygming_ms_implib_tmp"
+}
+
+# func_win32_libid arg
+# return the library type of file 'arg'
+#
+# Need a lot of goo to handle *both* DLLs and import libs
+# Has to be a shell function in order to 'eat' the argument
+# that is supplied when $file_magic_command is called.
+# Despite the name, also deal with 64 bit binaries.
+func_win32_libid ()
+{
+  $debug_cmd
+
+  win32_libid_type=unknown
+  win32_fileres=`file -L $1 2>/dev/null`
+  case $win32_fileres in
+  *ar\ archive\ import\ library*) # definitely import
+    win32_libid_type="x86 archive import"
+    ;;
+  *ar\ archive*) # could be an import, or static
+    # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
+    if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
+       $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
+      case $nm_interface in
+      "MS dumpbin")
+	if func_cygming_ms_implib_p "$1" ||
+	   func_cygming_gnu_implib_p "$1"
+	then
+	  win32_nmres=import
+	else
+	  win32_nmres=
+	fi
+	;;
+      *)
+	func_to_tool_file "$1" func_convert_file_msys_to_w32
+	win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
+	  $SED -n -e '
+	    1,100{
+		/ I /{
+		    s|.*|import|
+		    p
+		    q
+		}
+	    }'`
+	;;
+      esac
+      case $win32_nmres in
+      import*)  win32_libid_type="x86 archive import";;
+      *)        win32_libid_type="x86 archive static";;
+      esac
+    fi
+    ;;
+  *DLL*)
+    win32_libid_type="x86 DLL"
+    ;;
+  *executable*) # but shell scripts are "executable" too...
+    case $win32_fileres in
+    *MS\ Windows\ PE\ Intel*)
+      win32_libid_type="x86 DLL"
+      ;;
+    esac
+    ;;
+  esac
+  $ECHO "$win32_libid_type"
+}
+
+# func_cygming_dll_for_implib ARG
+#
+# Platform-specific function to extract the
+# name of the DLL associated with the specified
+# import library ARG.
+# Invoked by eval'ing the libtool variable
+#    $sharedlib_from_linklib_cmd
+# Result is available in the variable
+#    $sharedlib_from_linklib_result
+func_cygming_dll_for_implib ()
+{
+  $debug_cmd
+
+  sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
+}
+
+# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs
+#
+# The is the core of a fallback implementation of a
+# platform-specific function to extract the name of the
+# DLL associated with the specified import library LIBNAME.
+#
+# SECTION_NAME is either .idata$6 or .idata$7, depending
+# on the platform and compiler that created the implib.
+#
+# Echos the name of the DLL associated with the
+# specified import library.
+func_cygming_dll_for_implib_fallback_core ()
+{
+  $debug_cmd
+
+  match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"`
+  $OBJDUMP -s --section "$1" "$2" 2>/dev/null |
+    $SED '/^Contents of section '"$match_literal"':/{
+      # Place marker at beginning of archive member dllname section
+      s/.*/====MARK====/
+      p
+      d
+    }
+    # These lines can sometimes be longer than 43 characters, but
+    # are always uninteresting
+    /:[	 ]*file format pe[i]\{,1\}-/d
+    /^In archive [^:]*:/d
+    # Ensure marker is printed
+    /^====MARK====/p
+    # Remove all lines with less than 43 characters
+    /^.\{43\}/!d
+    # From remaining lines, remove first 43 characters
+    s/^.\{43\}//' |
+    $SED -n '
+      # Join marker and all lines until next marker into a single line
+      /^====MARK====/ b para
+      H
+      $ b para
+      b
+      :para
+      x
+      s/\n//g
+      # Remove the marker
+      s/^====MARK====//
+      # Remove trailing dots and whitespace
+      s/[\. \t]*$//
+      # Print
+      /./p' |
+    # we now have a list, one entry per line, of the stringified
+    # contents of the appropriate section of all members of the
+    # archive that possess that section. Heuristic: eliminate
+    # all those that have a first or second character that is
+    # a '.' (that is, objdump's representation of an unprintable
+    # character.) This should work for all archives with less than
+    # 0x302f exports -- but will fail for DLLs whose name actually
+    # begins with a literal '.' or a single character followed by
+    # a '.'.
+    #
+    # Of those that remain, print the first one.
+    $SED -e '/^\./d;/^.\./d;q'
+}
+
+# func_cygming_dll_for_implib_fallback ARG
+# Platform-specific function to extract the
+# name of the DLL associated with the specified
+# import library ARG.
+#
+# This fallback implementation is for use when $DLLTOOL
+# does not support the --identify-strict option.
+# Invoked by eval'ing the libtool variable
+#    $sharedlib_from_linklib_cmd
+# Result is available in the variable
+#    $sharedlib_from_linklib_result
+func_cygming_dll_for_implib_fallback ()
+{
+  $debug_cmd
+
+  if func_cygming_gnu_implib_p "$1"; then
+    # binutils import library
+    sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"`
+  elif func_cygming_ms_implib_p "$1"; then
+    # ms-generated import library
+    sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"`
+  else
+    # unknown
+    sharedlib_from_linklib_result=
+  fi
+}
+
+
+# func_extract_an_archive dir oldlib
+func_extract_an_archive ()
+{
+    $debug_cmd
+
+    f_ex_an_ar_dir=$1; shift
+    f_ex_an_ar_oldlib=$1
+    if test yes = "$lock_old_archive_extraction"; then
+      lockfile=$f_ex_an_ar_oldlib.lock
+      until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
+	func_echo "Waiting for $lockfile to be removed"
+	sleep 2
+      done
+    fi
+    func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \
+		   'stat=$?; rm -f "$lockfile"; exit $stat'
+    if test yes = "$lock_old_archive_extraction"; then
+      $opt_dry_run || rm -f "$lockfile"
+    fi
+    if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
+     :
+    else
+      func_fatal_error "object name conflicts in archive: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib"
+    fi
+}
+
+
+# func_extract_archives gentop oldlib ...
+func_extract_archives ()
+{
+    $debug_cmd
+
+    my_gentop=$1; shift
+    my_oldlibs=${1+"$@"}
+    my_oldobjs=
+    my_xlib=
+    my_xabs=
+    my_xdir=
+
+    for my_xlib in $my_oldlibs; do
+      # Extract the objects.
+      case $my_xlib in
+	[\\/]* | [A-Za-z]:[\\/]*) my_xabs=$my_xlib ;;
+	*) my_xabs=`pwd`"/$my_xlib" ;;
+      esac
+      func_basename "$my_xlib"
+      my_xlib=$func_basename_result
+      my_xlib_u=$my_xlib
+      while :; do
+        case " $extracted_archives " in
+	*" $my_xlib_u "*)
+	  func_arith $extracted_serial + 1
+	  extracted_serial=$func_arith_result
+	  my_xlib_u=lt$extracted_serial-$my_xlib ;;
+	*) break ;;
+	esac
+      done
+      extracted_archives="$extracted_archives $my_xlib_u"
+      my_xdir=$my_gentop/$my_xlib_u
+
+      func_mkdir_p "$my_xdir"
+
+      case $host in
+      *-darwin*)
+	func_verbose "Extracting $my_xabs"
+	# Do not bother doing anything if just a dry run
+	$opt_dry_run || {
+	  darwin_orig_dir=`pwd`
+	  cd $my_xdir || exit $?
+	  darwin_archive=$my_xabs
+	  darwin_curdir=`pwd`
+	  func_basename "$darwin_archive"
+	  darwin_base_archive=$func_basename_result
+	  darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true`
+	  if test -n "$darwin_arches"; then
+	    darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'`
+	    darwin_arch=
+	    func_verbose "$darwin_base_archive has multiple architectures $darwin_arches"
+	    for darwin_arch in  $darwin_arches; do
+	      func_mkdir_p "unfat-$$/$darwin_base_archive-$darwin_arch"
+	      $LIPO -thin $darwin_arch -output "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive" "$darwin_archive"
+	      cd "unfat-$$/$darwin_base_archive-$darwin_arch"
+	      func_extract_an_archive "`pwd`" "$darwin_base_archive"
+	      cd "$darwin_curdir"
+	      $RM "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive"
+	    done # $darwin_arches
+            ## Okay now we've a bunch of thin objects, gotta fatten them up :)
+	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$sed_basename" | sort -u`
+	    darwin_file=
+	    darwin_files=
+	    for darwin_file in $darwin_filelist; do
+	      darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP`
+	      $LIPO -create -output "$darwin_file" $darwin_files
+	    done # $darwin_filelist
+	    $RM -rf unfat-$$
+	    cd "$darwin_orig_dir"
+	  else
+	    cd $darwin_orig_dir
+	    func_extract_an_archive "$my_xdir" "$my_xabs"
+	  fi # $darwin_arches
+	} # !$opt_dry_run
+	;;
+      *)
+        func_extract_an_archive "$my_xdir" "$my_xabs"
+	;;
+      esac
+      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
+    done
+
+    func_extract_archives_result=$my_oldobjs
+}
+
+
+# func_emit_wrapper [arg=no]
+#
+# Emit a libtool wrapper script on stdout.
+# Don't directly open a file because we may want to
+# incorporate the script contents within a cygwin/mingw
+# wrapper executable.  Must ONLY be called from within
+# func_mode_link because it depends on a number of variables
+# set therein.
+#
+# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
+# variable will take.  If 'yes', then the emitted script
+# will assume that the directory where it is stored is
+# the $objdir directory.  This is a cygwin/mingw-specific
+# behavior.
+func_emit_wrapper ()
+{
+	func_emit_wrapper_arg1=${1-no}
+
+	$ECHO "\
+#! $SHELL
+
+# $output - temporary wrapper script for $objdir/$outputname
+# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
+#
+# The $output program cannot be directly executed until all the libtool
+# libraries that it depends on are installed.
+#
+# This wrapper script should never be moved out of the build directory.
+# If it is, it will not operate correctly.
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+sed_quote_subst='$sed_quote_subst'
+
+# Be Bourne compatible
+if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
+  setopt NO_GLOB_SUBST
+else
+  case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
+fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+relink_command=\"$relink_command\"
+
+# This environment variable determines our operation mode.
+if test \"\$libtool_install_magic\" = \"$magic\"; then
+  # install mode needs the following variables:
+  generated_by_libtool_version='$macro_version'
+  notinst_deplibs='$notinst_deplibs'
+else
+  # When we are sourced in execute mode, \$file and \$ECHO are already set.
+  if test \"\$libtool_execute_magic\" != \"$magic\"; then
+    file=\"\$0\""
+
+    qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"`
+    $ECHO "\
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+\$1
+_LTECHO_EOF'
+}
+    ECHO=\"$qECHO\"
+  fi
+
+# Very basic option parsing. These options are (a) specific to
+# the libtool wrapper, (b) are identical between the wrapper
+# /script/ and the wrapper /executable/ that is used only on
+# windows platforms, and (c) all begin with the string "--lt-"
+# (application programs are unlikely to have options that match
+# this pattern).
+#
+# There are only two supported options: --lt-debug and
+# --lt-dump-script. There is, deliberately, no --lt-help.
+#
+# The first argument to this parsing function should be the
+# script's $0 value, followed by "$@".
+lt_option_debug=
+func_parse_lt_options ()
+{
+  lt_script_arg0=\$0
+  shift
+  for lt_opt
+  do
+    case \"\$lt_opt\" in
+    --lt-debug) lt_option_debug=1 ;;
+    --lt-dump-script)
+        lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\`
+        test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=.
+        lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\`
+        cat \"\$lt_dump_D/\$lt_dump_F\"
+        exit 0
+      ;;
+    --lt-*)
+        \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2
+        exit 1
+      ;;
+    esac
+  done
+
+  # Print the debug banner immediately:
+  if test -n \"\$lt_option_debug\"; then
+    echo \"$outputname:$output:\$LINENO: libtool wrapper (GNU $PACKAGE) $VERSION\" 1>&2
+  fi
+}
+
+# Used when --lt-debug. Prints its arguments to stdout
+# (redirection is the responsibility of the caller)
+func_lt_dump_args ()
+{
+  lt_dump_args_N=1;
+  for lt_arg
+  do
+    \$ECHO \"$outputname:$output:\$LINENO: newargv[\$lt_dump_args_N]: \$lt_arg\"
+    lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
+  done
+}
+
+# Core function for launching the target application
+func_exec_program_core ()
+{
+"
+  case $host in
+  # Backslashes separate directories on plain windows
+  *-*-mingw | *-*-os2* | *-cegcc*)
+    $ECHO "\
+      if test -n \"\$lt_option_debug\"; then
+        \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir\\\\\$program\" 1>&2
+        func_lt_dump_args \${1+\"\$@\"} 1>&2
+      fi
+      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
+"
+    ;;
+
+  *)
+    $ECHO "\
+      if test -n \"\$lt_option_debug\"; then
+        \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir/\$program\" 1>&2
+        func_lt_dump_args \${1+\"\$@\"} 1>&2
+      fi
+      exec \"\$progdir/\$program\" \${1+\"\$@\"}
+"
+    ;;
+  esac
+  $ECHO "\
+      \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
+      exit 1
+}
+
+# A function to encapsulate launching the target application
+# Strips options in the --lt-* namespace from \$@ and
+# launches target application with the remaining arguments.
+func_exec_program ()
+{
+  case \" \$* \" in
+  *\\ --lt-*)
+    for lt_wr_arg
+    do
+      case \$lt_wr_arg in
+      --lt-*) ;;
+      *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
+      esac
+      shift
+    done ;;
+  esac
+  func_exec_program_core \${1+\"\$@\"}
+}
+
+  # Parse options
+  func_parse_lt_options \"\$0\" \${1+\"\$@\"}
+
+  # Find the directory that this script lives in.
+  thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\`
+  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
+
+  # Follow symbolic links until we get to the real thisdir.
+  file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\`
+  while test -n \"\$file\"; do
+    destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\`
+
+    # If there was a directory component, then change thisdir.
+    if test \"x\$destdir\" != \"x\$file\"; then
+      case \"\$destdir\" in
+      [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
+      *) thisdir=\"\$thisdir/\$destdir\" ;;
+      esac
+    fi
+
+    file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\`
+    file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\`
+  done
+
+  # Usually 'no', except on cygwin/mingw when embedded into
+  # the cwrapper.
+  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1
+  if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
+    # special case for '.'
+    if test \"\$thisdir\" = \".\"; then
+      thisdir=\`pwd\`
+    fi
+    # remove .libs from thisdir
+    case \"\$thisdir\" in
+    *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;;
+    $objdir )   thisdir=. ;;
+    esac
+  fi
+
+  # Try to get the absolute directory name.
+  absdir=\`cd \"\$thisdir\" && pwd\`
+  test -n \"\$absdir\" && thisdir=\"\$absdir\"
+"
+
+	if test yes = "$fast_install"; then
+	  $ECHO "\
+  program=lt-'$outputname'$exeext
+  progdir=\"\$thisdir/$objdir\"
+
+  if test ! -f \"\$progdir/\$program\" ||
+     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | $SED 1q\`; \\
+       test \"X\$file\" != \"X\$progdir/\$program\"; }; then
+
+    file=\"\$\$-\$program\"
+
+    if test ! -d \"\$progdir\"; then
+      $MKDIR \"\$progdir\"
+    else
+      $RM \"\$progdir/\$file\"
+    fi"
+
+	  $ECHO "\
+
+    # relink executable if necessary
+    if test -n \"\$relink_command\"; then
+      if relink_command_output=\`eval \$relink_command 2>&1\`; then :
+      else
+	\$ECHO \"\$relink_command_output\" >&2
+	$RM \"\$progdir/\$file\"
+	exit 1
+      fi
+    fi
+
+    $MV \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
+    { $RM \"\$progdir/\$program\";
+      $MV \"\$progdir/\$file\" \"\$progdir/\$program\"; }
+    $RM \"\$progdir/\$file\"
+  fi"
+	else
+	  $ECHO "\
+  program='$outputname'
+  progdir=\"\$thisdir/$objdir\"
+"
+	fi
+
+	$ECHO "\
+
+  if test -f \"\$progdir/\$program\"; then"
+
+	# fixup the dll searchpath if we need to.
+	#
+	# Fix the DLL searchpath if we need to.  Do this before prepending
+	# to shlibpath, because on Windows, both are PATH and uninstalled
+	# libraries must come first.
+	if test -n "$dllsearchpath"; then
+	  $ECHO "\
+    # Add the dll search path components to the executable PATH
+    PATH=$dllsearchpath:\$PATH
+"
+	fi
+
+	# Export our shlibpath_var if we have one.
+	if test yes = "$shlibpath_overrides_runpath" && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+	  $ECHO "\
+    # Add our own library path to $shlibpath_var
+    $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
+
+    # Some systems cannot cope with colon-terminated $shlibpath_var
+    # The second colon is a workaround for a bug in BeOS R4 sed
+    $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\`
+
+    export $shlibpath_var
+"
+	fi
+
+	$ECHO "\
+    if test \"\$libtool_execute_magic\" != \"$magic\"; then
+      # Run the actual program with our arguments.
+      func_exec_program \${1+\"\$@\"}
+    fi
+  else
+    # The program doesn't exist.
+    \$ECHO \"\$0: error: '\$progdir/\$program' does not exist\" 1>&2
+    \$ECHO \"This script is just a wrapper for \$program.\" 1>&2
+    \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
+    exit 1
+  fi
+fi\
+"
+}
+
+
+# func_emit_cwrapperexe_src
+# emit the source code for a wrapper executable on stdout
+# Must ONLY be called from within func_mode_link because
+# it depends on a number of variable set therein.
+func_emit_cwrapperexe_src ()
+{
+	cat <<EOF
+
+/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
+   Generated by $PROGRAM (GNU $PACKAGE) $VERSION
+
+   The $output program cannot be directly executed until all the libtool
+   libraries that it depends on are installed.
+
+   This wrapper executable should never be moved out of the build directory.
+   If it is, it will not operate correctly.
+*/
+EOF
+	    cat <<"EOF"
+#ifdef _MSC_VER
+# define _CRT_SECURE_NO_DEPRECATE 1
+#endif
+#include <stdio.h>
+#include <stdlib.h>
+#ifdef _MSC_VER
+# include <direct.h>
+# include <process.h>
+# include <io.h>
+#else
+# include <unistd.h>
+# include <stdint.h>
+# ifdef __CYGWIN__
+#  include <io.h>
+# endif
+#endif
+#include <malloc.h>
+#include <stdarg.h>
+#include <assert.h>
+#include <string.h>
+#include <ctype.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+
+#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0)
+
+/* declarations of non-ANSI functions */
+#if defined __MINGW32__
+# ifdef __STRICT_ANSI__
+int _putenv (const char *);
+# endif
+#elif defined __CYGWIN__
+# ifdef __STRICT_ANSI__
+char *realpath (const char *, char *);
+int putenv (char *);
+int setenv (const char *, const char *, int);
+# endif
+/* #elif defined other_platform || defined ... */
+#endif
+
+/* portability defines, excluding path handling macros */
+#if defined _MSC_VER
+# define setmode _setmode
+# define stat    _stat
+# define chmod   _chmod
+# define getcwd  _getcwd
+# define putenv  _putenv
+# define S_IXUSR _S_IEXEC
+#elif defined __MINGW32__
+# define setmode _setmode
+# define stat    _stat
+# define chmod   _chmod
+# define getcwd  _getcwd
+# define putenv  _putenv
+#elif defined __CYGWIN__
+# define HAVE_SETENV
+# define FOPEN_WB "wb"
+/* #elif defined other platforms ... */
+#endif
+
+#if defined PATH_MAX
+# define LT_PATHMAX PATH_MAX
+#elif defined MAXPATHLEN
+# define LT_PATHMAX MAXPATHLEN
+#else
+# define LT_PATHMAX 1024
+#endif
+
+#ifndef S_IXOTH
+# define S_IXOTH 0
+#endif
+#ifndef S_IXGRP
+# define S_IXGRP 0
+#endif
+
+/* path handling portability macros */
+#ifndef DIR_SEPARATOR
+# define DIR_SEPARATOR '/'
+# define PATH_SEPARATOR ':'
+#endif
+
+#if defined _WIN32 || defined __MSDOS__ || defined __DJGPP__ || \
+  defined __OS2__
+# define HAVE_DOS_BASED_FILE_SYSTEM
+# define FOPEN_WB "wb"
+# ifndef DIR_SEPARATOR_2
+#  define DIR_SEPARATOR_2 '\\'
+# endif
+# ifndef PATH_SEPARATOR_2
+#  define PATH_SEPARATOR_2 ';'
+# endif
+#endif
+
+#ifndef DIR_SEPARATOR_2
+# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
+#else /* DIR_SEPARATOR_2 */
+# define IS_DIR_SEPARATOR(ch) \
+	(((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
+#endif /* DIR_SEPARATOR_2 */
+
+#ifndef PATH_SEPARATOR_2
+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR)
+#else /* PATH_SEPARATOR_2 */
+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
+#endif /* PATH_SEPARATOR_2 */
+
+#ifndef FOPEN_WB
+# define FOPEN_WB "w"
+#endif
+#ifndef _O_BINARY
+# define _O_BINARY 0
+#endif
+
+#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
+#define XFREE(stale) do { \
+  if (stale) { free (stale); stale = 0; } \
+} while (0)
+
+#if defined LT_DEBUGWRAPPER
+static int lt_debug = 1;
+#else
+static int lt_debug = 0;
+#endif
+
+const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */
+
+void *xmalloc (size_t num);
+char *xstrdup (const char *string);
+const char *base_name (const char *name);
+char *find_executable (const char *wrapper);
+char *chase_symlinks (const char *pathspec);
+int make_executable (const char *path);
+int check_executable (const char *path);
+char *strendzap (char *str, const char *pat);
+void lt_debugprintf (const char *file, int line, const char *fmt, ...);
+void lt_fatal (const char *file, int line, const char *message, ...);
+static const char *nonnull (const char *s);
+static const char *nonempty (const char *s);
+void lt_setenv (const char *name, const char *value);
+char *lt_extend_str (const char *orig_value, const char *add, int to_end);
+void lt_update_exe_path (const char *name, const char *value);
+void lt_update_lib_path (const char *name, const char *value);
+char **prepare_spawn (char **argv);
+void lt_dump_script (FILE *f);
+EOF
+
+	    cat <<EOF
+#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 5)
+# define externally_visible volatile
+#else
+# define externally_visible __attribute__((externally_visible)) volatile
+#endif
+externally_visible const char * MAGIC_EXE = "$magic_exe";
+const char * LIB_PATH_VARNAME = "$shlibpath_var";
+EOF
+
+	    if test yes = "$shlibpath_overrides_runpath" && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+              func_to_host_path "$temp_rpath"
+	      cat <<EOF
+const char * LIB_PATH_VALUE   = "$func_to_host_path_result";
+EOF
+	    else
+	      cat <<"EOF"
+const char * LIB_PATH_VALUE   = "";
+EOF
+	    fi
+
+	    if test -n "$dllsearchpath"; then
+              func_to_host_path "$dllsearchpath:"
+	      cat <<EOF
+const char * EXE_PATH_VARNAME = "PATH";
+const char * EXE_PATH_VALUE   = "$func_to_host_path_result";
+EOF
+	    else
+	      cat <<"EOF"
+const char * EXE_PATH_VARNAME = "";
+const char * EXE_PATH_VALUE   = "";
+EOF
+	    fi
+
+	    if test yes = "$fast_install"; then
+	      cat <<EOF
+const char * TARGET_PROGRAM_NAME = "lt-$outputname"; /* hopefully, no .exe */
+EOF
+	    else
+	      cat <<EOF
+const char * TARGET_PROGRAM_NAME = "$outputname"; /* hopefully, no .exe */
+EOF
+	    fi
+
+
+	    cat <<"EOF"
+
+#define LTWRAPPER_OPTION_PREFIX         "--lt-"
+
+static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
+static const char *dumpscript_opt       = LTWRAPPER_OPTION_PREFIX "dump-script";
+static const char *debug_opt            = LTWRAPPER_OPTION_PREFIX "debug";
+
+int
+main (int argc, char *argv[])
+{
+  char **newargz;
+  int  newargc;
+  char *tmp_pathspec;
+  char *actual_cwrapper_path;
+  char *actual_cwrapper_name;
+  char *target_name;
+  char *lt_argv_zero;
+  int rval = 127;
+
+  int i;
+
+  program_name = (char *) xstrdup (base_name (argv[0]));
+  newargz = XMALLOC (char *, (size_t) argc + 1);
+
+  /* very simple arg parsing; don't want to rely on getopt
+   * also, copy all non cwrapper options to newargz, except
+   * argz[0], which is handled differently
+   */
+  newargc=0;
+  for (i = 1; i < argc; i++)
+    {
+      if (STREQ (argv[i], dumpscript_opt))
+	{
+EOF
+	    case $host in
+	      *mingw* | *cygwin* )
+		# make stdout use "unix" line endings
+		echo "          setmode(1,_O_BINARY);"
+		;;
+	      esac
+
+	    cat <<"EOF"
+	  lt_dump_script (stdout);
+	  return 0;
+	}
+      if (STREQ (argv[i], debug_opt))
+	{
+          lt_debug = 1;
+          continue;
+	}
+      if (STREQ (argv[i], ltwrapper_option_prefix))
+        {
+          /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
+             namespace, but it is not one of the ones we know about and
+             have already dealt with, above (inluding dump-script), then
+             report an error. Otherwise, targets might begin to believe
+             they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
+             namespace. The first time any user complains about this, we'll
+             need to make LTWRAPPER_OPTION_PREFIX a configure-time option
+             or a configure.ac-settable value.
+           */
+          lt_fatal (__FILE__, __LINE__,
+		    "unrecognized %s option: '%s'",
+                    ltwrapper_option_prefix, argv[i]);
+        }
+      /* otherwise ... */
+      newargz[++newargc] = xstrdup (argv[i]);
+    }
+  newargz[++newargc] = NULL;
+
+EOF
+	    cat <<EOF
+  /* The GNU banner must be the first non-error debug message */
+  lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE) $VERSION\n");
+EOF
+	    cat <<"EOF"
+  lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]);
+  lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name);
+
+  tmp_pathspec = find_executable (argv[0]);
+  if (tmp_pathspec == NULL)
+    lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv[0]);
+  lt_debugprintf (__FILE__, __LINE__,
+                  "(main) found exe (before symlink chase) at: %s\n",
+		  tmp_pathspec);
+
+  actual_cwrapper_path = chase_symlinks (tmp_pathspec);
+  lt_debugprintf (__FILE__, __LINE__,
+                  "(main) found exe (after symlink chase) at: %s\n",
+		  actual_cwrapper_path);
+  XFREE (tmp_pathspec);
+
+  actual_cwrapper_name = xstrdup (base_name (actual_cwrapper_path));
+  strendzap (actual_cwrapper_path, actual_cwrapper_name);
+
+  /* wrapper name transforms */
+  strendzap (actual_cwrapper_name, ".exe");
+  tmp_pathspec = lt_extend_str (actual_cwrapper_name, ".exe", 1);
+  XFREE (actual_cwrapper_name);
+  actual_cwrapper_name = tmp_pathspec;
+  tmp_pathspec = 0;
+
+  /* target_name transforms -- use actual target program name; might have lt- prefix */
+  target_name = xstrdup (base_name (TARGET_PROGRAM_NAME));
+  strendzap (target_name, ".exe");
+  tmp_pathspec = lt_extend_str (target_name, ".exe", 1);
+  XFREE (target_name);
+  target_name = tmp_pathspec;
+  tmp_pathspec = 0;
+
+  lt_debugprintf (__FILE__, __LINE__,
+		  "(main) libtool target name: %s\n",
+		  target_name);
+EOF
+
+	    cat <<EOF
+  newargz[0] =
+    XMALLOC (char, (strlen (actual_cwrapper_path) +
+		    strlen ("$objdir") + 1 + strlen (actual_cwrapper_name) + 1));
+  strcpy (newargz[0], actual_cwrapper_path);
+  strcat (newargz[0], "$objdir");
+  strcat (newargz[0], "/");
+EOF
+
+	    cat <<"EOF"
+  /* stop here, and copy so we don't have to do this twice */
+  tmp_pathspec = xstrdup (newargz[0]);
+
+  /* do NOT want the lt- prefix here, so use actual_cwrapper_name */
+  strcat (newargz[0], actual_cwrapper_name);
+
+  /* DO want the lt- prefix here if it exists, so use target_name */
+  lt_argv_zero = lt_extend_str (tmp_pathspec, target_name, 1);
+  XFREE (tmp_pathspec);
+  tmp_pathspec = NULL;
+EOF
+
+	    case $host_os in
+	      mingw*)
+	    cat <<"EOF"
+  {
+    char* p;
+    while ((p = strchr (newargz[0], '\\')) != NULL)
+      {
+	*p = '/';
+      }
+    while ((p = strchr (lt_argv_zero, '\\')) != NULL)
+      {
+	*p = '/';
+      }
+  }
+EOF
+	    ;;
+	    esac
+
+	    cat <<"EOF"
+  XFREE (target_name);
+  XFREE (actual_cwrapper_path);
+  XFREE (actual_cwrapper_name);
+
+  lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
+  lt_setenv ("DUALCASE", "1");  /* for MSK sh */
+  /* Update the DLL searchpath.  EXE_PATH_VALUE ($dllsearchpath) must
+     be prepended before (that is, appear after) LIB_PATH_VALUE ($temp_rpath)
+     because on Windows, both *_VARNAMEs are PATH but uninstalled
+     libraries must come first. */
+  lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
+  lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
+
+  lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n",
+		  nonnull (lt_argv_zero));
+  for (i = 0; i < newargc; i++)
+    {
+      lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n",
+		      i, nonnull (newargz[i]));
+    }
+
+EOF
+
+	    case $host_os in
+	      mingw*)
+		cat <<"EOF"
+  /* execv doesn't actually work on mingw as expected on unix */
+  newargz = prepare_spawn (newargz);
+  rval = (int) _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
+  if (rval == -1)
+    {
+      /* failed to start process */
+      lt_debugprintf (__FILE__, __LINE__,
+		      "(main) failed to launch target \"%s\": %s\n",
+		      lt_argv_zero, nonnull (strerror (errno)));
+      return 127;
+    }
+  return rval;
+EOF
+		;;
+	      *)
+		cat <<"EOF"
+  execv (lt_argv_zero, newargz);
+  return rval; /* =127, but avoids unused variable warning */
+EOF
+		;;
+	    esac
+
+	    cat <<"EOF"
+}
+
+void *
+xmalloc (size_t num)
+{
+  void *p = (void *) malloc (num);
+  if (!p)
+    lt_fatal (__FILE__, __LINE__, "memory exhausted");
+
+  return p;
+}
+
+char *
+xstrdup (const char *string)
+{
+  return string ? strcpy ((char *) xmalloc (strlen (string) + 1),
+			  string) : NULL;
+}
+
+const char *
+base_name (const char *name)
+{
+  const char *base;
+
+#if defined HAVE_DOS_BASED_FILE_SYSTEM
+  /* Skip over the disk name in MSDOS pathnames. */
+  if (isalpha ((unsigned char) name[0]) && name[1] == ':')
+    name += 2;
+#endif
+
+  for (base = name; *name; name++)
+    if (IS_DIR_SEPARATOR (*name))
+      base = name + 1;
+  return base;
+}
+
+int
+check_executable (const char *path)
+{
+  struct stat st;
+
+  lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n",
+                  nonempty (path));
+  if ((!path) || (!*path))
+    return 0;
+
+  if ((stat (path, &st) >= 0)
+      && (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)))
+    return 1;
+  else
+    return 0;
+}
+
+int
+make_executable (const char *path)
+{
+  int rval = 0;
+  struct stat st;
+
+  lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n",
+                  nonempty (path));
+  if ((!path) || (!*path))
+    return 0;
+
+  if (stat (path, &st) >= 0)
+    {
+      rval = chmod (path, st.st_mode | S_IXOTH | S_IXGRP | S_IXUSR);
+    }
+  return rval;
+}
+
+/* Searches for the full path of the wrapper.  Returns
+   newly allocated full path name if found, NULL otherwise
+   Does not chase symlinks, even on platforms that support them.
+*/
+char *
+find_executable (const char *wrapper)
+{
+  int has_slash = 0;
+  const char *p;
+  const char *p_next;
+  /* static buffer for getcwd */
+  char tmp[LT_PATHMAX + 1];
+  size_t tmp_len;
+  char *concat_name;
+
+  lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
+                  nonempty (wrapper));
+
+  if ((wrapper == NULL) || (*wrapper == '\0'))
+    return NULL;
+
+  /* Absolute path? */
+#if defined HAVE_DOS_BASED_FILE_SYSTEM
+  if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':')
+    {
+      concat_name = xstrdup (wrapper);
+      if (check_executable (concat_name))
+	return concat_name;
+      XFREE (concat_name);
+    }
+  else
+    {
+#endif
+      if (IS_DIR_SEPARATOR (wrapper[0]))
+	{
+	  concat_name = xstrdup (wrapper);
+	  if (check_executable (concat_name))
+	    return concat_name;
+	  XFREE (concat_name);
+	}
+#if defined HAVE_DOS_BASED_FILE_SYSTEM
+    }
+#endif
+
+  for (p = wrapper; *p; p++)
+    if (*p == '/')
+      {
+	has_slash = 1;
+	break;
+      }
+  if (!has_slash)
+    {
+      /* no slashes; search PATH */
+      const char *path = getenv ("PATH");
+      if (path != NULL)
+	{
+	  for (p = path; *p; p = p_next)
+	    {
+	      const char *q;
+	      size_t p_len;
+	      for (q = p; *q; q++)
+		if (IS_PATH_SEPARATOR (*q))
+		  break;
+	      p_len = (size_t) (q - p);
+	      p_next = (*q == '\0' ? q : q + 1);
+	      if (p_len == 0)
+		{
+		  /* empty path: current directory */
+		  if (getcwd (tmp, LT_PATHMAX) == NULL)
+		    lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
+                              nonnull (strerror (errno)));
+		  tmp_len = strlen (tmp);
+		  concat_name =
+		    XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
+		  memcpy (concat_name, tmp, tmp_len);
+		  concat_name[tmp_len] = '/';
+		  strcpy (concat_name + tmp_len + 1, wrapper);
+		}
+	      else
+		{
+		  concat_name =
+		    XMALLOC (char, p_len + 1 + strlen (wrapper) + 1);
+		  memcpy (concat_name, p, p_len);
+		  concat_name[p_len] = '/';
+		  strcpy (concat_name + p_len + 1, wrapper);
+		}
+	      if (check_executable (concat_name))
+		return concat_name;
+	      XFREE (concat_name);
+	    }
+	}
+      /* not found in PATH; assume curdir */
+    }
+  /* Relative path | not found in path: prepend cwd */
+  if (getcwd (tmp, LT_PATHMAX) == NULL)
+    lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
+              nonnull (strerror (errno)));
+  tmp_len = strlen (tmp);
+  concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
+  memcpy (concat_name, tmp, tmp_len);
+  concat_name[tmp_len] = '/';
+  strcpy (concat_name + tmp_len + 1, wrapper);
+
+  if (check_executable (concat_name))
+    return concat_name;
+  XFREE (concat_name);
+  return NULL;
+}
+
+char *
+chase_symlinks (const char *pathspec)
+{
+#ifndef S_ISLNK
+  return xstrdup (pathspec);
+#else
+  char buf[LT_PATHMAX];
+  struct stat s;
+  char *tmp_pathspec = xstrdup (pathspec);
+  char *p;
+  int has_symlinks = 0;
+  while (strlen (tmp_pathspec) && !has_symlinks)
+    {
+      lt_debugprintf (__FILE__, __LINE__,
+		      "checking path component for symlinks: %s\n",
+		      tmp_pathspec);
+      if (lstat (tmp_pathspec, &s) == 0)
+	{
+	  if (S_ISLNK (s.st_mode) != 0)
+	    {
+	      has_symlinks = 1;
+	      break;
+	    }
+
+	  /* search backwards for last DIR_SEPARATOR */
+	  p = tmp_pathspec + strlen (tmp_pathspec) - 1;
+	  while ((p > tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
+	    p--;
+	  if ((p == tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
+	    {
+	      /* no more DIR_SEPARATORS left */
+	      break;
+	    }
+	  *p = '\0';
+	}
+      else
+	{
+	  lt_fatal (__FILE__, __LINE__,
+		    "error accessing file \"%s\": %s",
+		    tmp_pathspec, nonnull (strerror (errno)));
+	}
+    }
+  XFREE (tmp_pathspec);
+
+  if (!has_symlinks)
+    {
+      return xstrdup (pathspec);
+    }
+
+  tmp_pathspec = realpath (pathspec, buf);
+  if (tmp_pathspec == 0)
+    {
+      lt_fatal (__FILE__, __LINE__,
+		"could not follow symlinks for %s", pathspec);
+    }
+  return xstrdup (tmp_pathspec);
+#endif
+}
+
+char *
+strendzap (char *str, const char *pat)
+{
+  size_t len, patlen;
+
+  assert (str != NULL);
+  assert (pat != NULL);
+
+  len = strlen (str);
+  patlen = strlen (pat);
+
+  if (patlen <= len)
+    {
+      str += len - patlen;
+      if (STREQ (str, pat))
+	*str = '\0';
+    }
+  return str;
+}
+
+void
+lt_debugprintf (const char *file, int line, const char *fmt, ...)
+{
+  va_list args;
+  if (lt_debug)
+    {
+      (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line);
+      va_start (args, fmt);
+      (void) vfprintf (stderr, fmt, args);
+      va_end (args);
+    }
+}
+
+static void
+lt_error_core (int exit_status, const char *file,
+	       int line, const char *mode,
+	       const char *message, va_list ap)
+{
+  fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode);
+  vfprintf (stderr, message, ap);
+  fprintf (stderr, ".\n");
+
+  if (exit_status >= 0)
+    exit (exit_status);
+}
+
+void
+lt_fatal (const char *file, int line, const char *message, ...)
+{
+  va_list ap;
+  va_start (ap, message);
+  lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap);
+  va_end (ap);
+}
+
+static const char *
+nonnull (const char *s)
+{
+  return s ? s : "(null)";
+}
+
+static const char *
+nonempty (const char *s)
+{
+  return (s && !*s) ? "(empty)" : nonnull (s);
+}
+
+void
+lt_setenv (const char *name, const char *value)
+{
+  lt_debugprintf (__FILE__, __LINE__,
+		  "(lt_setenv) setting '%s' to '%s'\n",
+                  nonnull (name), nonnull (value));
+  {
+#ifdef HAVE_SETENV
+    /* always make a copy, for consistency with !HAVE_SETENV */
+    char *str = xstrdup (value);
+    setenv (name, str, 1);
+#else
+    size_t len = strlen (name) + 1 + strlen (value) + 1;
+    char *str = XMALLOC (char, len);
+    sprintf (str, "%s=%s", name, value);
+    if (putenv (str) != EXIT_SUCCESS)
+      {
+        XFREE (str);
+      }
+#endif
+  }
+}
+
+char *
+lt_extend_str (const char *orig_value, const char *add, int to_end)
+{
+  char *new_value;
+  if (orig_value && *orig_value)
+    {
+      size_t orig_value_len = strlen (orig_value);
+      size_t add_len = strlen (add);
+      new_value = XMALLOC (char, add_len + orig_value_len + 1);
+      if (to_end)
+        {
+          strcpy (new_value, orig_value);
+          strcpy (new_value + orig_value_len, add);
+        }
+      else
+        {
+          strcpy (new_value, add);
+          strcpy (new_value + add_len, orig_value);
+        }
+    }
+  else
+    {
+      new_value = xstrdup (add);
+    }
+  return new_value;
+}
+
+void
+lt_update_exe_path (const char *name, const char *value)
+{
+  lt_debugprintf (__FILE__, __LINE__,
+		  "(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
+                  nonnull (name), nonnull (value));
+
+  if (name && *name && value && *value)
+    {
+      char *new_value = lt_extend_str (getenv (name), value, 0);
+      /* some systems can't cope with a ':'-terminated path #' */
+      size_t len = strlen (new_value);
+      while ((len > 0) && IS_PATH_SEPARATOR (new_value[len-1]))
+        {
+          new_value[--len] = '\0';
+        }
+      lt_setenv (name, new_value);
+      XFREE (new_value);
+    }
+}
+
+void
+lt_update_lib_path (const char *name, const char *value)
+{
+  lt_debugprintf (__FILE__, __LINE__,
+		  "(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
+                  nonnull (name), nonnull (value));
+
+  if (name && *name && value && *value)
+    {
+      char *new_value = lt_extend_str (getenv (name), value, 0);
+      lt_setenv (name, new_value);
+      XFREE (new_value);
+    }
+}
+
+EOF
+	    case $host_os in
+	      mingw*)
+		cat <<"EOF"
+
+/* Prepares an argument vector before calling spawn().
+   Note that spawn() does not by itself call the command interpreter
+     (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") :
+      ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+         GetVersionEx(&v);
+         v.dwPlatformId == VER_PLATFORM_WIN32_NT;
+      }) ? "cmd.exe" : "command.com").
+   Instead it simply concatenates the arguments, separated by ' ', and calls
+   CreateProcess().  We must quote the arguments since Win32 CreateProcess()
+   interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a
+   special way:
+   - Space and tab are interpreted as delimiters. They are not treated as
+     delimiters if they are surrounded by double quotes: "...".
+   - Unescaped double quotes are removed from the input. Their only effect is
+     that within double quotes, space and tab are treated like normal
+     characters.
+   - Backslashes not followed by double quotes are not special.
+   - But 2*n+1 backslashes followed by a double quote become
+     n backslashes followed by a double quote (n >= 0):
+       \" -> "
+       \\\" -> \"
+       \\\\\" -> \\"
+ */
+#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
+#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
+char **
+prepare_spawn (char **argv)
+{
+  size_t argc;
+  char **new_argv;
+  size_t i;
+
+  /* Count number of arguments.  */
+  for (argc = 0; argv[argc] != NULL; argc++)
+    ;
+
+  /* Allocate new argument vector.  */
+  new_argv = XMALLOC (char *, argc + 1);
+
+  /* Put quoted arguments into the new argument vector.  */
+  for (i = 0; i < argc; i++)
+    {
+      const char *string = argv[i];
+
+      if (string[0] == '\0')
+	new_argv[i] = xstrdup ("\"\"");
+      else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL)
+	{
+	  int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL);
+	  size_t length;
+	  unsigned int backslashes;
+	  const char *s;
+	  char *quoted_string;
+	  char *p;
+
+	  length = 0;
+	  backslashes = 0;
+	  if (quote_around)
+	    length++;
+	  for (s = string; *s != '\0'; s++)
+	    {
+	      char c = *s;
+	      if (c == '"')
+		length += backslashes + 1;
+	      length++;
+	      if (c == '\\')
+		backslashes++;
+	      else
+		backslashes = 0;
+	    }
+	  if (quote_around)
+	    length += backslashes + 1;
+
+	  quoted_string = XMALLOC (char, length + 1);
+
+	  p = quoted_string;
+	  backslashes = 0;
+	  if (quote_around)
+	    *p++ = '"';
+	  for (s = string; *s != '\0'; s++)
+	    {
+	      char c = *s;
+	      if (c == '"')
+		{
+		  unsigned int j;
+		  for (j = backslashes + 1; j > 0; j--)
+		    *p++ = '\\';
+		}
+	      *p++ = c;
+	      if (c == '\\')
+		backslashes++;
+	      else
+		backslashes = 0;
+	    }
+	  if (quote_around)
+	    {
+	      unsigned int j;
+	      for (j = backslashes; j > 0; j--)
+		*p++ = '\\';
+	      *p++ = '"';
+	    }
+	  *p = '\0';
+
+	  new_argv[i] = quoted_string;
+	}
+      else
+	new_argv[i] = (char *) string;
+    }
+  new_argv[argc] = NULL;
+
+  return new_argv;
+}
+EOF
+		;;
+	    esac
+
+            cat <<"EOF"
+void lt_dump_script (FILE* f)
+{
+EOF
+	    func_emit_wrapper yes |
+	      $SED -n -e '
+s/^\(.\{79\}\)\(..*\)/\1\
+\2/
+h
+s/\([\\"]\)/\\\1/g
+s/$/\\n/
+s/\([^\n]*\).*/  fputs ("\1", f);/p
+g
+D'
+            cat <<"EOF"
+}
+EOF
+}
+# end: func_emit_cwrapperexe_src
+
+# func_win32_import_lib_p ARG
+# True if ARG is an import lib, as indicated by $file_magic_cmd
+func_win32_import_lib_p ()
+{
+    $debug_cmd
+
+    case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
+    *import*) : ;;
+    *) false ;;
+    esac
+}
+
+# func_suncc_cstd_abi
+# !!ONLY CALL THIS FOR SUN CC AFTER $compile_command IS FULLY EXPANDED!!
+# Several compiler flags select an ABI that is incompatible with the
+# Cstd library. Avoid specifying it if any are in CXXFLAGS.
+func_suncc_cstd_abi ()
+{
+    $debug_cmd
+
+    case " $compile_command " in
+    *" -compat=g "*|*\ -std=c++[0-9][0-9]\ *|*" -library=stdcxx4 "*|*" -library=stlport4 "*)
+      suncc_use_cstd_abi=no
+      ;;
+    *)
+      suncc_use_cstd_abi=yes
+      ;;
+    esac
+}
+
+# func_mode_link arg...
+func_mode_link ()
+{
+    $debug_cmd
+
+    case $host in
+    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+      # It is impossible to link a dll without this setting, and
+      # we shouldn't force the makefile maintainer to figure out
+      # what system we are compiling for in order to pass an extra
+      # flag for every libtool invocation.
+      # allow_undefined=no
+
+      # FIXME: Unfortunately, there are problems with the above when trying
+      # to make a dll that has undefined symbols, in which case not
+      # even a static library is built.  For now, we need to specify
+      # -no-undefined on the libtool link line when we can be certain
+      # that all symbols are satisfied, otherwise we get a static library.
+      allow_undefined=yes
+      ;;
+    *)
+      allow_undefined=yes
+      ;;
+    esac
+    libtool_args=$nonopt
+    base_compile="$nonopt $@"
+    compile_command=$nonopt
+    finalize_command=$nonopt
+
+    compile_rpath=
+    finalize_rpath=
+    compile_shlibpath=
+    finalize_shlibpath=
+    convenience=
+    old_convenience=
+    deplibs=
+    old_deplibs=
+    compiler_flags=
+    linker_flags=
+    dllsearchpath=
+    lib_search_path=`pwd`
+    inst_prefix_dir=
+    new_inherited_linker_flags=
+
+    avoid_version=no
+    bindir=
+    dlfiles=
+    dlprefiles=
+    dlself=no
+    export_dynamic=no
+    export_symbols=
+    export_symbols_regex=
+    generated=
+    libobjs=
+    ltlibs=
+    module=no
+    no_install=no
+    objs=
+    os2dllname=
+    non_pic_objects=
+    precious_files_regex=
+    prefer_static_libs=no
+    preload=false
+    prev=
+    prevarg=
+    release=
+    rpath=
+    xrpath=
+    perm_rpath=
+    temp_rpath=
+    thread_safe=no
+    vinfo=
+    vinfo_number=no
+    weak_libs=
+    single_module=$wl-single_module
+    func_infer_tag $base_compile
+
+    # We need to know -static, to get the right output filenames.
+    for arg
+    do
+      case $arg in
+      -shared)
+	test yes != "$build_libtool_libs" \
+	  && func_fatal_configuration "cannot build a shared library"
+	build_old_libs=no
+	break
+	;;
+      -all-static | -static | -static-libtool-libs)
+	case $arg in
+	-all-static)
+	  if test yes = "$build_libtool_libs" && test -z "$link_static_flag"; then
+	    func_warning "complete static linking is impossible in this configuration"
+	  fi
+	  if test -n "$link_static_flag"; then
+	    dlopen_self=$dlopen_self_static
+	  fi
+	  prefer_static_libs=yes
+	  ;;
+	-static)
+	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
+	    dlopen_self=$dlopen_self_static
+	  fi
+	  prefer_static_libs=built
+	  ;;
+	-static-libtool-libs)
+	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
+	    dlopen_self=$dlopen_self_static
+	  fi
+	  prefer_static_libs=yes
+	  ;;
+	esac
+	build_libtool_libs=no
+	build_old_libs=yes
+	break
+	;;
+      esac
+    done
+
+    # See if our shared archives depend on static archives.
+    test -n "$old_archive_from_new_cmds" && build_old_libs=yes
+
+    # Go through the arguments, transforming them on the way.
+    while test "$#" -gt 0; do
+      arg=$1
+      shift
+      func_quote_for_eval "$arg"
+      qarg=$func_quote_for_eval_unquoted_result
+      func_append libtool_args " $func_quote_for_eval_result"
+
+      # If the previous option needs an argument, assign it.
+      if test -n "$prev"; then
+	case $prev in
+	output)
+	  func_append compile_command " @OUTPUT@"
+	  func_append finalize_command " @OUTPUT@"
+	  ;;
+	esac
+
+	case $prev in
+	bindir)
+	  bindir=$arg
+	  prev=
+	  continue
+	  ;;
+	dlfiles|dlprefiles)
+	  $preload || {
+	    # Add the symbol object into the linking commands.
+	    func_append compile_command " @SYMFILE@"
+	    func_append finalize_command " @SYMFILE@"
+	    preload=:
+	  }
+	  case $arg in
+	  *.la | *.lo) ;;  # We handle these cases below.
+	  force)
+	    if test no = "$dlself"; then
+	      dlself=needless
+	      export_dynamic=yes
+	    fi
+	    prev=
+	    continue
+	    ;;
+	  self)
+	    if test dlprefiles = "$prev"; then
+	      dlself=yes
+	    elif test dlfiles = "$prev" && test yes != "$dlopen_self"; then
+	      dlself=yes
+	    else
+	      dlself=needless
+	      export_dynamic=yes
+	    fi
+	    prev=
+	    continue
+	    ;;
+	  *)
+	    if test dlfiles = "$prev"; then
+	      func_append dlfiles " $arg"
+	    else
+	      func_append dlprefiles " $arg"
+	    fi
+	    prev=
+	    continue
+	    ;;
+	  esac
+	  ;;
+	expsyms)
+	  export_symbols=$arg
+	  test -f "$arg" \
+	    || func_fatal_error "symbol file '$arg' does not exist"
+	  prev=
+	  continue
+	  ;;
+	expsyms_regex)
+	  export_symbols_regex=$arg
+	  prev=
+	  continue
+	  ;;
+	framework)
+	  case $host in
+	    *-*-darwin*)
+	      case "$deplibs " in
+		*" $qarg.ltframework "*) ;;
+		*) func_append deplibs " $qarg.ltframework" # this is fixed later
+		   ;;
+	      esac
+	      ;;
+	  esac
+	  prev=
+	  continue
+	  ;;
+	inst_prefix)
+	  inst_prefix_dir=$arg
+	  prev=
+	  continue
+	  ;;
+	mllvm)
+	  # Clang does not use LLVM to link, so we can simply discard any
+	  # '-mllvm $arg' options when doing the link step.
+	  prev=
+	  continue
+	  ;;
+	objectlist)
+	  if test -f "$arg"; then
+	    save_arg=$arg
+	    moreargs=
+	    for fil in `cat "$save_arg"`
+	    do
+#	      func_append moreargs " $fil"
+	      arg=$fil
+	      # A libtool-controlled object.
+
+	      # Check to see that this really is a libtool object.
+	      if func_lalib_unsafe_p "$arg"; then
+		pic_object=
+		non_pic_object=
+
+		# Read the .lo file
+		func_source "$arg"
+
+		if test -z "$pic_object" ||
+		   test -z "$non_pic_object" ||
+		   test none = "$pic_object" &&
+		   test none = "$non_pic_object"; then
+		  func_fatal_error "cannot find name of object for '$arg'"
+		fi
+
+		# Extract subdirectory from the argument.
+		func_dirname "$arg" "/" ""
+		xdir=$func_dirname_result
+
+		if test none != "$pic_object"; then
+		  # Prepend the subdirectory the object is found in.
+		  pic_object=$xdir$pic_object
+
+		  if test dlfiles = "$prev"; then
+		    if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then
+		      func_append dlfiles " $pic_object"
+		      prev=
+		      continue
+		    else
+		      # If libtool objects are unsupported, then we need to preload.
+		      prev=dlprefiles
+		    fi
+		  fi
+
+		  # CHECK ME:  I think I busted this.  -Ossama
+		  if test dlprefiles = "$prev"; then
+		    # Preload the old-style object.
+		    func_append dlprefiles " $pic_object"
+		    prev=
+		  fi
+
+		  # A PIC object.
+		  func_append libobjs " $pic_object"
+		  arg=$pic_object
+		fi
+
+		# Non-PIC object.
+		if test none != "$non_pic_object"; then
+		  # Prepend the subdirectory the object is found in.
+		  non_pic_object=$xdir$non_pic_object
+
+		  # A standard non-PIC object
+		  func_append non_pic_objects " $non_pic_object"
+		  if test -z "$pic_object" || test none = "$pic_object"; then
+		    arg=$non_pic_object
+		  fi
+		else
+		  # If the PIC object exists, use it instead.
+		  # $xdir was prepended to $pic_object above.
+		  non_pic_object=$pic_object
+		  func_append non_pic_objects " $non_pic_object"
+		fi
+	      else
+		# Only an error if not doing a dry-run.
+		if $opt_dry_run; then
+		  # Extract subdirectory from the argument.
+		  func_dirname "$arg" "/" ""
+		  xdir=$func_dirname_result
+
+		  func_lo2o "$arg"
+		  pic_object=$xdir$objdir/$func_lo2o_result
+		  non_pic_object=$xdir$func_lo2o_result
+		  func_append libobjs " $pic_object"
+		  func_append non_pic_objects " $non_pic_object"
+	        else
+		  func_fatal_error "'$arg' is not a valid libtool object"
+		fi
+	      fi
+	    done
+	  else
+	    func_fatal_error "link input file '$arg' does not exist"
+	  fi
+	  arg=$save_arg
+	  prev=
+	  continue
+	  ;;
+	os2dllname)
+	  os2dllname=$arg
+	  prev=
+	  continue
+	  ;;
+	precious_regex)
+	  precious_files_regex=$arg
+	  prev=
+	  continue
+	  ;;
+	release)
+	  release=-$arg
+	  prev=
+	  continue
+	  ;;
+	rpath | xrpath)
+	  # We need an absolute path.
+	  case $arg in
+	  [\\/]* | [A-Za-z]:[\\/]*) ;;
+	  *)
+	    func_fatal_error "only absolute run-paths are allowed"
+	    ;;
+	  esac
+	  if test rpath = "$prev"; then
+	    case "$rpath " in
+	    *" $arg "*) ;;
+	    *) func_append rpath " $arg" ;;
+	    esac
+	  else
+	    case "$xrpath " in
+	    *" $arg "*) ;;
+	    *) func_append xrpath " $arg" ;;
+	    esac
+	  fi
+	  prev=
+	  continue
+	  ;;
+	shrext)
+	  shrext_cmds=$arg
+	  prev=
+	  continue
+	  ;;
+	weak)
+	  func_append weak_libs " $arg"
+	  prev=
+	  continue
+	  ;;
+	xcclinker)
+	  func_append linker_flags " $qarg"
+	  func_append compiler_flags " $qarg"
+	  prev=
+	  func_append compile_command " $qarg"
+	  func_append finalize_command " $qarg"
+	  continue
+	  ;;
+	xcompiler)
+	  func_append compiler_flags " $qarg"
+	  prev=
+	  func_append compile_command " $qarg"
+	  func_append finalize_command " $qarg"
+	  continue
+	  ;;
+	xlinker)
+	  func_append linker_flags " $qarg"
+	  func_append compiler_flags " $wl$qarg"
+	  prev=
+	  func_append compile_command " $wl$qarg"
+	  func_append finalize_command " $wl$qarg"
+	  continue
+	  ;;
+	*)
+	  eval "$prev=\"\$arg\""
+	  prev=
+	  continue
+	  ;;
+	esac
+      fi # test -n "$prev"
+
+      prevarg=$arg
+
+      case $arg in
+      -all-static)
+	if test -n "$link_static_flag"; then
+	  # See comment for -static flag below, for more details.
+	  func_append compile_command " $link_static_flag"
+	  func_append finalize_command " $link_static_flag"
+	fi
+	continue
+	;;
+
+      -allow-undefined)
+	# FIXME: remove this flag sometime in the future.
+	func_fatal_error "'-allow-undefined' must not be used because it is the default"
+	;;
+
+      -avoid-version)
+	avoid_version=yes
+	continue
+	;;
+
+      -bindir)
+	prev=bindir
+	continue
+	;;
+
+      -dlopen)
+	prev=dlfiles
+	continue
+	;;
+
+      -dlpreopen)
+	prev=dlprefiles
+	continue
+	;;
+
+      -export-dynamic)
+	export_dynamic=yes
+	continue
+	;;
+
+      -export-symbols | -export-symbols-regex)
+	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
+	  func_fatal_error "more than one -exported-symbols argument is not allowed"
+	fi
+	if test X-export-symbols = "X$arg"; then
+	  prev=expsyms
+	else
+	  prev=expsyms_regex
+	fi
+	continue
+	;;
+
+      -framework)
+	prev=framework
+	continue
+	;;
+
+      -inst-prefix-dir)
+	prev=inst_prefix
+	continue
+	;;
+
+      # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
+      # so, if we see these flags be careful not to treat them like -L
+      -L[A-Z][A-Z]*:*)
+	case $with_gcc/$host in
+	no/*-*-irix* | /*-*-irix*)
+	  func_append compile_command " $arg"
+	  func_append finalize_command " $arg"
+	  ;;
+	esac
+	continue
+	;;
+
+      -L*)
+	func_stripname "-L" '' "$arg"
+	if test -z "$func_stripname_result"; then
+	  if test "$#" -gt 0; then
+	    func_fatal_error "require no space between '-L' and '$1'"
+	  else
+	    func_fatal_error "need path for '-L' option"
+	  fi
+	fi
+	func_resolve_sysroot "$func_stripname_result"
+	dir=$func_resolve_sysroot_result
+	# We need an absolute path.
+	case $dir in
+	[\\/]* | [A-Za-z]:[\\/]*) ;;
+	*)
+	  absdir=`cd "$dir" && pwd`
+	  test -z "$absdir" && \
+	    func_fatal_error "cannot determine absolute directory name of '$dir'"
+	  dir=$absdir
+	  ;;
+	esac
+	case "$deplibs " in
+	*" -L$dir "* | *" $arg "*)
+	  # Will only happen for absolute or sysroot arguments
+	  ;;
+	*)
+	  # Preserve sysroot, but never include relative directories
+	  case $dir in
+	    [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;;
+	    *) func_append deplibs " -L$dir" ;;
+	  esac
+	  func_append lib_search_path " $dir"
+	  ;;
+	esac
+	case $host in
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+	  testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'`
+	  case :$dllsearchpath: in
+	  *":$dir:"*) ;;
+	  ::) dllsearchpath=$dir;;
+	  *) func_append dllsearchpath ":$dir";;
+	  esac
+	  case :$dllsearchpath: in
+	  *":$testbindir:"*) ;;
+	  ::) dllsearchpath=$testbindir;;
+	  *) func_append dllsearchpath ":$testbindir";;
+	  esac
+	  ;;
+	esac
+	continue
+	;;
+
+      -l*)
+	if test X-lc = "X$arg" || test X-lm = "X$arg"; then
+	  case $host in
+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
+	    # These systems don't actually have a C or math library (as such)
+	    continue
+	    ;;
+	  *-*-os2*)
+	    # These systems don't actually have a C library (as such)
+	    test X-lc = "X$arg" && continue
+	    ;;
+	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*)
+	    # Do not include libc due to us having libc/libc_r.
+	    test X-lc = "X$arg" && continue
+	    ;;
+	  *-*-rhapsody* | *-*-darwin1.[012])
+	    # Rhapsody C and math libraries are in the System framework
+	    func_append deplibs " System.ltframework"
+	    continue
+	    ;;
+	  *-*-sco3.2v5* | *-*-sco5v6*)
+	    # Causes problems with __ctype
+	    test X-lc = "X$arg" && continue
+	    ;;
+	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
+	    # Compiler inserts libc in the correct place for threads to work
+	    test X-lc = "X$arg" && continue
+	    ;;
+	  esac
+	elif test X-lc_r = "X$arg"; then
+	 case $host in
+	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*)
+	   # Do not include libc_r directly, use -pthread flag.
+	   continue
+	   ;;
+	 esac
+	fi
+	func_append deplibs " $arg"
+	continue
+	;;
+
+      -mllvm)
+	prev=mllvm
+	continue
+	;;
+
+      -module)
+	module=yes
+	continue
+	;;
+
+      # Tru64 UNIX uses -model [arg] to determine the layout of C++
+      # classes, name mangling, and exception handling.
+      # Darwin uses the -arch flag to determine output architecture.
+      -model|-arch|-isysroot|--sysroot)
+	func_append compiler_flags " $arg"
+	func_append compile_command " $arg"
+	func_append finalize_command " $arg"
+	prev=xcompiler
+	continue
+	;;
+
+      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+      |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
+	func_append compiler_flags " $arg"
+	func_append compile_command " $arg"
+	func_append finalize_command " $arg"
+	case "$new_inherited_linker_flags " in
+	    *" $arg "*) ;;
+	    * ) func_append new_inherited_linker_flags " $arg" ;;
+	esac
+	continue
+	;;
+
+      -multi_module)
+	single_module=$wl-multi_module
+	continue
+	;;
+
+      -no-fast-install)
+	fast_install=no
+	continue
+	;;
+
+      -no-install)
+	case $host in
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
+	  # The PATH hackery in wrapper scripts is required on Windows
+	  # and Darwin in order for the loader to find any dlls it needs.
+	  func_warning "'-no-install' is ignored for $host"
+	  func_warning "assuming '-no-fast-install' instead"
+	  fast_install=no
+	  ;;
+	*) no_install=yes ;;
+	esac
+	continue
+	;;
+
+      -no-undefined)
+	allow_undefined=no
+	continue
+	;;
+
+      -objectlist)
+	prev=objectlist
+	continue
+	;;
+
+      -os2dllname)
+	prev=os2dllname
+	continue
+	;;
+
+      -o) prev=output ;;
+
+      -precious-files-regex)
+	prev=precious_regex
+	continue
+	;;
+
+      -release)
+	prev=release
+	continue
+	;;
+
+      -rpath)
+	prev=rpath
+	continue
+	;;
+
+      -R)
+	prev=xrpath
+	continue
+	;;
+
+      -R*)
+	func_stripname '-R' '' "$arg"
+	dir=$func_stripname_result
+	# We need an absolute path.
+	case $dir in
+	[\\/]* | [A-Za-z]:[\\/]*) ;;
+	=*)
+	  func_stripname '=' '' "$dir"
+	  dir=$lt_sysroot$func_stripname_result
+	  ;;
+	*)
+	  func_fatal_error "only absolute run-paths are allowed"
+	  ;;
+	esac
+	case "$xrpath " in
+	*" $dir "*) ;;
+	*) func_append xrpath " $dir" ;;
+	esac
+	continue
+	;;
+
+      -shared)
+	# The effects of -shared are defined in a previous loop.
+	continue
+	;;
+
+      -shrext)
+	prev=shrext
+	continue
+	;;
+
+      -static | -static-libtool-libs)
+	# The effects of -static are defined in a previous loop.
+	# We used to do the same as -all-static on platforms that
+	# didn't have a PIC flag, but the assumption that the effects
+	# would be equivalent was wrong.  It would break on at least
+	# Digital Unix and AIX.
+	continue
+	;;
+
+      -thread-safe)
+	thread_safe=yes
+	continue
+	;;
+
+      -version-info)
+	prev=vinfo
+	continue
+	;;
+
+      -version-number)
+	prev=vinfo
+	vinfo_number=yes
+	continue
+	;;
+
+      -weak)
+        prev=weak
+	continue
+	;;
+
+      -Wc,*)
+	func_stripname '-Wc,' '' "$arg"
+	args=$func_stripname_result
+	arg=
+	save_ifs=$IFS; IFS=,
+	for flag in $args; do
+	  IFS=$save_ifs
+          func_quote_for_eval "$flag"
+	  func_append arg " $func_quote_for_eval_result"
+	  func_append compiler_flags " $func_quote_for_eval_result"
+	done
+	IFS=$save_ifs
+	func_stripname ' ' '' "$arg"
+	arg=$func_stripname_result
+	;;
+
+      -Wl,*)
+	func_stripname '-Wl,' '' "$arg"
+	args=$func_stripname_result
+	arg=
+	save_ifs=$IFS; IFS=,
+	for flag in $args; do
+	  IFS=$save_ifs
+          func_quote_for_eval "$flag"
+	  func_append arg " $wl$func_quote_for_eval_result"
+	  func_append compiler_flags " $wl$func_quote_for_eval_result"
+	  func_append linker_flags " $func_quote_for_eval_result"
+	done
+	IFS=$save_ifs
+	func_stripname ' ' '' "$arg"
+	arg=$func_stripname_result
+	;;
+
+      -Xcompiler)
+	prev=xcompiler
+	continue
+	;;
+
+      -Xlinker)
+	prev=xlinker
+	continue
+	;;
+
+      -XCClinker)
+	prev=xcclinker
+	continue
+	;;
+
+      # -msg_* for osf cc
+      -msg_*)
+	func_quote_for_eval "$arg"
+	arg=$func_quote_for_eval_result
+	;;
+
+      # Flags to be passed through unchanged, with rationale:
+      # -64, -mips[0-9]      enable 64-bit mode for the SGI compiler
+      # -r[0-9][0-9]*        specify processor for the SGI compiler
+      # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler
+      # +DA*, +DD*           enable 64-bit mode for the HP compiler
+      # -q*                  compiler args for the IBM compiler
+      # -m*, -t[45]*, -txscale* architecture-specific flags for GCC
+      # -F/path              path to uninstalled frameworks, gcc on darwin
+      # -p, -pg, --coverage, -fprofile-*  profiling flags for GCC
+      # -fstack-protector*   stack protector flags for GCC
+      # @file                GCC response files
+      # -tp=*                Portland pgcc target processor selection
+      # --sysroot=*          for sysroot support
+      # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
+      # -stdlib=*            select c++ std lib with clang
+      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
+      -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*)
+        func_quote_for_eval "$arg"
+	arg=$func_quote_for_eval_result
+        func_append compile_command " $arg"
+        func_append finalize_command " $arg"
+        func_append compiler_flags " $arg"
+        continue
+        ;;
+
+      -Z*)
+        if test os2 = "`expr $host : '.*\(os2\)'`"; then
+          # OS/2 uses -Zxxx to specify OS/2-specific options
+	  compiler_flags="$compiler_flags $arg"
+	  func_append compile_command " $arg"
+	  func_append finalize_command " $arg"
+	  case $arg in
+	  -Zlinker | -Zstack)
+	    prev=xcompiler
+	    ;;
+	  esac
+	  continue
+        else
+	  # Otherwise treat like 'Some other compiler flag' below
+	  func_quote_for_eval "$arg"
+	  arg=$func_quote_for_eval_result
+        fi
+	;;
+
+      # Some other compiler flag.
+      -* | +*)
+        func_quote_for_eval "$arg"
+	arg=$func_quote_for_eval_result
+	;;
+
+      *.$objext)
+	# A standard object.
+	func_append objs " $arg"
+	;;
+
+      *.lo)
+	# A libtool-controlled object.
+
+	# Check to see that this really is a libtool object.
+	if func_lalib_unsafe_p "$arg"; then
+	  pic_object=
+	  non_pic_object=
+
+	  # Read the .lo file
+	  func_source "$arg"
+
+	  if test -z "$pic_object" ||
+	     test -z "$non_pic_object" ||
+	     test none = "$pic_object" &&
+	     test none = "$non_pic_object"; then
+	    func_fatal_error "cannot find name of object for '$arg'"
+	  fi
+
+	  # Extract subdirectory from the argument.
+	  func_dirname "$arg" "/" ""
+	  xdir=$func_dirname_result
+
+	  test none = "$pic_object" || {
+	    # Prepend the subdirectory the object is found in.
+	    pic_object=$xdir$pic_object
+
+	    if test dlfiles = "$prev"; then
+	      if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then
+		func_append dlfiles " $pic_object"
+		prev=
+		continue
+	      else
+		# If libtool objects are unsupported, then we need to preload.
+		prev=dlprefiles
+	      fi
+	    fi
+
+	    # CHECK ME:  I think I busted this.  -Ossama
+	    if test dlprefiles = "$prev"; then
+	      # Preload the old-style object.
+	      func_append dlprefiles " $pic_object"
+	      prev=
+	    fi
+
+	    # A PIC object.
+	    func_append libobjs " $pic_object"
+	    arg=$pic_object
+	  }
+
+	  # Non-PIC object.
+	  if test none != "$non_pic_object"; then
+	    # Prepend the subdirectory the object is found in.
+	    non_pic_object=$xdir$non_pic_object
+
+	    # A standard non-PIC object
+	    func_append non_pic_objects " $non_pic_object"
+	    if test -z "$pic_object" || test none = "$pic_object"; then
+	      arg=$non_pic_object
+	    fi
+	  else
+	    # If the PIC object exists, use it instead.
+	    # $xdir was prepended to $pic_object above.
+	    non_pic_object=$pic_object
+	    func_append non_pic_objects " $non_pic_object"
+	  fi
+	else
+	  # Only an error if not doing a dry-run.
+	  if $opt_dry_run; then
+	    # Extract subdirectory from the argument.
+	    func_dirname "$arg" "/" ""
+	    xdir=$func_dirname_result
+
+	    func_lo2o "$arg"
+	    pic_object=$xdir$objdir/$func_lo2o_result
+	    non_pic_object=$xdir$func_lo2o_result
+	    func_append libobjs " $pic_object"
+	    func_append non_pic_objects " $non_pic_object"
+	  else
+	    func_fatal_error "'$arg' is not a valid libtool object"
+	  fi
+	fi
+	;;
+
+      *.$libext)
+	# An archive.
+	func_append deplibs " $arg"
+	func_append old_deplibs " $arg"
+	continue
+	;;
+
+      *.la)
+	# A libtool-controlled library.
+
+	func_resolve_sysroot "$arg"
+	if test dlfiles = "$prev"; then
+	  # This library was specified with -dlopen.
+	  func_append dlfiles " $func_resolve_sysroot_result"
+	  prev=
+	elif test dlprefiles = "$prev"; then
+	  # The library was specified with -dlpreopen.
+	  func_append dlprefiles " $func_resolve_sysroot_result"
+	  prev=
+	else
+	  func_append deplibs " $func_resolve_sysroot_result"
+	fi
+	continue
+	;;
+
+      # Some other compiler argument.
+      *)
+	# Unknown arguments in both finalize_command and compile_command need
+	# to be aesthetically quoted because they are evaled later.
+	func_quote_for_eval "$arg"
+	arg=$func_quote_for_eval_result
+	;;
+      esac # arg
+
+      # Now actually substitute the argument into the commands.
+      if test -n "$arg"; then
+	func_append compile_command " $arg"
+	func_append finalize_command " $arg"
+      fi
+    done # argument parsing loop
+
+    test -n "$prev" && \
+      func_fatal_help "the '$prevarg' option requires an argument"
+
+    if test yes = "$export_dynamic" && test -n "$export_dynamic_flag_spec"; then
+      eval arg=\"$export_dynamic_flag_spec\"
+      func_append compile_command " $arg"
+      func_append finalize_command " $arg"
+    fi
+
+    oldlibs=
+    # calculate the name of the file, without its directory
+    func_basename "$output"
+    outputname=$func_basename_result
+    libobjs_save=$libobjs
+
+    if test -n "$shlibpath_var"; then
+      # get the directories listed in $shlibpath_var
+      eval shlib_search_path=\`\$ECHO \"\$$shlibpath_var\" \| \$SED \'s/:/ /g\'\`
+    else
+      shlib_search_path=
+    fi
+    eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
+    eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
+
+    # Definition is injected by LT_CONFIG during libtool generation.
+    func_munge_path_list sys_lib_dlsearch_path "$LT_SYS_LIBRARY_PATH"
+
+    func_dirname "$output" "/" ""
+    output_objdir=$func_dirname_result$objdir
+    func_to_tool_file "$output_objdir/"
+    tool_output_objdir=$func_to_tool_file_result
+    # Create the object directory.
+    func_mkdir_p "$output_objdir"
+
+    # Determine the type of output
+    case $output in
+    "")
+      func_fatal_help "you must specify an output file"
+      ;;
+    *.$libext) linkmode=oldlib ;;
+    *.lo | *.$objext) linkmode=obj ;;
+    *.la) linkmode=lib ;;
+    *) linkmode=prog ;; # Anything else should be a program.
+    esac
+
+    specialdeplibs=
+
+    libs=
+    # Find all interdependent deplibs by searching for libraries
+    # that are linked more than once (e.g. -la -lb -la)
+    for deplib in $deplibs; do
+      if $opt_preserve_dup_deps; then
+	case "$libs " in
+	*" $deplib "*) func_append specialdeplibs " $deplib" ;;
+	esac
+      fi
+      func_append libs " $deplib"
+    done
+
+    if test lib = "$linkmode"; then
+      libs="$predeps $libs $compiler_lib_search_path $postdeps"
+
+      # Compute libraries that are listed more than once in $predeps
+      # $postdeps and mark them as special (i.e., whose duplicates are
+      # not to be eliminated).
+      pre_post_deps=
+      if $opt_duplicate_compiler_generated_deps; then
+	for pre_post_dep in $predeps $postdeps; do
+	  case "$pre_post_deps " in
+	  *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;;
+	  esac
+	  func_append pre_post_deps " $pre_post_dep"
+	done
+      fi
+      pre_post_deps=
+    fi
+
+    deplibs=
+    newdependency_libs=
+    newlib_search_path=
+    need_relink=no # whether we're linking any uninstalled libtool libraries
+    notinst_deplibs= # not-installed libtool libraries
+    notinst_path= # paths that contain not-installed libtool libraries
+
+    case $linkmode in
+    lib)
+	passes="conv dlpreopen link"
+	for file in $dlfiles $dlprefiles; do
+	  case $file in
+	  *.la) ;;
+	  *)
+	    func_fatal_help "libraries can '-dlopen' only libtool libraries: $file"
+	    ;;
+	  esac
+	done
+	;;
+    prog)
+	compile_deplibs=
+	finalize_deplibs=
+	alldeplibs=false
+	newdlfiles=
+	newdlprefiles=
+	passes="conv scan dlopen dlpreopen link"
+	;;
+    *)  passes="conv"
+	;;
+    esac
+
+    for pass in $passes; do
+      # The preopen pass in lib mode reverses $deplibs; put it back here
+      # so that -L comes before libs that need it for instance...
+      if test lib,link = "$linkmode,$pass"; then
+	## FIXME: Find the place where the list is rebuilt in the wrong
+	##        order, and fix it there properly
+        tmp_deplibs=
+	for deplib in $deplibs; do
+	  tmp_deplibs="$deplib $tmp_deplibs"
+	done
+	deplibs=$tmp_deplibs
+      fi
+
+      if test lib,link = "$linkmode,$pass" ||
+	 test prog,scan = "$linkmode,$pass"; then
+	libs=$deplibs
+	deplibs=
+      fi
+      if test prog = "$linkmode"; then
+	case $pass in
+	dlopen) libs=$dlfiles ;;
+	dlpreopen) libs=$dlprefiles ;;
+	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
+	esac
+      fi
+      if test lib,dlpreopen = "$linkmode,$pass"; then
+	# Collect and forward deplibs of preopened libtool libs
+	for lib in $dlprefiles; do
+	  # Ignore non-libtool-libs
+	  dependency_libs=
+	  func_resolve_sysroot "$lib"
+	  case $lib in
+	  *.la)	func_source "$func_resolve_sysroot_result" ;;
+	  esac
+
+	  # Collect preopened libtool deplibs, except any this library
+	  # has declared as weak libs
+	  for deplib in $dependency_libs; do
+	    func_basename "$deplib"
+            deplib_base=$func_basename_result
+	    case " $weak_libs " in
+	    *" $deplib_base "*) ;;
+	    *) func_append deplibs " $deplib" ;;
+	    esac
+	  done
+	done
+	libs=$dlprefiles
+      fi
+      if test dlopen = "$pass"; then
+	# Collect dlpreopened libraries
+	save_deplibs=$deplibs
+	deplibs=
+      fi
+
+      for deplib in $libs; do
+	lib=
+	found=false
+	case $deplib in
+	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+        |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
+	  if test prog,link = "$linkmode,$pass"; then
+	    compile_deplibs="$deplib $compile_deplibs"
+	    finalize_deplibs="$deplib $finalize_deplibs"
+	  else
+	    func_append compiler_flags " $deplib"
+	    if test lib = "$linkmode"; then
+		case "$new_inherited_linker_flags " in
+		    *" $deplib "*) ;;
+		    * ) func_append new_inherited_linker_flags " $deplib" ;;
+		esac
+	    fi
+	  fi
+	  continue
+	  ;;
+	-l*)
+	  if test lib != "$linkmode" && test prog != "$linkmode"; then
+	    func_warning "'-l' is ignored for archives/objects"
+	    continue
+	  fi
+	  func_stripname '-l' '' "$deplib"
+	  name=$func_stripname_result
+	  if test lib = "$linkmode"; then
+	    searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
+	  else
+	    searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
+	  fi
+	  for searchdir in $searchdirs; do
+	    for search_ext in .la $std_shrext .so .a; do
+	      # Search the libtool library
+	      lib=$searchdir/lib$name$search_ext
+	      if test -f "$lib"; then
+		if test .la = "$search_ext"; then
+		  found=:
+		else
+		  found=false
+		fi
+		break 2
+	      fi
+	    done
+	  done
+	  if $found; then
+	    # deplib is a libtool library
+	    # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
+	    # We need to do some special things here, and not later.
+	    if test yes = "$allow_libtool_libs_with_static_runtimes"; then
+	      case " $predeps $postdeps " in
+	      *" $deplib "*)
+		if func_lalib_p "$lib"; then
+		  library_names=
+		  old_library=
+		  func_source "$lib"
+		  for l in $old_library $library_names; do
+		    ll=$l
+		  done
+		  if test "X$ll" = "X$old_library"; then # only static version available
+		    found=false
+		    func_dirname "$lib" "" "."
+		    ladir=$func_dirname_result
+		    lib=$ladir/$old_library
+		    if test prog,link = "$linkmode,$pass"; then
+		      compile_deplibs="$deplib $compile_deplibs"
+		      finalize_deplibs="$deplib $finalize_deplibs"
+		    else
+		      deplibs="$deplib $deplibs"
+		      test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs"
+		    fi
+		    continue
+		  fi
+		fi
+		;;
+	      *) ;;
+	      esac
+	    fi
+	  else
+	    # deplib doesn't seem to be a libtool library
+	    if test prog,link = "$linkmode,$pass"; then
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    else
+	      deplibs="$deplib $deplibs"
+	      test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs"
+	    fi
+	    continue
+	  fi
+	  ;; # -l
+	*.ltframework)
+	  if test prog,link = "$linkmode,$pass"; then
+	    compile_deplibs="$deplib $compile_deplibs"
+	    finalize_deplibs="$deplib $finalize_deplibs"
+	  else
+	    deplibs="$deplib $deplibs"
+	    if test lib = "$linkmode"; then
+		case "$new_inherited_linker_flags " in
+		    *" $deplib "*) ;;
+		    * ) func_append new_inherited_linker_flags " $deplib" ;;
+		esac
+	    fi
+	  fi
+	  continue
+	  ;;
+	-L*)
+	  case $linkmode in
+	  lib)
+	    deplibs="$deplib $deplibs"
+	    test conv = "$pass" && continue
+	    newdependency_libs="$deplib $newdependency_libs"
+	    func_stripname '-L' '' "$deplib"
+	    func_resolve_sysroot "$func_stripname_result"
+	    func_append newlib_search_path " $func_resolve_sysroot_result"
+	    ;;
+	  prog)
+	    if test conv = "$pass"; then
+	      deplibs="$deplib $deplibs"
+	      continue
+	    fi
+	    if test scan = "$pass"; then
+	      deplibs="$deplib $deplibs"
+	    else
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    fi
+	    func_stripname '-L' '' "$deplib"
+	    func_resolve_sysroot "$func_stripname_result"
+	    func_append newlib_search_path " $func_resolve_sysroot_result"
+	    ;;
+	  *)
+	    func_warning "'-L' is ignored for archives/objects"
+	    ;;
+	  esac # linkmode
+	  continue
+	  ;; # -L
+	-R*)
+	  if test link = "$pass"; then
+	    func_stripname '-R' '' "$deplib"
+	    func_resolve_sysroot "$func_stripname_result"
+	    dir=$func_resolve_sysroot_result
+	    # Make sure the xrpath contains only unique directories.
+	    case "$xrpath " in
+	    *" $dir "*) ;;
+	    *) func_append xrpath " $dir" ;;
+	    esac
+	  fi
+	  deplibs="$deplib $deplibs"
+	  continue
+	  ;;
+	*.la)
+	  func_resolve_sysroot "$deplib"
+	  lib=$func_resolve_sysroot_result
+	  ;;
+	*.$libext)
+	  if test conv = "$pass"; then
+	    deplibs="$deplib $deplibs"
+	    continue
+	  fi
+	  case $linkmode in
+	  lib)
+	    # Linking convenience modules into shared libraries is allowed,
+	    # but linking other static libraries is non-portable.
+	    case " $dlpreconveniencelibs " in
+	    *" $deplib "*) ;;
+	    *)
+	      valid_a_lib=false
+	      case $deplibs_check_method in
+		match_pattern*)
+		  set dummy $deplibs_check_method; shift
+		  match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
+		  if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \
+		    | $EGREP "$match_pattern_regex" > /dev/null; then
+		    valid_a_lib=:
+		  fi
+		;;
+		pass_all)
+		  valid_a_lib=:
+		;;
+	      esac
+	      if $valid_a_lib; then
+		echo
+		$ECHO "*** Warning: Linking the shared library $output against the"
+		$ECHO "*** static library $deplib is not portable!"
+		deplibs="$deplib $deplibs"
+	      else
+		echo
+		$ECHO "*** Warning: Trying to link with static lib archive $deplib."
+		echo "*** I have the capability to make that library automatically link in when"
+		echo "*** you link to this library.  But I can only do this if you have a"
+		echo "*** shared version of the library, which you do not appear to have"
+		echo "*** because the file extensions .$libext of this argument makes me believe"
+		echo "*** that it is just a static archive that I should not use here."
+	      fi
+	      ;;
+	    esac
+	    continue
+	    ;;
+	  prog)
+	    if test link != "$pass"; then
+	      deplibs="$deplib $deplibs"
+	    else
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    fi
+	    continue
+	    ;;
+	  esac # linkmode
+	  ;; # *.$libext
+	*.lo | *.$objext)
+	  if test conv = "$pass"; then
+	    deplibs="$deplib $deplibs"
+	  elif test prog = "$linkmode"; then
+	    if test dlpreopen = "$pass" || test yes != "$dlopen_support" || test no = "$build_libtool_libs"; then
+	      # If there is no dlopen support or we're linking statically,
+	      # we need to preload.
+	      func_append newdlprefiles " $deplib"
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    else
+	      func_append newdlfiles " $deplib"
+	    fi
+	  fi
+	  continue
+	  ;;
+	%DEPLIBS%)
+	  alldeplibs=:
+	  continue
+	  ;;
+	esac # case $deplib
+
+	$found || test -f "$lib" \
+	  || func_fatal_error "cannot find the library '$lib' or unhandled argument '$deplib'"
+
+	# Check to see that this really is a libtool archive.
+	func_lalib_unsafe_p "$lib" \
+	  || func_fatal_error "'$lib' is not a valid libtool archive"
+
+	func_dirname "$lib" "" "."
+	ladir=$func_dirname_result
+
+	dlname=
+	dlopen=
+	dlpreopen=
+	libdir=
+	library_names=
+	old_library=
+	inherited_linker_flags=
+	# If the library was installed with an old release of libtool,
+	# it will not redefine variables installed, or shouldnotlink
+	installed=yes
+	shouldnotlink=no
+	avoidtemprpath=
+
+
+	# Read the .la file
+	func_source "$lib"
+
+	# Convert "-framework foo" to "foo.ltframework"
+	if test -n "$inherited_linker_flags"; then
+	  tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'`
+	  for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
+	    case " $new_inherited_linker_flags " in
+	      *" $tmp_inherited_linker_flag "*) ;;
+	      *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";;
+	    esac
+	  done
+	fi
+	dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	if test lib,link = "$linkmode,$pass" ||
+	   test prog,scan = "$linkmode,$pass" ||
+	   { test prog != "$linkmode" && test lib != "$linkmode"; }; then
+	  test -n "$dlopen" && func_append dlfiles " $dlopen"
+	  test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
+	fi
+
+	if test conv = "$pass"; then
+	  # Only check for convenience libraries
+	  deplibs="$lib $deplibs"
+	  if test -z "$libdir"; then
+	    if test -z "$old_library"; then
+	      func_fatal_error "cannot find name of link library for '$lib'"
+	    fi
+	    # It is a libtool convenience library, so add in its objects.
+	    func_append convenience " $ladir/$objdir/$old_library"
+	    func_append old_convenience " $ladir/$objdir/$old_library"
+	  elif test prog != "$linkmode" && test lib != "$linkmode"; then
+	    func_fatal_error "'$lib' is not a convenience library"
+	  fi
+	  tmp_libs=
+	  for deplib in $dependency_libs; do
+	    deplibs="$deplib $deplibs"
+	    if $opt_preserve_dup_deps; then
+	      case "$tmp_libs " in
+	      *" $deplib "*) func_append specialdeplibs " $deplib" ;;
+	      esac
+	    fi
+	    func_append tmp_libs " $deplib"
+	  done
+	  continue
+	fi # $pass = conv
+
+
+	# Get the name of the library we link against.
+	linklib=
+	if test -n "$old_library" &&
+	   { test yes = "$prefer_static_libs" ||
+	     test built,no = "$prefer_static_libs,$installed"; }; then
+	  linklib=$old_library
+	else
+	  for l in $old_library $library_names; do
+	    linklib=$l
+	  done
+	fi
+	if test -z "$linklib"; then
+	  func_fatal_error "cannot find name of link library for '$lib'"
+	fi
+
+	# This library was specified with -dlopen.
+	if test dlopen = "$pass"; then
+	  test -z "$libdir" \
+	    && func_fatal_error "cannot -dlopen a convenience library: '$lib'"
+	  if test -z "$dlname" ||
+	     test yes != "$dlopen_support" ||
+	     test no = "$build_libtool_libs"
+	  then
+	    # If there is no dlname, no dlopen support or we're linking
+	    # statically, we need to preload.  We also need to preload any
+	    # dependent libraries so libltdl's deplib preloader doesn't
+	    # bomb out in the load deplibs phase.
+	    func_append dlprefiles " $lib $dependency_libs"
+	  else
+	    func_append newdlfiles " $lib"
+	  fi
+	  continue
+	fi # $pass = dlopen
+
+	# We need an absolute path.
+	case $ladir in
+	[\\/]* | [A-Za-z]:[\\/]*) abs_ladir=$ladir ;;
+	*)
+	  abs_ladir=`cd "$ladir" && pwd`
+	  if test -z "$abs_ladir"; then
+	    func_warning "cannot determine absolute directory name of '$ladir'"
+	    func_warning "passing it literally to the linker, although it might fail"
+	    abs_ladir=$ladir
+	  fi
+	  ;;
+	esac
+	func_basename "$lib"
+	laname=$func_basename_result
+
+	# Find the relevant object directory and library name.
+	if test yes = "$installed"; then
+	  if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+	    func_warning "library '$lib' was moved."
+	    dir=$ladir
+	    absdir=$abs_ladir
+	    libdir=$abs_ladir
+	  else
+	    dir=$lt_sysroot$libdir
+	    absdir=$lt_sysroot$libdir
+	  fi
+	  test yes = "$hardcode_automatic" && avoidtemprpath=yes
+	else
+	  if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+	    dir=$ladir
+	    absdir=$abs_ladir
+	    # Remove this search path later
+	    func_append notinst_path " $abs_ladir"
+	  else
+	    dir=$ladir/$objdir
+	    absdir=$abs_ladir/$objdir
+	    # Remove this search path later
+	    func_append notinst_path " $abs_ladir"
+	  fi
+	fi # $installed = yes
+	func_stripname 'lib' '.la' "$laname"
+	name=$func_stripname_result
+
+	# This library was specified with -dlpreopen.
+	if test dlpreopen = "$pass"; then
+	  if test -z "$libdir" && test prog = "$linkmode"; then
+	    func_fatal_error "only libraries may -dlpreopen a convenience library: '$lib'"
+	  fi
+	  case $host in
+	    # special handling for platforms with PE-DLLs.
+	    *cygwin* | *mingw* | *cegcc* )
+	      # Linker will automatically link against shared library if both
+	      # static and shared are present.  Therefore, ensure we extract
+	      # symbols from the import library if a shared library is present
+	      # (otherwise, the dlopen module name will be incorrect).  We do
+	      # this by putting the import library name into $newdlprefiles.
+	      # We recover the dlopen module name by 'saving' the la file
+	      # name in a special purpose variable, and (later) extracting the
+	      # dlname from the la file.
+	      if test -n "$dlname"; then
+	        func_tr_sh "$dir/$linklib"
+	        eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname"
+	        func_append newdlprefiles " $dir/$linklib"
+	      else
+	        func_append newdlprefiles " $dir/$old_library"
+	        # Keep a list of preopened convenience libraries to check
+	        # that they are being used correctly in the link pass.
+	        test -z "$libdir" && \
+	          func_append dlpreconveniencelibs " $dir/$old_library"
+	      fi
+	    ;;
+	    * )
+	      # Prefer using a static library (so that no silly _DYNAMIC symbols
+	      # are required to link).
+	      if test -n "$old_library"; then
+	        func_append newdlprefiles " $dir/$old_library"
+	        # Keep a list of preopened convenience libraries to check
+	        # that they are being used correctly in the link pass.
+	        test -z "$libdir" && \
+	          func_append dlpreconveniencelibs " $dir/$old_library"
+	      # Otherwise, use the dlname, so that lt_dlopen finds it.
+	      elif test -n "$dlname"; then
+	        func_append newdlprefiles " $dir/$dlname"
+	      else
+	        func_append newdlprefiles " $dir/$linklib"
+	      fi
+	    ;;
+	  esac
+	fi # $pass = dlpreopen
+
+	if test -z "$libdir"; then
+	  # Link the convenience library
+	  if test lib = "$linkmode"; then
+	    deplibs="$dir/$old_library $deplibs"
+	  elif test prog,link = "$linkmode,$pass"; then
+	    compile_deplibs="$dir/$old_library $compile_deplibs"
+	    finalize_deplibs="$dir/$old_library $finalize_deplibs"
+	  else
+	    deplibs="$lib $deplibs" # used for prog,scan pass
+	  fi
+	  continue
+	fi
+
+
+	if test prog = "$linkmode" && test link != "$pass"; then
+	  func_append newlib_search_path " $ladir"
+	  deplibs="$lib $deplibs"
+
+	  linkalldeplibs=false
+	  if test no != "$link_all_deplibs" || test -z "$library_names" ||
+	     test no = "$build_libtool_libs"; then
+	    linkalldeplibs=:
+	  fi
+
+	  tmp_libs=
+	  for deplib in $dependency_libs; do
+	    case $deplib in
+	    -L*) func_stripname '-L' '' "$deplib"
+	         func_resolve_sysroot "$func_stripname_result"
+	         func_append newlib_search_path " $func_resolve_sysroot_result"
+		 ;;
+	    esac
+	    # Need to link against all dependency_libs?
+	    if $linkalldeplibs; then
+	      deplibs="$deplib $deplibs"
+	    else
+	      # Need to hardcode shared library paths
+	      # or/and link against static libraries
+	      newdependency_libs="$deplib $newdependency_libs"
+	    fi
+	    if $opt_preserve_dup_deps; then
+	      case "$tmp_libs " in
+	      *" $deplib "*) func_append specialdeplibs " $deplib" ;;
+	      esac
+	    fi
+	    func_append tmp_libs " $deplib"
+	  done # for deplib
+	  continue
+	fi # $linkmode = prog...
+
+	if test prog,link = "$linkmode,$pass"; then
+	  if test -n "$library_names" &&
+	     { { test no = "$prefer_static_libs" ||
+	         test built,yes = "$prefer_static_libs,$installed"; } ||
+	       test -z "$old_library"; }; then
+	    # We need to hardcode the library path
+	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath"; then
+	      # Make sure the rpath contains only unique directories.
+	      case $temp_rpath: in
+	      *"$absdir:"*) ;;
+	      *) func_append temp_rpath "$absdir:" ;;
+	      esac
+	    fi
+
+	    # Hardcode the library path.
+	    # Skip directories that are in the system default run-time
+	    # search path.
+	    case " $sys_lib_dlsearch_path " in
+	    *" $absdir "*) ;;
+	    *)
+	      case "$compile_rpath " in
+	      *" $absdir "*) ;;
+	      *) func_append compile_rpath " $absdir" ;;
+	      esac
+	      ;;
+	    esac
+	    case " $sys_lib_dlsearch_path " in
+	    *" $libdir "*) ;;
+	    *)
+	      case "$finalize_rpath " in
+	      *" $libdir "*) ;;
+	      *) func_append finalize_rpath " $libdir" ;;
+	      esac
+	      ;;
+	    esac
+	  fi # $linkmode,$pass = prog,link...
+
+	  if $alldeplibs &&
+	     { test pass_all = "$deplibs_check_method" ||
+	       { test yes = "$build_libtool_libs" &&
+		 test -n "$library_names"; }; }; then
+	    # We only need to search for static libraries
+	    continue
+	  fi
+	fi
+
+	link_static=no # Whether the deplib will be linked statically
+	use_static_libs=$prefer_static_libs
+	if test built = "$use_static_libs" && test yes = "$installed"; then
+	  use_static_libs=no
+	fi
+	if test -n "$library_names" &&
+	   { test no = "$use_static_libs" || test -z "$old_library"; }; then
+	  case $host in
+	  *cygwin* | *mingw* | *cegcc* | *os2*)
+	      # No point in relinking DLLs because paths are not encoded
+	      func_append notinst_deplibs " $lib"
+	      need_relink=no
+	    ;;
+	  *)
+	    if test no = "$installed"; then
+	      func_append notinst_deplibs " $lib"
+	      need_relink=yes
+	    fi
+	    ;;
+	  esac
+	  # This is a shared library
+
+	  # Warn about portability, can't link against -module's on some
+	  # systems (darwin).  Don't bleat about dlopened modules though!
+	  dlopenmodule=
+	  for dlpremoduletest in $dlprefiles; do
+	    if test "X$dlpremoduletest" = "X$lib"; then
+	      dlopenmodule=$dlpremoduletest
+	      break
+	    fi
+	  done
+	  if test -z "$dlopenmodule" && test yes = "$shouldnotlink" && test link = "$pass"; then
+	    echo
+	    if test prog = "$linkmode"; then
+	      $ECHO "*** Warning: Linking the executable $output against the loadable module"
+	    else
+	      $ECHO "*** Warning: Linking the shared library $output against the loadable module"
+	    fi
+	    $ECHO "*** $linklib is not portable!"
+	  fi
+	  if test lib = "$linkmode" &&
+	     test yes = "$hardcode_into_libs"; then
+	    # Hardcode the library path.
+	    # Skip directories that are in the system default run-time
+	    # search path.
+	    case " $sys_lib_dlsearch_path " in
+	    *" $absdir "*) ;;
+	    *)
+	      case "$compile_rpath " in
+	      *" $absdir "*) ;;
+	      *) func_append compile_rpath " $absdir" ;;
+	      esac
+	      ;;
+	    esac
+	    case " $sys_lib_dlsearch_path " in
+	    *" $libdir "*) ;;
+	    *)
+	      case "$finalize_rpath " in
+	      *" $libdir "*) ;;
+	      *) func_append finalize_rpath " $libdir" ;;
+	      esac
+	      ;;
+	    esac
+	  fi
+
+	  if test -n "$old_archive_from_expsyms_cmds"; then
+	    # figure out the soname
+	    set dummy $library_names
+	    shift
+	    realname=$1
+	    shift
+	    libname=`eval "\\$ECHO \"$libname_spec\""`
+	    # use dlname if we got it. it's perfectly good, no?
+	    if test -n "$dlname"; then
+	      soname=$dlname
+	    elif test -n "$soname_spec"; then
+	      # bleh windows
+	      case $host in
+	      *cygwin* | mingw* | *cegcc* | *os2*)
+	        func_arith $current - $age
+		major=$func_arith_result
+		versuffix=-$major
+		;;
+	      esac
+	      eval soname=\"$soname_spec\"
+	    else
+	      soname=$realname
+	    fi
+
+	    # Make a new name for the extract_expsyms_cmds to use
+	    soroot=$soname
+	    func_basename "$soroot"
+	    soname=$func_basename_result
+	    func_stripname 'lib' '.dll' "$soname"
+	    newlib=libimp-$func_stripname_result.a
+
+	    # If the library has no export list, then create one now
+	    if test -f "$output_objdir/$soname-def"; then :
+	    else
+	      func_verbose "extracting exported symbol list from '$soname'"
+	      func_execute_cmds "$extract_expsyms_cmds" 'exit $?'
+	    fi
+
+	    # Create $newlib
+	    if test -f "$output_objdir/$newlib"; then :; else
+	      func_verbose "generating import library for '$soname'"
+	      func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?'
+	    fi
+	    # make sure the library variables are pointing to the new library
+	    dir=$output_objdir
+	    linklib=$newlib
+	  fi # test -n "$old_archive_from_expsyms_cmds"
+
+	  if test prog = "$linkmode" || test relink != "$opt_mode"; then
+	    add_shlibpath=
+	    add_dir=
+	    add=
+	    lib_linked=yes
+	    case $hardcode_action in
+	    immediate | unsupported)
+	      if test no = "$hardcode_direct"; then
+		add=$dir/$linklib
+		case $host in
+		  *-*-sco3.2v5.0.[024]*) add_dir=-L$dir ;;
+		  *-*-sysv4*uw2*) add_dir=-L$dir ;;
+		  *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
+		    *-*-unixware7*) add_dir=-L$dir ;;
+		  *-*-darwin* )
+		    # if the lib is a (non-dlopened) module then we cannot
+		    # link against it, someone is ignoring the earlier warnings
+		    if /usr/bin/file -L $add 2> /dev/null |
+			 $GREP ": [^:]* bundle" >/dev/null; then
+		      if test "X$dlopenmodule" != "X$lib"; then
+			$ECHO "*** Warning: lib $linklib is a module, not a shared library"
+			if test -z "$old_library"; then
+			  echo
+			  echo "*** And there doesn't seem to be a static archive available"
+			  echo "*** The link will probably fail, sorry"
+			else
+			  add=$dir/$old_library
+			fi
+		      elif test -n "$old_library"; then
+			add=$dir/$old_library
+		      fi
+		    fi
+		esac
+	      elif test no = "$hardcode_minus_L"; then
+		case $host in
+		*-*-sunos*) add_shlibpath=$dir ;;
+		esac
+		add_dir=-L$dir
+		add=-l$name
+	      elif test no = "$hardcode_shlibpath_var"; then
+		add_shlibpath=$dir
+		add=-l$name
+	      else
+		lib_linked=no
+	      fi
+	      ;;
+	    relink)
+	      if test yes = "$hardcode_direct" &&
+	         test no = "$hardcode_direct_absolute"; then
+		add=$dir/$linklib
+	      elif test yes = "$hardcode_minus_L"; then
+		add_dir=-L$absdir
+		# Try looking first in the location we're being installed to.
+		if test -n "$inst_prefix_dir"; then
+		  case $libdir in
+		    [\\/]*)
+		      func_append add_dir " -L$inst_prefix_dir$libdir"
+		      ;;
+		  esac
+		fi
+		add=-l$name
+	      elif test yes = "$hardcode_shlibpath_var"; then
+		add_shlibpath=$dir
+		add=-l$name
+	      else
+		lib_linked=no
+	      fi
+	      ;;
+	    *) lib_linked=no ;;
+	    esac
+
+	    if test yes != "$lib_linked"; then
+	      func_fatal_configuration "unsupported hardcode properties"
+	    fi
+
+	    if test -n "$add_shlibpath"; then
+	      case :$compile_shlibpath: in
+	      *":$add_shlibpath:"*) ;;
+	      *) func_append compile_shlibpath "$add_shlibpath:" ;;
+	      esac
+	    fi
+	    if test prog = "$linkmode"; then
+	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
+	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
+	    else
+	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
+	      test -n "$add" && deplibs="$add $deplibs"
+	      if test yes != "$hardcode_direct" &&
+		 test yes != "$hardcode_minus_L" &&
+		 test yes = "$hardcode_shlibpath_var"; then
+		case :$finalize_shlibpath: in
+		*":$libdir:"*) ;;
+		*) func_append finalize_shlibpath "$libdir:" ;;
+		esac
+	      fi
+	    fi
+	  fi
+
+	  if test prog = "$linkmode" || test relink = "$opt_mode"; then
+	    add_shlibpath=
+	    add_dir=
+	    add=
+	    # Finalize command for both is simple: just hardcode it.
+	    if test yes = "$hardcode_direct" &&
+	       test no = "$hardcode_direct_absolute"; then
+	      add=$libdir/$linklib
+	    elif test yes = "$hardcode_minus_L"; then
+	      add_dir=-L$libdir
+	      add=-l$name
+	    elif test yes = "$hardcode_shlibpath_var"; then
+	      case :$finalize_shlibpath: in
+	      *":$libdir:"*) ;;
+	      *) func_append finalize_shlibpath "$libdir:" ;;
+	      esac
+	      add=-l$name
+	    elif test yes = "$hardcode_automatic"; then
+	      if test -n "$inst_prefix_dir" &&
+		 test -f "$inst_prefix_dir$libdir/$linklib"; then
+		add=$inst_prefix_dir$libdir/$linklib
+	      else
+		add=$libdir/$linklib
+	      fi
+	    else
+	      # We cannot seem to hardcode it, guess we'll fake it.
+	      add_dir=-L$libdir
+	      # Try looking first in the location we're being installed to.
+	      if test -n "$inst_prefix_dir"; then
+		case $libdir in
+		  [\\/]*)
+		    func_append add_dir " -L$inst_prefix_dir$libdir"
+		    ;;
+		esac
+	      fi
+	      add=-l$name
+	    fi
+
+	    if test prog = "$linkmode"; then
+	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
+	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
+	    else
+	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
+	      test -n "$add" && deplibs="$add $deplibs"
+	    fi
+	  fi
+	elif test prog = "$linkmode"; then
+	  # Here we assume that one of hardcode_direct or hardcode_minus_L
+	  # is not unsupported.  This is valid on all known static and
+	  # shared platforms.
+	  if test unsupported != "$hardcode_direct"; then
+	    test -n "$old_library" && linklib=$old_library
+	    compile_deplibs="$dir/$linklib $compile_deplibs"
+	    finalize_deplibs="$dir/$linklib $finalize_deplibs"
+	  else
+	    compile_deplibs="-l$name -L$dir $compile_deplibs"
+	    finalize_deplibs="-l$name -L$dir $finalize_deplibs"
+	  fi
+	elif test yes = "$build_libtool_libs"; then
+	  # Not a shared library
+	  if test pass_all != "$deplibs_check_method"; then
+	    # We're trying link a shared library against a static one
+	    # but the system doesn't support it.
+
+	    # Just print a warning and add the library to dependency_libs so
+	    # that the program can be linked against the static library.
+	    echo
+	    $ECHO "*** Warning: This system cannot link to static lib archive $lib."
+	    echo "*** I have the capability to make that library automatically link in when"
+	    echo "*** you link to this library.  But I can only do this if you have a"
+	    echo "*** shared version of the library, which you do not appear to have."
+	    if test yes = "$module"; then
+	      echo "*** But as you try to build a module library, libtool will still create "
+	      echo "*** a static module, that should work as long as the dlopening application"
+	      echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
+	      if test -z "$global_symbol_pipe"; then
+		echo
+		echo "*** However, this would only work if libtool was able to extract symbol"
+		echo "*** lists from a program, using 'nm' or equivalent, but libtool could"
+		echo "*** not find such a program.  So, this module is probably useless."
+		echo "*** 'nm' from GNU binutils and a full rebuild may help."
+	      fi
+	      if test no = "$build_old_libs"; then
+		build_libtool_libs=module
+		build_old_libs=yes
+	      else
+		build_libtool_libs=no
+	      fi
+	    fi
+	  else
+	    deplibs="$dir/$old_library $deplibs"
+	    link_static=yes
+	  fi
+	fi # link shared/static library?
+
+	if test lib = "$linkmode"; then
+	  if test -n "$dependency_libs" &&
+	     { test yes != "$hardcode_into_libs" ||
+	       test yes = "$build_old_libs" ||
+	       test yes = "$link_static"; }; then
+	    # Extract -R from dependency_libs
+	    temp_deplibs=
+	    for libdir in $dependency_libs; do
+	      case $libdir in
+	      -R*) func_stripname '-R' '' "$libdir"
+	           temp_xrpath=$func_stripname_result
+		   case " $xrpath " in
+		   *" $temp_xrpath "*) ;;
+		   *) func_append xrpath " $temp_xrpath";;
+		   esac;;
+	      *) func_append temp_deplibs " $libdir";;
+	      esac
+	    done
+	    dependency_libs=$temp_deplibs
+	  fi
+
+	  func_append newlib_search_path " $absdir"
+	  # Link against this library
+	  test no = "$link_static" && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
+	  # ... and its dependency_libs
+	  tmp_libs=
+	  for deplib in $dependency_libs; do
+	    newdependency_libs="$deplib $newdependency_libs"
+	    case $deplib in
+              -L*) func_stripname '-L' '' "$deplib"
+                   func_resolve_sysroot "$func_stripname_result";;
+              *) func_resolve_sysroot "$deplib" ;;
+            esac
+	    if $opt_preserve_dup_deps; then
+	      case "$tmp_libs " in
+	      *" $func_resolve_sysroot_result "*)
+                func_append specialdeplibs " $func_resolve_sysroot_result" ;;
+	      esac
+	    fi
+	    func_append tmp_libs " $func_resolve_sysroot_result"
+	  done
+
+	  if test no != "$link_all_deplibs"; then
+	    # Add the search paths of all dependency libraries
+	    for deplib in $dependency_libs; do
+	      path=
+	      case $deplib in
+	      -L*) path=$deplib ;;
+	      *.la)
+	        func_resolve_sysroot "$deplib"
+	        deplib=$func_resolve_sysroot_result
+	        func_dirname "$deplib" "" "."
+		dir=$func_dirname_result
+		# We need an absolute path.
+		case $dir in
+		[\\/]* | [A-Za-z]:[\\/]*) absdir=$dir ;;
+		*)
+		  absdir=`cd "$dir" && pwd`
+		  if test -z "$absdir"; then
+		    func_warning "cannot determine absolute directory name of '$dir'"
+		    absdir=$dir
+		  fi
+		  ;;
+		esac
+		if $GREP "^installed=no" $deplib > /dev/null; then
+		case $host in
+		*-*-darwin*)
+		  depdepl=
+		  eval deplibrary_names=`$SED -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
+		  if test -n "$deplibrary_names"; then
+		    for tmp in $deplibrary_names; do
+		      depdepl=$tmp
+		    done
+		    if test -f "$absdir/$objdir/$depdepl"; then
+		      depdepl=$absdir/$objdir/$depdepl
+		      darwin_install_name=`$OTOOL -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
+                      if test -z "$darwin_install_name"; then
+                          darwin_install_name=`$OTOOL64 -L $depdepl  | awk '{if (NR == 2) {print $1;exit}}'`
+                      fi
+		      func_append compiler_flags " $wl-dylib_file $wl$darwin_install_name:$depdepl"
+		      func_append linker_flags " -dylib_file $darwin_install_name:$depdepl"
+		      path=
+		    fi
+		  fi
+		  ;;
+		*)
+		  path=-L$absdir/$objdir
+		  ;;
+		esac
+		else
+		  eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+		  test -z "$libdir" && \
+		    func_fatal_error "'$deplib' is not a valid libtool archive"
+		  test "$absdir" != "$libdir" && \
+		    func_warning "'$deplib' seems to be moved"
+
+		  path=-L$absdir
+		fi
+		;;
+	      esac
+	      case " $deplibs " in
+	      *" $path "*) ;;
+	      *) deplibs="$path $deplibs" ;;
+	      esac
+	    done
+	  fi # link_all_deplibs != no
+	fi # linkmode = lib
+      done # for deplib in $libs
+      if test link = "$pass"; then
+	if test prog = "$linkmode"; then
+	  compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
+	  finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
+	else
+	  compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	fi
+      fi
+      dependency_libs=$newdependency_libs
+      if test dlpreopen = "$pass"; then
+	# Link the dlpreopened libraries before other libraries
+	for deplib in $save_deplibs; do
+	  deplibs="$deplib $deplibs"
+	done
+      fi
+      if test dlopen != "$pass"; then
+	test conv = "$pass" || {
+	  # Make sure lib_search_path contains only unique directories.
+	  lib_search_path=
+	  for dir in $newlib_search_path; do
+	    case "$lib_search_path " in
+	    *" $dir "*) ;;
+	    *) func_append lib_search_path " $dir" ;;
+	    esac
+	  done
+	  newlib_search_path=
+	}
+
+	if test prog,link = "$linkmode,$pass"; then
+	  vars="compile_deplibs finalize_deplibs"
+	else
+	  vars=deplibs
+	fi
+	for var in $vars dependency_libs; do
+	  # Add libraries to $var in reverse order
+	  eval tmp_libs=\"\$$var\"
+	  new_libs=
+	  for deplib in $tmp_libs; do
+	    # FIXME: Pedantically, this is the right thing to do, so
+	    #        that some nasty dependency loop isn't accidentally
+	    #        broken:
+	    #new_libs="$deplib $new_libs"
+	    # Pragmatically, this seems to cause very few problems in
+	    # practice:
+	    case $deplib in
+	    -L*) new_libs="$deplib $new_libs" ;;
+	    -R*) ;;
+	    *)
+	      # And here is the reason: when a library appears more
+	      # than once as an explicit dependence of a library, or
+	      # is implicitly linked in more than once by the
+	      # compiler, it is considered special, and multiple
+	      # occurrences thereof are not removed.  Compare this
+	      # with having the same library being listed as a
+	      # dependency of multiple other libraries: in this case,
+	      # we know (pedantically, we assume) the library does not
+	      # need to be listed more than once, so we keep only the
+	      # last copy.  This is not always right, but it is rare
+	      # enough that we require users that really mean to play
+	      # such unportable linking tricks to link the library
+	      # using -Wl,-lname, so that libtool does not consider it
+	      # for duplicate removal.
+	      case " $specialdeplibs " in
+	      *" $deplib "*) new_libs="$deplib $new_libs" ;;
+	      *)
+		case " $new_libs " in
+		*" $deplib "*) ;;
+		*) new_libs="$deplib $new_libs" ;;
+		esac
+		;;
+	      esac
+	      ;;
+	    esac
+	  done
+	  tmp_libs=
+	  for deplib in $new_libs; do
+	    case $deplib in
+	    -L*)
+	      case " $tmp_libs " in
+	      *" $deplib "*) ;;
+	      *) func_append tmp_libs " $deplib" ;;
+	      esac
+	      ;;
+	    *) func_append tmp_libs " $deplib" ;;
+	    esac
+	  done
+	  eval $var=\"$tmp_libs\"
+	done # for var
+      fi
+
+      # Add Sun CC postdeps if required:
+      test CXX = "$tagname" && {
+        case $host_os in
+        linux*)
+          case `$CC -V 2>&1 | sed 5q` in
+          *Sun\ C*) # Sun C++ 5.9
+            func_suncc_cstd_abi
+
+            if test no != "$suncc_use_cstd_abi"; then
+              func_append postdeps ' -library=Cstd -library=Crun'
+            fi
+            ;;
+          esac
+          ;;
+
+        solaris*)
+          func_cc_basename "$CC"
+          case $func_cc_basename_result in
+          CC* | sunCC*)
+            func_suncc_cstd_abi
+
+            if test no != "$suncc_use_cstd_abi"; then
+              func_append postdeps ' -library=Cstd -library=Crun'
+            fi
+            ;;
+          esac
+          ;;
+        esac
+      }
+
+      # Last step: remove runtime libs from dependency_libs
+      # (they stay in deplibs)
+      tmp_libs=
+      for i in $dependency_libs; do
+	case " $predeps $postdeps $compiler_lib_search_path " in
+	*" $i "*)
+	  i=
+	  ;;
+	esac
+	if test -n "$i"; then
+	  func_append tmp_libs " $i"
+	fi
+      done
+      dependency_libs=$tmp_libs
+    done # for pass
+    if test prog = "$linkmode"; then
+      dlfiles=$newdlfiles
+    fi
+    if test prog = "$linkmode" || test lib = "$linkmode"; then
+      dlprefiles=$newdlprefiles
+    fi
+
+    case $linkmode in
+    oldlib)
+      if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
+	func_warning "'-dlopen' is ignored for archives"
+      fi
+
+      case " $deplibs" in
+      *\ -l* | *\ -L*)
+	func_warning "'-l' and '-L' are ignored for archives" ;;
+      esac
+
+      test -n "$rpath" && \
+	func_warning "'-rpath' is ignored for archives"
+
+      test -n "$xrpath" && \
+	func_warning "'-R' is ignored for archives"
+
+      test -n "$vinfo" && \
+	func_warning "'-version-info/-version-number' is ignored for archives"
+
+      test -n "$release" && \
+	func_warning "'-release' is ignored for archives"
+
+      test -n "$export_symbols$export_symbols_regex" && \
+	func_warning "'-export-symbols' is ignored for archives"
+
+      # Now set the variables for building old libraries.
+      build_libtool_libs=no
+      oldlibs=$output
+      func_append objs "$old_deplibs"
+      ;;
+
+    lib)
+      # Make sure we only generate libraries of the form 'libNAME.la'.
+      case $outputname in
+      lib*)
+	func_stripname 'lib' '.la' "$outputname"
+	name=$func_stripname_result
+	eval shared_ext=\"$shrext_cmds\"
+	eval libname=\"$libname_spec\"
+	;;
+      *)
+	test no = "$module" \
+	  && func_fatal_help "libtool library '$output' must begin with 'lib'"
+
+	if test no != "$need_lib_prefix"; then
+	  # Add the "lib" prefix for modules if required
+	  func_stripname '' '.la' "$outputname"
+	  name=$func_stripname_result
+	  eval shared_ext=\"$shrext_cmds\"
+	  eval libname=\"$libname_spec\"
+	else
+	  func_stripname '' '.la' "$outputname"
+	  libname=$func_stripname_result
+	fi
+	;;
+      esac
+
+      if test -n "$objs"; then
+	if test pass_all != "$deplibs_check_method"; then
+	  func_fatal_error "cannot build libtool library '$output' from non-libtool objects on this host:$objs"
+	else
+	  echo
+	  $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
+	  $ECHO "*** objects $objs is not portable!"
+	  func_append libobjs " $objs"
+	fi
+      fi
+
+      test no = "$dlself" \
+	|| func_warning "'-dlopen self' is ignored for libtool libraries"
+
+      set dummy $rpath
+      shift
+      test 1 -lt "$#" \
+	&& func_warning "ignoring multiple '-rpath's for a libtool library"
+
+      install_libdir=$1
+
+      oldlibs=
+      if test -z "$rpath"; then
+	if test yes = "$build_libtool_libs"; then
+	  # Building a libtool convenience library.
+	  # Some compilers have problems with a '.al' extension so
+	  # convenience libraries should have the same extension an
+	  # archive normally would.
+	  oldlibs="$output_objdir/$libname.$libext $oldlibs"
+	  build_libtool_libs=convenience
+	  build_old_libs=yes
+	fi
+
+	test -n "$vinfo" && \
+	  func_warning "'-version-info/-version-number' is ignored for convenience libraries"
+
+	test -n "$release" && \
+	  func_warning "'-release' is ignored for convenience libraries"
+      else
+
+	# Parse the version information argument.
+	save_ifs=$IFS; IFS=:
+	set dummy $vinfo 0 0 0
+	shift
+	IFS=$save_ifs
+
+	test -n "$7" && \
+	  func_fatal_help "too many parameters to '-version-info'"
+
+	# convert absolute version numbers to libtool ages
+	# this retains compatibility with .la files and attempts
+	# to make the code below a bit more comprehensible
+
+	case $vinfo_number in
+	yes)
+	  number_major=$1
+	  number_minor=$2
+	  number_revision=$3
+	  #
+	  # There are really only two kinds -- those that
+	  # use the current revision as the major version
+	  # and those that subtract age and use age as
+	  # a minor version.  But, then there is irix
+	  # that has an extra 1 added just for fun
+	  #
+	  case $version_type in
+	  # correct linux to gnu/linux during the next big refactor
+	  darwin|freebsd-elf|linux|osf|windows|none)
+	    func_arith $number_major + $number_minor
+	    current=$func_arith_result
+	    age=$number_minor
+	    revision=$number_revision
+	    ;;
+	  freebsd-aout|qnx|sunos)
+	    current=$number_major
+	    revision=$number_minor
+	    age=0
+	    ;;
+	  irix|nonstopux)
+	    func_arith $number_major + $number_minor
+	    current=$func_arith_result
+	    age=$number_minor
+	    revision=$number_minor
+	    lt_irix_increment=no
+	    ;;
+	  esac
+	  ;;
+	no)
+	  current=$1
+	  revision=$2
+	  age=$3
+	  ;;
+	esac
+
+	# Check that each of the things are valid numbers.
+	case $current in
+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+	*)
+	  func_error "CURRENT '$current' must be a nonnegative integer"
+	  func_fatal_error "'$vinfo' is not valid version information"
+	  ;;
+	esac
+
+	case $revision in
+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+	*)
+	  func_error "REVISION '$revision' must be a nonnegative integer"
+	  func_fatal_error "'$vinfo' is not valid version information"
+	  ;;
+	esac
+
+	case $age in
+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+	*)
+	  func_error "AGE '$age' must be a nonnegative integer"
+	  func_fatal_error "'$vinfo' is not valid version information"
+	  ;;
+	esac
+
+	if test "$age" -gt "$current"; then
+	  func_error "AGE '$age' is greater than the current interface number '$current'"
+	  func_fatal_error "'$vinfo' is not valid version information"
+	fi
+
+	# Calculate the version variables.
+	major=
+	versuffix=
+	verstring=
+	case $version_type in
+	none) ;;
+
+	darwin)
+	  # Like Linux, but with the current version available in
+	  # verstring for coding it into the library header
+	  func_arith $current - $age
+	  major=.$func_arith_result
+	  versuffix=$major.$age.$revision
+	  # Darwin ld doesn't like 0 for these options...
+	  func_arith $current + 1
+	  minor_current=$func_arith_result
+	  xlcverstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision"
+	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+          # On Darwin other compilers
+          case $CC in
+              nagfor*)
+                  verstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision"
+                  ;;
+              *)
+                  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+                  ;;
+          esac
+	  ;;
+
+	freebsd-aout)
+	  major=.$current
+	  versuffix=.$current.$revision
+	  ;;
+
+	freebsd-elf)
+	  func_arith $current - $age
+	  major=.$func_arith_result
+	  versuffix=$major.$age.$revision
+	  ;;
+
+	irix | nonstopux)
+	  if test no = "$lt_irix_increment"; then
+	    func_arith $current - $age
+	  else
+	    func_arith $current - $age + 1
+	  fi
+	  major=$func_arith_result
+
+	  case $version_type in
+	    nonstopux) verstring_prefix=nonstopux ;;
+	    *)         verstring_prefix=sgi ;;
+	  esac
+	  verstring=$verstring_prefix$major.$revision
+
+	  # Add in all the interfaces that we are compatible with.
+	  loop=$revision
+	  while test 0 -ne "$loop"; do
+	    func_arith $revision - $loop
+	    iface=$func_arith_result
+	    func_arith $loop - 1
+	    loop=$func_arith_result
+	    verstring=$verstring_prefix$major.$iface:$verstring
+	  done
+
+	  # Before this point, $major must not contain '.'.
+	  major=.$major
+	  versuffix=$major.$revision
+	  ;;
+
+	linux) # correct to gnu/linux during the next big refactor
+	  func_arith $current - $age
+	  major=.$func_arith_result
+	  versuffix=$major.$age.$revision
+	  ;;
+
+	osf)
+	  func_arith $current - $age
+	  major=.$func_arith_result
+	  versuffix=.$current.$age.$revision
+	  verstring=$current.$age.$revision
+
+	  # Add in all the interfaces that we are compatible with.
+	  loop=$age
+	  while test 0 -ne "$loop"; do
+	    func_arith $current - $loop
+	    iface=$func_arith_result
+	    func_arith $loop - 1
+	    loop=$func_arith_result
+	    verstring=$verstring:$iface.0
+	  done
+
+	  # Make executables depend on our current version.
+	  func_append verstring ":$current.0"
+	  ;;
+
+	qnx)
+	  major=.$current
+	  versuffix=.$current
+	  ;;
+
+	sco)
+	  major=.$current
+	  versuffix=.$current
+	  ;;
+
+	sunos)
+	  major=.$current
+	  versuffix=.$current.$revision
+	  ;;
+
+	windows)
+	  # Use '-' rather than '.', since we only want one
+	  # extension on DOS 8.3 file systems.
+	  func_arith $current - $age
+	  major=$func_arith_result
+	  versuffix=-$major
+	  ;;
+
+	*)
+	  func_fatal_configuration "unknown library version type '$version_type'"
+	  ;;
+	esac
+
+	# Clear the version info if we defaulted, and they specified a release.
+	if test -z "$vinfo" && test -n "$release"; then
+	  major=
+	  case $version_type in
+	  darwin)
+	    # we can't check for "0.0" in archive_cmds due to quoting
+	    # problems, so we reset it completely
+	    verstring=
+	    ;;
+	  *)
+	    verstring=0.0
+	    ;;
+	  esac
+	  if test no = "$need_version"; then
+	    versuffix=
+	  else
+	    versuffix=.0.0
+	  fi
+	fi
+
+	# Remove version info from name if versioning should be avoided
+	if test yes,no = "$avoid_version,$need_version"; then
+	  major=
+	  versuffix=
+	  verstring=
+	fi
+
+	# Check to see if the archive will have undefined symbols.
+	if test yes = "$allow_undefined"; then
+	  if test unsupported = "$allow_undefined_flag"; then
+	    if test yes = "$build_old_libs"; then
+	      func_warning "undefined symbols not allowed in $host shared libraries; building static only"
+	      build_libtool_libs=no
+	    else
+	      func_fatal_error "can't build $host shared library unless -no-undefined is specified"
+	    fi
+	  fi
+	else
+	  # Don't allow undefined symbols.
+	  allow_undefined_flag=$no_undefined_flag
+	fi
+
+      fi
+
+      func_generate_dlsyms "$libname" "$libname" :
+      func_append libobjs " $symfileobj"
+      test " " = "$libobjs" && libobjs=
+
+      if test relink != "$opt_mode"; then
+	# Remove our outputs, but don't remove object files since they
+	# may have been created when compiling PIC objects.
+	removelist=
+	tempremovelist=`$ECHO "$output_objdir/*"`
+	for p in $tempremovelist; do
+	  case $p in
+	    *.$objext | *.gcno)
+	       ;;
+	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/$libname$release.*)
+	       if test -n "$precious_files_regex"; then
+		 if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
+		 then
+		   continue
+		 fi
+	       fi
+	       func_append removelist " $p"
+	       ;;
+	    *) ;;
+	  esac
+	done
+	test -n "$removelist" && \
+	  func_show_eval "${RM}r \$removelist"
+      fi
+
+      # Now set the variables for building old libraries.
+      if test yes = "$build_old_libs" && test convenience != "$build_libtool_libs"; then
+	func_append oldlibs " $output_objdir/$libname.$libext"
+
+	# Transform .lo files to .o files.
+	oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; $lo2o" | $NL2SP`
+      fi
+
+      # Eliminate all temporary directories.
+      #for path in $notinst_path; do
+      #	lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"`
+      #	deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"`
+      #	dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"`
+      #done
+
+      if test -n "$xrpath"; then
+	# If the user specified any rpath flags, then add them.
+	temp_xrpath=
+	for libdir in $xrpath; do
+	  func_replace_sysroot "$libdir"
+	  func_append temp_xrpath " -R$func_replace_sysroot_result"
+	  case "$finalize_rpath " in
+	  *" $libdir "*) ;;
+	  *) func_append finalize_rpath " $libdir" ;;
+	  esac
+	done
+	if test yes != "$hardcode_into_libs" || test yes = "$build_old_libs"; then
+	  dependency_libs="$temp_xrpath $dependency_libs"
+	fi
+      fi
+
+      # Make sure dlfiles contains only unique files that won't be dlpreopened
+      old_dlfiles=$dlfiles
+      dlfiles=
+      for lib in $old_dlfiles; do
+	case " $dlprefiles $dlfiles " in
+	*" $lib "*) ;;
+	*) func_append dlfiles " $lib" ;;
+	esac
+      done
+
+      # Make sure dlprefiles contains only unique files
+      old_dlprefiles=$dlprefiles
+      dlprefiles=
+      for lib in $old_dlprefiles; do
+	case "$dlprefiles " in
+	*" $lib "*) ;;
+	*) func_append dlprefiles " $lib" ;;
+	esac
+      done
+
+      if test yes = "$build_libtool_libs"; then
+	if test -n "$rpath"; then
+	  case $host in
+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
+	    # these systems don't actually have a c library (as such)!
+	    ;;
+	  *-*-rhapsody* | *-*-darwin1.[012])
+	    # Rhapsody C library is in the System framework
+	    func_append deplibs " System.ltframework"
+	    ;;
+	  *-*-netbsd*)
+	    # Don't link with libc until the a.out ld.so is fixed.
+	    ;;
+	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+	    # Do not include libc due to us having libc/libc_r.
+	    ;;
+	  *-*-sco3.2v5* | *-*-sco5v6*)
+	    # Causes problems with __ctype
+	    ;;
+	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
+	    # Compiler inserts libc in the correct place for threads to work
+	    ;;
+	  *)
+	    # Add libc to deplibs on all other systems if necessary.
+	    if test yes = "$build_libtool_need_lc"; then
+	      func_append deplibs " -lc"
+	    fi
+	    ;;
+	  esac
+	fi
+
+	# Transform deplibs into only deplibs that can be linked in shared.
+	name_save=$name
+	libname_save=$libname
+	release_save=$release
+	versuffix_save=$versuffix
+	major_save=$major
+	# I'm not sure if I'm treating the release correctly.  I think
+	# release should show up in the -l (ie -lgmp5) so we don't want to
+	# add it in twice.  Is that correct?
+	release=
+	versuffix=
+	major=
+	newdeplibs=
+	droppeddeps=no
+	case $deplibs_check_method in
+	pass_all)
+	  # Don't check for shared/static.  Everything works.
+	  # This might be a little naive.  We might want to check
+	  # whether the library exists or not.  But this is on
+	  # osf3 & osf4 and I'm not really sure... Just
+	  # implementing what was already the behavior.
+	  newdeplibs=$deplibs
+	  ;;
+	test_compile)
+	  # This code stresses the "libraries are programs" paradigm to its
+	  # limits. Maybe even breaks it.  We compile a program, linking it
+	  # against the deplibs as a proxy for the library.  Then we can check
+	  # whether they linked in statically or dynamically with ldd.
+	  $opt_dry_run || $RM conftest.c
+	  cat > conftest.c <<EOF
+	  int main() { return 0; }
+EOF
+	  $opt_dry_run || $RM conftest
+	  if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
+	    ldd_output=`ldd conftest`
+	    for i in $deplibs; do
+	      case $i in
+	      -l*)
+		func_stripname -l '' "$i"
+		name=$func_stripname_result
+		if test yes = "$allow_libtool_libs_with_static_runtimes"; then
+		  case " $predeps $postdeps " in
+		  *" $i "*)
+		    func_append newdeplibs " $i"
+		    i=
+		    ;;
+		  esac
+		fi
+		if test -n "$i"; then
+		  libname=`eval "\\$ECHO \"$libname_spec\""`
+		  deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
+		  set dummy $deplib_matches; shift
+		  deplib_match=$1
+		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then
+		    func_append newdeplibs " $i"
+		  else
+		    droppeddeps=yes
+		    echo
+		    $ECHO "*** Warning: dynamic linker does not accept needed library $i."
+		    echo "*** I have the capability to make that library automatically link in when"
+		    echo "*** you link to this library.  But I can only do this if you have a"
+		    echo "*** shared version of the library, which I believe you do not have"
+		    echo "*** because a test_compile did reveal that the linker did not use it for"
+		    echo "*** its dynamic dependency list that programs get resolved with at runtime."
+		  fi
+		fi
+		;;
+	      *)
+		func_append newdeplibs " $i"
+		;;
+	      esac
+	    done
+	  else
+	    # Error occurred in the first compile.  Let's try to salvage
+	    # the situation: Compile a separate program for each library.
+	    for i in $deplibs; do
+	      case $i in
+	      -l*)
+		func_stripname -l '' "$i"
+		name=$func_stripname_result
+		$opt_dry_run || $RM conftest
+		if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
+		  ldd_output=`ldd conftest`
+		  if test yes = "$allow_libtool_libs_with_static_runtimes"; then
+		    case " $predeps $postdeps " in
+		    *" $i "*)
+		      func_append newdeplibs " $i"
+		      i=
+		      ;;
+		    esac
+		  fi
+		  if test -n "$i"; then
+		    libname=`eval "\\$ECHO \"$libname_spec\""`
+		    deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
+		    set dummy $deplib_matches; shift
+		    deplib_match=$1
+		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then
+		      func_append newdeplibs " $i"
+		    else
+		      droppeddeps=yes
+		      echo
+		      $ECHO "*** Warning: dynamic linker does not accept needed library $i."
+		      echo "*** I have the capability to make that library automatically link in when"
+		      echo "*** you link to this library.  But I can only do this if you have a"
+		      echo "*** shared version of the library, which you do not appear to have"
+		      echo "*** because a test_compile did reveal that the linker did not use this one"
+		      echo "*** as a dynamic dependency that programs can get resolved with at runtime."
+		    fi
+		  fi
+		else
+		  droppeddeps=yes
+		  echo
+		  $ECHO "*** Warning!  Library $i is needed by this library but I was not able to"
+		  echo "*** make it link in!  You will probably need to install it or some"
+		  echo "*** library that it depends on before this library will be fully"
+		  echo "*** functional.  Installing it before continuing would be even better."
+		fi
+		;;
+	      *)
+		func_append newdeplibs " $i"
+		;;
+	      esac
+	    done
+	  fi
+	  ;;
+	file_magic*)
+	  set dummy $deplibs_check_method; shift
+	  file_magic_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
+	  for a_deplib in $deplibs; do
+	    case $a_deplib in
+	    -l*)
+	      func_stripname -l '' "$a_deplib"
+	      name=$func_stripname_result
+	      if test yes = "$allow_libtool_libs_with_static_runtimes"; then
+		case " $predeps $postdeps " in
+		*" $a_deplib "*)
+		  func_append newdeplibs " $a_deplib"
+		  a_deplib=
+		  ;;
+		esac
+	      fi
+	      if test -n "$a_deplib"; then
+		libname=`eval "\\$ECHO \"$libname_spec\""`
+		if test -n "$file_magic_glob"; then
+		  libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob`
+		else
+		  libnameglob=$libname
+		fi
+		test yes = "$want_nocaseglob" && nocaseglob=`shopt -p nocaseglob`
+		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
+		  if test yes = "$want_nocaseglob"; then
+		    shopt -s nocaseglob
+		    potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
+		    $nocaseglob
+		  else
+		    potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
+		  fi
+		  for potent_lib in $potential_libs; do
+		      # Follow soft links.
+		      if ls -lLd "$potent_lib" 2>/dev/null |
+			 $GREP " -> " >/dev/null; then
+			continue
+		      fi
+		      # The statement above tries to avoid entering an
+		      # endless loop below, in case of cyclic links.
+		      # We might still enter an endless loop, since a link
+		      # loop can be closed while we follow links,
+		      # but so what?
+		      potlib=$potent_lib
+		      while test -h "$potlib" 2>/dev/null; do
+			potliblink=`ls -ld $potlib | $SED 's/.* -> //'`
+			case $potliblink in
+			[\\/]* | [A-Za-z]:[\\/]*) potlib=$potliblink;;
+			*) potlib=`$ECHO "$potlib" | $SED 's|[^/]*$||'`"$potliblink";;
+			esac
+		      done
+		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
+			 $SED -e 10q |
+			 $EGREP "$file_magic_regex" > /dev/null; then
+			func_append newdeplibs " $a_deplib"
+			a_deplib=
+			break 2
+		      fi
+		  done
+		done
+	      fi
+	      if test -n "$a_deplib"; then
+		droppeddeps=yes
+		echo
+		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
+		echo "*** I have the capability to make that library automatically link in when"
+		echo "*** you link to this library.  But I can only do this if you have a"
+		echo "*** shared version of the library, which you do not appear to have"
+		echo "*** because I did check the linker path looking for a file starting"
+		if test -z "$potlib"; then
+		  $ECHO "*** with $libname but no candidates were found. (...for file magic test)"
+		else
+		  $ECHO "*** with $libname and none of the candidates passed a file format test"
+		  $ECHO "*** using a file magic. Last file checked: $potlib"
+		fi
+	      fi
+	      ;;
+	    *)
+	      # Add a -L argument.
+	      func_append newdeplibs " $a_deplib"
+	      ;;
+	    esac
+	  done # Gone through all deplibs.
+	  ;;
+	match_pattern*)
+	  set dummy $deplibs_check_method; shift
+	  match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
+	  for a_deplib in $deplibs; do
+	    case $a_deplib in
+	    -l*)
+	      func_stripname -l '' "$a_deplib"
+	      name=$func_stripname_result
+	      if test yes = "$allow_libtool_libs_with_static_runtimes"; then
+		case " $predeps $postdeps " in
+		*" $a_deplib "*)
+		  func_append newdeplibs " $a_deplib"
+		  a_deplib=
+		  ;;
+		esac
+	      fi
+	      if test -n "$a_deplib"; then
+		libname=`eval "\\$ECHO \"$libname_spec\""`
+		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
+		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
+		  for potent_lib in $potential_libs; do
+		    potlib=$potent_lib # see symlink-check above in file_magic test
+		    if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
+		       $EGREP "$match_pattern_regex" > /dev/null; then
+		      func_append newdeplibs " $a_deplib"
+		      a_deplib=
+		      break 2
+		    fi
+		  done
+		done
+	      fi
+	      if test -n "$a_deplib"; then
+		droppeddeps=yes
+		echo
+		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
+		echo "*** I have the capability to make that library automatically link in when"
+		echo "*** you link to this library.  But I can only do this if you have a"
+		echo "*** shared version of the library, which you do not appear to have"
+		echo "*** because I did check the linker path looking for a file starting"
+		if test -z "$potlib"; then
+		  $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
+		else
+		  $ECHO "*** with $libname and none of the candidates passed a file format test"
+		  $ECHO "*** using a regex pattern. Last file checked: $potlib"
+		fi
+	      fi
+	      ;;
+	    *)
+	      # Add a -L argument.
+	      func_append newdeplibs " $a_deplib"
+	      ;;
+	    esac
+	  done # Gone through all deplibs.
+	  ;;
+	none | unknown | *)
+	  newdeplibs=
+	  tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'`
+	  if test yes = "$allow_libtool_libs_with_static_runtimes"; then
+	    for i in $predeps $postdeps; do
+	      # can't use Xsed below, because $i might contain '/'
+	      tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s|$i||"`
+	    done
+	  fi
+	  case $tmp_deplibs in
+	  *[!\	\ ]*)
+	    echo
+	    if test none = "$deplibs_check_method"; then
+	      echo "*** Warning: inter-library dependencies are not supported in this platform."
+	    else
+	      echo "*** Warning: inter-library dependencies are not known to be supported."
+	    fi
+	    echo "*** All declared inter-library dependencies are being dropped."
+	    droppeddeps=yes
+	    ;;
+	  esac
+	  ;;
+	esac
+	versuffix=$versuffix_save
+	major=$major_save
+	release=$release_save
+	libname=$libname_save
+	name=$name_save
+
+	case $host in
+	*-*-rhapsody* | *-*-darwin1.[012])
+	  # On Rhapsody replace the C library with the System framework
+	  newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'`
+	  ;;
+	esac
+
+	if test yes = "$droppeddeps"; then
+	  if test yes = "$module"; then
+	    echo
+	    echo "*** Warning: libtool could not satisfy all declared inter-library"
+	    $ECHO "*** dependencies of module $libname.  Therefore, libtool will create"
+	    echo "*** a static module, that should work as long as the dlopening"
+	    echo "*** application is linked with the -dlopen flag."
+	    if test -z "$global_symbol_pipe"; then
+	      echo
+	      echo "*** However, this would only work if libtool was able to extract symbol"
+	      echo "*** lists from a program, using 'nm' or equivalent, but libtool could"
+	      echo "*** not find such a program.  So, this module is probably useless."
+	      echo "*** 'nm' from GNU binutils and a full rebuild may help."
+	    fi
+	    if test no = "$build_old_libs"; then
+	      oldlibs=$output_objdir/$libname.$libext
+	      build_libtool_libs=module
+	      build_old_libs=yes
+	    else
+	      build_libtool_libs=no
+	    fi
+	  else
+	    echo "*** The inter-library dependencies that have been dropped here will be"
+	    echo "*** automatically added whenever a program is linked with this library"
+	    echo "*** or is declared to -dlopen it."
+
+	    if test no = "$allow_undefined"; then
+	      echo
+	      echo "*** Since this library must not contain undefined symbols,"
+	      echo "*** because either the platform does not support them or"
+	      echo "*** it was explicitly requested with -no-undefined,"
+	      echo "*** libtool will only create a static version of it."
+	      if test no = "$build_old_libs"; then
+		oldlibs=$output_objdir/$libname.$libext
+		build_libtool_libs=module
+		build_old_libs=yes
+	      else
+		build_libtool_libs=no
+	      fi
+	    fi
+	  fi
+	fi
+	# Done checking deplibs!
+	deplibs=$newdeplibs
+      fi
+      # Time to change all our "foo.ltframework" stuff back to "-framework foo"
+      case $host in
+	*-*-darwin*)
+	  newdeplibs=`$ECHO " $newdeplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	  new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	  deplibs=`$ECHO " $deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	  ;;
+      esac
+
+      # move library search paths that coincide with paths to not yet
+      # installed libraries to the beginning of the library search list
+      new_libs=
+      for path in $notinst_path; do
+	case " $new_libs " in
+	*" -L$path/$objdir "*) ;;
+	*)
+	  case " $deplibs " in
+	  *" -L$path/$objdir "*)
+	    func_append new_libs " -L$path/$objdir" ;;
+	  esac
+	  ;;
+	esac
+      done
+      for deplib in $deplibs; do
+	case $deplib in
+	-L*)
+	  case " $new_libs " in
+	  *" $deplib "*) ;;
+	  *) func_append new_libs " $deplib" ;;
+	  esac
+	  ;;
+	*) func_append new_libs " $deplib" ;;
+	esac
+      done
+      deplibs=$new_libs
+
+      # All the library-specific variables (install_libdir is set above).
+      library_names=
+      old_library=
+      dlname=
+
+      # Test again, we may have decided not to build it any more
+      if test yes = "$build_libtool_libs"; then
+	# Remove $wl instances when linking with ld.
+	# FIXME: should test the right _cmds variable.
+	case $archive_cmds in
+	  *\$LD\ *) wl= ;;
+        esac
+	if test yes = "$hardcode_into_libs"; then
+	  # Hardcode the library paths
+	  hardcode_libdirs=
+	  dep_rpath=
+	  rpath=$finalize_rpath
+	  test relink = "$opt_mode" || rpath=$compile_rpath$rpath
+	  for libdir in $rpath; do
+	    if test -n "$hardcode_libdir_flag_spec"; then
+	      if test -n "$hardcode_libdir_separator"; then
+		func_replace_sysroot "$libdir"
+		libdir=$func_replace_sysroot_result
+		if test -z "$hardcode_libdirs"; then
+		  hardcode_libdirs=$libdir
+		else
+		  # Just accumulate the unique libdirs.
+		  case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+		  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+		    ;;
+		  *)
+		    func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
+		    ;;
+		  esac
+		fi
+	      else
+		eval flag=\"$hardcode_libdir_flag_spec\"
+		func_append dep_rpath " $flag"
+	      fi
+	    elif test -n "$runpath_var"; then
+	      case "$perm_rpath " in
+	      *" $libdir "*) ;;
+	      *) func_append perm_rpath " $libdir" ;;
+	      esac
+	    fi
+	  done
+	  # Substitute the hardcoded libdirs into the rpath.
+	  if test -n "$hardcode_libdir_separator" &&
+	     test -n "$hardcode_libdirs"; then
+	    libdir=$hardcode_libdirs
+	    eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
+	  fi
+	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
+	    # We should set the runpath_var.
+	    rpath=
+	    for dir in $perm_rpath; do
+	      func_append rpath "$dir:"
+	    done
+	    eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
+	  fi
+	  test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
+	fi
+
+	shlibpath=$finalize_shlibpath
+	test relink = "$opt_mode" || shlibpath=$compile_shlibpath$shlibpath
+	if test -n "$shlibpath"; then
+	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
+	fi
+
+	# Get the real and link names of the library.
+	eval shared_ext=\"$shrext_cmds\"
+	eval library_names=\"$library_names_spec\"
+	set dummy $library_names
+	shift
+	realname=$1
+	shift
+
+	if test -n "$soname_spec"; then
+	  eval soname=\"$soname_spec\"
+	else
+	  soname=$realname
+	fi
+	if test -z "$dlname"; then
+	  dlname=$soname
+	fi
+
+	lib=$output_objdir/$realname
+	linknames=
+	for link
+	do
+	  func_append linknames " $link"
+	done
+
+	# Use standard objects if they are pic
+	test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP`
+	test "X$libobjs" = "X " && libobjs=
+
+	delfiles=
+	if test -n "$export_symbols" && test -n "$include_expsyms"; then
+	  $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
+	  export_symbols=$output_objdir/$libname.uexp
+	  func_append delfiles " $export_symbols"
+	fi
+
+	orig_export_symbols=
+	case $host_os in
+	cygwin* | mingw* | cegcc*)
+	  if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
+	    # exporting using user supplied symfile
+	    func_dll_def_p "$export_symbols" || {
+	      # and it's NOT already a .def file. Must figure out
+	      # which of the given symbols are data symbols and tag
+	      # them as such. So, trigger use of export_symbols_cmds.
+	      # export_symbols gets reassigned inside the "prepare
+	      # the list of exported symbols" if statement, so the
+	      # include_expsyms logic still works.
+	      orig_export_symbols=$export_symbols
+	      export_symbols=
+	      always_export_symbols=yes
+	    }
+	  fi
+	  ;;
+	esac
+
+	# Prepare the list of exported symbols
+	if test -z "$export_symbols"; then
+	  if test yes = "$always_export_symbols" || test -n "$export_symbols_regex"; then
+	    func_verbose "generating symbol list for '$libname.la'"
+	    export_symbols=$output_objdir/$libname.exp
+	    $opt_dry_run || $RM $export_symbols
+	    cmds=$export_symbols_cmds
+	    save_ifs=$IFS; IFS='~'
+	    for cmd1 in $cmds; do
+	      IFS=$save_ifs
+	      # Take the normal branch if the nm_file_list_spec branch
+	      # doesn't work or if tool conversion is not needed.
+	      case $nm_file_list_spec~$to_tool_file_cmd in
+		*~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*)
+		  try_normal_branch=yes
+		  eval cmd=\"$cmd1\"
+		  func_len " $cmd"
+		  len=$func_len_result
+		  ;;
+		*)
+		  try_normal_branch=no
+		  ;;
+	      esac
+	      if test yes = "$try_normal_branch" \
+		 && { test "$len" -lt "$max_cmd_len" \
+		      || test "$max_cmd_len" -le -1; }
+	      then
+		func_show_eval "$cmd" 'exit $?'
+		skipped_export=false
+	      elif test -n "$nm_file_list_spec"; then
+		func_basename "$output"
+		output_la=$func_basename_result
+		save_libobjs=$libobjs
+		save_output=$output
+		output=$output_objdir/$output_la.nm
+		func_to_tool_file "$output"
+		libobjs=$nm_file_list_spec$func_to_tool_file_result
+		func_append delfiles " $output"
+		func_verbose "creating $NM input file list: $output"
+		for obj in $save_libobjs; do
+		  func_to_tool_file "$obj"
+		  $ECHO "$func_to_tool_file_result"
+		done > "$output"
+		eval cmd=\"$cmd1\"
+		func_show_eval "$cmd" 'exit $?'
+		output=$save_output
+		libobjs=$save_libobjs
+		skipped_export=false
+	      else
+		# The command line is too long to execute in one step.
+		func_verbose "using reloadable object file for export list..."
+		skipped_export=:
+		# Break out early, otherwise skipped_export may be
+		# set to false by a later but shorter cmd.
+		break
+	      fi
+	    done
+	    IFS=$save_ifs
+	    if test -n "$export_symbols_regex" && test : != "$skipped_export"; then
+	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
+	      func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
+	    fi
+	  fi
+	fi
+
+	if test -n "$export_symbols" && test -n "$include_expsyms"; then
+	  tmp_export_symbols=$export_symbols
+	  test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols
+	  $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
+	fi
+
+	if test : != "$skipped_export" && test -n "$orig_export_symbols"; then
+	  # The given exports_symbols file has to be filtered, so filter it.
+	  func_verbose "filter symbol list for '$libname.la' to tag DATA exports"
+	  # FIXME: $output_objdir/$libname.filter potentially contains lots of
+	  # 's' commands, which not all seds can handle. GNU sed should be fine
+	  # though. Also, the filter scales superlinearly with the number of
+	  # global variables. join(1) would be nice here, but unfortunately
+	  # isn't a blessed tool.
+	  $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
+	  func_append delfiles " $export_symbols $output_objdir/$libname.filter"
+	  export_symbols=$output_objdir/$libname.def
+	  $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
+	fi
+
+	tmp_deplibs=
+	for test_deplib in $deplibs; do
+	  case " $convenience " in
+	  *" $test_deplib "*) ;;
+	  *)
+	    func_append tmp_deplibs " $test_deplib"
+	    ;;
+	  esac
+	done
+	deplibs=$tmp_deplibs
+
+	if test -n "$convenience"; then
+	  if test -n "$whole_archive_flag_spec" &&
+	    test yes = "$compiler_needs_object" &&
+	    test -z "$libobjs"; then
+	    # extract the archives, so we have objects to list.
+	    # TODO: could optimize this to just extract one archive.
+	    whole_archive_flag_spec=
+	  fi
+	  if test -n "$whole_archive_flag_spec"; then
+	    save_libobjs=$libobjs
+	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+	    test "X$libobjs" = "X " && libobjs=
+	  else
+	    gentop=$output_objdir/${outputname}x
+	    func_append generated " $gentop"
+
+	    func_extract_archives $gentop $convenience
+	    func_append libobjs " $func_extract_archives_result"
+	    test "X$libobjs" = "X " && libobjs=
+	  fi
+	fi
+
+	if test yes = "$thread_safe" && test -n "$thread_safe_flag_spec"; then
+	  eval flag=\"$thread_safe_flag_spec\"
+	  func_append linker_flags " $flag"
+	fi
+
+	# Make a backup of the uninstalled library when relinking
+	if test relink = "$opt_mode"; then
+	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
+	fi
+
+	# Do each of the archive commands.
+	if test yes = "$module" && test -n "$module_cmds"; then
+	  if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
+	    eval test_cmds=\"$module_expsym_cmds\"
+	    cmds=$module_expsym_cmds
+	  else
+	    eval test_cmds=\"$module_cmds\"
+	    cmds=$module_cmds
+	  fi
+	else
+	  if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+	    eval test_cmds=\"$archive_expsym_cmds\"
+	    cmds=$archive_expsym_cmds
+	  else
+	    eval test_cmds=\"$archive_cmds\"
+	    cmds=$archive_cmds
+	  fi
+	fi
+
+	if test : != "$skipped_export" &&
+	   func_len " $test_cmds" &&
+	   len=$func_len_result &&
+	   test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+	  :
+	else
+	  # The command line is too long to link in one step, link piecewise
+	  # or, if using GNU ld and skipped_export is not :, use a linker
+	  # script.
+
+	  # Save the value of $output and $libobjs because we want to
+	  # use them later.  If we have whole_archive_flag_spec, we
+	  # want to use save_libobjs as it was before
+	  # whole_archive_flag_spec was expanded, because we can't
+	  # assume the linker understands whole_archive_flag_spec.
+	  # This may have to be revisited, in case too many
+	  # convenience libraries get linked in and end up exceeding
+	  # the spec.
+	  if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then
+	    save_libobjs=$libobjs
+	  fi
+	  save_output=$output
+	  func_basename "$output"
+	  output_la=$func_basename_result
+
+	  # Clear the reloadable object creation command queue and
+	  # initialize k to one.
+	  test_cmds=
+	  concat_cmds=
+	  objlist=
+	  last_robj=
+	  k=1
+
+	  if test -n "$save_libobjs" && test : != "$skipped_export" && test yes = "$with_gnu_ld"; then
+	    output=$output_objdir/$output_la.lnkscript
+	    func_verbose "creating GNU ld script: $output"
+	    echo 'INPUT (' > $output
+	    for obj in $save_libobjs
+	    do
+	      func_to_tool_file "$obj"
+	      $ECHO "$func_to_tool_file_result" >> $output
+	    done
+	    echo ')' >> $output
+	    func_append delfiles " $output"
+	    func_to_tool_file "$output"
+	    output=$func_to_tool_file_result
+	  elif test -n "$save_libobjs" && test : != "$skipped_export" && test -n "$file_list_spec"; then
+	    output=$output_objdir/$output_la.lnk
+	    func_verbose "creating linker input file list: $output"
+	    : > $output
+	    set x $save_libobjs
+	    shift
+	    firstobj=
+	    if test yes = "$compiler_needs_object"; then
+	      firstobj="$1 "
+	      shift
+	    fi
+	    for obj
+	    do
+	      func_to_tool_file "$obj"
+	      $ECHO "$func_to_tool_file_result" >> $output
+	    done
+	    func_append delfiles " $output"
+	    func_to_tool_file "$output"
+	    output=$firstobj\"$file_list_spec$func_to_tool_file_result\"
+	  else
+	    if test -n "$save_libobjs"; then
+	      func_verbose "creating reloadable object files..."
+	      output=$output_objdir/$output_la-$k.$objext
+	      eval test_cmds=\"$reload_cmds\"
+	      func_len " $test_cmds"
+	      len0=$func_len_result
+	      len=$len0
+
+	      # Loop over the list of objects to be linked.
+	      for obj in $save_libobjs
+	      do
+		func_len " $obj"
+		func_arith $len + $func_len_result
+		len=$func_arith_result
+		if test -z "$objlist" ||
+		   test "$len" -lt "$max_cmd_len"; then
+		  func_append objlist " $obj"
+		else
+		  # The command $test_cmds is almost too long, add a
+		  # command to the queue.
+		  if test 1 -eq "$k"; then
+		    # The first file doesn't have a previous command to add.
+		    reload_objs=$objlist
+		    eval concat_cmds=\"$reload_cmds\"
+		  else
+		    # All subsequent reloadable object files will link in
+		    # the last one created.
+		    reload_objs="$objlist $last_robj"
+		    eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
+		  fi
+		  last_robj=$output_objdir/$output_la-$k.$objext
+		  func_arith $k + 1
+		  k=$func_arith_result
+		  output=$output_objdir/$output_la-$k.$objext
+		  objlist=" $obj"
+		  func_len " $last_robj"
+		  func_arith $len0 + $func_len_result
+		  len=$func_arith_result
+		fi
+	      done
+	      # Handle the remaining objects by creating one last
+	      # reloadable object file.  All subsequent reloadable object
+	      # files will link in the last one created.
+	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+	      reload_objs="$objlist $last_robj"
+	      eval concat_cmds=\"\$concat_cmds$reload_cmds\"
+	      if test -n "$last_robj"; then
+	        eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
+	      fi
+	      func_append delfiles " $output"
+
+	    else
+	      output=
+	    fi
+
+	    ${skipped_export-false} && {
+	      func_verbose "generating symbol list for '$libname.la'"
+	      export_symbols=$output_objdir/$libname.exp
+	      $opt_dry_run || $RM $export_symbols
+	      libobjs=$output
+	      # Append the command to create the export file.
+	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+	      eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\"
+	      if test -n "$last_robj"; then
+		eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
+	      fi
+	    }
+
+	    test -n "$save_libobjs" &&
+	      func_verbose "creating a temporary reloadable object file: $output"
+
+	    # Loop through the commands generated above and execute them.
+	    save_ifs=$IFS; IFS='~'
+	    for cmd in $concat_cmds; do
+	      IFS=$save_ifs
+	      $opt_quiet || {
+		  func_quote_for_expand "$cmd"
+		  eval "func_echo $func_quote_for_expand_result"
+	      }
+	      $opt_dry_run || eval "$cmd" || {
+		lt_exit=$?
+
+		# Restore the uninstalled library and exit
+		if test relink = "$opt_mode"; then
+		  ( cd "$output_objdir" && \
+		    $RM "${realname}T" && \
+		    $MV "${realname}U" "$realname" )
+		fi
+
+		exit $lt_exit
+	      }
+	    done
+	    IFS=$save_ifs
+
+	    if test -n "$export_symbols_regex" && ${skipped_export-false}; then
+	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
+	      func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
+	    fi
+	  fi
+
+          ${skipped_export-false} && {
+	    if test -n "$export_symbols" && test -n "$include_expsyms"; then
+	      tmp_export_symbols=$export_symbols
+	      test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols
+	      $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
+	    fi
+
+	    if test -n "$orig_export_symbols"; then
+	      # The given exports_symbols file has to be filtered, so filter it.
+	      func_verbose "filter symbol list for '$libname.la' to tag DATA exports"
+	      # FIXME: $output_objdir/$libname.filter potentially contains lots of
+	      # 's' commands, which not all seds can handle. GNU sed should be fine
+	      # though. Also, the filter scales superlinearly with the number of
+	      # global variables. join(1) would be nice here, but unfortunately
+	      # isn't a blessed tool.
+	      $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
+	      func_append delfiles " $export_symbols $output_objdir/$libname.filter"
+	      export_symbols=$output_objdir/$libname.def
+	      $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
+	    fi
+	  }
+
+	  libobjs=$output
+	  # Restore the value of output.
+	  output=$save_output
+
+	  if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
+	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+	    test "X$libobjs" = "X " && libobjs=
+	  fi
+	  # Expand the library linking commands again to reset the
+	  # value of $libobjs for piecewise linking.
+
+	  # Do each of the archive commands.
+	  if test yes = "$module" && test -n "$module_cmds"; then
+	    if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
+	      cmds=$module_expsym_cmds
+	    else
+	      cmds=$module_cmds
+	    fi
+	  else
+	    if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+	      cmds=$archive_expsym_cmds
+	    else
+	      cmds=$archive_cmds
+	    fi
+	  fi
+	fi
+
+	if test -n "$delfiles"; then
+	  # Append the command to remove temporary files to $cmds.
+	  eval cmds=\"\$cmds~\$RM $delfiles\"
+	fi
+
+	# Add any objects from preloaded convenience libraries
+	if test -n "$dlprefiles"; then
+	  gentop=$output_objdir/${outputname}x
+	  func_append generated " $gentop"
+
+	  func_extract_archives $gentop $dlprefiles
+	  func_append libobjs " $func_extract_archives_result"
+	  test "X$libobjs" = "X " && libobjs=
+	fi
+
+	save_ifs=$IFS; IFS='~'
+	for cmd in $cmds; do
+	  IFS=$sp$nl
+	  eval cmd=\"$cmd\"
+	  IFS=$save_ifs
+	  $opt_quiet || {
+	    func_quote_for_expand "$cmd"
+	    eval "func_echo $func_quote_for_expand_result"
+	  }
+	  $opt_dry_run || eval "$cmd" || {
+	    lt_exit=$?
+
+	    # Restore the uninstalled library and exit
+	    if test relink = "$opt_mode"; then
+	      ( cd "$output_objdir" && \
+	        $RM "${realname}T" && \
+		$MV "${realname}U" "$realname" )
+	    fi
+
+	    exit $lt_exit
+	  }
+	done
+	IFS=$save_ifs
+
+	# Restore the uninstalled library and exit
+	if test relink = "$opt_mode"; then
+	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
+
+	  if test -n "$convenience"; then
+	    if test -z "$whole_archive_flag_spec"; then
+	      func_show_eval '${RM}r "$gentop"'
+	    fi
+	  fi
+
+	  exit $EXIT_SUCCESS
+	fi
+
+	# Create links to the real library.
+	for linkname in $linknames; do
+	  if test "$realname" != "$linkname"; then
+	    func_show_eval '(cd "$output_objdir" && $RM "$linkname" && $LN_S "$realname" "$linkname")' 'exit $?'
+	  fi
+	done
+
+	# If -module or -export-dynamic was specified, set the dlname.
+	if test yes = "$module" || test yes = "$export_dynamic"; then
+	  # On all known operating systems, these are identical.
+	  dlname=$soname
+	fi
+      fi
+      ;;
+
+    obj)
+      if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
+	func_warning "'-dlopen' is ignored for objects"
+      fi
+
+      case " $deplibs" in
+      *\ -l* | *\ -L*)
+	func_warning "'-l' and '-L' are ignored for objects" ;;
+      esac
+
+      test -n "$rpath" && \
+	func_warning "'-rpath' is ignored for objects"
+
+      test -n "$xrpath" && \
+	func_warning "'-R' is ignored for objects"
+
+      test -n "$vinfo" && \
+	func_warning "'-version-info' is ignored for objects"
+
+      test -n "$release" && \
+	func_warning "'-release' is ignored for objects"
+
+      case $output in
+      *.lo)
+	test -n "$objs$old_deplibs" && \
+	  func_fatal_error "cannot build library object '$output' from non-libtool objects"
+
+	libobj=$output
+	func_lo2o "$libobj"
+	obj=$func_lo2o_result
+	;;
+      *)
+	libobj=
+	obj=$output
+	;;
+      esac
+
+      # Delete the old objects.
+      $opt_dry_run || $RM $obj $libobj
+
+      # Objects from convenience libraries.  This assumes
+      # single-version convenience libraries.  Whenever we create
+      # different ones for PIC/non-PIC, this we'll have to duplicate
+      # the extraction.
+      reload_conv_objs=
+      gentop=
+      # if reload_cmds runs $LD directly, get rid of -Wl from
+      # whole_archive_flag_spec and hope we can get by with turning comma
+      # into space.
+      case $reload_cmds in
+        *\$LD[\ \$]*) wl= ;;
+      esac
+      if test -n "$convenience"; then
+	if test -n "$whole_archive_flag_spec"; then
+	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
+	  test -n "$wl" || tmp_whole_archive_flags=`$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
+	  reload_conv_objs=$reload_objs\ $tmp_whole_archive_flags
+	else
+	  gentop=$output_objdir/${obj}x
+	  func_append generated " $gentop"
+
+	  func_extract_archives $gentop $convenience
+	  reload_conv_objs="$reload_objs $func_extract_archives_result"
+	fi
+      fi
+
+      # If we're not building shared, we need to use non_pic_objs
+      test yes = "$build_libtool_libs" || libobjs=$non_pic_objects
+
+      # Create the old-style object.
+      reload_objs=$objs$old_deplibs' '`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; /\.lib$/d; $lo2o" | $NL2SP`' '$reload_conv_objs
+
+      output=$obj
+      func_execute_cmds "$reload_cmds" 'exit $?'
+
+      # Exit if we aren't doing a library object file.
+      if test -z "$libobj"; then
+	if test -n "$gentop"; then
+	  func_show_eval '${RM}r "$gentop"'
+	fi
+
+	exit $EXIT_SUCCESS
+      fi
+
+      test yes = "$build_libtool_libs" || {
+	if test -n "$gentop"; then
+	  func_show_eval '${RM}r "$gentop"'
+	fi
+
+	# Create an invalid libtool object if no PIC, so that we don't
+	# accidentally link it into a program.
+	# $show "echo timestamp > $libobj"
+	# $opt_dry_run || eval "echo timestamp > $libobj" || exit $?
+	exit $EXIT_SUCCESS
+      }
+
+      if test -n "$pic_flag" || test default != "$pic_mode"; then
+	# Only do commands if we really have different PIC objects.
+	reload_objs="$libobjs $reload_conv_objs"
+	output=$libobj
+	func_execute_cmds "$reload_cmds" 'exit $?'
+      fi
+
+      if test -n "$gentop"; then
+	func_show_eval '${RM}r "$gentop"'
+      fi
+
+      exit $EXIT_SUCCESS
+      ;;
+
+    prog)
+      case $host in
+	*cygwin*) func_stripname '' '.exe' "$output"
+	          output=$func_stripname_result.exe;;
+      esac
+      test -n "$vinfo" && \
+	func_warning "'-version-info' is ignored for programs"
+
+      test -n "$release" && \
+	func_warning "'-release' is ignored for programs"
+
+      $preload \
+	&& test unknown,unknown,unknown = "$dlopen_support,$dlopen_self,$dlopen_self_static" \
+	&& func_warning "'LT_INIT([dlopen])' not used. Assuming no dlopen support."
+
+      case $host in
+      *-*-rhapsody* | *-*-darwin1.[012])
+	# On Rhapsody replace the C library is the System framework
+	compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'`
+	finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'`
+	;;
+      esac
+
+      case $host in
+      *-*-darwin*)
+	# Don't allow lazy linking, it breaks C++ global constructors
+	# But is supposedly fixed on 10.4 or later (yay!).
+	if test CXX = "$tagname"; then
+	  case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
+	    10.[0123])
+	      func_append compile_command " $wl-bind_at_load"
+	      func_append finalize_command " $wl-bind_at_load"
+	    ;;
+	  esac
+	fi
+	# Time to change all our "foo.ltframework" stuff back to "-framework foo"
+	compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	;;
+      esac
+
+
+      # move library search paths that coincide with paths to not yet
+      # installed libraries to the beginning of the library search list
+      new_libs=
+      for path in $notinst_path; do
+	case " $new_libs " in
+	*" -L$path/$objdir "*) ;;
+	*)
+	  case " $compile_deplibs " in
+	  *" -L$path/$objdir "*)
+	    func_append new_libs " -L$path/$objdir" ;;
+	  esac
+	  ;;
+	esac
+      done
+      for deplib in $compile_deplibs; do
+	case $deplib in
+	-L*)
+	  case " $new_libs " in
+	  *" $deplib "*) ;;
+	  *) func_append new_libs " $deplib" ;;
+	  esac
+	  ;;
+	*) func_append new_libs " $deplib" ;;
+	esac
+      done
+      compile_deplibs=$new_libs
+
+
+      func_append compile_command " $compile_deplibs"
+      func_append finalize_command " $finalize_deplibs"
+
+      if test -n "$rpath$xrpath"; then
+	# If the user specified any rpath flags, then add them.
+	for libdir in $rpath $xrpath; do
+	  # This is the magic to use -rpath.
+	  case "$finalize_rpath " in
+	  *" $libdir "*) ;;
+	  *) func_append finalize_rpath " $libdir" ;;
+	  esac
+	done
+      fi
+
+      # Now hardcode the library paths
+      rpath=
+      hardcode_libdirs=
+      for libdir in $compile_rpath $finalize_rpath; do
+	if test -n "$hardcode_libdir_flag_spec"; then
+	  if test -n "$hardcode_libdir_separator"; then
+	    if test -z "$hardcode_libdirs"; then
+	      hardcode_libdirs=$libdir
+	    else
+	      # Just accumulate the unique libdirs.
+	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+		;;
+	      *)
+		func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
+		;;
+	      esac
+	    fi
+	  else
+	    eval flag=\"$hardcode_libdir_flag_spec\"
+	    func_append rpath " $flag"
+	  fi
+	elif test -n "$runpath_var"; then
+	  case "$perm_rpath " in
+	  *" $libdir "*) ;;
+	  *) func_append perm_rpath " $libdir" ;;
+	  esac
+	fi
+	case $host in
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+	  testbindir=`$ECHO "$libdir" | $SED -e 's*/lib$*/bin*'`
+	  case :$dllsearchpath: in
+	  *":$libdir:"*) ;;
+	  ::) dllsearchpath=$libdir;;
+	  *) func_append dllsearchpath ":$libdir";;
+	  esac
+	  case :$dllsearchpath: in
+	  *":$testbindir:"*) ;;
+	  ::) dllsearchpath=$testbindir;;
+	  *) func_append dllsearchpath ":$testbindir";;
+	  esac
+	  ;;
+	esac
+      done
+      # Substitute the hardcoded libdirs into the rpath.
+      if test -n "$hardcode_libdir_separator" &&
+	 test -n "$hardcode_libdirs"; then
+	libdir=$hardcode_libdirs
+	eval rpath=\" $hardcode_libdir_flag_spec\"
+      fi
+      compile_rpath=$rpath
+
+      rpath=
+      hardcode_libdirs=
+      for libdir in $finalize_rpath; do
+	if test -n "$hardcode_libdir_flag_spec"; then
+	  if test -n "$hardcode_libdir_separator"; then
+	    if test -z "$hardcode_libdirs"; then
+	      hardcode_libdirs=$libdir
+	    else
+	      # Just accumulate the unique libdirs.
+	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+		;;
+	      *)
+		func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
+		;;
+	      esac
+	    fi
+	  else
+	    eval flag=\"$hardcode_libdir_flag_spec\"
+	    func_append rpath " $flag"
+	  fi
+	elif test -n "$runpath_var"; then
+	  case "$finalize_perm_rpath " in
+	  *" $libdir "*) ;;
+	  *) func_append finalize_perm_rpath " $libdir" ;;
+	  esac
+	fi
+      done
+      # Substitute the hardcoded libdirs into the rpath.
+      if test -n "$hardcode_libdir_separator" &&
+	 test -n "$hardcode_libdirs"; then
+	libdir=$hardcode_libdirs
+	eval rpath=\" $hardcode_libdir_flag_spec\"
+      fi
+      finalize_rpath=$rpath
+
+      if test -n "$libobjs" && test yes = "$build_old_libs"; then
+	# Transform all the library objects into standard objects.
+	compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
+	finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
+      fi
+
+      func_generate_dlsyms "$outputname" "@PROGRAM@" false
+
+      # template prelinking step
+      if test -n "$prelink_cmds"; then
+	func_execute_cmds "$prelink_cmds" 'exit $?'
+      fi
+
+      wrappers_required=:
+      case $host in
+      *cegcc* | *mingw32ce*)
+        # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
+        wrappers_required=false
+        ;;
+      *cygwin* | *mingw* )
+        test yes = "$build_libtool_libs" || wrappers_required=false
+        ;;
+      *)
+        if test no = "$need_relink" || test yes != "$build_libtool_libs"; then
+          wrappers_required=false
+        fi
+        ;;
+      esac
+      $wrappers_required || {
+	# Replace the output file specification.
+	compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
+	link_command=$compile_command$compile_rpath
+
+	# We have no uninstalled library dependencies, so finalize right now.
+	exit_status=0
+	func_show_eval "$link_command" 'exit_status=$?'
+
+	if test -n "$postlink_cmds"; then
+	  func_to_tool_file "$output"
+	  postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
+	  func_execute_cmds "$postlink_cmds" 'exit $?'
+	fi
+
+	# Delete the generated files.
+	if test -f "$output_objdir/${outputname}S.$objext"; then
+	  func_show_eval '$RM "$output_objdir/${outputname}S.$objext"'
+	fi
+
+	exit $exit_status
+      }
+
+      if test -n "$compile_shlibpath$finalize_shlibpath"; then
+	compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
+      fi
+      if test -n "$finalize_shlibpath"; then
+	finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
+      fi
+
+      compile_var=
+      finalize_var=
+      if test -n "$runpath_var"; then
+	if test -n "$perm_rpath"; then
+	  # We should set the runpath_var.
+	  rpath=
+	  for dir in $perm_rpath; do
+	    func_append rpath "$dir:"
+	  done
+	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
+	fi
+	if test -n "$finalize_perm_rpath"; then
+	  # We should set the runpath_var.
+	  rpath=
+	  for dir in $finalize_perm_rpath; do
+	    func_append rpath "$dir:"
+	  done
+	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
+	fi
+      fi
+
+      if test yes = "$no_install"; then
+	# We don't need to create a wrapper script.
+	link_command=$compile_var$compile_command$compile_rpath
+	# Replace the output file specification.
+	link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
+	# Delete the old output file.
+	$opt_dry_run || $RM $output
+	# Link the executable and exit
+	func_show_eval "$link_command" 'exit $?'
+
+	if test -n "$postlink_cmds"; then
+	  func_to_tool_file "$output"
+	  postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
+	  func_execute_cmds "$postlink_cmds" 'exit $?'
+	fi
+
+	exit $EXIT_SUCCESS
+      fi
+
+      case $hardcode_action,$fast_install in
+        relink,*)
+	  # Fast installation is not supported
+	  link_command=$compile_var$compile_command$compile_rpath
+	  relink_command=$finalize_var$finalize_command$finalize_rpath
+
+	  func_warning "this platform does not like uninstalled shared libraries"
+	  func_warning "'$output' will be relinked during installation"
+	  ;;
+        *,yes)
+	  link_command=$finalize_var$compile_command$finalize_rpath
+	  relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
+          ;;
+	*,no)
+	  link_command=$compile_var$compile_command$compile_rpath
+	  relink_command=$finalize_var$finalize_command$finalize_rpath
+          ;;
+	*,needless)
+	  link_command=$finalize_var$compile_command$finalize_rpath
+	  relink_command=
+          ;;
+      esac
+
+      # Replace the output file specification.
+      link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
+
+      # Delete the old output files.
+      $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
+
+      func_show_eval "$link_command" 'exit $?'
+
+      if test -n "$postlink_cmds"; then
+	func_to_tool_file "$output_objdir/$outputname"
+	postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
+	func_execute_cmds "$postlink_cmds" 'exit $?'
+      fi
+
+      # Now create the wrapper script.
+      func_verbose "creating $output"
+
+      # Quote the relink command for shipping.
+      if test -n "$relink_command"; then
+	# Preserve any variables that may affect compiler behavior
+	for var in $variables_saved_for_relink; do
+	  if eval test -z \"\${$var+set}\"; then
+	    relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
+	  elif eval var_value=\$$var; test -z "$var_value"; then
+	    relink_command="$var=; export $var; $relink_command"
+	  else
+	    func_quote_for_eval "$var_value"
+	    relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
+	  fi
+	done
+	relink_command="(cd `pwd`; $relink_command)"
+	relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
+      fi
+
+      # Only actually do things if not in dry run mode.
+      $opt_dry_run || {
+	# win32 will think the script is a binary if it has
+	# a .exe suffix, so we strip it off here.
+	case $output in
+	  *.exe) func_stripname '' '.exe' "$output"
+	         output=$func_stripname_result ;;
+	esac
+	# test for cygwin because mv fails w/o .exe extensions
+	case $host in
+	  *cygwin*)
+	    exeext=.exe
+	    func_stripname '' '.exe' "$outputname"
+	    outputname=$func_stripname_result ;;
+	  *) exeext= ;;
+	esac
+	case $host in
+	  *cygwin* | *mingw* )
+	    func_dirname_and_basename "$output" "" "."
+	    output_name=$func_basename_result
+	    output_path=$func_dirname_result
+	    cwrappersource=$output_path/$objdir/lt-$output_name.c
+	    cwrapper=$output_path/$output_name.exe
+	    $RM $cwrappersource $cwrapper
+	    trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
+
+	    func_emit_cwrapperexe_src > $cwrappersource
+
+	    # The wrapper executable is built using the $host compiler,
+	    # because it contains $host paths and files. If cross-
+	    # compiling, it, like the target executable, must be
+	    # executed on the $host or under an emulation environment.
+	    $opt_dry_run || {
+	      $LTCC $LTCFLAGS -o $cwrapper $cwrappersource
+	      $STRIP $cwrapper
+	    }
+
+	    # Now, create the wrapper script for func_source use:
+	    func_ltwrapper_scriptname $cwrapper
+	    $RM $func_ltwrapper_scriptname_result
+	    trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15
+	    $opt_dry_run || {
+	      # note: this script will not be executed, so do not chmod.
+	      if test "x$build" = "x$host"; then
+		$cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result
+	      else
+		func_emit_wrapper no > $func_ltwrapper_scriptname_result
+	      fi
+	    }
+	  ;;
+	  * )
+	    $RM $output
+	    trap "$RM $output; exit $EXIT_FAILURE" 1 2 15
+
+	    func_emit_wrapper no > $output
+	    chmod +x $output
+	  ;;
+	esac
+      }
+      exit $EXIT_SUCCESS
+      ;;
+    esac
+
+    # See if we need to build an old-fashioned archive.
+    for oldlib in $oldlibs; do
+
+      case $build_libtool_libs in
+        convenience)
+	  oldobjs="$libobjs_save $symfileobj"
+	  addlibs=$convenience
+	  build_libtool_libs=no
+	  ;;
+	module)
+	  oldobjs=$libobjs_save
+	  addlibs=$old_convenience
+	  build_libtool_libs=no
+          ;;
+	*)
+	  oldobjs="$old_deplibs $non_pic_objects"
+	  $preload && test -f "$symfileobj" \
+	    && func_append oldobjs " $symfileobj"
+	  addlibs=$old_convenience
+	  ;;
+      esac
+
+      if test -n "$addlibs"; then
+	gentop=$output_objdir/${outputname}x
+	func_append generated " $gentop"
+
+	func_extract_archives $gentop $addlibs
+	func_append oldobjs " $func_extract_archives_result"
+      fi
+
+      # Do each command in the archive commands.
+      if test -n "$old_archive_from_new_cmds" && test yes = "$build_libtool_libs"; then
+	cmds=$old_archive_from_new_cmds
+      else
+
+	# Add any objects from preloaded convenience libraries
+	if test -n "$dlprefiles"; then
+	  gentop=$output_objdir/${outputname}x
+	  func_append generated " $gentop"
+
+	  func_extract_archives $gentop $dlprefiles
+	  func_append oldobjs " $func_extract_archives_result"
+	fi
+
+	# POSIX demands no paths to be encoded in archives.  We have
+	# to avoid creating archives with duplicate basenames if we
+	# might have to extract them afterwards, e.g., when creating a
+	# static archive out of a convenience library, or when linking
+	# the entirety of a libtool archive into another (currently
+	# not supported by libtool).
+	if (for obj in $oldobjs
+	    do
+	      func_basename "$obj"
+	      $ECHO "$func_basename_result"
+	    done | sort | sort -uc >/dev/null 2>&1); then
+	  :
+	else
+	  echo "copying selected object files to avoid basename conflicts..."
+	  gentop=$output_objdir/${outputname}x
+	  func_append generated " $gentop"
+	  func_mkdir_p "$gentop"
+	  save_oldobjs=$oldobjs
+	  oldobjs=
+	  counter=1
+	  for obj in $save_oldobjs
+	  do
+	    func_basename "$obj"
+	    objbase=$func_basename_result
+	    case " $oldobjs " in
+	    " ") oldobjs=$obj ;;
+	    *[\ /]"$objbase "*)
+	      while :; do
+		# Make sure we don't pick an alternate name that also
+		# overlaps.
+		newobj=lt$counter-$objbase
+		func_arith $counter + 1
+		counter=$func_arith_result
+		case " $oldobjs " in
+		*[\ /]"$newobj "*) ;;
+		*) if test ! -f "$gentop/$newobj"; then break; fi ;;
+		esac
+	      done
+	      func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
+	      func_append oldobjs " $gentop/$newobj"
+	      ;;
+	    *) func_append oldobjs " $obj" ;;
+	    esac
+	  done
+	fi
+	func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+	tool_oldlib=$func_to_tool_file_result
+	eval cmds=\"$old_archive_cmds\"
+
+	func_len " $cmds"
+	len=$func_len_result
+	if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+	  cmds=$old_archive_cmds
+	elif test -n "$archiver_list_spec"; then
+	  func_verbose "using command file archive linking..."
+	  for obj in $oldobjs
+	  do
+	    func_to_tool_file "$obj"
+	    $ECHO "$func_to_tool_file_result"
+	  done > $output_objdir/$libname.libcmd
+	  func_to_tool_file "$output_objdir/$libname.libcmd"
+	  oldobjs=" $archiver_list_spec$func_to_tool_file_result"
+	  cmds=$old_archive_cmds
+	else
+	  # the command line is too long to link in one step, link in parts
+	  func_verbose "using piecewise archive linking..."
+	  save_RANLIB=$RANLIB
+	  RANLIB=:
+	  objlist=
+	  concat_cmds=
+	  save_oldobjs=$oldobjs
+	  oldobjs=
+	  # Is there a better way of finding the last object in the list?
+	  for obj in $save_oldobjs
+	  do
+	    last_oldobj=$obj
+	  done
+	  eval test_cmds=\"$old_archive_cmds\"
+	  func_len " $test_cmds"
+	  len0=$func_len_result
+	  len=$len0
+	  for obj in $save_oldobjs
+	  do
+	    func_len " $obj"
+	    func_arith $len + $func_len_result
+	    len=$func_arith_result
+	    func_append objlist " $obj"
+	    if test "$len" -lt "$max_cmd_len"; then
+	      :
+	    else
+	      # the above command should be used before it gets too long
+	      oldobjs=$objlist
+	      if test "$obj" = "$last_oldobj"; then
+		RANLIB=$save_RANLIB
+	      fi
+	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+	      eval concat_cmds=\"\$concat_cmds$old_archive_cmds\"
+	      objlist=
+	      len=$len0
+	    fi
+	  done
+	  RANLIB=$save_RANLIB
+	  oldobjs=$objlist
+	  if test -z "$oldobjs"; then
+	    eval cmds=\"\$concat_cmds\"
+	  else
+	    eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
+	  fi
+	fi
+      fi
+      func_execute_cmds "$cmds" 'exit $?'
+    done
+
+    test -n "$generated" && \
+      func_show_eval "${RM}r$generated"
+
+    # Now create the libtool archive.
+    case $output in
+    *.la)
+      old_library=
+      test yes = "$build_old_libs" && old_library=$libname.$libext
+      func_verbose "creating $output"
+
+      # Preserve any variables that may affect compiler behavior
+      for var in $variables_saved_for_relink; do
+	if eval test -z \"\${$var+set}\"; then
+	  relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
+	elif eval var_value=\$$var; test -z "$var_value"; then
+	  relink_command="$var=; export $var; $relink_command"
+	else
+	  func_quote_for_eval "$var_value"
+	  relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
+	fi
+      done
+      # Quote the link command for shipping.
+      relink_command="(cd `pwd`; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
+      relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
+      if test yes = "$hardcode_automatic"; then
+	relink_command=
+      fi
+
+      # Only create the output if not a dry run.
+      $opt_dry_run || {
+	for installed in no yes; do
+	  if test yes = "$installed"; then
+	    if test -z "$install_libdir"; then
+	      break
+	    fi
+	    output=$output_objdir/${outputname}i
+	    # Replace all uninstalled libtool libraries with the installed ones
+	    newdependency_libs=
+	    for deplib in $dependency_libs; do
+	      case $deplib in
+	      *.la)
+		func_basename "$deplib"
+		name=$func_basename_result
+		func_resolve_sysroot "$deplib"
+		eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
+		test -z "$libdir" && \
+		  func_fatal_error "'$deplib' is not a valid libtool archive"
+		func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
+		;;
+	      -L*)
+		func_stripname -L '' "$deplib"
+		func_replace_sysroot "$func_stripname_result"
+		func_append newdependency_libs " -L$func_replace_sysroot_result"
+		;;
+	      -R*)
+		func_stripname -R '' "$deplib"
+		func_replace_sysroot "$func_stripname_result"
+		func_append newdependency_libs " -R$func_replace_sysroot_result"
+		;;
+	      *) func_append newdependency_libs " $deplib" ;;
+	      esac
+	    done
+	    dependency_libs=$newdependency_libs
+	    newdlfiles=
+
+	    for lib in $dlfiles; do
+	      case $lib in
+	      *.la)
+	        func_basename "$lib"
+		name=$func_basename_result
+		eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+		test -z "$libdir" && \
+		  func_fatal_error "'$lib' is not a valid libtool archive"
+		func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
+		;;
+	      *) func_append newdlfiles " $lib" ;;
+	      esac
+	    done
+	    dlfiles=$newdlfiles
+	    newdlprefiles=
+	    for lib in $dlprefiles; do
+	      case $lib in
+	      *.la)
+		# Only pass preopened files to the pseudo-archive (for
+		# eventual linking with the app. that links it) if we
+		# didn't already link the preopened objects directly into
+		# the library:
+		func_basename "$lib"
+		name=$func_basename_result
+		eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+		test -z "$libdir" && \
+		  func_fatal_error "'$lib' is not a valid libtool archive"
+		func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
+		;;
+	      esac
+	    done
+	    dlprefiles=$newdlprefiles
+	  else
+	    newdlfiles=
+	    for lib in $dlfiles; do
+	      case $lib in
+		[\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;;
+		*) abs=`pwd`"/$lib" ;;
+	      esac
+	      func_append newdlfiles " $abs"
+	    done
+	    dlfiles=$newdlfiles
+	    newdlprefiles=
+	    for lib in $dlprefiles; do
+	      case $lib in
+		[\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;;
+		*) abs=`pwd`"/$lib" ;;
+	      esac
+	      func_append newdlprefiles " $abs"
+	    done
+	    dlprefiles=$newdlprefiles
+	  fi
+	  $RM $output
+	  # place dlname in correct position for cygwin
+	  # In fact, it would be nice if we could use this code for all target
+	  # systems that can't hard-code library paths into their executables
+	  # and that have no shared library path variable independent of PATH,
+	  # but it turns out we can't easily determine that from inspecting
+	  # libtool variables, so we have to hard-code the OSs to which it
+	  # applies here; at the moment, that means platforms that use the PE
+	  # object format with DLL files.  See the long comment at the top of
+	  # tests/bindir.at for full details.
+	  tdlname=$dlname
+	  case $host,$output,$installed,$module,$dlname in
+	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
+	      # If a -bindir argument was supplied, place the dll there.
+	      if test -n "$bindir"; then
+		func_relative_path "$install_libdir" "$bindir"
+		tdlname=$func_relative_path_result/$dlname
+	      else
+		# Otherwise fall back on heuristic.
+		tdlname=../bin/$dlname
+	      fi
+	      ;;
+	  esac
+	  $ECHO > $output "\
+# $outputname - a libtool library file
+# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# The name that we can dlopen(3).
+dlname='$tdlname'
+
+# Names of this library.
+library_names='$library_names'
+
+# The name of the static archive.
+old_library='$old_library'
+
+# Linker flags that cannot go in dependency_libs.
+inherited_linker_flags='$new_inherited_linker_flags'
+
+# Libraries that this one depends upon.
+dependency_libs='$dependency_libs'
+
+# Names of additional weak libraries provided by this library
+weak_library_names='$weak_libs'
+
+# Version information for $libname.
+current=$current
+age=$age
+revision=$revision
+
+# Is this an already installed library?
+installed=$installed
+
+# Should we warn about portability when linking against -modules?
+shouldnotlink=$module
+
+# Files to dlopen/dlpreopen
+dlopen='$dlfiles'
+dlpreopen='$dlprefiles'
+
+# Directory that this library needs to be installed in:
+libdir='$install_libdir'"
+	  if test no,yes = "$installed,$need_relink"; then
+	    $ECHO >> $output "\
+relink_command=\"$relink_command\""
+	  fi
+	done
+      }
+
+      # Do a symbolic link so that the libtool archive can be found in
+      # LD_LIBRARY_PATH before the program is installed.
+      func_show_eval '( cd "$output_objdir" && $RM "$outputname" && $LN_S "../$outputname" "$outputname" )' 'exit $?'
+      ;;
+    esac
+    exit $EXIT_SUCCESS
+}
+
+if test link = "$opt_mode" || test relink = "$opt_mode"; then
+  func_mode_link ${1+"$@"}
+fi
+
+
+# func_mode_uninstall arg...
+func_mode_uninstall ()
+{
+    $debug_cmd
+
+    RM=$nonopt
+    files=
+    rmforce=false
+    exit_status=0
+
+    # This variable tells wrapper scripts just to set variables rather
+    # than running their programs.
+    libtool_install_magic=$magic
+
+    for arg
+    do
+      case $arg in
+      -f) func_append RM " $arg"; rmforce=: ;;
+      -*) func_append RM " $arg" ;;
+      *) func_append files " $arg" ;;
+      esac
+    done
+
+    test -z "$RM" && \
+      func_fatal_help "you must specify an RM program"
+
+    rmdirs=
+
+    for file in $files; do
+      func_dirname "$file" "" "."
+      dir=$func_dirname_result
+      if test . = "$dir"; then
+	odir=$objdir
+      else
+	odir=$dir/$objdir
+      fi
+      func_basename "$file"
+      name=$func_basename_result
+      test uninstall = "$opt_mode" && odir=$dir
+
+      # Remember odir for removal later, being careful to avoid duplicates
+      if test clean = "$opt_mode"; then
+	case " $rmdirs " in
+	  *" $odir "*) ;;
+	  *) func_append rmdirs " $odir" ;;
+	esac
+      fi
+
+      # Don't error if the file doesn't exist and rm -f was used.
+      if { test -L "$file"; } >/dev/null 2>&1 ||
+	 { test -h "$file"; } >/dev/null 2>&1 ||
+	 test -f "$file"; then
+	:
+      elif test -d "$file"; then
+	exit_status=1
+	continue
+      elif $rmforce; then
+	continue
+      fi
+
+      rmfiles=$file
+
+      case $name in
+      *.la)
+	# Possibly a libtool archive, so verify it.
+	if func_lalib_p "$file"; then
+	  func_source $dir/$name
+
+	  # Delete the libtool libraries and symlinks.
+	  for n in $library_names; do
+	    func_append rmfiles " $odir/$n"
+	  done
+	  test -n "$old_library" && func_append rmfiles " $odir/$old_library"
+
+	  case $opt_mode in
+	  clean)
+	    case " $library_names " in
+	    *" $dlname "*) ;;
+	    *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;;
+	    esac
+	    test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i"
+	    ;;
+	  uninstall)
+	    if test -n "$library_names"; then
+	      # Do each command in the postuninstall commands.
+	      func_execute_cmds "$postuninstall_cmds" '$rmforce || exit_status=1'
+	    fi
+
+	    if test -n "$old_library"; then
+	      # Do each command in the old_postuninstall commands.
+	      func_execute_cmds "$old_postuninstall_cmds" '$rmforce || exit_status=1'
+	    fi
+	    # FIXME: should reinstall the best remaining shared library.
+	    ;;
+	  esac
+	fi
+	;;
+
+      *.lo)
+	# Possibly a libtool object, so verify it.
+	if func_lalib_p "$file"; then
+
+	  # Read the .lo file
+	  func_source $dir/$name
+
+	  # Add PIC object to the list of files to remove.
+	  if test -n "$pic_object" && test none != "$pic_object"; then
+	    func_append rmfiles " $dir/$pic_object"
+	  fi
+
+	  # Add non-PIC object to the list of files to remove.
+	  if test -n "$non_pic_object" && test none != "$non_pic_object"; then
+	    func_append rmfiles " $dir/$non_pic_object"
+	  fi
+	fi
+	;;
+
+      *)
+	if test clean = "$opt_mode"; then
+	  noexename=$name
+	  case $file in
+	  *.exe)
+	    func_stripname '' '.exe' "$file"
+	    file=$func_stripname_result
+	    func_stripname '' '.exe' "$name"
+	    noexename=$func_stripname_result
+	    # $file with .exe has already been added to rmfiles,
+	    # add $file without .exe
+	    func_append rmfiles " $file"
+	    ;;
+	  esac
+	  # Do a test to see if this is a libtool program.
+	  if func_ltwrapper_p "$file"; then
+	    if func_ltwrapper_executable_p "$file"; then
+	      func_ltwrapper_scriptname "$file"
+	      relink_command=
+	      func_source $func_ltwrapper_scriptname_result
+	      func_append rmfiles " $func_ltwrapper_scriptname_result"
+	    else
+	      relink_command=
+	      func_source $dir/$noexename
+	    fi
+
+	    # note $name still contains .exe if it was in $file originally
+	    # as does the version of $file that was added into $rmfiles
+	    func_append rmfiles " $odir/$name $odir/${name}S.$objext"
+	    if test yes = "$fast_install" && test -n "$relink_command"; then
+	      func_append rmfiles " $odir/lt-$name"
+	    fi
+	    if test "X$noexename" != "X$name"; then
+	      func_append rmfiles " $odir/lt-$noexename.c"
+	    fi
+	  fi
+	fi
+	;;
+      esac
+      func_show_eval "$RM $rmfiles" 'exit_status=1'
+    done
+
+    # Try to remove the $objdir's in the directories where we deleted files
+    for dir in $rmdirs; do
+      if test -d "$dir"; then
+	func_show_eval "rmdir $dir >/dev/null 2>&1"
+      fi
+    done
+
+    exit $exit_status
+}
+
+if test uninstall = "$opt_mode" || test clean = "$opt_mode"; then
+  func_mode_uninstall ${1+"$@"}
+fi
+
+test -z "$opt_mode" && {
+  help=$generic_help
+  func_fatal_help "you must specify a MODE"
+}
+
+test -z "$exec_cmd" && \
+  func_fatal_help "invalid operation mode '$opt_mode'"
+
+if test -n "$exec_cmd"; then
+  eval exec "$exec_cmd"
+  exit $EXIT_FAILURE
+fi
+
+exit $exit_status
+
+
+# The TAGs below are defined such that we never get into a situation
+# where we disable both kinds of libraries.  Given conflicting
+# choices, we go for a static library, that is the most portable,
+# since we can't tell whether shared libraries were disabled because
+# the user asked for that or because the platform doesn't support
+# them.  This is particularly important on AIX, because we don't
+# support having both static and shared libraries enabled at the same
+# time on that platform, so we default to a shared-only configuration.
+# If a disable-shared tag is given, we'll fallback to a static-only
+# configuration.  But we'll never go from static-only to shared-only.
+
+# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
+build_libtool_libs=no
+build_old_libs=yes
+# ### END LIBTOOL TAG CONFIG: disable-shared
+
+# ### BEGIN LIBTOOL TAG CONFIG: disable-static
+build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
+# ### END LIBTOOL TAG CONFIG: disable-static
+
+# Local Variables:
+# mode:shell-script
+# sh-indentation:2
+# End:
diff --git a/config/ltoptions.m4 b/config/ltoptions.m4
new file mode 100644
index 0000000..94b0829
--- /dev/null
+++ b/config/ltoptions.m4
@@ -0,0 +1,437 @@
+# Helper functions for option handling.                    -*- Autoconf -*-
+#
+#   Copyright (C) 2004-2005, 2007-2009, 2011-2015 Free Software
+#   Foundation, Inc.
+#   Written by Gary V. Vaughan, 2004
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# serial 8 ltoptions.m4
+
+# This is to help aclocal find these macros, as it can't see m4_define.
+AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
+
+
+# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)
+# ------------------------------------------
+m4_define([_LT_MANGLE_OPTION],
+[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])])
+
+
+# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME)
+# ---------------------------------------
+# Set option OPTION-NAME for macro MACRO-NAME, and if there is a
+# matching handler defined, dispatch to it.  Other OPTION-NAMEs are
+# saved as a flag.
+m4_define([_LT_SET_OPTION],
+[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
+m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
+        _LT_MANGLE_DEFUN([$1], [$2]),
+    [m4_warning([Unknown $1 option '$2'])])[]dnl
+])
+
+
+# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET])
+# ------------------------------------------------------------
+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+m4_define([_LT_IF_OPTION],
+[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])])
+
+
+# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET)
+# -------------------------------------------------------
+# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME
+# are set.
+m4_define([_LT_UNLESS_OPTIONS],
+[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
+	    [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option),
+		      [m4_define([$0_found])])])[]dnl
+m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3
+])[]dnl
+])
+
+
+# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST)
+# ----------------------------------------
+# OPTION-LIST is a space-separated list of Libtool options associated
+# with MACRO-NAME.  If any OPTION has a matching handler declared with
+# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about
+# the unknown option and exit.
+m4_defun([_LT_SET_OPTIONS],
+[# Set options
+m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
+    [_LT_SET_OPTION([$1], _LT_Option)])
+
+m4_if([$1],[LT_INIT],[
+  dnl
+  dnl Simply set some default values (i.e off) if boolean options were not
+  dnl specified:
+  _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no
+  ])
+  _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no
+  ])
+  dnl
+  dnl If no reference was made to various pairs of opposing options, then
+  dnl we run the default mode handler for the pair.  For example, if neither
+  dnl 'shared' nor 'disable-shared' was passed, we enable building of shared
+  dnl archives by default:
+  _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
+  _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
+  _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
+  _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
+		   [_LT_ENABLE_FAST_INSTALL])
+  _LT_UNLESS_OPTIONS([LT_INIT], [aix-soname=aix aix-soname=both aix-soname=svr4],
+		   [_LT_WITH_AIX_SONAME([aix])])
+  ])
+])# _LT_SET_OPTIONS
+
+
+## --------------------------------- ##
+## Macros to handle LT_INIT options. ##
+## --------------------------------- ##
+
+# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME)
+# -----------------------------------------
+m4_define([_LT_MANGLE_DEFUN],
+[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])])
+
+
+# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE)
+# -----------------------------------------------
+m4_define([LT_OPTION_DEFINE],
+[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl
+])# LT_OPTION_DEFINE
+
+
+# dlopen
+# ------
+LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes
+])
+
+AU_DEFUN([AC_LIBTOOL_DLOPEN],
+[_LT_SET_OPTION([LT_INIT], [dlopen])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the 'dlopen' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], [])
+
+
+# win32-dll
+# ---------
+# Declare package support for building win32 dll's.
+LT_OPTION_DEFINE([LT_INIT], [win32-dll],
+[enable_win32_dll=yes
+
+case $host in
+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
+  AC_CHECK_TOOL(AS, as, false)
+  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+  AC_CHECK_TOOL(OBJDUMP, objdump, false)
+  ;;
+esac
+
+test -z "$AS" && AS=as
+_LT_DECL([], [AS],      [1], [Assembler program])dnl
+
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
+
+test -z "$OBJDUMP" && OBJDUMP=objdump
+_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl
+])# win32-dll
+
+AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+_LT_SET_OPTION([LT_INIT], [win32-dll])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the 'win32-dll' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
+
+
+# _LT_ENABLE_SHARED([DEFAULT])
+# ----------------------------
+# implement the --enable-shared flag, and supports the 'shared' and
+# 'disable-shared' LT_INIT options.
+# DEFAULT is either 'yes' or 'no'.  If omitted, it defaults to 'yes'.
+m4_define([_LT_ENABLE_SHARED],
+[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
+AC_ARG_ENABLE([shared],
+    [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
+	[build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_shared=yes ;;
+    no) enable_shared=no ;;
+    *)
+      enable_shared=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+      for pkg in $enableval; do
+	IFS=$lt_save_ifs
+	if test "X$pkg" = "X$p"; then
+	  enable_shared=yes
+	fi
+      done
+      IFS=$lt_save_ifs
+      ;;
+    esac],
+    [enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
+
+    _LT_DECL([build_libtool_libs], [enable_shared], [0],
+	[Whether or not to build shared libraries])
+])# _LT_ENABLE_SHARED
+
+LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])])
+LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])])
+
+# Old names:
+AC_DEFUN([AC_ENABLE_SHARED],
+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])
+])
+
+AC_DEFUN([AC_DISABLE_SHARED],
+[_LT_SET_OPTION([LT_INIT], [disable-shared])
+])
+
+AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
+AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_ENABLE_SHARED], [])
+dnl AC_DEFUN([AM_DISABLE_SHARED], [])
+
+
+
+# _LT_ENABLE_STATIC([DEFAULT])
+# ----------------------------
+# implement the --enable-static flag, and support the 'static' and
+# 'disable-static' LT_INIT options.
+# DEFAULT is either 'yes' or 'no'.  If omitted, it defaults to 'yes'.
+m4_define([_LT_ENABLE_STATIC],
+[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
+AC_ARG_ENABLE([static],
+    [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@],
+	[build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_static=yes ;;
+    no) enable_static=no ;;
+    *)
+     enable_static=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+      for pkg in $enableval; do
+	IFS=$lt_save_ifs
+	if test "X$pkg" = "X$p"; then
+	  enable_static=yes
+	fi
+      done
+      IFS=$lt_save_ifs
+      ;;
+    esac],
+    [enable_static=]_LT_ENABLE_STATIC_DEFAULT)
+
+    _LT_DECL([build_old_libs], [enable_static], [0],
+	[Whether or not to build static libraries])
+])# _LT_ENABLE_STATIC
+
+LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])])
+LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])])
+
+# Old names:
+AC_DEFUN([AC_ENABLE_STATIC],
+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])
+])
+
+AC_DEFUN([AC_DISABLE_STATIC],
+[_LT_SET_OPTION([LT_INIT], [disable-static])
+])
+
+AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
+AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_ENABLE_STATIC], [])
+dnl AC_DEFUN([AM_DISABLE_STATIC], [])
+
+
+
+# _LT_ENABLE_FAST_INSTALL([DEFAULT])
+# ----------------------------------
+# implement the --enable-fast-install flag, and support the 'fast-install'
+# and 'disable-fast-install' LT_INIT options.
+# DEFAULT is either 'yes' or 'no'.  If omitted, it defaults to 'yes'.
+m4_define([_LT_ENABLE_FAST_INSTALL],
+[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
+AC_ARG_ENABLE([fast-install],
+    [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
+    [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_fast_install=yes ;;
+    no) enable_fast_install=no ;;
+    *)
+      enable_fast_install=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+      for pkg in $enableval; do
+	IFS=$lt_save_ifs
+	if test "X$pkg" = "X$p"; then
+	  enable_fast_install=yes
+	fi
+      done
+      IFS=$lt_save_ifs
+      ;;
+    esac],
+    [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
+
+_LT_DECL([fast_install], [enable_fast_install], [0],
+	 [Whether or not to optimize for fast installation])dnl
+])# _LT_ENABLE_FAST_INSTALL
+
+LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])])
+LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])])
+
+# Old names:
+AU_DEFUN([AC_ENABLE_FAST_INSTALL],
+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you put
+the 'fast-install' option into LT_INIT's first parameter.])
+])
+
+AU_DEFUN([AC_DISABLE_FAST_INSTALL],
+[_LT_SET_OPTION([LT_INIT], [disable-fast-install])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you put
+the 'disable-fast-install' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
+dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
+
+
+# _LT_WITH_AIX_SONAME([DEFAULT])
+# ----------------------------------
+# implement the --with-aix-soname flag, and support the `aix-soname=aix'
+# and `aix-soname=both' and `aix-soname=svr4' LT_INIT options. DEFAULT
+# is either `aix', `both' or `svr4'.  If omitted, it defaults to `aix'.
+m4_define([_LT_WITH_AIX_SONAME],
+[m4_define([_LT_WITH_AIX_SONAME_DEFAULT], [m4_if($1, svr4, svr4, m4_if($1, both, both, aix))])dnl
+shared_archive_member_spec=
+case $host,$enable_shared in
+power*-*-aix[[5-9]]*,yes)
+  AC_MSG_CHECKING([which variant of shared library versioning to provide])
+  AC_ARG_WITH([aix-soname],
+    [AS_HELP_STRING([--with-aix-soname=aix|svr4|both],
+      [shared library versioning (aka "SONAME") variant to provide on AIX, @<:@default=]_LT_WITH_AIX_SONAME_DEFAULT[@:>@.])],
+    [case $withval in
+    aix|svr4|both)
+      ;;
+    *)
+      AC_MSG_ERROR([Unknown argument to --with-aix-soname])
+      ;;
+    esac
+    lt_cv_with_aix_soname=$with_aix_soname],
+    [AC_CACHE_VAL([lt_cv_with_aix_soname],
+      [lt_cv_with_aix_soname=]_LT_WITH_AIX_SONAME_DEFAULT)
+    with_aix_soname=$lt_cv_with_aix_soname])
+  AC_MSG_RESULT([$with_aix_soname])
+  if test aix != "$with_aix_soname"; then
+    # For the AIX way of multilib, we name the shared archive member
+    # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
+    # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File.
+    # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag,
+    # the AIX toolchain works better with OBJECT_MODE set (default 32).
+    if test 64 = "${OBJECT_MODE-32}"; then
+      shared_archive_member_spec=shr_64
+    else
+      shared_archive_member_spec=shr
+    fi
+  fi
+  ;;
+*)
+  with_aix_soname=aix
+  ;;
+esac
+
+_LT_DECL([], [shared_archive_member_spec], [0],
+    [Shared archive member basename, for filename based shared library versioning on AIX])dnl
+])# _LT_WITH_AIX_SONAME
+
+LT_OPTION_DEFINE([LT_INIT], [aix-soname=aix], [_LT_WITH_AIX_SONAME([aix])])
+LT_OPTION_DEFINE([LT_INIT], [aix-soname=both], [_LT_WITH_AIX_SONAME([both])])
+LT_OPTION_DEFINE([LT_INIT], [aix-soname=svr4], [_LT_WITH_AIX_SONAME([svr4])])
+
+
+# _LT_WITH_PIC([MODE])
+# --------------------
+# implement the --with-pic flag, and support the 'pic-only' and 'no-pic'
+# LT_INIT options.
+# MODE is either 'yes' or 'no'.  If omitted, it defaults to 'both'.
+m4_define([_LT_WITH_PIC],
+[AC_ARG_WITH([pic],
+    [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
+	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
+    [lt_p=${PACKAGE-default}
+    case $withval in
+    yes|no) pic_mode=$withval ;;
+    *)
+      pic_mode=default
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+      for lt_pkg in $withval; do
+	IFS=$lt_save_ifs
+	if test "X$lt_pkg" = "X$lt_p"; then
+	  pic_mode=yes
+	fi
+      done
+      IFS=$lt_save_ifs
+      ;;
+    esac],
+    [pic_mode=m4_default([$1], [default])])
+
+_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
+])# _LT_WITH_PIC
+
+LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])])
+LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])])
+
+# Old name:
+AU_DEFUN([AC_LIBTOOL_PICMODE],
+[_LT_SET_OPTION([LT_INIT], [pic-only])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the 'pic-only' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_PICMODE], [])
+
+## ----------------- ##
+## LTDL_INIT Options ##
+## ----------------- ##
+
+m4_define([_LTDL_MODE], [])
+LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive],
+		 [m4_define([_LTDL_MODE], [nonrecursive])])
+LT_OPTION_DEFINE([LTDL_INIT], [recursive],
+		 [m4_define([_LTDL_MODE], [recursive])])
+LT_OPTION_DEFINE([LTDL_INIT], [subproject],
+		 [m4_define([_LTDL_MODE], [subproject])])
+
+m4_define([_LTDL_TYPE], [])
+LT_OPTION_DEFINE([LTDL_INIT], [installable],
+		 [m4_define([_LTDL_TYPE], [installable])])
+LT_OPTION_DEFINE([LTDL_INIT], [convenience],
+		 [m4_define([_LTDL_TYPE], [convenience])])
diff --git a/config/ltsugar.m4 b/config/ltsugar.m4
new file mode 100644
index 0000000..48bc934
--- /dev/null
+++ b/config/ltsugar.m4
@@ -0,0 +1,124 @@
+# ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
+#
+# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software
+# Foundation, Inc.
+# Written by Gary V. Vaughan, 2004
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# serial 6 ltsugar.m4
+
+# This is to help aclocal find these macros, as it can't see m4_define.
+AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
+
+
+# lt_join(SEP, ARG1, [ARG2...])
+# -----------------------------
+# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their
+# associated separator.
+# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier
+# versions in m4sugar had bugs.
+m4_define([lt_join],
+[m4_if([$#], [1], [],
+       [$#], [2], [[$2]],
+       [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])])
+m4_define([_lt_join],
+[m4_if([$#$2], [2], [],
+       [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])])
+
+
+# lt_car(LIST)
+# lt_cdr(LIST)
+# ------------
+# Manipulate m4 lists.
+# These macros are necessary as long as will still need to support
+# Autoconf-2.59, which quotes differently.
+m4_define([lt_car], [[$1]])
+m4_define([lt_cdr],
+[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
+       [$#], 1, [],
+       [m4_dquote(m4_shift($@))])])
+m4_define([lt_unquote], $1)
+
+
+# lt_append(MACRO-NAME, STRING, [SEPARATOR])
+# ------------------------------------------
+# Redefine MACRO-NAME to hold its former content plus 'SEPARATOR''STRING'.
+# Note that neither SEPARATOR nor STRING are expanded; they are appended
+# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
+# No SEPARATOR is output if MACRO-NAME was previously undefined (different
+# than defined and empty).
+#
+# This macro is needed until we can rely on Autoconf 2.62, since earlier
+# versions of m4sugar mistakenly expanded SEPARATOR but not STRING.
+m4_define([lt_append],
+[m4_define([$1],
+	   m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])])
+
+
+
+# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...])
+# ----------------------------------------------------------
+# Produce a SEP delimited list of all paired combinations of elements of
+# PREFIX-LIST with SUFFIX1 through SUFFIXn.  Each element of the list
+# has the form PREFIXmINFIXSUFFIXn.
+# Needed until we can rely on m4_combine added in Autoconf 2.62.
+m4_define([lt_combine],
+[m4_if(m4_eval([$# > 3]), [1],
+       [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl
+[[m4_foreach([_Lt_prefix], [$2],
+	     [m4_foreach([_Lt_suffix],
+		]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[,
+	[_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])])
+
+
+# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])
+# -----------------------------------------------------------------------
+# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited
+# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ.
+m4_define([lt_if_append_uniq],
+[m4_ifdef([$1],
+	  [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1],
+		 [lt_append([$1], [$2], [$3])$4],
+		 [$5])],
+	  [lt_append([$1], [$2], [$3])$4])])
+
+
+# lt_dict_add(DICT, KEY, VALUE)
+# -----------------------------
+m4_define([lt_dict_add],
+[m4_define([$1($2)], [$3])])
+
+
+# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE)
+# --------------------------------------------
+m4_define([lt_dict_add_subkey],
+[m4_define([$1($2:$3)], [$4])])
+
+
+# lt_dict_fetch(DICT, KEY, [SUBKEY])
+# ----------------------------------
+m4_define([lt_dict_fetch],
+[m4_ifval([$3],
+	m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]),
+    m4_ifdef([$1($2)], [m4_defn([$1($2)])]))])
+
+
+# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE])
+# -----------------------------------------------------------------
+m4_define([lt_if_dict_fetch],
+[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4],
+	[$5],
+    [$6])])
+
+
+# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...])
+# --------------------------------------------------------------
+m4_define([lt_dict_filter],
+[m4_if([$5], [], [],
+  [lt_join(m4_quote(m4_default([$4], [[, ]])),
+           lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]),
+		      [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
+])
diff --git a/config/ltversion.m4 b/config/ltversion.m4
new file mode 100644
index 0000000..fa04b52
--- /dev/null
+++ b/config/ltversion.m4
@@ -0,0 +1,23 @@
+# ltversion.m4 -- version numbers			-*- Autoconf -*-
+#
+#   Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc.
+#   Written by Scott James Remnant, 2004
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# @configure_input@
+
+# serial 4179 ltversion.m4
+# This file is part of GNU Libtool
+
+m4_define([LT_PACKAGE_VERSION], [2.4.6])
+m4_define([LT_PACKAGE_REVISION], [2.4.6])
+
+AC_DEFUN([LTVERSION_VERSION],
+[macro_version='2.4.6'
+macro_revision='2.4.6'
+_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
+_LT_DECL(, macro_revision, 0)
+])
diff --git a/config/lt~obsolete.m4 b/config/lt~obsolete.m4
new file mode 100644
index 0000000..c6b26f8
--- /dev/null
+++ b/config/lt~obsolete.m4
@@ -0,0 +1,99 @@
+# lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
+#
+#   Copyright (C) 2004-2005, 2007, 2009, 2011-2015 Free Software
+#   Foundation, Inc.
+#   Written by Scott James Remnant, 2004.
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# serial 5 lt~obsolete.m4
+
+# These exist entirely to fool aclocal when bootstrapping libtool.
+#
+# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN),
+# which have later been changed to m4_define as they aren't part of the
+# exported API, or moved to Autoconf or Automake where they belong.
+#
+# The trouble is, aclocal is a bit thick.  It'll see the old AC_DEFUN
+# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us
+# using a macro with the same name in our local m4/libtool.m4 it'll
+# pull the old libtool.m4 in (it doesn't see our shiny new m4_define
+# and doesn't know about Autoconf macros at all.)
+#
+# So we provide this file, which has a silly filename so it's always
+# included after everything else.  This provides aclocal with the
+# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
+# because those macros already exist, or will be overwritten later.
+# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6.
+#
+# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
+# Yes, that means every name once taken will need to remain here until
+# we give up compatibility with versions before 1.7, at which point
+# we need to keep only those names which we still refer to.
+
+# This is to help aclocal find these macros, as it can't see m4_define.
+AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])])
+
+m4_ifndef([AC_LIBTOOL_LINKER_OPTION],	[AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])])
+m4_ifndef([AC_PROG_EGREP],		[AC_DEFUN([AC_PROG_EGREP])])
+m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])])
+m4_ifndef([_LT_AC_SHELL_INIT],		[AC_DEFUN([_LT_AC_SHELL_INIT])])
+m4_ifndef([_LT_AC_SYS_LIBPATH_AIX],	[AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])])
+m4_ifndef([_LT_PROG_LTMAIN],		[AC_DEFUN([_LT_PROG_LTMAIN])])
+m4_ifndef([_LT_AC_TAGVAR],		[AC_DEFUN([_LT_AC_TAGVAR])])
+m4_ifndef([AC_LTDL_ENABLE_INSTALL],	[AC_DEFUN([AC_LTDL_ENABLE_INSTALL])])
+m4_ifndef([AC_LTDL_PREOPEN],		[AC_DEFUN([AC_LTDL_PREOPEN])])
+m4_ifndef([_LT_AC_SYS_COMPILER],	[AC_DEFUN([_LT_AC_SYS_COMPILER])])
+m4_ifndef([_LT_AC_LOCK],		[AC_DEFUN([_LT_AC_LOCK])])
+m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE],	[AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])])
+m4_ifndef([_LT_AC_TRY_DLOPEN_SELF],	[AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])])
+m4_ifndef([AC_LIBTOOL_PROG_CC_C_O],	[AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])])
+m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])])
+m4_ifndef([AC_LIBTOOL_OBJDIR],		[AC_DEFUN([AC_LIBTOOL_OBJDIR])])
+m4_ifndef([AC_LTDL_OBJDIR],		[AC_DEFUN([AC_LTDL_OBJDIR])])
+m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])])
+m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP],	[AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])])
+m4_ifndef([AC_PATH_MAGIC],		[AC_DEFUN([AC_PATH_MAGIC])])
+m4_ifndef([AC_PROG_LD_GNU],		[AC_DEFUN([AC_PROG_LD_GNU])])
+m4_ifndef([AC_PROG_LD_RELOAD_FLAG],	[AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])])
+m4_ifndef([AC_DEPLIBS_CHECK_METHOD],	[AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])])
+m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])])
+m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])])
+m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])])
+m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS],	[AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])])
+m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP],	[AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])])
+m4_ifndef([LT_AC_PROG_EGREP],		[AC_DEFUN([LT_AC_PROG_EGREP])])
+m4_ifndef([LT_AC_PROG_SED],		[AC_DEFUN([LT_AC_PROG_SED])])
+m4_ifndef([_LT_CC_BASENAME],		[AC_DEFUN([_LT_CC_BASENAME])])
+m4_ifndef([_LT_COMPILER_BOILERPLATE],	[AC_DEFUN([_LT_COMPILER_BOILERPLATE])])
+m4_ifndef([_LT_LINKER_BOILERPLATE],	[AC_DEFUN([_LT_LINKER_BOILERPLATE])])
+m4_ifndef([_AC_PROG_LIBTOOL],		[AC_DEFUN([_AC_PROG_LIBTOOL])])
+m4_ifndef([AC_LIBTOOL_SETUP],		[AC_DEFUN([AC_LIBTOOL_SETUP])])
+m4_ifndef([_LT_AC_CHECK_DLFCN],		[AC_DEFUN([_LT_AC_CHECK_DLFCN])])
+m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER],	[AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])])
+m4_ifndef([_LT_AC_TAGCONFIG],		[AC_DEFUN([_LT_AC_TAGCONFIG])])
+m4_ifndef([AC_DISABLE_FAST_INSTALL],	[AC_DEFUN([AC_DISABLE_FAST_INSTALL])])
+m4_ifndef([_LT_AC_LANG_CXX],		[AC_DEFUN([_LT_AC_LANG_CXX])])
+m4_ifndef([_LT_AC_LANG_F77],		[AC_DEFUN([_LT_AC_LANG_F77])])
+m4_ifndef([_LT_AC_LANG_GCJ],		[AC_DEFUN([_LT_AC_LANG_GCJ])])
+m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
+m4_ifndef([_LT_AC_LANG_C_CONFIG],	[AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
+m4_ifndef([_LT_AC_LANG_CXX_CONFIG],	[AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])])
+m4_ifndef([_LT_AC_LANG_F77_CONFIG],	[AC_DEFUN([_LT_AC_LANG_F77_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])])
+m4_ifndef([_LT_AC_LANG_GCJ_CONFIG],	[AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])])
+m4_ifndef([_LT_AC_LANG_RC_CONFIG],	[AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
+m4_ifndef([AC_LIBTOOL_CONFIG],		[AC_DEFUN([AC_LIBTOOL_CONFIG])])
+m4_ifndef([_LT_AC_FILE_LTDLL_C],	[AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
+m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS],	[AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])
+m4_ifndef([_LT_AC_PROG_CXXCPP],		[AC_DEFUN([_LT_AC_PROG_CXXCPP])])
+m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS],	[AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
+m4_ifndef([_LT_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
+m4_ifndef([_LT_PROG_F77],		[AC_DEFUN([_LT_PROG_F77])])
+m4_ifndef([_LT_PROG_FC],		[AC_DEFUN([_LT_PROG_FC])])
+m4_ifndef([_LT_PROG_CXX],		[AC_DEFUN([_LT_PROG_CXX])])
diff --git a/config/missing b/config/missing
new file mode 100755
index 0000000..f62bbae
--- /dev/null
+++ b/config/missing
@@ -0,0 +1,215 @@
+#! /bin/sh
+# Common wrapper for a few potentially missing GNU programs.
+
+scriptversion=2013-10-28.13; # UTC
+
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Originally written by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+if test $# -eq 0; then
+  echo 1>&2 "Try '$0 --help' for more information"
+  exit 1
+fi
+
+case $1 in
+
+  --is-lightweight)
+    # Used by our autoconf macros to check whether the available missing
+    # script is modern enough.
+    exit 0
+    ;;
+
+  --run)
+    # Back-compat with the calling convention used by older automake.
+    shift
+    ;;
+
+  -h|--h|--he|--hel|--help)
+    echo "\
+$0 [OPTION]... PROGRAM [ARGUMENT]...
+
+Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due
+to PROGRAM being missing or too old.
+
+Options:
+  -h, --help      display this help and exit
+  -v, --version   output version information and exit
+
+Supported PROGRAM values:
+  aclocal   autoconf  autoheader   autom4te  automake  makeinfo
+  bison     yacc      flex         lex       help2man
+
+Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
+'g' are ignored when checking the name.
+
+Send bug reports to <bug-automake at gnu.org>."
+    exit $?
+    ;;
+
+  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
+    echo "missing $scriptversion (GNU Automake)"
+    exit $?
+    ;;
+
+  -*)
+    echo 1>&2 "$0: unknown '$1' option"
+    echo 1>&2 "Try '$0 --help' for more information"
+    exit 1
+    ;;
+
+esac
+
+# Run the given program, remember its exit status.
+"$@"; st=$?
+
+# If it succeeded, we are done.
+test $st -eq 0 && exit 0
+
+# Also exit now if we it failed (or wasn't found), and '--version' was
+# passed; such an option is passed most likely to detect whether the
+# program is present and works.
+case $2 in --version|--help) exit $st;; esac
+
+# Exit code 63 means version mismatch.  This often happens when the user
+# tries to use an ancient version of a tool on a file that requires a
+# minimum version.
+if test $st -eq 63; then
+  msg="probably too old"
+elif test $st -eq 127; then
+  # Program was missing.
+  msg="missing on your system"
+else
+  # Program was found and executed, but failed.  Give up.
+  exit $st
+fi
+
+perl_URL=http://www.perl.org/
+flex_URL=http://flex.sourceforge.net/
+gnu_software_URL=http://www.gnu.org/software
+
+program_details ()
+{
+  case $1 in
+    aclocal|automake)
+      echo "The '$1' program is part of the GNU Automake package:"
+      echo "<$gnu_software_URL/automake>"
+      echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
+      echo "<$gnu_software_URL/autoconf>"
+      echo "<$gnu_software_URL/m4/>"
+      echo "<$perl_URL>"
+      ;;
+    autoconf|autom4te|autoheader)
+      echo "The '$1' program is part of the GNU Autoconf package:"
+      echo "<$gnu_software_URL/autoconf/>"
+      echo "It also requires GNU m4 and Perl in order to run:"
+      echo "<$gnu_software_URL/m4/>"
+      echo "<$perl_URL>"
+      ;;
+  esac
+}
+
+give_advice ()
+{
+  # Normalize program name to check for.
+  normalized_program=`echo "$1" | sed '
+    s/^gnu-//; t
+    s/^gnu//; t
+    s/^g//; t'`
+
+  printf '%s\n' "'$1' is $msg."
+
+  configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
+  case $normalized_program in
+    autoconf*)
+      echo "You should only need it if you modified 'configure.ac',"
+      echo "or m4 files included by it."
+      program_details 'autoconf'
+      ;;
+    autoheader*)
+      echo "You should only need it if you modified 'acconfig.h' or"
+      echo "$configure_deps."
+      program_details 'autoheader'
+      ;;
+    automake*)
+      echo "You should only need it if you modified 'Makefile.am' or"
+      echo "$configure_deps."
+      program_details 'automake'
+      ;;
+    aclocal*)
+      echo "You should only need it if you modified 'acinclude.m4' or"
+      echo "$configure_deps."
+      program_details 'aclocal'
+      ;;
+   autom4te*)
+      echo "You might have modified some maintainer files that require"
+      echo "the 'autom4te' program to be rebuilt."
+      program_details 'autom4te'
+      ;;
+    bison*|yacc*)
+      echo "You should only need it if you modified a '.y' file."
+      echo "You may want to install the GNU Bison package:"
+      echo "<$gnu_software_URL/bison/>"
+      ;;
+    lex*|flex*)
+      echo "You should only need it if you modified a '.l' file."
+      echo "You may want to install the Fast Lexical Analyzer package:"
+      echo "<$flex_URL>"
+      ;;
+    help2man*)
+      echo "You should only need it if you modified a dependency" \
+           "of a man page."
+      echo "You may want to install the GNU Help2man package:"
+      echo "<$gnu_software_URL/help2man/>"
+    ;;
+    makeinfo*)
+      echo "You should only need it if you modified a '.texi' file, or"
+      echo "any other file indirectly affecting the aspect of the manual."
+      echo "You might want to install the Texinfo package:"
+      echo "<$gnu_software_URL/texinfo/>"
+      echo "The spurious makeinfo call might also be the consequence of"
+      echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
+      echo "want to install GNU make:"
+      echo "<$gnu_software_URL/make/>"
+      ;;
+    *)
+      echo "You might have modified some files without having the proper"
+      echo "tools for further handling them.  Check the 'README' file, it"
+      echo "often tells you about the needed prerequisites for installing"
+      echo "this package.  You may also peek at any GNU archive site, in"
+      echo "case some other package contains this missing '$1' program."
+      ;;
+  esac
+}
+
+give_advice "$1" | sed -e '1s/^/WARNING: /' \
+                       -e '2,$s/^/         /' >&2
+
+# Propagate the correct exit status (expected to be 127 for a program
+# not found, 63 for a program that failed due to version mismatch).
+exit $st
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/config/pmix.m4 b/config/pmix.m4
new file mode 100644
index 0000000..35bc67d
--- /dev/null
+++ b/config/pmix.m4
@@ -0,0 +1,1052 @@
+dnl -*- shell-script -*-
+dnl
+dnl Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
+dnl                         University Research and Technology
+dnl                         Corporation.  All rights reserved.
+dnl Copyright (c) 2004-2005 The University of Tennessee and The University
+dnl                         of Tennessee Research Foundation.  All rights
+dnl                         reserved.
+dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+dnl                         University of Stuttgart.  All rights reserved.
+dnl Copyright (c) 2004-2005 The Regents of the University of California.
+dnl                         All rights reserved.
+dnl Copyright (c) 2006-2016 Cisco Systems, Inc.  All rights reserved.
+dnl Copyright (c) 2007      Sun Microsystems, Inc.  All rights reserved.
+dnl Copyright (c) 2009      IBM Corporation.  All rights reserved.
+dnl Copyright (c) 2009      Los Alamos National Security, LLC.  All rights
+dnl                         reserved.
+dnl Copyright (c) 2009-2011 Oak Ridge National Labs.  All rights reserved.
+dnl Copyright (c) 2011-2013 NVIDIA Corporation.  All rights reserved.
+dnl Copyright (c) 2013-2017 Intel, Inc.  All rights reserved.
+dnl Copyright (c) 2015-2017 Research Organization for Information Science
+dnl                         and Technology (RIST). All rights reserved.
+dnl Copyright (c) 2016      Mellanox Technologies, Inc.
+dnl                         All rights reserved.
+dnl
+dnl $COPYRIGHT$
+dnl
+dnl Additional copyrights may follow
+dnl
+dnl $HEADER$
+dnl
+
+AC_DEFUN([PMIX_SETUP_CORE],[
+
+    AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
+    AC_REQUIRE([AC_CANONICAL_TARGET])
+    AC_REQUIRE([AC_PROG_CC])
+
+    # If no prefix was defined, set a good value
+    m4_ifval([$1],
+             [m4_define([pmix_config_prefix],[$1/])],
+             [m4_define([pmix_config_prefix], [])])
+
+    # Get pmix's absolute top builddir (which may not be the same as
+    # the real $top_builddir)
+    PMIX_startdir=`pwd`
+    if test x"pmix_config_prefix" != "x" && test ! -d "pmix_config_prefix"; then
+        mkdir -p "pmix_config_prefix"
+    fi
+    if test x"pmix_config_prefix" != "x"; then
+        cd "pmix_config_prefix"
+    fi
+    PMIX_top_builddir=`pwd`
+    AC_SUBST(PMIX_top_builddir)
+
+    # Get pmix's absolute top srcdir (which may not be the same as the
+    # real $top_srcdir.  First, go back to the startdir incase the
+    # $srcdir is relative.
+
+    cd "$PMIX_startdir"
+    cd "$srcdir"/pmix_config_prefix
+    PMIX_top_srcdir="`pwd`"
+    AC_SUBST(PMIX_top_srcdir)
+
+    # Go back to where we started
+    cd "$PMIX_startdir"
+
+    AC_MSG_NOTICE([pmix builddir: $PMIX_top_builddir])
+    AC_MSG_NOTICE([pmix srcdir: $PMIX_top_srcdir])
+    if test "$PMIX_top_builddir" != "$PMIX_top_srcdir"; then
+        AC_MSG_NOTICE([Detected VPATH build])
+    fi
+
+    # Get the version of pmix that we are installing
+    AC_MSG_CHECKING([for pmix version])
+    PMIX_VERSION="`$PMIX_top_srcdir/config/pmix_get_version.sh $PMIX_top_srcdir/VERSION`"
+    if test "$?" != "0"; then
+        AC_MSG_ERROR([Cannot continue])
+    fi
+    AC_MSG_RESULT([$PMIX_VERSION])
+    AC_SUBST(PMIX_VERSION)
+    AC_DEFINE_UNQUOTED([PMIX_VERSION], ["$PMIX_VERSION"],
+                       [The library version is always available, contrary to VERSION])
+
+    PMIX_RELEASE_DATE="`$PMIX_top_srcdir/config/pmix_get_version.sh $PMIX_top_srcdir/VERSION --release-date`"
+    AC_SUBST(PMIX_RELEASE_DATE)
+
+    # Save the breakdown the version information
+    PMIX_MAJOR_VERSION="`$PMIX_top_srcdir/config/pmix_get_version.sh $PMIX_top_srcdir/VERSION --major`"
+    if test "$?" != "0"; then
+        AC_MSG_ERROR([Cannot continue])
+    fi
+    AC_SUBST(PMIX_MAJOR_VERSION)
+    AC_DEFINE_UNQUOTED([PMIX_MAJOR_VERSION], [$PMIX_MAJOR_VERSION],
+                       [The library major version is always available, contrary to VERSION])
+
+    PMIX_MINOR_VERSION="`$PMIX_top_srcdir/config/pmix_get_version.sh $PMIX_top_srcdir/VERSION --minor`"
+    if test "$?" != "0"; then
+        AC_MSG_ERROR([Cannot continue])
+    fi
+    AC_SUBST(PMIX_MINOR_VERSION)
+    AC_DEFINE_UNQUOTED([PMIX_MINOR_VERSION], [$PMIX_MINOR_VERSION],
+                       [The library minor version is always available, contrary to VERSION])
+
+    pmixmajor=${PMIX_MAJOR_VERSION}L
+    pmixminor=${PMIX_MINOR_VERSION}L
+    AC_SUBST(pmixmajor)
+    AC_SUBST(pmixminor)
+    AC_CONFIG_FILES(pmix_config_prefix[include/pmix_version.h])
+
+    PMIX_RELEASE_VERSION="`$PMIX_top_srcdir/config/pmix_get_version.sh $PMIX_top_srcdir/VERSION --release`"
+    if test "$?" != "0"; then
+        AC_MSG_ERROR([Cannot continue])
+    fi
+    AC_SUBST(PMIX_RELEASE_VERSION)
+    AC_DEFINE_UNQUOTED([PMIX_RELEASE_VERSION], [$PMIX_RELEASE_VERSION],
+                       [The library release version is always available, contrary to VERSION])
+
+    # Debug mode?
+    AC_MSG_CHECKING([if want pmix maintainer support])
+    pmix_debug=
+    AS_IF([test "$pmix_debug" = "" && test "$enable_debug" = "yes"],
+          [pmix_debug=1
+           pmix_debug_msg="enabled"])
+    AS_IF([test "$pmix_debug" = ""],
+          [pmix_debug=0
+           pmix_debug_msg="disabled"])
+    # Grr; we use #ifndef for PMIX_DEBUG!  :-(
+    AH_TEMPLATE(PMIX_ENABLE_DEBUG, [Whether we are in debugging mode or not])
+    AS_IF([test "$pmix_debug" = "1"], [AC_DEFINE([PMIX_ENABLE_DEBUG])])
+    AC_MSG_RESULT([$pmix_debug_msg])
+
+    AC_MSG_CHECKING([for pmix directory prefix])
+    AC_MSG_RESULT(m4_ifval([$1], pmix_config_prefix, [(none)]))
+
+    # Note that private/config.h *MUST* be listed first so that it
+    # becomes the "main" config header file.  Any AC-CONFIG-HEADERS
+    # after that (pmix/config.h) will only have selective #defines
+    # replaced, not the entire file.
+    AC_CONFIG_HEADERS(pmix_config_prefix[src/include/pmix_config.h])
+
+    # Rename symbols?
+    AC_ARG_WITH([pmix-symbol-rename],
+                AC_HELP_STRING([--with-pmix-symbol-rename=PREFIX],
+                               [Provide a prefix to rename PMIx symbols]))
+    AC_MSG_CHECKING([for symbol rename])
+    AS_IF([test ! -z "$with_pmix_symbol_rename" && test "$with_pmix_symbol_rename" != "yes"],
+          [AC_MSG_RESULT([$with_pmix_symbol_rename])
+           pmix_symbol_rename="$with_pmix_symbol_rename"
+           PMIX_RENAME=$with_pmix_symbol_rename],
+          [AC_MSG_RESULT([no])
+           pmix_symbol_rename=""
+           PMIX_RENAME=])
+    AC_DEFINE_UNQUOTED(PMIX_SYMBOL_RENAME, [$pmix_symbol_rename],
+                       [The pmix symbol rename include directive])
+    AC_SUBST(PMIX_RENAME)
+    AC_CONFIG_FILES(pmix_config_prefix[include/pmix_rename.h])
+
+    # GCC specifics.
+    if test "x$GCC" = "xyes"; then
+        PMIX_GCC_CFLAGS="-Wall -Wmissing-prototypes -Wundef"
+        PMIX_GCC_CFLAGS="$PMIX_GCC_CFLAGS -Wpointer-arith -Wcast-align"
+    fi
+
+    ############################################################################
+    # Check for compilers and preprocessors
+    ############################################################################
+    pmix_show_title "Compiler and preprocessor tests"
+
+    PMIX_SETUP_CC
+
+    #
+    # Check for some types
+    #
+
+    AC_CHECK_TYPES(int8_t)
+    AC_CHECK_TYPES(uint8_t)
+    AC_CHECK_TYPES(int16_t)
+    AC_CHECK_TYPES(uint16_t)
+    AC_CHECK_TYPES(int32_t)
+    AC_CHECK_TYPES(uint32_t)
+    AC_CHECK_TYPES(int64_t)
+    AC_CHECK_TYPES(uint64_t)
+    AC_CHECK_TYPES(__int128)
+    AC_CHECK_TYPES(uint128_t)
+    AC_CHECK_TYPES(long long)
+
+    AC_CHECK_TYPES(intptr_t)
+    AC_CHECK_TYPES(uintptr_t)
+    AC_CHECK_TYPES(ptrdiff_t)
+
+    #
+    # Check for type sizes
+    #
+
+    AC_CHECK_SIZEOF(_Bool)
+    AC_CHECK_SIZEOF(char)
+    AC_CHECK_SIZEOF(short)
+    AC_CHECK_SIZEOF(int)
+    AC_CHECK_SIZEOF(long)
+    if test "$ac_cv_type_long_long" = yes; then
+        AC_CHECK_SIZEOF(long long)
+    fi
+    AC_CHECK_SIZEOF(float)
+    AC_CHECK_SIZEOF(double)
+
+    AC_CHECK_SIZEOF(void *)
+    AC_CHECK_SIZEOF(size_t)
+    if test "$ac_cv_type_ssize_t" = yes ; then
+        AC_CHECK_SIZEOF(ssize_t)
+    fi
+    if test "$ac_cv_type_ptrdiff_t" = yes; then
+        AC_CHECK_SIZEOF(ptrdiff_t)
+    fi
+    AC_CHECK_SIZEOF(wchar_t)
+
+    AC_CHECK_SIZEOF(pid_t)
+
+    #
+    # Check for type alignments
+    #
+
+    PMIX_C_GET_ALIGNMENT(bool, PMIX_ALIGNMENT_BOOL)
+    PMIX_C_GET_ALIGNMENT(int8_t, PMIX_ALIGNMENT_INT8)
+    PMIX_C_GET_ALIGNMENT(int16_t, PMIX_ALIGNMENT_INT16)
+    PMIX_C_GET_ALIGNMENT(int32_t, PMIX_ALIGNMENT_INT32)
+    PMIX_C_GET_ALIGNMENT(int64_t, PMIX_ALIGNMENT_INT64)
+    PMIX_C_GET_ALIGNMENT(char, PMIX_ALIGNMENT_CHAR)
+    PMIX_C_GET_ALIGNMENT(short, PMIX_ALIGNMENT_SHORT)
+    PMIX_C_GET_ALIGNMENT(wchar_t, PMIX_ALIGNMENT_WCHAR)
+    PMIX_C_GET_ALIGNMENT(int, PMIX_ALIGNMENT_INT)
+    PMIX_C_GET_ALIGNMENT(long, PMIX_ALIGNMENT_LONG)
+    if test "$ac_cv_type_long_long" = yes; then
+        PMIX_C_GET_ALIGNMENT(long long, PMIX_ALIGNMENT_LONG_LONG)
+    fi
+    PMIX_C_GET_ALIGNMENT(float, PMIX_ALIGNMENT_FLOAT)
+    PMIX_C_GET_ALIGNMENT(double, PMIX_ALIGNMENT_DOUBLE)
+    if test "$ac_cv_type_long_double" = yes; then
+        PMIX_C_GET_ALIGNMENT(long double, PMIX_ALIGNMENT_LONG_DOUBLE)
+    fi
+    PMIX_C_GET_ALIGNMENT(void *, PMIX_ALIGNMENT_VOID_P)
+    PMIX_C_GET_ALIGNMENT(size_t, PMIX_ALIGNMENT_SIZE_T)
+
+
+    #
+    # Does the C compiler native support "bool"? (i.e., without
+    # <stdbool.h> or any other help)
+    #
+
+    PMIX_VAR_SCOPE_PUSH([MSG])
+    AC_MSG_CHECKING(for C bool type)
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
+                                          AC_INCLUDES_DEFAULT],
+                                       [[bool bar, foo = true; bar = foo;]])],
+                      [PMIX_NEED_C_BOOL=0 MSG=yes],[PMIX_NEED_C_BOOL=1 MSG=no])
+    AC_DEFINE_UNQUOTED(PMIX_NEED_C_BOOL, $PMIX_NEED_C_BOOL,
+                       [Whether the C compiler supports "bool" without any other help (such as <stdbool.h>)])
+    AC_MSG_RESULT([$MSG])
+    AC_CHECK_SIZEOF(_Bool)
+    PMIX_VAR_SCOPE_POP
+
+    #
+    # Check for other compiler characteristics
+    #
+
+    PMIX_VAR_SCOPE_PUSH([PMIX_CFLAGS_save])
+    if test "$GCC" = "yes"; then
+
+        # gcc 2.96 will emit oodles of warnings if you use "inline" with
+        # -pedantic (which we do in developer builds).  However,
+        # "__inline__" is ok.  So we have to force gcc to select the
+        # right one.  If you use -pedantic, the AC_C_INLINE test will fail
+        # (because it names a function foo() -- without the (void)).  So
+        # we turn off all the picky flags, turn on -ansi mode (which is
+        # implied by -pedantic), and set warnings to be errors.  Hence,
+        # this does the following (for 2.96):
+        #
+        # - causes the check for "inline" to emit a warning, which then
+        # fails
+        # - checks for __inline__, which then emits no error, and works
+        #
+        # This also works nicely for gcc 3.x because "inline" will work on
+        # the first check, and all is fine.  :-)
+
+        PMIX_CFLAGS_save=$CFLAGS
+        CFLAGS="$PMIX_CFLAGS_BEFORE_PICKY -Werror -ansi"
+    fi
+    AC_C_INLINE
+    if test "$GCC" = "yes"; then
+        CFLAGS=$PMIX_CFLAGS_save
+    fi
+    PMIX_VAR_SCOPE_POP
+
+    if test "x$CC" = "xicc"; then
+        PMIX_CHECK_ICC_VARARGS
+    fi
+
+
+    ##################################
+    # Only after setting up
+    # C do we check compiler attributes.
+    ##################################
+
+    pmix_show_subtitle "Compiler characteristics"
+
+    PMIX_CHECK_ATTRIBUTES
+    PMIX_CHECK_COMPILER_VERSION_ID
+
+    ##################################
+    # Assembler Configuration
+    ##################################
+
+    pmix_show_subtitle "Assembler"
+
+    AM_PROG_AS
+    AC_PATH_PROG(PERL, perl, perl)
+    PMIX_CONFIG_ASM
+
+
+    ##################################
+    # Header files
+    ##################################
+
+    pmix_show_title "Header file tests"
+
+    AC_CHECK_HEADERS([arpa/inet.h \
+                      fcntl.h ifaddrs.h inttypes.h libgen.h \
+                      net/uio.h netinet/in.h \
+                      stdint.h stddef.h \
+                      stdlib.h string.h strings.h \
+                      sys/ioctl.h sys/param.h \
+                      sys/select.h sys/socket.h sys/sockio.h \
+                      stdarg.h sys/stat.h sys/time.h \
+                      sys/types.h sys/un.h sys/uio.h \
+                      sys/wait.h syslog.h \
+                      time.h unistd.h dirent.h \
+                      crt_externs.h signal.h \
+                      ioLib.h sockLib.h hostLib.h limits.h \
+                      sys/statfs.h sys/statvfs.h \
+                      netdb.h ucred.h zlib.h])
+
+    AC_CHECK_HEADERS([sys/mount.h], [], [],
+                     [AC_INCLUDES_DEFAULT
+                      #if HAVE_SYS_PARAM_H
+                      #include <sys/param.h>
+                      #endif
+                      ])
+
+    AC_CHECK_HEADERS([sys/sysctl.h], [], [],
+                     [AC_INCLUDES_DEFAULT
+                      #if HAVE_SYS_PARAM_H
+                      #include <sys/param.h>
+                      #endif
+                      ])
+
+    # Needed to work around Darwin requiring sys/socket.h for
+    # net/if.h
+    AC_CHECK_HEADERS([net/if.h], [], [],
+                     [#include <stdio.h>
+                      #if STDC_HEADERS
+                      # include <stdlib.h>
+                      # include <stddef.h>
+                      #else
+                      # if HAVE_STDLIB_H
+                      #  include <stdlib.h>
+                      # endif
+                      #endif
+                      #if HAVE_SYS_SOCKET_H
+                      # include <sys/socket.h>
+                      #endif
+                      ])
+
+    # Note that sometimes we have <stdbool.h>, but it doesn't work (e.g.,
+    # have both Portland and GNU installed; using pgcc will find GNU's
+    # <stdbool.h>, which all it does -- by standard -- is define "bool" to
+    # "_Bool" [see
+    # http://pmixw.opengroup.org/onlinepubs/009695399/basedefs/stdbool.h.html],
+    # and Portland has no idea what to do with _Bool).
+
+    # So first figure out if we have <stdbool.h> (i.e., check the value of
+    # the macro HAVE_STDBOOL_H from the result of AC_CHECK_HEADERS,
+    # above).  If we do have it, then check to see if it actually works.
+    # Define PMIX_USE_STDBOOL_H as approrpaite.
+    AC_CHECK_HEADERS([stdbool.h], [have_stdbool_h=1], [have_stdbool_h=0])
+    AC_MSG_CHECKING([if <stdbool.h> works])
+    if test "$have_stdbool_h" = "1"; then
+        AC_COMPILE_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT[
+                                                   #if HAVE_STDBOOL_H
+                                                   #include <stdbool.h>
+                                                   #endif
+                                               ]],
+                                           [[bool bar, foo = true; bar = foo;]])],
+                          [PMIX_USE_STDBOOL_H=1 MSG=yes],[PMIX_USE_STDBOOL_H=0 MSG=no])
+    else
+        PMIX_USE_STDBOOL_H=0
+        MSG="no (don't have <stdbool.h>)"
+    fi
+    AC_DEFINE_UNQUOTED(PMIX_USE_STDBOOL_H, $PMIX_USE_STDBOOL_H,
+                       [Whether to use <stdbool.h> or not])
+    AC_MSG_RESULT([$MSG])
+
+    # checkpoint results
+    AC_CACHE_SAVE
+
+    ##################################
+    # Types
+    ##################################
+
+    pmix_show_title "Type tests"
+
+    AC_CHECK_TYPES([socklen_t, struct sockaddr_in, struct sockaddr_un,
+                    struct sockaddr_in6, struct sockaddr_storage],
+                   [], [], [AC_INCLUDES_DEFAULT
+                            #if HAVE_SYS_SOCKET_H
+                            #include <sys/socket.h>
+                            #endif
+                            #if HAVE_SYS_UN_H
+                            #include <sys/un.h>
+                            #endif
+                            #ifdef HAVE_NETINET_IN_H
+                            #include <netinet/in.h>
+                            #endif
+                           ])
+
+    AC_CHECK_DECLS([AF_UNSPEC, PF_UNSPEC, AF_INET6, PF_INET6],
+                   [], [], [AC_INCLUDES_DEFAULT
+                            #if HAVE_SYS_SOCKET_H
+                            #include <sys/socket.h>
+                            #endif
+                            #ifdef HAVE_NETINET_IN_H
+                            #include <netinet/in.h>
+                            #endif
+                           ])
+
+    # SA_RESTART in signal.h
+    PMIX_VAR_SCOPE_PUSH([MSG2])
+    AC_MSG_CHECKING([if SA_RESTART defined in signal.h])
+                        AC_EGREP_CPP(yes, [
+                                            #include <signal.h>
+                                            #ifdef SA_RESTART
+                                            yes
+                                            #endif
+                                        ], [MSG2=yes VALUE=1], [MSG2=no VALUE=0])
+    AC_DEFINE_UNQUOTED(PMIX_HAVE_SA_RESTART, $VALUE,
+                       [Whether we have SA_RESTART in <signal.h> or not])
+    AC_MSG_RESULT([$MSG2])
+    PMIX_VAR_SCOPE_POP
+
+    AC_CHECK_MEMBERS([struct sockaddr.sa_len], [], [], [
+                         #include <sys/types.h>
+                         #if HAVE_SYS_SOCKET_H
+                         #include <sys/socket.h>
+                         #endif
+                     ])
+
+    AC_CHECK_MEMBERS([struct dirent.d_type], [], [], [
+                         #include <sys/types.h>
+                         #include <dirent.h>])
+
+    AC_CHECK_MEMBERS([siginfo_t.si_fd],,,[#include <signal.h>])
+    AC_CHECK_MEMBERS([siginfo_t.si_band],,,[#include <signal.h>])
+
+    #
+    # Checks for struct member names in struct statfs
+    #
+    AC_CHECK_MEMBERS([struct statfs.f_type], [], [], [
+                         AC_INCLUDES_DEFAULT
+                         #ifdef HAVE_SYS_VFS_H
+                         #include <sys/vfs.h>
+                         #endif
+                         #ifdef HAVE_SYS_STATFS_H
+                         #include <sys/statfs.h>
+                         #endif
+                     ])
+
+    AC_CHECK_MEMBERS([struct statfs.f_fstypename], [], [], [
+                         AC_INCLUDES_DEFAULT
+                         #ifdef HAVE_SYS_PARAM_H
+                         #include <sys/param.h>
+                         #endif
+                         #ifdef HAVE_SYS_MOUNT_H
+                         #include <sys/mount.h>
+                         #endif
+                         #ifdef HAVE_SYS_VFS_H
+                         #include <sys/vfs.h>
+                         #endif
+                         #ifdef HAVE_SYS_STATFS_H
+                         #include <sys/statfs.h>
+                         #endif
+                     ])
+
+    #
+    # Checks for struct member names in struct statvfs
+    #
+    AC_CHECK_MEMBERS([struct statvfs.f_basetype], [], [], [
+                         AC_INCLUDES_DEFAULT
+                         #ifdef HAVE_SYS_STATVFS_H
+                         #include <sys/statvfs.h>
+                         #endif
+                     ])
+
+    AC_CHECK_MEMBERS([struct statvfs.f_fstypename], [], [], [
+                         AC_INCLUDES_DEFAULT
+                         #ifdef HAVE_SYS_STATVFS_H
+                         #include <sys/statvfs.h>
+                         #endif
+                     ])
+
+    AC_CHECK_MEMBERS([struct ucred.uid, struct ucred.cr_uid, struct sockpeercred.uid],
+                     [], [],
+                     [#include <sys/types.h>
+                      #include <sys/socket.h> ])
+
+    #
+    # Check for ptrdiff type.  Yes, there are platforms where
+    # sizeof(void*) != sizeof(long) (64 bit Windows, apparently).
+    #
+    AC_MSG_CHECKING([for pointer diff type])
+    if test $ac_cv_type_ptrdiff_t = yes ; then
+        pmix_ptrdiff_t="ptrdiff_t"
+        pmix_ptrdiff_size=$ac_cv_sizeof_ptrdiff_t
+    elif test $ac_cv_sizeof_void_p -eq $ac_cv_sizeof_long ; then
+        pmix_ptrdiff_t="long"
+        pmix_ptrdiff_size=$ac_cv_sizeof_long
+    elif test $ac_cv_type_long_long = yes && test $ac_cv_sizeof_void_p -eq $ac_cv_sizeof_long_long ; then
+        pmix_ptrdiff_t="long long"
+        pmix_ptrdiff_size=$ac_cv_sizeof_long_long
+        #else
+        #    AC_MSG_ERROR([Could not find datatype to emulate ptrdiff_t.  Cannot continue])
+    fi
+    AC_DEFINE_UNQUOTED([PMIX_PTRDIFF_TYPE], [$pmix_ptrdiff_t],
+                       [type to use for ptrdiff_t])
+    AC_MSG_RESULT([$pmix_ptrdiff_t (size: $pmix_ptrdiff_size)])
+
+    ##################################
+    # Linker characteristics
+    ##################################
+
+    AC_MSG_CHECKING([the linker for support for the -fini option])
+    PMIX_VAR_SCOPE_PUSH([LDFLAGS_save])
+    LDFLAGS_save=$LDFLAGS
+    LDFLAGS="$LDFLAGS_save -Wl,-fini -Wl,finalize"
+    AC_TRY_LINK([void finalize (void) {}], [], [AC_MSG_RESULT([yes])
+            pmix_ld_have_fini=1], [AC_MSG_RESULT([no])
+            pmix_ld_have_fini=0])
+    LDFLAGS=$LDFLAGS_save
+    PMIX_VAR_SCOPE_POP
+
+    pmix_destructor_use_fini=0
+    pmix_no_destructor=0
+    if test x$pmix_cv___attribute__destructor = x0 ; then
+        if test x$pmix_ld_have_fini = x1 ; then
+            pmix_destructor_use_fini=1
+        else
+            pmix_no_destructor=1;
+        fi
+    fi
+
+    AC_DEFINE_UNQUOTED(PMIX_NO_LIB_DESTRUCTOR, [$pmix_no_destructor],
+        [Whether libraries can be configured with destructor functions])
+    AM_CONDITIONAL(PMIX_DESTRUCTOR_USE_FINI, [test x$pmix_destructor_use_fini = x1])
+
+    ##################################
+    # Libraries
+    ##################################
+
+    pmix_show_title "Library and Function tests"
+
+    PMIX_SEARCH_LIBS_CORE([socket], [socket])
+
+    # IRIX and CentOS have dirname in -lgen, usually in libc
+    PMIX_SEARCH_LIBS_CORE([dirname], [gen])
+
+    # Darwin doesn't need -lm, as it's a symlink to libSystem.dylib
+    PMIX_SEARCH_LIBS_CORE([ceil], [m])
+
+    AC_CHECK_FUNCS([asprintf snprintf vasprintf vsnprintf strsignal socketpair strncpy_s usleep statfs statvfs getpeereid getpeerucred strnlen posix_fallocate])
+
+    # On some hosts, htonl is a define, so the AC_CHECK_FUNC will get
+    # confused.  On others, it's in the standard library, but stubbed with
+    # the magic glibc foo as not implemented.  and on other systems, it's
+    # just not there.  This covers all cases.
+    AC_CACHE_CHECK([for htonl define],
+                   [pmix_cv_htonl_define],
+                   [AC_PREPROC_IFELSE([AC_LANG_PROGRAM([
+                                                          #ifdef HAVE_SYS_TYPES_H
+                                                          #include <sys/types.h>
+                                                          #endif
+                                                          #ifdef HAVE_NETINET_IN_H
+                                                          #include <netinet/in.h>
+                                                          #endif
+                                                          #ifdef HAVE_ARPA_INET_H
+                                                          #include <arpa/inet.h>
+                                                          #endif],[
+                                                          #ifndef ntohl
+                                                          #error "ntohl not defined"
+                                                          #endif
+                                                      ])], [pmix_cv_htonl_define=yes], [pmix_cv_htonl_define=no])])
+    AC_CHECK_FUNC([htonl], [pmix_have_htonl=yes], [pmix_have_htonl=no])
+    AS_IF([test "$pmix_cv_htonl_define" = "yes" || test "$pmix_have_htonl" = "yes"],
+          [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)
+    #
+
+    AC_CHECK_DECL(va_copy, PMIX_HAVE_VA_COPY=1, PMIX_HAVE_VA_COPY=0,
+                  [#include <stdarg.h>])
+    AC_DEFINE_UNQUOTED(PMIX_HAVE_VA_COPY, $PMIX_HAVE_VA_COPY,
+                       [Whether we have va_copy or not])
+
+    AC_CHECK_DECL(__va_copy, PMIX_HAVE_UNDERSCORE_VA_COPY=1,
+                  PMIX_HAVE_UNDERSCORE_VA_COPY=0, [#include <stdarg.h>])
+    AC_DEFINE_UNQUOTED(PMIX_HAVE_UNDERSCORE_VA_COPY, $PMIX_HAVE_UNDERSCORE_VA_COPY,
+                       [Whether we have __va_copy or not])
+
+    AC_CHECK_DECLS(__func__)
+
+    # checkpoint results
+    AC_CACHE_SAVE
+
+    ##################################
+    # System-specific tests
+    ##################################
+
+    pmix_show_title "System-specific tests"
+
+    AC_C_BIGENDIAN
+    PMIX_CHECK_BROKEN_QSORT
+
+    #
+    # Check out what thread support we have
+    #
+    PMIX_CONFIG_THREADS
+
+    CFLAGS="$CFLAGS $THREAD_CFLAGS"
+    CPPFLAGS="$CPPFLAGS $THREAD_CPPFLAGS"
+    CXXFLAGS="$CXXFLAGS $THREAD_CXXFLAGS"
+    CXXCPPFLAGS="$CXXCPPFLAGS $THREAD_CXXCPPFLAGS"
+    LDFLAGS="$LDFLAGS $THREAD_LDFLAGS"
+    LIBS="$LIBS $THREAD_LIBS"
+
+    #
+    # What is the local equivalent of "ln -s"
+    #
+
+    AC_PROG_LN_S
+
+    AC_PROG_GREP
+    AC_PROG_EGREP
+
+
+    ##################################
+    # Visibility
+    ##################################
+
+    # Check the visibility declspec at the end to avoid problem with
+    # the previous tests that are not necessarily prepared for
+    # the visibility feature.
+    pmix_show_title "Symbol visibility feature"
+
+    PMIX_CHECK_VISIBILITY
+
+    ##################################
+    # Libevent
+    ##################################
+    pmix_show_title "Libevent"
+
+    PMIX_LIBEVENT_CONFIG
+
+    ##################################
+    # ZLIB COMPRESSION
+    ##################################
+    pmix_show_title "ZLIB"
+
+    PMIX_ZLIB_CONFIG
+
+    ##################################
+    # MCA
+    ##################################
+
+    pmix_show_title "Modular Component Architecture (MCA) setup"
+
+    AC_MSG_CHECKING([for subdir args])
+    PMIX_CONFIG_SUBDIR_ARGS([pmix_subdir_args])
+    AC_MSG_RESULT([$pmix_subdir_args])
+
+    PMIX_MCA
+
+    ##################################
+    # Dstore Locking
+    ##################################
+
+    pmix_show_title "Dstore Locking"
+
+    PMIX_CHECK_DSTOR_LOCK
+
+    ############################################################################
+    # final compiler config
+    ############################################################################
+
+    pmix_show_subtitle "Set path-related compiler flags"
+
+    #
+    # This is needed for VPATH builds, so that it will -I the appropriate
+    # include directory.  We delayed doing it until now just so that
+    # '-I$(top_srcdir)' doesn't show up in any of the configure output --
+    # purely aesthetic.
+    #
+    # Because pmix_config.h is created by AC_CONFIG_HEADERS, we
+    # don't need to -I the builddir for pmix/include. However, if we
+    # are VPATH building, we do need to include the source directories.
+    #
+    if test "$PMIX_top_builddir" != "$PMIX_top_srcdir"; then
+        # Note the embedded m4 directives here -- we must embed them
+        # rather than have successive assignments to these shell
+        # variables, lest the $(foo) names try to get evaluated here.
+        # Yuck!
+        CPPFLAGS="-I$PMIX_top_builddir -I$PMIX_top_srcdir -I$PMIX_top_srcdir/src -I$PMIX_top_builddir/include -I$PMIX_top_srcdir/include $CPPFLAGS"
+    else
+        CPPFLAGS="-I$PMIX_top_srcdir -I$PMIX_top_srcdir/src -I$PMIX_top_srcdir/include $CPPFLAGS"
+    fi
+
+    # pmixdatadir, pmixlibdir, and pmixinclude are essentially the same as
+    # pkg*dir, but will always be */pmix.
+    pmixdatadir='${datadir}/pmix'
+    pmixlibdir='${libdir}/pmix'
+    pmixincludedir='${includedir}/pmix'
+    AC_SUBST(pmixdatadir)
+    AC_SUBST(pmixlibdir)
+    AC_SUBST(pmixincludedir)
+
+    ############################################################################
+    # final output
+    ############################################################################
+
+    pmix_show_subtitle "Final output"
+
+    AC_CONFIG_FILES(
+        pmix_config_prefix[Makefile]
+        pmix_config_prefix[config/Makefile]
+        pmix_config_prefix[include/Makefile]
+        pmix_config_prefix[src/Makefile]
+        pmix_config_prefix[src/util/keyval/Makefile]
+        pmix_config_prefix[src/mca/base/Makefile]
+        )
+
+    # publish any embedded flags so external wrappers can use them
+    AC_SUBST(PMIX_EMBEDDED_LIBS)
+    AC_SUBST(PMIX_EMBEDDED_LDFLAGS)
+    AC_SUBST(PMIX_EMBEDDED_CPPFLAGS)
+
+    # Success
+    $2
+])dnl
+
+AC_DEFUN([PMIX_DEFINE_ARGS],[
+    # do we want dlopen support ?
+    AC_MSG_CHECKING([if want dlopen support])
+    AC_ARG_ENABLE([dlopen],
+        [AC_HELP_STRING([--enable-dlopen],
+                        [Whether build should attempt to use dlopen (or
+                         similar) to dynamically load components.
+                         (default: enabled)])])
+    AS_IF([test "$enable_dlopen" = "no"],
+          [enable_mca_dso="no"
+           enable_mca_static="yes"
+           PMIX_ENABLE_DLOPEN_SUPPORT=0
+           AC_MSG_RESULT([no])],
+          [PMIX_ENABLE_DLOPEN_SUPPORT=1
+           AC_MSG_RESULT([yes])])
+    AC_DEFINE_UNQUOTED(PMIX_ENABLE_DLOPEN_SUPPORT, $PMIX_ENABLE_DLOPEN_SUPPORT,
+                      [Whether we want to enable dlopen support])
+
+    # Embedded mode, or standalone?
+    AC_MSG_CHECKING([if embedded mode is enabled])
+    AC_ARG_ENABLE([embedded-mode],
+        [AC_HELP_STRING([--enable-embedded-mode],
+                [Using --enable-embedded-mode causes PMIx to skip a few configure checks and install nothing.  It should only be used when building PMIx within the scope of a larger package.])])
+    AS_IF([test ! -z "$enable_embedded_mode" && test "$enable_embedded_mode" = "yes"],
+          [pmix_mode=embedded
+           pmix_install_primary_headers=no
+           AC_MSG_RESULT([yes])],
+          [pmix_mode=standalone
+           pmix_install_primary_headers=yes
+           AC_MSG_RESULT([no])])
+
+#
+# Is this a developer copy?
+#
+
+if test -d .git; then
+    PMIX_DEVEL=1
+else
+    PMIX_DEVEL=0
+fi
+
+
+#
+# Developer picky compiler options
+#
+
+AC_MSG_CHECKING([if want developer-level compiler pickyness])
+AC_ARG_ENABLE(picky,
+    AC_HELP_STRING([--enable-picky],
+                   [enable developer-level compiler pickyness when building PMIx (default: disabled)]))
+if test "$enable_picky" = "yes"; then
+    AC_MSG_RESULT([yes])
+    WANT_PICKY_COMPILER=1
+else
+    AC_MSG_RESULT([no])
+    WANT_PICKY_COMPILER=0
+fi
+#################### Early development override ####################
+if test "$WANT_PICKY_COMPILER" = "0" && test -z "$enable_picky" && test "$PMIX_DEVEL" = "1"; then
+    WANT_PICKY_COMPILER=1
+    echo "--> developer override: enable picky compiler by default"
+fi
+#################### Early development override ####################
+
+#
+# Developer debugging
+#
+
+AC_MSG_CHECKING([if want developer-level debugging code])
+AC_ARG_ENABLE(debug,
+    AC_HELP_STRING([--enable-debug],
+                   [enable developer-level debugging code (not for general PMIx users!) (default: disabled)]))
+if test "$enable_debug" = "yes"; then
+    AC_MSG_RESULT([yes])
+    WANT_DEBUG=1
+else
+    AC_MSG_RESULT([no])
+    WANT_DEBUG=0
+fi
+#################### Early development override ####################
+if test "$WANT_DEBUG" = "0" && test -z "$enable_debug" && test "$PMIX_DEVEL" = "1"; then
+    WANT_DEBUG=1
+    echo "--> developer override: enable debugging code by default"
+fi
+#################### Early development override ####################
+if test "$WANT_DEBUG" = "0"; then
+    CFLAGS="-DNDEBUG $CFLAGS"
+    CXXFLAGS="-DNDEBUG $CXXFLAGS"
+fi
+AC_DEFINE_UNQUOTED(PMIX_ENABLE_DEBUG, $WANT_DEBUG,
+                   [Whether we want developer-level debugging code or not])
+
+AC_ARG_ENABLE(debug-symbols,
+              AC_HELP_STRING([--disable-debug-symbols],
+                             [Disable adding compiler flags to enable debugging symbols if --enable-debug is specified.  For non-debugging builds, this flag has no effect.]))
+
+#
+# Do we want to install the internal devel headers?
+#
+AC_MSG_CHECKING([if want to install project-internal header files])
+AC_ARG_WITH(devel-headers,
+    AC_HELP_STRING([--with-devel-headers],
+                   [normal PMIx users/applications do not need this (pmix.h and friends are ALWAYS installed).  Developer headers are only necessary for authors doing deeper integration (default: disabled).]))
+if test "$with_devel_headers" = "yes"; then
+    AC_MSG_RESULT([yes])
+    WANT_INSTALL_HEADERS=1
+    pmix_install_primary_headers=yes
+else
+    AC_MSG_RESULT([no])
+    WANT_INSTALL_HEADERS=0
+fi
+
+# Install tests and examples?
+AC_MSG_CHECKING([if tests and examples are to be installed])
+AC_ARG_WITH([tests-examples],
+    [AC_HELP_STRING([--with-tests-examples],
+            [Whether or not to install the tests and example programs.])])
+AS_IF([test "$pmix_install_primary_headers" = "no"],
+      [AS_IF([test -z "$with_tests_examples" || test "$with_tests_examples" = "no"],
+             [pmix_tests=no
+              AC_MSG_RESULT([no])],
+             [AC_MSG_RESULT([no])
+              AC_MSG_WARN([Cannot install tests/examples without installing primary headers.])
+              AC_MSG_WARN([This situation arises when configured in embedded mode])
+              AC_MSG_WARN([and without devel headers.])
+              AC_MSG_ERROR([Please correct the configure line and retry])])],
+      [AS_IF([test ! -z "$with_tests_examples" && test "$with_tests_examples" = "no"],
+             [pmix_tests=no
+              AC_MSG_RESULT([no])],
+             [pmix_tests=yes
+              AC_MSG_RESULT([yes])])])
+
+#
+# Support per-user config files?
+#
+AC_ARG_ENABLE([per-user-config-files],
+   [AC_HELP_STRING([--enable-per-user-config-files],
+      [Disable per-user configuration files, to save disk accesses during job start-up.  This is likely desirable for large jobs.  Note that this can also be acheived by environment variables at run-time.  (default: enabled)])])
+if test "$enable_per_user_config_files" = "no" ; then
+  result=0
+else
+  result=1
+fi
+AC_DEFINE_UNQUOTED([PMIX_WANT_HOME_CONFIG_FILES], [$result],
+     [Enable per-user config files])
+
+#
+# Do we want the pretty-print stack trace feature?
+#
+
+AC_MSG_CHECKING([if want pretty-print stacktrace])
+AC_ARG_ENABLE([pretty-print-stacktrace],
+              [AC_HELP_STRING([--enable-pretty-print-stacktrace],
+                              [Pretty print stacktrace on process signal (default: enabled)])])
+if test "$enable_pretty_print_stacktrace" = "no" ; then
+    AC_MSG_RESULT([no])
+    WANT_PRETTY_PRINT_STACKTRACE=0
+else
+    AC_MSG_RESULT([yes])
+    WANT_PRETTY_PRINT_STACKTRACE=1
+fi
+AC_DEFINE_UNQUOTED([PMIX_WANT_PRETTY_PRINT_STACKTRACE],
+                   [$WANT_PRETTY_PRINT_STACKTRACE],
+                   [if want pretty-print stack trace feature])
+
+# Do we want the shared memory datastore usage?
+#
+
+AC_MSG_CHECKING([if want shared memory datastore])
+AC_ARG_ENABLE([dstore],
+              [AC_HELP_STRING([--disable-dstore],
+                              [Using shared memory datastore (default: enabled)])])
+if test "$enable_dstore" = "no" ; then
+    AC_MSG_RESULT([no])
+    WANT_DSTORE=0
+else
+    AC_MSG_RESULT([yes])
+    WANT_DSTORE=1
+fi
+AC_DEFINE_UNQUOTED([PMIX_ENABLE_DSTORE],
+                 [$WANT_DSTORE],
+                 [if want shared memory dstore feature])
+
+#
+#
+# Use pthread-based locking
+#
+DSTORE_PTHREAD_LOCK="1"
+AC_MSG_CHECKING([if want dstore pthread-based locking])
+AC_ARG_ENABLE([dstore-pthlck],
+              [AC_HELP_STRING([--disable-dstore-pthlck],
+                              [Disable pthread-based lockig in dstor (default: enabled)])])
+if test "$enable_dstore_pthlck" = "no" ; then
+    AC_MSG_RESULT([no])
+    DSTORE_PTHREAD_LOCK="0"
+else
+    AC_MSG_RESULT([yes])
+    DSTORE_PTHREAD_LOCK="1"
+fi
+
+#
+# Ident string
+#
+AC_MSG_CHECKING([if want ident string])
+AC_ARG_WITH([ident-string],
+            [AC_HELP_STRING([--with-ident-string=STRING],
+                            [Embed an ident string into PMIx object files])])
+if test "$with_ident_string" = "" || test "$with_ident_string" = "no"; then
+    with_ident_string="%VERSION%"
+fi
+# This is complicated, because $PMIX_VERSION may have spaces in it.
+# So put the whole sed expr in single quotes -- i.e., directly
+# substitute %VERSION% for (not expanded) $PMIX_VERSION.
+with_ident_string="`echo $with_ident_string | sed -e 's/%VERSION%/$PMIX_VERSION/'`"
+
+# Now eval an echo of that so that the "$PMIX_VERSION" token is
+# replaced with its value.  Enclose the whole thing in "" so that it
+# ends up as 1 token.
+with_ident_string="`eval echo $with_ident_string`"
+
+AC_DEFINE_UNQUOTED([PMIX_IDENT_STRING], ["$with_ident_string"],
+                   [ident string for PMIX])
+AC_MSG_RESULT([$with_ident_string])
+
+#
+# Timing support
+#
+AC_MSG_CHECKING([if want developer-level timing support])
+AC_ARG_ENABLE(pmix-timing,
+              AC_HELP_STRING([--enable-pmix-timing],
+                             [enable PMIx developer-level timing code (default: disabled)]))
+if test "$enable_pmix_timing" = "yes"; then
+    AC_MSG_RESULT([yes])
+    WANT_PMIX_TIMING=1
+else
+    AC_MSG_RESULT([no])
+    WANT_PMIX_TIMING=0
+fi
+
+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
+#
+AC_MSG_CHECKING([if want backward compatibility for PMI-1 and PMI-2])
+AC_ARG_ENABLE(pmi-backward-compatibility,
+              AC_HELP_STRING([--enable-pmi-backward-compatibility],
+                             [enable PMIx support for PMI-1 and PMI-2 (default: enabled)]))
+if test "$enable_pmi_backward_compatibility" = "no"; then
+    AC_MSG_RESULT([no])
+    WANT_PMI_BACKWARD=0
+else
+    AC_MSG_RESULT([yes])
+    WANT_PMI_BACKWARD=1
+fi
+
+AM_CONDITIONAL([WANT_INSTALL_HEADERS], [test $WANT_INSTALL_HEADERS -eq 1])
+])dnl
+
+# This must be a standalone routine so that it can be called both by
+# PMIX_INIT and an external caller (if PMIX_INIT is not invoked).
+AC_DEFUN([PMIX_DO_AM_CONDITIONALS],[
+    AS_IF([test "$pmix_did_am_conditionals" != "yes"],[
+        AM_CONDITIONAL([PMIX_EMBEDDED_MODE], [test "x$pmix_mode" = "xembedded"])
+        AM_CONDITIONAL([PMIX_TESTS_EXAMPLES], [test "x$pmix_tests" = "xyes"])
+        AM_CONDITIONAL([PMIX_COMPILE_TIMING], [test "$WANT_TIMING" = "1"])
+        AM_CONDITIONAL([PMIX_WANT_MUNGE], [test "$pmix_munge_support" = "1"])
+        AM_CONDITIONAL([PMIX_WANT_SASL], [test "$pmix_sasl_support" = "1"])
+        AM_CONDITIONAL([WANT_DSTORE], [test "x$enable_dstore" != "xno"])
+        AM_CONDITIONAL([WANT_PRIMARY_HEADERS], [test "x$pmix_install_primary_headers" = "xyes"])
+        AM_CONDITIONAL(WANT_INSTALL_HEADERS, test "$WANT_INSTALL_HEADERS" = 1)
+        AM_CONDITIONAL(WANT_PMI_BACKWARD, test "$WANT_PMI_BACKWARD" = 1)
+    ])
+    pmix_did_am_conditionals=yes
+])dnl
diff --git a/config/pmix_check_attributes.m4 b/config/pmix_check_attributes.m4
new file mode 100644
index 0000000..bbafcc2
--- /dev/null
+++ b/config/pmix_check_attributes.m4
@@ -0,0 +1,539 @@
+# -*- shell-script -*-
+# PMIx copyrights:
+# Copyright (c) 2013      Intel, Inc. All rights reserved
+#
+#########################
+#
+# Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2010 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2009      Oak Ridge National Labs.  All rights reserved.
+# Copyright (c) 2010-2015 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2013      Mellanox Technologies, Inc.
+#                         All rights reserved.
+# Copyright (c) 2015      Intel, Inc. All rights reserved.
+#########################
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+#
+# Search the generated warnings for
+# keywords regarding skipping or ignoring certain attributes
+#   Intel: ignore
+#   Sun C++: skip
+#
+AC_DEFUN([_PMIX_ATTRIBUTE_FAIL_SEARCH],[
+    AC_REQUIRE([AC_PROG_GREP])
+    if test -s conftest.err ; then
+        # icc uses 'invalid attribute' and 'attribute "__XXX__"  ignored'
+        # Sun 12.1 emits 'warning: attribute parameter "__printf__" is undefined'
+        for i in invalid ignore skip undefined ; do
+            $GREP -iq $i conftest.err
+            if test "$?" = "0" ; then
+                pmix_cv___attribute__[$1]=0
+                break;
+            fi
+        done
+    fi
+])
+
+#
+# Check for one specific attribute by compiling with C
+#
+# The last argument is for specific CFLAGS, that need to be set
+# for the compiler to generate a warning on the cross-check.
+# This may need adaption for future compilers / CFLAG-settings.
+#
+AC_DEFUN([_PMIX_CHECK_SPECIFIC_ATTRIBUTE], [
+    AC_MSG_CHECKING([for __attribute__([$1])])
+    AC_CACHE_VAL(pmix_cv___attribute__[$1], [
+        #
+        # Try to compile using the C compiler
+        #
+        AC_TRY_COMPILE([$2],[],
+                       [
+                        #
+                        # In case we did succeed: Fine, but was this due to the
+                        # attribute being ignored/skipped? Grep for IgNoRe/skip in conftest.err
+                        # and if found, reset the pmix_cv__attribute__var=0
+                        #
+                        pmix_cv___attribute__[$1]=1
+                        _PMIX_ATTRIBUTE_FAIL_SEARCH([$1])
+                       ],
+                       [pmix_cv___attribute__[$1]=0])
+    ])
+
+    if test "$pmix_cv___attribute__[$1]" = "1" ; then
+        AC_MSG_RESULT([yes])
+    else
+        AC_MSG_RESULT([no])
+    fi
+])
+
+
+#
+# Test the availability of __attribute__ and with the help
+# of _PMIX_CHECK_SPECIFIC_ATTRIBUTE for the support of
+# particular attributes. Compilers, that do not support an
+# attribute most often fail with a warning (when the warning
+# level is set).
+# The compilers output is parsed in _PMIX_ATTRIBUTE_FAIL_SEARCH
+#
+# To add a new attributes __NAME__ add the
+#   pmix_cv___attribute__NAME
+# add a new check with _PMIX_CHECK_SPECIFIC_ATTRIBUTE (possibly with a cross-check)
+#   _PMIX_CHECK_SPECIFIC_ATTRIBUTE([name], [int foo (int arg) __attribute__ ((__name__));], [], [])
+# and define the corresponding
+#   AC_DEFINE_UNQUOTED(PMIX_HAVE_ATTRIBUTE_NAME, [$pmix_cv___attribute__NAME],
+#                      [Whether your compiler has __attribute__ NAME or not])
+# and decide on a correct macro (in pmix/include/pmix_config_bottom.h):
+#  #  define __pmix_attribute_NAME(x)  __attribute__(__NAME__)
+#
+# Please use the "__"-notation of the attribute in order not to
+# clash with predefined names or macros (e.g. const, which some compilers
+# do not like..)
+#
+
+
+AC_DEFUN([PMIX_CHECK_ATTRIBUTES], [
+  AC_LANG(C)
+  AC_MSG_CHECKING(for __attribute__)
+
+  AC_CACHE_VAL(pmix_cv___attribute__, [
+    AC_TRY_COMPILE(
+      [#include <stdlib.h>
+       /* Check for the longest available __attribute__ (since gcc-2.3) */
+       struct foo {
+           char a;
+           int x[2] __attribute__ ((__packed__));
+        };
+      ],
+      [],
+      [pmix_cv___attribute__=1],
+      [pmix_cv___attribute__=0],
+    )
+
+    if test "$pmix_cv___attribute__" = "1" ; then
+        AC_TRY_COMPILE(
+          [#include <stdlib.h>
+           /* Check for the longest available __attribute__ (since gcc-2.3) */
+           struct foo {
+               char a;
+               int x[2] __attribute__ ((__packed__));
+            };
+          ],
+          [],
+          [pmix_cv___attribute__=1],
+          [pmix_cv___attribute__=0],
+        )
+    fi
+    ])
+  AC_DEFINE_UNQUOTED(PMIX_HAVE_ATTRIBUTE, [$pmix_cv___attribute__],
+                     [Whether your compiler has __attribute__ or not])
+
+#
+# Now that we know the compiler support __attribute__ let's check which kind of
+# attributed are supported.
+#
+  if test "$pmix_cv___attribute__" = "0" ; then
+    AC_MSG_RESULT([no])
+    pmix_cv___attribute__aligned=0
+    pmix_cv___attribute__always_inline=0
+    pmix_cv___attribute__cold=0
+    pmix_cv___attribute__const=0
+    pmix_cv___attribute__deprecated=0
+    pmix_cv___attribute__deprecated_argument=0
+    pmix_cv___attribute__format=0
+    pmix_cv___attribute__format_funcptr=0
+    pmix_cv___attribute__hot=0
+    pmix_cv___attribute__malloc=0
+    pmix_cv___attribute__may_alias=0
+    pmix_cv___attribute__no_instrument_function=0
+    pmix_cv___attribute__nonnull=0
+    pmix_cv___attribute__noreturn=0
+    pmix_cv___attribute__noreturn_funcptr=0
+    pmix_cv___attribute__packed=0
+    pmix_cv___attribute__pure=0
+    pmix_cv___attribute__sentinel=0
+    pmix_cv___attribute__unused=0
+    pmix_cv___attribute__visibility=0
+    pmix_cv___attribute__warn_unused_result=0
+    pmix_cv___attribute__destructor=0
+  else
+    AC_MSG_RESULT([yes])
+
+    _PMIX_CHECK_SPECIFIC_ATTRIBUTE([aligned],
+        [struct foo { char text[4]; }  __attribute__ ((__aligned__(8)));],
+        [],
+        [])
+
+    #
+    # Ignored by PGI-6.2.5; -- recognized by output-parser
+    #
+    _PMIX_CHECK_SPECIFIC_ATTRIBUTE([always_inline],
+        [int foo (int arg) __attribute__ ((__always_inline__));],
+        [],
+        [])
+
+    _PMIX_CHECK_SPECIFIC_ATTRIBUTE([cold],
+        [
+         int foo(int arg1, int arg2) __attribute__ ((__cold__));
+         int foo(int arg1, int arg2) { return arg1 * arg2 + arg1; }
+        ],
+        [],
+        [])
+
+    _PMIX_CHECK_SPECIFIC_ATTRIBUTE([const],
+        [
+         int foo(int arg1, int arg2) __attribute__ ((__const__));
+         int foo(int arg1, int arg2) { return arg1 * arg2 + arg1; }
+        ],
+        [],
+        [])
+
+    _PMIX_CHECK_SPECIFIC_ATTRIBUTE([deprecated],
+        [
+         int foo(int arg1, int arg2) __attribute__ ((__deprecated__));
+         int foo(int arg1, int arg2) { return arg1 * arg2 + arg1; }
+        ],
+        [],
+        [])
+
+    _PMIX_CHECK_SPECIFIC_ATTRIBUTE([deprecated_argument],
+        [
+         int foo(int arg1, int arg2) __attribute__ ((__deprecated__("compiler allows argument")));
+         int foo(int arg1, int arg2) { return arg1 * arg2 + arg1; }
+        ],
+        [],
+        [])
+
+    ATTRIBUTE_CFLAGS=
+    case "$pmix_c_vendor" in
+        gnu)
+            ATTRIBUTE_CFLAGS="-Wall"
+            ;;
+        intel)
+            # we want specifically the warning on format string conversion
+            ATTRIBUTE_CFLAGS="-we181"
+            ;;
+    esac
+    _PMIX_CHECK_SPECIFIC_ATTRIBUTE([format],
+        [
+         int this_printf (void *my_object, const char *my_format, ...) __attribute__ ((__format__ (__printf__, 2, 3)));
+        ],
+        [
+         static int usage (int * argument);
+         extern int this_printf (int arg1, const char *my_format, ...) __attribute__ ((__format__ (__printf__, 2, 3)));
+
+         static int usage (int * argument) {
+             return this_printf (*argument, "%d", argument); /* This should produce a format warning */
+         }
+         /* The autoconf-generated main-function is int main(), which produces a warning by itself */
+         int main(void);
+        ],
+        [$ATTRIBUTE_CFLAGS])
+
+    ATTRIBUTE_CFLAGS=
+    case "$pmix_c_vendor" in
+        gnu)
+            ATTRIBUTE_CFLAGS="-Wall"
+            ;;
+        intel)
+            # we want specifically the warning on format string conversion
+            ATTRIBUTE_CFLAGS="-we181"
+            ;;
+    esac
+    _PMIX_CHECK_SPECIFIC_ATTRIBUTE([format_funcptr],
+        [
+         int (*this_printf)(void *my_object, const char *my_format, ...) __attribute__ ((__format__ (__printf__, 2, 3)));
+        ],
+        [
+         static int usage (int * argument);
+         extern int (*this_printf) (int arg1, const char *my_format, ...) __attribute__ ((__format__ (__printf__, 2, 3)));
+
+         static int usage (int * argument) {
+             return (*this_printf) (*argument, "%d", argument); /* This should produce a format warning */
+         }
+         /* The autoconf-generated main-function is int main(), which produces a warning by itself */
+         int main(void);
+        ],
+        [$ATTRIBUTE_CFLAGS])
+
+    _PMIX_CHECK_SPECIFIC_ATTRIBUTE([hot],
+        [
+         int foo(int arg1, int arg2) __attribute__ ((__hot__));
+         int foo(int arg1, int arg2) { return arg1 * arg2 + arg1; }
+        ],
+        [],
+        [])
+
+    _PMIX_CHECK_SPECIFIC_ATTRIBUTE([malloc],
+        [
+#ifdef HAVE_STDLIB_H
+#  include <stdlib.h>
+#endif
+         int * foo(int arg1) __attribute__ ((__malloc__));
+         int * foo(int arg1) { return (int*) malloc(arg1); }
+        ],
+        [],
+        [])
+
+
+    #
+    # Attribute may_alias: No suitable cross-check available, that works for non-supporting compilers
+    # Ignored by intel-9.1.045 -- turn off with -wd1292
+    # Ignored by PGI-6.2.5; ignore not detected due to missing cross-check
+    #
+    _PMIX_CHECK_SPECIFIC_ATTRIBUTE([may_alias],
+        [int * p_value __attribute__ ((__may_alias__));],
+        [],
+        [])
+
+
+    _PMIX_CHECK_SPECIFIC_ATTRIBUTE([no_instrument_function],
+        [int * foo(int arg1) __attribute__ ((__no_instrument_function__));],
+        [],
+        [])
+
+
+    #
+    # Attribute nonnull:
+    # Ignored by intel-compiler 9.1.045 -- recognized by cross-check
+    # Ignored by PGI-6.2.5 (pgCC) -- recognized by cross-check
+    #
+    ATTRIBUTE_CFLAGS=
+    case "$pmix_c_vendor" in
+        gnu)
+            ATTRIBUTE_CFLAGS="-Wall"
+            ;;
+        intel)
+            # we do not want to get ignored attributes warnings, but rather real warnings
+            ATTRIBUTE_CFLAGS="-wd1292"
+            ;;
+    esac
+    _PMIX_CHECK_SPECIFIC_ATTRIBUTE([nonnull],
+        [
+         int square(int *arg) __attribute__ ((__nonnull__));
+         int square(int *arg) { return *arg; }
+        ],
+        [
+         static int usage(int * argument);
+         int square(int * argument) __attribute__ ((__nonnull__));
+         int square(int * argument) { return (*argument) * (*argument); }
+
+         static int usage(int * argument) {
+             return square( ((void*)0) );    /* This should produce an argument must be nonnull warning */
+         }
+         /* The autoconf-generated main-function is int main(), which produces a warning by itself */
+         int main(void);
+        ],
+        [$ATTRIBUTE_CFLAGS])
+
+
+    _PMIX_CHECK_SPECIFIC_ATTRIBUTE([noreturn],
+        [
+#ifdef HAVE_UNISTD_H
+#  include <unistd.h>
+#endif
+#ifdef HAVE_STDLIB_H
+#  include <stdlib.h>
+#endif
+         void fatal(int arg1) __attribute__ ((__noreturn__));
+         void fatal(int arg1) { exit(arg1); }
+        ],
+        [],
+        [])
+
+
+    _PMIX_CHECK_SPECIFIC_ATTRIBUTE([noreturn_funcptr],
+        [
+#ifdef HAVE_UNISTD_H
+#  include <unistd.h>
+#endif
+#ifdef HAVE_STDLIB_H
+#  include <stdlib.h>
+#endif
+         extern void (*fatal_exit)(int arg1) __attribute__ ((__noreturn__));
+         void fatal(int arg1) { fatal_exit (arg1); }
+        ],
+        [],
+        [$ATTRIBUTE_CFLAGS])
+
+
+    _PMIX_CHECK_SPECIFIC_ATTRIBUTE([packed],
+        [
+         struct foo {
+             char a;
+             int x[2] __attribute__ ((__packed__));
+         };
+        ],
+        [],
+        [])
+
+    _PMIX_CHECK_SPECIFIC_ATTRIBUTE([pure],
+        [
+         int square(int arg) __attribute__ ((__pure__));
+         int square(int arg) { return arg * arg; }
+        ],
+        [],
+        [])
+
+    #
+    # Attribute sentinel:
+    # Ignored by the intel-9.1.045 -- recognized by cross-check
+    #                intel-10.0beta works fine
+    # Ignored by PGI-6.2.5 (pgCC) -- recognized by output-parser and cross-check
+    # Ignored by pathcc-2.2.1 -- recognized by cross-check (through grep ignore)
+    #
+    ATTRIBUTE_CFLAGS=
+    case "$pmix_c_vendor" in
+        gnu)
+            ATTRIBUTE_CFLAGS="-Wall"
+            ;;
+        intel)
+            # we do not want to get ignored attributes warnings
+            ATTRIBUTE_CFLAGS="-wd1292"
+            ;;
+    esac
+    _PMIX_CHECK_SPECIFIC_ATTRIBUTE([sentinel],
+        [
+         int my_execlp(const char * file, const char *arg, ...) __attribute__ ((__sentinel__));
+        ],
+        [
+         static int usage(int * argument);
+         int my_execlp(const char * file, const char *arg, ...) __attribute__ ((__sentinel__));
+
+         static int usage(int * argument) {
+             void * last_arg_should_be_null = argument;
+             return my_execlp ("lala", "/home/there", last_arg_should_be_null);   /* This should produce a warning */
+         }
+         /* The autoconf-generated main-function is int main(), which produces a warning by itself */
+         int main(void);
+        ],
+        [$ATTRIBUTE_CFLAGS])
+
+    _PMIX_CHECK_SPECIFIC_ATTRIBUTE([unused],
+        [
+         int square(int arg1 __attribute__ ((__unused__)), int arg2);
+         int square(int arg1, int arg2) { return arg2; }
+        ],
+        [],
+        [])
+
+
+    #
+    # Ignored by PGI-6.2.5 (pgCC) -- recognized by the output-parser
+    #
+    _PMIX_CHECK_SPECIFIC_ATTRIBUTE([visibility],
+        [
+         int square(int arg1) __attribute__ ((__visibility__("hidden")));
+        ],
+        [],
+        [])
+
+
+    #
+    # Attribute warn_unused_result:
+    # Ignored by the intel-compiler 9.1.045 -- recognized by cross-check
+    # Ignored by pathcc-2.2.1 -- recognized by cross-check (through grep ignore)
+    #
+    ATTRIBUTE_CFLAGS=
+    case "$pmix_c_vendor" in
+        gnu)
+            ATTRIBUTE_CFLAGS="-Wall"
+            ;;
+        intel)
+            # we do not want to get ignored attributes warnings
+            ATTRIBUTE_CFLAGS="-wd1292"
+            ;;
+    esac
+    _PMIX_CHECK_SPECIFIC_ATTRIBUTE([warn_unused_result],
+        [
+         int foo(int arg) __attribute__ ((__warn_unused_result__));
+         int foo(int arg) { return arg + 3; }
+        ],
+        [
+         static int usage(int * argument);
+         int foo(int arg) __attribute__ ((__warn_unused_result__));
+
+         int foo(int arg) { return arg + 3; }
+         static int usage(int * argument) {
+           foo (*argument);        /* Should produce an unused result warning */
+           return 0;
+         }
+
+         /* The autoconf-generated main-function is int main(), which produces a warning by itself */
+         int main(void);
+        ],
+        [$ATTRIBUTE_CFLAGS])
+
+
+    _PMIX_CHECK_SPECIFIC_ATTRIBUTE([destructor],
+        [
+        void foo(void) __attribute__ ((__destructor__));
+        void foo(void) { return ; }
+        ],
+        [],
+        [])
+  fi
+
+  # Now that all the values are set, define them
+
+  AC_DEFINE_UNQUOTED(PMIX_HAVE_ATTRIBUTE_ALIGNED, [$pmix_cv___attribute__aligned],
+                     [Whether your compiler has __attribute__ aligned or not])
+  AC_DEFINE_UNQUOTED(PMIX_HAVE_ATTRIBUTE_ALWAYS_INLINE, [$pmix_cv___attribute__always_inline],
+                     [Whether your compiler has __attribute__ always_inline or not])
+  AC_DEFINE_UNQUOTED(PMIX_HAVE_ATTRIBUTE_COLD, [$pmix_cv___attribute__cold],
+                     [Whether your compiler has __attribute__ cold or not])
+  AC_DEFINE_UNQUOTED(PMIX_HAVE_ATTRIBUTE_CONST, [$pmix_cv___attribute__const],
+                     [Whether your compiler has __attribute__ const or not])
+  AC_DEFINE_UNQUOTED(PMIX_HAVE_ATTRIBUTE_DEPRECATED, [$pmix_cv___attribute__deprecated],
+                     [Whether your compiler has __attribute__ deprecated or not])
+  AC_DEFINE_UNQUOTED(PMIX_HAVE_ATTRIBUTE_DEPRECATED_ARGUMENT, [$pmix_cv___attribute__deprecated_argument],
+                     [Whether your compiler has __attribute__ deprecated with optional argument])
+  AC_DEFINE_UNQUOTED(PMIX_HAVE_ATTRIBUTE_FORMAT, [$pmix_cv___attribute__format],
+                     [Whether your compiler has __attribute__ format or not])
+  AC_DEFINE_UNQUOTED(PMIX_HAVE_ATTRIBUTE_FORMAT_FUNCPTR, [$pmix_cv___attribute__format_funcptr],
+                     [Whether your compiler has __attribute__ format and it works on function pointers])
+  AC_DEFINE_UNQUOTED(PMIX_HAVE_ATTRIBUTE_HOT, [$pmix_cv___attribute__hot],
+                     [Whether your compiler has __attribute__ hot or not])
+  AC_DEFINE_UNQUOTED(PMIX_HAVE_ATTRIBUTE_MALLOC, [$pmix_cv___attribute__malloc],
+                     [Whether your compiler has __attribute__ malloc or not])
+  AC_DEFINE_UNQUOTED(PMIX_HAVE_ATTRIBUTE_MAY_ALIAS, [$pmix_cv___attribute__may_alias],
+                     [Whether your compiler has __attribute__ may_alias or not])
+  AC_DEFINE_UNQUOTED(PMIX_HAVE_ATTRIBUTE_NO_INSTRUMENT_FUNCTION, [$pmix_cv___attribute__no_instrument_function],
+                     [Whether your compiler has __attribute__ no_instrument_function or not])
+  AC_DEFINE_UNQUOTED(PMIX_HAVE_ATTRIBUTE_NONNULL, [$pmix_cv___attribute__nonnull],
+                     [Whether your compiler has __attribute__ nonnull or not])
+  AC_DEFINE_UNQUOTED(PMIX_HAVE_ATTRIBUTE_NORETURN, [$pmix_cv___attribute__noreturn],
+                     [Whether your compiler has __attribute__ noreturn or not])
+  AC_DEFINE_UNQUOTED(PMIX_HAVE_ATTRIBUTE_NORETURN_FUNCPTR, [$pmix_cv___attribute__noreturn_funcptr],
+                     [Whether your compiler has __attribute__ noreturn and it works on function pointers])
+  AC_DEFINE_UNQUOTED(PMIX_HAVE_ATTRIBUTE_PACKED, [$pmix_cv___attribute__packed],
+                     [Whether your compiler has __attribute__ packed or not])
+  AC_DEFINE_UNQUOTED(PMIX_HAVE_ATTRIBUTE_PURE, [$pmix_cv___attribute__pure],
+                     [Whether your compiler has __attribute__ pure or not])
+  AC_DEFINE_UNQUOTED(PMIX_HAVE_ATTRIBUTE_SENTINEL, [$pmix_cv___attribute__sentinel],
+                     [Whether your compiler has __attribute__ sentinel or not])
+  AC_DEFINE_UNQUOTED(PMIX_HAVE_ATTRIBUTE_UNUSED, [$pmix_cv___attribute__unused],
+                     [Whether your compiler has __attribute__ unused or not])
+  AC_DEFINE_UNQUOTED(PMIX_HAVE_ATTRIBUTE_VISIBILITY, [$pmix_cv___attribute__visibility],
+                     [Whether your compiler has __attribute__ visibility or not])
+  AC_DEFINE_UNQUOTED(PMIX_HAVE_ATTRIBUTE_WARN_UNUSED_RESULT, [$pmix_cv___attribute__warn_unused_result],
+                     [Whether your compiler has __attribute__ warn unused result or not])
+  AC_DEFINE_UNQUOTED(PMIX_HAVE_ATTRIBUTE_WEAK_ALIAS, [$pmix_cv___attribute__weak_alias],
+                     [Whether your compiler has __attribute__ weak alias or not])
+  AC_DEFINE_UNQUOTED(PMIX_HAVE_ATTRIBUTE_DESTRUCTOR, [$pmix_cv___attribute__destructor],
+                     [Whether your compiler has __attribute__ destructor or not])
+])
diff --git a/config/pmix_check_broken_qsort.m4 b/config/pmix_check_broken_qsort.m4
new file mode 100644
index 0000000..da4d140
--- /dev/null
+++ b/config/pmix_check_broken_qsort.m4
@@ -0,0 +1,55 @@
+dnl -*- shell-script -*-
+dnl
+dnl Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+dnl                         University Research and Technology
+dnl                         Corporation.  All rights reserved.
+dnl Copyright (c) 2004-2005 The University of Tennessee and The University
+dnl                         of Tennessee Research Foundation.  All rights
+dnl                         reserved.
+dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+dnl                         University of Stuttgart.  All rights reserved.
+dnl Copyright (c) 2004-2005 The Regents of the University of California.
+dnl                         All rights reserved.
+dnl Copyright (c) 2007      Sun Microsystems, Inc.  All rights reserved.
+dnl Copyright (c) 2014-2015 Intel, Inc. All rights reserved.
+dnl Copyright (c) 2015      Cisco Systems, Inc.  All rights reserved.
+dnl $COPYRIGHT$
+dnl
+dnl Additional copyrights may follow
+dnl
+dnl $HEADER$
+dnl
+dnl There was some mentioning of broken qsort happened for Solaris that could
+dnl cause qsort to return a bad pointer which could cause some badness.
+dnl The problem should have been corrected with these patches from SunSolve.
+dnl Solaris 10 should be free from this problem.
+dnl
+dnl 5.8_sparc #108827-27 or later
+dnl 5.8_x86   #108828-28 or later
+dnl 5.9_sparc #112874-20 or later
+dnl 5.9_x86   #114432-07 or later
+dnl
+dnl For users who could not patch their systems or are convinced that their
+dnl native qsort is broken, they could specify this configure flag to use
+dnl the pmix_qsort instead.
+
+# check for broken qsort
+# PMIX_CHECK_BROKEN_QSORT(prefix, [action-if-found], [action-if-not-found])
+# --------------------------------------------------------
+AC_DEFUN([PMIX_CHECK_BROKEN_QSORT],[
+  AC_ARG_WITH([broken-qsort],
+              [AC_HELP_STRING([--with-broken-qsort],
+                              [Build with FreeBSD qsort instead of native qsort (default: no)])])
+  AC_MSG_CHECKING([for broken qsort])
+
+  if test "$with_broken_qsort" = "yes"; then
+    result="yes"
+    define_result=1
+  else
+    result="no"
+    define_result=0
+  fi
+  AC_MSG_RESULT([$result])
+  AC_DEFINE_UNQUOTED([PMIX_HAVE_BROKEN_QSORT], [$define_result],
+                     [whether qsort is broken or not])
+])
diff --git a/config/pmix_check_compiler_version.m4 b/config/pmix_check_compiler_version.m4
new file mode 100644
index 0000000..78343b9
--- /dev/null
+++ b/config/pmix_check_compiler_version.m4
@@ -0,0 +1,90 @@
+dnl -*- shell-script -*-
+dnl
+dnl Copyright (c) 2009      Oak Ridge National Labs.  All rights reserved.
+dnl Copyright (c) 2013-2017 Intel, Inc.  All rights reserved.
+dnl
+dnl $COPYRIGHT$
+dnl
+dnl Additional copyrights may follow
+dnl
+dnl $HEADER$
+dnl
+
+
+# PMIX_CHECK_COMPILER_VERSION_ID()
+# ----------------------------------------------------
+# Try to figure out the compiler's name and version to detect cases,
+# where users compile PMIx with one version and compile the application
+# with a different compiler.
+#
+AC_DEFUN([PMIX_CHECK_COMPILER_VERSION_ID],
+[
+    PMIX_CHECK_COMPILER(FAMILYID)
+    PMIX_CHECK_COMPILER_STRINGIFY(FAMILYNAME)
+    PMIX_CHECK_COMPILER(VERSION)
+    PMIX_CHECK_COMPILER_STRINGIFY(VERSION_STR)
+])dnl
+
+
+AC_DEFUN([PMIX_CHECK_COMPILER], [
+    lower=m4_tolower($1)
+    AC_CACHE_CHECK([for compiler $lower], pmix_cv_compiler_[$1],
+    [
+            CPPFLAGS_orig=$CPPFLAGS
+            CPPFLAGS="-I${top_pmix_srcdir}/src/include $CPPFLAGS"
+            AC_TRY_RUN([
+#include <stdio.h>
+#include <stdlib.h>
+
+int main (int argc, char * argv[])
+{
+    FILE * f;
+    f=fopen("conftestval", "w");
+    if (!f) exit(1);
+    fprintf (f, "%d", PLATFORM_COMPILER_$1);
+    return 0;
+}
+            ], [
+                eval pmix_cv_compiler_$1=`cat conftestval`;
+            ], [
+                eval pmix_cv_compiler_$1=0
+            ], [
+                eval pmix_cv_compiler_$1=0
+            ])
+            CPPFLAGS=$CPPFLAGS_orig
+    ])
+    AC_DEFINE_UNQUOTED([PMIX_BUILD_PLATFORM_COMPILER_$1], $pmix_cv_compiler_[$1],
+                       [The compiler $lower which PMIx was built with])
+])dnl
+
+
+AC_DEFUN([PMIX_CHECK_COMPILER_STRINGIFY], [
+    lower=m4_tolower($1)
+    AC_CACHE_CHECK([for compiler $lower], pmix_cv_compiler_[$1],
+    [
+            CPPFLAGS_orig=$CPPFLAGS
+            CPPFLAGS="-I${top_pmix_srcdir}/src/include $CPPFLAGS"
+            AC_TRY_RUN([
+#include <stdio.h>
+#include <stdlib.h>
+
+int main (int argc, char * argv[])
+{
+    FILE * f;
+    f=fopen("conftestval", "w");
+    if (!f) exit(1);
+    fprintf (f, "%s", _STRINGIFY(PLATFORM_COMPILER_$1));
+    return 0;
+}
+            ], [
+                eval pmix_cv_compiler_$1=`cat conftestval`;
+            ], [
+                eval pmix_cv_compiler_$1=UNKNOWN
+            ], [
+                eval pmix_cv_compiler_$1=UNKNOWN
+            ])
+            CPPFLAGS=$CPPFLAGS_orig
+    ])
+    AC_DEFINE_UNQUOTED([PMIX_BUILD_PLATFORM_COMPILER_$1], $pmix_cv_compiler_[$1],
+                       [The compiler $lower which PMIX was built with])
+])dnl
diff --git a/config/pmix_check_icc.m4 b/config/pmix_check_icc.m4
new file mode 100644
index 0000000..e8a06b2
--- /dev/null
+++ b/config/pmix_check_icc.m4
@@ -0,0 +1,62 @@
+dnl -*- shell-script -*-
+dnl
+dnl Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+dnl                         University Research and Technology
+dnl                         Corporation.  All rights reserved.
+dnl Copyright (c) 2004-2005 The University of Tennessee and The University
+dnl                         of Tennessee Research Foundation.  All rights
+dnl                         reserved.
+dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+dnl                         University of Stuttgart.  All rights reserved.
+dnl Copyright (c) 2004-2005 The Regents of the University of California.
+dnl                         All rights reserved.
+dnl Copyright (c) 2014      Intel, Inc. All rights reserved.
+dnl Copyright (c) 2016      Research Organization for Information Science
+dnl                         and Technology (RIST). All rights reserved.
+dnl $COPYRIGHT$
+dnl
+dnl Additional copyrights may follow
+dnl
+dnl $HEADER$
+dnl
+
+AC_DEFUN([PMIX_CHECK_ICC_VARARGS],[
+dnl
+dnl On EM64T, icc-8.1 before version 8.1.027 segfaulted, since
+dnl va_start was miscompiled...
+dnl
+AC_MSG_CHECKING([whether icc-8.1 for EM64T works with variable arguments])
+AC_TRY_RUN([
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+void func (int c, char * f, ...)
+{
+  va_list arglist;
+  va_start (arglist, f);
+  /* vprintf (f, arglist); */
+  va_end (arglist);
+}
+
+int main ()
+{
+  FILE *f;
+  func (4711, "Help %d [%s]\n", 10, "ten");
+  f=fopen ("conftestval", "w");
+  if (!f) exit (1);
+  return 0;
+}
+
+],[pmix_ac_icc_varargs=`test -f conftestval`],[pmix_ac_icc_varargs=1],[pmix_ac_icc_varargs=1])
+
+if test "$pmix_ac_icc_varargs" = "1"; then
+    AC_MSG_WARN([*** Problem running configure test!])
+    AC_MSG_WARN([*** Your icc-8.1 compiler seems to miscompile va_start!])
+    AC_MSG_WARN([*** Please upgrade compiler to at least version 8.1.027])
+    AC_MSG_ERROR([*** Cannot continue.])
+fi
+
+AC_MSG_RESULT([yes])
+
+rm -rf conftest*])dnl
diff --git a/config/pmix_check_ident.m4 b/config/pmix_check_ident.m4
new file mode 100644
index 0000000..de2fa57
--- /dev/null
+++ b/config/pmix_check_ident.m4
@@ -0,0 +1,103 @@
+dnl -*- shell-script -*-
+dnl
+dnl Copyright (c) 2007      Sun Microsystems, Inc.  All rights reserved.
+dnl Copyright (c) 2015      Intel, Inc. All rights reserved
+dnl $COPYRIGHT$
+dnl
+dnl Additional copyrights may follow
+dnl
+dnl $HEADER$
+dnl
+dnl defines:
+dnl   PMIX_$1_USE_PRAGMA_IDENT
+dnl   PMIX_$1_USE_IDENT
+dnl   PMIX_$1_USE_CONST_CHAR_IDENT
+dnl
+
+# PMIX_CHECK_IDENT(compiler-env, compiler-flags,
+# file-suffix, lang) Try to compile a source file containing
+# a #pragma ident, and determine whether the ident was
+# inserted into the resulting object file
+# -----------------------------------------------------------
+AC_DEFUN([PMIX_CHECK_IDENT], [
+    AC_MSG_CHECKING([for $4 ident string support])
+
+    pmix_pragma_ident_happy=0
+    pmix_ident_happy=0
+    pmix_static_const_char_happy=0
+    _PMIX_CHECK_IDENT(
+        [$1], [$2], [$3],
+        [[#]pragma ident], [],
+        [pmix_pragma_ident_happy=1
+         pmix_message="[#]pragma ident"],
+        _PMIX_CHECK_IDENT(
+            [$1], [$2], [$3],
+            [[#]ident], [],
+            [pmix_ident_happy=1
+             pmix_message="[#]ident"],
+            _PMIX_CHECK_IDENT(
+                [$1], [$2], [$3],
+                [[#]pragma comment(exestr, ], [)],
+                [pmix_pragma_comment_happy=1
+                 pmix_message="[#]pragma comment"],
+                [pmix_static_const_char_happy=1
+                 pmix_message="static const char[[]]"])))
+
+    AC_DEFINE_UNQUOTED([PMIX_$1_USE_PRAGMA_IDENT],
+        [$pmix_pragma_ident_happy], [Use #pragma ident strings for $4 files])
+    AC_DEFINE_UNQUOTED([PMIX_$1_USE_IDENT],
+        [$pmix_ident_happy], [Use #ident strings for $4 files])
+    AC_DEFINE_UNQUOTED([PMIX_$1_USE_PRAGMA_COMMENT],
+        [$pmix_pragma_comment_happy], [Use #pragma comment for $4 files])
+    AC_DEFINE_UNQUOTED([PMIX_$1_USE_CONST_CHAR_IDENT],
+        [$pmix_static_const_char_happy], [Use static const char[] strings for $4 files])
+
+    AC_MSG_RESULT([$pmix_message])
+
+    unset pmix_pragma_ident_happy pmix_ident_happy pmix_static_const_char_happy pmix_message
+])
+
+# _PMIX_CHECK_IDENT(compiler-env, compiler-flags,
+# file-suffix, header_prefix, header_suffix, action-if-success, action-if-fail)
+# Try to compile a source file containing a #-style ident,
+# and determine whether the ident was inserted into the
+# resulting object file
+# -----------------------------------------------------------
+AC_DEFUN([_PMIX_CHECK_IDENT], [
+    eval pmix_compiler="\$$1"
+    eval pmix_flags="\$$2"
+
+    pmix_ident="string_not_coincidentally_inserted_by_the_compiler"
+    cat > conftest.$3 <<EOF
+$4 "$pmix_ident" $5
+int main(int argc, char** argv);
+int main(int argc, char** argv) { return 0; }
+EOF
+
+    # "strings" won't always return the ident string.  objdump isn't
+    # universal (e.g., OS X doesn't have it), and ...other
+    # complications.  So just try to "grep" for the string in the
+    # resulting object file.  If the ident is found in "strings" or
+    # the grep succeeds, rule that we have this flavor of ident.
+
+    echo "configure:__oline__: $1" >&5
+    pmix_output=`$pmix_compiler $pmix_flags -c conftest.$3 -o conftest.${OBJEXT} 2>&1 1>/dev/null`
+    pmix_status=$?
+    AS_IF([test $pmix_status = 0],
+          [test -z "$pmix_output"
+           pmix_status=$?])
+    PMIX_LOG_MSG([\$? = $pmix_status], 1)
+    AS_IF([test $pmix_status = 0 && test -f conftest.${OBJEXT}],
+          [pmix_output="`strings -a conftest.${OBJEXT} | grep $pmix_ident`"
+           grep $pmix_ident conftest.${OBJEXT} 2>&1 1>/dev/null
+           pmix_status=$?
+           AS_IF([test "$pmix_output" != "" || test "$pmix_status" = "0"],
+                 [$6],
+                 [$7])],
+          [PMIX_LOG_MSG([the failed program was:])
+           PMIX_LOG_FILE([conftest.$3])
+           $7])
+
+    unset pmix_compiler pmix_flags pmix_output pmix_status
+    rm -rf conftest.* conftest${EXEEXT}
+])dnl
diff --git a/config/pmix_check_lock.m4 b/config/pmix_check_lock.m4
new file mode 100644
index 0000000..65f28d3
--- /dev/null
+++ b/config/pmix_check_lock.m4
@@ -0,0 +1,61 @@
+dnl -*- shell-script -*-
+dnl
+dnl Copyright (c) 2017      Mellanox Technologies, Inc.
+dnl                         All rights reserved.
+dnl Copyright (c) 2017      IBM Corporation.  All rights reserved.
+dnl Copyright (c) 2017      Research Organization for Information Science
+dnl                         and Technology (RIST). All rights reserved.
+dnl Copyright (c) 2017      Intel, Inc. All rights reserved.
+dnl $COPYRIGHT$
+dnl
+dnl Additional copyrights may follow
+dnl
+dnl $HEADER$
+dnl
+
+AC_DEFUN([PMIX_CHECK_DSTOR_LOCK],[
+    orig_libs=$LIBS
+    LIBS="-lpthread $LIBS"
+
+    _x_ac_pthread_lock_found="0"
+    _x_ac_fcntl_lock_found="0"
+
+    AC_CHECK_MEMBERS([struct flock.l_type],
+    [
+        AC_DEFINE([HAVE_FCNTL_FLOCK], [1],
+        [Define to 1 if you have the locking by fcntl.])
+        _x_ac_fcntl_lock_found="1"
+    ], [], [#include <fcntl.h>])
+
+    if test "$DSTORE_PTHREAD_LOCK" = "1"; then
+        AC_CHECK_FUNC([pthread_rwlockattr_setkind_np],
+            [AC_EGREP_HEADER([PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP],
+                    [pthread.h],[
+                        AC_DEFINE([HAVE_PTHREAD_SETKIND], [1],
+                            [Define to 1 if you have the `pthread_rwlockattr_setkind_np` function.])])])
+
+        AC_CHECK_FUNC([pthread_rwlockattr_setpshared],
+            [AC_EGREP_HEADER([PTHREAD_PROCESS_SHARED],
+                    [pthread.h],[
+                        AC_DEFINE([HAVE_PTHREAD_SHARED], [1],
+                            [Define to 1 if you have the `PTHREAD_PROCESS_SHARED` definition.
+                        ])
+                        _x_ac_pthread_lock_found="1"
+            ])
+        ])
+
+        if test "$_x_ac_pthread_lock_found" = "0"; then
+            if test "$_x_ac_fcntl_lock_found" = "1"; then
+                AC_MSG_WARN([dstore: pthread-based locking not found, will use fcntl-based locking.])
+            else
+                AC_MSG_ERROR([dstore: no available locking mechanisms was found. Can not continue. Try disabling dstore])
+            fi
+        fi
+    else
+        if test "$_x_ac_fcntl_lock_found" = "0"; then
+            AC_MSG_ERROR([dstore: no available locking mechanisms was found. Can not continue. Try disabling dstore])
+        fi
+        LIBS="$orig_libs"
+    fi
+
+])
diff --git a/config/pmix_check_os_flavors.m4 b/config/pmix_check_os_flavors.m4
new file mode 100644
index 0000000..5c333ff
--- /dev/null
+++ b/config/pmix_check_os_flavors.m4
@@ -0,0 +1,69 @@
+dnl -*- shell-script -*-
+dnl
+dnl Copyright (c) 2010      Cisco Systems, Inc.  All rights reserved.
+dnl Copyright (c) 2014-2016 Intel, Inc. All rights reserved.
+dnl Copyright (c) 2014      Research Organization for Information Science
+dnl                         and Technology (RIST). All rights reserved.
+dnl
+dnl $COPYRIGHT$
+dnl
+dnl Additional copyrights may follow
+dnl
+dnl $HEADER$
+dnl
+
+# PMIX_CHECK_OS_FLAVOR_SPECIFIC()
+# ----------------------------------------------------
+# Helper macro from PMIX-CHECK-OS-FLAVORS(), below.
+# $1 = macro to look for
+# $2 = suffix of env variable to set with results
+AC_DEFUN([PMIX_CHECK_OS_FLAVOR_SPECIFIC],
+[
+    AC_MSG_CHECKING([$1])
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
+     [[#ifndef $1
+      error: this isnt $1
+      #endif
+     ]])],
+                      [pmix_found_$2=yes],
+                      [pmix_found_$2=no])
+    AC_MSG_RESULT([$pmix_found_$2])
+])dnl
+
+# PMIX_CHECK_OS_FLAVORS()
+# ----------------------------------------------------
+# Try to figure out the various OS flavors out there.
+#
+AC_DEFUN([PMIX_CHECK_OS_FLAVORS],
+[
+    PMIX_CHECK_OS_FLAVOR_SPECIFIC([__NetBSD__], [netbsd])
+    PMIX_CHECK_OS_FLAVOR_SPECIFIC([__FreeBSD__], [freebsd])
+    PMIX_CHECK_OS_FLAVOR_SPECIFIC([__OpenBSD__], [openbsd])
+    PMIX_CHECK_OS_FLAVOR_SPECIFIC([__DragonFly__], [dragonfly])
+    PMIX_CHECK_OS_FLAVOR_SPECIFIC([__386BSD__], [386bsd])
+    PMIX_CHECK_OS_FLAVOR_SPECIFIC([__bsdi__], [bsdi])
+    PMIX_CHECK_OS_FLAVOR_SPECIFIC([__APPLE__], [apple])
+    PMIX_CHECK_OS_FLAVOR_SPECIFIC([__linux__], [linux])
+    PMIX_CHECK_OS_FLAVOR_SPECIFIC([__sun__], [sun])
+    AS_IF([test "$pmix_found_sun" = "no"],
+          PMIX_CHECK_OS_FLAVOR_SPECIFIC([__sun], [sun]))
+
+    AS_IF([test "$pmix_found_sun" = "yes"],
+          [pmix_have_solaris=1
+           CFLAGS="$CFLAGS -D_REENTRANT"
+           CPPFLAGS="$CPPFLAGS -D_REENTRANT"],
+          [pmix_have_solaris=0])
+    AC_DEFINE_UNQUOTED([PMIX_HAVE_SOLARIS],
+                       [$pmix_have_solaris],
+                       [Whether or not we have solaris])
+
+    # check for sockaddr_in (a good sign we have TCP)
+    AC_CHECK_HEADERS([netdb.h netinet/in.h netinet/tcp.h])
+    AC_CHECK_TYPES([struct sockaddr_in],
+                   [pmix_found_sockaddr=yes],
+                   [pmix_found_sockaddr=no],
+                   [AC_INCLUDES_DEFAULT
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif])
+])dnl
diff --git a/config/pmix_check_package.m4 b/config/pmix_check_package.m4
new file mode 100644
index 0000000..babb542
--- /dev/null
+++ b/config/pmix_check_package.m4
@@ -0,0 +1,186 @@
+# -*- shell-script -*-
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2012-2015 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2012      Oracle and/or its affiliates.  All rights reserved.
+# Copyright (c) 2014      Intel, Inc. All rights reserved.
+# Copyright (c) 2017      Research Organization for Information Science
+#                         and Technology (RIST). All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# _PMIX_CHECK_PACKAGE_HEADER(prefix, header, dir-prefix,
+#                            [action-if-found], [action-if-not-found],
+#                            includes)
+# --------------------------------------------------------------------
+AC_DEFUN([_PMIX_CHECK_PACKAGE_HEADER], [
+    # This is stolen from autoconf to peek under the covers to get the
+    # cache variable for the library check.  one should not copy this
+    # code into other places unless you want much pain and suffering
+    AS_VAR_PUSHDEF([pmix_Header], [ac_cv_header_$2])
+
+    # so this sucks, but there's no way to get through the progression
+    # of header includes without killing off the cache variable and trying
+    # again...
+    unset pmix_Header
+
+    pmix_check_package_header_happy="no"
+    AS_IF([test "$3" = "/usr" || test "$3" = "/usr/local"],
+           [ # try as is...
+            AC_VERBOSE([looking for header without includes])
+            AC_CHECK_HEADERS([$2], [pmix_check_package_header_happy="yes"], [])
+            AS_IF([test "$pmix_check_package_header_happy" = "no"],
+                  [# no go on the as is - reset the cache and try again
+                   unset pmix_Header])])
+
+    AS_IF([test "$pmix_check_package_header_happy" = "no"],
+          [AS_IF([test "$3" != ""],
+                 [$1_CPPFLAGS="$$1_CPPFLAGS -I$3/include"
+                  CPPFLAGS="$CPPFLAGS -I$3/include"])
+          AC_CHECK_HEADERS([$2], [pmix_check_package_header_happy="yes"], [], [$6])
+	  AS_IF([test "$pmix_check_package_header_happy" = "yes"], [$4], [$5])],
+          [$4])
+    unset pmix_check_package_header_happy
+
+    AS_VAR_POPDEF([pmix_Header])dnl
+])
+
+
+# _PMIX_CHECK_PACKAGE_LIB(prefix, library, function, extra-libraries,
+#                         dir-prefix, libdir,
+#                         [action-if-found], [action-if-not-found]])
+# --------------------------------------------------------------------
+AC_DEFUN([_PMIX_CHECK_PACKAGE_LIB], [
+    # This is stolen from autoconf to peek under the covers to get the
+    # cache variable for the library check.  one should not copy this
+    # code into other places unless you want much pain and suffering
+    AS_LITERAL_IF([$2],
+                  [AS_VAR_PUSHDEF([pmix_Lib], [ac_cv_lib_$2_$3])],
+                  [AS_VAR_PUSHDEF([pmix_Lib], [ac_cv_lib_$2''_$3])])dnl
+
+    # see comment above
+    unset pmix_Lib
+    pmix_check_package_lib_happy="no"
+    AS_IF([test "$6" != ""],
+          [ # libdir was specified - search only there
+           $1_LDFLAGS="$$1_LDFLAGS -L$6"
+           LDFLAGS="$LDFLAGS -L$6"
+           AC_SEARCH_LIBS([$3], [$2],
+                        [pmix_check_package_lib_happy="yes"],
+                        [pmix_check_package_lib_happy="no"], [$4])
+           AS_IF([test "$pmix_check_package_lib_happy" = "no"],
+                 [LDFLAGS="$pmix_check_package_$1_save_LDFLAGS"
+                  $1_LDFLAGS="$pmix_check_package_$1_orig_LDFLAGS"
+                  unset pmix_Lib])],
+          [ # libdir was not specified - go through search path
+           pmix_check_package_libdir="$5"
+           AS_IF([test "$pmix_check_package_libdir" = "" || test "$pmix_check_package_libdir" = "/usr" || test "$pmix_check_package_libdir" = "/usr/local"],
+               [ # try as is...
+                AC_VERBOSE([looking for library without search path])
+                AC_SEARCH_LIBS([$3], [$2],
+                        [pmix_check_package_lib_happy="yes"],
+                        [pmix_check_package_lib_happy="no"], [$4])
+                AS_IF([test "$pmix_check_package_lib_happy" = "no"],
+                    [ # no go on the as is..  see what happens later...
+                     LDFLAGS="$pmix_check_package_$1_save_LDFLAGS"
+                     $1_LDFLAGS="$pmix_check_package_$1_orig_LDFLAGS"
+                     unset pmix_Lib])])
+
+           AS_IF([test "$pmix_check_package_lib_happy" = "no"],
+               [AS_IF([test "$pmix_check_package_libdir" != ""],
+                    [$1_LDFLAGS="$$1_LDFLAGS -L$pmix_check_package_libdir/lib"
+                     LDFLAGS="$LDFLAGS -L$pmix_check_package_libdir/lib"
+                     AC_VERBOSE([looking for library in lib])
+                     AC_SEARCH_LIBS([$3], [$2],
+                               [pmix_check_package_lib_happy="yes"],
+                               [pmix_check_package_lib_happy="no"], [$4])
+                     AS_IF([test "$pmix_check_package_lib_happy" = "no"],
+                         [ # no go on the as is..  see what happens later...
+                          LDFLAGS="$pmix_check_package_$1_save_LDFLAGS"
+                          $1_LDFLAGS="$pmix_check_package_$1_orig_LDFLAGS"
+                          unset pmix_Lib])])])
+
+           AS_IF([test "$pmix_check_package_lib_happy" = "no"],
+               [AS_IF([test "$pmix_check_package_libdir" != ""],
+                    [$1_LDFLAGS="$$1_LDFLAGS -L$pmix_check_package_libdir/lib64"
+                     LDFLAGS="$LDFLAGS -L$pmix_check_package_libdir/lib64"
+                     AC_VERBOSE([looking for library in lib64])
+                     AC_SEARCH_LIBS([$3], [$2],
+                               [pmix_check_package_lib_happy="yes"],
+                               [pmix_check_package_lib_happy="no"], [$4])
+                     AS_IF([test "$pmix_check_package_lib_happy" = "no"],
+                         [ # no go on the as is..  see what happens later...
+                          LDFLAGS="$pmix_check_package_$1_save_LDFLAGS"
+                          $1_LDFLAGS="$pmix_check_package_$1_orig_LDFLAGS"
+                          unset pmix_Lib])])])])
+
+    AS_IF([test "$pmix_check_package_lib_happy" = "yes"],
+          [$1_LIBS="-l$2 $4"
+           $7], [$8])
+    AS_IF([test "$pmix_check_package_lib_happy" = "yes"],
+          [ # The result of AC SEARCH_LIBS is cached in $ac_cv_search_[function]
+           AS_IF([test "$ac_cv_search_$3" != "no" &&
+                  test "$ac_cv_search_$3" != "none required"],
+                 [$1_LIBS="$ac_cv_search_$3 $4"],
+                 [$1_LIBS="$4"])
+           $7],
+          [$8])
+
+    AS_VAR_POPDEF([pmix_Lib])dnl
+])
+
+
+# PMIX_CHECK_PACKAGE(prefix,
+#                    header,
+#                    library,
+#                    function,
+#                    extra-libraries,
+#                    dir-prefix,
+#                    libdir-prefix,
+#                    [action-if-found], [action-if-not-found],
+#                    includes)
+# -----------------------------------------------------------
+# check for package defined by header and libs, and probably
+# located in dir-prefix, possibly with libs in libdir-prefix.
+# Both dir-prefix and libdir-prefix can be empty.  Will set
+# prefix_{CPPFLAGS, LDFLAGS, LIBS} as needed
+AC_DEFUN([PMIX_CHECK_PACKAGE],[
+    pmix_check_package_$1_save_CPPFLAGS="$CPPFLAGS"
+    pmix_check_package_$1_save_LDFLAGS="$LDFLAGS"
+    pmix_check_package_$1_save_LIBS="$LIBS"
+
+    pmix_check_package_$1_orig_CPPFLAGS="$$1_CPPFLAGS"
+    pmix_check_package_$1_orig_LDFLAGS="$$1_LDFLAGS"
+    pmix_check_package_$1_orig_LIBS="$$1_LIBS"
+
+    _PMIX_CHECK_PACKAGE_HEADER([$1], [$2], [$6],
+          [_PMIX_CHECK_PACKAGE_LIB([$1], [$3], [$4], [$5], [$6], [$7],
+                [pmix_check_package_happy="yes"],
+                [pmix_check_package_happy="no"])],
+          [pmix_check_package_happy="no"],
+          [$10])
+
+    AS_IF([test "$pmix_check_package_happy" = "yes"],
+          [$8],
+          [$1_CPPFLAGS="$pmix_check_package_$1_orig_CPPFLAGS"
+           $1_LDFLAGS="$pmix_check_package_$1_orig_LDFLAGS"
+           $1_LIBS="$pmix_check_package_$1_orig_LIBS"
+           $9])
+
+    CPPFLAGS="$pmix_check_package_$1_save_CPPFLAGS"
+    LDFLAGS="$pmix_check_package_$1_save_LDFLAGS"
+    LIBS="$pmix_check_package_$1_save_LIBS"
+])
diff --git a/config/pmix_check_psm2.m4 b/config/pmix_check_psm2.m4
new file mode 100644
index 0000000..b2c291f
--- /dev/null
+++ b/config/pmix_check_psm2.m4
@@ -0,0 +1,89 @@
+# -*- shell-script -*-
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2006 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2006      QLogic Corp. All rights reserved.
+# Copyright (c) 2009-2016 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2016-2017 Intel, Inc.  All rights reserved.
+# Copyright (c) 2015      Research Organization for Information Science
+#                         and Technology (RIST). All rights reserved.
+# Copyright (c) 2016      Los Alamos National Security, LLC. All rights
+#                         reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# PMIX_CHECK_PSM2(prefix, [action-if-found], [action-if-not-found])
+# --------------------------------------------------------
+# check if PSM2 support can be found.  sets prefix_{CPPFLAGS,
+# LDFLAGS, LIBS} as needed and runs action-if-found if there is
+# support, otherwise executes action-if-not-found
+AC_DEFUN([PMIX_CHECK_PSM2],[
+    if test -z "$pmix_check_psm2_happy" ; then
+	AC_ARG_WITH([psm2],
+		    [AC_HELP_STRING([--with-psm2(=DIR)],
+				    [Build PSM2 (Intel PSM2) support, optionally adding DIR/include, DIR/lib, and DIR/lib64 to the search path for headers and libraries])])
+	PMIX_CHECK_WITHDIR([psm2], [$with_psm2], [include/psm2.h])
+	AC_ARG_WITH([psm2-libdir],
+		    [AC_HELP_STRING([--with-psm2-libdir=DIR],
+				    [Search for PSM (Intel PSM2) libraries in DIR])])
+	PMIX_CHECK_WITHDIR([psm2-libdir], [$with_psm2_libdir], [libpsm2.*])
+
+	pmix_check_psm2_$1_save_CPPFLAGS="$CPPFLAGS"
+	pmix_check_psm2_$1_save_LDFLAGS="$LDFLAGS"
+	pmix_check_psm2_$1_save_LIBS="$LIBS"
+
+	AS_IF([test "$with_psm2" != "no"],
+              [AS_IF([test ! -z "$with_psm2" && test "$with_psm2" != "yes"],
+                     [pmix_check_psm2_dir="$with_psm2"])
+               AS_IF([test ! -z "$with_psm2_libdir" && test "$with_psm2_libdir" != "yes"],
+                     [pmix_check_psm2_libdir="$with_psm2_libdir"])
+
+               PMIX_CHECK_PACKAGE([pmix_check_psm2],
+				  [psm2.h],
+				  [psm2],
+				  [psm2_mq_irecv2],
+				  [],
+				  [$pmix_check_psm2_dir],
+				  [$pmix_check_psm2_libdir],
+				  [pmix_check_psm2_happy="yes"],
+				  [pmix_check_psm2_happy="no"])],
+              [pmix_check_psm2_happy="no"])
+
+	CPPFLAGS="$pmix_check_psm2_$1_save_CPPFLAGS"
+	LDFLAGS="$pmix_check_psm2_$1_save_LDFLAGS"
+	LIBS="$pmix_check_psm2_$1_save_LIBS"
+
+	AS_IF([test "$pmix_check_psm2_happy" = "yes" && test "$enable_progress_threads" = "yes"],
+              [AC_MSG_WARN([PSM2 driver does not currently support progress threads.  Disabling MTL.])
+               pmix_check_psm2_happy="no"])
+
+        AS_IF([test "$pmix_check_psm2_happy" = "yes"],
+              [AC_CHECK_HEADERS(
+               glob.h,
+               [],
+               [AC_MSG_WARN([glob.h not found.  Can not build component.])
+               pmix_check_psm2_happy="no"])])
+
+    fi
+
+    AS_IF([test "$pmix_check_psm2_happy" = "yes"],
+          [$1_LDFLAGS="[$]$1_LDFLAGS $pmix_check_psm2_LDFLAGS"
+	   $1_CPPFLAGS="[$]$1_CPPFLAGS $pmix_check_psm2_CPPFLAGS"
+	   $1_LIBS="[$]$1_LIBS $pmix_check_psm2_LIBS"
+	   $2],
+          [AS_IF([test ! -z "$with_psm2" && test "$with_psm2" != "no"],
+                 [AC_MSG_ERROR([PSM2 support requested but not found.  Aborting])])
+           $3])
+])
diff --git a/config/pmix_check_pthread_pids.m4 b/config/pmix_check_pthread_pids.m4
new file mode 100644
index 0000000..2bf0357
--- /dev/null
+++ b/config/pmix_check_pthread_pids.m4
@@ -0,0 +1,109 @@
+dnl
+dnl Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
+dnl                         University Research and Technology
+dnl                         Corporation.  All rights reserved.
+dnl Copyright (c) 2004-2005 The University of Tennessee and The University
+dnl                         of Tennessee Research Foundation.  All rights
+dnl                         reserved.
+dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+dnl                         University of Stuttgart.  All rights reserved.
+dnl Copyright (c) 2004-2005 The Regents of the University of California.
+dnl                         All rights reserved.
+dnl Copyright (c) 2008-2013 Cisco Systems, Inc.  All rights reserved.
+dnl Copyright (c) 2017      Intel, Inc. All rights reserved.
+dnl $COPYRIGHT$
+dnl
+dnl Additional copyrights may follow
+dnl
+dnl $HEADER$
+dnl
+
+AC_DEFUN([PMIX_CHECK_PTHREAD_PIDS],[
+#
+# Arguments: none
+#
+# Dependencies: None
+#
+# Sets:
+#  PMIX_THREADS_HAVE_DIFFERENT_PIDS (variable)
+#
+# Test for Linux-like threads in the system.  PMIX does not support
+# systems with different PIDs for threads in the same process, so error
+# out if we detect that case.
+#
+
+AC_MSG_CHECKING([if threads have different pids (pthreads on linux)])
+
+PMIX_VAR_SCOPE_PUSH([tpids_CFLAGS_save tpids_CPPFLAGS_save tpids_LDFLAGS_save tpids_LIBS_save tpids_MSG])
+tpids_CFLAGS_save="$CFLAGS"
+CFLAGS="$CFLAGS $THREAD_CFLAGS"
+tpids_CPPFLAGS_save="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $THREAD_CPPFLAGS"
+tpids_LDFLAGS_save="$LDFLAGS"
+LDFLAGS="$LDFLAGS $THREAD_LDFLAGS"
+tpids_LIBS_save="$LIBS"
+LIBS="$LIBS $THREAD_LIBS"
+AC_RUN_IFELSE([AC_LANG_SOURCE([#include <pthread.h>
+#include <sys/types.h>
+#include <unistd.h>
+#include <stdlib.h>
+
+void *checkpid(void *arg);
+int main() {
+  pthread_t thr;
+  int pid, *retval;
+  pid = getpid();
+  pthread_create(&thr, NULL, checkpid, &pid);
+  pthread_join(thr, (void **) &retval);
+  exit(*retval);
+}
+
+static int ret;
+void *checkpid(void *arg) {
+   int ppid = *((int *) arg);
+   if (ppid == getpid())
+     ret = 0;
+   else
+     ret = 1;
+   pthread_exit((void *) &ret);
+}])],
+[tpids_MSG=no PMIX_THREADS_HAVE_DIFFERENT_PIDS=0],
+[tpids_MSG=yes PMIX_THREADS_HAVE_DIFFERENT_PIDS=1],
+[
+ # If we're cross compiling, we can't do another AC_* function here beause
+ # it we haven't displayed the result from the last one yet.  So defer
+ # another test until below.
+ PMIX_THREADS_HAVE_DIFFERENT_PIDS=
+ MSG="cross compiling (need another test)"])
+
+CFLAGS="$tpids_CFLAGS_save"
+CPPFLAGS="$tpids_CPPFLAGS_save"
+LDFLAGS="$tpids_LDFLAGS_save"
+LIBS="$tpids_LIBS_save"
+
+AC_MSG_RESULT([$tpids_MSG])
+
+AS_IF([test "x$PMIX_THREADS_HAVE_DIFFERENT_PIDS" = "x"],
+      [ # If we are cross-compiling, look for the symbol
+       # __linuxthreads_create_event, which seems to only exist in the
+       # Linux Threads-based pthreads implementation (i.e., the one
+       # that has different PIDs for each thread).  We *could* switch
+       # on $host here and only test *linux* hosts, but this test is
+       # pretty unique, so why bother?  Note that AC_CHECK_FUNC works
+       # properly in cross-compiling environments in recent-enough
+       # versions of Autoconf (which is one of the reasons we mandate
+       # recent versions in autogen!).
+       AC_CHECK_FUNC([__linuxthreads_create_event],
+                     [PMIX_THREADS_HAVE_DIFFERENT_PIDS=1])])
+
+AS_IF([test "$PMIX_THREADS_HAVE_DIFFERENT_PIDS" = "1"],
+      [AC_MSG_WARN([This version of PMIx only supports environments where])
+       AC_MSG_WARN([threads have the same PID])
+       AC_MSG_ERROR([Cannot continue])
+      ])
+
+#
+# if pthreads is not available, then the system does not have an insane threads
+# model
+#
+PMIX_VAR_SCOPE_POP])dnl
diff --git a/config/pmix_check_vendor.m4 b/config/pmix_check_vendor.m4
new file mode 100644
index 0000000..cf96c46
--- /dev/null
+++ b/config/pmix_check_vendor.m4
@@ -0,0 +1,252 @@
+dnl -*- shell-script -*-
+dnl
+dnl Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+dnl                         University Research and Technology
+dnl                         Corporation.  All rights reserved.
+dnl Copyright (c) 2004-2005 The University of Tennessee and The University
+dnl                         of Tennessee Research Foundation.  All rights
+dnl                         reserved.
+dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+dnl                         University of Stuttgart.  All rights reserved.
+dnl Copyright (c) 2004-2005 The Regents of the University of California.
+dnl                         All rights reserved.
+dnl Copyright (c) 2012      Oracle and/or its affiliates.  All rights reserved.
+dnl Copyright (c) 2013      Intel, Inc. All rights reserved
+dnl Copyright (c) 2015      Cisco Systems, Inc.  All rights reserved.
+dnl Copyright (c) 2015      Research Organization for Information Science
+dnl                         and Technology (RIST). All rights reserved.
+dnl $COPYRIGHT$
+dnl
+dnl Additional copyrights may follow
+dnl
+dnl $HEADER$
+dnl
+
+
+# PMIX_C_COMPILER_VENDOR(VENDOR_VARIABLE)
+# ---------------------------------------
+# Set shell variable VENDOR_VARIABLE to the name of the compiler
+# vendor for the current C compiler.
+#
+# See comment for _PMIX_CHECK_COMPILER_VENDOR for a complete
+# list of currently detected compilers.
+AC_DEFUN([PMIX_C_COMPILER_VENDOR], [
+    AC_REQUIRE([AC_PROG_CC])
+
+    AC_CACHE_CHECK([for the C compiler vendor],
+        [pmix_cv_c_compiler_vendor],
+        [AC_LANG_PUSH(C)
+         _PMIX_CHECK_COMPILER_VENDOR([pmix_cv_c_compiler_vendor])
+         AC_LANG_POP(C)])
+
+    $1="$pmix_cv_c_compiler_vendor"
+])
+
+
+# workaround to avoid syntax error with Autoconf < 2.68:
+m4_ifndef([AC_LANG_DEFINES_PROVIDED],
+	  [m4_define([AC_LANG_DEFINES_PROVIDED])])
+
+# PMIX_IFDEF_IFELSE(symbol, [action-if-defined],
+#                   [action-if-not-defined])
+# ----------------------------------------------
+# Run compiler to determine if preprocessor symbol "symbol" is
+# defined by the compiler.
+AC_DEFUN([PMIX_IFDEF_IFELSE], [
+    AC_COMPILE_IFELSE([AC_LANG_DEFINES_PROVIDED
+#ifndef $1
+#error "symbol $1 not defined"
+choke me
+#endif], [$2], [$3])])
+
+
+# PMIX_IF_IFELSE(symbol, [action-if-defined],
+#                [action-if-not-defined])
+# ----------------------------------------------
+# Run compiler to determine if preprocessor symbol "symbol" is
+# defined by the compiler.
+AC_DEFUN([PMIX_IF_IFELSE], [
+    AC_COMPILE_IFELSE([AC_LANG_DEFINES_PROVIDED
+#if !( $1 )
+#error "condition $1 not met"
+choke me
+#endif], [$2], [$3])])
+
+
+# _PMIX_CHECK_COMPILER_VENDOR(VENDOR_VARIABLE)
+# --------------------------------------------
+# Set shell variable VENDOR_VARIABLE to the name of the compiler
+# vendor for the compiler for the current language.  Language must be
+# one of C, OBJC, or C++.
+#
+# thanks to http://predef.sourceforge.net/precomp.html for the list
+# of defines to check.
+AC_DEFUN([_PMIX_CHECK_COMPILER_VENDOR], [
+    pmix_check_compiler_vendor_result="unknown"
+
+    # GNU is probably the most common, so check that one as soon as
+    # possible.  Intel pretends to be GNU, so need to check Intel
+    # before checking for GNU.
+
+    # Intel
+    AS_IF([test "$pmix_check_compiler_vendor_result" = "unknown"],
+          [PMIX_IF_IFELSE([defined(__INTEL_COMPILER) || defined(__ICC)],
+               [pmix_check_compiler_vendor_result="intel"])])
+
+    # Fujitsu
+    AS_IF([test "$pmix_check_compiler_vendor_result" = "unknown"],
+          [PMIX_IF_IFELSE([defined(__FUJITSU)],
+               [pmix_check_compiler_vendor_result="fujitsu"])])
+
+    # GNU
+    AS_IF([test "$pmix_check_compiler_vendor_result" = "unknown"],
+          [PMIX_IFDEF_IFELSE([__GNUC__],
+               [pmix_check_compiler_vendor_result="gnu"
+
+               # We do not support gccfss as a compiler so die if
+               # someone tries to use said compiler.  gccfss (gcc
+               # for SPARC Systems) is a compiler that is no longer
+               # supported by Oracle and it has some major flaws
+               # that prevents it from actually compiling PMIX code.
+               # So if we detect it we automatically bail.
+
+               if ($CC --version | grep gccfss) >/dev/null 2>&1; then
+                   AC_MSG_RESULT([gccfss])
+                   AC_MSG_WARN([Detected gccfss being used to compile PMIx.])
+                   AC_MSG_WARN([Because of several issues PMIx does not support])
+                   AC_MSG_WARN([the gccfss compiler.  Please use a different compiler.])
+                   AC_MSG_WARN([If you didn't think you used gccfss you may want to])
+                   AC_MSG_WARN([check to see if the compiler you think you used is])
+                   AC_MSG_WARN([actually a link to gccfss.])
+                   AC_MSG_ERROR([Cannot continue])
+               fi])])
+
+    # Borland Turbo C
+    AS_IF([test "$pmix_check_compiler_vendor_result" = "unknown"],
+          [PMIX_IFDEF_IFELSE([__TURBOC__],
+               [pmix_check_compiler_vendor_result="borland"])])
+
+    # Borland C++
+    AS_IF([test "$pmix_check_compiler_vendor_result" = "unknown"],
+          [PMIX_IFDEF_IFELSE([__BORLANDC__],
+               [pmix_check_compiler_vendor_result="borland"])])
+
+    # Comeau C++
+    AS_IF([test "$pmix_check_compiler_vendor_result" = "unknown"],
+          [PMIX_IFDEF_IFELSE([__COMO__],
+               [pmix_check_compiler_vendor_result="comeau"])])
+
+    # Compaq C/C++
+    AS_IF([test "$pmix_check_compiler_vendor_result" = "unknown"],
+          [PMIX_IF_IFELSE([defined(__DECC) || defined(VAXC) || defined(__VAXC)],
+               [pmix_check_compiler_vendor_result="compaq"],
+               [PMIX_IF_IFELSE([defined(__osf__) && defined(__LANGUAGE_C__)],
+                    [pmix_check_compiler_vendor_result="compaq"],
+                    [PMIX_IFDEF_IFELSE([__DECCXX],
+                         [pmix_check_compiler_vendor_result="compaq"])])])])
+
+    # Cray C/C++
+    AS_IF([test "$pmix_check_compiler_vendor_result" = "unknown"],
+          [PMIX_IFDEF_IFELSE([_CRAYC],
+               [pmix_check_compiler_vendor_result="cray"])])
+
+    # Diab C/C++
+    AS_IF([test "$pmix_check_compiler_vendor_result" = "unknown"],
+          [PMIX_IFDEF_IFELSE([__DCC__],
+               [pmix_check_compiler_vendor_result="diab"])])
+
+    # Digital Mars
+    AS_IF([test "$pmix_check_compiler_vendor_result" = "unknown"],
+          [PMIX_IF_IFELSE([defined(__DMC__) || defined(__SC__) || defined(__ZTC__)],
+               [pmix_check_compiler_vendor_result="digital mars"])])
+
+    # HP ANSI C / aC++
+    AS_IF([test "$pmix_check_compiler_vendor_result" = "unknown"],
+          [PMIX_IF_IFELSE([defined(__HP_cc) || defined(__HP_aCC)],
+               [pmix_check_compiler_vendor_result="hp"])])
+
+    # IBM XL C/C++
+    AS_IF([test "$pmix_check_compiler_vendor_result" = "unknown"],
+          [PMIX_IF_IFELSE([defined(__xlC__) || defined(__IBMC__) || defined(__IBMCPP__)],
+               [pmix_check_compiler_vendor_result="ibm"],
+               [PMIX_IF_IFELSE([defined(_AIX) && !defined(__GNUC__)],
+                    [pmix_check_compiler_vendor_result="ibm"])])])
+
+    # KAI C++ (rest in peace)
+    AS_IF([test "$pmix_check_compiler_vendor_result" = "unknown"],
+          [PMIX_IFDEF_IFELSE([__KCC],
+               [pmix_check_compiler_vendor_result="kai"])])
+
+    # LCC
+    AS_IF([test "$pmix_check_compiler_vendor_result" = "unknown"],
+          [PMIX_IFDEF_IFELSE([__LCC__],
+               [pmix_check_compiler_vendor_result="lcc"])])
+
+    # MetaWare High C/C++
+    AS_IF([test "$pmix_check_compiler_vendor_result" = "unknown"],
+          [PMIX_IFDEF_IFELSE([__HIGHC__],
+               [pmix_check_compiler_vendor_result="metaware high"])])
+
+    # Metrowerks Codewarrior
+    AS_IF([test "$pmix_check_compiler_vendor_result" = "unknown"],
+          [PMIX_IFDEF_IFELSE([__MWERKS__],
+               [pmix_check_compiler_vendor_result="metrowerks"])])
+
+    # MIPSpro (SGI)
+    AS_IF([test "$pmix_check_compiler_vendor_result" = "unknown"],
+          [PMIX_IF_IFELSE([defined(sgi) || defined(__sgi)],
+               [pmix_check_compiler_vendor_result="sgi"])])
+
+    # MPW C++
+    AS_IF([test "$pmix_check_compiler_vendor_result" = "unknown"],
+          [PMIX_IF_IFELSE([defined(__MRC__) || defined(MPW_C) || defined(MPW_CPLUS)],
+               [pmix_check_compiler_vendor_result="mpw"])])
+
+    # Norcroft C
+    AS_IF([test "$pmix_check_compiler_vendor_result" = "unknown"],
+          [PMIX_IFDEF_IFELSE([__CC_NORCROFT],
+               [pmix_check_compiler_vendor_result="norcroft"])])
+
+    # Pelles C
+    AS_IF([test "$pmix_check_compiler_vendor_result" = "unknown"],
+          [PMIX_IFDEF_IFELSE([__POCC__],
+               [pmix_check_compiler_vendor_result="pelles"])])
+
+    # Portland Group
+    AS_IF([test "$pmix_check_compiler_vendor_result" = "unknown"],
+          [PMIX_IFDEF_IFELSE([__PGI],
+               [pmix_check_compiler_vendor_result="portland group"])])
+
+    # SAS/C
+    AS_IF([test "$pmix_check_compiler_vendor_result" = "unknown"],
+          [PMIX_IF_IFELSE([defined(SASC) || defined(__SASC) || defined(__SASC__)],
+               [pmix_check_compiler_vendor_result="sas"])])
+
+    # Sun Workshop C/C++
+    AS_IF([test "$pmix_check_compiler_vendor_result" = "unknown"],
+          [PMIX_IF_IFELSE([defined(__SUNPRO_C) || defined(__SUNPRO_CC)],
+               [pmix_check_compiler_vendor_result="sun"])])
+
+    # TenDRA C/C++
+    AS_IF([test "$pmix_check_compiler_vendor_result" = "unknown"],
+          [PMIX_IFDEF_IFELSE([__TenDRA__],
+               [pmix_check_compiler_vendor_result="tendra"])])
+
+    # Tiny C
+    AS_IF([test "$pmix_check_compiler_vendor_result" = "unknown"],
+          [PMIX_IFDEF_IFELSE([__TINYC__],
+               [pmix_check_compiler_vendor_result="tiny"])])
+
+    # USL C
+    AS_IF([test "$pmix_check_compiler_vendor_result" = "unknown"],
+          [PMIX_IFDEF_IFELSE([__USLC__],
+               [pmix_check_compiler_vendor_result="usl"])])
+
+    # Watcom C++
+    AS_IF([test "$pmix_check_compiler_vendor_result" = "unknown"],
+          [PMIX_IFDEF_IFELSE([__WATCOMC__],
+               [pmix_check_compiler_vendor_result="watcom"])])
+
+    $1="$pmix_check_compiler_vendor_result"
+    unset pmix_check_compiler_vendor_result
+])
diff --git a/config/pmix_check_visibility.m4 b/config/pmix_check_visibility.m4
new file mode 100644
index 0000000..d92d621
--- /dev/null
+++ b/config/pmix_check_visibility.m4
@@ -0,0 +1,93 @@
+# -*- shell-script -*-
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2007 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2006-2015 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2009-2011 Oracle and/or its affiliates.  All rights reserved.
+# Copyright (c) 2017      Intel, Inc. All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# PMIX_CHECK_VISIBILITY
+# --------------------------------------------------------
+AC_DEFUN([PMIX_CHECK_VISIBILITY],[
+    AC_REQUIRE([AC_PROG_GREP])
+
+    # Check if the compiler has support for visibility, like some
+    # versions of gcc, icc Sun Studio cc.
+    AC_ARG_ENABLE(visibility,
+        AC_HELP_STRING([--enable-visibility],
+            [enable visibility feature of certain compilers/linkers (default: enabled)]))
+
+    WANT_VISIBILITY=0
+    pmix_msg="whether to enable symbol visibility"
+
+    if test "$enable_visibility" = "no"; then
+        AC_MSG_CHECKING([$pmix_msg])
+        AC_MSG_RESULT([no (disabled)])
+    else
+        CFLAGS_orig=$CFLAGS
+
+        pmix_add=
+        case "$pmix_c_vendor" in
+        sun)
+            # Check using Sun Studio -xldscope=hidden flag
+            pmix_add=-xldscope=hidden
+            CFLAGS="$PMIX_CFLAGS_BEFORE_PICKY $pmix_add -errwarn=%all"
+            ;;
+
+        *)
+            # Check using -fvisibility=hidden
+            pmix_add=-fvisibility=hidden
+            CFLAGS="$PMIX_CFLAGS_BEFORE_PICKY $pmix_add -Werror"
+            ;;
+        esac
+
+        AC_MSG_CHECKING([if $CC supports $pmix_add])
+        AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+            #include <stdio.h>
+            __attribute__((visibility("default"))) int foo;
+            ]],[[fprintf(stderr, "Hello, world\n");]])],
+            [AS_IF([test -s conftest.err],
+                   [$GREP -iq visibility conftest.err
+                    # If we find "visibility" in the stderr, then
+                    # assume it doesn't work
+                    AS_IF([test "$?" = "0"], [pmix_add=])])
+            ], [pmix_add=])
+        AS_IF([test "$pmix_add" = ""],
+              [AC_MSG_RESULT([no])],
+              [AC_MSG_RESULT([yes])])
+
+        CFLAGS=$CFLAGS_orig
+        PMIX_VISIBILITY_CFLAGS=$pmix_add
+
+        if test "$pmix_add" != "" ; then
+            WANT_VISIBILITY=1
+            CFLAGS="$CFLAGS $PMIX_VISIBILITY_CFLAGS"
+            AC_MSG_CHECKING([$pmix_msg])
+            AC_MSG_RESULT([yes (via $pmix_add)])
+        elif test "$enable_visibility" = "yes"; then
+            AC_MSG_ERROR([Symbol visibility support requested but compiler does not seem to support it.  Aborting])
+        else
+            AC_MSG_CHECKING([$pmix_msg])
+            AC_MSG_RESULT([no (unsupported)])
+        fi
+        unset pmix_add
+    fi
+
+    AC_DEFINE_UNQUOTED([PMIX_HAVE_VISIBILITY], [$WANT_VISIBILITY],
+            [Whether C compiler supports symbol visibility or not])
+    AM_CONDITIONAL([WANT_HIDDEN],[test "$WANT_VISIBILITY" = "1"])
+])
diff --git a/config/pmix_check_withdir.m4 b/config/pmix_check_withdir.m4
new file mode 100644
index 0000000..3fdaefb
--- /dev/null
+++ b/config/pmix_check_withdir.m4
@@ -0,0 +1,39 @@
+dnl -*- shell-script -*-
+dnl
+dnl Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
+dnl                         University Research and Technology
+dnl                         Corporation.  All rights reserved.
+dnl Copyright (c) 2006      Los Alamos National Security, LLC.  All rights
+dnl                         reserved.
+dnl Copyright (c) 2008-2009 Cisco Systems, Inc.  All rights reserved.
+dnl Copyright (c) 2015      Research Organization for Information Science
+dnl                         and Technology (RIST). All rights reserved.
+dnl Copyright (c) 2016      Intel, Inc.  All rights reserved.
+dnl $COPYRIGHT$
+dnl
+dnl Additional copyrights may follow
+dnl
+dnl $HEADER$
+dnl
+
+# PMIX_CHECK_WITHDIR(with_option_name, dir_value, file_in_dir)
+# ----------------------------------------------------
+AC_DEFUN([PMIX_CHECK_WITHDIR],[
+    AC_MSG_CHECKING([--with-$1 value])
+    AS_IF([test "$2" = "yes" || test "$2" = "no" || test "x$2" = "x"],
+          [AC_MSG_RESULT([simple ok (unspecified)])],
+          [AS_IF([test ! -d "$2"],
+                 [AC_MSG_RESULT([not found])
+                  AC_MSG_WARN([Directory $2 not found])
+                  AC_MSG_ERROR([Cannot continue])],
+                 [AS_IF([test "x`ls $2/$3 2> /dev/null`" = "x"],
+                        [AC_MSG_RESULT([not found])
+                         AC_MSG_WARN([Expected file $2/$3 not found])
+                         AC_MSG_ERROR([Cannot continue])],
+                        [AC_MSG_RESULT([sanity check ok ($2)])]
+                       )
+                 ]
+                )
+          ]
+         )
+])dnl
diff --git a/config/pmix_config_asm.m4 b/config/pmix_config_asm.m4
new file mode 100644
index 0000000..91f24ad
--- /dev/null
+++ b/config/pmix_config_asm.m4
@@ -0,0 +1,1197 @@
+dnl
+dnl Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+dnl                         University Research and Technology
+dnl                         Corporation.  All rights reserved.
+dnl Copyright (c) 2004-2015 The University of Tennessee and The University
+dnl                         of Tennessee Research Foundation.  All rights
+dnl                         reserved.
+dnl Copyright (c) 2004-2006 High Performance Computing Center Stuttgart,
+dnl                         University of Stuttgart.  All rights reserved.
+dnl Copyright (c) 2004-2005 The Regents of the University of California.
+dnl                         All rights reserved.
+dnl Copyright (c) 2008-2015 Cisco Systems, Inc.  All rights reserved.
+dnl Copyright (c) 2010      Oracle and/or its affiliates.  All rights reserved.
+dnl Copyright (c) 2015-2017 Research Organization for Information Science
+dnl                         and Technology (RIST). All rights reserved.
+dnl Copyright (c) 2014-2017 Los Alamos National Security, LLC. All rights
+dnl                         reserved.
+dnl Copyright (c) 2017      Amazon.com, Inc. or its affiliates.  All Rights
+dnl                         reserved.
+dnl Copyright (c) 2017      Intel, Inc. All rights reserved.
+dnl $COPYRIGHT$
+dnl
+dnl Additional copyrights may follow
+dnl
+dnl $HEADER$
+dnl
+
+
+AC_DEFUN([PMIX_CHECK_SYNC_BUILTIN_CSWAP_INT128], [
+
+  PMIX_VAR_SCOPE_PUSH([sync_bool_compare_and_swap_128_result CFLAGS_save])
+
+  AC_ARG_ENABLE([cross-cmpset128],[AC_HELP_STRING([--enable-cross-cmpset128],
+                [enable the use of the __sync builtin atomic compare-and-swap 128 when cross compiling])])
+
+  sync_bool_compare_and_swap_128_result=0
+
+  if test ! "$enable_cross_cmpset128" = "yes" ; then
+      AC_MSG_CHECKING([for processor support of __sync builtin atomic compare-and-swap on 128-bit values])
+
+      AC_RUN_IFELSE([AC_LANG_PROGRAM([], [__int128 x = 0; __sync_bool_compare_and_swap (&x, 0, 1);])],
+	  [AC_MSG_RESULT([yes])
+	      sync_bool_compare_and_swap_128_result=1],
+	  [AC_MSG_RESULT([no])],
+	  [AC_MSG_RESULT([no (cross compiling)])])
+
+      if test $sync_bool_compare_and_swap_128_result = 0 ; then
+	  CFLAGS_save=$CFLAGS
+	  CFLAGS="$CFLAGS -mcx16"
+
+	  AC_MSG_CHECKING([for __sync builtin atomic compare-and-swap on 128-bit values with -mcx16 flag])
+	  AC_RUN_IFELSE([AC_LANG_PROGRAM([], [__int128 x = 0; __sync_bool_compare_and_swap (&x, 0, 1);])],
+              [AC_MSG_RESULT([yes])
+		  sync_bool_compare_and_swap_128_result=1
+		  CFLAGS_save="$CFLAGS"],
+              [AC_MSG_RESULT([no])],
+	      [AC_MSG_RESULT([no (cross compiling)])])
+
+	  CFLAGS=$CFLAGS_save
+      fi
+  else
+      AC_MSG_CHECKING([for compiler support of __sync builtin atomic compare-and-swap on 128-bit values])
+
+      # Check if the compiler supports the __sync builtin
+      AC_TRY_LINK([], [__int128 x = 0; __sync_bool_compare_and_swap (&x, 0, 1);],
+	  [AC_MSG_RESULT([yes])
+	      sync_bool_compare_and_swap_128_result=1],
+	  [AC_MSG_RESULT([no])])
+
+      if test $sync_bool_compare_and_swap_128_result = 0 ; then
+	  CFLAGS_save=$CFLAGS
+	  CFLAGS="$CFLAGS -mcx16"
+
+	  AC_MSG_CHECKING([for __sync builtin atomic compare-and-swap on 128-bit values with -mcx16 flag])
+	  AC_TRY_LINK([], [__int128 x = 0; __sync_bool_compare_and_swap (&x, 0, 1);],
+              [AC_MSG_RESULT([yes])
+		  sync_bool_compare_and_swap_128_result=1
+		  CFLAGS_save="$CFLAGS"],
+              [AC_MSG_RESULT([no])])
+
+	  CFLAGS=$CFLAGS_save
+      fi
+  fi
+
+  AC_DEFINE_UNQUOTED([PMIX_HAVE_SYNC_BUILTIN_CSWAP_INT128], [$sync_bool_compare_and_swap_128_result],
+	[Whether the __sync builtin atomic compare and swap supports 128-bit values])
+
+  PMIX_VAR_SCOPE_POP
+])
+
+AC_DEFUN([PMIX_CHECK_SYNC_BUILTINS], [
+  AC_MSG_CHECKING([for __sync builtin atomics])
+
+  AC_TRY_LINK([long tmp;], [__sync_synchronize();
+__sync_bool_compare_and_swap(&tmp, 0, 1);
+__sync_add_and_fetch(&tmp, 1);],
+    [AC_MSG_RESULT([yes])
+     $1],
+    [AC_MSG_RESULT([no])
+     $2])
+
+  AC_MSG_CHECKING([for 64-bit __sync builtin atomics])
+
+  AC_TRY_LINK([
+#include <stdint.h>
+uint64_t tmp;], [
+__sync_bool_compare_and_swap(&tmp, 0, 1);
+__sync_add_and_fetch(&tmp, 1);],
+    [AC_MSG_RESULT([yes])
+     pmix_asm_sync_have_64bit=1],
+    [AC_MSG_RESULT([no])
+     pmix_asm_sync_have_64bit=0])
+
+  AC_DEFINE_UNQUOTED([PMIX_ASM_SYNC_HAVE_64BIT],[$pmix_asm_sync_have_64bit],
+		     [Whether 64-bit is supported by the __sync builtin atomics])
+
+  # Check for 128-bit support
+  PMIX_CHECK_SYNC_BUILTIN_CSWAP_INT128
+])
+
+
+AC_DEFUN([PMIX_CHECK_GCC_BUILTIN_CSWAP_INT128], [
+
+  PMIX_VAR_SCOPE_PUSH([atomic_compare_exchange_n_128_result CFLAGS_save])
+
+  AC_ARG_ENABLE([cross-cmpset128],[AC_HELP_STRING([--enable-cross-cmpset128],
+                [enable the use of the __sync builtin atomic compare-and-swap 128 when cross compiling])])
+
+  atomic_compare_exchange_n_128_result=0
+
+  if test ! "$enable_cross_cmpset128" = "yes" ; then
+      AC_MSG_CHECKING([for processor support of __atomic builtin atomic compare-and-swap on 128-bit values])
+
+      AC_RUN_IFELSE([AC_LANG_PROGRAM([], [__int128 x = 0, y = 0; __atomic_compare_exchange_n (&x, &y, 1, 0, __ATOMIC_RELAXED, __ATOMIC_RELAXED);])],
+	  [AC_MSG_RESULT([yes])
+	      atomic_compare_exchange_n_128_result=1],
+	  [AC_MSG_RESULT([no])],
+	  [AC_MSG_RESULT([no (cross compiling)])])
+
+      if test $atomic_compare_exchange_n_128_result = 0 ; then
+	  CFLAGS_save=$CFLAGS
+	  CFLAGS="$CFLAGS -mcx16"
+
+	  AC_MSG_CHECKING([for __atomic builtin atomic compare-and-swap on 128-bit values with -mcx16 flag])
+          AC_RUN_IFELSE([AC_LANG_PROGRAM([], [__int128 x = 0, y = 0; __atomic_compare_exchange_n (&x, &y, 1, 0, __ATOMIC_RELAXED, __ATOMIC_RELAXED);])],
+              [AC_MSG_RESULT([yes])
+		  atomic_compare_exchange_n_128_result=1
+		  CFLAGS_save="$CFLAGS"],
+              [AC_MSG_RESULT([no])],
+	      [AC_MSG_RESULT([no (cross compiling)])])
+
+	  CFLAGS=$CFLAGS_save
+      fi
+
+      if test $atomic_compare_exchange_n_128_result = 1 ; then
+         AC_MSG_CHECKING([if __int128 atomic compare-and-swap is always lock-free])
+          AC_RUN_IFELSE([AC_LANG_PROGRAM([], [if (!__atomic_always_lock_free(16, 0)) { return 1; }])],
+              [AC_MSG_RESULT([yes])],
+              [AC_MSG_RESULT([no])
+                 PMIX_CHECK_SYNC_BUILTIN_CSWAP_INT128
+                 atomic_compare_exchange_n_128_result=0],
+             [AC_MSG_RESULT([no (cross compiling)])])
+      fi
+  else
+      AC_MSG_CHECKING([for compiler support of __atomic builtin atomic compare-and-swap on 128-bit values])
+
+      # Check if the compiler supports the __atomic builtin
+      AC_TRY_LINK([], [__int128 x = 0, y = 0; __atomic_compare_exchange_n (&x, &y, 1, 0, __ATOMIC_RELAXED, __ATOMIC_RELAXED);],
+	  [AC_MSG_RESULT([yes])
+	      atomic_compare_exchange_n_128_result=1],
+	  [AC_MSG_RESULT([no])])
+
+      if test $atomic_compare_exchange_n_128_result = 0 ; then
+	  CFLAGS_save=$CFLAGS
+	  CFLAGS="$CFLAGS -mcx16"
+
+	  AC_MSG_CHECKING([for __atomic builtin atomic compare-and-swap on 128-bit values with -mcx16 flag])
+          AC_TRY_LINK([], [__int128 x = 0, y = 0; __atomic_compare_exchange_n (&x, &y, 1, 0, __ATOMIC_RELAXED, __ATOMIC_RELAXED);],
+              [AC_MSG_RESULT([yes])
+		  atomic_compare_exchange_n_128_result=1
+		  CFLAGS_save="$CFLAGS"],
+              [AC_MSG_RESULT([no])])
+
+	  CFLAGS=$CFLAGS_save
+      fi
+  fi
+
+  AC_DEFINE_UNQUOTED([PMIX_HAVE_GCC_BUILTIN_CSWAP_INT128], [$atomic_compare_exchange_n_128_result],
+	[Whether the __atomic builtin atomic compare and swap is lock-free on 128-bit values])
+
+  PMIX_VAR_SCOPE_POP
+])
+
+AC_DEFUN([PMIX_CHECK_GCC_ATOMIC_BUILTINS], [
+  AC_MSG_CHECKING([for __atomic builtin atomics])
+
+  AC_TRY_LINK([
+#include <stdint.h>
+uint32_t tmp, old = 0;
+uint64_t tmp64, old64 = 0;], [
+__atomic_thread_fence(__ATOMIC_SEQ_CST);
+__atomic_compare_exchange_n(&tmp, &old, 1, 0, __ATOMIC_RELAXED, __ATOMIC_RELAXED);
+__atomic_add_fetch(&tmp, 1, __ATOMIC_RELAXED);
+__atomic_compare_exchange_n(&tmp64, &old64, 1, 0, __ATOMIC_RELAXED, __ATOMIC_RELAXED);
+__atomic_add_fetch(&tmp64, 1, __ATOMIC_RELAXED);],
+    [AC_MSG_RESULT([yes])
+     $1],
+    [AC_MSG_RESULT([no])
+     $2])
+
+  # Check for 128-bit support
+  PMIX_CHECK_GCC_BUILTIN_CSWAP_INT128
+])
+
+
+dnl #################################################################
+dnl
+dnl PMIX_CHECK_ASM_TEXT
+dnl
+dnl Determine how to set current mode as text.
+dnl
+dnl #################################################################
+AC_DEFUN([PMIX_CHECK_ASM_TEXT],[
+    AC_MSG_CHECKING([directive for setting text section])
+    pmix_cv_asm_text=""
+    if test "$pmix_cv_c_compiler_vendor" = "microsoft" ; then
+        # text section will be brought in with the rest of
+        # header for MS - leave blank for now
+        pmix_cv_asm_text=""
+    else
+        case $host in
+            *-aix*)
+                pmix_cv_asm_text=[".csect .text[PR]"]
+            ;;
+            *)
+                pmix_cv_asm_text=".text"
+            ;;
+        esac
+    fi
+    AC_MSG_RESULT([$pmix_cv_asm_text])
+    AC_DEFINE_UNQUOTED([PMIX_ASM_TEXT], ["$pmix_cv_asm_text"],
+                       [Assembly directive for setting text section])
+    PMIX_ASM_TEXT="$pmix_cv_asm_text"
+    AC_SUBST(PMIX_ASM_TEXT)
+])dnl
+
+
+dnl #################################################################
+dnl
+dnl PMIX_CHECK_ASM_GLOBAL
+dnl
+dnl Sets PMIX_ASM_GLOBAL to the value to prefix global values
+dnl
+dnl I'm sure if I don't have a test for this, there will be some
+dnl dumb platform that uses something else
+dnl
+dnl #################################################################
+AC_DEFUN([PMIX_CHECK_ASM_GLOBAL],[
+    AC_MSG_CHECKING([directive for exporting symbols])
+    pmix_cv_asm_global=""
+    if test "$pmix_cv_c_compiler_vendor" = "microsoft" ; then
+        pmix_cv_asm_global="PUBLIC"
+    else
+        case $host in
+            *)
+                pmix_cv_asm_global=".globl"
+            ;;
+        esac
+    fi
+    AC_MSG_RESULT([$pmix_cv_asm_global])
+    AC_DEFINE_UNQUOTED([PMIX_ASM_GLOBAL], ["$pmix_cv_asm_global"],
+                       [Assembly directive for exporting symbols])
+    PMIX_ASM_GLOBAL="$pmix_cv_asm_global"
+    AC_SUBST(PMIX_AS_GLOBAL)
+])dnl
+
+
+dnl #################################################################
+dnl
+dnl PMIX_CHECK_ASM_LSYM
+dnl
+dnl Sets PMIX_ASM_LSYM to the prefix value on a symbol to make it
+dnl an internal label (jump target and whatnot)
+dnl
+dnl We look for L .L $ L$ (in that order) for something that both
+dnl assembles and does not leave a label in the output of nm.  Fall
+dnl back to L if nothing else seems to work :/
+dnl
+dnl #################################################################
+
+# _PMIX_CHECK_ASM_LSYM([variable-to-set])
+# ---------------------------------------
+AC_DEFUN([_PMIX_CHECK_ASM_LSYM],[
+    AC_REQUIRE([AC_PROG_GREP])
+
+    $1="L"
+
+    for sym in L .L $ L$ ; do
+        asm_result=0
+        echo "configure: trying $sym" >&AC_FD_CC
+        PMIX_TRY_ASSEMBLE([foobar$pmix_cv_asm_label_suffix
+${sym}mytestlabel$pmix_cv_asm_label_suffix],
+            [# ok, we succeeded at assembling.  see if we can nm,
+             # throwing the results in a file
+            if $NM conftest.$OBJEXT > conftest.out 2>&AC_FD_CC ; then
+                if test "`$GREP mytestlabel conftest.out`" = "" ; then
+                    # there was no symbol...  looks promising to me
+                    $1="$sym"
+                    asm_result=1
+                elif test ["`$GREP ' [Nt] .*mytestlabel' conftest.out`"] = "" ; then
+                    # see if we have a non-global-ish symbol
+                    # but we should see if we can do better.
+                    $1="$sym"
+                fi
+            else
+                # not so much on the NM goodness :/
+                echo "$NM failed.  Output from NM was:" >&AC_FD_CC
+                cat conftest.out >&AC_FD_CC
+                AC_MSG_WARN([$NM could not read object file])
+            fi
+            ])
+        if test "$asm_result" = "1" ; then
+            break
+        fi
+    done
+    rm -f conftest.out
+    unset asm_result sym
+])
+
+# PMIX_CHECK_ASM_LSYM()
+# ---------------------
+AC_DEFUN([PMIX_CHECK_ASM_LSYM],[
+    AC_REQUIRE([AC_PROG_NM])
+
+    AC_CACHE_CHECK([prefix for lsym labels],
+                   [pmix_cv_asm_lsym],
+                   [_PMIX_CHECK_ASM_LSYM([pmix_cv_asm_lsym])])
+    AC_DEFINE_UNQUOTED([PMIX_ASM_LSYM], ["$pmix_cv_asm_lsym"],
+                       [Assembly prefix for lsym labels])
+    PMIX_ASM_LSYM="$pmix_cv_asm_lsym"
+    AC_SUBST(PMIX_ASM_LSYM)
+])dnl
+
+dnl #################################################################
+dnl
+dnl PMIX_CHECK_ASM_PROC
+dnl
+dnl Sets a cv-flag, if the compiler needs a proc/endp-definition to
+dnl link with C.
+dnl
+dnl #################################################################
+AC_DEFUN([PMIX_CHECK_ASM_PROC],[
+    AC_CACHE_CHECK([if .proc/endp is needed],
+                   [pmix_cv_asm_need_proc],
+                   [pmix_cv_asm_need_proc="no"
+                    PMIX_TRY_ASSEMBLE([
+     .proc mysym
+mysym:
+     .endp mysym],
+                          [pmix_cv_asm_need_proc="yes"])
+                    rm -f conftest.out])
+
+    if test "$pmix_cv_asm_need_proc" = "yes" ; then
+       pmix_cv_asm_proc=".proc"
+       pmix_cv_asm_endproc=".endp"
+    else
+       pmix_cv_asm_proc="#"
+       pmix_cv_asm_endproc="#"
+    fi
+])dnl
+
+
+dnl #################################################################
+dnl
+dnl PMIX_CHECK_ASM_GSYM
+dnl
+dnl Sets PMIX_ASM_GSYM to the prefix value on a symbol to make it
+dnl a global linkable from C.  Basically, an _ or not.
+dnl
+dnl #################################################################
+AC_DEFUN([PMIX_CHECK_ASM_GSYM],[
+    AC_CACHE_CHECK([prefix for global symbol labels],
+                   [pmix_cv_asm_gsym],
+                   [_PMIX_CHECK_ASM_GSYM])
+
+    if test "$pmix_cv_asm_gsym" = "none" ; then
+       AC_MSG_ERROR([Could not determine global symbol label prefix])
+    fi
+
+    AC_DEFINE_UNQUOTED([PMIX_ASM_GSYM], ["$pmix_cv_asm_gsym"],
+                       [Assembly prefix for gsym labels])
+    PMIX_ASM_GSYM="$pmix_cv_asm_gsym"
+    AC_SUBST(PMIX_ASM_GSYM)
+
+])
+
+AC_DEFUN([_PMIX_CHECK_ASM_GSYM],[
+    pmix_cv_asm_gsym="none"
+
+    for sym in "_" "" "." ; do
+        asm_result=0
+        echo "configure: trying $sym" >&AC_FD_CC
+cat > conftest_c.c <<EOF
+#ifdef __cplusplus
+extern "C" {
+#endif
+void gsym_test_func(void);
+#ifdef __cplusplus
+}
+#endif
+int
+main()
+{
+    gsym_test_func();
+    return 0;
+}
+EOF
+        PMIX_TRY_ASSEMBLE([
+$pmix_cv_asm_text
+$pmix_cv_asm_proc ${sym}gsym_test_func
+$pmix_cv_asm_global ${sym}gsym_test_func
+${sym}gsym_test_func${pmix_cv_asm_label_suffix}
+$pmix_cv_asm_endproc ${sym}gsym_test_func
+            ],
+            [pmix_compile="$CC $CFLAGS -I. conftest_c.c -c > conftest.cmpl 2>&1"
+             if AC_TRY_EVAL(pmix_compile) ; then
+                # save the warnings
+                 cat conftest.cmpl >&AC_FD_CC
+                 pmix_link="$CC $CFLAGS conftest_c.$OBJEXT conftest.$OBJEXT -o conftest  $LDFLAGS $LIBS > conftest.link 2>&1"
+                 if AC_TRY_EVAL(pmix_link) ; then
+                     # save the warnings
+                     cat conftest.link >&AC_FD_CC
+                     asm_result=1
+                 else
+                     cat conftest.link >&AC_FD_CC
+                     echo "configure: failed C program was: " >&AC_FD_CC
+                     cat conftest_c.c >&AC_FD_CC
+                     echo "configure: failed ASM program was: " >&AC_FD_CC
+                     cat conftest.s >&AC_FD_CC
+                     asm_result=0
+                 fi
+             else
+                # save output and failed program
+                 cat conftest.cmpl >&AC_FD_CC
+                 echo "configure: failed C program was: " >&AC_FD_CC
+                 cat conftest.c >&AC_FD_CC
+                 asm_result=0
+             fi],
+            [asm_result=0])
+        if test "$asm_result" = "1" ; then
+            pmix_cv_asm_gsym="$sym"
+            break
+        fi
+    done
+    rm -rf conftest.*
+])dnl
+
+
+dnl #################################################################
+dnl
+dnl PMIX_CHECK_ASM_LABEL_SUFFIX
+dnl
+dnl Sets PMIX_ASM_LABEL_SUFFIX to the value to suffix for labels
+dnl
+dnl I'm sure if I don't have a test for this, there will be some
+dnl dumb platform that uses something else
+dnl
+dnl #################################################################
+AC_DEFUN([PMIX_CHECK_ASM_LABEL_SUFFIX],[
+    AC_MSG_CHECKING([suffix for labels])
+    pmix_cv_asm_label_suffix=""
+    case $host in
+        *)
+                pmix_cv_asm_label_suffix=":"
+        ;;
+    esac
+    AC_MSG_RESULT([$pmix_cv_asm_label_suffix])
+    AC_DEFINE_UNQUOTED([PMIX_ASM_LABEL_SUFFIX], ["$pmix_cv_asm_label_suffix"],
+                       [Assembly suffix for labels])
+    PMIX_ASM_LABEL_SUFFIX="$pmix_cv_asm_label_suffix"
+    AC_SUBST(PMIX_AS_LABEL_SUFFIX)
+])dnl
+
+
+dnl #################################################################
+dnl
+dnl PMIX_CHECK_ASM_ALIGN_LOG
+dnl
+dnl Sets PMIX_ASM_ALIGN_LOG to 1 if align is specified
+dnl logarithmically, 0 otherwise
+dnl
+dnl #################################################################
+AC_DEFUN([PMIX_CHECK_ASM_ALIGN_LOG],[
+    AC_REQUIRE([AC_PROG_NM])
+    AC_REQUIRE([AC_PROG_GREP])
+
+    AC_CACHE_CHECK([if .align directive takes logarithmic value],
+                   [pmix_cv_asm_align_log],
+                   [ PMIX_TRY_ASSEMBLE([        $pmix_cv_asm_text
+        .align 4
+        $pmix_cv_asm_global foo
+        .byte 1
+        .align 4
+foo$pmix_cv_asm_label_suffix
+        .byte 2],
+        [pmix_asm_addr=[`$NM conftest.$OBJEXT | $GREP foo | sed -e 's/.*\([0-9a-fA-F][0-9a-fA-F]\).*foo.*/\1/'`]],
+        [pmix_asm_addr=""])
+    # test for both 16 and 10 (decimal and hex notations)
+    echo "configure: .align test address offset is $pmix_asm_addr" >&AC_FD_CC
+    if test "$pmix_asm_addr" = "16" || test "$pmix_asm_addr" = "10" ; then
+       pmix_cv_asm_align_log="yes"
+    else
+        pmix_cv_asm_align_log="no"
+    fi])
+
+    if test "$pmix_cv_asm_align_log" = "yes" || test "$pmix_cv_asm_align_log" = "1" ; then
+        pmix_asm_align_log_result=1
+    else
+        pmix_asm_align_log_result=0
+    fi
+
+    AC_DEFINE_UNQUOTED([PMIX_ASM_ALIGN_LOG],
+                       [$asm_align_log_result],
+                       [Assembly align directive expects logarithmic value])
+
+    unset omp_asm_addr asm_result
+])dnl
+
+
+dnl #################################################################
+dnl
+dnl PMIX_CHECK_ASM_TYPE
+dnl
+dnl Sets PMIX_ASM_TYPE to the prefix for the function type to
+dnl set a symbol's type as function (needed on ELF for shared
+dnl libaries).  If no .type directive is needed, sets PMIX_ASM_TYPE
+dnl to an empty string
+dnl
+dnl We look for @ \# %
+dnl
+dnl #################################################################
+AC_DEFUN([PMIX_CHECK_ASM_TYPE],[
+        AC_CACHE_CHECK([prefix for function in .type],
+                       [pmix_cv_asm_type],
+                       [_PMIX_CHECK_ASM_TYPE])
+
+    AC_DEFINE_UNQUOTED([PMIX_ASM_TYPE], ["$pmix_cv_asm_type"],
+                       [How to set function type in .type directive])
+    PMIX_ASM_TYPE="$pmix_cv_asm_type"
+    AC_SUBST(PMIX_ASM_TYPE)
+])
+
+AC_DEFUN([_PMIX_CHECK_ASM_TYPE],[
+    pmix_cv_asm_type=""
+
+    case "${host}" in
+    *-sun-solaris*)
+        # GCC on solaris seems to accept just about anything, not
+        # that what it defines actually works...  So just hardwire
+        # to the right answer
+        pmix_cv_asm_type="#"
+    ;;
+    *)
+        for type  in @ \# % ; do
+            asm_result=0
+            echo "configure: trying $type" >&AC_FD_CC
+            PMIX_TRY_ASSEMBLE([     .type mysym, ${type}function
+mysym:],
+                 [pmix_cv_asm_type="${type}"
+                    asm_result=1])
+            if test "$asm_result" = "1" ; then
+                break
+            fi
+        done
+    ;;
+    esac
+    rm -f conftest.out
+
+    unset asm_result type
+])dnl
+
+
+dnl #################################################################
+dnl
+dnl PMIX_CHECK_ASM_SIZE
+dnl
+dnl Sets PMIX_ASM_SIZE to 1 if we should set .size directives for
+dnl each function, 0 otherwise.
+dnl
+dnl #################################################################
+AC_DEFUN([PMIX_CHECK_ASM_SIZE],[
+    AC_CACHE_CHECK([if .size is needed],
+                   [pmix_cv_asm_need_size],
+                   [pmix_cv_asm_need_size="no"
+                    PMIX_TRY_ASSEMBLE([     .size mysym, 1],
+                          [pmix_cv_asm_need_size="yes"])
+                    rm -f conftest.out])
+
+    if test "$pmix_cv_asm_need_size" = "yes" ; then
+       pmix_asm_size=1
+    else
+       pmix_asm_size=0
+    fi
+
+    AC_DEFINE_UNQUOTED([PMIX_ASM_SIZE], ["$pmix_asm_size"],
+                       [Do we need to give a .size directive])
+    PMIX_ASM_SIZE="$pmix_asm_size"
+    AC_SUBST(PMIX_ASM_TYPE)
+    unset asm_result
+])dnl
+
+
+# PMIX_CHECK_ASM_GNU_STACKEXEC(var)
+# ----------------------------------
+# sets shell variable var to the things necessary to
+# disable execable stacks with GAS
+AC_DEFUN([PMIX_CHECK_ASM_GNU_STACKEXEC], [
+    AC_REQUIRE([AC_PROG_GREP])
+
+    AC_CHECK_PROG([OBJDUMP], [objdump], [objdump])
+    AC_CACHE_CHECK([if .note.GNU-stack is needed],
+        [pmix_cv_asm_gnu_stack_result],
+        [AS_IF([test "$OBJDUMP" != ""],
+            [ # first, see if a simple C program has it set
+             cat >conftest.c <<EOF
+int testfunc() {return 0; }
+EOF
+             PMIX_LOG_COMMAND([$CC $CFLAGS -c conftest.c -o conftest.$OBJEXT],
+                 [$OBJDUMP -x conftest.$OBJEXT | $GREP '\.note\.GNU-stack' > /dev/null && pmix_cv_asm_gnu_stack_result=yes],
+                 [PMIX_LOG_MSG([the failed program was:], 1)
+                  PMIX_LOG_FILE([conftest.c])
+                  pmix_cv_asm_gnu_stack_result=no])
+             if test "$pmix_cv_asm_gnu_stack_result" != "yes" ; then
+                 pmix_cv_asm_gnu_stack_result="no"
+             fi
+             rm -rf conftest.*],
+            [pmix_cv_asm_gnu_stack_result="no"])])
+    if test "$pmix_cv_asm_gnu_stack_result" = "yes" ; then
+        pmix_cv_asm_gnu_stack=1
+    else
+        pmix_cv_asm_gnu_stack=0
+    fi
+])dnl
+
+
+dnl #################################################################
+dnl
+dnl PMIX_CHECK_POWERPC_REG
+dnl
+dnl See if the notation for specifying registers is X (most everyone)
+dnl or rX (OS X)
+dnl
+dnl #################################################################
+AC_DEFUN([PMIX_CHECK_POWERPC_REG],[
+    AC_MSG_CHECKING([if PowerPC registers have r prefix])
+    PMIX_TRY_ASSEMBLE([$pmix_cv_asm_text
+        addi 1,1,0],
+        [pmix_cv_asm_powerpc_r_reg=0],
+        [PMIX_TRY_ASSEMBLE([$pmix_cv_asm_text
+        addi r1,r1,0],
+            [pmix_cv_asm_powerpc_r_reg=1],
+            [AC_MSG_ERROR([Can not determine how to use PPC registers])])])
+    if test "$pmix_cv_asm_powerpc_r_reg" = "1" ; then
+        AC_MSG_RESULT([yes])
+    else
+        AC_MSG_RESULT([no])
+    fi
+
+    AC_DEFINE_UNQUOTED([PMIX_POWERPC_R_REGISTERS],
+                       [$pmix_cv_asm_powerpc_r_reg],
+                       [Whether r notation is used for ppc registers])
+])dnl
+
+
+dnl #################################################################
+dnl
+dnl PMIX_CHECK_POWERPC_64BIT
+dnl
+dnl On some powerpc chips (the PPC970 or G5), the OS usually runs in
+dnl 32 bit mode, even though the hardware can do 64bit things.  If
+dnl the compiler will let us, emit code for 64bit test and set type
+dnl operations (on a long long).
+dnl
+dnl #################################################################
+AC_DEFUN([PMIX_CHECK_POWERPC_64BIT],[
+    if test "$ac_cv_sizeof_long" != "4" ; then
+        # this function should only be called in the 32 bit case
+        AC_MSG_ERROR([CHECK_POWERPC_64BIT called on 64 bit platform.  Internal error.])
+    fi
+    AC_MSG_CHECKING([for 64-bit PowerPC assembly support])
+        case $host in
+            *-darwin*)
+                ppc64_result=0
+                if test "$pmix_cv_asm_powerpc_r_reg" = "1" ; then
+                   ldarx_asm="        ldarx r1,r1,r1";
+                else
+                   ldarx_asm="        ldarx 1,1,1";
+                fi
+                PMIX_TRY_ASSEMBLE([$pmix_cv_asm_text
+        $ldarx_asm],
+                    [ppc64_result=1],
+                    [ppc64_result=0])
+            ;;
+            *)
+                ppc64_result=0
+            ;;
+        esac
+
+    if test "$ppc64_result" = "1" ; then
+        AC_MSG_RESULT([yes])
+        ifelse([$1],,:,[$1])
+    else
+        AC_MSG_RESULT([no])
+        ifelse([$2],,:,[$2])
+    fi
+
+    unset ppc64_result ldarx_asm
+])dnl
+
+
+dnl #################################################################
+dnl
+dnl PMIX_CHECK_SPARCV8PLUS
+dnl
+dnl #################################################################
+AC_DEFUN([PMIX_CHECK_SPARCV8PLUS],[
+    AC_MSG_CHECKING([if have Sparc v8+/v9 support])
+    sparc_result=0
+    PMIX_TRY_ASSEMBLE([$pmix_cv_asm_text
+	casa [%o0] 0x80, %o1, %o2],
+                [sparc_result=1],
+                [sparc_result=0])
+    if test "$sparc_result" = "1" ; then
+        AC_MSG_RESULT([yes])
+        ifelse([$1],,:,[$1])
+    else
+        AC_MSG_RESULT([no])
+        ifelse([$2],,:,[$2])
+    fi
+
+    unset sparc_result
+])dnl
+
+dnl #################################################################
+dnl
+dnl PMIX_CHECK_CMPXCHG16B
+dnl
+dnl #################################################################
+AC_DEFUN([PMIX_CHECK_CMPXCHG16B],[
+    PMIX_VAR_SCOPE_PUSH([cmpxchg16b_result])
+
+    AC_ARG_ENABLE([cross-cmpxchg16b],[AC_HELP_STRING([--enable-cross-cmpxchg16b],
+                  [enable the use of the cmpxchg16b instruction when cross compiling])])
+
+    if test ! "$enable_cross_cmpxchg16b" = "yes" ; then
+	AC_MSG_CHECKING([if processor supports x86_64 16-byte compare-and-exchange])
+	AC_RUN_IFELSE([AC_LANG_PROGRAM([[unsigned char tmp[16];]],[[
+    __asm__ __volatile__ ("lock cmpxchg16b (%%rsi)" : : "S" (tmp) : "memory", "cc");]])],
+            [AC_MSG_RESULT([yes])
+		cmpxchg16b_result=1],
+            [AC_MSG_RESULT([no])
+		cmpxchg16b_result=0],
+            [AC_MSG_RESULT([no (cross-compiling)])
+		cmpxchg16b_result=0])
+    else
+	AC_MSG_CHECKING([if assembler supports x86_64 16-byte compare-and-exchange])
+
+	PMIX_TRY_ASSEMBLE([$pmix_cv_asm_text
+		cmpxchg16b 0],
+            [AC_MSG_RESULT([yes])
+		cmpxchg16b_result=1],
+            [AC_MSG_RESULT([no])
+		cmpxchg16b_result=0])
+    fi
+    if test "$cmpxchg16b_result" = 1; then
+        AC_MSG_CHECKING([if compiler correctly handles volatile 128bits])
+        AC_RUN_IFELSE([AC_LANG_PROGRAM([#include <stdint.h>
+#include <assert.h>
+
+union pmix_counted_pointer_t {
+    struct {
+        uint64_t counter;
+        uint64_t item;
+    } data;
+#if defined(HAVE___INT128) && HAVE___INT128
+    __int128 value;
+#elif defined(HAVE_INT128_T) && HAVE_INT128_T
+    int128_t value;
+#endif
+};
+typedef union pmix_counted_pointer_t pmix_counted_pointer_t;],
+                                       [volatile pmix_counted_pointer_t a;
+    pmix_counted_pointer_t b;
+
+    a.data.counter = 0;
+    a.data.item = 0x1234567890ABCDEF;
+
+    b.data.counter = a.data.counter;
+    b.data.item = a.data.item;
+
+    /* bozo checks */
+    assert(16 == sizeof(pmix_counted_pointer_t));
+    assert(a.data.counter == b.data.counter);
+    assert(a.data.item == b.data.item);
+    /*
+     * the following test fails on buggy compilers
+     * so far, with icc -o conftest conftest.c
+     *  - intel icc 14.0.0.080 (aka 2013sp1)
+     *  - intel icc 14.0.1.106 (aka 2013sp1u1)
+     * older and more recents compilers work fine
+     * buggy compilers work also fine but only with -O0
+     */
+#if (defined(HAVE___INT128) && HAVE___INT128) || (defined(HAVE_INT128_T) && HAVE_INT128_T)
+    return (a.value != b.value);
+#else
+    return 0;
+#endif])],
+                    [AC_MSG_RESULT([yes])],
+                    [AC_MSG_RESULT([no])
+                     cmpxchg16b_result=0],
+                    [AC_MSG_RESULT([untested, assuming ok])])
+    fi
+    AC_DEFINE_UNQUOTED([PMIX_HAVE_CMPXCHG16B], [$cmpxchg16b_result],
+        [Whether the processor supports the cmpxchg16b instruction])
+    PMIX_VAR_SCOPE_POP
+])dnl
+
+dnl #################################################################
+dnl
+dnl PMIX_CHECK_INLINE_GCC
+dnl
+dnl Check if the compiler is capable of doing GCC-style inline
+dnl assembly.  Some compilers emit a warning and ignore the inline
+dnl assembly (xlc on OS X) and compile without error.  Therefore,
+dnl the test attempts to run the emited code to check that the
+dnl assembly is actually run.  To run this test, one argument to
+dnl the macro must be an assembly instruction in gcc format to move
+dnl the value 0 into the register containing the variable ret.
+dnl For PowerPC, this would be:
+dnl
+dnl   "li %0,0" : "=&r"(ret)
+dnl
+dnl For testing ia32 assembly, the assembly instruction xaddl is
+dnl tested.  The xaddl instruction is used by some of the atomic
+dnl implementations so it makes sense to test for it.  In addition,
+dnl some compilers (i.e. earlier versions of Sun Studio 12) do not
+dnl necessarily handle xaddl properly, so that needs to be detected
+dnl during configure time.
+dnl
+dnl DEFINE PMIX_GCC_INLINE_ASSEMBLY to 0 or 1 depending on GCC
+dnl                support
+dnl
+dnl #################################################################
+AC_DEFUN([PMIX_CHECK_INLINE_C_GCC],[
+    assembly="$1"
+    asm_result="unknown"
+
+    AC_MSG_CHECKING([if $CC supports GCC inline assembly])
+
+    if test ! "$assembly" = "" ; then
+        AC_RUN_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT],[[
+int ret = 1;
+int negone = -1;
+__asm__ __volatile__ ($assembly);
+return ret;
+                                                             ]])],
+                      [asm_result="yes"], [asm_result="no"],
+                      [asm_result="unknown"])
+    else
+        assembly="test skipped - assuming no"
+    fi
+
+    # if we're cross compiling, just try to compile and figure good enough
+    if test "$asm_result" = "unknown" ; then
+        AC_LINK_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT],[[
+int ret = 1;
+int negone = -1;
+__asm__ __volatile__ ($assembly);
+return ret;
+                                                              ]])],
+                       [asm_result="yes"], [asm_result="no"])
+    fi
+
+    AC_MSG_RESULT([$asm_result])
+
+    if test "$asm_result" = "yes" ; then
+        PMIX_C_GCC_INLINE_ASSEMBLY=1
+	pmix_cv_asm_inline_supported="yes"
+    else
+        PMIX_C_GCC_INLINE_ASSEMBLY=0
+    fi
+
+    AC_DEFINE_UNQUOTED([PMIX_C_GCC_INLINE_ASSEMBLY],
+                       [$PMIX_C_GCC_INLINE_ASSEMBLY],
+                       [Whether C compiler supports GCC style inline assembly])
+
+    unset PMIX_C_GCC_INLINE_ASSEMBLY assembly asm_result
+])dnl
+
+dnl #################################################################
+dnl
+dnl PMIX_CONFIG_ASM
+dnl
+dnl DEFINE PMIX_ASSEMBLY_ARCH to something in sys/architecture.h
+dnl DEFINE PMIX_ASSEMBLY_FORMAT to string containing correct
+dnl                             format for assembly (not user friendly)
+dnl SUBST PMIX_ASSEMBLY_FORMAT to string containing correct
+dnl                             format for assembly (not user friendly)
+dnl
+dnl #################################################################
+AC_DEFUN([PMIX_CONFIG_ASM],[
+    AC_REQUIRE([PMIX_SETUP_CC])
+    AC_REQUIRE([AM_PROG_AS])
+
+    AC_ARG_ENABLE([builtin-atomics],
+      [AC_HELP_STRING([--enable-builtin-atomics],
+         [Enable use of __sync builtin atomics (default: enabled)])],
+         [], [enable_builtin_atomics="yes"])
+
+    pmix_cv_asm_builtin="BUILTIN_NO"
+    AS_IF([test "$pmix_cv_asm_builtin" = "BUILTIN_NO" && test "$enable_builtin_atomics" != "no"],
+          [PMIX_CHECK_GCC_ATOMIC_BUILTINS([pmix_cv_asm_builtin="BUILTIN_GCC"], [])])
+    AS_IF([test "$pmix_cv_asm_builtin" = "BUILTIN_NO" && test "$enable_builtin_atomics" != "no"],
+          [PMIX_CHECK_SYNC_BUILTINS([pmix_cv_asm_builtin="BUILTIN_SYNC"], [])])
+    AS_IF([test "$pmix_cv_asm_builtin" = "BUILTIN_NO" && test "$enable_builtin_atomics" = "yes"],
+          [AC_MSG_WARN([__sync builtin atomics requested but not found - proceeding with inline atomics])])
+
+        PMIX_CHECK_ASM_PROC
+        PMIX_CHECK_ASM_TEXT
+        PMIX_CHECK_ASM_GLOBAL
+        PMIX_CHECK_ASM_GNU_STACKEXEC
+        PMIX_CHECK_ASM_LABEL_SUFFIX
+        PMIX_CHECK_ASM_GSYM
+        PMIX_CHECK_ASM_LSYM
+        PMIX_CHECK_ASM_TYPE
+        PMIX_CHECK_ASM_SIZE
+        PMIX_CHECK_ASM_ALIGN_LOG
+
+        # find our architecture for purposes of assembly stuff
+        pmix_cv_asm_arch="UNSUPPORTED"
+        PMIX_GCC_INLINE_ASSIGN=""
+        PMIX_ASM_SUPPORT_64BIT=0
+        case "${host}" in
+        x86_64-*x32)
+            pmix_cv_asm_arch="X86_64"
+            PMIX_ASM_SUPPORT_64BIT=1
+            PMIX_GCC_INLINE_ASSIGN='"xaddl %1,%0" : "=m"(ret), "+r"(negone) : "m"(ret)'
+            ;;
+        i?86-*|x86_64*|amd64*)
+            if test "$ac_cv_sizeof_long" = "4" ; then
+                pmix_cv_asm_arch="IA32"
+            else
+                pmix_cv_asm_arch="X86_64"
+            fi
+            PMIX_ASM_SUPPORT_64BIT=1
+            PMIX_GCC_INLINE_ASSIGN='"xaddl %1,%0" : "=m"(ret), "+r"(negone) : "m"(ret)'
+            PMIX_CHECK_CMPXCHG16B
+            ;;
+
+        ia64-*)
+            pmix_cv_asm_arch="IA64"
+            PMIX_ASM_SUPPORT_64BIT=1
+            PMIX_GCC_INLINE_ASSIGN='"mov %0=r0\n;;\n" : "=&r"(ret)'
+            ;;
+	aarch64*)
+            pmix_cv_asm_arch="ARM64"
+            PMIX_ASM_SUPPORT_64BIT=1
+            PMIX_ASM_ARM_VERSION=8
+            AC_DEFINE_UNQUOTED([PMIX_ASM_ARM_VERSION], [$PMIX_ASM_ARM_VERSION],
+                               [What ARM assembly version to use])
+            PMIX_GCC_INLINE_ASSIGN='"mov %0, #0" : "=&r"(ret)'
+            ;;
+
+        armv7*|arm-*-linux-gnueabihf)
+            pmix_cv_asm_arch="ARM"
+            PMIX_ASM_SUPPORT_64BIT=1
+            PMIX_ASM_ARM_VERSION=7
+            AC_DEFINE_UNQUOTED([PMIX_ASM_ARM_VERSION], [$PMIX_ASM_ARM_VERSION],
+                               [What ARM assembly version to use])
+            PMIX_GCC_INLINE_ASSIGN='"mov %0, #0" : "=&r"(ret)'
+            ;;
+
+        armv6*)
+            pmix_cv_asm_arch="ARM"
+            PMIX_ASM_SUPPORT_64BIT=0
+            PMIX_ASM_ARM_VERSION=6
+            CCASFLAGS="$CCASFLAGS -march=armv7-a"
+            AC_DEFINE_UNQUOTED([PMIX_ASM_ARM_VERSION], [$PMIX_ASM_ARM_VERSION],
+                               [What ARM assembly version to use])
+            PMIX_GCC_INLINE_ASSIGN='"mov %0, #0" : "=&r"(ret)'
+            ;;
+
+        armv5*linux*|armv4*linux*|arm-*-linux-gnueabi)
+            # uses Linux kernel helpers for some atomic operations
+            pmix_cv_asm_arch="ARM"
+            PMIX_ASM_SUPPORT_64BIT=0
+            PMIX_ASM_ARM_VERSION=5
+            CCASFLAGS="$CCASFLAGS -march=armv7-a"
+            AC_DEFINE_UNQUOTED([PMIX_ASM_ARM_VERSION], [$PMIX_ASM_ARM_VERSION],
+                               [What ARM assembly version to use])
+            PMIX_GCC_INLINE_ASSIGN='"mov %0, #0" : "=&r"(ret)'
+            ;;
+
+        mips-*|mips64*)
+            # Should really find some way to make sure that we are on
+            # a MIPS III machine (r4000 and later)
+            pmix_cv_asm_arch="MIPS"
+            PMIX_ASM_SUPPORT_64BIT=1
+            PMIX_GCC_INLINE_ASSIGN='"or %0,[$]0,[$]0" : "=&r"(ret)'
+            ;;
+
+        powerpc-*|powerpc64-*|powerpcle-*|powerpc64le-*|rs6000-*|ppc-*)
+            PMIX_CHECK_POWERPC_REG
+            if test "$ac_cv_sizeof_long" = "4" ; then
+                pmix_cv_asm_arch="POWERPC32"
+
+                # Note that on some platforms (Apple G5), even if we are
+                # compiling in 32 bit mode (and therefore should assume
+                # sizeof(long) == 4), we can use the 64 bit test and set
+                # operations.
+                PMIX_CHECK_POWERPC_64BIT(PMIX_ASM_SUPPORT_64BIT=1)
+            elif test "$ac_cv_sizeof_long" = "8" ; then
+                PMIX_ASM_SUPPORT_64BIT=1
+                pmix_cv_asm_arch="POWERPC64"
+            else
+                AC_MSG_ERROR([Could not determine PowerPC word size: $ac_cv_sizeof_long])
+            fi
+            PMIX_GCC_INLINE_ASSIGN='"1: li %0,0" : "=&r"(ret)'
+            ;;
+        # There is no current difference between s390 and s390x
+        # But use two different defines in case some come later
+        # as s390 is 31bits while s390x is 64bits
+        s390-*)
+            pmix_cv_asm_arch="S390"
+            PMIX_CHECK_SYNC_BUILTINS([pmix_cv_asm_builtin="BUILTIN_SYNC"],
+              [AC_MSG_ERROR([No atomic primitives available for $host])])
+            ;;
+        s390x-*)
+            pmix_cv_asm_arch="S390X"
+            PMIX_CHECK_SYNC_BUILTINS([pmix_cv_asm_builtin="BUILTIN_SYNC"],
+              [AC_MSG_ERROR([No atomic primitives available for $host])])
+            ;;
+        sparc*-*)
+            # SPARC v9 (and above) are the only ones with 64bit support
+            # if compiling 32 bit, see if we are v9 (aka v8plus) or
+            # earlier (casa is v8+/v9).
+            if test "$ac_cv_sizeof_long" = "4" ; then
+                have_v8plus=0
+                PMIX_CHECK_SPARCV8PLUS([have_v8plus=1])
+                if test "$have_v8plus" = "0" ; then
+                    PMIX_ASM_SUPPORT_64BIT=0
+                    pmix_cv_asm_arch="SPARC"
+AC_MSG_WARN([Sparc v8 target is not supported in this release of Open MPI.])
+AC_MSG_WARN([You must specify the target architecture v8plus to compile])
+AC_MSG_WARN([Open MPI in 32 bit mode on Sparc processors (see the README).])
+AC_MSG_ERROR([Can not continue.])
+                else
+                    PMIX_ASM_SUPPORT_64BIT=1
+                    pmix_cv_asm_arch="SPARCV9_32"
+                fi
+
+            elif test "$ac_cv_sizeof_long" = "8" ; then
+                PMIX_ASM_SUPPORT_64BIT=1
+                pmix_cv_asm_arch="SPARCV9_64"
+            else
+                AC_MSG_ERROR([Could not determine Sparc word size: $ac_cv_sizeof_long])
+            fi
+            PMIX_GCC_INLINE_ASSIGN='"mov 0,%0" : "=&r"(ret)'
+            ;;
+
+        *)
+            PMIX_CHECK_SYNC_BUILTINS([pmix_cv_asm_builtin="BUILTIN_SYNC"],
+              [AC_MSG_ERROR([No atomic primitives available for $host])])
+            ;;
+        esac
+
+	if test "x$PMIX_ASM_SUPPORT_64BIT" = "x1" && test "$pmix_cv_asm_builtin" = "BUILTIN_SYNC" &&
+		test "$pmix_asm_sync_have_64bit" = "0" ; then
+	    # __sync builtins exist but do not implement 64-bit support. Fall back on inline asm.
+	    pmix_cv_asm_builtin="BUILTIN_NO"
+	fi
+
+      if test "$pmix_cv_asm_builtin" = "BUILTIN_SYNC" || test "$pmix_cv_asm_builtin" = "BUILTIN_GCC" ; then
+        AC_DEFINE([PMIX_C_GCC_INLINE_ASSEMBLY], [1],
+          [Whether C compiler supports GCC style inline assembly])
+      else
+        AC_DEFINE_UNQUOTED([PMIX_ASM_SUPPORT_64BIT],
+            [$PMIX_ASM_SUPPORT_64BIT],
+            [Whether we can do 64bit assembly operations or not.  Should not be used outside of the assembly header files])
+        AC_SUBST([PMIX_ASM_SUPPORT_64BIT])
+
+        #
+        # figure out if we need any special function start / stop code
+        #
+        case $host_os in
+        aix*)
+            pmix_asm_arch_config="aix"
+            ;;
+        *)
+            pmix_asm_arch_config="default"
+            ;;
+         esac
+
+	 pmix_cv_asm_inline_supported="no"
+         # now that we know our architecture, try to inline assemble
+         PMIX_CHECK_INLINE_C_GCC([$PMIX_GCC_INLINE_ASSIGN])
+
+         # format:
+         #   config_file-text-global-label_suffix-gsym-lsym-type-size-align_log-ppc_r_reg-64_bit-gnu_stack
+         asm_format="${pmix_asm_arch_config}"
+         asm_format="${asm_format}-${pmix_cv_asm_text}-${pmix_cv_asm_global}"
+         asm_format="${asm_format}-${pmix_cv_asm_label_suffix}-${pmix_cv_asm_gsym}"
+         asm_format="${asm_format}-${pmix_cv_asm_lsym}"
+         asm_format="${asm_format}-${pmix_cv_asm_type}-${pmix_asm_size}"
+         asm_format="${asm_format}-${pmix_asm_align_log_result}"
+         if test "$pmix_cv_asm_arch" = "POWERPC32" || test "$pmix_cv_asm_arch" = "POWERPC64" ; then
+             asm_format="${asm_format}-${pmix_cv_asm_powerpc_r_reg}"
+         else
+             asm_format="${asm_format}-1"
+         fi
+         asm_format="${asm_format}-${PMIX_ASM_SUPPORT_64BIT}"
+         pmix_cv_asm_format="${asm_format}-${pmix_cv_asm_gnu_stack}"
+         # For the Makefile, need to escape the $ as $$.  Don't display
+         # this version, but make sure the Makefile gives the right thing
+         # when regenerating the files because the base has been touched.
+         PMIX_ASSEMBLY_FORMAT=`echo "$pmix_cv_asm_format" | sed -e 's/\\\$/\\\$\\\$/'`
+
+        AC_MSG_CHECKING([for assembly format])
+        AC_MSG_RESULT([$pmix_cv_asm_format])
+        AC_DEFINE_UNQUOTED([PMIX_ASSEMBLY_FORMAT], ["$PMIX_ASSEMBLY_FORMAT"],
+                           [Format of assembly file])
+        AC_SUBST([PMIX_ASSEMBLY_FORMAT])
+      fi # if pmix_cv_asm_builtin = BUILTIN_SYNC
+
+    result="PMIX_$pmix_cv_asm_arch"
+    PMIX_ASSEMBLY_ARCH="$pmix_cv_asm_arch"
+    AC_MSG_CHECKING([for assembly architecture])
+    AC_MSG_RESULT([$pmix_cv_asm_arch])
+    AC_DEFINE_UNQUOTED([PMIX_ASSEMBLY_ARCH], [$result],
+        [Architecture type of assembly to use for atomic operations and CMA])
+    AC_SUBST([PMIX_ASSEMBLY_ARCH])
+
+    # Check for RDTSCP support
+    result=0
+    AS_IF([test "$pmix_cv_asm_arch" = "PMIX_X86_64" || test "$pmix_cv_asm_arch" = "PMIX_IA32"],
+          [AC_MSG_CHECKING([for RDTSCP assembly support])
+           AC_LANG_PUSH([C])
+           AC_TRY_RUN([[
+int main(int argc, char* argv[])
+{
+  unsigned int rax, rdx;
+  __asm__ __volatile__ ("rdtscp\n": "=a" (rax), "=d" (rdx):: "%rax", "%rdx");
+  return 0;
+}
+           ]],
+           [result=1
+            AC_MSG_RESULT([yes])],
+           [AC_MSG_RESULT([no])],
+           [#cross compile not supported
+            AC_MSG_RESULT(["no (cross compiling)"])])
+           AC_LANG_POP([C])])
+    AC_DEFINE_UNQUOTED([PMIX_ASSEMBLY_SUPPORTS_RDTSCP], [$result],
+                       [Whether we have support for RDTSCP instruction])
+
+    result="PMIX_$pmix_cv_asm_builtin"
+    PMIX_ASSEMBLY_BUILTIN="$pmix_cv_asm_builtin"
+    AC_MSG_CHECKING([for builtin atomics])
+    AC_MSG_RESULT([$pmix_cv_asm_builtin])
+    AC_DEFINE_UNQUOTED([PMIX_ASSEMBLY_BUILTIN], [$result],
+        [Whether to use builtin atomics])
+    AC_SUBST([PMIX_ASSEMBLY_BUILTIN])
+
+    PMIX_ASM_FIND_FILE
+
+    unset result asm_format
+])dnl
+
+
+dnl #################################################################
+dnl
+dnl PMIX_ASM_FIND_FILE
+dnl
+dnl
+dnl do all the evil mojo to provide a working assembly file
+dnl
+dnl #################################################################
+AC_DEFUN([PMIX_ASM_FIND_FILE], [
+    AC_REQUIRE([AC_PROG_GREP])
+    AC_REQUIRE([AC_PROG_FGREP])
+
+if test "$pmix_cv_asm_arch" != "WINDOWS" && test "$pmix_cv_asm_builtin" != "BUILTIN_SYNC" && test "$pmix_cv_asm_builtin" != "BUILTIN_GCC" && test "$pmix_cv_asm_builtin" != "BUILTIN_OSX"  && test "$pmix_cv_asm_inline_arch" = "no" ; then
+    AC_MSG_ERROR([no atomic support available. exiting])
+else
+    # On windows with VC++, atomics are done with compiler primitives
+    pmix_cv_asm_file=""
+fi
+])dnl
diff --git a/config/pmix_config_pthreads.m4 b/config/pmix_config_pthreads.m4
new file mode 100644
index 0000000..2e2f1fd
--- /dev/null
+++ b/config/pmix_config_pthreads.m4
@@ -0,0 +1,669 @@
+dnl
+dnl Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+dnl                         University Research and Technology
+dnl                         Corporation.  All rights reserved.
+dnl Copyright (c) 2004-2005 The University of Tennessee and The University
+dnl                         of Tennessee Research Foundation.  All rights
+dnl                         reserved.
+dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+dnl                         University of Stuttgart.  All rights reserved.
+dnl Copyright (c) 2004-2005 The Regents of the University of California.
+dnl                         All rights reserved.
+dnl Copyright (c) 2012      Cisco Systems, Inc.  All rights reserved.
+dnl Copyright (c) 2014-2017 Intel, Inc. All rights reserved.
+dnl Copyright (c) 2014-2016 Research Organization for Information Science
+dnl                         and Technology (RIST). All rights reserved.
+dnl $COPYRIGHT$
+dnl
+dnl Additional copyrights may follow
+dnl
+dnl $HEADER$
+dnl
+dnl PMIX_CONFIG_POSIX_THREADS()
+dnl
+dnl Configure posix threads, setting the following variables (but
+dnl  not calling AC_SUBST on them).
+
+# ********************************************************************
+#
+# Internal macros - do not call from outside PMIX_CONFIG_POSIX_THREADS
+#
+# ********************************************************************
+
+
+AC_DEFUN([PMIX_INTL_PTHREAD_TRY_LINK], [
+# BEGIN: PMIX_INTL_PTHREAD_TRY_LINK
+#
+# Make sure that we can run a small application in C or C++, which
+# ever is the current language.  Do make sure that C or C++ is the
+# current language.
+#
+# As long as this is not being run....
+# pthread_t may be anything from an int to a struct -- init with self-tid.
+#
+    AC_LINK_IFELSE([AC_LANG_SOURCE([[
+#include <pthread.h>
+
+int i = 3;
+pthread_t me, newthread;
+
+void cleanup_routine(void *foo);
+void *thread_main(void *foo);
+
+void cleanup_routine(void *foo) { i = 4; }
+void *thread_main(void *foo) { i = 2; return (void*) &i; }
+
+int main(int argc, char* argv[])
+{
+    pthread_attr_t attr;
+
+    me = pthread_self();
+    pthread_atfork(NULL, NULL, NULL);
+    pthread_attr_init(&attr);
+    pthread_cleanup_push(cleanup_routine, 0);
+    pthread_create(&newthread, &attr, thread_main, 0);
+    pthread_join(newthread, 0);
+    pthread_cleanup_pop(0);
+
+    return 0;
+}]])],
+                 [$1], [$2])
+# END: PMIX_INTL_PTHREAD_TRY_LINK
+])dnl
+
+
+AC_DEFUN([PMIX_INTL_PTHREAD_TRY_LINK_FORTRAN], [
+# BEGIN: PMIX_INTL_PTHREAD_TRY_LINK_FORTRAN
+#
+# Make sure that we can run a small application in Fortran, with
+# pthreads living in a C object file
+
+# Fortran module
+cat > conftestf.f <<EOF
+      program fpthread
+      call pthreadtest
+      end
+EOF
+
+# C module
+if test -f conftest.h; then
+    pmix_conftest_h="#include \"conftest.h\""
+else
+    pmix_conftest_h=""
+fi
+cat > conftest.c <<EOF
+#include <stdio.h>
+#include <stdlib.h>
+#include <pthread.h>
+$pmix_conftest_h
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+int i = 3;
+pthread_t me, newthread;
+
+void cleanup_routine(void *foo);
+void *thread_main(void *foo);
+void pthreadtest_f(void);
+
+void cleanup_routine(void *foo) { i = 4; }
+void *thread_main(void *foo) { i = 2; return (void*) &i; }
+
+void pthreadtest_f(void)
+{
+    pthread_attr_t attr;
+
+    me = pthread_self();
+    pthread_atfork(NULL, NULL, NULL);
+    pthread_attr_init(&attr);
+    pthread_cleanup_push(cleanup_routine, 0);
+    pthread_create(&newthread, &attr, thread_main, 0);
+    pthread_join(newthread, 0);
+    pthread_cleanup_pop(0);
+}
+
+void pthreadtest(void)
+{ pthreadtest_f(); }
+
+void pthreadtest_(void)
+{ pthreadtest_f(); }
+
+void pthreadtest__(void)
+{ pthreadtest_f(); }
+
+void PTHREADTEST(void)
+{ pthreadtest_f(); }
+
+#ifdef __cplusplus
+}
+#endif
+EOF
+
+# Try the compile
+PMIX_LOG_COMMAND(
+    [$CC $CFLAGS -I. -c conftest.c],
+    PMIX_LOG_COMMAND(
+        [$FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS],
+        [HAPPY=1],
+	[HAPPY=0]),
+    [HAPPY=0])
+
+if test "$HAPPY" = "1"; then
+   $1
+else
+    PMIX_LOG_MSG([here is the C program:], 1)
+    PMIX_LOG_FILE([conftest.c])
+    if test -f conftest.h; then
+	PMIX_LOG_MSG([here is contest.h:], 1)
+	PMIX_LOG_FILE([conftest.h])
+    fi
+    PMIX_LOG_MSG([here is the fortran program:], 1)
+    PMIX_LOG_FILE([conftestf.f])
+    $2
+fi
+
+unset HAPPY pmix_conftest_h
+rm -rf conftest*
+# END: PMIX_INTL_PTHREAD_TRY_LINK_FORTRAN
+])dnl
+
+
+# ********************************************************************
+#
+# Try to compile thread support without any special flags
+#
+# ********************************************************************
+AC_DEFUN([PMIX_INTL_POSIX_THREADS_PLAIN_C], [
+#
+# C compiler
+#
+if test "$pmix_pthread_c_success" = "0"; then
+  AC_MSG_CHECKING([if C compiler and POSIX threads work as is])
+
+  AC_LANG_PUSH(C)
+  PMIX_INTL_PTHREAD_TRY_LINK(pmix_pthread_c_success=1,
+                            pmix_pthread_c_success=0)
+  AC_LANG_POP(C)
+  if test "$pmix_pthread_c_success" = "1"; then
+    AC_MSG_RESULT([yes])
+  else
+    AC_MSG_RESULT([no])
+  fi
+fi
+])dnl
+
+
+AC_DEFUN([PMIX_INTL_POSIX_THREADS_PLAIN_CXX], [
+#
+# C++ compiler
+#
+if test "$pmix_pthread_cxx_success" = "0"; then
+  AC_MSG_CHECKING([if C++ compiler and POSIX threads work as is])
+
+  AC_LANG_PUSH(C++)
+  PMIX_INTL_PTHREAD_TRY_LINK(pmix_pthread_cxx_success=1,
+                            pmix_pthread_cxx_success=0)
+  AC_LANG_POP(C++)
+  if test "$pmix_pthread_cxx_success" = "1"; then
+    AC_MSG_RESULT([yes])
+  else
+    AC_MSG_RESULT([no])
+  fi
+fi
+])dnl
+
+
+AC_DEFUN([PMIX_INTL_POSIX_THREADS_PLAIN_FC], [
+#
+# Fortran compiler
+#
+if test "$pmix_pthread_fortran_success" = "0" && \
+   test "$OMPI_TRY_FORTRAN_BINDINGS" -gt "$OMPI_FORTRAN_NO_BINDINGS" && \
+   test $ompi_fortran_happy -eq 1; then
+  AC_MSG_CHECKING([if Fortran compiler and POSIX threads work as is])
+
+  AC_LANG_PUSH(C)
+  PMIX_INTL_PTHREAD_TRY_LINK_FORTRAN(pmix_pthread_fortran_success=1,
+                                     pmix_pthread_fortran_success=0)
+  AC_LANG_POP(C)
+  if test "$pmix_pthread_fortran_success" = "1"; then
+    AC_MSG_RESULT([yes])
+  else
+    AC_MSG_RESULT([no])
+  fi
+fi
+])dnl
+
+
+AC_DEFUN([PMIX_INTL_POSIX_THREADS_PLAIN], [
+# BEGIN: PMIX_INTL_POSIX_THREADS_PLAIN
+#
+# Check if can compile without any special flags
+# we throw -D_REENTRANT or -D_THREAD_SAFE in here, just in
+# case.  Some systems (OS X, for example) generally don't need
+# the defines, but then will on one system header here or there
+# why take chances?
+#
+
+# Only run C++ and Fortran if those compilers already configured
+AC_PROVIDE_IFELSE([AC_PROG_CC],
+                  [PMIX_INTL_POSIX_THREADS_PLAIN_C],
+                  [pmix_pthread_c_success=1])
+
+AC_PROVIDE_IFELSE([AC_PROG_CXX],
+                  [PMIX_INTL_POSIX_THREADS_PLAIN_CXX],
+                  [pmix_pthread_cxx_success=1])
+
+AC_PROVIDE_IFELSE([AC_PROG_FC],
+                  [PMIX_INTL_POSIX_THREADS_PLAIN_FC],
+                  [pmix_pthread_fortran_success=1])
+
+# End: PMIX_INTL_POSIX_THREADS_PLAIN
+])dnl
+
+
+# ********************************************************************
+#
+# Try to compile thread support with special compiler flags
+#
+# ********************************************************************
+AC_DEFUN([PMIX_INTL_POSIX_THREADS_SPECIAL_FLAGS_C], [
+#
+# C compiler
+#
+if test "$pmix_pthread_c_success" = "0"; then
+  for pf in $pflags; do
+    AC_MSG_CHECKING([if C compiler and POSIX threads work with $pf])
+    CFLAGS="$orig_CFLAGS $pf"
+    AC_LANG_PUSH(C)
+    PMIX_INTL_PTHREAD_TRY_LINK(pmix_pthread_c_success=1,
+                              pmix_pthread_c_success=0)
+    AC_LANG_POP(C)
+    if test "$pmix_pthread_c_success" = "1"; then
+      PTHREAD_CFLAGS="$pf"
+      AC_MSG_RESULT([yes])
+      break
+    else
+      PTHREAD_CFLAGS=
+      CFLAGS="$orig_CFLAGS"
+      AC_MSG_RESULT([no])
+    fi
+  done
+fi
+])
+
+
+AC_DEFUN([PMIX_INTL_POSIX_THREADS_SPECIAL_FLAGS_CXX], [
+#
+# C++ compiler
+#
+if test "$pmix_pthread_cxx_success" = "0"; then
+  for pf in $pflags; do
+    AC_MSG_CHECKING([if C++ compiler and POSIX threads work with $pf])
+    CXXFLAGS="$orig_CXXFLAGS $pf"
+    AC_LANG_PUSH(C++)
+    PMIX_INTL_PTHREAD_TRY_LINK(pmix_pthread_cxx_success=1,
+                              pmix_pthread_cxx_success=0)
+    AC_LANG_POP(C++)
+    if test "$pmix_pthread_cxx_success" = "1"; then
+      PTHREAD_CXXFLAGS="$pf"
+      AC_MSG_RESULT([yes])
+      break
+    else
+      PTHREAD_CXXFLAGS=
+      CXXFLAGS="$orig_CXXFLAGS"
+      AC_MSG_RESULT([no])
+    fi
+  done
+fi
+])
+
+
+AC_DEFUN([PMIX_INTL_POSIX_THREADS_SPECIAL_FLAGS_FC], [
+#
+# Fortran compiler
+#
+if test "$pmix_pthread_fortran_success" = "0" && \
+   test "$OMPI_TRY_FORTRAN_BINDINGS" -gt "$OMPI_FORTRAN_NO_BINDINGS" && \
+   test $ompi_fortran_happy -eq 1; then
+  for pf in $pflags; do
+    AC_MSG_CHECKING([if Fortran compiler and POSIX threads work with $pf])
+    FCFLAGS="$orig_FCFLAGS $pf"
+    AC_LANG_PUSH(C)
+    PMIX_INTL_PTHREAD_TRY_LINK_FORTRAN(pmix_pthread_fortran_success=1,
+                                       pmix_pthread_fortran_success=0)
+    AC_LANG_POP(C)
+    if test "$pmix_pthread_fortran_success" = "1"; then
+      PTHREAD_FCFLAGS="$pf"
+      AC_MSG_RESULT([yes])
+      break
+    else
+      PTHREAD_FCFLAGS=
+      FCFLAGS="$orig_FCFLAGS"
+      AC_MSG_RESULT([no])
+    fi
+  done
+fi
+])
+
+
+AC_DEFUN([PMIX_INTL_POSIX_THREADS_SPECIAL_FLAGS],[
+# Begin: PMIX_INTL_POSIX_THREADS_SPECIAL_FLAGS
+#
+# If above didn't work, try some super-special compiler flags
+# that get evaluated to the "right" things.
+#
+# -Kthread:
+# -kthread:  FreeBSD kernel threads
+# -pthread:  Modern GCC (most all platforms)
+# -pthreads: GCC on solaris
+# -mthreads:
+# -mt:       Solaris native compilers / HP-UX aCC
+#
+# Put -mt before -mthreads because HP-UX aCC will properly compile
+# with -mthreads (reading as -mt), but emit a warning about unknown
+# flags hreads.  Stupid compilers.
+
+case "${host_cpu}-${host_os}" in
+  *solaris*)
+    pflags="-pthread -pthreads -mt"
+  ;;
+  *)
+    pflags="-Kthread -kthread -pthread -pthreads -mt -mthreads"
+  ;;
+esac
+
+# Only run C++ and Fortran if those compilers already configured
+AC_PROVIDE_IFELSE([AC_PROG_CC],
+                  [PMIX_INTL_POSIX_THREADS_SPECIAL_FLAGS_C],
+                  [pmix_pthread_c_success=1])
+
+AC_PROVIDE_IFELSE([AC_PROG_CXX],
+                  [PMIX_INTL_POSIX_THREADS_SPECIAL_FLAGS_CXX],
+                  [pmix_pthread_cxx_success=1])
+
+AC_PROVIDE_IFELSE([AC_PROG_FC],
+                  [PMIX_INTL_POSIX_THREADS_SPECIAL_FLAGS_FC],
+                  [pmix_pthread_fortran_success=1])
+
+# End: PMIX_INTL_POSIX_THREADS_SPECIAL_FLAGS
+])dnl
+
+
+# ********************************************************************
+#
+# Try to compile thread support with extra libs
+#
+# ********************************************************************
+AC_DEFUN([PMIX_INTL_POSIX_THREADS_LIBS_C],[
+#
+# C compiler
+#
+if test "$pmix_pthread_c_success" = "0"; then
+  for pl in $plibs; do
+    AC_MSG_CHECKING([if C compiler and POSIX threads work with $pl])
+    case "${host_cpu}-${host-_os}" in
+      *-aix* | *-freebsd*)
+        if test "`echo $CPPFLAGS | $GREP 'D_THREAD_SAFE'`" = ""; then
+          PTHREAD_CPPFLAGS="-D_THREAD_SAFE"
+          CPPFLAGS="$CPPFLAGS $PTHREAD_CPPFLAGS"
+        fi
+      ;;
+      *)
+        if test "`echo $CPPFLAGS | $GREP 'D_REENTRANT'`" = ""; then
+          PTHREAD_CPPFLAGS="-D_REENTRANT"
+          CPPFLAGS="$CPPFLAGS $PTHREAD_CPPFLAGS"
+        fi
+      ;;
+    esac
+    LIBS="$orig_LIBS $pl"
+    AC_LANG_PUSH(C)
+    PMIX_INTL_PTHREAD_TRY_LINK(pmix_pthread_c_success=1,
+                              pmix_pthread_c_success=0)
+    AC_LANG_POP(C)
+    if test "$pmix_pthread_c_success" = "1"; then
+      PTHREAD_LIBS="$pl"
+      AC_MSG_RESULT([yes])
+    else
+      PTHREAD_CPPFLAGS=
+      CPPFLAGS="$orig_CPPFLAGS"
+      LIBS="$orig_LIBS"
+      AC_MSG_RESULT([no])
+    fi
+  done
+fi
+])dnl
+
+
+AC_DEFUN([PMIX_INTL_POSIX_THREADS_LIBS_CXX],[
+#
+# C++ compiler
+#
+if test "$pmix_pthread_cxx_success" = "0"; then
+  if test ! "$pmix_pthread_c_success" = "0" && test ! "$PTHREAD_LIBS" = "" ; then
+    AC_MSG_CHECKING([if C++ compiler and POSIX threads work with $PTHREAD_LIBS])
+    case "${host_cpu}-${host-_os}" in
+      *-aix* | *-freebsd*)
+        if test "`echo $CXXCPPFLAGS | $GREP 'D_THREAD_SAFE'`" = ""; then
+          PTHREAD_CXXCPPFLAGS="-D_THREAD_SAFE"
+          CXXCPPFLAGS="$CXXCPPFLAGS $PTHREAD_CXXCPPFLAGS"
+        fi
+      ;;
+      *)
+        if test "`echo $CXXCPPFLAGS | $GREP 'D_REENTRANT'`" = ""; then
+          PTHREAD_CXXCPPFLAGS="-D_REENTRANT"
+          CXXCPPFLAGS="$CXXCPPFLAGS $PTHREAD_CXXCPPFLAGS"
+        fi
+      ;;
+    esac
+    LIBS="$orig_LIBS $PTHREAD_LIBS"
+    AC_LANG_PUSH(C++)
+    PMIX_INTL_PTHREAD_TRY_LINK(pmix_pthread_cxx_success=1,
+                              pmix_pthread_cxx_success=0)
+    AC_LANG_POP(C++)
+    if test "$pmix_pthread_cxx_success" = "1"; then
+      AC_MSG_RESULT([yes])
+    else
+      CXXCPPFLAGS="$orig_CXXCPPFLAGS"
+      LIBS="$orig_LIBS"
+      AC_MSG_RESULT([no])
+      AC_MSG_ERROR([Can not find working threads configuration.  aborting])
+    fi
+  else
+    for pl in $plibs; do
+      AC_MSG_CHECKING([if C++ compiler and POSIX threads work with $pl])
+      case "${host_cpu}-${host-_os}" in
+        *-aix* | *-freebsd*)
+          if test "`echo $CXXCPPFLAGS | $GREP 'D_THREAD_SAFE'`" = ""; then
+            PTHREAD_CXXCPPFLAGS="-D_THREAD_SAFE"
+            CXXCPPFLAGS="$CXXCPPFLAGS $PTHREAD_CXXCPPFLAGS"
+          fi
+        ;;
+        *)
+          if test "`echo $CXXCPPFLAGS | $GREP 'D_REENTRANT'`" = ""; then
+            PTHREAD_CXXCPPFLAGS="-D_REENTRANT"
+            CXXCPPFLAGS="$CXXCPPFLAGS $PTHREAD_CXXCPPFLAGS"
+          fi
+        ;;
+      esac
+      LIBS="$orig_LIBS $pl"
+      AC_LANG_PUSH(C++)
+      PMIX_INTL_PTHREAD_TRY_LINK(pmix_pthread_cxx_success=1,
+                                pmix_pthread_cxx_success=0)
+      AC_LANG_POP(C++)
+      if test "$pmix_pthread_cxx_success" = "1"; then
+	PTHREAD_LIBS="$pl"
+        AC_MSG_RESULT([yes])
+      else
+        PTHREAD_CXXCPPFLAGS=
+        CXXCPPFLAGS="$orig_CXXCPPFLAGS"
+        LIBS="$orig_LIBS"
+        AC_MSG_RESULT([no])
+      fi
+    done
+  fi
+fi
+])dnl
+
+
+AC_DEFUN([PMIX_INTL_POSIX_THREADS_LIBS_FC],[
+#
+# Fortran compiler
+#
+if test "$pmix_pthread_fortran_success" = "0" && \
+   test "$OMPI_TRY_FORTRAN_BINDINGS" -gt "$OMPI_FORTRAN_NO_BINDINGS" && \
+   test $ompi_fortran_happy -eq 1; then
+  if test ! "$pmix_pthread_c_success" = "0" && test ! "$PTHREAD_LIBS" = "" ; then
+    AC_MSG_CHECKING([if Fortran compiler and POSIX threads work with $PTHREAD_LIBS])
+    LIBS="$orig_LIBS $PTHREAD_LIBS"
+    AC_LANG_PUSH(C)
+    PMIX_INTL_PTHREAD_TRY_LINK_FORTRAN(pmix_pthread_fortran_success=1,
+                                       pmix_pthread_fortran_success=0)
+    AC_LANG_POP(C)
+    if test "$pmix_pthread_fortran_success" = "1"; then
+      AC_MSG_RESULT([yes])
+    else
+      LIBS="$orig_LIBS"
+      AC_MSG_RESULT([no])
+      AC_MSG_ERROR([Can not find working threads configuration.  aborting])
+    fi
+  else
+    for pl in $plibs; do
+      AC_MSG_CHECKING([if Fortran compiler and POSIX threads work with $pl])
+      LIBS="$orig_LIBS $pl"
+      AC_LANG_PUSH(C)
+      PMIX_INTL_PTHREAD_TRY_LINK_FORTRAN(pmix_pthread_fortran_success=1,
+                                         pmix_pthread_fortran_success=0)
+      AC_LANG_POP(C)
+      if test "$pmix_pthread_fortran_success" = "1"; then
+	PTHREAD_LIBS="$pl"
+        AC_MSG_RESULT([yes])
+        break
+      else
+        LIBS="$orig_LIBS"
+        AC_MSG_RESULT([no])
+      fi
+    done
+  fi
+fi
+])dnl
+
+
+AC_DEFUN([PMIX_INTL_POSIX_THREADS_LIBS],[
+# Begin: PMIX_INTL_POSIX_THREADS_LIBS
+#
+# if we can't find a super-special compiler flags, try some libraries.
+# we throw -D_REENTRANT or -D_THREAD_SAFE in here, just in case.  Some
+# systems (OS X, for example) generally don't need the defines, but
+# then will on one system header here or there why take chances?
+#
+# libpthreads: AIX - must check before libpthread
+# liblthread:  LinuxThreads on FreeBSD
+# libpthread:  The usual place (like we can define usual!)
+plibs="-lpthreads -llthread -lpthread"
+
+# Only run C++ and Fortran if those compilers already configured
+AC_PROVIDE_IFELSE([AC_PROG_CC],
+                  [PMIX_INTL_POSIX_THREADS_LIBS_C],
+                  [pmix_pthread_c_success=1])
+
+AC_PROVIDE_IFELSE([AC_PROG_CXX],
+                  [PMIX_INTL_POSIX_THREADS_LIBS_CXX],
+                  [pmix_pthread_cxx_success=1])
+
+AC_PROVIDE_IFELSE([AC_PROG_FC],
+                  [PMIX_INTL_POSIX_THREADS_LIBS_FC],
+                  [pmix_pthread_fortran_success=1])
+
+# End: PMIX_INTL_POSIX_THREADS_LIBS]
+)dnl
+
+
+#********************************************************************
+#
+# External macro (aka, the real thing)
+#
+#********************************************************************
+AC_DEFUN([PMIX_CONFIG_POSIX_THREADS],[
+    AC_REQUIRE([AC_PROG_GREP])
+
+pmix_pthread_c_success=0
+pmix_pthread_cxx_success=0
+
+orig_CFLAGS="$CFLAGS"
+orig_FCFLAGS="$FCFLAGS"
+orig_CXXFLAGS="$CXXFLAGS"
+orig_CPPFLAGS="$CPPFLAGS"
+orig_CXXCPPFLAGS="$CXXCPPFLAGS"
+orig_LDFLAGS="$LDFLAGS"
+orig_LIBS="$LIBS"
+
+PTHREAD_CFLAGS=
+PTHREAD_FCFLAGS=
+PTHREAD_CXXFLAGS=
+PTHREAD_CPPFLAGS=
+PTHREAD_CXXCPPFLAGS=
+PTHREAD_LDFLAGS=
+PTHREAD_LIBS=
+
+# Try with the basics, mam.
+PMIX_INTL_POSIX_THREADS_PLAIN
+
+# Try the super-special compiler flags.
+PMIX_INTL_POSIX_THREADS_SPECIAL_FLAGS
+
+# Try the normal linking methods (that's no fun)
+PMIX_INTL_POSIX_THREADS_LIBS
+
+#
+# check to see if we can create shared memory mutexes and conditions
+#
+AC_CHECK_FUNCS([pthread_mutexattr_setpshared pthread_condattr_setpshared])
+
+#
+# check to see if we can set error checking mutexes
+#
+
+# LinuxThreads
+AC_MSG_CHECKING([for PTHREAD_MUTEX_ERRORCHECK_NP])
+AC_LINK_IFELSE(
+    [AC_LANG_PROGRAM(
+        [[#include <pthread.h>]],
+        [[pthread_mutexattr_settype(NULL, PTHREAD_MUTEX_ERRORCHECK_NP);]])],
+    [result="yes" defval=1], [result="no" defval=0])
+AC_MSG_RESULT([$result])
+AC_DEFINE_UNQUOTED([PMIX_HAVE_PTHREAD_MUTEX_ERRORCHECK_NP], [$defval],
+            [If PTHREADS implementation supports PTHREAD_MUTEX_ERRORCHECK_NP])
+
+# Mac OS X
+AC_MSG_CHECKING([for PTHREAD_MUTEX_ERRORCHECK])
+AC_LINK_IFELSE(
+    [AC_LANG_PROGRAM(
+        [[#include <pthread.h>]],
+        [[pthread_mutexattr_settype(NULL, PTHREAD_MUTEX_ERRORCHECK);]])],
+    [result="yes" defval=1], [result="no" defval=0])
+AC_MSG_RESULT([$result])
+AC_DEFINE_UNQUOTED([PMIX_HAVE_PTHREAD_MUTEX_ERRORCHECK], [$defval],
+            [If PTHREADS implementation supports PTHREAD_MUTEX_ERRORCHECK])
+
+CFLAGS="$orig_CFLAGS"
+FCFLAGS="$orig_FCFLAGS"
+CXXFLAGS="$orig_CXXFLAGS"
+CPPFLAGS="$orig_CPPFLAGS"
+CXXCPPFLAGS="$orig_CXXCPPFLAGS"
+LDFLAGS="$orig_LDFLAGS"
+LIBS="$orig_LIBS"
+
+if test "$pmix_pthread_c_success" = "1" && \
+   test "$pmix_pthread_cxx_success" = "1"; then
+  internal_useless=1
+  $1
+else
+  internal_useless=1
+  $2
+fi
+
+unset pmix_pthread_c_success pmix_pthread_fortran_success pmix_pthread_cxx_success
+unset internal_useless
+])dnl
diff --git a/config/pmix_config_subdir.m4 b/config/pmix_config_subdir.m4
new file mode 100644
index 0000000..ff60f31
--- /dev/null
+++ b/config/pmix_config_subdir.m4
@@ -0,0 +1,147 @@
+dnl -*- shell-script -*-
+dnl
+dnl Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+dnl                         University Research and Technology
+dnl                         Corporation.  All rights reserved.
+dnl Copyright (c) 2004-2005 The University of Tennessee and The University
+dnl                         of Tennessee Research Foundation.  All rights
+dnl                         reserved.
+dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+dnl                         University of Stuttgart.  All rights reserved.
+dnl Copyright (c) 2004-2005 The Regents of the University of California.
+dnl                         All rights reserved.
+dnl Copyright (c) 2012-2016 Cisco Systems, Inc.  All rights reserved.
+dnl Copyright (c) 2014      Intel, Inc. All rights reserved.
+dnl Copyright (c) 2015      Research Organization for Information Science
+dnl                         and Technology (RIST). All rights reserved.
+dnl $COPYRIGHT$
+dnl
+dnl Additional copyrights may follow
+dnl
+dnl $HEADER$
+dnl
+
+AC_DEFUN([PMIX_CONFIG_SUBDIR],[
+PMIX_VAR_SCOPE_PUSH([subdir_parent sub_configure subdir_dir subdir_srcdir subdir_cache_file subdir_args subdir_dots total_dir dir_part temp])
+
+#
+# Invoke configure in a specific subdirectory.
+#
+# $1 is the directory to invoke in
+# $2 is the list of arguments to pass
+# $3 is actions to execute upon success
+# $4 is actions to execute upon failure
+#
+subdir_dir="$1"
+subdir_args="$2"
+subdir_success="$3"
+subdir_failure="$4"
+
+#
+# Sanity checks
+#
+
+if test "$subdir_dir" != ":" && test -d $srcdir/$subdir_dir; then
+    AC_MSG_NOTICE([PMIX configuring in $subdir_dir])
+
+    #
+    # Gotta check where srcdir is for VPATH builds.  If srcdir is not
+    # ., then we need to mkdir the subdir.  Otherwise, we can just cd
+    # into it.
+    #
+
+    case $srcdir in
+    .)
+	;;
+    *)
+	{ case $subdir_dir in
+	[[\\/]]* | ?:[[\\/]]* ) total_dir=;;
+	*)                      total_dir=.;;
+	esac
+	temp=$subdir_dir
+	for dir_part in `IFS='/\\'; set X $temp; shift; echo "$[@]"`; do
+	    case $dir_part in
+	    # Skip DOS drivespec
+	    ?:) total_dir=$dir_part ;;
+	    *)  total_dir=$total_dir/$dir_part
+		test -d "$total_dir" ||
+		mkdir "$total_dir" ||
+		AC_MSG_ERROR([cannot create $subdir_dir])
+		;;
+	    esac
+	done; }
+
+	if test -d ./$subdir_dir; then :;
+	else
+	    AC_MSG_ERROR([cannot create `pwd`/$subdir_dir])
+	fi
+	;;
+    esac
+
+    #
+    # Move into the target directory
+    #
+
+    subdir_parent=`pwd`
+    cd $subdir_dir
+
+    #
+    # Make a "../" for each directory in $subdir_dir.
+    #
+
+    subdir_dots=`[echo $subdir_dir | sed 's,^\./,,;s,[^/]$,&/,;s,[^/]*/,../,g]'`
+    #
+    # Construct the --srcdir argument
+    #
+
+    case $srcdir in
+    .)
+	# In place
+	subdir_srcdir="$srcdir"
+	;;
+    [[\\/]* | ?:[\\/]*] )
+	# Absolute path
+	subdir_srcdir="$srcdir/$subdir_dir"
+	;;
+    *)
+	# Relative path
+	subdir_srcdir="$subdir_dots$srcdir/$subdir_dir"
+	;;
+    esac
+
+    #
+    # Construct the --cache-file argument
+    #
+
+    # BWB - subdir caching is a pain since we change CFLAGS and all that.
+    # Just disable it for now
+    subdir_cache_file="/dev/null"
+
+    #
+    # Invoke the configure script in the subdirectory
+    #
+
+    sub_configure="$SHELL '$subdir_srcdir/configure'"
+    AC_MSG_NOTICE([running $sub_configure $subdir_args --cache-file=$subdir_cache_file --srcdir=$subdir_srcdir --disable-option-checking])
+    eval "$sub_configure $subdir_args \
+	--cache-file=\"\$subdir_cache_file\" --srcdir=\"$subdir_srcdir\" --disable-option-checking"
+    if test "$?" = "0"; then
+	eval $subdir_success
+	AC_MSG_NOTICE([$sub_configure succeeded for $subdir_dir])
+    else
+	eval $subdir_failure
+	AC_MSG_NOTICE([$sub_configure *failed* for $subdir_dir])
+    fi
+
+    #
+    # Go back to the topdir
+    #
+
+    cd $subdir_parent
+fi
+
+#
+# Clean up
+#
+
+PMIX_VAR_SCOPE_POP])dnl
diff --git a/config/pmix_config_subdir_args.m4 b/config/pmix_config_subdir_args.m4
new file mode 100644
index 0000000..2702383
--- /dev/null
+++ b/config/pmix_config_subdir_args.m4
@@ -0,0 +1,84 @@
+dnl -*- shell-script -*-
+dnl
+dnl Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+dnl                         University Research and Technology
+dnl                         Corporation.  All rights reserved.
+dnl Copyright (c) 2004-2005 The University of Tennessee and The University
+dnl                         of Tennessee Research Foundation.  All rights
+dnl                         reserved.
+dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+dnl                         University of Stuttgart.  All rights reserved.
+dnl Copyright (c) 2004-2005 The Regents of the University of California.
+dnl                         All rights reserved.
+dnl Copyright (c) 2014-2016 Intel, Inc. All rights reserved.
+dnl Copyright (c) 2015      Cisco Systems, Inc.  All rights reserved.
+dnl $COPYRIGHT$
+dnl
+dnl Additional copyrights may follow
+dnl
+dnl $HEADER$
+dnl
+
+AC_DEFUN([PMIX_CONFIG_SUBDIR_ARGS],[
+PMIX_VAR_SCOPE_PUSH([subdirs_str subdirs_skip subdirs_args subdirs_arg])
+#
+# Invoke configure in subdirectories.
+#
+# $1 is the name of the variable to assign the output to
+#
+
+#
+# Make a list of command line args --eliminate the --srcdir and
+# --cache-file args, because we need to replace them with our own
+# values when invoking the sub-configure script. Also eliminate
+# the --with-platform as this will confuse any subdir with
+# similar options
+#
+
+subdirs_args=
+subdirs_skip=no
+
+eval "set x $ac_configure_args"
+shift
+for subdirs_arg
+do
+    if test "$subdirs_skip" = "yes"; then
+	subdirs_skip=no
+    else
+	case $subdirs_arg in
+	-cache-file | --cache-file | -cache | --cache)
+	    subdirs_skip=yes
+	    ;;
+	--config-cache | -C)
+	    ;;
+	-cache-file=* | --cache-file=*)
+	    ;;
+	-srcdir | --srcdir)
+	    subdirs_skip=yes
+	    ;;
+	-srcdir=* | --srcdir=*)
+	    ;;
+	-with-platform=* | --with-platform=*)
+	    ;;
+	*)
+	    case $subdir_arg in
+	    *\'*) subdir_arg=`echo "$subdir_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+	    esac
+	    subdirs_args="$subdirs_args '$subdirs_arg'"
+	    ;;
+	esac
+    fi
+done
+
+#
+# Assign the output
+#
+
+subdirs_str=$1=\"$subdirs_args\"
+eval "$subdirs_str"
+
+#
+# Clean up
+#
+
+PMIX_VAR_SCOPE_POP])dnl
diff --git a/config/pmix_config_threads.m4 b/config/pmix_config_threads.m4
new file mode 100644
index 0000000..541e63f
--- /dev/null
+++ b/config/pmix_config_threads.m4
@@ -0,0 +1,71 @@
+dnl
+dnl Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
+dnl                         University Research and Technology
+dnl                         Corporation.  All rights reserved.
+dnl Copyright (c) 2004-2005 The University of Tennessee and The University
+dnl                         of Tennessee Research Foundation.  All rights
+dnl                         reserved.
+dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+dnl                         University of Stuttgart.  All rights reserved.
+dnl Copyright (c) 2004-2005 The Regents of the University of California.
+dnl                         All rights reserved.
+dnl Copyright (c) 2010      Cisco Systems, Inc.  All rights reserved.
+dnl Copyright (c) 2009-2011 Oak Ridge National Labs.  All rights reserved.
+dnl Copyright (c) 2014-2017 Intel, Inc. All rights reserved.
+dnl Copyright (c) 2015      Research Organization for Information Science
+dnl                         and Technology (RIST). All rights reserved.
+dnl $COPYRIGHT$
+dnl
+dnl Additional copyrights may follow
+dnl
+dnl $HEADER$
+dnl
+
+AC_DEFUN([PMIX_CONFIG_THREADS],[
+#
+# Arguments: none
+#
+# Dependencies: None
+#
+# Modifies:
+#  none - see called tests
+#
+# configure threads
+#
+
+#
+# Check we have POSIX threads
+#
+PMIX_CONFIG_POSIX_THREADS(HAVE_POSIX_THREADS=1, HAVE_POSIX_THREADS=0)
+AC_MSG_CHECKING([for working POSIX threads package])
+if test "$HAVE_POSIX_THREADS" = "1" ; then
+  AC_MSG_RESULT([yes])
+else
+  AC_MSG_RESULT([no])
+fi
+export HAVE_POSIX_THREADS
+
+#
+# Ask what threading we want (allow posix right now)
+#
+
+if test "$HAVE_POSIX_THREADS" = "0"; then
+    AC_MSG_WARN(["*** POSIX threads are not"])
+    AC_MSG_WARN(["*** available on your system "])
+    AC_MSG_ERROR(["*** Can not continue"])
+fi
+
+THREAD_CFLAGS="$PTHREAD_CFLAGS"
+THREAD_FCFLAGS="$PTHREAD_FCFLAGS"
+THREAD_CXXFLAGS="$PTHREAD_CXXFLAGS"
+THREAD_CPPFLAGS="$PTHREAD_CPPFLAGS"
+THREAD_CXXCPPFLAGS="$PTHREAD_CXXCPPFLAGS"
+THREAD_LDFLAGS="$PTHREAD_LDFLAGS"
+THREAD_LIBS="$PTHREAD_LIBS"
+
+PMIX_CHECK_PTHREAD_PIDS
+
+AC_DEFINE_UNQUOTED([PMIX_ENABLE_MULTI_THREADS], [1],
+                   [Whether we should enable thread support within the PMIX code base])
+
+])dnl
diff --git a/config/pmix_ensure_contains_optflags.m4 b/config/pmix_ensure_contains_optflags.m4
new file mode 100644
index 0000000..68bf360
--- /dev/null
+++ b/config/pmix_ensure_contains_optflags.m4
@@ -0,0 +1,67 @@
+dnl -*- shell-script -*-
+dnl
+dnl Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+dnl                         University Research and Technology
+dnl                         Corporation.  All rights reserved.
+dnl Copyright (c) 2004-2005 The University of Tennessee and The University
+dnl                         of Tennessee Research Foundation.  All rights
+dnl                         reserved.
+dnl Copyright (c) 2004-2007 High Performance Computing Center Stuttgart,
+dnl                         University of Stuttgart.  All rights reserved.
+dnl Copyright (c) 2004-2005 The Regents of the University of California.
+dnl                         All rights reserved.
+dnl Copyright (c) 2007-2009 Sun Microsystems, Inc.  All rights reserved.
+dnl Copyright (c) 2008-2015 Cisco Systems, Inc.  All rights reserved.
+dnl Copyright (c) 2013      Intel, Inc. All rights reserved
+dnl $COPYRIGHT$
+dnl
+dnl Additional copyrights may follow
+dnl
+dnl $HEADER$
+dnl
+
+AC_DEFUN([PMIX_ENSURE_CONTAINS_OPTFLAGS],[
+
+# Modularize this setup so that sub-configure.in scripts can use this
+# same setup code.
+
+##################################
+# Optimization flags
+##################################
+
+# If the user did not specify optimization flags, add some (the value
+# from $OPTFLAGS)
+
+co_arg="$1"
+co_found=0
+for co_word in $co_arg; do
+    # See http://www.gnu.org/software/autoconf/manual/html_node/Quadrigraphs.html#Quadrigraphs
+    # for an explanation of @<:@ and @:>@ -- they m4 expand to [ and ]
+    case $co_word in
+    -g)              co_found=1 ;;
+    -g@<:@1-3@:>@)   co_found=1 ;;
+    +K@<:@0-5@:>@)   co_found=1 ;;
+    -O)              co_found=1 ;;
+    -O@<:@0-9@:>@)   co_found=1 ;;
+    -xO)             co_found=1 ;;
+    -xO@<:@0-9@:>@)  co_found=1 ;;
+    -fast)           co_found=1 ;;
+
+    # The below Sun Studio flags require or
+    # trigger -xO optimization
+    -xvector*)     co_found=1 ;;
+    -xdepend=yes)  co_found=1 ;;
+
+    esac
+done
+
+if test "$co_found" = "0"; then
+    co_result="$OPTFLAGS $co_arg"
+else
+    co_result="$co_arg"
+fi
+
+# Clean up
+
+unset co_found co_word co_arg
+])
diff --git a/config/pmix_functions.m4 b/config/pmix_functions.m4
new file mode 100644
index 0000000..e0f3a93
--- /dev/null
+++ b/config/pmix_functions.m4
@@ -0,0 +1,670 @@
+dnl -*- shell-script -*-
+dnl
+dnl Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+dnl                         University Research and Technology
+dnl                         Corporation.  All rights reserved.
+dnl Copyright (c) 2004-2005 The University of Tennessee and The University
+dnl                         of Tennessee Research Foundation.  All rights
+dnl                         reserved.
+dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+dnl                         University of Stuttgart.  All rights reserved.
+dnl Copyright (c) 2004-2005 The Regents of the University of California.
+dnl                         All rights reserved.
+dnl Copyright (c) 2007      Sun Microsystems, Inc.  All rights reserved.
+dnl Copyright (c) 2009      Oak Ridge National Labs.  All rights reserved.
+dnl Copyright (c) 2009-2016 Cisco Systems, Inc.  All rights reserved.
+dnl Copyright (c) 2013-2016 Intel, Inc.  All rights reserved.
+dnl Copyright (c) 2017      Research Organization for Information Science
+dnl                         and Technology (RIST). All rights reserved.
+dnl
+dnl $COPYRIGHT$
+dnl
+dnl Additional copyrights may follow
+dnl
+dnl $HEADER$
+dnl
+dnl Portions of this file derived from GASNet v1.12 (see "GASNet"
+dnl comments, below)
+dnl Copyright 2004,  Dan Bonachea <bonachea at cs.berkeley.edu>
+dnl
+dnl IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
+dnl DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
+dnl OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
+dnl CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+dnl
+dnl THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+dnl INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+dnl AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+dnl ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
+dnl PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+dnl
+
+AC_DEFUN([PMIX_CONFIGURE_SETUP],[
+
+# Some helper script functions.  Unfortunately, we cannot use $1 kinds
+# of arugments here because of the m4 substitution.  So we have to set
+# special variable names before invoking the function.  :-\
+
+pmix_show_title() {
+  cat <<EOF
+
+============================================================================
+== ${1}
+============================================================================
+EOF
+  PMIX_LOG_MSG([=== ${1}], 1)
+}
+
+
+pmix_show_subtitle() {
+  cat <<EOF
+
+*** ${1}
+EOF
+  PMIX_LOG_MSG([*** ${1}], 1)
+}
+
+
+pmix_show_subsubtitle() {
+  cat <<EOF
+
++++ ${1}
+EOF
+  PMIX_LOG_MSG([+++ ${1}], 1)
+}
+
+pmix_show_subsubsubtitle() {
+  cat <<EOF
+
+--- ${1}
+EOF
+  PMIX_LOG_MSG([--- ${1}], 1)
+}
+
+pmix_show_verbose() {
+  if test "$V" = "1"; then
+      cat <<EOF
++++ VERBOSE: ${1}
+EOF
+      PMIX_LOG_MSG([--- ${1}], 1)
+  fi
+}
+
+#
+# Save some stats about this build
+#
+
+PMIX_CONFIGURE_USER="`whoami`"
+PMIX_CONFIGURE_HOST="`(hostname || uname -n) 2> /dev/null | sed 1q`"
+PMIX_CONFIGURE_DATE="`date`"
+
+#
+# Save these details so that they can be used in pmix_info later
+#
+AC_SUBST(PMIX_CONFIGURE_USER)
+AC_SUBST(PMIX_CONFIGURE_HOST)
+AC_SUBST(PMIX_CONFIGURE_DATE)])dnl
+
+dnl #######################################################################
+dnl #######################################################################
+dnl #######################################################################
+
+AC_DEFUN([PMIX_BASIC_SETUP],[
+#
+# Save some stats about this build
+#
+
+PMIX_CONFIGURE_USER="`whoami`"
+PMIX_CONFIGURE_HOST="`(hostname || uname -n) 2> /dev/null | sed 1q`"
+PMIX_CONFIGURE_DATE="`date`"
+
+#
+# Make automake clean emacs ~ files for "make clean"
+#
+
+CLEANFILES="*~ .\#*"
+AC_SUBST(CLEANFILES)
+
+#
+# See if we can find an old installation of PMIX to overwrite
+#
+
+# Stupid autoconf 2.54 has a bug in AC_PREFIX_PROGRAM -- if pmix_clean
+# is not found in the path and the user did not specify --prefix,
+# we'll get a $prefix of "."
+
+pmix_prefix_save="$prefix"
+AC_PREFIX_PROGRAM(pmix_clean)
+if test "$prefix" = "."; then
+    prefix="$pmix_prefix_save"
+fi
+unset pmix_prefix_save
+
+#
+# Basic sanity checking; we can't install to a relative path
+#
+
+case "$prefix" in
+  /*/bin)
+    prefix="`dirname $prefix`"
+    echo installing to directory \"$prefix\"
+    ;;
+  /*)
+    echo installing to directory \"$prefix\"
+    ;;
+  NONE)
+    echo installing to directory \"$ac_default_prefix\"
+    ;;
+  @<:@a-zA-Z@:>@:*)
+    echo installing to directory \"$prefix\"
+    ;;
+  *)
+    AC_MSG_ERROR(prefix "$prefix" must be an absolute directory path)
+    ;;
+esac
+
+# BEGIN: Derived from GASNet
+
+# Suggestion from Paul Hargrove to disable --program-prefix and
+# friends.  Heavily influenced by GASNet 1.12 acinclude.m4
+# functionality to do the same thing (copyright listed at top of this
+# file).
+
+# echo program_prefix=$program_prefix  program_suffix=$program_suffix program_transform_name=$program_transform_name
+# undo prefix autoconf automatically adds during cross-compilation
+if test "$cross_compiling" = yes && test "$program_prefix" = "${target_alias}-" ; then
+    program_prefix=NONE
+fi
+# normalize empty prefix/suffix
+if test -z "$program_prefix" ; then
+    program_prefix=NONE
+fi
+if test -z "$program_suffix" ; then
+    program_suffix=NONE
+fi
+# undo transforms caused by empty prefix/suffix
+if expr "$program_transform_name" : 's.^..$' >/dev/null || \
+   expr "$program_transform_name" : 's.$$..$' >/dev/null || \
+   expr "$program_transform_name" : 's.$$..;s.^..$' >/dev/null ; then
+    program_transform_name="s,x,x,"
+fi
+if test "$program_prefix$program_suffix$program_transform_name" != "NONENONEs,x,x," ; then
+    AC_MSG_WARN([*** The PMIx configure script does not support --program-prefix, --program-suffix or --program-transform-name. Users are recommended to instead use --prefix with a unique directory and make symbolic links as desired for renaming.])
+    AC_MSG_ERROR([*** Cannot continue])
+fi
+
+# END: Derived from GASNet
+])dnl
+
+dnl #######################################################################
+dnl #######################################################################
+dnl #######################################################################
+
+AC_DEFUN([PMIX_LOG_MSG],[
+# 1 is the message
+# 2 is whether to put a prefix or not
+if test -n "$2"; then
+    echo "configure:__oline__: $1" >&5
+else
+    echo $1 >&5
+fi])dnl
+
+dnl #######################################################################
+dnl #######################################################################
+dnl #######################################################################
+
+AC_DEFUN([PMIX_LOG_FILE],[
+# 1 is the filename
+if test -n "$1" && test -f "$1"; then
+    cat $1 >&5
+fi])dnl
+
+dnl #######################################################################
+dnl #######################################################################
+dnl #######################################################################
+
+AC_DEFUN([PMIX_LOG_COMMAND],[
+# 1 is the command
+# 2 is actions to do if success
+# 3 is actions to do if fail
+echo "configure:__oline__: $1" >&5
+$1 1>&5 2>&1
+pmix_status=$?
+PMIX_LOG_MSG([\$? = $pmix_status], 1)
+if test "$pmix_status" = "0"; then
+    unset pmix_status
+    $2
+else
+    unset pmix_status
+    $3
+fi])dnl
+
+dnl #######################################################################
+dnl #######################################################################
+dnl #######################################################################
+
+AC_DEFUN([PMIX_UNIQ],[
+# 1 is the variable name to be uniq-ized
+pmix_name=$1
+
+# Go through each item in the variable and only keep the unique ones
+
+pmix_count=0
+for val in ${$1}; do
+    pmix_done=0
+    pmix_i=1
+    pmix_found=0
+
+    # Loop over every token we've seen so far
+
+    pmix_done="`expr $pmix_i \> $pmix_count`"
+    while test "$pmix_found" = "0" && test "$pmix_done" = "0"; do
+
+	# Have we seen this token already?  Prefix the comparison with
+	# "x" so that "-Lfoo" values won't be cause an error.
+
+	pmix_eval="expr x$val = x\$pmix_array_$pmix_i"
+	pmix_found=`eval $pmix_eval`
+
+	# Check the ending condition
+
+	pmix_done="`expr $pmix_i \>= $pmix_count`"
+
+	# Increment the counter
+
+	pmix_i="`expr $pmix_i + 1`"
+    done
+
+    # Check for special cases where we do want to allow repeated
+    # arguments (per
+    # http://www.open-mpi.org/community/lists/devel/2012/08/11362.php).
+
+    case $val in
+    -Xclang|-Xg)
+            pmix_found=0
+            pmix_i=`expr $pmix_count + 1`
+            ;;
+    esac
+
+    # If we didn't find the token, add it to the "array"
+
+    if test "$pmix_found" = "0"; then
+	pmix_eval="pmix_array_$pmix_i=$val"
+	eval $pmix_eval
+	pmix_count="`expr $pmix_count + 1`"
+    else
+	pmix_i="`expr $pmix_i - 1`"
+    fi
+done
+
+# Take all the items in the "array" and assemble them back into a
+# single variable
+
+pmix_i=1
+pmix_done="`expr $pmix_i \> $pmix_count`"
+pmix_newval=
+while test "$pmix_done" = "0"; do
+    pmix_eval="pmix_newval=\"$pmix_newval \$pmix_array_$pmix_i\""
+    eval $pmix_eval
+
+    pmix_eval="unset pmix_array_$pmix_i"
+    eval $pmix_eval
+
+    pmix_done="`expr $pmix_i \>= $pmix_count`"
+    pmix_i="`expr $pmix_i + 1`"
+done
+
+# Done; do the assignment
+
+pmix_newval="`echo $pmix_newval`"
+pmix_eval="$pmix_name=\"$pmix_newval\""
+eval $pmix_eval
+
+# Clean up
+
+unset pmix_name pmix_i pmix_done pmix_newval pmix_eval pmix_count])dnl
+
+dnl #######################################################################
+dnl #######################################################################
+dnl #######################################################################
+
+# Remove all duplicate -I, -L, and -l flags from the variable named $1
+AC_DEFUN([PMIX_FLAGS_UNIQ],[
+    # 1 is the variable name to be uniq-ized
+    pmix_name=$1
+
+    # Go through each item in the variable and only keep the unique ones
+
+    pmix_count=0
+    for val in ${$1}; do
+        pmix_done=0
+        pmix_i=1
+        pmix_found=0
+
+        # Loop over every token we've seen so far
+
+        pmix_done="`expr $pmix_i \> $pmix_count`"
+        while test "$pmix_found" = "0" && test "$pmix_done" = "0"; do
+
+            # Have we seen this token already?  Prefix the comparison
+            # with "x" so that "-Lfoo" values won't be cause an error.
+
+	    pmix_eval="expr x$val = x\$pmix_array_$pmix_i"
+	    pmix_found=`eval $pmix_eval`
+
+            # Check the ending condition
+
+	    pmix_done="`expr $pmix_i \>= $pmix_count`"
+
+            # Increment the counter
+
+	    pmix_i="`expr $pmix_i + 1`"
+        done
+
+        # Check for special cases where we do want to allow repeated
+        # arguments (per
+        # http://www.open-mpi.org/community/lists/devel/2012/08/11362.php
+        # and
+        # https://github.com/open-mpi/ompi/issues/324).
+
+        case $val in
+        -Xclang|-Xg)
+                pmix_found=0
+                pmix_i=`expr $pmix_count + 1`
+                ;;
+        -framework)
+                pmix_found=0
+                pmix_i=`expr $pmix_count + 1`
+                ;;
+        --param)
+                pmix_found=0
+                pmix_i=`expr $pmix_count + 1`
+                ;;
+        esac
+
+        # If we didn't find the token, add it to the "array"
+
+        if test "$pmix_found" = "0"; then
+	    pmix_eval="pmix_array_$pmix_i=$val"
+	    eval $pmix_eval
+	    pmix_count="`expr $pmix_count + 1`"
+        else
+	    pmix_i="`expr $pmix_i - 1`"
+        fi
+    done
+
+    # Take all the items in the "array" and assemble them back into a
+    # single variable
+
+    pmix_i=1
+    pmix_done="`expr $pmix_i \> $pmix_count`"
+    pmix_newval=
+    while test "$pmix_done" = "0"; do
+        pmix_eval="pmix_newval=\"$pmix_newval \$pmix_array_$pmix_i\""
+        eval $pmix_eval
+
+        pmix_eval="unset pmix_array_$pmix_i"
+        eval $pmix_eval
+
+        pmix_done="`expr $pmix_i \>= $pmix_count`"
+        pmix_i="`expr $pmix_i + 1`"
+    done
+
+    # Done; do the assignment
+
+    pmix_newval="`echo $pmix_newval`"
+    pmix_eval="$pmix_name=\"$pmix_newval\""
+    eval $pmix_eval
+
+    # Clean up
+
+    unset pmix_name pmix_i pmix_done pmix_newval pmix_eval pmix_count
+])dnl
+
+dnl #######################################################################
+dnl #######################################################################
+dnl #######################################################################
+
+# PMIX_APPEND_UNIQ(variable, new_argument)
+# ----------------------------------------
+# Append new_argument to variable if not already in variable.  This assumes a
+# space seperated list.
+#
+# This could probably be made more efficient :(.
+AC_DEFUN([PMIX_APPEND_UNIQ], [
+for arg in $2; do
+    pmix_found=0;
+    for val in ${$1}; do
+        if test "x$val" = "x$arg" ; then
+            pmix_found=1
+            break
+        fi
+    done
+    if test "$pmix_found" = "0" ; then
+        if test -z "$$1"; then
+            $1="$arg"
+        else
+            $1="$$1 $arg"
+        fi
+    fi
+done
+unset pmix_found
+])
+
+dnl #######################################################################
+dnl #######################################################################
+dnl #######################################################################
+
+# PMIX_FLAGS_APPEND_UNIQ(variable, new_argument)
+# ----------------------------------------------
+# Append new_argument to variable if:
+#
+# - the argument does not begin with -I, -L, or -l, or
+# - the argument begins with -I, -L, or -l, and it's not already in variable
+#
+# This macro assumes a space seperated list.
+AC_DEFUN([PMIX_FLAGS_APPEND_UNIQ], [
+    PMIX_VAR_SCOPE_PUSH([pmix_tmp pmix_append])
+
+    for arg in $2; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        AS_IF([test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"],
+              [for val in ${$1}; do
+                   AS_IF([test "x$val" = "x$arg"], [pmix_append=0])
+               done])
+        AS_IF([test "$pmix_append" = "1"],
+              [AS_IF([test -z "$$1"], [$1=$arg], [$1="$$1 $arg"])])
+    done
+
+    PMIX_VAR_SCOPE_POP
+])
+
+dnl #######################################################################
+dnl #######################################################################
+dnl #######################################################################
+
+# Macro that serves as an alternative to using `which <prog>`. It is
+# preferable to simply using `which <prog>` because backticks (`) (aka
+# backquotes) invoke a sub-shell which may source a "noisy"
+# ~/.whatever file (and we do not want the error messages to be part
+# of the assignment in foo=`which <prog>`). This macro ensures that we
+# get a sane executable value.
+AC_DEFUN([PMIX_WHICH],[
+# 1 is the variable name to do "which" on
+# 2 is the variable name to assign the return value to
+
+PMIX_VAR_SCOPE_PUSH([pmix_prog pmix_file pmix_dir pmix_sentinel])
+
+pmix_prog=$1
+
+IFS_SAVE=$IFS
+IFS="$PATH_SEPARATOR"
+for pmix_dir in $PATH; do
+    if test -x "$pmix_dir/$pmix_prog"; then
+        $2="$pmix_dir/$pmix_prog"
+        break
+    fi
+done
+IFS=$IFS_SAVE
+
+PMIX_VAR_SCOPE_POP
+])dnl
+
+dnl #######################################################################
+dnl #######################################################################
+dnl #######################################################################
+
+# Declare some variables; use PMIX_VAR_SCOPE_END to ensure that they
+# are cleaned up / undefined.
+AC_DEFUN([PMIX_VAR_SCOPE_PUSH],[
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in $1; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            AC_MSG_WARN([Found configure shell variable clash!])
+            AC_MSG_WARN([[PMIX_VAR_SCOPE_PUSH] called on "$pmix_var",])
+            AC_MSG_WARN([but it is already defined with value "$pmix_str"])
+            AC_MSG_WARN([This usually indicates an error in configure.])
+            AC_MSG_ERROR([Cannot continue])
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"$1\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+])dnl
+
+# Unset a bunch of variables that were previously set
+AC_DEFUN([PMIX_VAR_SCOPE_POP],[
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        AC_MSG_WARN([[PMIX_VAR_SCOPE_POP] popped too many PMIX configure scopes.])
+        AC_MSG_WARN([This usually indicates an error in configure.])
+        AC_MSG_ERROR([Cannot continue])
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+])dnl
+
+
+dnl #######################################################################
+dnl #######################################################################
+dnl #######################################################################
+
+#
+# PMIX_WITH_OPTION_MIN_MAX_VALUE(NAME,DEFAULT_VALUE,LOWER_BOUND,UPPER_BOUND)
+# Defines a variable PMIX_MAX_xxx, with "xxx" being specified as parameter $1 as "variable_name".
+# If not set at configure-time using --with-max-xxx, the default-value ($2) is assumed.
+# If set, value is checked against lower (value >= $3) and upper bound (value <= $4)
+#
+AC_DEFUN([PMIX_WITH_OPTION_MIN_MAX_VALUE], [
+    max_value=[$2]
+    AC_MSG_CHECKING([maximum length of ]m4_translit($1, [_], [ ]))
+    AC_ARG_WITH([max-]m4_translit($1, [_], [-]),
+        AC_HELP_STRING([--with-max-]m4_translit($1, [_], [-])[=VALUE],
+                       [maximum length of ]m4_translit($1, [_], [ ])[s.  VALUE argument has to be specified (default: [$2]).]))
+    if test ! -z "$with_max_[$1]" && test "$with_max_[$1]" != "no" ; then
+        # Ensure it's a number (hopefully an integer!), and >0
+        expr $with_max_[$1] + 1 > /dev/null 2> /dev/null
+        AS_IF([test "$?" != "0"], [happy=0],
+              [AS_IF([test $with_max_[$1] -ge $3 && test $with_max_[$1] -le $4],
+                     [happy=1], [happy=0])])
+
+        # If badness in the above tests, bail
+        AS_IF([test "$happy" = "0"],
+              [AC_MSG_RESULT([bad value ($with_max_[$1])])
+               AC_MSG_WARN([--with-max-]m4_translit($1, [_], [-])[s value must be >= $3 and <= $4])
+               AC_MSG_ERROR([Cannot continue])])
+        max_value=$with_max_[$1]
+    fi
+    AC_MSG_RESULT([$max_value])
+    AC_DEFINE_UNQUOTED([PMIX_MAX_]m4_toupper($1), $max_value,
+                       [Maximum length of ]m4_translit($1, [_], [ ])[s (default is $2)])
+    [PMIX_MAX_]m4_toupper($1)=$max_value
+    AC_SUBST([PMIX_MAX_]m4_toupper($1))
+])dnl
+
+dnl #######################################################################
+dnl #######################################################################
+dnl #######################################################################
+
+# Usage: PMIX_COMPUTE_MAX_VALUE(number_bytes, variable_to_set, action if overflow)
+# Compute maximum value of datatype of
+# number_bytes, setting the result in the second argument.  Assumes a
+# signed datatype.
+AC_DEFUN([PMIX_COMPUTE_MAX_VALUE], [
+    # This is more complicated than it really should be.  But some
+    # expr implementations (OpenBSD) have an expr with a max value of
+    # 2^31 - 1, and we sometimes want to compute the max value of a
+    # type as big or bigger than that...
+    pmix_num_bits=`expr $1 \* 8 - 1`
+    newval=1
+    value=1
+    overflow=0
+
+    while test $pmix_num_bits -ne 0 ; do
+        newval=`expr $value \* 2`
+        if test 0 -eq `expr $newval \< 0` ; then
+            # if the new value is not negative, next iteration...
+            value=$newval
+            pmix_num_bits=`expr $pmix_num_bits - 1`
+            # if this was the last iteration, subtract 1 (as signed
+            # max positive is 2^num_bits - 1).  Do this here instead
+            # of outside of the while loop because we might have
+            # already subtracted 1 by then if we're trying to find the
+            # max value of the same datatype expr uses as it's
+            # internal representation (ie, if we hit the else
+            # below...)
+            if test 0 -eq $pmix_num_bits ; then
+                value=`expr $value - 1`
+            fi
+        else
+            # if the new value is negative, we've over flowed.  First,
+            # try adding value - 1 instead of value (see if we can get
+            # to positive max of expr)
+            newval=`expr $value - 1 + $value`
+            if test 0 -eq `expr $newval \< 0` ; then
+                value=$newval
+                # Still positive, this is as high as we can go.  If
+                # pmix_num_bits is 1, we didn't actually overflow.
+                # Otherwise, we overflowed.
+                if test 1 -ne $pmix_num_bits ; then
+                    overflow=1
+                fi
+            else
+                # stil negative.  Time to give up.
+                overflow=1
+            fi
+            pmix_num_bits=0
+        fi
+    done
+
+    AS_VAR_SET([$2], [$value])
+    AS_IF([test $overflow -ne 0], [$3])
+])dnl
diff --git a/config/pmix_get_version.sh b/config/pmix_get_version.sh
new file mode 100755
index 0000000..6106af6
--- /dev/null
+++ b/config/pmix_get_version.sh
@@ -0,0 +1,161 @@
+#!/bin/sh
+#
+# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2008-2015 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2015      Intel, Inc. All rights reserved
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+
+
+# PMIX_GET_VERSION(version_file, variable_prefix)
+# -----------------------------------------------
+# parse version_file for version information, setting
+# the following shell variables:
+#
+#  prefix_VERSION
+#  prefix_BASE_VERSION
+#  prefix_MAJOR_VERSION
+#  prefix_MINOR_VERSION
+#  prefix_RELEASE_VERSION
+#  prefix_GREEK_VERSION
+#  prefix_REPO_REV
+#  prefix_TARBALL_VERSION
+#  prefix_RELEASE_DATE
+
+
+
+srcfile="$1"
+option="$2"
+
+if test -z "$srcfile"; then
+    option="--help"
+else
+
+        if test -f "$srcfile"; then
+        srcdir=`dirname $srcfile`
+        pmix_vers=`sed -n "
+    t clear
+    : clear
+    s/^major/PMIX_MAJOR_VERSION/
+    s/^minor/PMIX_MINOR_VERSION/
+    s/^release/PMIX_RELEASE_VERSION/
+    s/^greek/PMIX_GREEK_VERSION/
+    s/^repo_rev/PMIX_REPO_REV/
+    s/^tarball_version/PMIX_TARBALL_VERSION/
+    s/^date/PMIX_RELEASE_DATE/
+    t print
+    b
+    : print
+    p" < "$srcfile"`
+    eval "$pmix_vers"
+
+        PMIX_VERSION="$PMIX_MAJOR_VERSION.$PMIX_MINOR_VERSION.$PMIX_RELEASE_VERSION"
+        PMIX_VERSION="${PMIX_VERSION}${PMIX_GREEK_VERSION}"
+
+        if test "$PMIX_TARBALL_VERSION" = ""; then
+            PMIX_TARBALL_VERSION=$PMIX_VERSION
+        fi
+
+        # If repo_rev was not set in the VERSION file, then get it now
+        if test "$PMIX_REPO_REV" = ""; then
+            # See if we can find the "git" command.
+            git_happy=0
+            git --version > /dev/null 2>&1
+            if test $? -eq 0; then
+                git_happy=1
+            fi
+
+            # If we're in a git repo and we found the git command, use
+            # git describe to get the repo rev
+            if test -d "$srcdir/.git" && test $git_happy -eq 1; then
+                if test "$srcdir" != "`pwd`"; then
+                    git_save_dir=`pwd`
+                    cd $srcdir
+                    PMIX_REPO_REV=`git describe --tags --always`
+                    cd $git_save_dir
+                    unset git_save_dir
+                else
+                    PMIX_REPO_REV=`git describe --tags --always`
+                fi
+            else
+                PMIX_REPO_REV="date`date '+%Y-%m-%d'`"
+            fi
+        fi
+
+
+    fi
+
+
+    if test "$option" = ""; then
+    option="--full"
+    fi
+fi
+
+case "$option" in
+    --full|-v|--version)
+    echo $PMIX_VERSION
+    ;;
+    --major)
+    echo $PMIX_MAJOR_VERSION
+    ;;
+    --minor)
+    echo $PMIX_MINOR_VERSION
+    ;;
+    --release)
+    echo $PMIX_RELEASE_VERSION
+    ;;
+    --greek)
+    echo $PMIX_GREEK_VERSION
+    ;;
+    --repo-rev)
+    echo $PMIX_REPO_REV
+    ;;
+    --tarball)
+        echo $PMIX_TARBALL_VERSION
+        ;;
+    --release-date)
+        echo $PMIX_RELEASE_DATE
+        ;;
+    --all)
+        echo ${PMIX_VERSION} : ${PMIX_MAJOR_VERSION} : ${PMIX_MINOR_VERSION} : ${PMIX_RELEASE_VERSION} : ${PMIX_GREEK_VERSION} : ${PMIX_REPO_REV} : ${PMIX_TARBALL_VERSION}
+        ;;
+    -h|--help)
+    cat <<EOF
+$0 <srcfile> <option>
+
+<srcfile> - Text version file
+<option>  - One of:
+    --full         - Full version number
+    --major        - Major version number
+    --minor        - Minor version number
+    --release      - Release version number
+    --greek        - Greek (alpha, beta, etc) version number
+    --repo-rev     - Repository version
+    --tarball      - Show tarball filename version string
+    --all          - Show all version numbers, separated by :
+    --release-date - Show the release date
+    --help         - This message
+EOF
+        ;;
+    *)
+        echo "Unrecognized option $option.  Run $0 --help for options"
+        ;;
+esac
+
+# All done
+
+exit 0
diff --git a/config/pmix_load_platform.m4 b/config/pmix_load_platform.m4
new file mode 100644
index 0000000..53d4afb
--- /dev/null
+++ b/config/pmix_load_platform.m4
@@ -0,0 +1,81 @@
+dnl -*- shell-script -*-
+dnl
+dnl Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+dnl                         University Research and Technology
+dnl                         Corporation.  All rights reserved.
+dnl Copyright (c) 2004-2005 The University of Tennessee and The University
+dnl                         of Tennessee Research Foundation.  All rights
+dnl                         reserved.
+dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+dnl                         University of Stuttgart.  All rights reserved.
+dnl Copyright (c) 2004-2005 The Regents of the University of California.
+dnl                         All rights reserved.
+dnl Copyright (c) 2014-2015 Intel, Inc. All rights reserved.
+dnl Copyright (c) 2015      Research Organization for Information Science
+dnl                         and Technology (RIST). All rights reserved.
+dnl $COPYRIGHT$
+dnl
+dnl Additional copyrights may follow
+dnl
+dnl $HEADER$
+dnl
+
+# PMIX_LOAD_PLATFORM()
+# --------------------
+AC_DEFUN([PMIX_LOAD_PLATFORM], [
+
+    AC_ARG_WITH([platform],
+        [AC_HELP_STRING([--with-platform=FILE],
+                        [Load options for build from FILE.  Options on the
+                         command line not in FILE are used.  Options on the
+                         command line and in FILE are replaced by what is
+                         in FILE.])])
+
+    if test "$with_platform" = "yes" ; then
+        AC_MSG_ERROR([--with-platform argument must include FILE option])
+    elif test "$with_platform" = "no" ; then
+        AC_MSG_ERROR([--without-platform is not a valid argument])
+    elif test "$with_platform" != "" ; then
+        # if not an absolute path, check in contrib/platform
+        if test ! "`echo $with_platform | cut -c1`" = "/" && test ! "`echo $with_platform | cut -c2`" = ".." ; then
+            if test -r "${srcdir}/contrib/platform/$with_platform" ; then
+                with_platform="${srcdir}/contrib/platform/$with_platform"
+            fi
+        fi
+
+        # make sure file exists
+        if test ! -r "$with_platform" ; then
+            AC_MSG_ERROR([platform file $with_platform not found])
+        fi
+
+        # eval into environment
+        PMIX_LOG_MSG([Loading environment file $with_platform, with contents below])
+        PMIX_LOG_FILE([$with_platform])
+
+        # setup by getting full pathname for the platform directories
+        platform_base="`dirname $with_platform`"
+        platform_file="`basename $with_platform`"
+        # get full pathname of where we are so we can return
+        platform_savedir="`pwd`"
+        # go to where the platform file is located
+        cd "$platform_base"
+        # get the full path to this location
+        platform_file_dir=`pwd`
+
+        . ./"$platform_file"
+
+        # see if they left us a name
+        if test "$PMIX_PLATFORM_LOADED" != "" ; then
+           platform_loaded="$PMIX_PLATFORM_LOADED"
+        else
+           platform_loaded="$with_platform"
+        fi
+        echo "Loaded platform arguments for $platform_loaded"
+        PMIX_LOG_MSG([Loaded platform arguments for $platform_loaded])
+
+        # look for default mca param file
+
+        # return to where we started
+        cd "$platform_savedir"
+    fi
+])
diff --git a/config/pmix_mca.m4 b/config/pmix_mca.m4
new file mode 100644
index 0000000..262e6f4
--- /dev/null
+++ b/config/pmix_mca.m4
@@ -0,0 +1,918 @@
+dnl -*- shell-script -*-
+dnl
+dnl Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+dnl                         University Research and Technology
+dnl                         Corporation.  All rights reserved.
+dnl Copyright (c) 2004-2005 The University of Tennessee and The University
+dnl                         of Tennessee Research Foundation.  All rights
+dnl                         reserved.
+dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+dnl                         University of Stuttgart.  All rights reserved.
+dnl Copyright (c) 2004-2005 The Regents of the University of California.
+dnl                         All rights reserved.
+dnl Copyright (c) 2010-2015 Cisco Systems, Inc.  All rights reserved.
+dnl Copyright (c) 2013-2016 Intel, Inc.  All rights reserved.
+dnl $COPYRIGHT$
+dnl
+dnl Additional copyrights may follow
+dnl
+dnl $HEADER$
+dnl
+
+# PMIX_EVAL_ARG(arg)
+# ------------------
+# evaluates and returns argument
+AC_DEFUN([PMIX_EVAL_ARG], [$1])
+
+######################################################################
+#
+# PMIX_MCA
+#
+# configure the MCA (modular component architecture).  Works hand in hand
+# with PMIX's autogen.pl, requiring it's specially formatted lists
+# of frameworks, components, etc.
+#
+# USAGE:
+#   PMIX_MCA()
+#
+######################################################################
+AC_DEFUN([PMIX_MCA],[
+    dnl for PMIX_CONFIGURE_USER env variable
+    AC_REQUIRE([PMIX_CONFIGURE_SETUP])
+
+    # Find which components should be built as run-time loadable components
+    # Acceptable combinations:
+    #
+    # [default -- no option given]
+    # --enable-mca-dso
+    # --enable-mca-dso=[.+,]*COMPONENT_TYPE[.+,]*
+    # --enable-mca-dso=[.+,]*COMPONENT_TYPE-COMPONENT_NAME[.+,]*
+    # --disable-mca-dso
+    #
+    AC_ARG_ENABLE([mca-no-build],
+        [AC_HELP_STRING([--enable-mca-no-build=LIST],
+                        [Comma-separated list of <type>-<component> pairs
+                         that will not be built.  Example: "--enable-mca-no-build=maffinity,btl-portals" will disable building all maffinity components and the "portals" btl components.])])
+    AC_ARG_ENABLE(mca-dso,
+        AC_HELP_STRING([--enable-mca-dso=LIST],
+                       [Comma-separated list of types and/or
+                        type-component pairs that will be built as
+                        run-time loadable components (as opposed to
+                        statically linked in), if supported on this
+                        platform.  The default is to build all components
+                        as DSOs.]))
+    AC_ARG_ENABLE(mca-static,
+        AC_HELP_STRING([--enable-mca-static=LIST],
+                       [Comma-separated list of types and/or
+                        type-component pairs that will be built statically
+                        linked into the library.  The default (if DSOs are
+                        supported) is to build all components as DSOs.
+                        Enabling a component as static disables it
+                        building as a DSO.]))
+    AC_ARG_ENABLE(mca-direct,
+        AC_HELP_STRING([--enable-mca-direct=LIST],
+                       [Comma-separated list of type-component pairs that
+                        will be hard coded as the one component to use for
+                        a given component type, saving the (small)
+                        overhead of the component architecture.  LIST must
+                        not be empty and implies given component pairs are
+                        build as static components.]))
+
+    AC_MSG_CHECKING([which components should be disabled])
+    if test "$enable_mca_no_build" = "yes"; then
+        AC_MSG_RESULT([yes])
+        AC_MSG_ERROR([*** The enable-mca-no-build flag requires an explicit list
+*** of type-component pairs.  For example, --enable-mca-direct=pml-ob1])
+    else
+        ifs_save="$IFS"
+        IFS="${IFS}$PATH_SEPARATOR,"
+        msg=
+        for item in $enable_mca_no_build; do
+            type="`echo $item | cut -s -f1 -d-`"
+            comp="`echo $item | cut -s -f2- -d-`"
+            if test -z $type ; then
+                type=$item
+            fi
+            if test -z $comp ; then
+                str="`echo DISABLE_${type}=1 | sed s/-/_/g`"
+                eval $str
+                msg="$item $msg"
+            else
+                str="`echo DISABLE_${type}_${comp}=1 | sed s/-/_/g`"
+                eval $str
+                msg="$item $msg"
+            fi
+        done
+        IFS="$ifs_save"
+    fi
+    AC_MSG_RESULT([$msg])
+    unset msg
+
+    #
+    # First, add all the mca-direct components / types into the mca-static
+    # lists and create a list of component types that are direct compile,
+    # in the form DIRECT_[type]=[component]
+    #
+    AC_MSG_CHECKING([which components should be direct-linked into the library])
+    if test "$enable_mca_direct" = "yes" ; then
+        AC_MSG_RESULT([yes])
+        AC_MSG_ERROR([*** The enable-mca-direct flag requires an explicit list of
+*** type-component pairs.  For example, --enable-mca-direct=pml-ob1,coll-basic])
+    elif test ! -z "$enable_mca_direct" && test "$enable_mca_direct" != "" ; then
+        #
+        # we need to add this into the static list, unless the static list
+        # is everything
+        #
+        if test "$enable_mca_static" = "no" ; then
+            AC_MSG_WARN([*** Re-enabling static component support for direct call])
+            enable_mca_static="$enable_mca_direct"
+        elif test -z "$enable_mca_static" ; then
+            enable_mca_static="$enable_mca_direct"
+        elif test "$enable_mca_static" != "yes" ; then
+            enable_mca_static="$enable_mca_direct,$enable_mca_static"
+        fi
+
+        ifs_save="$IFS"
+        IFS="${IFS}$PATH_SEPARATOR,"
+        msg=
+        for item in $enable_mca_direct; do
+            type="`echo $item | cut -f1 -d-`"
+            comp="`echo $item | cut -f2- -d-`"
+            if test -z $type || test -z $comp ; then
+                AC_MSG_ERROR([*** The enable-mca-direct flag requires a
+*** list of type-component pairs.  Invalid input detected.])
+            else
+                str="`echo DIRECT_$type=$comp | sed s/-/_/g`"
+                eval $str
+                msg="$item $msg"
+            fi
+        done
+        IFS="$ifs_save"
+    fi
+    AC_MSG_RESULT([$msg])
+    unset msg
+
+    #
+    # Second, set the DSO_all and STATIC_all variables.  conflict
+    # resolution (prefer static) is done in the big loop below
+    #
+    AC_MSG_CHECKING([which components should be run-time loadable])
+    if test "$enable_static" != "no"; then
+        DSO_all=0
+        msg=none
+    elif test -z "$enable_mca_dso" || test "$enable_mca_dso" = "yes"; then
+        DSO_all=1
+        msg=all
+    elif test "$enable_mca_dso" = "no"; then
+        DSO_all=0
+        msg=none
+    else
+        DSO_all=0
+        ifs_save="$IFS"
+        IFS="${IFS}$PATH_SEPARATOR,"
+        msg=
+        for item in $enable_mca_dso; do
+            str="`echo DSO_$item=1 | sed s/-/_/g`"
+            eval $str
+            msg="$item $msg"
+        done
+        IFS="$ifs_save"
+    fi
+    AC_MSG_RESULT([$msg])
+    unset msg
+    if test "$enable_static" != "no"; then
+        AC_MSG_WARN([*** Shared libraries have been disabled (--disable-shared)])
+        AC_MSG_WARN([*** Building MCA components as DSOs automatically disabled])
+    fi
+
+    AC_MSG_CHECKING([which components should be static])
+    if test "$enable_mca_static" = "yes"; then
+        STATIC_all=1
+        msg=all
+    elif test -z "$enable_mca_static" || test "$enable_mca_static" = "no"; then
+        STATIC_all=0
+        msg=none
+    else
+        STATIC_all=0
+        ifs_save="$IFS"
+        IFS="${IFS}$PATH_SEPARATOR,"
+        msg=
+        for item in $enable_mca_static; do
+            str="`echo STATIC_$item=1 | sed s/-/_/g`"
+            eval $str
+            msg="$item $msg"
+        done
+        IFS="$ifs_save"
+    fi
+    AC_MSG_RESULT([$msg])
+    unset msg
+
+    # now configure the PMIx project.  Most
+    # of the hard stuff is in here
+    MCA_PROJECT_SUBDIRS=
+
+    # can't use a variable rename here because these need to be evaled
+    # at auto* time.
+
+    pmix_show_subtitle "Configuring MCA"
+
+    AC_MSG_CHECKING([for frameworks])
+    AC_MSG_RESULT([mca_pmix_framework_list])
+
+    # iterate through the list of frameworks.  There is something
+    # funky with m4 foreach if the list is defined, but empty.  It
+    # will call the 3rd argument once with an empty value for the
+    # first argument.  Protect against calling MCA_CONFIGURE_FRAMEWORK
+    # with an empty second argument.  Grrr....
+    # if there isn't a project list, abort
+    #
+    # Also setup two variables for Makefiles:
+    #  MCA_project_FRAMEWORKS     - list of frameworks in that project
+    #  MCA_project_FRAMEWORK_LIBS - list of libraries (or variables pointing
+    #                               to more libraries) that must be included
+    #                               in the project's main library
+    m4_ifdef([mca_pmix_framework_list], [],
+             [m4_fatal([Could not find mca_pmix_framework_list - please rerun autogen.pl])])
+
+    MCA_pmix_FRAMEWORKS=
+    MCA_pmix_FRAMEWORKS_SUBDIRS=
+    MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS=
+    MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS=
+    MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS=
+    MCA_pmix_FRAMEWORK_LIBS=
+
+    m4_foreach(mca_framework, [mca_pmix_framework_list],
+               [m4_ifval(mca_framework,
+                         [dnl common has to go up front
+                          m4_if(mca_framework, [common],
+                                [MCA_pmix_FRAMEWORKS="mca_framework $MCA_pmix_FRAMEWORKS"
+                                 MCA_pmix_FRAMEWORKS_SUBDIRS="[mca/]mca_framework $MCA_pmix_FRAMEWORKS_SUBDIRS"
+                                 MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS="[\$(MCA_pmix_]mca_framework[_ALL_SUBDIRS)] $MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS"
+                                 MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS="[\$(MCA_pmix_]mca_framework[_DSO_SUBDIRS)] $MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS"
+                                 MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS="[\$(MCA_pmix_]mca_framework[_STATIC_SUBDIRS)] $MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS"
+                                ], [
+                                 MCA_pmix_FRAMEWORKS="$MCA_pmix_FRAMEWORKS mca_framework"
+                                 MCA_pmix_FRAMEWORKS_SUBDIRS="$MCA_pmix_FRAMEWORKS_SUBDIRS [mca/]mca_framework"
+                                 MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS="$MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS [\$(MCA_pmix_]mca_framework[_ALL_SUBDIRS)]"
+                                 MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS="$MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS [\$(MCA_]pmix[_]mca_framework[_DSO_SUBDIRS)]"
+                                 MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS="$MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS [\$(MCA_pmix_]mca_framework[_STATIC_SUBDIRS)]"
+                                 MCA_pmix_FRAMEWORK_LIBS="$MCA_pmix_FRAMEWORK_LIBS [mca/]mca_framework[/libmca_]mca_framework[.la]"])
+                          MCA_pmix_FRAMEWORK_LIBS="$MCA_pmix_FRAMEWORK_LIBS [\$(MCA_pmix_]mca_framework[_STATIC_LTLIBS)]"
+                          m4_ifdef([MCA_pmix_]mca_framework[_CONFIG],
+                                   [MCA_pmix_]mca_framework[_CONFIG](mca_framework),
+                                   [MCA_CONFIGURE_FRAMEWORK(mca_framework, 1)])])])
+
+    # note that mca_wrapper_extra_* is a running list, and we take checkpoints at the end of our project
+    pmix_mca_wrapper_extra_cppflags="$mca_wrapper_extra_cppflags"
+    pmix_mca_wrapper_extra_ldflags="$mca_wrapper_extra_ldflags"
+    pmix_mca_wrapper_extra_libs="$mca_wrapper_extra_libs"
+
+    AC_SUBST(MCA_pmix_FRAMEWORKS)
+    AC_SUBST(MCA_pmix_FRAMEWORKS_SUBDIRS)
+    AC_SUBST(MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS)
+    AC_SUBST(MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS)
+    AC_SUBST(MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS)
+    AC_SUBST(MCA_pmix_FRAMEWORK_LIBS)
+
+    AC_SUBST(MCA_PROJECT_SUBDIRS)
+
+])
+
+# MCA_ORDER_COMPONENT_LIST(framework_name)
+AC_DEFUN([MCA_ORDER_COMPONENT_LIST], [
+    m4_foreach(mca_component, [mca_pmix_$1_m4_config_component_list],
+               [m4_ifval(mca_component,
+                    [m4_ifdef([MCA_pmix_]$1[_]mca_component[_PRIORITY], [],
+                         [m4_fatal([MCA_pmix_$1_]mca_component[_PRIORITY not found, but required.])])])])
+    m4_define([component_list],
+              [esyscmd([config/pmix_mca_priority_sort.pl] m4_foreach([mca_component], [mca_pmix_$1_m4_config_component_list],
+                        [m4_ifval(mca_component, [mca_component ]PMIX_EVAL_ARG([MCA_pmix_]$1[_]mca_component[_PRIORITY ]))]))])
+])
+
+AC_DEFUN([MCA_CHECK_IGNORED_PRIORITY], [
+    m4_foreach(mca_component, [mca_pmix_$1_m4_config_component_list],
+               [m4_ifval(mca_component,
+                    [m4_ifdef([MCA_pmix_]$1[_]mca_component[_PRIORITY],
+                         [m4_warn([unsupported], [MCA_pmix_]$1[_]mca_component[_PRIORITY found, but ignored.])])])])
+])
+
+
+######################################################################
+#
+# MCA_CONFIGURE_FRAMEWORK
+#
+# Configure the given framework and all components inside the
+# framework.  Assumes that the framework is located in
+# src/mca/[framework], and that all components are
+# available under the framework directory.  Will configure all
+# no-configure and builtin components, then search for components with
+# configure scripts.  Assumes that no component is marked as builtin
+# AND has a configure script.
+#
+# USAGE:
+#   MCA_CONFIGURE_FRAMEWORK(framework_name, allow_succeed)
+#
+######################################################################
+AC_DEFUN([MCA_CONFIGURE_FRAMEWORK],[
+    pmix_show_subsubtitle "Configuring MCA framework $1"
+
+    m4_ifdef([mca_pmix_$1_no_config_component_list], [],
+             [m4_fatal([Could not find mca_pmix_$1_no_config_component_list - please rerun autogen.pl])])
+    m4_ifdef([mca_pmix_$1_m4_config_component_list], [],
+             [m4_fatal([Could not find mca_pmix_$1_m4_config_component_list - please rerun autogen.pl])])
+
+    # setup for framework
+    all_components=
+    static_components=
+    dso_components=
+    static_ltlibs=
+
+    # Ensure that the directory where the #include file is to live
+    # exists.  Need to do this for VPATH builds, because the directory
+    # may not exist yet.  For the "common" type, it's not really a
+    # component, so it doesn't have a base.
+    m4_if([$1], [common], [outdir=src/mca/common], [outdir=src/mca/$1/base])
+    AS_MKDIR_P([$outdir])
+
+    # emit Makefile rule
+    AC_CONFIG_FILES([src/mca/$1/Makefile])
+
+    # remove any previously generated #include files
+    outfile_real=$outdir/static-components.h
+    outfile=$outfile_real.new
+    rm -f $outfile $outfile.struct $outfile.extern
+    touch $outfile.struct $outfile.extern
+
+    # print some nice messages about what we're about to do...
+    AC_MSG_CHECKING([for no configure components in framework $1])
+    AC_MSG_RESULT([mca_pmix_$1_no_config_component_list])
+    AC_MSG_CHECKING([for m4 configure components in framework $1])
+    AC_MSG_RESULT([mca_pmix_$1_m4_config_component_list])
+
+    # If there are components in the no configure list, but we're
+    # doing one of the "special" selection logics, abort with a
+    # reasonable message.
+    m4_if(PMIX_EVAL_ARG([MCA_pmix_$1_CONFIGURE_MODE]), [STOP_AT_FIRST],
+          [m4_ifval(mca_pmix_$1_no_config_component_list,
+                   [m4_fatal([Framework $1 using STOP_AT_FIRST but at least one component has no configure.m4])])])
+    m4_if(PMIX_EVAL_ARG([MCA_pmix_$1_CONFIGURE_MODE]), [STOP_AT_FIRST_PRIORITY],
+          [m4_ifval(mca_pmix_$1_no_config_component_list,
+                   [m4_fatal([Framework $1 using STOP_AT_FIRST_PRIORITY but at least one component has no configure.m4])])])
+    m4_if(PMIX_EVAL_ARG([MCA_pmix_$1_CONFIGURE_MODE]), [PRIORITY],
+          [m4_ifval(mca_pmix_$1_no_config_component_list,
+                   [m4_fatal([Framework $1 using PRIORITY but at least one component has no configure.m4])])])
+    # run the configure logic for the no-config components
+    m4_foreach(mca_component, [mca_pmix_$1_no_config_component_list],
+               [m4_ifval(mca_component,
+                  [MCA_CONFIGURE_NO_CONFIG_COMPONENT($1, mca_component,
+                                                     [all_components],
+                                                     [static_components],
+                                                     [dso_components],
+                                                     [static_ltlibs],
+                                                     [$2])])])
+
+    # configure components that use built-in configuration scripts
+    m4_ifdef([component_list], [m4_undefine([component_list])])
+    m4_if(PMIX_EVAL_ARG([MCA_pmix_$1_CONFIGURE_MODE]), [STOP_AT_FIRST], [MCA_ORDER_COMPONENT_LIST($1)],
+          [m4_if(PMIX_EVAL_ARG([MCA_pmix_$1_CONFIGURE_MODE]), [STOP_AT_FIRST_PRIORITY], [MCA_ORDER_COMPONENT_LIST($1)],
+                [m4_if(PMIX_EVAL_ARG([MCA_pmix_$1_CONFIGURE_MODE]), [PRIORITY], [MCA_ORDER_COMPONENT_LIST($1)],
+                       [m4_define([component_list], [mca_pmix_$1_m4_config_component_list])])])])
+
+    best_mca_component_priority=0
+    components_looking_for_succeed=$2
+    components_last_result=0
+    m4_foreach(mca_component, [component_list],
+               [m4_ifval(mca_component,
+                  [m4_if(PMIX_EVAL_ARG([MCA_pmix_$1_CONFIGURE_MODE]), [STOP_AT_FIRST_PRIORITY],
+                         [AS_IF([test $best_mca_component_priority -gt MCA_pmix_$1_]mca_component[_PRIORITY], [components_looking_for_succeed=0])])
+                   MCA_CONFIGURE_M4_CONFIG_COMPONENT($1, mca_component,
+                                                     [all_components],
+                                                     [static_components],
+                                                     [dso_components],
+                                                     [static_ltlibs],
+                                                     [$components_looking_for_succeed],
+                                                     [components_last_result=1],
+                                                     [components_last_result=0])
+                   m4_if(PMIX_EVAL_ARG([MCA_pmix_$1_CONFIGURE_MODE]), [STOP_AT_FIRST],
+                         [AS_IF([test $components_last_result -eq 1], [components_looking_for_succeed=0])])
+                   m4_if(PMIX_EVAL_ARG([MCA_pmix_$1_CONFIGURE_MODE]), [STOP_AT_FIRST_PRIORITY],
+                         [AS_IF([test $components_last_result -eq 1], [best_mca_component_priority=]PMIX_EVAL_ARG([MCA_pmix_$1_]mca_component[_PRIORITY]))])
+                   ])])
+
+    # configure components that provide their own configure script.
+    # It would be really hard to run these for "find first that
+    # works", so we don't :)
+    m4_if(PMIX_EVAL_ARG([MCA_pmix_]$1[_CONFIGURE_MODE]), [STOP_AT_FIRST], [],
+        [m4_if(PMIX_EVAL_ARG([MCA_pmix_]$1[_CONFIGURE_MODE]), [STOP_AT_FIRST_PRIORITY], [],
+             [m4_if(PMIX_EVAL_ARG([MCA_pmix_]$1[_CONFIGURE_MODE]), [PRIORITY], [],
+                 [MCA_CHECK_IGNORED_PRIORITY($1)
+                  AS_IF([test "$2" != "0"],
+                        [MCA_CONFIGURE_ALL_CONFIG_COMPONENTS($1, [all_components],
+                                               [static_components], [dso_components],
+                                               [static_ltlibs])])])])])
+
+    MCA_pmix_$1_ALL_COMPONENTS="$all_components"
+    MCA_pmix_$1_STATIC_COMPONENTS="$static_components"
+    MCA_pmix_$1_DSO_COMPONENTS="$dso_components"
+    MCA_pmix_$1_STATIC_LTLIBS="$static_ltlibs"
+
+    AC_SUBST(MCA_pmix_$1_ALL_COMPONENTS)
+    AC_SUBST(MCA_pmix_$1_STATIC_COMPONENTS)
+    AC_SUBST(MCA_pmix_$1_DSO_COMPONENTS)
+    AC_SUBST(MCA_pmix_$1_STATIC_LTLIBS)
+
+    PMIX_MCA_MAKE_DIR_LIST(MCA_pmix_$1_ALL_SUBDIRS, $1, [$all_components])
+    PMIX_MCA_MAKE_DIR_LIST(MCA_pmix_$1_STATIC_SUBDIRS, $1, [$static_components])
+    PMIX_MCA_MAKE_DIR_LIST(MCA_pmix_$1_DSO_SUBDIRS, $1, [$dso_components])
+
+    # Create the final .h file that will be included in the type's
+    # top-level glue.  This lists all the static components.  We don't
+    # need to do this for "common".
+    if test "$2" != "common"; then
+        cat > $outfile <<EOF
+/*
+ * \$HEADER\$
+ */
+#if defined(c_plusplus) || defined(__cplusplus)
+extern "C" {
+#endif
+
+`cat $outfile.extern`
+
+const pmix_mca_base_component_t *mca_$1_base_static_components[[]] = {
+`cat $outfile.struct`
+  NULL
+};
+
+#if defined(c_plusplus) || defined(__cplusplus)
+}
+#endif
+
+EOF
+        # Only replace the header file if a) it doesn't previously
+        # exist, or b) the contents are different.  Do this to not
+        # trigger recompilation of certain .c files just because the
+        # timestamp changed on $outfile_real (similar to the way AC
+        # handles AC_CONFIG_HEADER files).
+        diff $outfile $outfile_real > /dev/null 2>&1
+        if test "$?" != "0"; then
+            mv $outfile $outfile_real
+        else
+            rm -f $outfile
+        fi
+    fi
+    rm -f $outfile.struct $outfile.extern
+
+    unset all_components static_components dso_components outfile outfile_real
+])
+
+
+######################################################################
+#
+# MCA_CONFIGURE_NO_CONFIG_COMPONENT
+#
+# Configure the given framework and all components inside the framework.
+# Assumes that the framework is located in [project_name]/mca/[framework],
+# and that all components are available under the framework directory.
+# Will configure all builtin components, then search for components with
+# configure scripts.  Assumes that no component is marked as builtin
+# AND has a configure script.
+#
+# USAGE:
+#   MCA_CONFIGURE_PROJECT(framework_name, component_name
+#                         all_components_variable,
+#                         static_components_variable,
+#                         dso_components_variable,
+#                         static_ltlibs_variable,
+#                         allowed_to_succeed)
+#
+######################################################################
+AC_DEFUN([MCA_CONFIGURE_NO_CONFIG_COMPONENT],[
+    pmix_show_subsubsubtitle "MCA component $1:$2 (no configuration)"
+
+    pmix_show_verbose "PMIX_MCA_NO_CONFIG_COMPONENT: before, should_build=$7"
+    MCA_COMPONENT_BUILD_CHECK($1, $2,
+                              [should_build=$7], [should_build=0])
+    MCA_COMPONENT_COMPILE_MODE($1, $2, compile_mode)
+    pmix_show_verbose "PMIX_MCA_NO_CONFIG_COMPONENT: after, should_build=$should_build"
+
+    if test "$should_build" = "1" ; then
+        MCA_PROCESS_COMPONENT($1, $2, $3, $4, $5, $6, $compile_mode)
+    else
+        MCA_PROCESS_DEAD_COMPONENT($1, $2)
+        # add component to all component list
+        $3="$$3 $2"
+    fi
+
+    # set the AM_CONDITIONAL on how we should build
+    if test "$compile_mode" = "dso" ; then
+        BUILD_pmix_$1_$2_DSO=1
+    else
+        BUILD_pmix_$1_$2_DSO=0
+    fi
+    AM_CONDITIONAL(MCA_BUILD_pmix_$1_$2_DSO, test "$BUILD_pmix_$1_$2_DSO" = "1")
+
+    AC_CONFIG_FILES([src/mca/$1/$2/Makefile])
+
+    unset compile_mode
+])
+
+
+######################################################################
+#
+# MCA_CONFIGURE_M4_CONFIG_COMPONENT
+#
+#
+# USAGE:
+#   MCA_CONFIGURE_PROJECT(framework_name, component_name
+#                         all_components_variable,
+#                         static_components_variable,
+#                         dso_components_variable,
+#                         static_ltlibs_variable,
+#                         allowed_to_succeed,
+#                         [eval if should build],
+#                         [eval if should not build])
+#
+######################################################################
+AC_DEFUN([MCA_CONFIGURE_M4_CONFIG_COMPONENT],[
+    m4_ifdef([MCA_pmix_$1_$2_PRIORITY],
+        [pmix_show_subsubsubtitle "MCA component $1:$2 (m4 configuration macro, priority MCA_pmix_$1_$2_PRIORITY)"],
+        [pmix_show_subsubsubtitle "MCA component $1:$2 (m4 configuration macro)"])
+
+    pmix_show_verbose "PMIX_MCA_M4_CONFIG_COMPONENT: before, should_build=$7"
+    MCA_COMPONENT_BUILD_CHECK($1, $2, [should_build=$7], [should_build=0])
+    # Allow the component to override the build mode if it really wants to.
+    # It is, of course, free to end up calling MCA_COMPONENT_COMPILE_MODE
+    m4_ifdef([MCA_pmix_$1_$2_COMPILE_MODE],
+             [MCA_pmix_$1_$2_COMPILE_MODE($1, $2, compile_mode)],
+             [MCA_COMPONENT_COMPILE_MODE($1, $2, compile_mode)])
+
+    # try to configure the component
+    m4_ifdef([MCA_pmix_$1_$2_CONFIG],
+             [MCA_pmix_$1_$2_CONFIG([should_build=$should_build],
+                                  [should_build=0])],
+             [m4_fatal([MCA_pmix_$1_$2_CONFIG macro not found])])
+    pmix_show_verbose "PMIX_MCA_M4_CONFIG_COMPONENT: after, should_build=$should_build"
+
+    AS_IF([test "$should_build" = "1"],
+          [MCA_PROCESS_COMPONENT($1, $2, $3, $4, $5, $6, $compile_mode)],
+          [MCA_PROCESS_DEAD_COMPONENT($1, $2)
+           # add component to all component list
+           $3="$$3 $2"])
+
+    m4_ifdef([MCA_pmix_$1_$2_POST_CONFIG],
+             [ MCA_pmix_$1_$2_POST_CONFIG($should_build)])
+
+    # set the AM_CONDITIONAL on how we should build
+    AS_IF([test "$compile_mode" = "dso"],
+          [BUILD_pmix_$1_$2_DSO=1],
+          [BUILD_pmix_$1_$2_DSO=0])
+    AM_CONDITIONAL(MCA_BUILD_pmix_$1_$2_DSO, test "$BUILD_pmix_$1_$2_DSO" = "1")
+
+    AS_IF([test "$should_build" = "1"], [$8], [$9])
+
+    unset compile_mode
+])
+
+
+######################################################################
+#
+# MCA_CONFIGURE_ALL_CONFIG_COMPONENTS
+#
+# configure all components in the given framework that have configure
+# scripts and should be configured according to the usual rules...
+#
+# USAGE:
+#   MCA_CONFIGURE_ALL_CONFIG_COMPONENTS(framework_name,
+#                         all_components_variable,
+#                         static_components_variable,
+#                         dso_components_variable,
+#                         static_ltlibs_variable)
+#
+######################################################################
+AC_DEFUN([MCA_CONFIGURE_ALL_CONFIG_COMPONENTS],[
+    for component_path in $srcdir/src/mca/$1/* ; do
+        component="`basename $component_path`"
+        if test -d $component_path && test -x $component_path/configure ; then
+            pmix_show_subsubsubtitle "MCA component $1:$component (need to configure)"
+
+            pmix_show_verbose "PMIX_MCA_ALL_CONFIG_COMPONENTS: before, should_build=$7"
+            MCA_COMPONENT_BUILD_CHECK($1, $component,
+                                      [should_build=1], [should_build=0])
+            MCA_COMPONENT_COMPILE_MODE($1, $component, compile_mode)
+            pmix_show_verbose "PMIX_MCA_ALL_CONFIG_COMPONENTS: after, should_build=$should_build"
+
+            if test "$should_build" = "1" ; then
+                PMIX_CONFIG_SUBDIR([src/mca/$1/$component],
+                                   [$pmix_subdir_args],
+                                   [should_build=1], [should_build=0])
+                pmix_show_verbose "PMIX_MCA_ALL_CONFIG_COMPONENTS: after subdir, should_build=$should_build"
+            fi
+
+            if test "$should_build" = "1" ; then
+                # do some extra work to pass flags back from the
+                # top-level configure, the way a configure.m4
+                # component would.
+                infile="$srcdir/src/mca/$1/$2/post_configure.sh"
+                if test -f $infile; then
+
+                    # First check for the ABORT tag
+                    line="`$GREP ABORT= $infile | cut -d= -f2-`"
+                    if test -n "$line" && test "$line" != "no"; then
+                        AC_MSG_WARN([MCA component configure script told me to abort])
+                        AC_MSG_ERROR([cannot continue])
+                    fi
+
+                    m4_foreach(flags, [LDFLAGS, LIBS],
+                        [[line="`$GREP WRAPPER_EXTRA_]flags[= $infile | cut -d= -f2-`"]
+                            eval "line=$line"
+                            if test -n "$line"; then
+                                $2[_]$3[_WRAPPER_EXTRA_]flags[="$line"]
+                            fi
+                        ])dnl
+                fi
+
+                MCA_PROCESS_COMPONENT($1, $component, $2, $3, $4, $5, $compile_mode)
+            else
+                MCA_PROCESS_DEAD_COMPONENT($1, $component)
+            fi
+        fi
+    done
+])
+
+
+# MCA_COMPONENT_COMPILE_MODE(framework_name (1),
+#                            component_name (2), compile_mode_variable (3))
+# -------------------------------------------------------------------------
+# set compile_mode_variable to the compile mode for the given component
+#
+#   NOTE: component_name may not be determined until runtime....
+AC_DEFUN([MCA_COMPONENT_COMPILE_MODE],[
+    SHARED_FRAMEWORK="$DSO_$1"
+    AS_LITERAL_IF([$2],
+        [SHARED_COMPONENT="$DSO_$1_$2"],
+        [str="SHARED_COMPONENT=\$DSO_$1_$2"
+         eval $str])
+
+    STATIC_FRAMEWORK="$STATIC_$1"
+    AS_LITERAL_IF([$2],
+        [STATIC_COMPONENT="$STATIC_$1_$2"],
+        [str="STATIC_COMPONENT=\$STATIC_$1_$2"
+         eval $str])
+
+    shared_mode_override=static
+
+    # Setup for either shared or static
+    if test "$STATIC_FRAMEWORK" = "1" || \
+       test "$STATIC_COMPONENT" = "1" || \
+       test "$STATIC_all" = "1" ; then
+        $3="static"
+    elif test "$shared_mode_override" = "dso" || \
+         test "$SHARED_FRAMEWORK" = "1" || \
+         test "$SHARED_COMPONENT" = "1" || \
+         test "$DSO_all" = "1"; then
+        $3="dso"
+    else
+        $3="static"
+    fi
+
+    AC_MSG_CHECKING([for MCA component $1:$2 compile mode])
+    if test "$DIRECT_$1" = "$2" ; then
+        AC_MSG_RESULT([$$3 - direct])
+    else
+        AC_MSG_RESULT([$$3])
+    fi
+])
+
+
+# MCA_PROCESS_COMPONENT(framework_name (1), component_name (2),
+#                        all_components_variable (3), static_components_variable (4)
+#                        dso_components_variable (5), static_ltlibs_variable (6),
+#                        compile_mode_variable (7))
+#---------------------------------------------------------------------
+# Final setup work for a given component.  It should be known before
+# calling that this component can build properly (and exists)
+#
+#   NOTE: component_name may not be determined until runtime....
+AC_DEFUN([MCA_PROCESS_COMPONENT],[
+    AC_REQUIRE([AC_PROG_GREP])
+
+    # See if it dropped an output file for us to pick up some
+    # shell variables in.
+    infile="$srcdir/src/mca/$1/$2/post_configure.sh"
+
+    # Add this subdir to the mast list of all MCA component subdirs
+    $3="$$3 $2"
+
+    if test "$7" = "dso" ; then
+        $5="$$5 $2"
+    else
+        if test "$1" = "common"; then
+            # Static libraries in "common" frameworks are installed, and
+            # therefore must obey the $FRAMEWORK_LIB_PREFIX that was
+            # set.
+            $6="mca/$1/$2/lib${m4_translit([pmix], [a-z], [A-Z])_LIB_PREFIX}mca_$1_$2.la $$6"
+        else
+            # Other frameworks do not have to obey the
+            # $FRAMEWORK_LIB_PREFIX prefix.
+            $6="mca/$1/$2/libmca_$1_$2.la $$6"
+        fi
+        echo "extern const pmix_mca_base_component_t mca_$1_$2_component;" >> $outfile.extern
+        echo "  &mca_$1_$2_component, " >> $outfile.struct
+        $4="$$4 $2"
+    fi
+
+    # Output pretty results
+    AC_MSG_CHECKING([if MCA component $1:$2 can compile])
+    AC_MSG_RESULT([yes])
+
+    dnl BWB: FIX ME: We still use the post_configure.sh for frameworks that use the direct call infrastructure.
+    dnl All other uses we can ignore here, because config_components will have read it in and set all the
+    dnl proper environment variables.  At some point, we should handle the direct call stuff the same way we
+    dnl handle the headers for static components like timers in PMIx, ie, have a framework level configure.m4 that
+    dnl does the right thing
+    if test -f $infile; then
+        # check for direct call header to include.  This will be
+        # AC_SUBSTed later.
+        if test "$DIRECT_$1" = "$2" ; then
+            if test "`$GREP DIRECT_CALL_HEADER $infile`" != "" ; then
+                line="`$GREP DIRECT_CALL_HEADER $infile | cut -d= -f2-`"
+                str="MCA_pmix_$1_DIRECT_CALL_HEADER=$line"
+                eval $str
+            else
+AC_MSG_ERROR([*** $1 component $2 was supposed to be direct-called, but
+*** does not appear to support direct calling.
+*** Aborting])
+            fi
+        fi
+    else
+        # were we supposed to have found something in the
+        # post_configure.sh, but the file didn't exist?
+        if test "$DIRECT_$1" = "$2" ; then
+AC_MSG_ERROR([*** $1 component $2 was supposed to be direct-called, but
+*** does not appear to support direct calling.
+*** Aborting])
+        fi
+    fi
+
+    # if the component is building, add it's WRAPPER_EXTRA_LDFLAGS and
+    # WRAPPER_EXTRA_LIBS.  If the component doesn't specify it's
+    # WRAPPER_EXTRA_LIBS and WRAPPER_EXTRA_LDFLAGS, try using LDFLAGS and LIBS if
+    # component didn't have it's own configure script (in which case,
+    # we know it didn't set LDFLAGS and LIBS because it can't) Don't
+    # have to do this if the component is building dynamically,
+    # because it will link against these (without a dependency from
+    # libmpi.so to these flags)
+    if test "$7" = "static"; then
+        AS_LITERAL_IF([$2],
+            [m4_foreach(flags, [LDFLAGS, LIBS],
+                    [AS_IF([test "$$1_$2_WRAPPER_EXTRA_]flags[" = ""],
+                           [PMIX_FLAGS_APPEND_UNIQ([mca_wrapper_extra_]m4_tolower(flags), [$$1_$2_]flags)],
+                           [PMIX_FLAGS_APPEND_UNIQ([mca_wrapper_extra_]m4_tolower(flags), [$$1_$2_WRAPPER_EXTRA_]flags)])
+                        ])],
+            [m4_foreach(flags, [LDFLAGS, LIBS],
+                    [[str="line=\$$1_$2_WRAPPER_EXTRA_]flags["]
+                      eval "$str"
+                      PMIX_FLAGS_APPEND_UNIQ([mca_wrapper_extra_]m4_tolower(flags), [$line])])])
+    fi
+
+    # if needed, copy over WRAPPER_EXTRA_CPPFLAGS.  Since a configure script
+    # component can never be used in a STOP_AT_FIRST framework, we
+    # don't have to implement the else clause in the literal check...
+    AS_LITERAL_IF([$2],
+        [AS_IF([test "$$1_$2_WRAPPER_EXTRA_CPPFLAGS" != ""],
+           [m4_if(PMIX_EVAL_ARG([MCA_pmix_$1_CONFIGURE_MODE]), [STOP_AT_FIRST], [stop_at_first=1], [stop_at_first=0])
+            AS_IF([test "$7" = "static" && test "$stop_at_first" = "1"],
+              [AS_IF([test "$with_devel_headers" = "yes"],
+                     [PMIX_FLAGS_APPEND_UNIQ([mca_wrapper_extra_cppflags], [$$1_$2_WRAPPER_EXTRA_CPPFLAGS])])],
+              [AC_MSG_WARN([ignoring $1_$2_WRAPPER_EXTRA_CPPFLAGS ($$1_$2_WRAPPER_EXTRA_CPPFLAGS): component conditions not met])])])])
+])
+
+
+# MCA_PROCESS_DEAD_COMPONENT(framework_name (1),
+#                            component_name (2))
+# ----------------------------------------------------------------
+# Finall setup work for a component that can not be built.  Do the
+# last minute checks to make sure the user isn't doing something
+# stupid.
+#
+#   NOTE: component_name may not be determined until runtime....
+AC_DEFUN([MCA_PROCESS_DEAD_COMPONENT],[
+    AC_MSG_CHECKING([if MCA component $1:$2 can compile])
+    AC_MSG_RESULT([no])
+
+    # If this component was requested as the default for this
+    # type, then abort.
+    if test "$with_$1" = "$2" ; then
+        AC_MSG_WARN([MCA component "$2" failed to configure properly])
+        AC_MSG_WARN([This component was selected as the default])
+        AC_MSG_ERROR([Cannot continue])
+    fi
+
+    if test ! -z "$DIRECT_$1" ; then
+        if test "$DIRECT_$1" = "$2" ; then
+            AC_MSG_WARN([MCA component "$2" failed to configure properly])
+            AC_MSG_WARN([This component was selected as the default (direct call)])
+            AC_MSG_ERROR([Cannot continue])
+        fi
+    fi
+])
+
+
+# MCA_COMPONENT_BUILD_CHECK(framework_name(1),
+#                           component_name (2), action-if-build (3)
+#                           action-if-not-build (4)
+# -----------------------------------------------------------------
+# checks the standard rules of component building to see if the
+# given component should be built.
+#
+# Note: component_name may not be determined until runtime....
+AC_DEFUN([MCA_COMPONENT_BUILD_CHECK],[
+    AC_REQUIRE([AC_PROG_GREP])
+
+    component_path="$srcdir/src/mca/$1/$2"
+    want_component=0
+
+    # build if:
+    # - the component type is direct and we are that component
+    # - there is no pmix_ignore file
+    # - there is an pmix_ignore, but there is an empty pmix_unignore
+    # - there is an pmix_ignore, but username is in pmix_unignore
+    if test -d $component_path ; then
+        # decide if we want the component to be built or not.  This
+        # is spread out because some of the logic is a little complex
+        # and test's syntax isn't exactly the greatest.  We want to
+        # build the component by default.
+        want_component=1
+        if test -f $component_path/.pmix_ignore ; then
+            # If there is an pmix_ignore file, don't build
+            # the component.  Note that this decision can be
+            # overridden by the unignore logic below.
+            want_component=0
+        fi
+        if test -f $component_path/.pmix_unignore ; then
+            # if there is an empty pmix_unignore, that is
+            # equivalent to having your userid in the unignore file.
+            # If userid is in the file, unignore the ignore file.
+            if test ! -s $component_path/.pmix_unignore ; then
+                want_component=1
+            elif test ! -z "`$GREP $PMIX_CONFIGURE_USER $component_path/.pmix_unignore`" ; then
+                want_component=1
+            fi
+        fi
+        # if this component type is direct and we are not it, we don't want
+        # to be built.  Otherwise, we do want to be built.
+        if test ! -z "$DIRECT_$1" ; then
+            if test "$DIRECT_$1" = "$2" ; then
+                want_component=1
+            else
+                want_component=0
+            fi
+        fi
+    fi
+
+    # if we were explicitly disabled, don't build :)
+    AS_IF([test "$DISABLE_$1" = "1"], [want_component=0])
+    AS_LITERAL_IF([$2],
+        [AS_IF([test "$DISABLE_$1_$2" = "1"], [want_component=0])],
+        [str="DISABLED_COMPONENT_CHECK=\$DISABLE_$1_$2"
+         eval $str
+         if test "$DISABLED_COMPONENT_CHECK" = "1" ; then
+             want_component=0
+         fi])
+
+    AS_IF([test "$want_component" = "1"], [$3], [$4])
+])
+
+
+# MCA_SETUP_DIRECT_CALL(framework_name  (1))
+# -------------------------------------------------------------
+AC_DEFUN([MCA_SETUP_DIRECT_CALL],[
+    if test ! -z "$DIRECT_$1" ; then
+        MCA_pmix_$1_DIRECT_CALL_COMPONENT=$DIRECT_$1
+        MCA_pmix_$1_DIRECT_CALL=1
+    else
+        MCA_pmix_$1_DIRECT_CALL_COMPONENT=
+        MCA_pmix_$1_DIRECT_CALL=0
+    fi
+
+    AC_SUBST(MCA_pmix_$1_DIRECT_CALL_HEADER)
+    AC_DEFINE_UNQUOTED([MCA_pmix_$2_DIRECT_CALL], [$MCA_pmix_$1_DIRECT_CALL],
+            [Defined to 1 if PMIx:$1 should use direct calls instead of components])
+    AC_DEFINE_UNQUOTED([MCA_pmix_$1_DIRECT_CALL_COMPONENT], [$MCA_pmix_$1_DIRECT_CALL_COMPONENT],
+            [name of component to use for direct calls, if MCA_pmix_$1_DIRECT_CALL is 1])
+    AC_DEFINE_UNQUOTED([MCA_pmix_$1_DIRECT_CALL_HEADER],
+                       ["[$MCA_pmix_]$1[_DIRECT_CALL_HEADER]"],
+                       [Header PMIx:$1 includes to be direct called])
+])
+
+
+# PMIX_MCA_MAKE_DIR_LIST(subst'ed variable, framework, shell list)
+# -------------------------------------------------------------------------
+AC_DEFUN([PMIX_MCA_MAKE_DIR_LIST],[
+    $1=
+    for item in $3 ; do
+       $1="$$1 mca/$2/$item"
+    done
+    AC_SUBST($1)
+])
diff --git a/config/pmix_mca_priority_sort.pl b/config/pmix_mca_priority_sort.pl
new file mode 100755
index 0000000..4026e99
--- /dev/null
+++ b/config/pmix_mca_priority_sort.pl
@@ -0,0 +1,31 @@
+#!/usr/bin/env perl
+#
+# Copyright (c) 2010      Sandia National Laboratories. All rights reserved.
+#
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+my $components;
+my @result;
+
+while (@ARGV) {
+    my $component;
+    $component->{"name"} = shift(@ARGV);
+    $component->{"value"} = shift(@ARGV);
+    push(@{$components}, $component);
+}
+
+foreach my $component (sort { $b->{value} <=> $a->{value} } @{$components}) {
+    push(@result, $component->{name});
+}
+sub commify_series {
+    (@_ == 0) ? ''                                      :
+    (@_ == 1) ? $_[0]                                   :
+                join(", ", @_[0 .. ($#_-1)], "$_[-1]");
+}
+
+print commify_series(@result);
diff --git a/config/pmix_search_libs.m4 b/config/pmix_search_libs.m4
new file mode 100644
index 0000000..9d7a8af
--- /dev/null
+++ b/config/pmix_search_libs.m4
@@ -0,0 +1,34 @@
+dnl -*- shell-script -*-
+dnl
+dnl Copyright (c) 2013-2014 Cisco Systems, Inc.  All rights reserved.
+dnl Copyright (c) 2014      Intel, Inc. All rights reserved.
+dnl $COPYRIGHT$
+dnl
+dnl Additional copyrights may follow
+dnl
+dnl $HEADER$
+dnl
+
+# PMIX SEARCH_LIBS_CORE(func, list-of-libraries,
+#                       action-if-found, action-if-not-found,
+#                       other-libraries)
+#
+# Wrapper around AC SEARCH_LIBS.  If a library ends up being added to
+# $LIBS, then also add it to the wrapper LIBS list (so that it is
+# added to the link command line for the static link case).
+#
+# NOTE: COMPONENTS SHOULD NOT USE THIS MACRO!  Components should use
+# PMIX_SEARCH_LIBS_COMPONENT.  The reason why is because this macro
+# calls PMIX_WRAPPER_FLAGS_ADD -- see big comment in
+# pmix_setup_wrappers.m4 for an explanation of why this is bad).
+AC_DEFUN([PMIX_SEARCH_LIBS_CORE],[
+    AC_SEARCH_LIBS([$1], [$2],
+        [pmix_have_$1=1
+         $3],
+        [pmix_have_$1=0
+         $4], [$5])
+
+    AC_DEFINE_UNQUOTED([PMIX_HAVE_]m4_toupper($1), [$pmix_have_$1],
+         [whether $1 is found and available])
+
+])dnl
diff --git a/config/pmix_setup_cc.m4 b/config/pmix_setup_cc.m4
new file mode 100644
index 0000000..bc45f5b
--- /dev/null
+++ b/config/pmix_setup_cc.m4
@@ -0,0 +1,333 @@
+dnl -*- shell-script -*-
+dnl
+dnl Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+dnl                         University Research and Technology
+dnl                         Corporation.  All rights reserved.
+dnl Copyright (c) 2004-2006 The University of Tennessee and The University
+dnl                         of Tennessee Research Foundation.  All rights
+dnl                         reserved.
+dnl Copyright (c) 2004-2008 High Performance Computing Center Stuttgart,
+dnl                         University of Stuttgart.  All rights reserved.
+dnl Copyright (c) 2004-2006 The Regents of the University of California.
+dnl                         All rights reserved.
+dnl Copyright (c) 2007-2009 Sun Microsystems, Inc.  All rights reserved.
+dnl Copyright (c) 2008-2015 Cisco Systems, Inc.  All rights reserved.
+dnl Copyright (c) 2012-2017 Los Alamos National Security, LLC. All rights
+dnl                         reserved.
+dnl Copyright (c) 2015      Research Organization for Information Science
+dnl                         and Technology (RIST). All rights reserved.
+dnl Copyright (c) 2015-2016 Intel, Inc.  All rights reserved.
+dnl $COPYRIGHT$
+dnl
+dnl Additional copyrights may follow
+dnl
+dnl $HEADER$
+dnl
+
+# PMIX_SETUP_CC()
+# ---------------
+# Do everything required to setup the C compiler.  Safe to AC_REQUIRE
+# this macro.
+AC_DEFUN([PMIX_SETUP_CC],[
+    # AM_PROG_CC_C_O AC_REQUIREs AC_PROG_CC, so we have to be a little
+    # careful about ordering here, and AC_REQUIRE these things so that
+    # they get stamped out in the right order.
+
+    AC_REQUIRE([_PMIX_START_SETUP_CC])
+    AC_REQUIRE([_PMIX_PROG_CC])
+    AC_REQUIRE([AM_PROG_CC_C_O])
+
+    # We require a C99 compiant compiler
+    # The result of AC_PROG_CC_C99 is stored in ac_cv_prog_cc_c99
+    if test "x$ac_cv_prog_cc_c99" = xno ; then
+        AC_MSG_WARN([PMIx requires a C99 compiler])
+        AC_MSG_ERROR([Aborting.])
+    fi
+
+
+    PMIX_C_COMPILER_VENDOR([pmix_c_vendor])
+
+    # Check for standard headers, needed here because needed before
+    # the types checks.
+    AC_HEADER_STDC
+
+    # GNU C and autotools are inconsistent about whether this is
+    # defined so let's make it true everywhere for now...  However, IBM
+    # XL compilers on PPC Linux behave really badly when compiled with
+    # _GNU_SOURCE defined, so don't define it in that situation.
+    #
+    # Don't use AC_GNU_SOURCE because it requires that no compiler
+    # tests are done before setting it, and we need to at least do
+    # enough tests to figure out if we're using XL or not.
+    AS_IF([test "$pmix_cv_c_compiler_vendor" != "ibm"],
+          [AH_VERBATIM([_GNU_SOURCE],
+                       [/* Enable GNU extensions on systems that have them.  */
+#ifndef _GNU_SOURCE
+# undef _GNU_SOURCE
+#endif])
+           AC_DEFINE([_GNU_SOURCE])])
+
+    # Do we want debugging?
+    if test "$WANT_DEBUG" = "1" && test "$enable_debug_symbols" != "no" ; then
+        CFLAGS="$CFLAGS -g"
+
+        PMIX_FLAGS_UNIQ(CFLAGS)
+        AC_MSG_WARN([-g has been added to CFLAGS (--enable-debug)])
+    fi
+
+    # These flags are generally gcc-specific; even the
+    # gcc-impersonating compilers won't accept them.
+    PMIX_CFLAGS_BEFORE_PICKY="$CFLAGS"
+
+    if test $WANT_PICKY_COMPILER -eq 1; then
+        CFLAGS_orig=$CFLAGS
+        add=
+
+        # These flags are likely GCC-specific (or, more specifically,
+        # we don't have general tests for each one, and we know they
+        # work with all versions of GCC that we have used throughout
+        # the years, so we'll keep them limited just to GCC).
+        if test "$pmix_c_vendor" = "gnu" ; then
+            add="$add -Wall -Wundef -Wno-long-long -Wsign-compare"
+            add="$add -Wmissing-prototypes -Wstrict-prototypes"
+            add="$add -Wcomment -pedantic"
+        fi
+
+        # see if -Wno-long-double works...
+        # Starting with GCC-4.4, the compiler complains about not
+        # knowing -Wno-long-double, only if -Wstrict-prototypes is set, too.
+        #
+        # Actually, this is not real fix, as GCC will pass on any -Wno- flag,
+        # have fun with the warning: -Wno-britney
+        CFLAGS="$CFLAGS_orig $add -Wno-long-double -Wstrict-prototypes"
+
+        AC_CACHE_CHECK([if $CC supports -Wno-long-double],
+            [pmix_cv_cc_wno_long_double],
+            [AC_TRY_COMPILE([], [],
+                [
+                 dnl So -Wno-long-double did not produce any errors...
+                 dnl We will try to extract a warning regarding
+                 dnl unrecognized or ignored options
+                 AC_TRY_COMPILE([], [long double test;],
+                     [
+                      pmix_cv_cc_wno_long_double="yes"
+                      if test -s conftest.err ; then
+                          dnl Yes, it should be "ignor", in order to catch ignoring and ignore
+                          for i in unknown invalid ignor unrecognized ; do
+                              $GREP -iq $i conftest.err
+                              if test "$?" = "0" ; then
+                                  pmix_cv_cc_wno_long_double="no"
+                                  break;
+                              fi
+                          done
+                      fi
+                     ],
+                     [pmix_cv_cc_wno_long_double="no"])],
+                [pmix_cv_cc_wno_long_double="no"])
+            ])
+
+        if test "$pmix_cv_cc_wno_long_double" = "yes" ; then
+            add="$add -Wno-long-double"
+        fi
+
+        # Per above, we know that this flag works with GCC / haven't
+        # really tested it elsewhere.
+        if test "$pmix_c_vendor" = "gnu" ; then
+            add="$add -Werror-implicit-function-declaration "
+        fi
+
+        CFLAGS="$CFLAGS_orig $add"
+        PMIX_FLAGS_UNIQ(CFLAGS)
+        AC_MSG_WARN([$add has been added to CFLAGS (--enable-picky)])
+        unset add
+    fi
+
+    # See if this version of gcc allows -finline-functions and/or
+    # -fno-strict-aliasing.  Even check the gcc-impersonating compilers.
+    if test "$GCC" = "yes"; then
+        CFLAGS_orig="$CFLAGS"
+
+        # Note: Some versions of clang (at least >= 3.5 -- perhaps
+        # older versions, too?) will *warn* about -finline-functions,
+        # but still allow it.  This is very annoying, so check for
+        # that warning, too.  The clang warning looks like this:
+        # clang: warning: optimization flag '-finline-functions' is not supported
+        # clang: warning: argument unused during compilation: '-finline-functions'
+        CFLAGS="$CFLAGS_orig -finline-functions"
+        add=
+        AC_CACHE_CHECK([if $CC supports -finline-functions],
+                   [pmix_cv_cc_finline_functions],
+                   [AC_TRY_COMPILE([], [],
+                                   [pmix_cv_cc_finline_functions="yes"
+                                    if test -s conftest.err ; then
+                                        for i in unused 'not supported' ; do
+                                            if $GREP -iq "$i" conftest.err; then
+                                                pmix_cv_cc_finline_functions="no"
+                                                break;
+                                            fi
+                                        done
+                                    fi
+                                   ],
+                                   [pmix_cv_cc_finline_functions="no"])])
+        if test "$pmix_cv_cc_finline_functions" = "yes" ; then
+            add=" -finline-functions"
+        fi
+        CFLAGS="$CFLAGS_orig$add"
+
+        CFLAGS_orig="$CFLAGS"
+        CFLAGS="$CFLAGS_orig -fno-strict-aliasing"
+        add=
+        AC_CACHE_CHECK([if $CC supports -fno-strict-aliasing],
+                   [pmix_cv_cc_fno_strict_aliasing],
+                   [AC_TRY_COMPILE([], [],
+                                   [pmix_cv_cc_fno_strict_aliasing="yes"],
+                                   [pmix_cv_cc_fno_strict_aliasing="no"])])
+        if test "$pmix_cv_cc_fno_strict_aliasing" = "yes" ; then
+            add=" -fno-strict-aliasing"
+        fi
+        CFLAGS="$CFLAGS_orig$add"
+
+        PMIX_FLAGS_UNIQ(CFLAGS)
+        AC_MSG_WARN([$add has been added to CFLAGS])
+        unset add
+    fi
+
+    # Try to enable restrict keyword
+    RESTRICT_CFLAGS=
+    case "$pmix_c_vendor" in
+        intel)
+            RESTRICT_CFLAGS="-restrict"
+        ;;
+        sgi)
+            RESTRICT_CFLAGS="-LANG:restrict=ON"
+        ;;
+    esac
+    if test ! -z "$RESTRICT_CFLAGS" ; then
+        CFLAGS_orig="$CFLAGS"
+        CFLAGS="$CFLAGS_orig $RESTRICT_CFLAGS"
+        add=
+        AC_CACHE_CHECK([if $CC supports $RESTRICT_CFLAGS],
+                   [pmix_cv_cc_restrict_cflags],
+                   [AC_TRY_COMPILE([], [],
+                                   [pmix_cv_cc_restrict_cflags="yes"],
+                                   [pmix_cv_cc_restrict_cflags="no"])])
+        if test "$pmix_cv_cc_restrict_cflags" = "yes" ; then
+            add=" $RESTRICT_CFLAGS"
+        fi
+
+        CFLAGS="${CFLAGS_orig}${add}"
+        PMIX_FLAGS_UNIQ([CFLAGS])
+        if test "$add" != "" ; then
+            AC_MSG_WARN([$add has been added to CFLAGS])
+        fi
+        unset add
+    fi
+
+    # see if the C compiler supports __builtin_expect
+    AC_CACHE_CHECK([if $CC supports __builtin_expect],
+        [pmix_cv_cc_supports___builtin_expect],
+        [AC_TRY_LINK([],
+          [void *ptr = (void*) 0;
+           if (__builtin_expect (ptr != (void*) 0, 1)) return 0;],
+          [pmix_cv_cc_supports___builtin_expect="yes"],
+          [pmix_cv_cc_supports___builtin_expect="no"])])
+    if test "$pmix_cv_cc_supports___builtin_expect" = "yes" ; then
+        have_cc_builtin_expect=1
+    else
+        have_cc_builtin_expect=0
+    fi
+    AC_DEFINE_UNQUOTED([PMIX_C_HAVE_BUILTIN_EXPECT], [$have_cc_builtin_expect],
+        [Whether C compiler supports __builtin_expect])
+
+    # see if the C compiler supports __builtin_prefetch
+    AC_CACHE_CHECK([if $CC supports __builtin_prefetch],
+        [pmix_cv_cc_supports___builtin_prefetch],
+        [AC_TRY_LINK([],
+          [int ptr;
+           __builtin_prefetch(&ptr,0,0);],
+          [pmix_cv_cc_supports___builtin_prefetch="yes"],
+          [pmix_cv_cc_supports___builtin_prefetch="no"])])
+    if test "$pmix_cv_cc_supports___builtin_prefetch" = "yes" ; then
+        have_cc_builtin_prefetch=1
+    else
+        have_cc_builtin_prefetch=0
+    fi
+    AC_DEFINE_UNQUOTED([PMIX_C_HAVE_BUILTIN_PREFETCH], [$have_cc_builtin_prefetch],
+        [Whether C compiler supports __builtin_prefetch])
+
+    # see if the C compiler supports __builtin_clz
+    AC_CACHE_CHECK([if $CC supports __builtin_clz],
+        [pmix_cv_cc_supports___builtin_clz],
+        [AC_TRY_LINK([],
+            [int value = 0xffff; /* we know we have 16 bits set */
+             if ((8*sizeof(int)-16) != __builtin_clz(value)) return 0;],
+            [pmix_cv_cc_supports___builtin_clz="yes"],
+            [pmix_cv_cc_supports___builtin_clz="no"])])
+    if test "$pmix_cv_cc_supports___builtin_clz" = "yes" ; then
+        have_cc_builtin_clz=1
+    else
+        have_cc_builtin_clz=0
+    fi
+    AC_DEFINE_UNQUOTED([PMIX_C_HAVE_BUILTIN_CLZ], [$have_cc_builtin_clz],
+        [Whether C compiler supports __builtin_clz])
+
+    # Preload the optflags for the case where the user didn't specify
+    # any.  If we're using GNU compilers, use -O3 (since it GNU
+    # doesn't require all compilation units to be compiled with the
+    # same level of optimization -- selecting a high level of
+    # optimization is not prohibitive).  If we're using anything else,
+    # be conservative and just use -O.
+    #
+    # Note: gcc-impersonating compilers accept -O3
+    if test "$WANT_DEBUG" = "1"; then
+        OPTFLAGS=
+    else
+        if test "$GCC" = yes; then
+            OPTFLAGS="-O3"
+        else
+            OPTFLAGS="-O"
+        fi
+    fi
+
+    PMIX_ENSURE_CONTAINS_OPTFLAGS("$PMIX_CFLAGS_BEFORE_PICKY")
+    PMIX_CFLAGS_BEFORE_PICKY="$co_result"
+
+    AC_MSG_CHECKING([for C optimization flags])
+    PMIX_ENSURE_CONTAINS_OPTFLAGS(["$CFLAGS"])
+    AC_MSG_RESULT([$co_result])
+    CFLAGS="$co_result"
+
+    ##################################
+    # C compiler characteristics
+    ##################################
+    # Does the compiler support "ident"-like constructs?
+    PMIX_CHECK_IDENT([CC], [CFLAGS], [c], [C])
+
+])
+
+
+AC_DEFUN([_PMIX_START_SETUP_CC],[
+    pmix_show_subtitle "C compiler and preprocessor"
+
+    # $%@#!@#% AIX!!  This has to be called before anything invokes the C
+    # compiler.
+    dnl AC_AIX
+])
+
+
+AC_DEFUN([_PMIX_PROG_CC],[
+    #
+    # Check for the compiler
+    #
+    PMIX_VAR_SCOPE_PUSH([pmix_cflags_save dummy pmix_cc_arvgv0])
+    pmix_cflags_save="$CFLAGS"
+    AC_PROG_CC_C99
+    BASECC="`basename $CC`"
+    CFLAGS="$pmix_cflags_save"
+    AC_DEFINE_UNQUOTED(PMIX_CC, "$CC", [PMIx underlying C compiler])
+    set dummy $CC
+    pmix_cc_argv0=[$]2
+    PMIX_WHICH([$pmix_cc_argv0], [PMIX_CC_ABSOLUTE])
+    AC_SUBST(PMIX_CC_ABSOLUTE)
+    PMIX_VAR_SCOPE_POP
+])
diff --git a/config/pmix_setup_libevent.m4 b/config/pmix_setup_libevent.m4
new file mode 100644
index 0000000..7643863
--- /dev/null
+++ b/config/pmix_setup_libevent.m4
@@ -0,0 +1,122 @@
+# -*- shell-script -*-
+#
+# Copyright (c) 2009-2015 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2013      Los Alamos National Security, LLC.  All rights reserved.
+# Copyright (c) 2013-2017 Intel, Inc. All rights reserved.
+# Copyright (c) 2017      Research Organization for Information Science
+#                         and Technology (RIST). All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# MCA_libevent_CONFIG([action-if-found], [action-if-not-found])
+# --------------------------------------------------------------------
+AC_DEFUN([PMIX_LIBEVENT_CONFIG],[
+    AC_ARG_WITH([libevent-header],
+                [AC_HELP_STRING([--with-libevent-header=HEADER],
+                                [The value that should be included in C files to include event.h])])
+
+    AC_ARG_ENABLE([embedded-libevent],
+                  [AC_HELP_STRING([--enable-embedded-libevent],
+                                  [Enable use of locally embedded libevent])])
+
+    AS_IF([test "$enable_embedded_libevent" = "yes"],
+          [_PMIX_LIBEVENT_EMBEDDED_MODE],
+          [_PMIX_LIBEVENT_EXTERNAL])
+
+    AC_MSG_CHECKING([libevent header])
+    AC_DEFINE_UNQUOTED([PMIX_EVENT_HEADER], [$PMIX_EVENT_HEADER],
+                       [Location of event.h])
+    AC_MSG_RESULT([$PMIX_EVENT_HEADER])
+    AC_MSG_CHECKING([libevent2/thread header])
+    AC_DEFINE_UNQUOTED([PMIX_EVENT2_THREAD_HEADER], [$PMIX_EVENT2_THREAD_HEADER],
+                       [Location of event2/thread.h])
+    AC_MSG_RESULT([$PMIX_EVENT2_THREAD_HEADER])
+])
+
+AC_DEFUN([_PMIX_LIBEVENT_EMBEDDED_MODE],[
+    AC_MSG_CHECKING([for libevent])
+    AC_MSG_RESULT([assumed available (embedded mode)])
+
+    AS_IF([test -z "$with_libevent_header" || test "$with_libevent_header" = "yes"],
+          [PMIX_EVENT_HEADER="<event.h>"
+           PMIX_EVENT2_THREAD_HEADER="<event2/thread.h>"],
+          [PMIX_EVENT_HEADER="$with_libevent_header"
+           PMIX_EVENT2_THREAD_HEADER="$with_libevent_header"])
+
+ ])
+
+AC_DEFUN([_PMIX_LIBEVENT_EXTERNAL],[
+    PMIX_VAR_SCOPE_PUSH([pmix_event_dir pmix_event_libdir])
+
+    AC_ARG_WITH([libevent],
+                [AC_HELP_STRING([--with-libevent=DIR],
+                                [Search for libevent headers and libraries in DIR ])])
+
+    # Bozo check
+    AS_IF([test "$with_libevent" = "no"],
+          [AC_MSG_WARN([It is not possible to configure PMIx --without-libevent])
+           AC_MSG_ERROR([Cannot continue])])
+
+    AC_ARG_WITH([libevent-libdir],
+                [AC_HELP_STRING([--with-libevent-libdir=DIR],
+                                [Search for libevent libraries in DIR ])])
+
+    AC_MSG_CHECKING([for libevent in])
+    if test ! -z "$with_libevent" && test "$with_libevent" != "yes"; then
+        pmix_event_dir=$with_libevent
+        if test -d $with_libevent/lib; then
+            pmix_event_libdir=$with_libevent/lib
+        elif test -d $with_libevent/lib64; then
+            pmix_event_libdir=$with_libevent/lib64
+        else
+            AC_MSG_RESULT([Could not find $with_libevent/lib or $with_libevent/lib64])
+            AC_MSG_ERROR([Can not continue])
+        fi
+        AC_MSG_RESULT([$pmix_event_dir and $pmix_event_libdir])
+    else
+        AC_MSG_RESULT([(default search paths)])
+    fi
+    AS_IF([test ! -z "$with_libevent_libdir" && "$with_libevent_libdir" != "yes"],
+          [pmix_event_libdir="$with_libevent_libdir"])
+
+    PMIX_CHECK_PACKAGE([pmix_libevent],
+                       [event.h],
+                       [event],
+                       [event_config_new],
+                       [-levent -levent_pthreads],
+                       [$pmix_event_dir],
+                       [$pmix_event_libdir],
+                       [],
+                       [AC_MSG_WARN([LIBEVENT SUPPORT NOT FOUND])
+                        AC_MSG_ERROR([CANNOT CONTINE])])
+
+    PMIX_FLAGS_APPEND_UNIQ(CPPFLAGS, $pmix_libevent_CPPFLAGS)
+    PMIX_FLAGS_APPEND_UNIQ(LIBS, $pmix_libevent_LIBS)
+    PMIX_FLAGS_APPEND_UNIQ(LDFLAGS, $pmix_libevent_LDFLAGS)
+
+    # Ensure that this libevent has the symbol
+    # "evthread_set_lock_callbacks", which will only exist if
+    # libevent was configured with thread support.
+    AC_CHECK_LIB([event], [evthread_set_lock_callbacks],
+                 [],
+                 [AC_MSG_WARN([External libevent does not have thread support])
+                  AC_MSG_WARN([PMIx requires libevent to be compiled with])
+                  AC_MSG_WARN([thread support enabled])
+                  AC_MSG_ERROR([Cannot continue])])
+    AC_CHECK_LIB([event_pthreads], [evthread_use_pthreads],
+                 [],
+                 [AC_MSG_WARN([External libevent does not have thread support])
+                  AC_MSG_WARN([PMIx requires libevent to be compiled with])
+                  AC_MSG_WARN([thread support enabled])
+                  AC_MSG_ERROR([Cannot continue])])
+
+    # Set output variables
+    PMIX_EVENT_HEADER="<event.h>"
+    PMIX_EVENT2_THREAD_HEADER="<event2/thread.h>"
+
+    PMIX_VAR_SCOPE_POP
+])dnl
diff --git a/config/pmix_setup_zlib.m4 b/config/pmix_setup_zlib.m4
new file mode 100644
index 0000000..a67f1b7
--- /dev/null
+++ b/config/pmix_setup_zlib.m4
@@ -0,0 +1,88 @@
+# -*- shell-script -*-
+#
+# Copyright (c) 2009-2015 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2013      Los Alamos National Security, LLC.  All rights reserved.
+# Copyright (c) 2013-2017 Intel, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# MCA_zlib_CONFIG([action-if-found], [action-if-not-found])
+# --------------------------------------------------------------------
+AC_DEFUN([PMIX_ZLIB_CONFIG],[
+    PMIX_VAR_SCOPE_PUSH([pmix_zlib_dir pmix_zlib_libdir])
+
+    AC_ARG_WITH([zlib],
+                [AC_HELP_STRING([--with-zlib=DIR],
+                                [Search for zlib headers and libraries in DIR ])])
+
+    AC_ARG_WITH([zlib-libdir],
+                [AC_HELP_STRING([--with-zlib-libdir=DIR],
+                                [Search for zlib libraries in DIR ])])
+
+    pmix_zlib_support=0
+    if test "$with_zlib" != "no"; then
+        AC_MSG_CHECKING([for zlib in])
+        if test ! -z "$with_zlib" && test "$with_zlib" != "yes"; then
+            pmix_zlib_dir=$with_zlib
+            pmix_zlib_standard_header_location=no
+            if test -d $with_zlib/lib; then
+                pmix_zlib_libdir=$with_zlib/lib
+            elif test -d $with_zlib/lib64; then
+                pmix_zlib_libdir=$with_zlib/lib64
+            else
+                AC_MSG_RESULT([Could not find $with_zlib/lib or $with_zlib/lib64])
+                AC_MSG_ERROR([Can not continue])
+            fi
+            AC_MSG_RESULT([$pmix_zlib_dir and $pmix_zlib_libdir])
+        else
+            AC_MSG_RESULT([(default search paths)])
+            pmix_zlib_standard_header_location=yes
+        fi
+        AS_IF([test ! -z "$with_zlib_libdir" && test "$with_zlib_libdir" != "yes"],
+              [pmix_zlib_libdir="$with_zlib_libdir"
+               pmix_zlib_standard_lib_location=no],
+              [pmix_zlib_standard_lib_location=yes])
+
+        PMIX_CHECK_PACKAGE([pmix_zlib],
+                           [zlib.h],
+                           [z],
+                           [deflate],
+                           [-lz],
+                           [$pmix_zlib_dir],
+                           [$pmix_zlib_libdir],
+                           [pmix_zlib_support=1],
+                           [pmix_zlib_support=0])
+        if test $pmix_zlib_support = "1"; then
+            LIBS="$LIBS -lz"
+            PMIX_EMBEDDED_LIBS="$PMIX_EMBEDDED_LIBS -lz"
+            if test "$pmix_zlib_standard_header_location" != "yes"; then
+                PMIX_EMBEDDED_CPPFLAGS="$PMIX_EMBEDDED_CPPFLAGS $pmix_zlib_CPPFLAGS"
+                CPPFLAGS="$CPPFLAGS $pmix_zlib_CPPFLAGS"
+            fi
+            if test "$pmix_zlib_standard_lib_location" != "yes"; then
+                PMIX_EMBEDDED_LDFLAGS="$PMIX_EMBEDDED_LDFLAGS $pmix_zlib_LDFLAGS"
+                LDFLAGS="$LDFLAGS $pmix_zlib_LDFLAGS"
+            fi
+        fi
+    fi
+
+    if test ! -z "$with_zlib" && test "$with_zlib" != "no" && test "$pmix_zlib_support" != "1"; then
+        AC_MSG_WARN([ZLIB SUPPORT REQUESTED AND NOT FOUND])
+        AC_MSG_ERROR([CANNOT CONTINUE])
+    fi
+
+    AC_MSG_CHECKING([will zlib support be built])
+    if test "$pmix_zlib_support" != "1"; then
+        AC_MSG_RESULT([no])
+    else
+        AC_MSG_RESULT([yes])
+    fi
+
+    AC_DEFINE_UNQUOTED([PMIX_HAVE_ZLIB], [$pmix_zlib_support],
+                       [Whether or not we have zlib support])
+    PMIX_VAR_SCOPE_POP
+])dnl
diff --git a/config/pmix_try_assemble.m4 b/config/pmix_try_assemble.m4
new file mode 100644
index 0000000..eba8dfd
--- /dev/null
+++ b/config/pmix_try_assemble.m4
@@ -0,0 +1,52 @@
+dnl
+dnl Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+dnl                         University Research and Technology
+dnl                         Corporation.  All rights reserved.
+dnl Copyright (c) 2004-2005 The University of Tennessee and The University
+dnl                         of Tennessee Research Foundation.  All rights
+dnl                         reserved.
+dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+dnl                         University of Stuttgart.  All rights reserved.
+dnl Copyright (c) 2004-2005 The Regents of the University of California.
+dnl                         All rights reserved.
+dnl Copyright (c) 2014-2017 Intel, Inc. All rights reserved.
+dnl $COPYRIGHT$
+dnl
+dnl Additional copyrights may follow
+dnl
+dnl $HEADER$
+dnl
+
+dnl PMIX_TRY_ASSEMBLE(asm-code, [action-if-success], [action-if-fail])
+dnl
+dnl Attempt to assemble asm-code.  If success, run action-if-success.
+dnl Otherwise, run action-if-fail.  Neither action-if-success nor
+dnl action-if-fail are required.
+dnl
+dnl No preprocessing is guaranteed to be done on asm-code.  Some
+dnl compilers do not run the preprocessor on assembly files.
+dnl
+dnl On failure, asm-test.s will be included in config.out
+AC_DEFUN([PMIX_TRY_ASSEMBLE],
+[cat >conftest.s <<EOF
+[$1]
+EOF
+if test "$CC" = "$CCAS" ; then
+    pmix_assemble="$CCAS $CCASFLAGS -c conftest.s >conftest.out 2>&1"
+else
+    pmix_assemble="$CCAS $CCASFLAGS -o conftest.o conftest.s >conftest.out 2>&1"
+fi
+if AC_TRY_EVAL(pmix_assemble); then
+  # save the warnings
+  cat conftest.out >&AC_FD_CC
+  ifelse([$2],,:,[$2])
+else
+  # save compiler output and failed program
+  cat conftest.out >&AC_FD_CC
+  echo "configure: failed program was:" >&AC_FD_CC
+  cat conftest.s >&AC_FD_CC
+  ifelse([$3],,:,[$3])
+fi
+rm -rf conftest*
+unset pmix_assemble
+])dnl
diff --git a/config/ylwrap b/config/ylwrap
new file mode 100755
index 0000000..7c2d927
--- /dev/null
+++ b/config/ylwrap
@@ -0,0 +1,247 @@
+#! /bin/sh
+# ylwrap - wrapper for lex/yacc invocations.
+
+scriptversion=2013-01-12.17; # UTC
+
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+#
+# Written by Tom Tromey <tromey at cygnus.com>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <bug-automake at gnu.org> or send patches to
+# <automake-patches at gnu.org>.
+
+get_dirname ()
+{
+  case $1 in
+    */*|*\\*) printf '%s\n' "$1" | sed -e 's|\([\\/]\)[^\\/]*$|\1|';;
+    # Otherwise,  we want the empty string (not ".").
+  esac
+}
+
+# guard FILE
+# ----------
+# The CPP macro used to guard inclusion of FILE.
+guard ()
+{
+  printf '%s\n' "$1"                                                    \
+    | sed                                                               \
+        -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'   \
+        -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'                        \
+        -e 's/__*/_/g'
+}
+
+# quote_for_sed [STRING]
+# ----------------------
+# Return STRING (or stdin) quoted to be used as a sed pattern.
+quote_for_sed ()
+{
+  case $# in
+    0) cat;;
+    1) printf '%s\n' "$1";;
+  esac \
+    | sed -e 's|[][\\.*]|\\&|g'
+}
+
+case "$1" in
+  '')
+    echo "$0: No files given.  Try '$0 --help' for more information." 1>&2
+    exit 1
+    ;;
+  --basedir)
+    basedir=$2
+    shift 2
+    ;;
+  -h|--h*)
+    cat <<\EOF
+Usage: ylwrap [--help|--version] INPUT [OUTPUT DESIRED]... -- PROGRAM [ARGS]...
+
+Wrapper for lex/yacc invocations, renaming files as desired.
+
+  INPUT is the input file
+  OUTPUT is one file PROG generates
+  DESIRED is the file we actually want instead of OUTPUT
+  PROGRAM is program to run
+  ARGS are passed to PROG
+
+Any number of OUTPUT,DESIRED pairs may be used.
+
+Report bugs to <bug-automake at gnu.org>.
+EOF
+    exit $?
+    ;;
+  -v|--v*)
+    echo "ylwrap $scriptversion"
+    exit $?
+    ;;
+esac
+
+
+# The input.
+input=$1
+shift
+# We'll later need for a correct munging of "#line" directives.
+input_sub_rx=`get_dirname "$input" | quote_for_sed`
+case $input in
+  [\\/]* | ?:[\\/]*)
+    # Absolute path; do nothing.
+    ;;
+  *)
+    # Relative path.  Make it absolute.
+    input=`pwd`/$input
+    ;;
+esac
+input_rx=`get_dirname "$input" | quote_for_sed`
+
+# Since DOS filename conventions don't allow two dots,
+# the DOS version of Bison writes out y_tab.c instead of y.tab.c
+# and y_tab.h instead of y.tab.h. Test to see if this is the case.
+y_tab_nodot=false
+if test -f y_tab.c || test -f y_tab.h; then
+  y_tab_nodot=true
+fi
+
+# The parser itself, the first file, is the destination of the .y.c
+# rule in the Makefile.
+parser=$1
+
+# A sed program to s/FROM/TO/g for all the FROM/TO so that, for
+# instance, we rename #include "y.tab.h" into #include "parse.h"
+# during the conversion from y.tab.c to parse.c.
+sed_fix_filenames=
+
+# Also rename header guards, as Bison 2.7 for instance uses its header
+# guard in its implementation file.
+sed_fix_header_guards=
+
+while test $# -ne 0; do
+  if test x"$1" = x"--"; then
+    shift
+    break
+  fi
+  from=$1
+  # Handle y_tab.c and y_tab.h output by DOS
+  if $y_tab_nodot; then
+    case $from in
+      "y.tab.c") from=y_tab.c;;
+      "y.tab.h") from=y_tab.h;;
+    esac
+  fi
+  shift
+  to=$1
+  shift
+  sed_fix_filenames="${sed_fix_filenames}s|"`quote_for_sed "$from"`"|$to|g;"
+  sed_fix_header_guards="${sed_fix_header_guards}s|"`guard "$from"`"|"`guard "$to"`"|g;"
+done
+
+# The program to run.
+prog=$1
+shift
+# Make any relative path in $prog absolute.
+case $prog in
+  [\\/]* | ?:[\\/]*) ;;
+  *[\\/]*) prog=`pwd`/$prog ;;
+esac
+
+dirname=ylwrap$$
+do_exit="cd '`pwd`' && rm -rf $dirname > /dev/null 2>&1;"' (exit $ret); exit $ret'
+trap "ret=129; $do_exit" 1
+trap "ret=130; $do_exit" 2
+trap "ret=141; $do_exit" 13
+trap "ret=143; $do_exit" 15
+mkdir $dirname || exit 1
+
+cd $dirname
+
+case $# in
+  0) "$prog" "$input" ;;
+  *) "$prog" "$@" "$input" ;;
+esac
+ret=$?
+
+if test $ret -eq 0; then
+  for from in *
+  do
+    to=`printf '%s\n' "$from" | sed "$sed_fix_filenames"`
+    if test -f "$from"; then
+      # If $2 is an absolute path name, then just use that,
+      # otherwise prepend '../'.
+      case $to in
+        [\\/]* | ?:[\\/]*) target=$to;;
+        *) target=../$to;;
+      esac
+
+      # Do not overwrite unchanged header files to avoid useless
+      # recompilations.  Always update the parser itself: it is the
+      # destination of the .y.c rule in the Makefile.  Divert the
+      # output of all other files to a temporary file so we can
+      # compare them to existing versions.
+      if test $from != $parser; then
+        realtarget=$target
+        target=tmp-`printf '%s\n' "$target" | sed 's|.*[\\/]||g'`
+      fi
+
+      # Munge "#line" or "#" directives.  Don't let the resulting
+      # debug information point at an absolute srcdir.  Use the real
+      # output file name, not yy.lex.c for instance.  Adjust the
+      # include guards too.
+      sed -e "/^#/!b"                           \
+          -e "s|$input_rx|$input_sub_rx|"       \
+          -e "$sed_fix_filenames"               \
+          -e "$sed_fix_header_guards"           \
+        "$from" >"$target" || ret=$?
+
+      # Check whether files must be updated.
+      if test "$from" != "$parser"; then
+        if test -f "$realtarget" && cmp -s "$realtarget" "$target"; then
+          echo "$to is unchanged"
+          rm -f "$target"
+        else
+          echo "updating $to"
+          mv -f "$target" "$realtarget"
+        fi
+      fi
+    else
+      # A missing file is only an error for the parser.  This is a
+      # blatant hack to let us support using "yacc -d".  If -d is not
+      # specified, don't fail when the header file is "missing".
+      if test "$from" = "$parser"; then
+        ret=1
+      fi
+    fi
+  done
+fi
+
+# Remove the directory.
+cd ..
+rm -rf $dirname
+
+exit $ret
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/configure b/configure
new file mode 100755
index 0000000..56d6dec
--- /dev/null
+++ b/configure
@@ -0,0 +1,57108 @@
+#! /bin/sh
+# Guess values for system-dependent variables and create Makefiles.
+# Generated by GNU Autoconf 2.69 for pmix 2.0.1.
+#
+# Report bugs to <http://pmix.github.io/master>.
+#
+#
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
+#
+#
+# This configure script is free software; the Free Software Foundation
+# gives unlimited permission to copy, distribute and modify it.
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
+
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
+fi
+
+
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in #(
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
+fi
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" ""	$as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
+case $0 in #((
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  done
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  exit 1
+fi
+
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+# Use a proper internal environment variable to ensure we don't fall
+  # into an infinite loop, continuously re-executing ourselves.
+  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+    _as_can_reexec=no; export _as_can_reexec;
+    # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+  fi
+  # We don't want this to propagate to other subprocesses.
+          { _as_can_reexec=; unset _as_can_reexec;}
+if test "x$CONFIG_SHELL" = x; then
+  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
+  setopt NO_GLOB_SUBST
+else
+  case \`(set -o) 2>/dev/null\` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
+fi
+"
+  as_required="as_fn_return () { (exit \$1); }
+as_fn_success () { as_fn_return 0; }
+as_fn_failure () { as_fn_return 1; }
+as_fn_ret_success () { return 0; }
+as_fn_ret_failure () { return 1; }
+
+exitcode=0
+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
+
+else
+  exitcode=1; echo positional parameters were not saved.
+fi
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
+  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
+  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
+  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
+  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
+test \$(( 1 + 1 )) = 2 || exit 1
+
+  test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || (
+    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
+    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
+    PATH=/empty FPATH=/empty; export PATH FPATH
+    test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\
+      || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1"
+  if (eval "$as_required") 2>/dev/null; then :
+  as_have_required=yes
+else
+  as_have_required=no
+fi
+  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
+
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_found=false
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  as_found=:
+  case $as_dir in #(
+	 /*)
+	   for as_base in sh bash ksh sh5; do
+	     # Try only shells that exist, to save several forks.
+	     as_shell=$as_dir/$as_base
+	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
+  CONFIG_SHELL=$as_shell as_have_required=yes
+		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
+  break 2
+fi
+fi
+	   done;;
+       esac
+  as_found=false
+done
+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
+  CONFIG_SHELL=$SHELL as_have_required=yes
+fi; }
+IFS=$as_save_IFS
+
+
+      if test "x$CONFIG_SHELL" != x; then :
+  export CONFIG_SHELL
+             # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
+fi
+
+    if test x$as_have_required = xno; then :
+  $as_echo "$0: This script requires a shell more modern than all"
+  $as_echo "$0: the shells that I found on your system."
+  if test x${ZSH_VERSION+set} = xset ; then
+    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
+  else
+    $as_echo "$0: Please tell bug-autoconf at gnu.org and
+$0: http://pmix.github.io/master about your system,
+$0: including any error possibly output before this
+$0: message. Then install a modern shell, or manually run
+$0: the script under such a shell if you do have one."
+  fi
+  exit 1
+fi
+fi
+fi
+SHELL=${CONFIG_SHELL-/bin/sh}
+export SHELL
+# Unset more variables known to interfere with behavior of common tools.
+CLICOLOR_FORCE= GREP_OPTIONS=
+unset CLICOLOR_FORCE GREP_OPTIONS
+
+## --------------------- ##
+## M4sh Shell Functions. ##
+## --------------------- ##
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} # as_fn_exit
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
+else
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
+else
+  as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  }
+fi # as_fn_arith
+
+
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+  fi
+  $as_echo "$as_me: error: $2" >&2
+  as_fn_exit $as_status
+} # as_fn_error
+
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+  as_basename=basename
+else
+  as_basename=false
+fi
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+
+  as_lineno_1=$LINENO as_lineno_1a=$LINENO
+  as_lineno_2=$LINENO as_lineno_2a=$LINENO
+  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
+  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
+  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
+  sed -n '
+    p
+    /[$]LINENO/=
+  ' <$as_myself |
+    sed '
+      s/[$]LINENO.*/&-/
+      t lineno
+      b
+      :lineno
+      N
+      :loop
+      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+      t loop
+      s/-\n.*//
+    ' >$as_me.lineno &&
+  chmod +x "$as_me.lineno" ||
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+
+  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+  # already done that, so ensure we don't try to do so again and fall
+  # in an infinite loop.  This has already happened in practice.
+  _as_can_reexec=no; export _as_can_reexec
+  # Don't try to exec as it changes $[0], causing all sort of problems
+  # (the dirname of $[0] is not the place where we might find the
+  # original and so on.  Autoconf is especially sensitive to this).
+  . "./$as_me.lineno"
+  # Exit status is that of the last command.
+  exit
+}
+
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in #(((((
+-n*)
+  case `echo 'xy\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
+  esac;;
+*)
+  ECHO_N='-n';;
+esac
+
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
+else
+  rm -f conf$$.dir
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -pR'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -pR'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
+    as_ln_s='cp -pR'
+  fi
+else
+  as_ln_s='cp -pR'
+fi
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
+
+if mkdir -p . 2>/dev/null; then
+  as_mkdir_p='mkdir -p "$as_dir"'
+else
+  test -d ./-p && rmdir ./-p
+  as_mkdir_p=false
+fi
+
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+SHELL=${CONFIG_SHELL-/bin/sh}
+
+
+test -n "$DJDIR" || exec 7<&0 </dev/null
+exec 6>&1
+
+# Name of the host.
+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
+# so uname gets run too.
+ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+
+#
+# Initializations.
+#
+ac_default_prefix=/usr/local
+ac_clean_files=
+ac_config_libobj_dir=.
+LIBOBJS=
+cross_compiling=no
+subdirs=
+MFLAGS=
+MAKEFLAGS=
+
+# Identity of this package.
+PACKAGE_NAME='pmix'
+PACKAGE_TARNAME='pmix'
+PACKAGE_VERSION='2.0.1'
+PACKAGE_STRING='pmix 2.0.1'
+PACKAGE_BUGREPORT='http://pmix.github.io/master'
+PACKAGE_URL=''
+
+# Factoring default headers for most tests.
+ac_includes_default="\
+#include <stdio.h>
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
+#ifdef STDC_HEADERS
+# include <stdlib.h>
+# include <stddef.h>
+#else
+# ifdef HAVE_STDLIB_H
+#  include <stdlib.h>
+# endif
+#endif
+#ifdef HAVE_STRING_H
+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
+#  include <memory.h>
+# endif
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+#ifdef HAVE_INTTYPES_H
+# include <inttypes.h>
+#endif
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif"
+
+ac_subst_vars='am__EXEEXT_FALSE
+am__EXEEXT_TRUE
+LTLIBOBJS
+LIBOBJS
+libpmix_so_version
+CONFIGURE_DEPENDENCIES
+CC_FOR_BUILD
+WANT_PMI_BACKWARD_FALSE
+WANT_PMI_BACKWARD_TRUE
+WANT_PRIMARY_HEADERS_FALSE
+WANT_PRIMARY_HEADERS_TRUE
+WANT_DSTORE_FALSE
+WANT_DSTORE_TRUE
+PMIX_WANT_SASL_FALSE
+PMIX_WANT_SASL_TRUE
+PMIX_WANT_MUNGE_FALSE
+PMIX_WANT_MUNGE_TRUE
+PMIX_COMPILE_TIMING_FALSE
+PMIX_COMPILE_TIMING_TRUE
+PMIX_TESTS_EXAMPLES_FALSE
+PMIX_TESTS_EXAMPLES_TRUE
+PMIX_EMBEDDED_MODE_FALSE
+PMIX_EMBEDDED_MODE_TRUE
+PMIX_EMBEDDED_CPPFLAGS
+PMIX_EMBEDDED_LDFLAGS
+PMIX_EMBEDDED_LIBS
+pmixincludedir
+pmixlibdir
+pmixdatadir
+MCA_PROJECT_SUBDIRS
+MCA_pmix_FRAMEWORK_LIBS
+MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS
+MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS
+MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS
+MCA_pmix_FRAMEWORKS_SUBDIRS
+MCA_pmix_FRAMEWORKS
+MCA_pmix_ptl_DSO_SUBDIRS
+MCA_pmix_ptl_STATIC_SUBDIRS
+MCA_pmix_ptl_ALL_SUBDIRS
+MCA_pmix_ptl_STATIC_LTLIBS
+MCA_pmix_ptl_DSO_COMPONENTS
+MCA_pmix_ptl_STATIC_COMPONENTS
+MCA_pmix_ptl_ALL_COMPONENTS
+MCA_BUILD_pmix_ptl_usock_DSO_FALSE
+MCA_BUILD_pmix_ptl_usock_DSO_TRUE
+MCA_BUILD_pmix_ptl_tcp_DSO_FALSE
+MCA_BUILD_pmix_ptl_tcp_DSO_TRUE
+MCA_pmix_psensor_DSO_SUBDIRS
+MCA_pmix_psensor_STATIC_SUBDIRS
+MCA_pmix_psensor_ALL_SUBDIRS
+MCA_pmix_psensor_STATIC_LTLIBS
+MCA_pmix_psensor_DSO_COMPONENTS
+MCA_pmix_psensor_STATIC_COMPONENTS
+MCA_pmix_psensor_ALL_COMPONENTS
+MCA_BUILD_pmix_psensor_heartbeat_DSO_FALSE
+MCA_BUILD_pmix_psensor_heartbeat_DSO_TRUE
+MCA_BUILD_pmix_psensor_file_DSO_FALSE
+MCA_BUILD_pmix_psensor_file_DSO_TRUE
+MCA_pmix_psec_DSO_SUBDIRS
+MCA_pmix_psec_STATIC_SUBDIRS
+MCA_pmix_psec_ALL_SUBDIRS
+MCA_pmix_psec_STATIC_LTLIBS
+MCA_pmix_psec_DSO_COMPONENTS
+MCA_pmix_psec_STATIC_COMPONENTS
+MCA_pmix_psec_ALL_COMPONENTS
+MCA_BUILD_pmix_psec_munge_DSO_FALSE
+MCA_BUILD_pmix_psec_munge_DSO_TRUE
+psec_munge_LIBS
+psec_munge_LDFLAGS
+psec_munge_CPPFLAGS
+MCA_BUILD_pmix_psec_none_DSO_FALSE
+MCA_BUILD_pmix_psec_none_DSO_TRUE
+MCA_BUILD_pmix_psec_native_DSO_FALSE
+MCA_BUILD_pmix_psec_native_DSO_TRUE
+MCA_pmix_pnet_DSO_SUBDIRS
+MCA_pmix_pnet_STATIC_SUBDIRS
+MCA_pmix_pnet_ALL_SUBDIRS
+MCA_pmix_pnet_STATIC_LTLIBS
+MCA_pmix_pnet_DSO_COMPONENTS
+MCA_pmix_pnet_STATIC_COMPONENTS
+MCA_pmix_pnet_ALL_COMPONENTS
+MCA_BUILD_pmix_pnet_opa_DSO_FALSE
+MCA_BUILD_pmix_pnet_opa_DSO_TRUE
+pnet_opa_LIBS
+pnet_opa_LDFLAGS
+pnet_opa_CPPFLAGS
+pnet_opa_CFLAGS
+MCA_pmix_pinstalldirs_DSO_SUBDIRS
+MCA_pmix_pinstalldirs_STATIC_SUBDIRS
+MCA_pmix_pinstalldirs_ALL_SUBDIRS
+MCA_pmix_pinstalldirs_STATIC_LTLIBS
+MCA_pmix_pinstalldirs_DSO_COMPONENTS
+MCA_pmix_pinstalldirs_STATIC_COMPONENTS
+MCA_pmix_pinstalldirs_ALL_COMPONENTS
+MCA_BUILD_pmix_pinstalldirs_config_DSO_FALSE
+MCA_BUILD_pmix_pinstalldirs_config_DSO_TRUE
+MCA_BUILD_pmix_pinstalldirs_env_DSO_FALSE
+MCA_BUILD_pmix_pinstalldirs_env_DSO_TRUE
+MCA_pmix_pif_DSO_SUBDIRS
+MCA_pmix_pif_STATIC_SUBDIRS
+MCA_pmix_pif_ALL_SUBDIRS
+MCA_pmix_pif_STATIC_LTLIBS
+MCA_pmix_pif_DSO_COMPONENTS
+MCA_pmix_pif_STATIC_COMPONENTS
+MCA_pmix_pif_ALL_COMPONENTS
+MCA_BUILD_pmix_pif_solaris_ipv6_DSO_FALSE
+MCA_BUILD_pmix_pif_solaris_ipv6_DSO_TRUE
+MCA_BUILD_pmix_pif_posix_ipv4_DSO_FALSE
+MCA_BUILD_pmix_pif_posix_ipv4_DSO_TRUE
+MCA_BUILD_pmix_pif_linux_ipv6_DSO_FALSE
+MCA_BUILD_pmix_pif_linux_ipv6_DSO_TRUE
+MCA_BUILD_pmix_pif_bsdx_ipv6_DSO_FALSE
+MCA_BUILD_pmix_pif_bsdx_ipv6_DSO_TRUE
+MCA_BUILD_pmix_pif_bsdx_ipv4_DSO_FALSE
+MCA_BUILD_pmix_pif_bsdx_ipv4_DSO_TRUE
+MCA_pmix_pdl_DSO_SUBDIRS
+MCA_pmix_pdl_STATIC_SUBDIRS
+MCA_pmix_pdl_ALL_SUBDIRS
+MCA_pmix_pdl_STATIC_LTLIBS
+MCA_pmix_pdl_DSO_COMPONENTS
+MCA_pmix_pdl_STATIC_COMPONENTS
+MCA_pmix_pdl_ALL_COMPONENTS
+MCA_BUILD_pmix_pdl_plibltdl_DSO_FALSE
+MCA_BUILD_pmix_pdl_plibltdl_DSO_TRUE
+pmix_pdl_plibltdl_LIBS
+pmix_pdl_plibltdl_LDFLAGS
+pmix_pdl_plibltdl_CPPFLAGS
+MCA_BUILD_pmix_pdl_pdlopen_DSO_FALSE
+MCA_BUILD_pmix_pdl_pdlopen_DSO_TRUE
+pmix_pdl_pdlopen_LIBS
+WANT_HIDDEN_FALSE
+WANT_HIDDEN_TRUE
+PMIX_HAVE_PANDOC_FALSE
+PMIX_HAVE_PANDOC_TRUE
+pmix_have_pandoc
+PMIX_DESTRUCTOR_USE_FINI_FALSE
+PMIX_DESTRUCTOR_USE_FINI_TRUE
+PMIX_ASSEMBLY_BUILTIN
+PMIX_ASSEMBLY_ARCH
+PMIX_ASSEMBLY_FORMAT
+PMIX_ASM_SUPPORT_64BIT
+PMIX_ASM_TYPE
+PMIX_ASM_LSYM
+PMIX_ASM_GSYM
+PMIX_AS_LABEL_SUFFIX
+PMIX_AS_GLOBAL
+PMIX_ASM_TEXT
+PERL
+am__fastdepCCAS_FALSE
+am__fastdepCCAS_TRUE
+CCASDEPMODE
+CCASFLAGS
+CCAS
+PMIX_CC_ABSOLUTE
+PMIX_RENAME
+PMIX_RELEASE_VERSION
+pmixminor
+pmixmajor
+PMIX_MINOR_VERSION
+PMIX_MAJOR_VERSION
+PMIX_RELEASE_DATE
+PMIX_VERSION
+PMIX_top_srcdir
+PMIX_top_builddir
+CXXCPP
+am__fastdepCXX_FALSE
+am__fastdepCXX_TRUE
+CXXDEPMODE
+ac_ct_CXX
+CXXFLAGS
+CXX
+LT_SYS_LIBRARY_PATH
+OTOOL64
+OTOOL
+LIPO
+NMEDIT
+DSYMUTIL
+MANIFEST_TOOL
+RANLIB
+DLLTOOL
+OBJDUMP
+LN_S
+NM
+ac_ct_DUMPBIN
+DUMPBIN
+LD
+FGREP
+SED
+LIBTOOL
+ac_prefix_program
+CLEANFILES
+WANT_INSTALL_HEADERS_FALSE
+WANT_INSTALL_HEADERS_TRUE
+LEXLIB
+LEX_OUTPUT_ROOT
+LEX
+ac_ct_AR
+AR
+EGREP
+GREP
+CPP
+am__fastdepCC_FALSE
+am__fastdepCC_TRUE
+CCDEPMODE
+am__nodep
+AMDEPBACKSLASH
+AMDEP_FALSE
+AMDEP_TRUE
+am__quote
+am__include
+DEPDIR
+OBJEXT
+EXEEXT
+ac_ct_CC
+CPPFLAGS
+LDFLAGS
+CFLAGS
+CC
+AM_BACKSLASH
+AM_DEFAULT_VERBOSITY
+AM_DEFAULT_V
+AM_V
+am__untar
+am__tar
+AMTAR
+am__leading_dot
+SET_MAKE
+AWK
+mkdir_p
+MKDIR_P
+INSTALL_STRIP_PROGRAM
+STRIP
+install_sh
+MAKEINFO
+AUTOHEADER
+AUTOMAKE
+AUTOCONF
+ACLOCAL
+VERSION
+PACKAGE
+CYGPATH_W
+am__isrc
+INSTALL_DATA
+INSTALL_SCRIPT
+INSTALL_PROGRAM
+target_os
+target_vendor
+target_cpu
+target
+host_os
+host_vendor
+host_cpu
+host
+build_os
+build_vendor
+build_cpu
+build
+PMIX_CONFIGURE_DATE
+PMIX_CONFIGURE_HOST
+PMIX_CONFIGURE_USER
+target_alias
+host_alias
+build_alias
+LIBS
+ECHO_T
+ECHO_N
+ECHO_C
+DEFS
+mandir
+localedir
+libdir
+psdir
+pdfdir
+dvidir
+htmldir
+infodir
+docdir
+oldincludedir
+includedir
+localstatedir
+sharedstatedir
+sysconfdir
+datadir
+datarootdir
+libexecdir
+sbindir
+bindir
+program_transform_name
+prefix
+exec_prefix
+PACKAGE_URL
+PACKAGE_BUGREPORT
+PACKAGE_STRING
+PACKAGE_VERSION
+PACKAGE_TARNAME
+PACKAGE_NAME
+PATH_SEPARATOR
+SHELL'
+ac_subst_files=''
+ac_user_opts='
+enable_option_checking
+with_platform
+enable_silent_rules
+enable_dependency_tracking
+enable_shared
+enable_static
+enable_dlopen
+enable_embedded_mode
+enable_picky
+enable_debug
+enable_debug_symbols
+with_devel_headers
+with_tests_examples
+enable_per_user_config_files
+enable_pretty_print_stacktrace
+enable_dstore
+enable_dstore_pthlck
+with_ident_string
+enable_pmix_timing
+enable_pmi_backward_compatibility
+with_pic
+enable_fast_install
+with_aix_soname
+with_gnu_ld
+with_sysroot
+enable_libtool_lock
+with_pmix_symbol_rename
+enable_builtin_atomics
+enable_cross_cmpset128
+enable_cross_cmpxchg16b
+with_broken_qsort
+enable_visibility
+with_libevent_header
+enable_embedded_libevent
+with_libevent
+with_libevent_libdir
+with_zlib
+with_zlib_libdir
+enable_mca_no_build
+enable_mca_dso
+enable_mca_static
+enable_mca_direct
+enable_dl_dlopen
+with_plibltdl
+with_libltdl_libdir
+with_psm2
+with_psm2_libdir
+with_munge
+with_munge_libdir
+'
+      ac_precious_vars='build_alias
+host_alias
+target_alias
+CC
+CFLAGS
+LDFLAGS
+LIBS
+CPPFLAGS
+CPP
+LT_SYS_LIBRARY_PATH
+CXX
+CXXFLAGS
+CCC
+CXXCPP
+CCAS
+CCASFLAGS
+CC_FOR_BUILD'
+
+
+# Initialize some variables set by options.
+ac_init_help=
+ac_init_version=false
+ac_unrecognized_opts=
+ac_unrecognized_sep=
+# The variables have the same names as the options, with
+# dashes changed to underlines.
+cache_file=/dev/null
+exec_prefix=NONE
+no_create=
+no_recursion=
+prefix=NONE
+program_prefix=NONE
+program_suffix=NONE
+program_transform_name=s,x,x,
+silent=
+site=
+srcdir=
+verbose=
+x_includes=NONE
+x_libraries=NONE
+
+# Installation directory options.
+# These are left unexpanded so users can "make install exec_prefix=/foo"
+# and all the variables that are supposed to be based on exec_prefix
+# by default will actually change.
+# Use braces instead of parens because sh, perl, etc. also accept them.
+# (The list follows the same order as the GNU Coding Standards.)
+bindir='${exec_prefix}/bin'
+sbindir='${exec_prefix}/sbin'
+libexecdir='${exec_prefix}/libexec'
+datarootdir='${prefix}/share'
+datadir='${datarootdir}'
+sysconfdir='${prefix}/etc'
+sharedstatedir='${prefix}/com'
+localstatedir='${prefix}/var'
+includedir='${prefix}/include'
+oldincludedir='/usr/include'
+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
+infodir='${datarootdir}/info'
+htmldir='${docdir}'
+dvidir='${docdir}'
+pdfdir='${docdir}'
+psdir='${docdir}'
+libdir='${exec_prefix}/lib'
+localedir='${datarootdir}/locale'
+mandir='${datarootdir}/man'
+
+ac_prev=
+ac_dashdash=
+for ac_option
+do
+  # If the previous option needs an argument, assign it.
+  if test -n "$ac_prev"; then
+    eval $ac_prev=\$ac_option
+    ac_prev=
+    continue
+  fi
+
+  case $ac_option in
+  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+  *=)   ac_optarg= ;;
+  *)    ac_optarg=yes ;;
+  esac
+
+  # Accept the important Cygnus configure options, so we can diagnose typos.
+
+  case $ac_dashdash$ac_option in
+  --)
+    ac_dashdash=yes ;;
+
+  -bindir | --bindir | --bindi | --bind | --bin | --bi)
+    ac_prev=bindir ;;
+  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
+    bindir=$ac_optarg ;;
+
+  -build | --build | --buil | --bui | --bu)
+    ac_prev=build_alias ;;
+  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
+    build_alias=$ac_optarg ;;
+
+  -cache-file | --cache-file | --cache-fil | --cache-fi \
+  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
+    ac_prev=cache_file ;;
+  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
+  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
+    cache_file=$ac_optarg ;;
+
+  --config-cache | -C)
+    cache_file=config.cache ;;
+
+  -datadir | --datadir | --datadi | --datad)
+    ac_prev=datadir ;;
+  -datadir=* | --datadir=* | --datadi=* | --datad=*)
+    datadir=$ac_optarg ;;
+
+  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
+  | --dataroo | --dataro | --datar)
+    ac_prev=datarootdir ;;
+  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
+  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
+    datarootdir=$ac_optarg ;;
+
+  -disable-* | --disable-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid feature name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=no ;;
+
+  -docdir | --docdir | --docdi | --doc | --do)
+    ac_prev=docdir ;;
+  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
+    docdir=$ac_optarg ;;
+
+  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
+    ac_prev=dvidir ;;
+  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
+    dvidir=$ac_optarg ;;
+
+  -enable-* | --enable-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid feature name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=\$ac_optarg ;;
+
+  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
+  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
+  | --exec | --exe | --ex)
+    ac_prev=exec_prefix ;;
+  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
+  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
+  | --exec=* | --exe=* | --ex=*)
+    exec_prefix=$ac_optarg ;;
+
+  -gas | --gas | --ga | --g)
+    # Obsolete; use --with-gas.
+    with_gas=yes ;;
+
+  -help | --help | --hel | --he | -h)
+    ac_init_help=long ;;
+  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
+    ac_init_help=recursive ;;
+  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
+    ac_init_help=short ;;
+
+  -host | --host | --hos | --ho)
+    ac_prev=host_alias ;;
+  -host=* | --host=* | --hos=* | --ho=*)
+    host_alias=$ac_optarg ;;
+
+  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
+    ac_prev=htmldir ;;
+  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
+  | --ht=*)
+    htmldir=$ac_optarg ;;
+
+  -includedir | --includedir | --includedi | --included | --include \
+  | --includ | --inclu | --incl | --inc)
+    ac_prev=includedir ;;
+  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
+  | --includ=* | --inclu=* | --incl=* | --inc=*)
+    includedir=$ac_optarg ;;
+
+  -infodir | --infodir | --infodi | --infod | --info | --inf)
+    ac_prev=infodir ;;
+  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
+    infodir=$ac_optarg ;;
+
+  -libdir | --libdir | --libdi | --libd)
+    ac_prev=libdir ;;
+  -libdir=* | --libdir=* | --libdi=* | --libd=*)
+    libdir=$ac_optarg ;;
+
+  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
+  | --libexe | --libex | --libe)
+    ac_prev=libexecdir ;;
+  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
+  | --libexe=* | --libex=* | --libe=*)
+    libexecdir=$ac_optarg ;;
+
+  -localedir | --localedir | --localedi | --localed | --locale)
+    ac_prev=localedir ;;
+  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
+    localedir=$ac_optarg ;;
+
+  -localstatedir | --localstatedir | --localstatedi | --localstated \
+  | --localstate | --localstat | --localsta | --localst | --locals)
+    ac_prev=localstatedir ;;
+  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
+  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
+    localstatedir=$ac_optarg ;;
+
+  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
+    ac_prev=mandir ;;
+  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
+    mandir=$ac_optarg ;;
+
+  -nfp | --nfp | --nf)
+    # Obsolete; use --without-fp.
+    with_fp=no ;;
+
+  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+  | --no-cr | --no-c | -n)
+    no_create=yes ;;
+
+  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
+    no_recursion=yes ;;
+
+  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
+  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
+  | --oldin | --oldi | --old | --ol | --o)
+    ac_prev=oldincludedir ;;
+  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
+  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
+  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
+    oldincludedir=$ac_optarg ;;
+
+  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
+    ac_prev=prefix ;;
+  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
+    prefix=$ac_optarg ;;
+
+  -program-prefix | --program-prefix | --program-prefi | --program-pref \
+  | --program-pre | --program-pr | --program-p)
+    ac_prev=program_prefix ;;
+  -program-prefix=* | --program-prefix=* | --program-prefi=* \
+  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
+    program_prefix=$ac_optarg ;;
+
+  -program-suffix | --program-suffix | --program-suffi | --program-suff \
+  | --program-suf | --program-su | --program-s)
+    ac_prev=program_suffix ;;
+  -program-suffix=* | --program-suffix=* | --program-suffi=* \
+  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
+    program_suffix=$ac_optarg ;;
+
+  -program-transform-name | --program-transform-name \
+  | --program-transform-nam | --program-transform-na \
+  | --program-transform-n | --program-transform- \
+  | --program-transform | --program-transfor \
+  | --program-transfo | --program-transf \
+  | --program-trans | --program-tran \
+  | --progr-tra | --program-tr | --program-t)
+    ac_prev=program_transform_name ;;
+  -program-transform-name=* | --program-transform-name=* \
+  | --program-transform-nam=* | --program-transform-na=* \
+  | --program-transform-n=* | --program-transform-=* \
+  | --program-transform=* | --program-transfor=* \
+  | --program-transfo=* | --program-transf=* \
+  | --program-trans=* | --program-tran=* \
+  | --progr-tra=* | --program-tr=* | --program-t=*)
+    program_transform_name=$ac_optarg ;;
+
+  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
+    ac_prev=pdfdir ;;
+  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
+    pdfdir=$ac_optarg ;;
+
+  -psdir | --psdir | --psdi | --psd | --ps)
+    ac_prev=psdir ;;
+  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
+    psdir=$ac_optarg ;;
+
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil)
+    silent=yes ;;
+
+  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
+    ac_prev=sbindir ;;
+  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
+  | --sbi=* | --sb=*)
+    sbindir=$ac_optarg ;;
+
+  -sharedstatedir | --sharedstatedir | --sharedstatedi \
+  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
+  | --sharedst | --shareds | --shared | --share | --shar \
+  | --sha | --sh)
+    ac_prev=sharedstatedir ;;
+  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
+  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
+  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
+  | --sha=* | --sh=*)
+    sharedstatedir=$ac_optarg ;;
+
+  -site | --site | --sit)
+    ac_prev=site ;;
+  -site=* | --site=* | --sit=*)
+    site=$ac_optarg ;;
+
+  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
+    ac_prev=srcdir ;;
+  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
+    srcdir=$ac_optarg ;;
+
+  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
+  | --syscon | --sysco | --sysc | --sys | --sy)
+    ac_prev=sysconfdir ;;
+  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
+  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
+    sysconfdir=$ac_optarg ;;
+
+  -target | --target | --targe | --targ | --tar | --ta | --t)
+    ac_prev=target_alias ;;
+  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
+    target_alias=$ac_optarg ;;
+
+  -v | -verbose | --verbose | --verbos | --verbo | --verb)
+    verbose=yes ;;
+
+  -version | --version | --versio | --versi | --vers | -V)
+    ac_init_version=: ;;
+
+  -with-* | --with-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid package name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=\$ac_optarg ;;
+
+  -without-* | --without-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid package name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=no ;;
+
+  --x)
+    # Obsolete; use --with-x.
+    with_x=yes ;;
+
+  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
+  | --x-incl | --x-inc | --x-in | --x-i)
+    ac_prev=x_includes ;;
+  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
+  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
+    x_includes=$ac_optarg ;;
+
+  -x-libraries | --x-libraries | --x-librarie | --x-librari \
+  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
+    ac_prev=x_libraries ;;
+  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
+  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
+    x_libraries=$ac_optarg ;;
+
+  -*) as_fn_error $? "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information"
+    ;;
+
+  *=*)
+    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
+    # Reject names that are not valid shell variable names.
+    case $ac_envvar in #(
+      '' | [0-9]* | *[!_$as_cr_alnum]* )
+      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
+    esac
+    eval $ac_envvar=\$ac_optarg
+    export $ac_envvar ;;
+
+  *)
+    # FIXME: should be removed in autoconf 3.0.
+    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
+    ;;
+
+  esac
+done
+
+if test -n "$ac_prev"; then
+  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+  as_fn_error $? "missing argument to $ac_option"
+fi
+
+if test -n "$ac_unrecognized_opts"; then
+  case $enable_option_checking in
+    no) ;;
+    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
+    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+  esac
+fi
+
+# Check all directory arguments for consistency.
+for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
+		datadir sysconfdir sharedstatedir localstatedir includedir \
+		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
+		libdir localedir mandir
+do
+  eval ac_val=\$$ac_var
+  # Remove trailing slashes.
+  case $ac_val in
+    */ )
+      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
+      eval $ac_var=\$ac_val;;
+  esac
+  # Be sure to have absolute directory names.
+  case $ac_val in
+    [\\/$]* | ?:[\\/]* )  continue;;
+    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
+  esac
+  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
+done
+
+# There might be people who depend on the old broken behavior: `$host'
+# used to hold the argument of --host etc.
+# FIXME: To remove some day.
+build=$build_alias
+host=$host_alias
+target=$target_alias
+
+# FIXME: To remove some day.
+if test "x$host_alias" != x; then
+  if test "x$build_alias" = x; then
+    cross_compiling=maybe
+  elif test "x$build_alias" != "x$host_alias"; then
+    cross_compiling=yes
+  fi
+fi
+
+ac_tool_prefix=
+test -n "$host_alias" && ac_tool_prefix=$host_alias-
+
+test "$silent" = yes && exec 6>/dev/null
+
+
+ac_pwd=`pwd` && test -n "$ac_pwd" &&
+ac_ls_di=`ls -di .` &&
+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
+  as_fn_error $? "working directory cannot be determined"
+test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
+  as_fn_error $? "pwd does not report name of working directory"
+
+
+# Find the source files, if location was not specified.
+if test -z "$srcdir"; then
+  ac_srcdir_defaulted=yes
+  # Try the directory containing this script, then the parent directory.
+  ac_confdir=`$as_dirname -- "$as_myself" ||
+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_myself" : 'X\(//\)[^/]' \| \
+	 X"$as_myself" : 'X\(//\)$' \| \
+	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_myself" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+  srcdir=$ac_confdir
+  if test ! -r "$srcdir/$ac_unique_file"; then
+    srcdir=..
+  fi
+else
+  ac_srcdir_defaulted=no
+fi
+if test ! -r "$srcdir/$ac_unique_file"; then
+  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
+  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
+fi
+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
+ac_abs_confdir=`(
+	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
+	pwd)`
+# When building in place, set srcdir=.
+if test "$ac_abs_confdir" = "$ac_pwd"; then
+  srcdir=.
+fi
+# Remove unnecessary trailing slashes from srcdir.
+# Double slashes in file names in object file debugging info
+# mess up M-x gdb in Emacs.
+case $srcdir in
+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
+esac
+for ac_var in $ac_precious_vars; do
+  eval ac_env_${ac_var}_set=\${${ac_var}+set}
+  eval ac_env_${ac_var}_value=\$${ac_var}
+  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
+  eval ac_cv_env_${ac_var}_value=\$${ac_var}
+done
+
+#
+# Report the --help message.
+#
+if test "$ac_init_help" = "long"; then
+  # Omit some internal or obsolete options to make the list less imposing.
+  # This message is too long to be a string in the A/UX 3.1 sh.
+  cat <<_ACEOF
+\`configure' configures pmix 2.0.1 to adapt to many kinds of systems.
+
+Usage: $0 [OPTION]... [VAR=VALUE]...
+
+To assign environment variables (e.g., CC, CFLAGS...), specify them as
+VAR=VALUE.  See below for descriptions of some of the useful variables.
+
+Defaults for the options are specified in brackets.
+
+Configuration:
+  -h, --help              display this help and exit
+      --help=short        display options specific to this package
+      --help=recursive    display the short help of all the included packages
+  -V, --version           display version information and exit
+  -q, --quiet, --silent   do not print \`checking ...' messages
+      --cache-file=FILE   cache test results in FILE [disabled]
+  -C, --config-cache      alias for \`--cache-file=config.cache'
+  -n, --no-create         do not create output files
+      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
+
+Installation directories:
+  --prefix=PREFIX         install architecture-independent files in PREFIX
+                          [$ac_default_prefix]
+  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
+                          [PREFIX]
+
+By default, \`make install' will install all the files in
+\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
+an installation prefix other than \`$ac_default_prefix' using \`--prefix',
+for instance \`--prefix=\$HOME'.
+
+For better control, use the options below.
+
+Fine tuning of the installation directories:
+  --bindir=DIR            user executables [EPREFIX/bin]
+  --sbindir=DIR           system admin executables [EPREFIX/sbin]
+  --libexecdir=DIR        program executables [EPREFIX/libexec]
+  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --libdir=DIR            object code libraries [EPREFIX/lib]
+  --includedir=DIR        C header files [PREFIX/include]
+  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
+  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
+  --infodir=DIR           info documentation [DATAROOTDIR/info]
+  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
+  --mandir=DIR            man documentation [DATAROOTDIR/man]
+  --docdir=DIR            documentation root [DATAROOTDIR/doc/pmix]
+  --htmldir=DIR           html documentation [DOCDIR]
+  --dvidir=DIR            dvi documentation [DOCDIR]
+  --pdfdir=DIR            pdf documentation [DOCDIR]
+  --psdir=DIR             ps documentation [DOCDIR]
+_ACEOF
+
+  cat <<\_ACEOF
+
+Program names:
+  --program-prefix=PREFIX            prepend PREFIX to installed program names
+  --program-suffix=SUFFIX            append SUFFIX to installed program names
+  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
+
+System types:
+  --build=BUILD     configure for building on BUILD [guessed]
+  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
+  --target=TARGET   configure for building compilers for TARGET [HOST]
+_ACEOF
+fi
+
+if test -n "$ac_init_help"; then
+  case $ac_init_help in
+     short | recursive ) echo "Configuration of pmix 2.0.1:";;
+   esac
+  cat <<\_ACEOF
+
+Optional Features:
+  --disable-option-checking  ignore unrecognized --enable/--with options
+  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --enable-silent-rules   less verbose build output (undo: "make V=1")
+  --disable-silent-rules  verbose build output (undo: "make V=0")
+  --enable-dependency-tracking
+                          do not reject slow dependency extractors
+  --disable-dependency-tracking
+                          speeds up one-time build
+  --enable-shared[=PKGS]  build shared libraries [default=yes]
+  --enable-static[=PKGS]  build static libraries [default=no]
+  --enable-dlopen         Whether build should attempt to use dlopen (or
+                          similar) to dynamically load components. (default:
+                          enabled)
+  --enable-embedded-mode  Using --enable-embedded-mode causes PMIx to skip a
+                          few configure checks and install nothing. It should
+                          only be used when building PMIx within the scope of
+                          a larger package.
+  --enable-picky          enable developer-level compiler pickyness when
+                          building PMIx (default: disabled)
+  --enable-debug          enable developer-level debugging code (not for
+                          general PMIx users!) (default: disabled)
+  --disable-debug-symbols Disable adding compiler flags to enable debugging
+                          symbols if --enable-debug is specified. For
+                          non-debugging builds, this flag has no effect.
+  --enable-per-user-config-files
+                          Disable per-user configuration files, to save disk
+                          accesses during job start-up. This is likely
+                          desirable for large jobs. Note that this can also be
+                          acheived by environment variables at run-time.
+                          (default: enabled)
+  --enable-pretty-print-stacktrace
+                          Pretty print stacktrace on process signal (default:
+                          enabled)
+  --disable-dstore        Using shared memory datastore (default: enabled)
+  --disable-dstore-pthlck Disable pthread-based lockig in dstor (default:
+                          enabled)
+  --enable-pmix-timing    enable PMIx developer-level timing code (default:
+                          disabled)
+  --enable-pmi-backward-compatibility
+                          enable PMIx support for PMI-1 and PMI-2 (default:
+                          enabled)
+  --enable-fast-install[=PKGS]
+                          optimize for fast installation [default=yes]
+  --disable-libtool-lock  avoid locking (might break parallel builds)
+  --enable-builtin-atomics
+                          Enable use of __sync builtin atomics (default:
+                          enabled)
+  --enable-cross-cmpset128
+                          enable the use of the __sync builtin atomic
+                          compare-and-swap 128 when cross compiling
+  --enable-cross-cmpxchg16b
+                          enable the use of the cmpxchg16b instruction when
+                          cross compiling
+  --enable-visibility     enable visibility feature of certain
+                          compilers/linkers (default: enabled)
+  --enable-embedded-libevent
+                          Enable use of locally embedded libevent
+  --enable-mca-no-build=LIST
+                          Comma-separated list of <type>-<component> pairs
+                          that will not be built. Example:
+                          "--enable-mca-no-build=maffinity,btl-portals" will
+                          disable building all maffinity components and the
+                          "portals" btl components.
+  --enable-mca-dso=LIST   Comma-separated list of types and/or type-component
+                          pairs that will be built as run-time loadable
+                          components (as opposed to statically linked in), if
+                          supported on this platform. The default is to build
+                          all components as DSOs.
+  --enable-mca-static=LIST
+                          Comma-separated list of types and/or type-component
+                          pairs that will be built statically linked into the
+                          library. The default (if DSOs are supported) is to
+                          build all components as DSOs. Enabling a component
+                          as static disables it building as a DSO.
+  --enable-mca-direct=LIST
+                          Comma-separated list of type-component pairs that
+                          will be hard coded as the one component to use for a
+                          given component type, saving the (small) overhead of
+                          the component architecture. LIST must not be empty
+                          and implies given component pairs are build as
+                          static components.
+  --disable-dl-dlopen     Disable the "dlopen" PDL component (and probably
+                          force the use of the "libltdl" PDL component).
+
+
+Optional Packages:
+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-platform=FILE    Load options for build from FILE. Options on the
+                          command line not in FILE are used. Options on the
+                          command line and in FILE are replaced by what is in
+                          FILE.
+  --with-devel-headers    normal PMIx users/applications do not need this
+                          (pmix.h and friends are ALWAYS installed). Developer
+                          headers are only necessary for authors doing deeper
+                          integration (default: disabled).
+  --with-tests-examples   Whether or not to install the tests and example
+                          programs.
+  --with-ident-string=STRING
+                          Embed an ident string into PMIx object files
+  --with-devel-headers    also install developer-level header files (only for
+                          internal PMIx developers, default: disabled)
+  --with-pic[=PKGS]       try to use only PIC/non-PIC objects [default=use
+                          both]
+  --with-aix-soname=aix|svr4|both
+                          shared library versioning (aka "SONAME") variant to
+                          provide on AIX, [default=aix].
+  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
+  --with-sysroot[=DIR]    Search for dependent libraries within DIR (or the
+                          compiler's sysroot if not specified).
+  --with-pmix-symbol-rename=PREFIX
+                          Provide a prefix to rename PMIx symbols
+  --with-broken-qsort     Build with FreeBSD qsort instead of native qsort
+                          (default: no)
+  --with-libevent-header=HEADER
+                          The value that should be included in C files to
+                          include event.h
+  --with-libevent=DIR     Search for libevent headers and libraries in DIR
+  --with-libevent-libdir=DIR
+                          Search for libevent libraries in DIR
+  --with-zlib=DIR         Search for zlib headers and libraries in DIR
+  --with-zlib-libdir=DIR  Search for zlib libraries in DIR
+  --with-libltdl(=DIR)    Build libltdl support, optionally adding
+                          DIR/include, DIR/lib, and DIR/lib64 to the search
+                          path for headers and libraries
+  --with-libltdl-libdir=DIR
+                          Search for libltdl libraries in DIR
+  --with-psm2(=DIR)       Build PSM2 (Intel PSM2) support, optionally adding
+                          DIR/include, DIR/lib, and DIR/lib64 to the search
+                          path for headers and libraries
+  --with-psm2-libdir=DIR  Search for PSM (Intel PSM2) libraries in DIR
+  --with-munge=DIR        Search for munge headers and libraries in DIR
+  --with-munge-libdir=DIR Search for munge libraries in DIR
+
+Some influential environment variables:
+  CC          C compiler command
+  CFLAGS      C compiler flags
+  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
+              nonstandard directory <lib dir>
+  LIBS        libraries to pass to the linker, e.g. -l<library>
+  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
+              you have headers in a nonstandard directory <include dir>
+  CPP         C preprocessor
+  LT_SYS_LIBRARY_PATH
+              User-defined run-time library search path.
+  CXX         C++ compiler command
+  CXXFLAGS    C++ compiler flags
+  CXXCPP      C++ preprocessor
+  CCAS        assembler compiler command (defaults to CC)
+  CCASFLAGS   assembler compiler flags (defaults to CFLAGS)
+  CC_FOR_BUILD
+              build system C compiler
+
+Use these variables to override the choices made by `configure' or to help
+it to find libraries and programs with nonstandard names/locations.
+
+Report bugs to <http://pmix.github.io/master>.
+_ACEOF
+ac_status=$?
+fi
+
+if test "$ac_init_help" = "recursive"; then
+  # If there are subdirs, report their specific --help.
+  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
+    test -d "$ac_dir" ||
+      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+      continue
+    ac_builddir=.
+
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
+
+case $srcdir in
+  .)  # We are building in place.
+    ac_srcdir=.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+    cd "$ac_dir" || { ac_status=$?; continue; }
+    # Check for guested configure.
+    if test -f "$ac_srcdir/configure.gnu"; then
+      echo &&
+      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
+    elif test -f "$ac_srcdir/configure"; then
+      echo &&
+      $SHELL "$ac_srcdir/configure" --help=recursive
+    else
+      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+    fi || ac_status=$?
+    cd "$ac_pwd" || { ac_status=$?; break; }
+  done
+fi
+
+test -n "$ac_init_help" && exit $ac_status
+if $ac_init_version; then
+  cat <<\_ACEOF
+pmix configure 2.0.1
+generated by GNU Autoconf 2.69
+
+Copyright (C) 2012 Free Software Foundation, Inc.
+This configure script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it.
+_ACEOF
+  exit
+fi
+
+## ------------------------ ##
+## Autoconf initialization. ##
+## ------------------------ ##
+
+# ac_fn_c_try_compile LINENO
+# --------------------------
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext
+  if { { ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compile") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_compile
+
+# ac_fn_c_try_cpp LINENO
+# ----------------------
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_cpp ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } > conftest.i && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+    ac_retval=1
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_cpp
+
+# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists, giving a warning if it cannot be compiled using
+# the include files in INCLUDES and setting the cache variable VAR
+# accordingly.
+ac_fn_c_check_header_mongrel ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if eval \${$3+:} false; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
+$as_echo_n "checking $2 usability... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_header_compiler=yes
+else
+  ac_header_compiler=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
+$as_echo_n "checking $2 presence... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <$2>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  ac_header_preproc=yes
+else
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
+  yes:no: )
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+( $as_echo "## ------------------------------------------- ##
+## Report this to http://pmix.github.io/master ##
+## ------------------------------------------- ##"
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval "$3=\$ac_header_compiler"
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_header_mongrel
+
+# ac_fn_c_try_run LINENO
+# ----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
+# that executables *can* be run.
+ac_fn_c_try_run ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+       $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       ac_retval=$ac_status
+fi
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_run
+
+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists and can be compiled using the include files in
+# INCLUDES, setting the cache variable VAR accordingly.
+ac_fn_c_check_header_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_header_compile
+
+# ac_fn_c_try_link LINENO
+# -----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_link ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext conftest$ac_exeext
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 test -x conftest$ac_exeext
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+  # interfere with the next link command; also delete a directory that is
+  # left behind by Apple's compiler.  We do this before executing the actions.
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_link
+
+# ac_fn_c_check_func LINENO FUNC VAR
+# ----------------------------------
+# Tests whether FUNC exists, setting the cache variable VAR accordingly
+ac_fn_c_check_func ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $2 innocuous_$2
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $2 (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $2
+
+/* 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 $2 ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_$2 || defined __stub___$2
+choke me
+#endif
+
+int
+main ()
+{
+return $2 ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_func
+
+# ac_fn_cxx_try_compile LINENO
+# ----------------------------
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
+ac_fn_cxx_try_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext
+  if { { ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compile") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_cxx_try_compile
+
+# ac_fn_cxx_try_cpp LINENO
+# ------------------------
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+ac_fn_cxx_try_cpp ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } > conftest.i && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+    ac_retval=1
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_cxx_try_cpp
+
+# ac_fn_cxx_try_link LINENO
+# -------------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_cxx_try_link ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext conftest$ac_exeext
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 test -x conftest$ac_exeext
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+  # interfere with the next link command; also delete a directory that is
+  # left behind by Apple's compiler.  We do this before executing the actions.
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_cxx_try_link
+
+# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
+# -------------------------------------------
+# Tests whether TYPE exists after having included INCLUDES, setting cache
+# variable VAR accordingly.
+ac_fn_c_check_type ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval "$3=no"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+if (sizeof ($2))
+	 return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+if (sizeof (($2)))
+	    return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+  eval "$3=yes"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_type
+
+# ac_fn_c_compute_int LINENO EXPR VAR INCLUDES
+# --------------------------------------------
+# Tries to find the compile-time value of EXPR in a program that includes
+# INCLUDES, setting VAR accordingly. Returns whether the value could be
+# computed
+ac_fn_c_compute_int ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if test "$cross_compiling" = yes; then
+    # Depending upon the size, compute the lo and hi bounds.
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+static int test_array [1 - 2 * !(($2) >= 0)];
+test_array [0] = 0;
+return test_array [0];
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_lo=0 ac_mid=0
+  while :; do
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+static int test_array [1 - 2 * !(($2) <= $ac_mid)];
+test_array [0] = 0;
+return test_array [0];
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_hi=$ac_mid; break
+else
+  as_fn_arith $ac_mid + 1 && ac_lo=$as_val
+			if test $ac_lo -le $ac_mid; then
+			  ac_lo= ac_hi=
+			  break
+			fi
+			as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  done
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+static int test_array [1 - 2 * !(($2) < 0)];
+test_array [0] = 0;
+return test_array [0];
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_hi=-1 ac_mid=-1
+  while :; do
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+static int test_array [1 - 2 * !(($2) >= $ac_mid)];
+test_array [0] = 0;
+return test_array [0];
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_lo=$ac_mid; break
+else
+  as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val
+			if test $ac_mid -le $ac_hi; then
+			  ac_lo= ac_hi=
+			  break
+			fi
+			as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  done
+else
+  ac_lo= ac_hi=
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+# Binary search between lo and hi bounds.
+while test "x$ac_lo" != "x$ac_hi"; do
+  as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+static int test_array [1 - 2 * !(($2) <= $ac_mid)];
+test_array [0] = 0;
+return test_array [0];
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_hi=$ac_mid
+else
+  as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+case $ac_lo in #((
+?*) eval "$3=\$ac_lo"; ac_retval=0 ;;
+'') ac_retval=1 ;;
+esac
+  else
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+static long int longval () { return $2; }
+static unsigned long int ulongval () { return $2; }
+#include <stdio.h>
+#include <stdlib.h>
+int
+main ()
+{
+
+  FILE *f = fopen ("conftest.val", "w");
+  if (! f)
+    return 1;
+  if (($2) < 0)
+    {
+      long int i = longval ();
+      if (i != ($2))
+	return 1;
+      fprintf (f, "%ld", i);
+    }
+  else
+    {
+      unsigned long int i = ulongval ();
+      if (i != ($2))
+	return 1;
+      fprintf (f, "%lu", i);
+    }
+  /* Do not output a trailing newline, as this causes \r\n confusion
+     on some platforms.  */
+  return ferror (f) || fclose (f) != 0;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  echo >>conftest.val; read $3 <conftest.val; ac_retval=0
+else
+  ac_retval=1
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f conftest.val
+
+  fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_compute_int
+
+# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
+# ---------------------------------------------
+# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
+# accordingly.
+ac_fn_c_check_decl ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  as_decl_name=`echo $2|sed 's/ *(.*//'`
+  as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
+$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+#ifndef $as_decl_name
+#ifdef __cplusplus
+  (void) $as_decl_use;
+#else
+  (void) $as_decl_name;
+#endif
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_decl
+
+# ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES
+# ----------------------------------------------------
+# Tries to find if the field MEMBER exists in type AGGR, after including
+# INCLUDES, setting cache variable VAR accordingly.
+ac_fn_c_check_member ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
+$as_echo_n "checking for $2.$3... " >&6; }
+if eval \${$4+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$5
+int
+main ()
+{
+static $2 ac_aggr;
+if (ac_aggr.$3)
+return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$4=yes"
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$5
+int
+main ()
+{
+static $2 ac_aggr;
+if (sizeof ac_aggr.$3)
+return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$4=yes"
+else
+  eval "$4=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$4
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_member
+cat >config.log <<_ACEOF
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
+
+It was created by pmix $as_me 2.0.1, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
+
+  $ $0 $@
+
+_ACEOF
+exec 5>>config.log
+{
+cat <<_ASUNAME
+## --------- ##
+## Platform. ##
+## --------- ##
+
+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
+
+/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
+/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
+/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
+/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
+
+_ASUNAME
+
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    $as_echo "PATH: $as_dir"
+  done
+IFS=$as_save_IFS
+
+} >&5
+
+cat >&5 <<_ACEOF
+
+
+## ----------- ##
+## Core tests. ##
+## ----------- ##
+
+_ACEOF
+
+
+# Keep a trace of the command line.
+# Strip out --no-create and --no-recursion so they do not pile up.
+# Strip out --silent because we don't want to record it for future runs.
+# Also quote any args containing shell meta-characters.
+# Make two passes to allow for proper duplicate-argument suppression.
+ac_configure_args=
+ac_configure_args0=
+ac_configure_args1=
+ac_must_keep_next=false
+for ac_pass in 1 2
+do
+  for ac_arg
+  do
+    case $ac_arg in
+    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
+    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+    | -silent | --silent | --silen | --sile | --sil)
+      continue ;;
+    *\'*)
+      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    case $ac_pass in
+    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
+    2)
+      as_fn_append ac_configure_args1 " '$ac_arg'"
+      if test $ac_must_keep_next = true; then
+	ac_must_keep_next=false # Got value, back to normal.
+      else
+	case $ac_arg in
+	  *=* | --config-cache | -C | -disable-* | --disable-* \
+	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
+	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
+	  | -with-* | --with-* | -without-* | --without-* | --x)
+	    case "$ac_configure_args0 " in
+	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
+	    esac
+	    ;;
+	  -* ) ac_must_keep_next=true ;;
+	esac
+      fi
+      as_fn_append ac_configure_args " '$ac_arg'"
+      ;;
+    esac
+  done
+done
+{ ac_configure_args0=; unset ac_configure_args0;}
+{ ac_configure_args1=; unset ac_configure_args1;}
+
+# When interrupted or exit'd, cleanup temporary files, and complete
+# config.log.  We remove comments because anyway the quotes in there
+# would cause problems or look ugly.
+# WARNING: Use '\'' to represent an apostrophe within the trap.
+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
+trap 'exit_status=$?
+  # Save into config.log some information that might help in debugging.
+  {
+    echo
+
+    $as_echo "## ---------------- ##
+## Cache variables. ##
+## ---------------- ##"
+    echo
+    # The following way of writing the cache mishandles newlines in values,
+(
+  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) { eval $ac_var=; unset $ac_var;} ;;
+      esac ;;
+    esac
+  done
+  (set) 2>&1 |
+    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
+    *${as_nl}ac_space=\ *)
+      sed -n \
+	"s/'\''/'\''\\\\'\'''\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
+      ;; #(
+    *)
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+      ;;
+    esac |
+    sort
+)
+    echo
+
+    $as_echo "## ----------------- ##
+## Output variables. ##
+## ----------------- ##"
+    echo
+    for ac_var in $ac_subst_vars
+    do
+      eval ac_val=\$$ac_var
+      case $ac_val in
+      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      esac
+      $as_echo "$ac_var='\''$ac_val'\''"
+    done | sort
+    echo
+
+    if test -n "$ac_subst_files"; then
+      $as_echo "## ------------------- ##
+## File substitutions. ##
+## ------------------- ##"
+      echo
+      for ac_var in $ac_subst_files
+      do
+	eval ac_val=\$$ac_var
+	case $ac_val in
+	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	esac
+	$as_echo "$ac_var='\''$ac_val'\''"
+      done | sort
+      echo
+    fi
+
+    if test -s confdefs.h; then
+      $as_echo "## ----------- ##
+## confdefs.h. ##
+## ----------- ##"
+      echo
+      cat confdefs.h
+      echo
+    fi
+    test "$ac_signal" != 0 &&
+      $as_echo "$as_me: caught signal $ac_signal"
+    $as_echo "$as_me: exit $exit_status"
+  } >&5
+  rm -f core *.core core.conftest.* &&
+    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
+    exit $exit_status
+' 0
+for ac_signal in 1 2 13 15; do
+  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
+done
+ac_signal=0
+
+# confdefs.h avoids OS command line length limits that DEFS can exceed.
+rm -f -r conftest* confdefs.h
+
+$as_echo "/* confdefs.h */" > confdefs.h
+
+# Predefined preprocessor variables.
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_NAME "$PACKAGE_NAME"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION "$PACKAGE_VERSION"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_STRING "$PACKAGE_STRING"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_URL "$PACKAGE_URL"
+_ACEOF
+
+
+# Let the site file select an alternate cache file if it wants to.
+# Prefer an explicitly selected file to automatically selected ones.
+ac_site_file1=NONE
+ac_site_file2=NONE
+if test -n "$CONFIG_SITE"; then
+  # We do not want a PATH search for config.site.
+  case $CONFIG_SITE in #((
+    -*)  ac_site_file1=./$CONFIG_SITE;;
+    */*) ac_site_file1=$CONFIG_SITE;;
+    *)   ac_site_file1=./$CONFIG_SITE;;
+  esac
+elif test "x$prefix" != xNONE; then
+  ac_site_file1=$prefix/share/config.site
+  ac_site_file2=$prefix/etc/config.site
+else
+  ac_site_file1=$ac_default_prefix/share/config.site
+  ac_site_file2=$ac_default_prefix/etc/config.site
+fi
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
+do
+  test "x$ac_site_file" = xNONE && continue
+  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
+    sed 's/^/| /' "$ac_site_file" >&5
+    . "$ac_site_file" \
+      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "failed to load site script $ac_site_file
+See \`config.log' for more details" "$LINENO" 5; }
+  fi
+done
+
+if test -r "$cache_file"; then
+  # Some versions of bash will fail to source /dev/null (special files
+  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
+  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+$as_echo "$as_me: loading cache $cache_file" >&6;}
+    case $cache_file in
+      [\\/]* | ?:[\\/]* ) . "$cache_file";;
+      *)                      . "./$cache_file";;
+    esac
+  fi
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
+$as_echo "$as_me: creating cache $cache_file" >&6;}
+  >$cache_file
+fi
+
+# Check that the precious variables saved in the cache have kept the same
+# value.
+ac_cache_corrupted=false
+for ac_var in $ac_precious_vars; do
+  eval ac_old_set=\$ac_cv_env_${ac_var}_set
+  eval ac_new_set=\$ac_env_${ac_var}_set
+  eval ac_old_val=\$ac_cv_env_${ac_var}_value
+  eval ac_new_val=\$ac_env_${ac_var}_value
+  case $ac_old_set,$ac_new_set in
+    set,)
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,set)
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,);;
+    *)
+      if test "x$ac_old_val" != "x$ac_new_val"; then
+	# differences in whitespace do not lead to failure.
+	ac_old_val_w=`echo x $ac_old_val`
+	ac_new_val_w=`echo x $ac_new_val`
+	if test "$ac_old_val_w" != "$ac_new_val_w"; then
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+	  ac_cache_corrupted=:
+	else
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+	  eval $ac_var=\$ac_old_val
+	fi
+	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
+$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
+	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
+$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
+      fi;;
+  esac
+  # Pass precious variables to config.status.
+  if test "$ac_new_set" = set; then
+    case $ac_new_val in
+    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *) ac_arg=$ac_var=$ac_new_val ;;
+    esac
+    case " $ac_configure_args " in
+      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
+      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
+    esac
+  fi
+done
+if $ac_cache_corrupted; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+fi
+## -------------------- ##
+## Main body of script. ##
+## -------------------- ##
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+ac_aux_dir=
+for ac_dir in ./config "$srcdir"/./config; do
+  if test -f "$ac_dir/install-sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install-sh -c"
+    break
+  elif test -f "$ac_dir/install.sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install.sh -c"
+    break
+  elif test -f "$ac_dir/shtool"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/shtool install -c"
+    break
+  fi
+done
+if test -z "$ac_aux_dir"; then
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ./config \"$srcdir\"/./config" "$LINENO" 5
+fi
+
+# These three variables are undocumented and unsupported,
+# and are intended to be withdrawn in a future Autoconf release.
+# They can cause serious problems if a builder's source tree is in a directory
+# whose full name contains unusual characters.
+ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
+ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
+ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
+
+
+# Note that this directory must *exactly* match what was specified via
+# -I in ACLOCAL_AMFLAGS in the top-level Makefile.am.
+
+
+# Get our platform support file.  This has to be done very, very early
+# because it twiddles random bits of autoconf
+
+
+
+# Check whether --with-platform was given.
+if test "${with_platform+set}" = set; then :
+  withval=$with_platform;
+fi
+
+
+    if test "$with_platform" = "yes" ; then
+        as_fn_error $? "--with-platform argument must include FILE option" "$LINENO" 5
+    elif test "$with_platform" = "no" ; then
+        as_fn_error $? "--without-platform is not a valid argument" "$LINENO" 5
+    elif test "$with_platform" != "" ; then
+        # if not an absolute path, check in contrib/platform
+        if test ! "`echo $with_platform | cut -c1`" = "/" && test ! "`echo $with_platform | cut -c2`" = ".." ; then
+            if test -r "${srcdir}/contrib/platform/$with_platform" ; then
+                with_platform="${srcdir}/contrib/platform/$with_platform"
+            fi
+        fi
+
+        # make sure file exists
+        if test ! -r "$with_platform" ; then
+            as_fn_error $? "platform file $with_platform not found" "$LINENO" 5
+        fi
+
+        # eval into environment
+
+# 1 is the message
+# 2 is whether to put a prefix or not
+if test -n ""; then
+    echo "configure:3082: Loading environment file $with_platform, with contents below" >&5
+else
+    echo Loading environment file $with_platform, with contents below >&5
+fi
+
+# 1 is the filename
+if test -n "$with_platform" && test -f "$with_platform"; then
+    cat $with_platform >&5
+fi
+
+        # setup by getting full pathname for the platform directories
+        platform_base="`dirname $with_platform`"
+        platform_file="`basename $with_platform`"
+        # get full pathname of where we are so we can return
+        platform_savedir="`pwd`"
+        # go to where the platform file is located
+        cd "$platform_base"
+        # get the full path to this location
+        platform_file_dir=`pwd`
+
+        . ./"$platform_file"
+
+        # see if they left us a name
+        if test "$PMIX_PLATFORM_LOADED" != "" ; then
+           platform_loaded="$PMIX_PLATFORM_LOADED"
+        else
+           platform_loaded="$with_platform"
+        fi
+        echo "Loaded platform arguments for $platform_loaded"
+
+# 1 is the message
+# 2 is whether to put a prefix or not
+if test -n ""; then
+    echo "configure:3115: Loaded platform arguments for $platform_loaded" >&5
+else
+    echo Loaded platform arguments for $platform_loaded >&5
+fi
+
+        # look for default mca param file
+
+        # return to where we started
+        cd "$platform_savedir"
+    fi
+
+
+# setup configure options (e.g., show_title and friends)
+
+
+# Some helper script functions.  Unfortunately, we cannot use  kinds
+# of arugments here because of the m4 substitution.  So we have to set
+# special variable names before invoking the function.  :-\
+
+pmix_show_title() {
+  cat <<EOF
+
+============================================================================
+== ${1}
+============================================================================
+EOF
+
+# 1 is the message
+# 2 is whether to put a prefix or not
+if test -n "1"; then
+    echo "configure:3145: === ${1}" >&5
+else
+    echo === ${1} >&5
+fi
+}
+
+
+pmix_show_subtitle() {
+  cat <<EOF
+
+*** ${1}
+EOF
+
+# 1 is the message
+# 2 is whether to put a prefix or not
+if test -n "1"; then
+    echo "configure:3161: *** ${1}" >&5
+else
+    echo *** ${1} >&5
+fi
+}
+
+
+pmix_show_subsubtitle() {
+  cat <<EOF
+
++++ ${1}
+EOF
+
+# 1 is the message
+# 2 is whether to put a prefix or not
+if test -n "1"; then
+    echo "configure:3177: +++ ${1}" >&5
+else
+    echo +++ ${1} >&5
+fi
+}
+
+pmix_show_subsubsubtitle() {
+  cat <<EOF
+
+--- ${1}
+EOF
+
+# 1 is the message
+# 2 is whether to put a prefix or not
+if test -n "1"; then
+    echo "configure:3192: --- ${1}" >&5
+else
+    echo --- ${1} >&5
+fi
+}
+
+pmix_show_verbose() {
+  if test "$V" = "1"; then
+      cat <<EOF
++++ VERBOSE: ${1}
+EOF
+
+# 1 is the message
+# 2 is whether to put a prefix or not
+if test -n "1"; then
+    echo "configure:3207: --- ${1}" >&5
+else
+    echo --- ${1} >&5
+fi
+  fi
+}
+
+#
+# Save some stats about this build
+#
+
+PMIX_CONFIGURE_USER="`whoami`"
+PMIX_CONFIGURE_HOST="`(hostname || uname -n) 2> /dev/null | sed 1q`"
+PMIX_CONFIGURE_DATE="`date`"
+
+#
+# Save these details so that they can be used in pmix_info later
+#
+
+
+
+pmix_show_title "Configuring PMIx"
+
+# This must be before AM_INIT_AUTOMAKE
+# Make sure we can run config.sub.
+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
+if ${ac_cv_build+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_build_alias=$build_alias
+test "x$ac_build_alias" = x &&
+  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+test "x$ac_build_alias" = x &&
+  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
+case $ac_cv_build in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
+esac
+build=$ac_cv_build
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_build
+shift
+build_cpu=$1
+build_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+build_os=$*
+IFS=$ac_save_IFS
+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+$as_echo_n "checking host system type... " >&6; }
+if ${ac_cv_host+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "x$host_alias" = x; then
+  ac_cv_host=$ac_cv_build
+else
+  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+$as_echo "$ac_cv_host" >&6; }
+case $ac_cv_host in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
+esac
+host=$ac_cv_host
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_host
+shift
+host_cpu=$1
+host_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+host_os=$*
+IFS=$ac_save_IFS
+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5
+$as_echo_n "checking target system type... " >&6; }
+if ${ac_cv_target+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "x$target_alias" = x; then
+  ac_cv_target=$ac_cv_host
+else
+  ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
+    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5
+$as_echo "$ac_cv_target" >&6; }
+case $ac_cv_target in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;;
+esac
+target=$ac_cv_target
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_target
+shift
+target_cpu=$1
+target_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+target_os=$*
+IFS=$ac_save_IFS
+case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac
+
+
+# The aliases save the names the user supplied, while $host etc.
+# will get canonicalized.
+test -n "$target_alias" &&
+  test "$program_prefix$program_suffix$program_transform_name" = \
+    NONENONEs,x,x, &&
+  program_prefix=${target_alias}-
+
+# Init automake
+am__api_version='1.15'
+
+# Find a good install program.  We prefer a C program (faster),
+# so one script is as good as another.  But avoid the broken or
+# incompatible versions:
+# SysV /etc/install, /usr/sbin/install
+# SunOS /usr/etc/install
+# IRIX /sbin/install
+# AIX /bin/install
+# AmigaOS /C/install, which installs bootblocks on floppy discs
+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+# OS/2's system install, which has a completely different semantic
+# ./install, which can be erroneously created by make from ./install.sh.
+# Reject install programs that cannot install multiple files.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
+$as_echo_n "checking for a BSD-compatible install... " >&6; }
+if test -z "$INSTALL"; then
+if ${ac_cv_path_install+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    # Account for people who put trailing slashes in PATH elements.
+case $as_dir/ in #((
+  ./ | .// | /[cC]/* | \
+  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
+  ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
+  /usr/ucb/* ) ;;
+  *)
+    # OSF1 and SCO ODT 3.0 have their own names for install.
+    # Don't use installbsd from OSF since it installs stuff as root
+    # by default.
+    for ac_prog in ginstall scoinst install; do
+      for ac_exec_ext in '' $ac_executable_extensions; do
+	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
+	  if test $ac_prog = install &&
+	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+	    # AIX install.  It has an incompatible calling convention.
+	    :
+	  elif test $ac_prog = install &&
+	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+	    # program-specific install script used by HP pwplus--don't use.
+	    :
+	  else
+	    rm -rf conftest.one conftest.two conftest.dir
+	    echo one > conftest.one
+	    echo two > conftest.two
+	    mkdir conftest.dir
+	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+	      test -s conftest.one && test -s conftest.two &&
+	      test -s conftest.dir/conftest.one &&
+	      test -s conftest.dir/conftest.two
+	    then
+	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+	      break 3
+	    fi
+	  fi
+	fi
+      done
+    done
+    ;;
+esac
+
+  done
+IFS=$as_save_IFS
+
+rm -rf conftest.one conftest.two conftest.dir
+
+fi
+  if test "${ac_cv_path_install+set}" = set; then
+    INSTALL=$ac_cv_path_install
+  else
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for INSTALL within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the value is a relative name.
+    INSTALL=$ac_install_sh
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
+$as_echo "$INSTALL" >&6; }
+
+# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+# It thinks the first close brace ends the variable substitution.
+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
+
+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
+$as_echo_n "checking whether build environment is sane... " >&6; }
+# Reject unsafe characters in $srcdir or the absolute working directory
+# name.  Accept space and tab only in the latter.
+am_lf='
+'
+case `pwd` in
+  *[\\\"\#\$\&\'\`$am_lf]*)
+    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
+esac
+case $srcdir in
+  *[\\\"\#\$\&\'\`$am_lf\ \	]*)
+    as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
+esac
+
+# Do 'set' in a subshell so we don't clobber the current shell's
+# arguments.  Must try -L first in case configure is actually a
+# symlink; some systems play weird games with the mod time of symlinks
+# (eg FreeBSD returns the mod time of the symlink's containing
+# directory).
+if (
+   am_has_slept=no
+   for am_try in 1 2; do
+     echo "timestamp, slept: $am_has_slept" > conftest.file
+     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+     if test "$*" = "X"; then
+	# -L didn't work.
+	set X `ls -t "$srcdir/configure" conftest.file`
+     fi
+     if test "$*" != "X $srcdir/configure conftest.file" \
+	&& test "$*" != "X conftest.file $srcdir/configure"; then
+
+	# If neither matched, then we have a broken ls.  This can happen
+	# if, for instance, CONFIG_SHELL is bash and it inherits a
+	# broken ls alias from the environment.  This has actually
+	# happened.  Such a system could not be considered "sane".
+	as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
+  alias in your environment" "$LINENO" 5
+     fi
+     if test "$2" = conftest.file || test $am_try -eq 2; then
+       break
+     fi
+     # Just in case.
+     sleep 1
+     am_has_slept=yes
+   done
+   test "$2" = conftest.file
+   )
+then
+   # Ok.
+   :
+else
+   as_fn_error $? "newly created file is older than distributed files!
+Check your system clock" "$LINENO" 5
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+  ( sleep 1 ) &
+  am_sleep_pid=$!
+fi
+
+rm -f conftest.file
+
+test "$program_prefix" != NONE &&
+  program_transform_name="s&^&$program_prefix&;$program_transform_name"
+# Use a double $ so make ignores it.
+test "$program_suffix" != NONE &&
+  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
+# Double any \ or $.
+# By default was `s,x,x', remove it if useless.
+ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
+program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
+
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
+
+if test x"${MISSING+set}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+  *)
+    MISSING="\${SHELL} $am_aux_dir/missing" ;;
+  esac
+fi
+# Use eval to expand $SHELL
+if eval "$MISSING --is-lightweight"; then
+  am_missing_run="$MISSING "
+else
+  am_missing_run=
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
+$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
+fi
+
+if test x"${install_sh+set}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
+  *)
+    install_sh="\${SHELL} $am_aux_dir/install-sh"
+  esac
+fi
+
+# Installed binaries are usually stripped using 'strip' when the user
+# run "make install-strip".  However 'strip' might not be the right
+# tool to use in cross-compilation environments, therefore Automake
+# will honor the 'STRIP' environment variable to overrule this program.
+if test "$cross_compiling" != no; then
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+set dummy ${ac_tool_prefix}strip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_STRIP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$STRIP"; then
+  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+STRIP=$ac_cv_prog_STRIP
+if test -n "$STRIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_STRIP"; then
+  ac_ct_STRIP=$STRIP
+  # Extract the first word of "strip", so it can be a program name with args.
+set dummy strip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_STRIP"; then
+  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_STRIP="strip"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+if test -n "$ac_ct_STRIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_STRIP" = x; then
+    STRIP=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    STRIP=$ac_ct_STRIP
+  fi
+else
+  STRIP="$ac_cv_prog_STRIP"
+fi
+
+fi
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
+$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
+if test -z "$MKDIR_P"; then
+  if ${ac_cv_path_mkdir+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in mkdir gmkdir; do
+	 for ac_exec_ext in '' $ac_executable_extensions; do
+	   as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
+	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
+	     'mkdir (GNU coreutils) '* | \
+	     'mkdir (coreutils) '* | \
+	     'mkdir (fileutils) '4.1*)
+	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
+	       break 3;;
+	   esac
+	 done
+       done
+  done
+IFS=$as_save_IFS
+
+fi
+
+  test -d ./--version && rmdir ./--version
+  if test "${ac_cv_path_mkdir+set}" = set; then
+    MKDIR_P="$ac_cv_path_mkdir -p"
+  else
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for MKDIR_P within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the value is a relative name.
+    MKDIR_P="$ac_install_sh -d"
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
+$as_echo "$MKDIR_P" >&6; }
+
+for ac_prog in gawk mawk nawk awk
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_AWK+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AWK"; then
+  ac_cv_prog_AWK="$AWK" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_AWK="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+AWK=$ac_cv_prog_AWK
+if test -n "$AWK"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
+$as_echo "$AWK" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$AWK" && break
+done
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+set x ${MAKE-make}
+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.make <<\_ACEOF
+SHELL = /bin/sh
+all:
+	@echo '@@@%%%=$(MAKE)=@@@%%%'
+_ACEOF
+# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
+case `${MAKE-make} -f conftest.make 2>/dev/null` in
+  *@@@%%%=?*=@@@%%%*)
+    eval ac_cv_prog_make_${ac_make}_set=yes;;
+  *)
+    eval ac_cv_prog_make_${ac_make}_set=no;;
+esac
+rm -f conftest.make
+fi
+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+  SET_MAKE=
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+  SET_MAKE="MAKE=${MAKE-make}"
+fi
+
+rm -rf .tst 2>/dev/null
+mkdir .tst 2>/dev/null
+if test -d .tst; then
+  am__leading_dot=.
+else
+  am__leading_dot=_
+fi
+rmdir .tst 2>/dev/null
+
+# Check whether --enable-silent-rules was given.
+if test "${enable_silent_rules+set}" = set; then :
+  enableval=$enable_silent_rules;
+fi
+
+case $enable_silent_rules in # (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=1;;
+esac
+am_make=${MAKE-make}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
+if ${am_cv_make_support_nested_variables+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if $as_echo 'TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+$as_echo "$am_cv_make_support_nested_variables" >&6; }
+if test $am_cv_make_support_nested_variables = yes; then
+    AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AM_BACKSLASH='\'
+
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+  # is not polluted with repeated "-I."
+  am__isrc=' -I$(srcdir)'
+  # test to see if srcdir already configured
+  if test -f $srcdir/config.status; then
+    as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
+  fi
+fi
+
+# test whether we have cygpath
+if test -z "$CYGPATH_W"; then
+  if (cygpath --version) >/dev/null 2>/dev/null; then
+    CYGPATH_W='cygpath -w'
+  else
+    CYGPATH_W=echo
+  fi
+fi
+
+
+# Define the identity of the package.
+ PACKAGE='pmix'
+ VERSION='2.0.1'
+
+
+# Some tools Automake needs.
+
+ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
+
+
+AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
+
+
+AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
+
+
+AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
+
+
+MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
+
+# For better backward compatibility.  To be removed once Automake 1.9.x
+# dies out for good.  For more background, see:
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+mkdir_p='$(MKDIR_P)'
+
+# We need awk for the "check" target (and possibly the TAP driver).  The
+# system "awk" is bad on some platforms.
+# Always define AMTAR for backward compatibility.  Yes, it's still used
+# in the wild :-(  We should find a proper way to deprecate it ...
+AMTAR='$${TAR-tar}'
+
+
+# We'll loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar  pax cpio none'
+
+am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
+
+
+
+
+
+
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes.  So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+  cat >&2 <<'END'
+Oops!
+
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present.  This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+
+Please tell bug-automake at gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message.  This
+can help us improve future automake versions.
+
+END
+  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+    echo 'Configuration will proceed anyway, since you have set the' >&2
+    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+    echo >&2
+  else
+    cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <http://www.gnu.org/software/coreutils/>.
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+    as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
+  fi
+fi
+
+
+# SILENT_RULES is new in AM 1.11, but we require 1.13.4 or higher via
+# autogen.  Limited testing shows that calling SILENT_RULES directly
+# works in more cases than adding "silent-rules" to INIT_AUTOMAKE
+# (even though they're supposed to be identical).  Shrug.
+# Check whether --enable-silent-rules was given.
+if test "${enable_silent_rules+set}" = set; then :
+  enableval=$enable_silent_rules;
+fi
+
+case $enable_silent_rules in # (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=0;;
+esac
+am_make=${MAKE-make}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
+if ${am_cv_make_support_nested_variables+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if $as_echo 'TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+$as_echo "$am_cv_make_support_nested_variables" >&6; }
+if test $am_cv_make_support_nested_variables = yes; then
+    AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AM_BACKSLASH='\'
+
+
+# set the language
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+# AC_USE_SYSTEM_EXTENSIONS will modify CFLAGS if nothing was in there
+# beforehand.  We don't want that.  So if there was nothing in
+# CFLAGS, put nothing back in there.
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in CFLAGS_save; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"CFLAGS_save\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+CFLAGS_save=$CFLAGS
+DEPDIR="${am__leading_dot}deps"
+
+ac_config_commands="$ac_config_commands depfiles"
+
+
+am_make=${MAKE-make}
+cat > confinc << 'END'
+am__doit:
+	@echo this is the am__doit target
+.PHONY: am__doit
+END
+# If we don't find an include directive, just comment out the code.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
+$as_echo_n "checking for style of include used by $am_make... " >&6; }
+am__include="#"
+am__quote=
+_am_result=none
+# First try GNU make style include.
+echo "include confinc" > confmf
+# Ignore all kinds of additional output from 'make'.
+case `$am_make -s -f confmf 2> /dev/null` in #(
+*the\ am__doit\ target*)
+  am__include=include
+  am__quote=
+  _am_result=GNU
+  ;;
+esac
+# Now try BSD make style include.
+if test "$am__include" = "#"; then
+   echo '.include "confinc"' > confmf
+   case `$am_make -s -f confmf 2> /dev/null` in #(
+   *the\ am__doit\ target*)
+     am__include=.include
+     am__quote="\""
+     _am_result=BSD
+     ;;
+   esac
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
+$as_echo "$_am_result" >&6; }
+rm -f confinc confmf
+
+# Check whether --enable-dependency-tracking was given.
+if test "${enable_dependency_tracking+set}" = set; then :
+  enableval=$enable_dependency_tracking;
+fi
+
+if test "x$enable_dependency_tracking" != xno; then
+  am_depcomp="$ac_aux_dir/depcomp"
+  AMDEPBACKSLASH='\'
+  am__nodep='_no'
+fi
+ if test "x$enable_dependency_tracking" != xno; then
+  AMDEP_TRUE=
+  AMDEP_FALSE='#'
+else
+  AMDEP_TRUE='#'
+  AMDEP_FALSE=
+fi
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}gcc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CC="${ac_tool_prefix}gcc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_CC"; then
+  ac_ct_CC=$CC
+  # Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_CC="gcc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+else
+  CC="$ac_cv_prog_CC"
+fi
+
+if test -z "$CC"; then
+          if test -n "$ac_tool_prefix"; then
+    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}cc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CC="${ac_tool_prefix}cc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  fi
+fi
+if test -z "$CC"; then
+  # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  ac_prog_rejected=no
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+       ac_prog_rejected=yes
+       continue
+     fi
+    ac_cv_prog_CC="cc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+if test $ac_prog_rejected = yes; then
+  # We found a bogon in the path, so make sure we never use it.
+  set dummy $ac_cv_prog_CC
+  shift
+  if test $# != 0; then
+    # We chose a different compiler from the bogus one.
+    # However, it has the same basename, so the bogon will be chosen
+    # first if we set CC to just the basename; use the full file name.
+    shift
+    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
+  fi
+fi
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$CC"; then
+  if test -n "$ac_tool_prefix"; then
+  for ac_prog in cl.exe
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$CC" && break
+  done
+fi
+if test -z "$CC"; then
+  ac_ct_CC=$CC
+  for ac_prog in cl.exe
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_CC="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_CC" && break
+done
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+fi
+
+fi
+
+
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "no acceptable C compiler found in \$PATH
+See \`config.log' for more details" "$LINENO" 5; }
+
+# Provide some information about the compiler.
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+for ac_option in --version -v -V -qversion; do
+  { { ac_try="$ac_compiler $ac_option >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    sed '10a\
+... rest of stderr output deleted ...
+         10q' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+  fi
+  rm -f conftest.er1 conftest.err
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+done
+
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
+# Try to create an executable without -o first, disregard a.out.
+# It will help us diagnose broken compilers, and finding out an intuition
+# of exeext.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+
+# The possible output files:
+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+
+ac_rmfiles=
+for ac_file in $ac_files
+do
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
+  esac
+done
+rm -f $ac_rmfiles
+
+if { { ac_try="$ac_link_default"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link_default") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
+  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
+# in a Makefile.  We should not override ac_cv_exeext if it was cached,
+# so that the user can short-circuit this test for compilers unknown to
+# Autoconf.
+for ac_file in $ac_files ''
+do
+  test -f "$ac_file" || continue
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
+	;;
+    [ab].out )
+	# We found the default executable, but exeext='' is most
+	# certainly right.
+	break;;
+    *.* )
+	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+	then :; else
+	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+	fi
+	# We set ac_cv_exeext here because the later test for it is not
+	# safe: cross compilers may not add the suffix if given an `-o'
+	# argument, so we may need to know it at that point already.
+	# Even if this section looks crufty: it has the advantage of
+	# actually working.
+	break;;
+    * )
+	break;;
+  esac
+done
+test "$ac_cv_exeext" = no && ac_cv_exeext=
+
+else
+  ac_file=''
+fi
+if test -z "$ac_file"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "C compiler cannot create executables
+See \`config.log' for more details" "$LINENO" 5; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
+ac_exeext=$ac_cv_exeext
+
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
+ac_clean_files=$ac_clean_files_save
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+$as_echo_n "checking for suffix of executables... " >&6; }
+if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
+  # If both `conftest.exe' and `conftest' are `present' (well, observable)
+# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
+# work properly (i.e., refer to `conftest.exe'), while it won't with
+# `rm'.
+for ac_file in conftest.exe conftest conftest.*; do
+  test -f "$ac_file" || continue
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+	  break;;
+    * ) break;;
+  esac
+done
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details" "$LINENO" 5; }
+fi
+rm -f conftest conftest$ac_cv_exeext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+$as_echo "$ac_cv_exeext" >&6; }
+
+rm -f conftest.$ac_ext
+EXEEXT=$ac_cv_exeext
+ac_exeext=$EXEEXT
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdio.h>
+int
+main ()
+{
+FILE *f = fopen ("conftest.out", "w");
+ return ferror (f) || fclose (f) != 0;
+
+  ;
+  return 0;
+}
+_ACEOF
+ac_clean_files="$ac_clean_files conftest.out"
+# Check that the compiler produces executables we can run.  If not, either
+# the compiler is broken, or we cross compile.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+if test "$cross_compiling" != yes; then
+  { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+  if { ac_try='./conftest$ac_cv_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then
+    cross_compiling=no
+  else
+    if test "$cross_compiling" = maybe; then
+	cross_compiling=yes
+    else
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details" "$LINENO" 5; }
+    fi
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
+
+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
+ac_clean_files=$ac_clean_files_save
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+$as_echo_n "checking for suffix of object files... " >&6; }
+if ${ac_cv_objext+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.o conftest.obj
+if { { ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compile") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
+  for ac_file in conftest.o conftest.obj conftest.*; do
+  test -f "$ac_file" || continue;
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
+    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
+       break;;
+  esac
+done
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details" "$LINENO" 5; }
+fi
+rm -f conftest.$ac_cv_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
+$as_echo "$ac_cv_objext" >&6; }
+OBJEXT=$ac_cv_objext
+ac_objext=$OBJEXT
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+if ${ac_cv_c_compiler_gnu+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+#ifndef __GNUC__
+       choke me
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_compiler_gnu=yes
+else
+  ac_compiler_gnu=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_c_compiler_gnu=$ac_compiler_gnu
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GCC=yes
+else
+  GCC=
+fi
+ac_test_CFLAGS=${CFLAGS+set}
+ac_save_CFLAGS=$CFLAGS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
+if ${ac_cv_prog_cc_g+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_save_c_werror_flag=$ac_c_werror_flag
+   ac_c_werror_flag=yes
+   ac_cv_prog_cc_g=no
+   CFLAGS="-g"
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_g=yes
+else
+  CFLAGS=""
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+  ac_c_werror_flag=$ac_save_c_werror_flag
+	 CFLAGS="-g"
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_g=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_c_werror_flag=$ac_save_c_werror_flag
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
+if test "$ac_test_CFLAGS" = set; then
+  CFLAGS=$ac_save_CFLAGS
+elif test $ac_cv_prog_cc_g = yes; then
+  if test "$GCC" = yes; then
+    CFLAGS="-g -O2"
+  else
+    CFLAGS="-g"
+  fi
+else
+  if test "$GCC" = yes; then
+    CFLAGS="-O2"
+  else
+    CFLAGS=
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+if ${ac_cv_prog_cc_c89+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_prog_cc_c89=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdarg.h>
+#include <stdio.h>
+struct stat;
+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
+struct buf { int x; };
+FILE * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+     char **p;
+     int i;
+{
+  return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+  char *s;
+  va_list v;
+  va_start (v,p);
+  s = g (p, va_arg (v,int));
+  va_end (v);
+  return s;
+}
+
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
+   function prototypes and stuff, but not '\xHH' hex character constants.
+   These don't provoke an error unfortunately, instead are silently treated
+   as 'x'.  The following induces an error, until -std is added to get
+   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
+   array size at least.  It's necessary to write '\x00'==0 to get something
+   that's true only with -std.  */
+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+   inside strings and character constants.  */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+int argc;
+char **argv;
+int
+main ()
+{
+return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
+  ;
+  return 0;
+}
+_ACEOF
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_c89=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext
+  test "x$ac_cv_prog_cc_c89" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+
+fi
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c89" in
+  x)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
+  xno)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
+  *)
+    CC="$CC $ac_cv_prog_cc_c89"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
+esac
+if test "x$ac_cv_prog_cc_c89" != xno; then :
+
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
+$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
+if ${am_cv_prog_cc_c_o+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
+   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
+$as_echo "$am_cv_prog_cc_c_o" >&6; }
+if test "$am_cv_prog_cc_c_o" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+depcc="$CC"   am_compiler_list=
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+$as_echo_n "checking dependency style of $depcc... " >&6; }
+if ${am_cv_CC_dependencies_compiler_type+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+  # We make a subdir and do the tests there.  Otherwise we can end up
+  # making bogus files that we don't know about and never remove.  For
+  # instance it was reported that on HP-UX the gcc test will end up
+  # making a dummy file named 'D' -- because '-MD' means "put the output
+  # in D".
+  rm -rf conftest.dir
+  mkdir conftest.dir
+  # Copy depcomp to subdir because otherwise we won't find it if we're
+  # using a relative directory.
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
+
+  am_cv_CC_dependencies_compiler_type=none
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+  fi
+  am__universal=false
+  case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac
+
+  for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
+    # We need to recreate these files for each test, as the compiler may
+    # overwrite some of them when testing with obscure command lines.
+    # This happens at least with the AIX C compiler.
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle '-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs.
+    am__obj=sub/conftest.${OBJEXT-o}
+    am__minus_obj="-o $am__obj"
+    case $depmode in
+    gcc)
+      # This depmode causes a compiler race in universal mode.
+      test "$am__universal" = false || continue
+      ;;
+    nosideeffect)
+      # After this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested.
+      if test "x$enable_dependency_tracking" = xyes; then
+	continue
+      else
+	break
+      fi
+      ;;
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+      # This compiler won't grok '-c -o', but also, the minuso test has
+      # not run yet.  These depmodes are late enough in the game, and
+      # so weak that their functioning should not be impacted.
+      am__obj=conftest.${OBJEXT-o}
+      am__minus_obj=
+      ;;
+    none) break ;;
+    esac
+    if depmode=$depmode \
+       source=sub/conftest.c object=$am__obj \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+        am_cv_CC_dependencies_compiler_type=$depmode
+        break
+      fi
+    fi
+  done
+
+  cd ..
+  rm -rf conftest.dir
+else
+  am_cv_CC_dependencies_compiler_type=none
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
+$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
+CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
+
+ if
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
+  am__fastdepCC_TRUE=
+  am__fastdepCC_FALSE='#'
+else
+  am__fastdepCC_TRUE='#'
+  am__fastdepCC_FALSE=
+fi
+
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
+# On Suns, sometimes $CPP names a directory.
+if test -n "$CPP" && test -d "$CPP"; then
+  CPP=
+fi
+if test -z "$CPP"; then
+  if ${ac_cv_prog_CPP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+      # Double quotes because CPP needs to be expanded
+    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+    do
+      ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+  break
+fi
+
+    done
+    ac_cv_prog_CPP=$CPP
+
+fi
+  CPP=$ac_cv_prog_CPP
+else
+  ac_cv_prog_CPP=$CPP
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
+ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5; }
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
+if ${ac_cv_path_GREP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$GREP"; then
+  ac_path_GREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in grep ggrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_GREP" || continue
+# Check for GNU ac_path_GREP and select it if it is found.
+  # Check for GNU $ac_path_GREP
+case `"$ac_path_GREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo 'GREP' >> "conftest.nl"
+    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_GREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_GREP="$ac_path_GREP"
+      ac_path_GREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_GREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_GREP"; then
+    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
+else
+  ac_cv_path_GREP=$GREP
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
+$as_echo "$ac_cv_path_GREP" >&6; }
+ GREP="$ac_cv_path_GREP"
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
+if ${ac_cv_path_EGREP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+   then ac_cv_path_EGREP="$GREP -E"
+   else
+     if test -z "$EGREP"; then
+  ac_path_EGREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in egrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_EGREP" || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
+  # Check for GNU $ac_path_EGREP
+case `"$ac_path_EGREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo 'EGREP' >> "conftest.nl"
+    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_EGREP="$ac_path_EGREP"
+      ac_path_EGREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_EGREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_EGREP"; then
+    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
+else
+  ac_cv_path_EGREP=$EGREP
+fi
+
+   fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
+ EGREP="$ac_cv_path_EGREP"
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
+if ${ac_cv_header_stdc+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_header_stdc=yes
+else
+  ac_cv_header_stdc=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+if test $ac_cv_header_stdc = yes; then
+  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <string.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "memchr" >/dev/null 2>&1; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "free" >/dev/null 2>&1; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+  if test "$cross_compiling" = yes; then :
+  :
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ctype.h>
+#include <stdlib.h>
+#if ((' ' & 0x0FF) == 0x020)
+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+#else
+# define ISLOWER(c) \
+		   (('a' <= (c) && (c) <= 'i') \
+		     || ('j' <= (c) && (c) <= 'r') \
+		     || ('s' <= (c) && (c) <= 'z'))
+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+#endif
+
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+int
+main ()
+{
+  int i;
+  for (i = 0; i < 256; i++)
+    if (XOR (islower (i), ISLOWER (i))
+	|| toupper (i) != TOUPPER (i))
+      return 2;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
+if test $ac_cv_header_stdc = yes; then
+
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
+
+fi
+
+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+		  inttypes.h stdint.h unistd.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+
+  ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default"
+if test "x$ac_cv_header_minix_config_h" = xyes; then :
+  MINIX=yes
+else
+  MINIX=
+fi
+
+
+  if test "$MINIX" = yes; then
+
+$as_echo "#define _POSIX_SOURCE 1" >>confdefs.h
+
+
+$as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h
+
+
+$as_echo "#define _MINIX 1" >>confdefs.h
+
+  fi
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
+$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
+if ${ac_cv_safe_to_define___extensions__+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#         define __EXTENSIONS__ 1
+          $ac_includes_default
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_safe_to_define___extensions__=yes
+else
+  ac_cv_safe_to_define___extensions__=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
+$as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
+  test $ac_cv_safe_to_define___extensions__ = yes &&
+    $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h
+
+  $as_echo "#define _ALL_SOURCE 1" >>confdefs.h
+
+  $as_echo "#define _GNU_SOURCE 1" >>confdefs.h
+
+  $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
+
+  $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h
+
+
+if test -z "$CFLAGS_save"; then :
+  CFLAGS=
+fi
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+####################################################################
+# Setup the configure header files
+####################################################################
+
+
+
+
+############################################################################
+# Setup Libtool
+############################################################################
+
+# We want new Libtool.  None of that old stuff.  Pfft.
+
+
+
+#
+# Enable static so that we have the --with tests done up here and can
+# check for OS.  Save the values of $enable_static and $enable_shared
+# before setting the defaults, because if the user specified
+# --[en|dis]able-[static|shared] on the command line, they'll already
+# be set.  In this way, we can tell if the user requested something or
+# if the default was set here.
+#
+
+pmix_enable_shared="$enable_shared"
+pmix_enable_static="$enable_static"
+# Check whether --enable-shared was given.
+if test "${enable_shared+set}" = set; then :
+  enableval=$enable_shared; p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_shared=yes ;;
+    no) enable_shared=no ;;
+    *)
+      enable_shared=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+      for pkg in $enableval; do
+	IFS=$lt_save_ifs
+	if test "X$pkg" = "X$p"; then
+	  enable_shared=yes
+	fi
+      done
+      IFS=$lt_save_ifs
+      ;;
+    esac
+else
+  enable_shared=yes
+fi
+
+
+
+
+
+
+
+
+
+# Check whether --enable-static was given.
+if test "${enable_static+set}" = set; then :
+  enableval=$enable_static; p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_static=yes ;;
+    no) enable_static=no ;;
+    *)
+     enable_static=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+      for pkg in $enableval; do
+	IFS=$lt_save_ifs
+	if test "X$pkg" = "X$p"; then
+	  enable_static=yes
+	fi
+      done
+      IFS=$lt_save_ifs
+      ;;
+    esac
+else
+  enable_static=no
+fi
+
+
+
+
+
+
+
+
+
+
+# This did not exist pre AM 1.11.x (where x is somewhere >0 and <3),
+# but it is necessary in AM 1.12.x.
+if test -n "$ac_tool_prefix"; then
+  for ac_prog in ar lib "link -lib"
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_AR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AR"; then
+  ac_cv_prog_AR="$AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+AR=$ac_cv_prog_AR
+if test -n "$AR"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+$as_echo "$AR" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$AR" && break
+  done
+fi
+if test -z "$AR"; then
+  ac_ct_AR=$AR
+  for ac_prog in ar lib "link -lib"
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_AR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_AR"; then
+  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_AR="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_AR=$ac_cv_prog_ac_ct_AR
+if test -n "$ac_ct_AR"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+$as_echo "$ac_ct_AR" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_AR" && break
+done
+
+  if test "x$ac_ct_AR" = x; then
+    AR="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    AR=$ac_ct_AR
+  fi
+fi
+
+: ${AR=ar}
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the archiver ($AR) interface" >&5
+$as_echo_n "checking the archiver ($AR) interface... " >&6; }
+if ${am_cv_ar_interface+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+   am_cv_ar_interface=ar
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+int some_variable = 0;
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  am_ar_try='$AR cru libconftest.a conftest.$ac_objext >&5'
+      { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$am_ar_try\""; } >&5
+  (eval $am_ar_try) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+      if test "$ac_status" -eq 0; then
+        am_cv_ar_interface=ar
+      else
+        am_ar_try='$AR -NOLOGO -OUT:conftest.lib conftest.$ac_objext >&5'
+        { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$am_ar_try\""; } >&5
+  (eval $am_ar_try) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+        if test "$ac_status" -eq 0; then
+          am_cv_ar_interface=lib
+        else
+          am_cv_ar_interface=unknown
+        fi
+      fi
+      rm -f conftest.lib libconftest.a
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_ar_interface" >&5
+$as_echo "$am_cv_ar_interface" >&6; }
+
+case $am_cv_ar_interface in
+ar)
+  ;;
+lib)
+  # Microsoft lib, so override with the ar-lib wrapper script.
+  # FIXME: It is wrong to rewrite AR.
+  # But if we don't then we get into trouble of one sort or another.
+  # A longer-term fix would be to have automake use am__AR in this case,
+  # and then we could set am__AR="$am_aux_dir/ar-lib \$(AR)" or something
+  # similar.
+  AR="$am_aux_dir/ar-lib $AR"
+  ;;
+unknown)
+  as_fn_error $? "could not determine $AR interface" "$LINENO" 5
+  ;;
+esac
+
+for ac_prog in flex lex
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_LEX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$LEX"; then
+  ac_cv_prog_LEX="$LEX" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_LEX="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+LEX=$ac_cv_prog_LEX
+if test -n "$LEX"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LEX" >&5
+$as_echo "$LEX" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$LEX" && break
+done
+test -n "$LEX" || LEX=":"
+
+if test "x$LEX" != "x:"; then
+  cat >conftest.l <<_ACEOF
+%%
+a { ECHO; }
+b { REJECT; }
+c { yymore (); }
+d { yyless (1); }
+e { /* IRIX 6.5 flex 2.5.4 underquotes its yyless argument.  */
+    yyless ((input () != 0)); }
+f { unput (yytext[0]); }
+. { BEGIN INITIAL; }
+%%
+#ifdef YYTEXT_POINTER
+extern char *yytext;
+#endif
+int
+main (void)
+{
+  return ! yylex () + ! yywrap ();
+}
+_ACEOF
+{ { ac_try="$LEX conftest.l"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$LEX conftest.l") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking lex output file root" >&5
+$as_echo_n "checking lex output file root... " >&6; }
+if ${ac_cv_prog_lex_root+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+if test -f lex.yy.c; then
+  ac_cv_prog_lex_root=lex.yy
+elif test -f lexyy.c; then
+  ac_cv_prog_lex_root=lexyy
+else
+  as_fn_error $? "cannot find output from $LEX; giving up" "$LINENO" 5
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_root" >&5
+$as_echo "$ac_cv_prog_lex_root" >&6; }
+LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
+
+if test -z "${LEXLIB+set}"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking lex library" >&5
+$as_echo_n "checking lex library... " >&6; }
+if ${ac_cv_lib_lex+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+    ac_save_LIBS=$LIBS
+    ac_cv_lib_lex='none needed'
+    for ac_lib in '' -lfl -ll; do
+      LIBS="$ac_lib $ac_save_LIBS"
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+`cat $LEX_OUTPUT_ROOT.c`
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_lex=$ac_lib
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+      test "$ac_cv_lib_lex" != 'none needed' && break
+    done
+    LIBS=$ac_save_LIBS
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lex" >&5
+$as_echo "$ac_cv_lib_lex" >&6; }
+  test "$ac_cv_lib_lex" != 'none needed' && LEXLIB=$ac_cv_lib_lex
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether yytext is a pointer" >&5
+$as_echo_n "checking whether yytext is a pointer... " >&6; }
+if ${ac_cv_prog_lex_yytext_pointer+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  # POSIX says lex can declare yytext either as a pointer or an array; the
+# default is implementation-dependent.  Figure out which it is, since
+# not all implementations provide the %pointer and %array declarations.
+ac_cv_prog_lex_yytext_pointer=no
+ac_save_LIBS=$LIBS
+LIBS="$LEXLIB $ac_save_LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+  #define YYTEXT_POINTER 1
+`cat $LEX_OUTPUT_ROOT.c`
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_prog_lex_yytext_pointer=yes
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_save_LIBS
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_yytext_pointer" >&5
+$as_echo "$ac_cv_prog_lex_yytext_pointer" >&6; }
+if test $ac_cv_prog_lex_yytext_pointer = yes; then
+
+$as_echo "#define YYTEXT_POINTER 1" >>confdefs.h
+
+fi
+rm -f conftest.l $LEX_OUTPUT_ROOT.c
+
+fi
+if test "$LEX" = :; then
+  LEX=${am_missing_run}flex
+fi
+
+############################################################################
+# Configuration options
+############################################################################
+
+# Define PMIx configure arguments
+
+    # do we want dlopen support ?
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if want dlopen support" >&5
+$as_echo_n "checking if want dlopen support... " >&6; }
+    # Check whether --enable-dlopen was given.
+if test "${enable_dlopen+set}" = set; then :
+  enableval=$enable_dlopen;
+fi
+
+    if test "$enable_dlopen" = "no"; then :
+  enable_mca_dso="no"
+           enable_mca_static="yes"
+           PMIX_ENABLE_DLOPEN_SUPPORT=0
+           { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+else
+  PMIX_ENABLE_DLOPEN_SUPPORT=1
+           { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_ENABLE_DLOPEN_SUPPORT $PMIX_ENABLE_DLOPEN_SUPPORT
+_ACEOF
+
+
+    # Embedded mode, or standalone?
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if embedded mode is enabled" >&5
+$as_echo_n "checking if embedded mode is enabled... " >&6; }
+    # Check whether --enable-embedded-mode was given.
+if test "${enable_embedded_mode+set}" = set; then :
+  enableval=$enable_embedded_mode;
+fi
+
+    if test ! -z "$enable_embedded_mode" && test "$enable_embedded_mode" = "yes"; then :
+  pmix_mode=embedded
+           pmix_install_primary_headers=no
+           { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  pmix_mode=standalone
+           pmix_install_primary_headers=yes
+           { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+#
+# Is this a developer copy?
+#
+
+if test -d .git; then
+    PMIX_DEVEL=1
+else
+    PMIX_DEVEL=0
+fi
+
+
+#
+# Developer picky compiler options
+#
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if want developer-level compiler pickyness" >&5
+$as_echo_n "checking if want developer-level compiler pickyness... " >&6; }
+# Check whether --enable-picky was given.
+if test "${enable_picky+set}" = set; then :
+  enableval=$enable_picky;
+fi
+
+if test "$enable_picky" = "yes"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+    WANT_PICKY_COMPILER=1
+else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    WANT_PICKY_COMPILER=0
+fi
+#################### Early development override ####################
+if test "$WANT_PICKY_COMPILER" = "0" && test -z "$enable_picky" && test "$PMIX_DEVEL" = "1"; then
+    WANT_PICKY_COMPILER=1
+    echo "--> developer override: enable picky compiler by default"
+fi
+#################### Early development override ####################
+
+#
+# Developer debugging
+#
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if want developer-level debugging code" >&5
+$as_echo_n "checking if want developer-level debugging code... " >&6; }
+# Check whether --enable-debug was given.
+if test "${enable_debug+set}" = set; then :
+  enableval=$enable_debug;
+fi
+
+if test "$enable_debug" = "yes"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+    WANT_DEBUG=1
+else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    WANT_DEBUG=0
+fi
+#################### Early development override ####################
+if test "$WANT_DEBUG" = "0" && test -z "$enable_debug" && test "$PMIX_DEVEL" = "1"; then
+    WANT_DEBUG=1
+    echo "--> developer override: enable debugging code by default"
+fi
+#################### Early development override ####################
+if test "$WANT_DEBUG" = "0"; then
+    CFLAGS="-DNDEBUG $CFLAGS"
+    CXXFLAGS="-DNDEBUG $CXXFLAGS"
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_ENABLE_DEBUG $WANT_DEBUG
+_ACEOF
+
+
+# Check whether --enable-debug-symbols was given.
+if test "${enable_debug_symbols+set}" = set; then :
+  enableval=$enable_debug_symbols;
+fi
+
+
+#
+# Do we want to install the internal devel headers?
+#
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if want to install project-internal header files" >&5
+$as_echo_n "checking if want to install project-internal header files... " >&6; }
+
+# Check whether --with-devel-headers was given.
+if test "${with_devel_headers+set}" = set; then :
+  withval=$with_devel_headers;
+fi
+
+if test "$with_devel_headers" = "yes"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+    WANT_INSTALL_HEADERS=1
+    pmix_install_primary_headers=yes
+else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    WANT_INSTALL_HEADERS=0
+fi
+
+# Install tests and examples?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if tests and examples are to be installed" >&5
+$as_echo_n "checking if tests and examples are to be installed... " >&6; }
+
+# Check whether --with-tests-examples was given.
+if test "${with_tests_examples+set}" = set; then :
+  withval=$with_tests_examples;
+fi
+
+if test "$pmix_install_primary_headers" = "no"; then :
+  if test -z "$with_tests_examples" || test "$with_tests_examples" = "no"; then :
+  pmix_tests=no
+              { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+              { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot install tests/examples without installing primary headers." >&5
+$as_echo "$as_me: WARNING: Cannot install tests/examples without installing primary headers." >&2;}
+              { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This situation arises when configured in embedded mode" >&5
+$as_echo "$as_me: WARNING: This situation arises when configured in embedded mode" >&2;}
+              { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: and without devel headers." >&5
+$as_echo "$as_me: WARNING: and without devel headers." >&2;}
+              as_fn_error $? "Please correct the configure line and retry" "$LINENO" 5
+fi
+else
+  if test ! -z "$with_tests_examples" && test "$with_tests_examples" = "no"; then :
+  pmix_tests=no
+              { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+else
+  pmix_tests=yes
+              { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+fi
+fi
+
+#
+# Support per-user config files?
+#
+# Check whether --enable-per-user-config-files was given.
+if test "${enable_per_user_config_files+set}" = set; then :
+  enableval=$enable_per_user_config_files;
+fi
+
+if test "$enable_per_user_config_files" = "no" ; then
+  result=0
+else
+  result=1
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_WANT_HOME_CONFIG_FILES $result
+_ACEOF
+
+
+#
+# Do we want the pretty-print stack trace feature?
+#
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if want pretty-print stacktrace" >&5
+$as_echo_n "checking if want pretty-print stacktrace... " >&6; }
+# Check whether --enable-pretty-print-stacktrace was given.
+if test "${enable_pretty_print_stacktrace+set}" = set; then :
+  enableval=$enable_pretty_print_stacktrace;
+fi
+
+if test "$enable_pretty_print_stacktrace" = "no" ; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    WANT_PRETTY_PRINT_STACKTRACE=0
+else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+    WANT_PRETTY_PRINT_STACKTRACE=1
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_WANT_PRETTY_PRINT_STACKTRACE $WANT_PRETTY_PRINT_STACKTRACE
+_ACEOF
+
+
+# Do we want the shared memory datastore usage?
+#
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if want shared memory datastore" >&5
+$as_echo_n "checking if want shared memory datastore... " >&6; }
+# Check whether --enable-dstore was given.
+if test "${enable_dstore+set}" = set; then :
+  enableval=$enable_dstore;
+fi
+
+if test "$enable_dstore" = "no" ; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    WANT_DSTORE=0
+else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+    WANT_DSTORE=1
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_ENABLE_DSTORE $WANT_DSTORE
+_ACEOF
+
+
+#
+#
+# Use pthread-based locking
+#
+DSTORE_PTHREAD_LOCK="1"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if want dstore pthread-based locking" >&5
+$as_echo_n "checking if want dstore pthread-based locking... " >&6; }
+# Check whether --enable-dstore-pthlck was given.
+if test "${enable_dstore_pthlck+set}" = set; then :
+  enableval=$enable_dstore_pthlck;
+fi
+
+if test "$enable_dstore_pthlck" = "no" ; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    DSTORE_PTHREAD_LOCK="0"
+else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+    DSTORE_PTHREAD_LOCK="1"
+fi
+
+#
+# Ident string
+#
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if want ident string" >&5
+$as_echo_n "checking if want ident string... " >&6; }
+
+# Check whether --with-ident-string was given.
+if test "${with_ident_string+set}" = set; then :
+  withval=$with_ident_string;
+fi
+
+if test "$with_ident_string" = "" || test "$with_ident_string" = "no"; then
+    with_ident_string="%VERSION%"
+fi
+# This is complicated, because $PMIX_VERSION may have spaces in it.
+# So put the whole sed expr in single quotes -- i.e., directly
+# substitute %VERSION% for (not expanded) $PMIX_VERSION.
+with_ident_string="`echo $with_ident_string | sed -e 's/%VERSION%/$PMIX_VERSION/'`"
+
+# Now eval an echo of that so that the "$PMIX_VERSION" token is
+# replaced with its value.  Enclose the whole thing in "" so that it
+# ends up as 1 token.
+with_ident_string="`eval echo $with_ident_string`"
+
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_IDENT_STRING "$with_ident_string"
+_ACEOF
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_ident_string" >&5
+$as_echo "$with_ident_string" >&6; }
+
+#
+# Timing support
+#
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if want developer-level timing support" >&5
+$as_echo_n "checking if want developer-level timing support... " >&6; }
+# Check whether --enable-pmix-timing was given.
+if test "${enable_pmix_timing+set}" = set; then :
+  enableval=$enable_pmix_timing;
+fi
+
+if test "$enable_pmix_timing" = "yes"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+    WANT_PMIX_TIMING=1
+else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    WANT_PMIX_TIMING=0
+fi
+
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_ENABLE_TIMING $WANT_PMIX_TIMING
+_ACEOF
+
+
+#
+# Install header files
+#
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if want to head developer-level header files" >&5
+$as_echo_n "checking if want to head developer-level header files... " >&6; }
+
+# Check whether --with-devel-headers was given.
+if test "${with_devel_headers+set}" = set; then :
+  withval=$with_devel_headers;
+fi
+
+if test "$with_devel_headers" = "yes"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+    WANT_INSTALL_HEADERS=1
+else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    WANT_INSTALL_HEADERS=0
+fi
+
+#
+# Install backward compatibility support for PMI-1 and PMI-2
+#
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if want backward compatibility for PMI-1 and PMI-2" >&5
+$as_echo_n "checking if want backward compatibility for PMI-1 and PMI-2... " >&6; }
+# Check whether --enable-pmi-backward-compatibility was given.
+if test "${enable_pmi_backward_compatibility+set}" = set; then :
+  enableval=$enable_pmi_backward_compatibility;
+fi
+
+if test "$enable_pmi_backward_compatibility" = "no"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    WANT_PMI_BACKWARD=0
+else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+    WANT_PMI_BACKWARD=1
+fi
+
+ if test $WANT_INSTALL_HEADERS -eq 1; then
+  WANT_INSTALL_HEADERS_TRUE=
+  WANT_INSTALL_HEADERS_FALSE='#'
+else
+  WANT_INSTALL_HEADERS_TRUE='#'
+  WANT_INSTALL_HEADERS_FALSE=
+fi
+
+
+# Define some basic useful values
+
+#
+# Save some stats about this build
+#
+
+PMIX_CONFIGURE_USER="`whoami`"
+PMIX_CONFIGURE_HOST="`(hostname || uname -n) 2> /dev/null | sed 1q`"
+PMIX_CONFIGURE_DATE="`date`"
+
+#
+# Make automake clean emacs ~ files for "make clean"
+#
+
+CLEANFILES="*~ .\#*"
+
+
+#
+# See if we can find an old installation of PMIX to overwrite
+#
+
+# Stupid autoconf 2.54 has a bug in AC_PREFIX_PROGRAM -- if pmix_clean
+# is not found in the path and the user did not specify --prefix,
+# we'll get a $prefix of "."
+
+pmix_prefix_save="$prefix"
+if test "x$prefix" = xNONE; then
+  $as_echo_n "checking for prefix by " >&6
+  # Extract the first word of "pmix_clean", so it can be a program name with args.
+set dummy pmix_clean; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_prefix_program+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ac_prefix_program in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_prefix_program="$ac_prefix_program" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_ac_prefix_program="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+ac_prefix_program=$ac_cv_path_ac_prefix_program
+if test -n "$ac_prefix_program"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_prefix_program" >&5
+$as_echo "$ac_prefix_program" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  if test -n "$ac_prefix_program"; then
+    prefix=`$as_dirname -- "$ac_prefix_program" ||
+$as_expr X"$ac_prefix_program" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$ac_prefix_program" : 'X\(//\)[^/]' \| \
+	 X"$ac_prefix_program" : 'X\(//\)$' \| \
+	 X"$ac_prefix_program" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$ac_prefix_program" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+    prefix=`$as_dirname -- "$prefix" ||
+$as_expr X"$prefix" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$prefix" : 'X\(//\)[^/]' \| \
+	 X"$prefix" : 'X\(//\)$' \| \
+	 X"$prefix" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$prefix" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+  fi
+fi
+
+if test "$prefix" = "."; then
+    prefix="$pmix_prefix_save"
+fi
+unset pmix_prefix_save
+
+#
+# Basic sanity checking; we can't install to a relative path
+#
+
+case "$prefix" in
+  /*/bin)
+    prefix="`dirname $prefix`"
+    echo installing to directory \"$prefix\"
+    ;;
+  /*)
+    echo installing to directory \"$prefix\"
+    ;;
+  NONE)
+    echo installing to directory \"$ac_default_prefix\"
+    ;;
+  [a-zA-Z]:*)
+    echo installing to directory \"$prefix\"
+    ;;
+  *)
+    as_fn_error $? "prefix \"$prefix\" must be an absolute directory path" "$LINENO" 5
+    ;;
+esac
+
+# BEGIN: Derived from GASNet
+
+# Suggestion from Paul Hargrove to disable --program-prefix and
+# friends.  Heavily influenced by GASNet 1.12 acinclude.m4
+# functionality to do the same thing (copyright listed at top of this
+# file).
+
+# echo program_prefix=$program_prefix  program_suffix=$program_suffix program_transform_name=$program_transform_name
+# undo prefix autoconf automatically adds during cross-compilation
+if test "$cross_compiling" = yes && test "$program_prefix" = "${target_alias}-" ; then
+    program_prefix=NONE
+fi
+# normalize empty prefix/suffix
+if test -z "$program_prefix" ; then
+    program_prefix=NONE
+fi
+if test -z "$program_suffix" ; then
+    program_suffix=NONE
+fi
+# undo transforms caused by empty prefix/suffix
+if expr "$program_transform_name" : 's.^..$' >/dev/null || \
+   expr "$program_transform_name" : 's.$$..$' >/dev/null || \
+   expr "$program_transform_name" : 's.$$..;s.^..$' >/dev/null ; then
+    program_transform_name="s,x,x,"
+fi
+if test "$program_prefix$program_suffix$program_transform_name" != "NONENONEs,x,x," ; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** The PMIx configure script does not support --program-prefix, --program-suffix or --program-transform-name. Users are recommended to instead use --prefix with a unique directory and make symbolic links as desired for renaming." >&5
+$as_echo "$as_me: WARNING: *** The PMIx configure script does not support --program-prefix, --program-suffix or --program-transform-name. Users are recommended to instead use --prefix with a unique directory and make symbolic links as desired for renaming." >&2;}
+    as_fn_error $? "*** Cannot continue" "$LINENO" 5
+fi
+
+# END: Derived from GASNet
+
+
+# If debug mode, add -g
+if test "$pmix_debug" = "1"; then :
+  CFLAGS="$CFLAGS -g"
+fi
+
+case `pwd` in
+  *\ * | *\	*)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
+$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
+esac
+
+
+
+macro_version='2.4.6'
+macro_revision='2.4.6'
+
+
+
+
+
+
+
+
+
+
+
+
+
+ltmain=$ac_aux_dir/ltmain.sh
+
+# Backslashify metacharacters that are still active within
+# double-quoted strings.
+sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\(["`\\]\)/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+
+ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
+$as_echo_n "checking how to print strings... " >&6; }
+# Test print first, because it will be a builtin if present.
+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
+   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='print -r --'
+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='printf %s\n'
+else
+  # Use this function as a fallback that always works.
+  func_fallback_echo ()
+  {
+    eval 'cat <<_LTECHO_EOF
+$1
+_LTECHO_EOF'
+  }
+  ECHO='func_fallback_echo'
+fi
+
+# func_echo_all arg...
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+    $ECHO ""
+}
+
+case $ECHO in
+  printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
+$as_echo "printf" >&6; } ;;
+  print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
+$as_echo "print -r" >&6; } ;;
+  *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5
+$as_echo "cat" >&6; } ;;
+esac
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
+$as_echo_n "checking for a sed that does not truncate output... " >&6; }
+if ${ac_cv_path_SED+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+            ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+     for ac_i in 1 2 3 4 5 6 7; do
+       ac_script="$ac_script$as_nl$ac_script"
+     done
+     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
+     { ac_script=; unset ac_script;}
+     if test -z "$SED"; then
+  ac_path_SED_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in sed gsed; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_SED" || continue
+# Check for GNU ac_path_SED and select it if it is found.
+  # Check for GNU $ac_path_SED
+case `"$ac_path_SED" --version 2>&1` in
+*GNU*)
+  ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo '' >> "conftest.nl"
+    "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_SED_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_SED="$ac_path_SED"
+      ac_path_SED_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_SED_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_SED"; then
+    as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
+  fi
+else
+  ac_cv_path_SED=$SED
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
+$as_echo "$ac_cv_path_SED" >&6; }
+ SED="$ac_cv_path_SED"
+  rm -f conftest.sed
+
+test -z "$SED" && SED=sed
+Xsed="$SED -e 1s/^X//"
+
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
+$as_echo_n "checking for fgrep... " >&6; }
+if ${ac_cv_path_FGREP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
+   then ac_cv_path_FGREP="$GREP -F"
+   else
+     if test -z "$FGREP"; then
+  ac_path_FGREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in fgrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_FGREP" || continue
+# Check for GNU ac_path_FGREP and select it if it is found.
+  # Check for GNU $ac_path_FGREP
+case `"$ac_path_FGREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo 'FGREP' >> "conftest.nl"
+    "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_FGREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_FGREP="$ac_path_FGREP"
+      ac_path_FGREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_FGREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_FGREP"; then
+    as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
+else
+  ac_cv_path_FGREP=$FGREP
+fi
+
+   fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
+$as_echo "$ac_cv_path_FGREP" >&6; }
+ FGREP="$ac_cv_path_FGREP"
+
+
+test -z "$GREP" && GREP=grep
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Check whether --with-gnu-ld was given.
+if test "${with_gnu_ld+set}" = set; then :
+  withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes
+else
+  with_gnu_ld=no
+fi
+
+ac_prog=ld
+if test yes = "$GCC"; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
+$as_echo_n "checking for ld used by $CC... " >&6; }
+  case $host in
+  *-*-mingw*)
+    # gcc leaves a trailing carriage return, which upsets mingw
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+  *)
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  esac
+  case $ac_prog in
+    # Accept absolute paths.
+    [\\/]* | ?:[\\/]*)
+      re_direlt='/[^/][^/]*/\.\./'
+      # Canonicalize the pathname of ld
+      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
+      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
+	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
+      done
+      test -z "$LD" && LD=$ac_prog
+      ;;
+  "")
+    # If it fails, then pretend we aren't using GCC.
+    ac_prog=ld
+    ;;
+  *)
+    # If it is relative, then search for the first ld in PATH.
+    with_gnu_ld=unknown
+    ;;
+  esac
+elif test yes = "$with_gnu_ld"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+$as_echo_n "checking for GNU ld... " >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+$as_echo_n "checking for non-GNU ld... " >&6; }
+fi
+if ${lt_cv_path_LD+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$LD"; then
+  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
+  for ac_dir in $PATH; do
+    IFS=$lt_save_ifs
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      lt_cv_path_LD=$ac_dir/$ac_prog
+      # Check to see if the program is GNU ld.  I'd rather use --version,
+      # but apparently some variants of GNU ld only accept -v.
+      # Break only if it was the GNU/non-GNU ld that we prefer.
+      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+      *GNU* | *'with BFD'*)
+	test no != "$with_gnu_ld" && break
+	;;
+      *)
+	test yes != "$with_gnu_ld" && break
+	;;
+      esac
+    fi
+  done
+  IFS=$lt_save_ifs
+else
+  lt_cv_path_LD=$LD # Let the user override the test with a path.
+fi
+fi
+
+LD=$lt_cv_path_LD
+if test -n "$LD"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+$as_echo "$LD" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+if ${lt_cv_prog_gnu_ld+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  # I'd rather use --version here, but apparently some GNU lds only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  lt_cv_prog_gnu_ld=yes
+  ;;
+*)
+  lt_cv_prog_gnu_ld=no
+  ;;
+esac
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
+$as_echo "$lt_cv_prog_gnu_ld" >&6; }
+with_gnu_ld=$lt_cv_prog_gnu_ld
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
+$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
+if ${lt_cv_path_NM+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$NM"; then
+  # Let the user override the test.
+  lt_cv_path_NM=$NM
+else
+  lt_nm_to_check=${ac_tool_prefix}nm
+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+    lt_nm_to_check="$lt_nm_to_check nm"
+  fi
+  for lt_tmp_nm in $lt_nm_to_check; do
+    lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+      IFS=$lt_save_ifs
+      test -z "$ac_dir" && ac_dir=.
+      tmp_nm=$ac_dir/$lt_tmp_nm
+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then
+	# Check to see if the nm accepts a BSD-compat flag.
+	# Adding the 'sed 1q' prevents false positives on HP-UX, which says:
+	#   nm: unknown option "B" ignored
+	# Tru64's nm complains that /dev/null is an invalid object file
+	# MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty
+	case $build_os in
+	mingw*) lt_bad_file=conftest.nm/nofile ;;
+	*) lt_bad_file=/dev/null ;;
+	esac
+	case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in
+	*$lt_bad_file* | *'Invalid file or object type'*)
+	  lt_cv_path_NM="$tmp_nm -B"
+	  break 2
+	  ;;
+	*)
+	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+	  */dev/null*)
+	    lt_cv_path_NM="$tmp_nm -p"
+	    break 2
+	    ;;
+	  *)
+	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	    continue # so that we can try to find one that supports BSD flags
+	    ;;
+	  esac
+	  ;;
+	esac
+      fi
+    done
+    IFS=$lt_save_ifs
+  done
+  : ${lt_cv_path_NM=no}
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
+$as_echo "$lt_cv_path_NM" >&6; }
+if test no != "$lt_cv_path_NM"; then
+  NM=$lt_cv_path_NM
+else
+  # Didn't find any BSD compatible name lister, look for dumpbin.
+  if test -n "$DUMPBIN"; then :
+    # Let the user override the test.
+  else
+    if test -n "$ac_tool_prefix"; then
+  for ac_prog in dumpbin "link -dump"
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_DUMPBIN+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$DUMPBIN"; then
+  ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+DUMPBIN=$ac_cv_prog_DUMPBIN
+if test -n "$DUMPBIN"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
+$as_echo "$DUMPBIN" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$DUMPBIN" && break
+  done
+fi
+if test -z "$DUMPBIN"; then
+  ac_ct_DUMPBIN=$DUMPBIN
+  for ac_prog in dumpbin "link -dump"
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_DUMPBIN"; then
+  ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
+if test -n "$ac_ct_DUMPBIN"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
+$as_echo "$ac_ct_DUMPBIN" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_DUMPBIN" && break
+done
+
+  if test "x$ac_ct_DUMPBIN" = x; then
+    DUMPBIN=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    DUMPBIN=$ac_ct_DUMPBIN
+  fi
+fi
+
+    case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in
+    *COFF*)
+      DUMPBIN="$DUMPBIN -symbols -headers"
+      ;;
+    *)
+      DUMPBIN=:
+      ;;
+    esac
+  fi
+
+  if test : != "$DUMPBIN"; then
+    NM=$DUMPBIN
+  fi
+fi
+test -z "$NM" && NM=nm
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
+$as_echo_n "checking the name lister ($NM) interface... " >&6; }
+if ${lt_cv_nm_interface+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_nm_interface="BSD nm"
+  echo "int some_variable = 0;" > conftest.$ac_ext
+  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
+  (eval "$ac_compile" 2>conftest.err)
+  cat conftest.err >&5
+  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+  cat conftest.err >&5
+  (eval echo "\"\$as_me:$LINENO: output\"" >&5)
+  cat conftest.out >&5
+  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+    lt_cv_nm_interface="MS dumpbin"
+  fi
+  rm -f conftest*
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
+$as_echo "$lt_cv_nm_interface" >&6; }
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
+$as_echo_n "checking whether ln -s works... " >&6; }
+LN_S=$as_ln_s
+if test "$LN_S" = "ln -s"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
+$as_echo "no, using $LN_S" >&6; }
+fi
+
+# find the maximum length of command line arguments
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
+$as_echo_n "checking the maximum length of command line arguments... " >&6; }
+if ${lt_cv_sys_max_cmd_len+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+    i=0
+  teststring=ABCD
+
+  case $build_os in
+  msdosdjgpp*)
+    # On DJGPP, this test can blow up pretty badly due to problems in libc
+    # (any single argument exceeding 2000 bytes causes a buffer overrun
+    # during glob expansion).  Even if it were fixed, the result of this
+    # check would be larger than it should be.
+    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
+    ;;
+
+  gnu*)
+    # Under GNU Hurd, this test is not required because there is
+    # no limit to the length of command line arguments.
+    # Libtool will interpret -1 as no limit whatsoever
+    lt_cv_sys_max_cmd_len=-1;
+    ;;
+
+  cygwin* | mingw* | cegcc*)
+    # On Win9x/ME, this test blows up -- it succeeds, but takes
+    # about 5 minutes as the teststring grows exponentially.
+    # Worse, since 9x/ME are not pre-emptively multitasking,
+    # you end up with a "frozen" computer, even though with patience
+    # the test eventually succeeds (with a max line length of 256k).
+    # Instead, let's just punt: use the minimum linelength reported by
+    # all of the supported platforms: 8192 (on NT/2K/XP).
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  mint*)
+    # On MiNT this can take a long time and run out of memory.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  amigaos*)
+    # On AmigaOS with pdksh, this test takes hours, literally.
+    # So we just punt and use a minimum line length of 8192.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*)
+    # This has been around since 386BSD, at least.  Likely further.
+    if test -x /sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+    elif test -x /usr/sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
+    else
+      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
+    fi
+    # And add a safety zone
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    ;;
+
+  interix*)
+    # We know the value 262144 and hardcode it with a safety zone (like BSD)
+    lt_cv_sys_max_cmd_len=196608
+    ;;
+
+  os2*)
+    # The test takes a long time on OS/2.
+    lt_cv_sys_max_cmd_len=8192
+    ;;
+
+  osf*)
+    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
+    # nice to cause kernel panics so lets avoid the loop below.
+    # First set a reasonable default.
+    lt_cv_sys_max_cmd_len=16384
+    #
+    if test -x /sbin/sysconfig; then
+      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
+        *1*) lt_cv_sys_max_cmd_len=-1 ;;
+      esac
+    fi
+    ;;
+  sco3.2v5*)
+    lt_cv_sys_max_cmd_len=102400
+    ;;
+  sysv5* | sco5v6* | sysv4.2uw2*)
+    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
+    if test -n "$kargmax"; then
+      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[	 ]//'`
+    else
+      lt_cv_sys_max_cmd_len=32768
+    fi
+    ;;
+  *)
+    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+    if test -n "$lt_cv_sys_max_cmd_len" && \
+       test undefined != "$lt_cv_sys_max_cmd_len"; then
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    else
+      # Make teststring a little bigger before we do anything with it.
+      # a 1K string should be a reasonable start.
+      for i in 1 2 3 4 5 6 7 8; do
+        teststring=$teststring$teststring
+      done
+      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+      # If test is not a shell built-in, we'll probably end up computing a
+      # maximum length that is only half of the actual maximum length, but
+      # we can't tell.
+      while { test X`env echo "$teststring$teststring" 2>/dev/null` \
+	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
+	      test 17 != "$i" # 1/2 MB should be enough
+      do
+        i=`expr $i + 1`
+        teststring=$teststring$teststring
+      done
+      # Only check the string length outside the loop.
+      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
+      teststring=
+      # Add a significant safety factor because C++ compilers can tack on
+      # massive amounts of additional arguments before passing them to the
+      # linker.  It appears as though 1/2 is a usable value.
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+    fi
+    ;;
+  esac
+
+fi
+
+if test -n "$lt_cv_sys_max_cmd_len"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
+$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
+$as_echo "none" >&6; }
+fi
+max_cmd_len=$lt_cv_sys_max_cmd_len
+
+
+
+
+
+
+: ${CP="cp -f"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
+
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  lt_unset=unset
+else
+  lt_unset=false
+fi
+
+
+
+
+
+# test EBCDIC or ASCII
+case `echo X|tr X '\101'` in
+ A) # ASCII based system
+    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
+  lt_SP2NL='tr \040 \012'
+  lt_NL2SP='tr \015\012 \040\040'
+  ;;
+ *) # EBCDIC based system
+  lt_SP2NL='tr \100 \n'
+  lt_NL2SP='tr \r\n \100\100'
+  ;;
+esac
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
+if ${lt_cv_to_host_file_cmd+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
+        ;;
+    esac
+    ;;
+  *-*-cygwin* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_noop
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
+        ;;
+    esac
+    ;;
+  * ) # unhandled hosts (and "normal" native builds)
+    lt_cv_to_host_file_cmd=func_convert_file_noop
+    ;;
+esac
+
+fi
+
+to_host_file_cmd=$lt_cv_to_host_file_cmd
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
+if ${lt_cv_to_tool_file_cmd+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  #assume ordinary cross tools, or native build.
+lt_cv_to_tool_file_cmd=func_convert_file_noop
+case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
+        ;;
+    esac
+    ;;
+esac
+
+fi
+
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
+$as_echo_n "checking for $LD option to reload object files... " >&6; }
+if ${lt_cv_ld_reload_flag+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ld_reload_flag='-r'
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
+$as_echo "$lt_cv_ld_reload_flag" >&6; }
+reload_flag=$lt_cv_ld_reload_flag
+case $reload_flag in
+"" | " "*) ;;
+*) reload_flag=" $reload_flag" ;;
+esac
+reload_cmds='$LD$reload_flag -o $output$reload_objs'
+case $host_os in
+  cygwin* | mingw* | pw32* | cegcc*)
+    if test yes != "$GCC"; then
+      reload_cmds=false
+    fi
+    ;;
+  darwin*)
+    if test yes = "$GCC"; then
+      reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs'
+    else
+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
+    fi
+    ;;
+esac
+
+
+
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
+set dummy ${ac_tool_prefix}objdump; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_OBJDUMP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OBJDUMP"; then
+  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+OBJDUMP=$ac_cv_prog_OBJDUMP
+if test -n "$OBJDUMP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
+$as_echo "$OBJDUMP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_OBJDUMP"; then
+  ac_ct_OBJDUMP=$OBJDUMP
+  # Extract the first word of "objdump", so it can be a program name with args.
+set dummy objdump; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_OBJDUMP"; then
+  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_OBJDUMP="objdump"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
+if test -n "$ac_ct_OBJDUMP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
+$as_echo "$ac_ct_OBJDUMP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_OBJDUMP" = x; then
+    OBJDUMP="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    OBJDUMP=$ac_ct_OBJDUMP
+  fi
+else
+  OBJDUMP="$ac_cv_prog_OBJDUMP"
+fi
+
+test -z "$OBJDUMP" && OBJDUMP=objdump
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
+$as_echo_n "checking how to recognize dependent libraries... " >&6; }
+if ${lt_cv_deplibs_check_method+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_file_magic_cmd='$MAGIC_CMD'
+lt_cv_file_magic_test_file=
+lt_cv_deplibs_check_method='unknown'
+# Need to set the preceding variable on all platforms that support
+# interlibrary dependencies.
+# 'none' -- dependencies not supported.
+# 'unknown' -- same as none, but documents that we really don't know.
+# 'pass_all' -- all dependencies passed with no checks.
+# 'test_compile' -- check by making test program.
+# 'file_magic [[regex]]' -- check by looking for files in library path
+# that responds to the $file_magic_cmd with a given extended regex.
+# If you have 'file' or equivalent on your system and you're not sure
+# whether 'pass_all' will *always* work, you probably want this one.
+
+case $host_os in
+aix[4-9]*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+beos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+bsdi[45]*)
+  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
+  lt_cv_file_magic_cmd='/usr/bin/file -L'
+  lt_cv_file_magic_test_file=/shlib/libc.so
+  ;;
+
+cygwin*)
+  # func_win32_libid is a shell function defined in ltmain.sh
+  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+  lt_cv_file_magic_cmd='func_win32_libid'
+  ;;
+
+mingw* | pw32*)
+  # Base MSYS/MinGW do not provide the 'file' command needed by
+  # func_win32_libid shell function, so use a weaker test based on 'objdump',
+  # unless we find 'file', for example because we are cross-compiling.
+  if ( file / ) >/dev/null 2>&1; then
+    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+    lt_cv_file_magic_cmd='func_win32_libid'
+  else
+    # Keep this pattern in sync with the one in func_win32_libid.
+    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
+    lt_cv_file_magic_cmd='$OBJDUMP -f'
+  fi
+  ;;
+
+cegcc*)
+  # use the weaker test based on 'objdump'. See mingw*.
+  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
+  lt_cv_file_magic_cmd='$OBJDUMP -f'
+  ;;
+
+darwin* | rhapsody*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+freebsd* | dragonfly*)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    case $host_cpu in
+    i*86 )
+      # Not sure whether the presence of OpenBSD here was a mistake.
+      # Let's accept both of them until this is cleared up.
+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
+      lt_cv_file_magic_cmd=/usr/bin/file
+      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+      ;;
+    esac
+  else
+    lt_cv_deplibs_check_method=pass_all
+  fi
+  ;;
+
+haiku*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+hpux10.20* | hpux11*)
+  lt_cv_file_magic_cmd=/usr/bin/file
+  case $host_cpu in
+  ia64*)
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
+    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+    ;;
+  hppa*64*)
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'
+    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
+    ;;
+  *)
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library'
+    lt_cv_file_magic_test_file=/usr/lib/libc.sl
+    ;;
+  esac
+  ;;
+
+interix[3-9]*)
+  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $LD in
+  *-32|*"-32 ") libmagic=32-bit;;
+  *-n32|*"-n32 ") libmagic=N32;;
+  *-64|*"-64 ") libmagic=64-bit;;
+  *) libmagic=never-match;;
+  esac
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+netbsd*)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
+  fi
+  ;;
+
+newos6*)
+  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
+  lt_cv_file_magic_cmd=/usr/bin/file
+  lt_cv_file_magic_test_file=/usr/lib/libnls.so
+  ;;
+
+*nto* | *qnx*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+openbsd* | bitrig*)
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+  fi
+  ;;
+
+osf3* | osf4* | osf5*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+rdos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+solaris*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv4 | sysv4.3*)
+  case $host_vendor in
+  motorola)
+    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
+    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+    ;;
+  ncr)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  sequent)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
+    ;;
+  sni)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
+    lt_cv_file_magic_test_file=/lib/libc.so
+    ;;
+  siemens)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  pc)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  esac
+  ;;
+
+tpf*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+os2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+esac
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
+$as_echo "$lt_cv_deplibs_check_method" >&6; }
+
+file_magic_glob=
+want_nocaseglob=no
+if test "$build" = "$host"; then
+  case $host_os in
+  mingw* | pw32*)
+    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
+      want_nocaseglob=yes
+    else
+      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
+    fi
+    ;;
+  esac
+fi
+
+file_magic_cmd=$lt_cv_file_magic_cmd
+deplibs_check_method=$lt_cv_deplibs_check_method
+test -z "$deplibs_check_method" && deplibs_check_method=unknown
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_DLLTOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$DLLTOOL"; then
+  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+DLLTOOL=$ac_cv_prog_DLLTOOL
+if test -n "$DLLTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
+$as_echo "$DLLTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_DLLTOOL"; then
+  ac_ct_DLLTOOL=$DLLTOOL
+  # Extract the first word of "dlltool", so it can be a program name with args.
+set dummy dlltool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_DLLTOOL"; then
+  ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_DLLTOOL="dlltool"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
+if test -n "$ac_ct_DLLTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
+$as_echo "$ac_ct_DLLTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_DLLTOOL" = x; then
+    DLLTOOL="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    DLLTOOL=$ac_ct_DLLTOOL
+  fi
+else
+  DLLTOOL="$ac_cv_prog_DLLTOOL"
+fi
+
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_sharedlib_from_linklib_cmd='unknown'
+
+case $host_os in
+cygwin* | mingw* | pw32* | cegcc*)
+  # two different shell functions defined in ltmain.sh;
+  # decide which one to use based on capabilities of $DLLTOOL
+  case `$DLLTOOL --help 2>&1` in
+  *--identify-strict*)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
+    ;;
+  *)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
+    ;;
+  esac
+  ;;
+*)
+  # fallback: assume linklib IS sharedlib
+  lt_cv_sharedlib_from_linklib_cmd=$ECHO
+  ;;
+esac
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
+
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  for ac_prog in ar
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_AR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AR"; then
+  ac_cv_prog_AR="$AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+AR=$ac_cv_prog_AR
+if test -n "$AR"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+$as_echo "$AR" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$AR" && break
+  done
+fi
+if test -z "$AR"; then
+  ac_ct_AR=$AR
+  for ac_prog in ar
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_AR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_AR"; then
+  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_AR="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_AR=$ac_cv_prog_ac_ct_AR
+if test -n "$ac_ct_AR"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+$as_echo "$ac_ct_AR" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_AR" && break
+done
+
+  if test "x$ac_ct_AR" = x; then
+    AR="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    AR=$ac_ct_AR
+  fi
+fi
+
+: ${AR=ar}
+: ${AR_FLAGS=cru}
+
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
+$as_echo_n "checking for archiver @FILE support... " >&6; }
+if ${lt_cv_ar_at_file+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ar_at_file=no
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  echo conftest.$ac_objext > conftest.lst
+      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
+      { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
+  (eval $lt_ar_try) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+      if test 0 -eq "$ac_status"; then
+	# Ensure the archiver fails upon bogus file names.
+	rm -f conftest.$ac_objext libconftest.a
+	{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
+  (eval $lt_ar_try) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+	if test 0 -ne "$ac_status"; then
+          lt_cv_ar_at_file=@
+        fi
+      fi
+      rm -f conftest.* libconftest.a
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
+$as_echo "$lt_cv_ar_at_file" >&6; }
+
+if test no = "$lt_cv_ar_at_file"; then
+  archiver_list_spec=
+else
+  archiver_list_spec=$lt_cv_ar_at_file
+fi
+
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+set dummy ${ac_tool_prefix}strip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_STRIP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$STRIP"; then
+  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+STRIP=$ac_cv_prog_STRIP
+if test -n "$STRIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_STRIP"; then
+  ac_ct_STRIP=$STRIP
+  # Extract the first word of "strip", so it can be a program name with args.
+set dummy strip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_STRIP"; then
+  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_STRIP="strip"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+if test -n "$ac_ct_STRIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_STRIP" = x; then
+    STRIP=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    STRIP=$ac_ct_STRIP
+  fi
+else
+  STRIP="$ac_cv_prog_STRIP"
+fi
+
+test -z "$STRIP" && STRIP=:
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_RANLIB+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$RANLIB"; then
+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+RANLIB=$ac_cv_prog_RANLIB
+if test -n "$RANLIB"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_RANLIB"; then
+  ac_ct_RANLIB=$RANLIB
+  # Extract the first word of "ranlib", so it can be a program name with args.
+set dummy ranlib; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_RANLIB"; then
+  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_RANLIB="ranlib"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+if test -n "$ac_ct_RANLIB"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+$as_echo "$ac_ct_RANLIB" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_RANLIB" = x; then
+    RANLIB=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    RANLIB=$ac_ct_RANLIB
+  fi
+else
+  RANLIB="$ac_cv_prog_RANLIB"
+fi
+
+test -z "$RANLIB" && RANLIB=:
+
+
+
+
+
+
+# Determine commands to create old-style static archives.
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
+old_postinstall_cmds='chmod 644 $oldlib'
+old_postuninstall_cmds=
+
+if test -n "$RANLIB"; then
+  case $host_os in
+  bitrig* | openbsd*)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
+    ;;
+  *)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
+    ;;
+  esac
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
+fi
+
+case $host_os in
+  darwin*)
+    lock_old_archive_extraction=yes ;;
+  *)
+    lock_old_archive_extraction=no ;;
+esac
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+
+
+# Check for command to grab the raw symbol name followed by C symbol from nm.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
+$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
+if ${lt_cv_sys_global_symbol_pipe+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+# These are sane defaults that work on at least a few old systems.
+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
+
+# Character class describing NM global symbol codes.
+symcode='[BCDEGRST]'
+
+# Regexp to match symbols that can be accessed directly from C.
+sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
+
+# Define system-specific variables.
+case $host_os in
+aix*)
+  symcode='[BCDT]'
+  ;;
+cygwin* | mingw* | pw32* | cegcc*)
+  symcode='[ABCDGISTW]'
+  ;;
+hpux*)
+  if test ia64 = "$host_cpu"; then
+    symcode='[ABCDEGRST]'
+  fi
+  ;;
+irix* | nonstopux*)
+  symcode='[BCDEGRST]'
+  ;;
+osf*)
+  symcode='[BCDEGQRST]'
+  ;;
+solaris*)
+  symcode='[BDRT]'
+  ;;
+sco3.2v5*)
+  symcode='[DT]'
+  ;;
+sysv4.2uw2*)
+  symcode='[DT]'
+  ;;
+sysv5* | sco5v6* | unixware* | OpenUNIX*)
+  symcode='[ABDT]'
+  ;;
+sysv4)
+  symcode='[DFNSTU]'
+  ;;
+esac
+
+# If we're using GNU nm, then use its standard symbol codes.
+case `$NM -V 2>&1` in
+*GNU* | *'with BFD'*)
+  symcode='[ABCDGIRSTW]' ;;
+esac
+
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+  # Gets list of data symbols to import.
+  lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'"
+  # Adjust the below global symbol transforms to fixup imported variables.
+  lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'"
+  lt_c_name_hook=" -e 's/^I .* \(.*\)$/  {\"\1\", (void *) 0},/p'"
+  lt_c_name_lib_hook="\
+  -e 's/^I .* \(lib.*\)$/  {\"\1\", (void *) 0},/p'\
+  -e 's/^I .* \(.*\)$/  {\"lib\1\", (void *) 0},/p'"
+else
+  # Disable hooks by default.
+  lt_cv_sys_global_symbol_to_import=
+  lt_cdecl_hook=
+  lt_c_name_hook=
+  lt_c_name_lib_hook=
+fi
+
+# Transform an extracted symbol line into a proper C declaration.
+# Some systems (esp. on ia64) link data and code symbols differently,
+# so use this general approach.
+lt_cv_sys_global_symbol_to_cdecl="sed -n"\
+$lt_cdecl_hook\
+" -e 's/^T .* \(.*\)$/extern int \1();/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'"
+
+# Transform an extracted symbol line into symbol name and symbol address
+lt_cv_sys_global_symbol_to_c_name_address="sed -n"\
+$lt_c_name_hook\
+" -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/p'"
+
+# Transform an extracted symbol line into symbol name with lib prefix and
+# symbol address.
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\
+$lt_c_name_lib_hook\
+" -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* \(lib.*\)$/  {\"\1\", (void *) \&\1},/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"lib\1\", (void *) \&\1},/p'"
+
+# Handle CRLF in mingw tool chain
+opt_cr=
+case $build_os in
+mingw*)
+  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
+  ;;
+esac
+
+# Try without a prefix underscore, then with it.
+for ac_symprfx in "" "_"; do
+
+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
+  symxfrm="\\1 $ac_symprfx\\2 \\2"
+
+  # Write the raw and C identifiers.
+  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+    # Fake it for dumpbin and say T for any non-static function,
+    # D for any global variable and I for any imported variable.
+    # Also find C++ and __fastcall symbols from MSVC++,
+    # which start with @ or ?.
+    lt_cv_sys_global_symbol_pipe="$AWK '"\
+"     {last_section=section; section=\$ 3};"\
+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
+"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
+"     /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\
+"     /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\
+"     /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\
+"     \$ 0!~/External *\|/{next};"\
+"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
+"     {if(hide[section]) next};"\
+"     {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\
+"     {split(\$ 0,a,/\||\r/); split(a[2],s)};"\
+"     s[1]~/^[@?]/{print f,s[1],s[1]; next};"\
+"     s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\
+"     ' prfx=^$ac_symprfx"
+  else
+    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[	 ]\($symcode$symcode*\)[	 ][	 ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+  fi
+  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
+
+  # Check to see that the pipe works correctly.
+  pipe_works=no
+
+  rm -f conftest*
+  cat > conftest.$ac_ext <<_LT_EOF
+#ifdef __cplusplus
+extern "C" {
+#endif
+char nm_test_var;
+void nm_test_func(void);
+void nm_test_func(void){}
+#ifdef __cplusplus
+}
+#endif
+int main(){nm_test_var='a';nm_test_func();return(0);}
+_LT_EOF
+
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    # Now try to grab the symbols.
+    nlist=conftest.nm
+    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5
+  (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s "$nlist"; then
+      # Try sorting and uniquifying the output.
+      if sort "$nlist" | uniq > "$nlist"T; then
+	mv -f "$nlist"T "$nlist"
+      else
+	rm -f "$nlist"T
+      fi
+
+      # Make sure that we snagged all the symbols we need.
+      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
+	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
+	  cat <<_LT_EOF > conftest.$ac_ext
+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
+#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
+/* DATA imports from DLLs on WIN32 can't be const, because runtime
+   relocations are performed -- see ld's documentation on pseudo-relocs.  */
+# define LT_DLSYM_CONST
+#elif defined __osf__
+/* This system does not cope well with relocations in const data.  */
+# define LT_DLSYM_CONST
+#else
+# define LT_DLSYM_CONST const
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+_LT_EOF
+	  # Now generate the symbol file.
+	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
+
+	  cat <<_LT_EOF >> conftest.$ac_ext
+
+/* The mapping between symbol names and symbols.  */
+LT_DLSYM_CONST struct {
+  const char *name;
+  void       *address;
+}
+lt__PROGRAM__LTX_preloaded_symbols[] =
+{
+  { "@PROGRAM@", (void *) 0 },
+_LT_EOF
+	  $SED "s/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
+	  cat <<\_LT_EOF >> conftest.$ac_ext
+  {0, (void *) 0}
+};
+
+/* This works around a problem in FreeBSD linker */
+#ifdef FREEBSD_WORKAROUND
+static const void *lt_preloaded_setup() {
+  return lt__PROGRAM__LTX_preloaded_symbols;
+}
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+_LT_EOF
+	  # Now try linking the two files.
+	  mv conftest.$ac_objext conftstm.$ac_objext
+	  lt_globsym_save_LIBS=$LIBS
+	  lt_globsym_save_CFLAGS=$CFLAGS
+	  LIBS=conftstm.$ac_objext
+	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
+	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s conftest$ac_exeext; then
+	    pipe_works=yes
+	  fi
+	  LIBS=$lt_globsym_save_LIBS
+	  CFLAGS=$lt_globsym_save_CFLAGS
+	else
+	  echo "cannot find nm_test_func in $nlist" >&5
+	fi
+      else
+	echo "cannot find nm_test_var in $nlist" >&5
+      fi
+    else
+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
+    fi
+  else
+    echo "$progname: failed program was:" >&5
+    cat conftest.$ac_ext >&5
+  fi
+  rm -rf conftest* conftst*
+
+  # Do not use the global_symbol_pipe unless it works.
+  if test yes = "$pipe_works"; then
+    break
+  else
+    lt_cv_sys_global_symbol_pipe=
+  fi
+done
+
+fi
+
+if test -z "$lt_cv_sys_global_symbol_pipe"; then
+  lt_cv_sys_global_symbol_to_cdecl=
+fi
+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+$as_echo "failed" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+$as_echo "ok" >&6; }
+fi
+
+# Response file support.
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+  nm_file_list_spec='@'
+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
+  nm_file_list_spec='@'
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
+$as_echo_n "checking for sysroot... " >&6; }
+
+# Check whether --with-sysroot was given.
+if test "${with_sysroot+set}" = set; then :
+  withval=$with_sysroot;
+else
+  with_sysroot=no
+fi
+
+
+lt_sysroot=
+case $with_sysroot in #(
+ yes)
+   if test yes = "$GCC"; then
+     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
+   fi
+   ;; #(
+ /*)
+   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
+   ;; #(
+ no|'')
+   ;; #(
+ *)
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5
+$as_echo "$with_sysroot" >&6; }
+   as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
+   ;;
+esac
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
+$as_echo "${lt_sysroot:-no}" >&6; }
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5
+$as_echo_n "checking for a working dd... " >&6; }
+if ${ac_cv_path_lt_DD+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+: ${lt_DD:=$DD}
+if test -z "$lt_DD"; then
+  ac_path_lt_DD_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in dd; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_lt_DD="$as_dir/$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_lt_DD" || continue
+if "$ac_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+  cmp -s conftest.i conftest.out \
+  && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=:
+fi
+      $ac_path_lt_DD_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_lt_DD"; then
+    :
+  fi
+else
+  ac_cv_path_lt_DD=$lt_DD
+fi
+
+rm -f conftest.i conftest2.i conftest.out
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5
+$as_echo "$ac_cv_path_lt_DD" >&6; }
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5
+$as_echo_n "checking how to truncate binary pipes... " >&6; }
+if ${lt_cv_truncate_bin+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+lt_cv_truncate_bin=
+if "$ac_cv_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+  cmp -s conftest.i conftest.out \
+  && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1"
+fi
+rm -f conftest.i conftest2.i conftest.out
+test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5
+$as_echo "$lt_cv_truncate_bin" >&6; }
+
+
+
+
+
+
+
+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+func_cc_basename ()
+{
+    for cc_temp in $*""; do
+      case $cc_temp in
+        compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+        distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+        \-*) ;;
+        *) break;;
+      esac
+    done
+    func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+}
+
+# Check whether --enable-libtool-lock was given.
+if test "${enable_libtool_lock+set}" = set; then :
+  enableval=$enable_libtool_lock;
+fi
+
+test no = "$enable_libtool_lock" || enable_libtool_lock=yes
+
+# Some flags need to be propagated to the compiler or linker for good
+# libtool support.
+case $host in
+ia64-*-hpux*)
+  # Find out what ABI is being produced by ac_compile, and set mode
+  # options accordingly.
+  echo 'int i;' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    case `/usr/bin/file conftest.$ac_objext` in
+      *ELF-32*)
+	HPUX_IA64_MODE=32
+	;;
+      *ELF-64*)
+	HPUX_IA64_MODE=64
+	;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+*-*-irix6*)
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.
+  echo '#line '$LINENO' "configure"' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    if test yes = "$lt_cv_prog_gnu_ld"; then
+      case `/usr/bin/file conftest.$ac_objext` in
+	*32-bit*)
+	  LD="${LD-ld} -melf32bsmip"
+	  ;;
+	*N32*)
+	  LD="${LD-ld} -melf32bmipn32"
+	  ;;
+	*64-bit*)
+	  LD="${LD-ld} -melf64bmip"
+	;;
+      esac
+    else
+      case `/usr/bin/file conftest.$ac_objext` in
+	*32-bit*)
+	  LD="${LD-ld} -32"
+	  ;;
+	*N32*)
+	  LD="${LD-ld} -n32"
+	  ;;
+	*64-bit*)
+	  LD="${LD-ld} -64"
+	  ;;
+      esac
+    fi
+  fi
+  rm -rf conftest*
+  ;;
+
+mips64*-*linux*)
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.
+  echo '#line '$LINENO' "configure"' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    emul=elf
+    case `/usr/bin/file conftest.$ac_objext` in
+      *32-bit*)
+	emul="${emul}32"
+	;;
+      *64-bit*)
+	emul="${emul}64"
+	;;
+    esac
+    case `/usr/bin/file conftest.$ac_objext` in
+      *MSB*)
+	emul="${emul}btsmip"
+	;;
+      *LSB*)
+	emul="${emul}ltsmip"
+	;;
+    esac
+    case `/usr/bin/file conftest.$ac_objext` in
+      *N32*)
+	emul="${emul}n32"
+	;;
+    esac
+    LD="${LD-ld} -m $emul"
+  fi
+  rm -rf conftest*
+  ;;
+
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
+s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.  Note that the listed cases only cover the
+  # situations where additional linker options are needed (such as when
+  # doing 32-bit compilation for a host where ld defaults to 64-bit, or
+  # vice versa); the common cases where no linker options are needed do
+  # not appear in the list.
+  echo 'int i;' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    case `/usr/bin/file conftest.o` in
+      *32-bit*)
+	case $host in
+	  x86_64-*kfreebsd*-gnu)
+	    LD="${LD-ld} -m elf_i386_fbsd"
+	    ;;
+	  x86_64-*linux*)
+	    case `/usr/bin/file conftest.o` in
+	      *x86-64*)
+		LD="${LD-ld} -m elf32_x86_64"
+		;;
+	      *)
+		LD="${LD-ld} -m elf_i386"
+		;;
+	    esac
+	    ;;
+	  powerpc64le-*linux*)
+	    LD="${LD-ld} -m elf32lppclinux"
+	    ;;
+	  powerpc64-*linux*)
+	    LD="${LD-ld} -m elf32ppclinux"
+	    ;;
+	  s390x-*linux*)
+	    LD="${LD-ld} -m elf_s390"
+	    ;;
+	  sparc64-*linux*)
+	    LD="${LD-ld} -m elf32_sparc"
+	    ;;
+	esac
+	;;
+      *64-bit*)
+	case $host in
+	  x86_64-*kfreebsd*-gnu)
+	    LD="${LD-ld} -m elf_x86_64_fbsd"
+	    ;;
+	  x86_64-*linux*)
+	    LD="${LD-ld} -m elf_x86_64"
+	    ;;
+	  powerpcle-*linux*)
+	    LD="${LD-ld} -m elf64lppc"
+	    ;;
+	  powerpc-*linux*)
+	    LD="${LD-ld} -m elf64ppc"
+	    ;;
+	  s390*-*linux*|s390*-*tpf*)
+	    LD="${LD-ld} -m elf64_s390"
+	    ;;
+	  sparc*-*linux*)
+	    LD="${LD-ld} -m elf64_sparc"
+	    ;;
+	esac
+	;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+
+*-*-sco3.2v5*)
+  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+  SAVE_CFLAGS=$CFLAGS
+  CFLAGS="$CFLAGS -belf"
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
+$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
+if ${lt_cv_cc_needs_belf+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  lt_cv_cc_needs_belf=yes
+else
+  lt_cv_cc_needs_belf=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+     ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
+$as_echo "$lt_cv_cc_needs_belf" >&6; }
+  if test yes != "$lt_cv_cc_needs_belf"; then
+    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+    CFLAGS=$SAVE_CFLAGS
+  fi
+  ;;
+*-*solaris*)
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.
+  echo 'int i;' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    case `/usr/bin/file conftest.o` in
+    *64-bit*)
+      case $lt_cv_prog_gnu_ld in
+      yes*)
+        case $host in
+        i?86-*-solaris*|x86_64-*-solaris*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        sparc*-*-solaris*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+        esac
+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+          LD=${LD-ld}_sol2
+        fi
+        ;;
+      *)
+	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+	  LD="${LD-ld} -64"
+	fi
+	;;
+      esac
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+esac
+
+need_locks=$enable_libtool_lock
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
+set dummy ${ac_tool_prefix}mt; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$MANIFEST_TOOL"; then
+  ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
+if test -n "$MANIFEST_TOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
+$as_echo "$MANIFEST_TOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
+  ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
+  # Extract the first word of "mt", so it can be a program name with args.
+set dummy mt; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_MANIFEST_TOOL"; then
+  ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
+if test -n "$ac_ct_MANIFEST_TOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_MANIFEST_TOOL" = x; then
+    MANIFEST_TOOL=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
+  fi
+else
+  MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
+fi
+
+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
+if ${lt_cv_path_mainfest_tool+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_path_mainfest_tool=no
+  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
+  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
+  cat conftest.err >&5
+  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
+    lt_cv_path_mainfest_tool=yes
+  fi
+  rm -f conftest*
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
+if test yes != "$lt_cv_path_mainfest_tool"; then
+  MANIFEST_TOOL=:
+fi
+
+
+
+
+
+
+  case $host_os in
+    rhapsody* | darwin*)
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_DSYMUTIL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$DSYMUTIL"; then
+  ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+DSYMUTIL=$ac_cv_prog_DSYMUTIL
+if test -n "$DSYMUTIL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
+$as_echo "$DSYMUTIL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_DSYMUTIL"; then
+  ac_ct_DSYMUTIL=$DSYMUTIL
+  # Extract the first word of "dsymutil", so it can be a program name with args.
+set dummy dsymutil; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_DSYMUTIL"; then
+  ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
+if test -n "$ac_ct_DSYMUTIL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
+$as_echo "$ac_ct_DSYMUTIL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_DSYMUTIL" = x; then
+    DSYMUTIL=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    DSYMUTIL=$ac_ct_DSYMUTIL
+  fi
+else
+  DSYMUTIL="$ac_cv_prog_DSYMUTIL"
+fi
+
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
+set dummy ${ac_tool_prefix}nmedit; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_NMEDIT+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$NMEDIT"; then
+  ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+NMEDIT=$ac_cv_prog_NMEDIT
+if test -n "$NMEDIT"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
+$as_echo "$NMEDIT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_NMEDIT"; then
+  ac_ct_NMEDIT=$NMEDIT
+  # Extract the first word of "nmedit", so it can be a program name with args.
+set dummy nmedit; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_NMEDIT"; then
+  ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_NMEDIT="nmedit"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
+if test -n "$ac_ct_NMEDIT"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
+$as_echo "$ac_ct_NMEDIT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_NMEDIT" = x; then
+    NMEDIT=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    NMEDIT=$ac_ct_NMEDIT
+  fi
+else
+  NMEDIT="$ac_cv_prog_NMEDIT"
+fi
+
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
+set dummy ${ac_tool_prefix}lipo; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_LIPO+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$LIPO"; then
+  ac_cv_prog_LIPO="$LIPO" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+LIPO=$ac_cv_prog_LIPO
+if test -n "$LIPO"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
+$as_echo "$LIPO" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_LIPO"; then
+  ac_ct_LIPO=$LIPO
+  # Extract the first word of "lipo", so it can be a program name with args.
+set dummy lipo; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_LIPO+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_LIPO"; then
+  ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_LIPO="lipo"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
+if test -n "$ac_ct_LIPO"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
+$as_echo "$ac_ct_LIPO" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_LIPO" = x; then
+    LIPO=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    LIPO=$ac_ct_LIPO
+  fi
+else
+  LIPO="$ac_cv_prog_LIPO"
+fi
+
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
+set dummy ${ac_tool_prefix}otool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_OTOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OTOOL"; then
+  ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+OTOOL=$ac_cv_prog_OTOOL
+if test -n "$OTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
+$as_echo "$OTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_OTOOL"; then
+  ac_ct_OTOOL=$OTOOL
+  # Extract the first word of "otool", so it can be a program name with args.
+set dummy otool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_OTOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_OTOOL"; then
+  ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_OTOOL="otool"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
+if test -n "$ac_ct_OTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
+$as_echo "$ac_ct_OTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_OTOOL" = x; then
+    OTOOL=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    OTOOL=$ac_ct_OTOOL
+  fi
+else
+  OTOOL="$ac_cv_prog_OTOOL"
+fi
+
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
+set dummy ${ac_tool_prefix}otool64; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_OTOOL64+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OTOOL64"; then
+  ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+OTOOL64=$ac_cv_prog_OTOOL64
+if test -n "$OTOOL64"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
+$as_echo "$OTOOL64" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_OTOOL64"; then
+  ac_ct_OTOOL64=$OTOOL64
+  # Extract the first word of "otool64", so it can be a program name with args.
+set dummy otool64; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_OTOOL64"; then
+  ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_OTOOL64="otool64"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
+if test -n "$ac_ct_OTOOL64"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
+$as_echo "$ac_ct_OTOOL64" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_OTOOL64" = x; then
+    OTOOL64=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    OTOOL64=$ac_ct_OTOOL64
+  fi
+else
+  OTOOL64="$ac_cv_prog_OTOOL64"
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
+$as_echo_n "checking for -single_module linker flag... " >&6; }
+if ${lt_cv_apple_cc_single_mod+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_apple_cc_single_mod=no
+      if test -z "$LT_MULTI_MODULE"; then
+	# By default we will add the -single_module flag. You can override
+	# by either setting the environment variable LT_MULTI_MODULE
+	# non-empty at configure time, or by adding -multi_module to the
+	# link flags.
+	rm -rf libconftest.dylib*
+	echo "int foo(void){return 1;}" > conftest.c
+	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+-dynamiclib -Wl,-single_module conftest.c" >&5
+	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
+        _lt_result=$?
+	# If there is a non-empty error log, and "single_module"
+	# appears in it, assume the flag caused a linker warning
+        if test -s conftest.err && $GREP single_module conftest.err; then
+	  cat conftest.err >&5
+	# Otherwise, if the output was created with a 0 exit code from
+	# the compiler, it worked.
+	elif test -f libconftest.dylib && test 0 = "$_lt_result"; then
+	  lt_cv_apple_cc_single_mod=yes
+	else
+	  cat conftest.err >&5
+	fi
+	rm -rf libconftest.dylib*
+	rm -f conftest.*
+      fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
+$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
+$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
+if ${lt_cv_ld_exported_symbols_list+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ld_exported_symbols_list=no
+      save_LDFLAGS=$LDFLAGS
+      echo "_main" > conftest.sym
+      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  lt_cv_ld_exported_symbols_list=yes
+else
+  lt_cv_ld_exported_symbols_list=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+	LDFLAGS=$save_LDFLAGS
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
+$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
+$as_echo_n "checking for -force_load linker flag... " >&6; }
+if ${lt_cv_ld_force_load+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ld_force_load=no
+      cat > conftest.c << _LT_EOF
+int forced_loaded() { return 2;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5
+      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
+      echo "$AR cru libconftest.a conftest.o" >&5
+      $AR cru libconftest.a conftest.o 2>&5
+      echo "$RANLIB libconftest.a" >&5
+      $RANLIB libconftest.a 2>&5
+      cat > conftest.c << _LT_EOF
+int main() { return 0;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
+      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
+      _lt_result=$?
+      if test -s conftest.err && $GREP force_load conftest.err; then
+	cat conftest.err >&5
+      elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then
+	lt_cv_ld_force_load=yes
+      else
+	cat conftest.err >&5
+      fi
+        rm -f conftest.err libconftest.a conftest conftest.c
+        rm -rf conftest.dSYM
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
+$as_echo "$lt_cv_ld_force_load" >&6; }
+    case $host_os in
+    rhapsody* | darwin1.[012])
+      _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
+    darwin1.*)
+      _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
+    darwin*) # darwin 5.x on
+      # if running on 10.5 or later, the deployment target defaults
+      # to the OS version, if on x86, and 10.4, the deployment
+      # target defaults to 10.4. Don't you love it?
+      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+	10.0,*86*-darwin8*|10.0,*-darwin[91]*)
+	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
+	10.[012][,.]*)
+	  _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
+	10.*)
+	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
+      esac
+    ;;
+  esac
+    if test yes = "$lt_cv_apple_cc_single_mod"; then
+      _lt_dar_single_mod='$single_module'
+    fi
+    if test yes = "$lt_cv_ld_exported_symbols_list"; then
+      _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym'
+    else
+      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib'
+    fi
+    if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then
+      _lt_dsymutil='~$DSYMUTIL $lib || :'
+    else
+      _lt_dsymutil=
+    fi
+    ;;
+  esac
+
+# func_munge_path_list VARIABLE PATH
+# -----------------------------------
+# VARIABLE is name of variable containing _space_ separated list of
+# directories to be munged by the contents of PATH, which is string
+# having a format:
+# "DIR[:DIR]:"
+#       string "DIR[ DIR]" will be prepended to VARIABLE
+# ":DIR[:DIR]"
+#       string "DIR[ DIR]" will be appended to VARIABLE
+# "DIRP[:DIRP]::[DIRA:]DIRA"
+#       string "DIRP[ DIRP]" will be prepended to VARIABLE and string
+#       "DIRA[ DIRA]" will be appended to VARIABLE
+# "DIR[:DIR]"
+#       VARIABLE will be replaced by "DIR[ DIR]"
+func_munge_path_list ()
+{
+    case x$2 in
+    x)
+        ;;
+    *:)
+        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
+        ;;
+    x:*)
+        eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
+        ;;
+    *::*)
+        eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
+        eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\"
+        ;;
+    *)
+        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\"
+        ;;
+    esac
+}
+
+for ac_header in dlfcn.h
+do :
+  ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
+"
+if test "x$ac_cv_header_dlfcn_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_DLFCN_H 1
+_ACEOF
+
+fi
+
+done
+
+
+
+
+
+# Set options
+
+
+
+        enable_dlopen=no
+
+
+  enable_win32_dll=no
+
+
+
+
+
+# Check whether --with-pic was given.
+if test "${with_pic+set}" = set; then :
+  withval=$with_pic; lt_p=${PACKAGE-default}
+    case $withval in
+    yes|no) pic_mode=$withval ;;
+    *)
+      pic_mode=default
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+      for lt_pkg in $withval; do
+	IFS=$lt_save_ifs
+	if test "X$lt_pkg" = "X$lt_p"; then
+	  pic_mode=yes
+	fi
+      done
+      IFS=$lt_save_ifs
+      ;;
+    esac
+else
+  pic_mode=default
+fi
+
+
+
+
+
+
+
+
+  # Check whether --enable-fast-install was given.
+if test "${enable_fast_install+set}" = set; then :
+  enableval=$enable_fast_install; p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_fast_install=yes ;;
+    no) enable_fast_install=no ;;
+    *)
+      enable_fast_install=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+      for pkg in $enableval; do
+	IFS=$lt_save_ifs
+	if test "X$pkg" = "X$p"; then
+	  enable_fast_install=yes
+	fi
+      done
+      IFS=$lt_save_ifs
+      ;;
+    esac
+else
+  enable_fast_install=yes
+fi
+
+
+
+
+
+
+
+
+  shared_archive_member_spec=
+case $host,$enable_shared in
+power*-*-aix[5-9]*,yes)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5
+$as_echo_n "checking which variant of shared library versioning to provide... " >&6; }
+
+# Check whether --with-aix-soname was given.
+if test "${with_aix_soname+set}" = set; then :
+  withval=$with_aix_soname; case $withval in
+    aix|svr4|both)
+      ;;
+    *)
+      as_fn_error $? "Unknown argument to --with-aix-soname" "$LINENO" 5
+      ;;
+    esac
+    lt_cv_with_aix_soname=$with_aix_soname
+else
+  if ${lt_cv_with_aix_soname+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_with_aix_soname=aix
+fi
+
+    with_aix_soname=$lt_cv_with_aix_soname
+fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5
+$as_echo "$with_aix_soname" >&6; }
+  if test aix != "$with_aix_soname"; then
+    # For the AIX way of multilib, we name the shared archive member
+    # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
+    # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File.
+    # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag,
+    # the AIX toolchain works better with OBJECT_MODE set (default 32).
+    if test 64 = "${OBJECT_MODE-32}"; then
+      shared_archive_member_spec=shr_64
+    else
+      shared_archive_member_spec=shr
+    fi
+  fi
+  ;;
+*)
+  with_aix_soname=aix
+  ;;
+esac
+
+
+
+
+
+
+
+
+
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS=$ltmain
+
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+test -z "$LN_S" && LN_S="ln -s"
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+if test -n "${ZSH_VERSION+set}"; then
+   setopt NO_GLOB_SUBST
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
+$as_echo_n "checking for objdir... " >&6; }
+if ${lt_cv_objdir+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  rm -f .libs 2>/dev/null
+mkdir .libs 2>/dev/null
+if test -d .libs; then
+  lt_cv_objdir=.libs
+else
+  # MS-DOS does not allow filenames that begin with a dot.
+  lt_cv_objdir=_libs
+fi
+rmdir .libs 2>/dev/null
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
+$as_echo "$lt_cv_objdir" >&6; }
+objdir=$lt_cv_objdir
+
+
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define LT_OBJDIR "$lt_cv_objdir/"
+_ACEOF
+
+
+
+
+case $host_os in
+aix3*)
+  # AIX sometimes has problems with the GCC collect2 program.  For some
+  # reason, if we set the COLLECT_NAMES environment variable, the problems
+  # vanish in a puff of smoke.
+  if test set != "${COLLECT_NAMES+set}"; then
+    COLLECT_NAMES=
+    export COLLECT_NAMES
+  fi
+  ;;
+esac
+
+# Global variables:
+ofile=libtool
+can_build_shared=yes
+
+# All known linkers require a '.a' archive for static linking (except MSVC,
+# which needs '.lib').
+libext=a
+
+with_gnu_ld=$lt_cv_prog_gnu_ld
+
+old_CC=$CC
+old_CFLAGS=$CFLAGS
+
+# Set sane defaults for various variables
+test -z "$CC" && CC=cc
+test -z "$LTCC" && LTCC=$CC
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+test -z "$LD" && LD=ld
+test -z "$ac_objext" && ac_objext=o
+
+func_cc_basename $compiler
+cc_basename=$func_cc_basename_result
+
+
+# Only perform the check for file, if the check method requires it
+test -z "$MAGIC_CMD" && MAGIC_CMD=file
+case $deplibs_check_method in
+file_magic*)
+  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
+$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
+if ${lt_cv_path_MAGIC_CMD+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $MAGIC_CMD in
+[\\/*] |  ?:[\\/]*)
+  lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
+  ;;
+*)
+  lt_save_MAGIC_CMD=$MAGIC_CMD
+  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
+  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
+  for ac_dir in $ac_dummy; do
+    IFS=$lt_save_ifs
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/${ac_tool_prefix}file"; then
+      lt_cv_path_MAGIC_CMD=$ac_dir/"${ac_tool_prefix}file"
+      if test -n "$file_magic_test_file"; then
+	case $deplibs_check_method in
+	"file_magic "*)
+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+	  MAGIC_CMD=$lt_cv_path_MAGIC_CMD
+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+	    $EGREP "$file_magic_regex" > /dev/null; then
+	    :
+	  else
+	    cat <<_LT_EOF 1>&2
+
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such.  This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem.  Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool at gnu.org
+
+_LT_EOF
+	  fi ;;
+	esac
+      fi
+      break
+    fi
+  done
+  IFS=$lt_save_ifs
+  MAGIC_CMD=$lt_save_MAGIC_CMD
+  ;;
+esac
+fi
+
+MAGIC_CMD=$lt_cv_path_MAGIC_CMD
+if test -n "$MAGIC_CMD"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
+$as_echo "$MAGIC_CMD" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
+
+
+if test -z "$lt_cv_path_MAGIC_CMD"; then
+  if test -n "$ac_tool_prefix"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
+$as_echo_n "checking for file... " >&6; }
+if ${lt_cv_path_MAGIC_CMD+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $MAGIC_CMD in
+[\\/*] |  ?:[\\/]*)
+  lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
+  ;;
+*)
+  lt_save_MAGIC_CMD=$MAGIC_CMD
+  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
+  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
+  for ac_dir in $ac_dummy; do
+    IFS=$lt_save_ifs
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/file"; then
+      lt_cv_path_MAGIC_CMD=$ac_dir/"file"
+      if test -n "$file_magic_test_file"; then
+	case $deplibs_check_method in
+	"file_magic "*)
+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+	  MAGIC_CMD=$lt_cv_path_MAGIC_CMD
+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+	    $EGREP "$file_magic_regex" > /dev/null; then
+	    :
+	  else
+	    cat <<_LT_EOF 1>&2
+
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such.  This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem.  Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool at gnu.org
+
+_LT_EOF
+	  fi ;;
+	esac
+      fi
+      break
+    fi
+  done
+  IFS=$lt_save_ifs
+  MAGIC_CMD=$lt_save_MAGIC_CMD
+  ;;
+esac
+fi
+
+MAGIC_CMD=$lt_cv_path_MAGIC_CMD
+if test -n "$MAGIC_CMD"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
+$as_echo "$MAGIC_CMD" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  else
+    MAGIC_CMD=:
+  fi
+fi
+
+  fi
+  ;;
+esac
+
+# Use C for the default configuration in the libtool script
+
+lt_save_CC=$CC
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+# Source file extension for C test sources.
+ac_ext=c
+
+# Object file extension for compiled C test sources.
+objext=o
+objext=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="int some_variable = 0;"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='int main(){return(0);}'
+
+
+
+
+
+
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+
+# Save the default compiler, since it gets overwritten when the other
+# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
+compiler_DEFAULT=$CC
+
+# save warnings/boilerplate of simple test code
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$RM conftest*
+
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$RM -r conftest*
+
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+
+lt_prog_compiler_no_builtin_flag=
+
+if test yes = "$GCC"; then
+  case $cc_basename in
+  nvcc*)
+    lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;;
+  *)
+    lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;;
+  esac
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
+if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_rtti_exceptions=no
+   ac_outfile=conftest.$ac_objext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="-fno-rtti -fno-exceptions"  ## exclude from sc_useless_quotes_in_assignment
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings other than the usual output.
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_rtti_exceptions=yes
+     fi
+   fi
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+
+if test yes = "$lt_cv_prog_compiler_rtti_exceptions"; then
+    lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
+else
+    :
+fi
+
+fi
+
+
+
+
+
+
+  lt_prog_compiler_wl=
+lt_prog_compiler_pic=
+lt_prog_compiler_static=
+
+
+  if test yes = "$GCC"; then
+    lt_prog_compiler_wl='-Wl,'
+    lt_prog_compiler_static='-static'
+
+    case $host_os in
+      aix*)
+      # All AIX code is PIC.
+      if test ia64 = "$host_cpu"; then
+	# AIX 5 now supports IA64 processor
+	lt_prog_compiler_static='-Bstatic'
+      fi
+      lt_prog_compiler_pic='-fPIC'
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            lt_prog_compiler_pic='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the '-m68020' flag to GCC prevents building anything better,
+            # like '-m68040'.
+            lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
+      ;;
+
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      lt_prog_compiler_pic='-DDLL_EXPORT'
+      case $host_os in
+      os2*)
+	lt_prog_compiler_static='$wl-static'
+	;;
+      esac
+      ;;
+
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      lt_prog_compiler_pic='-fno-common'
+      ;;
+
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      lt_prog_compiler_static=
+      ;;
+
+    hpux*)
+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
+      # sets the default TLS model and affects inlining.
+      case $host_cpu in
+      hppa*64*)
+	# +Z the default
+	;;
+      *)
+	lt_prog_compiler_pic='-fPIC'
+	;;
+      esac
+      ;;
+
+    interix[3-9]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+
+    msdosdjgpp*)
+      # Just because we use GCC doesn't mean we suddenly get shared libraries
+      # on systems that don't support them.
+      lt_prog_compiler_can_build_shared=no
+      enable_shared=no
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      lt_prog_compiler_pic='-fPIC -shared'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	lt_prog_compiler_pic=-Kconform_pic
+      fi
+      ;;
+
+    *)
+      lt_prog_compiler_pic='-fPIC'
+      ;;
+    esac
+
+    case $cc_basename in
+    nvcc*) # Cuda Compiler Driver 2.2
+      lt_prog_compiler_wl='-Xlinker '
+      if test -n "$lt_prog_compiler_pic"; then
+        lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic"
+      fi
+      ;;
+    esac
+  else
+    # PORTME Check for flag to pass linker flags through the system compiler.
+    case $host_os in
+    aix*)
+      lt_prog_compiler_wl='-Wl,'
+      if test ia64 = "$host_cpu"; then
+	# AIX 5 now supports IA64 processor
+	lt_prog_compiler_static='-Bstatic'
+      else
+	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
+      fi
+      ;;
+
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      lt_prog_compiler_pic='-fno-common'
+      case $cc_basename in
+      nagfor*)
+        # NAG Fortran compiler
+        lt_prog_compiler_wl='-Wl,-Wl,,'
+        lt_prog_compiler_pic='-PIC'
+        lt_prog_compiler_static='-Bstatic'
+        ;;
+      esac
+      ;;
+
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      lt_prog_compiler_pic='-DDLL_EXPORT'
+      case $host_os in
+      os2*)
+	lt_prog_compiler_static='$wl-static'
+	;;
+      esac
+      ;;
+
+    hpux9* | hpux10* | hpux11*)
+      lt_prog_compiler_wl='-Wl,'
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case $host_cpu in
+      hppa*64*|ia64*)
+	# +Z the default
+	;;
+      *)
+	lt_prog_compiler_pic='+Z'
+	;;
+      esac
+      # Is there a better lt_prog_compiler_static that works with the bundled CC?
+      lt_prog_compiler_static='$wl-a ${wl}archive'
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      lt_prog_compiler_wl='-Wl,'
+      # PIC (with -KPIC) is the default.
+      lt_prog_compiler_static='-non_shared'
+      ;;
+
+    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+      case $cc_basename in
+      # old Intel for x86_64, which still supported -KPIC.
+      ecc*)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-KPIC'
+	lt_prog_compiler_static='-static'
+        ;;
+      # icc used to be incompatible with GCC.
+      # ICC 10 doesn't accept -KPIC any more.
+      icc* | ifort*)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-fPIC'
+	lt_prog_compiler_static='-static'
+        ;;
+      # Lahey Fortran 8.1.
+      lf95*)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='--shared'
+	lt_prog_compiler_static='--static'
+	;;
+      nagfor*)
+	# NAG Fortran compiler
+	lt_prog_compiler_wl='-Wl,-Wl,,'
+	lt_prog_compiler_pic='-PIC'
+	lt_prog_compiler_static='-Bstatic'
+	;;
+      tcc*)
+	# Fabrice Bellard et al's Tiny C Compiler
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-fPIC'
+	lt_prog_compiler_static='-static'
+	;;
+      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
+        # Portland Group compilers (*not* the Pentium gcc compiler,
+	# which looks to be a dead project)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-fpic'
+	lt_prog_compiler_static='-Bstatic'
+        ;;
+      ccc*)
+        lt_prog_compiler_wl='-Wl,'
+        # All Alpha code is PIC.
+        lt_prog_compiler_static='-non_shared'
+        ;;
+      xl* | bgxl* | bgf* | mpixl*)
+	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-qpic'
+	lt_prog_compiler_static='-qstaticlink'
+	;;
+      *)
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl=''
+	  ;;
+	*Sun\ F* | *Sun*Fortran*)
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl='-Qoption ld '
+	  ;;
+	*Sun\ C*)
+	  # Sun C 5.9
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl='-Wl,'
+	  ;;
+        *Intel*\ [CF]*Compiler*)
+	  lt_prog_compiler_wl='-Wl,'
+	  lt_prog_compiler_pic='-fPIC'
+	  lt_prog_compiler_static='-static'
+	  ;;
+	*Portland\ Group*)
+	  lt_prog_compiler_wl='-Wl,'
+	  lt_prog_compiler_pic='-fpic'
+	  lt_prog_compiler_static='-Bstatic'
+	  ;;
+	esac
+	;;
+      esac
+      ;;
+
+    newsos6)
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      lt_prog_compiler_pic='-fPIC -shared'
+      ;;
+
+    osf3* | osf4* | osf5*)
+      lt_prog_compiler_wl='-Wl,'
+      # All OSF/1 code is PIC.
+      lt_prog_compiler_static='-non_shared'
+      ;;
+
+    rdos*)
+      lt_prog_compiler_static='-non_shared'
+      ;;
+
+    solaris*)
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      case $cc_basename in
+      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
+	lt_prog_compiler_wl='-Qoption ld ';;
+      *)
+	lt_prog_compiler_wl='-Wl,';;
+      esac
+      ;;
+
+    sunos4*)
+      lt_prog_compiler_wl='-Qoption ld '
+      lt_prog_compiler_pic='-PIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    sysv4 | sysv4.2uw2* | sysv4.3*)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	lt_prog_compiler_pic='-Kconform_pic'
+	lt_prog_compiler_static='-Bstatic'
+      fi
+      ;;
+
+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    unicos*)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_can_build_shared=no
+      ;;
+
+    uts4*)
+      lt_prog_compiler_pic='-pic'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    *)
+      lt_prog_compiler_can_build_shared=no
+      ;;
+    esac
+  fi
+
+case $host_os in
+  # For platforms that do not support PIC, -DPIC is meaningless:
+  *djgpp*)
+    lt_prog_compiler_pic=
+    ;;
+  *)
+    lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
+    ;;
+esac
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+if ${lt_cv_prog_compiler_pic+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
+
+#
+# Check to make sure the PIC flag actually works.
+#
+if test -n "$lt_prog_compiler_pic"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
+if ${lt_cv_prog_compiler_pic_works+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_pic_works=no
+   ac_outfile=conftest.$ac_objext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="$lt_prog_compiler_pic -DPIC"  ## exclude from sc_useless_quotes_in_assignment
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings other than the usual output.
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_pic_works=yes
+     fi
+   fi
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
+$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
+
+if test yes = "$lt_cv_prog_compiler_pic_works"; then
+    case $lt_prog_compiler_pic in
+     "" | " "*) ;;
+     *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
+     esac
+else
+    lt_prog_compiler_pic=
+     lt_prog_compiler_can_build_shared=no
+fi
+
+fi
+
+
+
+
+
+
+
+
+
+
+
+#
+# Check to make sure the static flag actually works.
+#
+wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+if ${lt_cv_prog_compiler_static_works+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_static_works=no
+   save_LDFLAGS=$LDFLAGS
+   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&5
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         lt_cv_prog_compiler_static_works=yes
+       fi
+     else
+       lt_cv_prog_compiler_static_works=yes
+     fi
+   fi
+   $RM -r conftest*
+   LDFLAGS=$save_LDFLAGS
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
+$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
+
+if test yes = "$lt_cv_prog_compiler_static_works"; then
+    :
+else
+    lt_prog_compiler_static=
+fi
+
+
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if ${lt_cv_prog_compiler_c_o+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_c_o=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_c_o=yes
+     fi
+   fi
+   chmod u+w . 2>&5
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
+$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
+
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if ${lt_cv_prog_compiler_c_o+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_c_o=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_c_o=yes
+     fi
+   fi
+   chmod u+w . 2>&5
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
+$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
+
+
+
+
+hard_links=nottested
+if test no = "$lt_cv_prog_compiler_c_o" && test no != "$need_locks"; then
+  # do not overwrite the value of need_locks provided by the user
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
+$as_echo_n "checking if we can lock with hard links... " >&6; }
+  hard_links=yes
+  $RM conftest*
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  touch conftest.a
+  ln conftest.a conftest.b 2>&5 || hard_links=no
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
+$as_echo "$hard_links" >&6; }
+  if test no = "$hard_links"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
+    need_locks=warn
+  fi
+else
+  need_locks=no
+fi
+
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
+
+  runpath_var=
+  allow_undefined_flag=
+  always_export_symbols=no
+  archive_cmds=
+  archive_expsym_cmds=
+  compiler_needs_object=no
+  enable_shared_with_static_runtimes=no
+  export_dynamic_flag_spec=
+  export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  hardcode_automatic=no
+  hardcode_direct=no
+  hardcode_direct_absolute=no
+  hardcode_libdir_flag_spec=
+  hardcode_libdir_separator=
+  hardcode_minus_L=no
+  hardcode_shlibpath_var=unsupported
+  inherit_rpath=no
+  link_all_deplibs=unknown
+  module_cmds=
+  module_expsym_cmds=
+  old_archive_from_new_cmds=
+  old_archive_from_expsyms_cmds=
+  thread_safe_flag_spec=
+  whole_archive_flag_spec=
+  # include_expsyms should be a list of space-separated symbols to be *always*
+  # included in the symbol list
+  include_expsyms=
+  # exclude_expsyms can be an extended regexp of symbols to exclude
+  # it will be wrapped by ' (' and ')$', so one must not match beginning or
+  # end of line.  Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc',
+  # as well as any symbol that contains 'd'.
+  exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
+  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+  # platforms (ab)use it in PIC code, but their linkers get confused if
+  # the symbol is explicitly referenced.  Since portable code cannot
+  # rely on this symbol name, it's probably fine to never include it in
+  # preloaded symbol tables.
+  # Exclude shared library initialization/finalization symbols.
+  extract_expsyms_cmds=
+
+  case $host_os in
+  cygwin* | mingw* | pw32* | cegcc*)
+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+    # When not using gcc, we currently assume that we are using
+    # Microsoft Visual C++.
+    if test yes != "$GCC"; then
+      with_gnu_ld=no
+    fi
+    ;;
+  interix*)
+    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    with_gnu_ld=yes
+    ;;
+  openbsd* | bitrig*)
+    with_gnu_ld=no
+    ;;
+  esac
+
+  ld_shlibs=yes
+
+  # On some targets, GNU ld is compatible enough with the native linker
+  # that we're better off using the native interface for both.
+  lt_use_gnu_ld_interface=no
+  if test yes = "$with_gnu_ld"; then
+    case $host_os in
+      aix*)
+	# The AIX port of GNU ld has always aspired to compatibility
+	# with the native linker.  However, as the warning in the GNU ld
+	# block says, versions before 2.19.5* couldn't really create working
+	# shared libraries, regardless of the interface used.
+	case `$LD -v 2>&1` in
+	  *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
+	  *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;;
+	  *\ \(GNU\ Binutils\)\ [3-9]*) ;;
+	  *)
+	    lt_use_gnu_ld_interface=yes
+	    ;;
+	esac
+	;;
+      *)
+	lt_use_gnu_ld_interface=yes
+	;;
+    esac
+  fi
+
+  if test yes = "$lt_use_gnu_ld_interface"; then
+    # If archive_cmds runs LD, not CC, wlarc should be empty
+    wlarc='$wl'
+
+    # Set some defaults for GNU ld with shared library support. These
+    # are reset later if shared libraries are not supported. Putting them
+    # here allows them to be overridden if necessary.
+    runpath_var=LD_RUN_PATH
+    hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+    export_dynamic_flag_spec='$wl--export-dynamic'
+    # ancient GNU ld didn't support --whole-archive et. al.
+    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
+      whole_archive_flag_spec=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
+    else
+      whole_archive_flag_spec=
+    fi
+    supports_anon_versioning=no
+    case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in
+      *GNU\ gold*) supports_anon_versioning=yes ;;
+      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+      *\ 2.11.*) ;; # other 2.11 versions
+      *) supports_anon_versioning=yes ;;
+    esac
+
+    # See if GNU ld supports shared libraries.
+    case $host_os in
+    aix[3-9]*)
+      # On AIX/PPC, the GNU linker is very broken
+      if test ia64 != "$host_cpu"; then
+	ld_shlibs=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: the GNU linker, at least up to release 2.19, is reported
+*** to be unable to reliably create shared libraries on AIX.
+*** Therefore, libtool is disabling shared libraries support.  If you
+*** really care for shared libraries, you may want to install binutils
+*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
+*** You will then need to restart the configuration process.
+
+_LT_EOF
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+            archive_expsym_cmds=''
+        ;;
+      m68k)
+            archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            hardcode_libdir_flag_spec='-L$libdir'
+            hardcode_minus_L=yes
+        ;;
+      esac
+      ;;
+
+    beos*)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	allow_undefined_flag=unsupported
+	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
+	# support --undefined.  This deserves some investigation.  FIXME
+	archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
+    cygwin* | mingw* | pw32* | cegcc*)
+      # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
+      # as there is no search path for DLLs.
+      hardcode_libdir_flag_spec='-L$libdir'
+      export_dynamic_flag_spec='$wl--export-all-symbols'
+      allow_undefined_flag=unsupported
+      always_export_symbols=no
+      enable_shared_with_static_runtimes=yes
+      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
+      exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
+
+      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	# If the export-symbols file already is a .def file, use it as
+	# is; otherwise, prepend EXPORTS...
+	archive_expsym_cmds='if   test DEF = "`$SED -n     -e '\''s/^[	 ]*//'\''     -e '\''/^\(;.*\)*$/d'\''     -e '\''s/^\(EXPORTS\|LIBRARY\)\([	 ].*\)*$/DEF/p'\''     -e q     $export_symbols`" ; then
+          cp $export_symbols $output_objdir/$soname.def;
+        else
+          echo EXPORTS > $output_objdir/$soname.def;
+          cat $export_symbols >> $output_objdir/$soname.def;
+        fi~
+        $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
+    haiku*)
+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+      link_all_deplibs=yes
+      ;;
+
+    os2*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      allow_undefined_flag=unsupported
+      shrext_cmds=.dll
+      archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	prefix_cmds="$SED"~
+	if test EXPORTS = "`$SED 1q $export_symbols`"; then
+	  prefix_cmds="$prefix_cmds -e 1d";
+	fi~
+	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+      enable_shared_with_static_runtimes=yes
+      ;;
+
+    interix[3-9]*)
+      hardcode_direct=no
+      hardcode_shlibpath_var=no
+      hardcode_libdir_flag_spec='$wl-rpath,$libdir'
+      export_dynamic_flag_spec='$wl-E'
+      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+      # Instead, shared libraries are loaded at an image base (0x10000000 by
+      # default) and relocated if they conflict, which is a slow very memory
+      # consuming and fragmenting process.  To avoid this, we pick a random,
+      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+      archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      archive_expsym_cmds='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      ;;
+
+    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+      tmp_diet=no
+      if test linux-dietlibc = "$host_os"; then
+	case $cc_basename in
+	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
+	esac
+      fi
+      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
+	 && test no = "$tmp_diet"
+      then
+	tmp_addflag=' $pic_flag'
+	tmp_sharedflag='-shared'
+	case $cc_basename,$host_cpu in
+        pgcc*)				# Portland Group C compiler
+	  whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+	  tmp_addflag=' $pic_flag'
+	  ;;
+	pgf77* | pgf90* | pgf95* | pgfortran*)
+					# Portland Group f77 and f90 compilers
+	  whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+	  tmp_addflag=' $pic_flag -Mnomain' ;;
+	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
+	  tmp_addflag=' -i_dynamic' ;;
+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
+	ifc* | ifort*)			# Intel Fortran compiler
+	  tmp_addflag=' -nofor_main' ;;
+	lf95*)				# Lahey Fortran 8.1
+	  whole_archive_flag_spec=
+	  tmp_sharedflag='--shared' ;;
+        nagfor*)                        # NAGFOR 5.3
+          tmp_sharedflag='-Wl,-shared' ;;
+	xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
+	  tmp_sharedflag='-qmkshrobj'
+	  tmp_addflag= ;;
+	nvcc*)	# Cuda Compiler Driver 2.2
+	  whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+	  compiler_needs_object=yes
+	  ;;
+	esac
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)			# Sun C 5.9
+	  whole_archive_flag_spec='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+	  compiler_needs_object=yes
+	  tmp_sharedflag='-G' ;;
+	*Sun\ F*)			# Sun Fortran 8.3
+	  tmp_sharedflag='-G' ;;
+	esac
+	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+
+        if test yes = "$supports_anon_versioning"; then
+          archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
+            cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+            echo "local: *; };" >> $output_objdir/$libname.ver~
+            $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
+        fi
+
+	case $cc_basename in
+	tcc*)
+	  export_dynamic_flag_spec='-rdynamic'
+	  ;;
+	xlf* | bgf* | bgxlf* | mpixlf*)
+	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
+	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
+	  hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+	  archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
+	  if test yes = "$supports_anon_versioning"; then
+	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
+              cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+              echo "local: *; };" >> $output_objdir/$libname.ver~
+              $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+	  fi
+	  ;;
+	esac
+      else
+        ld_shlibs=no
+      fi
+      ;;
+
+    netbsd*)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+	wlarc=
+      else
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+      fi
+      ;;
+
+    solaris*)
+      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
+	ld_shlibs=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+*** create shared libraries on Solaris systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.9.1 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+      case `$LD -v 2>&1` in
+        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
+	ld_shlibs=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot
+*** reliably create shared libraries on SCO systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+	;;
+	*)
+	  # For security reasons, it is highly recommended that you always
+	  # use absolute paths for naming shared libraries, and exclude the
+	  # DT_RUNPATH tag from executables and libraries.  But doing so
+	  # requires that you compile everything twice, which is a pain.
+	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	    hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+	    archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	    archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+	  else
+	    ld_shlibs=no
+	  fi
+	;;
+      esac
+      ;;
+
+    sunos4*)
+      archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      wlarc=
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    *)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+    esac
+
+    if test no = "$ld_shlibs"; then
+      runpath_var=
+      hardcode_libdir_flag_spec=
+      export_dynamic_flag_spec=
+      whole_archive_flag_spec=
+    fi
+  else
+    # PORTME fill in a description of your system's linker (not GNU ld)
+    case $host_os in
+    aix3*)
+      allow_undefined_flag=unsupported
+      always_export_symbols=yes
+      archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+      # Note: this linker hardcodes the directories in LIBPATH if there
+      # are no directories specified by -L.
+      hardcode_minus_L=yes
+      if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then
+	# Neither direct hardcoding nor static linking is supported with a
+	# broken collect2.
+	hardcode_direct=unsupported
+      fi
+      ;;
+
+    aix[4-9]*)
+      if test ia64 = "$host_cpu"; then
+	# On IA64, the linker does run time linking by default, so we don't
+	# have to do anything special.
+	aix_use_runtimelinking=no
+	exp_sym_flag='-Bexport'
+	no_entry_flag=
+      else
+	# If we're using GNU nm, then we don't want the "-C" option.
+	# -C means demangle to GNU nm, but means don't demangle to AIX nm.
+	# Without the "-l" option, or with the "-B" option, AIX nm treats
+	# weak defined symbols like other global defined symbols, whereas
+	# GNU nm marks them as "W".
+	# While the 'weak' keyword is ignored in the Export File, we need
+	# it in the Import File for the 'aix-soname' feature, so we have
+	# to replace the "-B" option with "-P" for AIX nm.
+	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
+	else
+	  export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
+	fi
+	aix_use_runtimelinking=no
+
+	# Test if we are trying to use run time linking or normal
+	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
+	# have runtime linking enabled, and use it for executables.
+	# For shared libraries, we enable/disable runtime linking
+	# depending on the kind of the shared library created -
+	# when "with_aix_soname,aix_use_runtimelinking" is:
+	# "aix,no"   lib.a(lib.so.V) shared, rtl:no,  for executables
+	# "aix,yes"  lib.so          shared, rtl:yes, for executables
+	#            lib.a           static archive
+	# "both,no"  lib.so.V(shr.o) shared, rtl:yes
+	#            lib.a(lib.so.V) shared, rtl:no,  for executables
+	# "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+	#            lib.a(lib.so.V) shared, rtl:no
+	# "svr4,*"   lib.so.V(shr.o) shared, rtl:yes, for executables
+	#            lib.a           static archive
+	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+	  for ld_flag in $LDFLAGS; do
+	  if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then
+	    aix_use_runtimelinking=yes
+	    break
+	  fi
+	  done
+	  if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+	    # With aix-soname=svr4, we create the lib.so.V shared archives only,
+	    # so we don't have lib.a shared libs to link our executables.
+	    # We have to force runtime linking in this case.
+	    aix_use_runtimelinking=yes
+	    LDFLAGS="$LDFLAGS -Wl,-brtl"
+	  fi
+	  ;;
+	esac
+
+	exp_sym_flag='-bexport'
+	no_entry_flag='-bnoentry'
+      fi
+
+      # When large executables or shared objects are built, AIX ld can
+      # have problems creating the table of contents.  If linking a library
+      # or program results in "error TOC overflow" add -mminimal-toc to
+      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+      archive_cmds=''
+      hardcode_direct=yes
+      hardcode_direct_absolute=yes
+      hardcode_libdir_separator=':'
+      link_all_deplibs=yes
+      file_list_spec='$wl-f,'
+      case $with_aix_soname,$aix_use_runtimelinking in
+      aix,*) ;; # traditional, no import file
+      svr4,* | *,yes) # use import file
+	# The Import File defines what to hardcode.
+	hardcode_direct=no
+	hardcode_direct_absolute=no
+	;;
+      esac
+
+      if test yes = "$GCC"; then
+	case $host_os in aix4.[012]|aix4.[012].*)
+	# We only want to do this on AIX 4.2 and lower, the check
+	# below for broken collect2 doesn't work under 4.3+
+	  collect2name=`$CC -print-prog-name=collect2`
+	  if test -f "$collect2name" &&
+	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+	  then
+	  # We have reworked collect2
+	  :
+	  else
+	  # We have old collect2
+	  hardcode_direct=unsupported
+	  # It fails to find uninstalled libraries when the uninstalled
+	  # path is not listed in the libpath.  Setting hardcode_minus_L
+	  # to unsupported forces relinking
+	  hardcode_minus_L=yes
+	  hardcode_libdir_flag_spec='-L$libdir'
+	  hardcode_libdir_separator=
+	  fi
+	  ;;
+	esac
+	shared_flag='-shared'
+	if test yes = "$aix_use_runtimelinking"; then
+	  shared_flag="$shared_flag "'$wl-G'
+	fi
+	# Need to ensure runtime linking is disabled for the traditional
+	# shared library, or the linker may eventually find shared libraries
+	# /with/ Import File - we do not want to mix them.
+	shared_flag_aix='-shared'
+	shared_flag_svr4='-shared $wl-G'
+      else
+	# not using gcc
+	if test ia64 = "$host_cpu"; then
+	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	# chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+	else
+	  if test yes = "$aix_use_runtimelinking"; then
+	    shared_flag='$wl-G'
+	  else
+	    shared_flag='$wl-bM:SRE'
+	  fi
+	  shared_flag_aix='$wl-bM:SRE'
+	  shared_flag_svr4='$wl-G'
+	fi
+      fi
+
+      export_dynamic_flag_spec='$wl-bexpall'
+      # It seems that -bexpall does not export symbols beginning with
+      # underscore (_), so it is better to generate a list of symbols to export.
+      always_export_symbols=yes
+      if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
+	# Warning - without using the other runtime loading flags (-brtl),
+	# -berok will link without error, but may produce a broken library.
+	allow_undefined_flag='-berok'
+        # Determine the default libpath from the value encoded in an
+        # empty executable.
+        if test set = "${lt_cv_aix_libpath+set}"; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  if ${lt_cv_aix_libpath_+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+
+  lt_aix_libpath_sed='
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *\([^ ]*\) *$/\1/
+	      p
+	  }
+      }'
+  lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  if test -z "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_=/usr/lib:/lib
+  fi
+
+fi
+
+  aix_libpath=$lt_cv_aix_libpath_
+fi
+
+        hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath"
+        archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
+      else
+	if test ia64 = "$host_cpu"; then
+	  hardcode_libdir_flag_spec='$wl-R $libdir:/usr/lib:/lib'
+	  allow_undefined_flag="-z nodefs"
+	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
+	else
+	 # Determine the default libpath from the value encoded in an
+	 # empty executable.
+	 if test set = "${lt_cv_aix_libpath+set}"; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  if ${lt_cv_aix_libpath_+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+
+  lt_aix_libpath_sed='
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *\([^ ]*\) *$/\1/
+	      p
+	  }
+      }'
+  lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  if test -z "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_=/usr/lib:/lib
+  fi
+
+fi
+
+  aix_libpath=$lt_cv_aix_libpath_
+fi
+
+	 hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath"
+	  # Warning - without using the other run time loading flags,
+	  # -berok will link without error, but may produce a broken library.
+	  no_undefined_flag=' $wl-bernotok'
+	  allow_undefined_flag=' $wl-berok'
+	  if test yes = "$with_gnu_ld"; then
+	    # We only use this code for GNU lds that support --whole-archive.
+	    whole_archive_flag_spec='$wl--whole-archive$convenience $wl--no-whole-archive'
+	  else
+	    # Exported symbols can be pulled into shared objects from archives
+	    whole_archive_flag_spec='$convenience'
+	  fi
+	  archive_cmds_need_lc=yes
+	  archive_expsym_cmds='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+	  # -brtl affects multiple linker settings, -berok does not and is overridden later
+	  compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`'
+	  if test svr4 != "$with_aix_soname"; then
+	    # This is similar to how AIX traditionally builds its shared libraries.
+	    archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+	  fi
+	  if test aix != "$with_aix_soname"; then
+	    archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) >  [...]
+	  else
+	    # used by -dlpreopen to get the symbols
+	    archive_expsym_cmds="$archive_expsym_cmds"'~$MV  $output_objdir/$realname.d/$soname $output_objdir'
+	  fi
+	  archive_expsym_cmds="$archive_expsym_cmds"'~$RM -r $output_objdir/$realname.d'
+	fi
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+            archive_expsym_cmds=''
+        ;;
+      m68k)
+            archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            hardcode_libdir_flag_spec='-L$libdir'
+            hardcode_minus_L=yes
+        ;;
+      esac
+      ;;
+
+    bsdi[45]*)
+      export_dynamic_flag_spec=-rdynamic
+      ;;
+
+    cygwin* | mingw* | pw32* | cegcc*)
+      # When not using gcc, we currently assume that we are using
+      # Microsoft Visual C++.
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      case $cc_basename in
+      cl*)
+	# Native MSVC
+	hardcode_libdir_flag_spec=' '
+	allow_undefined_flag=unsupported
+	always_export_symbols=yes
+	file_list_spec='@'
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=.dll
+	# FIXME: Setting linknames here is a bad hack.
+	archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+	archive_expsym_cmds='if   test DEF = "`$SED -n     -e '\''s/^[	 ]*//'\''     -e '\''/^\(;.*\)*$/d'\''     -e '\''s/^\(EXPORTS\|LIBRARY\)\([	 ].*\)*$/DEF/p'\''     -e q     $export_symbols`" ; then
+            cp "$export_symbols" "$output_objdir/$soname.def";
+            echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+          else
+            $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
+          fi~
+          $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+          linknames='
+	# The linker will not automatically build a static lib if we build a DLL.
+	# _LT_TAGVAR(old_archive_from_new_cmds, )='true'
+	enable_shared_with_static_runtimes=yes
+	exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+	export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+	# Don't use ranlib
+	old_postinstall_cmds='chmod 644 $oldlib'
+	postlink_cmds='lt_outputfile="@OUTPUT@"~
+          lt_tool_outputfile="@TOOL_OUTPUT@"~
+          case $lt_outputfile in
+            *.exe|*.EXE) ;;
+            *)
+              lt_outputfile=$lt_outputfile.exe
+              lt_tool_outputfile=$lt_tool_outputfile.exe
+              ;;
+          esac~
+          if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
+            $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+            $RM "$lt_outputfile.manifest";
+          fi'
+	;;
+      *)
+	# Assume MSVC wrapper
+	hardcode_libdir_flag_spec=' '
+	allow_undefined_flag=unsupported
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=.dll
+	# FIXME: Setting linknames here is a bad hack.
+	archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
+	# The linker will automatically build a .lib file if we build a DLL.
+	old_archive_from_new_cmds='true'
+	# FIXME: Should let the user specify the lib program.
+	old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
+	enable_shared_with_static_runtimes=yes
+	;;
+      esac
+      ;;
+
+    darwin* | rhapsody*)
+
+
+  archive_cmds_need_lc=no
+  hardcode_direct=no
+  hardcode_automatic=yes
+  hardcode_shlibpath_var=unsupported
+  if test yes = "$lt_cv_ld_force_load"; then
+    whole_archive_flag_spec='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+
+  else
+    whole_archive_flag_spec=''
+  fi
+  link_all_deplibs=yes
+  allow_undefined_flag=$_lt_dar_allow_undefined
+  case $cc_basename in
+     ifort*|nagfor*) _lt_dar_can_shared=yes ;;
+     *) _lt_dar_can_shared=$GCC ;;
+  esac
+  if test yes = "$_lt_dar_can_shared"; then
+    output_verbose_link_cmd=func_echo_all
+    archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
+    module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
+    archive_expsym_cmds="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
+    module_expsym_cmds="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
+
+  else
+  ld_shlibs=no
+  fi
+
+      ;;
+
+    dgux*)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_shlibpath_var=no
+      ;;
+
+    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+    # support.  Future versions do this automatically, but an explicit c++rt0.o
+    # does not break anything, and helps significantly (at the cost of a little
+    # extra space).
+    freebsd2.2*)
+      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+    freebsd2.*)
+      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_direct=yes
+      hardcode_minus_L=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+    freebsd* | dragonfly*)
+      archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    hpux9*)
+      if test yes = "$GCC"; then
+	archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
+      else
+	archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
+      fi
+      hardcode_libdir_flag_spec='$wl+b $wl$libdir'
+      hardcode_libdir_separator=:
+      hardcode_direct=yes
+
+      # hardcode_minus_L: Not really in the search PATH,
+      # but as the default location of the library.
+      hardcode_minus_L=yes
+      export_dynamic_flag_spec='$wl-E'
+      ;;
+
+    hpux10*)
+      if test yes,no = "$GCC,$with_gnu_ld"; then
+	archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      if test no = "$with_gnu_ld"; then
+	hardcode_libdir_flag_spec='$wl+b $wl$libdir'
+	hardcode_libdir_separator=:
+	hardcode_direct=yes
+	hardcode_direct_absolute=yes
+	export_dynamic_flag_spec='$wl-E'
+	# hardcode_minus_L: Not really in the search PATH,
+	# but as the default location of the library.
+	hardcode_minus_L=yes
+      fi
+      ;;
+
+    hpux11*)
+      if test yes,no = "$GCC,$with_gnu_ld"; then
+	case $host_cpu in
+	hppa*64*)
+	  archive_cmds='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	esac
+      else
+	case $host_cpu in
+	hppa*64*)
+	  archive_cmds='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  archive_cmds='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+
+	  # Older versions of the 11.00 compiler do not understand -b yet
+	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
+$as_echo_n "checking if $CC understands -b... " >&6; }
+if ${lt_cv_prog_compiler__b+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler__b=no
+   save_LDFLAGS=$LDFLAGS
+   LDFLAGS="$LDFLAGS -b"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&5
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         lt_cv_prog_compiler__b=yes
+       fi
+     else
+       lt_cv_prog_compiler__b=yes
+     fi
+   fi
+   $RM -r conftest*
+   LDFLAGS=$save_LDFLAGS
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
+$as_echo "$lt_cv_prog_compiler__b" >&6; }
+
+if test yes = "$lt_cv_prog_compiler__b"; then
+    archive_cmds='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+else
+    archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+fi
+
+	  ;;
+	esac
+      fi
+      if test no = "$with_gnu_ld"; then
+	hardcode_libdir_flag_spec='$wl+b $wl$libdir'
+	hardcode_libdir_separator=:
+
+	case $host_cpu in
+	hppa*64*|ia64*)
+	  hardcode_direct=no
+	  hardcode_shlibpath_var=no
+	  ;;
+	*)
+	  hardcode_direct=yes
+	  hardcode_direct_absolute=yes
+	  export_dynamic_flag_spec='$wl-E'
+
+	  # hardcode_minus_L: Not really in the search PATH,
+	  # but as the default location of the library.
+	  hardcode_minus_L=yes
+	  ;;
+	esac
+      fi
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      if test yes = "$GCC"; then
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+	# Try to use the -exported_symbol ld option, if it does not
+	# work, assume that -exports_file does not work either and
+	# implicitly export all symbols.
+	# This should be the same for all languages, so no per-tag cache variable.
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
+if ${lt_cv_irix_exported_symbol+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  save_LDFLAGS=$LDFLAGS
+	   LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null"
+	   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+int foo (void) { return 0; }
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  lt_cv_irix_exported_symbol=yes
+else
+  lt_cv_irix_exported_symbol=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+           LDFLAGS=$save_LDFLAGS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
+	if test yes = "$lt_cv_irix_exported_symbol"; then
+          archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
+	fi
+      else
+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'
+      fi
+      archive_cmds_need_lc='no'
+      hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+      hardcode_libdir_separator=:
+      inherit_rpath=yes
+      link_all_deplibs=yes
+      ;;
+
+    linux*)
+      case $cc_basename in
+      tcc*)
+	# Fabrice Bellard et al's Tiny C Compiler
+	ld_shlibs=yes
+	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	;;
+      esac
+      ;;
+
+    netbsd*)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+      else
+	archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+      fi
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    newsos6)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_direct=yes
+      hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+      hardcode_libdir_separator=:
+      hardcode_shlibpath_var=no
+      ;;
+
+    *nto* | *qnx*)
+      ;;
+
+    openbsd* | bitrig*)
+      if test -f /usr/libexec/ld.so; then
+	hardcode_direct=yes
+	hardcode_shlibpath_var=no
+	hardcode_direct_absolute=yes
+	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols'
+	  hardcode_libdir_flag_spec='$wl-rpath,$libdir'
+	  export_dynamic_flag_spec='$wl-E'
+	else
+	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  hardcode_libdir_flag_spec='$wl-rpath,$libdir'
+	fi
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
+    os2*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      allow_undefined_flag=unsupported
+      shrext_cmds=.dll
+      archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	prefix_cmds="$SED"~
+	if test EXPORTS = "`$SED 1q $export_symbols`"; then
+	  prefix_cmds="$prefix_cmds -e 1d";
+	fi~
+	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+      enable_shared_with_static_runtimes=yes
+      ;;
+
+    osf3*)
+      if test yes = "$GCC"; then
+	allow_undefined_flag=' $wl-expect_unresolved $wl\*'
+	archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+      else
+	allow_undefined_flag=' -expect_unresolved \*'
+	archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+      fi
+      archive_cmds_need_lc='no'
+      hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+      hardcode_libdir_separator=:
+      ;;
+
+    osf4* | osf5*)	# as osf3* with the addition of -msym flag
+      if test yes = "$GCC"; then
+	allow_undefined_flag=' $wl-expect_unresolved $wl\*'
+	archive_cmds='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+	hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+      else
+	allow_undefined_flag=' -expect_unresolved \*'
+	archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
+          $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp'
+
+	# Both c and cxx compiler support -rpath directly
+	hardcode_libdir_flag_spec='-rpath $libdir'
+      fi
+      archive_cmds_need_lc='no'
+      hardcode_libdir_separator=:
+      ;;
+
+    solaris*)
+      no_undefined_flag=' -z defs'
+      if test yes = "$GCC"; then
+	wlarc='$wl'
+	archive_cmds='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+          $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+      else
+	case `$CC -V 2>&1` in
+	*"Compilers 5.0"*)
+	  wlarc=''
+	  archive_cmds='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+            $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+	  ;;
+	*)
+	  wlarc='$wl'
+	  archive_cmds='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+            $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+	  ;;
+	esac
+      fi
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_shlibpath_var=no
+      case $host_os in
+      solaris2.[0-5] | solaris2.[0-5].*) ;;
+      *)
+	# The compiler driver will combine and reorder linker options,
+	# but understands '-z linker_flag'.  GCC discards it without '$wl',
+	# but is careful enough not to reorder.
+	# Supported since Solaris 2.6 (maybe 2.5.1?)
+	if test yes = "$GCC"; then
+	  whole_archive_flag_spec='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
+	else
+	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
+	fi
+	;;
+      esac
+      link_all_deplibs=yes
+      ;;
+
+    sunos4*)
+      if test sequent = "$host_vendor"; then
+	# Use $CC to link under sequent, because it throws in some extra .o
+	# files that make .init and .fini sections work.
+	archive_cmds='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_direct=yes
+      hardcode_minus_L=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    sysv4)
+      case $host_vendor in
+	sni)
+	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  hardcode_direct=yes # is this really true???
+	;;
+	siemens)
+	  ## LD is ld it makes a PLAMLIB
+	  ## CC just makes a GrossModule.
+	  archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+	  reload_cmds='$CC -r -o $output$reload_objs'
+	  hardcode_direct=no
+        ;;
+	motorola)
+	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  hardcode_direct=no #Motorola manual says yes, but my tests say they lie
+	;;
+      esac
+      runpath_var='LD_RUN_PATH'
+      hardcode_shlibpath_var=no
+      ;;
+
+    sysv4.3*)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_shlibpath_var=no
+      export_dynamic_flag_spec='-Bexport'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	hardcode_shlibpath_var=no
+	runpath_var=LD_RUN_PATH
+	hardcode_runpath_var=yes
+	ld_shlibs=yes
+      fi
+      ;;
+
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+      no_undefined_flag='$wl-z,text'
+      archive_cmds_need_lc=no
+      hardcode_shlibpath_var=no
+      runpath_var='LD_RUN_PATH'
+
+      if test yes = "$GCC"; then
+	archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6*)
+      # Note: We CANNOT use -z defs as we might desire, because we do not
+      # link with -lc, and that would cause any symbols used from libc to
+      # always be unresolved, which means just about no library would
+      # ever link correctly.  If we're not using GNU ld we use -z text
+      # though, which does catch some bad symbols but isn't as heavy-handed
+      # as -z defs.
+      no_undefined_flag='$wl-z,text'
+      allow_undefined_flag='$wl-z,nodefs'
+      archive_cmds_need_lc=no
+      hardcode_shlibpath_var=no
+      hardcode_libdir_flag_spec='$wl-R,$libdir'
+      hardcode_libdir_separator=':'
+      link_all_deplibs=yes
+      export_dynamic_flag_spec='$wl-Bexport'
+      runpath_var='LD_RUN_PATH'
+
+      if test yes = "$GCC"; then
+	archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    uts4*)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_shlibpath_var=no
+      ;;
+
+    *)
+      ld_shlibs=no
+      ;;
+    esac
+
+    if test sni = "$host_vendor"; then
+      case $host in
+      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+	export_dynamic_flag_spec='$wl-Blargedynsym'
+	;;
+      esac
+    fi
+  fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
+$as_echo "$ld_shlibs" >&6; }
+test no = "$ld_shlibs" && can_build_shared=no
+
+with_gnu_ld=$with_gnu_ld
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#
+# Do we need to explicitly link libc?
+#
+case "x$archive_cmds_need_lc" in
+x|xyes)
+  # Assume -lc should be added
+  archive_cmds_need_lc=yes
+
+  if test yes,yes = "$GCC,$enable_shared"; then
+    case $archive_cmds in
+    *'~'*)
+      # FIXME: we may have to deal with multi-command sequences.
+      ;;
+    '$CC '*)
+      # Test whether the compiler implicitly links with -lc since on some
+      # systems, -lgcc has to come before -lc. If gcc already passes -lc
+      # to ld, don't add -lc before -lgcc.
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
+if ${lt_cv_archive_cmds_need_lc+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  $RM conftest*
+	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } 2>conftest.err; then
+	  soname=conftest
+	  lib=conftest
+	  libobjs=conftest.$ac_objext
+	  deplibs=
+	  wl=$lt_prog_compiler_wl
+	  pic_flag=$lt_prog_compiler_pic
+	  compiler_flags=-v
+	  linker_flags=-v
+	  verstring=
+	  output_objdir=.
+	  libname=conftest
+	  lt_save_allow_undefined_flag=$allow_undefined_flag
+	  allow_undefined_flag=
+	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
+  (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+	  then
+	    lt_cv_archive_cmds_need_lc=no
+	  else
+	    lt_cv_archive_cmds_need_lc=yes
+	  fi
+	  allow_undefined_flag=$lt_save_allow_undefined_flag
+	else
+	  cat conftest.err 1>&5
+	fi
+	$RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
+$as_echo "$lt_cv_archive_cmds_need_lc" >&6; }
+      archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc
+      ;;
+    esac
+  fi
+  ;;
+esac
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
+$as_echo_n "checking dynamic linker characteristics... " >&6; }
+
+if test yes = "$GCC"; then
+  case $host_os in
+    darwin*) lt_awk_arg='/^libraries:/,/LR/' ;;
+    *) lt_awk_arg='/^libraries:/' ;;
+  esac
+  case $host_os in
+    mingw* | cegcc*) lt_sed_strip_eq='s|=\([A-Za-z]:\)|\1|g' ;;
+    *) lt_sed_strip_eq='s|=/|/|g' ;;
+  esac
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
+  case $lt_search_path_spec in
+  *\;*)
+    # if the path contains ";" then we assume it to be the separator
+    # otherwise default to the standard path separator (i.e. ":") - it is
+    # assumed that no part of a normal pathname contains ";" but that should
+    # okay in the real world where ";" in dirpaths is itself problematic.
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
+    ;;
+  *)
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
+    ;;
+  esac
+  # Ok, now we have the path, separated by spaces, we can step through it
+  # and add multilib dir if necessary...
+  lt_tmp_lt_search_path_spec=
+  lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  # ...but if some path component already ends with the multilib dir we assume
+  # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer).
+  case "$lt_multi_os_dir; $lt_search_path_spec " in
+  "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*)
+    lt_multi_os_dir=
+    ;;
+  esac
+  for lt_sys_path in $lt_search_path_spec; do
+    if test -d "$lt_sys_path$lt_multi_os_dir"; then
+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir"
+    elif test -n "$lt_multi_os_dir"; then
+      test -d "$lt_sys_path" && \
+	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+    fi
+  done
+  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
+BEGIN {RS = " "; FS = "/|\n";} {
+  lt_foo = "";
+  lt_count = 0;
+  for (lt_i = NF; lt_i > 0; lt_i--) {
+    if ($lt_i != "" && $lt_i != ".") {
+      if ($lt_i == "..") {
+        lt_count++;
+      } else {
+        if (lt_count == 0) {
+          lt_foo = "/" $lt_i lt_foo;
+        } else {
+          lt_count--;
+        }
+      }
+    }
+  }
+  if (lt_foo != "") { lt_freq[lt_foo]++; }
+  if (lt_freq[lt_foo] == 1) { print lt_foo; }
+}'`
+  # AWK program above erroneously prepends '/' to C:/dos/paths
+  # for these hosts.
+  case $host_os in
+    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
+      $SED 's|/\([A-Za-z]:\)|\1|g'` ;;
+  esac
+  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
+else
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+fi
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
+shrext_cmds=.so
+postinstall_cmds=
+postuninstall_cmds=
+finish_cmds=
+finish_eval=
+shlibpath_var=
+shlibpath_overrides_runpath=unknown
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+need_lib_prefix=unknown
+hardcode_into_libs=no
+
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+need_version=unknown
+
+
+
+case $host_os in
+aix3*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname.a'
+  shlibpath_var=LIBPATH
+
+  # AIX 3 has no versioning support, so we append a major version to the name.
+  soname_spec='$libname$release$shared_ext$major'
+  ;;
+
+aix[4-9]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  hardcode_into_libs=yes
+  if test ia64 = "$host_cpu"; then
+    # AIX 5 supports IA64
+    library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext'
+    shlibpath_var=LD_LIBRARY_PATH
+  else
+    # With GCC up to 2.95.x, collect2 would create an import file
+    # for dependence libraries.  The import file would start with
+    # the line '#! .'.  This would cause the generated library to
+    # depend on '.', always an invalid library.  This was fixed in
+    # development snapshots of GCC prior to 3.0.
+    case $host_os in
+      aix4 | aix4.[01] | aix4.[01].*)
+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+	   echo ' yes '
+	   echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then
+	:
+      else
+	can_build_shared=no
+      fi
+      ;;
+    esac
+    # Using Import Files as archive members, it is possible to support
+    # filename-based versioning of shared library archives on AIX. While
+    # this would work for both with and without runtime linking, it will
+    # prevent static linking of such archives. So we do filename-based
+    # shared library versioning with .so extension only, which is used
+    # when both runtime linking and shared linking is enabled.
+    # Unfortunately, runtime linking may impact performance, so we do
+    # not want this to be the default eventually. Also, we use the
+    # versioned .so libs for executables only if there is the -brtl
+    # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
+    # To allow for filename-based versioning support, we need to create
+    # libNAME.so.V as an archive file, containing:
+    # *) an Import File, referring to the versioned filename of the
+    #    archive as well as the shared archive member, telling the
+    #    bitwidth (32 or 64) of that shared object, and providing the
+    #    list of exported symbols of that shared object, eventually
+    #    decorated with the 'weak' keyword
+    # *) the shared object with the F_LOADONLY flag set, to really avoid
+    #    it being seen by the linker.
+    # At run time we better use the real file rather than another symlink,
+    # but for link time we create the symlink libNAME.so -> libNAME.so.V
+
+    case $with_aix_soname,$aix_use_runtimelinking in
+    # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
+    # soname into executable. Probably we can add versioning support to
+    # collect2, so additional links can be useful in future.
+    aix,yes) # traditional libtool
+      dynamic_linker='AIX unversionable lib.so'
+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+      # instead of lib<name>.a to let people know that these are not
+      # typical AIX shared libraries.
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+      ;;
+    aix,no) # traditional AIX only
+      dynamic_linker='AIX lib.a(lib.so.V)'
+      # We preserve .a as extension for shared libraries through AIX4.2
+      # and later when we are not doing run time linking.
+      library_names_spec='$libname$release.a $libname.a'
+      soname_spec='$libname$release$shared_ext$major'
+      ;;
+    svr4,*) # full svr4 only
+      dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)"
+      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+      # We do not specify a path in Import Files, so LIBPATH fires.
+      shlibpath_overrides_runpath=yes
+      ;;
+    *,yes) # both, prefer svr4
+      dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)"
+      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+      # unpreferred sharedlib libNAME.a needs extra handling
+      postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
+      postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
+      # We do not specify a path in Import Files, so LIBPATH fires.
+      shlibpath_overrides_runpath=yes
+      ;;
+    *,no) # both, prefer aix
+      dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)"
+      library_names_spec='$libname$release.a $libname.a'
+      soname_spec='$libname$release$shared_ext$major'
+      # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
+      postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
+      postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
+      ;;
+    esac
+    shlibpath_var=LIBPATH
+  fi
+  ;;
+
+amigaos*)
+  case $host_cpu in
+  powerpc)
+    # Since July 2007 AmigaOS4 officially supports .so libraries.
+    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    ;;
+  m68k)
+    library_names_spec='$libname.ixlibrary $libname.a'
+    # Create ${libname}_ixlibrary.a entries in /sys/libs.
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    ;;
+  esac
+  ;;
+
+beos*)
+  library_names_spec='$libname$shared_ext'
+  dynamic_linker="$host_os ld.so"
+  shlibpath_var=LIBRARY_PATH
+  ;;
+
+bsdi[45]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+  # the default ld.so.conf also contains /usr/contrib/lib and
+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+  # libtool to hard-code these into programs
+  ;;
+
+cygwin* | mingw* | pw32* | cegcc*)
+  version_type=windows
+  shrext_cmds=.dll
+  need_version=no
+  need_lib_prefix=no
+
+  case $GCC,$cc_basename in
+  yes,*)
+    # gcc
+    library_names_spec='$libname.dll.a'
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \$file`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname~
+      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+      fi'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+
+    case $host_os in
+    cygwin*)
+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+      soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+
+      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
+      ;;
+    mingw* | cegcc*)
+      # MinGW DLLs use traditional 'lib' prefix
+      soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+      ;;
+    esac
+    dynamic_linker='Win32 ld.exe'
+    ;;
+
+  *,cl*)
+    # Native MSVC
+    libname_spec='$name'
+    soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+    library_names_spec='$libname.dll.lib'
+
+    case $build_os in
+    mingw*)
+      sys_lib_search_path_spec=
+      lt_save_ifs=$IFS
+      IFS=';'
+      for lt_path in $LIB
+      do
+        IFS=$lt_save_ifs
+        # Let DOS variable expansion print the short 8.3 style file name.
+        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
+        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
+      done
+      IFS=$lt_save_ifs
+      # Convert to MSYS style.
+      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
+      ;;
+    cygwin*)
+      # Convert to unix form, then to dos form, then back to unix form
+      # but this time dos style (no spaces!) so that the unix form looks
+      # like /cygdrive/c/PROGRA~1:/cygdr...
+      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
+      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
+      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      ;;
+    *)
+      sys_lib_search_path_spec=$LIB
+      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
+        # It is most probably a Windows format PATH.
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      fi
+      # FIXME: find the short name or the path components, as spaces are
+      # common. (e.g. "Program Files" -> "PROGRA~1")
+      ;;
+    esac
+
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \$file`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+    dynamic_linker='Win32 link.exe'
+    ;;
+
+  *)
+    # Assume MSVC wrapper
+    library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib'
+    dynamic_linker='Win32 ld.exe'
+    ;;
+  esac
+  # FIXME: first we should search . and the directory the executable is in
+  shlibpath_var=PATH
+  ;;
+
+darwin* | rhapsody*)
+  dynamic_linker="$host_os dyld"
+  version_type=darwin
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$major$shared_ext $libname$shared_ext'
+  soname_spec='$libname$release$major$shared_ext'
+  shlibpath_overrides_runpath=yes
+  shlibpath_var=DYLD_LIBRARY_PATH
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+
+  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+  ;;
+
+dgux*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+freebsd* | dragonfly*)
+  # DragonFly does not have aout.  When/if they implement a new
+  # versioning mechanism, adjust this.
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[23].*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
+  version_type=freebsd-$objformat
+  case $version_type in
+    freebsd-elf*)
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+      soname_spec='$libname$release$shared_ext$major'
+      need_version=no
+      need_lib_prefix=no
+      ;;
+    freebsd-*)
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+      need_version=yes
+      ;;
+  esac
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_os in
+  freebsd2.*)
+    shlibpath_overrides_runpath=yes
+    ;;
+  freebsd3.[01]* | freebsdelf3.[01]*)
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
+  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
+    shlibpath_overrides_runpath=no
+    hardcode_into_libs=yes
+    ;;
+  *) # from 4.6 on, and DragonFly
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  esac
+  ;;
+
+haiku*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  dynamic_linker="$host_os runtime_loader"
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
+  hardcode_into_libs=yes
+  ;;
+
+hpux9* | hpux10* | hpux11*)
+  # Give a soname corresponding to the major version so that dld.sl refuses to
+  # link against other versions.
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  case $host_cpu in
+  ia64*)
+    shrext_cmds='.so'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.so"
+    shlibpath_var=LD_LIBRARY_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    if test 32 = "$HPUX_IA64_MODE"; then
+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+      sys_lib_dlsearch_path_spec=/usr/lib/hpux32
+    else
+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+      sys_lib_dlsearch_path_spec=/usr/lib/hpux64
+    fi
+    ;;
+  hppa*64*)
+    shrext_cmds='.sl'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  *)
+    shrext_cmds='.sl'
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=SHLIB_PATH
+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    ;;
+  esac
+  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
+  postinstall_cmds='chmod 555 $lib'
+  # or fails outright, so override atomically:
+  install_override_mode=555
+  ;;
+
+interix[3-9]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $host_os in
+    nonstopux*) version_type=nonstopux ;;
+    *)
+	if test yes = "$lt_cv_prog_gnu_ld"; then
+		version_type=linux # correct to gnu/linux during the next big refactor
+	else
+		version_type=irix
+	fi ;;
+  esac
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='$libname$release$shared_ext$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext'
+  case $host_os in
+  irix5* | nonstopux*)
+    libsuff= shlibsuff=
+    ;;
+  *)
+    case $LD in # libtool.m4 will add one of these switches to LD
+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+      libsuff= shlibsuff= libmagic=32-bit;;
+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+      libsuff=32 shlibsuff=N32 libmagic=N32;;
+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+    *) libsuff= shlibsuff= libmagic=never-match;;
+    esac
+    ;;
+  esac
+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff"
+  sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff"
+  hardcode_into_libs=yes
+  ;;
+
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+  dynamic_linker=no
+  ;;
+
+linux*android*)
+  version_type=none # Android doesn't support versioned libraries.
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext'
+  soname_spec='$libname$release$shared_ext'
+  finish_cmds=
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  dynamic_linker='Android linker'
+  # Don't embed -rpath directories since the linker doesn't support them.
+  hardcode_libdir_flag_spec='-L$libdir'
+  ;;
+
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+
+  # Some binutils ld are patched to set DT_RUNPATH
+  if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_shlibpath_overrides_runpath=no
+    save_LDFLAGS=$LDFLAGS
+    save_libdir=$libdir
+    eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
+	 LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
+  lt_cv_shlibpath_overrides_runpath=yes
+fi
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+    LDFLAGS=$save_LDFLAGS
+    libdir=$save_libdir
+
+fi
+
+  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
+
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  # Ideally, we could use ldconfig to report *all* directores which are
+  # searched for libraries, however this is still not possible.  Aside from not
+  # being certain /sbin/ldconfig is available, command
+  # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
+  # even though it is searched at run-time.  Try to do the best guess by
+  # appending ld.so.conf contents (and includes) to the search path.
+  if test -f /etc/ld.so.conf; then
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+  fi
+
+  # We used to test for /lib/ld.so.1 and disable shared libraries on
+  # powerpc, because MkLinux only supported shared libraries with the
+  # GNU dynamic linker.  Since this was broken with cross compilers,
+  # most powerpc-linux boxes support dynamic linking these days and
+  # people can always --disable-shared, the test was removed, and we
+  # assume the GNU/Linux dynamic linker is in use.
+  dynamic_linker='GNU/Linux ld.so'
+  ;;
+
+netbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+    dynamic_linker='NetBSD (a.out) ld.so'
+  else
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    dynamic_linker='NetBSD ld.elf_so'
+  fi
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  ;;
+
+newsos6)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+*nto* | *qnx*)
+  version_type=qnx
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='ldqnx.so'
+  ;;
+
+openbsd* | bitrig*)
+  version_type=sunos
+  sys_lib_dlsearch_path_spec=/usr/lib
+  need_lib_prefix=no
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+    need_version=no
+  else
+    need_version=yes
+  fi
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+os2*)
+  libname_spec='$name'
+  version_type=windows
+  shrext_cmds=.dll
+  need_version=no
+  need_lib_prefix=no
+  # OS/2 can only load a DLL with a base name of 8 characters or less.
+  soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
+    v=$($ECHO $release$versuffix | tr -d .-);
+    n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
+    $ECHO $n$v`$shared_ext'
+  library_names_spec='${libname}_dll.$libext'
+  dynamic_linker='OS/2 ld.exe'
+  shlibpath_var=BEGINLIBPATH
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+  postinstall_cmds='base_file=`basename \$file`~
+    dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~
+    dldir=$destdir/`dirname \$dlpath`~
+    test -d \$dldir || mkdir -p \$dldir~
+    $install_prog $dir/$dlname \$dldir/$dlname~
+    chmod a+x \$dldir/$dlname~
+    if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+      eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+    fi'
+  postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
+    dlpath=$dir/\$dldll~
+    $RM \$dlpath'
+  ;;
+
+osf3* | osf4* | osf5*)
+  version_type=osf
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='$libname$release$shared_ext$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+  ;;
+
+rdos*)
+  dynamic_linker=no
+  ;;
+
+solaris*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  # ldd complains unless libraries are executable
+  postinstall_cmds='chmod +x $lib'
+  ;;
+
+sunos4*)
+  version_type=sunos
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  if test yes = "$with_gnu_ld"; then
+    need_lib_prefix=no
+  fi
+  need_version=yes
+  ;;
+
+sysv4 | sysv4.3*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_vendor in
+    sni)
+      shlibpath_overrides_runpath=no
+      need_lib_prefix=no
+      runpath_var=LD_RUN_PATH
+      ;;
+    siemens)
+      need_lib_prefix=no
+      ;;
+    motorola)
+      need_lib_prefix=no
+      need_version=no
+      shlibpath_overrides_runpath=no
+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+      ;;
+  esac
+  ;;
+
+sysv4*MP*)
+  if test -d /usr/nec; then
+    version_type=linux # correct to gnu/linux during the next big refactor
+    library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext'
+    soname_spec='$libname$shared_ext.$major'
+    shlibpath_var=LD_LIBRARY_PATH
+  fi
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  version_type=sco
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  if test yes = "$with_gnu_ld"; then
+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+  else
+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+    case $host_os in
+      sco3.2v5*)
+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+	;;
+    esac
+  fi
+  sys_lib_dlsearch_path_spec='/usr/lib'
+  ;;
+
+tpf*)
+  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+uts4*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+*)
+  dynamic_linker=no
+  ;;
+esac
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
+$as_echo "$dynamic_linker" >&6; }
+test no = "$dynamic_linker" && can_build_shared=no
+
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test yes = "$GCC"; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
+if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
+  sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
+fi
+
+if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
+  sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
+fi
+
+# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
+configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
+
+# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
+func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
+
+# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
+configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
+$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
+hardcode_action=
+if test -n "$hardcode_libdir_flag_spec" ||
+   test -n "$runpath_var" ||
+   test yes = "$hardcode_automatic"; then
+
+  # We can hardcode non-existent directories.
+  if test no != "$hardcode_direct" &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, )" &&
+     test no != "$hardcode_minus_L"; then
+    # Linking always hardcodes the temporary library directory.
+    hardcode_action=relink
+  else
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    hardcode_action=immediate
+  fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  hardcode_action=unsupported
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
+$as_echo "$hardcode_action" >&6; }
+
+if test relink = "$hardcode_action" ||
+   test yes = "$inherit_rpath"; then
+  # Fast installation is not supported
+  enable_fast_install=no
+elif test yes = "$shlibpath_overrides_runpath" ||
+     test no = "$enable_shared"; then
+  # Fast installation is not necessary
+  enable_fast_install=needless
+fi
+
+
+
+
+
+
+  if test yes != "$enable_dlopen"; then
+  enable_dlopen=unknown
+  enable_dlopen_self=unknown
+  enable_dlopen_self_static=unknown
+else
+  lt_cv_dlopen=no
+  lt_cv_dlopen_libs=
+
+  case $host_os in
+  beos*)
+    lt_cv_dlopen=load_add_on
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ;;
+
+  mingw* | pw32* | cegcc*)
+    lt_cv_dlopen=LoadLibrary
+    lt_cv_dlopen_libs=
+    ;;
+
+  cygwin*)
+    lt_cv_dlopen=dlopen
+    lt_cv_dlopen_libs=
+    ;;
+
+  darwin*)
+    # if libdl is installed we need to link against it
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
+if ${ac_cv_lib_dl_dlopen+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl  $LIBS"
+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 dlopen ();
+int
+main ()
+{
+return dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_dl_dlopen=yes
+else
+  ac_cv_lib_dl_dlopen=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
+  lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
+else
+
+    lt_cv_dlopen=dyld
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+
+fi
+
+    ;;
+
+  tpf*)
+    # Don't try to run any link tests for TPF.  We know it's impossible
+    # because TPF is a cross-compiler, and we know how we open DSOs.
+    lt_cv_dlopen=dlopen
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=no
+    ;;
+
+  *)
+    ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
+if test "x$ac_cv_func_shl_load" = xyes; then :
+  lt_cv_dlopen=shl_load
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
+$as_echo_n "checking for shl_load in -ldld... " >&6; }
+if ${ac_cv_lib_dld_shl_load+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldld  $LIBS"
+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 shl_load ();
+int
+main ()
+{
+return shl_load ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_dld_shl_load=yes
+else
+  ac_cv_lib_dld_shl_load=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
+$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
+if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
+  lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld
+else
+  ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
+if test "x$ac_cv_func_dlopen" = xyes; then :
+  lt_cv_dlopen=dlopen
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
+if ${ac_cv_lib_dl_dlopen+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl  $LIBS"
+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 dlopen ();
+int
+main ()
+{
+return dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_dl_dlopen=yes
+else
+  ac_cv_lib_dl_dlopen=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
+  lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
+$as_echo_n "checking for dlopen in -lsvld... " >&6; }
+if ${ac_cv_lib_svld_dlopen+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsvld  $LIBS"
+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 dlopen ();
+int
+main ()
+{
+return dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_svld_dlopen=yes
+else
+  ac_cv_lib_svld_dlopen=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
+$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
+if test "x$ac_cv_lib_svld_dlopen" = xyes; then :
+  lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
+$as_echo_n "checking for dld_link in -ldld... " >&6; }
+if ${ac_cv_lib_dld_dld_link+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldld  $LIBS"
+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 dld_link ();
+int
+main ()
+{
+return dld_link ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_dld_dld_link=yes
+else
+  ac_cv_lib_dld_dld_link=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
+$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
+if test "x$ac_cv_lib_dld_dld_link" = xyes; then :
+  lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld
+fi
+
+
+fi
+
+
+fi
+
+
+fi
+
+
+fi
+
+
+fi
+
+    ;;
+  esac
+
+  if test no = "$lt_cv_dlopen"; then
+    enable_dlopen=no
+  else
+    enable_dlopen=yes
+  fi
+
+  case $lt_cv_dlopen in
+  dlopen)
+    save_CPPFLAGS=$CPPFLAGS
+    test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+
+    save_LDFLAGS=$LDFLAGS
+    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+
+    save_LIBS=$LIBS
+    LIBS="$lt_cv_dlopen_libs $LIBS"
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
+$as_echo_n "checking whether a program can dlopen itself... " >&6; }
+if ${lt_cv_dlopen_self+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  	  if test yes = "$cross_compiling"; then :
+  lt_cv_dlopen_self=cross
+else
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<_LT_EOF
+#line $LINENO "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL		RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL		DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL		0
+#  endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW		DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW	DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW	0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+/* When -fvisibility=hidden is used, assume the code has been annotated
+   correspondingly for the symbols needed.  */
+#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+int fnord () __attribute__((visibility("default")));
+#endif
+
+int fnord () { return 42; }
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
+
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else
+        {
+	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
+          else puts (dlerror ());
+	}
+      /* dlclose (self); */
+    }
+  else
+    puts (dlerror ());
+
+  return status;
+}
+_LT_EOF
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
+    (./conftest; exit; ) >&5 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
+      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
+      x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;;
+    esac
+  else :
+    # compilation failed
+    lt_cv_dlopen_self=no
+  fi
+fi
+rm -fr conftest*
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
+$as_echo "$lt_cv_dlopen_self" >&6; }
+
+    if test yes = "$lt_cv_dlopen_self"; then
+      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
+$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
+if ${lt_cv_dlopen_self_static+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  	  if test yes = "$cross_compiling"; then :
+  lt_cv_dlopen_self_static=cross
+else
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<_LT_EOF
+#line $LINENO "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL		RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL		DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL		0
+#  endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW		DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW	DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW	0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+/* When -fvisibility=hidden is used, assume the code has been annotated
+   correspondingly for the symbols needed.  */
+#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+int fnord () __attribute__((visibility("default")));
+#endif
+
+int fnord () { return 42; }
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
+
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else
+        {
+	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
+          else puts (dlerror ());
+	}
+      /* dlclose (self); */
+    }
+  else
+    puts (dlerror ());
+
+  return status;
+}
+_LT_EOF
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
+    (./conftest; exit; ) >&5 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
+      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
+      x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;;
+    esac
+  else :
+    # compilation failed
+    lt_cv_dlopen_self_static=no
+  fi
+fi
+rm -fr conftest*
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
+$as_echo "$lt_cv_dlopen_self_static" >&6; }
+    fi
+
+    CPPFLAGS=$save_CPPFLAGS
+    LDFLAGS=$save_LDFLAGS
+    LIBS=$save_LIBS
+    ;;
+  esac
+
+  case $lt_cv_dlopen_self in
+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+  *) enable_dlopen_self=unknown ;;
+  esac
+
+  case $lt_cv_dlopen_self_static in
+  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+  *) enable_dlopen_self_static=unknown ;;
+  esac
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+striplib=
+old_striplib=
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
+$as_echo_n "checking whether stripping libraries is possible... " >&6; }
+if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+# FIXME - insert some real tests, host_os isn't really good enough
+  case $host_os in
+  darwin*)
+    if test -n "$STRIP"; then
+      striplib="$STRIP -x"
+      old_striplib="$STRIP -S"
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+    else
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    fi
+    ;;
+  *)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    ;;
+  esac
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+  # Report what library types will actually be built
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
+$as_echo_n "checking if libtool supports shared libraries... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
+$as_echo "$can_build_shared" >&6; }
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
+$as_echo_n "checking whether to build shared libraries... " >&6; }
+  test no = "$can_build_shared" && enable_shared=no
+
+  # On AIX, shared libraries and static libraries use the same namespace, and
+  # are all built from PIC.
+  case $host_os in
+  aix3*)
+    test yes = "$enable_shared" && enable_static=no
+    if test -n "$RANLIB"; then
+      archive_cmds="$archive_cmds~\$RANLIB \$lib"
+      postinstall_cmds='$RANLIB $lib'
+    fi
+    ;;
+
+  aix[4-9]*)
+    if test ia64 != "$host_cpu"; then
+      case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+      yes,aix,yes) ;;			# shared object as lib.so file only
+      yes,svr4,*) ;;			# shared object as lib.so archive member only
+      yes,*) enable_static=no ;;	# shared object in lib.a archive as well
+      esac
+    fi
+    ;;
+  esac
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
+$as_echo "$enable_shared" >&6; }
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
+$as_echo_n "checking whether to build static libraries... " >&6; }
+  # Make sure either enable_shared or enable_static is yes.
+  test yes = "$enable_shared" || enable_static=yes
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
+$as_echo "$enable_static" >&6; }
+
+
+
+
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+CC=$lt_save_CC
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+        ac_config_commands="$ac_config_commands libtool"
+
+
+
+
+# Only expand once:
+
+
+
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+if test -z "$CXX"; then
+  if test -n "$CCC"; then
+    CXX=$CCC
+  else
+    if test -n "$ac_tool_prefix"; then
+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CXX"; then
+  ac_cv_prog_CXX="$CXX" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CXX=$ac_cv_prog_CXX
+if test -n "$CXX"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
+$as_echo "$CXX" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$CXX" && break
+  done
+fi
+if test -z "$CXX"; then
+  ac_ct_CXX=$CXX
+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_CXX"; then
+  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_CXX="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
+if test -n "$ac_ct_CXX"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
+$as_echo "$ac_ct_CXX" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_CXX" && break
+done
+
+  if test "x$ac_ct_CXX" = x; then
+    CXX="g++"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CXX=$ac_ct_CXX
+  fi
+fi
+
+  fi
+fi
+# Provide some information about the compiler.
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+for ac_option in --version -v -V -qversion; do
+  { { ac_try="$ac_compiler $ac_option >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    sed '10a\
+... rest of stderr output deleted ...
+         10q' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+  fi
+  rm -f conftest.er1 conftest.err
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+done
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
+$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
+if ${ac_cv_cxx_compiler_gnu+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+#ifndef __GNUC__
+       choke me
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  ac_compiler_gnu=yes
+else
+  ac_compiler_gnu=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
+$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GXX=yes
+else
+  GXX=
+fi
+ac_test_CXXFLAGS=${CXXFLAGS+set}
+ac_save_CXXFLAGS=$CXXFLAGS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
+$as_echo_n "checking whether $CXX accepts -g... " >&6; }
+if ${ac_cv_prog_cxx_g+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
+   ac_cxx_werror_flag=yes
+   ac_cv_prog_cxx_g=no
+   CXXFLAGS="-g"
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  ac_cv_prog_cxx_g=yes
+else
+  CXXFLAGS=""
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+
+else
+  ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+	 CXXFLAGS="-g"
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  ac_cv_prog_cxx_g=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
+$as_echo "$ac_cv_prog_cxx_g" >&6; }
+if test "$ac_test_CXXFLAGS" = set; then
+  CXXFLAGS=$ac_save_CXXFLAGS
+elif test $ac_cv_prog_cxx_g = yes; then
+  if test "$GXX" = yes; then
+    CXXFLAGS="-g -O2"
+  else
+    CXXFLAGS="-g"
+  fi
+else
+  if test "$GXX" = yes; then
+    CXXFLAGS="-O2"
+  else
+    CXXFLAGS=
+  fi
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+depcc="$CXX"  am_compiler_list=
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+$as_echo_n "checking dependency style of $depcc... " >&6; }
+if ${am_cv_CXX_dependencies_compiler_type+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+  # We make a subdir and do the tests there.  Otherwise we can end up
+  # making bogus files that we don't know about and never remove.  For
+  # instance it was reported that on HP-UX the gcc test will end up
+  # making a dummy file named 'D' -- because '-MD' means "put the output
+  # in D".
+  rm -rf conftest.dir
+  mkdir conftest.dir
+  # Copy depcomp to subdir because otherwise we won't find it if we're
+  # using a relative directory.
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
+
+  am_cv_CXX_dependencies_compiler_type=none
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+  fi
+  am__universal=false
+  case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac
+
+  for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
+    # We need to recreate these files for each test, as the compiler may
+    # overwrite some of them when testing with obscure command lines.
+    # This happens at least with the AIX C compiler.
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle '-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs.
+    am__obj=sub/conftest.${OBJEXT-o}
+    am__minus_obj="-o $am__obj"
+    case $depmode in
+    gcc)
+      # This depmode causes a compiler race in universal mode.
+      test "$am__universal" = false || continue
+      ;;
+    nosideeffect)
+      # After this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested.
+      if test "x$enable_dependency_tracking" = xyes; then
+	continue
+      else
+	break
+      fi
+      ;;
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+      # This compiler won't grok '-c -o', but also, the minuso test has
+      # not run yet.  These depmodes are late enough in the game, and
+      # so weak that their functioning should not be impacted.
+      am__obj=conftest.${OBJEXT-o}
+      am__minus_obj=
+      ;;
+    none) break ;;
+    esac
+    if depmode=$depmode \
+       source=sub/conftest.c object=$am__obj \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+        am_cv_CXX_dependencies_compiler_type=$depmode
+        break
+      fi
+    fi
+  done
+
+  cd ..
+  rm -rf conftest.dir
+else
+  am_cv_CXX_dependencies_compiler_type=none
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5
+$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
+CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
+
+ if
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
+  am__fastdepCXX_TRUE=
+  am__fastdepCXX_FALSE='#'
+else
+  am__fastdepCXX_TRUE='#'
+  am__fastdepCXX_FALSE=
+fi
+
+
+
+
+
+func_stripname_cnf ()
+{
+  case $2 in
+  .*) func_stripname_result=`$ECHO "$3" | $SED "s%^$1%%; s%\\\\$2\$%%"`;;
+  *)  func_stripname_result=`$ECHO "$3" | $SED "s%^$1%%; s%$2\$%%"`;;
+  esac
+} # func_stripname_cnf
+
+      if test -n "$CXX" && ( test no != "$CXX" &&
+    ( (test g++ = "$CXX" && `g++ -v >/dev/null 2>&1` ) ||
+    (test g++ != "$CXX"))); then
+  ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
+$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
+if test -z "$CXXCPP"; then
+  if ${ac_cv_prog_CXXCPP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+      # Double quotes because CXXCPP needs to be expanded
+    for CXXCPP in "$CXX -E" "/lib/cpp"
+    do
+      ac_preproc_ok=false
+for ac_cxx_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+  break
+fi
+
+    done
+    ac_cv_prog_CXXCPP=$CXXCPP
+
+fi
+  CXXCPP=$ac_cv_prog_CXXCPP
+else
+  ac_cv_prog_CXXCPP=$CXXCPP
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
+$as_echo "$CXXCPP" >&6; }
+ac_preproc_ok=false
+for ac_cxx_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5; }
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+else
+  _lt_caught_CXX_error=yes
+fi
+
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+archive_cmds_need_lc_CXX=no
+allow_undefined_flag_CXX=
+always_export_symbols_CXX=no
+archive_expsym_cmds_CXX=
+compiler_needs_object_CXX=no
+export_dynamic_flag_spec_CXX=
+hardcode_direct_CXX=no
+hardcode_direct_absolute_CXX=no
+hardcode_libdir_flag_spec_CXX=
+hardcode_libdir_separator_CXX=
+hardcode_minus_L_CXX=no
+hardcode_shlibpath_var_CXX=unsupported
+hardcode_automatic_CXX=no
+inherit_rpath_CXX=no
+module_cmds_CXX=
+module_expsym_cmds_CXX=
+link_all_deplibs_CXX=unknown
+old_archive_cmds_CXX=$old_archive_cmds
+reload_flag_CXX=$reload_flag
+reload_cmds_CXX=$reload_cmds
+no_undefined_flag_CXX=
+whole_archive_flag_spec_CXX=
+enable_shared_with_static_runtimes_CXX=no
+
+# Source file extension for C++ test sources.
+ac_ext=cpp
+
+# Object file extension for compiled C++ test sources.
+objext=o
+objext_CXX=$objext
+
+# No sense in running all these tests if we already determined that
+# the CXX compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test yes != "$_lt_caught_CXX_error"; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="int some_variable = 0;"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code='int main(int, char *[]) { return(0); }'
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+
+
+
+
+
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+
+
+  # save warnings/boilerplate of simple test code
+  ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$RM conftest*
+
+  ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$RM -r conftest*
+
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC=$CC
+  lt_save_CFLAGS=$CFLAGS
+  lt_save_LD=$LD
+  lt_save_GCC=$GCC
+  GCC=$GXX
+  lt_save_with_gnu_ld=$with_gnu_ld
+  lt_save_path_LD=$lt_cv_path_LD
+  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
+    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
+  else
+    $as_unset lt_cv_prog_gnu_ld
+  fi
+  if test -n "${lt_cv_path_LDCXX+set}"; then
+    lt_cv_path_LD=$lt_cv_path_LDCXX
+  else
+    $as_unset lt_cv_path_LD
+  fi
+  test -z "${LDCXX+set}" || LD=$LDCXX
+  CC=${CXX-"c++"}
+  CFLAGS=$CXXFLAGS
+  compiler=$CC
+  compiler_CXX=$CC
+  func_cc_basename $compiler
+cc_basename=$func_cc_basename_result
+
+
+  if test -n "$compiler"; then
+    # We don't want -fno-exception when compiling C++ code, so set the
+    # no_builtin_flag separately
+    if test yes = "$GXX"; then
+      lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin'
+    else
+      lt_prog_compiler_no_builtin_flag_CXX=
+    fi
+
+    if test yes = "$GXX"; then
+      # Set up default GNU C++ configuration
+
+
+
+# Check whether --with-gnu-ld was given.
+if test "${with_gnu_ld+set}" = set; then :
+  withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes
+else
+  with_gnu_ld=no
+fi
+
+ac_prog=ld
+if test yes = "$GCC"; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
+$as_echo_n "checking for ld used by $CC... " >&6; }
+  case $host in
+  *-*-mingw*)
+    # gcc leaves a trailing carriage return, which upsets mingw
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+  *)
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  esac
+  case $ac_prog in
+    # Accept absolute paths.
+    [\\/]* | ?:[\\/]*)
+      re_direlt='/[^/][^/]*/\.\./'
+      # Canonicalize the pathname of ld
+      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
+      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
+	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
+      done
+      test -z "$LD" && LD=$ac_prog
+      ;;
+  "")
+    # If it fails, then pretend we aren't using GCC.
+    ac_prog=ld
+    ;;
+  *)
+    # If it is relative, then search for the first ld in PATH.
+    with_gnu_ld=unknown
+    ;;
+  esac
+elif test yes = "$with_gnu_ld"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+$as_echo_n "checking for GNU ld... " >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+$as_echo_n "checking for non-GNU ld... " >&6; }
+fi
+if ${lt_cv_path_LD+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$LD"; then
+  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
+  for ac_dir in $PATH; do
+    IFS=$lt_save_ifs
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      lt_cv_path_LD=$ac_dir/$ac_prog
+      # Check to see if the program is GNU ld.  I'd rather use --version,
+      # but apparently some variants of GNU ld only accept -v.
+      # Break only if it was the GNU/non-GNU ld that we prefer.
+      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+      *GNU* | *'with BFD'*)
+	test no != "$with_gnu_ld" && break
+	;;
+      *)
+	test yes != "$with_gnu_ld" && break
+	;;
+      esac
+    fi
+  done
+  IFS=$lt_save_ifs
+else
+  lt_cv_path_LD=$LD # Let the user override the test with a path.
+fi
+fi
+
+LD=$lt_cv_path_LD
+if test -n "$LD"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+$as_echo "$LD" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+if ${lt_cv_prog_gnu_ld+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  # I'd rather use --version here, but apparently some GNU lds only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  lt_cv_prog_gnu_ld=yes
+  ;;
+*)
+  lt_cv_prog_gnu_ld=no
+  ;;
+esac
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
+$as_echo "$lt_cv_prog_gnu_ld" >&6; }
+with_gnu_ld=$lt_cv_prog_gnu_ld
+
+
+
+
+
+
+
+      # Check if GNU C++ uses GNU ld as the underlying linker, since the
+      # archiving commands below assume that GNU ld is being used.
+      if test yes = "$with_gnu_ld"; then
+        archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+        archive_expsym_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+
+        hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir'
+        export_dynamic_flag_spec_CXX='$wl--export-dynamic'
+
+        # If archive_cmds runs LD, not CC, wlarc should be empty
+        # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
+        #     investigate it a little bit more. (MM)
+        wlarc='$wl'
+
+        # ancient GNU ld didn't support --whole-archive et. al.
+        if eval "`$CC -print-prog-name=ld` --help 2>&1" |
+	  $GREP 'no-whole-archive' > /dev/null; then
+          whole_archive_flag_spec_CXX=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
+        else
+          whole_archive_flag_spec_CXX=
+        fi
+      else
+        with_gnu_ld=no
+        wlarc=
+
+        # A generic and very simple default shared library creation
+        # command for GNU C++ for the case where it uses the native
+        # linker, instead of GNU ld.  If possible, this setting should
+        # overridden to take advantage of the native linker features on
+        # the platform it is being used on.
+        archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+      fi
+
+      # Commands to make compiler produce verbose output that lists
+      # what "hidden" libraries, object files and flags are used when
+      # linking a shared library.
+      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+
+    else
+      GXX=no
+      with_gnu_ld=no
+      wlarc=
+    fi
+
+    # PORTME: fill in a description of your system's C++ link characteristics
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
+    ld_shlibs_CXX=yes
+    case $host_os in
+      aix3*)
+        # FIXME: insert proper C++ library support
+        ld_shlibs_CXX=no
+        ;;
+      aix[4-9]*)
+        if test ia64 = "$host_cpu"; then
+          # On IA64, the linker does run time linking by default, so we don't
+          # have to do anything special.
+          aix_use_runtimelinking=no
+          exp_sym_flag='-Bexport'
+          no_entry_flag=
+        else
+          aix_use_runtimelinking=no
+
+          # Test if we are trying to use run time linking or normal
+          # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+          # have runtime linking enabled, and use it for executables.
+          # For shared libraries, we enable/disable runtime linking
+          # depending on the kind of the shared library created -
+          # when "with_aix_soname,aix_use_runtimelinking" is:
+          # "aix,no"   lib.a(lib.so.V) shared, rtl:no,  for executables
+          # "aix,yes"  lib.so          shared, rtl:yes, for executables
+          #            lib.a           static archive
+          # "both,no"  lib.so.V(shr.o) shared, rtl:yes
+          #            lib.a(lib.so.V) shared, rtl:no,  for executables
+          # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+          #            lib.a(lib.so.V) shared, rtl:no
+          # "svr4,*"   lib.so.V(shr.o) shared, rtl:yes, for executables
+          #            lib.a           static archive
+          case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+	    for ld_flag in $LDFLAGS; do
+	      case $ld_flag in
+	      *-brtl*)
+	        aix_use_runtimelinking=yes
+	        break
+	        ;;
+	      esac
+	    done
+	    if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+	      # With aix-soname=svr4, we create the lib.so.V shared archives only,
+	      # so we don't have lib.a shared libs to link our executables.
+	      # We have to force runtime linking in this case.
+	      aix_use_runtimelinking=yes
+	      LDFLAGS="$LDFLAGS -Wl,-brtl"
+	    fi
+	    ;;
+          esac
+
+          exp_sym_flag='-bexport'
+          no_entry_flag='-bnoentry'
+        fi
+
+        # When large executables or shared objects are built, AIX ld can
+        # have problems creating the table of contents.  If linking a library
+        # or program results in "error TOC overflow" add -mminimal-toc to
+        # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+        # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+        archive_cmds_CXX=''
+        hardcode_direct_CXX=yes
+        hardcode_direct_absolute_CXX=yes
+        hardcode_libdir_separator_CXX=':'
+        link_all_deplibs_CXX=yes
+        file_list_spec_CXX='$wl-f,'
+        case $with_aix_soname,$aix_use_runtimelinking in
+        aix,*) ;;	# no import file
+        svr4,* | *,yes) # use import file
+          # The Import File defines what to hardcode.
+          hardcode_direct_CXX=no
+          hardcode_direct_absolute_CXX=no
+          ;;
+        esac
+
+        if test yes = "$GXX"; then
+          case $host_os in aix4.[012]|aix4.[012].*)
+          # We only want to do this on AIX 4.2 and lower, the check
+          # below for broken collect2 doesn't work under 4.3+
+	  collect2name=`$CC -print-prog-name=collect2`
+	  if test -f "$collect2name" &&
+	     strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+	  then
+	    # We have reworked collect2
+	    :
+	  else
+	    # We have old collect2
+	    hardcode_direct_CXX=unsupported
+	    # It fails to find uninstalled libraries when the uninstalled
+	    # path is not listed in the libpath.  Setting hardcode_minus_L
+	    # to unsupported forces relinking
+	    hardcode_minus_L_CXX=yes
+	    hardcode_libdir_flag_spec_CXX='-L$libdir'
+	    hardcode_libdir_separator_CXX=
+	  fi
+          esac
+          shared_flag='-shared'
+	  if test yes = "$aix_use_runtimelinking"; then
+	    shared_flag=$shared_flag' $wl-G'
+	  fi
+	  # Need to ensure runtime linking is disabled for the traditional
+	  # shared library, or the linker may eventually find shared libraries
+	  # /with/ Import File - we do not want to mix them.
+	  shared_flag_aix='-shared'
+	  shared_flag_svr4='-shared $wl-G'
+        else
+          # not using gcc
+          if test ia64 = "$host_cpu"; then
+	  # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	  # chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+          else
+	    if test yes = "$aix_use_runtimelinking"; then
+	      shared_flag='$wl-G'
+	    else
+	      shared_flag='$wl-bM:SRE'
+	    fi
+	    shared_flag_aix='$wl-bM:SRE'
+	    shared_flag_svr4='$wl-G'
+          fi
+        fi
+
+        export_dynamic_flag_spec_CXX='$wl-bexpall'
+        # It seems that -bexpall does not export symbols beginning with
+        # underscore (_), so it is better to generate a list of symbols to
+	# export.
+        always_export_symbols_CXX=yes
+	if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
+          # Warning - without using the other runtime loading flags (-brtl),
+          # -berok will link without error, but may produce a broken library.
+          # The "-G" linker flag allows undefined symbols.
+          no_undefined_flag_CXX='-bernotok'
+          # Determine the default libpath from the value encoded in an empty
+          # executable.
+          if test set = "${lt_cv_aix_libpath+set}"; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  if ${lt_cv_aix_libpath__CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+
+  lt_aix_libpath_sed='
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *\([^ ]*\) *$/\1/
+	      p
+	  }
+      }'
+  lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$lt_cv_aix_libpath__CXX"; then
+    lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  if test -z "$lt_cv_aix_libpath__CXX"; then
+    lt_cv_aix_libpath__CXX=/usr/lib:/lib
+  fi
+
+fi
+
+  aix_libpath=$lt_cv_aix_libpath__CXX
+fi
+
+          hardcode_libdir_flag_spec_CXX='$wl-blibpath:$libdir:'"$aix_libpath"
+
+          archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
+        else
+          if test ia64 = "$host_cpu"; then
+	    hardcode_libdir_flag_spec_CXX='$wl-R $libdir:/usr/lib:/lib'
+	    allow_undefined_flag_CXX="-z nodefs"
+	    archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
+          else
+	    # Determine the default libpath from the value encoded in an
+	    # empty executable.
+	    if test set = "${lt_cv_aix_libpath+set}"; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  if ${lt_cv_aix_libpath__CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+
+  lt_aix_libpath_sed='
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *\([^ ]*\) *$/\1/
+	      p
+	  }
+      }'
+  lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$lt_cv_aix_libpath__CXX"; then
+    lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  if test -z "$lt_cv_aix_libpath__CXX"; then
+    lt_cv_aix_libpath__CXX=/usr/lib:/lib
+  fi
+
+fi
+
+  aix_libpath=$lt_cv_aix_libpath__CXX
+fi
+
+	    hardcode_libdir_flag_spec_CXX='$wl-blibpath:$libdir:'"$aix_libpath"
+	    # Warning - without using the other run time loading flags,
+	    # -berok will link without error, but may produce a broken library.
+	    no_undefined_flag_CXX=' $wl-bernotok'
+	    allow_undefined_flag_CXX=' $wl-berok'
+	    if test yes = "$with_gnu_ld"; then
+	      # We only use this code for GNU lds that support --whole-archive.
+	      whole_archive_flag_spec_CXX='$wl--whole-archive$convenience $wl--no-whole-archive'
+	    else
+	      # Exported symbols can be pulled into shared objects from archives
+	      whole_archive_flag_spec_CXX='$convenience'
+	    fi
+	    archive_cmds_need_lc_CXX=yes
+	    archive_expsym_cmds_CXX='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+	    # -brtl affects multiple linker settings, -berok does not and is overridden later
+	    compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`'
+	    if test svr4 != "$with_aix_soname"; then
+	      # This is similar to how AIX traditionally builds its shared
+	      # libraries. Need -bnortl late, we may have -brtl in LDFLAGS.
+	      archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+	    fi
+	    if test aix != "$with_aix_soname"; then
+	      archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_sy [...]
+	    else
+	      # used by -dlpreopen to get the symbols
+	      archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$MV  $output_objdir/$realname.d/$soname $output_objdir'
+	    fi
+	    archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$RM -r $output_objdir/$realname.d'
+          fi
+        fi
+        ;;
+
+      beos*)
+	if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	  allow_undefined_flag_CXX=unsupported
+	  # Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
+	  # support --undefined.  This deserves some investigation.  FIXME
+	  archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	else
+	  ld_shlibs_CXX=no
+	fi
+	;;
+
+      chorus*)
+        case $cc_basename in
+          *)
+	  # FIXME: insert proper C++ library support
+	  ld_shlibs_CXX=no
+	  ;;
+        esac
+        ;;
+
+      cygwin* | mingw* | pw32* | cegcc*)
+	case $GXX,$cc_basename in
+	,cl* | no,cl*)
+	  # Native MSVC
+	  # hardcode_libdir_flag_spec is actually meaningless, as there is
+	  # no search path for DLLs.
+	  hardcode_libdir_flag_spec_CXX=' '
+	  allow_undefined_flag_CXX=unsupported
+	  always_export_symbols_CXX=yes
+	  file_list_spec_CXX='@'
+	  # Tell ltmain to make .lib files, not .a files.
+	  libext=lib
+	  # Tell ltmain to make .dll files, not .so files.
+	  shrext_cmds=.dll
+	  # FIXME: Setting linknames here is a bad hack.
+	  archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+	  archive_expsym_cmds_CXX='if   test DEF = "`$SED -n     -e '\''s/^[	 ]*//'\''     -e '\''/^\(;.*\)*$/d'\''     -e '\''s/^\(EXPORTS\|LIBRARY\)\([	 ].*\)*$/DEF/p'\''     -e q     $export_symbols`" ; then
+              cp "$export_symbols" "$output_objdir/$soname.def";
+              echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+            else
+              $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
+            fi~
+            $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+            linknames='
+	  # The linker will not automatically build a static lib if we build a DLL.
+	  # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true'
+	  enable_shared_with_static_runtimes_CXX=yes
+	  # Don't use ranlib
+	  old_postinstall_cmds_CXX='chmod 644 $oldlib'
+	  postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~
+            lt_tool_outputfile="@TOOL_OUTPUT@"~
+            case $lt_outputfile in
+              *.exe|*.EXE) ;;
+              *)
+                lt_outputfile=$lt_outputfile.exe
+                lt_tool_outputfile=$lt_tool_outputfile.exe
+                ;;
+            esac~
+            func_to_tool_file "$lt_outputfile"~
+            if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
+              $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+              $RM "$lt_outputfile.manifest";
+            fi'
+	  ;;
+	*)
+	  # g++
+	  # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
+	  # as there is no search path for DLLs.
+	  hardcode_libdir_flag_spec_CXX='-L$libdir'
+	  export_dynamic_flag_spec_CXX='$wl--export-all-symbols'
+	  allow_undefined_flag_CXX=unsupported
+	  always_export_symbols_CXX=no
+	  enable_shared_with_static_runtimes_CXX=yes
+
+	  if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	    # If the export-symbols file already is a .def file, use it as
+	    # is; otherwise, prepend EXPORTS...
+	    archive_expsym_cmds_CXX='if   test DEF = "`$SED -n     -e '\''s/^[	 ]*//'\''     -e '\''/^\(;.*\)*$/d'\''     -e '\''s/^\(EXPORTS\|LIBRARY\)\([	 ].*\)*$/DEF/p'\''     -e q     $export_symbols`" ; then
+              cp $export_symbols $output_objdir/$soname.def;
+            else
+              echo EXPORTS > $output_objdir/$soname.def;
+              cat $export_symbols >> $output_objdir/$soname.def;
+            fi~
+            $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	  else
+	    ld_shlibs_CXX=no
+	  fi
+	  ;;
+	esac
+	;;
+      darwin* | rhapsody*)
+
+
+  archive_cmds_need_lc_CXX=no
+  hardcode_direct_CXX=no
+  hardcode_automatic_CXX=yes
+  hardcode_shlibpath_var_CXX=unsupported
+  if test yes = "$lt_cv_ld_force_load"; then
+    whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+
+  else
+    whole_archive_flag_spec_CXX=''
+  fi
+  link_all_deplibs_CXX=yes
+  allow_undefined_flag_CXX=$_lt_dar_allow_undefined
+  case $cc_basename in
+     ifort*|nagfor*) _lt_dar_can_shared=yes ;;
+     *) _lt_dar_can_shared=$GCC ;;
+  esac
+  if test yes = "$_lt_dar_can_shared"; then
+    output_verbose_link_cmd=func_echo_all
+    archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
+    module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
+    archive_expsym_cmds_CXX="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
+    module_expsym_cmds_CXX="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
+       if test yes != "$lt_cv_apple_cc_single_mod"; then
+      archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil"
+      archive_expsym_cmds_CXX="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil"
+    fi
+
+  else
+  ld_shlibs_CXX=no
+  fi
+
+	;;
+
+      os2*)
+	hardcode_libdir_flag_spec_CXX='-L$libdir'
+	hardcode_minus_L_CXX=yes
+	allow_undefined_flag_CXX=unsupported
+	shrext_cmds=.dll
+	archive_cmds_CXX='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	  $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	  $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	  $ECHO EXPORTS >> $output_objdir/$libname.def~
+	  emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+	  $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	  emximp -o $lib $output_objdir/$libname.def'
+	archive_expsym_cmds_CXX='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	  $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	  $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	  $ECHO EXPORTS >> $output_objdir/$libname.def~
+	  prefix_cmds="$SED"~
+	  if test EXPORTS = "`$SED 1q $export_symbols`"; then
+	    prefix_cmds="$prefix_cmds -e 1d";
+	  fi~
+	  prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+	  cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+	  $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	  emximp -o $lib $output_objdir/$libname.def'
+	old_archive_From_new_cmds_CXX='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+	enable_shared_with_static_runtimes_CXX=yes
+	;;
+
+      dgux*)
+        case $cc_basename in
+          ec++*)
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+          ghcx*)
+	    # Green Hills C++ Compiler
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+        esac
+        ;;
+
+      freebsd2.*)
+        # C++ shared libraries reported to be fairly broken before
+	# switch to ELF
+        ld_shlibs_CXX=no
+        ;;
+
+      freebsd-elf*)
+        archive_cmds_need_lc_CXX=no
+        ;;
+
+      freebsd* | dragonfly*)
+        # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+        # conventions
+        ld_shlibs_CXX=yes
+        ;;
+
+      haiku*)
+        archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+        link_all_deplibs_CXX=yes
+        ;;
+
+      hpux9*)
+        hardcode_libdir_flag_spec_CXX='$wl+b $wl$libdir'
+        hardcode_libdir_separator_CXX=:
+        export_dynamic_flag_spec_CXX='$wl-E'
+        hardcode_direct_CXX=yes
+        hardcode_minus_L_CXX=yes # Not in the search PATH,
+				             # but as the default
+				             # location of the library.
+
+        case $cc_basename in
+          CC*)
+            # FIXME: insert proper C++ library support
+            ld_shlibs_CXX=no
+            ;;
+          aCC*)
+            archive_cmds_CXX='$RM $output_objdir/$soname~$CC -b $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
+            # Commands to make compiler produce verbose output that lists
+            # what "hidden" libraries, object files and flags are used when
+            # linking a shared library.
+            #
+            # There doesn't appear to be a way to prevent this compiler from
+            # explicitly linking system object files so we need to strip them
+            # from the output so that they don't get included in the library
+            # dependencies.
+            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+            ;;
+          *)
+            if test yes = "$GXX"; then
+              archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
+            else
+              # FIXME: insert proper C++ library support
+              ld_shlibs_CXX=no
+            fi
+            ;;
+        esac
+        ;;
+
+      hpux10*|hpux11*)
+        if test no = "$with_gnu_ld"; then
+	  hardcode_libdir_flag_spec_CXX='$wl+b $wl$libdir'
+	  hardcode_libdir_separator_CXX=:
+
+          case $host_cpu in
+            hppa*64*|ia64*)
+              ;;
+            *)
+	      export_dynamic_flag_spec_CXX='$wl-E'
+              ;;
+          esac
+        fi
+        case $host_cpu in
+          hppa*64*|ia64*)
+            hardcode_direct_CXX=no
+            hardcode_shlibpath_var_CXX=no
+            ;;
+          *)
+            hardcode_direct_CXX=yes
+            hardcode_direct_absolute_CXX=yes
+            hardcode_minus_L_CXX=yes # Not in the search PATH,
+					         # but as the default
+					         # location of the library.
+            ;;
+        esac
+
+        case $cc_basename in
+          CC*)
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+          aCC*)
+	    case $host_cpu in
+	      hppa*64*)
+	        archive_cmds_CXX='$CC -b $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	      ia64*)
+	        archive_cmds_CXX='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	      *)
+	        archive_cmds_CXX='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	    esac
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+	    ;;
+          *)
+	    if test yes = "$GXX"; then
+	      if test no = "$with_gnu_ld"; then
+	        case $host_cpu in
+	          hppa*64*)
+	            archive_cmds_CXX='$CC -shared -nostdlib -fPIC $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	          ia64*)
+	            archive_cmds_CXX='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	          *)
+	            archive_cmds_CXX='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	        esac
+	      fi
+	    else
+	      # FIXME: insert proper C++ library support
+	      ld_shlibs_CXX=no
+	    fi
+	    ;;
+        esac
+        ;;
+
+      interix[3-9]*)
+	hardcode_direct_CXX=no
+	hardcode_shlibpath_var_CXX=no
+	hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir'
+	export_dynamic_flag_spec_CXX='$wl-E'
+	# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+	# Instead, shared libraries are loaded at an image base (0x10000000 by
+	# default) and relocated if they conflict, which is a slow very memory
+	# consuming and fragmenting process.  To avoid this, we pick a random,
+	# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+	# time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+	archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+	archive_expsym_cmds_CXX='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+	;;
+      irix5* | irix6*)
+        case $cc_basename in
+          CC*)
+	    # SGI C++
+	    archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
+	    # necessary to make sure instantiated templates are included
+	    # in the archive.
+	    old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs'
+	    ;;
+          *)
+	    if test yes = "$GXX"; then
+	      if test no = "$with_gnu_ld"; then
+	        archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+	      else
+	        archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` -o $lib'
+	      fi
+	    fi
+	    link_all_deplibs_CXX=yes
+	    ;;
+        esac
+        hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir'
+        hardcode_libdir_separator_CXX=:
+        inherit_rpath_CXX=yes
+        ;;
+
+      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+        case $cc_basename in
+          KCC*)
+	    # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	    # KCC will only create a shared library if the output file
+	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
+	    # to its proper name (with version) after linking.
+	    archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+	    archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib $wl-retain-symbols-file,$export_symbols; mv \$templib $lib'
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+
+	    hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir'
+	    export_dynamic_flag_spec_CXX='$wl--export-dynamic'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -Bstatic", where "CC" is the KAI C++ compiler.
+	    old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
+	    ;;
+	  icpc* | ecpc* )
+	    # Intel C++
+	    with_gnu_ld=yes
+	    # version 8.0 and above of icpc choke on multiply defined symbols
+	    # if we add $predep_objects and $postdep_objects, however 7.1 and
+	    # earlier do not add the objects themselves.
+	    case `$CC -V 2>&1` in
+	      *"Version 7."*)
+	        archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+		archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+		;;
+	      *)  # Version 8.0 or newer
+	        tmp_idyn=
+	        case $host_cpu in
+		  ia64*) tmp_idyn=' -i_dynamic';;
+		esac
+	        archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+		archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+		;;
+	    esac
+	    archive_cmds_need_lc_CXX=no
+	    hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir'
+	    export_dynamic_flag_spec_CXX='$wl--export-dynamic'
+	    whole_archive_flag_spec_CXX='$wl--whole-archive$convenience $wl--no-whole-archive'
+	    ;;
+          pgCC* | pgcpp*)
+            # Portland Group C++ compiler
+	    case `$CC -V` in
+	    *pgCC\ [1-5].* | *pgcpp\ [1-5].*)
+	      prelink_cmds_CXX='tpldir=Template.dir~
+               rm -rf $tpldir~
+               $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
+               compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
+	      old_archive_cmds_CXX='tpldir=Template.dir~
+                rm -rf $tpldir~
+                $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
+                $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
+                $RANLIB $oldlib'
+	      archive_cmds_CXX='tpldir=Template.dir~
+                rm -rf $tpldir~
+                $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+                $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+	      archive_expsym_cmds_CXX='tpldir=Template.dir~
+                rm -rf $tpldir~
+                $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+                $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+	      ;;
+	    *) # Version 6 and above use weak symbols
+	      archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+	      archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+	      ;;
+	    esac
+
+	    hardcode_libdir_flag_spec_CXX='$wl--rpath $wl$libdir'
+	    export_dynamic_flag_spec_CXX='$wl--export-dynamic'
+	    whole_archive_flag_spec_CXX='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+            ;;
+	  cxx*)
+	    # Compaq C++
+	    archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+	    archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname  -o $lib $wl-retain-symbols-file $wl$export_symbols'
+
+	    runpath_var=LD_RUN_PATH
+	    hardcode_libdir_flag_spec_CXX='-rpath $libdir'
+	    hardcode_libdir_separator_CXX=:
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
+	    ;;
+	  xl* | mpixl* | bgxl*)
+	    # IBM XL 8.0 on PPC, with GNU ld
+	    hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir'
+	    export_dynamic_flag_spec_CXX='$wl--export-dynamic'
+	    archive_cmds_CXX='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	    if test yes = "$supports_anon_versioning"; then
+	      archive_expsym_cmds_CXX='echo "{ global:" > $output_objdir/$libname.ver~
+                cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+                echo "local: *; };" >> $output_objdir/$libname.ver~
+                $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
+	    fi
+	    ;;
+	  *)
+	    case `$CC -V 2>&1 | sed 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      no_undefined_flag_CXX=' -zdefs'
+	      archive_cmds_CXX='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	      archive_expsym_cmds_CXX='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file $wl$export_symbols'
+	      hardcode_libdir_flag_spec_CXX='-R$libdir'
+	      whole_archive_flag_spec_CXX='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+	      compiler_needs_object_CXX=yes
+
+	      # Not sure whether something based on
+	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
+	      # would be better.
+	      output_verbose_link_cmd='func_echo_all'
+
+	      # Archives containing C++ object files must be created using
+	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	      # necessary to make sure instantiated templates are included
+	      # in the archive.
+	      old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
+	      ;;
+	    esac
+	    ;;
+	esac
+	;;
+
+      lynxos*)
+        # FIXME: insert proper C++ library support
+	ld_shlibs_CXX=no
+	;;
+
+      m88k*)
+        # FIXME: insert proper C++ library support
+        ld_shlibs_CXX=no
+	;;
+
+      mvs*)
+        case $cc_basename in
+          cxx*)
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+	  *)
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+	esac
+	;;
+
+      netbsd*)
+        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	  archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+	  wlarc=
+	  hardcode_libdir_flag_spec_CXX='-R$libdir'
+	  hardcode_direct_CXX=yes
+	  hardcode_shlibpath_var_CXX=no
+	fi
+	# Workaround some broken pre-1.5 toolchains
+	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+	;;
+
+      *nto* | *qnx*)
+        ld_shlibs_CXX=yes
+	;;
+
+      openbsd* | bitrig*)
+	if test -f /usr/libexec/ld.so; then
+	  hardcode_direct_CXX=yes
+	  hardcode_shlibpath_var_CXX=no
+	  hardcode_direct_absolute_CXX=yes
+	  archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+	  hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir'
+	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then
+	    archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file,$export_symbols -o $lib'
+	    export_dynamic_flag_spec_CXX='$wl-E'
+	    whole_archive_flag_spec_CXX=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
+	  fi
+	  output_verbose_link_cmd=func_echo_all
+	else
+	  ld_shlibs_CXX=no
+	fi
+	;;
+
+      osf3* | osf4* | osf5*)
+        case $cc_basename in
+          KCC*)
+	    # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	    # KCC will only create a shared library if the output file
+	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
+	    # to its proper name (with version) after linking.
+	    archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+
+	    hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir'
+	    hardcode_libdir_separator_CXX=:
+
+	    # Archives containing C++ object files must be created using
+	    # the KAI C++ compiler.
+	    case $host in
+	      osf3*) old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' ;;
+	      *) old_archive_cmds_CXX='$CC -o $oldlib $oldobjs' ;;
+	    esac
+	    ;;
+          RCC*)
+	    # Rational C++ 2.4.1
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+          cxx*)
+	    case $host in
+	      osf3*)
+	        allow_undefined_flag_CXX=' $wl-expect_unresolved $wl\*'
+	        archive_cmds_CXX='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $soname `test -n "$verstring" && func_echo_all "$wl-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+	        hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir'
+		;;
+	      *)
+	        allow_undefined_flag_CXX=' -expect_unresolved \*'
+	        archive_cmds_CXX='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+	        archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
+                  echo "-hidden">> $lib.exp~
+                  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname $wl-input $wl$lib.exp  `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~
+                  $RM $lib.exp'
+	        hardcode_libdir_flag_spec_CXX='-rpath $libdir'
+		;;
+	    esac
+
+	    hardcode_libdir_separator_CXX=:
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+	    ;;
+	  *)
+	    if test yes,no = "$GXX,$with_gnu_ld"; then
+	      allow_undefined_flag_CXX=' $wl-expect_unresolved $wl\*'
+	      case $host in
+	        osf3*)
+	          archive_cmds_CXX='$CC -shared -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+		  ;;
+	        *)
+	          archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+		  ;;
+	      esac
+
+	      hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir'
+	      hardcode_libdir_separator_CXX=:
+
+	      # Commands to make compiler produce verbose output that lists
+	      # what "hidden" libraries, object files and flags are used when
+	      # linking a shared library.
+	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+
+	    else
+	      # FIXME: insert proper C++ library support
+	      ld_shlibs_CXX=no
+	    fi
+	    ;;
+        esac
+        ;;
+
+      psos*)
+        # FIXME: insert proper C++ library support
+        ld_shlibs_CXX=no
+        ;;
+
+      sunos4*)
+        case $cc_basename in
+          CC*)
+	    # Sun C++ 4.x
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+          lcc*)
+	    # Lucid
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+        esac
+        ;;
+
+      solaris*)
+        case $cc_basename in
+          CC* | sunCC*)
+	    # Sun C++ 4.2, 5.x and Centerline C++
+            archive_cmds_need_lc_CXX=yes
+	    no_undefined_flag_CXX=' -zdefs'
+	    archive_cmds_CXX='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	    archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+              $CC -G$allow_undefined_flag $wl-M $wl$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	    hardcode_libdir_flag_spec_CXX='-R$libdir'
+	    hardcode_shlibpath_var_CXX=no
+	    case $host_os in
+	      solaris2.[0-5] | solaris2.[0-5].*) ;;
+	      *)
+		# The compiler driver will combine and reorder linker options,
+		# but understands '-z linker_flag'.
+	        # Supported since Solaris 2.6 (maybe 2.5.1?)
+		whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract'
+	        ;;
+	    esac
+	    link_all_deplibs_CXX=yes
+
+	    output_verbose_link_cmd='func_echo_all'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	    # necessary to make sure instantiated templates are included
+	    # in the archive.
+	    old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
+	    ;;
+          gcx*)
+	    # Green Hills C++ Compiler
+	    archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
+
+	    # The C++ compiler must be used to create the archive.
+	    old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
+	    ;;
+          *)
+	    # GNU C++ compiler with Solaris linker
+	    if test yes,no = "$GXX,$with_gnu_ld"; then
+	      no_undefined_flag_CXX=' $wl-z ${wl}defs'
+	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
+	        archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
+	        archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+                  $CC -shared $pic_flag -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	        # Commands to make compiler produce verbose output that lists
+	        # what "hidden" libraries, object files and flags are used when
+	        # linking a shared library.
+	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+	      else
+	        # g++ 2.7 appears to require '-G' NOT '-shared' on this
+	        # platform.
+	        archive_cmds_CXX='$CC -G -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
+	        archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+                  $CC -G -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	        # Commands to make compiler produce verbose output that lists
+	        # what "hidden" libraries, object files and flags are used when
+	        # linking a shared library.
+	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+	      fi
+
+	      hardcode_libdir_flag_spec_CXX='$wl-R $wl$libdir'
+	      case $host_os in
+		solaris2.[0-5] | solaris2.[0-5].*) ;;
+		*)
+		  whole_archive_flag_spec_CXX='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
+		  ;;
+	      esac
+	    fi
+	    ;;
+        esac
+        ;;
+
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+      no_undefined_flag_CXX='$wl-z,text'
+      archive_cmds_need_lc_CXX=no
+      hardcode_shlibpath_var_CXX=no
+      runpath_var='LD_RUN_PATH'
+
+      case $cc_basename in
+        CC*)
+	  archive_cmds_CXX='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds_CXX='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  archive_cmds_CXX='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds_CXX='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+      esac
+      ;;
+
+      sysv5* | sco3.2v5* | sco5v6*)
+	# Note: We CANNOT use -z defs as we might desire, because we do not
+	# link with -lc, and that would cause any symbols used from libc to
+	# always be unresolved, which means just about no library would
+	# ever link correctly.  If we're not using GNU ld we use -z text
+	# though, which does catch some bad symbols but isn't as heavy-handed
+	# as -z defs.
+	no_undefined_flag_CXX='$wl-z,text'
+	allow_undefined_flag_CXX='$wl-z,nodefs'
+	archive_cmds_need_lc_CXX=no
+	hardcode_shlibpath_var_CXX=no
+	hardcode_libdir_flag_spec_CXX='$wl-R,$libdir'
+	hardcode_libdir_separator_CXX=':'
+	link_all_deplibs_CXX=yes
+	export_dynamic_flag_spec_CXX='$wl-Bexport'
+	runpath_var='LD_RUN_PATH'
+
+	case $cc_basename in
+          CC*)
+	    archive_cmds_CXX='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    archive_expsym_cmds_CXX='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    old_archive_cmds_CXX='$CC -Tprelink_objects $oldobjs~
+              '"$old_archive_cmds_CXX"
+	    reload_cmds_CXX='$CC -Tprelink_objects $reload_objs~
+              '"$reload_cmds_CXX"
+	    ;;
+	  *)
+	    archive_cmds_CXX='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    archive_expsym_cmds_CXX='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    ;;
+	esac
+      ;;
+
+      tandem*)
+        case $cc_basename in
+          NCC*)
+	    # NonStop-UX NCC 3.20
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+        esac
+        ;;
+
+      vxworks*)
+        # FIXME: insert proper C++ library support
+        ld_shlibs_CXX=no
+        ;;
+
+      *)
+        # FIXME: insert proper C++ library support
+        ld_shlibs_CXX=no
+        ;;
+    esac
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
+$as_echo "$ld_shlibs_CXX" >&6; }
+    test no = "$ld_shlibs_CXX" && can_build_shared=no
+
+    GCC_CXX=$GXX
+    LD_CXX=$LD
+
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    # Dependencies to place before and after the object being linked:
+predep_objects_CXX=
+postdep_objects_CXX=
+predeps_CXX=
+postdeps_CXX=
+compiler_lib_search_path_CXX=
+
+cat > conftest.$ac_ext <<_LT_EOF
+class Foo
+{
+public:
+  Foo (void) { a = 0; }
+private:
+  int a;
+};
+_LT_EOF
+
+
+_lt_libdeps_save_CFLAGS=$CFLAGS
+case "$CC $CFLAGS " in #(
+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
+esac
+
+if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  # Parse the compiler output and extract the necessary
+  # objects, libraries and library flags.
+
+  # Sentinel used to keep track of whether or not we are before
+  # the conftest object file.
+  pre_test_object_deps_done=no
+
+  for p in `eval "$output_verbose_link_cmd"`; do
+    case $prev$p in
+
+    -L* | -R* | -l*)
+       # Some compilers place space between "-{L,R}" and the path.
+       # Remove the space.
+       if test x-L = "$p" ||
+          test x-R = "$p"; then
+	 prev=$p
+	 continue
+       fi
+
+       # Expand the sysroot to ease extracting the directories later.
+       if test -z "$prev"; then
+         case $p in
+         -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
+         -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
+         -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
+         esac
+       fi
+       case $p in
+       =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
+       esac
+       if test no = "$pre_test_object_deps_done"; then
+	 case $prev in
+	 -L | -R)
+	   # Internal compiler library paths should come after those
+	   # provided the user.  The postdeps already come after the
+	   # user supplied libs so there is no need to process them.
+	   if test -z "$compiler_lib_search_path_CXX"; then
+	     compiler_lib_search_path_CXX=$prev$p
+	   else
+	     compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} $prev$p"
+	   fi
+	   ;;
+	 # The "-l" case would never come before the object being
+	 # linked, so don't bother handling this case.
+	 esac
+       else
+	 if test -z "$postdeps_CXX"; then
+	   postdeps_CXX=$prev$p
+	 else
+	   postdeps_CXX="${postdeps_CXX} $prev$p"
+	 fi
+       fi
+       prev=
+       ;;
+
+    *.lto.$objext) ;; # Ignore GCC LTO objects
+    *.$objext)
+       # This assumes that the test object file only shows up
+       # once in the compiler output.
+       if test "$p" = "conftest.$objext"; then
+	 pre_test_object_deps_done=yes
+	 continue
+       fi
+
+       if test no = "$pre_test_object_deps_done"; then
+	 if test -z "$predep_objects_CXX"; then
+	   predep_objects_CXX=$p
+	 else
+	   predep_objects_CXX="$predep_objects_CXX $p"
+	 fi
+       else
+	 if test -z "$postdep_objects_CXX"; then
+	   postdep_objects_CXX=$p
+	 else
+	   postdep_objects_CXX="$postdep_objects_CXX $p"
+	 fi
+       fi
+       ;;
+
+    *) ;; # Ignore the rest.
+
+    esac
+  done
+
+  # Clean up.
+  rm -f a.out a.exe
+else
+  echo "libtool.m4: error: problem compiling CXX test program"
+fi
+
+$RM -f confest.$objext
+CFLAGS=$_lt_libdeps_save_CFLAGS
+
+# PORTME: override above test on systems where it is broken
+case $host_os in
+interix[3-9]*)
+  # Interix 3.5 installs completely hosed .la files for C++, so rather than
+  # hack all around it, let's just trust "g++" to DTRT.
+  predep_objects_CXX=
+  postdep_objects_CXX=
+  postdeps_CXX=
+  ;;
+esac
+
+
+case " $postdeps_CXX " in
+*" -lc "*) archive_cmds_need_lc_CXX=no ;;
+esac
+ compiler_lib_search_dirs_CXX=
+if test -n "${compiler_lib_search_path_CXX}"; then
+ compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | $SED -e 's! -L! !g' -e 's!^ !!'`
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    lt_prog_compiler_wl_CXX=
+lt_prog_compiler_pic_CXX=
+lt_prog_compiler_static_CXX=
+
+
+  # C++ specific cases for pic, static, wl, etc.
+  if test yes = "$GXX"; then
+    lt_prog_compiler_wl_CXX='-Wl,'
+    lt_prog_compiler_static_CXX='-static'
+
+    case $host_os in
+    aix*)
+      # All AIX code is PIC.
+      if test ia64 = "$host_cpu"; then
+	# AIX 5 now supports IA64 processor
+	lt_prog_compiler_static_CXX='-Bstatic'
+      fi
+      lt_prog_compiler_pic_CXX='-fPIC'
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            lt_prog_compiler_pic_CXX='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the '-m68020' flag to GCC prevents building anything better,
+            # like '-m68040'.
+            lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
+      ;;
+
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+    mingw* | cygwin* | os2* | pw32* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
+      case $host_os in
+      os2*)
+	lt_prog_compiler_static_CXX='$wl-static'
+	;;
+      esac
+      ;;
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      lt_prog_compiler_pic_CXX='-fno-common'
+      ;;
+    *djgpp*)
+      # DJGPP does not support shared libraries at all
+      lt_prog_compiler_pic_CXX=
+      ;;
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      lt_prog_compiler_static_CXX=
+      ;;
+    interix[3-9]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	lt_prog_compiler_pic_CXX=-Kconform_pic
+      fi
+      ;;
+    hpux*)
+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
+      # sets the default TLS model and affects inlining.
+      case $host_cpu in
+      hppa*64*)
+	;;
+      *)
+	lt_prog_compiler_pic_CXX='-fPIC'
+	;;
+      esac
+      ;;
+    *qnx* | *nto*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      lt_prog_compiler_pic_CXX='-fPIC -shared'
+      ;;
+    *)
+      lt_prog_compiler_pic_CXX='-fPIC'
+      ;;
+    esac
+  else
+    case $host_os in
+      aix[4-9]*)
+	# All AIX code is PIC.
+	if test ia64 = "$host_cpu"; then
+	  # AIX 5 now supports IA64 processor
+	  lt_prog_compiler_static_CXX='-Bstatic'
+	else
+	  lt_prog_compiler_static_CXX='-bnso -bI:/lib/syscalls.exp'
+	fi
+	;;
+      chorus*)
+	case $cc_basename in
+	cxch68*)
+	  # Green Hills C++ Compiler
+	  # _LT_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
+	  ;;
+	esac
+	;;
+      mingw* | cygwin* | os2* | pw32* | cegcc*)
+	# This hack is so that the source file can tell whether it is being
+	# built for inclusion in a dll (and should export symbols for example).
+	lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
+	;;
+      dgux*)
+	case $cc_basename in
+	  ec++*)
+	    lt_prog_compiler_pic_CXX='-KPIC'
+	    ;;
+	  ghcx*)
+	    # Green Hills C++ Compiler
+	    lt_prog_compiler_pic_CXX='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      freebsd* | dragonfly*)
+	# FreeBSD uses GNU C++
+	;;
+      hpux9* | hpux10* | hpux11*)
+	case $cc_basename in
+	  CC*)
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_static_CXX='$wl-a ${wl}archive'
+	    if test ia64 != "$host_cpu"; then
+	      lt_prog_compiler_pic_CXX='+Z'
+	    fi
+	    ;;
+	  aCC*)
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_static_CXX='$wl-a ${wl}archive'
+	    case $host_cpu in
+	    hppa*64*|ia64*)
+	      # +Z the default
+	      ;;
+	    *)
+	      lt_prog_compiler_pic_CXX='+Z'
+	      ;;
+	    esac
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      interix*)
+	# This is c89, which is MS Visual C++ (no shared libs)
+	# Anyone wants to do a port?
+	;;
+      irix5* | irix6* | nonstopux*)
+	case $cc_basename in
+	  CC*)
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_static_CXX='-non_shared'
+	    # CC pic flag -KPIC is the default.
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+	case $cc_basename in
+	  KCC*)
+	    # KAI C++ Compiler
+	    lt_prog_compiler_wl_CXX='--backend -Wl,'
+	    lt_prog_compiler_pic_CXX='-fPIC'
+	    ;;
+	  ecpc* )
+	    # old Intel C++ for x86_64, which still supported -KPIC.
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_pic_CXX='-KPIC'
+	    lt_prog_compiler_static_CXX='-static'
+	    ;;
+	  icpc* )
+	    # Intel C++, used to be incompatible with GCC.
+	    # ICC 10 doesn't accept -KPIC any more.
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_pic_CXX='-fPIC'
+	    lt_prog_compiler_static_CXX='-static'
+	    ;;
+	  pgCC* | pgcpp*)
+	    # Portland Group C++ compiler
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_pic_CXX='-fpic'
+	    lt_prog_compiler_static_CXX='-Bstatic'
+	    ;;
+	  cxx*)
+	    # Compaq C++
+	    # Make sure the PIC flag is empty.  It appears that all Alpha
+	    # Linux and Compaq Tru64 Unix objects are PIC.
+	    lt_prog_compiler_pic_CXX=
+	    lt_prog_compiler_static_CXX='-non_shared'
+	    ;;
+	  xlc* | xlC* | bgxl[cC]* | mpixl[cC]*)
+	    # IBM XL 8.0, 9.0 on PPC and BlueGene
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_pic_CXX='-qpic'
+	    lt_prog_compiler_static_CXX='-qstaticlink'
+	    ;;
+	  *)
+	    case `$CC -V 2>&1 | sed 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      lt_prog_compiler_pic_CXX='-KPIC'
+	      lt_prog_compiler_static_CXX='-Bstatic'
+	      lt_prog_compiler_wl_CXX='-Qoption ld '
+	      ;;
+	    esac
+	    ;;
+	esac
+	;;
+      lynxos*)
+	;;
+      m88k*)
+	;;
+      mvs*)
+	case $cc_basename in
+	  cxx*)
+	    lt_prog_compiler_pic_CXX='-W c,exportall'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      netbsd*)
+	;;
+      *qnx* | *nto*)
+        # QNX uses GNU C++, but need to define -shared option too, otherwise
+        # it will coredump.
+        lt_prog_compiler_pic_CXX='-fPIC -shared'
+        ;;
+      osf3* | osf4* | osf5*)
+	case $cc_basename in
+	  KCC*)
+	    lt_prog_compiler_wl_CXX='--backend -Wl,'
+	    ;;
+	  RCC*)
+	    # Rational C++ 2.4.1
+	    lt_prog_compiler_pic_CXX='-pic'
+	    ;;
+	  cxx*)
+	    # Digital/Compaq C++
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    # Make sure the PIC flag is empty.  It appears that all Alpha
+	    # Linux and Compaq Tru64 Unix objects are PIC.
+	    lt_prog_compiler_pic_CXX=
+	    lt_prog_compiler_static_CXX='-non_shared'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      psos*)
+	;;
+      solaris*)
+	case $cc_basename in
+	  CC* | sunCC*)
+	    # Sun C++ 4.2, 5.x and Centerline C++
+	    lt_prog_compiler_pic_CXX='-KPIC'
+	    lt_prog_compiler_static_CXX='-Bstatic'
+	    lt_prog_compiler_wl_CXX='-Qoption ld '
+	    ;;
+	  gcx*)
+	    # Green Hills C++ Compiler
+	    lt_prog_compiler_pic_CXX='-PIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      sunos4*)
+	case $cc_basename in
+	  CC*)
+	    # Sun C++ 4.x
+	    lt_prog_compiler_pic_CXX='-pic'
+	    lt_prog_compiler_static_CXX='-Bstatic'
+	    ;;
+	  lcc*)
+	    # Lucid
+	    lt_prog_compiler_pic_CXX='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+	case $cc_basename in
+	  CC*)
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_pic_CXX='-KPIC'
+	    lt_prog_compiler_static_CXX='-Bstatic'
+	    ;;
+	esac
+	;;
+      tandem*)
+	case $cc_basename in
+	  NCC*)
+	    # NonStop-UX NCC 3.20
+	    lt_prog_compiler_pic_CXX='-KPIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      vxworks*)
+	;;
+      *)
+	lt_prog_compiler_can_build_shared_CXX=no
+	;;
+    esac
+  fi
+
+case $host_os in
+  # For platforms that do not support PIC, -DPIC is meaningless:
+  *djgpp*)
+    lt_prog_compiler_pic_CXX=
+    ;;
+  *)
+    lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
+    ;;
+esac
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+if ${lt_cv_prog_compiler_pic_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; }
+lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX
+
+#
+# Check to make sure the PIC flag actually works.
+#
+if test -n "$lt_prog_compiler_pic_CXX"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; }
+if ${lt_cv_prog_compiler_pic_works_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_pic_works_CXX=no
+   ac_outfile=conftest.$ac_objext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"  ## exclude from sc_useless_quotes_in_assignment
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings other than the usual output.
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_pic_works_CXX=yes
+     fi
+   fi
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; }
+
+if test yes = "$lt_cv_prog_compiler_pic_works_CXX"; then
+    case $lt_prog_compiler_pic_CXX in
+     "" | " "*) ;;
+     *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
+     esac
+else
+    lt_prog_compiler_pic_CXX=
+     lt_prog_compiler_can_build_shared_CXX=no
+fi
+
+fi
+
+
+
+
+
+#
+# Check to make sure the static flag actually works.
+#
+wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+if ${lt_cv_prog_compiler_static_works_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_static_works_CXX=no
+   save_LDFLAGS=$LDFLAGS
+   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&5
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         lt_cv_prog_compiler_static_works_CXX=yes
+       fi
+     else
+       lt_cv_prog_compiler_static_works_CXX=yes
+     fi
+   fi
+   $RM -r conftest*
+   LDFLAGS=$save_LDFLAGS
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; }
+
+if test yes = "$lt_cv_prog_compiler_static_works_CXX"; then
+    :
+else
+    lt_prog_compiler_static_CXX=
+fi
+
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if ${lt_cv_prog_compiler_c_o_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_c_o_CXX=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_c_o_CXX=yes
+     fi
+   fi
+   chmod u+w . 2>&5
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if ${lt_cv_prog_compiler_c_o_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_c_o_CXX=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_c_o_CXX=yes
+     fi
+   fi
+   chmod u+w . 2>&5
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
+
+
+
+
+hard_links=nottested
+if test no = "$lt_cv_prog_compiler_c_o_CXX" && test no != "$need_locks"; then
+  # do not overwrite the value of need_locks provided by the user
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
+$as_echo_n "checking if we can lock with hard links... " >&6; }
+  hard_links=yes
+  $RM conftest*
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  touch conftest.a
+  ln conftest.a conftest.b 2>&5 || hard_links=no
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
+$as_echo "$hard_links" >&6; }
+  if test no = "$hard_links"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
+    need_locks=warn
+  fi
+else
+  need_locks=no
+fi
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
+
+  export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
+  case $host_os in
+  aix[4-9]*)
+    # If we're using GNU nm, then we don't want the "-C" option.
+    # -C means demangle to GNU nm, but means don't demangle to AIX nm.
+    # Without the "-l" option, or with the "-B" option, AIX nm treats
+    # weak defined symbols like other global defined symbols, whereas
+    # GNU nm marks them as "W".
+    # While the 'weak' keyword is ignored in the Export File, we need
+    # it in the Import File for the 'aix-soname' feature, so we have
+    # to replace the "-B" option with "-P" for AIX nm.
+    if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+      export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
+    else
+      export_symbols_cmds_CXX='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
+    fi
+    ;;
+  pw32*)
+    export_symbols_cmds_CXX=$ltdll_cmds
+    ;;
+  cygwin* | mingw* | cegcc*)
+    case $cc_basename in
+    cl*)
+      exclude_expsyms_CXX='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+      ;;
+    *)
+      export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
+      exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
+      ;;
+    esac
+    ;;
+  *)
+    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+    ;;
+  esac
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
+$as_echo "$ld_shlibs_CXX" >&6; }
+test no = "$ld_shlibs_CXX" && can_build_shared=no
+
+with_gnu_ld_CXX=$with_gnu_ld
+
+
+
+
+
+
+#
+# Do we need to explicitly link libc?
+#
+case "x$archive_cmds_need_lc_CXX" in
+x|xyes)
+  # Assume -lc should be added
+  archive_cmds_need_lc_CXX=yes
+
+  if test yes,yes = "$GCC,$enable_shared"; then
+    case $archive_cmds_CXX in
+    *'~'*)
+      # FIXME: we may have to deal with multi-command sequences.
+      ;;
+    '$CC '*)
+      # Test whether the compiler implicitly links with -lc since on some
+      # systems, -lgcc has to come before -lc. If gcc already passes -lc
+      # to ld, don't add -lc before -lgcc.
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
+if ${lt_cv_archive_cmds_need_lc_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  $RM conftest*
+	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } 2>conftest.err; then
+	  soname=conftest
+	  lib=conftest
+	  libobjs=conftest.$ac_objext
+	  deplibs=
+	  wl=$lt_prog_compiler_wl_CXX
+	  pic_flag=$lt_prog_compiler_pic_CXX
+	  compiler_flags=-v
+	  linker_flags=-v
+	  verstring=
+	  output_objdir=.
+	  libname=conftest
+	  lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
+	  allow_undefined_flag_CXX=
+	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
+  (eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+	  then
+	    lt_cv_archive_cmds_need_lc_CXX=no
+	  else
+	    lt_cv_archive_cmds_need_lc_CXX=yes
+	  fi
+	  allow_undefined_flag_CXX=$lt_save_allow_undefined_flag
+	else
+	  cat conftest.err 1>&5
+	fi
+	$RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc_CXX" >&5
+$as_echo "$lt_cv_archive_cmds_need_lc_CXX" >&6; }
+      archive_cmds_need_lc_CXX=$lt_cv_archive_cmds_need_lc_CXX
+      ;;
+    esac
+  fi
+  ;;
+esac
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
+$as_echo_n "checking dynamic linker characteristics... " >&6; }
+
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
+shrext_cmds=.so
+postinstall_cmds=
+postuninstall_cmds=
+finish_cmds=
+finish_eval=
+shlibpath_var=
+shlibpath_overrides_runpath=unknown
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+need_lib_prefix=unknown
+hardcode_into_libs=no
+
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+need_version=unknown
+
+
+
+case $host_os in
+aix3*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname.a'
+  shlibpath_var=LIBPATH
+
+  # AIX 3 has no versioning support, so we append a major version to the name.
+  soname_spec='$libname$release$shared_ext$major'
+  ;;
+
+aix[4-9]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  hardcode_into_libs=yes
+  if test ia64 = "$host_cpu"; then
+    # AIX 5 supports IA64
+    library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext'
+    shlibpath_var=LD_LIBRARY_PATH
+  else
+    # With GCC up to 2.95.x, collect2 would create an import file
+    # for dependence libraries.  The import file would start with
+    # the line '#! .'.  This would cause the generated library to
+    # depend on '.', always an invalid library.  This was fixed in
+    # development snapshots of GCC prior to 3.0.
+    case $host_os in
+      aix4 | aix4.[01] | aix4.[01].*)
+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+	   echo ' yes '
+	   echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then
+	:
+      else
+	can_build_shared=no
+      fi
+      ;;
+    esac
+    # Using Import Files as archive members, it is possible to support
+    # filename-based versioning of shared library archives on AIX. While
+    # this would work for both with and without runtime linking, it will
+    # prevent static linking of such archives. So we do filename-based
+    # shared library versioning with .so extension only, which is used
+    # when both runtime linking and shared linking is enabled.
+    # Unfortunately, runtime linking may impact performance, so we do
+    # not want this to be the default eventually. Also, we use the
+    # versioned .so libs for executables only if there is the -brtl
+    # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
+    # To allow for filename-based versioning support, we need to create
+    # libNAME.so.V as an archive file, containing:
+    # *) an Import File, referring to the versioned filename of the
+    #    archive as well as the shared archive member, telling the
+    #    bitwidth (32 or 64) of that shared object, and providing the
+    #    list of exported symbols of that shared object, eventually
+    #    decorated with the 'weak' keyword
+    # *) the shared object with the F_LOADONLY flag set, to really avoid
+    #    it being seen by the linker.
+    # At run time we better use the real file rather than another symlink,
+    # but for link time we create the symlink libNAME.so -> libNAME.so.V
+
+    case $with_aix_soname,$aix_use_runtimelinking in
+    # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
+    # soname into executable. Probably we can add versioning support to
+    # collect2, so additional links can be useful in future.
+    aix,yes) # traditional libtool
+      dynamic_linker='AIX unversionable lib.so'
+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+      # instead of lib<name>.a to let people know that these are not
+      # typical AIX shared libraries.
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+      ;;
+    aix,no) # traditional AIX only
+      dynamic_linker='AIX lib.a(lib.so.V)'
+      # We preserve .a as extension for shared libraries through AIX4.2
+      # and later when we are not doing run time linking.
+      library_names_spec='$libname$release.a $libname.a'
+      soname_spec='$libname$release$shared_ext$major'
+      ;;
+    svr4,*) # full svr4 only
+      dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)"
+      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+      # We do not specify a path in Import Files, so LIBPATH fires.
+      shlibpath_overrides_runpath=yes
+      ;;
+    *,yes) # both, prefer svr4
+      dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)"
+      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+      # unpreferred sharedlib libNAME.a needs extra handling
+      postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
+      postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
+      # We do not specify a path in Import Files, so LIBPATH fires.
+      shlibpath_overrides_runpath=yes
+      ;;
+    *,no) # both, prefer aix
+      dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)"
+      library_names_spec='$libname$release.a $libname.a'
+      soname_spec='$libname$release$shared_ext$major'
+      # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
+      postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
+      postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
+      ;;
+    esac
+    shlibpath_var=LIBPATH
+  fi
+  ;;
+
+amigaos*)
+  case $host_cpu in
+  powerpc)
+    # Since July 2007 AmigaOS4 officially supports .so libraries.
+    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    ;;
+  m68k)
+    library_names_spec='$libname.ixlibrary $libname.a'
+    # Create ${libname}_ixlibrary.a entries in /sys/libs.
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    ;;
+  esac
+  ;;
+
+beos*)
+  library_names_spec='$libname$shared_ext'
+  dynamic_linker="$host_os ld.so"
+  shlibpath_var=LIBRARY_PATH
+  ;;
+
+bsdi[45]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+  # the default ld.so.conf also contains /usr/contrib/lib and
+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+  # libtool to hard-code these into programs
+  ;;
+
+cygwin* | mingw* | pw32* | cegcc*)
+  version_type=windows
+  shrext_cmds=.dll
+  need_version=no
+  need_lib_prefix=no
+
+  case $GCC,$cc_basename in
+  yes,*)
+    # gcc
+    library_names_spec='$libname.dll.a'
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \$file`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname~
+      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+      fi'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+
+    case $host_os in
+    cygwin*)
+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+      soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+
+      ;;
+    mingw* | cegcc*)
+      # MinGW DLLs use traditional 'lib' prefix
+      soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+      ;;
+    esac
+    dynamic_linker='Win32 ld.exe'
+    ;;
+
+  *,cl*)
+    # Native MSVC
+    libname_spec='$name'
+    soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+    library_names_spec='$libname.dll.lib'
+
+    case $build_os in
+    mingw*)
+      sys_lib_search_path_spec=
+      lt_save_ifs=$IFS
+      IFS=';'
+      for lt_path in $LIB
+      do
+        IFS=$lt_save_ifs
+        # Let DOS variable expansion print the short 8.3 style file name.
+        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
+        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
+      done
+      IFS=$lt_save_ifs
+      # Convert to MSYS style.
+      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
+      ;;
+    cygwin*)
+      # Convert to unix form, then to dos form, then back to unix form
+      # but this time dos style (no spaces!) so that the unix form looks
+      # like /cygdrive/c/PROGRA~1:/cygdr...
+      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
+      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
+      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      ;;
+    *)
+      sys_lib_search_path_spec=$LIB
+      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
+        # It is most probably a Windows format PATH.
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      fi
+      # FIXME: find the short name or the path components, as spaces are
+      # common. (e.g. "Program Files" -> "PROGRA~1")
+      ;;
+    esac
+
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \$file`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+    dynamic_linker='Win32 link.exe'
+    ;;
+
+  *)
+    # Assume MSVC wrapper
+    library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib'
+    dynamic_linker='Win32 ld.exe'
+    ;;
+  esac
+  # FIXME: first we should search . and the directory the executable is in
+  shlibpath_var=PATH
+  ;;
+
+darwin* | rhapsody*)
+  dynamic_linker="$host_os dyld"
+  version_type=darwin
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$major$shared_ext $libname$shared_ext'
+  soname_spec='$libname$release$major$shared_ext'
+  shlibpath_overrides_runpath=yes
+  shlibpath_var=DYLD_LIBRARY_PATH
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+
+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+  ;;
+
+dgux*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+freebsd* | dragonfly*)
+  # DragonFly does not have aout.  When/if they implement a new
+  # versioning mechanism, adjust this.
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[23].*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
+  version_type=freebsd-$objformat
+  case $version_type in
+    freebsd-elf*)
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+      soname_spec='$libname$release$shared_ext$major'
+      need_version=no
+      need_lib_prefix=no
+      ;;
+    freebsd-*)
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+      need_version=yes
+      ;;
+  esac
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_os in
+  freebsd2.*)
+    shlibpath_overrides_runpath=yes
+    ;;
+  freebsd3.[01]* | freebsdelf3.[01]*)
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
+  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
+    shlibpath_overrides_runpath=no
+    hardcode_into_libs=yes
+    ;;
+  *) # from 4.6 on, and DragonFly
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  esac
+  ;;
+
+haiku*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  dynamic_linker="$host_os runtime_loader"
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
+  hardcode_into_libs=yes
+  ;;
+
+hpux9* | hpux10* | hpux11*)
+  # Give a soname corresponding to the major version so that dld.sl refuses to
+  # link against other versions.
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  case $host_cpu in
+  ia64*)
+    shrext_cmds='.so'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.so"
+    shlibpath_var=LD_LIBRARY_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    if test 32 = "$HPUX_IA64_MODE"; then
+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+      sys_lib_dlsearch_path_spec=/usr/lib/hpux32
+    else
+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+      sys_lib_dlsearch_path_spec=/usr/lib/hpux64
+    fi
+    ;;
+  hppa*64*)
+    shrext_cmds='.sl'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  *)
+    shrext_cmds='.sl'
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=SHLIB_PATH
+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    ;;
+  esac
+  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
+  postinstall_cmds='chmod 555 $lib'
+  # or fails outright, so override atomically:
+  install_override_mode=555
+  ;;
+
+interix[3-9]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $host_os in
+    nonstopux*) version_type=nonstopux ;;
+    *)
+	if test yes = "$lt_cv_prog_gnu_ld"; then
+		version_type=linux # correct to gnu/linux during the next big refactor
+	else
+		version_type=irix
+	fi ;;
+  esac
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='$libname$release$shared_ext$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext'
+  case $host_os in
+  irix5* | nonstopux*)
+    libsuff= shlibsuff=
+    ;;
+  *)
+    case $LD in # libtool.m4 will add one of these switches to LD
+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+      libsuff= shlibsuff= libmagic=32-bit;;
+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+      libsuff=32 shlibsuff=N32 libmagic=N32;;
+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+    *) libsuff= shlibsuff= libmagic=never-match;;
+    esac
+    ;;
+  esac
+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff"
+  sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff"
+  hardcode_into_libs=yes
+  ;;
+
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+  dynamic_linker=no
+  ;;
+
+linux*android*)
+  version_type=none # Android doesn't support versioned libraries.
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext'
+  soname_spec='$libname$release$shared_ext'
+  finish_cmds=
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  dynamic_linker='Android linker'
+  # Don't embed -rpath directories since the linker doesn't support them.
+  hardcode_libdir_flag_spec_CXX='-L$libdir'
+  ;;
+
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+
+  # Some binutils ld are patched to set DT_RUNPATH
+  if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_shlibpath_overrides_runpath=no
+    save_LDFLAGS=$LDFLAGS
+    save_libdir=$libdir
+    eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \
+	 LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\""
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
+  lt_cv_shlibpath_overrides_runpath=yes
+fi
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+    LDFLAGS=$save_LDFLAGS
+    libdir=$save_libdir
+
+fi
+
+  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
+
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  # Ideally, we could use ldconfig to report *all* directores which are
+  # searched for libraries, however this is still not possible.  Aside from not
+  # being certain /sbin/ldconfig is available, command
+  # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
+  # even though it is searched at run-time.  Try to do the best guess by
+  # appending ld.so.conf contents (and includes) to the search path.
+  if test -f /etc/ld.so.conf; then
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+  fi
+
+  # We used to test for /lib/ld.so.1 and disable shared libraries on
+  # powerpc, because MkLinux only supported shared libraries with the
+  # GNU dynamic linker.  Since this was broken with cross compilers,
+  # most powerpc-linux boxes support dynamic linking these days and
+  # people can always --disable-shared, the test was removed, and we
+  # assume the GNU/Linux dynamic linker is in use.
+  dynamic_linker='GNU/Linux ld.so'
+  ;;
+
+netbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+    dynamic_linker='NetBSD (a.out) ld.so'
+  else
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    dynamic_linker='NetBSD ld.elf_so'
+  fi
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  ;;
+
+newsos6)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+*nto* | *qnx*)
+  version_type=qnx
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='ldqnx.so'
+  ;;
+
+openbsd* | bitrig*)
+  version_type=sunos
+  sys_lib_dlsearch_path_spec=/usr/lib
+  need_lib_prefix=no
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+    need_version=no
+  else
+    need_version=yes
+  fi
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+os2*)
+  libname_spec='$name'
+  version_type=windows
+  shrext_cmds=.dll
+  need_version=no
+  need_lib_prefix=no
+  # OS/2 can only load a DLL with a base name of 8 characters or less.
+  soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
+    v=$($ECHO $release$versuffix | tr -d .-);
+    n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
+    $ECHO $n$v`$shared_ext'
+  library_names_spec='${libname}_dll.$libext'
+  dynamic_linker='OS/2 ld.exe'
+  shlibpath_var=BEGINLIBPATH
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+  postinstall_cmds='base_file=`basename \$file`~
+    dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~
+    dldir=$destdir/`dirname \$dlpath`~
+    test -d \$dldir || mkdir -p \$dldir~
+    $install_prog $dir/$dlname \$dldir/$dlname~
+    chmod a+x \$dldir/$dlname~
+    if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+      eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+    fi'
+  postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
+    dlpath=$dir/\$dldll~
+    $RM \$dlpath'
+  ;;
+
+osf3* | osf4* | osf5*)
+  version_type=osf
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='$libname$release$shared_ext$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+  ;;
+
+rdos*)
+  dynamic_linker=no
+  ;;
+
+solaris*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  # ldd complains unless libraries are executable
+  postinstall_cmds='chmod +x $lib'
+  ;;
+
+sunos4*)
+  version_type=sunos
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  if test yes = "$with_gnu_ld"; then
+    need_lib_prefix=no
+  fi
+  need_version=yes
+  ;;
+
+sysv4 | sysv4.3*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_vendor in
+    sni)
+      shlibpath_overrides_runpath=no
+      need_lib_prefix=no
+      runpath_var=LD_RUN_PATH
+      ;;
+    siemens)
+      need_lib_prefix=no
+      ;;
+    motorola)
+      need_lib_prefix=no
+      need_version=no
+      shlibpath_overrides_runpath=no
+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+      ;;
+  esac
+  ;;
+
+sysv4*MP*)
+  if test -d /usr/nec; then
+    version_type=linux # correct to gnu/linux during the next big refactor
+    library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext'
+    soname_spec='$libname$shared_ext.$major'
+    shlibpath_var=LD_LIBRARY_PATH
+  fi
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  version_type=sco
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  if test yes = "$with_gnu_ld"; then
+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+  else
+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+    case $host_os in
+      sco3.2v5*)
+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+	;;
+    esac
+  fi
+  sys_lib_dlsearch_path_spec='/usr/lib'
+  ;;
+
+tpf*)
+  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+uts4*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+*)
+  dynamic_linker=no
+  ;;
+esac
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
+$as_echo "$dynamic_linker" >&6; }
+test no = "$dynamic_linker" && can_build_shared=no
+
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test yes = "$GCC"; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
+if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
+  sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
+fi
+
+if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
+  sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
+fi
+
+# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
+configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
+
+# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
+func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
+
+# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
+configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
+$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
+hardcode_action_CXX=
+if test -n "$hardcode_libdir_flag_spec_CXX" ||
+   test -n "$runpath_var_CXX" ||
+   test yes = "$hardcode_automatic_CXX"; then
+
+  # We can hardcode non-existent directories.
+  if test no != "$hardcode_direct_CXX" &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, CXX)" &&
+     test no != "$hardcode_minus_L_CXX"; then
+    # Linking always hardcodes the temporary library directory.
+    hardcode_action_CXX=relink
+  else
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    hardcode_action_CXX=immediate
+  fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  hardcode_action_CXX=unsupported
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX" >&5
+$as_echo "$hardcode_action_CXX" >&6; }
+
+if test relink = "$hardcode_action_CXX" ||
+   test yes = "$inherit_rpath_CXX"; then
+  # Fast installation is not supported
+  enable_fast_install=no
+elif test yes = "$shlibpath_overrides_runpath" ||
+     test no = "$enable_shared"; then
+  # Fast installation is not necessary
+  enable_fast_install=needless
+fi
+
+
+
+
+
+
+
+  fi # test -n "$compiler"
+
+  CC=$lt_save_CC
+  CFLAGS=$lt_save_CFLAGS
+  LDCXX=$LD
+  LD=$lt_save_LD
+  GCC=$lt_save_GCC
+  with_gnu_ld=$lt_save_with_gnu_ld
+  lt_cv_path_LDCXX=$lt_cv_path_LD
+  lt_cv_path_LD=$lt_save_path_LD
+  lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
+  lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
+fi # test yes != "$_lt_caught_CXX_error"
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+############################################################################
+# Setup the core
+############################################################################
+
+# Setup the pmix core
+
+    pmix_show_subtitle "C compiler and preprocessor"
+
+    # $%@#!@#% AIX!!  This has to be called before anything invokes the C
+    # compiler.
+
+
+    #
+    # Check for the compiler
+    #
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_cflags_save dummy pmix_cc_arvgv0; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_cflags_save dummy pmix_cc_arvgv0\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+    pmix_cflags_save="$CFLAGS"
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C99" >&5
+$as_echo_n "checking for $CC option to accept ISO C99... " >&6; }
+if ${ac_cv_prog_cc_c99+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_prog_cc_c99=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <wchar.h>
+#include <stdio.h>
+
+// Check varargs macros.  These examples are taken from C99 6.10.3.5.
+#define debug(...) fprintf (stderr, __VA_ARGS__)
+#define showlist(...) puts (#__VA_ARGS__)
+#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__))
+static void
+test_varargs_macros (void)
+{
+  int x = 1234;
+  int y = 5678;
+  debug ("Flag");
+  debug ("X = %d\n", x);
+  showlist (The first, second, and third items.);
+  report (x>y, "x is %d but y is %d", x, y);
+}
+
+// Check long long types.
+#define BIG64 18446744073709551615ull
+#define BIG32 4294967295ul
+#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0)
+#if !BIG_OK
+  your preprocessor is broken;
+#endif
+#if BIG_OK
+#else
+  your preprocessor is broken;
+#endif
+static long long int bignum = -9223372036854775807LL;
+static unsigned long long int ubignum = BIG64;
+
+struct incomplete_array
+{
+  int datasize;
+  double data[];
+};
+
+struct named_init {
+  int number;
+  const wchar_t *name;
+  double average;
+};
+
+typedef const char *ccp;
+
+static inline int
+test_restrict (ccp restrict text)
+{
+  // See if C++-style comments work.
+  // Iterate through items via the restricted pointer.
+  // Also check for declarations in for loops.
+  for (unsigned int i = 0; *(text+i) != '\0'; ++i)
+    continue;
+  return 0;
+}
+
+// Check varargs and va_copy.
+static void
+test_varargs (const char *format, ...)
+{
+  va_list args;
+  va_start (args, format);
+  va_list args_copy;
+  va_copy (args_copy, args);
+
+  const char *str;
+  int number;
+  float fnumber;
+
+  while (*format)
+    {
+      switch (*format++)
+	{
+	case 's': // string
+	  str = va_arg (args_copy, const char *);
+	  break;
+	case 'd': // int
+	  number = va_arg (args_copy, int);
+	  break;
+	case 'f': // float
+	  fnumber = va_arg (args_copy, double);
+	  break;
+	default:
+	  break;
+	}
+    }
+  va_end (args_copy);
+  va_end (args);
+}
+
+int
+main ()
+{
+
+  // Check bool.
+  _Bool success = false;
+
+  // Check restrict.
+  if (test_restrict ("String literal") == 0)
+    success = true;
+  char *restrict newvar = "Another string";
+
+  // Check varargs.
+  test_varargs ("s, d' f .", "string", 65, 34.234);
+  test_varargs_macros ();
+
+  // Check flexible array members.
+  struct incomplete_array *ia =
+    malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10));
+  ia->datasize = 10;
+  for (int i = 0; i < ia->datasize; ++i)
+    ia->data[i] = i * 1.234;
+
+  // Check named initializers.
+  struct named_init ni = {
+    .number = 34,
+    .name = L"Test wide string",
+    .average = 543.34343,
+  };
+
+  ni.number = 58;
+
+  int dynamic_array[ni.number];
+  dynamic_array[ni.number - 1] = 543;
+
+  // work around unused variable warnings
+  return (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == 'x'
+	  || dynamic_array[ni.number - 1] != 543);
+
+  ;
+  return 0;
+}
+_ACEOF
+for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -D_STDC_C99= -qlanglvl=extc99
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_c99=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext
+  test "x$ac_cv_prog_cc_c99" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+
+fi
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c99" in
+  x)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
+  xno)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
+  *)
+    CC="$CC $ac_cv_prog_cc_c99"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
+$as_echo "$ac_cv_prog_cc_c99" >&6; } ;;
+esac
+if test "x$ac_cv_prog_cc_c99" != xno; then :
+
+fi
+
+
+    BASECC="`basename $CC`"
+    CFLAGS="$pmix_cflags_save"
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_CC "$CC"
+_ACEOF
+
+    set dummy $CC
+    pmix_cc_argv0=$2
+
+# 1 is the variable name to do "which" on
+# 2 is the variable name to assign the return value to
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_prog pmix_file pmix_dir pmix_sentinel; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_prog pmix_file pmix_dir pmix_sentinel\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+pmix_prog=$pmix_cc_argv0
+
+IFS_SAVE=$IFS
+IFS="$PATH_SEPARATOR"
+for pmix_dir in $PATH; do
+    if test -x "$pmix_dir/$pmix_prog"; then
+        PMIX_CC_ABSOLUTE="$pmix_dir/$pmix_prog"
+        break
+    fi
+done
+IFS=$IFS_SAVE
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
+$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
+if ${lt_cv_path_NM+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$NM"; then
+  # Let the user override the test.
+  lt_cv_path_NM=$NM
+else
+  lt_nm_to_check=${ac_tool_prefix}nm
+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+    lt_nm_to_check="$lt_nm_to_check nm"
+  fi
+  for lt_tmp_nm in $lt_nm_to_check; do
+    lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+      IFS=$lt_save_ifs
+      test -z "$ac_dir" && ac_dir=.
+      tmp_nm=$ac_dir/$lt_tmp_nm
+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then
+	# Check to see if the nm accepts a BSD-compat flag.
+	# Adding the 'sed 1q' prevents false positives on HP-UX, which says:
+	#   nm: unknown option "B" ignored
+	# Tru64's nm complains that /dev/null is an invalid object file
+	# MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty
+	case $build_os in
+	mingw*) lt_bad_file=conftest.nm/nofile ;;
+	*) lt_bad_file=/dev/null ;;
+	esac
+	case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in
+	*$lt_bad_file* | *'Invalid file or object type'*)
+	  lt_cv_path_NM="$tmp_nm -B"
+	  break 2
+	  ;;
+	*)
+	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+	  */dev/null*)
+	    lt_cv_path_NM="$tmp_nm -p"
+	    break 2
+	    ;;
+	  *)
+	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	    continue # so that we can try to find one that supports BSD flags
+	    ;;
+	  esac
+	  ;;
+	esac
+      fi
+    done
+    IFS=$lt_save_ifs
+  done
+  : ${lt_cv_path_NM=no}
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
+$as_echo "$lt_cv_path_NM" >&6; }
+if test no != "$lt_cv_path_NM"; then
+  NM=$lt_cv_path_NM
+else
+  # Didn't find any BSD compatible name lister, look for dumpbin.
+  if test -n "$DUMPBIN"; then :
+    # Let the user override the test.
+  else
+    if test -n "$ac_tool_prefix"; then
+  for ac_prog in dumpbin "link -dump"
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_DUMPBIN+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$DUMPBIN"; then
+  ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+DUMPBIN=$ac_cv_prog_DUMPBIN
+if test -n "$DUMPBIN"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
+$as_echo "$DUMPBIN" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$DUMPBIN" && break
+  done
+fi
+if test -z "$DUMPBIN"; then
+  ac_ct_DUMPBIN=$DUMPBIN
+  for ac_prog in dumpbin "link -dump"
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_DUMPBIN"; then
+  ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
+if test -n "$ac_ct_DUMPBIN"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
+$as_echo "$ac_ct_DUMPBIN" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_DUMPBIN" && break
+done
+
+  if test "x$ac_ct_DUMPBIN" = x; then
+    DUMPBIN=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    DUMPBIN=$ac_ct_DUMPBIN
+  fi
+fi
+
+    case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in
+    *COFF*)
+      DUMPBIN="$DUMPBIN -symbols -headers"
+      ;;
+    *)
+      DUMPBIN=:
+      ;;
+    esac
+  fi
+
+  if test : != "$DUMPBIN"; then
+    NM=$DUMPBIN
+  fi
+fi
+test -z "$NM" && NM=nm
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
+$as_echo_n "checking the name lister ($NM) interface... " >&6; }
+if ${lt_cv_nm_interface+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_nm_interface="BSD nm"
+  echo "int some_variable = 0;" > conftest.$ac_ext
+  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
+  (eval "$ac_compile" 2>conftest.err)
+  cat conftest.err >&5
+  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+  cat conftest.err >&5
+  (eval echo "\"\$as_me:$LINENO: output\"" >&5)
+  cat conftest.out >&5
+  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+    lt_cv_nm_interface="MS dumpbin"
+  fi
+  rm -f conftest*
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
+$as_echo "$lt_cv_nm_interface" >&6; }
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking __NetBSD__" >&5
+$as_echo_n "checking __NetBSD__... " >&6; }
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifndef __NetBSD__
+      error: this isnt __NetBSD__
+      #endif
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  pmix_found_netbsd=yes
+else
+  pmix_found_netbsd=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pmix_found_netbsd" >&5
+$as_echo "$pmix_found_netbsd" >&6; }
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking __FreeBSD__" >&5
+$as_echo_n "checking __FreeBSD__... " >&6; }
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifndef __FreeBSD__
+      error: this isnt __FreeBSD__
+      #endif
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  pmix_found_freebsd=yes
+else
+  pmix_found_freebsd=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pmix_found_freebsd" >&5
+$as_echo "$pmix_found_freebsd" >&6; }
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking __OpenBSD__" >&5
+$as_echo_n "checking __OpenBSD__... " >&6; }
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifndef __OpenBSD__
+      error: this isnt __OpenBSD__
+      #endif
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  pmix_found_openbsd=yes
+else
+  pmix_found_openbsd=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pmix_found_openbsd" >&5
+$as_echo "$pmix_found_openbsd" >&6; }
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking __DragonFly__" >&5
+$as_echo_n "checking __DragonFly__... " >&6; }
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifndef __DragonFly__
+      error: this isnt __DragonFly__
+      #endif
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  pmix_found_dragonfly=yes
+else
+  pmix_found_dragonfly=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pmix_found_dragonfly" >&5
+$as_echo "$pmix_found_dragonfly" >&6; }
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking __386BSD__" >&5
+$as_echo_n "checking __386BSD__... " >&6; }
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifndef __386BSD__
+      error: this isnt __386BSD__
+      #endif
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  pmix_found_386bsd=yes
+else
+  pmix_found_386bsd=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pmix_found_386bsd" >&5
+$as_echo "$pmix_found_386bsd" >&6; }
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking __bsdi__" >&5
+$as_echo_n "checking __bsdi__... " >&6; }
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifndef __bsdi__
+      error: this isnt __bsdi__
+      #endif
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  pmix_found_bsdi=yes
+else
+  pmix_found_bsdi=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pmix_found_bsdi" >&5
+$as_echo "$pmix_found_bsdi" >&6; }
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking __APPLE__" >&5
+$as_echo_n "checking __APPLE__... " >&6; }
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifndef __APPLE__
+      error: this isnt __APPLE__
+      #endif
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  pmix_found_apple=yes
+else
+  pmix_found_apple=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pmix_found_apple" >&5
+$as_echo "$pmix_found_apple" >&6; }
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking __linux__" >&5
+$as_echo_n "checking __linux__... " >&6; }
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifndef __linux__
+      error: this isnt __linux__
+      #endif
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  pmix_found_linux=yes
+else
+  pmix_found_linux=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pmix_found_linux" >&5
+$as_echo "$pmix_found_linux" >&6; }
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking __sun__" >&5
+$as_echo_n "checking __sun__... " >&6; }
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifndef __sun__
+      error: this isnt __sun__
+      #endif
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  pmix_found_sun=yes
+else
+  pmix_found_sun=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pmix_found_sun" >&5
+$as_echo "$pmix_found_sun" >&6; }
+
+    if test "$pmix_found_sun" = "no"; then :
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking __sun" >&5
+$as_echo_n "checking __sun... " >&6; }
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifndef __sun
+      error: this isnt __sun
+      #endif
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  pmix_found_sun=yes
+else
+  pmix_found_sun=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pmix_found_sun" >&5
+$as_echo "$pmix_found_sun" >&6; }
+
+fi
+
+    if test "$pmix_found_sun" = "yes"; then :
+  pmix_have_solaris=1
+           CFLAGS="$CFLAGS -D_REENTRANT"
+           CPPFLAGS="$CPPFLAGS -D_REENTRANT"
+else
+  pmix_have_solaris=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_HAVE_SOLARIS $pmix_have_solaris
+_ACEOF
+
+
+    # check for sockaddr_in (a good sign we have TCP)
+    for ac_header in netdb.h netinet/in.h netinet/tcp.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+    ac_fn_c_check_type "$LINENO" "struct sockaddr_in" "ac_cv_type_struct_sockaddr_in" "$ac_includes_default
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+"
+if test "x$ac_cv_type_struct_sockaddr_in" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_SOCKADDR_IN 1
+_ACEOF
+
+pmix_found_sockaddr=yes
+else
+  pmix_found_sockaddr=no
+fi
+
+
+
+
+
+
+
+
+    # If no prefix was defined, set a good value
+
+
+    # Get pmix's absolute top builddir (which may not be the same as
+    # the real $top_builddir)
+    PMIX_startdir=`pwd`
+    if test x"" != "x" && test ! -d ""; then
+        mkdir -p ""
+    fi
+    if test x"" != "x"; then
+        cd ""
+    fi
+    PMIX_top_builddir=`pwd`
+
+
+    # Get pmix's absolute top srcdir (which may not be the same as the
+    # real $top_srcdir.  First, go back to the startdir incase the
+    # $srcdir is relative.
+
+    cd "$PMIX_startdir"
+    cd "$srcdir"/
+    PMIX_top_srcdir="`pwd`"
+
+
+    # Go back to where we started
+    cd "$PMIX_startdir"
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: pmix builddir: $PMIX_top_builddir" >&5
+$as_echo "$as_me: pmix builddir: $PMIX_top_builddir" >&6;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: pmix srcdir: $PMIX_top_srcdir" >&5
+$as_echo "$as_me: pmix srcdir: $PMIX_top_srcdir" >&6;}
+    if test "$PMIX_top_builddir" != "$PMIX_top_srcdir"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: Detected VPATH build" >&5
+$as_echo "$as_me: Detected VPATH build" >&6;}
+    fi
+
+    # Get the version of pmix that we are installing
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pmix version" >&5
+$as_echo_n "checking for pmix version... " >&6; }
+    PMIX_VERSION="`$PMIX_top_srcdir/config/pmix_get_version.sh $PMIX_top_srcdir/VERSION`"
+    if test "$?" != "0"; then
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PMIX_VERSION" >&5
+$as_echo "$PMIX_VERSION" >&6; }
+
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_VERSION "$PMIX_VERSION"
+_ACEOF
+
+
+    PMIX_RELEASE_DATE="`$PMIX_top_srcdir/config/pmix_get_version.sh $PMIX_top_srcdir/VERSION --release-date`"
+
+
+    # Save the breakdown the version information
+    PMIX_MAJOR_VERSION="`$PMIX_top_srcdir/config/pmix_get_version.sh $PMIX_top_srcdir/VERSION --major`"
+    if test "$?" != "0"; then
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_MAJOR_VERSION $PMIX_MAJOR_VERSION
+_ACEOF
+
+
+    PMIX_MINOR_VERSION="`$PMIX_top_srcdir/config/pmix_get_version.sh $PMIX_top_srcdir/VERSION --minor`"
+    if test "$?" != "0"; then
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_MINOR_VERSION $PMIX_MINOR_VERSION
+_ACEOF
+
+
+    pmixmajor=${PMIX_MAJOR_VERSION}L
+    pmixminor=${PMIX_MINOR_VERSION}L
+
+
+    ac_config_files="$ac_config_files include/pmix_version.h"
+
+
+    PMIX_RELEASE_VERSION="`$PMIX_top_srcdir/config/pmix_get_version.sh $PMIX_top_srcdir/VERSION --release`"
+    if test "$?" != "0"; then
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_RELEASE_VERSION $PMIX_RELEASE_VERSION
+_ACEOF
+
+
+    # Debug mode?
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if want pmix maintainer support" >&5
+$as_echo_n "checking if want pmix maintainer support... " >&6; }
+    pmix_debug=
+    if test "$pmix_debug" = "" && test "$enable_debug" = "yes"; then :
+  pmix_debug=1
+           pmix_debug_msg="enabled"
+fi
+    if test "$pmix_debug" = ""; then :
+  pmix_debug=0
+           pmix_debug_msg="disabled"
+fi
+    # Grr; we use #ifndef for PMIX_DEBUG!  :-(
+
+    if test "$pmix_debug" = "1"; then :
+  $as_echo "#define PMIX_ENABLE_DEBUG 1" >>confdefs.h
+
+fi
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pmix_debug_msg" >&5
+$as_echo "$pmix_debug_msg" >&6; }
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pmix directory prefix" >&5
+$as_echo_n "checking for pmix directory prefix... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: (none)" >&5
+$as_echo "(none)" >&6; }
+
+    # Note that private/config.h *MUST* be listed first so that it
+    # becomes the "main" config header file.  Any AC-CONFIG-HEADERS
+    # after that (pmix/config.h) will only have selective #defines
+    # replaced, not the entire file.
+    ac_config_headers="$ac_config_headers src/include/pmix_config.h"
+
+
+    # Rename symbols?
+
+# Check whether --with-pmix-symbol-rename was given.
+if test "${with_pmix_symbol_rename+set}" = set; then :
+  withval=$with_pmix_symbol_rename;
+fi
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for symbol rename" >&5
+$as_echo_n "checking for symbol rename... " >&6; }
+    if test ! -z "$with_pmix_symbol_rename" && test "$with_pmix_symbol_rename" != "yes"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_pmix_symbol_rename" >&5
+$as_echo "$with_pmix_symbol_rename" >&6; }
+           pmix_symbol_rename="$with_pmix_symbol_rename"
+           PMIX_RENAME=$with_pmix_symbol_rename
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+           pmix_symbol_rename=""
+           PMIX_RENAME=
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_SYMBOL_RENAME $pmix_symbol_rename
+_ACEOF
+
+
+    ac_config_files="$ac_config_files include/pmix_rename.h"
+
+
+    # GCC specifics.
+    if test "x$GCC" = "xyes"; then
+        PMIX_GCC_CFLAGS="-Wall -Wmissing-prototypes -Wundef"
+        PMIX_GCC_CFLAGS="$PMIX_GCC_CFLAGS -Wpointer-arith -Wcast-align"
+    fi
+
+    ############################################################################
+    # Check for compilers and preprocessors
+    ############################################################################
+    pmix_show_title "Compiler and preprocessor tests"
+
+
+    # AM_PROG_CC_C_O AC_REQUIREs AC_PROG_CC, so we have to be a little
+    # careful about ordering here, and AC_REQUIRE these things so that
+    # they get stamped out in the right order.
+
+
+
+
+
+    # We require a C99 compiant compiler
+    # The result of AC_PROG_CC_C99 is stored in ac_cv_prog_cc_c99
+    if test "x$ac_cv_prog_cc_c99" = xno ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIx requires a C99 compiler" >&5
+$as_echo "$as_me: WARNING: PMIx requires a C99 compiler" >&2;}
+        as_fn_error $? "Aborting." "$LINENO" 5
+    fi
+
+
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the C compiler vendor" >&5
+$as_echo_n "checking for the C compiler vendor... " >&6; }
+if ${pmix_cv_c_compiler_vendor+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+    pmix_check_compiler_vendor_result="unknown"
+
+    # GNU is probably the most common, so check that one as soon as
+    # possible.  Intel pretends to be GNU, so need to check Intel
+    # before checking for GNU.
+
+    # Intel
+    if test "$pmix_check_compiler_vendor_result" = "unknown"; then :
+
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#if !( defined(__INTEL_COMPILER) || defined(__ICC) )
+#error "condition defined(__INTEL_COMPILER) || defined(__ICC) not met"
+choke me
+#endif
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  pmix_check_compiler_vendor_result="intel"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+    # Fujitsu
+    if test "$pmix_check_compiler_vendor_result" = "unknown"; then :
+
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#if !( defined(__FUJITSU) )
+#error "condition defined(__FUJITSU) not met"
+choke me
+#endif
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  pmix_check_compiler_vendor_result="fujitsu"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+    # GNU
+    if test "$pmix_check_compiler_vendor_result" = "unknown"; then :
+
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#ifndef __GNUC__
+#error "symbol __GNUC__ not defined"
+choke me
+#endif
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  pmix_check_compiler_vendor_result="gnu"
+
+               # We do not support gccfss as a compiler so die if
+               # someone tries to use said compiler.  gccfss (gcc
+               # for SPARC Systems) is a compiler that is no longer
+               # supported by Oracle and it has some major flaws
+               # that prevents it from actually compiling PMIX code.
+               # So if we detect it we automatically bail.
+
+               if ($CC --version | grep gccfss) >/dev/null 2>&1; then
+                   { $as_echo "$as_me:${as_lineno-$LINENO}: result: gccfss" >&5
+$as_echo "gccfss" >&6; }
+                   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Detected gccfss being used to compile PMIx." >&5
+$as_echo "$as_me: WARNING: Detected gccfss being used to compile PMIx." >&2;}
+                   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Because of several issues PMIx does not support" >&5
+$as_echo "$as_me: WARNING: Because of several issues PMIx does not support" >&2;}
+                   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: the gccfss compiler.  Please use a different compiler." >&5
+$as_echo "$as_me: WARNING: the gccfss compiler.  Please use a different compiler." >&2;}
+                   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: If you didn't think you used gccfss you may want to" >&5
+$as_echo "$as_me: WARNING: If you didn't think you used gccfss you may want to" >&2;}
+                   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: check to see if the compiler you think you used is" >&5
+$as_echo "$as_me: WARNING: check to see if the compiler you think you used is" >&2;}
+                   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: actually a link to gccfss." >&5
+$as_echo "$as_me: WARNING: actually a link to gccfss." >&2;}
+                   as_fn_error $? "Cannot continue" "$LINENO" 5
+               fi
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+    # Borland Turbo C
+    if test "$pmix_check_compiler_vendor_result" = "unknown"; then :
+
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#ifndef __TURBOC__
+#error "symbol __TURBOC__ not defined"
+choke me
+#endif
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  pmix_check_compiler_vendor_result="borland"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+    # Borland C++
+    if test "$pmix_check_compiler_vendor_result" = "unknown"; then :
+
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#ifndef __BORLANDC__
+#error "symbol __BORLANDC__ not defined"
+choke me
+#endif
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  pmix_check_compiler_vendor_result="borland"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+    # Comeau C++
+    if test "$pmix_check_compiler_vendor_result" = "unknown"; then :
+
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#ifndef __COMO__
+#error "symbol __COMO__ not defined"
+choke me
+#endif
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  pmix_check_compiler_vendor_result="comeau"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+    # Compaq C/C++
+    if test "$pmix_check_compiler_vendor_result" = "unknown"; then :
+
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#if !( defined(__DECC) || defined(VAXC) || defined(__VAXC) )
+#error "condition defined(__DECC) || defined(VAXC) || defined(__VAXC) not met"
+choke me
+#endif
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  pmix_check_compiler_vendor_result="compaq"
+else
+
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#if !( defined(__osf__) && defined(__LANGUAGE_C__) )
+#error "condition defined(__osf__) && defined(__LANGUAGE_C__) not met"
+choke me
+#endif
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  pmix_check_compiler_vendor_result="compaq"
+else
+
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#ifndef __DECCXX
+#error "symbol __DECCXX not defined"
+choke me
+#endif
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  pmix_check_compiler_vendor_result="compaq"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+    # Cray C/C++
+    if test "$pmix_check_compiler_vendor_result" = "unknown"; then :
+
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#ifndef _CRAYC
+#error "symbol _CRAYC not defined"
+choke me
+#endif
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  pmix_check_compiler_vendor_result="cray"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+    # Diab C/C++
+    if test "$pmix_check_compiler_vendor_result" = "unknown"; then :
+
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#ifndef __DCC__
+#error "symbol __DCC__ not defined"
+choke me
+#endif
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  pmix_check_compiler_vendor_result="diab"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+    # Digital Mars
+    if test "$pmix_check_compiler_vendor_result" = "unknown"; then :
+
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#if !( defined(__DMC__) || defined(__SC__) || defined(__ZTC__) )
+#error "condition defined(__DMC__) || defined(__SC__) || defined(__ZTC__) not met"
+choke me
+#endif
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  pmix_check_compiler_vendor_result="digital mars"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+    # HP ANSI C / aC++
+    if test "$pmix_check_compiler_vendor_result" = "unknown"; then :
+
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#if !( defined(__HP_cc) || defined(__HP_aCC) )
+#error "condition defined(__HP_cc) || defined(__HP_aCC) not met"
+choke me
+#endif
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  pmix_check_compiler_vendor_result="hp"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+    # IBM XL C/C++
+    if test "$pmix_check_compiler_vendor_result" = "unknown"; then :
+
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#if !( defined(__xlC__) || defined(__IBMC__) || defined(__IBMCPP__) )
+#error "condition defined(__xlC__) || defined(__IBMC__) || defined(__IBMCPP__) not met"
+choke me
+#endif
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  pmix_check_compiler_vendor_result="ibm"
+else
+
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#if !( defined(_AIX) && !defined(__GNUC__) )
+#error "condition defined(_AIX) && !defined(__GNUC__) not met"
+choke me
+#endif
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  pmix_check_compiler_vendor_result="ibm"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+    # KAI C++ (rest in peace)
+    if test "$pmix_check_compiler_vendor_result" = "unknown"; then :
+
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#ifndef __KCC
+#error "symbol __KCC not defined"
+choke me
+#endif
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  pmix_check_compiler_vendor_result="kai"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+    # LCC
+    if test "$pmix_check_compiler_vendor_result" = "unknown"; then :
+
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#ifndef __LCC__
+#error "symbol __LCC__ not defined"
+choke me
+#endif
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  pmix_check_compiler_vendor_result="lcc"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+    # MetaWare High C/C++
+    if test "$pmix_check_compiler_vendor_result" = "unknown"; then :
+
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#ifndef __HIGHC__
+#error "symbol __HIGHC__ not defined"
+choke me
+#endif
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  pmix_check_compiler_vendor_result="metaware high"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+    # Metrowerks Codewarrior
+    if test "$pmix_check_compiler_vendor_result" = "unknown"; then :
+
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#ifndef __MWERKS__
+#error "symbol __MWERKS__ not defined"
+choke me
+#endif
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  pmix_check_compiler_vendor_result="metrowerks"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+    # MIPSpro (SGI)
+    if test "$pmix_check_compiler_vendor_result" = "unknown"; then :
+
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#if !( defined(sgi) || defined(__sgi) )
+#error "condition defined(sgi) || defined(__sgi) not met"
+choke me
+#endif
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  pmix_check_compiler_vendor_result="sgi"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+    # MPW C++
+    if test "$pmix_check_compiler_vendor_result" = "unknown"; then :
+
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#if !( defined(__MRC__) || defined(MPW_C) || defined(MPW_CPLUS) )
+#error "condition defined(__MRC__) || defined(MPW_C) || defined(MPW_CPLUS) not met"
+choke me
+#endif
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  pmix_check_compiler_vendor_result="mpw"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+    # Norcroft C
+    if test "$pmix_check_compiler_vendor_result" = "unknown"; then :
+
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#ifndef __CC_NORCROFT
+#error "symbol __CC_NORCROFT not defined"
+choke me
+#endif
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  pmix_check_compiler_vendor_result="norcroft"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+    # Pelles C
+    if test "$pmix_check_compiler_vendor_result" = "unknown"; then :
+
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#ifndef __POCC__
+#error "symbol __POCC__ not defined"
+choke me
+#endif
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  pmix_check_compiler_vendor_result="pelles"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+    # Portland Group
+    if test "$pmix_check_compiler_vendor_result" = "unknown"; then :
+
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#ifndef __PGI
+#error "symbol __PGI not defined"
+choke me
+#endif
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  pmix_check_compiler_vendor_result="portland group"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+    # SAS/C
+    if test "$pmix_check_compiler_vendor_result" = "unknown"; then :
+
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#if !( defined(SASC) || defined(__SASC) || defined(__SASC__) )
+#error "condition defined(SASC) || defined(__SASC) || defined(__SASC__) not met"
+choke me
+#endif
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  pmix_check_compiler_vendor_result="sas"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+    # Sun Workshop C/C++
+    if test "$pmix_check_compiler_vendor_result" = "unknown"; then :
+
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#if !( defined(__SUNPRO_C) || defined(__SUNPRO_CC) )
+#error "condition defined(__SUNPRO_C) || defined(__SUNPRO_CC) not met"
+choke me
+#endif
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  pmix_check_compiler_vendor_result="sun"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+    # TenDRA C/C++
+    if test "$pmix_check_compiler_vendor_result" = "unknown"; then :
+
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#ifndef __TenDRA__
+#error "symbol __TenDRA__ not defined"
+choke me
+#endif
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  pmix_check_compiler_vendor_result="tendra"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+    # Tiny C
+    if test "$pmix_check_compiler_vendor_result" = "unknown"; then :
+
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#ifndef __TINYC__
+#error "symbol __TINYC__ not defined"
+choke me
+#endif
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  pmix_check_compiler_vendor_result="tiny"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+    # USL C
+    if test "$pmix_check_compiler_vendor_result" = "unknown"; then :
+
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#ifndef __USLC__
+#error "symbol __USLC__ not defined"
+choke me
+#endif
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  pmix_check_compiler_vendor_result="usl"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+    # Watcom C++
+    if test "$pmix_check_compiler_vendor_result" = "unknown"; then :
+
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#ifndef __WATCOMC__
+#error "symbol __WATCOMC__ not defined"
+choke me
+#endif
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  pmix_check_compiler_vendor_result="watcom"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+    pmix_cv_c_compiler_vendor="$pmix_check_compiler_vendor_result"
+    unset pmix_check_compiler_vendor_result
+
+         ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pmix_cv_c_compiler_vendor" >&5
+$as_echo "$pmix_cv_c_compiler_vendor" >&6; }
+
+    pmix_c_vendor="$pmix_cv_c_compiler_vendor"
+
+
+    # Check for standard headers, needed here because needed before
+    # the types checks.
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
+if ${ac_cv_header_stdc+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_header_stdc=yes
+else
+  ac_cv_header_stdc=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+if test $ac_cv_header_stdc = yes; then
+  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <string.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "memchr" >/dev/null 2>&1; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "free" >/dev/null 2>&1; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+  if test "$cross_compiling" = yes; then :
+  :
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ctype.h>
+#include <stdlib.h>
+#if ((' ' & 0x0FF) == 0x020)
+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+#else
+# define ISLOWER(c) \
+		   (('a' <= (c) && (c) <= 'i') \
+		     || ('j' <= (c) && (c) <= 'r') \
+		     || ('s' <= (c) && (c) <= 'z'))
+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+#endif
+
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+int
+main ()
+{
+  int i;
+  for (i = 0; i < 256; i++)
+    if (XOR (islower (i), ISLOWER (i))
+	|| toupper (i) != TOUPPER (i))
+      return 2;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
+if test $ac_cv_header_stdc = yes; then
+
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
+
+fi
+
+
+    # GNU C and autotools are inconsistent about whether this is
+    # defined so let's make it true everywhere for now...  However, IBM
+    # XL compilers on PPC Linux behave really badly when compiled with
+    # _GNU_SOURCE defined, so don't define it in that situation.
+    #
+    # Don't use AC_GNU_SOURCE because it requires that no compiler
+    # tests are done before setting it, and we need to at least do
+    # enough tests to figure out if we're using XL or not.
+    if test "$pmix_cv_c_compiler_vendor" != "ibm"; then :
+
+           $as_echo "#define _GNU_SOURCE 1" >>confdefs.h
+
+fi
+
+    # Do we want debugging?
+    if test "$WANT_DEBUG" = "1" && test "$enable_debug_symbols" != "no" ; then
+        CFLAGS="$CFLAGS -g"
+
+
+    # 1 is the variable name to be uniq-ized
+    pmix_name=CFLAGS
+
+    # Go through each item in the variable and only keep the unique ones
+
+    pmix_count=0
+    for val in ${CFLAGS}; do
+        pmix_done=0
+        pmix_i=1
+        pmix_found=0
+
+        # Loop over every token we've seen so far
+
+        pmix_done="`expr $pmix_i \> $pmix_count`"
+        while test "$pmix_found" = "0" && test "$pmix_done" = "0"; do
+
+            # Have we seen this token already?  Prefix the comparison
+            # with "x" so that "-Lfoo" values won't be cause an error.
+
+	    pmix_eval="expr x$val = x\$pmix_array_$pmix_i"
+	    pmix_found=`eval $pmix_eval`
+
+            # Check the ending condition
+
+	    pmix_done="`expr $pmix_i \>= $pmix_count`"
+
+            # Increment the counter
+
+	    pmix_i="`expr $pmix_i + 1`"
+        done
+
+        # Check for special cases where we do want to allow repeated
+        # arguments (per
+        # http://www.open-mpi.org/community/lists/devel/2012/08/11362.php
+        # and
+        # https://github.com/open-mpi/ompi/issues/324).
+
+        case $val in
+        -Xclang|-Xg)
+                pmix_found=0
+                pmix_i=`expr $pmix_count + 1`
+                ;;
+        -framework)
+                pmix_found=0
+                pmix_i=`expr $pmix_count + 1`
+                ;;
+        --param)
+                pmix_found=0
+                pmix_i=`expr $pmix_count + 1`
+                ;;
+        esac
+
+        # If we didn't find the token, add it to the "array"
+
+        if test "$pmix_found" = "0"; then
+	    pmix_eval="pmix_array_$pmix_i=$val"
+	    eval $pmix_eval
+	    pmix_count="`expr $pmix_count + 1`"
+        else
+	    pmix_i="`expr $pmix_i - 1`"
+        fi
+    done
+
+    # Take all the items in the "array" and assemble them back into a
+    # single variable
+
+    pmix_i=1
+    pmix_done="`expr $pmix_i \> $pmix_count`"
+    pmix_newval=
+    while test "$pmix_done" = "0"; do
+        pmix_eval="pmix_newval=\"$pmix_newval \$pmix_array_$pmix_i\""
+        eval $pmix_eval
+
+        pmix_eval="unset pmix_array_$pmix_i"
+        eval $pmix_eval
+
+        pmix_done="`expr $pmix_i \>= $pmix_count`"
+        pmix_i="`expr $pmix_i + 1`"
+    done
+
+    # Done; do the assignment
+
+    pmix_newval="`echo $pmix_newval`"
+    pmix_eval="$pmix_name=\"$pmix_newval\""
+    eval $pmix_eval
+
+    # Clean up
+
+    unset pmix_name pmix_i pmix_done pmix_newval pmix_eval pmix_count
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: -g has been added to CFLAGS (--enable-debug)" >&5
+$as_echo "$as_me: WARNING: -g has been added to CFLAGS (--enable-debug)" >&2;}
+    fi
+
+    # These flags are generally gcc-specific; even the
+    # gcc-impersonating compilers won't accept them.
+    PMIX_CFLAGS_BEFORE_PICKY="$CFLAGS"
+
+    if test $WANT_PICKY_COMPILER -eq 1; then
+        CFLAGS_orig=$CFLAGS
+        add=
+
+        # These flags are likely GCC-specific (or, more specifically,
+        # we don't have general tests for each one, and we know they
+        # work with all versions of GCC that we have used throughout
+        # the years, so we'll keep them limited just to GCC).
+        if test "$pmix_c_vendor" = "gnu" ; then
+            add="$add -Wall -Wundef -Wno-long-long -Wsign-compare"
+            add="$add -Wmissing-prototypes -Wstrict-prototypes"
+            add="$add -Wcomment -pedantic"
+        fi
+
+        # see if -Wno-long-double works...
+        # Starting with GCC-4.4, the compiler complains about not
+        # knowing -Wno-long-double, only if -Wstrict-prototypes is set, too.
+        #
+        # Actually, this is not real fix, as GCC will pass on any -Wno- flag,
+        # have fun with the warning: -Wno-britney
+        CFLAGS="$CFLAGS_orig $add -Wno-long-double -Wstrict-prototypes"
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wno-long-double" >&5
+$as_echo_n "checking if $CC supports -Wno-long-double... " >&6; }
+if ${pmix_cv_cc_wno_long_double+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+                                                                    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+long double test;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+                      pmix_cv_cc_wno_long_double="yes"
+                      if test -s conftest.err ; then
+                                                    for i in unknown invalid ignor unrecognized ; do
+                              $GREP -iq $i conftest.err
+                              if test "$?" = "0" ; then
+                                  pmix_cv_cc_wno_long_double="no"
+                                  break;
+                              fi
+                          done
+                      fi
+
+else
+  pmix_cv_cc_wno_long_double="no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+  pmix_cv_cc_wno_long_double="no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pmix_cv_cc_wno_long_double" >&5
+$as_echo "$pmix_cv_cc_wno_long_double" >&6; }
+
+        if test "$pmix_cv_cc_wno_long_double" = "yes" ; then
+            add="$add -Wno-long-double"
+        fi
+
+        # Per above, we know that this flag works with GCC / haven't
+        # really tested it elsewhere.
+        if test "$pmix_c_vendor" = "gnu" ; then
+            add="$add -Werror-implicit-function-declaration "
+        fi
+
+        CFLAGS="$CFLAGS_orig $add"
+
+    # 1 is the variable name to be uniq-ized
+    pmix_name=CFLAGS
+
+    # Go through each item in the variable and only keep the unique ones
+
+    pmix_count=0
+    for val in ${CFLAGS}; do
+        pmix_done=0
+        pmix_i=1
+        pmix_found=0
+
+        # Loop over every token we've seen so far
+
+        pmix_done="`expr $pmix_i \> $pmix_count`"
+        while test "$pmix_found" = "0" && test "$pmix_done" = "0"; do
+
+            # Have we seen this token already?  Prefix the comparison
+            # with "x" so that "-Lfoo" values won't be cause an error.
+
+	    pmix_eval="expr x$val = x\$pmix_array_$pmix_i"
+	    pmix_found=`eval $pmix_eval`
+
+            # Check the ending condition
+
+	    pmix_done="`expr $pmix_i \>= $pmix_count`"
+
+            # Increment the counter
+
+	    pmix_i="`expr $pmix_i + 1`"
+        done
+
+        # Check for special cases where we do want to allow repeated
+        # arguments (per
+        # http://www.open-mpi.org/community/lists/devel/2012/08/11362.php
+        # and
+        # https://github.com/open-mpi/ompi/issues/324).
+
+        case $val in
+        -Xclang|-Xg)
+                pmix_found=0
+                pmix_i=`expr $pmix_count + 1`
+                ;;
+        -framework)
+                pmix_found=0
+                pmix_i=`expr $pmix_count + 1`
+                ;;
+        --param)
+                pmix_found=0
+                pmix_i=`expr $pmix_count + 1`
+                ;;
+        esac
+
+        # If we didn't find the token, add it to the "array"
+
+        if test "$pmix_found" = "0"; then
+	    pmix_eval="pmix_array_$pmix_i=$val"
+	    eval $pmix_eval
+	    pmix_count="`expr $pmix_count + 1`"
+        else
+	    pmix_i="`expr $pmix_i - 1`"
+        fi
+    done
+
+    # Take all the items in the "array" and assemble them back into a
+    # single variable
+
+    pmix_i=1
+    pmix_done="`expr $pmix_i \> $pmix_count`"
+    pmix_newval=
+    while test "$pmix_done" = "0"; do
+        pmix_eval="pmix_newval=\"$pmix_newval \$pmix_array_$pmix_i\""
+        eval $pmix_eval
+
+        pmix_eval="unset pmix_array_$pmix_i"
+        eval $pmix_eval
+
+        pmix_done="`expr $pmix_i \>= $pmix_count`"
+        pmix_i="`expr $pmix_i + 1`"
+    done
+
+    # Done; do the assignment
+
+    pmix_newval="`echo $pmix_newval`"
+    pmix_eval="$pmix_name=\"$pmix_newval\""
+    eval $pmix_eval
+
+    # Clean up
+
+    unset pmix_name pmix_i pmix_done pmix_newval pmix_eval pmix_count
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $add has been added to CFLAGS (--enable-picky)" >&5
+$as_echo "$as_me: WARNING: $add has been added to CFLAGS (--enable-picky)" >&2;}
+        unset add
+    fi
+
+    # See if this version of gcc allows -finline-functions and/or
+    # -fno-strict-aliasing.  Even check the gcc-impersonating compilers.
+    if test "$GCC" = "yes"; then
+        CFLAGS_orig="$CFLAGS"
+
+        # Note: Some versions of clang (at least >= 3.5 -- perhaps
+        # older versions, too?) will *warn* about -finline-functions,
+        # but still allow it.  This is very annoying, so check for
+        # that warning, too.  The clang warning looks like this:
+        # clang: warning: optimization flag '-finline-functions' is not supported
+        # clang: warning: argument unused during compilation: '-finline-functions'
+        CFLAGS="$CFLAGS_orig -finline-functions"
+        add=
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -finline-functions" >&5
+$as_echo_n "checking if $CC supports -finline-functions... " >&6; }
+if ${pmix_cv_cc_finline_functions+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  pmix_cv_cc_finline_functions="yes"
+                                    if test -s conftest.err ; then
+                                        for i in unused 'not supported' ; do
+                                            if $GREP -iq "$i" conftest.err; then
+                                                pmix_cv_cc_finline_functions="no"
+                                                break;
+                                            fi
+                                        done
+                                    fi
+
+else
+  pmix_cv_cc_finline_functions="no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pmix_cv_cc_finline_functions" >&5
+$as_echo "$pmix_cv_cc_finline_functions" >&6; }
+        if test "$pmix_cv_cc_finline_functions" = "yes" ; then
+            add=" -finline-functions"
+        fi
+        CFLAGS="$CFLAGS_orig$add"
+
+        CFLAGS_orig="$CFLAGS"
+        CFLAGS="$CFLAGS_orig -fno-strict-aliasing"
+        add=
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -fno-strict-aliasing" >&5
+$as_echo_n "checking if $CC supports -fno-strict-aliasing... " >&6; }
+if ${pmix_cv_cc_fno_strict_aliasing+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  pmix_cv_cc_fno_strict_aliasing="yes"
+else
+  pmix_cv_cc_fno_strict_aliasing="no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pmix_cv_cc_fno_strict_aliasing" >&5
+$as_echo "$pmix_cv_cc_fno_strict_aliasing" >&6; }
+        if test "$pmix_cv_cc_fno_strict_aliasing" = "yes" ; then
+            add=" -fno-strict-aliasing"
+        fi
+        CFLAGS="$CFLAGS_orig$add"
+
+
+    # 1 is the variable name to be uniq-ized
+    pmix_name=CFLAGS
+
+    # Go through each item in the variable and only keep the unique ones
+
+    pmix_count=0
+    for val in ${CFLAGS}; do
+        pmix_done=0
+        pmix_i=1
+        pmix_found=0
+
+        # Loop over every token we've seen so far
+
+        pmix_done="`expr $pmix_i \> $pmix_count`"
+        while test "$pmix_found" = "0" && test "$pmix_done" = "0"; do
+
+            # Have we seen this token already?  Prefix the comparison
+            # with "x" so that "-Lfoo" values won't be cause an error.
+
+	    pmix_eval="expr x$val = x\$pmix_array_$pmix_i"
+	    pmix_found=`eval $pmix_eval`
+
+            # Check the ending condition
+
+	    pmix_done="`expr $pmix_i \>= $pmix_count`"
+
+            # Increment the counter
+
+	    pmix_i="`expr $pmix_i + 1`"
+        done
+
+        # Check for special cases where we do want to allow repeated
+        # arguments (per
+        # http://www.open-mpi.org/community/lists/devel/2012/08/11362.php
+        # and
+        # https://github.com/open-mpi/ompi/issues/324).
+
+        case $val in
+        -Xclang|-Xg)
+                pmix_found=0
+                pmix_i=`expr $pmix_count + 1`
+                ;;
+        -framework)
+                pmix_found=0
+                pmix_i=`expr $pmix_count + 1`
+                ;;
+        --param)
+                pmix_found=0
+                pmix_i=`expr $pmix_count + 1`
+                ;;
+        esac
+
+        # If we didn't find the token, add it to the "array"
+
+        if test "$pmix_found" = "0"; then
+	    pmix_eval="pmix_array_$pmix_i=$val"
+	    eval $pmix_eval
+	    pmix_count="`expr $pmix_count + 1`"
+        else
+	    pmix_i="`expr $pmix_i - 1`"
+        fi
+    done
+
+    # Take all the items in the "array" and assemble them back into a
+    # single variable
+
+    pmix_i=1
+    pmix_done="`expr $pmix_i \> $pmix_count`"
+    pmix_newval=
+    while test "$pmix_done" = "0"; do
+        pmix_eval="pmix_newval=\"$pmix_newval \$pmix_array_$pmix_i\""
+        eval $pmix_eval
+
+        pmix_eval="unset pmix_array_$pmix_i"
+        eval $pmix_eval
+
+        pmix_done="`expr $pmix_i \>= $pmix_count`"
+        pmix_i="`expr $pmix_i + 1`"
+    done
+
+    # Done; do the assignment
+
+    pmix_newval="`echo $pmix_newval`"
+    pmix_eval="$pmix_name=\"$pmix_newval\""
+    eval $pmix_eval
+
+    # Clean up
+
+    unset pmix_name pmix_i pmix_done pmix_newval pmix_eval pmix_count
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $add has been added to CFLAGS" >&5
+$as_echo "$as_me: WARNING: $add has been added to CFLAGS" >&2;}
+        unset add
+    fi
+
+    # Try to enable restrict keyword
+    RESTRICT_CFLAGS=
+    case "$pmix_c_vendor" in
+        intel)
+            RESTRICT_CFLAGS="-restrict"
+        ;;
+        sgi)
+            RESTRICT_CFLAGS="-LANG:restrict=ON"
+        ;;
+    esac
+    if test ! -z "$RESTRICT_CFLAGS" ; then
+        CFLAGS_orig="$CFLAGS"
+        CFLAGS="$CFLAGS_orig $RESTRICT_CFLAGS"
+        add=
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports $RESTRICT_CFLAGS" >&5
+$as_echo_n "checking if $CC supports $RESTRICT_CFLAGS... " >&6; }
+if ${pmix_cv_cc_restrict_cflags+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  pmix_cv_cc_restrict_cflags="yes"
+else
+  pmix_cv_cc_restrict_cflags="no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pmix_cv_cc_restrict_cflags" >&5
+$as_echo "$pmix_cv_cc_restrict_cflags" >&6; }
+        if test "$pmix_cv_cc_restrict_cflags" = "yes" ; then
+            add=" $RESTRICT_CFLAGS"
+        fi
+
+        CFLAGS="${CFLAGS_orig}${add}"
+
+    # 1 is the variable name to be uniq-ized
+    pmix_name=CFLAGS
+
+    # Go through each item in the variable and only keep the unique ones
+
+    pmix_count=0
+    for val in ${CFLAGS}; do
+        pmix_done=0
+        pmix_i=1
+        pmix_found=0
+
+        # Loop over every token we've seen so far
+
+        pmix_done="`expr $pmix_i \> $pmix_count`"
+        while test "$pmix_found" = "0" && test "$pmix_done" = "0"; do
+
+            # Have we seen this token already?  Prefix the comparison
+            # with "x" so that "-Lfoo" values won't be cause an error.
+
+	    pmix_eval="expr x$val = x\$pmix_array_$pmix_i"
+	    pmix_found=`eval $pmix_eval`
+
+            # Check the ending condition
+
+	    pmix_done="`expr $pmix_i \>= $pmix_count`"
+
+            # Increment the counter
+
+	    pmix_i="`expr $pmix_i + 1`"
+        done
+
+        # Check for special cases where we do want to allow repeated
+        # arguments (per
+        # http://www.open-mpi.org/community/lists/devel/2012/08/11362.php
+        # and
+        # https://github.com/open-mpi/ompi/issues/324).
+
+        case $val in
+        -Xclang|-Xg)
+                pmix_found=0
+                pmix_i=`expr $pmix_count + 1`
+                ;;
+        -framework)
+                pmix_found=0
+                pmix_i=`expr $pmix_count + 1`
+                ;;
+        --param)
+                pmix_found=0
+                pmix_i=`expr $pmix_count + 1`
+                ;;
+        esac
+
+        # If we didn't find the token, add it to the "array"
+
+        if test "$pmix_found" = "0"; then
+	    pmix_eval="pmix_array_$pmix_i=$val"
+	    eval $pmix_eval
+	    pmix_count="`expr $pmix_count + 1`"
+        else
+	    pmix_i="`expr $pmix_i - 1`"
+        fi
+    done
+
+    # Take all the items in the "array" and assemble them back into a
+    # single variable
+
+    pmix_i=1
+    pmix_done="`expr $pmix_i \> $pmix_count`"
+    pmix_newval=
+    while test "$pmix_done" = "0"; do
+        pmix_eval="pmix_newval=\"$pmix_newval \$pmix_array_$pmix_i\""
+        eval $pmix_eval
+
+        pmix_eval="unset pmix_array_$pmix_i"
+        eval $pmix_eval
+
+        pmix_done="`expr $pmix_i \>= $pmix_count`"
+        pmix_i="`expr $pmix_i + 1`"
+    done
+
+    # Done; do the assignment
+
+    pmix_newval="`echo $pmix_newval`"
+    pmix_eval="$pmix_name=\"$pmix_newval\""
+    eval $pmix_eval
+
+    # Clean up
+
+    unset pmix_name pmix_i pmix_done pmix_newval pmix_eval pmix_count
+
+        if test "$add" != "" ; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $add has been added to CFLAGS" >&5
+$as_echo "$as_me: WARNING: $add has been added to CFLAGS" >&2;}
+        fi
+        unset add
+    fi
+
+    # see if the C compiler supports __builtin_expect
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports __builtin_expect" >&5
+$as_echo_n "checking if $CC supports __builtin_expect... " >&6; }
+if ${pmix_cv_cc_supports___builtin_expect+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+void *ptr = (void*) 0;
+           if (__builtin_expect (ptr != (void*) 0, 1)) return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  pmix_cv_cc_supports___builtin_expect="yes"
+else
+  pmix_cv_cc_supports___builtin_expect="no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pmix_cv_cc_supports___builtin_expect" >&5
+$as_echo "$pmix_cv_cc_supports___builtin_expect" >&6; }
+    if test "$pmix_cv_cc_supports___builtin_expect" = "yes" ; then
+        have_cc_builtin_expect=1
+    else
+        have_cc_builtin_expect=0
+    fi
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_C_HAVE_BUILTIN_EXPECT $have_cc_builtin_expect
+_ACEOF
+
+
+    # see if the C compiler supports __builtin_prefetch
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports __builtin_prefetch" >&5
+$as_echo_n "checking if $CC supports __builtin_prefetch... " >&6; }
+if ${pmix_cv_cc_supports___builtin_prefetch+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+int ptr;
+           __builtin_prefetch(&ptr,0,0);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  pmix_cv_cc_supports___builtin_prefetch="yes"
+else
+  pmix_cv_cc_supports___builtin_prefetch="no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pmix_cv_cc_supports___builtin_prefetch" >&5
+$as_echo "$pmix_cv_cc_supports___builtin_prefetch" >&6; }
+    if test "$pmix_cv_cc_supports___builtin_prefetch" = "yes" ; then
+        have_cc_builtin_prefetch=1
+    else
+        have_cc_builtin_prefetch=0
+    fi
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_C_HAVE_BUILTIN_PREFETCH $have_cc_builtin_prefetch
+_ACEOF
+
+
+    # see if the C compiler supports __builtin_clz
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports __builtin_clz" >&5
+$as_echo_n "checking if $CC supports __builtin_clz... " >&6; }
+if ${pmix_cv_cc_supports___builtin_clz+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+int value = 0xffff; /* we know we have 16 bits set */
+             if ((8*sizeof(int)-16) != __builtin_clz(value)) return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  pmix_cv_cc_supports___builtin_clz="yes"
+else
+  pmix_cv_cc_supports___builtin_clz="no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pmix_cv_cc_supports___builtin_clz" >&5
+$as_echo "$pmix_cv_cc_supports___builtin_clz" >&6; }
+    if test "$pmix_cv_cc_supports___builtin_clz" = "yes" ; then
+        have_cc_builtin_clz=1
+    else
+        have_cc_builtin_clz=0
+    fi
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_C_HAVE_BUILTIN_CLZ $have_cc_builtin_clz
+_ACEOF
+
+
+    # Preload the optflags for the case where the user didn't specify
+    # any.  If we're using GNU compilers, use -O3 (since it GNU
+    # doesn't require all compilation units to be compiled with the
+    # same level of optimization -- selecting a high level of
+    # optimization is not prohibitive).  If we're using anything else,
+    # be conservative and just use -O.
+    #
+    # Note: gcc-impersonating compilers accept -O3
+    if test "$WANT_DEBUG" = "1"; then
+        OPTFLAGS=
+    else
+        if test "$GCC" = yes; then
+            OPTFLAGS="-O3"
+        else
+            OPTFLAGS="-O"
+        fi
+    fi
+
+
+
+# Modularize this setup so that sub-configure.in scripts can use this
+# same setup code.
+
+##################################
+# Optimization flags
+##################################
+
+# If the user did not specify optimization flags, add some (the value
+# from $OPTFLAGS)
+
+co_arg=""$PMIX_CFLAGS_BEFORE_PICKY""
+co_found=0
+for co_word in $co_arg; do
+    # See http://www.gnu.org/software/autoconf/manual/html_node/Quadrigraphs.html#Quadrigraphs
+    # for an explanation of [ and ] -- they m4 expand to [ and ]
+    case $co_word in
+    -g)              co_found=1 ;;
+    -g[1-3])   co_found=1 ;;
+    +K[0-5])   co_found=1 ;;
+    -O)              co_found=1 ;;
+    -O[0-9])   co_found=1 ;;
+    -xO)             co_found=1 ;;
+    -xO[0-9])  co_found=1 ;;
+    -fast)           co_found=1 ;;
+
+    # The below Sun Studio flags require or
+    # trigger -xO optimization
+    -xvector*)     co_found=1 ;;
+    -xdepend=yes)  co_found=1 ;;
+
+    esac
+done
+
+if test "$co_found" = "0"; then
+    co_result="$OPTFLAGS $co_arg"
+else
+    co_result="$co_arg"
+fi
+
+# Clean up
+
+unset co_found co_word co_arg
+
+    PMIX_CFLAGS_BEFORE_PICKY="$co_result"
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C optimization flags" >&5
+$as_echo_n "checking for C optimization flags... " >&6; }
+
+
+# Modularize this setup so that sub-configure.in scripts can use this
+# same setup code.
+
+##################################
+# Optimization flags
+##################################
+
+# If the user did not specify optimization flags, add some (the value
+# from $OPTFLAGS)
+
+co_arg=""$CFLAGS""
+co_found=0
+for co_word in $co_arg; do
+    # See http://www.gnu.org/software/autoconf/manual/html_node/Quadrigraphs.html#Quadrigraphs
+    # for an explanation of [ and ] -- they m4 expand to [ and ]
+    case $co_word in
+    -g)              co_found=1 ;;
+    -g[1-3])   co_found=1 ;;
+    +K[0-5])   co_found=1 ;;
+    -O)              co_found=1 ;;
+    -O[0-9])   co_found=1 ;;
+    -xO)             co_found=1 ;;
+    -xO[0-9])  co_found=1 ;;
+    -fast)           co_found=1 ;;
+
+    # The below Sun Studio flags require or
+    # trigger -xO optimization
+    -xvector*)     co_found=1 ;;
+    -xdepend=yes)  co_found=1 ;;
+
+    esac
+done
+
+if test "$co_found" = "0"; then
+    co_result="$OPTFLAGS $co_arg"
+else
+    co_result="$co_arg"
+fi
+
+# Clean up
+
+unset co_found co_word co_arg
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $co_result" >&5
+$as_echo "$co_result" >&6; }
+    CFLAGS="$co_result"
+
+    ##################################
+    # C compiler characteristics
+    ##################################
+    # Does the compiler support "ident"-like constructs?
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C ident string support" >&5
+$as_echo_n "checking for C ident string support... " >&6; }
+
+    pmix_pragma_ident_happy=0
+    pmix_ident_happy=0
+    pmix_static_const_char_happy=0
+
+    eval pmix_compiler="\$CC"
+    eval pmix_flags="\$CFLAGS"
+
+    pmix_ident="string_not_coincidentally_inserted_by_the_compiler"
+    cat > conftest.c <<EOF
+#pragma ident "$pmix_ident"
+int main(int argc, char** argv);
+int main(int argc, char** argv) { return 0; }
+EOF
+
+    # "strings" won't always return the ident string.  objdump isn't
+    # universal (e.g., OS X doesn't have it), and ...other
+    # complications.  So just try to "grep" for the string in the
+    # resulting object file.  If the ident is found in "strings" or
+    # the grep succeeds, rule that we have this flavor of ident.
+
+    echo "configure:20380: CC" >&5
+    pmix_output=`$pmix_compiler $pmix_flags -c conftest.c -o conftest.${OBJEXT} 2>&1 1>/dev/null`
+    pmix_status=$?
+    if test $pmix_status = 0; then :
+  test -z "$pmix_output"
+           pmix_status=$?
+fi
+
+# 1 is the message
+# 2 is whether to put a prefix or not
+if test -n "1"; then
+    echo "configure:20391: \$? = $pmix_status" >&5
+else
+    echo \$? = $pmix_status >&5
+fi
+    if test $pmix_status = 0 && test -f conftest.${OBJEXT}; then :
+  pmix_output="`strings -a conftest.${OBJEXT} | grep $pmix_ident`"
+           grep $pmix_ident conftest.${OBJEXT} 2>&1 1>/dev/null
+           pmix_status=$?
+           if test "$pmix_output" != "" || test "$pmix_status" = "0"; then :
+  pmix_pragma_ident_happy=1
+         pmix_message="#pragma ident"
+else
+
+    eval pmix_compiler="\$CC"
+    eval pmix_flags="\$CFLAGS"
+
+    pmix_ident="string_not_coincidentally_inserted_by_the_compiler"
+    cat > conftest.c <<EOF
+#ident "$pmix_ident"
+int main(int argc, char** argv);
+int main(int argc, char** argv) { return 0; }
+EOF
+
+    # "strings" won't always return the ident string.  objdump isn't
+    # universal (e.g., OS X doesn't have it), and ...other
+    # complications.  So just try to "grep" for the string in the
+    # resulting object file.  If the ident is found in "strings" or
+    # the grep succeeds, rule that we have this flavor of ident.
+
+    echo "configure:20420: CC" >&5
+    pmix_output=`$pmix_compiler $pmix_flags -c conftest.c -o conftest.${OBJEXT} 2>&1 1>/dev/null`
+    pmix_status=$?
+    if test $pmix_status = 0; then :
+  test -z "$pmix_output"
+           pmix_status=$?
+fi
+
+# 1 is the message
+# 2 is whether to put a prefix or not
+if test -n "1"; then
+    echo "configure:20431: \$? = $pmix_status" >&5
+else
+    echo \$? = $pmix_status >&5
+fi
+    if test $pmix_status = 0 && test -f conftest.${OBJEXT}; then :
+  pmix_output="`strings -a conftest.${OBJEXT} | grep $pmix_ident`"
+           grep $pmix_ident conftest.${OBJEXT} 2>&1 1>/dev/null
+           pmix_status=$?
+           if test "$pmix_output" != "" || test "$pmix_status" = "0"; then :
+  pmix_ident_happy=1
+             pmix_message="#ident"
+else
+
+    eval pmix_compiler="\$CC"
+    eval pmix_flags="\$CFLAGS"
+
+    pmix_ident="string_not_coincidentally_inserted_by_the_compiler"
+    cat > conftest.c <<EOF
+#pragma comment(exestr,  "$pmix_ident" )
+int main(int argc, char** argv);
+int main(int argc, char** argv) { return 0; }
+EOF
+
+    # "strings" won't always return the ident string.  objdump isn't
+    # universal (e.g., OS X doesn't have it), and ...other
+    # complications.  So just try to "grep" for the string in the
+    # resulting object file.  If the ident is found in "strings" or
+    # the grep succeeds, rule that we have this flavor of ident.
+
+    echo "configure:20460: CC" >&5
+    pmix_output=`$pmix_compiler $pmix_flags -c conftest.c -o conftest.${OBJEXT} 2>&1 1>/dev/null`
+    pmix_status=$?
+    if test $pmix_status = 0; then :
+  test -z "$pmix_output"
+           pmix_status=$?
+fi
+
+# 1 is the message
+# 2 is whether to put a prefix or not
+if test -n "1"; then
+    echo "configure:20471: \$? = $pmix_status" >&5
+else
+    echo \$? = $pmix_status >&5
+fi
+    if test $pmix_status = 0 && test -f conftest.${OBJEXT}; then :
+  pmix_output="`strings -a conftest.${OBJEXT} | grep $pmix_ident`"
+           grep $pmix_ident conftest.${OBJEXT} 2>&1 1>/dev/null
+           pmix_status=$?
+           if test "$pmix_output" != "" || test "$pmix_status" = "0"; then :
+  pmix_pragma_comment_happy=1
+                 pmix_message="#pragma comment"
+else
+  pmix_static_const_char_happy=1
+                 pmix_message="static const char"
+fi
+else
+
+# 1 is the message
+# 2 is whether to put a prefix or not
+if test -n ""; then
+    echo "configure:20491: the failed program was:" >&5
+else
+    echo the failed program was: >&5
+fi
+
+# 1 is the filename
+if test -n "conftest.c" && test -f "conftest.c"; then
+    cat conftest.c >&5
+fi
+           pmix_static_const_char_happy=1
+                 pmix_message="static const char"
+fi
+
+    unset pmix_compiler pmix_flags pmix_output pmix_status
+    rm -rf conftest.* conftest${EXEEXT}
+
+fi
+else
+
+# 1 is the message
+# 2 is whether to put a prefix or not
+if test -n ""; then
+    echo "configure:20513: the failed program was:" >&5
+else
+    echo the failed program was: >&5
+fi
+
+# 1 is the filename
+if test -n "conftest.c" && test -f "conftest.c"; then
+    cat conftest.c >&5
+fi
+
+    eval pmix_compiler="\$CC"
+    eval pmix_flags="\$CFLAGS"
+
+    pmix_ident="string_not_coincidentally_inserted_by_the_compiler"
+    cat > conftest.c <<EOF
+#pragma comment(exestr,  "$pmix_ident" )
+int main(int argc, char** argv);
+int main(int argc, char** argv) { return 0; }
+EOF
+
+    # "strings" won't always return the ident string.  objdump isn't
+    # universal (e.g., OS X doesn't have it), and ...other
+    # complications.  So just try to "grep" for the string in the
+    # resulting object file.  If the ident is found in "strings" or
+    # the grep succeeds, rule that we have this flavor of ident.
+
+    echo "configure:20539: CC" >&5
+    pmix_output=`$pmix_compiler $pmix_flags -c conftest.c -o conftest.${OBJEXT} 2>&1 1>/dev/null`
+    pmix_status=$?
+    if test $pmix_status = 0; then :
+  test -z "$pmix_output"
+           pmix_status=$?
+fi
+
+# 1 is the message
+# 2 is whether to put a prefix or not
+if test -n "1"; then
+    echo "configure:20550: \$? = $pmix_status" >&5
+else
+    echo \$? = $pmix_status >&5
+fi
+    if test $pmix_status = 0 && test -f conftest.${OBJEXT}; then :
+  pmix_output="`strings -a conftest.${OBJEXT} | grep $pmix_ident`"
+           grep $pmix_ident conftest.${OBJEXT} 2>&1 1>/dev/null
+           pmix_status=$?
+           if test "$pmix_output" != "" || test "$pmix_status" = "0"; then :
+  pmix_pragma_comment_happy=1
+                 pmix_message="#pragma comment"
+else
+  pmix_static_const_char_happy=1
+                 pmix_message="static const char"
+fi
+else
+
+# 1 is the message
+# 2 is whether to put a prefix or not
+if test -n ""; then
+    echo "configure:20570: the failed program was:" >&5
+else
+    echo the failed program was: >&5
+fi
+
+# 1 is the filename
+if test -n "conftest.c" && test -f "conftest.c"; then
+    cat conftest.c >&5
+fi
+           pmix_static_const_char_happy=1
+                 pmix_message="static const char"
+fi
+
+    unset pmix_compiler pmix_flags pmix_output pmix_status
+    rm -rf conftest.* conftest${EXEEXT}
+
+fi
+
+    unset pmix_compiler pmix_flags pmix_output pmix_status
+    rm -rf conftest.* conftest${EXEEXT}
+
+fi
+else
+
+# 1 is the message
+# 2 is whether to put a prefix or not
+if test -n ""; then
+    echo "configure:20597: the failed program was:" >&5
+else
+    echo the failed program was: >&5
+fi
+
+# 1 is the filename
+if test -n "conftest.c" && test -f "conftest.c"; then
+    cat conftest.c >&5
+fi
+
+    eval pmix_compiler="\$CC"
+    eval pmix_flags="\$CFLAGS"
+
+    pmix_ident="string_not_coincidentally_inserted_by_the_compiler"
+    cat > conftest.c <<EOF
+#ident "$pmix_ident"
+int main(int argc, char** argv);
+int main(int argc, char** argv) { return 0; }
+EOF
+
+    # "strings" won't always return the ident string.  objdump isn't
+    # universal (e.g., OS X doesn't have it), and ...other
+    # complications.  So just try to "grep" for the string in the
+    # resulting object file.  If the ident is found in "strings" or
+    # the grep succeeds, rule that we have this flavor of ident.
+
+    echo "configure:20623: CC" >&5
+    pmix_output=`$pmix_compiler $pmix_flags -c conftest.c -o conftest.${OBJEXT} 2>&1 1>/dev/null`
+    pmix_status=$?
+    if test $pmix_status = 0; then :
+  test -z "$pmix_output"
+           pmix_status=$?
+fi
+
+# 1 is the message
+# 2 is whether to put a prefix or not
+if test -n "1"; then
+    echo "configure:20634: \$? = $pmix_status" >&5
+else
+    echo \$? = $pmix_status >&5
+fi
+    if test $pmix_status = 0 && test -f conftest.${OBJEXT}; then :
+  pmix_output="`strings -a conftest.${OBJEXT} | grep $pmix_ident`"
+           grep $pmix_ident conftest.${OBJEXT} 2>&1 1>/dev/null
+           pmix_status=$?
+           if test "$pmix_output" != "" || test "$pmix_status" = "0"; then :
+  pmix_ident_happy=1
+             pmix_message="#ident"
+else
+
+    eval pmix_compiler="\$CC"
+    eval pmix_flags="\$CFLAGS"
+
+    pmix_ident="string_not_coincidentally_inserted_by_the_compiler"
+    cat > conftest.c <<EOF
+#pragma comment(exestr,  "$pmix_ident" )
+int main(int argc, char** argv);
+int main(int argc, char** argv) { return 0; }
+EOF
+
+    # "strings" won't always return the ident string.  objdump isn't
+    # universal (e.g., OS X doesn't have it), and ...other
+    # complications.  So just try to "grep" for the string in the
+    # resulting object file.  If the ident is found in "strings" or
+    # the grep succeeds, rule that we have this flavor of ident.
+
+    echo "configure:20663: CC" >&5
+    pmix_output=`$pmix_compiler $pmix_flags -c conftest.c -o conftest.${OBJEXT} 2>&1 1>/dev/null`
+    pmix_status=$?
+    if test $pmix_status = 0; then :
+  test -z "$pmix_output"
+           pmix_status=$?
+fi
+
+# 1 is the message
+# 2 is whether to put a prefix or not
+if test -n "1"; then
+    echo "configure:20674: \$? = $pmix_status" >&5
+else
+    echo \$? = $pmix_status >&5
+fi
+    if test $pmix_status = 0 && test -f conftest.${OBJEXT}; then :
+  pmix_output="`strings -a conftest.${OBJEXT} | grep $pmix_ident`"
+           grep $pmix_ident conftest.${OBJEXT} 2>&1 1>/dev/null
+           pmix_status=$?
+           if test "$pmix_output" != "" || test "$pmix_status" = "0"; then :
+  pmix_pragma_comment_happy=1
+                 pmix_message="#pragma comment"
+else
+  pmix_static_const_char_happy=1
+                 pmix_message="static const char"
+fi
+else
+
+# 1 is the message
+# 2 is whether to put a prefix or not
+if test -n ""; then
+    echo "configure:20694: the failed program was:" >&5
+else
+    echo the failed program was: >&5
+fi
+
+# 1 is the filename
+if test -n "conftest.c" && test -f "conftest.c"; then
+    cat conftest.c >&5
+fi
+           pmix_static_const_char_happy=1
+                 pmix_message="static const char"
+fi
+
+    unset pmix_compiler pmix_flags pmix_output pmix_status
+    rm -rf conftest.* conftest${EXEEXT}
+
+fi
+else
+
+# 1 is the message
+# 2 is whether to put a prefix or not
+if test -n ""; then
+    echo "configure:20716: the failed program was:" >&5
+else
+    echo the failed program was: >&5
+fi
+
+# 1 is the filename
+if test -n "conftest.c" && test -f "conftest.c"; then
+    cat conftest.c >&5
+fi
+
+    eval pmix_compiler="\$CC"
+    eval pmix_flags="\$CFLAGS"
+
+    pmix_ident="string_not_coincidentally_inserted_by_the_compiler"
+    cat > conftest.c <<EOF
+#pragma comment(exestr,  "$pmix_ident" )
+int main(int argc, char** argv);
+int main(int argc, char** argv) { return 0; }
+EOF
+
+    # "strings" won't always return the ident string.  objdump isn't
+    # universal (e.g., OS X doesn't have it), and ...other
+    # complications.  So just try to "grep" for the string in the
+    # resulting object file.  If the ident is found in "strings" or
+    # the grep succeeds, rule that we have this flavor of ident.
+
+    echo "configure:20742: CC" >&5
+    pmix_output=`$pmix_compiler $pmix_flags -c conftest.c -o conftest.${OBJEXT} 2>&1 1>/dev/null`
+    pmix_status=$?
+    if test $pmix_status = 0; then :
+  test -z "$pmix_output"
+           pmix_status=$?
+fi
+
+# 1 is the message
+# 2 is whether to put a prefix or not
+if test -n "1"; then
+    echo "configure:20753: \$? = $pmix_status" >&5
+else
+    echo \$? = $pmix_status >&5
+fi
+    if test $pmix_status = 0 && test -f conftest.${OBJEXT}; then :
+  pmix_output="`strings -a conftest.${OBJEXT} | grep $pmix_ident`"
+           grep $pmix_ident conftest.${OBJEXT} 2>&1 1>/dev/null
+           pmix_status=$?
+           if test "$pmix_output" != "" || test "$pmix_status" = "0"; then :
+  pmix_pragma_comment_happy=1
+                 pmix_message="#pragma comment"
+else
+  pmix_static_const_char_happy=1
+                 pmix_message="static const char"
+fi
+else
+
+# 1 is the message
+# 2 is whether to put a prefix or not
+if test -n ""; then
+    echo "configure:20773: the failed program was:" >&5
+else
+    echo the failed program was: >&5
+fi
+
+# 1 is the filename
+if test -n "conftest.c" && test -f "conftest.c"; then
+    cat conftest.c >&5
+fi
+           pmix_static_const_char_happy=1
+                 pmix_message="static const char"
+fi
+
+    unset pmix_compiler pmix_flags pmix_output pmix_status
+    rm -rf conftest.* conftest${EXEEXT}
+
+fi
+
+    unset pmix_compiler pmix_flags pmix_output pmix_status
+    rm -rf conftest.* conftest${EXEEXT}
+
+fi
+
+    unset pmix_compiler pmix_flags pmix_output pmix_status
+    rm -rf conftest.* conftest${EXEEXT}
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_CC_USE_PRAGMA_IDENT $pmix_pragma_ident_happy
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_CC_USE_IDENT $pmix_ident_happy
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_CC_USE_PRAGMA_COMMENT $pmix_pragma_comment_happy
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_CC_USE_CONST_CHAR_IDENT $pmix_static_const_char_happy
+_ACEOF
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pmix_message" >&5
+$as_echo "$pmix_message" >&6; }
+
+    unset pmix_pragma_ident_happy pmix_ident_happy pmix_static_const_char_happy pmix_message
+
+
+
+
+    #
+    # Check for some types
+    #
+
+    ac_fn_c_check_type "$LINENO" "int8_t" "ac_cv_type_int8_t" "$ac_includes_default"
+if test "x$ac_cv_type_int8_t" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_INT8_T 1
+_ACEOF
+
+
+fi
+
+    ac_fn_c_check_type "$LINENO" "uint8_t" "ac_cv_type_uint8_t" "$ac_includes_default"
+if test "x$ac_cv_type_uint8_t" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_UINT8_T 1
+_ACEOF
+
+
+fi
+
+    ac_fn_c_check_type "$LINENO" "int16_t" "ac_cv_type_int16_t" "$ac_includes_default"
+if test "x$ac_cv_type_int16_t" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_INT16_T 1
+_ACEOF
+
+
+fi
+
+    ac_fn_c_check_type "$LINENO" "uint16_t" "ac_cv_type_uint16_t" "$ac_includes_default"
+if test "x$ac_cv_type_uint16_t" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_UINT16_T 1
+_ACEOF
+
+
+fi
+
+    ac_fn_c_check_type "$LINENO" "int32_t" "ac_cv_type_int32_t" "$ac_includes_default"
+if test "x$ac_cv_type_int32_t" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_INT32_T 1
+_ACEOF
+
+
+fi
+
+    ac_fn_c_check_type "$LINENO" "uint32_t" "ac_cv_type_uint32_t" "$ac_includes_default"
+if test "x$ac_cv_type_uint32_t" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_UINT32_T 1
+_ACEOF
+
+
+fi
+
+    ac_fn_c_check_type "$LINENO" "int64_t" "ac_cv_type_int64_t" "$ac_includes_default"
+if test "x$ac_cv_type_int64_t" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_INT64_T 1
+_ACEOF
+
+
+fi
+
+    ac_fn_c_check_type "$LINENO" "uint64_t" "ac_cv_type_uint64_t" "$ac_includes_default"
+if test "x$ac_cv_type_uint64_t" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_UINT64_T 1
+_ACEOF
+
+
+fi
+
+    ac_fn_c_check_type "$LINENO" "__int128" "ac_cv_type___int128" "$ac_includes_default"
+if test "x$ac_cv_type___int128" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE___INT128 1
+_ACEOF
+
+
+fi
+
+    ac_fn_c_check_type "$LINENO" "uint128_t" "ac_cv_type_uint128_t" "$ac_includes_default"
+if test "x$ac_cv_type_uint128_t" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_UINT128_T 1
+_ACEOF
+
+
+fi
+
+    ac_fn_c_check_type "$LINENO" "long long" "ac_cv_type_long_long" "$ac_includes_default"
+if test "x$ac_cv_type_long_long" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_LONG_LONG 1
+_ACEOF
+
+
+fi
+
+
+    ac_fn_c_check_type "$LINENO" "intptr_t" "ac_cv_type_intptr_t" "$ac_includes_default"
+if test "x$ac_cv_type_intptr_t" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_INTPTR_T 1
+_ACEOF
+
+
+fi
+
+    ac_fn_c_check_type "$LINENO" "uintptr_t" "ac_cv_type_uintptr_t" "$ac_includes_default"
+if test "x$ac_cv_type_uintptr_t" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_UINTPTR_T 1
+_ACEOF
+
+
+fi
+
+    ac_fn_c_check_type "$LINENO" "ptrdiff_t" "ac_cv_type_ptrdiff_t" "$ac_includes_default"
+if test "x$ac_cv_type_ptrdiff_t" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_PTRDIFF_T 1
+_ACEOF
+
+
+fi
+
+
+    #
+    # Check for type sizes
+    #
+
+    # The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of _Bool" >&5
+$as_echo_n "checking size of _Bool... " >&6; }
+if ${ac_cv_sizeof__Bool+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (_Bool))" "ac_cv_sizeof__Bool"        "$ac_includes_default"; then :
+
+else
+  if test "$ac_cv_type__Bool" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "cannot compute sizeof (_Bool)
+See \`config.log' for more details" "$LINENO" 5; }
+   else
+     ac_cv_sizeof__Bool=0
+   fi
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof__Bool" >&5
+$as_echo "$ac_cv_sizeof__Bool" >&6; }
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF__BOOL $ac_cv_sizeof__Bool
+_ACEOF
+
+
+    # The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of char" >&5
+$as_echo_n "checking size of char... " >&6; }
+if ${ac_cv_sizeof_char+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (char))" "ac_cv_sizeof_char"        "$ac_includes_default"; then :
+
+else
+  if test "$ac_cv_type_char" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "cannot compute sizeof (char)
+See \`config.log' for more details" "$LINENO" 5; }
+   else
+     ac_cv_sizeof_char=0
+   fi
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_char" >&5
+$as_echo "$ac_cv_sizeof_char" >&6; }
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_CHAR $ac_cv_sizeof_char
+_ACEOF
+
+
+    # The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of short" >&5
+$as_echo_n "checking size of short... " >&6; }
+if ${ac_cv_sizeof_short+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (short))" "ac_cv_sizeof_short"        "$ac_includes_default"; then :
+
+else
+  if test "$ac_cv_type_short" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "cannot compute sizeof (short)
+See \`config.log' for more details" "$LINENO" 5; }
+   else
+     ac_cv_sizeof_short=0
+   fi
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_short" >&5
+$as_echo "$ac_cv_sizeof_short" >&6; }
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_SHORT $ac_cv_sizeof_short
+_ACEOF
+
+
+    # The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5
+$as_echo_n "checking size of int... " >&6; }
+if ${ac_cv_sizeof_int+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int"        "$ac_includes_default"; then :
+
+else
+  if test "$ac_cv_type_int" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "cannot compute sizeof (int)
+See \`config.log' for more details" "$LINENO" 5; }
+   else
+     ac_cv_sizeof_int=0
+   fi
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5
+$as_echo "$ac_cv_sizeof_int" >&6; }
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_INT $ac_cv_sizeof_int
+_ACEOF
+
+
+    # The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
+$as_echo_n "checking size of long... " >&6; }
+if ${ac_cv_sizeof_long+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"; then :
+
+else
+  if test "$ac_cv_type_long" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "cannot compute sizeof (long)
+See \`config.log' for more details" "$LINENO" 5; }
+   else
+     ac_cv_sizeof_long=0
+   fi
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
+$as_echo "$ac_cv_sizeof_long" >&6; }
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_LONG $ac_cv_sizeof_long
+_ACEOF
+
+
+    if test "$ac_cv_type_long_long" = yes; then
+        # The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5
+$as_echo_n "checking size of long long... " >&6; }
+if ${ac_cv_sizeof_long_long+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long"        "$ac_includes_default"; then :
+
+else
+  if test "$ac_cv_type_long_long" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "cannot compute sizeof (long long)
+See \`config.log' for more details" "$LINENO" 5; }
+   else
+     ac_cv_sizeof_long_long=0
+   fi
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_long" >&5
+$as_echo "$ac_cv_sizeof_long_long" >&6; }
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
+_ACEOF
+
+
+    fi
+    # The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of float" >&5
+$as_echo_n "checking size of float... " >&6; }
+if ${ac_cv_sizeof_float+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (float))" "ac_cv_sizeof_float"        "$ac_includes_default"; then :
+
+else
+  if test "$ac_cv_type_float" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "cannot compute sizeof (float)
+See \`config.log' for more details" "$LINENO" 5; }
+   else
+     ac_cv_sizeof_float=0
+   fi
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_float" >&5
+$as_echo "$ac_cv_sizeof_float" >&6; }
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_FLOAT $ac_cv_sizeof_float
+_ACEOF
+
+
+    # The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of double" >&5
+$as_echo_n "checking size of double... " >&6; }
+if ${ac_cv_sizeof_double+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (double))" "ac_cv_sizeof_double"        "$ac_includes_default"; then :
+
+else
+  if test "$ac_cv_type_double" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "cannot compute sizeof (double)
+See \`config.log' for more details" "$LINENO" 5; }
+   else
+     ac_cv_sizeof_double=0
+   fi
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_double" >&5
+$as_echo "$ac_cv_sizeof_double" >&6; }
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_DOUBLE $ac_cv_sizeof_double
+_ACEOF
+
+
+
+    # The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of void *" >&5
+$as_echo_n "checking size of void *... " >&6; }
+if ${ac_cv_sizeof_void_p+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void *))" "ac_cv_sizeof_void_p"        "$ac_includes_default"; then :
+
+else
+  if test "$ac_cv_type_void_p" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "cannot compute sizeof (void *)
+See \`config.log' for more details" "$LINENO" 5; }
+   else
+     ac_cv_sizeof_void_p=0
+   fi
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_void_p" >&5
+$as_echo "$ac_cv_sizeof_void_p" >&6; }
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_VOID_P $ac_cv_sizeof_void_p
+_ACEOF
+
+
+    # The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of size_t" >&5
+$as_echo_n "checking size of size_t... " >&6; }
+if ${ac_cv_sizeof_size_t+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (size_t))" "ac_cv_sizeof_size_t"        "$ac_includes_default"; then :
+
+else
+  if test "$ac_cv_type_size_t" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "cannot compute sizeof (size_t)
+See \`config.log' for more details" "$LINENO" 5; }
+   else
+     ac_cv_sizeof_size_t=0
+   fi
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_size_t" >&5
+$as_echo "$ac_cv_sizeof_size_t" >&6; }
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t
+_ACEOF
+
+
+    if test "$ac_cv_type_ssize_t" = yes ; then
+        # The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of ssize_t" >&5
+$as_echo_n "checking size of ssize_t... " >&6; }
+if ${ac_cv_sizeof_ssize_t+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (ssize_t))" "ac_cv_sizeof_ssize_t"        "$ac_includes_default"; then :
+
+else
+  if test "$ac_cv_type_ssize_t" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "cannot compute sizeof (ssize_t)
+See \`config.log' for more details" "$LINENO" 5; }
+   else
+     ac_cv_sizeof_ssize_t=0
+   fi
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_ssize_t" >&5
+$as_echo "$ac_cv_sizeof_ssize_t" >&6; }
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_SSIZE_T $ac_cv_sizeof_ssize_t
+_ACEOF
+
+
+    fi
+    if test "$ac_cv_type_ptrdiff_t" = yes; then
+        # The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of ptrdiff_t" >&5
+$as_echo_n "checking size of ptrdiff_t... " >&6; }
+if ${ac_cv_sizeof_ptrdiff_t+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (ptrdiff_t))" "ac_cv_sizeof_ptrdiff_t"        "$ac_includes_default"; then :
+
+else
+  if test "$ac_cv_type_ptrdiff_t" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "cannot compute sizeof (ptrdiff_t)
+See \`config.log' for more details" "$LINENO" 5; }
+   else
+     ac_cv_sizeof_ptrdiff_t=0
+   fi
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_ptrdiff_t" >&5
+$as_echo "$ac_cv_sizeof_ptrdiff_t" >&6; }
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_PTRDIFF_T $ac_cv_sizeof_ptrdiff_t
+_ACEOF
+
+
+    fi
+    # The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of wchar_t" >&5
+$as_echo_n "checking size of wchar_t... " >&6; }
+if ${ac_cv_sizeof_wchar_t+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (wchar_t))" "ac_cv_sizeof_wchar_t"        "$ac_includes_default"; then :
+
+else
+  if test "$ac_cv_type_wchar_t" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "cannot compute sizeof (wchar_t)
+See \`config.log' for more details" "$LINENO" 5; }
+   else
+     ac_cv_sizeof_wchar_t=0
+   fi
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_wchar_t" >&5
+$as_echo "$ac_cv_sizeof_wchar_t" >&6; }
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_WCHAR_T $ac_cv_sizeof_wchar_t
+_ACEOF
+
+
+
+    # The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of pid_t" >&5
+$as_echo_n "checking size of pid_t... " >&6; }
+if ${ac_cv_sizeof_pid_t+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (pid_t))" "ac_cv_sizeof_pid_t"        "$ac_includes_default"; then :
+
+else
+  if test "$ac_cv_type_pid_t" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "cannot compute sizeof (pid_t)
+See \`config.log' for more details" "$LINENO" 5; }
+   else
+     ac_cv_sizeof_pid_t=0
+   fi
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_pid_t" >&5
+$as_echo "$ac_cv_sizeof_pid_t" >&6; }
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_PID_T $ac_cv_sizeof_pid_t
+_ACEOF
+
+
+
+    #
+    # Check for type alignments
+    #
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking alignment of bool" >&5
+$as_echo_n "checking alignment of bool... " >&6; }
+if ${pmix_cv_c_align_bool+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then :
+   # cross compile - do a non-executable test.  Trick
+                                 # taken from the Autoconf 2.59c.  Switch to using
+                                 # AC_CHECK_ALIGNOF when we can require Autoconf 2.60.
+                                 if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (pmix__type_alignof_, y)" "pmix_cv_c_align_bool"        "$ac_includes_default
+#include <stdbool.h>
+
+#ifndef offsetof
+# define offsetof(type, member) ((char *) &((type *) 0)->member - (char *) 0)
+#endif
+typedef struct { char x; bool y; } pmix__type_alignof_;
+"; then :
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Problem running configure test!" >&5
+$as_echo "$as_me: WARNING: *** Problem running configure test!" >&2;}
+                                                  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** See config.log for details." >&5
+$as_echo "$as_me: WARNING: *** See config.log for details." >&2;}
+                                                  as_fn_error $? "*** Cannot continue." "$LINENO" 5
+fi
+
+
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_includes_default
+                                                    #include <stdbool.h>
+int
+main ()
+{
+
+    struct foo { char c; bool x; };
+    struct foo *p = (struct foo *) malloc(sizeof(struct foo));
+    int diff;
+    FILE *f=fopen("conftestval", "w");
+    if (!f) exit(1);
+    diff = ((char *)&p->x) - ((char *)&p->c);
+    fprintf(f, "%d\n", (diff >= 0) ? diff : -diff);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  pmix_cv_c_align_bool=`cat conftestval`
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Problem running configure test!" >&5
+$as_echo "$as_me: WARNING: *** Problem running configure test!" >&2;}
+                                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** See config.log for details." >&5
+$as_echo "$as_me: WARNING: *** See config.log for details." >&2;}
+                                as_fn_error $? "*** Cannot continue." "$LINENO" 5
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pmix_cv_c_align_bool" >&5
+$as_echo "$pmix_cv_c_align_bool" >&6; }
+
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_ALIGNMENT_BOOL $pmix_cv_c_align_bool
+_ACEOF
+
+eval "PMIX_ALIGNMENT_BOOL=$pmix_cv_c_align_bool"
+
+rm -rf conftest*
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking alignment of int8_t" >&5
+$as_echo_n "checking alignment of int8_t... " >&6; }
+if ${pmix_cv_c_align_int8_t+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then :
+   # cross compile - do a non-executable test.  Trick
+                                 # taken from the Autoconf 2.59c.  Switch to using
+                                 # AC_CHECK_ALIGNOF when we can require Autoconf 2.60.
+                                 if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (pmix__type_alignof_, y)" "pmix_cv_c_align_int8_t"        "$ac_includes_default
+#include <stdbool.h>
+
+#ifndef offsetof
+# define offsetof(type, member) ((char *) &((type *) 0)->member - (char *) 0)
+#endif
+typedef struct { char x; int8_t y; } pmix__type_alignof_;
+"; then :
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Problem running configure test!" >&5
+$as_echo "$as_me: WARNING: *** Problem running configure test!" >&2;}
+                                                  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** See config.log for details." >&5
+$as_echo "$as_me: WARNING: *** See config.log for details." >&2;}
+                                                  as_fn_error $? "*** Cannot continue." "$LINENO" 5
+fi
+
+
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_includes_default
+                                                    #include <stdbool.h>
+int
+main ()
+{
+
+    struct foo { char c; int8_t x; };
+    struct foo *p = (struct foo *) malloc(sizeof(struct foo));
+    int diff;
+    FILE *f=fopen("conftestval", "w");
+    if (!f) exit(1);
+    diff = ((char *)&p->x) - ((char *)&p->c);
+    fprintf(f, "%d\n", (diff >= 0) ? diff : -diff);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  pmix_cv_c_align_int8_t=`cat conftestval`
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Problem running configure test!" >&5
+$as_echo "$as_me: WARNING: *** Problem running configure test!" >&2;}
+                                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** See config.log for details." >&5
+$as_echo "$as_me: WARNING: *** See config.log for details." >&2;}
+                                as_fn_error $? "*** Cannot continue." "$LINENO" 5
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pmix_cv_c_align_int8_t" >&5
+$as_echo "$pmix_cv_c_align_int8_t" >&6; }
+
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_ALIGNMENT_INT8 $pmix_cv_c_align_int8_t
+_ACEOF
+
+eval "PMIX_ALIGNMENT_INT8=$pmix_cv_c_align_int8_t"
+
+rm -rf conftest*
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking alignment of int16_t" >&5
+$as_echo_n "checking alignment of int16_t... " >&6; }
+if ${pmix_cv_c_align_int16_t+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then :
+   # cross compile - do a non-executable test.  Trick
+                                 # taken from the Autoconf 2.59c.  Switch to using
+                                 # AC_CHECK_ALIGNOF when we can require Autoconf 2.60.
+                                 if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (pmix__type_alignof_, y)" "pmix_cv_c_align_int16_t"        "$ac_includes_default
+#include <stdbool.h>
+
+#ifndef offsetof
+# define offsetof(type, member) ((char *) &((type *) 0)->member - (char *) 0)
+#endif
+typedef struct { char x; int16_t y; } pmix__type_alignof_;
+"; then :
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Problem running configure test!" >&5
+$as_echo "$as_me: WARNING: *** Problem running configure test!" >&2;}
+                                                  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** See config.log for details." >&5
+$as_echo "$as_me: WARNING: *** See config.log for details." >&2;}
+                                                  as_fn_error $? "*** Cannot continue." "$LINENO" 5
+fi
+
+
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_includes_default
+                                                    #include <stdbool.h>
+int
+main ()
+{
+
+    struct foo { char c; int16_t x; };
+    struct foo *p = (struct foo *) malloc(sizeof(struct foo));
+    int diff;
+    FILE *f=fopen("conftestval", "w");
+    if (!f) exit(1);
+    diff = ((char *)&p->x) - ((char *)&p->c);
+    fprintf(f, "%d\n", (diff >= 0) ? diff : -diff);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  pmix_cv_c_align_int16_t=`cat conftestval`
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Problem running configure test!" >&5
+$as_echo "$as_me: WARNING: *** Problem running configure test!" >&2;}
+                                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** See config.log for details." >&5
+$as_echo "$as_me: WARNING: *** See config.log for details." >&2;}
+                                as_fn_error $? "*** Cannot continue." "$LINENO" 5
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pmix_cv_c_align_int16_t" >&5
+$as_echo "$pmix_cv_c_align_int16_t" >&6; }
+
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_ALIGNMENT_INT16 $pmix_cv_c_align_int16_t
+_ACEOF
+
+eval "PMIX_ALIGNMENT_INT16=$pmix_cv_c_align_int16_t"
+
+rm -rf conftest*
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking alignment of int32_t" >&5
+$as_echo_n "checking alignment of int32_t... " >&6; }
+if ${pmix_cv_c_align_int32_t+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then :
+   # cross compile - do a non-executable test.  Trick
+                                 # taken from the Autoconf 2.59c.  Switch to using
+                                 # AC_CHECK_ALIGNOF when we can require Autoconf 2.60.
+                                 if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (pmix__type_alignof_, y)" "pmix_cv_c_align_int32_t"        "$ac_includes_default
+#include <stdbool.h>
+
+#ifndef offsetof
+# define offsetof(type, member) ((char *) &((type *) 0)->member - (char *) 0)
+#endif
+typedef struct { char x; int32_t y; } pmix__type_alignof_;
+"; then :
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Problem running configure test!" >&5
+$as_echo "$as_me: WARNING: *** Problem running configure test!" >&2;}
+                                                  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** See config.log for details." >&5
+$as_echo "$as_me: WARNING: *** See config.log for details." >&2;}
+                                                  as_fn_error $? "*** Cannot continue." "$LINENO" 5
+fi
+
+
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_includes_default
+                                                    #include <stdbool.h>
+int
+main ()
+{
+
+    struct foo { char c; int32_t x; };
+    struct foo *p = (struct foo *) malloc(sizeof(struct foo));
+    int diff;
+    FILE *f=fopen("conftestval", "w");
+    if (!f) exit(1);
+    diff = ((char *)&p->x) - ((char *)&p->c);
+    fprintf(f, "%d\n", (diff >= 0) ? diff : -diff);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  pmix_cv_c_align_int32_t=`cat conftestval`
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Problem running configure test!" >&5
+$as_echo "$as_me: WARNING: *** Problem running configure test!" >&2;}
+                                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** See config.log for details." >&5
+$as_echo "$as_me: WARNING: *** See config.log for details." >&2;}
+                                as_fn_error $? "*** Cannot continue." "$LINENO" 5
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pmix_cv_c_align_int32_t" >&5
+$as_echo "$pmix_cv_c_align_int32_t" >&6; }
+
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_ALIGNMENT_INT32 $pmix_cv_c_align_int32_t
+_ACEOF
+
+eval "PMIX_ALIGNMENT_INT32=$pmix_cv_c_align_int32_t"
+
+rm -rf conftest*
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking alignment of int64_t" >&5
+$as_echo_n "checking alignment of int64_t... " >&6; }
+if ${pmix_cv_c_align_int64_t+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then :
+   # cross compile - do a non-executable test.  Trick
+                                 # taken from the Autoconf 2.59c.  Switch to using
+                                 # AC_CHECK_ALIGNOF when we can require Autoconf 2.60.
+                                 if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (pmix__type_alignof_, y)" "pmix_cv_c_align_int64_t"        "$ac_includes_default
+#include <stdbool.h>
+
+#ifndef offsetof
+# define offsetof(type, member) ((char *) &((type *) 0)->member - (char *) 0)
+#endif
+typedef struct { char x; int64_t y; } pmix__type_alignof_;
+"; then :
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Problem running configure test!" >&5
+$as_echo "$as_me: WARNING: *** Problem running configure test!" >&2;}
+                                                  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** See config.log for details." >&5
+$as_echo "$as_me: WARNING: *** See config.log for details." >&2;}
+                                                  as_fn_error $? "*** Cannot continue." "$LINENO" 5
+fi
+
+
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_includes_default
+                                                    #include <stdbool.h>
+int
+main ()
+{
+
+    struct foo { char c; int64_t x; };
+    struct foo *p = (struct foo *) malloc(sizeof(struct foo));
+    int diff;
+    FILE *f=fopen("conftestval", "w");
+    if (!f) exit(1);
+    diff = ((char *)&p->x) - ((char *)&p->c);
+    fprintf(f, "%d\n", (diff >= 0) ? diff : -diff);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  pmix_cv_c_align_int64_t=`cat conftestval`
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Problem running configure test!" >&5
+$as_echo "$as_me: WARNING: *** Problem running configure test!" >&2;}
+                                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** See config.log for details." >&5
+$as_echo "$as_me: WARNING: *** See config.log for details." >&2;}
+                                as_fn_error $? "*** Cannot continue." "$LINENO" 5
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pmix_cv_c_align_int64_t" >&5
+$as_echo "$pmix_cv_c_align_int64_t" >&6; }
+
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_ALIGNMENT_INT64 $pmix_cv_c_align_int64_t
+_ACEOF
+
+eval "PMIX_ALIGNMENT_INT64=$pmix_cv_c_align_int64_t"
+
+rm -rf conftest*
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking alignment of char" >&5
+$as_echo_n "checking alignment of char... " >&6; }
+if ${pmix_cv_c_align_char+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then :
+   # cross compile - do a non-executable test.  Trick
+                                 # taken from the Autoconf 2.59c.  Switch to using
+                                 # AC_CHECK_ALIGNOF when we can require Autoconf 2.60.
+                                 if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (pmix__type_alignof_, y)" "pmix_cv_c_align_char"        "$ac_includes_default
+#include <stdbool.h>
+
+#ifndef offsetof
+# define offsetof(type, member) ((char *) &((type *) 0)->member - (char *) 0)
+#endif
+typedef struct { char x; char y; } pmix__type_alignof_;
+"; then :
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Problem running configure test!" >&5
+$as_echo "$as_me: WARNING: *** Problem running configure test!" >&2;}
+                                                  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** See config.log for details." >&5
+$as_echo "$as_me: WARNING: *** See config.log for details." >&2;}
+                                                  as_fn_error $? "*** Cannot continue." "$LINENO" 5
+fi
+
+
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_includes_default
+                                                    #include <stdbool.h>
+int
+main ()
+{
+
+    struct foo { char c; char x; };
+    struct foo *p = (struct foo *) malloc(sizeof(struct foo));
+    int diff;
+    FILE *f=fopen("conftestval", "w");
+    if (!f) exit(1);
+    diff = ((char *)&p->x) - ((char *)&p->c);
+    fprintf(f, "%d\n", (diff >= 0) ? diff : -diff);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  pmix_cv_c_align_char=`cat conftestval`
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Problem running configure test!" >&5
+$as_echo "$as_me: WARNING: *** Problem running configure test!" >&2;}
+                                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** See config.log for details." >&5
+$as_echo "$as_me: WARNING: *** See config.log for details." >&2;}
+                                as_fn_error $? "*** Cannot continue." "$LINENO" 5
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pmix_cv_c_align_char" >&5
+$as_echo "$pmix_cv_c_align_char" >&6; }
+
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_ALIGNMENT_CHAR $pmix_cv_c_align_char
+_ACEOF
+
+eval "PMIX_ALIGNMENT_CHAR=$pmix_cv_c_align_char"
+
+rm -rf conftest*
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking alignment of short" >&5
+$as_echo_n "checking alignment of short... " >&6; }
+if ${pmix_cv_c_align_short+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then :
+   # cross compile - do a non-executable test.  Trick
+                                 # taken from the Autoconf 2.59c.  Switch to using
+                                 # AC_CHECK_ALIGNOF when we can require Autoconf 2.60.
+                                 if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (pmix__type_alignof_, y)" "pmix_cv_c_align_short"        "$ac_includes_default
+#include <stdbool.h>
+
+#ifndef offsetof
+# define offsetof(type, member) ((char *) &((type *) 0)->member - (char *) 0)
+#endif
+typedef struct { char x; short y; } pmix__type_alignof_;
+"; then :
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Problem running configure test!" >&5
+$as_echo "$as_me: WARNING: *** Problem running configure test!" >&2;}
+                                                  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** See config.log for details." >&5
+$as_echo "$as_me: WARNING: *** See config.log for details." >&2;}
+                                                  as_fn_error $? "*** Cannot continue." "$LINENO" 5
+fi
+
+
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_includes_default
+                                                    #include <stdbool.h>
+int
+main ()
+{
+
+    struct foo { char c; short x; };
+    struct foo *p = (struct foo *) malloc(sizeof(struct foo));
+    int diff;
+    FILE *f=fopen("conftestval", "w");
+    if (!f) exit(1);
+    diff = ((char *)&p->x) - ((char *)&p->c);
+    fprintf(f, "%d\n", (diff >= 0) ? diff : -diff);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  pmix_cv_c_align_short=`cat conftestval`
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Problem running configure test!" >&5
+$as_echo "$as_me: WARNING: *** Problem running configure test!" >&2;}
+                                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** See config.log for details." >&5
+$as_echo "$as_me: WARNING: *** See config.log for details." >&2;}
+                                as_fn_error $? "*** Cannot continue." "$LINENO" 5
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pmix_cv_c_align_short" >&5
+$as_echo "$pmix_cv_c_align_short" >&6; }
+
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_ALIGNMENT_SHORT $pmix_cv_c_align_short
+_ACEOF
+
+eval "PMIX_ALIGNMENT_SHORT=$pmix_cv_c_align_short"
+
+rm -rf conftest*
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking alignment of wchar_t" >&5
+$as_echo_n "checking alignment of wchar_t... " >&6; }
+if ${pmix_cv_c_align_wchar_t+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then :
+   # cross compile - do a non-executable test.  Trick
+                                 # taken from the Autoconf 2.59c.  Switch to using
+                                 # AC_CHECK_ALIGNOF when we can require Autoconf 2.60.
+                                 if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (pmix__type_alignof_, y)" "pmix_cv_c_align_wchar_t"        "$ac_includes_default
+#include <stdbool.h>
+
+#ifndef offsetof
+# define offsetof(type, member) ((char *) &((type *) 0)->member - (char *) 0)
+#endif
+typedef struct { char x; wchar_t y; } pmix__type_alignof_;
+"; then :
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Problem running configure test!" >&5
+$as_echo "$as_me: WARNING: *** Problem running configure test!" >&2;}
+                                                  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** See config.log for details." >&5
+$as_echo "$as_me: WARNING: *** See config.log for details." >&2;}
+                                                  as_fn_error $? "*** Cannot continue." "$LINENO" 5
+fi
+
+
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_includes_default
+                                                    #include <stdbool.h>
+int
+main ()
+{
+
+    struct foo { char c; wchar_t x; };
+    struct foo *p = (struct foo *) malloc(sizeof(struct foo));
+    int diff;
+    FILE *f=fopen("conftestval", "w");
+    if (!f) exit(1);
+    diff = ((char *)&p->x) - ((char *)&p->c);
+    fprintf(f, "%d\n", (diff >= 0) ? diff : -diff);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  pmix_cv_c_align_wchar_t=`cat conftestval`
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Problem running configure test!" >&5
+$as_echo "$as_me: WARNING: *** Problem running configure test!" >&2;}
+                                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** See config.log for details." >&5
+$as_echo "$as_me: WARNING: *** See config.log for details." >&2;}
+                                as_fn_error $? "*** Cannot continue." "$LINENO" 5
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pmix_cv_c_align_wchar_t" >&5
+$as_echo "$pmix_cv_c_align_wchar_t" >&6; }
+
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_ALIGNMENT_WCHAR $pmix_cv_c_align_wchar_t
+_ACEOF
+
+eval "PMIX_ALIGNMENT_WCHAR=$pmix_cv_c_align_wchar_t"
+
+rm -rf conftest*
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking alignment of int" >&5
+$as_echo_n "checking alignment of int... " >&6; }
+if ${pmix_cv_c_align_int+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then :
+   # cross compile - do a non-executable test.  Trick
+                                 # taken from the Autoconf 2.59c.  Switch to using
+                                 # AC_CHECK_ALIGNOF when we can require Autoconf 2.60.
+                                 if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (pmix__type_alignof_, y)" "pmix_cv_c_align_int"        "$ac_includes_default
+#include <stdbool.h>
+
+#ifndef offsetof
+# define offsetof(type, member) ((char *) &((type *) 0)->member - (char *) 0)
+#endif
+typedef struct { char x; int y; } pmix__type_alignof_;
+"; then :
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Problem running configure test!" >&5
+$as_echo "$as_me: WARNING: *** Problem running configure test!" >&2;}
+                                                  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** See config.log for details." >&5
+$as_echo "$as_me: WARNING: *** See config.log for details." >&2;}
+                                                  as_fn_error $? "*** Cannot continue." "$LINENO" 5
+fi
+
+
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_includes_default
+                                                    #include <stdbool.h>
+int
+main ()
+{
+
+    struct foo { char c; int x; };
+    struct foo *p = (struct foo *) malloc(sizeof(struct foo));
+    int diff;
+    FILE *f=fopen("conftestval", "w");
+    if (!f) exit(1);
+    diff = ((char *)&p->x) - ((char *)&p->c);
+    fprintf(f, "%d\n", (diff >= 0) ? diff : -diff);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  pmix_cv_c_align_int=`cat conftestval`
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Problem running configure test!" >&5
+$as_echo "$as_me: WARNING: *** Problem running configure test!" >&2;}
+                                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** See config.log for details." >&5
+$as_echo "$as_me: WARNING: *** See config.log for details." >&2;}
+                                as_fn_error $? "*** Cannot continue." "$LINENO" 5
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pmix_cv_c_align_int" >&5
+$as_echo "$pmix_cv_c_align_int" >&6; }
+
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_ALIGNMENT_INT $pmix_cv_c_align_int
+_ACEOF
+
+eval "PMIX_ALIGNMENT_INT=$pmix_cv_c_align_int"
+
+rm -rf conftest*
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking alignment of long" >&5
+$as_echo_n "checking alignment of long... " >&6; }
+if ${pmix_cv_c_align_long+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then :
+   # cross compile - do a non-executable test.  Trick
+                                 # taken from the Autoconf 2.59c.  Switch to using
+                                 # AC_CHECK_ALIGNOF when we can require Autoconf 2.60.
+                                 if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (pmix__type_alignof_, y)" "pmix_cv_c_align_long"        "$ac_includes_default
+#include <stdbool.h>
+
+#ifndef offsetof
+# define offsetof(type, member) ((char *) &((type *) 0)->member - (char *) 0)
+#endif
+typedef struct { char x; long y; } pmix__type_alignof_;
+"; then :
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Problem running configure test!" >&5
+$as_echo "$as_me: WARNING: *** Problem running configure test!" >&2;}
+                                                  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** See config.log for details." >&5
+$as_echo "$as_me: WARNING: *** See config.log for details." >&2;}
+                                                  as_fn_error $? "*** Cannot continue." "$LINENO" 5
+fi
+
+
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_includes_default
+                                                    #include <stdbool.h>
+int
+main ()
+{
+
+    struct foo { char c; long x; };
+    struct foo *p = (struct foo *) malloc(sizeof(struct foo));
+    int diff;
+    FILE *f=fopen("conftestval", "w");
+    if (!f) exit(1);
+    diff = ((char *)&p->x) - ((char *)&p->c);
+    fprintf(f, "%d\n", (diff >= 0) ? diff : -diff);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  pmix_cv_c_align_long=`cat conftestval`
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Problem running configure test!" >&5
+$as_echo "$as_me: WARNING: *** Problem running configure test!" >&2;}
+                                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** See config.log for details." >&5
+$as_echo "$as_me: WARNING: *** See config.log for details." >&2;}
+                                as_fn_error $? "*** Cannot continue." "$LINENO" 5
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pmix_cv_c_align_long" >&5
+$as_echo "$pmix_cv_c_align_long" >&6; }
+
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_ALIGNMENT_LONG $pmix_cv_c_align_long
+_ACEOF
+
+eval "PMIX_ALIGNMENT_LONG=$pmix_cv_c_align_long"
+
+rm -rf conftest*
+    if test "$ac_cv_type_long_long" = yes; then
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking alignment of long long" >&5
+$as_echo_n "checking alignment of long long... " >&6; }
+if ${pmix_cv_c_align_long_long+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then :
+   # cross compile - do a non-executable test.  Trick
+                                 # taken from the Autoconf 2.59c.  Switch to using
+                                 # AC_CHECK_ALIGNOF when we can require Autoconf 2.60.
+                                 if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (pmix__type_alignof_, y)" "pmix_cv_c_align_long_long"        "$ac_includes_default
+#include <stdbool.h>
+
+#ifndef offsetof
+# define offsetof(type, member) ((char *) &((type *) 0)->member - (char *) 0)
+#endif
+typedef struct { char x; long long y; } pmix__type_alignof_;
+"; then :
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Problem running configure test!" >&5
+$as_echo "$as_me: WARNING: *** Problem running configure test!" >&2;}
+                                                  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** See config.log for details." >&5
+$as_echo "$as_me: WARNING: *** See config.log for details." >&2;}
+                                                  as_fn_error $? "*** Cannot continue." "$LINENO" 5
+fi
+
+
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_includes_default
+                                                    #include <stdbool.h>
+int
+main ()
+{
+
+    struct foo { char c; long long x; };
+    struct foo *p = (struct foo *) malloc(sizeof(struct foo));
+    int diff;
+    FILE *f=fopen("conftestval", "w");
+    if (!f) exit(1);
+    diff = ((char *)&p->x) - ((char *)&p->c);
+    fprintf(f, "%d\n", (diff >= 0) ? diff : -diff);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  pmix_cv_c_align_long_long=`cat conftestval`
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Problem running configure test!" >&5
+$as_echo "$as_me: WARNING: *** Problem running configure test!" >&2;}
+                                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** See config.log for details." >&5
+$as_echo "$as_me: WARNING: *** See config.log for details." >&2;}
+                                as_fn_error $? "*** Cannot continue." "$LINENO" 5
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pmix_cv_c_align_long_long" >&5
+$as_echo "$pmix_cv_c_align_long_long" >&6; }
+
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_ALIGNMENT_LONG_LONG $pmix_cv_c_align_long_long
+_ACEOF
+
+eval "PMIX_ALIGNMENT_LONG_LONG=$pmix_cv_c_align_long_long"
+
+rm -rf conftest*
+    fi
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking alignment of float" >&5
+$as_echo_n "checking alignment of float... " >&6; }
+if ${pmix_cv_c_align_float+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then :
+   # cross compile - do a non-executable test.  Trick
+                                 # taken from the Autoconf 2.59c.  Switch to using
+                                 # AC_CHECK_ALIGNOF when we can require Autoconf 2.60.
+                                 if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (pmix__type_alignof_, y)" "pmix_cv_c_align_float"        "$ac_includes_default
+#include <stdbool.h>
+
+#ifndef offsetof
+# define offsetof(type, member) ((char *) &((type *) 0)->member - (char *) 0)
+#endif
+typedef struct { char x; float y; } pmix__type_alignof_;
+"; then :
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Problem running configure test!" >&5
+$as_echo "$as_me: WARNING: *** Problem running configure test!" >&2;}
+                                                  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** See config.log for details." >&5
+$as_echo "$as_me: WARNING: *** See config.log for details." >&2;}
+                                                  as_fn_error $? "*** Cannot continue." "$LINENO" 5
+fi
+
+
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_includes_default
+                                                    #include <stdbool.h>
+int
+main ()
+{
+
+    struct foo { char c; float x; };
+    struct foo *p = (struct foo *) malloc(sizeof(struct foo));
+    int diff;
+    FILE *f=fopen("conftestval", "w");
+    if (!f) exit(1);
+    diff = ((char *)&p->x) - ((char *)&p->c);
+    fprintf(f, "%d\n", (diff >= 0) ? diff : -diff);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  pmix_cv_c_align_float=`cat conftestval`
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Problem running configure test!" >&5
+$as_echo "$as_me: WARNING: *** Problem running configure test!" >&2;}
+                                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** See config.log for details." >&5
+$as_echo "$as_me: WARNING: *** See config.log for details." >&2;}
+                                as_fn_error $? "*** Cannot continue." "$LINENO" 5
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pmix_cv_c_align_float" >&5
+$as_echo "$pmix_cv_c_align_float" >&6; }
+
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_ALIGNMENT_FLOAT $pmix_cv_c_align_float
+_ACEOF
+
+eval "PMIX_ALIGNMENT_FLOAT=$pmix_cv_c_align_float"
+
+rm -rf conftest*
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking alignment of double" >&5
+$as_echo_n "checking alignment of double... " >&6; }
+if ${pmix_cv_c_align_double+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then :
+   # cross compile - do a non-executable test.  Trick
+                                 # taken from the Autoconf 2.59c.  Switch to using
+                                 # AC_CHECK_ALIGNOF when we can require Autoconf 2.60.
+                                 if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (pmix__type_alignof_, y)" "pmix_cv_c_align_double"        "$ac_includes_default
+#include <stdbool.h>
+
+#ifndef offsetof
+# define offsetof(type, member) ((char *) &((type *) 0)->member - (char *) 0)
+#endif
+typedef struct { char x; double y; } pmix__type_alignof_;
+"; then :
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Problem running configure test!" >&5
+$as_echo "$as_me: WARNING: *** Problem running configure test!" >&2;}
+                                                  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** See config.log for details." >&5
+$as_echo "$as_me: WARNING: *** See config.log for details." >&2;}
+                                                  as_fn_error $? "*** Cannot continue." "$LINENO" 5
+fi
+
+
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_includes_default
+                                                    #include <stdbool.h>
+int
+main ()
+{
+
+    struct foo { char c; double x; };
+    struct foo *p = (struct foo *) malloc(sizeof(struct foo));
+    int diff;
+    FILE *f=fopen("conftestval", "w");
+    if (!f) exit(1);
+    diff = ((char *)&p->x) - ((char *)&p->c);
+    fprintf(f, "%d\n", (diff >= 0) ? diff : -diff);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  pmix_cv_c_align_double=`cat conftestval`
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Problem running configure test!" >&5
+$as_echo "$as_me: WARNING: *** Problem running configure test!" >&2;}
+                                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** See config.log for details." >&5
+$as_echo "$as_me: WARNING: *** See config.log for details." >&2;}
+                                as_fn_error $? "*** Cannot continue." "$LINENO" 5
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pmix_cv_c_align_double" >&5
+$as_echo "$pmix_cv_c_align_double" >&6; }
+
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_ALIGNMENT_DOUBLE $pmix_cv_c_align_double
+_ACEOF
+
+eval "PMIX_ALIGNMENT_DOUBLE=$pmix_cv_c_align_double"
+
+rm -rf conftest*
+    if test "$ac_cv_type_long_double" = yes; then
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking alignment of long double" >&5
+$as_echo_n "checking alignment of long double... " >&6; }
+if ${pmix_cv_c_align_long_double+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then :
+   # cross compile - do a non-executable test.  Trick
+                                 # taken from the Autoconf 2.59c.  Switch to using
+                                 # AC_CHECK_ALIGNOF when we can require Autoconf 2.60.
+                                 if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (pmix__type_alignof_, y)" "pmix_cv_c_align_long_double"        "$ac_includes_default
+#include <stdbool.h>
+
+#ifndef offsetof
+# define offsetof(type, member) ((char *) &((type *) 0)->member - (char *) 0)
+#endif
+typedef struct { char x; long double y; } pmix__type_alignof_;
+"; then :
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Problem running configure test!" >&5
+$as_echo "$as_me: WARNING: *** Problem running configure test!" >&2;}
+                                                  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** See config.log for details." >&5
+$as_echo "$as_me: WARNING: *** See config.log for details." >&2;}
+                                                  as_fn_error $? "*** Cannot continue." "$LINENO" 5
+fi
+
+
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_includes_default
+                                                    #include <stdbool.h>
+int
+main ()
+{
+
+    struct foo { char c; long double x; };
+    struct foo *p = (struct foo *) malloc(sizeof(struct foo));
+    int diff;
+    FILE *f=fopen("conftestval", "w");
+    if (!f) exit(1);
+    diff = ((char *)&p->x) - ((char *)&p->c);
+    fprintf(f, "%d\n", (diff >= 0) ? diff : -diff);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  pmix_cv_c_align_long_double=`cat conftestval`
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Problem running configure test!" >&5
+$as_echo "$as_me: WARNING: *** Problem running configure test!" >&2;}
+                                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** See config.log for details." >&5
+$as_echo "$as_me: WARNING: *** See config.log for details." >&2;}
+                                as_fn_error $? "*** Cannot continue." "$LINENO" 5
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pmix_cv_c_align_long_double" >&5
+$as_echo "$pmix_cv_c_align_long_double" >&6; }
+
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_ALIGNMENT_LONG_DOUBLE $pmix_cv_c_align_long_double
+_ACEOF
+
+eval "PMIX_ALIGNMENT_LONG_DOUBLE=$pmix_cv_c_align_long_double"
+
+rm -rf conftest*
+    fi
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking alignment of void *" >&5
+$as_echo_n "checking alignment of void *... " >&6; }
+if ${pmix_cv_c_align_void_p+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then :
+   # cross compile - do a non-executable test.  Trick
+                                 # taken from the Autoconf 2.59c.  Switch to using
+                                 # AC_CHECK_ALIGNOF when we can require Autoconf 2.60.
+                                 if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (pmix__type_alignof_, y)" "pmix_cv_c_align_void_p"        "$ac_includes_default
+#include <stdbool.h>
+
+#ifndef offsetof
+# define offsetof(type, member) ((char *) &((type *) 0)->member - (char *) 0)
+#endif
+typedef struct { char x; void * y; } pmix__type_alignof_;
+"; then :
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Problem running configure test!" >&5
+$as_echo "$as_me: WARNING: *** Problem running configure test!" >&2;}
+                                                  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** See config.log for details." >&5
+$as_echo "$as_me: WARNING: *** See config.log for details." >&2;}
+                                                  as_fn_error $? "*** Cannot continue." "$LINENO" 5
+fi
+
+
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_includes_default
+                                                    #include <stdbool.h>
+int
+main ()
+{
+
+    struct foo { char c; void * x; };
+    struct foo *p = (struct foo *) malloc(sizeof(struct foo));
+    int diff;
+    FILE *f=fopen("conftestval", "w");
+    if (!f) exit(1);
+    diff = ((char *)&p->x) - ((char *)&p->c);
+    fprintf(f, "%d\n", (diff >= 0) ? diff : -diff);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  pmix_cv_c_align_void_p=`cat conftestval`
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Problem running configure test!" >&5
+$as_echo "$as_me: WARNING: *** Problem running configure test!" >&2;}
+                                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** See config.log for details." >&5
+$as_echo "$as_me: WARNING: *** See config.log for details." >&2;}
+                                as_fn_error $? "*** Cannot continue." "$LINENO" 5
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pmix_cv_c_align_void_p" >&5
+$as_echo "$pmix_cv_c_align_void_p" >&6; }
+
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_ALIGNMENT_VOID_P $pmix_cv_c_align_void_p
+_ACEOF
+
+eval "PMIX_ALIGNMENT_VOID_P=$pmix_cv_c_align_void_p"
+
+rm -rf conftest*
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking alignment of size_t" >&5
+$as_echo_n "checking alignment of size_t... " >&6; }
+if ${pmix_cv_c_align_size_t+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then :
+   # cross compile - do a non-executable test.  Trick
+                                 # taken from the Autoconf 2.59c.  Switch to using
+                                 # AC_CHECK_ALIGNOF when we can require Autoconf 2.60.
+                                 if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (pmix__type_alignof_, y)" "pmix_cv_c_align_size_t"        "$ac_includes_default
+#include <stdbool.h>
+
+#ifndef offsetof
+# define offsetof(type, member) ((char *) &((type *) 0)->member - (char *) 0)
+#endif
+typedef struct { char x; size_t y; } pmix__type_alignof_;
+"; then :
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Problem running configure test!" >&5
+$as_echo "$as_me: WARNING: *** Problem running configure test!" >&2;}
+                                                  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** See config.log for details." >&5
+$as_echo "$as_me: WARNING: *** See config.log for details." >&2;}
+                                                  as_fn_error $? "*** Cannot continue." "$LINENO" 5
+fi
+
+
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_includes_default
+                                                    #include <stdbool.h>
+int
+main ()
+{
+
+    struct foo { char c; size_t x; };
+    struct foo *p = (struct foo *) malloc(sizeof(struct foo));
+    int diff;
+    FILE *f=fopen("conftestval", "w");
+    if (!f) exit(1);
+    diff = ((char *)&p->x) - ((char *)&p->c);
+    fprintf(f, "%d\n", (diff >= 0) ? diff : -diff);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  pmix_cv_c_align_size_t=`cat conftestval`
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Problem running configure test!" >&5
+$as_echo "$as_me: WARNING: *** Problem running configure test!" >&2;}
+                                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** See config.log for details." >&5
+$as_echo "$as_me: WARNING: *** See config.log for details." >&2;}
+                                as_fn_error $? "*** Cannot continue." "$LINENO" 5
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pmix_cv_c_align_size_t" >&5
+$as_echo "$pmix_cv_c_align_size_t" >&6; }
+
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_ALIGNMENT_SIZE_T $pmix_cv_c_align_size_t
+_ACEOF
+
+eval "PMIX_ALIGNMENT_SIZE_T=$pmix_cv_c_align_size_t"
+
+rm -rf conftest*
+
+
+    #
+    # Does the C compiler native support "bool"? (i.e., without
+    # <stdbool.h> or any other help)
+    #
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in MSG; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"MSG\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C bool type" >&5
+$as_echo_n "checking for C bool type... " >&6; }
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+                                          $ac_includes_default
+int
+main ()
+{
+bool bar, foo = true; bar = foo;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  PMIX_NEED_C_BOOL=0 MSG=yes
+else
+  PMIX_NEED_C_BOOL=1 MSG=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_NEED_C_BOOL $PMIX_NEED_C_BOOL
+_ACEOF
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSG" >&5
+$as_echo "$MSG" >&6; }
+    # The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of _Bool" >&5
+$as_echo_n "checking size of _Bool... " >&6; }
+if ${ac_cv_sizeof__Bool+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (_Bool))" "ac_cv_sizeof__Bool"        "$ac_includes_default"; then :
+
+else
+  if test "$ac_cv_type__Bool" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "cannot compute sizeof (_Bool)
+See \`config.log' for more details" "$LINENO" 5; }
+   else
+     ac_cv_sizeof__Bool=0
+   fi
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof__Bool" >&5
+$as_echo "$ac_cv_sizeof__Bool" >&6; }
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF__BOOL $ac_cv_sizeof__Bool
+_ACEOF
+
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+    #
+    # Check for other compiler characteristics
+    #
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in PMIX_CFLAGS_save; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"PMIX_CFLAGS_save\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+    if test "$GCC" = "yes"; then
+
+        # gcc 2.96 will emit oodles of warnings if you use "inline" with
+        # -pedantic (which we do in developer builds).  However,
+        # "__inline__" is ok.  So we have to force gcc to select the
+        # right one.  If you use -pedantic, the AC_C_INLINE test will fail
+        # (because it names a function foo() -- without the (void)).  So
+        # we turn off all the picky flags, turn on -ansi mode (which is
+        # implied by -pedantic), and set warnings to be errors.  Hence,
+        # this does the following (for 2.96):
+        #
+        # - causes the check for "inline" to emit a warning, which then
+        # fails
+        # - checks for __inline__, which then emits no error, and works
+        #
+        # This also works nicely for gcc 3.x because "inline" will work on
+        # the first check, and all is fine.  :-)
+
+        PMIX_CFLAGS_save=$CFLAGS
+        CFLAGS="$PMIX_CFLAGS_BEFORE_PICKY -Werror -ansi"
+    fi
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
+$as_echo_n "checking for inline... " >&6; }
+if ${ac_cv_c_inline+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_c_inline=no
+for ac_kw in inline __inline__ __inline; do
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifndef __cplusplus
+typedef int foo_t;
+static $ac_kw foo_t static_foo () {return 0; }
+$ac_kw foo_t foo () {return 0; }
+#endif
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_c_inline=$ac_kw
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  test "$ac_cv_c_inline" != no && break
+done
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
+$as_echo "$ac_cv_c_inline" >&6; }
+
+case $ac_cv_c_inline in
+  inline | yes) ;;
+  *)
+    case $ac_cv_c_inline in
+      no) ac_val=;;
+      *) ac_val=$ac_cv_c_inline;;
+    esac
+    cat >>confdefs.h <<_ACEOF
+#ifndef __cplusplus
+#define inline $ac_val
+#endif
+_ACEOF
+    ;;
+esac
+
+    if test "$GCC" = "yes"; then
+        CFLAGS=$PMIX_CFLAGS_save
+    fi
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+    if test "x$CC" = "xicc"; then
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether icc-8.1 for EM64T works with variable arguments" >&5
+$as_echo_n "checking whether icc-8.1 for EM64T works with variable arguments... " >&6; }
+if test "$cross_compiling" = yes; then :
+  pmix_ac_icc_varargs=1
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+void func (int c, char * f, ...)
+{
+  va_list arglist;
+  va_start (arglist, f);
+  /* vprintf (f, arglist); */
+  va_end (arglist);
+}
+
+int main ()
+{
+  FILE *f;
+  func (4711, "Help %d [%s]\n", 10, "ten");
+  f=fopen ("conftestval", "w");
+  if (!f) exit (1);
+  return 0;
+}
+
+
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  pmix_ac_icc_varargs=`test -f conftestval`
+else
+  pmix_ac_icc_varargs=1
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+
+if test "$pmix_ac_icc_varargs" = "1"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Problem running configure test!" >&5
+$as_echo "$as_me: WARNING: *** Problem running configure test!" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Your icc-8.1 compiler seems to miscompile va_start!" >&5
+$as_echo "$as_me: WARNING: *** Your icc-8.1 compiler seems to miscompile va_start!" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Please upgrade compiler to at least version 8.1.027" >&5
+$as_echo "$as_me: WARNING: *** Please upgrade compiler to at least version 8.1.027" >&2;}
+    as_fn_error $? "*** Cannot continue." "$LINENO" 5
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+rm -rf conftest*
+    fi
+
+
+    ##################################
+    # Only after setting up
+    # C do we check compiler attributes.
+    ##################################
+
+    pmix_show_subtitle "Compiler characteristics"
+
+
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __attribute__" >&5
+$as_echo_n "checking for __attribute__... " >&6; }
+
+  if ${pmix_cv___attribute__+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
+       /* Check for the longest available __attribute__ (since gcc-2.3) */
+       struct foo {
+           char a;
+           int x[2] __attribute__ ((__packed__));
+        };
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  pmix_cv___attribute__=1
+else
+  pmix_cv___attribute__=0
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+    if test "$pmix_cv___attribute__" = "1" ; then
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
+           /* Check for the longest available __attribute__ (since gcc-2.3) */
+           struct foo {
+               char a;
+               int x[2] __attribute__ ((__packed__));
+            };
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  pmix_cv___attribute__=1
+else
+  pmix_cv___attribute__=0
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    fi
+
+fi
+
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_HAVE_ATTRIBUTE $pmix_cv___attribute__
+_ACEOF
+
+
+#
+# Now that we know the compiler support __attribute__ let's check which kind of
+# attributed are supported.
+#
+  if test "$pmix_cv___attribute__" = "0" ; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    pmix_cv___attribute__aligned=0
+    pmix_cv___attribute__always_inline=0
+    pmix_cv___attribute__cold=0
+    pmix_cv___attribute__const=0
+    pmix_cv___attribute__deprecated=0
+    pmix_cv___attribute__deprecated_argument=0
+    pmix_cv___attribute__format=0
+    pmix_cv___attribute__format_funcptr=0
+    pmix_cv___attribute__hot=0
+    pmix_cv___attribute__malloc=0
+    pmix_cv___attribute__may_alias=0
+    pmix_cv___attribute__no_instrument_function=0
+    pmix_cv___attribute__nonnull=0
+    pmix_cv___attribute__noreturn=0
+    pmix_cv___attribute__noreturn_funcptr=0
+    pmix_cv___attribute__packed=0
+    pmix_cv___attribute__pure=0
+    pmix_cv___attribute__sentinel=0
+    pmix_cv___attribute__unused=0
+    pmix_cv___attribute__visibility=0
+    pmix_cv___attribute__warn_unused_result=0
+    pmix_cv___attribute__destructor=0
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __attribute__(aligned)" >&5
+$as_echo_n "checking for __attribute__(aligned)... " >&6; }
+    if ${pmix_cv___attribute__aligned+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+        #
+        # Try to compile using the C compiler
+        #
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+struct foo { char text[4]; }  __attribute__ ((__aligned__(8)));
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+                        #
+                        # In case we did succeed: Fine, but was this due to the
+                        # attribute being ignored/skipped? Grep for IgNoRe/skip in conftest.err
+                        # and if found, reset the pmix_cv__attribute__var=0
+                        #
+                        pmix_cv___attribute__aligned=1
+
+
+    if test -s conftest.err ; then
+        # icc uses 'invalid attribute' and 'attribute "__XXX__"  ignored'
+        # Sun 12.1 emits 'warning: attribute parameter "__printf__" is undefined'
+        for i in invalid ignore skip undefined ; do
+            $GREP -iq $i conftest.err
+            if test "$?" = "0" ; then
+                pmix_cv___attribute__aligned=0
+                break;
+            fi
+        done
+    fi
+
+
+else
+  pmix_cv___attribute__aligned=0
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+
+
+    if test "$pmix_cv___attribute__aligned" = "1" ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+    else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    fi
+
+
+    #
+    # Ignored by PGI-6.2.5; -- recognized by output-parser
+    #
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __attribute__(always_inline)" >&5
+$as_echo_n "checking for __attribute__(always_inline)... " >&6; }
+    if ${pmix_cv___attribute__always_inline+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+        #
+        # Try to compile using the C compiler
+        #
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+int foo (int arg) __attribute__ ((__always_inline__));
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+                        #
+                        # In case we did succeed: Fine, but was this due to the
+                        # attribute being ignored/skipped? Grep for IgNoRe/skip in conftest.err
+                        # and if found, reset the pmix_cv__attribute__var=0
+                        #
+                        pmix_cv___attribute__always_inline=1
+
+
+    if test -s conftest.err ; then
+        # icc uses 'invalid attribute' and 'attribute "__XXX__"  ignored'
+        # Sun 12.1 emits 'warning: attribute parameter "__printf__" is undefined'
+        for i in invalid ignore skip undefined ; do
+            $GREP -iq $i conftest.err
+            if test "$?" = "0" ; then
+                pmix_cv___attribute__always_inline=0
+                break;
+            fi
+        done
+    fi
+
+
+else
+  pmix_cv___attribute__always_inline=0
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+
+
+    if test "$pmix_cv___attribute__always_inline" = "1" ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+    else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    fi
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __attribute__(cold)" >&5
+$as_echo_n "checking for __attribute__(cold)... " >&6; }
+    if ${pmix_cv___attribute__cold+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+        #
+        # Try to compile using the C compiler
+        #
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+         int foo(int arg1, int arg2) __attribute__ ((__cold__));
+         int foo(int arg1, int arg2) { return arg1 * arg2 + arg1; }
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+                        #
+                        # In case we did succeed: Fine, but was this due to the
+                        # attribute being ignored/skipped? Grep for IgNoRe/skip in conftest.err
+                        # and if found, reset the pmix_cv__attribute__var=0
+                        #
+                        pmix_cv___attribute__cold=1
+
+
+    if test -s conftest.err ; then
+        # icc uses 'invalid attribute' and 'attribute "__XXX__"  ignored'
+        # Sun 12.1 emits 'warning: attribute parameter "__printf__" is undefined'
+        for i in invalid ignore skip undefined ; do
+            $GREP -iq $i conftest.err
+            if test "$?" = "0" ; then
+                pmix_cv___attribute__cold=0
+                break;
+            fi
+        done
+    fi
+
+
+else
+  pmix_cv___attribute__cold=0
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+
+
+    if test "$pmix_cv___attribute__cold" = "1" ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+    else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    fi
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __attribute__(const)" >&5
+$as_echo_n "checking for __attribute__(const)... " >&6; }
+    if ${pmix_cv___attribute__const+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+        #
+        # Try to compile using the C compiler
+        #
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+         int foo(int arg1, int arg2) __attribute__ ((__const__));
+         int foo(int arg1, int arg2) { return arg1 * arg2 + arg1; }
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+                        #
+                        # In case we did succeed: Fine, but was this due to the
+                        # attribute being ignored/skipped? Grep for IgNoRe/skip in conftest.err
+                        # and if found, reset the pmix_cv__attribute__var=0
+                        #
+                        pmix_cv___attribute__const=1
+
+
+    if test -s conftest.err ; then
+        # icc uses 'invalid attribute' and 'attribute "__XXX__"  ignored'
+        # Sun 12.1 emits 'warning: attribute parameter "__printf__" is undefined'
+        for i in invalid ignore skip undefined ; do
+            $GREP -iq $i conftest.err
+            if test "$?" = "0" ; then
+                pmix_cv___attribute__const=0
+                break;
+            fi
+        done
+    fi
+
+
+else
+  pmix_cv___attribute__const=0
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+
+
+    if test "$pmix_cv___attribute__const" = "1" ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+    else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    fi
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __attribute__(deprecated)" >&5
+$as_echo_n "checking for __attribute__(deprecated)... " >&6; }
+    if ${pmix_cv___attribute__deprecated+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+        #
+        # Try to compile using the C compiler
+        #
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+         int foo(int arg1, int arg2) __attribute__ ((__deprecated__));
+         int foo(int arg1, int arg2) { return arg1 * arg2 + arg1; }
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+                        #
+                        # In case we did succeed: Fine, but was this due to the
+                        # attribute being ignored/skipped? Grep for IgNoRe/skip in conftest.err
+                        # and if found, reset the pmix_cv__attribute__var=0
+                        #
+                        pmix_cv___attribute__deprecated=1
+
+
+    if test -s conftest.err ; then
+        # icc uses 'invalid attribute' and 'attribute "__XXX__"  ignored'
+        # Sun 12.1 emits 'warning: attribute parameter "__printf__" is undefined'
+        for i in invalid ignore skip undefined ; do
+            $GREP -iq $i conftest.err
+            if test "$?" = "0" ; then
+                pmix_cv___attribute__deprecated=0
+                break;
+            fi
+        done
+    fi
+
+
+else
+  pmix_cv___attribute__deprecated=0
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+
+
+    if test "$pmix_cv___attribute__deprecated" = "1" ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+    else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    fi
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __attribute__(deprecated_argument)" >&5
+$as_echo_n "checking for __attribute__(deprecated_argument)... " >&6; }
+    if ${pmix_cv___attribute__deprecated_argument+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+        #
+        # Try to compile using the C compiler
+        #
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+         int foo(int arg1, int arg2) __attribute__ ((__deprecated__("compiler allows argument")));
+         int foo(int arg1, int arg2) { return arg1 * arg2 + arg1; }
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+                        #
+                        # In case we did succeed: Fine, but was this due to the
+                        # attribute being ignored/skipped? Grep for IgNoRe/skip in conftest.err
+                        # and if found, reset the pmix_cv__attribute__var=0
+                        #
+                        pmix_cv___attribute__deprecated_argument=1
+
+
+    if test -s conftest.err ; then
+        # icc uses 'invalid attribute' and 'attribute "__XXX__"  ignored'
+        # Sun 12.1 emits 'warning: attribute parameter "__printf__" is undefined'
+        for i in invalid ignore skip undefined ; do
+            $GREP -iq $i conftest.err
+            if test "$?" = "0" ; then
+                pmix_cv___attribute__deprecated_argument=0
+                break;
+            fi
+        done
+    fi
+
+
+else
+  pmix_cv___attribute__deprecated_argument=0
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+
+
+    if test "$pmix_cv___attribute__deprecated_argument" = "1" ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+    else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    fi
+
+
+    ATTRIBUTE_CFLAGS=
+    case "$pmix_c_vendor" in
+        gnu)
+            ATTRIBUTE_CFLAGS="-Wall"
+            ;;
+        intel)
+            # we want specifically the warning on format string conversion
+            ATTRIBUTE_CFLAGS="-we181"
+            ;;
+    esac
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __attribute__(format)" >&5
+$as_echo_n "checking for __attribute__(format)... " >&6; }
+    if ${pmix_cv___attribute__format+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+        #
+        # Try to compile using the C compiler
+        #
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+         int this_printf (void *my_object, const char *my_format, ...) __attribute__ ((__format__ (__printf__, 2, 3)));
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+                        #
+                        # In case we did succeed: Fine, but was this due to the
+                        # attribute being ignored/skipped? Grep for IgNoRe/skip in conftest.err
+                        # and if found, reset the pmix_cv__attribute__var=0
+                        #
+                        pmix_cv___attribute__format=1
+
+
+    if test -s conftest.err ; then
+        # icc uses 'invalid attribute' and 'attribute "__XXX__"  ignored'
+        # Sun 12.1 emits 'warning: attribute parameter "__printf__" is undefined'
+        for i in invalid ignore skip undefined ; do
+            $GREP -iq $i conftest.err
+            if test "$?" = "0" ; then
+                pmix_cv___attribute__format=0
+                break;
+            fi
+        done
+    fi
+
+
+else
+  pmix_cv___attribute__format=0
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+
+
+    if test "$pmix_cv___attribute__format" = "1" ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+    else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    fi
+
+
+    ATTRIBUTE_CFLAGS=
+    case "$pmix_c_vendor" in
+        gnu)
+            ATTRIBUTE_CFLAGS="-Wall"
+            ;;
+        intel)
+            # we want specifically the warning on format string conversion
+            ATTRIBUTE_CFLAGS="-we181"
+            ;;
+    esac
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __attribute__(format_funcptr)" >&5
+$as_echo_n "checking for __attribute__(format_funcptr)... " >&6; }
+    if ${pmix_cv___attribute__format_funcptr+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+        #
+        # Try to compile using the C compiler
+        #
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+         int (*this_printf)(void *my_object, const char *my_format, ...) __attribute__ ((__format__ (__printf__, 2, 3)));
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+                        #
+                        # In case we did succeed: Fine, but was this due to the
+                        # attribute being ignored/skipped? Grep for IgNoRe/skip in conftest.err
+                        # and if found, reset the pmix_cv__attribute__var=0
+                        #
+                        pmix_cv___attribute__format_funcptr=1
+
+
+    if test -s conftest.err ; then
+        # icc uses 'invalid attribute' and 'attribute "__XXX__"  ignored'
+        # Sun 12.1 emits 'warning: attribute parameter "__printf__" is undefined'
+        for i in invalid ignore skip undefined ; do
+            $GREP -iq $i conftest.err
+            if test "$?" = "0" ; then
+                pmix_cv___attribute__format_funcptr=0
+                break;
+            fi
+        done
+    fi
+
+
+else
+  pmix_cv___attribute__format_funcptr=0
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+
+
+    if test "$pmix_cv___attribute__format_funcptr" = "1" ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+    else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    fi
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __attribute__(hot)" >&5
+$as_echo_n "checking for __attribute__(hot)... " >&6; }
+    if ${pmix_cv___attribute__hot+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+        #
+        # Try to compile using the C compiler
+        #
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+         int foo(int arg1, int arg2) __attribute__ ((__hot__));
+         int foo(int arg1, int arg2) { return arg1 * arg2 + arg1; }
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+                        #
+                        # In case we did succeed: Fine, but was this due to the
+                        # attribute being ignored/skipped? Grep for IgNoRe/skip in conftest.err
+                        # and if found, reset the pmix_cv__attribute__var=0
+                        #
+                        pmix_cv___attribute__hot=1
+
+
+    if test -s conftest.err ; then
+        # icc uses 'invalid attribute' and 'attribute "__XXX__"  ignored'
+        # Sun 12.1 emits 'warning: attribute parameter "__printf__" is undefined'
+        for i in invalid ignore skip undefined ; do
+            $GREP -iq $i conftest.err
+            if test "$?" = "0" ; then
+                pmix_cv___attribute__hot=0
+                break;
+            fi
+        done
+    fi
+
+
+else
+  pmix_cv___attribute__hot=0
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+
+
+    if test "$pmix_cv___attribute__hot" = "1" ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+    else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    fi
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __attribute__(malloc)" >&5
+$as_echo_n "checking for __attribute__(malloc)... " >&6; }
+    if ${pmix_cv___attribute__malloc+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+        #
+        # Try to compile using the C compiler
+        #
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#ifdef HAVE_STDLIB_H
+#  include <stdlib.h>
+#endif
+         int * foo(int arg1) __attribute__ ((__malloc__));
+         int * foo(int arg1) { return (int*) malloc(arg1); }
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+                        #
+                        # In case we did succeed: Fine, but was this due to the
+                        # attribute being ignored/skipped? Grep for IgNoRe/skip in conftest.err
+                        # and if found, reset the pmix_cv__attribute__var=0
+                        #
+                        pmix_cv___attribute__malloc=1
+
+
+    if test -s conftest.err ; then
+        # icc uses 'invalid attribute' and 'attribute "__XXX__"  ignored'
+        # Sun 12.1 emits 'warning: attribute parameter "__printf__" is undefined'
+        for i in invalid ignore skip undefined ; do
+            $GREP -iq $i conftest.err
+            if test "$?" = "0" ; then
+                pmix_cv___attribute__malloc=0
+                break;
+            fi
+        done
+    fi
+
+
+else
+  pmix_cv___attribute__malloc=0
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+
+
+    if test "$pmix_cv___attribute__malloc" = "1" ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+    else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    fi
+
+
+
+    #
+    # Attribute may_alias: No suitable cross-check available, that works for non-supporting compilers
+    # Ignored by intel-9.1.045 -- turn off with -wd1292
+    # Ignored by PGI-6.2.5; ignore not detected due to missing cross-check
+    #
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __attribute__(may_alias)" >&5
+$as_echo_n "checking for __attribute__(may_alias)... " >&6; }
+    if ${pmix_cv___attribute__may_alias+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+        #
+        # Try to compile using the C compiler
+        #
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+int * p_value __attribute__ ((__may_alias__));
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+                        #
+                        # In case we did succeed: Fine, but was this due to the
+                        # attribute being ignored/skipped? Grep for IgNoRe/skip in conftest.err
+                        # and if found, reset the pmix_cv__attribute__var=0
+                        #
+                        pmix_cv___attribute__may_alias=1
+
+
+    if test -s conftest.err ; then
+        # icc uses 'invalid attribute' and 'attribute "__XXX__"  ignored'
+        # Sun 12.1 emits 'warning: attribute parameter "__printf__" is undefined'
+        for i in invalid ignore skip undefined ; do
+            $GREP -iq $i conftest.err
+            if test "$?" = "0" ; then
+                pmix_cv___attribute__may_alias=0
+                break;
+            fi
+        done
+    fi
+
+
+else
+  pmix_cv___attribute__may_alias=0
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+
+
+    if test "$pmix_cv___attribute__may_alias" = "1" ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+    else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    fi
+
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __attribute__(no_instrument_function)" >&5
+$as_echo_n "checking for __attribute__(no_instrument_function)... " >&6; }
+    if ${pmix_cv___attribute__no_instrument_function+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+        #
+        # Try to compile using the C compiler
+        #
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+int * foo(int arg1) __attribute__ ((__no_instrument_function__));
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+                        #
+                        # In case we did succeed: Fine, but was this due to the
+                        # attribute being ignored/skipped? Grep for IgNoRe/skip in conftest.err
+                        # and if found, reset the pmix_cv__attribute__var=0
+                        #
+                        pmix_cv___attribute__no_instrument_function=1
+
+
+    if test -s conftest.err ; then
+        # icc uses 'invalid attribute' and 'attribute "__XXX__"  ignored'
+        # Sun 12.1 emits 'warning: attribute parameter "__printf__" is undefined'
+        for i in invalid ignore skip undefined ; do
+            $GREP -iq $i conftest.err
+            if test "$?" = "0" ; then
+                pmix_cv___attribute__no_instrument_function=0
+                break;
+            fi
+        done
+    fi
+
+
+else
+  pmix_cv___attribute__no_instrument_function=0
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+
+
+    if test "$pmix_cv___attribute__no_instrument_function" = "1" ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+    else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    fi
+
+
+
+    #
+    # Attribute nonnull:
+    # Ignored by intel-compiler 9.1.045 -- recognized by cross-check
+    # Ignored by PGI-6.2.5 (pgCC) -- recognized by cross-check
+    #
+    ATTRIBUTE_CFLAGS=
+    case "$pmix_c_vendor" in
+        gnu)
+            ATTRIBUTE_CFLAGS="-Wall"
+            ;;
+        intel)
+            # we do not want to get ignored attributes warnings, but rather real warnings
+            ATTRIBUTE_CFLAGS="-wd1292"
+            ;;
+    esac
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __attribute__(nonnull)" >&5
+$as_echo_n "checking for __attribute__(nonnull)... " >&6; }
+    if ${pmix_cv___attribute__nonnull+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+        #
+        # Try to compile using the C compiler
+        #
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+         int square(int *arg) __attribute__ ((__nonnull__));
+         int square(int *arg) { return *arg; }
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+                        #
+                        # In case we did succeed: Fine, but was this due to the
+                        # attribute being ignored/skipped? Grep for IgNoRe/skip in conftest.err
+                        # and if found, reset the pmix_cv__attribute__var=0
+                        #
+                        pmix_cv___attribute__nonnull=1
+
+
+    if test -s conftest.err ; then
+        # icc uses 'invalid attribute' and 'attribute "__XXX__"  ignored'
+        # Sun 12.1 emits 'warning: attribute parameter "__printf__" is undefined'
+        for i in invalid ignore skip undefined ; do
+            $GREP -iq $i conftest.err
+            if test "$?" = "0" ; then
+                pmix_cv___attribute__nonnull=0
+                break;
+            fi
+        done
+    fi
+
+
+else
+  pmix_cv___attribute__nonnull=0
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+
+
+    if test "$pmix_cv___attribute__nonnull" = "1" ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+    else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    fi
+
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __attribute__(noreturn)" >&5
+$as_echo_n "checking for __attribute__(noreturn)... " >&6; }
+    if ${pmix_cv___attribute__noreturn+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+        #
+        # Try to compile using the C compiler
+        #
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#ifdef HAVE_UNISTD_H
+#  include <unistd.h>
+#endif
+#ifdef HAVE_STDLIB_H
+#  include <stdlib.h>
+#endif
+         void fatal(int arg1) __attribute__ ((__noreturn__));
+         void fatal(int arg1) { exit(arg1); }
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+                        #
+                        # In case we did succeed: Fine, but was this due to the
+                        # attribute being ignored/skipped? Grep for IgNoRe/skip in conftest.err
+                        # and if found, reset the pmix_cv__attribute__var=0
+                        #
+                        pmix_cv___attribute__noreturn=1
+
+
+    if test -s conftest.err ; then
+        # icc uses 'invalid attribute' and 'attribute "__XXX__"  ignored'
+        # Sun 12.1 emits 'warning: attribute parameter "__printf__" is undefined'
+        for i in invalid ignore skip undefined ; do
+            $GREP -iq $i conftest.err
+            if test "$?" = "0" ; then
+                pmix_cv___attribute__noreturn=0
+                break;
+            fi
+        done
+    fi
+
+
+else
+  pmix_cv___attribute__noreturn=0
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+
+
+    if test "$pmix_cv___attribute__noreturn" = "1" ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+    else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    fi
+
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __attribute__(noreturn_funcptr)" >&5
+$as_echo_n "checking for __attribute__(noreturn_funcptr)... " >&6; }
+    if ${pmix_cv___attribute__noreturn_funcptr+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+        #
+        # Try to compile using the C compiler
+        #
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#ifdef HAVE_UNISTD_H
+#  include <unistd.h>
+#endif
+#ifdef HAVE_STDLIB_H
+#  include <stdlib.h>
+#endif
+         extern void (*fatal_exit)(int arg1) __attribute__ ((__noreturn__));
+         void fatal(int arg1) { fatal_exit (arg1); }
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+                        #
+                        # In case we did succeed: Fine, but was this due to the
+                        # attribute being ignored/skipped? Grep for IgNoRe/skip in conftest.err
+                        # and if found, reset the pmix_cv__attribute__var=0
+                        #
+                        pmix_cv___attribute__noreturn_funcptr=1
+
+
+    if test -s conftest.err ; then
+        # icc uses 'invalid attribute' and 'attribute "__XXX__"  ignored'
+        # Sun 12.1 emits 'warning: attribute parameter "__printf__" is undefined'
+        for i in invalid ignore skip undefined ; do
+            $GREP -iq $i conftest.err
+            if test "$?" = "0" ; then
+                pmix_cv___attribute__noreturn_funcptr=0
+                break;
+            fi
+        done
+    fi
+
+
+else
+  pmix_cv___attribute__noreturn_funcptr=0
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+
+
+    if test "$pmix_cv___attribute__noreturn_funcptr" = "1" ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+    else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    fi
+
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __attribute__(packed)" >&5
+$as_echo_n "checking for __attribute__(packed)... " >&6; }
+    if ${pmix_cv___attribute__packed+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+        #
+        # Try to compile using the C compiler
+        #
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+         struct foo {
+             char a;
+             int x[2] __attribute__ ((__packed__));
+         };
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+                        #
+                        # In case we did succeed: Fine, but was this due to the
+                        # attribute being ignored/skipped? Grep for IgNoRe/skip in conftest.err
+                        # and if found, reset the pmix_cv__attribute__var=0
+                        #
+                        pmix_cv___attribute__packed=1
+
+
+    if test -s conftest.err ; then
+        # icc uses 'invalid attribute' and 'attribute "__XXX__"  ignored'
+        # Sun 12.1 emits 'warning: attribute parameter "__printf__" is undefined'
+        for i in invalid ignore skip undefined ; do
+            $GREP -iq $i conftest.err
+            if test "$?" = "0" ; then
+                pmix_cv___attribute__packed=0
+                break;
+            fi
+        done
+    fi
+
+
+else
+  pmix_cv___attribute__packed=0
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+
+
+    if test "$pmix_cv___attribute__packed" = "1" ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+    else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    fi
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __attribute__(pure)" >&5
+$as_echo_n "checking for __attribute__(pure)... " >&6; }
+    if ${pmix_cv___attribute__pure+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+        #
+        # Try to compile using the C compiler
+        #
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+         int square(int arg) __attribute__ ((__pure__));
+         int square(int arg) { return arg * arg; }
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+                        #
+                        # In case we did succeed: Fine, but was this due to the
+                        # attribute being ignored/skipped? Grep for IgNoRe/skip in conftest.err
+                        # and if found, reset the pmix_cv__attribute__var=0
+                        #
+                        pmix_cv___attribute__pure=1
+
+
+    if test -s conftest.err ; then
+        # icc uses 'invalid attribute' and 'attribute "__XXX__"  ignored'
+        # Sun 12.1 emits 'warning: attribute parameter "__printf__" is undefined'
+        for i in invalid ignore skip undefined ; do
+            $GREP -iq $i conftest.err
+            if test "$?" = "0" ; then
+                pmix_cv___attribute__pure=0
+                break;
+            fi
+        done
+    fi
+
+
+else
+  pmix_cv___attribute__pure=0
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+
+
+    if test "$pmix_cv___attribute__pure" = "1" ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+    else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    fi
+
+
+    #
+    # Attribute sentinel:
+    # Ignored by the intel-9.1.045 -- recognized by cross-check
+    #                intel-10.0beta works fine
+    # Ignored by PGI-6.2.5 (pgCC) -- recognized by output-parser and cross-check
+    # Ignored by pathcc-2.2.1 -- recognized by cross-check (through grep ignore)
+    #
+    ATTRIBUTE_CFLAGS=
+    case "$pmix_c_vendor" in
+        gnu)
+            ATTRIBUTE_CFLAGS="-Wall"
+            ;;
+        intel)
+            # we do not want to get ignored attributes warnings
+            ATTRIBUTE_CFLAGS="-wd1292"
+            ;;
+    esac
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __attribute__(sentinel)" >&5
+$as_echo_n "checking for __attribute__(sentinel)... " >&6; }
+    if ${pmix_cv___attribute__sentinel+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+        #
+        # Try to compile using the C compiler
+        #
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+         int my_execlp(const char * file, const char *arg, ...) __attribute__ ((__sentinel__));
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+                        #
+                        # In case we did succeed: Fine, but was this due to the
+                        # attribute being ignored/skipped? Grep for IgNoRe/skip in conftest.err
+                        # and if found, reset the pmix_cv__attribute__var=0
+                        #
+                        pmix_cv___attribute__sentinel=1
+
+
+    if test -s conftest.err ; then
+        # icc uses 'invalid attribute' and 'attribute "__XXX__"  ignored'
+        # Sun 12.1 emits 'warning: attribute parameter "__printf__" is undefined'
+        for i in invalid ignore skip undefined ; do
+            $GREP -iq $i conftest.err
+            if test "$?" = "0" ; then
+                pmix_cv___attribute__sentinel=0
+                break;
+            fi
+        done
+    fi
+
+
+else
+  pmix_cv___attribute__sentinel=0
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+
+
+    if test "$pmix_cv___attribute__sentinel" = "1" ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+    else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    fi
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __attribute__(unused)" >&5
+$as_echo_n "checking for __attribute__(unused)... " >&6; }
+    if ${pmix_cv___attribute__unused+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+        #
+        # Try to compile using the C compiler
+        #
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+         int square(int arg1 __attribute__ ((__unused__)), int arg2);
+         int square(int arg1, int arg2) { return arg2; }
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+                        #
+                        # In case we did succeed: Fine, but was this due to the
+                        # attribute being ignored/skipped? Grep for IgNoRe/skip in conftest.err
+                        # and if found, reset the pmix_cv__attribute__var=0
+                        #
+                        pmix_cv___attribute__unused=1
+
+
+    if test -s conftest.err ; then
+        # icc uses 'invalid attribute' and 'attribute "__XXX__"  ignored'
+        # Sun 12.1 emits 'warning: attribute parameter "__printf__" is undefined'
+        for i in invalid ignore skip undefined ; do
+            $GREP -iq $i conftest.err
+            if test "$?" = "0" ; then
+                pmix_cv___attribute__unused=0
+                break;
+            fi
+        done
+    fi
+
+
+else
+  pmix_cv___attribute__unused=0
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+
+
+    if test "$pmix_cv___attribute__unused" = "1" ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+    else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    fi
+
+
+
+    #
+    # Ignored by PGI-6.2.5 (pgCC) -- recognized by the output-parser
+    #
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __attribute__(visibility)" >&5
+$as_echo_n "checking for __attribute__(visibility)... " >&6; }
+    if ${pmix_cv___attribute__visibility+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+        #
+        # Try to compile using the C compiler
+        #
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+         int square(int arg1) __attribute__ ((__visibility__("hidden")));
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+                        #
+                        # In case we did succeed: Fine, but was this due to the
+                        # attribute being ignored/skipped? Grep for IgNoRe/skip in conftest.err
+                        # and if found, reset the pmix_cv__attribute__var=0
+                        #
+                        pmix_cv___attribute__visibility=1
+
+
+    if test -s conftest.err ; then
+        # icc uses 'invalid attribute' and 'attribute "__XXX__"  ignored'
+        # Sun 12.1 emits 'warning: attribute parameter "__printf__" is undefined'
+        for i in invalid ignore skip undefined ; do
+            $GREP -iq $i conftest.err
+            if test "$?" = "0" ; then
+                pmix_cv___attribute__visibility=0
+                break;
+            fi
+        done
+    fi
+
+
+else
+  pmix_cv___attribute__visibility=0
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+
+
+    if test "$pmix_cv___attribute__visibility" = "1" ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+    else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    fi
+
+
+
+    #
+    # Attribute warn_unused_result:
+    # Ignored by the intel-compiler 9.1.045 -- recognized by cross-check
+    # Ignored by pathcc-2.2.1 -- recognized by cross-check (through grep ignore)
+    #
+    ATTRIBUTE_CFLAGS=
+    case "$pmix_c_vendor" in
+        gnu)
+            ATTRIBUTE_CFLAGS="-Wall"
+            ;;
+        intel)
+            # we do not want to get ignored attributes warnings
+            ATTRIBUTE_CFLAGS="-wd1292"
+            ;;
+    esac
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __attribute__(warn_unused_result)" >&5
+$as_echo_n "checking for __attribute__(warn_unused_result)... " >&6; }
+    if ${pmix_cv___attribute__warn_unused_result+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+        #
+        # Try to compile using the C compiler
+        #
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+         int foo(int arg) __attribute__ ((__warn_unused_result__));
+         int foo(int arg) { return arg + 3; }
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+                        #
+                        # In case we did succeed: Fine, but was this due to the
+                        # attribute being ignored/skipped? Grep for IgNoRe/skip in conftest.err
+                        # and if found, reset the pmix_cv__attribute__var=0
+                        #
+                        pmix_cv___attribute__warn_unused_result=1
+
+
+    if test -s conftest.err ; then
+        # icc uses 'invalid attribute' and 'attribute "__XXX__"  ignored'
+        # Sun 12.1 emits 'warning: attribute parameter "__printf__" is undefined'
+        for i in invalid ignore skip undefined ; do
+            $GREP -iq $i conftest.err
+            if test "$?" = "0" ; then
+                pmix_cv___attribute__warn_unused_result=0
+                break;
+            fi
+        done
+    fi
+
+
+else
+  pmix_cv___attribute__warn_unused_result=0
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+
+
+    if test "$pmix_cv___attribute__warn_unused_result" = "1" ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+    else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    fi
+
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __attribute__(destructor)" >&5
+$as_echo_n "checking for __attribute__(destructor)... " >&6; }
+    if ${pmix_cv___attribute__destructor+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+        #
+        # Try to compile using the C compiler
+        #
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+        void foo(void) __attribute__ ((__destructor__));
+        void foo(void) { return ; }
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+                        #
+                        # In case we did succeed: Fine, but was this due to the
+                        # attribute being ignored/skipped? Grep for IgNoRe/skip in conftest.err
+                        # and if found, reset the pmix_cv__attribute__var=0
+                        #
+                        pmix_cv___attribute__destructor=1
+
+
+    if test -s conftest.err ; then
+        # icc uses 'invalid attribute' and 'attribute "__XXX__"  ignored'
+        # Sun 12.1 emits 'warning: attribute parameter "__printf__" is undefined'
+        for i in invalid ignore skip undefined ; do
+            $GREP -iq $i conftest.err
+            if test "$?" = "0" ; then
+                pmix_cv___attribute__destructor=0
+                break;
+            fi
+        done
+    fi
+
+
+else
+  pmix_cv___attribute__destructor=0
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+
+
+    if test "$pmix_cv___attribute__destructor" = "1" ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+    else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    fi
+
+  fi
+
+  # Now that all the values are set, define them
+
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_HAVE_ATTRIBUTE_ALIGNED $pmix_cv___attribute__aligned
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_HAVE_ATTRIBUTE_ALWAYS_INLINE $pmix_cv___attribute__always_inline
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_HAVE_ATTRIBUTE_COLD $pmix_cv___attribute__cold
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_HAVE_ATTRIBUTE_CONST $pmix_cv___attribute__const
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_HAVE_ATTRIBUTE_DEPRECATED $pmix_cv___attribute__deprecated
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_HAVE_ATTRIBUTE_DEPRECATED_ARGUMENT $pmix_cv___attribute__deprecated_argument
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_HAVE_ATTRIBUTE_FORMAT $pmix_cv___attribute__format
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_HAVE_ATTRIBUTE_FORMAT_FUNCPTR $pmix_cv___attribute__format_funcptr
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_HAVE_ATTRIBUTE_HOT $pmix_cv___attribute__hot
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_HAVE_ATTRIBUTE_MALLOC $pmix_cv___attribute__malloc
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_HAVE_ATTRIBUTE_MAY_ALIAS $pmix_cv___attribute__may_alias
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_HAVE_ATTRIBUTE_NO_INSTRUMENT_FUNCTION $pmix_cv___attribute__no_instrument_function
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_HAVE_ATTRIBUTE_NONNULL $pmix_cv___attribute__nonnull
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_HAVE_ATTRIBUTE_NORETURN $pmix_cv___attribute__noreturn
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_HAVE_ATTRIBUTE_NORETURN_FUNCPTR $pmix_cv___attribute__noreturn_funcptr
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_HAVE_ATTRIBUTE_PACKED $pmix_cv___attribute__packed
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_HAVE_ATTRIBUTE_PURE $pmix_cv___attribute__pure
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_HAVE_ATTRIBUTE_SENTINEL $pmix_cv___attribute__sentinel
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_HAVE_ATTRIBUTE_UNUSED $pmix_cv___attribute__unused
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_HAVE_ATTRIBUTE_VISIBILITY $pmix_cv___attribute__visibility
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_HAVE_ATTRIBUTE_WARN_UNUSED_RESULT $pmix_cv___attribute__warn_unused_result
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_HAVE_ATTRIBUTE_WEAK_ALIAS $pmix_cv___attribute__weak_alias
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_HAVE_ATTRIBUTE_DESTRUCTOR $pmix_cv___attribute__destructor
+_ACEOF
+
+
+
+
+    lower=familyid
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compiler $lower" >&5
+$as_echo_n "checking for compiler $lower... " >&6; }
+if ${pmix_cv_compiler_FAMILYID+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+            CPPFLAGS_orig=$CPPFLAGS
+            CPPFLAGS="-I${top_pmix_srcdir}/src/include $CPPFLAGS"
+            if test "$cross_compiling" = yes; then :
+
+                eval pmix_cv_compiler_FAMILYID=0
+
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdio.h>
+#include <stdlib.h>
+
+int main (int argc, char * argv[])
+{
+    FILE * f;
+    f=fopen("conftestval", "w");
+    if (!f) exit(1);
+    fprintf (f, "%d", PLATFORM_COMPILER_FAMILYID);
+    return 0;
+}
+
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+
+                eval pmix_cv_compiler_FAMILYID=`cat conftestval`;
+
+else
+
+                eval pmix_cv_compiler_FAMILYID=0
+
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+            CPPFLAGS=$CPPFLAGS_orig
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pmix_cv_compiler_FAMILYID" >&5
+$as_echo "$pmix_cv_compiler_FAMILYID" >&6; }
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_BUILD_PLATFORM_COMPILER_FAMILYID $pmix_cv_compiler_FAMILYID
+_ACEOF
+
+
+
+    lower=familyname
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compiler $lower" >&5
+$as_echo_n "checking for compiler $lower... " >&6; }
+if ${pmix_cv_compiler_FAMILYNAME+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+            CPPFLAGS_orig=$CPPFLAGS
+            CPPFLAGS="-I${top_pmix_srcdir}/src/include $CPPFLAGS"
+            if test "$cross_compiling" = yes; then :
+
+                eval pmix_cv_compiler_FAMILYNAME=UNKNOWN
+
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdio.h>
+#include <stdlib.h>
+
+int main (int argc, char * argv[])
+{
+    FILE * f;
+    f=fopen("conftestval", "w");
+    if (!f) exit(1);
+    fprintf (f, "%s", _STRINGIFY(PLATFORM_COMPILER_FAMILYNAME));
+    return 0;
+}
+
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+
+                eval pmix_cv_compiler_FAMILYNAME=`cat conftestval`;
+
+else
+
+                eval pmix_cv_compiler_FAMILYNAME=UNKNOWN
+
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+            CPPFLAGS=$CPPFLAGS_orig
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pmix_cv_compiler_FAMILYNAME" >&5
+$as_echo "$pmix_cv_compiler_FAMILYNAME" >&6; }
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_BUILD_PLATFORM_COMPILER_FAMILYNAME $pmix_cv_compiler_FAMILYNAME
+_ACEOF
+
+
+
+    lower=version
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compiler $lower" >&5
+$as_echo_n "checking for compiler $lower... " >&6; }
+if ${pmix_cv_compiler_VERSION+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+            CPPFLAGS_orig=$CPPFLAGS
+            CPPFLAGS="-I${top_pmix_srcdir}/src/include $CPPFLAGS"
+            if test "$cross_compiling" = yes; then :
+
+                eval pmix_cv_compiler_VERSION=0
+
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdio.h>
+#include <stdlib.h>
+
+int main (int argc, char * argv[])
+{
+    FILE * f;
+    f=fopen("conftestval", "w");
+    if (!f) exit(1);
+    fprintf (f, "%d", PLATFORM_COMPILER_VERSION);
+    return 0;
+}
+
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+
+                eval pmix_cv_compiler_VERSION=`cat conftestval`;
+
+else
+
+                eval pmix_cv_compiler_VERSION=0
+
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+            CPPFLAGS=$CPPFLAGS_orig
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pmix_cv_compiler_VERSION" >&5
+$as_echo "$pmix_cv_compiler_VERSION" >&6; }
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_BUILD_PLATFORM_COMPILER_VERSION $pmix_cv_compiler_VERSION
+_ACEOF
+
+
+
+    lower=version_str
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compiler $lower" >&5
+$as_echo_n "checking for compiler $lower... " >&6; }
+if ${pmix_cv_compiler_VERSION_STR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+            CPPFLAGS_orig=$CPPFLAGS
+            CPPFLAGS="-I${top_pmix_srcdir}/src/include $CPPFLAGS"
+            if test "$cross_compiling" = yes; then :
+
+                eval pmix_cv_compiler_VERSION_STR=UNKNOWN
+
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdio.h>
+#include <stdlib.h>
+
+int main (int argc, char * argv[])
+{
+    FILE * f;
+    f=fopen("conftestval", "w");
+    if (!f) exit(1);
+    fprintf (f, "%s", _STRINGIFY(PLATFORM_COMPILER_VERSION_STR));
+    return 0;
+}
+
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+
+                eval pmix_cv_compiler_VERSION_STR=`cat conftestval`;
+
+else
+
+                eval pmix_cv_compiler_VERSION_STR=UNKNOWN
+
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+            CPPFLAGS=$CPPFLAGS_orig
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pmix_cv_compiler_VERSION_STR" >&5
+$as_echo "$pmix_cv_compiler_VERSION_STR" >&6; }
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_BUILD_PLATFORM_COMPILER_VERSION_STR $pmix_cv_compiler_VERSION_STR
+_ACEOF
+
+
+
+
+    ##################################
+    # Assembler Configuration
+    ##################################
+
+    pmix_show_subtitle "Assembler"
+
+    # By default we simply use the C compiler to build assembly code.
+
+test "${CCAS+set}" = set || CCAS=$CC
+test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS
+
+
+
+depcc="$CCAS"   am_compiler_list=
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+$as_echo_n "checking dependency style of $depcc... " >&6; }
+if ${am_cv_CCAS_dependencies_compiler_type+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+  # We make a subdir and do the tests there.  Otherwise we can end up
+  # making bogus files that we don't know about and never remove.  For
+  # instance it was reported that on HP-UX the gcc test will end up
+  # making a dummy file named 'D' -- because '-MD' means "put the output
+  # in D".
+  rm -rf conftest.dir
+  mkdir conftest.dir
+  # Copy depcomp to subdir because otherwise we won't find it if we're
+  # using a relative directory.
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
+
+  am_cv_CCAS_dependencies_compiler_type=none
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+  fi
+  am__universal=false
+
+
+  for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
+    # We need to recreate these files for each test, as the compiler may
+    # overwrite some of them when testing with obscure command lines.
+    # This happens at least with the AIX C compiler.
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle '-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs.
+    am__obj=sub/conftest.${OBJEXT-o}
+    am__minus_obj="-o $am__obj"
+    case $depmode in
+    gcc)
+      # This depmode causes a compiler race in universal mode.
+      test "$am__universal" = false || continue
+      ;;
+    nosideeffect)
+      # After this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested.
+      if test "x$enable_dependency_tracking" = xyes; then
+	continue
+      else
+	break
+      fi
+      ;;
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+      # This compiler won't grok '-c -o', but also, the minuso test has
+      # not run yet.  These depmodes are late enough in the game, and
+      # so weak that their functioning should not be impacted.
+      am__obj=conftest.${OBJEXT-o}
+      am__minus_obj=
+      ;;
+    none) break ;;
+    esac
+    if depmode=$depmode \
+       source=sub/conftest.c object=$am__obj \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+        am_cv_CCAS_dependencies_compiler_type=$depmode
+        break
+      fi
+    fi
+  done
+
+  cd ..
+  rm -rf conftest.dir
+else
+  am_cv_CCAS_dependencies_compiler_type=none
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CCAS_dependencies_compiler_type" >&5
+$as_echo "$am_cv_CCAS_dependencies_compiler_type" >&6; }
+CCASDEPMODE=depmode=$am_cv_CCAS_dependencies_compiler_type
+
+ if
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_CCAS_dependencies_compiler_type" = gcc3; then
+  am__fastdepCCAS_TRUE=
+  am__fastdepCCAS_FALSE='#'
+else
+  am__fastdepCCAS_TRUE='#'
+  am__fastdepCCAS_FALSE=
+fi
+
+
+    # Extract the first word of "perl", so it can be a program name with args.
+set dummy perl; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PERL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $PERL in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PERL="$PERL" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_path_PERL" && ac_cv_path_PERL="perl"
+  ;;
+esac
+fi
+PERL=$ac_cv_path_PERL
+if test -n "$PERL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5
+$as_echo "$PERL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
+
+
+
+    # Check whether --enable-builtin-atomics was given.
+if test "${enable_builtin_atomics+set}" = set; then :
+  enableval=$enable_builtin_atomics;
+else
+  enable_builtin_atomics="yes"
+fi
+
+
+    pmix_cv_asm_builtin="BUILTIN_NO"
+    if test "$pmix_cv_asm_builtin" = "BUILTIN_NO" && test "$enable_builtin_atomics" != "no"; then :
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __atomic builtin atomics" >&5
+$as_echo_n "checking for __atomic builtin atomics... " >&6; }
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdint.h>
+uint32_t tmp, old = 0;
+uint64_t tmp64, old64 = 0;
+int
+main ()
+{
+
+__atomic_thread_fence(__ATOMIC_SEQ_CST);
+__atomic_compare_exchange_n(&tmp, &old, 1, 0, __ATOMIC_RELAXED, __ATOMIC_RELAXED);
+__atomic_add_fetch(&tmp, 1, __ATOMIC_RELAXED);
+__atomic_compare_exchange_n(&tmp64, &old64, 1, 0, __ATOMIC_RELAXED, __ATOMIC_RELAXED);
+__atomic_add_fetch(&tmp64, 1, __ATOMIC_RELAXED);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+     pmix_cv_asm_builtin="BUILTIN_GCC"
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+  # Check for 128-bit support
+
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in atomic_compare_exchange_n_128_result CFLAGS_save; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"atomic_compare_exchange_n_128_result CFLAGS_save\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+  # Check whether --enable-cross-cmpset128 was given.
+if test "${enable_cross_cmpset128+set}" = set; then :
+  enableval=$enable_cross_cmpset128;
+fi
+
+
+  atomic_compare_exchange_n_128_result=0
+
+  if test ! "$enable_cross_cmpset128" = "yes" ; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for processor support of __atomic builtin atomic compare-and-swap on 128-bit values" >&5
+$as_echo_n "checking for processor support of __atomic builtin atomic compare-and-swap on 128-bit values... " >&6; }
+
+      if test "$cross_compiling" = yes; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no (cross compiling)" >&5
+$as_echo "no (cross compiling)" >&6; }
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+__int128 x = 0, y = 0; __atomic_compare_exchange_n (&x, &y, 1, 0, __ATOMIC_RELAXED, __ATOMIC_RELAXED);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	      atomic_compare_exchange_n_128_result=1
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+
+      if test $atomic_compare_exchange_n_128_result = 0 ; then
+	  CFLAGS_save=$CFLAGS
+	  CFLAGS="$CFLAGS -mcx16"
+
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __atomic builtin atomic compare-and-swap on 128-bit values with -mcx16 flag" >&5
+$as_echo_n "checking for __atomic builtin atomic compare-and-swap on 128-bit values with -mcx16 flag... " >&6; }
+          if test "$cross_compiling" = yes; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no (cross compiling)" >&5
+$as_echo "no (cross compiling)" >&6; }
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+__int128 x = 0, y = 0; __atomic_compare_exchange_n (&x, &y, 1, 0, __ATOMIC_RELAXED, __ATOMIC_RELAXED);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+		  atomic_compare_exchange_n_128_result=1
+		  CFLAGS_save="$CFLAGS"
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+
+	  CFLAGS=$CFLAGS_save
+      fi
+
+      if test $atomic_compare_exchange_n_128_result = 1 ; then
+         { $as_echo "$as_me:${as_lineno-$LINENO}: checking if __int128 atomic compare-and-swap is always lock-free" >&5
+$as_echo_n "checking if __int128 atomic compare-and-swap is always lock-free... " >&6; }
+          if test "$cross_compiling" = yes; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no (cross compiling)" >&5
+$as_echo "no (cross compiling)" >&6; }
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+if (!__atomic_always_lock_free(16, 0)) { return 1; }
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in sync_bool_compare_and_swap_128_result CFLAGS_save; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"sync_bool_compare_and_swap_128_result CFLAGS_save\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+  # Check whether --enable-cross-cmpset128 was given.
+if test "${enable_cross_cmpset128+set}" = set; then :
+  enableval=$enable_cross_cmpset128;
+fi
+
+
+  sync_bool_compare_and_swap_128_result=0
+
+  if test ! "$enable_cross_cmpset128" = "yes" ; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for processor support of __sync builtin atomic compare-and-swap on 128-bit values" >&5
+$as_echo_n "checking for processor support of __sync builtin atomic compare-and-swap on 128-bit values... " >&6; }
+
+      if test "$cross_compiling" = yes; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no (cross compiling)" >&5
+$as_echo "no (cross compiling)" >&6; }
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+__int128 x = 0; __sync_bool_compare_and_swap (&x, 0, 1);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	      sync_bool_compare_and_swap_128_result=1
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+
+      if test $sync_bool_compare_and_swap_128_result = 0 ; then
+	  CFLAGS_save=$CFLAGS
+	  CFLAGS="$CFLAGS -mcx16"
+
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __sync builtin atomic compare-and-swap on 128-bit values with -mcx16 flag" >&5
+$as_echo_n "checking for __sync builtin atomic compare-and-swap on 128-bit values with -mcx16 flag... " >&6; }
+	  if test "$cross_compiling" = yes; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no (cross compiling)" >&5
+$as_echo "no (cross compiling)" >&6; }
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+__int128 x = 0; __sync_bool_compare_and_swap (&x, 0, 1);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+		  sync_bool_compare_and_swap_128_result=1
+		  CFLAGS_save="$CFLAGS"
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+
+	  CFLAGS=$CFLAGS_save
+      fi
+  else
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compiler support of __sync builtin atomic compare-and-swap on 128-bit values" >&5
+$as_echo_n "checking for compiler support of __sync builtin atomic compare-and-swap on 128-bit values... " >&6; }
+
+      # Check if the compiler supports the __sync builtin
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+__int128 x = 0; __sync_bool_compare_and_swap (&x, 0, 1);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	      sync_bool_compare_and_swap_128_result=1
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+      if test $sync_bool_compare_and_swap_128_result = 0 ; then
+	  CFLAGS_save=$CFLAGS
+	  CFLAGS="$CFLAGS -mcx16"
+
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __sync builtin atomic compare-and-swap on 128-bit values with -mcx16 flag" >&5
+$as_echo_n "checking for __sync builtin atomic compare-and-swap on 128-bit values with -mcx16 flag... " >&6; }
+	  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+__int128 x = 0; __sync_bool_compare_and_swap (&x, 0, 1);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+		  sync_bool_compare_and_swap_128_result=1
+		  CFLAGS_save="$CFLAGS"
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+	  CFLAGS=$CFLAGS_save
+      fi
+  fi
+
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_HAVE_SYNC_BUILTIN_CSWAP_INT128 $sync_bool_compare_and_swap_128_result
+_ACEOF
+
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+                 atomic_compare_exchange_n_128_result=0
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+      fi
+  else
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compiler support of __atomic builtin atomic compare-and-swap on 128-bit values" >&5
+$as_echo_n "checking for compiler support of __atomic builtin atomic compare-and-swap on 128-bit values... " >&6; }
+
+      # Check if the compiler supports the __atomic builtin
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+__int128 x = 0, y = 0; __atomic_compare_exchange_n (&x, &y, 1, 0, __ATOMIC_RELAXED, __ATOMIC_RELAXED);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	      atomic_compare_exchange_n_128_result=1
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+      if test $atomic_compare_exchange_n_128_result = 0 ; then
+	  CFLAGS_save=$CFLAGS
+	  CFLAGS="$CFLAGS -mcx16"
+
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __atomic builtin atomic compare-and-swap on 128-bit values with -mcx16 flag" >&5
+$as_echo_n "checking for __atomic builtin atomic compare-and-swap on 128-bit values with -mcx16 flag... " >&6; }
+          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+__int128 x = 0, y = 0; __atomic_compare_exchange_n (&x, &y, 1, 0, __ATOMIC_RELAXED, __ATOMIC_RELAXED);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+		  atomic_compare_exchange_n_128_result=1
+		  CFLAGS_save="$CFLAGS"
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+	  CFLAGS=$CFLAGS_save
+      fi
+  fi
+
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_HAVE_GCC_BUILTIN_CSWAP_INT128 $atomic_compare_exchange_n_128_result
+_ACEOF
+
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+
+fi
+    if test "$pmix_cv_asm_builtin" = "BUILTIN_NO" && test "$enable_builtin_atomics" != "no"; then :
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __sync builtin atomics" >&5
+$as_echo_n "checking for __sync builtin atomics... " >&6; }
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+long tmp;
+int
+main ()
+{
+__sync_synchronize();
+__sync_bool_compare_and_swap(&tmp, 0, 1);
+__sync_add_and_fetch(&tmp, 1);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+     pmix_cv_asm_builtin="BUILTIN_SYNC"
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit __sync builtin atomics" >&5
+$as_echo_n "checking for 64-bit __sync builtin atomics... " >&6; }
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdint.h>
+uint64_t tmp;
+int
+main ()
+{
+
+__sync_bool_compare_and_swap(&tmp, 0, 1);
+__sync_add_and_fetch(&tmp, 1);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+     pmix_asm_sync_have_64bit=1
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+     pmix_asm_sync_have_64bit=0
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_ASM_SYNC_HAVE_64BIT $pmix_asm_sync_have_64bit
+_ACEOF
+
+
+  # Check for 128-bit support
+
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in sync_bool_compare_and_swap_128_result CFLAGS_save; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"sync_bool_compare_and_swap_128_result CFLAGS_save\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+  # Check whether --enable-cross-cmpset128 was given.
+if test "${enable_cross_cmpset128+set}" = set; then :
+  enableval=$enable_cross_cmpset128;
+fi
+
+
+  sync_bool_compare_and_swap_128_result=0
+
+  if test ! "$enable_cross_cmpset128" = "yes" ; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for processor support of __sync builtin atomic compare-and-swap on 128-bit values" >&5
+$as_echo_n "checking for processor support of __sync builtin atomic compare-and-swap on 128-bit values... " >&6; }
+
+      if test "$cross_compiling" = yes; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no (cross compiling)" >&5
+$as_echo "no (cross compiling)" >&6; }
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+__int128 x = 0; __sync_bool_compare_and_swap (&x, 0, 1);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	      sync_bool_compare_and_swap_128_result=1
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+
+      if test $sync_bool_compare_and_swap_128_result = 0 ; then
+	  CFLAGS_save=$CFLAGS
+	  CFLAGS="$CFLAGS -mcx16"
+
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __sync builtin atomic compare-and-swap on 128-bit values with -mcx16 flag" >&5
+$as_echo_n "checking for __sync builtin atomic compare-and-swap on 128-bit values with -mcx16 flag... " >&6; }
+	  if test "$cross_compiling" = yes; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no (cross compiling)" >&5
+$as_echo "no (cross compiling)" >&6; }
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+__int128 x = 0; __sync_bool_compare_and_swap (&x, 0, 1);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+		  sync_bool_compare_and_swap_128_result=1
+		  CFLAGS_save="$CFLAGS"
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+
+	  CFLAGS=$CFLAGS_save
+      fi
+  else
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compiler support of __sync builtin atomic compare-and-swap on 128-bit values" >&5
+$as_echo_n "checking for compiler support of __sync builtin atomic compare-and-swap on 128-bit values... " >&6; }
+
+      # Check if the compiler supports the __sync builtin
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+__int128 x = 0; __sync_bool_compare_and_swap (&x, 0, 1);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	      sync_bool_compare_and_swap_128_result=1
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+      if test $sync_bool_compare_and_swap_128_result = 0 ; then
+	  CFLAGS_save=$CFLAGS
+	  CFLAGS="$CFLAGS -mcx16"
+
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __sync builtin atomic compare-and-swap on 128-bit values with -mcx16 flag" >&5
+$as_echo_n "checking for __sync builtin atomic compare-and-swap on 128-bit values with -mcx16 flag... " >&6; }
+	  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+__int128 x = 0; __sync_bool_compare_and_swap (&x, 0, 1);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+		  sync_bool_compare_and_swap_128_result=1
+		  CFLAGS_save="$CFLAGS"
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+	  CFLAGS=$CFLAGS_save
+      fi
+  fi
+
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_HAVE_SYNC_BUILTIN_CSWAP_INT128 $sync_bool_compare_and_swap_128_result
+_ACEOF
+
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+
+fi
+    if test "$pmix_cv_asm_builtin" = "BUILTIN_NO" && test "$enable_builtin_atomics" = "yes"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: __sync builtin atomics requested but not found - proceeding with inline atomics" >&5
+$as_echo "$as_me: WARNING: __sync builtin atomics requested but not found - proceeding with inline atomics" >&2;}
+fi
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if .proc/endp is needed" >&5
+$as_echo_n "checking if .proc/endp is needed... " >&6; }
+if ${pmix_cv_asm_need_proc+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  pmix_cv_asm_need_proc="no"
+                    cat >conftest.s <<EOF
+
+     .proc mysym
+mysym:
+     .endp mysym
+EOF
+if test "$CC" = "$CCAS" ; then
+    pmix_assemble="$CCAS $CCASFLAGS -c conftest.s >conftest.out 2>&1"
+else
+    pmix_assemble="$CCAS $CCASFLAGS -o conftest.o conftest.s >conftest.out 2>&1"
+fi
+if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$pmix_assemble\""; } >&5
+  (eval $pmix_assemble) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  # save the warnings
+  cat conftest.out >&5
+  pmix_cv_asm_need_proc="yes"
+else
+  # save compiler output and failed program
+  cat conftest.out >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.s >&5
+  :
+fi
+rm -rf conftest*
+unset pmix_assemble
+
+                    rm -f conftest.out
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pmix_cv_asm_need_proc" >&5
+$as_echo "$pmix_cv_asm_need_proc" >&6; }
+
+    if test "$pmix_cv_asm_need_proc" = "yes" ; then
+       pmix_cv_asm_proc=".proc"
+       pmix_cv_asm_endproc=".endp"
+    else
+       pmix_cv_asm_proc="#"
+       pmix_cv_asm_endproc="#"
+    fi
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking directive for setting text section" >&5
+$as_echo_n "checking directive for setting text section... " >&6; }
+    pmix_cv_asm_text=""
+    if test "$pmix_cv_c_compiler_vendor" = "microsoft" ; then
+        # text section will be brought in with the rest of
+        # header for MS - leave blank for now
+        pmix_cv_asm_text=""
+    else
+        case $host in
+            *-aix*)
+                pmix_cv_asm_text=".csect .text[PR]"
+            ;;
+            *)
+                pmix_cv_asm_text=".text"
+            ;;
+        esac
+    fi
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pmix_cv_asm_text" >&5
+$as_echo "$pmix_cv_asm_text" >&6; }
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_ASM_TEXT "$pmix_cv_asm_text"
+_ACEOF
+
+    PMIX_ASM_TEXT="$pmix_cv_asm_text"
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking directive for exporting symbols" >&5
+$as_echo_n "checking directive for exporting symbols... " >&6; }
+    pmix_cv_asm_global=""
+    if test "$pmix_cv_c_compiler_vendor" = "microsoft" ; then
+        pmix_cv_asm_global="PUBLIC"
+    else
+        case $host in
+            *)
+                pmix_cv_asm_global=".globl"
+            ;;
+        esac
+    fi
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pmix_cv_asm_global" >&5
+$as_echo "$pmix_cv_asm_global" >&6; }
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_ASM_GLOBAL "$pmix_cv_asm_global"
+_ACEOF
+
+    PMIX_ASM_GLOBAL="$pmix_cv_asm_global"
+
+
+
+
+
+    # Extract the first word of "objdump", so it can be a program name with args.
+set dummy objdump; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_OBJDUMP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OBJDUMP"; then
+  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_OBJDUMP="objdump"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+OBJDUMP=$ac_cv_prog_OBJDUMP
+if test -n "$OBJDUMP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
+$as_echo "$OBJDUMP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if .note.GNU-stack is needed" >&5
+$as_echo_n "checking if .note.GNU-stack is needed... " >&6; }
+if ${pmix_cv_asm_gnu_stack_result+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "$OBJDUMP" != ""; then :
+   # first, see if a simple C program has it set
+             cat >conftest.c <<EOF
+int testfunc() {return 0; }
+EOF
+
+# 1 is the command
+# 2 is actions to do if success
+# 3 is actions to do if fail
+echo "configure:26014: $CC $CFLAGS -c conftest.c -o conftest.$OBJEXT" >&5
+$CC $CFLAGS -c conftest.c -o conftest.$OBJEXT 1>&5 2>&1
+pmix_status=$?
+
+# 1 is the message
+# 2 is whether to put a prefix or not
+if test -n "1"; then
+    echo "configure:26021: \$? = $pmix_status" >&5
+else
+    echo \$? = $pmix_status >&5
+fi
+if test "$pmix_status" = "0"; then
+    unset pmix_status
+    $OBJDUMP -x conftest.$OBJEXT | $GREP '\.note\.GNU-stack' > /dev/null && pmix_cv_asm_gnu_stack_result=yes
+else
+    unset pmix_status
+
+# 1 is the message
+# 2 is whether to put a prefix or not
+if test -n "1"; then
+    echo "configure:26034: the failed program was:" >&5
+else
+    echo the failed program was: >&5
+fi
+
+# 1 is the filename
+if test -n "conftest.c" && test -f "conftest.c"; then
+    cat conftest.c >&5
+fi
+                  pmix_cv_asm_gnu_stack_result=no
+fi
+             if test "$pmix_cv_asm_gnu_stack_result" != "yes" ; then
+                 pmix_cv_asm_gnu_stack_result="no"
+             fi
+             rm -rf conftest.*
+else
+  pmix_cv_asm_gnu_stack_result="no"
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pmix_cv_asm_gnu_stack_result" >&5
+$as_echo "$pmix_cv_asm_gnu_stack_result" >&6; }
+    if test "$pmix_cv_asm_gnu_stack_result" = "yes" ; then
+        pmix_cv_asm_gnu_stack=1
+    else
+        pmix_cv_asm_gnu_stack=0
+    fi
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking suffix for labels" >&5
+$as_echo_n "checking suffix for labels... " >&6; }
+    pmix_cv_asm_label_suffix=""
+    case $host in
+        *)
+                pmix_cv_asm_label_suffix=":"
+        ;;
+    esac
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pmix_cv_asm_label_suffix" >&5
+$as_echo "$pmix_cv_asm_label_suffix" >&6; }
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_ASM_LABEL_SUFFIX "$pmix_cv_asm_label_suffix"
+_ACEOF
+
+    PMIX_ASM_LABEL_SUFFIX="$pmix_cv_asm_label_suffix"
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking prefix for global symbol labels" >&5
+$as_echo_n "checking prefix for global symbol labels... " >&6; }
+if ${pmix_cv_asm_gsym+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+    pmix_cv_asm_gsym="none"
+
+    for sym in "_" "" "." ; do
+        asm_result=0
+        echo "configure: trying $sym" >&5
+cat > conftest_c.c <<EOF
+#ifdef __cplusplus
+extern "C" {
+#endif
+void gsym_test_func(void);
+#ifdef __cplusplus
+}
+#endif
+int
+main()
+{
+    gsym_test_func();
+    return 0;
+}
+EOF
+        cat >conftest.s <<EOF
+
+$pmix_cv_asm_text
+$pmix_cv_asm_proc ${sym}gsym_test_func
+$pmix_cv_asm_global ${sym}gsym_test_func
+${sym}gsym_test_func${pmix_cv_asm_label_suffix}
+$pmix_cv_asm_endproc ${sym}gsym_test_func
+
+EOF
+if test "$CC" = "$CCAS" ; then
+    pmix_assemble="$CCAS $CCASFLAGS -c conftest.s >conftest.out 2>&1"
+else
+    pmix_assemble="$CCAS $CCASFLAGS -o conftest.o conftest.s >conftest.out 2>&1"
+fi
+if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$pmix_assemble\""; } >&5
+  (eval $pmix_assemble) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  # save the warnings
+  cat conftest.out >&5
+  pmix_compile="$CC $CFLAGS -I. conftest_c.c -c > conftest.cmpl 2>&1"
+             if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$pmix_compile\""; } >&5
+  (eval $pmix_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } ; then
+                # save the warnings
+                 cat conftest.cmpl >&5
+                 pmix_link="$CC $CFLAGS conftest_c.$OBJEXT conftest.$OBJEXT -o conftest  $LDFLAGS $LIBS > conftest.link 2>&1"
+                 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$pmix_link\""; } >&5
+  (eval $pmix_link) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } ; then
+                     # save the warnings
+                     cat conftest.link >&5
+                     asm_result=1
+                 else
+                     cat conftest.link >&5
+                     echo "configure: failed C program was: " >&5
+                     cat conftest_c.c >&5
+                     echo "configure: failed ASM program was: " >&5
+                     cat conftest.s >&5
+                     asm_result=0
+                 fi
+             else
+                # save output and failed program
+                 cat conftest.cmpl >&5
+                 echo "configure: failed C program was: " >&5
+                 cat conftest.c >&5
+                 asm_result=0
+             fi
+else
+  # save compiler output and failed program
+  cat conftest.out >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.s >&5
+  asm_result=0
+fi
+rm -rf conftest*
+unset pmix_assemble
+
+        if test "$asm_result" = "1" ; then
+            pmix_cv_asm_gsym="$sym"
+            break
+        fi
+    done
+    rm -rf conftest.*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pmix_cv_asm_gsym" >&5
+$as_echo "$pmix_cv_asm_gsym" >&6; }
+
+    if test "$pmix_cv_asm_gsym" = "none" ; then
+       as_fn_error $? "Could not determine global symbol label prefix" "$LINENO" 5
+    fi
+
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_ASM_GSYM "$pmix_cv_asm_gsym"
+_ACEOF
+
+    PMIX_ASM_GSYM="$pmix_cv_asm_gsym"
+
+
+
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking prefix for lsym labels" >&5
+$as_echo_n "checking prefix for lsym labels... " >&6; }
+if ${pmix_cv_asm_lsym+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+
+
+    pmix_cv_asm_lsym="L"
+
+    for sym in L .L $ L$ ; do
+        asm_result=0
+        echo "configure: trying $sym" >&5
+        cat >conftest.s <<EOF
+foobar$pmix_cv_asm_label_suffix
+${sym}mytestlabel$pmix_cv_asm_label_suffix
+EOF
+if test "$CC" = "$CCAS" ; then
+    pmix_assemble="$CCAS $CCASFLAGS -c conftest.s >conftest.out 2>&1"
+else
+    pmix_assemble="$CCAS $CCASFLAGS -o conftest.o conftest.s >conftest.out 2>&1"
+fi
+if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$pmix_assemble\""; } >&5
+  (eval $pmix_assemble) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  # save the warnings
+  cat conftest.out >&5
+  # ok, we succeeded at assembling.  see if we can nm,
+             # throwing the results in a file
+            if $NM conftest.$OBJEXT > conftest.out 2>&5 ; then
+                if test "`$GREP mytestlabel conftest.out`" = "" ; then
+                    # there was no symbol...  looks promising to me
+                    pmix_cv_asm_lsym="$sym"
+                    asm_result=1
+                elif test "`$GREP ' [Nt] .*mytestlabel' conftest.out`" = "" ; then
+                    # see if we have a non-global-ish symbol
+                    # but we should see if we can do better.
+                    pmix_cv_asm_lsym="$sym"
+                fi
+            else
+                # not so much on the NM goodness :/
+                echo "$NM failed.  Output from NM was:" >&5
+                cat conftest.out >&5
+                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $NM could not read object file" >&5
+$as_echo "$as_me: WARNING: $NM could not read object file" >&2;}
+            fi
+
+else
+  # save compiler output and failed program
+  cat conftest.out >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.s >&5
+  :
+fi
+rm -rf conftest*
+unset pmix_assemble
+
+        if test "$asm_result" = "1" ; then
+            break
+        fi
+    done
+    rm -f conftest.out
+    unset asm_result sym
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pmix_cv_asm_lsym" >&5
+$as_echo "$pmix_cv_asm_lsym" >&6; }
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_ASM_LSYM "$pmix_cv_asm_lsym"
+_ACEOF
+
+    PMIX_ASM_LSYM="$pmix_cv_asm_lsym"
+
+
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking prefix for function in .type" >&5
+$as_echo_n "checking prefix for function in .type... " >&6; }
+if ${pmix_cv_asm_type+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+    pmix_cv_asm_type=""
+
+    case "${host}" in
+    *-sun-solaris*)
+        # GCC on solaris seems to accept just about anything, not
+        # that what it defines actually works...  So just hardwire
+        # to the right answer
+        pmix_cv_asm_type="#"
+    ;;
+    *)
+        for type  in @ \# % ; do
+            asm_result=0
+            echo "configure: trying $type" >&5
+            cat >conftest.s <<EOF
+     .type mysym, ${type}function
+mysym:
+EOF
+if test "$CC" = "$CCAS" ; then
+    pmix_assemble="$CCAS $CCASFLAGS -c conftest.s >conftest.out 2>&1"
+else
+    pmix_assemble="$CCAS $CCASFLAGS -o conftest.o conftest.s >conftest.out 2>&1"
+fi
+if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$pmix_assemble\""; } >&5
+  (eval $pmix_assemble) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  # save the warnings
+  cat conftest.out >&5
+  pmix_cv_asm_type="${type}"
+                    asm_result=1
+else
+  # save compiler output and failed program
+  cat conftest.out >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.s >&5
+  :
+fi
+rm -rf conftest*
+unset pmix_assemble
+
+            if test "$asm_result" = "1" ; then
+                break
+            fi
+        done
+    ;;
+    esac
+    rm -f conftest.out
+
+    unset asm_result type
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pmix_cv_asm_type" >&5
+$as_echo "$pmix_cv_asm_type" >&6; }
+
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_ASM_TYPE "$pmix_cv_asm_type"
+_ACEOF
+
+    PMIX_ASM_TYPE="$pmix_cv_asm_type"
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if .size is needed" >&5
+$as_echo_n "checking if .size is needed... " >&6; }
+if ${pmix_cv_asm_need_size+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  pmix_cv_asm_need_size="no"
+                    cat >conftest.s <<EOF
+     .size mysym, 1
+EOF
+if test "$CC" = "$CCAS" ; then
+    pmix_assemble="$CCAS $CCASFLAGS -c conftest.s >conftest.out 2>&1"
+else
+    pmix_assemble="$CCAS $CCASFLAGS -o conftest.o conftest.s >conftest.out 2>&1"
+fi
+if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$pmix_assemble\""; } >&5
+  (eval $pmix_assemble) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  # save the warnings
+  cat conftest.out >&5
+  pmix_cv_asm_need_size="yes"
+else
+  # save compiler output and failed program
+  cat conftest.out >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.s >&5
+  :
+fi
+rm -rf conftest*
+unset pmix_assemble
+
+                    rm -f conftest.out
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pmix_cv_asm_need_size" >&5
+$as_echo "$pmix_cv_asm_need_size" >&6; }
+
+    if test "$pmix_cv_asm_need_size" = "yes" ; then
+       pmix_asm_size=1
+    else
+       pmix_asm_size=0
+    fi
+
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_ASM_SIZE "$pmix_asm_size"
+_ACEOF
+
+    PMIX_ASM_SIZE="$pmix_asm_size"
+
+    unset asm_result
+
+
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if .align directive takes logarithmic value" >&5
+$as_echo_n "checking if .align directive takes logarithmic value... " >&6; }
+if ${pmix_cv_asm_align_log+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+   cat >conftest.s <<EOF
+        $pmix_cv_asm_text
+        .align 4
+        $pmix_cv_asm_global foo
+        .byte 1
+        .align 4
+foo$pmix_cv_asm_label_suffix
+        .byte 2
+EOF
+if test "$CC" = "$CCAS" ; then
+    pmix_assemble="$CCAS $CCASFLAGS -c conftest.s >conftest.out 2>&1"
+else
+    pmix_assemble="$CCAS $CCASFLAGS -o conftest.o conftest.s >conftest.out 2>&1"
+fi
+if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$pmix_assemble\""; } >&5
+  (eval $pmix_assemble) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  # save the warnings
+  cat conftest.out >&5
+  pmix_asm_addr=`$NM conftest.$OBJEXT | $GREP foo | sed -e 's/.*\([0-9a-fA-F][0-9a-fA-F]\).*foo.*/\1/'`
+else
+  # save compiler output and failed program
+  cat conftest.out >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.s >&5
+  pmix_asm_addr=""
+fi
+rm -rf conftest*
+unset pmix_assemble
+
+    # test for both 16 and 10 (decimal and hex notations)
+    echo "configure: .align test address offset is $pmix_asm_addr" >&5
+    if test "$pmix_asm_addr" = "16" || test "$pmix_asm_addr" = "10" ; then
+       pmix_cv_asm_align_log="yes"
+    else
+        pmix_cv_asm_align_log="no"
+    fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pmix_cv_asm_align_log" >&5
+$as_echo "$pmix_cv_asm_align_log" >&6; }
+
+    if test "$pmix_cv_asm_align_log" = "yes" || test "$pmix_cv_asm_align_log" = "1" ; then
+        pmix_asm_align_log_result=1
+    else
+        pmix_asm_align_log_result=0
+    fi
+
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_ASM_ALIGN_LOG $asm_align_log_result
+_ACEOF
+
+
+    unset omp_asm_addr asm_result
+
+
+        # find our architecture for purposes of assembly stuff
+        pmix_cv_asm_arch="UNSUPPORTED"
+        PMIX_GCC_INLINE_ASSIGN=""
+        PMIX_ASM_SUPPORT_64BIT=0
+        case "${host}" in
+        x86_64-*x32)
+            pmix_cv_asm_arch="X86_64"
+            PMIX_ASM_SUPPORT_64BIT=1
+            PMIX_GCC_INLINE_ASSIGN='"xaddl %1,%0" : "=m"(ret), "+r"(negone) : "m"(ret)'
+            ;;
+        i?86-*|x86_64*|amd64*)
+            if test "$ac_cv_sizeof_long" = "4" ; then
+                pmix_cv_asm_arch="IA32"
+            else
+                pmix_cv_asm_arch="X86_64"
+            fi
+            PMIX_ASM_SUPPORT_64BIT=1
+            PMIX_GCC_INLINE_ASSIGN='"xaddl %1,%0" : "=m"(ret), "+r"(negone) : "m"(ret)'
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in cmpxchg16b_result; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"cmpxchg16b_result\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    # Check whether --enable-cross-cmpxchg16b was given.
+if test "${enable_cross_cmpxchg16b+set}" = set; then :
+  enableval=$enable_cross_cmpxchg16b;
+fi
+
+
+    if test ! "$enable_cross_cmpxchg16b" = "yes" ; then
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if processor supports x86_64 16-byte compare-and-exchange" >&5
+$as_echo_n "checking if processor supports x86_64 16-byte compare-and-exchange... " >&6; }
+	if test "$cross_compiling" = yes; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no (cross-compiling)" >&5
+$as_echo "no (cross-compiling)" >&6; }
+		cmpxchg16b_result=0
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+unsigned char tmp[16];
+int
+main ()
+{
+
+    __asm__ __volatile__ ("lock cmpxchg16b (%%rsi)" : : "S" (tmp) : "memory", "cc");
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+		cmpxchg16b_result=1
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+		cmpxchg16b_result=0
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+    else
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if assembler supports x86_64 16-byte compare-and-exchange" >&5
+$as_echo_n "checking if assembler supports x86_64 16-byte compare-and-exchange... " >&6; }
+
+	cat >conftest.s <<EOF
+$pmix_cv_asm_text
+		cmpxchg16b 0
+EOF
+if test "$CC" = "$CCAS" ; then
+    pmix_assemble="$CCAS $CCASFLAGS -c conftest.s >conftest.out 2>&1"
+else
+    pmix_assemble="$CCAS $CCASFLAGS -o conftest.o conftest.s >conftest.out 2>&1"
+fi
+if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$pmix_assemble\""; } >&5
+  (eval $pmix_assemble) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  # save the warnings
+  cat conftest.out >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+		cmpxchg16b_result=1
+else
+  # save compiler output and failed program
+  cat conftest.out >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.s >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+		cmpxchg16b_result=0
+fi
+rm -rf conftest*
+unset pmix_assemble
+
+    fi
+    if test "$cmpxchg16b_result" = 1; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler correctly handles volatile 128bits" >&5
+$as_echo_n "checking if compiler correctly handles volatile 128bits... " >&6; }
+        if test "$cross_compiling" = yes; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: untested, assuming ok" >&5
+$as_echo "untested, assuming ok" >&6; }
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdint.h>
+#include <assert.h>
+
+union pmix_counted_pointer_t {
+    struct {
+        uint64_t counter;
+        uint64_t item;
+    } data;
+#if defined(HAVE___INT128) && HAVE___INT128
+    __int128 value;
+#elif defined(HAVE_INT128_T) && HAVE_INT128_T
+    int128_t value;
+#endif
+};
+typedef union pmix_counted_pointer_t pmix_counted_pointer_t;
+int
+main ()
+{
+volatile pmix_counted_pointer_t a;
+    pmix_counted_pointer_t b;
+
+    a.data.counter = 0;
+    a.data.item = 0x1234567890ABCDEF;
+
+    b.data.counter = a.data.counter;
+    b.data.item = a.data.item;
+
+    /* bozo checks */
+    assert(16 == sizeof(pmix_counted_pointer_t));
+    assert(a.data.counter == b.data.counter);
+    assert(a.data.item == b.data.item);
+    /*
+     * the following test fails on buggy compilers
+     * so far, with icc -o conftest conftest.c
+     *  - intel icc 14.0.0.080 (aka 2013sp1)
+     *  - intel icc 14.0.1.106 (aka 2013sp1u1)
+     * older and more recents compilers work fine
+     * buggy compilers work also fine but only with -O0
+     */
+#if (defined(HAVE___INT128) && HAVE___INT128) || (defined(HAVE_INT128_T) && HAVE_INT128_T)
+    return (a.value != b.value);
+#else
+    return 0;
+#endif
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                     cmpxchg16b_result=0
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+    fi
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_HAVE_CMPXCHG16B $cmpxchg16b_result
+_ACEOF
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+            ;;
+
+        ia64-*)
+            pmix_cv_asm_arch="IA64"
+            PMIX_ASM_SUPPORT_64BIT=1
+            PMIX_GCC_INLINE_ASSIGN='"mov %0=r0\n;;\n" : "=&r"(ret)'
+            ;;
+	aarch64*)
+            pmix_cv_asm_arch="ARM64"
+            PMIX_ASM_SUPPORT_64BIT=1
+            PMIX_ASM_ARM_VERSION=8
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_ASM_ARM_VERSION $PMIX_ASM_ARM_VERSION
+_ACEOF
+
+            PMIX_GCC_INLINE_ASSIGN='"mov %0, #0" : "=&r"(ret)'
+            ;;
+
+        armv7*|arm-*-linux-gnueabihf)
+            pmix_cv_asm_arch="ARM"
+            PMIX_ASM_SUPPORT_64BIT=1
+            PMIX_ASM_ARM_VERSION=7
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_ASM_ARM_VERSION $PMIX_ASM_ARM_VERSION
+_ACEOF
+
+            PMIX_GCC_INLINE_ASSIGN='"mov %0, #0" : "=&r"(ret)'
+            ;;
+
+        armv6*)
+            pmix_cv_asm_arch="ARM"
+            PMIX_ASM_SUPPORT_64BIT=0
+            PMIX_ASM_ARM_VERSION=6
+            CCASFLAGS="$CCASFLAGS -march=armv7-a"
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_ASM_ARM_VERSION $PMIX_ASM_ARM_VERSION
+_ACEOF
+
+            PMIX_GCC_INLINE_ASSIGN='"mov %0, #0" : "=&r"(ret)'
+            ;;
+
+        armv5*linux*|armv4*linux*|arm-*-linux-gnueabi)
+            # uses Linux kernel helpers for some atomic operations
+            pmix_cv_asm_arch="ARM"
+            PMIX_ASM_SUPPORT_64BIT=0
+            PMIX_ASM_ARM_VERSION=5
+            CCASFLAGS="$CCASFLAGS -march=armv7-a"
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_ASM_ARM_VERSION $PMIX_ASM_ARM_VERSION
+_ACEOF
+
+            PMIX_GCC_INLINE_ASSIGN='"mov %0, #0" : "=&r"(ret)'
+            ;;
+
+        mips-*|mips64*)
+            # Should really find some way to make sure that we are on
+            # a MIPS III machine (r4000 and later)
+            pmix_cv_asm_arch="MIPS"
+            PMIX_ASM_SUPPORT_64BIT=1
+            PMIX_GCC_INLINE_ASSIGN='"or %0,$0,$0" : "=&r"(ret)'
+            ;;
+
+        powerpc-*|powerpc64-*|powerpcle-*|powerpc64le-*|rs6000-*|ppc-*)
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if PowerPC registers have r prefix" >&5
+$as_echo_n "checking if PowerPC registers have r prefix... " >&6; }
+    cat >conftest.s <<EOF
+$pmix_cv_asm_text
+        addi 1,1,0
+EOF
+if test "$CC" = "$CCAS" ; then
+    pmix_assemble="$CCAS $CCASFLAGS -c conftest.s >conftest.out 2>&1"
+else
+    pmix_assemble="$CCAS $CCASFLAGS -o conftest.o conftest.s >conftest.out 2>&1"
+fi
+if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$pmix_assemble\""; } >&5
+  (eval $pmix_assemble) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  # save the warnings
+  cat conftest.out >&5
+  pmix_cv_asm_powerpc_r_reg=0
+else
+  # save compiler output and failed program
+  cat conftest.out >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.s >&5
+  cat >conftest.s <<EOF
+$pmix_cv_asm_text
+        addi r1,r1,0
+EOF
+if test "$CC" = "$CCAS" ; then
+    pmix_assemble="$CCAS $CCASFLAGS -c conftest.s >conftest.out 2>&1"
+else
+    pmix_assemble="$CCAS $CCASFLAGS -o conftest.o conftest.s >conftest.out 2>&1"
+fi
+if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$pmix_assemble\""; } >&5
+  (eval $pmix_assemble) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  # save the warnings
+  cat conftest.out >&5
+  pmix_cv_asm_powerpc_r_reg=1
+else
+  # save compiler output and failed program
+  cat conftest.out >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.s >&5
+  as_fn_error $? "Can not determine how to use PPC registers" "$LINENO" 5
+fi
+rm -rf conftest*
+unset pmix_assemble
+
+fi
+rm -rf conftest*
+unset pmix_assemble
+
+    if test "$pmix_cv_asm_powerpc_r_reg" = "1" ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+    else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    fi
+
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_POWERPC_R_REGISTERS $pmix_cv_asm_powerpc_r_reg
+_ACEOF
+
+
+            if test "$ac_cv_sizeof_long" = "4" ; then
+                pmix_cv_asm_arch="POWERPC32"
+
+                # Note that on some platforms (Apple G5), even if we are
+                # compiling in 32 bit mode (and therefore should assume
+                # sizeof(long) == 4), we can use the 64 bit test and set
+                # operations.
+
+    if test "$ac_cv_sizeof_long" != "4" ; then
+        # this function should only be called in the 32 bit case
+        as_fn_error $? "CHECK_POWERPC_64BIT called on 64 bit platform.  Internal error." "$LINENO" 5
+    fi
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit PowerPC assembly support" >&5
+$as_echo_n "checking for 64-bit PowerPC assembly support... " >&6; }
+        case $host in
+            *-darwin*)
+                ppc64_result=0
+                if test "$pmix_cv_asm_powerpc_r_reg" = "1" ; then
+                   ldarx_asm="        ldarx r1,r1,r1";
+                else
+                   ldarx_asm="        ldarx 1,1,1";
+                fi
+                cat >conftest.s <<EOF
+$pmix_cv_asm_text
+        $ldarx_asm
+EOF
+if test "$CC" = "$CCAS" ; then
+    pmix_assemble="$CCAS $CCASFLAGS -c conftest.s >conftest.out 2>&1"
+else
+    pmix_assemble="$CCAS $CCASFLAGS -o conftest.o conftest.s >conftest.out 2>&1"
+fi
+if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$pmix_assemble\""; } >&5
+  (eval $pmix_assemble) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  # save the warnings
+  cat conftest.out >&5
+  ppc64_result=1
+else
+  # save compiler output and failed program
+  cat conftest.out >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.s >&5
+  ppc64_result=0
+fi
+rm -rf conftest*
+unset pmix_assemble
+
+            ;;
+            *)
+                ppc64_result=0
+            ;;
+        esac
+
+    if test "$ppc64_result" = "1" ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+        PMIX_ASM_SUPPORT_64BIT=1
+    else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+        :
+    fi
+
+    unset ppc64_result ldarx_asm
+
+            elif test "$ac_cv_sizeof_long" = "8" ; then
+                PMIX_ASM_SUPPORT_64BIT=1
+                pmix_cv_asm_arch="POWERPC64"
+            else
+                as_fn_error $? "Could not determine PowerPC word size: $ac_cv_sizeof_long" "$LINENO" 5
+            fi
+            PMIX_GCC_INLINE_ASSIGN='"1: li %0,0" : "=&r"(ret)'
+            ;;
+        # There is no current difference between s390 and s390x
+        # But use two different defines in case some come later
+        # as s390 is 31bits while s390x is 64bits
+        s390-*)
+            pmix_cv_asm_arch="S390"
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __sync builtin atomics" >&5
+$as_echo_n "checking for __sync builtin atomics... " >&6; }
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+long tmp;
+int
+main ()
+{
+__sync_synchronize();
+__sync_bool_compare_and_swap(&tmp, 0, 1);
+__sync_add_and_fetch(&tmp, 1);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+     pmix_cv_asm_builtin="BUILTIN_SYNC"
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+     as_fn_error $? "No atomic primitives available for $host" "$LINENO" 5
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit __sync builtin atomics" >&5
+$as_echo_n "checking for 64-bit __sync builtin atomics... " >&6; }
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdint.h>
+uint64_t tmp;
+int
+main ()
+{
+
+__sync_bool_compare_and_swap(&tmp, 0, 1);
+__sync_add_and_fetch(&tmp, 1);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+     pmix_asm_sync_have_64bit=1
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+     pmix_asm_sync_have_64bit=0
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_ASM_SYNC_HAVE_64BIT $pmix_asm_sync_have_64bit
+_ACEOF
+
+
+  # Check for 128-bit support
+
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in sync_bool_compare_and_swap_128_result CFLAGS_save; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"sync_bool_compare_and_swap_128_result CFLAGS_save\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+  # Check whether --enable-cross-cmpset128 was given.
+if test "${enable_cross_cmpset128+set}" = set; then :
+  enableval=$enable_cross_cmpset128;
+fi
+
+
+  sync_bool_compare_and_swap_128_result=0
+
+  if test ! "$enable_cross_cmpset128" = "yes" ; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for processor support of __sync builtin atomic compare-and-swap on 128-bit values" >&5
+$as_echo_n "checking for processor support of __sync builtin atomic compare-and-swap on 128-bit values... " >&6; }
+
+      if test "$cross_compiling" = yes; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no (cross compiling)" >&5
+$as_echo "no (cross compiling)" >&6; }
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+__int128 x = 0; __sync_bool_compare_and_swap (&x, 0, 1);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	      sync_bool_compare_and_swap_128_result=1
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+
+      if test $sync_bool_compare_and_swap_128_result = 0 ; then
+	  CFLAGS_save=$CFLAGS
+	  CFLAGS="$CFLAGS -mcx16"
+
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __sync builtin atomic compare-and-swap on 128-bit values with -mcx16 flag" >&5
+$as_echo_n "checking for __sync builtin atomic compare-and-swap on 128-bit values with -mcx16 flag... " >&6; }
+	  if test "$cross_compiling" = yes; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no (cross compiling)" >&5
+$as_echo "no (cross compiling)" >&6; }
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+__int128 x = 0; __sync_bool_compare_and_swap (&x, 0, 1);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+		  sync_bool_compare_and_swap_128_result=1
+		  CFLAGS_save="$CFLAGS"
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+
+	  CFLAGS=$CFLAGS_save
+      fi
+  else
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compiler support of __sync builtin atomic compare-and-swap on 128-bit values" >&5
+$as_echo_n "checking for compiler support of __sync builtin atomic compare-and-swap on 128-bit values... " >&6; }
+
+      # Check if the compiler supports the __sync builtin
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+__int128 x = 0; __sync_bool_compare_and_swap (&x, 0, 1);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	      sync_bool_compare_and_swap_128_result=1
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+      if test $sync_bool_compare_and_swap_128_result = 0 ; then
+	  CFLAGS_save=$CFLAGS
+	  CFLAGS="$CFLAGS -mcx16"
+
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __sync builtin atomic compare-and-swap on 128-bit values with -mcx16 flag" >&5
+$as_echo_n "checking for __sync builtin atomic compare-and-swap on 128-bit values with -mcx16 flag... " >&6; }
+	  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+__int128 x = 0; __sync_bool_compare_and_swap (&x, 0, 1);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+		  sync_bool_compare_and_swap_128_result=1
+		  CFLAGS_save="$CFLAGS"
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+	  CFLAGS=$CFLAGS_save
+      fi
+  fi
+
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_HAVE_SYNC_BUILTIN_CSWAP_INT128 $sync_bool_compare_and_swap_128_result
+_ACEOF
+
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+
+            ;;
+        s390x-*)
+            pmix_cv_asm_arch="S390X"
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __sync builtin atomics" >&5
+$as_echo_n "checking for __sync builtin atomics... " >&6; }
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+long tmp;
+int
+main ()
+{
+__sync_synchronize();
+__sync_bool_compare_and_swap(&tmp, 0, 1);
+__sync_add_and_fetch(&tmp, 1);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+     pmix_cv_asm_builtin="BUILTIN_SYNC"
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+     as_fn_error $? "No atomic primitives available for $host" "$LINENO" 5
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit __sync builtin atomics" >&5
+$as_echo_n "checking for 64-bit __sync builtin atomics... " >&6; }
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdint.h>
+uint64_t tmp;
+int
+main ()
+{
+
+__sync_bool_compare_and_swap(&tmp, 0, 1);
+__sync_add_and_fetch(&tmp, 1);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+     pmix_asm_sync_have_64bit=1
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+     pmix_asm_sync_have_64bit=0
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_ASM_SYNC_HAVE_64BIT $pmix_asm_sync_have_64bit
+_ACEOF
+
+
+  # Check for 128-bit support
+
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in sync_bool_compare_and_swap_128_result CFLAGS_save; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"sync_bool_compare_and_swap_128_result CFLAGS_save\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+  # Check whether --enable-cross-cmpset128 was given.
+if test "${enable_cross_cmpset128+set}" = set; then :
+  enableval=$enable_cross_cmpset128;
+fi
+
+
+  sync_bool_compare_and_swap_128_result=0
+
+  if test ! "$enable_cross_cmpset128" = "yes" ; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for processor support of __sync builtin atomic compare-and-swap on 128-bit values" >&5
+$as_echo_n "checking for processor support of __sync builtin atomic compare-and-swap on 128-bit values... " >&6; }
+
+      if test "$cross_compiling" = yes; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no (cross compiling)" >&5
+$as_echo "no (cross compiling)" >&6; }
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+__int128 x = 0; __sync_bool_compare_and_swap (&x, 0, 1);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	      sync_bool_compare_and_swap_128_result=1
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+
+      if test $sync_bool_compare_and_swap_128_result = 0 ; then
+	  CFLAGS_save=$CFLAGS
+	  CFLAGS="$CFLAGS -mcx16"
+
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __sync builtin atomic compare-and-swap on 128-bit values with -mcx16 flag" >&5
+$as_echo_n "checking for __sync builtin atomic compare-and-swap on 128-bit values with -mcx16 flag... " >&6; }
+	  if test "$cross_compiling" = yes; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no (cross compiling)" >&5
+$as_echo "no (cross compiling)" >&6; }
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+__int128 x = 0; __sync_bool_compare_and_swap (&x, 0, 1);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+		  sync_bool_compare_and_swap_128_result=1
+		  CFLAGS_save="$CFLAGS"
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+
+	  CFLAGS=$CFLAGS_save
+      fi
+  else
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compiler support of __sync builtin atomic compare-and-swap on 128-bit values" >&5
+$as_echo_n "checking for compiler support of __sync builtin atomic compare-and-swap on 128-bit values... " >&6; }
+
+      # Check if the compiler supports the __sync builtin
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+__int128 x = 0; __sync_bool_compare_and_swap (&x, 0, 1);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	      sync_bool_compare_and_swap_128_result=1
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+      if test $sync_bool_compare_and_swap_128_result = 0 ; then
+	  CFLAGS_save=$CFLAGS
+	  CFLAGS="$CFLAGS -mcx16"
+
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __sync builtin atomic compare-and-swap on 128-bit values with -mcx16 flag" >&5
+$as_echo_n "checking for __sync builtin atomic compare-and-swap on 128-bit values with -mcx16 flag... " >&6; }
+	  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+__int128 x = 0; __sync_bool_compare_and_swap (&x, 0, 1);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+		  sync_bool_compare_and_swap_128_result=1
+		  CFLAGS_save="$CFLAGS"
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+	  CFLAGS=$CFLAGS_save
+      fi
+  fi
+
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_HAVE_SYNC_BUILTIN_CSWAP_INT128 $sync_bool_compare_and_swap_128_result
+_ACEOF
+
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+
+            ;;
+        sparc*-*)
+            # SPARC v9 (and above) are the only ones with 64bit support
+            # if compiling 32 bit, see if we are v9 (aka v8plus) or
+            # earlier (casa is v8+/v9).
+            if test "$ac_cv_sizeof_long" = "4" ; then
+                have_v8plus=0
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if have Sparc v8+/v9 support" >&5
+$as_echo_n "checking if have Sparc v8+/v9 support... " >&6; }
+    sparc_result=0
+    cat >conftest.s <<EOF
+$pmix_cv_asm_text
+	casa [%o0] 0x80, %o1, %o2
+EOF
+if test "$CC" = "$CCAS" ; then
+    pmix_assemble="$CCAS $CCASFLAGS -c conftest.s >conftest.out 2>&1"
+else
+    pmix_assemble="$CCAS $CCASFLAGS -o conftest.o conftest.s >conftest.out 2>&1"
+fi
+if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$pmix_assemble\""; } >&5
+  (eval $pmix_assemble) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  # save the warnings
+  cat conftest.out >&5
+  sparc_result=1
+else
+  # save compiler output and failed program
+  cat conftest.out >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.s >&5
+  sparc_result=0
+fi
+rm -rf conftest*
+unset pmix_assemble
+
+    if test "$sparc_result" = "1" ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+        have_v8plus=1
+    else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+        :
+    fi
+
+    unset sparc_result
+
+                if test "$have_v8plus" = "0" ; then
+                    PMIX_ASM_SUPPORT_64BIT=0
+                    pmix_cv_asm_arch="SPARC"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Sparc v8 target is not supported in this release of Open MPI." >&5
+$as_echo "$as_me: WARNING: Sparc v8 target is not supported in this release of Open MPI." >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You must specify the target architecture v8plus to compile" >&5
+$as_echo "$as_me: WARNING: You must specify the target architecture v8plus to compile" >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Open MPI in 32 bit mode on Sparc processors (see the README)." >&5
+$as_echo "$as_me: WARNING: Open MPI in 32 bit mode on Sparc processors (see the README)." >&2;}
+as_fn_error $? "Can not continue." "$LINENO" 5
+                else
+                    PMIX_ASM_SUPPORT_64BIT=1
+                    pmix_cv_asm_arch="SPARCV9_32"
+                fi
+
+            elif test "$ac_cv_sizeof_long" = "8" ; then
+                PMIX_ASM_SUPPORT_64BIT=1
+                pmix_cv_asm_arch="SPARCV9_64"
+            else
+                as_fn_error $? "Could not determine Sparc word size: $ac_cv_sizeof_long" "$LINENO" 5
+            fi
+            PMIX_GCC_INLINE_ASSIGN='"mov 0,%0" : "=&r"(ret)'
+            ;;
+
+        *)
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __sync builtin atomics" >&5
+$as_echo_n "checking for __sync builtin atomics... " >&6; }
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+long tmp;
+int
+main ()
+{
+__sync_synchronize();
+__sync_bool_compare_and_swap(&tmp, 0, 1);
+__sync_add_and_fetch(&tmp, 1);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+     pmix_cv_asm_builtin="BUILTIN_SYNC"
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+     as_fn_error $? "No atomic primitives available for $host" "$LINENO" 5
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit __sync builtin atomics" >&5
+$as_echo_n "checking for 64-bit __sync builtin atomics... " >&6; }
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdint.h>
+uint64_t tmp;
+int
+main ()
+{
+
+__sync_bool_compare_and_swap(&tmp, 0, 1);
+__sync_add_and_fetch(&tmp, 1);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+     pmix_asm_sync_have_64bit=1
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+     pmix_asm_sync_have_64bit=0
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_ASM_SYNC_HAVE_64BIT $pmix_asm_sync_have_64bit
+_ACEOF
+
+
+  # Check for 128-bit support
+
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in sync_bool_compare_and_swap_128_result CFLAGS_save; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"sync_bool_compare_and_swap_128_result CFLAGS_save\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+  # Check whether --enable-cross-cmpset128 was given.
+if test "${enable_cross_cmpset128+set}" = set; then :
+  enableval=$enable_cross_cmpset128;
+fi
+
+
+  sync_bool_compare_and_swap_128_result=0
+
+  if test ! "$enable_cross_cmpset128" = "yes" ; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for processor support of __sync builtin atomic compare-and-swap on 128-bit values" >&5
+$as_echo_n "checking for processor support of __sync builtin atomic compare-and-swap on 128-bit values... " >&6; }
+
+      if test "$cross_compiling" = yes; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no (cross compiling)" >&5
+$as_echo "no (cross compiling)" >&6; }
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+__int128 x = 0; __sync_bool_compare_and_swap (&x, 0, 1);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	      sync_bool_compare_and_swap_128_result=1
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+
+      if test $sync_bool_compare_and_swap_128_result = 0 ; then
+	  CFLAGS_save=$CFLAGS
+	  CFLAGS="$CFLAGS -mcx16"
+
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __sync builtin atomic compare-and-swap on 128-bit values with -mcx16 flag" >&5
+$as_echo_n "checking for __sync builtin atomic compare-and-swap on 128-bit values with -mcx16 flag... " >&6; }
+	  if test "$cross_compiling" = yes; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no (cross compiling)" >&5
+$as_echo "no (cross compiling)" >&6; }
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+__int128 x = 0; __sync_bool_compare_and_swap (&x, 0, 1);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+		  sync_bool_compare_and_swap_128_result=1
+		  CFLAGS_save="$CFLAGS"
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+
+	  CFLAGS=$CFLAGS_save
+      fi
+  else
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compiler support of __sync builtin atomic compare-and-swap on 128-bit values" >&5
+$as_echo_n "checking for compiler support of __sync builtin atomic compare-and-swap on 128-bit values... " >&6; }
+
+      # Check if the compiler supports the __sync builtin
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+__int128 x = 0; __sync_bool_compare_and_swap (&x, 0, 1);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	      sync_bool_compare_and_swap_128_result=1
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+      if test $sync_bool_compare_and_swap_128_result = 0 ; then
+	  CFLAGS_save=$CFLAGS
+	  CFLAGS="$CFLAGS -mcx16"
+
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __sync builtin atomic compare-and-swap on 128-bit values with -mcx16 flag" >&5
+$as_echo_n "checking for __sync builtin atomic compare-and-swap on 128-bit values with -mcx16 flag... " >&6; }
+	  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+__int128 x = 0; __sync_bool_compare_and_swap (&x, 0, 1);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+		  sync_bool_compare_and_swap_128_result=1
+		  CFLAGS_save="$CFLAGS"
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+	  CFLAGS=$CFLAGS_save
+      fi
+  fi
+
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_HAVE_SYNC_BUILTIN_CSWAP_INT128 $sync_bool_compare_and_swap_128_result
+_ACEOF
+
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+
+            ;;
+        esac
+
+	if test "x$PMIX_ASM_SUPPORT_64BIT" = "x1" && test "$pmix_cv_asm_builtin" = "BUILTIN_SYNC" &&
+		test "$pmix_asm_sync_have_64bit" = "0" ; then
+	    # __sync builtins exist but do not implement 64-bit support. Fall back on inline asm.
+	    pmix_cv_asm_builtin="BUILTIN_NO"
+	fi
+
+      if test "$pmix_cv_asm_builtin" = "BUILTIN_SYNC" || test "$pmix_cv_asm_builtin" = "BUILTIN_GCC" ; then
+
+$as_echo "#define PMIX_C_GCC_INLINE_ASSEMBLY 1" >>confdefs.h
+
+      else
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_ASM_SUPPORT_64BIT $PMIX_ASM_SUPPORT_64BIT
+_ACEOF
+
+
+
+        #
+        # figure out if we need any special function start / stop code
+        #
+        case $host_os in
+        aix*)
+            pmix_asm_arch_config="aix"
+            ;;
+        *)
+            pmix_asm_arch_config="default"
+            ;;
+         esac
+
+	 pmix_cv_asm_inline_supported="no"
+         # now that we know our architecture, try to inline assemble
+
+    assembly="$PMIX_GCC_INLINE_ASSIGN"
+    asm_result="unknown"
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports GCC inline assembly" >&5
+$as_echo_n "checking if $CC supports GCC inline assembly... " >&6; }
+
+    if test ! "$assembly" = "" ; then
+        if test "$cross_compiling" = yes; then :
+  asm_result="unknown"
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+
+int ret = 1;
+int negone = -1;
+__asm__ __volatile__ ($assembly);
+return ret;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  asm_result="yes"
+else
+  asm_result="no"
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+    else
+        assembly="test skipped - assuming no"
+    fi
+
+    # if we're cross compiling, just try to compile and figure good enough
+    if test "$asm_result" = "unknown" ; then
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+
+int ret = 1;
+int negone = -1;
+__asm__ __volatile__ ($assembly);
+return ret;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  asm_result="yes"
+else
+  asm_result="no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+    fi
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $asm_result" >&5
+$as_echo "$asm_result" >&6; }
+
+    if test "$asm_result" = "yes" ; then
+        PMIX_C_GCC_INLINE_ASSEMBLY=1
+	pmix_cv_asm_inline_supported="yes"
+    else
+        PMIX_C_GCC_INLINE_ASSEMBLY=0
+    fi
+
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_C_GCC_INLINE_ASSEMBLY $PMIX_C_GCC_INLINE_ASSEMBLY
+_ACEOF
+
+
+    unset PMIX_C_GCC_INLINE_ASSEMBLY assembly asm_result
+
+
+         # format:
+         #   config_file-text-global-label_suffix-gsym-lsym-type-size-align_log-ppc_r_reg-64_bit-gnu_stack
+         asm_format="${pmix_asm_arch_config}"
+         asm_format="${asm_format}-${pmix_cv_asm_text}-${pmix_cv_asm_global}"
+         asm_format="${asm_format}-${pmix_cv_asm_label_suffix}-${pmix_cv_asm_gsym}"
+         asm_format="${asm_format}-${pmix_cv_asm_lsym}"
+         asm_format="${asm_format}-${pmix_cv_asm_type}-${pmix_asm_size}"
+         asm_format="${asm_format}-${pmix_asm_align_log_result}"
+         if test "$pmix_cv_asm_arch" = "POWERPC32" || test "$pmix_cv_asm_arch" = "POWERPC64" ; then
+             asm_format="${asm_format}-${pmix_cv_asm_powerpc_r_reg}"
+         else
+             asm_format="${asm_format}-1"
+         fi
+         asm_format="${asm_format}-${PMIX_ASM_SUPPORT_64BIT}"
+         pmix_cv_asm_format="${asm_format}-${pmix_cv_asm_gnu_stack}"
+         # For the Makefile, need to escape the $ as $$.  Don't display
+         # this version, but make sure the Makefile gives the right thing
+         # when regenerating the files because the base has been touched.
+         PMIX_ASSEMBLY_FORMAT=`echo "$pmix_cv_asm_format" | sed -e 's/\\\$/\\\$\\\$/'`
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for assembly format" >&5
+$as_echo_n "checking for assembly format... " >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pmix_cv_asm_format" >&5
+$as_echo "$pmix_cv_asm_format" >&6; }
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_ASSEMBLY_FORMAT "$PMIX_ASSEMBLY_FORMAT"
+_ACEOF
+
+
+      fi # if pmix_cv_asm_builtin = BUILTIN_SYNC
+
+    result="PMIX_$pmix_cv_asm_arch"
+    PMIX_ASSEMBLY_ARCH="$pmix_cv_asm_arch"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for assembly architecture" >&5
+$as_echo_n "checking for assembly architecture... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pmix_cv_asm_arch" >&5
+$as_echo "$pmix_cv_asm_arch" >&6; }
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_ASSEMBLY_ARCH $result
+_ACEOF
+
+
+
+    # Check for RDTSCP support
+    result=0
+    if test "$pmix_cv_asm_arch" = "PMIX_X86_64" || test "$pmix_cv_asm_arch" = "PMIX_IA32"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for RDTSCP assembly support" >&5
+$as_echo_n "checking for RDTSCP assembly support... " >&6; }
+           ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+           if test "$cross_compiling" = yes; then :
+  #cross compile not supported
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"no (cross compiling)\"" >&5
+$as_echo "\"no (cross compiling)\"" >&6; }
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+[
+int main(int argc, char* argv[])
+{
+  unsigned int rax, rdx;
+  __asm__ __volatile__ ("rdtscp\n": "=a" (rax), "=d" (rdx):: "%rax", "%rdx");
+  return 0;
+}
+           ]
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  result=1
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+           ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_ASSEMBLY_SUPPORTS_RDTSCP $result
+_ACEOF
+
+
+    result="PMIX_$pmix_cv_asm_builtin"
+    PMIX_ASSEMBLY_BUILTIN="$pmix_cv_asm_builtin"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for builtin atomics" >&5
+$as_echo_n "checking for builtin atomics... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pmix_cv_asm_builtin" >&5
+$as_echo "$pmix_cv_asm_builtin" >&6; }
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_ASSEMBLY_BUILTIN $result
+_ACEOF
+
+
+
+
+
+
+
+if test "$pmix_cv_asm_arch" != "WINDOWS" && test "$pmix_cv_asm_builtin" != "BUILTIN_SYNC" && test "$pmix_cv_asm_builtin" != "BUILTIN_GCC" && test "$pmix_cv_asm_builtin" != "BUILTIN_OSX"  && test "$pmix_cv_asm_inline_arch" = "no" ; then
+    as_fn_error $? "no atomic support available. exiting" "$LINENO" 5
+else
+    # On windows with VC++, atomics are done with compiler primitives
+    pmix_cv_asm_file=""
+fi
+
+
+    unset result asm_format
+
+
+
+    ##################################
+    # Header files
+    ##################################
+
+    pmix_show_title "Header file tests"
+
+    for ac_header in arpa/inet.h \
+                      fcntl.h ifaddrs.h inttypes.h libgen.h \
+                      net/uio.h netinet/in.h \
+                      stdint.h stddef.h \
+                      stdlib.h string.h strings.h \
+                      sys/ioctl.h sys/param.h \
+                      sys/select.h sys/socket.h sys/sockio.h \
+                      stdarg.h sys/stat.h sys/time.h \
+                      sys/types.h sys/un.h sys/uio.h \
+                      sys/wait.h syslog.h \
+                      time.h unistd.h dirent.h \
+                      crt_externs.h signal.h \
+                      ioLib.h sockLib.h hostLib.h limits.h \
+                      sys/statfs.h sys/statvfs.h \
+                      netdb.h ucred.h zlib.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+    for ac_header in sys/mount.h
+do :
+  ac_fn_c_check_header_compile "$LINENO" "sys/mount.h" "ac_cv_header_sys_mount_h" "$ac_includes_default
+                      #if HAVE_SYS_PARAM_H
+                      #include <sys/param.h>
+                      #endif
+
+"
+if test "x$ac_cv_header_sys_mount_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SYS_MOUNT_H 1
+_ACEOF
+
+fi
+
+done
+
+
+    for ac_header in sys/sysctl.h
+do :
+  ac_fn_c_check_header_compile "$LINENO" "sys/sysctl.h" "ac_cv_header_sys_sysctl_h" "$ac_includes_default
+                      #if HAVE_SYS_PARAM_H
+                      #include <sys/param.h>
+                      #endif
+
+"
+if test "x$ac_cv_header_sys_sysctl_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SYS_SYSCTL_H 1
+_ACEOF
+
+fi
+
+done
+
+
+    # Needed to work around Darwin requiring sys/socket.h for
+    # net/if.h
+    for ac_header in net/if.h
+do :
+  ac_fn_c_check_header_compile "$LINENO" "net/if.h" "ac_cv_header_net_if_h" "#include <stdio.h>
+                      #if STDC_HEADERS
+                      # include <stdlib.h>
+                      # include <stddef.h>
+                      #else
+                      # if HAVE_STDLIB_H
+                      #  include <stdlib.h>
+                      # endif
+                      #endif
+                      #if HAVE_SYS_SOCKET_H
+                      # include <sys/socket.h>
+                      #endif
+
+"
+if test "x$ac_cv_header_net_if_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_NET_IF_H 1
+_ACEOF
+
+fi
+
+done
+
+
+    # Note that sometimes we have <stdbool.h>, but it doesn't work (e.g.,
+    # have both Portland and GNU installed; using pgcc will find GNU's
+    # <stdbool.h>, which all it does -- by standard -- is define "bool" to
+    # "_Bool" [see
+    # http://pmixw.opengroup.org/onlinepubs/009695399/basedefs/stdbool.h.html],
+    # and Portland has no idea what to do with _Bool).
+
+    # So first figure out if we have <stdbool.h> (i.e., check the value of
+    # the macro HAVE_STDBOOL_H from the result of AC_CHECK_HEADERS,
+    # above).  If we do have it, then check to see if it actually works.
+    # Define PMIX_USE_STDBOOL_H as approrpaite.
+    for ac_header in stdbool.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "stdbool.h" "ac_cv_header_stdbool_h" "$ac_includes_default"
+if test "x$ac_cv_header_stdbool_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_STDBOOL_H 1
+_ACEOF
+ have_stdbool_h=1
+else
+  have_stdbool_h=0
+fi
+
+done
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if <stdbool.h> works" >&5
+$as_echo_n "checking if <stdbool.h> works... " >&6; }
+    if test "$have_stdbool_h" = "1"; then
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_includes_default
+                                                   #if HAVE_STDBOOL_H
+                                                   #include <stdbool.h>
+                                                   #endif
+
+int
+main ()
+{
+bool bar, foo = true; bar = foo;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  PMIX_USE_STDBOOL_H=1 MSG=yes
+else
+  PMIX_USE_STDBOOL_H=0 MSG=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    else
+        PMIX_USE_STDBOOL_H=0
+        MSG="no (don't have <stdbool.h>)"
+    fi
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_USE_STDBOOL_H $PMIX_USE_STDBOOL_H
+_ACEOF
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSG" >&5
+$as_echo "$MSG" >&6; }
+
+    # checkpoint results
+    cat >confcache <<\_ACEOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs, see configure's option --config-cache.
+# It is not useful on other systems.  If it contains results you don't
+# want to keep, you may remove or edit it.
+#
+# config.status only pays attention to the cache file if you give it
+# the --recheck option to rerun configure.
+#
+# `ac_cv_env_foo' variables (set or unset) will be overridden when
+# loading this file, other *unset* `ac_cv_foo' will be assigned the
+# following values.
+
+_ACEOF
+
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, we kill variables containing newlines.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+(
+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) { eval $ac_var=; unset $ac_var;} ;;
+      esac ;;
+    esac
+  done
+
+  (set) 2>&1 |
+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
+    *${as_nl}ac_space=\ *)
+      # `set' does not quote correctly, so add quotes: double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \.
+      sed -n \
+	"s/'/'\\\\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+      ;; #(
+    *)
+      # `set' quotes correctly as required by POSIX, so do not add quotes.
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+      ;;
+    esac |
+    sort
+) |
+  sed '
+     /^ac_cv_env_/b end
+     t clear
+     :clear
+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+     t end
+     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     :end' >>confcache
+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
+  if test -w "$cache_file"; then
+    if test "x$cache_file" != "x/dev/null"; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
+      if test ! -f "$cache_file" || test -h "$cache_file"; then
+	cat confcache >"$cache_file"
+      else
+        case $cache_file in #(
+        */* | ?:*)
+	  mv -f confcache "$cache_file"$$ &&
+	  mv -f "$cache_file"$$ "$cache_file" ;; #(
+        *)
+	  mv -f confcache "$cache_file" ;;
+	esac
+      fi
+    fi
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+  fi
+fi
+rm -f confcache
+
+    ##################################
+    # Types
+    ##################################
+
+    pmix_show_title "Type tests"
+
+    ac_fn_c_check_type "$LINENO" "socklen_t" "ac_cv_type_socklen_t" "$ac_includes_default
+                            #if HAVE_SYS_SOCKET_H
+                            #include <sys/socket.h>
+                            #endif
+                            #if HAVE_SYS_UN_H
+                            #include <sys/un.h>
+                            #endif
+                            #ifdef HAVE_NETINET_IN_H
+                            #include <netinet/in.h>
+                            #endif
+
+"
+if test "x$ac_cv_type_socklen_t" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_SOCKLEN_T 1
+_ACEOF
+
+
+fi
+ac_fn_c_check_type "$LINENO" "struct sockaddr_in" "ac_cv_type_struct_sockaddr_in" "$ac_includes_default
+                            #if HAVE_SYS_SOCKET_H
+                            #include <sys/socket.h>
+                            #endif
+                            #if HAVE_SYS_UN_H
+                            #include <sys/un.h>
+                            #endif
+                            #ifdef HAVE_NETINET_IN_H
+                            #include <netinet/in.h>
+                            #endif
+
+"
+if test "x$ac_cv_type_struct_sockaddr_in" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_SOCKADDR_IN 1
+_ACEOF
+
+
+fi
+ac_fn_c_check_type "$LINENO" "struct sockaddr_un" "ac_cv_type_struct_sockaddr_un" "$ac_includes_default
+                            #if HAVE_SYS_SOCKET_H
+                            #include <sys/socket.h>
+                            #endif
+                            #if HAVE_SYS_UN_H
+                            #include <sys/un.h>
+                            #endif
+                            #ifdef HAVE_NETINET_IN_H
+                            #include <netinet/in.h>
+                            #endif
+
+"
+if test "x$ac_cv_type_struct_sockaddr_un" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_SOCKADDR_UN 1
+_ACEOF
+
+
+fi
+ac_fn_c_check_type "$LINENO" "struct sockaddr_in6" "ac_cv_type_struct_sockaddr_in6" "$ac_includes_default
+                            #if HAVE_SYS_SOCKET_H
+                            #include <sys/socket.h>
+                            #endif
+                            #if HAVE_SYS_UN_H
+                            #include <sys/un.h>
+                            #endif
+                            #ifdef HAVE_NETINET_IN_H
+                            #include <netinet/in.h>
+                            #endif
+
+"
+if test "x$ac_cv_type_struct_sockaddr_in6" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_SOCKADDR_IN6 1
+_ACEOF
+
+
+fi
+ac_fn_c_check_type "$LINENO" "struct sockaddr_storage" "ac_cv_type_struct_sockaddr_storage" "$ac_includes_default
+                            #if HAVE_SYS_SOCKET_H
+                            #include <sys/socket.h>
+                            #endif
+                            #if HAVE_SYS_UN_H
+                            #include <sys/un.h>
+                            #endif
+                            #ifdef HAVE_NETINET_IN_H
+                            #include <netinet/in.h>
+                            #endif
+
+"
+if test "x$ac_cv_type_struct_sockaddr_storage" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_SOCKADDR_STORAGE 1
+_ACEOF
+
+
+fi
+
+
+    ac_fn_c_check_decl "$LINENO" "AF_UNSPEC" "ac_cv_have_decl_AF_UNSPEC" "$ac_includes_default
+                            #if HAVE_SYS_SOCKET_H
+                            #include <sys/socket.h>
+                            #endif
+                            #ifdef HAVE_NETINET_IN_H
+                            #include <netinet/in.h>
+                            #endif
+
+"
+if test "x$ac_cv_have_decl_AF_UNSPEC" = xyes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_AF_UNSPEC $ac_have_decl
+_ACEOF
+ac_fn_c_check_decl "$LINENO" "PF_UNSPEC" "ac_cv_have_decl_PF_UNSPEC" "$ac_includes_default
+                            #if HAVE_SYS_SOCKET_H
+                            #include <sys/socket.h>
+                            #endif
+                            #ifdef HAVE_NETINET_IN_H
+                            #include <netinet/in.h>
+                            #endif
+
+"
+if test "x$ac_cv_have_decl_PF_UNSPEC" = xyes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_PF_UNSPEC $ac_have_decl
+_ACEOF
+ac_fn_c_check_decl "$LINENO" "AF_INET6" "ac_cv_have_decl_AF_INET6" "$ac_includes_default
+                            #if HAVE_SYS_SOCKET_H
+                            #include <sys/socket.h>
+                            #endif
+                            #ifdef HAVE_NETINET_IN_H
+                            #include <netinet/in.h>
+                            #endif
+
+"
+if test "x$ac_cv_have_decl_AF_INET6" = xyes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_AF_INET6 $ac_have_decl
+_ACEOF
+ac_fn_c_check_decl "$LINENO" "PF_INET6" "ac_cv_have_decl_PF_INET6" "$ac_includes_default
+                            #if HAVE_SYS_SOCKET_H
+                            #include <sys/socket.h>
+                            #endif
+                            #ifdef HAVE_NETINET_IN_H
+                            #include <netinet/in.h>
+                            #endif
+
+"
+if test "x$ac_cv_have_decl_PF_INET6" = xyes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_PF_INET6 $ac_have_decl
+_ACEOF
+
+
+    # SA_RESTART in signal.h
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in MSG2; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"MSG2\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if SA_RESTART defined in signal.h" >&5
+$as_echo_n "checking if SA_RESTART defined in signal.h... " >&6; }
+                        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+                                            #include <signal.h>
+                                            #ifdef SA_RESTART
+                                            yes
+                                            #endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "yes" >/dev/null 2>&1; then :
+  MSG2=yes VALUE=1
+else
+  MSG2=no VALUE=0
+fi
+rm -f conftest*
+
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_HAVE_SA_RESTART $VALUE
+_ACEOF
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSG2" >&5
+$as_echo "$MSG2" >&6; }
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+    ac_fn_c_check_member "$LINENO" "struct sockaddr" "sa_len" "ac_cv_member_struct_sockaddr_sa_len" "
+                         #include <sys/types.h>
+                         #if HAVE_SYS_SOCKET_H
+                         #include <sys/socket.h>
+                         #endif
+
+"
+if test "x$ac_cv_member_struct_sockaddr_sa_len" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_SOCKADDR_SA_LEN 1
+_ACEOF
+
+
+fi
+
+
+    ac_fn_c_check_member "$LINENO" "struct dirent" "d_type" "ac_cv_member_struct_dirent_d_type" "
+                         #include <sys/types.h>
+                         #include <dirent.h>
+"
+if test "x$ac_cv_member_struct_dirent_d_type" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_DIRENT_D_TYPE 1
+_ACEOF
+
+
+fi
+
+
+    ac_fn_c_check_member "$LINENO" "siginfo_t" "si_fd" "ac_cv_member_siginfo_t_si_fd" "#include <signal.h>
+"
+if test "x$ac_cv_member_siginfo_t_si_fd" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_SIGINFO_T_SI_FD 1
+_ACEOF
+
+
+fi
+
+    ac_fn_c_check_member "$LINENO" "siginfo_t" "si_band" "ac_cv_member_siginfo_t_si_band" "#include <signal.h>
+"
+if test "x$ac_cv_member_siginfo_t_si_band" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_SIGINFO_T_SI_BAND 1
+_ACEOF
+
+
+fi
+
+
+    #
+    # Checks for struct member names in struct statfs
+    #
+    ac_fn_c_check_member "$LINENO" "struct statfs" "f_type" "ac_cv_member_struct_statfs_f_type" "
+                         $ac_includes_default
+                         #ifdef HAVE_SYS_VFS_H
+                         #include <sys/vfs.h>
+                         #endif
+                         #ifdef HAVE_SYS_STATFS_H
+                         #include <sys/statfs.h>
+                         #endif
+
+"
+if test "x$ac_cv_member_struct_statfs_f_type" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_STATFS_F_TYPE 1
+_ACEOF
+
+
+fi
+
+
+    ac_fn_c_check_member "$LINENO" "struct statfs" "f_fstypename" "ac_cv_member_struct_statfs_f_fstypename" "
+                         $ac_includes_default
+                         #ifdef HAVE_SYS_PARAM_H
+                         #include <sys/param.h>
+                         #endif
+                         #ifdef HAVE_SYS_MOUNT_H
+                         #include <sys/mount.h>
+                         #endif
+                         #ifdef HAVE_SYS_VFS_H
+                         #include <sys/vfs.h>
+                         #endif
+                         #ifdef HAVE_SYS_STATFS_H
+                         #include <sys/statfs.h>
+                         #endif
+
+"
+if test "x$ac_cv_member_struct_statfs_f_fstypename" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_STATFS_F_FSTYPENAME 1
+_ACEOF
+
+
+fi
+
+
+    #
+    # Checks for struct member names in struct statvfs
+    #
+    ac_fn_c_check_member "$LINENO" "struct statvfs" "f_basetype" "ac_cv_member_struct_statvfs_f_basetype" "
+                         $ac_includes_default
+                         #ifdef HAVE_SYS_STATVFS_H
+                         #include <sys/statvfs.h>
+                         #endif
+
+"
+if test "x$ac_cv_member_struct_statvfs_f_basetype" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_STATVFS_F_BASETYPE 1
+_ACEOF
+
+
+fi
+
+
+    ac_fn_c_check_member "$LINENO" "struct statvfs" "f_fstypename" "ac_cv_member_struct_statvfs_f_fstypename" "
+                         $ac_includes_default
+                         #ifdef HAVE_SYS_STATVFS_H
+                         #include <sys/statvfs.h>
+                         #endif
+
+"
+if test "x$ac_cv_member_struct_statvfs_f_fstypename" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_STATVFS_F_FSTYPENAME 1
+_ACEOF
+
+
+fi
+
+
+    ac_fn_c_check_member "$LINENO" "struct ucred" "uid" "ac_cv_member_struct_ucred_uid" "#include <sys/types.h>
+                      #include <sys/socket.h>
+"
+if test "x$ac_cv_member_struct_ucred_uid" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_UCRED_UID 1
+_ACEOF
+
+
+fi
+ac_fn_c_check_member "$LINENO" "struct ucred" "cr_uid" "ac_cv_member_struct_ucred_cr_uid" "#include <sys/types.h>
+                      #include <sys/socket.h>
+"
+if test "x$ac_cv_member_struct_ucred_cr_uid" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_UCRED_CR_UID 1
+_ACEOF
+
+
+fi
+ac_fn_c_check_member "$LINENO" "struct sockpeercred" "uid" "ac_cv_member_struct_sockpeercred_uid" "#include <sys/types.h>
+                      #include <sys/socket.h>
+"
+if test "x$ac_cv_member_struct_sockpeercred_uid" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_SOCKPEERCRED_UID 1
+_ACEOF
+
+
+fi
+
+
+    #
+    # Check for ptrdiff type.  Yes, there are platforms where
+    # sizeof(void*) != sizeof(long) (64 bit Windows, apparently).
+    #
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pointer diff type" >&5
+$as_echo_n "checking for pointer diff type... " >&6; }
+    if test $ac_cv_type_ptrdiff_t = yes ; then
+        pmix_ptrdiff_t="ptrdiff_t"
+        pmix_ptrdiff_size=$ac_cv_sizeof_ptrdiff_t
+    elif test $ac_cv_sizeof_void_p -eq $ac_cv_sizeof_long ; then
+        pmix_ptrdiff_t="long"
+        pmix_ptrdiff_size=$ac_cv_sizeof_long
+    elif test $ac_cv_type_long_long = yes && test $ac_cv_sizeof_void_p -eq $ac_cv_sizeof_long_long ; then
+        pmix_ptrdiff_t="long long"
+        pmix_ptrdiff_size=$ac_cv_sizeof_long_long
+        #else
+        #    AC_MSG_ERROR([Could not find datatype to emulate ptrdiff_t.  Cannot continue])
+    fi
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_PTRDIFF_TYPE $pmix_ptrdiff_t
+_ACEOF
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pmix_ptrdiff_t (size: $pmix_ptrdiff_size)" >&5
+$as_echo "$pmix_ptrdiff_t (size: $pmix_ptrdiff_size)" >&6; }
+
+    ##################################
+    # Linker characteristics
+    ##################################
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking the linker for support for the -fini option" >&5
+$as_echo_n "checking the linker for support for the -fini option... " >&6; }
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in LDFLAGS_save; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"LDFLAGS_save\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+    LDFLAGS_save=$LDFLAGS
+    LDFLAGS="$LDFLAGS_save -Wl,-fini -Wl,finalize"
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+void finalize (void) {}
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+            pmix_ld_have_fini=1
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+            pmix_ld_have_fini=0
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+    LDFLAGS=$LDFLAGS_save
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+    pmix_destructor_use_fini=0
+    pmix_no_destructor=0
+    if test x$pmix_cv___attribute__destructor = x0 ; then
+        if test x$pmix_ld_have_fini = x1 ; then
+            pmix_destructor_use_fini=1
+        else
+            pmix_no_destructor=1;
+        fi
+    fi
+
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_NO_LIB_DESTRUCTOR $pmix_no_destructor
+_ACEOF
+
+     if test x$pmix_destructor_use_fini = x1; then
+  PMIX_DESTRUCTOR_USE_FINI_TRUE=
+  PMIX_DESTRUCTOR_USE_FINI_FALSE='#'
+else
+  PMIX_DESTRUCTOR_USE_FINI_TRUE='#'
+  PMIX_DESTRUCTOR_USE_FINI_FALSE=
+fi
+
+
+    ##################################
+    # Libraries
+    ##################################
+
+    pmix_show_title "Library and Function tests"
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing socket" >&5
+$as_echo_n "checking for library containing socket... " >&6; }
+if ${ac_cv_search_socket+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+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 socket ();
+int
+main ()
+{
+return socket ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' socket; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_socket=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_socket+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_socket+:} false; then :
+
+else
+  ac_cv_search_socket=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_socket" >&5
+$as_echo "$ac_cv_search_socket" >&6; }
+ac_res=$ac_cv_search_socket
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  pmix_have_socket=1
+
+else
+  pmix_have_socket=0
+
+fi
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_HAVE_SOCKET $pmix_have_socket
+_ACEOF
+
+
+
+
+    # IRIX and CentOS have dirname in -lgen, usually in libc
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dirname" >&5
+$as_echo_n "checking for library containing dirname... " >&6; }
+if ${ac_cv_search_dirname+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+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 dirname ();
+int
+main ()
+{
+return dirname ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' gen; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_dirname=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_dirname+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_dirname+:} false; then :
+
+else
+  ac_cv_search_dirname=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_dirname" >&5
+$as_echo "$ac_cv_search_dirname" >&6; }
+ac_res=$ac_cv_search_dirname
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  pmix_have_dirname=1
+
+else
+  pmix_have_dirname=0
+
+fi
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_HAVE_DIRNAME $pmix_have_dirname
+_ACEOF
+
+
+
+
+    # Darwin doesn't need -lm, as it's a symlink to libSystem.dylib
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ceil" >&5
+$as_echo_n "checking for library containing ceil... " >&6; }
+if ${ac_cv_search_ceil+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+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 ceil ();
+int
+main ()
+{
+return ceil ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' m; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_ceil=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_ceil+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_ceil+:} false; then :
+
+else
+  ac_cv_search_ceil=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ceil" >&5
+$as_echo "$ac_cv_search_ceil" >&6; }
+ac_res=$ac_cv_search_ceil
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  pmix_have_ceil=1
+
+else
+  pmix_have_ceil=0
+
+fi
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_HAVE_CEIL $pmix_have_ceil
+_ACEOF
+
+
+
+
+    for ac_func in asprintf snprintf vasprintf vsnprintf strsignal socketpair strncpy_s usleep statfs statvfs getpeereid getpeerucred strnlen posix_fallocate
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+
+    # On some hosts, htonl is a define, so the AC_CHECK_FUNC will get
+    # confused.  On others, it's in the standard library, but stubbed with
+    # the magic glibc foo as not implemented.  and on other systems, it's
+    # just not there.  This covers all cases.
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for htonl define" >&5
+$as_echo_n "checking for htonl define... " >&6; }
+if ${pmix_cv_htonl_define+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+                                                          #ifdef HAVE_SYS_TYPES_H
+                                                          #include <sys/types.h>
+                                                          #endif
+                                                          #ifdef HAVE_NETINET_IN_H
+                                                          #include <netinet/in.h>
+                                                          #endif
+                                                          #ifdef HAVE_ARPA_INET_H
+                                                          #include <arpa/inet.h>
+                                                          #endif
+int
+main ()
+{
+
+                                                          #ifndef ntohl
+                                                          #error "ntohl not defined"
+                                                          #endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  pmix_cv_htonl_define=yes
+else
+  pmix_cv_htonl_define=no
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pmix_cv_htonl_define" >&5
+$as_echo "$pmix_cv_htonl_define" >&6; }
+    ac_fn_c_check_func "$LINENO" "htonl" "ac_cv_func_htonl"
+if test "x$ac_cv_func_htonl" = xyes; then :
+  pmix_have_htonl=yes
+else
+  pmix_have_htonl=no
+fi
+
+    if test "$pmix_cv_htonl_define" = "yes" || test "$pmix_have_htonl" = "yes"; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_UNIX_BYTESWAP 1
+_ACEOF
+
+fi
+
+    # check pandoc separately so we can setup an AM_CONDITIONAL off it
+    # Extract the first word of "pandoc", so it can be a program name with args.
+set dummy pandoc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_pmix_have_pandoc+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$pmix_have_pandoc"; then
+  ac_cv_prog_pmix_have_pandoc="$pmix_have_pandoc" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_pmix_have_pandoc="yes"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_prog_pmix_have_pandoc" && ac_cv_prog_pmix_have_pandoc="no"
+fi
+fi
+pmix_have_pandoc=$ac_cv_prog_pmix_have_pandoc
+if test -n "$pmix_have_pandoc"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pmix_have_pandoc" >&5
+$as_echo "$pmix_have_pandoc" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+     if test "x$pmix_have_pandoc" = "xyes"; then
+  PMIX_HAVE_PANDOC_TRUE=
+  PMIX_HAVE_PANDOC_FALSE='#'
+else
+  PMIX_HAVE_PANDOC_TRUE='#'
+  PMIX_HAVE_PANDOC_FALSE=
+fi
+
+
+    #
+    # Make sure we can copy va_lists (need check declared, not linkable)
+    #
+
+    ac_fn_c_check_decl "$LINENO" "va_copy" "ac_cv_have_decl_va_copy" "#include <stdarg.h>
+"
+if test "x$ac_cv_have_decl_va_copy" = xyes; then :
+  PMIX_HAVE_VA_COPY=1
+else
+  PMIX_HAVE_VA_COPY=0
+fi
+
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_HAVE_VA_COPY $PMIX_HAVE_VA_COPY
+_ACEOF
+
+
+    ac_fn_c_check_decl "$LINENO" "__va_copy" "ac_cv_have_decl___va_copy" "#include <stdarg.h>
+"
+if test "x$ac_cv_have_decl___va_copy" = xyes; then :
+  PMIX_HAVE_UNDERSCORE_VA_COPY=1
+else
+  PMIX_HAVE_UNDERSCORE_VA_COPY=0
+fi
+
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_HAVE_UNDERSCORE_VA_COPY $PMIX_HAVE_UNDERSCORE_VA_COPY
+_ACEOF
+
+
+    ac_fn_c_check_decl "$LINENO" "__func__" "ac_cv_have_decl___func__" "$ac_includes_default"
+if test "x$ac_cv_have_decl___func__" = xyes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL___FUNC__ $ac_have_decl
+_ACEOF
+
+
+    # checkpoint results
+    cat >confcache <<\_ACEOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs, see configure's option --config-cache.
+# It is not useful on other systems.  If it contains results you don't
+# want to keep, you may remove or edit it.
+#
+# config.status only pays attention to the cache file if you give it
+# the --recheck option to rerun configure.
+#
+# `ac_cv_env_foo' variables (set or unset) will be overridden when
+# loading this file, other *unset* `ac_cv_foo' will be assigned the
+# following values.
+
+_ACEOF
+
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, we kill variables containing newlines.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+(
+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) { eval $ac_var=; unset $ac_var;} ;;
+      esac ;;
+    esac
+  done
+
+  (set) 2>&1 |
+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
+    *${as_nl}ac_space=\ *)
+      # `set' does not quote correctly, so add quotes: double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \.
+      sed -n \
+	"s/'/'\\\\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+      ;; #(
+    *)
+      # `set' quotes correctly as required by POSIX, so do not add quotes.
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+      ;;
+    esac |
+    sort
+) |
+  sed '
+     /^ac_cv_env_/b end
+     t clear
+     :clear
+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+     t end
+     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     :end' >>confcache
+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
+  if test -w "$cache_file"; then
+    if test "x$cache_file" != "x/dev/null"; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
+      if test ! -f "$cache_file" || test -h "$cache_file"; then
+	cat confcache >"$cache_file"
+      else
+        case $cache_file in #(
+        */* | ?:*)
+	  mv -f confcache "$cache_file"$$ &&
+	  mv -f "$cache_file"$$ "$cache_file" ;; #(
+        *)
+	  mv -f confcache "$cache_file" ;;
+	esac
+      fi
+    fi
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+  fi
+fi
+rm -f confcache
+
+    ##################################
+    # System-specific tests
+    ##################################
+
+    pmix_show_title "System-specific tests"
+
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
+$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
+if ${ac_cv_c_bigendian+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_c_bigendian=unknown
+    # See if we're dealing with a universal compiler.
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifndef __APPLE_CC__
+	       not a universal capable compiler
+	     #endif
+	     typedef int dummy;
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+	# Check for potential -arch flags.  It is not universal unless
+	# there are at least two -arch flags with different values.
+	ac_arch=
+	ac_prev=
+	for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
+	 if test -n "$ac_prev"; then
+	   case $ac_word in
+	     i?86 | x86_64 | ppc | ppc64)
+	       if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
+		 ac_arch=$ac_word
+	       else
+		 ac_cv_c_bigendian=universal
+		 break
+	       fi
+	       ;;
+	   esac
+	   ac_prev=
+	 elif test "x$ac_word" = "x-arch"; then
+	   ac_prev=arch
+	 fi
+       done
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    if test $ac_cv_c_bigendian = unknown; then
+      # See if sys/param.h defines the BYTE_ORDER macro.
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+	     #include <sys/param.h>
+
+int
+main ()
+{
+#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
+		     && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
+		     && LITTLE_ENDIAN)
+	      bogus endian macros
+	     #endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  # It does; now see whether it defined to BIG_ENDIAN or not.
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+		#include <sys/param.h>
+
+int
+main ()
+{
+#if BYTE_ORDER != BIG_ENDIAN
+		 not big endian
+		#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_c_bigendian=yes
+else
+  ac_cv_c_bigendian=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    fi
+    if test $ac_cv_c_bigendian = unknown; then
+      # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <limits.h>
+
+int
+main ()
+{
+#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
+	      bogus endian macros
+	     #endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  # It does; now see whether it defined to _BIG_ENDIAN or not.
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <limits.h>
+
+int
+main ()
+{
+#ifndef _BIG_ENDIAN
+		 not big endian
+		#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_c_bigendian=yes
+else
+  ac_cv_c_bigendian=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    fi
+    if test $ac_cv_c_bigendian = unknown; then
+      # Compile a test program.
+      if test "$cross_compiling" = yes; then :
+  # Try to guess by grepping values from an object file.
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+short int ascii_mm[] =
+		  { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
+		short int ascii_ii[] =
+		  { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
+		int use_ascii (int i) {
+		  return ascii_mm[i] + ascii_ii[i];
+		}
+		short int ebcdic_ii[] =
+		  { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
+		short int ebcdic_mm[] =
+		  { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
+		int use_ebcdic (int i) {
+		  return ebcdic_mm[i] + ebcdic_ii[i];
+		}
+		extern int foo;
+
+int
+main ()
+{
+return use_ascii (foo) == use_ebcdic (foo);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
+	      ac_cv_c_bigendian=yes
+	    fi
+	    if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
+	      if test "$ac_cv_c_bigendian" = unknown; then
+		ac_cv_c_bigendian=no
+	      else
+		# finding both strings is unlikely to happen, but who knows?
+		ac_cv_c_bigendian=unknown
+	      fi
+	    fi
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+
+	     /* Are we little or big endian?  From Harbison&Steele.  */
+	     union
+	     {
+	       long int l;
+	       char c[sizeof (long int)];
+	     } u;
+	     u.l = 1;
+	     return u.c[sizeof (long int) - 1] == 1;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  ac_cv_c_bigendian=no
+else
+  ac_cv_c_bigendian=yes
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+    fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
+$as_echo "$ac_cv_c_bigendian" >&6; }
+ case $ac_cv_c_bigendian in #(
+   yes)
+     $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h
+;; #(
+   no)
+      ;; #(
+   universal)
+
+$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
+
+     ;; #(
+   *)
+     as_fn_error $? "unknown endianness
+ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
+ esac
+
+
+
+# Check whether --with-broken-qsort was given.
+if test "${with_broken_qsort+set}" = set; then :
+  withval=$with_broken_qsort;
+fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken qsort" >&5
+$as_echo_n "checking for broken qsort... " >&6; }
+
+  if test "$with_broken_qsort" = "yes"; then
+    result="yes"
+    define_result=1
+  else
+    result="no"
+    define_result=0
+  fi
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_HAVE_BROKEN_QSORT $define_result
+_ACEOF
+
+
+
+    #
+    # Check out what thread support we have
+    #
+
+#
+# Arguments: none
+#
+# Dependencies: None
+#
+# Modifies:
+#  none - see called tests
+#
+# configure threads
+#
+
+#
+# Check we have POSIX threads
+#
+
+
+
+pmix_pthread_c_success=0
+pmix_pthread_cxx_success=0
+
+orig_CFLAGS="$CFLAGS"
+orig_FCFLAGS="$FCFLAGS"
+orig_CXXFLAGS="$CXXFLAGS"
+orig_CPPFLAGS="$CPPFLAGS"
+orig_CXXCPPFLAGS="$CXXCPPFLAGS"
+orig_LDFLAGS="$LDFLAGS"
+orig_LIBS="$LIBS"
+
+PTHREAD_CFLAGS=
+PTHREAD_FCFLAGS=
+PTHREAD_CXXFLAGS=
+PTHREAD_CPPFLAGS=
+PTHREAD_CXXCPPFLAGS=
+PTHREAD_LDFLAGS=
+PTHREAD_LIBS=
+
+# Try with the basics, mam.
+
+# BEGIN: PMIX_INTL_POSIX_THREADS_PLAIN
+#
+# Check if can compile without any special flags
+# we throw -D_REENTRANT or -D_THREAD_SAFE in here, just in
+# case.  Some systems (OS X, for example) generally don't need
+# the defines, but then will on one system header here or there
+# why take chances?
+#
+
+# Only run C++ and Fortran if those compilers already configured
+
+#
+# C compiler
+#
+if test "$pmix_pthread_c_success" = "0"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if C compiler and POSIX threads work as is" >&5
+$as_echo_n "checking if C compiler and POSIX threads work as is... " >&6; }
+
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+# BEGIN: PMIX_INTL_PTHREAD_TRY_LINK
+#
+# Make sure that we can run a small application in C or C++, which
+# ever is the current language.  Do make sure that C or C++ is the
+# current language.
+#
+# As long as this is not being run....
+# pthread_t may be anything from an int to a struct -- init with self-tid.
+#
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <pthread.h>
+
+int i = 3;
+pthread_t me, newthread;
+
+void cleanup_routine(void *foo);
+void *thread_main(void *foo);
+
+void cleanup_routine(void *foo) { i = 4; }
+void *thread_main(void *foo) { i = 2; return (void*) &i; }
+
+int main(int argc, char* argv[])
+{
+    pthread_attr_t attr;
+
+    me = pthread_self();
+    pthread_atfork(NULL, NULL, NULL);
+    pthread_attr_init(&attr);
+    pthread_cleanup_push(cleanup_routine, 0);
+    pthread_create(&newthread, &attr, thread_main, 0);
+    pthread_join(newthread, 0);
+    pthread_cleanup_pop(0);
+
+    return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  pmix_pthread_c_success=1
+else
+  pmix_pthread_c_success=0
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+# END: PMIX_INTL_PTHREAD_TRY_LINK
+
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+  if test "$pmix_pthread_c_success" = "1"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+  fi
+fi
+
+
+
+#
+# C++ compiler
+#
+if test "$pmix_pthread_cxx_success" = "0"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if C++ compiler and POSIX threads work as is" >&5
+$as_echo_n "checking if C++ compiler and POSIX threads work as is... " >&6; }
+
+  ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+
+# BEGIN: PMIX_INTL_PTHREAD_TRY_LINK
+#
+# Make sure that we can run a small application in C or C++, which
+# ever is the current language.  Do make sure that C or C++ is the
+# current language.
+#
+# As long as this is not being run....
+# pthread_t may be anything from an int to a struct -- init with self-tid.
+#
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <pthread.h>
+
+int i = 3;
+pthread_t me, newthread;
+
+void cleanup_routine(void *foo);
+void *thread_main(void *foo);
+
+void cleanup_routine(void *foo) { i = 4; }
+void *thread_main(void *foo) { i = 2; return (void*) &i; }
+
+int main(int argc, char* argv[])
+{
+    pthread_attr_t attr;
+
+    me = pthread_self();
+    pthread_atfork(NULL, NULL, NULL);
+    pthread_attr_init(&attr);
+    pthread_cleanup_push(cleanup_routine, 0);
+    pthread_create(&newthread, &attr, thread_main, 0);
+    pthread_join(newthread, 0);
+    pthread_cleanup_pop(0);
+
+    return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+  pmix_pthread_cxx_success=1
+else
+  pmix_pthread_cxx_success=0
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+# END: PMIX_INTL_PTHREAD_TRY_LINK
+
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+  if test "$pmix_pthread_cxx_success" = "1"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+  fi
+fi
+
+
+pmix_pthread_fortran_success=1
+
+# End: PMIX_INTL_POSIX_THREADS_PLAIN
+
+
+# Try the super-special compiler flags.
+
+# Begin: PMIX_INTL_POSIX_THREADS_SPECIAL_FLAGS
+#
+# If above didn't work, try some super-special compiler flags
+# that get evaluated to the "right" things.
+#
+# -Kthread:
+# -kthread:  FreeBSD kernel threads
+# -pthread:  Modern GCC (most all platforms)
+# -pthreads: GCC on solaris
+# -mthreads:
+# -mt:       Solaris native compilers / HP-UX aCC
+#
+# Put -mt before -mthreads because HP-UX aCC will properly compile
+# with -mthreads (reading as -mt), but emit a warning about unknown
+# flags hreads.  Stupid compilers.
+
+case "${host_cpu}-${host_os}" in
+  *solaris*)
+    pflags="-pthread -pthreads -mt"
+  ;;
+  *)
+    pflags="-Kthread -kthread -pthread -pthreads -mt -mthreads"
+  ;;
+esac
+
+# Only run C++ and Fortran if those compilers already configured
+
+#
+# C compiler
+#
+if test "$pmix_pthread_c_success" = "0"; then
+  for pf in $pflags; do
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if C compiler and POSIX threads work with $pf" >&5
+$as_echo_n "checking if C compiler and POSIX threads work with $pf... " >&6; }
+    CFLAGS="$orig_CFLAGS $pf"
+    ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+# BEGIN: PMIX_INTL_PTHREAD_TRY_LINK
+#
+# Make sure that we can run a small application in C or C++, which
+# ever is the current language.  Do make sure that C or C++ is the
+# current language.
+#
+# As long as this is not being run....
+# pthread_t may be anything from an int to a struct -- init with self-tid.
+#
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <pthread.h>
+
+int i = 3;
+pthread_t me, newthread;
+
+void cleanup_routine(void *foo);
+void *thread_main(void *foo);
+
+void cleanup_routine(void *foo) { i = 4; }
+void *thread_main(void *foo) { i = 2; return (void*) &i; }
+
+int main(int argc, char* argv[])
+{
+    pthread_attr_t attr;
+
+    me = pthread_self();
+    pthread_atfork(NULL, NULL, NULL);
+    pthread_attr_init(&attr);
+    pthread_cleanup_push(cleanup_routine, 0);
+    pthread_create(&newthread, &attr, thread_main, 0);
+    pthread_join(newthread, 0);
+    pthread_cleanup_pop(0);
+
+    return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  pmix_pthread_c_success=1
+else
+  pmix_pthread_c_success=0
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+# END: PMIX_INTL_PTHREAD_TRY_LINK
+
+    ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+    if test "$pmix_pthread_c_success" = "1"; then
+      PTHREAD_CFLAGS="$pf"
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+      break
+    else
+      PTHREAD_CFLAGS=
+      CFLAGS="$orig_CFLAGS"
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    fi
+  done
+fi
+
+
+
+#
+# C++ compiler
+#
+if test "$pmix_pthread_cxx_success" = "0"; then
+  for pf in $pflags; do
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if C++ compiler and POSIX threads work with $pf" >&5
+$as_echo_n "checking if C++ compiler and POSIX threads work with $pf... " >&6; }
+    CXXFLAGS="$orig_CXXFLAGS $pf"
+    ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+
+# BEGIN: PMIX_INTL_PTHREAD_TRY_LINK
+#
+# Make sure that we can run a small application in C or C++, which
+# ever is the current language.  Do make sure that C or C++ is the
+# current language.
+#
+# As long as this is not being run....
+# pthread_t may be anything from an int to a struct -- init with self-tid.
+#
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <pthread.h>
+
+int i = 3;
+pthread_t me, newthread;
+
+void cleanup_routine(void *foo);
+void *thread_main(void *foo);
+
+void cleanup_routine(void *foo) { i = 4; }
+void *thread_main(void *foo) { i = 2; return (void*) &i; }
+
+int main(int argc, char* argv[])
+{
+    pthread_attr_t attr;
+
+    me = pthread_self();
+    pthread_atfork(NULL, NULL, NULL);
+    pthread_attr_init(&attr);
+    pthread_cleanup_push(cleanup_routine, 0);
+    pthread_create(&newthread, &attr, thread_main, 0);
+    pthread_join(newthread, 0);
+    pthread_cleanup_pop(0);
+
+    return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+  pmix_pthread_cxx_success=1
+else
+  pmix_pthread_cxx_success=0
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+# END: PMIX_INTL_PTHREAD_TRY_LINK
+
+    ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+    if test "$pmix_pthread_cxx_success" = "1"; then
+      PTHREAD_CXXFLAGS="$pf"
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+      break
+    else
+      PTHREAD_CXXFLAGS=
+      CXXFLAGS="$orig_CXXFLAGS"
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    fi
+  done
+fi
+
+
+pmix_pthread_fortran_success=1
+
+# End: PMIX_INTL_POSIX_THREADS_SPECIAL_FLAGS
+
+
+# Try the normal linking methods (that's no fun)
+
+# Begin: PMIX_INTL_POSIX_THREADS_LIBS
+#
+# if we can't find a super-special compiler flags, try some libraries.
+# we throw -D_REENTRANT or -D_THREAD_SAFE in here, just in case.  Some
+# systems (OS X, for example) generally don't need the defines, but
+# then will on one system header here or there why take chances?
+#
+# libpthreads: AIX - must check before libpthread
+# liblthread:  LinuxThreads on FreeBSD
+# libpthread:  The usual place (like we can define usual!)
+plibs="-lpthreads -llthread -lpthread"
+
+# Only run C++ and Fortran if those compilers already configured
+
+#
+# C compiler
+#
+if test "$pmix_pthread_c_success" = "0"; then
+  for pl in $plibs; do
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if C compiler and POSIX threads work with $pl" >&5
+$as_echo_n "checking if C compiler and POSIX threads work with $pl... " >&6; }
+    case "${host_cpu}-${host-_os}" in
+      *-aix* | *-freebsd*)
+        if test "`echo $CPPFLAGS | $GREP 'D_THREAD_SAFE'`" = ""; then
+          PTHREAD_CPPFLAGS="-D_THREAD_SAFE"
+          CPPFLAGS="$CPPFLAGS $PTHREAD_CPPFLAGS"
+        fi
+      ;;
+      *)
+        if test "`echo $CPPFLAGS | $GREP 'D_REENTRANT'`" = ""; then
+          PTHREAD_CPPFLAGS="-D_REENTRANT"
+          CPPFLAGS="$CPPFLAGS $PTHREAD_CPPFLAGS"
+        fi
+      ;;
+    esac
+    LIBS="$orig_LIBS $pl"
+    ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+# BEGIN: PMIX_INTL_PTHREAD_TRY_LINK
+#
+# Make sure that we can run a small application in C or C++, which
+# ever is the current language.  Do make sure that C or C++ is the
+# current language.
+#
+# As long as this is not being run....
+# pthread_t may be anything from an int to a struct -- init with self-tid.
+#
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <pthread.h>
+
+int i = 3;
+pthread_t me, newthread;
+
+void cleanup_routine(void *foo);
+void *thread_main(void *foo);
+
+void cleanup_routine(void *foo) { i = 4; }
+void *thread_main(void *foo) { i = 2; return (void*) &i; }
+
+int main(int argc, char* argv[])
+{
+    pthread_attr_t attr;
+
+    me = pthread_self();
+    pthread_atfork(NULL, NULL, NULL);
+    pthread_attr_init(&attr);
+    pthread_cleanup_push(cleanup_routine, 0);
+    pthread_create(&newthread, &attr, thread_main, 0);
+    pthread_join(newthread, 0);
+    pthread_cleanup_pop(0);
+
+    return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  pmix_pthread_c_success=1
+else
+  pmix_pthread_c_success=0
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+# END: PMIX_INTL_PTHREAD_TRY_LINK
+
+    ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+    if test "$pmix_pthread_c_success" = "1"; then
+      PTHREAD_LIBS="$pl"
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+    else
+      PTHREAD_CPPFLAGS=
+      CPPFLAGS="$orig_CPPFLAGS"
+      LIBS="$orig_LIBS"
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    fi
+  done
+fi
+
+
+
+#
+# C++ compiler
+#
+if test "$pmix_pthread_cxx_success" = "0"; then
+  if test ! "$pmix_pthread_c_success" = "0" && test ! "$PTHREAD_LIBS" = "" ; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if C++ compiler and POSIX threads work with $PTHREAD_LIBS" >&5
+$as_echo_n "checking if C++ compiler and POSIX threads work with $PTHREAD_LIBS... " >&6; }
+    case "${host_cpu}-${host-_os}" in
+      *-aix* | *-freebsd*)
+        if test "`echo $CXXCPPFLAGS | $GREP 'D_THREAD_SAFE'`" = ""; then
+          PTHREAD_CXXCPPFLAGS="-D_THREAD_SAFE"
+          CXXCPPFLAGS="$CXXCPPFLAGS $PTHREAD_CXXCPPFLAGS"
+        fi
+      ;;
+      *)
+        if test "`echo $CXXCPPFLAGS | $GREP 'D_REENTRANT'`" = ""; then
+          PTHREAD_CXXCPPFLAGS="-D_REENTRANT"
+          CXXCPPFLAGS="$CXXCPPFLAGS $PTHREAD_CXXCPPFLAGS"
+        fi
+      ;;
+    esac
+    LIBS="$orig_LIBS $PTHREAD_LIBS"
+    ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+
+# BEGIN: PMIX_INTL_PTHREAD_TRY_LINK
+#
+# Make sure that we can run a small application in C or C++, which
+# ever is the current language.  Do make sure that C or C++ is the
+# current language.
+#
+# As long as this is not being run....
+# pthread_t may be anything from an int to a struct -- init with self-tid.
+#
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <pthread.h>
+
+int i = 3;
+pthread_t me, newthread;
+
+void cleanup_routine(void *foo);
+void *thread_main(void *foo);
+
+void cleanup_routine(void *foo) { i = 4; }
+void *thread_main(void *foo) { i = 2; return (void*) &i; }
+
+int main(int argc, char* argv[])
+{
+    pthread_attr_t attr;
+
+    me = pthread_self();
+    pthread_atfork(NULL, NULL, NULL);
+    pthread_attr_init(&attr);
+    pthread_cleanup_push(cleanup_routine, 0);
+    pthread_create(&newthread, &attr, thread_main, 0);
+    pthread_join(newthread, 0);
+    pthread_cleanup_pop(0);
+
+    return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+  pmix_pthread_cxx_success=1
+else
+  pmix_pthread_cxx_success=0
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+# END: PMIX_INTL_PTHREAD_TRY_LINK
+
+    ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+    if test "$pmix_pthread_cxx_success" = "1"; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+    else
+      CXXCPPFLAGS="$orig_CXXCPPFLAGS"
+      LIBS="$orig_LIBS"
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+      as_fn_error $? "Can not find working threads configuration.  aborting" "$LINENO" 5
+    fi
+  else
+    for pl in $plibs; do
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking if C++ compiler and POSIX threads work with $pl" >&5
+$as_echo_n "checking if C++ compiler and POSIX threads work with $pl... " >&6; }
+      case "${host_cpu}-${host-_os}" in
+        *-aix* | *-freebsd*)
+          if test "`echo $CXXCPPFLAGS | $GREP 'D_THREAD_SAFE'`" = ""; then
+            PTHREAD_CXXCPPFLAGS="-D_THREAD_SAFE"
+            CXXCPPFLAGS="$CXXCPPFLAGS $PTHREAD_CXXCPPFLAGS"
+          fi
+        ;;
+        *)
+          if test "`echo $CXXCPPFLAGS | $GREP 'D_REENTRANT'`" = ""; then
+            PTHREAD_CXXCPPFLAGS="-D_REENTRANT"
+            CXXCPPFLAGS="$CXXCPPFLAGS $PTHREAD_CXXCPPFLAGS"
+          fi
+        ;;
+      esac
+      LIBS="$orig_LIBS $pl"
+      ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+
+# BEGIN: PMIX_INTL_PTHREAD_TRY_LINK
+#
+# Make sure that we can run a small application in C or C++, which
+# ever is the current language.  Do make sure that C or C++ is the
+# current language.
+#
+# As long as this is not being run....
+# pthread_t may be anything from an int to a struct -- init with self-tid.
+#
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <pthread.h>
+
+int i = 3;
+pthread_t me, newthread;
+
+void cleanup_routine(void *foo);
+void *thread_main(void *foo);
+
+void cleanup_routine(void *foo) { i = 4; }
+void *thread_main(void *foo) { i = 2; return (void*) &i; }
+
+int main(int argc, char* argv[])
+{
+    pthread_attr_t attr;
+
+    me = pthread_self();
+    pthread_atfork(NULL, NULL, NULL);
+    pthread_attr_init(&attr);
+    pthread_cleanup_push(cleanup_routine, 0);
+    pthread_create(&newthread, &attr, thread_main, 0);
+    pthread_join(newthread, 0);
+    pthread_cleanup_pop(0);
+
+    return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+  pmix_pthread_cxx_success=1
+else
+  pmix_pthread_cxx_success=0
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+# END: PMIX_INTL_PTHREAD_TRY_LINK
+
+      ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+      if test "$pmix_pthread_cxx_success" = "1"; then
+	PTHREAD_LIBS="$pl"
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+      else
+        PTHREAD_CXXCPPFLAGS=
+        CXXCPPFLAGS="$orig_CXXCPPFLAGS"
+        LIBS="$orig_LIBS"
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+      fi
+    done
+  fi
+fi
+
+
+pmix_pthread_fortran_success=1
+
+# End: PMIX_INTL_POSIX_THREADS_LIBS
+
+
+#
+# check to see if we can create shared memory mutexes and conditions
+#
+for ac_func in pthread_mutexattr_setpshared pthread_condattr_setpshared
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+
+#
+# check to see if we can set error checking mutexes
+#
+
+# LinuxThreads
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PTHREAD_MUTEX_ERRORCHECK_NP" >&5
+$as_echo_n "checking for PTHREAD_MUTEX_ERRORCHECK_NP... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <pthread.h>
+int
+main ()
+{
+pthread_mutexattr_settype(NULL, PTHREAD_MUTEX_ERRORCHECK_NP);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  result="yes" defval=1
+else
+  result="no" defval=0
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_HAVE_PTHREAD_MUTEX_ERRORCHECK_NP $defval
+_ACEOF
+
+
+# Mac OS X
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PTHREAD_MUTEX_ERRORCHECK" >&5
+$as_echo_n "checking for PTHREAD_MUTEX_ERRORCHECK... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <pthread.h>
+int
+main ()
+{
+pthread_mutexattr_settype(NULL, PTHREAD_MUTEX_ERRORCHECK);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  result="yes" defval=1
+else
+  result="no" defval=0
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_HAVE_PTHREAD_MUTEX_ERRORCHECK $defval
+_ACEOF
+
+
+CFLAGS="$orig_CFLAGS"
+FCFLAGS="$orig_FCFLAGS"
+CXXFLAGS="$orig_CXXFLAGS"
+CPPFLAGS="$orig_CPPFLAGS"
+CXXCPPFLAGS="$orig_CXXCPPFLAGS"
+LDFLAGS="$orig_LDFLAGS"
+LIBS="$orig_LIBS"
+
+if test "$pmix_pthread_c_success" = "1" && \
+   test "$pmix_pthread_cxx_success" = "1"; then
+  internal_useless=1
+  HAVE_POSIX_THREADS=1
+else
+  internal_useless=1
+  HAVE_POSIX_THREADS=0
+fi
+
+unset pmix_pthread_c_success pmix_pthread_fortran_success pmix_pthread_cxx_success
+unset internal_useless
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working POSIX threads package" >&5
+$as_echo_n "checking for working POSIX threads package... " >&6; }
+if test "$HAVE_POSIX_THREADS" = "1" ; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+export HAVE_POSIX_THREADS
+
+#
+# Ask what threading we want (allow posix right now)
+#
+
+if test "$HAVE_POSIX_THREADS" = "0"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"*** POSIX threads are not\"" >&5
+$as_echo "$as_me: WARNING: \"*** POSIX threads are not\"" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"*** available on your system \"" >&5
+$as_echo "$as_me: WARNING: \"*** available on your system \"" >&2;}
+    as_fn_error $? "\"*** Can not continue\"" "$LINENO" 5
+fi
+
+THREAD_CFLAGS="$PTHREAD_CFLAGS"
+THREAD_FCFLAGS="$PTHREAD_FCFLAGS"
+THREAD_CXXFLAGS="$PTHREAD_CXXFLAGS"
+THREAD_CPPFLAGS="$PTHREAD_CPPFLAGS"
+THREAD_CXXCPPFLAGS="$PTHREAD_CXXCPPFLAGS"
+THREAD_LDFLAGS="$PTHREAD_LDFLAGS"
+THREAD_LIBS="$PTHREAD_LIBS"
+
+
+#
+# Arguments: none
+#
+# Dependencies: None
+#
+# Sets:
+#  PMIX_THREADS_HAVE_DIFFERENT_PIDS (variable)
+#
+# Test for Linux-like threads in the system.  PMIX does not support
+# systems with different PIDs for threads in the same process, so error
+# out if we detect that case.
+#
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if threads have different pids (pthreads on linux)" >&5
+$as_echo_n "checking if threads have different pids (pthreads on linux)... " >&6; }
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in tpids_CFLAGS_save tpids_CPPFLAGS_save tpids_LDFLAGS_save tpids_LIBS_save tpids_MSG; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"tpids_CFLAGS_save tpids_CPPFLAGS_save tpids_LDFLAGS_save tpids_LIBS_save tpids_MSG\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+tpids_CFLAGS_save="$CFLAGS"
+CFLAGS="$CFLAGS $THREAD_CFLAGS"
+tpids_CPPFLAGS_save="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $THREAD_CPPFLAGS"
+tpids_LDFLAGS_save="$LDFLAGS"
+LDFLAGS="$LDFLAGS $THREAD_LDFLAGS"
+tpids_LIBS_save="$LIBS"
+LIBS="$LIBS $THREAD_LIBS"
+if test "$cross_compiling" = yes; then :
+
+ # If we're cross compiling, we can't do another AC_* function here beause
+ # it we haven't displayed the result from the last one yet.  So defer
+ # another test until below.
+ PMIX_THREADS_HAVE_DIFFERENT_PIDS=
+ MSG="cross compiling (need another test)"
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <pthread.h>
+#include <sys/types.h>
+#include <unistd.h>
+#include <stdlib.h>
+
+void *checkpid(void *arg);
+int main() {
+  pthread_t thr;
+  int pid, *retval;
+  pid = getpid();
+  pthread_create(&thr, NULL, checkpid, &pid);
+  pthread_join(thr, (void **) &retval);
+  exit(*retval);
+}
+
+static int ret;
+void *checkpid(void *arg) {
+   int ppid = *((int *) arg);
+   if (ppid == getpid())
+     ret = 0;
+   else
+     ret = 1;
+   pthread_exit((void *) &ret);
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  tpids_MSG=no PMIX_THREADS_HAVE_DIFFERENT_PIDS=0
+else
+  tpids_MSG=yes PMIX_THREADS_HAVE_DIFFERENT_PIDS=1
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+
+CFLAGS="$tpids_CFLAGS_save"
+CPPFLAGS="$tpids_CPPFLAGS_save"
+LDFLAGS="$tpids_LDFLAGS_save"
+LIBS="$tpids_LIBS_save"
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tpids_MSG" >&5
+$as_echo "$tpids_MSG" >&6; }
+
+if test "x$PMIX_THREADS_HAVE_DIFFERENT_PIDS" = "x"; then :
+   # If we are cross-compiling, look for the symbol
+       # __linuxthreads_create_event, which seems to only exist in the
+       # Linux Threads-based pthreads implementation (i.e., the one
+       # that has different PIDs for each thread).  We *could* switch
+       # on $host here and only test *linux* hosts, but this test is
+       # pretty unique, so why bother?  Note that AC_CHECK_FUNC works
+       # properly in cross-compiling environments in recent-enough
+       # versions of Autoconf (which is one of the reasons we mandate
+       # recent versions in autogen!).
+       ac_fn_c_check_func "$LINENO" "__linuxthreads_create_event" "ac_cv_func___linuxthreads_create_event"
+if test "x$ac_cv_func___linuxthreads_create_event" = xyes; then :
+  PMIX_THREADS_HAVE_DIFFERENT_PIDS=1
+fi
+
+fi
+
+if test "$PMIX_THREADS_HAVE_DIFFERENT_PIDS" = "1"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This version of PMIx only supports environments where" >&5
+$as_echo "$as_me: WARNING: This version of PMIx only supports environments where" >&2;}
+       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: threads have the same PID" >&5
+$as_echo "$as_me: WARNING: threads have the same PID" >&2;}
+       as_fn_error $? "Cannot continue" "$LINENO" 5
+
+fi
+
+#
+# if pthreads is not available, then the system does not have an insane threads
+# model
+#
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_ENABLE_MULTI_THREADS 1
+_ACEOF
+
+
+
+
+    CFLAGS="$CFLAGS $THREAD_CFLAGS"
+    CPPFLAGS="$CPPFLAGS $THREAD_CPPFLAGS"
+    CXXFLAGS="$CXXFLAGS $THREAD_CXXFLAGS"
+    CXXCPPFLAGS="$CXXCPPFLAGS $THREAD_CXXCPPFLAGS"
+    LDFLAGS="$LDFLAGS $THREAD_LDFLAGS"
+    LIBS="$LIBS $THREAD_LIBS"
+
+    #
+    # What is the local equivalent of "ln -s"
+    #
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
+$as_echo_n "checking whether ln -s works... " >&6; }
+LN_S=$as_ln_s
+if test "$LN_S" = "ln -s"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
+$as_echo "no, using $LN_S" >&6; }
+fi
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
+if ${ac_cv_path_GREP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$GREP"; then
+  ac_path_GREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in grep ggrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_GREP" || continue
+# Check for GNU ac_path_GREP and select it if it is found.
+  # Check for GNU $ac_path_GREP
+case `"$ac_path_GREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo 'GREP' >> "conftest.nl"
+    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_GREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_GREP="$ac_path_GREP"
+      ac_path_GREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_GREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_GREP"; then
+    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
+else
+  ac_cv_path_GREP=$GREP
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
+$as_echo "$ac_cv_path_GREP" >&6; }
+ GREP="$ac_cv_path_GREP"
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
+if ${ac_cv_path_EGREP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+   then ac_cv_path_EGREP="$GREP -E"
+   else
+     if test -z "$EGREP"; then
+  ac_path_EGREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in egrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_EGREP" || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
+  # Check for GNU $ac_path_EGREP
+case `"$ac_path_EGREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo 'EGREP' >> "conftest.nl"
+    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_EGREP="$ac_path_EGREP"
+      ac_path_EGREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_EGREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_EGREP"; then
+    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
+else
+  ac_cv_path_EGREP=$EGREP
+fi
+
+   fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
+ EGREP="$ac_cv_path_EGREP"
+
+
+
+
+    ##################################
+    # Visibility
+    ##################################
+
+    # Check the visibility declspec at the end to avoid problem with
+    # the previous tests that are not necessarily prepared for
+    # the visibility feature.
+    pmix_show_title "Symbol visibility feature"
+
+
+
+
+    # Check if the compiler has support for visibility, like some
+    # versions of gcc, icc Sun Studio cc.
+    # Check whether --enable-visibility was given.
+if test "${enable_visibility+set}" = set; then :
+  enableval=$enable_visibility;
+fi
+
+
+    WANT_VISIBILITY=0
+    pmix_msg="whether to enable symbol visibility"
+
+    if test "$enable_visibility" = "no"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking $pmix_msg" >&5
+$as_echo_n "checking $pmix_msg... " >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no (disabled)" >&5
+$as_echo "no (disabled)" >&6; }
+    else
+        CFLAGS_orig=$CFLAGS
+
+        pmix_add=
+        case "$pmix_c_vendor" in
+        sun)
+            # Check using Sun Studio -xldscope=hidden flag
+            pmix_add=-xldscope=hidden
+            CFLAGS="$PMIX_CFLAGS_BEFORE_PICKY $pmix_add -errwarn=%all"
+            ;;
+
+        *)
+            # Check using -fvisibility=hidden
+            pmix_add=-fvisibility=hidden
+            CFLAGS="$PMIX_CFLAGS_BEFORE_PICKY $pmix_add -Werror"
+            ;;
+        esac
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports $pmix_add" >&5
+$as_echo_n "checking if $CC supports $pmix_add... " >&6; }
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+            #include <stdio.h>
+            __attribute__((visibility("default"))) int foo;
+
+int
+main ()
+{
+fprintf(stderr, "Hello, world\n");
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  if test -s conftest.err; then :
+  $GREP -iq visibility conftest.err
+                    # If we find "visibility" in the stderr, then
+                    # assume it doesn't work
+                    if test "$?" = "0"; then :
+  pmix_add=
+fi
+fi
+
+else
+  pmix_add=
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+        if test "$pmix_add" = ""; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+fi
+
+        CFLAGS=$CFLAGS_orig
+        PMIX_VISIBILITY_CFLAGS=$pmix_add
+
+        if test "$pmix_add" != "" ; then
+            WANT_VISIBILITY=1
+            CFLAGS="$CFLAGS $PMIX_VISIBILITY_CFLAGS"
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking $pmix_msg" >&5
+$as_echo_n "checking $pmix_msg... " >&6; }
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (via $pmix_add)" >&5
+$as_echo "yes (via $pmix_add)" >&6; }
+        elif test "$enable_visibility" = "yes"; then
+            as_fn_error $? "Symbol visibility support requested but compiler does not seem to support it.  Aborting" "$LINENO" 5
+        else
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking $pmix_msg" >&5
+$as_echo_n "checking $pmix_msg... " >&6; }
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: no (unsupported)" >&5
+$as_echo "no (unsupported)" >&6; }
+        fi
+        unset pmix_add
+    fi
+
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_HAVE_VISIBILITY $WANT_VISIBILITY
+_ACEOF
+
+     if test "$WANT_VISIBILITY" = "1"; then
+  WANT_HIDDEN_TRUE=
+  WANT_HIDDEN_FALSE='#'
+else
+  WANT_HIDDEN_TRUE='#'
+  WANT_HIDDEN_FALSE=
+fi
+
+
+
+    ##################################
+    # Libevent
+    ##################################
+    pmix_show_title "Libevent"
+
+
+
+# Check whether --with-libevent-header was given.
+if test "${with_libevent_header+set}" = set; then :
+  withval=$with_libevent_header;
+fi
+
+
+    # Check whether --enable-embedded-libevent was given.
+if test "${enable_embedded_libevent+set}" = set; then :
+  enableval=$enable_embedded_libevent;
+fi
+
+
+    if test "$enable_embedded_libevent" = "yes"; then :
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libevent" >&5
+$as_echo_n "checking for libevent... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: assumed available (embedded mode)" >&5
+$as_echo "assumed available (embedded mode)" >&6; }
+
+    if test -z "$with_libevent_header" || test "$with_libevent_header" = "yes"; then :
+  PMIX_EVENT_HEADER="<event.h>"
+           PMIX_EVENT2_THREAD_HEADER="<event2/thread.h>"
+else
+  PMIX_EVENT_HEADER="$with_libevent_header"
+           PMIX_EVENT2_THREAD_HEADER="$with_libevent_header"
+fi
+
+
+else
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_event_dir pmix_event_libdir; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_event_dir pmix_event_libdir\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+
+# Check whether --with-libevent was given.
+if test "${with_libevent+set}" = set; then :
+  withval=$with_libevent;
+fi
+
+
+    # Bozo check
+    if test "$with_libevent" = "no"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: It is not possible to configure PMIx --without-libevent" >&5
+$as_echo "$as_me: WARNING: It is not possible to configure PMIx --without-libevent" >&2;}
+           as_fn_error $? "Cannot continue" "$LINENO" 5
+fi
+
+
+# Check whether --with-libevent-libdir was given.
+if test "${with_libevent_libdir+set}" = set; then :
+  withval=$with_libevent_libdir;
+fi
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libevent in" >&5
+$as_echo_n "checking for libevent in... " >&6; }
+    if test ! -z "$with_libevent" && test "$with_libevent" != "yes"; then
+        pmix_event_dir=$with_libevent
+        if test -d $with_libevent/lib; then
+            pmix_event_libdir=$with_libevent/lib
+        elif test -d $with_libevent/lib64; then
+            pmix_event_libdir=$with_libevent/lib64
+        else
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: Could not find $with_libevent/lib or $with_libevent/lib64" >&5
+$as_echo "Could not find $with_libevent/lib or $with_libevent/lib64" >&6; }
+            as_fn_error $? "Can not continue" "$LINENO" 5
+        fi
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pmix_event_dir and $pmix_event_libdir" >&5
+$as_echo "$pmix_event_dir and $pmix_event_libdir" >&6; }
+    else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: (default search paths)" >&5
+$as_echo "(default search paths)" >&6; }
+    fi
+    if test ! -z "$with_libevent_libdir" && "$with_libevent_libdir" != "yes"; then :
+  pmix_event_libdir="$with_libevent_libdir"
+fi
+
+
+    pmix_check_package_pmix_libevent_save_CPPFLAGS="$CPPFLAGS"
+    pmix_check_package_pmix_libevent_save_LDFLAGS="$LDFLAGS"
+    pmix_check_package_pmix_libevent_save_LIBS="$LIBS"
+
+    pmix_check_package_pmix_libevent_orig_CPPFLAGS="$pmix_libevent_CPPFLAGS"
+    pmix_check_package_pmix_libevent_orig_LDFLAGS="$pmix_libevent_LDFLAGS"
+    pmix_check_package_pmix_libevent_orig_LIBS="$pmix_libevent_LIBS"
+
+
+    # This is stolen from autoconf to peek under the covers to get the
+    # cache variable for the library check.  one should not copy this
+    # code into other places unless you want much pain and suffering
+
+
+    # so this sucks, but there's no way to get through the progression
+    # of header includes without killing off the cache variable and trying
+    # again...
+    unset ac_cv_header_event_h
+
+    pmix_check_package_header_happy="no"
+    if test "$pmix_event_dir" = "/usr" || test "$pmix_event_dir" = "/usr/local"; then :
+   # try as is...
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: looking for header without includes" >&5
+$as_echo "looking for header without includes" >&6; }
+            for ac_header in event.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "event.h" "ac_cv_header_event_h" "$ac_includes_default"
+if test "x$ac_cv_header_event_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_EVENT_H 1
+_ACEOF
+ pmix_check_package_header_happy="yes"
+fi
+
+done
+
+            if test "$pmix_check_package_header_happy" = "no"; then :
+  # no go on the as is - reset the cache and try again
+                   unset ac_cv_header_event_h
+fi
+fi
+
+    if test "$pmix_check_package_header_happy" = "no"; then :
+  if test "$pmix_event_dir" != ""; then :
+  pmix_libevent_CPPFLAGS="$pmix_libevent_CPPFLAGS -I$pmix_event_dir/include"
+                  CPPFLAGS="$CPPFLAGS -I$pmix_event_dir/include"
+fi
+          for ac_header in event.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "event.h" "ac_cv_header_event_h" "$ac_includes_default"
+if test "x$ac_cv_header_event_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_EVENT_H 1
+_ACEOF
+ pmix_check_package_header_happy="yes"
+fi
+
+done
+
+	  if test "$pmix_check_package_header_happy" = "yes"; then :
+
+    # This is stolen from autoconf to peek under the covers to get the
+    # cache variable for the library check.  one should not copy this
+    # code into other places unless you want much pain and suffering
+
+    # see comment above
+    unset ac_cv_lib_event_event_config_new
+    pmix_check_package_lib_happy="no"
+    if test "$pmix_event_libdir" != ""; then :
+   # libdir was specified - search only there
+           pmix_libevent_LDFLAGS="$pmix_libevent_LDFLAGS -L$pmix_event_libdir"
+           LDFLAGS="$LDFLAGS -L$pmix_event_libdir"
+           { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing event_config_new" >&5
+$as_echo_n "checking for library containing event_config_new... " >&6; }
+if ${ac_cv_search_event_config_new+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+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 event_config_new ();
+int
+main ()
+{
+return event_config_new ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' event; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib -levent -levent_pthreads $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_event_config_new=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_event_config_new+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_event_config_new+:} false; then :
+
+else
+  ac_cv_search_event_config_new=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_event_config_new" >&5
+$as_echo "$ac_cv_search_event_config_new" >&6; }
+ac_res=$ac_cv_search_event_config_new
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  pmix_check_package_lib_happy="yes"
+else
+  pmix_check_package_lib_happy="no"
+fi
+
+           if test "$pmix_check_package_lib_happy" = "no"; then :
+  LDFLAGS="$pmix_check_package_pmix_libevent_save_LDFLAGS"
+                  pmix_libevent_LDFLAGS="$pmix_check_package_pmix_libevent_orig_LDFLAGS"
+                  unset ac_cv_lib_event_event_config_new
+fi
+else
+   # libdir was not specified - go through search path
+           pmix_check_package_libdir="$pmix_event_dir"
+           if test "$pmix_check_package_libdir" = "" || test "$pmix_check_package_libdir" = "/usr" || test "$pmix_check_package_libdir" = "/usr/local"; then :
+   # try as is...
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: looking for library without search path" >&5
+$as_echo "looking for library without search path" >&6; }
+                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing event_config_new" >&5
+$as_echo_n "checking for library containing event_config_new... " >&6; }
+if ${ac_cv_search_event_config_new+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+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 event_config_new ();
+int
+main ()
+{
+return event_config_new ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' event; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib -levent -levent_pthreads $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_event_config_new=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_event_config_new+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_event_config_new+:} false; then :
+
+else
+  ac_cv_search_event_config_new=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_event_config_new" >&5
+$as_echo "$ac_cv_search_event_config_new" >&6; }
+ac_res=$ac_cv_search_event_config_new
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  pmix_check_package_lib_happy="yes"
+else
+  pmix_check_package_lib_happy="no"
+fi
+
+                if test "$pmix_check_package_lib_happy" = "no"; then :
+   # no go on the as is..  see what happens later...
+                     LDFLAGS="$pmix_check_package_pmix_libevent_save_LDFLAGS"
+                     pmix_libevent_LDFLAGS="$pmix_check_package_pmix_libevent_orig_LDFLAGS"
+                     unset ac_cv_lib_event_event_config_new
+fi
+fi
+
+           if test "$pmix_check_package_lib_happy" = "no"; then :
+  if test "$pmix_check_package_libdir" != ""; then :
+  pmix_libevent_LDFLAGS="$pmix_libevent_LDFLAGS -L$pmix_check_package_libdir/lib"
+                     LDFLAGS="$LDFLAGS -L$pmix_check_package_libdir/lib"
+                     { $as_echo "$as_me:${as_lineno-$LINENO}: result: looking for library in lib" >&5
+$as_echo "looking for library in lib" >&6; }
+                     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing event_config_new" >&5
+$as_echo_n "checking for library containing event_config_new... " >&6; }
+if ${ac_cv_search_event_config_new+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+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 event_config_new ();
+int
+main ()
+{
+return event_config_new ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' event; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib -levent -levent_pthreads $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_event_config_new=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_event_config_new+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_event_config_new+:} false; then :
+
+else
+  ac_cv_search_event_config_new=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_event_config_new" >&5
+$as_echo "$ac_cv_search_event_config_new" >&6; }
+ac_res=$ac_cv_search_event_config_new
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  pmix_check_package_lib_happy="yes"
+else
+  pmix_check_package_lib_happy="no"
+fi
+
+                     if test "$pmix_check_package_lib_happy" = "no"; then :
+   # no go on the as is..  see what happens later...
+                          LDFLAGS="$pmix_check_package_pmix_libevent_save_LDFLAGS"
+                          pmix_libevent_LDFLAGS="$pmix_check_package_pmix_libevent_orig_LDFLAGS"
+                          unset ac_cv_lib_event_event_config_new
+fi
+fi
+fi
+
+           if test "$pmix_check_package_lib_happy" = "no"; then :
+  if test "$pmix_check_package_libdir" != ""; then :
+  pmix_libevent_LDFLAGS="$pmix_libevent_LDFLAGS -L$pmix_check_package_libdir/lib64"
+                     LDFLAGS="$LDFLAGS -L$pmix_check_package_libdir/lib64"
+                     { $as_echo "$as_me:${as_lineno-$LINENO}: result: looking for library in lib64" >&5
+$as_echo "looking for library in lib64" >&6; }
+                     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing event_config_new" >&5
+$as_echo_n "checking for library containing event_config_new... " >&6; }
+if ${ac_cv_search_event_config_new+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+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 event_config_new ();
+int
+main ()
+{
+return event_config_new ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' event; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib -levent -levent_pthreads $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_event_config_new=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_event_config_new+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_event_config_new+:} false; then :
+
+else
+  ac_cv_search_event_config_new=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_event_config_new" >&5
+$as_echo "$ac_cv_search_event_config_new" >&6; }
+ac_res=$ac_cv_search_event_config_new
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  pmix_check_package_lib_happy="yes"
+else
+  pmix_check_package_lib_happy="no"
+fi
+
+                     if test "$pmix_check_package_lib_happy" = "no"; then :
+   # no go on the as is..  see what happens later...
+                          LDFLAGS="$pmix_check_package_pmix_libevent_save_LDFLAGS"
+                          pmix_libevent_LDFLAGS="$pmix_check_package_pmix_libevent_orig_LDFLAGS"
+                          unset ac_cv_lib_event_event_config_new
+fi
+fi
+fi
+fi
+
+    if test "$pmix_check_package_lib_happy" = "yes"; then :
+  pmix_libevent_LIBS="-levent -levent -levent_pthreads"
+           pmix_check_package_happy="yes"
+else
+  pmix_check_package_happy="no"
+fi
+    if test "$pmix_check_package_lib_happy" = "yes"; then :
+   # The result of AC SEARCH_LIBS is cached in $ac_cv_search_[function]
+           if test "$ac_cv_search_event_config_new" != "no" &&
+                  test "$ac_cv_search_event_config_new" != "none required"; then :
+  pmix_libevent_LIBS="$ac_cv_search_event_config_new -levent -levent_pthreads"
+else
+  pmix_libevent_LIBS="-levent -levent_pthreads"
+fi
+           pmix_check_package_happy="yes"
+else
+  pmix_check_package_happy="no"
+fi
+
+
+else
+  pmix_check_package_happy="no"
+fi
+else
+
+    # This is stolen from autoconf to peek under the covers to get the
+    # cache variable for the library check.  one should not copy this
+    # code into other places unless you want much pain and suffering
+
+    # see comment above
+    unset ac_cv_lib_event_event_config_new
+    pmix_check_package_lib_happy="no"
+    if test "$pmix_event_libdir" != ""; then :
+   # libdir was specified - search only there
+           pmix_libevent_LDFLAGS="$pmix_libevent_LDFLAGS -L$pmix_event_libdir"
+           LDFLAGS="$LDFLAGS -L$pmix_event_libdir"
+           { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing event_config_new" >&5
+$as_echo_n "checking for library containing event_config_new... " >&6; }
+if ${ac_cv_search_event_config_new+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+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 event_config_new ();
+int
+main ()
+{
+return event_config_new ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' event; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib -levent -levent_pthreads $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_event_config_new=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_event_config_new+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_event_config_new+:} false; then :
+
+else
+  ac_cv_search_event_config_new=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_event_config_new" >&5
+$as_echo "$ac_cv_search_event_config_new" >&6; }
+ac_res=$ac_cv_search_event_config_new
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  pmix_check_package_lib_happy="yes"
+else
+  pmix_check_package_lib_happy="no"
+fi
+
+           if test "$pmix_check_package_lib_happy" = "no"; then :
+  LDFLAGS="$pmix_check_package_pmix_libevent_save_LDFLAGS"
+                  pmix_libevent_LDFLAGS="$pmix_check_package_pmix_libevent_orig_LDFLAGS"
+                  unset ac_cv_lib_event_event_config_new
+fi
+else
+   # libdir was not specified - go through search path
+           pmix_check_package_libdir="$pmix_event_dir"
+           if test "$pmix_check_package_libdir" = "" || test "$pmix_check_package_libdir" = "/usr" || test "$pmix_check_package_libdir" = "/usr/local"; then :
+   # try as is...
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: looking for library without search path" >&5
+$as_echo "looking for library without search path" >&6; }
+                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing event_config_new" >&5
+$as_echo_n "checking for library containing event_config_new... " >&6; }
+if ${ac_cv_search_event_config_new+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+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 event_config_new ();
+int
+main ()
+{
+return event_config_new ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' event; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib -levent -levent_pthreads $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_event_config_new=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_event_config_new+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_event_config_new+:} false; then :
+
+else
+  ac_cv_search_event_config_new=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_event_config_new" >&5
+$as_echo "$ac_cv_search_event_config_new" >&6; }
+ac_res=$ac_cv_search_event_config_new
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  pmix_check_package_lib_happy="yes"
+else
+  pmix_check_package_lib_happy="no"
+fi
+
+                if test "$pmix_check_package_lib_happy" = "no"; then :
+   # no go on the as is..  see what happens later...
+                     LDFLAGS="$pmix_check_package_pmix_libevent_save_LDFLAGS"
+                     pmix_libevent_LDFLAGS="$pmix_check_package_pmix_libevent_orig_LDFLAGS"
+                     unset ac_cv_lib_event_event_config_new
+fi
+fi
+
+           if test "$pmix_check_package_lib_happy" = "no"; then :
+  if test "$pmix_check_package_libdir" != ""; then :
+  pmix_libevent_LDFLAGS="$pmix_libevent_LDFLAGS -L$pmix_check_package_libdir/lib"
+                     LDFLAGS="$LDFLAGS -L$pmix_check_package_libdir/lib"
+                     { $as_echo "$as_me:${as_lineno-$LINENO}: result: looking for library in lib" >&5
+$as_echo "looking for library in lib" >&6; }
+                     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing event_config_new" >&5
+$as_echo_n "checking for library containing event_config_new... " >&6; }
+if ${ac_cv_search_event_config_new+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+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 event_config_new ();
+int
+main ()
+{
+return event_config_new ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' event; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib -levent -levent_pthreads $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_event_config_new=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_event_config_new+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_event_config_new+:} false; then :
+
+else
+  ac_cv_search_event_config_new=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_event_config_new" >&5
+$as_echo "$ac_cv_search_event_config_new" >&6; }
+ac_res=$ac_cv_search_event_config_new
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  pmix_check_package_lib_happy="yes"
+else
+  pmix_check_package_lib_happy="no"
+fi
+
+                     if test "$pmix_check_package_lib_happy" = "no"; then :
+   # no go on the as is..  see what happens later...
+                          LDFLAGS="$pmix_check_package_pmix_libevent_save_LDFLAGS"
+                          pmix_libevent_LDFLAGS="$pmix_check_package_pmix_libevent_orig_LDFLAGS"
+                          unset ac_cv_lib_event_event_config_new
+fi
+fi
+fi
+
+           if test "$pmix_check_package_lib_happy" = "no"; then :
+  if test "$pmix_check_package_libdir" != ""; then :
+  pmix_libevent_LDFLAGS="$pmix_libevent_LDFLAGS -L$pmix_check_package_libdir/lib64"
+                     LDFLAGS="$LDFLAGS -L$pmix_check_package_libdir/lib64"
+                     { $as_echo "$as_me:${as_lineno-$LINENO}: result: looking for library in lib64" >&5
+$as_echo "looking for library in lib64" >&6; }
+                     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing event_config_new" >&5
+$as_echo_n "checking for library containing event_config_new... " >&6; }
+if ${ac_cv_search_event_config_new+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+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 event_config_new ();
+int
+main ()
+{
+return event_config_new ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' event; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib -levent -levent_pthreads $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_event_config_new=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_event_config_new+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_event_config_new+:} false; then :
+
+else
+  ac_cv_search_event_config_new=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_event_config_new" >&5
+$as_echo "$ac_cv_search_event_config_new" >&6; }
+ac_res=$ac_cv_search_event_config_new
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  pmix_check_package_lib_happy="yes"
+else
+  pmix_check_package_lib_happy="no"
+fi
+
+                     if test "$pmix_check_package_lib_happy" = "no"; then :
+   # no go on the as is..  see what happens later...
+                          LDFLAGS="$pmix_check_package_pmix_libevent_save_LDFLAGS"
+                          pmix_libevent_LDFLAGS="$pmix_check_package_pmix_libevent_orig_LDFLAGS"
+                          unset ac_cv_lib_event_event_config_new
+fi
+fi
+fi
+fi
+
+    if test "$pmix_check_package_lib_happy" = "yes"; then :
+  pmix_libevent_LIBS="-levent -levent -levent_pthreads"
+           pmix_check_package_happy="yes"
+else
+  pmix_check_package_happy="no"
+fi
+    if test "$pmix_check_package_lib_happy" = "yes"; then :
+   # The result of AC SEARCH_LIBS is cached in $ac_cv_search_[function]
+           if test "$ac_cv_search_event_config_new" != "no" &&
+                  test "$ac_cv_search_event_config_new" != "none required"; then :
+  pmix_libevent_LIBS="$ac_cv_search_event_config_new -levent -levent_pthreads"
+else
+  pmix_libevent_LIBS="-levent -levent_pthreads"
+fi
+           pmix_check_package_happy="yes"
+else
+  pmix_check_package_happy="no"
+fi
+
+
+fi
+    unset pmix_check_package_header_happy
+
+
+
+    if test "$pmix_check_package_happy" = "yes"; then :
+
+else
+  pmix_libevent_CPPFLAGS="$pmix_check_package_pmix_libevent_orig_CPPFLAGS"
+           pmix_libevent_LDFLAGS="$pmix_check_package_pmix_libevent_orig_LDFLAGS"
+           pmix_libevent_LIBS="$pmix_check_package_pmix_libevent_orig_LIBS"
+           { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: LIBEVENT SUPPORT NOT FOUND" >&5
+$as_echo "$as_me: WARNING: LIBEVENT SUPPORT NOT FOUND" >&2;}
+                        as_fn_error $? "CANNOT CONTINE" "$LINENO" 5
+fi
+
+    CPPFLAGS="$pmix_check_package_pmix_libevent_save_CPPFLAGS"
+    LDFLAGS="$pmix_check_package_pmix_libevent_save_LDFLAGS"
+    LIBS="$pmix_check_package_pmix_libevent_save_LIBS"
+
+
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $pmix_libevent_CPPFLAGS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${CPPFLAGS}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$CPPFLAGS"; then :
+  CPPFLAGS=$arg
+else
+  CPPFLAGS="$CPPFLAGS $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $pmix_libevent_LIBS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${LIBS}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$LIBS"; then :
+  LIBS=$arg
+else
+  LIBS="$LIBS $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $pmix_libevent_LDFLAGS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${LDFLAGS}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$LDFLAGS"; then :
+  LDFLAGS=$arg
+else
+  LDFLAGS="$LDFLAGS $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+
+    # Ensure that this libevent has the symbol
+    # "evthread_set_lock_callbacks", which will only exist if
+    # libevent was configured with thread support.
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for evthread_set_lock_callbacks in -levent" >&5
+$as_echo_n "checking for evthread_set_lock_callbacks in -levent... " >&6; }
+if ${ac_cv_lib_event_evthread_set_lock_callbacks+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-levent  $LIBS"
+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 evthread_set_lock_callbacks ();
+int
+main ()
+{
+return evthread_set_lock_callbacks ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_event_evthread_set_lock_callbacks=yes
+else
+  ac_cv_lib_event_evthread_set_lock_callbacks=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_event_evthread_set_lock_callbacks" >&5
+$as_echo "$ac_cv_lib_event_evthread_set_lock_callbacks" >&6; }
+if test "x$ac_cv_lib_event_evthread_set_lock_callbacks" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBEVENT 1
+_ACEOF
+
+  LIBS="-levent $LIBS"
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: External libevent does not have thread support" >&5
+$as_echo "$as_me: WARNING: External libevent does not have thread support" >&2;}
+                  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIx requires libevent to be compiled with" >&5
+$as_echo "$as_me: WARNING: PMIx requires libevent to be compiled with" >&2;}
+                  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: thread support enabled" >&5
+$as_echo "$as_me: WARNING: thread support enabled" >&2;}
+                  as_fn_error $? "Cannot continue" "$LINENO" 5
+fi
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for evthread_use_pthreads in -levent_pthreads" >&5
+$as_echo_n "checking for evthread_use_pthreads in -levent_pthreads... " >&6; }
+if ${ac_cv_lib_event_pthreads_evthread_use_pthreads+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-levent_pthreads  $LIBS"
+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 evthread_use_pthreads ();
+int
+main ()
+{
+return evthread_use_pthreads ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_event_pthreads_evthread_use_pthreads=yes
+else
+  ac_cv_lib_event_pthreads_evthread_use_pthreads=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_event_pthreads_evthread_use_pthreads" >&5
+$as_echo "$ac_cv_lib_event_pthreads_evthread_use_pthreads" >&6; }
+if test "x$ac_cv_lib_event_pthreads_evthread_use_pthreads" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBEVENT_PTHREADS 1
+_ACEOF
+
+  LIBS="-levent_pthreads $LIBS"
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: External libevent does not have thread support" >&5
+$as_echo "$as_me: WARNING: External libevent does not have thread support" >&2;}
+                  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIx requires libevent to be compiled with" >&5
+$as_echo "$as_me: WARNING: PMIx requires libevent to be compiled with" >&2;}
+                  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: thread support enabled" >&5
+$as_echo "$as_me: WARNING: thread support enabled" >&2;}
+                  as_fn_error $? "Cannot continue" "$LINENO" 5
+fi
+
+
+    # Set output variables
+    PMIX_EVENT_HEADER="<event.h>"
+    PMIX_EVENT2_THREAD_HEADER="<event2/thread.h>"
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+fi
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking libevent header" >&5
+$as_echo_n "checking libevent header... " >&6; }
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_EVENT_HEADER $PMIX_EVENT_HEADER
+_ACEOF
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PMIX_EVENT_HEADER" >&5
+$as_echo "$PMIX_EVENT_HEADER" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking libevent2/thread header" >&5
+$as_echo_n "checking libevent2/thread header... " >&6; }
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_EVENT2_THREAD_HEADER $PMIX_EVENT2_THREAD_HEADER
+_ACEOF
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PMIX_EVENT2_THREAD_HEADER" >&5
+$as_echo "$PMIX_EVENT2_THREAD_HEADER" >&6; }
+
+
+    ##################################
+    # ZLIB COMPRESSION
+    ##################################
+    pmix_show_title "ZLIB"
+
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_zlib_dir pmix_zlib_libdir; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_zlib_dir pmix_zlib_libdir\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+
+# Check whether --with-zlib was given.
+if test "${with_zlib+set}" = set; then :
+  withval=$with_zlib;
+fi
+
+
+
+# Check whether --with-zlib-libdir was given.
+if test "${with_zlib_libdir+set}" = set; then :
+  withval=$with_zlib_libdir;
+fi
+
+
+    pmix_zlib_support=0
+    if test "$with_zlib" != "no"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for zlib in" >&5
+$as_echo_n "checking for zlib in... " >&6; }
+        if test ! -z "$with_zlib" && test "$with_zlib" != "yes"; then
+            pmix_zlib_dir=$with_zlib
+            pmix_zlib_standard_header_location=no
+            if test -d $with_zlib/lib; then
+                pmix_zlib_libdir=$with_zlib/lib
+            elif test -d $with_zlib/lib64; then
+                pmix_zlib_libdir=$with_zlib/lib64
+            else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: Could not find $with_zlib/lib or $with_zlib/lib64" >&5
+$as_echo "Could not find $with_zlib/lib or $with_zlib/lib64" >&6; }
+                as_fn_error $? "Can not continue" "$LINENO" 5
+            fi
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pmix_zlib_dir and $pmix_zlib_libdir" >&5
+$as_echo "$pmix_zlib_dir and $pmix_zlib_libdir" >&6; }
+        else
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: (default search paths)" >&5
+$as_echo "(default search paths)" >&6; }
+            pmix_zlib_standard_header_location=yes
+        fi
+        if test ! -z "$with_zlib_libdir" && test "$with_zlib_libdir" != "yes"; then :
+  pmix_zlib_libdir="$with_zlib_libdir"
+               pmix_zlib_standard_lib_location=no
+else
+  pmix_zlib_standard_lib_location=yes
+fi
+
+
+    pmix_check_package_pmix_zlib_save_CPPFLAGS="$CPPFLAGS"
+    pmix_check_package_pmix_zlib_save_LDFLAGS="$LDFLAGS"
+    pmix_check_package_pmix_zlib_save_LIBS="$LIBS"
+
+    pmix_check_package_pmix_zlib_orig_CPPFLAGS="$pmix_zlib_CPPFLAGS"
+    pmix_check_package_pmix_zlib_orig_LDFLAGS="$pmix_zlib_LDFLAGS"
+    pmix_check_package_pmix_zlib_orig_LIBS="$pmix_zlib_LIBS"
+
+
+    # This is stolen from autoconf to peek under the covers to get the
+    # cache variable for the library check.  one should not copy this
+    # code into other places unless you want much pain and suffering
+
+
+    # so this sucks, but there's no way to get through the progression
+    # of header includes without killing off the cache variable and trying
+    # again...
+    unset ac_cv_header_zlib_h
+
+    pmix_check_package_header_happy="no"
+    if test "$pmix_zlib_dir" = "/usr" || test "$pmix_zlib_dir" = "/usr/local"; then :
+   # try as is...
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: looking for header without includes" >&5
+$as_echo "looking for header without includes" >&6; }
+            for ac_header in zlib.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
+if test "x$ac_cv_header_zlib_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_ZLIB_H 1
+_ACEOF
+ pmix_check_package_header_happy="yes"
+fi
+
+done
+
+            if test "$pmix_check_package_header_happy" = "no"; then :
+  # no go on the as is - reset the cache and try again
+                   unset ac_cv_header_zlib_h
+fi
+fi
+
+    if test "$pmix_check_package_header_happy" = "no"; then :
+  if test "$pmix_zlib_dir" != ""; then :
+  pmix_zlib_CPPFLAGS="$pmix_zlib_CPPFLAGS -I$pmix_zlib_dir/include"
+                  CPPFLAGS="$CPPFLAGS -I$pmix_zlib_dir/include"
+fi
+          for ac_header in zlib.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
+if test "x$ac_cv_header_zlib_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_ZLIB_H 1
+_ACEOF
+ pmix_check_package_header_happy="yes"
+fi
+
+done
+
+	  if test "$pmix_check_package_header_happy" = "yes"; then :
+
+    # This is stolen from autoconf to peek under the covers to get the
+    # cache variable for the library check.  one should not copy this
+    # code into other places unless you want much pain and suffering
+
+    # see comment above
+    unset ac_cv_lib_z_deflate
+    pmix_check_package_lib_happy="no"
+    if test "$pmix_zlib_libdir" != ""; then :
+   # libdir was specified - search only there
+           pmix_zlib_LDFLAGS="$pmix_zlib_LDFLAGS -L$pmix_zlib_libdir"
+           LDFLAGS="$LDFLAGS -L$pmix_zlib_libdir"
+           { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing deflate" >&5
+$as_echo_n "checking for library containing deflate... " >&6; }
+if ${ac_cv_search_deflate+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+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 deflate ();
+int
+main ()
+{
+return deflate ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' z; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib -lz $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_deflate=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_deflate+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_deflate+:} false; then :
+
+else
+  ac_cv_search_deflate=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_deflate" >&5
+$as_echo "$ac_cv_search_deflate" >&6; }
+ac_res=$ac_cv_search_deflate
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  pmix_check_package_lib_happy="yes"
+else
+  pmix_check_package_lib_happy="no"
+fi
+
+           if test "$pmix_check_package_lib_happy" = "no"; then :
+  LDFLAGS="$pmix_check_package_pmix_zlib_save_LDFLAGS"
+                  pmix_zlib_LDFLAGS="$pmix_check_package_pmix_zlib_orig_LDFLAGS"
+                  unset ac_cv_lib_z_deflate
+fi
+else
+   # libdir was not specified - go through search path
+           pmix_check_package_libdir="$pmix_zlib_dir"
+           if test "$pmix_check_package_libdir" = "" || test "$pmix_check_package_libdir" = "/usr" || test "$pmix_check_package_libdir" = "/usr/local"; then :
+   # try as is...
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: looking for library without search path" >&5
+$as_echo "looking for library without search path" >&6; }
+                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing deflate" >&5
+$as_echo_n "checking for library containing deflate... " >&6; }
+if ${ac_cv_search_deflate+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+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 deflate ();
+int
+main ()
+{
+return deflate ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' z; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib -lz $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_deflate=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_deflate+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_deflate+:} false; then :
+
+else
+  ac_cv_search_deflate=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_deflate" >&5
+$as_echo "$ac_cv_search_deflate" >&6; }
+ac_res=$ac_cv_search_deflate
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  pmix_check_package_lib_happy="yes"
+else
+  pmix_check_package_lib_happy="no"
+fi
+
+                if test "$pmix_check_package_lib_happy" = "no"; then :
+   # no go on the as is..  see what happens later...
+                     LDFLAGS="$pmix_check_package_pmix_zlib_save_LDFLAGS"
+                     pmix_zlib_LDFLAGS="$pmix_check_package_pmix_zlib_orig_LDFLAGS"
+                     unset ac_cv_lib_z_deflate
+fi
+fi
+
+           if test "$pmix_check_package_lib_happy" = "no"; then :
+  if test "$pmix_check_package_libdir" != ""; then :
+  pmix_zlib_LDFLAGS="$pmix_zlib_LDFLAGS -L$pmix_check_package_libdir/lib"
+                     LDFLAGS="$LDFLAGS -L$pmix_check_package_libdir/lib"
+                     { $as_echo "$as_me:${as_lineno-$LINENO}: result: looking for library in lib" >&5
+$as_echo "looking for library in lib" >&6; }
+                     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing deflate" >&5
+$as_echo_n "checking for library containing deflate... " >&6; }
+if ${ac_cv_search_deflate+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+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 deflate ();
+int
+main ()
+{
+return deflate ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' z; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib -lz $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_deflate=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_deflate+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_deflate+:} false; then :
+
+else
+  ac_cv_search_deflate=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_deflate" >&5
+$as_echo "$ac_cv_search_deflate" >&6; }
+ac_res=$ac_cv_search_deflate
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  pmix_check_package_lib_happy="yes"
+else
+  pmix_check_package_lib_happy="no"
+fi
+
+                     if test "$pmix_check_package_lib_happy" = "no"; then :
+   # no go on the as is..  see what happens later...
+                          LDFLAGS="$pmix_check_package_pmix_zlib_save_LDFLAGS"
+                          pmix_zlib_LDFLAGS="$pmix_check_package_pmix_zlib_orig_LDFLAGS"
+                          unset ac_cv_lib_z_deflate
+fi
+fi
+fi
+
+           if test "$pmix_check_package_lib_happy" = "no"; then :
+  if test "$pmix_check_package_libdir" != ""; then :
+  pmix_zlib_LDFLAGS="$pmix_zlib_LDFLAGS -L$pmix_check_package_libdir/lib64"
+                     LDFLAGS="$LDFLAGS -L$pmix_check_package_libdir/lib64"
+                     { $as_echo "$as_me:${as_lineno-$LINENO}: result: looking for library in lib64" >&5
+$as_echo "looking for library in lib64" >&6; }
+                     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing deflate" >&5
+$as_echo_n "checking for library containing deflate... " >&6; }
+if ${ac_cv_search_deflate+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+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 deflate ();
+int
+main ()
+{
+return deflate ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' z; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib -lz $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_deflate=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_deflate+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_deflate+:} false; then :
+
+else
+  ac_cv_search_deflate=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_deflate" >&5
+$as_echo "$ac_cv_search_deflate" >&6; }
+ac_res=$ac_cv_search_deflate
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  pmix_check_package_lib_happy="yes"
+else
+  pmix_check_package_lib_happy="no"
+fi
+
+                     if test "$pmix_check_package_lib_happy" = "no"; then :
+   # no go on the as is..  see what happens later...
+                          LDFLAGS="$pmix_check_package_pmix_zlib_save_LDFLAGS"
+                          pmix_zlib_LDFLAGS="$pmix_check_package_pmix_zlib_orig_LDFLAGS"
+                          unset ac_cv_lib_z_deflate
+fi
+fi
+fi
+fi
+
+    if test "$pmix_check_package_lib_happy" = "yes"; then :
+  pmix_zlib_LIBS="-lz -lz"
+           pmix_check_package_happy="yes"
+else
+  pmix_check_package_happy="no"
+fi
+    if test "$pmix_check_package_lib_happy" = "yes"; then :
+   # The result of AC SEARCH_LIBS is cached in $ac_cv_search_[function]
+           if test "$ac_cv_search_deflate" != "no" &&
+                  test "$ac_cv_search_deflate" != "none required"; then :
+  pmix_zlib_LIBS="$ac_cv_search_deflate -lz"
+else
+  pmix_zlib_LIBS="-lz"
+fi
+           pmix_check_package_happy="yes"
+else
+  pmix_check_package_happy="no"
+fi
+
+
+else
+  pmix_check_package_happy="no"
+fi
+else
+
+    # This is stolen from autoconf to peek under the covers to get the
+    # cache variable for the library check.  one should not copy this
+    # code into other places unless you want much pain and suffering
+
+    # see comment above
+    unset ac_cv_lib_z_deflate
+    pmix_check_package_lib_happy="no"
+    if test "$pmix_zlib_libdir" != ""; then :
+   # libdir was specified - search only there
+           pmix_zlib_LDFLAGS="$pmix_zlib_LDFLAGS -L$pmix_zlib_libdir"
+           LDFLAGS="$LDFLAGS -L$pmix_zlib_libdir"
+           { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing deflate" >&5
+$as_echo_n "checking for library containing deflate... " >&6; }
+if ${ac_cv_search_deflate+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+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 deflate ();
+int
+main ()
+{
+return deflate ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' z; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib -lz $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_deflate=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_deflate+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_deflate+:} false; then :
+
+else
+  ac_cv_search_deflate=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_deflate" >&5
+$as_echo "$ac_cv_search_deflate" >&6; }
+ac_res=$ac_cv_search_deflate
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  pmix_check_package_lib_happy="yes"
+else
+  pmix_check_package_lib_happy="no"
+fi
+
+           if test "$pmix_check_package_lib_happy" = "no"; then :
+  LDFLAGS="$pmix_check_package_pmix_zlib_save_LDFLAGS"
+                  pmix_zlib_LDFLAGS="$pmix_check_package_pmix_zlib_orig_LDFLAGS"
+                  unset ac_cv_lib_z_deflate
+fi
+else
+   # libdir was not specified - go through search path
+           pmix_check_package_libdir="$pmix_zlib_dir"
+           if test "$pmix_check_package_libdir" = "" || test "$pmix_check_package_libdir" = "/usr" || test "$pmix_check_package_libdir" = "/usr/local"; then :
+   # try as is...
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: looking for library without search path" >&5
+$as_echo "looking for library without search path" >&6; }
+                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing deflate" >&5
+$as_echo_n "checking for library containing deflate... " >&6; }
+if ${ac_cv_search_deflate+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+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 deflate ();
+int
+main ()
+{
+return deflate ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' z; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib -lz $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_deflate=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_deflate+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_deflate+:} false; then :
+
+else
+  ac_cv_search_deflate=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_deflate" >&5
+$as_echo "$ac_cv_search_deflate" >&6; }
+ac_res=$ac_cv_search_deflate
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  pmix_check_package_lib_happy="yes"
+else
+  pmix_check_package_lib_happy="no"
+fi
+
+                if test "$pmix_check_package_lib_happy" = "no"; then :
+   # no go on the as is..  see what happens later...
+                     LDFLAGS="$pmix_check_package_pmix_zlib_save_LDFLAGS"
+                     pmix_zlib_LDFLAGS="$pmix_check_package_pmix_zlib_orig_LDFLAGS"
+                     unset ac_cv_lib_z_deflate
+fi
+fi
+
+           if test "$pmix_check_package_lib_happy" = "no"; then :
+  if test "$pmix_check_package_libdir" != ""; then :
+  pmix_zlib_LDFLAGS="$pmix_zlib_LDFLAGS -L$pmix_check_package_libdir/lib"
+                     LDFLAGS="$LDFLAGS -L$pmix_check_package_libdir/lib"
+                     { $as_echo "$as_me:${as_lineno-$LINENO}: result: looking for library in lib" >&5
+$as_echo "looking for library in lib" >&6; }
+                     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing deflate" >&5
+$as_echo_n "checking for library containing deflate... " >&6; }
+if ${ac_cv_search_deflate+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+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 deflate ();
+int
+main ()
+{
+return deflate ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' z; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib -lz $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_deflate=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_deflate+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_deflate+:} false; then :
+
+else
+  ac_cv_search_deflate=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_deflate" >&5
+$as_echo "$ac_cv_search_deflate" >&6; }
+ac_res=$ac_cv_search_deflate
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  pmix_check_package_lib_happy="yes"
+else
+  pmix_check_package_lib_happy="no"
+fi
+
+                     if test "$pmix_check_package_lib_happy" = "no"; then :
+   # no go on the as is..  see what happens later...
+                          LDFLAGS="$pmix_check_package_pmix_zlib_save_LDFLAGS"
+                          pmix_zlib_LDFLAGS="$pmix_check_package_pmix_zlib_orig_LDFLAGS"
+                          unset ac_cv_lib_z_deflate
+fi
+fi
+fi
+
+           if test "$pmix_check_package_lib_happy" = "no"; then :
+  if test "$pmix_check_package_libdir" != ""; then :
+  pmix_zlib_LDFLAGS="$pmix_zlib_LDFLAGS -L$pmix_check_package_libdir/lib64"
+                     LDFLAGS="$LDFLAGS -L$pmix_check_package_libdir/lib64"
+                     { $as_echo "$as_me:${as_lineno-$LINENO}: result: looking for library in lib64" >&5
+$as_echo "looking for library in lib64" >&6; }
+                     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing deflate" >&5
+$as_echo_n "checking for library containing deflate... " >&6; }
+if ${ac_cv_search_deflate+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+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 deflate ();
+int
+main ()
+{
+return deflate ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' z; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib -lz $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_deflate=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_deflate+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_deflate+:} false; then :
+
+else
+  ac_cv_search_deflate=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_deflate" >&5
+$as_echo "$ac_cv_search_deflate" >&6; }
+ac_res=$ac_cv_search_deflate
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  pmix_check_package_lib_happy="yes"
+else
+  pmix_check_package_lib_happy="no"
+fi
+
+                     if test "$pmix_check_package_lib_happy" = "no"; then :
+   # no go on the as is..  see what happens later...
+                          LDFLAGS="$pmix_check_package_pmix_zlib_save_LDFLAGS"
+                          pmix_zlib_LDFLAGS="$pmix_check_package_pmix_zlib_orig_LDFLAGS"
+                          unset ac_cv_lib_z_deflate
+fi
+fi
+fi
+fi
+
+    if test "$pmix_check_package_lib_happy" = "yes"; then :
+  pmix_zlib_LIBS="-lz -lz"
+           pmix_check_package_happy="yes"
+else
+  pmix_check_package_happy="no"
+fi
+    if test "$pmix_check_package_lib_happy" = "yes"; then :
+   # The result of AC SEARCH_LIBS is cached in $ac_cv_search_[function]
+           if test "$ac_cv_search_deflate" != "no" &&
+                  test "$ac_cv_search_deflate" != "none required"; then :
+  pmix_zlib_LIBS="$ac_cv_search_deflate -lz"
+else
+  pmix_zlib_LIBS="-lz"
+fi
+           pmix_check_package_happy="yes"
+else
+  pmix_check_package_happy="no"
+fi
+
+
+fi
+    unset pmix_check_package_header_happy
+
+
+
+    if test "$pmix_check_package_happy" = "yes"; then :
+  pmix_zlib_support=1
+else
+  pmix_zlib_CPPFLAGS="$pmix_check_package_pmix_zlib_orig_CPPFLAGS"
+           pmix_zlib_LDFLAGS="$pmix_check_package_pmix_zlib_orig_LDFLAGS"
+           pmix_zlib_LIBS="$pmix_check_package_pmix_zlib_orig_LIBS"
+           pmix_zlib_support=0
+fi
+
+    CPPFLAGS="$pmix_check_package_pmix_zlib_save_CPPFLAGS"
+    LDFLAGS="$pmix_check_package_pmix_zlib_save_LDFLAGS"
+    LIBS="$pmix_check_package_pmix_zlib_save_LIBS"
+
+        if test $pmix_zlib_support = "1"; then
+            LIBS="$LIBS -lz"
+            PMIX_EMBEDDED_LIBS="$PMIX_EMBEDDED_LIBS -lz"
+            if test "$pmix_zlib_standard_header_location" != "yes"; then
+                PMIX_EMBEDDED_CPPFLAGS="$PMIX_EMBEDDED_CPPFLAGS $pmix_zlib_CPPFLAGS"
+                CPPFLAGS="$CPPFLAGS $pmix_zlib_CPPFLAGS"
+            fi
+            if test "$pmix_zlib_standard_lib_location" != "yes"; then
+                PMIX_EMBEDDED_LDFLAGS="$PMIX_EMBEDDED_LDFLAGS $pmix_zlib_LDFLAGS"
+                LDFLAGS="$LDFLAGS $pmix_zlib_LDFLAGS"
+            fi
+        fi
+    fi
+
+    if test ! -z "$with_zlib" && test "$with_zlib" != "no" && test "$pmix_zlib_support" != "1"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ZLIB SUPPORT REQUESTED AND NOT FOUND" >&5
+$as_echo "$as_me: WARNING: ZLIB SUPPORT REQUESTED AND NOT FOUND" >&2;}
+        as_fn_error $? "CANNOT CONTINUE" "$LINENO" 5
+    fi
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking will zlib support be built" >&5
+$as_echo_n "checking will zlib support be built... " >&6; }
+    if test "$pmix_zlib_support" != "1"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+    fi
+
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_HAVE_ZLIB $pmix_zlib_support
+_ACEOF
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+
+    ##################################
+    # MCA
+    ##################################
+
+    pmix_show_title "Modular Component Architecture (MCA) setup"
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for subdir args" >&5
+$as_echo_n "checking for subdir args... " >&6; }
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in subdirs_str subdirs_skip subdirs_args subdirs_arg; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"subdirs_str subdirs_skip subdirs_args subdirs_arg\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+#
+# Invoke configure in subdirectories.
+#
+# pmix_subdir_args is the name of the variable to assign the output to
+#
+
+#
+# Make a list of command line args --eliminate the --srcdir and
+# --cache-file args, because we need to replace them with our own
+# values when invoking the sub-configure script. Also eliminate
+# the --with-platform as this will confuse any subdir with
+# similar options
+#
+
+subdirs_args=
+subdirs_skip=no
+
+eval "set x $ac_configure_args"
+shift
+for subdirs_arg
+do
+    if test "$subdirs_skip" = "yes"; then
+	subdirs_skip=no
+    else
+	case $subdirs_arg in
+	-cache-file | --cache-file | -cache | --cache)
+	    subdirs_skip=yes
+	    ;;
+	--config-cache | -C)
+	    ;;
+	-cache-file=* | --cache-file=*)
+	    ;;
+	-srcdir | --srcdir)
+	    subdirs_skip=yes
+	    ;;
+	-srcdir=* | --srcdir=*)
+	    ;;
+	-with-platform=* | --with-platform=*)
+	    ;;
+	*)
+	    case $subdir_arg in
+	    *\'*) subdir_arg=`echo "$subdir_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+	    esac
+	    subdirs_args="$subdirs_args '$subdirs_arg'"
+	    ;;
+	esac
+    fi
+done
+
+#
+# Assign the output
+#
+
+subdirs_str=pmix_subdir_args=\"$subdirs_args\"
+eval "$subdirs_str"
+
+#
+# Clean up
+#
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pmix_subdir_args" >&5
+$as_echo "$pmix_subdir_args" >&6; }
+
+
+
+
+    # Find which components should be built as run-time loadable components
+    # Acceptable combinations:
+    #
+    # [default -- no option given]
+    # --enable-mca-dso
+    # --enable-mca-dso=[.+,]*COMPONENT_TYPE[.+,]*
+    # --enable-mca-dso=[.+,]*COMPONENT_TYPE-COMPONENT_NAME[.+,]*
+    # --disable-mca-dso
+    #
+    # Check whether --enable-mca-no-build was given.
+if test "${enable_mca_no_build+set}" = set; then :
+  enableval=$enable_mca_no_build;
+fi
+
+    # Check whether --enable-mca-dso was given.
+if test "${enable_mca_dso+set}" = set; then :
+  enableval=$enable_mca_dso;
+fi
+
+    # Check whether --enable-mca-static was given.
+if test "${enable_mca_static+set}" = set; then :
+  enableval=$enable_mca_static;
+fi
+
+    # Check whether --enable-mca-direct was given.
+if test "${enable_mca_direct+set}" = set; then :
+  enableval=$enable_mca_direct;
+fi
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking which components should be disabled" >&5
+$as_echo_n "checking which components should be disabled... " >&6; }
+    if test "$enable_mca_no_build" = "yes"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+        as_fn_error $? "*** The enable-mca-no-build flag requires an explicit list
+*** of type-component pairs.  For example, --enable-mca-direct=pml-ob1" "$LINENO" 5
+    else
+        ifs_save="$IFS"
+        IFS="${IFS}$PATH_SEPARATOR,"
+        msg=
+        for item in $enable_mca_no_build; do
+            type="`echo $item | cut -s -f1 -d-`"
+            comp="`echo $item | cut -s -f2- -d-`"
+            if test -z $type ; then
+                type=$item
+            fi
+            if test -z $comp ; then
+                str="`echo DISABLE_${type}=1 | sed s/-/_/g`"
+                eval $str
+                msg="$item $msg"
+            else
+                str="`echo DISABLE_${type}_${comp}=1 | sed s/-/_/g`"
+                eval $str
+                msg="$item $msg"
+            fi
+        done
+        IFS="$ifs_save"
+    fi
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $msg" >&5
+$as_echo "$msg" >&6; }
+    unset msg
+
+    #
+    # First, add all the mca-direct components / types into the mca-static
+    # lists and create a list of component types that are direct compile,
+    # in the form DIRECT_[type]=[component]
+    #
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking which components should be direct-linked into the library" >&5
+$as_echo_n "checking which components should be direct-linked into the library... " >&6; }
+    if test "$enable_mca_direct" = "yes" ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+        as_fn_error $? "*** The enable-mca-direct flag requires an explicit list of
+*** type-component pairs.  For example, --enable-mca-direct=pml-ob1,coll-basic" "$LINENO" 5
+    elif test ! -z "$enable_mca_direct" && test "$enable_mca_direct" != "" ; then
+        #
+        # we need to add this into the static list, unless the static list
+        # is everything
+        #
+        if test "$enable_mca_static" = "no" ; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Re-enabling static component support for direct call" >&5
+$as_echo "$as_me: WARNING: *** Re-enabling static component support for direct call" >&2;}
+            enable_mca_static="$enable_mca_direct"
+        elif test -z "$enable_mca_static" ; then
+            enable_mca_static="$enable_mca_direct"
+        elif test "$enable_mca_static" != "yes" ; then
+            enable_mca_static="$enable_mca_direct,$enable_mca_static"
+        fi
+
+        ifs_save="$IFS"
+        IFS="${IFS}$PATH_SEPARATOR,"
+        msg=
+        for item in $enable_mca_direct; do
+            type="`echo $item | cut -f1 -d-`"
+            comp="`echo $item | cut -f2- -d-`"
+            if test -z $type || test -z $comp ; then
+                as_fn_error $? "*** The enable-mca-direct flag requires a
+*** list of type-component pairs.  Invalid input detected." "$LINENO" 5
+            else
+                str="`echo DIRECT_$type=$comp | sed s/-/_/g`"
+                eval $str
+                msg="$item $msg"
+            fi
+        done
+        IFS="$ifs_save"
+    fi
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $msg" >&5
+$as_echo "$msg" >&6; }
+    unset msg
+
+    #
+    # Second, set the DSO_all and STATIC_all variables.  conflict
+    # resolution (prefer static) is done in the big loop below
+    #
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking which components should be run-time loadable" >&5
+$as_echo_n "checking which components should be run-time loadable... " >&6; }
+    if test "$enable_static" != "no"; then
+        DSO_all=0
+        msg=none
+    elif test -z "$enable_mca_dso" || test "$enable_mca_dso" = "yes"; then
+        DSO_all=1
+        msg=all
+    elif test "$enable_mca_dso" = "no"; then
+        DSO_all=0
+        msg=none
+    else
+        DSO_all=0
+        ifs_save="$IFS"
+        IFS="${IFS}$PATH_SEPARATOR,"
+        msg=
+        for item in $enable_mca_dso; do
+            str="`echo DSO_$item=1 | sed s/-/_/g`"
+            eval $str
+            msg="$item $msg"
+        done
+        IFS="$ifs_save"
+    fi
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $msg" >&5
+$as_echo "$msg" >&6; }
+    unset msg
+    if test "$enable_static" != "no"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Shared libraries have been disabled (--disable-shared)" >&5
+$as_echo "$as_me: WARNING: *** Shared libraries have been disabled (--disable-shared)" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Building MCA components as DSOs automatically disabled" >&5
+$as_echo "$as_me: WARNING: *** Building MCA components as DSOs automatically disabled" >&2;}
+    fi
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking which components should be static" >&5
+$as_echo_n "checking which components should be static... " >&6; }
+    if test "$enable_mca_static" = "yes"; then
+        STATIC_all=1
+        msg=all
+    elif test -z "$enable_mca_static" || test "$enable_mca_static" = "no"; then
+        STATIC_all=0
+        msg=none
+    else
+        STATIC_all=0
+        ifs_save="$IFS"
+        IFS="${IFS}$PATH_SEPARATOR,"
+        msg=
+        for item in $enable_mca_static; do
+            str="`echo STATIC_$item=1 | sed s/-/_/g`"
+            eval $str
+            msg="$item $msg"
+        done
+        IFS="$ifs_save"
+    fi
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $msg" >&5
+$as_echo "$msg" >&6; }
+    unset msg
+
+    # now configure the PMIx project.  Most
+    # of the hard stuff is in here
+    MCA_PROJECT_SUBDIRS=
+
+    # can't use a variable rename here because these need to be evaled
+    # at auto* time.
+
+    pmix_show_subtitle "Configuring MCA"
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for frameworks" >&5
+$as_echo_n "checking for frameworks... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pdl, pif, pinstalldirs, pnet, psec, psensor, ptl" >&5
+$as_echo "pdl, pif, pinstalldirs, pnet, psec, psensor, ptl" >&6; }
+
+    # iterate through the list of frameworks.  There is something
+    # funky with m4 foreach if the list is defined, but empty.  It
+    # will call the 3rd argument once with an empty value for the
+    # first argument.  Protect against calling MCA_CONFIGURE_FRAMEWORK
+    # with an empty second argument.  Grrr....
+    # if there isn't a project list, abort
+    #
+    # Also setup two variables for Makefiles:
+    #  MCA_project_FRAMEWORKS     - list of frameworks in that project
+    #  MCA_project_FRAMEWORK_LIBS - list of libraries (or variables pointing
+    #                               to more libraries) that must be included
+    #                               in the project's main library
+
+
+    MCA_pmix_FRAMEWORKS=
+    MCA_pmix_FRAMEWORKS_SUBDIRS=
+    MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS=
+    MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS=
+    MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS=
+    MCA_pmix_FRAMEWORK_LIBS=
+
+
+                                 MCA_pmix_FRAMEWORKS="$MCA_pmix_FRAMEWORKS pdl"
+                                 MCA_pmix_FRAMEWORKS_SUBDIRS="$MCA_pmix_FRAMEWORKS_SUBDIRS mca/pdl"
+                                 MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS="$MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS \$(MCA_pmix_pdl_ALL_SUBDIRS)"
+                                 MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS="$MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS \$(MCA_pmix_pdl_DSO_SUBDIRS)"
+                                 MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS="$MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS \$(MCA_pmix_pdl_STATIC_SUBDIRS)"
+                                 MCA_pmix_FRAMEWORK_LIBS="$MCA_pmix_FRAMEWORK_LIBS mca/pdl/libmca_pdl.la"
+                          MCA_pmix_FRAMEWORK_LIBS="$MCA_pmix_FRAMEWORK_LIBS \$(MCA_pmix_pdl_STATIC_LTLIBS)"
+
+    PMIX_HAVE_PDL_SUPPORT=0
+
+    # If --disable-dlopen was used, then have all the components fail
+    # (we still need to configure them all so that things like "make
+    # dist" work", but we just want the MCA system to (artificially)
+    # conclude that it can't build any of the components.
+    if test "$enable_dlopen" = "no"; then :
+  want_pdl=0
+else
+  want_pdl=1
+fi
+
+
+    pmix_show_subsubtitle "Configuring MCA framework pdl"
+
+
+
+
+    # setup for framework
+    all_components=
+    static_components=
+    dso_components=
+    static_ltlibs=
+
+    # Ensure that the directory where the #include file is to live
+    # exists.  Need to do this for VPATH builds, because the directory
+    # may not exist yet.  For the "common" type, it's not really a
+    # component, so it doesn't have a base.
+    outdir=src/mca/pdl/base
+    as_dir=$outdir; as_fn_mkdir_p
+
+    # emit Makefile rule
+    ac_config_files="$ac_config_files src/mca/pdl/Makefile"
+
+
+    # remove any previously generated #include files
+    outfile_real=$outdir/static-components.h
+    outfile=$outfile_real.new
+    rm -f $outfile $outfile.struct $outfile.extern
+    touch $outfile.struct $outfile.extern
+
+    # print some nice messages about what we're about to do...
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for no configure components in framework pdl" >&5
+$as_echo_n "checking for no configure components in framework pdl... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+$as_echo "" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for m4 configure components in framework pdl" >&5
+$as_echo_n "checking for m4 configure components in framework pdl... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pdlopen, plibltdl" >&5
+$as_echo "pdlopen, plibltdl" >&6; }
+
+    # If there are components in the no configure list, but we're
+    # doing one of the "special" selection logics, abort with a
+    # reasonable message.
+
+
+
+    # run the configure logic for the no-config components
+
+
+    # configure components that use built-in configuration scripts
+
+
+
+
+
+
+    best_mca_component_priority=0
+    components_looking_for_succeed=$want_pdl
+    components_last_result=0
+
+
+    pmix_show_subsubsubtitle "MCA component pdl:pdlopen (m4 configuration macro, priority 80)"
+
+    pmix_show_verbose "PMIX_MCA_M4_CONFIG_COMPONENT: before, should_build=$components_looking_for_succeed"
+
+
+
+    component_path="$srcdir/src/mca/pdl/pdlopen"
+    want_component=0
+
+    # build if:
+    # - the component type is direct and we are that component
+    # - there is no pmix_ignore file
+    # - there is an pmix_ignore, but there is an empty pmix_unignore
+    # - there is an pmix_ignore, but username is in pmix_unignore
+    if test -d $component_path ; then
+        # decide if we want the component to be built or not.  This
+        # is spread out because some of the logic is a little complex
+        # and test's syntax isn't exactly the greatest.  We want to
+        # build the component by default.
+        want_component=1
+        if test -f $component_path/.pmix_ignore ; then
+            # If there is an pmix_ignore file, don't build
+            # the component.  Note that this decision can be
+            # overridden by the unignore logic below.
+            want_component=0
+        fi
+        if test -f $component_path/.pmix_unignore ; then
+            # if there is an empty pmix_unignore, that is
+            # equivalent to having your userid in the unignore file.
+            # If userid is in the file, unignore the ignore file.
+            if test ! -s $component_path/.pmix_unignore ; then
+                want_component=1
+            elif test ! -z "`$GREP $PMIX_CONFIGURE_USER $component_path/.pmix_unignore`" ; then
+                want_component=1
+            fi
+        fi
+        # if this component type is direct and we are not it, we don't want
+        # to be built.  Otherwise, we do want to be built.
+        if test ! -z "$DIRECT_pdl" ; then
+            if test "$DIRECT_pdl" = "pdlopen" ; then
+                want_component=1
+            else
+                want_component=0
+            fi
+        fi
+    fi
+
+    # if we were explicitly disabled, don't build :)
+    if test "$DISABLE_pdl" = "1"; then :
+  want_component=0
+fi
+    if test "$DISABLE_pdl_pdlopen" = "1"; then :
+  want_component=0
+fi
+
+    if test "$want_component" = "1"; then :
+  should_build=$components_looking_for_succeed
+else
+  should_build=0
+fi
+
+    # Allow the component to override the build mode if it really wants to.
+    # It is, of course, free to end up calling MCA_COMPONENT_COMPILE_MODE
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MCA component pdl:pdlopen compile mode" >&5
+$as_echo_n "checking for MCA component pdl:pdlopen compile mode... " >&6; }
+    compile_mode="static"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $compile_mode" >&5
+$as_echo "$compile_mode" >&6; }
+
+
+    # try to configure the component
+
+    ac_config_files="$ac_config_files src/mca/pdl/pdlopen/Makefile"
+
+
+            # Check whether --enable-dl-dlopen was given.
+if test "${enable_dl_dlopen+set}" = set; then :
+  enableval=$enable_dl_dlopen;
+fi
+
+
+    pmix_pdl_pdlopen_happy=no
+    if test "$enable_dl_dlopen" != "no"; then :
+
+    pmix_check_package_pmix_pdl_pdlopen_save_CPPFLAGS="$CPPFLAGS"
+    pmix_check_package_pmix_pdl_pdlopen_save_LDFLAGS="$LDFLAGS"
+    pmix_check_package_pmix_pdl_pdlopen_save_LIBS="$LIBS"
+
+    pmix_check_package_pmix_pdl_pdlopen_orig_CPPFLAGS="$pmix_pdl_pdlopen_CPPFLAGS"
+    pmix_check_package_pmix_pdl_pdlopen_orig_LDFLAGS="$pmix_pdl_pdlopen_LDFLAGS"
+    pmix_check_package_pmix_pdl_pdlopen_orig_LIBS="$pmix_pdl_pdlopen_LIBS"
+
+
+    # This is stolen from autoconf to peek under the covers to get the
+    # cache variable for the library check.  one should not copy this
+    # code into other places unless you want much pain and suffering
+
+
+    # so this sucks, but there's no way to get through the progression
+    # of header includes without killing off the cache variable and trying
+    # again...
+    unset ac_cv_header_dlfcn_h
+
+    pmix_check_package_header_happy="no"
+    if test "" = "/usr" || test "" = "/usr/local"; then :
+   # try as is...
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: looking for header without includes" >&5
+$as_echo "looking for header without includes" >&6; }
+            for ac_header in dlfcn.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default"
+if test "x$ac_cv_header_dlfcn_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_DLFCN_H 1
+_ACEOF
+ pmix_check_package_header_happy="yes"
+fi
+
+done
+
+            if test "$pmix_check_package_header_happy" = "no"; then :
+  # no go on the as is - reset the cache and try again
+                   unset ac_cv_header_dlfcn_h
+fi
+fi
+
+    if test "$pmix_check_package_header_happy" = "no"; then :
+  if test "" != ""; then :
+  pmix_pdl_pdlopen_CPPFLAGS="$pmix_pdl_pdlopen_CPPFLAGS -I/include"
+                  CPPFLAGS="$CPPFLAGS -I/include"
+fi
+          for ac_header in dlfcn.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default"
+if test "x$ac_cv_header_dlfcn_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_DLFCN_H 1
+_ACEOF
+ pmix_check_package_header_happy="yes"
+fi
+
+done
+
+	  if test "$pmix_check_package_header_happy" = "yes"; then :
+
+    # This is stolen from autoconf to peek under the covers to get the
+    # cache variable for the library check.  one should not copy this
+    # code into other places unless you want much pain and suffering
+
+    # see comment above
+    unset ac_cv_lib_dl_dlopen
+    pmix_check_package_lib_happy="no"
+    if test "" != ""; then :
+   # libdir was specified - search only there
+           pmix_pdl_pdlopen_LDFLAGS="$pmix_pdl_pdlopen_LDFLAGS -L"
+           LDFLAGS="$LDFLAGS -L"
+           { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5
+$as_echo_n "checking for library containing dlopen... " >&6; }
+if ${ac_cv_search_dlopen+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+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 dlopen ();
+int
+main ()
+{
+return dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' dl; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_dlopen=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_dlopen+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_dlopen+:} false; then :
+
+else
+  ac_cv_search_dlopen=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_dlopen" >&5
+$as_echo "$ac_cv_search_dlopen" >&6; }
+ac_res=$ac_cv_search_dlopen
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  pmix_check_package_lib_happy="yes"
+else
+  pmix_check_package_lib_happy="no"
+fi
+
+           if test "$pmix_check_package_lib_happy" = "no"; then :
+  LDFLAGS="$pmix_check_package_pmix_pdl_pdlopen_save_LDFLAGS"
+                  pmix_pdl_pdlopen_LDFLAGS="$pmix_check_package_pmix_pdl_pdlopen_orig_LDFLAGS"
+                  unset ac_cv_lib_dl_dlopen
+fi
+else
+   # libdir was not specified - go through search path
+           pmix_check_package_libdir=""
+           if test "$pmix_check_package_libdir" = "" || test "$pmix_check_package_libdir" = "/usr" || test "$pmix_check_package_libdir" = "/usr/local"; then :
+   # try as is...
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: looking for library without search path" >&5
+$as_echo "looking for library without search path" >&6; }
+                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5
+$as_echo_n "checking for library containing dlopen... " >&6; }
+if ${ac_cv_search_dlopen+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+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 dlopen ();
+int
+main ()
+{
+return dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' dl; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_dlopen=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_dlopen+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_dlopen+:} false; then :
+
+else
+  ac_cv_search_dlopen=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_dlopen" >&5
+$as_echo "$ac_cv_search_dlopen" >&6; }
+ac_res=$ac_cv_search_dlopen
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  pmix_check_package_lib_happy="yes"
+else
+  pmix_check_package_lib_happy="no"
+fi
+
+                if test "$pmix_check_package_lib_happy" = "no"; then :
+   # no go on the as is..  see what happens later...
+                     LDFLAGS="$pmix_check_package_pmix_pdl_pdlopen_save_LDFLAGS"
+                     pmix_pdl_pdlopen_LDFLAGS="$pmix_check_package_pmix_pdl_pdlopen_orig_LDFLAGS"
+                     unset ac_cv_lib_dl_dlopen
+fi
+fi
+
+           if test "$pmix_check_package_lib_happy" = "no"; then :
+  if test "$pmix_check_package_libdir" != ""; then :
+  pmix_pdl_pdlopen_LDFLAGS="$pmix_pdl_pdlopen_LDFLAGS -L$pmix_check_package_libdir/lib"
+                     LDFLAGS="$LDFLAGS -L$pmix_check_package_libdir/lib"
+                     { $as_echo "$as_me:${as_lineno-$LINENO}: result: looking for library in lib" >&5
+$as_echo "looking for library in lib" >&6; }
+                     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5
+$as_echo_n "checking for library containing dlopen... " >&6; }
+if ${ac_cv_search_dlopen+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+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 dlopen ();
+int
+main ()
+{
+return dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' dl; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_dlopen=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_dlopen+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_dlopen+:} false; then :
+
+else
+  ac_cv_search_dlopen=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_dlopen" >&5
+$as_echo "$ac_cv_search_dlopen" >&6; }
+ac_res=$ac_cv_search_dlopen
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  pmix_check_package_lib_happy="yes"
+else
+  pmix_check_package_lib_happy="no"
+fi
+
+                     if test "$pmix_check_package_lib_happy" = "no"; then :
+   # no go on the as is..  see what happens later...
+                          LDFLAGS="$pmix_check_package_pmix_pdl_pdlopen_save_LDFLAGS"
+                          pmix_pdl_pdlopen_LDFLAGS="$pmix_check_package_pmix_pdl_pdlopen_orig_LDFLAGS"
+                          unset ac_cv_lib_dl_dlopen
+fi
+fi
+fi
+
+           if test "$pmix_check_package_lib_happy" = "no"; then :
+  if test "$pmix_check_package_libdir" != ""; then :
+  pmix_pdl_pdlopen_LDFLAGS="$pmix_pdl_pdlopen_LDFLAGS -L$pmix_check_package_libdir/lib64"
+                     LDFLAGS="$LDFLAGS -L$pmix_check_package_libdir/lib64"
+                     { $as_echo "$as_me:${as_lineno-$LINENO}: result: looking for library in lib64" >&5
+$as_echo "looking for library in lib64" >&6; }
+                     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5
+$as_echo_n "checking for library containing dlopen... " >&6; }
+if ${ac_cv_search_dlopen+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+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 dlopen ();
+int
+main ()
+{
+return dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' dl; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_dlopen=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_dlopen+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_dlopen+:} false; then :
+
+else
+  ac_cv_search_dlopen=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_dlopen" >&5
+$as_echo "$ac_cv_search_dlopen" >&6; }
+ac_res=$ac_cv_search_dlopen
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  pmix_check_package_lib_happy="yes"
+else
+  pmix_check_package_lib_happy="no"
+fi
+
+                     if test "$pmix_check_package_lib_happy" = "no"; then :
+   # no go on the as is..  see what happens later...
+                          LDFLAGS="$pmix_check_package_pmix_pdl_pdlopen_save_LDFLAGS"
+                          pmix_pdl_pdlopen_LDFLAGS="$pmix_check_package_pmix_pdl_pdlopen_orig_LDFLAGS"
+                          unset ac_cv_lib_dl_dlopen
+fi
+fi
+fi
+fi
+
+    if test "$pmix_check_package_lib_happy" = "yes"; then :
+  pmix_pdl_pdlopen_LIBS="-ldl "
+           pmix_check_package_happy="yes"
+else
+  pmix_check_package_happy="no"
+fi
+    if test "$pmix_check_package_lib_happy" = "yes"; then :
+   # The result of AC SEARCH_LIBS is cached in $ac_cv_search_[function]
+           if test "$ac_cv_search_dlopen" != "no" &&
+                  test "$ac_cv_search_dlopen" != "none required"; then :
+  pmix_pdl_pdlopen_LIBS="$ac_cv_search_dlopen "
+else
+  pmix_pdl_pdlopen_LIBS=""
+fi
+           pmix_check_package_happy="yes"
+else
+  pmix_check_package_happy="no"
+fi
+
+
+else
+  pmix_check_package_happy="no"
+fi
+else
+
+    # This is stolen from autoconf to peek under the covers to get the
+    # cache variable for the library check.  one should not copy this
+    # code into other places unless you want much pain and suffering
+
+    # see comment above
+    unset ac_cv_lib_dl_dlopen
+    pmix_check_package_lib_happy="no"
+    if test "" != ""; then :
+   # libdir was specified - search only there
+           pmix_pdl_pdlopen_LDFLAGS="$pmix_pdl_pdlopen_LDFLAGS -L"
+           LDFLAGS="$LDFLAGS -L"
+           { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5
+$as_echo_n "checking for library containing dlopen... " >&6; }
+if ${ac_cv_search_dlopen+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+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 dlopen ();
+int
+main ()
+{
+return dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' dl; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_dlopen=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_dlopen+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_dlopen+:} false; then :
+
+else
+  ac_cv_search_dlopen=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_dlopen" >&5
+$as_echo "$ac_cv_search_dlopen" >&6; }
+ac_res=$ac_cv_search_dlopen
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  pmix_check_package_lib_happy="yes"
+else
+  pmix_check_package_lib_happy="no"
+fi
+
+           if test "$pmix_check_package_lib_happy" = "no"; then :
+  LDFLAGS="$pmix_check_package_pmix_pdl_pdlopen_save_LDFLAGS"
+                  pmix_pdl_pdlopen_LDFLAGS="$pmix_check_package_pmix_pdl_pdlopen_orig_LDFLAGS"
+                  unset ac_cv_lib_dl_dlopen
+fi
+else
+   # libdir was not specified - go through search path
+           pmix_check_package_libdir=""
+           if test "$pmix_check_package_libdir" = "" || test "$pmix_check_package_libdir" = "/usr" || test "$pmix_check_package_libdir" = "/usr/local"; then :
+   # try as is...
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: looking for library without search path" >&5
+$as_echo "looking for library without search path" >&6; }
+                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5
+$as_echo_n "checking for library containing dlopen... " >&6; }
+if ${ac_cv_search_dlopen+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+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 dlopen ();
+int
+main ()
+{
+return dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' dl; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_dlopen=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_dlopen+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_dlopen+:} false; then :
+
+else
+  ac_cv_search_dlopen=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_dlopen" >&5
+$as_echo "$ac_cv_search_dlopen" >&6; }
+ac_res=$ac_cv_search_dlopen
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  pmix_check_package_lib_happy="yes"
+else
+  pmix_check_package_lib_happy="no"
+fi
+
+                if test "$pmix_check_package_lib_happy" = "no"; then :
+   # no go on the as is..  see what happens later...
+                     LDFLAGS="$pmix_check_package_pmix_pdl_pdlopen_save_LDFLAGS"
+                     pmix_pdl_pdlopen_LDFLAGS="$pmix_check_package_pmix_pdl_pdlopen_orig_LDFLAGS"
+                     unset ac_cv_lib_dl_dlopen
+fi
+fi
+
+           if test "$pmix_check_package_lib_happy" = "no"; then :
+  if test "$pmix_check_package_libdir" != ""; then :
+  pmix_pdl_pdlopen_LDFLAGS="$pmix_pdl_pdlopen_LDFLAGS -L$pmix_check_package_libdir/lib"
+                     LDFLAGS="$LDFLAGS -L$pmix_check_package_libdir/lib"
+                     { $as_echo "$as_me:${as_lineno-$LINENO}: result: looking for library in lib" >&5
+$as_echo "looking for library in lib" >&6; }
+                     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5
+$as_echo_n "checking for library containing dlopen... " >&6; }
+if ${ac_cv_search_dlopen+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+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 dlopen ();
+int
+main ()
+{
+return dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' dl; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_dlopen=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_dlopen+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_dlopen+:} false; then :
+
+else
+  ac_cv_search_dlopen=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_dlopen" >&5
+$as_echo "$ac_cv_search_dlopen" >&6; }
+ac_res=$ac_cv_search_dlopen
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  pmix_check_package_lib_happy="yes"
+else
+  pmix_check_package_lib_happy="no"
+fi
+
+                     if test "$pmix_check_package_lib_happy" = "no"; then :
+   # no go on the as is..  see what happens later...
+                          LDFLAGS="$pmix_check_package_pmix_pdl_pdlopen_save_LDFLAGS"
+                          pmix_pdl_pdlopen_LDFLAGS="$pmix_check_package_pmix_pdl_pdlopen_orig_LDFLAGS"
+                          unset ac_cv_lib_dl_dlopen
+fi
+fi
+fi
+
+           if test "$pmix_check_package_lib_happy" = "no"; then :
+  if test "$pmix_check_package_libdir" != ""; then :
+  pmix_pdl_pdlopen_LDFLAGS="$pmix_pdl_pdlopen_LDFLAGS -L$pmix_check_package_libdir/lib64"
+                     LDFLAGS="$LDFLAGS -L$pmix_check_package_libdir/lib64"
+                     { $as_echo "$as_me:${as_lineno-$LINENO}: result: looking for library in lib64" >&5
+$as_echo "looking for library in lib64" >&6; }
+                     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5
+$as_echo_n "checking for library containing dlopen... " >&6; }
+if ${ac_cv_search_dlopen+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+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 dlopen ();
+int
+main ()
+{
+return dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' dl; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_dlopen=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_dlopen+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_dlopen+:} false; then :
+
+else
+  ac_cv_search_dlopen=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_dlopen" >&5
+$as_echo "$ac_cv_search_dlopen" >&6; }
+ac_res=$ac_cv_search_dlopen
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  pmix_check_package_lib_happy="yes"
+else
+  pmix_check_package_lib_happy="no"
+fi
+
+                     if test "$pmix_check_package_lib_happy" = "no"; then :
+   # no go on the as is..  see what happens later...
+                          LDFLAGS="$pmix_check_package_pmix_pdl_pdlopen_save_LDFLAGS"
+                          pmix_pdl_pdlopen_LDFLAGS="$pmix_check_package_pmix_pdl_pdlopen_orig_LDFLAGS"
+                          unset ac_cv_lib_dl_dlopen
+fi
+fi
+fi
+fi
+
+    if test "$pmix_check_package_lib_happy" = "yes"; then :
+  pmix_pdl_pdlopen_LIBS="-ldl "
+           pmix_check_package_happy="yes"
+else
+  pmix_check_package_happy="no"
+fi
+    if test "$pmix_check_package_lib_happy" = "yes"; then :
+   # The result of AC SEARCH_LIBS is cached in $ac_cv_search_[function]
+           if test "$ac_cv_search_dlopen" != "no" &&
+                  test "$ac_cv_search_dlopen" != "none required"; then :
+  pmix_pdl_pdlopen_LIBS="$ac_cv_search_dlopen "
+else
+  pmix_pdl_pdlopen_LIBS=""
+fi
+           pmix_check_package_happy="yes"
+else
+  pmix_check_package_happy="no"
+fi
+
+
+fi
+    unset pmix_check_package_header_happy
+
+
+
+    if test "$pmix_check_package_happy" = "yes"; then :
+  pmix_pdl_pdlopen_happy=yes
+else
+  pmix_pdl_pdlopen_CPPFLAGS="$pmix_check_package_pmix_pdl_pdlopen_orig_CPPFLAGS"
+           pmix_pdl_pdlopen_LDFLAGS="$pmix_check_package_pmix_pdl_pdlopen_orig_LDFLAGS"
+           pmix_pdl_pdlopen_LIBS="$pmix_check_package_pmix_pdl_pdlopen_orig_LIBS"
+           pmix_pdl_pdlopen_happy=no
+fi
+
+    CPPFLAGS="$pmix_check_package_pmix_pdl_pdlopen_save_CPPFLAGS"
+    LDFLAGS="$pmix_check_package_pmix_pdl_pdlopen_save_LDFLAGS"
+    LIBS="$pmix_check_package_pmix_pdl_pdlopen_save_LIBS"
+
+
+fi
+
+    if test "$pmix_pdl_pdlopen_happy" = "yes"; then :
+  pmix_pdl_pdlopen_ADD_LIBS=$pmix_pdl_pdlopen_LIBS
+           should_build=$should_build
+else
+  should_build=0
+fi
+
+
+
+    pmix_show_verbose "PMIX_MCA_M4_CONFIG_COMPONENT: after, should_build=$should_build"
+
+    if test "$should_build" = "1"; then :
+
+
+
+    # See if it dropped an output file for us to pick up some
+    # shell variables in.
+    infile="$srcdir/src/mca/pdl/pdlopen/post_configure.sh"
+
+    # Add this subdir to the mast list of all MCA component subdirs
+    all_components="$all_components pdlopen"
+
+    if test "$compile_mode" = "dso" ; then
+        dso_components="$dso_components pdlopen"
+    else
+        if test "pdl" = "common"; then
+            # Static libraries in "common" frameworks are installed, and
+            # therefore must obey the $FRAMEWORK_LIB_PREFIX that was
+            # set.
+            static_ltlibs="mca/pdl/pdlopen/lib${PMIX_LIB_PREFIX}mca_pdl_pdlopen.la $static_ltlibs"
+        else
+            # Other frameworks do not have to obey the
+            # $FRAMEWORK_LIB_PREFIX prefix.
+            static_ltlibs="mca/pdl/pdlopen/libmca_pdl_pdlopen.la $static_ltlibs"
+        fi
+        echo "extern const pmix_mca_base_component_t mca_pdl_pdlopen_component;" >> $outfile.extern
+        echo "  &mca_pdl_pdlopen_component, " >> $outfile.struct
+        static_components="$static_components pdlopen"
+    fi
+
+    # Output pretty results
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if MCA component pdl:pdlopen can compile" >&5
+$as_echo_n "checking if MCA component pdl:pdlopen can compile... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+                        if test -f $infile; then
+        # check for direct call header to include.  This will be
+        # AC_SUBSTed later.
+        if test "$DIRECT_pdl" = "pdlopen" ; then
+            if test "`$GREP DIRECT_CALL_HEADER $infile`" != "" ; then
+                line="`$GREP DIRECT_CALL_HEADER $infile | cut -d= -f2-`"
+                str="MCA_pmix_pdl_DIRECT_CALL_HEADER=$line"
+                eval $str
+            else
+as_fn_error $? "*** pdl component pdlopen was supposed to be direct-called, but
+*** does not appear to support direct calling.
+*** Aborting" "$LINENO" 5
+            fi
+        fi
+    else
+        # were we supposed to have found something in the
+        # post_configure.sh, but the file didn't exist?
+        if test "$DIRECT_pdl" = "pdlopen" ; then
+as_fn_error $? "*** pdl component pdlopen was supposed to be direct-called, but
+*** does not appear to support direct calling.
+*** Aborting" "$LINENO" 5
+        fi
+    fi
+
+    # if the component is building, add it's WRAPPER_EXTRA_LDFLAGS and
+    # WRAPPER_EXTRA_LIBS.  If the component doesn't specify it's
+    # WRAPPER_EXTRA_LIBS and WRAPPER_EXTRA_LDFLAGS, try using LDFLAGS and LIBS if
+    # component didn't have it's own configure script (in which case,
+    # we know it didn't set LDFLAGS and LIBS because it can't) Don't
+    # have to do this if the component is building dynamically,
+    # because it will link against these (without a dependency from
+    # libmpi.so to these flags)
+    if test "$compile_mode" = "static"; then
+        if test "$pdl_pdlopen_WRAPPER_EXTRA_LDFLAGS" = ""; then :
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $pdl_pdlopen_LDFLAGS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_ldflags}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_ldflags"; then :
+  mca_wrapper_extra_ldflags=$arg
+else
+  mca_wrapper_extra_ldflags="$mca_wrapper_extra_ldflags $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+else
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $pdl_pdlopen_WRAPPER_EXTRA_LDFLAGS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_ldflags}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_ldflags"; then :
+  mca_wrapper_extra_ldflags=$arg
+else
+  mca_wrapper_extra_ldflags="$mca_wrapper_extra_ldflags $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+fi
+                        if test "$pdl_pdlopen_WRAPPER_EXTRA_LIBS" = ""; then :
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $pdl_pdlopen_LIBS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_libs}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_libs"; then :
+  mca_wrapper_extra_libs=$arg
+else
+  mca_wrapper_extra_libs="$mca_wrapper_extra_libs $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+else
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $pdl_pdlopen_WRAPPER_EXTRA_LIBS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_libs}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_libs"; then :
+  mca_wrapper_extra_libs=$arg
+else
+  mca_wrapper_extra_libs="$mca_wrapper_extra_libs $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+fi
+
+    fi
+
+    # if needed, copy over WRAPPER_EXTRA_CPPFLAGS.  Since a configure script
+    # component can never be used in a STOP_AT_FIRST framework, we
+    # don't have to implement the else clause in the literal check...
+    if test "$pdl_pdlopen_WRAPPER_EXTRA_CPPFLAGS" != ""; then :
+  stop_at_first=1
+            if test "$compile_mode" = "static" && test "$stop_at_first" = "1"; then :
+  if test "$with_devel_headers" = "yes"; then :
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $pdl_pdlopen_WRAPPER_EXTRA_CPPFLAGS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_cppflags}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_cppflags"; then :
+  mca_wrapper_extra_cppflags=$arg
+else
+  mca_wrapper_extra_cppflags="$mca_wrapper_extra_cppflags $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+fi
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ignoring pdl_pdlopen_WRAPPER_EXTRA_CPPFLAGS ($pdl_pdlopen_WRAPPER_EXTRA_CPPFLAGS): component conditions not met" >&5
+$as_echo "$as_me: WARNING: ignoring pdl_pdlopen_WRAPPER_EXTRA_CPPFLAGS ($pdl_pdlopen_WRAPPER_EXTRA_CPPFLAGS): component conditions not met" >&2;}
+fi
+fi
+
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if MCA component pdl:pdlopen can compile" >&5
+$as_echo_n "checking if MCA component pdl:pdlopen can compile... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+    # If this component was requested as the default for this
+    # type, then abort.
+    if test "$with_pdl" = "pdlopen" ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MCA component \"pdlopen\" failed to configure properly" >&5
+$as_echo "$as_me: WARNING: MCA component \"pdlopen\" failed to configure properly" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This component was selected as the default" >&5
+$as_echo "$as_me: WARNING: This component was selected as the default" >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    if test ! -z "$DIRECT_pdl" ; then
+        if test "$DIRECT_pdl" = "pdlopen" ; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MCA component \"pdlopen\" failed to configure properly" >&5
+$as_echo "$as_me: WARNING: MCA component \"pdlopen\" failed to configure properly" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This component was selected as the default (direct call)" >&5
+$as_echo "$as_me: WARNING: This component was selected as the default (direct call)" >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    fi
+
+           # add component to all component list
+           all_components="$all_components pdlopen"
+fi
+
+
+    # If we won, then do all the rest of the setup
+    if test "$should_build" = "1"; then :
+
+           # Add some stuff to CPPFLAGS so that the rest of the source
+           # tree can be built
+           LDFLAGS="$LDFLAGS $pmix_pdl_pdlopen_ADD_LDFLAGS"
+           LIBS="$LIBS $pmix_pdl_pdlopen_ADD_LIBS"
+
+fi
+
+
+    # set the AM_CONDITIONAL on how we should build
+    if test "$compile_mode" = "dso"; then :
+  BUILD_pmix_pdl_pdlopen_DSO=1
+else
+  BUILD_pmix_pdl_pdlopen_DSO=0
+fi
+     if test "$BUILD_pmix_pdl_pdlopen_DSO" = "1"; then
+  MCA_BUILD_pmix_pdl_pdlopen_DSO_TRUE=
+  MCA_BUILD_pmix_pdl_pdlopen_DSO_FALSE='#'
+else
+  MCA_BUILD_pmix_pdl_pdlopen_DSO_TRUE='#'
+  MCA_BUILD_pmix_pdl_pdlopen_DSO_FALSE=
+fi
+
+
+    if test "$should_build" = "1"; then :
+  components_last_result=1
+else
+  components_last_result=0
+fi
+
+    unset compile_mode
+
+                   if test $components_last_result -eq 1; then :
+  components_looking_for_succeed=0
+fi
+
+
+
+    pmix_show_subsubsubtitle "MCA component pdl:plibltdl (m4 configuration macro, priority 50)"
+
+    pmix_show_verbose "PMIX_MCA_M4_CONFIG_COMPONENT: before, should_build=$components_looking_for_succeed"
+
+
+
+    component_path="$srcdir/src/mca/pdl/plibltdl"
+    want_component=0
+
+    # build if:
+    # - the component type is direct and we are that component
+    # - there is no pmix_ignore file
+    # - there is an pmix_ignore, but there is an empty pmix_unignore
+    # - there is an pmix_ignore, but username is in pmix_unignore
+    if test -d $component_path ; then
+        # decide if we want the component to be built or not.  This
+        # is spread out because some of the logic is a little complex
+        # and test's syntax isn't exactly the greatest.  We want to
+        # build the component by default.
+        want_component=1
+        if test -f $component_path/.pmix_ignore ; then
+            # If there is an pmix_ignore file, don't build
+            # the component.  Note that this decision can be
+            # overridden by the unignore logic below.
+            want_component=0
+        fi
+        if test -f $component_path/.pmix_unignore ; then
+            # if there is an empty pmix_unignore, that is
+            # equivalent to having your userid in the unignore file.
+            # If userid is in the file, unignore the ignore file.
+            if test ! -s $component_path/.pmix_unignore ; then
+                want_component=1
+            elif test ! -z "`$GREP $PMIX_CONFIGURE_USER $component_path/.pmix_unignore`" ; then
+                want_component=1
+            fi
+        fi
+        # if this component type is direct and we are not it, we don't want
+        # to be built.  Otherwise, we do want to be built.
+        if test ! -z "$DIRECT_pdl" ; then
+            if test "$DIRECT_pdl" = "plibltdl" ; then
+                want_component=1
+            else
+                want_component=0
+            fi
+        fi
+    fi
+
+    # if we were explicitly disabled, don't build :)
+    if test "$DISABLE_pdl" = "1"; then :
+  want_component=0
+fi
+    if test "$DISABLE_pdl_plibltdl" = "1"; then :
+  want_component=0
+fi
+
+    if test "$want_component" = "1"; then :
+  should_build=$components_looking_for_succeed
+else
+  should_build=0
+fi
+
+    # Allow the component to override the build mode if it really wants to.
+    # It is, of course, free to end up calling MCA_COMPONENT_COMPILE_MODE
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MCA component pdl:plibltdl compile mode" >&5
+$as_echo_n "checking for MCA component pdl:plibltdl compile mode... " >&6; }
+    compile_mode="static"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $compile_mode" >&5
+$as_echo "$compile_mode" >&6; }
+
+
+    # try to configure the component
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in CPPFLAGS_save LDFLAGS_save LIBS_save; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"CPPFLAGS_save LDFLAGS_save LIBS_save\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+    ac_config_files="$ac_config_files src/mca/pdl/plibltdl/Makefile"
+
+
+    # Add --with options
+
+# Check whether --with-plibltdl was given.
+if test "${with_plibltdl+set}" = set; then :
+  withval=$with_plibltdl;
+fi
+
+
+# Check whether --with-libltdl-libdir was given.
+if test "${with_libltdl_libdir+set}" = set; then :
+  withval=$with_libltdl_libdir;
+fi
+
+
+    # Sanity check the --with values
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking --with-plibltdl value" >&5
+$as_echo_n "checking --with-plibltdl value... " >&6; }
+    if test "$with_libltdl" = "yes" || test "$with_libltdl" = "no" || test "x$with_libltdl" = "x"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: simple ok (unspecified)" >&5
+$as_echo "simple ok (unspecified)" >&6; }
+else
+  if test ! -d "$with_libltdl"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+                  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Directory $with_libltdl not found" >&5
+$as_echo "$as_me: WARNING: Directory $with_libltdl not found" >&2;}
+                  as_fn_error $? "Cannot continue" "$LINENO" 5
+else
+  if test "x`ls $with_libltdl/include/ltdl.h 2> /dev/null`" = "x"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+                         { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Expected file $with_libltdl/include/ltdl.h not found" >&5
+$as_echo "$as_me: WARNING: Expected file $with_libltdl/include/ltdl.h not found" >&2;}
+                         as_fn_error $? "Cannot continue" "$LINENO" 5
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: sanity check ok ($with_libltdl)" >&5
+$as_echo "sanity check ok ($with_libltdl)" >&6; }
+
+fi
+
+
+fi
+
+
+fi
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking --with-plibltdl-libdir value" >&5
+$as_echo_n "checking --with-plibltdl-libdir value... " >&6; }
+    if test "$with_libltdl_libdir" = "yes" || test "$with_libltdl_libdir" = "no" || test "x$with_libltdl_libdir" = "x"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: simple ok (unspecified)" >&5
+$as_echo "simple ok (unspecified)" >&6; }
+else
+  if test ! -d "$with_libltdl_libdir"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+                  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Directory $with_libltdl_libdir not found" >&5
+$as_echo "$as_me: WARNING: Directory $with_libltdl_libdir not found" >&2;}
+                  as_fn_error $? "Cannot continue" "$LINENO" 5
+else
+  if test "x`ls $with_libltdl_libdir/libltdl.* 2> /dev/null`" = "x"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+                         { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Expected file $with_libltdl_libdir/libltdl.* not found" >&5
+$as_echo "$as_me: WARNING: Expected file $with_libltdl_libdir/libltdl.* not found" >&2;}
+                         as_fn_error $? "Cannot continue" "$LINENO" 5
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: sanity check ok ($with_libltdl_libdir)" >&5
+$as_echo "sanity check ok ($with_libltdl_libdir)" >&6; }
+
+fi
+
+
+fi
+
+
+fi
+
+
+    # Defaults
+    pmix_check_plibltdl_dir_msg="compiler default"
+    pmix_check_plibltdl_libdir_msg="linker default"
+
+    # Save directory names if supplied
+    if test ! -z "$with_libltdl" && test "$with_libltdl" != "yes"; then :
+  pmix_check_plibltdl_dir=$with_libltdl
+           pmix_check_plibltdl_dir_msg="$pmix_check_plibltdl_dir (from --with-libltdl)"
+fi
+    if test ! -z "$with_libltdl_libdir" && test "$with_libltdl_libdir" != "yes"; then :
+  pmix_check_plibltdl_libdir=$with_libltdl_libdir
+           pmix_check_plibltdl_libdir_msg="$pmix_check_plibltdl_libdir (from --with-libltdl-libdir)"
+fi
+
+    pmix_pdl_plibltdl_happy=no
+    if test "$with_plibltdl" != "no"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libltdl dir" >&5
+$as_echo_n "checking for libltdl dir... " >&6; }
+           { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pmix_check_plibltdl_dir_msg" >&5
+$as_echo "$pmix_check_plibltdl_dir_msg" >&6; }
+           { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libltdl library dir" >&5
+$as_echo_n "checking for libltdl library dir... " >&6; }
+           { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pmix_check_plibltdl_libdir_msg" >&5
+$as_echo "$pmix_check_plibltdl_libdir_msg" >&6; }
+
+
+    pmix_check_package_pmix_pdl_plibltdl_save_CPPFLAGS="$CPPFLAGS"
+    pmix_check_package_pmix_pdl_plibltdl_save_LDFLAGS="$LDFLAGS"
+    pmix_check_package_pmix_pdl_plibltdl_save_LIBS="$LIBS"
+
+    pmix_check_package_pmix_pdl_plibltdl_orig_CPPFLAGS="$pmix_pdl_plibltdl_CPPFLAGS"
+    pmix_check_package_pmix_pdl_plibltdl_orig_LDFLAGS="$pmix_pdl_plibltdl_LDFLAGS"
+    pmix_check_package_pmix_pdl_plibltdl_orig_LIBS="$pmix_pdl_plibltdl_LIBS"
+
+
+    # This is stolen from autoconf to peek under the covers to get the
+    # cache variable for the library check.  one should not copy this
+    # code into other places unless you want much pain and suffering
+
+
+    # so this sucks, but there's no way to get through the progression
+    # of header includes without killing off the cache variable and trying
+    # again...
+    unset ac_cv_header_ltdl_h
+
+    pmix_check_package_header_happy="no"
+    if test "$pmix_check_plibltdl_dir" = "/usr" || test "$pmix_check_plibltdl_dir" = "/usr/local"; then :
+   # try as is...
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: looking for header without includes" >&5
+$as_echo "looking for header without includes" >&6; }
+            for ac_header in ltdl.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "ltdl.h" "ac_cv_header_ltdl_h" "$ac_includes_default"
+if test "x$ac_cv_header_ltdl_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LTDL_H 1
+_ACEOF
+ pmix_check_package_header_happy="yes"
+fi
+
+done
+
+            if test "$pmix_check_package_header_happy" = "no"; then :
+  # no go on the as is - reset the cache and try again
+                   unset ac_cv_header_ltdl_h
+fi
+fi
+
+    if test "$pmix_check_package_header_happy" = "no"; then :
+  if test "$pmix_check_plibltdl_dir" != ""; then :
+  pmix_pdl_plibltdl_CPPFLAGS="$pmix_pdl_plibltdl_CPPFLAGS -I$pmix_check_plibltdl_dir/include"
+                  CPPFLAGS="$CPPFLAGS -I$pmix_check_plibltdl_dir/include"
+fi
+          for ac_header in ltdl.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "ltdl.h" "ac_cv_header_ltdl_h" "$ac_includes_default"
+if test "x$ac_cv_header_ltdl_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LTDL_H 1
+_ACEOF
+ pmix_check_package_header_happy="yes"
+fi
+
+done
+
+	  if test "$pmix_check_package_header_happy" = "yes"; then :
+
+    # This is stolen from autoconf to peek under the covers to get the
+    # cache variable for the library check.  one should not copy this
+    # code into other places unless you want much pain and suffering
+
+    # see comment above
+    unset ac_cv_lib_ltdl_lt_dlopen
+    pmix_check_package_lib_happy="no"
+    if test "$pmix_check_plibltdl_libdir" != ""; then :
+   # libdir was specified - search only there
+           pmix_pdl_plibltdl_LDFLAGS="$pmix_pdl_plibltdl_LDFLAGS -L$pmix_check_plibltdl_libdir"
+           LDFLAGS="$LDFLAGS -L$pmix_check_plibltdl_libdir"
+           { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing lt_dlopen" >&5
+$as_echo_n "checking for library containing lt_dlopen... " >&6; }
+if ${ac_cv_search_lt_dlopen+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+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 lt_dlopen ();
+int
+main ()
+{
+return lt_dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' ltdl; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_lt_dlopen=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_lt_dlopen+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_lt_dlopen+:} false; then :
+
+else
+  ac_cv_search_lt_dlopen=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_lt_dlopen" >&5
+$as_echo "$ac_cv_search_lt_dlopen" >&6; }
+ac_res=$ac_cv_search_lt_dlopen
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  pmix_check_package_lib_happy="yes"
+else
+  pmix_check_package_lib_happy="no"
+fi
+
+           if test "$pmix_check_package_lib_happy" = "no"; then :
+  LDFLAGS="$pmix_check_package_pmix_pdl_plibltdl_save_LDFLAGS"
+                  pmix_pdl_plibltdl_LDFLAGS="$pmix_check_package_pmix_pdl_plibltdl_orig_LDFLAGS"
+                  unset ac_cv_lib_ltdl_lt_dlopen
+fi
+else
+   # libdir was not specified - go through search path
+           pmix_check_package_libdir="$pmix_check_plibltdl_dir"
+           if test "$pmix_check_package_libdir" = "" || test "$pmix_check_package_libdir" = "/usr" || test "$pmix_check_package_libdir" = "/usr/local"; then :
+   # try as is...
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: looking for library without search path" >&5
+$as_echo "looking for library without search path" >&6; }
+                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing lt_dlopen" >&5
+$as_echo_n "checking for library containing lt_dlopen... " >&6; }
+if ${ac_cv_search_lt_dlopen+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+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 lt_dlopen ();
+int
+main ()
+{
+return lt_dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' ltdl; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_lt_dlopen=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_lt_dlopen+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_lt_dlopen+:} false; then :
+
+else
+  ac_cv_search_lt_dlopen=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_lt_dlopen" >&5
+$as_echo "$ac_cv_search_lt_dlopen" >&6; }
+ac_res=$ac_cv_search_lt_dlopen
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  pmix_check_package_lib_happy="yes"
+else
+  pmix_check_package_lib_happy="no"
+fi
+
+                if test "$pmix_check_package_lib_happy" = "no"; then :
+   # no go on the as is..  see what happens later...
+                     LDFLAGS="$pmix_check_package_pmix_pdl_plibltdl_save_LDFLAGS"
+                     pmix_pdl_plibltdl_LDFLAGS="$pmix_check_package_pmix_pdl_plibltdl_orig_LDFLAGS"
+                     unset ac_cv_lib_ltdl_lt_dlopen
+fi
+fi
+
+           if test "$pmix_check_package_lib_happy" = "no"; then :
+  if test "$pmix_check_package_libdir" != ""; then :
+  pmix_pdl_plibltdl_LDFLAGS="$pmix_pdl_plibltdl_LDFLAGS -L$pmix_check_package_libdir/lib"
+                     LDFLAGS="$LDFLAGS -L$pmix_check_package_libdir/lib"
+                     { $as_echo "$as_me:${as_lineno-$LINENO}: result: looking for library in lib" >&5
+$as_echo "looking for library in lib" >&6; }
+                     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing lt_dlopen" >&5
+$as_echo_n "checking for library containing lt_dlopen... " >&6; }
+if ${ac_cv_search_lt_dlopen+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+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 lt_dlopen ();
+int
+main ()
+{
+return lt_dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' ltdl; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_lt_dlopen=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_lt_dlopen+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_lt_dlopen+:} false; then :
+
+else
+  ac_cv_search_lt_dlopen=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_lt_dlopen" >&5
+$as_echo "$ac_cv_search_lt_dlopen" >&6; }
+ac_res=$ac_cv_search_lt_dlopen
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  pmix_check_package_lib_happy="yes"
+else
+  pmix_check_package_lib_happy="no"
+fi
+
+                     if test "$pmix_check_package_lib_happy" = "no"; then :
+   # no go on the as is..  see what happens later...
+                          LDFLAGS="$pmix_check_package_pmix_pdl_plibltdl_save_LDFLAGS"
+                          pmix_pdl_plibltdl_LDFLAGS="$pmix_check_package_pmix_pdl_plibltdl_orig_LDFLAGS"
+                          unset ac_cv_lib_ltdl_lt_dlopen
+fi
+fi
+fi
+
+           if test "$pmix_check_package_lib_happy" = "no"; then :
+  if test "$pmix_check_package_libdir" != ""; then :
+  pmix_pdl_plibltdl_LDFLAGS="$pmix_pdl_plibltdl_LDFLAGS -L$pmix_check_package_libdir/lib64"
+                     LDFLAGS="$LDFLAGS -L$pmix_check_package_libdir/lib64"
+                     { $as_echo "$as_me:${as_lineno-$LINENO}: result: looking for library in lib64" >&5
+$as_echo "looking for library in lib64" >&6; }
+                     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing lt_dlopen" >&5
+$as_echo_n "checking for library containing lt_dlopen... " >&6; }
+if ${ac_cv_search_lt_dlopen+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+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 lt_dlopen ();
+int
+main ()
+{
+return lt_dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' ltdl; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_lt_dlopen=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_lt_dlopen+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_lt_dlopen+:} false; then :
+
+else
+  ac_cv_search_lt_dlopen=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_lt_dlopen" >&5
+$as_echo "$ac_cv_search_lt_dlopen" >&6; }
+ac_res=$ac_cv_search_lt_dlopen
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  pmix_check_package_lib_happy="yes"
+else
+  pmix_check_package_lib_happy="no"
+fi
+
+                     if test "$pmix_check_package_lib_happy" = "no"; then :
+   # no go on the as is..  see what happens later...
+                          LDFLAGS="$pmix_check_package_pmix_pdl_plibltdl_save_LDFLAGS"
+                          pmix_pdl_plibltdl_LDFLAGS="$pmix_check_package_pmix_pdl_plibltdl_orig_LDFLAGS"
+                          unset ac_cv_lib_ltdl_lt_dlopen
+fi
+fi
+fi
+fi
+
+    if test "$pmix_check_package_lib_happy" = "yes"; then :
+  pmix_pdl_plibltdl_LIBS="-lltdl "
+           pmix_check_package_happy="yes"
+else
+  pmix_check_package_happy="no"
+fi
+    if test "$pmix_check_package_lib_happy" = "yes"; then :
+   # The result of AC SEARCH_LIBS is cached in $ac_cv_search_[function]
+           if test "$ac_cv_search_lt_dlopen" != "no" &&
+                  test "$ac_cv_search_lt_dlopen" != "none required"; then :
+  pmix_pdl_plibltdl_LIBS="$ac_cv_search_lt_dlopen "
+else
+  pmix_pdl_plibltdl_LIBS=""
+fi
+           pmix_check_package_happy="yes"
+else
+  pmix_check_package_happy="no"
+fi
+
+
+else
+  pmix_check_package_happy="no"
+fi
+else
+
+    # This is stolen from autoconf to peek under the covers to get the
+    # cache variable for the library check.  one should not copy this
+    # code into other places unless you want much pain and suffering
+
+    # see comment above
+    unset ac_cv_lib_ltdl_lt_dlopen
+    pmix_check_package_lib_happy="no"
+    if test "$pmix_check_plibltdl_libdir" != ""; then :
+   # libdir was specified - search only there
+           pmix_pdl_plibltdl_LDFLAGS="$pmix_pdl_plibltdl_LDFLAGS -L$pmix_check_plibltdl_libdir"
+           LDFLAGS="$LDFLAGS -L$pmix_check_plibltdl_libdir"
+           { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing lt_dlopen" >&5
+$as_echo_n "checking for library containing lt_dlopen... " >&6; }
+if ${ac_cv_search_lt_dlopen+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+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 lt_dlopen ();
+int
+main ()
+{
+return lt_dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' ltdl; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_lt_dlopen=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_lt_dlopen+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_lt_dlopen+:} false; then :
+
+else
+  ac_cv_search_lt_dlopen=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_lt_dlopen" >&5
+$as_echo "$ac_cv_search_lt_dlopen" >&6; }
+ac_res=$ac_cv_search_lt_dlopen
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  pmix_check_package_lib_happy="yes"
+else
+  pmix_check_package_lib_happy="no"
+fi
+
+           if test "$pmix_check_package_lib_happy" = "no"; then :
+  LDFLAGS="$pmix_check_package_pmix_pdl_plibltdl_save_LDFLAGS"
+                  pmix_pdl_plibltdl_LDFLAGS="$pmix_check_package_pmix_pdl_plibltdl_orig_LDFLAGS"
+                  unset ac_cv_lib_ltdl_lt_dlopen
+fi
+else
+   # libdir was not specified - go through search path
+           pmix_check_package_libdir="$pmix_check_plibltdl_dir"
+           if test "$pmix_check_package_libdir" = "" || test "$pmix_check_package_libdir" = "/usr" || test "$pmix_check_package_libdir" = "/usr/local"; then :
+   # try as is...
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: looking for library without search path" >&5
+$as_echo "looking for library without search path" >&6; }
+                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing lt_dlopen" >&5
+$as_echo_n "checking for library containing lt_dlopen... " >&6; }
+if ${ac_cv_search_lt_dlopen+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+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 lt_dlopen ();
+int
+main ()
+{
+return lt_dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' ltdl; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_lt_dlopen=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_lt_dlopen+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_lt_dlopen+:} false; then :
+
+else
+  ac_cv_search_lt_dlopen=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_lt_dlopen" >&5
+$as_echo "$ac_cv_search_lt_dlopen" >&6; }
+ac_res=$ac_cv_search_lt_dlopen
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  pmix_check_package_lib_happy="yes"
+else
+  pmix_check_package_lib_happy="no"
+fi
+
+                if test "$pmix_check_package_lib_happy" = "no"; then :
+   # no go on the as is..  see what happens later...
+                     LDFLAGS="$pmix_check_package_pmix_pdl_plibltdl_save_LDFLAGS"
+                     pmix_pdl_plibltdl_LDFLAGS="$pmix_check_package_pmix_pdl_plibltdl_orig_LDFLAGS"
+                     unset ac_cv_lib_ltdl_lt_dlopen
+fi
+fi
+
+           if test "$pmix_check_package_lib_happy" = "no"; then :
+  if test "$pmix_check_package_libdir" != ""; then :
+  pmix_pdl_plibltdl_LDFLAGS="$pmix_pdl_plibltdl_LDFLAGS -L$pmix_check_package_libdir/lib"
+                     LDFLAGS="$LDFLAGS -L$pmix_check_package_libdir/lib"
+                     { $as_echo "$as_me:${as_lineno-$LINENO}: result: looking for library in lib" >&5
+$as_echo "looking for library in lib" >&6; }
+                     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing lt_dlopen" >&5
+$as_echo_n "checking for library containing lt_dlopen... " >&6; }
+if ${ac_cv_search_lt_dlopen+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+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 lt_dlopen ();
+int
+main ()
+{
+return lt_dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' ltdl; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_lt_dlopen=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_lt_dlopen+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_lt_dlopen+:} false; then :
+
+else
+  ac_cv_search_lt_dlopen=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_lt_dlopen" >&5
+$as_echo "$ac_cv_search_lt_dlopen" >&6; }
+ac_res=$ac_cv_search_lt_dlopen
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  pmix_check_package_lib_happy="yes"
+else
+  pmix_check_package_lib_happy="no"
+fi
+
+                     if test "$pmix_check_package_lib_happy" = "no"; then :
+   # no go on the as is..  see what happens later...
+                          LDFLAGS="$pmix_check_package_pmix_pdl_plibltdl_save_LDFLAGS"
+                          pmix_pdl_plibltdl_LDFLAGS="$pmix_check_package_pmix_pdl_plibltdl_orig_LDFLAGS"
+                          unset ac_cv_lib_ltdl_lt_dlopen
+fi
+fi
+fi
+
+           if test "$pmix_check_package_lib_happy" = "no"; then :
+  if test "$pmix_check_package_libdir" != ""; then :
+  pmix_pdl_plibltdl_LDFLAGS="$pmix_pdl_plibltdl_LDFLAGS -L$pmix_check_package_libdir/lib64"
+                     LDFLAGS="$LDFLAGS -L$pmix_check_package_libdir/lib64"
+                     { $as_echo "$as_me:${as_lineno-$LINENO}: result: looking for library in lib64" >&5
+$as_echo "looking for library in lib64" >&6; }
+                     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing lt_dlopen" >&5
+$as_echo_n "checking for library containing lt_dlopen... " >&6; }
+if ${ac_cv_search_lt_dlopen+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+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 lt_dlopen ();
+int
+main ()
+{
+return lt_dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' ltdl; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_lt_dlopen=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_lt_dlopen+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_lt_dlopen+:} false; then :
+
+else
+  ac_cv_search_lt_dlopen=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_lt_dlopen" >&5
+$as_echo "$ac_cv_search_lt_dlopen" >&6; }
+ac_res=$ac_cv_search_lt_dlopen
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  pmix_check_package_lib_happy="yes"
+else
+  pmix_check_package_lib_happy="no"
+fi
+
+                     if test "$pmix_check_package_lib_happy" = "no"; then :
+   # no go on the as is..  see what happens later...
+                          LDFLAGS="$pmix_check_package_pmix_pdl_plibltdl_save_LDFLAGS"
+                          pmix_pdl_plibltdl_LDFLAGS="$pmix_check_package_pmix_pdl_plibltdl_orig_LDFLAGS"
+                          unset ac_cv_lib_ltdl_lt_dlopen
+fi
+fi
+fi
+fi
+
+    if test "$pmix_check_package_lib_happy" = "yes"; then :
+  pmix_pdl_plibltdl_LIBS="-lltdl "
+           pmix_check_package_happy="yes"
+else
+  pmix_check_package_happy="no"
+fi
+    if test "$pmix_check_package_lib_happy" = "yes"; then :
+   # The result of AC SEARCH_LIBS is cached in $ac_cv_search_[function]
+           if test "$ac_cv_search_lt_dlopen" != "no" &&
+                  test "$ac_cv_search_lt_dlopen" != "none required"; then :
+  pmix_pdl_plibltdl_LIBS="$ac_cv_search_lt_dlopen "
+else
+  pmix_pdl_plibltdl_LIBS=""
+fi
+           pmix_check_package_happy="yes"
+else
+  pmix_check_package_happy="no"
+fi
+
+
+fi
+    unset pmix_check_package_header_happy
+
+
+
+    if test "$pmix_check_package_happy" = "yes"; then :
+  pmix_pdl_plibltdl_happy=yes
+else
+  pmix_pdl_plibltdl_CPPFLAGS="$pmix_check_package_pmix_pdl_plibltdl_orig_CPPFLAGS"
+           pmix_pdl_plibltdl_LDFLAGS="$pmix_check_package_pmix_pdl_plibltdl_orig_LDFLAGS"
+           pmix_pdl_plibltdl_LIBS="$pmix_check_package_pmix_pdl_plibltdl_orig_LIBS"
+           pmix_pdl_plibltdl_happy=no
+fi
+
+    CPPFLAGS="$pmix_check_package_pmix_pdl_plibltdl_save_CPPFLAGS"
+    LDFLAGS="$pmix_check_package_pmix_pdl_plibltdl_save_LDFLAGS"
+    LIBS="$pmix_check_package_pmix_pdl_plibltdl_save_LIBS"
+
+
+fi
+
+    # If we have plibltdl, do we have lt_dladvise?
+    pmix_pdl_plibltdl_have_lt_dladvise=0
+    if test "$pmix_pdl_plibltdl_happy" = "yes"; then :
+  CPPFLAGS_save=$CPPFLAGS
+           LDFLAGS_save=$LDFLAGS
+           LIBS_save=$LIBS
+
+           CPPFLAGS="$pmix_pdl_plibltdl_CPPFLAGS $CPPFLAGS"
+           LDFLAGS="$pmix_pdl_plibltdl_LDFLAGS $LDFLAGS"
+           LIBS="$pmix_pdl_plibltdl_LIBS $LIBS"
+           ac_fn_c_check_func "$LINENO" "lt_dladvise_init" "ac_cv_func_lt_dladvise_init"
+if test "x$ac_cv_func_lt_dladvise_init" = xyes; then :
+  pmix_pdl_plibltdl_have_lt_dladvise=1
+fi
+
+           CPPFLAGS=$CPPFLAGS_save
+           LDFLAGS=$LDFLAGS_save
+           LIBS=$LIBS_save
+
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_PDL_PLIBLTDL_HAVE_LT_DLADVISE $pmix_pdl_plibltdl_have_lt_dladvise
+_ACEOF
+
+
+    if test "$pmix_pdl_plibltdl_happy" = "yes"; then :
+  pmix_pdl_plibltdl_ADD_CPPFLAGS=$pmix_pdl_plibltdl_CPPFLAGS
+           pmix_pdl_plibltdl_ADD_LDFLAGS=$pmix_pdl_plibltdl_LDFLAGS
+           pmix_pdl_plibltdl_ADD_LIBS=$pmix_pdl_plibltdl_LIBS
+           should_build=$should_build
+else
+  if test ! -z "$with_libltdl" && \
+                  test "$with_libltdl" != "no"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libltdl support requested (via --with-libltdl) but not found." >&5
+$as_echo "$as_me: WARNING: libltdl support requested (via --with-libltdl) but not found." >&2;}
+                  as_fn_error $? "Cannot continue." "$LINENO" 5
+fi
+           should_build=0
+fi
+
+
+
+
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+    pmix_show_verbose "PMIX_MCA_M4_CONFIG_COMPONENT: after, should_build=$should_build"
+
+    if test "$should_build" = "1"; then :
+
+
+
+    # See if it dropped an output file for us to pick up some
+    # shell variables in.
+    infile="$srcdir/src/mca/pdl/plibltdl/post_configure.sh"
+
+    # Add this subdir to the mast list of all MCA component subdirs
+    all_components="$all_components plibltdl"
+
+    if test "$compile_mode" = "dso" ; then
+        dso_components="$dso_components plibltdl"
+    else
+        if test "pdl" = "common"; then
+            # Static libraries in "common" frameworks are installed, and
+            # therefore must obey the $FRAMEWORK_LIB_PREFIX that was
+            # set.
+            static_ltlibs="mca/pdl/plibltdl/lib${PMIX_LIB_PREFIX}mca_pdl_plibltdl.la $static_ltlibs"
+        else
+            # Other frameworks do not have to obey the
+            # $FRAMEWORK_LIB_PREFIX prefix.
+            static_ltlibs="mca/pdl/plibltdl/libmca_pdl_plibltdl.la $static_ltlibs"
+        fi
+        echo "extern const pmix_mca_base_component_t mca_pdl_plibltdl_component;" >> $outfile.extern
+        echo "  &mca_pdl_plibltdl_component, " >> $outfile.struct
+        static_components="$static_components plibltdl"
+    fi
+
+    # Output pretty results
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if MCA component pdl:plibltdl can compile" >&5
+$as_echo_n "checking if MCA component pdl:plibltdl can compile... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+                        if test -f $infile; then
+        # check for direct call header to include.  This will be
+        # AC_SUBSTed later.
+        if test "$DIRECT_pdl" = "plibltdl" ; then
+            if test "`$GREP DIRECT_CALL_HEADER $infile`" != "" ; then
+                line="`$GREP DIRECT_CALL_HEADER $infile | cut -d= -f2-`"
+                str="MCA_pmix_pdl_DIRECT_CALL_HEADER=$line"
+                eval $str
+            else
+as_fn_error $? "*** pdl component plibltdl was supposed to be direct-called, but
+*** does not appear to support direct calling.
+*** Aborting" "$LINENO" 5
+            fi
+        fi
+    else
+        # were we supposed to have found something in the
+        # post_configure.sh, but the file didn't exist?
+        if test "$DIRECT_pdl" = "plibltdl" ; then
+as_fn_error $? "*** pdl component plibltdl was supposed to be direct-called, but
+*** does not appear to support direct calling.
+*** Aborting" "$LINENO" 5
+        fi
+    fi
+
+    # if the component is building, add it's WRAPPER_EXTRA_LDFLAGS and
+    # WRAPPER_EXTRA_LIBS.  If the component doesn't specify it's
+    # WRAPPER_EXTRA_LIBS and WRAPPER_EXTRA_LDFLAGS, try using LDFLAGS and LIBS if
+    # component didn't have it's own configure script (in which case,
+    # we know it didn't set LDFLAGS and LIBS because it can't) Don't
+    # have to do this if the component is building dynamically,
+    # because it will link against these (without a dependency from
+    # libmpi.so to these flags)
+    if test "$compile_mode" = "static"; then
+        if test "$pdl_plibltdl_WRAPPER_EXTRA_LDFLAGS" = ""; then :
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $pdl_plibltdl_LDFLAGS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_ldflags}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_ldflags"; then :
+  mca_wrapper_extra_ldflags=$arg
+else
+  mca_wrapper_extra_ldflags="$mca_wrapper_extra_ldflags $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+else
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $pdl_plibltdl_WRAPPER_EXTRA_LDFLAGS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_ldflags}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_ldflags"; then :
+  mca_wrapper_extra_ldflags=$arg
+else
+  mca_wrapper_extra_ldflags="$mca_wrapper_extra_ldflags $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+fi
+                        if test "$pdl_plibltdl_WRAPPER_EXTRA_LIBS" = ""; then :
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $pdl_plibltdl_LIBS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_libs}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_libs"; then :
+  mca_wrapper_extra_libs=$arg
+else
+  mca_wrapper_extra_libs="$mca_wrapper_extra_libs $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+else
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $pdl_plibltdl_WRAPPER_EXTRA_LIBS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_libs}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_libs"; then :
+  mca_wrapper_extra_libs=$arg
+else
+  mca_wrapper_extra_libs="$mca_wrapper_extra_libs $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+fi
+
+    fi
+
+    # if needed, copy over WRAPPER_EXTRA_CPPFLAGS.  Since a configure script
+    # component can never be used in a STOP_AT_FIRST framework, we
+    # don't have to implement the else clause in the literal check...
+    if test "$pdl_plibltdl_WRAPPER_EXTRA_CPPFLAGS" != ""; then :
+  stop_at_first=1
+            if test "$compile_mode" = "static" && test "$stop_at_first" = "1"; then :
+  if test "$with_devel_headers" = "yes"; then :
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $pdl_plibltdl_WRAPPER_EXTRA_CPPFLAGS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_cppflags}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_cppflags"; then :
+  mca_wrapper_extra_cppflags=$arg
+else
+  mca_wrapper_extra_cppflags="$mca_wrapper_extra_cppflags $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+fi
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ignoring pdl_plibltdl_WRAPPER_EXTRA_CPPFLAGS ($pdl_plibltdl_WRAPPER_EXTRA_CPPFLAGS): component conditions not met" >&5
+$as_echo "$as_me: WARNING: ignoring pdl_plibltdl_WRAPPER_EXTRA_CPPFLAGS ($pdl_plibltdl_WRAPPER_EXTRA_CPPFLAGS): component conditions not met" >&2;}
+fi
+fi
+
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if MCA component pdl:plibltdl can compile" >&5
+$as_echo_n "checking if MCA component pdl:plibltdl can compile... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+    # If this component was requested as the default for this
+    # type, then abort.
+    if test "$with_pdl" = "plibltdl" ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MCA component \"plibltdl\" failed to configure properly" >&5
+$as_echo "$as_me: WARNING: MCA component \"plibltdl\" failed to configure properly" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This component was selected as the default" >&5
+$as_echo "$as_me: WARNING: This component was selected as the default" >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    if test ! -z "$DIRECT_pdl" ; then
+        if test "$DIRECT_pdl" = "plibltdl" ; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MCA component \"plibltdl\" failed to configure properly" >&5
+$as_echo "$as_me: WARNING: MCA component \"plibltdl\" failed to configure properly" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This component was selected as the default (direct call)" >&5
+$as_echo "$as_me: WARNING: This component was selected as the default (direct call)" >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    fi
+
+           # add component to all component list
+           all_components="$all_components plibltdl"
+fi
+
+
+    # If we won, then do all the rest of the setup
+    if test "$should_build" = "1"; then :
+
+           # Add some stuff to CPPFLAGS so that the rest of the source
+           # tree can be built
+           LDFLAGS="$LDFLAGS $pmix_pdl_plibltdl_ADD_LDFLAGS"
+           LIBS="$LIBS $pmix_pdl_plibltdl_ADD_LIBS"
+
+fi
+
+
+    # set the AM_CONDITIONAL on how we should build
+    if test "$compile_mode" = "dso"; then :
+  BUILD_pmix_pdl_plibltdl_DSO=1
+else
+  BUILD_pmix_pdl_plibltdl_DSO=0
+fi
+     if test "$BUILD_pmix_pdl_plibltdl_DSO" = "1"; then
+  MCA_BUILD_pmix_pdl_plibltdl_DSO_TRUE=
+  MCA_BUILD_pmix_pdl_plibltdl_DSO_FALSE='#'
+else
+  MCA_BUILD_pmix_pdl_plibltdl_DSO_TRUE='#'
+  MCA_BUILD_pmix_pdl_plibltdl_DSO_FALSE=
+fi
+
+
+    if test "$should_build" = "1"; then :
+  components_last_result=1
+else
+  components_last_result=0
+fi
+
+    unset compile_mode
+
+                   if test $components_last_result -eq 1; then :
+  components_looking_for_succeed=0
+fi
+
+
+
+    # configure components that provide their own configure script.
+    # It would be really hard to run these for "find first that
+    # works", so we don't :)
+
+
+    MCA_pmix_pdl_ALL_COMPONENTS="$all_components"
+    MCA_pmix_pdl_STATIC_COMPONENTS="$static_components"
+    MCA_pmix_pdl_DSO_COMPONENTS="$dso_components"
+    MCA_pmix_pdl_STATIC_LTLIBS="$static_ltlibs"
+
+
+
+
+
+
+
+    MCA_pmix_pdl_ALL_SUBDIRS=
+    for item in $all_components ; do
+       MCA_pmix_pdl_ALL_SUBDIRS="$MCA_pmix_pdl_ALL_SUBDIRS mca/pdl/$item"
+    done
+
+
+
+    MCA_pmix_pdl_STATIC_SUBDIRS=
+    for item in $static_components ; do
+       MCA_pmix_pdl_STATIC_SUBDIRS="$MCA_pmix_pdl_STATIC_SUBDIRS mca/pdl/$item"
+    done
+
+
+
+    MCA_pmix_pdl_DSO_SUBDIRS=
+    for item in $dso_components ; do
+       MCA_pmix_pdl_DSO_SUBDIRS="$MCA_pmix_pdl_DSO_SUBDIRS mca/pdl/$item"
+    done
+
+
+
+    # Create the final .h file that will be included in the type's
+    # top-level glue.  This lists all the static components.  We don't
+    # need to do this for "common".
+    if test "$want_pdl" != "common"; then
+        cat > $outfile <<EOF
+/*
+ * \$HEADER\$
+ */
+#if defined(c_plusplus) || defined(__cplusplus)
+extern "C" {
+#endif
+
+`cat $outfile.extern`
+
+const pmix_mca_base_component_t *mca_pdl_base_static_components[] = {
+`cat $outfile.struct`
+  NULL
+};
+
+#if defined(c_plusplus) || defined(__cplusplus)
+}
+#endif
+
+EOF
+        # Only replace the header file if a) it doesn't previously
+        # exist, or b) the contents are different.  Do this to not
+        # trigger recompilation of certain .c files just because the
+        # timestamp changed on $outfile_real (similar to the way AC
+        # handles AC_CONFIG_HEADER files).
+        diff $outfile $outfile_real > /dev/null 2>&1
+        if test "$?" != "0"; then
+            mv $outfile $outfile_real
+        else
+            rm -f $outfile
+        fi
+    fi
+    rm -f $outfile.struct $outfile.extern
+
+    unset all_components static_components dso_components outfile outfile_real
+
+
+    # If we found no suitable static pdl component and dlopen support
+    # was not specifically disabled, this is an error.
+    if test "$MCA_pmix_pdl_STATIC_COMPONENTS" = "" && \
+           test "$enable_dlopen" != "no"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Did not find a suitable static pmix pdl component" >&5
+$as_echo "$as_me: WARNING: Did not find a suitable static pmix pdl component" >&2;}
+           { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You might need to install libltld (and its headers) or" >&5
+$as_echo "$as_me: WARNING: You might need to install libltld (and its headers) or" >&2;}
+           { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: specify --disable-dlopen to configure." >&5
+$as_echo "$as_me: WARNING: specify --disable-dlopen to configure." >&2;}
+           as_fn_error $? "Cannot continue" "$LINENO" 5
+fi
+
+    # If we have a winning component (which, per above, will only
+    # happen if --disable-dlopen was *not* specified), do some more
+    # logic.
+    if test "$MCA_pmix_pdl_STATIC_COMPONENTS" != ""; then :
+   # We had a winner -- w00t!
+
+        PMIX_HAVE_PDL_SUPPORT=1
+        # If we added any -L flags to ADD_LDFLAGS, then we (might)
+        # need to add those directories to LD_LIBRARY_PATH.
+        # Otherwise, if we try to AC RUN_IFELSE anything here in
+        # configure, it might die because it can't find the libraries
+        # we just linked against.
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_pdl_base_found_l pmix_pdl_base_token pmix_pdl_base_tmp pmix_pdl_base_dir; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_pdl_base_found_l pmix_pdl_base_token pmix_pdl_base_tmp pmix_pdl_base_dir\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+        pmix_pdl_base_found_l=0
+        eval "pmix_pdl_base_tmp=\$pmix_pdl_${pmix_pdl_winner}_ADD_LIBS"
+        for pmix_pdl_base_token in $pmix_pdl_base_tmp; do
+            case $pmix_pdl_base_token in
+            -l*) pmix_pdl_base_found_l=1 ;;
+            esac
+        done
+        if test $pmix_pdl_base_found_l -eq 1; then :
+  eval "pmix_pdl_base_tmp=\$pmix_pdl_${pmix_pdl_winner}_ADD_LDFLAGS"
+               for pmix_pdl_base_token in $pmix_pdl_base_tmp; do
+                   case $pmix_pdl_base_token in
+                   -L*)
+                       pmix_pdl_base_dir=`echo $pmix_pdl_base_token | cut -c3-`
+                       export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$pmix_pdl_base_dir
+                       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Adding to LD_LIBRARY_PATH: $pmix_pdl_base_dir" >&5
+$as_echo "$as_me: WARNING: Adding to LD_LIBRARY_PATH: $pmix_pdl_base_dir" >&2;}
+                       ;;
+                   esac
+               done
+fi
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+fi
+
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_HAVE_PDL_SUPPORT $PMIX_HAVE_PDL_SUPPORT
+_ACEOF
+
+
+                                 MCA_pmix_FRAMEWORKS="$MCA_pmix_FRAMEWORKS pif"
+                                 MCA_pmix_FRAMEWORKS_SUBDIRS="$MCA_pmix_FRAMEWORKS_SUBDIRS mca/pif"
+                                 MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS="$MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS \$(MCA_pmix_pif_ALL_SUBDIRS)"
+                                 MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS="$MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS \$(MCA_pmix_pif_DSO_SUBDIRS)"
+                                 MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS="$MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS \$(MCA_pmix_pif_STATIC_SUBDIRS)"
+                                 MCA_pmix_FRAMEWORK_LIBS="$MCA_pmix_FRAMEWORK_LIBS mca/pif/libmca_pif.la"
+                          MCA_pmix_FRAMEWORK_LIBS="$MCA_pmix_FRAMEWORK_LIBS \$(MCA_pmix_pif_STATIC_LTLIBS)"
+
+    pmix_show_subsubtitle "Configuring MCA framework pif"
+
+
+
+
+    # setup for framework
+    all_components=
+    static_components=
+    dso_components=
+    static_ltlibs=
+
+    # Ensure that the directory where the #include file is to live
+    # exists.  Need to do this for VPATH builds, because the directory
+    # may not exist yet.  For the "common" type, it's not really a
+    # component, so it doesn't have a base.
+    outdir=src/mca/pif/base
+    as_dir=$outdir; as_fn_mkdir_p
+
+    # emit Makefile rule
+    ac_config_files="$ac_config_files src/mca/pif/Makefile"
+
+
+    # remove any previously generated #include files
+    outfile_real=$outdir/static-components.h
+    outfile=$outfile_real.new
+    rm -f $outfile $outfile.struct $outfile.extern
+    touch $outfile.struct $outfile.extern
+
+    # print some nice messages about what we're about to do...
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for no configure components in framework pif" >&5
+$as_echo_n "checking for no configure components in framework pif... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+$as_echo "" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for m4 configure components in framework pif" >&5
+$as_echo_n "checking for m4 configure components in framework pif... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: bsdx_ipv4, bsdx_ipv6, linux_ipv6, posix_ipv4, solaris_ipv6" >&5
+$as_echo "bsdx_ipv4, bsdx_ipv6, linux_ipv6, posix_ipv4, solaris_ipv6" >&6; }
+
+    # If there are components in the no configure list, but we're
+    # doing one of the "special" selection logics, abort with a
+    # reasonable message.
+
+
+
+    # run the configure logic for the no-config components
+
+
+    # configure components that use built-in configuration scripts
+
+
+
+    best_mca_component_priority=0
+    components_looking_for_succeed=1
+    components_last_result=0
+
+
+    pmix_show_subsubsubtitle "MCA component pif:bsdx_ipv4 (m4 configuration macro)"
+
+    pmix_show_verbose "PMIX_MCA_M4_CONFIG_COMPONENT: before, should_build=$components_looking_for_succeed"
+
+
+
+    component_path="$srcdir/src/mca/pif/bsdx_ipv4"
+    want_component=0
+
+    # build if:
+    # - the component type is direct and we are that component
+    # - there is no pmix_ignore file
+    # - there is an pmix_ignore, but there is an empty pmix_unignore
+    # - there is an pmix_ignore, but username is in pmix_unignore
+    if test -d $component_path ; then
+        # decide if we want the component to be built or not.  This
+        # is spread out because some of the logic is a little complex
+        # and test's syntax isn't exactly the greatest.  We want to
+        # build the component by default.
+        want_component=1
+        if test -f $component_path/.pmix_ignore ; then
+            # If there is an pmix_ignore file, don't build
+            # the component.  Note that this decision can be
+            # overridden by the unignore logic below.
+            want_component=0
+        fi
+        if test -f $component_path/.pmix_unignore ; then
+            # if there is an empty pmix_unignore, that is
+            # equivalent to having your userid in the unignore file.
+            # If userid is in the file, unignore the ignore file.
+            if test ! -s $component_path/.pmix_unignore ; then
+                want_component=1
+            elif test ! -z "`$GREP $PMIX_CONFIGURE_USER $component_path/.pmix_unignore`" ; then
+                want_component=1
+            fi
+        fi
+        # if this component type is direct and we are not it, we don't want
+        # to be built.  Otherwise, we do want to be built.
+        if test ! -z "$DIRECT_pif" ; then
+            if test "$DIRECT_pif" = "bsdx_ipv4" ; then
+                want_component=1
+            else
+                want_component=0
+            fi
+        fi
+    fi
+
+    # if we were explicitly disabled, don't build :)
+    if test "$DISABLE_pif" = "1"; then :
+  want_component=0
+fi
+    if test "$DISABLE_pif_bsdx_ipv4" = "1"; then :
+  want_component=0
+fi
+
+    if test "$want_component" = "1"; then :
+  should_build=$components_looking_for_succeed
+else
+  should_build=0
+fi
+
+    # Allow the component to override the build mode if it really wants to.
+    # It is, of course, free to end up calling MCA_COMPONENT_COMPILE_MODE
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MCA component pif:bsdx_ipv4 compile mode" >&5
+$as_echo_n "checking for MCA component pif:bsdx_ipv4 compile mode... " >&6; }
+    compile_mode="static"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $compile_mode" >&5
+$as_echo "$compile_mode" >&6; }
+
+
+    # try to configure the component
+
+    ac_config_files="$ac_config_files src/mca/pif/bsdx_ipv4/Makefile"
+
+
+
+
+    # If we found struct sockaddr and we're on any of the BSDs, we're
+    # happy.  I.e., this:
+    #if defined(__NetBSD__) || defined(__FreeBSD__) || \
+    #    defined(__OpenBSD__) || defined(__DragonFly__)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking struct sockaddr" >&5
+$as_echo_n "checking struct sockaddr... " >&6; }
+    if test "$pmix_found_sockaddr" = "yes"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (cached)" >&5
+$as_echo "yes (cached)" >&6; }
+           { $as_echo "$as_me:${as_lineno-$LINENO}: checking NetBSD, FreeBSD, OpenBSD, or DragonFly" >&5
+$as_echo_n "checking NetBSD, FreeBSD, OpenBSD, or DragonFly... " >&6; }
+           if test "$pmix_found_netbsd" = "yes" || \
+                  test "$pmix_found_freebsd" = "yes" || \
+                  test "$pmix_found_openbsd" = "yes" || \
+                  test "$pmix_found_dragonfly" = "yes"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+                  should_build=$should_build
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                  should_build=0
+fi
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no (cached)" >&5
+$as_echo "no (cached)" >&6; }
+           should_build=0
+fi
+
+    pmix_show_verbose "PMIX_MCA_M4_CONFIG_COMPONENT: after, should_build=$should_build"
+
+    if test "$should_build" = "1"; then :
+
+
+
+    # See if it dropped an output file for us to pick up some
+    # shell variables in.
+    infile="$srcdir/src/mca/pif/bsdx_ipv4/post_configure.sh"
+
+    # Add this subdir to the mast list of all MCA component subdirs
+    all_components="$all_components bsdx_ipv4"
+
+    if test "$compile_mode" = "dso" ; then
+        dso_components="$dso_components bsdx_ipv4"
+    else
+        if test "pif" = "common"; then
+            # Static libraries in "common" frameworks are installed, and
+            # therefore must obey the $FRAMEWORK_LIB_PREFIX that was
+            # set.
+            static_ltlibs="mca/pif/bsdx_ipv4/lib${PMIX_LIB_PREFIX}mca_pif_bsdx_ipv4.la $static_ltlibs"
+        else
+            # Other frameworks do not have to obey the
+            # $FRAMEWORK_LIB_PREFIX prefix.
+            static_ltlibs="mca/pif/bsdx_ipv4/libmca_pif_bsdx_ipv4.la $static_ltlibs"
+        fi
+        echo "extern const pmix_mca_base_component_t mca_pif_bsdx_ipv4_component;" >> $outfile.extern
+        echo "  &mca_pif_bsdx_ipv4_component, " >> $outfile.struct
+        static_components="$static_components bsdx_ipv4"
+    fi
+
+    # Output pretty results
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if MCA component pif:bsdx_ipv4 can compile" >&5
+$as_echo_n "checking if MCA component pif:bsdx_ipv4 can compile... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+                        if test -f $infile; then
+        # check for direct call header to include.  This will be
+        # AC_SUBSTed later.
+        if test "$DIRECT_pif" = "bsdx_ipv4" ; then
+            if test "`$GREP DIRECT_CALL_HEADER $infile`" != "" ; then
+                line="`$GREP DIRECT_CALL_HEADER $infile | cut -d= -f2-`"
+                str="MCA_pmix_pif_DIRECT_CALL_HEADER=$line"
+                eval $str
+            else
+as_fn_error $? "*** pif component bsdx_ipv4 was supposed to be direct-called, but
+*** does not appear to support direct calling.
+*** Aborting" "$LINENO" 5
+            fi
+        fi
+    else
+        # were we supposed to have found something in the
+        # post_configure.sh, but the file didn't exist?
+        if test "$DIRECT_pif" = "bsdx_ipv4" ; then
+as_fn_error $? "*** pif component bsdx_ipv4 was supposed to be direct-called, but
+*** does not appear to support direct calling.
+*** Aborting" "$LINENO" 5
+        fi
+    fi
+
+    # if the component is building, add it's WRAPPER_EXTRA_LDFLAGS and
+    # WRAPPER_EXTRA_LIBS.  If the component doesn't specify it's
+    # WRAPPER_EXTRA_LIBS and WRAPPER_EXTRA_LDFLAGS, try using LDFLAGS and LIBS if
+    # component didn't have it's own configure script (in which case,
+    # we know it didn't set LDFLAGS and LIBS because it can't) Don't
+    # have to do this if the component is building dynamically,
+    # because it will link against these (without a dependency from
+    # libmpi.so to these flags)
+    if test "$compile_mode" = "static"; then
+        if test "$pif_bsdx_ipv4_WRAPPER_EXTRA_LDFLAGS" = ""; then :
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $pif_bsdx_ipv4_LDFLAGS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_ldflags}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_ldflags"; then :
+  mca_wrapper_extra_ldflags=$arg
+else
+  mca_wrapper_extra_ldflags="$mca_wrapper_extra_ldflags $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+else
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $pif_bsdx_ipv4_WRAPPER_EXTRA_LDFLAGS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_ldflags}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_ldflags"; then :
+  mca_wrapper_extra_ldflags=$arg
+else
+  mca_wrapper_extra_ldflags="$mca_wrapper_extra_ldflags $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+fi
+                        if test "$pif_bsdx_ipv4_WRAPPER_EXTRA_LIBS" = ""; then :
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $pif_bsdx_ipv4_LIBS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_libs}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_libs"; then :
+  mca_wrapper_extra_libs=$arg
+else
+  mca_wrapper_extra_libs="$mca_wrapper_extra_libs $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+else
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $pif_bsdx_ipv4_WRAPPER_EXTRA_LIBS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_libs}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_libs"; then :
+  mca_wrapper_extra_libs=$arg
+else
+  mca_wrapper_extra_libs="$mca_wrapper_extra_libs $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+fi
+
+    fi
+
+    # if needed, copy over WRAPPER_EXTRA_CPPFLAGS.  Since a configure script
+    # component can never be used in a STOP_AT_FIRST framework, we
+    # don't have to implement the else clause in the literal check...
+    if test "$pif_bsdx_ipv4_WRAPPER_EXTRA_CPPFLAGS" != ""; then :
+  stop_at_first=0
+            if test "$compile_mode" = "static" && test "$stop_at_first" = "1"; then :
+  if test "$with_devel_headers" = "yes"; then :
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $pif_bsdx_ipv4_WRAPPER_EXTRA_CPPFLAGS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_cppflags}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_cppflags"; then :
+  mca_wrapper_extra_cppflags=$arg
+else
+  mca_wrapper_extra_cppflags="$mca_wrapper_extra_cppflags $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+fi
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ignoring pif_bsdx_ipv4_WRAPPER_EXTRA_CPPFLAGS ($pif_bsdx_ipv4_WRAPPER_EXTRA_CPPFLAGS): component conditions not met" >&5
+$as_echo "$as_me: WARNING: ignoring pif_bsdx_ipv4_WRAPPER_EXTRA_CPPFLAGS ($pif_bsdx_ipv4_WRAPPER_EXTRA_CPPFLAGS): component conditions not met" >&2;}
+fi
+fi
+
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if MCA component pif:bsdx_ipv4 can compile" >&5
+$as_echo_n "checking if MCA component pif:bsdx_ipv4 can compile... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+    # If this component was requested as the default for this
+    # type, then abort.
+    if test "$with_pif" = "bsdx_ipv4" ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MCA component \"bsdx_ipv4\" failed to configure properly" >&5
+$as_echo "$as_me: WARNING: MCA component \"bsdx_ipv4\" failed to configure properly" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This component was selected as the default" >&5
+$as_echo "$as_me: WARNING: This component was selected as the default" >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    if test ! -z "$DIRECT_pif" ; then
+        if test "$DIRECT_pif" = "bsdx_ipv4" ; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MCA component \"bsdx_ipv4\" failed to configure properly" >&5
+$as_echo "$as_me: WARNING: MCA component \"bsdx_ipv4\" failed to configure properly" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This component was selected as the default (direct call)" >&5
+$as_echo "$as_me: WARNING: This component was selected as the default (direct call)" >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    fi
+
+           # add component to all component list
+           all_components="$all_components bsdx_ipv4"
+fi
+
+
+
+    # set the AM_CONDITIONAL on how we should build
+    if test "$compile_mode" = "dso"; then :
+  BUILD_pmix_pif_bsdx_ipv4_DSO=1
+else
+  BUILD_pmix_pif_bsdx_ipv4_DSO=0
+fi
+     if test "$BUILD_pmix_pif_bsdx_ipv4_DSO" = "1"; then
+  MCA_BUILD_pmix_pif_bsdx_ipv4_DSO_TRUE=
+  MCA_BUILD_pmix_pif_bsdx_ipv4_DSO_FALSE='#'
+else
+  MCA_BUILD_pmix_pif_bsdx_ipv4_DSO_TRUE='#'
+  MCA_BUILD_pmix_pif_bsdx_ipv4_DSO_FALSE=
+fi
+
+
+    if test "$should_build" = "1"; then :
+  components_last_result=1
+else
+  components_last_result=0
+fi
+
+    unset compile_mode
+
+
+
+
+
+    pmix_show_subsubsubtitle "MCA component pif:bsdx_ipv6 (m4 configuration macro)"
+
+    pmix_show_verbose "PMIX_MCA_M4_CONFIG_COMPONENT: before, should_build=$components_looking_for_succeed"
+
+
+
+    component_path="$srcdir/src/mca/pif/bsdx_ipv6"
+    want_component=0
+
+    # build if:
+    # - the component type is direct and we are that component
+    # - there is no pmix_ignore file
+    # - there is an pmix_ignore, but there is an empty pmix_unignore
+    # - there is an pmix_ignore, but username is in pmix_unignore
+    if test -d $component_path ; then
+        # decide if we want the component to be built or not.  This
+        # is spread out because some of the logic is a little complex
+        # and test's syntax isn't exactly the greatest.  We want to
+        # build the component by default.
+        want_component=1
+        if test -f $component_path/.pmix_ignore ; then
+            # If there is an pmix_ignore file, don't build
+            # the component.  Note that this decision can be
+            # overridden by the unignore logic below.
+            want_component=0
+        fi
+        if test -f $component_path/.pmix_unignore ; then
+            # if there is an empty pmix_unignore, that is
+            # equivalent to having your userid in the unignore file.
+            # If userid is in the file, unignore the ignore file.
+            if test ! -s $component_path/.pmix_unignore ; then
+                want_component=1
+            elif test ! -z "`$GREP $PMIX_CONFIGURE_USER $component_path/.pmix_unignore`" ; then
+                want_component=1
+            fi
+        fi
+        # if this component type is direct and we are not it, we don't want
+        # to be built.  Otherwise, we do want to be built.
+        if test ! -z "$DIRECT_pif" ; then
+            if test "$DIRECT_pif" = "bsdx_ipv6" ; then
+                want_component=1
+            else
+                want_component=0
+            fi
+        fi
+    fi
+
+    # if we were explicitly disabled, don't build :)
+    if test "$DISABLE_pif" = "1"; then :
+  want_component=0
+fi
+    if test "$DISABLE_pif_bsdx_ipv6" = "1"; then :
+  want_component=0
+fi
+
+    if test "$want_component" = "1"; then :
+  should_build=$components_looking_for_succeed
+else
+  should_build=0
+fi
+
+    # Allow the component to override the build mode if it really wants to.
+    # It is, of course, free to end up calling MCA_COMPONENT_COMPILE_MODE
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MCA component pif:bsdx_ipv6 compile mode" >&5
+$as_echo_n "checking for MCA component pif:bsdx_ipv6 compile mode... " >&6; }
+    compile_mode="static"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $compile_mode" >&5
+$as_echo "$compile_mode" >&6; }
+
+
+    # try to configure the component
+
+    ac_config_files="$ac_config_files src/mca/pif/bsdx_ipv6/Makefile"
+
+
+
+
+    # If we found struct sockaddr and we're on any of the BSDs, we're
+    # happy.  I.e., this:
+    #if defined( __NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) || \
+    #             defined(__386BSD__) || defined(__bsdi__) || defined(__APPLE__)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking struct sockaddr" >&5
+$as_echo_n "checking struct sockaddr... " >&6; }
+    if test "$pmix_found_sockaddr" = "yes"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (cached)" >&5
+$as_echo "yes (cached)" >&6; }
+           { $as_echo "$as_me:${as_lineno-$LINENO}: checking some flavor of BSD" >&5
+$as_echo_n "checking some flavor of BSD... " >&6; }
+           if test "$pmix_found_netbsd" = "yes" || \
+                  test "$pmix_found_freebsd" = "yes" || \
+                  test "$pmix_found_openbsd" = "yes" || \
+                  test "$pmix_found_386bsd" = "yes" || \
+                  test "$pmix_found_bsdi" = "yes" ||
+                  test "$pmix_found_apple" = "yes"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+                  should_build=$should_build
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                  should_build=0
+fi
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no (cached)" >&5
+$as_echo "no (cached)" >&6; }
+           should_build=0
+fi
+
+    pmix_show_verbose "PMIX_MCA_M4_CONFIG_COMPONENT: after, should_build=$should_build"
+
+    if test "$should_build" = "1"; then :
+
+
+
+    # See if it dropped an output file for us to pick up some
+    # shell variables in.
+    infile="$srcdir/src/mca/pif/bsdx_ipv6/post_configure.sh"
+
+    # Add this subdir to the mast list of all MCA component subdirs
+    all_components="$all_components bsdx_ipv6"
+
+    if test "$compile_mode" = "dso" ; then
+        dso_components="$dso_components bsdx_ipv6"
+    else
+        if test "pif" = "common"; then
+            # Static libraries in "common" frameworks are installed, and
+            # therefore must obey the $FRAMEWORK_LIB_PREFIX that was
+            # set.
+            static_ltlibs="mca/pif/bsdx_ipv6/lib${PMIX_LIB_PREFIX}mca_pif_bsdx_ipv6.la $static_ltlibs"
+        else
+            # Other frameworks do not have to obey the
+            # $FRAMEWORK_LIB_PREFIX prefix.
+            static_ltlibs="mca/pif/bsdx_ipv6/libmca_pif_bsdx_ipv6.la $static_ltlibs"
+        fi
+        echo "extern const pmix_mca_base_component_t mca_pif_bsdx_ipv6_component;" >> $outfile.extern
+        echo "  &mca_pif_bsdx_ipv6_component, " >> $outfile.struct
+        static_components="$static_components bsdx_ipv6"
+    fi
+
+    # Output pretty results
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if MCA component pif:bsdx_ipv6 can compile" >&5
+$as_echo_n "checking if MCA component pif:bsdx_ipv6 can compile... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+                        if test -f $infile; then
+        # check for direct call header to include.  This will be
+        # AC_SUBSTed later.
+        if test "$DIRECT_pif" = "bsdx_ipv6" ; then
+            if test "`$GREP DIRECT_CALL_HEADER $infile`" != "" ; then
+                line="`$GREP DIRECT_CALL_HEADER $infile | cut -d= -f2-`"
+                str="MCA_pmix_pif_DIRECT_CALL_HEADER=$line"
+                eval $str
+            else
+as_fn_error $? "*** pif component bsdx_ipv6 was supposed to be direct-called, but
+*** does not appear to support direct calling.
+*** Aborting" "$LINENO" 5
+            fi
+        fi
+    else
+        # were we supposed to have found something in the
+        # post_configure.sh, but the file didn't exist?
+        if test "$DIRECT_pif" = "bsdx_ipv6" ; then
+as_fn_error $? "*** pif component bsdx_ipv6 was supposed to be direct-called, but
+*** does not appear to support direct calling.
+*** Aborting" "$LINENO" 5
+        fi
+    fi
+
+    # if the component is building, add it's WRAPPER_EXTRA_LDFLAGS and
+    # WRAPPER_EXTRA_LIBS.  If the component doesn't specify it's
+    # WRAPPER_EXTRA_LIBS and WRAPPER_EXTRA_LDFLAGS, try using LDFLAGS and LIBS if
+    # component didn't have it's own configure script (in which case,
+    # we know it didn't set LDFLAGS and LIBS because it can't) Don't
+    # have to do this if the component is building dynamically,
+    # because it will link against these (without a dependency from
+    # libmpi.so to these flags)
+    if test "$compile_mode" = "static"; then
+        if test "$pif_bsdx_ipv6_WRAPPER_EXTRA_LDFLAGS" = ""; then :
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $pif_bsdx_ipv6_LDFLAGS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_ldflags}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_ldflags"; then :
+  mca_wrapper_extra_ldflags=$arg
+else
+  mca_wrapper_extra_ldflags="$mca_wrapper_extra_ldflags $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+else
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $pif_bsdx_ipv6_WRAPPER_EXTRA_LDFLAGS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_ldflags}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_ldflags"; then :
+  mca_wrapper_extra_ldflags=$arg
+else
+  mca_wrapper_extra_ldflags="$mca_wrapper_extra_ldflags $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+fi
+                        if test "$pif_bsdx_ipv6_WRAPPER_EXTRA_LIBS" = ""; then :
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $pif_bsdx_ipv6_LIBS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_libs}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_libs"; then :
+  mca_wrapper_extra_libs=$arg
+else
+  mca_wrapper_extra_libs="$mca_wrapper_extra_libs $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+else
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $pif_bsdx_ipv6_WRAPPER_EXTRA_LIBS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_libs}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_libs"; then :
+  mca_wrapper_extra_libs=$arg
+else
+  mca_wrapper_extra_libs="$mca_wrapper_extra_libs $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+fi
+
+    fi
+
+    # if needed, copy over WRAPPER_EXTRA_CPPFLAGS.  Since a configure script
+    # component can never be used in a STOP_AT_FIRST framework, we
+    # don't have to implement the else clause in the literal check...
+    if test "$pif_bsdx_ipv6_WRAPPER_EXTRA_CPPFLAGS" != ""; then :
+  stop_at_first=0
+            if test "$compile_mode" = "static" && test "$stop_at_first" = "1"; then :
+  if test "$with_devel_headers" = "yes"; then :
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $pif_bsdx_ipv6_WRAPPER_EXTRA_CPPFLAGS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_cppflags}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_cppflags"; then :
+  mca_wrapper_extra_cppflags=$arg
+else
+  mca_wrapper_extra_cppflags="$mca_wrapper_extra_cppflags $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+fi
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ignoring pif_bsdx_ipv6_WRAPPER_EXTRA_CPPFLAGS ($pif_bsdx_ipv6_WRAPPER_EXTRA_CPPFLAGS): component conditions not met" >&5
+$as_echo "$as_me: WARNING: ignoring pif_bsdx_ipv6_WRAPPER_EXTRA_CPPFLAGS ($pif_bsdx_ipv6_WRAPPER_EXTRA_CPPFLAGS): component conditions not met" >&2;}
+fi
+fi
+
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if MCA component pif:bsdx_ipv6 can compile" >&5
+$as_echo_n "checking if MCA component pif:bsdx_ipv6 can compile... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+    # If this component was requested as the default for this
+    # type, then abort.
+    if test "$with_pif" = "bsdx_ipv6" ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MCA component \"bsdx_ipv6\" failed to configure properly" >&5
+$as_echo "$as_me: WARNING: MCA component \"bsdx_ipv6\" failed to configure properly" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This component was selected as the default" >&5
+$as_echo "$as_me: WARNING: This component was selected as the default" >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    if test ! -z "$DIRECT_pif" ; then
+        if test "$DIRECT_pif" = "bsdx_ipv6" ; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MCA component \"bsdx_ipv6\" failed to configure properly" >&5
+$as_echo "$as_me: WARNING: MCA component \"bsdx_ipv6\" failed to configure properly" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This component was selected as the default (direct call)" >&5
+$as_echo "$as_me: WARNING: This component was selected as the default (direct call)" >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    fi
+
+           # add component to all component list
+           all_components="$all_components bsdx_ipv6"
+fi
+
+
+
+    # set the AM_CONDITIONAL on how we should build
+    if test "$compile_mode" = "dso"; then :
+  BUILD_pmix_pif_bsdx_ipv6_DSO=1
+else
+  BUILD_pmix_pif_bsdx_ipv6_DSO=0
+fi
+     if test "$BUILD_pmix_pif_bsdx_ipv6_DSO" = "1"; then
+  MCA_BUILD_pmix_pif_bsdx_ipv6_DSO_TRUE=
+  MCA_BUILD_pmix_pif_bsdx_ipv6_DSO_FALSE='#'
+else
+  MCA_BUILD_pmix_pif_bsdx_ipv6_DSO_TRUE='#'
+  MCA_BUILD_pmix_pif_bsdx_ipv6_DSO_FALSE=
+fi
+
+
+    if test "$should_build" = "1"; then :
+  components_last_result=1
+else
+  components_last_result=0
+fi
+
+    unset compile_mode
+
+
+
+
+
+    pmix_show_subsubsubtitle "MCA component pif:linux_ipv6 (m4 configuration macro)"
+
+    pmix_show_verbose "PMIX_MCA_M4_CONFIG_COMPONENT: before, should_build=$components_looking_for_succeed"
+
+
+
+    component_path="$srcdir/src/mca/pif/linux_ipv6"
+    want_component=0
+
+    # build if:
+    # - the component type is direct and we are that component
+    # - there is no pmix_ignore file
+    # - there is an pmix_ignore, but there is an empty pmix_unignore
+    # - there is an pmix_ignore, but username is in pmix_unignore
+    if test -d $component_path ; then
+        # decide if we want the component to be built or not.  This
+        # is spread out because some of the logic is a little complex
+        # and test's syntax isn't exactly the greatest.  We want to
+        # build the component by default.
+        want_component=1
+        if test -f $component_path/.pmix_ignore ; then
+            # If there is an pmix_ignore file, don't build
+            # the component.  Note that this decision can be
+            # overridden by the unignore logic below.
+            want_component=0
+        fi
+        if test -f $component_path/.pmix_unignore ; then
+            # if there is an empty pmix_unignore, that is
+            # equivalent to having your userid in the unignore file.
+            # If userid is in the file, unignore the ignore file.
+            if test ! -s $component_path/.pmix_unignore ; then
+                want_component=1
+            elif test ! -z "`$GREP $PMIX_CONFIGURE_USER $component_path/.pmix_unignore`" ; then
+                want_component=1
+            fi
+        fi
+        # if this component type is direct and we are not it, we don't want
+        # to be built.  Otherwise, we do want to be built.
+        if test ! -z "$DIRECT_pif" ; then
+            if test "$DIRECT_pif" = "linux_ipv6" ; then
+                want_component=1
+            else
+                want_component=0
+            fi
+        fi
+    fi
+
+    # if we were explicitly disabled, don't build :)
+    if test "$DISABLE_pif" = "1"; then :
+  want_component=0
+fi
+    if test "$DISABLE_pif_linux_ipv6" = "1"; then :
+  want_component=0
+fi
+
+    if test "$want_component" = "1"; then :
+  should_build=$components_looking_for_succeed
+else
+  should_build=0
+fi
+
+    # Allow the component to override the build mode if it really wants to.
+    # It is, of course, free to end up calling MCA_COMPONENT_COMPILE_MODE
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MCA component pif:linux_ipv6 compile mode" >&5
+$as_echo_n "checking for MCA component pif:linux_ipv6 compile mode... " >&6; }
+    compile_mode="static"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $compile_mode" >&5
+$as_echo "$compile_mode" >&6; }
+
+
+    # try to configure the component
+
+    ac_config_files="$ac_config_files src/mca/pif/linux_ipv6/Makefile"
+
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we are on Linux with TCP" >&5
+$as_echo_n "checking if we are on Linux with TCP... " >&6; }
+    # If we have struct sockaddr and we're on Linux, then we're
+    # happy.
+    if test "$pmix_found_sockaddr" = "yes" && test "$pmix_found_linux" = "yes"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+           should_build=$should_build
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+           should_build=0
+fi
+
+    pmix_show_verbose "PMIX_MCA_M4_CONFIG_COMPONENT: after, should_build=$should_build"
+
+    if test "$should_build" = "1"; then :
+
+
+
+    # See if it dropped an output file for us to pick up some
+    # shell variables in.
+    infile="$srcdir/src/mca/pif/linux_ipv6/post_configure.sh"
+
+    # Add this subdir to the mast list of all MCA component subdirs
+    all_components="$all_components linux_ipv6"
+
+    if test "$compile_mode" = "dso" ; then
+        dso_components="$dso_components linux_ipv6"
+    else
+        if test "pif" = "common"; then
+            # Static libraries in "common" frameworks are installed, and
+            # therefore must obey the $FRAMEWORK_LIB_PREFIX that was
+            # set.
+            static_ltlibs="mca/pif/linux_ipv6/lib${PMIX_LIB_PREFIX}mca_pif_linux_ipv6.la $static_ltlibs"
+        else
+            # Other frameworks do not have to obey the
+            # $FRAMEWORK_LIB_PREFIX prefix.
+            static_ltlibs="mca/pif/linux_ipv6/libmca_pif_linux_ipv6.la $static_ltlibs"
+        fi
+        echo "extern const pmix_mca_base_component_t mca_pif_linux_ipv6_component;" >> $outfile.extern
+        echo "  &mca_pif_linux_ipv6_component, " >> $outfile.struct
+        static_components="$static_components linux_ipv6"
+    fi
+
+    # Output pretty results
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if MCA component pif:linux_ipv6 can compile" >&5
+$as_echo_n "checking if MCA component pif:linux_ipv6 can compile... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+                        if test -f $infile; then
+        # check for direct call header to include.  This will be
+        # AC_SUBSTed later.
+        if test "$DIRECT_pif" = "linux_ipv6" ; then
+            if test "`$GREP DIRECT_CALL_HEADER $infile`" != "" ; then
+                line="`$GREP DIRECT_CALL_HEADER $infile | cut -d= -f2-`"
+                str="MCA_pmix_pif_DIRECT_CALL_HEADER=$line"
+                eval $str
+            else
+as_fn_error $? "*** pif component linux_ipv6 was supposed to be direct-called, but
+*** does not appear to support direct calling.
+*** Aborting" "$LINENO" 5
+            fi
+        fi
+    else
+        # were we supposed to have found something in the
+        # post_configure.sh, but the file didn't exist?
+        if test "$DIRECT_pif" = "linux_ipv6" ; then
+as_fn_error $? "*** pif component linux_ipv6 was supposed to be direct-called, but
+*** does not appear to support direct calling.
+*** Aborting" "$LINENO" 5
+        fi
+    fi
+
+    # if the component is building, add it's WRAPPER_EXTRA_LDFLAGS and
+    # WRAPPER_EXTRA_LIBS.  If the component doesn't specify it's
+    # WRAPPER_EXTRA_LIBS and WRAPPER_EXTRA_LDFLAGS, try using LDFLAGS and LIBS if
+    # component didn't have it's own configure script (in which case,
+    # we know it didn't set LDFLAGS and LIBS because it can't) Don't
+    # have to do this if the component is building dynamically,
+    # because it will link against these (without a dependency from
+    # libmpi.so to these flags)
+    if test "$compile_mode" = "static"; then
+        if test "$pif_linux_ipv6_WRAPPER_EXTRA_LDFLAGS" = ""; then :
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $pif_linux_ipv6_LDFLAGS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_ldflags}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_ldflags"; then :
+  mca_wrapper_extra_ldflags=$arg
+else
+  mca_wrapper_extra_ldflags="$mca_wrapper_extra_ldflags $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+else
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $pif_linux_ipv6_WRAPPER_EXTRA_LDFLAGS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_ldflags}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_ldflags"; then :
+  mca_wrapper_extra_ldflags=$arg
+else
+  mca_wrapper_extra_ldflags="$mca_wrapper_extra_ldflags $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+fi
+                        if test "$pif_linux_ipv6_WRAPPER_EXTRA_LIBS" = ""; then :
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $pif_linux_ipv6_LIBS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_libs}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_libs"; then :
+  mca_wrapper_extra_libs=$arg
+else
+  mca_wrapper_extra_libs="$mca_wrapper_extra_libs $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+else
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $pif_linux_ipv6_WRAPPER_EXTRA_LIBS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_libs}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_libs"; then :
+  mca_wrapper_extra_libs=$arg
+else
+  mca_wrapper_extra_libs="$mca_wrapper_extra_libs $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+fi
+
+    fi
+
+    # if needed, copy over WRAPPER_EXTRA_CPPFLAGS.  Since a configure script
+    # component can never be used in a STOP_AT_FIRST framework, we
+    # don't have to implement the else clause in the literal check...
+    if test "$pif_linux_ipv6_WRAPPER_EXTRA_CPPFLAGS" != ""; then :
+  stop_at_first=0
+            if test "$compile_mode" = "static" && test "$stop_at_first" = "1"; then :
+  if test "$with_devel_headers" = "yes"; then :
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $pif_linux_ipv6_WRAPPER_EXTRA_CPPFLAGS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_cppflags}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_cppflags"; then :
+  mca_wrapper_extra_cppflags=$arg
+else
+  mca_wrapper_extra_cppflags="$mca_wrapper_extra_cppflags $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+fi
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ignoring pif_linux_ipv6_WRAPPER_EXTRA_CPPFLAGS ($pif_linux_ipv6_WRAPPER_EXTRA_CPPFLAGS): component conditions not met" >&5
+$as_echo "$as_me: WARNING: ignoring pif_linux_ipv6_WRAPPER_EXTRA_CPPFLAGS ($pif_linux_ipv6_WRAPPER_EXTRA_CPPFLAGS): component conditions not met" >&2;}
+fi
+fi
+
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if MCA component pif:linux_ipv6 can compile" >&5
+$as_echo_n "checking if MCA component pif:linux_ipv6 can compile... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+    # If this component was requested as the default for this
+    # type, then abort.
+    if test "$with_pif" = "linux_ipv6" ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MCA component \"linux_ipv6\" failed to configure properly" >&5
+$as_echo "$as_me: WARNING: MCA component \"linux_ipv6\" failed to configure properly" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This component was selected as the default" >&5
+$as_echo "$as_me: WARNING: This component was selected as the default" >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    if test ! -z "$DIRECT_pif" ; then
+        if test "$DIRECT_pif" = "linux_ipv6" ; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MCA component \"linux_ipv6\" failed to configure properly" >&5
+$as_echo "$as_me: WARNING: MCA component \"linux_ipv6\" failed to configure properly" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This component was selected as the default (direct call)" >&5
+$as_echo "$as_me: WARNING: This component was selected as the default (direct call)" >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    fi
+
+           # add component to all component list
+           all_components="$all_components linux_ipv6"
+fi
+
+
+
+    # set the AM_CONDITIONAL on how we should build
+    if test "$compile_mode" = "dso"; then :
+  BUILD_pmix_pif_linux_ipv6_DSO=1
+else
+  BUILD_pmix_pif_linux_ipv6_DSO=0
+fi
+     if test "$BUILD_pmix_pif_linux_ipv6_DSO" = "1"; then
+  MCA_BUILD_pmix_pif_linux_ipv6_DSO_TRUE=
+  MCA_BUILD_pmix_pif_linux_ipv6_DSO_FALSE='#'
+else
+  MCA_BUILD_pmix_pif_linux_ipv6_DSO_TRUE='#'
+  MCA_BUILD_pmix_pif_linux_ipv6_DSO_FALSE=
+fi
+
+
+    if test "$should_build" = "1"; then :
+  components_last_result=1
+else
+  components_last_result=0
+fi
+
+    unset compile_mode
+
+
+
+
+
+    pmix_show_subsubsubtitle "MCA component pif:posix_ipv4 (m4 configuration macro)"
+
+    pmix_show_verbose "PMIX_MCA_M4_CONFIG_COMPONENT: before, should_build=$components_looking_for_succeed"
+
+
+
+    component_path="$srcdir/src/mca/pif/posix_ipv4"
+    want_component=0
+
+    # build if:
+    # - the component type is direct and we are that component
+    # - there is no pmix_ignore file
+    # - there is an pmix_ignore, but there is an empty pmix_unignore
+    # - there is an pmix_ignore, but username is in pmix_unignore
+    if test -d $component_path ; then
+        # decide if we want the component to be built or not.  This
+        # is spread out because some of the logic is a little complex
+        # and test's syntax isn't exactly the greatest.  We want to
+        # build the component by default.
+        want_component=1
+        if test -f $component_path/.pmix_ignore ; then
+            # If there is an pmix_ignore file, don't build
+            # the component.  Note that this decision can be
+            # overridden by the unignore logic below.
+            want_component=0
+        fi
+        if test -f $component_path/.pmix_unignore ; then
+            # if there is an empty pmix_unignore, that is
+            # equivalent to having your userid in the unignore file.
+            # If userid is in the file, unignore the ignore file.
+            if test ! -s $component_path/.pmix_unignore ; then
+                want_component=1
+            elif test ! -z "`$GREP $PMIX_CONFIGURE_USER $component_path/.pmix_unignore`" ; then
+                want_component=1
+            fi
+        fi
+        # if this component type is direct and we are not it, we don't want
+        # to be built.  Otherwise, we do want to be built.
+        if test ! -z "$DIRECT_pif" ; then
+            if test "$DIRECT_pif" = "posix_ipv4" ; then
+                want_component=1
+            else
+                want_component=0
+            fi
+        fi
+    fi
+
+    # if we were explicitly disabled, don't build :)
+    if test "$DISABLE_pif" = "1"; then :
+  want_component=0
+fi
+    if test "$DISABLE_pif_posix_ipv4" = "1"; then :
+  want_component=0
+fi
+
+    if test "$want_component" = "1"; then :
+  should_build=$components_looking_for_succeed
+else
+  should_build=0
+fi
+
+    # Allow the component to override the build mode if it really wants to.
+    # It is, of course, free to end up calling MCA_COMPONENT_COMPILE_MODE
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MCA component pif:posix_ipv4 compile mode" >&5
+$as_echo_n "checking for MCA component pif:posix_ipv4 compile mode... " >&6; }
+    compile_mode="static"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $compile_mode" >&5
+$as_echo "$compile_mode" >&6; }
+
+
+    # try to configure the component
+
+    ac_config_files="$ac_config_files src/mca/pif/posix_ipv4/Makefile"
+
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_pif_posix_ipv4_happy; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_pif_posix_ipv4_happy\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+    pmix_pif_posix_ipv4_happy=no
+
+
+
+    # If we found struct sockaddr and we're NOT on most of the BSDs,
+    # we're happy.  I.e., if posix but not:
+    #if defined(__NetBSD__) || defined(__FreeBSD__) || \
+    #    defined(__OpenBSD__) || defined(__DragonFly__)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking struct sockaddr" >&5
+$as_echo_n "checking struct sockaddr... " >&6; }
+    if test "$pmix_found_sockaddr" = "yes"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (cached)" >&5
+$as_echo "yes (cached)" >&6; }
+           { $as_echo "$as_me:${as_lineno-$LINENO}: checking not NetBSD, FreeBSD, OpenBSD, or DragonFly" >&5
+$as_echo_n "checking not NetBSD, FreeBSD, OpenBSD, or DragonFly... " >&6; }
+           if test "$pmix_found_netbsd" = "no" && test "$pmix_found_freebsd" = "no" && test "$pmix_found_openbsd" = "no" && test "$pmix_found_dragonfly" = "no"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+                  pmix_pif_posix_ipv4_happy=yes
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+fi
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no (cached)" >&5
+$as_echo "no (cached)" >&6; }
+
+fi
+
+    if test "$pmix_pif_posix_ipv4_happy" = "yes"; then :
+  ac_fn_c_check_member "$LINENO" "struct ifreq" "ifr_hwaddr" "ac_cv_member_struct_ifreq_ifr_hwaddr" "#include <net/if.h>
+"
+if test "x$ac_cv_member_struct_ifreq_ifr_hwaddr" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_IFREQ_IFR_HWADDR 1
+_ACEOF
+
+
+fi
+
+           ac_fn_c_check_member "$LINENO" "struct ifreq" "ifr_mtu" "ac_cv_member_struct_ifreq_ifr_mtu" "#include <net/if.h>
+"
+if test "x$ac_cv_member_struct_ifreq_ifr_mtu" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_IFREQ_IFR_MTU 1
+_ACEOF
+
+
+fi
+
+
+fi
+
+    if test "$pmix_pif_posix_ipv4_happy" = "yes"; then :
+  should_build=$should_build
+else
+  should_build=0
+fi;
+
+    pmix_show_verbose "PMIX_MCA_M4_CONFIG_COMPONENT: after, should_build=$should_build"
+
+    if test "$should_build" = "1"; then :
+
+
+
+    # See if it dropped an output file for us to pick up some
+    # shell variables in.
+    infile="$srcdir/src/mca/pif/posix_ipv4/post_configure.sh"
+
+    # Add this subdir to the mast list of all MCA component subdirs
+    all_components="$all_components posix_ipv4"
+
+    if test "$compile_mode" = "dso" ; then
+        dso_components="$dso_components posix_ipv4"
+    else
+        if test "pif" = "common"; then
+            # Static libraries in "common" frameworks are installed, and
+            # therefore must obey the $FRAMEWORK_LIB_PREFIX that was
+            # set.
+            static_ltlibs="mca/pif/posix_ipv4/lib${PMIX_LIB_PREFIX}mca_pif_posix_ipv4.la $static_ltlibs"
+        else
+            # Other frameworks do not have to obey the
+            # $FRAMEWORK_LIB_PREFIX prefix.
+            static_ltlibs="mca/pif/posix_ipv4/libmca_pif_posix_ipv4.la $static_ltlibs"
+        fi
+        echo "extern const pmix_mca_base_component_t mca_pif_posix_ipv4_component;" >> $outfile.extern
+        echo "  &mca_pif_posix_ipv4_component, " >> $outfile.struct
+        static_components="$static_components posix_ipv4"
+    fi
+
+    # Output pretty results
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if MCA component pif:posix_ipv4 can compile" >&5
+$as_echo_n "checking if MCA component pif:posix_ipv4 can compile... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+                        if test -f $infile; then
+        # check for direct call header to include.  This will be
+        # AC_SUBSTed later.
+        if test "$DIRECT_pif" = "posix_ipv4" ; then
+            if test "`$GREP DIRECT_CALL_HEADER $infile`" != "" ; then
+                line="`$GREP DIRECT_CALL_HEADER $infile | cut -d= -f2-`"
+                str="MCA_pmix_pif_DIRECT_CALL_HEADER=$line"
+                eval $str
+            else
+as_fn_error $? "*** pif component posix_ipv4 was supposed to be direct-called, but
+*** does not appear to support direct calling.
+*** Aborting" "$LINENO" 5
+            fi
+        fi
+    else
+        # were we supposed to have found something in the
+        # post_configure.sh, but the file didn't exist?
+        if test "$DIRECT_pif" = "posix_ipv4" ; then
+as_fn_error $? "*** pif component posix_ipv4 was supposed to be direct-called, but
+*** does not appear to support direct calling.
+*** Aborting" "$LINENO" 5
+        fi
+    fi
+
+    # if the component is building, add it's WRAPPER_EXTRA_LDFLAGS and
+    # WRAPPER_EXTRA_LIBS.  If the component doesn't specify it's
+    # WRAPPER_EXTRA_LIBS and WRAPPER_EXTRA_LDFLAGS, try using LDFLAGS and LIBS if
+    # component didn't have it's own configure script (in which case,
+    # we know it didn't set LDFLAGS and LIBS because it can't) Don't
+    # have to do this if the component is building dynamically,
+    # because it will link against these (without a dependency from
+    # libmpi.so to these flags)
+    if test "$compile_mode" = "static"; then
+        if test "$pif_posix_ipv4_WRAPPER_EXTRA_LDFLAGS" = ""; then :
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $pif_posix_ipv4_LDFLAGS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_ldflags}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_ldflags"; then :
+  mca_wrapper_extra_ldflags=$arg
+else
+  mca_wrapper_extra_ldflags="$mca_wrapper_extra_ldflags $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+else
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $pif_posix_ipv4_WRAPPER_EXTRA_LDFLAGS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_ldflags}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_ldflags"; then :
+  mca_wrapper_extra_ldflags=$arg
+else
+  mca_wrapper_extra_ldflags="$mca_wrapper_extra_ldflags $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+fi
+                        if test "$pif_posix_ipv4_WRAPPER_EXTRA_LIBS" = ""; then :
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $pif_posix_ipv4_LIBS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_libs}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_libs"; then :
+  mca_wrapper_extra_libs=$arg
+else
+  mca_wrapper_extra_libs="$mca_wrapper_extra_libs $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+else
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $pif_posix_ipv4_WRAPPER_EXTRA_LIBS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_libs}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_libs"; then :
+  mca_wrapper_extra_libs=$arg
+else
+  mca_wrapper_extra_libs="$mca_wrapper_extra_libs $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+fi
+
+    fi
+
+    # if needed, copy over WRAPPER_EXTRA_CPPFLAGS.  Since a configure script
+    # component can never be used in a STOP_AT_FIRST framework, we
+    # don't have to implement the else clause in the literal check...
+    if test "$pif_posix_ipv4_WRAPPER_EXTRA_CPPFLAGS" != ""; then :
+  stop_at_first=0
+            if test "$compile_mode" = "static" && test "$stop_at_first" = "1"; then :
+  if test "$with_devel_headers" = "yes"; then :
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $pif_posix_ipv4_WRAPPER_EXTRA_CPPFLAGS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_cppflags}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_cppflags"; then :
+  mca_wrapper_extra_cppflags=$arg
+else
+  mca_wrapper_extra_cppflags="$mca_wrapper_extra_cppflags $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+fi
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ignoring pif_posix_ipv4_WRAPPER_EXTRA_CPPFLAGS ($pif_posix_ipv4_WRAPPER_EXTRA_CPPFLAGS): component conditions not met" >&5
+$as_echo "$as_me: WARNING: ignoring pif_posix_ipv4_WRAPPER_EXTRA_CPPFLAGS ($pif_posix_ipv4_WRAPPER_EXTRA_CPPFLAGS): component conditions not met" >&2;}
+fi
+fi
+
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if MCA component pif:posix_ipv4 can compile" >&5
+$as_echo_n "checking if MCA component pif:posix_ipv4 can compile... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+    # If this component was requested as the default for this
+    # type, then abort.
+    if test "$with_pif" = "posix_ipv4" ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MCA component \"posix_ipv4\" failed to configure properly" >&5
+$as_echo "$as_me: WARNING: MCA component \"posix_ipv4\" failed to configure properly" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This component was selected as the default" >&5
+$as_echo "$as_me: WARNING: This component was selected as the default" >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    if test ! -z "$DIRECT_pif" ; then
+        if test "$DIRECT_pif" = "posix_ipv4" ; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MCA component \"posix_ipv4\" failed to configure properly" >&5
+$as_echo "$as_me: WARNING: MCA component \"posix_ipv4\" failed to configure properly" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This component was selected as the default (direct call)" >&5
+$as_echo "$as_me: WARNING: This component was selected as the default (direct call)" >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    fi
+
+           # add component to all component list
+           all_components="$all_components posix_ipv4"
+fi
+
+
+
+    # set the AM_CONDITIONAL on how we should build
+    if test "$compile_mode" = "dso"; then :
+  BUILD_pmix_pif_posix_ipv4_DSO=1
+else
+  BUILD_pmix_pif_posix_ipv4_DSO=0
+fi
+     if test "$BUILD_pmix_pif_posix_ipv4_DSO" = "1"; then
+  MCA_BUILD_pmix_pif_posix_ipv4_DSO_TRUE=
+  MCA_BUILD_pmix_pif_posix_ipv4_DSO_FALSE='#'
+else
+  MCA_BUILD_pmix_pif_posix_ipv4_DSO_TRUE='#'
+  MCA_BUILD_pmix_pif_posix_ipv4_DSO_FALSE=
+fi
+
+
+    if test "$should_build" = "1"; then :
+  components_last_result=1
+else
+  components_last_result=0
+fi
+
+    unset compile_mode
+
+
+
+
+
+    pmix_show_subsubsubtitle "MCA component pif:solaris_ipv6 (m4 configuration macro)"
+
+    pmix_show_verbose "PMIX_MCA_M4_CONFIG_COMPONENT: before, should_build=$components_looking_for_succeed"
+
+
+
+    component_path="$srcdir/src/mca/pif/solaris_ipv6"
+    want_component=0
+
+    # build if:
+    # - the component type is direct and we are that component
+    # - there is no pmix_ignore file
+    # - there is an pmix_ignore, but there is an empty pmix_unignore
+    # - there is an pmix_ignore, but username is in pmix_unignore
+    if test -d $component_path ; then
+        # decide if we want the component to be built or not.  This
+        # is spread out because some of the logic is a little complex
+        # and test's syntax isn't exactly the greatest.  We want to
+        # build the component by default.
+        want_component=1
+        if test -f $component_path/.pmix_ignore ; then
+            # If there is an pmix_ignore file, don't build
+            # the component.  Note that this decision can be
+            # overridden by the unignore logic below.
+            want_component=0
+        fi
+        if test -f $component_path/.pmix_unignore ; then
+            # if there is an empty pmix_unignore, that is
+            # equivalent to having your userid in the unignore file.
+            # If userid is in the file, unignore the ignore file.
+            if test ! -s $component_path/.pmix_unignore ; then
+                want_component=1
+            elif test ! -z "`$GREP $PMIX_CONFIGURE_USER $component_path/.pmix_unignore`" ; then
+                want_component=1
+            fi
+        fi
+        # if this component type is direct and we are not it, we don't want
+        # to be built.  Otherwise, we do want to be built.
+        if test ! -z "$DIRECT_pif" ; then
+            if test "$DIRECT_pif" = "solaris_ipv6" ; then
+                want_component=1
+            else
+                want_component=0
+            fi
+        fi
+    fi
+
+    # if we were explicitly disabled, don't build :)
+    if test "$DISABLE_pif" = "1"; then :
+  want_component=0
+fi
+    if test "$DISABLE_pif_solaris_ipv6" = "1"; then :
+  want_component=0
+fi
+
+    if test "$want_component" = "1"; then :
+  should_build=$components_looking_for_succeed
+else
+  should_build=0
+fi
+
+    # Allow the component to override the build mode if it really wants to.
+    # It is, of course, free to end up calling MCA_COMPONENT_COMPILE_MODE
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MCA component pif:solaris_ipv6 compile mode" >&5
+$as_echo_n "checking for MCA component pif:solaris_ipv6 compile mode... " >&6; }
+    compile_mode="static"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $compile_mode" >&5
+$as_echo "$compile_mode" >&6; }
+
+
+    # try to configure the component
+
+    ac_config_files="$ac_config_files src/mca/pif/solaris_ipv6/Makefile"
+
+
+
+
+    # check to see if we are on a solaris machine
+    if test "$pmix_found_sun" = "yes"; then :
+  should_build=$should_build
+else
+  should_build=0
+fi
+
+    pmix_show_verbose "PMIX_MCA_M4_CONFIG_COMPONENT: after, should_build=$should_build"
+
+    if test "$should_build" = "1"; then :
+
+
+
+    # See if it dropped an output file for us to pick up some
+    # shell variables in.
+    infile="$srcdir/src/mca/pif/solaris_ipv6/post_configure.sh"
+
+    # Add this subdir to the mast list of all MCA component subdirs
+    all_components="$all_components solaris_ipv6"
+
+    if test "$compile_mode" = "dso" ; then
+        dso_components="$dso_components solaris_ipv6"
+    else
+        if test "pif" = "common"; then
+            # Static libraries in "common" frameworks are installed, and
+            # therefore must obey the $FRAMEWORK_LIB_PREFIX that was
+            # set.
+            static_ltlibs="mca/pif/solaris_ipv6/lib${PMIX_LIB_PREFIX}mca_pif_solaris_ipv6.la $static_ltlibs"
+        else
+            # Other frameworks do not have to obey the
+            # $FRAMEWORK_LIB_PREFIX prefix.
+            static_ltlibs="mca/pif/solaris_ipv6/libmca_pif_solaris_ipv6.la $static_ltlibs"
+        fi
+        echo "extern const pmix_mca_base_component_t mca_pif_solaris_ipv6_component;" >> $outfile.extern
+        echo "  &mca_pif_solaris_ipv6_component, " >> $outfile.struct
+        static_components="$static_components solaris_ipv6"
+    fi
+
+    # Output pretty results
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if MCA component pif:solaris_ipv6 can compile" >&5
+$as_echo_n "checking if MCA component pif:solaris_ipv6 can compile... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+                        if test -f $infile; then
+        # check for direct call header to include.  This will be
+        # AC_SUBSTed later.
+        if test "$DIRECT_pif" = "solaris_ipv6" ; then
+            if test "`$GREP DIRECT_CALL_HEADER $infile`" != "" ; then
+                line="`$GREP DIRECT_CALL_HEADER $infile | cut -d= -f2-`"
+                str="MCA_pmix_pif_DIRECT_CALL_HEADER=$line"
+                eval $str
+            else
+as_fn_error $? "*** pif component solaris_ipv6 was supposed to be direct-called, but
+*** does not appear to support direct calling.
+*** Aborting" "$LINENO" 5
+            fi
+        fi
+    else
+        # were we supposed to have found something in the
+        # post_configure.sh, but the file didn't exist?
+        if test "$DIRECT_pif" = "solaris_ipv6" ; then
+as_fn_error $? "*** pif component solaris_ipv6 was supposed to be direct-called, but
+*** does not appear to support direct calling.
+*** Aborting" "$LINENO" 5
+        fi
+    fi
+
+    # if the component is building, add it's WRAPPER_EXTRA_LDFLAGS and
+    # WRAPPER_EXTRA_LIBS.  If the component doesn't specify it's
+    # WRAPPER_EXTRA_LIBS and WRAPPER_EXTRA_LDFLAGS, try using LDFLAGS and LIBS if
+    # component didn't have it's own configure script (in which case,
+    # we know it didn't set LDFLAGS and LIBS because it can't) Don't
+    # have to do this if the component is building dynamically,
+    # because it will link against these (without a dependency from
+    # libmpi.so to these flags)
+    if test "$compile_mode" = "static"; then
+        if test "$pif_solaris_ipv6_WRAPPER_EXTRA_LDFLAGS" = ""; then :
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $pif_solaris_ipv6_LDFLAGS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_ldflags}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_ldflags"; then :
+  mca_wrapper_extra_ldflags=$arg
+else
+  mca_wrapper_extra_ldflags="$mca_wrapper_extra_ldflags $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+else
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $pif_solaris_ipv6_WRAPPER_EXTRA_LDFLAGS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_ldflags}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_ldflags"; then :
+  mca_wrapper_extra_ldflags=$arg
+else
+  mca_wrapper_extra_ldflags="$mca_wrapper_extra_ldflags $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+fi
+                        if test "$pif_solaris_ipv6_WRAPPER_EXTRA_LIBS" = ""; then :
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $pif_solaris_ipv6_LIBS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_libs}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_libs"; then :
+  mca_wrapper_extra_libs=$arg
+else
+  mca_wrapper_extra_libs="$mca_wrapper_extra_libs $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+else
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $pif_solaris_ipv6_WRAPPER_EXTRA_LIBS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_libs}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_libs"; then :
+  mca_wrapper_extra_libs=$arg
+else
+  mca_wrapper_extra_libs="$mca_wrapper_extra_libs $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+fi
+
+    fi
+
+    # if needed, copy over WRAPPER_EXTRA_CPPFLAGS.  Since a configure script
+    # component can never be used in a STOP_AT_FIRST framework, we
+    # don't have to implement the else clause in the literal check...
+    if test "$pif_solaris_ipv6_WRAPPER_EXTRA_CPPFLAGS" != ""; then :
+  stop_at_first=0
+            if test "$compile_mode" = "static" && test "$stop_at_first" = "1"; then :
+  if test "$with_devel_headers" = "yes"; then :
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $pif_solaris_ipv6_WRAPPER_EXTRA_CPPFLAGS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_cppflags}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_cppflags"; then :
+  mca_wrapper_extra_cppflags=$arg
+else
+  mca_wrapper_extra_cppflags="$mca_wrapper_extra_cppflags $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+fi
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ignoring pif_solaris_ipv6_WRAPPER_EXTRA_CPPFLAGS ($pif_solaris_ipv6_WRAPPER_EXTRA_CPPFLAGS): component conditions not met" >&5
+$as_echo "$as_me: WARNING: ignoring pif_solaris_ipv6_WRAPPER_EXTRA_CPPFLAGS ($pif_solaris_ipv6_WRAPPER_EXTRA_CPPFLAGS): component conditions not met" >&2;}
+fi
+fi
+
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if MCA component pif:solaris_ipv6 can compile" >&5
+$as_echo_n "checking if MCA component pif:solaris_ipv6 can compile... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+    # If this component was requested as the default for this
+    # type, then abort.
+    if test "$with_pif" = "solaris_ipv6" ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MCA component \"solaris_ipv6\" failed to configure properly" >&5
+$as_echo "$as_me: WARNING: MCA component \"solaris_ipv6\" failed to configure properly" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This component was selected as the default" >&5
+$as_echo "$as_me: WARNING: This component was selected as the default" >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    if test ! -z "$DIRECT_pif" ; then
+        if test "$DIRECT_pif" = "solaris_ipv6" ; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MCA component \"solaris_ipv6\" failed to configure properly" >&5
+$as_echo "$as_me: WARNING: MCA component \"solaris_ipv6\" failed to configure properly" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This component was selected as the default (direct call)" >&5
+$as_echo "$as_me: WARNING: This component was selected as the default (direct call)" >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    fi
+
+           # add component to all component list
+           all_components="$all_components solaris_ipv6"
+fi
+
+
+
+    # set the AM_CONDITIONAL on how we should build
+    if test "$compile_mode" = "dso"; then :
+  BUILD_pmix_pif_solaris_ipv6_DSO=1
+else
+  BUILD_pmix_pif_solaris_ipv6_DSO=0
+fi
+     if test "$BUILD_pmix_pif_solaris_ipv6_DSO" = "1"; then
+  MCA_BUILD_pmix_pif_solaris_ipv6_DSO_TRUE=
+  MCA_BUILD_pmix_pif_solaris_ipv6_DSO_FALSE='#'
+else
+  MCA_BUILD_pmix_pif_solaris_ipv6_DSO_TRUE='#'
+  MCA_BUILD_pmix_pif_solaris_ipv6_DSO_FALSE=
+fi
+
+
+    if test "$should_build" = "1"; then :
+  components_last_result=1
+else
+  components_last_result=0
+fi
+
+    unset compile_mode
+
+
+
+
+
+    # configure components that provide their own configure script.
+    # It would be really hard to run these for "find first that
+    # works", so we don't :)
+
+
+
+                  if test "1" != "0"; then :
+
+    for component_path in $srcdir/src/mca/pif/* ; do
+        component="`basename $component_path`"
+        if test -d $component_path && test -x $component_path/configure ; then
+            pmix_show_subsubsubtitle "MCA component pif:$component (need to configure)"
+
+            pmix_show_verbose "PMIX_MCA_ALL_CONFIG_COMPONENTS: before, should_build="
+
+
+
+    component_path="$srcdir/src/mca/pif/$component"
+    want_component=0
+
+    # build if:
+    # - the component type is direct and we are that component
+    # - there is no pmix_ignore file
+    # - there is an pmix_ignore, but there is an empty pmix_unignore
+    # - there is an pmix_ignore, but username is in pmix_unignore
+    if test -d $component_path ; then
+        # decide if we want the component to be built or not.  This
+        # is spread out because some of the logic is a little complex
+        # and test's syntax isn't exactly the greatest.  We want to
+        # build the component by default.
+        want_component=1
+        if test -f $component_path/.pmix_ignore ; then
+            # If there is an pmix_ignore file, don't build
+            # the component.  Note that this decision can be
+            # overridden by the unignore logic below.
+            want_component=0
+        fi
+        if test -f $component_path/.pmix_unignore ; then
+            # if there is an empty pmix_unignore, that is
+            # equivalent to having your userid in the unignore file.
+            # If userid is in the file, unignore the ignore file.
+            if test ! -s $component_path/.pmix_unignore ; then
+                want_component=1
+            elif test ! -z "`$GREP $PMIX_CONFIGURE_USER $component_path/.pmix_unignore`" ; then
+                want_component=1
+            fi
+        fi
+        # if this component type is direct and we are not it, we don't want
+        # to be built.  Otherwise, we do want to be built.
+        if test ! -z "$DIRECT_pif" ; then
+            if test "$DIRECT_pif" = "$component" ; then
+                want_component=1
+            else
+                want_component=0
+            fi
+        fi
+    fi
+
+    # if we were explicitly disabled, don't build :)
+    if test "$DISABLE_pif" = "1"; then :
+  want_component=0
+fi
+    str="DISABLED_COMPONENT_CHECK=\$DISABLE_pif_$component"
+         eval $str
+         if test "$DISABLED_COMPONENT_CHECK" = "1" ; then
+             want_component=0
+         fi
+
+    if test "$want_component" = "1"; then :
+  should_build=1
+else
+  should_build=0
+fi
+
+
+    SHARED_FRAMEWORK="$DSO_pif"
+    str="SHARED_COMPONENT=\$DSO_pif_$component"
+         eval $str
+
+    STATIC_FRAMEWORK="$STATIC_pif"
+    str="STATIC_COMPONENT=\$STATIC_pif_$component"
+         eval $str
+
+    shared_mode_override=static
+
+    # Setup for either shared or static
+    if test "$STATIC_FRAMEWORK" = "1" || \
+       test "$STATIC_COMPONENT" = "1" || \
+       test "$STATIC_all" = "1" ; then
+        compile_mode="static"
+    elif test "$shared_mode_override" = "dso" || \
+         test "$SHARED_FRAMEWORK" = "1" || \
+         test "$SHARED_COMPONENT" = "1" || \
+         test "$DSO_all" = "1"; then
+        compile_mode="dso"
+    else
+        compile_mode="static"
+    fi
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MCA component pif:$component compile mode" >&5
+$as_echo_n "checking for MCA component pif:$component compile mode... " >&6; }
+    if test "$DIRECT_pif" = "$component" ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $compile_mode - direct" >&5
+$as_echo "$compile_mode - direct" >&6; }
+    else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $compile_mode" >&5
+$as_echo "$compile_mode" >&6; }
+    fi
+
+            pmix_show_verbose "PMIX_MCA_ALL_CONFIG_COMPONENTS: after, should_build=$should_build"
+
+            if test "$should_build" = "1" ; then
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in subdir_parent sub_configure subdir_dir subdir_srcdir subdir_cache_file subdir_args subdir_dots total_dir dir_part temp; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"subdir_parent sub_configure subdir_dir subdir_srcdir subdir_cache_file subdir_args subdir_dots total_dir dir_part temp\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+#
+# Invoke configure in a specific subdirectory.
+#
+# src/mca/pif/$component is the directory to invoke in
+# $pmix_subdir_args is the list of arguments to pass
+# should_build=1 is actions to execute upon success
+# should_build=0 is actions to execute upon failure
+#
+subdir_dir="src/mca/pif/$component"
+subdir_args="$pmix_subdir_args"
+subdir_success="should_build=1"
+subdir_failure="should_build=0"
+
+#
+# Sanity checks
+#
+
+if test "$subdir_dir" != ":" && test -d $srcdir/$subdir_dir; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: PMIX configuring in $subdir_dir" >&5
+$as_echo "$as_me: PMIX configuring in $subdir_dir" >&6;}
+
+    #
+    # Gotta check where srcdir is for VPATH builds.  If srcdir is not
+    # ., then we need to mkdir the subdir.  Otherwise, we can just cd
+    # into it.
+    #
+
+    case $srcdir in
+    .)
+	;;
+    *)
+	{ case $subdir_dir in
+	[\\/]* | ?:[\\/]* ) total_dir=;;
+	*)                      total_dir=.;;
+	esac
+	temp=$subdir_dir
+	for dir_part in `IFS='/\\'; set X $temp; shift; echo "$@"`; do
+	    case $dir_part in
+	    # Skip DOS drivespec
+	    ?:) total_dir=$dir_part ;;
+	    *)  total_dir=$total_dir/$dir_part
+		test -d "$total_dir" ||
+		mkdir "$total_dir" ||
+		as_fn_error $? "cannot create $subdir_dir" "$LINENO" 5
+		;;
+	    esac
+	done; }
+
+	if test -d ./$subdir_dir; then :;
+	else
+	    as_fn_error $? "cannot create \`pwd\`/$subdir_dir" "$LINENO" 5
+	fi
+	;;
+    esac
+
+    #
+    # Move into the target directory
+    #
+
+    subdir_parent=`pwd`
+    cd $subdir_dir
+
+    #
+    # Make a "../" for each directory in $subdir_dir.
+    #
+
+    subdir_dots=`echo $subdir_dir | sed 's,^\./,,;s,[^/]$,&/,;s,[^/]*/,../,g'`
+    #
+    # Construct the --srcdir argument
+    #
+
+    case $srcdir in
+    .)
+	# In place
+	subdir_srcdir="$srcdir"
+	;;
+    [\\/]* | ?:[\\/]* )
+	# Absolute path
+	subdir_srcdir="$srcdir/$subdir_dir"
+	;;
+    *)
+	# Relative path
+	subdir_srcdir="$subdir_dots$srcdir/$subdir_dir"
+	;;
+    esac
+
+    #
+    # Construct the --cache-file argument
+    #
+
+    # BWB - subdir caching is a pain since we change CFLAGS and all that.
+    # Just disable it for now
+    subdir_cache_file="/dev/null"
+
+    #
+    # Invoke the configure script in the subdirectory
+    #
+
+    sub_configure="$SHELL '$subdir_srcdir/configure'"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: running $sub_configure $subdir_args --cache-file=$subdir_cache_file --srcdir=$subdir_srcdir --disable-option-checking" >&5
+$as_echo "$as_me: running $sub_configure $subdir_args --cache-file=$subdir_cache_file --srcdir=$subdir_srcdir --disable-option-checking" >&6;}
+    eval "$sub_configure $subdir_args \
+	--cache-file=\"\$subdir_cache_file\" --srcdir=\"$subdir_srcdir\" --disable-option-checking"
+    if test "$?" = "0"; then
+	eval $subdir_success
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: $sub_configure succeeded for $subdir_dir" >&5
+$as_echo "$as_me: $sub_configure succeeded for $subdir_dir" >&6;}
+    else
+	eval $subdir_failure
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: $sub_configure *failed* for $subdir_dir" >&5
+$as_echo "$as_me: $sub_configure *failed* for $subdir_dir" >&6;}
+    fi
+
+    #
+    # Go back to the topdir
+    #
+
+    cd $subdir_parent
+fi
+
+#
+# Clean up
+#
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+                pmix_show_verbose "PMIX_MCA_ALL_CONFIG_COMPONENTS: after subdir, should_build=$should_build"
+            fi
+
+            if test "$should_build" = "1" ; then
+                # do some extra work to pass flags back from the
+                # top-level configure, the way a configure.m4
+                # component would.
+                infile="$srcdir/src/mca/pif/all_components/post_configure.sh"
+                if test -f $infile; then
+
+                    # First check for the ABORT tag
+                    line="`$GREP ABORT= $infile | cut -d= -f2-`"
+                    if test -n "$line" && test "$line" != "no"; then
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MCA component configure script told me to abort" >&5
+$as_echo "$as_me: WARNING: MCA component configure script told me to abort" >&2;}
+                        as_fn_error $? "cannot continue" "$LINENO" 5
+                    fi
+
+                    line="`$GREP WRAPPER_EXTRA_LDFLAGS= $infile | cut -d= -f2-`"
+                            eval "line=$line"
+                            if test -n "$line"; then
+                                all_components_static_components_WRAPPER_EXTRA_LDFLAGS="$line"
+                            fi
+                        line="`$GREP WRAPPER_EXTRA_LIBS= $infile | cut -d= -f2-`"
+                            eval "line=$line"
+                            if test -n "$line"; then
+                                all_components_static_components_WRAPPER_EXTRA_LIBS="$line"
+                            fi
+                                        fi
+
+
+
+
+    # See if it dropped an output file for us to pick up some
+    # shell variables in.
+    infile="$srcdir/src/mca/pif/$component/post_configure.sh"
+
+    # Add this subdir to the mast list of all MCA component subdirs
+    all_components="$all_components $component"
+
+    if test "$compile_mode" = "dso" ; then
+        dso_components="$dso_components $component"
+    else
+        if test "pif" = "common"; then
+            # Static libraries in "common" frameworks are installed, and
+            # therefore must obey the $FRAMEWORK_LIB_PREFIX that was
+            # set.
+            static_ltlibs="mca/pif/$component/lib${PMIX_LIB_PREFIX}mca_pif_$component.la $static_ltlibs"
+        else
+            # Other frameworks do not have to obey the
+            # $FRAMEWORK_LIB_PREFIX prefix.
+            static_ltlibs="mca/pif/$component/libmca_pif_$component.la $static_ltlibs"
+        fi
+        echo "extern const pmix_mca_base_component_t mca_pif_$component_component;" >> $outfile.extern
+        echo "  &mca_pif_$component_component, " >> $outfile.struct
+        static_components="$static_components $component"
+    fi
+
+    # Output pretty results
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if MCA component pif:$component can compile" >&5
+$as_echo_n "checking if MCA component pif:$component can compile... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+                        if test -f $infile; then
+        # check for direct call header to include.  This will be
+        # AC_SUBSTed later.
+        if test "$DIRECT_pif" = "$component" ; then
+            if test "`$GREP DIRECT_CALL_HEADER $infile`" != "" ; then
+                line="`$GREP DIRECT_CALL_HEADER $infile | cut -d= -f2-`"
+                str="MCA_pmix_pif_DIRECT_CALL_HEADER=$line"
+                eval $str
+            else
+as_fn_error $? "*** pif component $component was supposed to be direct-called, but
+*** does not appear to support direct calling.
+*** Aborting" "$LINENO" 5
+            fi
+        fi
+    else
+        # were we supposed to have found something in the
+        # post_configure.sh, but the file didn't exist?
+        if test "$DIRECT_pif" = "$component" ; then
+as_fn_error $? "*** pif component $component was supposed to be direct-called, but
+*** does not appear to support direct calling.
+*** Aborting" "$LINENO" 5
+        fi
+    fi
+
+    # if the component is building, add it's WRAPPER_EXTRA_LDFLAGS and
+    # WRAPPER_EXTRA_LIBS.  If the component doesn't specify it's
+    # WRAPPER_EXTRA_LIBS and WRAPPER_EXTRA_LDFLAGS, try using LDFLAGS and LIBS if
+    # component didn't have it's own configure script (in which case,
+    # we know it didn't set LDFLAGS and LIBS because it can't) Don't
+    # have to do this if the component is building dynamically,
+    # because it will link against these (without a dependency from
+    # libmpi.so to these flags)
+    if test "$compile_mode" = "static"; then
+        str="line=\$pif_$component_WRAPPER_EXTRA_LDFLAGS"
+                      eval "$str"
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $line; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_ldflags}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_ldflags"; then :
+  mca_wrapper_extra_ldflags=$arg
+else
+  mca_wrapper_extra_ldflags="$mca_wrapper_extra_ldflags $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+str="line=\$pif_$component_WRAPPER_EXTRA_LIBS"
+                      eval "$str"
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $line; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_libs}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_libs"; then :
+  mca_wrapper_extra_libs=$arg
+else
+  mca_wrapper_extra_libs="$mca_wrapper_extra_libs $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+    fi
+
+    # if needed, copy over WRAPPER_EXTRA_CPPFLAGS.  Since a configure script
+    # component can never be used in a STOP_AT_FIRST framework, we
+    # don't have to implement the else clause in the literal check...
+
+
+            else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if MCA component pif:$component can compile" >&5
+$as_echo_n "checking if MCA component pif:$component can compile... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+    # If this component was requested as the default for this
+    # type, then abort.
+    if test "$with_pif" = "$component" ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MCA component \"$component\" failed to configure properly" >&5
+$as_echo "$as_me: WARNING: MCA component \"$component\" failed to configure properly" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This component was selected as the default" >&5
+$as_echo "$as_me: WARNING: This component was selected as the default" >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    if test ! -z "$DIRECT_pif" ; then
+        if test "$DIRECT_pif" = "$component" ; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MCA component \"$component\" failed to configure properly" >&5
+$as_echo "$as_me: WARNING: MCA component \"$component\" failed to configure properly" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This component was selected as the default (direct call)" >&5
+$as_echo "$as_me: WARNING: This component was selected as the default (direct call)" >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    fi
+
+            fi
+        fi
+    done
+
+fi
+
+    MCA_pmix_pif_ALL_COMPONENTS="$all_components"
+    MCA_pmix_pif_STATIC_COMPONENTS="$static_components"
+    MCA_pmix_pif_DSO_COMPONENTS="$dso_components"
+    MCA_pmix_pif_STATIC_LTLIBS="$static_ltlibs"
+
+
+
+
+
+
+
+    MCA_pmix_pif_ALL_SUBDIRS=
+    for item in $all_components ; do
+       MCA_pmix_pif_ALL_SUBDIRS="$MCA_pmix_pif_ALL_SUBDIRS mca/pif/$item"
+    done
+
+
+
+    MCA_pmix_pif_STATIC_SUBDIRS=
+    for item in $static_components ; do
+       MCA_pmix_pif_STATIC_SUBDIRS="$MCA_pmix_pif_STATIC_SUBDIRS mca/pif/$item"
+    done
+
+
+
+    MCA_pmix_pif_DSO_SUBDIRS=
+    for item in $dso_components ; do
+       MCA_pmix_pif_DSO_SUBDIRS="$MCA_pmix_pif_DSO_SUBDIRS mca/pif/$item"
+    done
+
+
+
+    # Create the final .h file that will be included in the type's
+    # top-level glue.  This lists all the static components.  We don't
+    # need to do this for "common".
+    if test "1" != "common"; then
+        cat > $outfile <<EOF
+/*
+ * \$HEADER\$
+ */
+#if defined(c_plusplus) || defined(__cplusplus)
+extern "C" {
+#endif
+
+`cat $outfile.extern`
+
+const pmix_mca_base_component_t *mca_pif_base_static_components[] = {
+`cat $outfile.struct`
+  NULL
+};
+
+#if defined(c_plusplus) || defined(__cplusplus)
+}
+#endif
+
+EOF
+        # Only replace the header file if a) it doesn't previously
+        # exist, or b) the contents are different.  Do this to not
+        # trigger recompilation of certain .c files just because the
+        # timestamp changed on $outfile_real (similar to the way AC
+        # handles AC_CONFIG_HEADER files).
+        diff $outfile $outfile_real > /dev/null 2>&1
+        if test "$?" != "0"; then
+            mv $outfile $outfile_real
+        else
+            rm -f $outfile
+        fi
+    fi
+    rm -f $outfile.struct $outfile.extern
+
+    unset all_components static_components dso_components outfile outfile_real
+
+                                 MCA_pmix_FRAMEWORKS="$MCA_pmix_FRAMEWORKS pinstalldirs"
+                                 MCA_pmix_FRAMEWORKS_SUBDIRS="$MCA_pmix_FRAMEWORKS_SUBDIRS mca/pinstalldirs"
+                                 MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS="$MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS \$(MCA_pmix_pinstalldirs_ALL_SUBDIRS)"
+                                 MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS="$MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS \$(MCA_pmix_pinstalldirs_DSO_SUBDIRS)"
+                                 MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS="$MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS \$(MCA_pmix_pinstalldirs_STATIC_SUBDIRS)"
+                                 MCA_pmix_FRAMEWORK_LIBS="$MCA_pmix_FRAMEWORK_LIBS mca/pinstalldirs/libmca_pinstalldirs.la"
+                          MCA_pmix_FRAMEWORK_LIBS="$MCA_pmix_FRAMEWORK_LIBS \$(MCA_pmix_pinstalldirs_STATIC_LTLIBS)"
+
+    pmix_show_subsubtitle "Configuring MCA framework pinstalldirs"
+
+
+
+
+    # setup for framework
+    all_components=
+    static_components=
+    dso_components=
+    static_ltlibs=
+
+    # Ensure that the directory where the #include file is to live
+    # exists.  Need to do this for VPATH builds, because the directory
+    # may not exist yet.  For the "common" type, it's not really a
+    # component, so it doesn't have a base.
+    outdir=src/mca/pinstalldirs/base
+    as_dir=$outdir; as_fn_mkdir_p
+
+    # emit Makefile rule
+    ac_config_files="$ac_config_files src/mca/pinstalldirs/Makefile"
+
+
+    # remove any previously generated #include files
+    outfile_real=$outdir/static-components.h
+    outfile=$outfile_real.new
+    rm -f $outfile $outfile.struct $outfile.extern
+    touch $outfile.struct $outfile.extern
+
+    # print some nice messages about what we're about to do...
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for no configure components in framework pinstalldirs" >&5
+$as_echo_n "checking for no configure components in framework pinstalldirs... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+$as_echo "" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for m4 configure components in framework pinstalldirs" >&5
+$as_echo_n "checking for m4 configure components in framework pinstalldirs... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: config, env" >&5
+$as_echo "config, env" >&6; }
+
+    # If there are components in the no configure list, but we're
+    # doing one of the "special" selection logics, abort with a
+    # reasonable message.
+
+
+
+    # run the configure logic for the no-config components
+
+
+    # configure components that use built-in configuration scripts
+
+
+
+
+
+
+    best_mca_component_priority=0
+    components_looking_for_succeed=1
+    components_last_result=0
+
+
+    pmix_show_subsubsubtitle "MCA component pinstalldirs:env (m4 configuration macro, priority 10)"
+
+    pmix_show_verbose "PMIX_MCA_M4_CONFIG_COMPONENT: before, should_build=$components_looking_for_succeed"
+
+
+
+    component_path="$srcdir/src/mca/pinstalldirs/env"
+    want_component=0
+
+    # build if:
+    # - the component type is direct and we are that component
+    # - there is no pmix_ignore file
+    # - there is an pmix_ignore, but there is an empty pmix_unignore
+    # - there is an pmix_ignore, but username is in pmix_unignore
+    if test -d $component_path ; then
+        # decide if we want the component to be built or not.  This
+        # is spread out because some of the logic is a little complex
+        # and test's syntax isn't exactly the greatest.  We want to
+        # build the component by default.
+        want_component=1
+        if test -f $component_path/.pmix_ignore ; then
+            # If there is an pmix_ignore file, don't build
+            # the component.  Note that this decision can be
+            # overridden by the unignore logic below.
+            want_component=0
+        fi
+        if test -f $component_path/.pmix_unignore ; then
+            # if there is an empty pmix_unignore, that is
+            # equivalent to having your userid in the unignore file.
+            # If userid is in the file, unignore the ignore file.
+            if test ! -s $component_path/.pmix_unignore ; then
+                want_component=1
+            elif test ! -z "`$GREP $PMIX_CONFIGURE_USER $component_path/.pmix_unignore`" ; then
+                want_component=1
+            fi
+        fi
+        # if this component type is direct and we are not it, we don't want
+        # to be built.  Otherwise, we do want to be built.
+        if test ! -z "$DIRECT_pinstalldirs" ; then
+            if test "$DIRECT_pinstalldirs" = "env" ; then
+                want_component=1
+            else
+                want_component=0
+            fi
+        fi
+    fi
+
+    # if we were explicitly disabled, don't build :)
+    if test "$DISABLE_pinstalldirs" = "1"; then :
+  want_component=0
+fi
+    if test "$DISABLE_pinstalldirs_env" = "1"; then :
+  want_component=0
+fi
+
+    if test "$want_component" = "1"; then :
+  should_build=$components_looking_for_succeed
+else
+  should_build=0
+fi
+
+    # Allow the component to override the build mode if it really wants to.
+    # It is, of course, free to end up calling MCA_COMPONENT_COMPILE_MODE
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MCA component pinstalldirs:env compile mode" >&5
+$as_echo_n "checking for MCA component pinstalldirs:env compile mode... " >&6; }
+    compile_mode="static"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $compile_mode" >&5
+$as_echo "$compile_mode" >&6; }
+
+
+    # try to configure the component
+
+    ac_config_files="$ac_config_files src/mca/pinstalldirs/env/Makefile"
+
+
+    pmix_show_verbose "PMIX_MCA_M4_CONFIG_COMPONENT: after, should_build=$should_build"
+
+    if test "$should_build" = "1"; then :
+
+
+
+    # See if it dropped an output file for us to pick up some
+    # shell variables in.
+    infile="$srcdir/src/mca/pinstalldirs/env/post_configure.sh"
+
+    # Add this subdir to the mast list of all MCA component subdirs
+    all_components="$all_components env"
+
+    if test "$compile_mode" = "dso" ; then
+        dso_components="$dso_components env"
+    else
+        if test "pinstalldirs" = "common"; then
+            # Static libraries in "common" frameworks are installed, and
+            # therefore must obey the $FRAMEWORK_LIB_PREFIX that was
+            # set.
+            static_ltlibs="mca/pinstalldirs/env/lib${PMIX_LIB_PREFIX}mca_pinstalldirs_env.la $static_ltlibs"
+        else
+            # Other frameworks do not have to obey the
+            # $FRAMEWORK_LIB_PREFIX prefix.
+            static_ltlibs="mca/pinstalldirs/env/libmca_pinstalldirs_env.la $static_ltlibs"
+        fi
+        echo "extern const pmix_mca_base_component_t mca_pinstalldirs_env_component;" >> $outfile.extern
+        echo "  &mca_pinstalldirs_env_component, " >> $outfile.struct
+        static_components="$static_components env"
+    fi
+
+    # Output pretty results
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if MCA component pinstalldirs:env can compile" >&5
+$as_echo_n "checking if MCA component pinstalldirs:env can compile... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+                        if test -f $infile; then
+        # check for direct call header to include.  This will be
+        # AC_SUBSTed later.
+        if test "$DIRECT_pinstalldirs" = "env" ; then
+            if test "`$GREP DIRECT_CALL_HEADER $infile`" != "" ; then
+                line="`$GREP DIRECT_CALL_HEADER $infile | cut -d= -f2-`"
+                str="MCA_pmix_pinstalldirs_DIRECT_CALL_HEADER=$line"
+                eval $str
+            else
+as_fn_error $? "*** pinstalldirs component env was supposed to be direct-called, but
+*** does not appear to support direct calling.
+*** Aborting" "$LINENO" 5
+            fi
+        fi
+    else
+        # were we supposed to have found something in the
+        # post_configure.sh, but the file didn't exist?
+        if test "$DIRECT_pinstalldirs" = "env" ; then
+as_fn_error $? "*** pinstalldirs component env was supposed to be direct-called, but
+*** does not appear to support direct calling.
+*** Aborting" "$LINENO" 5
+        fi
+    fi
+
+    # if the component is building, add it's WRAPPER_EXTRA_LDFLAGS and
+    # WRAPPER_EXTRA_LIBS.  If the component doesn't specify it's
+    # WRAPPER_EXTRA_LIBS and WRAPPER_EXTRA_LDFLAGS, try using LDFLAGS and LIBS if
+    # component didn't have it's own configure script (in which case,
+    # we know it didn't set LDFLAGS and LIBS because it can't) Don't
+    # have to do this if the component is building dynamically,
+    # because it will link against these (without a dependency from
+    # libmpi.so to these flags)
+    if test "$compile_mode" = "static"; then
+        if test "$pinstalldirs_env_WRAPPER_EXTRA_LDFLAGS" = ""; then :
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $pinstalldirs_env_LDFLAGS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_ldflags}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_ldflags"; then :
+  mca_wrapper_extra_ldflags=$arg
+else
+  mca_wrapper_extra_ldflags="$mca_wrapper_extra_ldflags $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+else
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $pinstalldirs_env_WRAPPER_EXTRA_LDFLAGS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_ldflags}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_ldflags"; then :
+  mca_wrapper_extra_ldflags=$arg
+else
+  mca_wrapper_extra_ldflags="$mca_wrapper_extra_ldflags $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+fi
+                        if test "$pinstalldirs_env_WRAPPER_EXTRA_LIBS" = ""; then :
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $pinstalldirs_env_LIBS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_libs}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_libs"; then :
+  mca_wrapper_extra_libs=$arg
+else
+  mca_wrapper_extra_libs="$mca_wrapper_extra_libs $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+else
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $pinstalldirs_env_WRAPPER_EXTRA_LIBS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_libs}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_libs"; then :
+  mca_wrapper_extra_libs=$arg
+else
+  mca_wrapper_extra_libs="$mca_wrapper_extra_libs $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+fi
+
+    fi
+
+    # if needed, copy over WRAPPER_EXTRA_CPPFLAGS.  Since a configure script
+    # component can never be used in a STOP_AT_FIRST framework, we
+    # don't have to implement the else clause in the literal check...
+    if test "$pinstalldirs_env_WRAPPER_EXTRA_CPPFLAGS" != ""; then :
+  stop_at_first=0
+            if test "$compile_mode" = "static" && test "$stop_at_first" = "1"; then :
+  if test "$with_devel_headers" = "yes"; then :
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $pinstalldirs_env_WRAPPER_EXTRA_CPPFLAGS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_cppflags}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_cppflags"; then :
+  mca_wrapper_extra_cppflags=$arg
+else
+  mca_wrapper_extra_cppflags="$mca_wrapper_extra_cppflags $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+fi
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ignoring pinstalldirs_env_WRAPPER_EXTRA_CPPFLAGS ($pinstalldirs_env_WRAPPER_EXTRA_CPPFLAGS): component conditions not met" >&5
+$as_echo "$as_me: WARNING: ignoring pinstalldirs_env_WRAPPER_EXTRA_CPPFLAGS ($pinstalldirs_env_WRAPPER_EXTRA_CPPFLAGS): component conditions not met" >&2;}
+fi
+fi
+
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if MCA component pinstalldirs:env can compile" >&5
+$as_echo_n "checking if MCA component pinstalldirs:env can compile... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+    # If this component was requested as the default for this
+    # type, then abort.
+    if test "$with_pinstalldirs" = "env" ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MCA component \"env\" failed to configure properly" >&5
+$as_echo "$as_me: WARNING: MCA component \"env\" failed to configure properly" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This component was selected as the default" >&5
+$as_echo "$as_me: WARNING: This component was selected as the default" >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    if test ! -z "$DIRECT_pinstalldirs" ; then
+        if test "$DIRECT_pinstalldirs" = "env" ; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MCA component \"env\" failed to configure properly" >&5
+$as_echo "$as_me: WARNING: MCA component \"env\" failed to configure properly" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This component was selected as the default (direct call)" >&5
+$as_echo "$as_me: WARNING: This component was selected as the default (direct call)" >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    fi
+
+           # add component to all component list
+           all_components="$all_components env"
+fi
+
+
+
+    # set the AM_CONDITIONAL on how we should build
+    if test "$compile_mode" = "dso"; then :
+  BUILD_pmix_pinstalldirs_env_DSO=1
+else
+  BUILD_pmix_pinstalldirs_env_DSO=0
+fi
+     if test "$BUILD_pmix_pinstalldirs_env_DSO" = "1"; then
+  MCA_BUILD_pmix_pinstalldirs_env_DSO_TRUE=
+  MCA_BUILD_pmix_pinstalldirs_env_DSO_FALSE='#'
+else
+  MCA_BUILD_pmix_pinstalldirs_env_DSO_TRUE='#'
+  MCA_BUILD_pmix_pinstalldirs_env_DSO_FALSE=
+fi
+
+
+    if test "$should_build" = "1"; then :
+  components_last_result=1
+else
+  components_last_result=0
+fi
+
+    unset compile_mode
+
+
+
+
+
+    pmix_show_subsubsubtitle "MCA component pinstalldirs:config (m4 configuration macro, priority 0)"
+
+    pmix_show_verbose "PMIX_MCA_M4_CONFIG_COMPONENT: before, should_build=$components_looking_for_succeed"
+
+
+
+    component_path="$srcdir/src/mca/pinstalldirs/config"
+    want_component=0
+
+    # build if:
+    # - the component type is direct and we are that component
+    # - there is no pmix_ignore file
+    # - there is an pmix_ignore, but there is an empty pmix_unignore
+    # - there is an pmix_ignore, but username is in pmix_unignore
+    if test -d $component_path ; then
+        # decide if we want the component to be built or not.  This
+        # is spread out because some of the logic is a little complex
+        # and test's syntax isn't exactly the greatest.  We want to
+        # build the component by default.
+        want_component=1
+        if test -f $component_path/.pmix_ignore ; then
+            # If there is an pmix_ignore file, don't build
+            # the component.  Note that this decision can be
+            # overridden by the unignore logic below.
+            want_component=0
+        fi
+        if test -f $component_path/.pmix_unignore ; then
+            # if there is an empty pmix_unignore, that is
+            # equivalent to having your userid in the unignore file.
+            # If userid is in the file, unignore the ignore file.
+            if test ! -s $component_path/.pmix_unignore ; then
+                want_component=1
+            elif test ! -z "`$GREP $PMIX_CONFIGURE_USER $component_path/.pmix_unignore`" ; then
+                want_component=1
+            fi
+        fi
+        # if this component type is direct and we are not it, we don't want
+        # to be built.  Otherwise, we do want to be built.
+        if test ! -z "$DIRECT_pinstalldirs" ; then
+            if test "$DIRECT_pinstalldirs" = "config" ; then
+                want_component=1
+            else
+                want_component=0
+            fi
+        fi
+    fi
+
+    # if we were explicitly disabled, don't build :)
+    if test "$DISABLE_pinstalldirs" = "1"; then :
+  want_component=0
+fi
+    if test "$DISABLE_pinstalldirs_config" = "1"; then :
+  want_component=0
+fi
+
+    if test "$want_component" = "1"; then :
+  should_build=$components_looking_for_succeed
+else
+  should_build=0
+fi
+
+    # Allow the component to override the build mode if it really wants to.
+    # It is, of course, free to end up calling MCA_COMPONENT_COMPILE_MODE
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MCA component pinstalldirs:config compile mode" >&5
+$as_echo_n "checking for MCA component pinstalldirs:config compile mode... " >&6; }
+    compile_mode="static"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $compile_mode" >&5
+$as_echo "$compile_mode" >&6; }
+
+
+    # try to configure the component
+
+    ac_config_files="$ac_config_files src/mca/pinstalldirs/config/Makefile src/mca/pinstalldirs/config/pinstall_dirs.h"
+
+
+    pmix_show_verbose "PMIX_MCA_M4_CONFIG_COMPONENT: after, should_build=$should_build"
+
+    if test "$should_build" = "1"; then :
+
+
+
+    # See if it dropped an output file for us to pick up some
+    # shell variables in.
+    infile="$srcdir/src/mca/pinstalldirs/config/post_configure.sh"
+
+    # Add this subdir to the mast list of all MCA component subdirs
+    all_components="$all_components config"
+
+    if test "$compile_mode" = "dso" ; then
+        dso_components="$dso_components config"
+    else
+        if test "pinstalldirs" = "common"; then
+            # Static libraries in "common" frameworks are installed, and
+            # therefore must obey the $FRAMEWORK_LIB_PREFIX that was
+            # set.
+            static_ltlibs="mca/pinstalldirs/config/lib${PMIX_LIB_PREFIX}mca_pinstalldirs_config.la $static_ltlibs"
+        else
+            # Other frameworks do not have to obey the
+            # $FRAMEWORK_LIB_PREFIX prefix.
+            static_ltlibs="mca/pinstalldirs/config/libmca_pinstalldirs_config.la $static_ltlibs"
+        fi
+        echo "extern const pmix_mca_base_component_t mca_pinstalldirs_config_component;" >> $outfile.extern
+        echo "  &mca_pinstalldirs_config_component, " >> $outfile.struct
+        static_components="$static_components config"
+    fi
+
+    # Output pretty results
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if MCA component pinstalldirs:config can compile" >&5
+$as_echo_n "checking if MCA component pinstalldirs:config can compile... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+                        if test -f $infile; then
+        # check for direct call header to include.  This will be
+        # AC_SUBSTed later.
+        if test "$DIRECT_pinstalldirs" = "config" ; then
+            if test "`$GREP DIRECT_CALL_HEADER $infile`" != "" ; then
+                line="`$GREP DIRECT_CALL_HEADER $infile | cut -d= -f2-`"
+                str="MCA_pmix_pinstalldirs_DIRECT_CALL_HEADER=$line"
+                eval $str
+            else
+as_fn_error $? "*** pinstalldirs component config was supposed to be direct-called, but
+*** does not appear to support direct calling.
+*** Aborting" "$LINENO" 5
+            fi
+        fi
+    else
+        # were we supposed to have found something in the
+        # post_configure.sh, but the file didn't exist?
+        if test "$DIRECT_pinstalldirs" = "config" ; then
+as_fn_error $? "*** pinstalldirs component config was supposed to be direct-called, but
+*** does not appear to support direct calling.
+*** Aborting" "$LINENO" 5
+        fi
+    fi
+
+    # if the component is building, add it's WRAPPER_EXTRA_LDFLAGS and
+    # WRAPPER_EXTRA_LIBS.  If the component doesn't specify it's
+    # WRAPPER_EXTRA_LIBS and WRAPPER_EXTRA_LDFLAGS, try using LDFLAGS and LIBS if
+    # component didn't have it's own configure script (in which case,
+    # we know it didn't set LDFLAGS and LIBS because it can't) Don't
+    # have to do this if the component is building dynamically,
+    # because it will link against these (without a dependency from
+    # libmpi.so to these flags)
+    if test "$compile_mode" = "static"; then
+        if test "$pinstalldirs_config_WRAPPER_EXTRA_LDFLAGS" = ""; then :
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $pinstalldirs_config_LDFLAGS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_ldflags}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_ldflags"; then :
+  mca_wrapper_extra_ldflags=$arg
+else
+  mca_wrapper_extra_ldflags="$mca_wrapper_extra_ldflags $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+else
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $pinstalldirs_config_WRAPPER_EXTRA_LDFLAGS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_ldflags}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_ldflags"; then :
+  mca_wrapper_extra_ldflags=$arg
+else
+  mca_wrapper_extra_ldflags="$mca_wrapper_extra_ldflags $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+fi
+                        if test "$pinstalldirs_config_WRAPPER_EXTRA_LIBS" = ""; then :
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $pinstalldirs_config_LIBS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_libs}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_libs"; then :
+  mca_wrapper_extra_libs=$arg
+else
+  mca_wrapper_extra_libs="$mca_wrapper_extra_libs $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+else
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $pinstalldirs_config_WRAPPER_EXTRA_LIBS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_libs}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_libs"; then :
+  mca_wrapper_extra_libs=$arg
+else
+  mca_wrapper_extra_libs="$mca_wrapper_extra_libs $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+fi
+
+    fi
+
+    # if needed, copy over WRAPPER_EXTRA_CPPFLAGS.  Since a configure script
+    # component can never be used in a STOP_AT_FIRST framework, we
+    # don't have to implement the else clause in the literal check...
+    if test "$pinstalldirs_config_WRAPPER_EXTRA_CPPFLAGS" != ""; then :
+  stop_at_first=0
+            if test "$compile_mode" = "static" && test "$stop_at_first" = "1"; then :
+  if test "$with_devel_headers" = "yes"; then :
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $pinstalldirs_config_WRAPPER_EXTRA_CPPFLAGS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_cppflags}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_cppflags"; then :
+  mca_wrapper_extra_cppflags=$arg
+else
+  mca_wrapper_extra_cppflags="$mca_wrapper_extra_cppflags $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+fi
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ignoring pinstalldirs_config_WRAPPER_EXTRA_CPPFLAGS ($pinstalldirs_config_WRAPPER_EXTRA_CPPFLAGS): component conditions not met" >&5
+$as_echo "$as_me: WARNING: ignoring pinstalldirs_config_WRAPPER_EXTRA_CPPFLAGS ($pinstalldirs_config_WRAPPER_EXTRA_CPPFLAGS): component conditions not met" >&2;}
+fi
+fi
+
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if MCA component pinstalldirs:config can compile" >&5
+$as_echo_n "checking if MCA component pinstalldirs:config can compile... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+    # If this component was requested as the default for this
+    # type, then abort.
+    if test "$with_pinstalldirs" = "config" ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MCA component \"config\" failed to configure properly" >&5
+$as_echo "$as_me: WARNING: MCA component \"config\" failed to configure properly" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This component was selected as the default" >&5
+$as_echo "$as_me: WARNING: This component was selected as the default" >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    if test ! -z "$DIRECT_pinstalldirs" ; then
+        if test "$DIRECT_pinstalldirs" = "config" ; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MCA component \"config\" failed to configure properly" >&5
+$as_echo "$as_me: WARNING: MCA component \"config\" failed to configure properly" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This component was selected as the default (direct call)" >&5
+$as_echo "$as_me: WARNING: This component was selected as the default (direct call)" >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    fi
+
+           # add component to all component list
+           all_components="$all_components config"
+fi
+
+
+
+    # set the AM_CONDITIONAL on how we should build
+    if test "$compile_mode" = "dso"; then :
+  BUILD_pmix_pinstalldirs_config_DSO=1
+else
+  BUILD_pmix_pinstalldirs_config_DSO=0
+fi
+     if test "$BUILD_pmix_pinstalldirs_config_DSO" = "1"; then
+  MCA_BUILD_pmix_pinstalldirs_config_DSO_TRUE=
+  MCA_BUILD_pmix_pinstalldirs_config_DSO_FALSE='#'
+else
+  MCA_BUILD_pmix_pinstalldirs_config_DSO_TRUE='#'
+  MCA_BUILD_pmix_pinstalldirs_config_DSO_FALSE=
+fi
+
+
+    if test "$should_build" = "1"; then :
+  components_last_result=1
+else
+  components_last_result=0
+fi
+
+    unset compile_mode
+
+
+
+
+
+    # configure components that provide their own configure script.
+    # It would be really hard to run these for "find first that
+    # works", so we don't :)
+
+
+    MCA_pmix_pinstalldirs_ALL_COMPONENTS="$all_components"
+    MCA_pmix_pinstalldirs_STATIC_COMPONENTS="$static_components"
+    MCA_pmix_pinstalldirs_DSO_COMPONENTS="$dso_components"
+    MCA_pmix_pinstalldirs_STATIC_LTLIBS="$static_ltlibs"
+
+
+
+
+
+
+
+    MCA_pmix_pinstalldirs_ALL_SUBDIRS=
+    for item in $all_components ; do
+       MCA_pmix_pinstalldirs_ALL_SUBDIRS="$MCA_pmix_pinstalldirs_ALL_SUBDIRS mca/pinstalldirs/$item"
+    done
+
+
+
+    MCA_pmix_pinstalldirs_STATIC_SUBDIRS=
+    for item in $static_components ; do
+       MCA_pmix_pinstalldirs_STATIC_SUBDIRS="$MCA_pmix_pinstalldirs_STATIC_SUBDIRS mca/pinstalldirs/$item"
+    done
+
+
+
+    MCA_pmix_pinstalldirs_DSO_SUBDIRS=
+    for item in $dso_components ; do
+       MCA_pmix_pinstalldirs_DSO_SUBDIRS="$MCA_pmix_pinstalldirs_DSO_SUBDIRS mca/pinstalldirs/$item"
+    done
+
+
+
+    # Create the final .h file that will be included in the type's
+    # top-level glue.  This lists all the static components.  We don't
+    # need to do this for "common".
+    if test "1" != "common"; then
+        cat > $outfile <<EOF
+/*
+ * \$HEADER\$
+ */
+#if defined(c_plusplus) || defined(__cplusplus)
+extern "C" {
+#endif
+
+`cat $outfile.extern`
+
+const pmix_mca_base_component_t *mca_pinstalldirs_base_static_components[] = {
+`cat $outfile.struct`
+  NULL
+};
+
+#if defined(c_plusplus) || defined(__cplusplus)
+}
+#endif
+
+EOF
+        # Only replace the header file if a) it doesn't previously
+        # exist, or b) the contents are different.  Do this to not
+        # trigger recompilation of certain .c files just because the
+        # timestamp changed on $outfile_real (similar to the way AC
+        # handles AC_CONFIG_HEADER files).
+        diff $outfile $outfile_real > /dev/null 2>&1
+        if test "$?" != "0"; then
+            mv $outfile $outfile_real
+        else
+            rm -f $outfile
+        fi
+    fi
+    rm -f $outfile.struct $outfile.extern
+
+    unset all_components static_components dso_components outfile outfile_real
+
+                                 MCA_pmix_FRAMEWORKS="$MCA_pmix_FRAMEWORKS pnet"
+                                 MCA_pmix_FRAMEWORKS_SUBDIRS="$MCA_pmix_FRAMEWORKS_SUBDIRS mca/pnet"
+                                 MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS="$MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS \$(MCA_pmix_pnet_ALL_SUBDIRS)"
+                                 MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS="$MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS \$(MCA_pmix_pnet_DSO_SUBDIRS)"
+                                 MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS="$MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS \$(MCA_pmix_pnet_STATIC_SUBDIRS)"
+                                 MCA_pmix_FRAMEWORK_LIBS="$MCA_pmix_FRAMEWORK_LIBS mca/pnet/libmca_pnet.la"
+                          MCA_pmix_FRAMEWORK_LIBS="$MCA_pmix_FRAMEWORK_LIBS \$(MCA_pmix_pnet_STATIC_LTLIBS)"
+
+    pmix_show_subsubtitle "Configuring MCA framework pnet"
+
+
+
+
+    # setup for framework
+    all_components=
+    static_components=
+    dso_components=
+    static_ltlibs=
+
+    # Ensure that the directory where the #include file is to live
+    # exists.  Need to do this for VPATH builds, because the directory
+    # may not exist yet.  For the "common" type, it's not really a
+    # component, so it doesn't have a base.
+    outdir=src/mca/pnet/base
+    as_dir=$outdir; as_fn_mkdir_p
+
+    # emit Makefile rule
+    ac_config_files="$ac_config_files src/mca/pnet/Makefile"
+
+
+    # remove any previously generated #include files
+    outfile_real=$outdir/static-components.h
+    outfile=$outfile_real.new
+    rm -f $outfile $outfile.struct $outfile.extern
+    touch $outfile.struct $outfile.extern
+
+    # print some nice messages about what we're about to do...
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for no configure components in framework pnet" >&5
+$as_echo_n "checking for no configure components in framework pnet... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+$as_echo "" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for m4 configure components in framework pnet" >&5
+$as_echo_n "checking for m4 configure components in framework pnet... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: opa" >&5
+$as_echo "opa" >&6; }
+
+    # If there are components in the no configure list, but we're
+    # doing one of the "special" selection logics, abort with a
+    # reasonable message.
+
+
+
+    # run the configure logic for the no-config components
+
+
+    # configure components that use built-in configuration scripts
+
+
+
+    best_mca_component_priority=0
+    components_looking_for_succeed=1
+    components_last_result=0
+
+
+    pmix_show_subsubsubtitle "MCA component pnet:opa (m4 configuration macro)"
+
+    pmix_show_verbose "PMIX_MCA_M4_CONFIG_COMPONENT: before, should_build=$components_looking_for_succeed"
+
+
+
+    component_path="$srcdir/src/mca/pnet/opa"
+    want_component=0
+
+    # build if:
+    # - the component type is direct and we are that component
+    # - there is no pmix_ignore file
+    # - there is an pmix_ignore, but there is an empty pmix_unignore
+    # - there is an pmix_ignore, but username is in pmix_unignore
+    if test -d $component_path ; then
+        # decide if we want the component to be built or not.  This
+        # is spread out because some of the logic is a little complex
+        # and test's syntax isn't exactly the greatest.  We want to
+        # build the component by default.
+        want_component=1
+        if test -f $component_path/.pmix_ignore ; then
+            # If there is an pmix_ignore file, don't build
+            # the component.  Note that this decision can be
+            # overridden by the unignore logic below.
+            want_component=0
+        fi
+        if test -f $component_path/.pmix_unignore ; then
+            # if there is an empty pmix_unignore, that is
+            # equivalent to having your userid in the unignore file.
+            # If userid is in the file, unignore the ignore file.
+            if test ! -s $component_path/.pmix_unignore ; then
+                want_component=1
+            elif test ! -z "`$GREP $PMIX_CONFIGURE_USER $component_path/.pmix_unignore`" ; then
+                want_component=1
+            fi
+        fi
+        # if this component type is direct and we are not it, we don't want
+        # to be built.  Otherwise, we do want to be built.
+        if test ! -z "$DIRECT_pnet" ; then
+            if test "$DIRECT_pnet" = "opa" ; then
+                want_component=1
+            else
+                want_component=0
+            fi
+        fi
+    fi
+
+    # if we were explicitly disabled, don't build :)
+    if test "$DISABLE_pnet" = "1"; then :
+  want_component=0
+fi
+    if test "$DISABLE_pnet_opa" = "1"; then :
+  want_component=0
+fi
+
+    if test "$want_component" = "1"; then :
+  should_build=$components_looking_for_succeed
+else
+  should_build=0
+fi
+
+    # Allow the component to override the build mode if it really wants to.
+    # It is, of course, free to end up calling MCA_COMPONENT_COMPILE_MODE
+
+    SHARED_FRAMEWORK="$DSO_pnet"
+    SHARED_COMPONENT="$DSO_pnet_opa"
+
+    STATIC_FRAMEWORK="$STATIC_pnet"
+    STATIC_COMPONENT="$STATIC_pnet_opa"
+
+    shared_mode_override=static
+
+    # Setup for either shared or static
+    if test "$STATIC_FRAMEWORK" = "1" || \
+       test "$STATIC_COMPONENT" = "1" || \
+       test "$STATIC_all" = "1" ; then
+        compile_mode="static"
+    elif test "$shared_mode_override" = "dso" || \
+         test "$SHARED_FRAMEWORK" = "1" || \
+         test "$SHARED_COMPONENT" = "1" || \
+         test "$DSO_all" = "1"; then
+        compile_mode="dso"
+    else
+        compile_mode="static"
+    fi
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MCA component pnet:opa compile mode" >&5
+$as_echo_n "checking for MCA component pnet:opa compile mode... " >&6; }
+    if test "$DIRECT_pnet" = "opa" ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $compile_mode - direct" >&5
+$as_echo "$compile_mode - direct" >&6; }
+    else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $compile_mode" >&5
+$as_echo "$compile_mode" >&6; }
+    fi
+
+
+    # try to configure the component
+
+    ac_config_files="$ac_config_files src/mca/pnet/opa/Makefile"
+
+
+
+    if test -z "$pmix_check_psm2_happy" ; then
+
+# Check whether --with-psm2 was given.
+if test "${with_psm2+set}" = set; then :
+  withval=$with_psm2;
+fi
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking --with-psm2 value" >&5
+$as_echo_n "checking --with-psm2 value... " >&6; }
+    if test "$with_psm2" = "yes" || test "$with_psm2" = "no" || test "x$with_psm2" = "x"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: simple ok (unspecified)" >&5
+$as_echo "simple ok (unspecified)" >&6; }
+else
+  if test ! -d "$with_psm2"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+                  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Directory $with_psm2 not found" >&5
+$as_echo "$as_me: WARNING: Directory $with_psm2 not found" >&2;}
+                  as_fn_error $? "Cannot continue" "$LINENO" 5
+else
+  if test "x`ls $with_psm2/include/psm2.h 2> /dev/null`" = "x"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+                         { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Expected file $with_psm2/include/psm2.h not found" >&5
+$as_echo "$as_me: WARNING: Expected file $with_psm2/include/psm2.h not found" >&2;}
+                         as_fn_error $? "Cannot continue" "$LINENO" 5
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: sanity check ok ($with_psm2)" >&5
+$as_echo "sanity check ok ($with_psm2)" >&6; }
+
+fi
+
+
+fi
+
+
+fi
+
+
+# Check whether --with-psm2-libdir was given.
+if test "${with_psm2_libdir+set}" = set; then :
+  withval=$with_psm2_libdir;
+fi
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking --with-psm2-libdir value" >&5
+$as_echo_n "checking --with-psm2-libdir value... " >&6; }
+    if test "$with_psm2_libdir" = "yes" || test "$with_psm2_libdir" = "no" || test "x$with_psm2_libdir" = "x"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: simple ok (unspecified)" >&5
+$as_echo "simple ok (unspecified)" >&6; }
+else
+  if test ! -d "$with_psm2_libdir"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+                  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Directory $with_psm2_libdir not found" >&5
+$as_echo "$as_me: WARNING: Directory $with_psm2_libdir not found" >&2;}
+                  as_fn_error $? "Cannot continue" "$LINENO" 5
+else
+  if test "x`ls $with_psm2_libdir/libpsm2.* 2> /dev/null`" = "x"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+                         { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Expected file $with_psm2_libdir/libpsm2.* not found" >&5
+$as_echo "$as_me: WARNING: Expected file $with_psm2_libdir/libpsm2.* not found" >&2;}
+                         as_fn_error $? "Cannot continue" "$LINENO" 5
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: sanity check ok ($with_psm2_libdir)" >&5
+$as_echo "sanity check ok ($with_psm2_libdir)" >&6; }
+
+fi
+
+
+fi
+
+
+fi
+
+
+	pmix_check_psm2_pnet_opa_save_CPPFLAGS="$CPPFLAGS"
+	pmix_check_psm2_pnet_opa_save_LDFLAGS="$LDFLAGS"
+	pmix_check_psm2_pnet_opa_save_LIBS="$LIBS"
+
+	if test "$with_psm2" != "no"; then :
+  if test ! -z "$with_psm2" && test "$with_psm2" != "yes"; then :
+  pmix_check_psm2_dir="$with_psm2"
+fi
+               if test ! -z "$with_psm2_libdir" && test "$with_psm2_libdir" != "yes"; then :
+  pmix_check_psm2_libdir="$with_psm2_libdir"
+fi
+
+
+    pmix_check_package_pmix_check_psm2_save_CPPFLAGS="$CPPFLAGS"
+    pmix_check_package_pmix_check_psm2_save_LDFLAGS="$LDFLAGS"
+    pmix_check_package_pmix_check_psm2_save_LIBS="$LIBS"
+
+    pmix_check_package_pmix_check_psm2_orig_CPPFLAGS="$pmix_check_psm2_CPPFLAGS"
+    pmix_check_package_pmix_check_psm2_orig_LDFLAGS="$pmix_check_psm2_LDFLAGS"
+    pmix_check_package_pmix_check_psm2_orig_LIBS="$pmix_check_psm2_LIBS"
+
+
+    # This is stolen from autoconf to peek under the covers to get the
+    # cache variable for the library check.  one should not copy this
+    # code into other places unless you want much pain and suffering
+
+
+    # so this sucks, but there's no way to get through the progression
+    # of header includes without killing off the cache variable and trying
+    # again...
+    unset ac_cv_header_psm2_h
+
+    pmix_check_package_header_happy="no"
+    if test "$pmix_check_psm2_dir" = "/usr" || test "$pmix_check_psm2_dir" = "/usr/local"; then :
+   # try as is...
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: looking for header without includes" >&5
+$as_echo "looking for header without includes" >&6; }
+            for ac_header in psm2.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "psm2.h" "ac_cv_header_psm2_h" "$ac_includes_default"
+if test "x$ac_cv_header_psm2_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_PSM2_H 1
+_ACEOF
+ pmix_check_package_header_happy="yes"
+fi
+
+done
+
+            if test "$pmix_check_package_header_happy" = "no"; then :
+  # no go on the as is - reset the cache and try again
+                   unset ac_cv_header_psm2_h
+fi
+fi
+
+    if test "$pmix_check_package_header_happy" = "no"; then :
+  if test "$pmix_check_psm2_dir" != ""; then :
+  pmix_check_psm2_CPPFLAGS="$pmix_check_psm2_CPPFLAGS -I$pmix_check_psm2_dir/include"
+                  CPPFLAGS="$CPPFLAGS -I$pmix_check_psm2_dir/include"
+fi
+          for ac_header in psm2.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "psm2.h" "ac_cv_header_psm2_h" "$ac_includes_default"
+if test "x$ac_cv_header_psm2_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_PSM2_H 1
+_ACEOF
+ pmix_check_package_header_happy="yes"
+fi
+
+done
+
+	  if test "$pmix_check_package_header_happy" = "yes"; then :
+
+    # This is stolen from autoconf to peek under the covers to get the
+    # cache variable for the library check.  one should not copy this
+    # code into other places unless you want much pain and suffering
+
+    # see comment above
+    unset ac_cv_lib_psm2_psm2_mq_irecv2
+    pmix_check_package_lib_happy="no"
+    if test "$pmix_check_psm2_libdir" != ""; then :
+   # libdir was specified - search only there
+           pmix_check_psm2_LDFLAGS="$pmix_check_psm2_LDFLAGS -L$pmix_check_psm2_libdir"
+           LDFLAGS="$LDFLAGS -L$pmix_check_psm2_libdir"
+           { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing psm2_mq_irecv2" >&5
+$as_echo_n "checking for library containing psm2_mq_irecv2... " >&6; }
+if ${ac_cv_search_psm2_mq_irecv2+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+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 psm2_mq_irecv2 ();
+int
+main ()
+{
+return psm2_mq_irecv2 ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' psm2; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_psm2_mq_irecv2=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_psm2_mq_irecv2+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_psm2_mq_irecv2+:} false; then :
+
+else
+  ac_cv_search_psm2_mq_irecv2=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_psm2_mq_irecv2" >&5
+$as_echo "$ac_cv_search_psm2_mq_irecv2" >&6; }
+ac_res=$ac_cv_search_psm2_mq_irecv2
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  pmix_check_package_lib_happy="yes"
+else
+  pmix_check_package_lib_happy="no"
+fi
+
+           if test "$pmix_check_package_lib_happy" = "no"; then :
+  LDFLAGS="$pmix_check_package_pmix_check_psm2_save_LDFLAGS"
+                  pmix_check_psm2_LDFLAGS="$pmix_check_package_pmix_check_psm2_orig_LDFLAGS"
+                  unset ac_cv_lib_psm2_psm2_mq_irecv2
+fi
+else
+   # libdir was not specified - go through search path
+           pmix_check_package_libdir="$pmix_check_psm2_dir"
+           if test "$pmix_check_package_libdir" = "" || test "$pmix_check_package_libdir" = "/usr" || test "$pmix_check_package_libdir" = "/usr/local"; then :
+   # try as is...
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: looking for library without search path" >&5
+$as_echo "looking for library without search path" >&6; }
+                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing psm2_mq_irecv2" >&5
+$as_echo_n "checking for library containing psm2_mq_irecv2... " >&6; }
+if ${ac_cv_search_psm2_mq_irecv2+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+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 psm2_mq_irecv2 ();
+int
+main ()
+{
+return psm2_mq_irecv2 ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' psm2; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_psm2_mq_irecv2=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_psm2_mq_irecv2+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_psm2_mq_irecv2+:} false; then :
+
+else
+  ac_cv_search_psm2_mq_irecv2=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_psm2_mq_irecv2" >&5
+$as_echo "$ac_cv_search_psm2_mq_irecv2" >&6; }
+ac_res=$ac_cv_search_psm2_mq_irecv2
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  pmix_check_package_lib_happy="yes"
+else
+  pmix_check_package_lib_happy="no"
+fi
+
+                if test "$pmix_check_package_lib_happy" = "no"; then :
+   # no go on the as is..  see what happens later...
+                     LDFLAGS="$pmix_check_package_pmix_check_psm2_save_LDFLAGS"
+                     pmix_check_psm2_LDFLAGS="$pmix_check_package_pmix_check_psm2_orig_LDFLAGS"
+                     unset ac_cv_lib_psm2_psm2_mq_irecv2
+fi
+fi
+
+           if test "$pmix_check_package_lib_happy" = "no"; then :
+  if test "$pmix_check_package_libdir" != ""; then :
+  pmix_check_psm2_LDFLAGS="$pmix_check_psm2_LDFLAGS -L$pmix_check_package_libdir/lib"
+                     LDFLAGS="$LDFLAGS -L$pmix_check_package_libdir/lib"
+                     { $as_echo "$as_me:${as_lineno-$LINENO}: result: looking for library in lib" >&5
+$as_echo "looking for library in lib" >&6; }
+                     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing psm2_mq_irecv2" >&5
+$as_echo_n "checking for library containing psm2_mq_irecv2... " >&6; }
+if ${ac_cv_search_psm2_mq_irecv2+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+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 psm2_mq_irecv2 ();
+int
+main ()
+{
+return psm2_mq_irecv2 ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' psm2; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_psm2_mq_irecv2=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_psm2_mq_irecv2+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_psm2_mq_irecv2+:} false; then :
+
+else
+  ac_cv_search_psm2_mq_irecv2=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_psm2_mq_irecv2" >&5
+$as_echo "$ac_cv_search_psm2_mq_irecv2" >&6; }
+ac_res=$ac_cv_search_psm2_mq_irecv2
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  pmix_check_package_lib_happy="yes"
+else
+  pmix_check_package_lib_happy="no"
+fi
+
+                     if test "$pmix_check_package_lib_happy" = "no"; then :
+   # no go on the as is..  see what happens later...
+                          LDFLAGS="$pmix_check_package_pmix_check_psm2_save_LDFLAGS"
+                          pmix_check_psm2_LDFLAGS="$pmix_check_package_pmix_check_psm2_orig_LDFLAGS"
+                          unset ac_cv_lib_psm2_psm2_mq_irecv2
+fi
+fi
+fi
+
+           if test "$pmix_check_package_lib_happy" = "no"; then :
+  if test "$pmix_check_package_libdir" != ""; then :
+  pmix_check_psm2_LDFLAGS="$pmix_check_psm2_LDFLAGS -L$pmix_check_package_libdir/lib64"
+                     LDFLAGS="$LDFLAGS -L$pmix_check_package_libdir/lib64"
+                     { $as_echo "$as_me:${as_lineno-$LINENO}: result: looking for library in lib64" >&5
+$as_echo "looking for library in lib64" >&6; }
+                     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing psm2_mq_irecv2" >&5
+$as_echo_n "checking for library containing psm2_mq_irecv2... " >&6; }
+if ${ac_cv_search_psm2_mq_irecv2+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+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 psm2_mq_irecv2 ();
+int
+main ()
+{
+return psm2_mq_irecv2 ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' psm2; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_psm2_mq_irecv2=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_psm2_mq_irecv2+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_psm2_mq_irecv2+:} false; then :
+
+else
+  ac_cv_search_psm2_mq_irecv2=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_psm2_mq_irecv2" >&5
+$as_echo "$ac_cv_search_psm2_mq_irecv2" >&6; }
+ac_res=$ac_cv_search_psm2_mq_irecv2
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  pmix_check_package_lib_happy="yes"
+else
+  pmix_check_package_lib_happy="no"
+fi
+
+                     if test "$pmix_check_package_lib_happy" = "no"; then :
+   # no go on the as is..  see what happens later...
+                          LDFLAGS="$pmix_check_package_pmix_check_psm2_save_LDFLAGS"
+                          pmix_check_psm2_LDFLAGS="$pmix_check_package_pmix_check_psm2_orig_LDFLAGS"
+                          unset ac_cv_lib_psm2_psm2_mq_irecv2
+fi
+fi
+fi
+fi
+
+    if test "$pmix_check_package_lib_happy" = "yes"; then :
+  pmix_check_psm2_LIBS="-lpsm2 "
+           pmix_check_package_happy="yes"
+else
+  pmix_check_package_happy="no"
+fi
+    if test "$pmix_check_package_lib_happy" = "yes"; then :
+   # The result of AC SEARCH_LIBS is cached in $ac_cv_search_[function]
+           if test "$ac_cv_search_psm2_mq_irecv2" != "no" &&
+                  test "$ac_cv_search_psm2_mq_irecv2" != "none required"; then :
+  pmix_check_psm2_LIBS="$ac_cv_search_psm2_mq_irecv2 "
+else
+  pmix_check_psm2_LIBS=""
+fi
+           pmix_check_package_happy="yes"
+else
+  pmix_check_package_happy="no"
+fi
+
+
+else
+  pmix_check_package_happy="no"
+fi
+else
+
+    # This is stolen from autoconf to peek under the covers to get the
+    # cache variable for the library check.  one should not copy this
+    # code into other places unless you want much pain and suffering
+
+    # see comment above
+    unset ac_cv_lib_psm2_psm2_mq_irecv2
+    pmix_check_package_lib_happy="no"
+    if test "$pmix_check_psm2_libdir" != ""; then :
+   # libdir was specified - search only there
+           pmix_check_psm2_LDFLAGS="$pmix_check_psm2_LDFLAGS -L$pmix_check_psm2_libdir"
+           LDFLAGS="$LDFLAGS -L$pmix_check_psm2_libdir"
+           { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing psm2_mq_irecv2" >&5
+$as_echo_n "checking for library containing psm2_mq_irecv2... " >&6; }
+if ${ac_cv_search_psm2_mq_irecv2+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+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 psm2_mq_irecv2 ();
+int
+main ()
+{
+return psm2_mq_irecv2 ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' psm2; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_psm2_mq_irecv2=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_psm2_mq_irecv2+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_psm2_mq_irecv2+:} false; then :
+
+else
+  ac_cv_search_psm2_mq_irecv2=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_psm2_mq_irecv2" >&5
+$as_echo "$ac_cv_search_psm2_mq_irecv2" >&6; }
+ac_res=$ac_cv_search_psm2_mq_irecv2
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  pmix_check_package_lib_happy="yes"
+else
+  pmix_check_package_lib_happy="no"
+fi
+
+           if test "$pmix_check_package_lib_happy" = "no"; then :
+  LDFLAGS="$pmix_check_package_pmix_check_psm2_save_LDFLAGS"
+                  pmix_check_psm2_LDFLAGS="$pmix_check_package_pmix_check_psm2_orig_LDFLAGS"
+                  unset ac_cv_lib_psm2_psm2_mq_irecv2
+fi
+else
+   # libdir was not specified - go through search path
+           pmix_check_package_libdir="$pmix_check_psm2_dir"
+           if test "$pmix_check_package_libdir" = "" || test "$pmix_check_package_libdir" = "/usr" || test "$pmix_check_package_libdir" = "/usr/local"; then :
+   # try as is...
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: looking for library without search path" >&5
+$as_echo "looking for library without search path" >&6; }
+                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing psm2_mq_irecv2" >&5
+$as_echo_n "checking for library containing psm2_mq_irecv2... " >&6; }
+if ${ac_cv_search_psm2_mq_irecv2+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+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 psm2_mq_irecv2 ();
+int
+main ()
+{
+return psm2_mq_irecv2 ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' psm2; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_psm2_mq_irecv2=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_psm2_mq_irecv2+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_psm2_mq_irecv2+:} false; then :
+
+else
+  ac_cv_search_psm2_mq_irecv2=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_psm2_mq_irecv2" >&5
+$as_echo "$ac_cv_search_psm2_mq_irecv2" >&6; }
+ac_res=$ac_cv_search_psm2_mq_irecv2
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  pmix_check_package_lib_happy="yes"
+else
+  pmix_check_package_lib_happy="no"
+fi
+
+                if test "$pmix_check_package_lib_happy" = "no"; then :
+   # no go on the as is..  see what happens later...
+                     LDFLAGS="$pmix_check_package_pmix_check_psm2_save_LDFLAGS"
+                     pmix_check_psm2_LDFLAGS="$pmix_check_package_pmix_check_psm2_orig_LDFLAGS"
+                     unset ac_cv_lib_psm2_psm2_mq_irecv2
+fi
+fi
+
+           if test "$pmix_check_package_lib_happy" = "no"; then :
+  if test "$pmix_check_package_libdir" != ""; then :
+  pmix_check_psm2_LDFLAGS="$pmix_check_psm2_LDFLAGS -L$pmix_check_package_libdir/lib"
+                     LDFLAGS="$LDFLAGS -L$pmix_check_package_libdir/lib"
+                     { $as_echo "$as_me:${as_lineno-$LINENO}: result: looking for library in lib" >&5
+$as_echo "looking for library in lib" >&6; }
+                     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing psm2_mq_irecv2" >&5
+$as_echo_n "checking for library containing psm2_mq_irecv2... " >&6; }
+if ${ac_cv_search_psm2_mq_irecv2+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+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 psm2_mq_irecv2 ();
+int
+main ()
+{
+return psm2_mq_irecv2 ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' psm2; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_psm2_mq_irecv2=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_psm2_mq_irecv2+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_psm2_mq_irecv2+:} false; then :
+
+else
+  ac_cv_search_psm2_mq_irecv2=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_psm2_mq_irecv2" >&5
+$as_echo "$ac_cv_search_psm2_mq_irecv2" >&6; }
+ac_res=$ac_cv_search_psm2_mq_irecv2
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  pmix_check_package_lib_happy="yes"
+else
+  pmix_check_package_lib_happy="no"
+fi
+
+                     if test "$pmix_check_package_lib_happy" = "no"; then :
+   # no go on the as is..  see what happens later...
+                          LDFLAGS="$pmix_check_package_pmix_check_psm2_save_LDFLAGS"
+                          pmix_check_psm2_LDFLAGS="$pmix_check_package_pmix_check_psm2_orig_LDFLAGS"
+                          unset ac_cv_lib_psm2_psm2_mq_irecv2
+fi
+fi
+fi
+
+           if test "$pmix_check_package_lib_happy" = "no"; then :
+  if test "$pmix_check_package_libdir" != ""; then :
+  pmix_check_psm2_LDFLAGS="$pmix_check_psm2_LDFLAGS -L$pmix_check_package_libdir/lib64"
+                     LDFLAGS="$LDFLAGS -L$pmix_check_package_libdir/lib64"
+                     { $as_echo "$as_me:${as_lineno-$LINENO}: result: looking for library in lib64" >&5
+$as_echo "looking for library in lib64" >&6; }
+                     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing psm2_mq_irecv2" >&5
+$as_echo_n "checking for library containing psm2_mq_irecv2... " >&6; }
+if ${ac_cv_search_psm2_mq_irecv2+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+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 psm2_mq_irecv2 ();
+int
+main ()
+{
+return psm2_mq_irecv2 ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' psm2; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_psm2_mq_irecv2=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_psm2_mq_irecv2+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_psm2_mq_irecv2+:} false; then :
+
+else
+  ac_cv_search_psm2_mq_irecv2=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_psm2_mq_irecv2" >&5
+$as_echo "$ac_cv_search_psm2_mq_irecv2" >&6; }
+ac_res=$ac_cv_search_psm2_mq_irecv2
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  pmix_check_package_lib_happy="yes"
+else
+  pmix_check_package_lib_happy="no"
+fi
+
+                     if test "$pmix_check_package_lib_happy" = "no"; then :
+   # no go on the as is..  see what happens later...
+                          LDFLAGS="$pmix_check_package_pmix_check_psm2_save_LDFLAGS"
+                          pmix_check_psm2_LDFLAGS="$pmix_check_package_pmix_check_psm2_orig_LDFLAGS"
+                          unset ac_cv_lib_psm2_psm2_mq_irecv2
+fi
+fi
+fi
+fi
+
+    if test "$pmix_check_package_lib_happy" = "yes"; then :
+  pmix_check_psm2_LIBS="-lpsm2 "
+           pmix_check_package_happy="yes"
+else
+  pmix_check_package_happy="no"
+fi
+    if test "$pmix_check_package_lib_happy" = "yes"; then :
+   # The result of AC SEARCH_LIBS is cached in $ac_cv_search_[function]
+           if test "$ac_cv_search_psm2_mq_irecv2" != "no" &&
+                  test "$ac_cv_search_psm2_mq_irecv2" != "none required"; then :
+  pmix_check_psm2_LIBS="$ac_cv_search_psm2_mq_irecv2 "
+else
+  pmix_check_psm2_LIBS=""
+fi
+           pmix_check_package_happy="yes"
+else
+  pmix_check_package_happy="no"
+fi
+
+
+fi
+    unset pmix_check_package_header_happy
+
+
+
+    if test "$pmix_check_package_happy" = "yes"; then :
+  pmix_check_psm2_happy="yes"
+else
+  pmix_check_psm2_CPPFLAGS="$pmix_check_package_pmix_check_psm2_orig_CPPFLAGS"
+           pmix_check_psm2_LDFLAGS="$pmix_check_package_pmix_check_psm2_orig_LDFLAGS"
+           pmix_check_psm2_LIBS="$pmix_check_package_pmix_check_psm2_orig_LIBS"
+           pmix_check_psm2_happy="no"
+fi
+
+    CPPFLAGS="$pmix_check_package_pmix_check_psm2_save_CPPFLAGS"
+    LDFLAGS="$pmix_check_package_pmix_check_psm2_save_LDFLAGS"
+    LIBS="$pmix_check_package_pmix_check_psm2_save_LIBS"
+
+else
+  pmix_check_psm2_happy="no"
+fi
+
+	CPPFLAGS="$pmix_check_psm2_pnet_opa_save_CPPFLAGS"
+	LDFLAGS="$pmix_check_psm2_pnet_opa_save_LDFLAGS"
+	LIBS="$pmix_check_psm2_pnet_opa_save_LIBS"
+
+	if test "$pmix_check_psm2_happy" = "yes" && test "$enable_progress_threads" = "yes"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PSM2 driver does not currently support progress threads.  Disabling MTL." >&5
+$as_echo "$as_me: WARNING: PSM2 driver does not currently support progress threads.  Disabling MTL." >&2;}
+               pmix_check_psm2_happy="no"
+fi
+
+        if test "$pmix_check_psm2_happy" = "yes"; then :
+  for ac_header in glob.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "glob.h" "ac_cv_header_glob_h" "$ac_includes_default"
+if test "x$ac_cv_header_glob_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_GLOB_H 1
+_ACEOF
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: glob.h not found.  Can not build component." >&5
+$as_echo "$as_me: WARNING: glob.h not found.  Can not build component." >&2;}
+               pmix_check_psm2_happy="no"
+fi
+
+done
+
+fi
+
+    fi
+
+    if test "$pmix_check_psm2_happy" = "yes"; then :
+  pnet_opa_LDFLAGS="$pnet_opa_LDFLAGS $pmix_check_psm2_LDFLAGS"
+	   pnet_opa_CPPFLAGS="$pnet_opa_CPPFLAGS $pmix_check_psm2_CPPFLAGS"
+	   pnet_opa_LIBS="$pnet_opa_LIBS $pmix_check_psm2_LIBS"
+	   pnet_opa_happy="yes"
+else
+  if test ! -z "$with_psm2" && test "$with_psm2" != "no"; then :
+  as_fn_error $? "PSM2 support requested but not found.  Aborting" "$LINENO" 5
+fi
+           pnet_opa_happy="no"
+fi
+
+
+    if test "$pnet_opa_happy" = "yes"; then :
+  should_build=$should_build
+else
+  should_build=0
+fi
+
+    # substitute in the things needed to build psm2
+
+
+
+
+
+    pmix_show_verbose "PMIX_MCA_M4_CONFIG_COMPONENT: after, should_build=$should_build"
+
+    if test "$should_build" = "1"; then :
+
+
+
+    # See if it dropped an output file for us to pick up some
+    # shell variables in.
+    infile="$srcdir/src/mca/pnet/opa/post_configure.sh"
+
+    # Add this subdir to the mast list of all MCA component subdirs
+    all_components="$all_components opa"
+
+    if test "$compile_mode" = "dso" ; then
+        dso_components="$dso_components opa"
+    else
+        if test "pnet" = "common"; then
+            # Static libraries in "common" frameworks are installed, and
+            # therefore must obey the $FRAMEWORK_LIB_PREFIX that was
+            # set.
+            static_ltlibs="mca/pnet/opa/lib${PMIX_LIB_PREFIX}mca_pnet_opa.la $static_ltlibs"
+        else
+            # Other frameworks do not have to obey the
+            # $FRAMEWORK_LIB_PREFIX prefix.
+            static_ltlibs="mca/pnet/opa/libmca_pnet_opa.la $static_ltlibs"
+        fi
+        echo "extern const pmix_mca_base_component_t mca_pnet_opa_component;" >> $outfile.extern
+        echo "  &mca_pnet_opa_component, " >> $outfile.struct
+        static_components="$static_components opa"
+    fi
+
+    # Output pretty results
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if MCA component pnet:opa can compile" >&5
+$as_echo_n "checking if MCA component pnet:opa can compile... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+                        if test -f $infile; then
+        # check for direct call header to include.  This will be
+        # AC_SUBSTed later.
+        if test "$DIRECT_pnet" = "opa" ; then
+            if test "`$GREP DIRECT_CALL_HEADER $infile`" != "" ; then
+                line="`$GREP DIRECT_CALL_HEADER $infile | cut -d= -f2-`"
+                str="MCA_pmix_pnet_DIRECT_CALL_HEADER=$line"
+                eval $str
+            else
+as_fn_error $? "*** pnet component opa was supposed to be direct-called, but
+*** does not appear to support direct calling.
+*** Aborting" "$LINENO" 5
+            fi
+        fi
+    else
+        # were we supposed to have found something in the
+        # post_configure.sh, but the file didn't exist?
+        if test "$DIRECT_pnet" = "opa" ; then
+as_fn_error $? "*** pnet component opa was supposed to be direct-called, but
+*** does not appear to support direct calling.
+*** Aborting" "$LINENO" 5
+        fi
+    fi
+
+    # if the component is building, add it's WRAPPER_EXTRA_LDFLAGS and
+    # WRAPPER_EXTRA_LIBS.  If the component doesn't specify it's
+    # WRAPPER_EXTRA_LIBS and WRAPPER_EXTRA_LDFLAGS, try using LDFLAGS and LIBS if
+    # component didn't have it's own configure script (in which case,
+    # we know it didn't set LDFLAGS and LIBS because it can't) Don't
+    # have to do this if the component is building dynamically,
+    # because it will link against these (without a dependency from
+    # libmpi.so to these flags)
+    if test "$compile_mode" = "static"; then
+        if test "$pnet_opa_WRAPPER_EXTRA_LDFLAGS" = ""; then :
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $pnet_opa_LDFLAGS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_ldflags}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_ldflags"; then :
+  mca_wrapper_extra_ldflags=$arg
+else
+  mca_wrapper_extra_ldflags="$mca_wrapper_extra_ldflags $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+else
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $pnet_opa_WRAPPER_EXTRA_LDFLAGS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_ldflags}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_ldflags"; then :
+  mca_wrapper_extra_ldflags=$arg
+else
+  mca_wrapper_extra_ldflags="$mca_wrapper_extra_ldflags $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+fi
+                        if test "$pnet_opa_WRAPPER_EXTRA_LIBS" = ""; then :
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $pnet_opa_LIBS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_libs}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_libs"; then :
+  mca_wrapper_extra_libs=$arg
+else
+  mca_wrapper_extra_libs="$mca_wrapper_extra_libs $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+else
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $pnet_opa_WRAPPER_EXTRA_LIBS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_libs}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_libs"; then :
+  mca_wrapper_extra_libs=$arg
+else
+  mca_wrapper_extra_libs="$mca_wrapper_extra_libs $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+fi
+
+    fi
+
+    # if needed, copy over WRAPPER_EXTRA_CPPFLAGS.  Since a configure script
+    # component can never be used in a STOP_AT_FIRST framework, we
+    # don't have to implement the else clause in the literal check...
+    if test "$pnet_opa_WRAPPER_EXTRA_CPPFLAGS" != ""; then :
+  stop_at_first=0
+            if test "$compile_mode" = "static" && test "$stop_at_first" = "1"; then :
+  if test "$with_devel_headers" = "yes"; then :
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $pnet_opa_WRAPPER_EXTRA_CPPFLAGS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_cppflags}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_cppflags"; then :
+  mca_wrapper_extra_cppflags=$arg
+else
+  mca_wrapper_extra_cppflags="$mca_wrapper_extra_cppflags $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+fi
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ignoring pnet_opa_WRAPPER_EXTRA_CPPFLAGS ($pnet_opa_WRAPPER_EXTRA_CPPFLAGS): component conditions not met" >&5
+$as_echo "$as_me: WARNING: ignoring pnet_opa_WRAPPER_EXTRA_CPPFLAGS ($pnet_opa_WRAPPER_EXTRA_CPPFLAGS): component conditions not met" >&2;}
+fi
+fi
+
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if MCA component pnet:opa can compile" >&5
+$as_echo_n "checking if MCA component pnet:opa can compile... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+    # If this component was requested as the default for this
+    # type, then abort.
+    if test "$with_pnet" = "opa" ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MCA component \"opa\" failed to configure properly" >&5
+$as_echo "$as_me: WARNING: MCA component \"opa\" failed to configure properly" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This component was selected as the default" >&5
+$as_echo "$as_me: WARNING: This component was selected as the default" >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    if test ! -z "$DIRECT_pnet" ; then
+        if test "$DIRECT_pnet" = "opa" ; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MCA component \"opa\" failed to configure properly" >&5
+$as_echo "$as_me: WARNING: MCA component \"opa\" failed to configure properly" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This component was selected as the default (direct call)" >&5
+$as_echo "$as_me: WARNING: This component was selected as the default (direct call)" >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    fi
+
+           # add component to all component list
+           all_components="$all_components opa"
+fi
+
+
+
+    # set the AM_CONDITIONAL on how we should build
+    if test "$compile_mode" = "dso"; then :
+  BUILD_pmix_pnet_opa_DSO=1
+else
+  BUILD_pmix_pnet_opa_DSO=0
+fi
+     if test "$BUILD_pmix_pnet_opa_DSO" = "1"; then
+  MCA_BUILD_pmix_pnet_opa_DSO_TRUE=
+  MCA_BUILD_pmix_pnet_opa_DSO_FALSE='#'
+else
+  MCA_BUILD_pmix_pnet_opa_DSO_TRUE='#'
+  MCA_BUILD_pmix_pnet_opa_DSO_FALSE=
+fi
+
+
+    if test "$should_build" = "1"; then :
+  components_last_result=1
+else
+  components_last_result=0
+fi
+
+    unset compile_mode
+
+
+
+
+
+    # configure components that provide their own configure script.
+    # It would be really hard to run these for "find first that
+    # works", so we don't :)
+
+
+
+                  if test "1" != "0"; then :
+
+    for component_path in $srcdir/src/mca/pnet/* ; do
+        component="`basename $component_path`"
+        if test -d $component_path && test -x $component_path/configure ; then
+            pmix_show_subsubsubtitle "MCA component pnet:$component (need to configure)"
+
+            pmix_show_verbose "PMIX_MCA_ALL_CONFIG_COMPONENTS: before, should_build="
+
+
+
+    component_path="$srcdir/src/mca/pnet/$component"
+    want_component=0
+
+    # build if:
+    # - the component type is direct and we are that component
+    # - there is no pmix_ignore file
+    # - there is an pmix_ignore, but there is an empty pmix_unignore
+    # - there is an pmix_ignore, but username is in pmix_unignore
+    if test -d $component_path ; then
+        # decide if we want the component to be built or not.  This
+        # is spread out because some of the logic is a little complex
+        # and test's syntax isn't exactly the greatest.  We want to
+        # build the component by default.
+        want_component=1
+        if test -f $component_path/.pmix_ignore ; then
+            # If there is an pmix_ignore file, don't build
+            # the component.  Note that this decision can be
+            # overridden by the unignore logic below.
+            want_component=0
+        fi
+        if test -f $component_path/.pmix_unignore ; then
+            # if there is an empty pmix_unignore, that is
+            # equivalent to having your userid in the unignore file.
+            # If userid is in the file, unignore the ignore file.
+            if test ! -s $component_path/.pmix_unignore ; then
+                want_component=1
+            elif test ! -z "`$GREP $PMIX_CONFIGURE_USER $component_path/.pmix_unignore`" ; then
+                want_component=1
+            fi
+        fi
+        # if this component type is direct and we are not it, we don't want
+        # to be built.  Otherwise, we do want to be built.
+        if test ! -z "$DIRECT_pnet" ; then
+            if test "$DIRECT_pnet" = "$component" ; then
+                want_component=1
+            else
+                want_component=0
+            fi
+        fi
+    fi
+
+    # if we were explicitly disabled, don't build :)
+    if test "$DISABLE_pnet" = "1"; then :
+  want_component=0
+fi
+    str="DISABLED_COMPONENT_CHECK=\$DISABLE_pnet_$component"
+         eval $str
+         if test "$DISABLED_COMPONENT_CHECK" = "1" ; then
+             want_component=0
+         fi
+
+    if test "$want_component" = "1"; then :
+  should_build=1
+else
+  should_build=0
+fi
+
+
+    SHARED_FRAMEWORK="$DSO_pnet"
+    str="SHARED_COMPONENT=\$DSO_pnet_$component"
+         eval $str
+
+    STATIC_FRAMEWORK="$STATIC_pnet"
+    str="STATIC_COMPONENT=\$STATIC_pnet_$component"
+         eval $str
+
+    shared_mode_override=static
+
+    # Setup for either shared or static
+    if test "$STATIC_FRAMEWORK" = "1" || \
+       test "$STATIC_COMPONENT" = "1" || \
+       test "$STATIC_all" = "1" ; then
+        compile_mode="static"
+    elif test "$shared_mode_override" = "dso" || \
+         test "$SHARED_FRAMEWORK" = "1" || \
+         test "$SHARED_COMPONENT" = "1" || \
+         test "$DSO_all" = "1"; then
+        compile_mode="dso"
+    else
+        compile_mode="static"
+    fi
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MCA component pnet:$component compile mode" >&5
+$as_echo_n "checking for MCA component pnet:$component compile mode... " >&6; }
+    if test "$DIRECT_pnet" = "$component" ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $compile_mode - direct" >&5
+$as_echo "$compile_mode - direct" >&6; }
+    else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $compile_mode" >&5
+$as_echo "$compile_mode" >&6; }
+    fi
+
+            pmix_show_verbose "PMIX_MCA_ALL_CONFIG_COMPONENTS: after, should_build=$should_build"
+
+            if test "$should_build" = "1" ; then
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in subdir_parent sub_configure subdir_dir subdir_srcdir subdir_cache_file subdir_args subdir_dots total_dir dir_part temp; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"subdir_parent sub_configure subdir_dir subdir_srcdir subdir_cache_file subdir_args subdir_dots total_dir dir_part temp\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+#
+# Invoke configure in a specific subdirectory.
+#
+# src/mca/pnet/$component is the directory to invoke in
+# $pmix_subdir_args is the list of arguments to pass
+# should_build=1 is actions to execute upon success
+# should_build=0 is actions to execute upon failure
+#
+subdir_dir="src/mca/pnet/$component"
+subdir_args="$pmix_subdir_args"
+subdir_success="should_build=1"
+subdir_failure="should_build=0"
+
+#
+# Sanity checks
+#
+
+if test "$subdir_dir" != ":" && test -d $srcdir/$subdir_dir; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: PMIX configuring in $subdir_dir" >&5
+$as_echo "$as_me: PMIX configuring in $subdir_dir" >&6;}
+
+    #
+    # Gotta check where srcdir is for VPATH builds.  If srcdir is not
+    # ., then we need to mkdir the subdir.  Otherwise, we can just cd
+    # into it.
+    #
+
+    case $srcdir in
+    .)
+	;;
+    *)
+	{ case $subdir_dir in
+	[\\/]* | ?:[\\/]* ) total_dir=;;
+	*)                      total_dir=.;;
+	esac
+	temp=$subdir_dir
+	for dir_part in `IFS='/\\'; set X $temp; shift; echo "$@"`; do
+	    case $dir_part in
+	    # Skip DOS drivespec
+	    ?:) total_dir=$dir_part ;;
+	    *)  total_dir=$total_dir/$dir_part
+		test -d "$total_dir" ||
+		mkdir "$total_dir" ||
+		as_fn_error $? "cannot create $subdir_dir" "$LINENO" 5
+		;;
+	    esac
+	done; }
+
+	if test -d ./$subdir_dir; then :;
+	else
+	    as_fn_error $? "cannot create \`pwd\`/$subdir_dir" "$LINENO" 5
+	fi
+	;;
+    esac
+
+    #
+    # Move into the target directory
+    #
+
+    subdir_parent=`pwd`
+    cd $subdir_dir
+
+    #
+    # Make a "../" for each directory in $subdir_dir.
+    #
+
+    subdir_dots=`echo $subdir_dir | sed 's,^\./,,;s,[^/]$,&/,;s,[^/]*/,../,g'`
+    #
+    # Construct the --srcdir argument
+    #
+
+    case $srcdir in
+    .)
+	# In place
+	subdir_srcdir="$srcdir"
+	;;
+    [\\/]* | ?:[\\/]* )
+	# Absolute path
+	subdir_srcdir="$srcdir/$subdir_dir"
+	;;
+    *)
+	# Relative path
+	subdir_srcdir="$subdir_dots$srcdir/$subdir_dir"
+	;;
+    esac
+
+    #
+    # Construct the --cache-file argument
+    #
+
+    # BWB - subdir caching is a pain since we change CFLAGS and all that.
+    # Just disable it for now
+    subdir_cache_file="/dev/null"
+
+    #
+    # Invoke the configure script in the subdirectory
+    #
+
+    sub_configure="$SHELL '$subdir_srcdir/configure'"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: running $sub_configure $subdir_args --cache-file=$subdir_cache_file --srcdir=$subdir_srcdir --disable-option-checking" >&5
+$as_echo "$as_me: running $sub_configure $subdir_args --cache-file=$subdir_cache_file --srcdir=$subdir_srcdir --disable-option-checking" >&6;}
+    eval "$sub_configure $subdir_args \
+	--cache-file=\"\$subdir_cache_file\" --srcdir=\"$subdir_srcdir\" --disable-option-checking"
+    if test "$?" = "0"; then
+	eval $subdir_success
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: $sub_configure succeeded for $subdir_dir" >&5
+$as_echo "$as_me: $sub_configure succeeded for $subdir_dir" >&6;}
+    else
+	eval $subdir_failure
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: $sub_configure *failed* for $subdir_dir" >&5
+$as_echo "$as_me: $sub_configure *failed* for $subdir_dir" >&6;}
+    fi
+
+    #
+    # Go back to the topdir
+    #
+
+    cd $subdir_parent
+fi
+
+#
+# Clean up
+#
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+                pmix_show_verbose "PMIX_MCA_ALL_CONFIG_COMPONENTS: after subdir, should_build=$should_build"
+            fi
+
+            if test "$should_build" = "1" ; then
+                # do some extra work to pass flags back from the
+                # top-level configure, the way a configure.m4
+                # component would.
+                infile="$srcdir/src/mca/pnet/all_components/post_configure.sh"
+                if test -f $infile; then
+
+                    # First check for the ABORT tag
+                    line="`$GREP ABORT= $infile | cut -d= -f2-`"
+                    if test -n "$line" && test "$line" != "no"; then
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MCA component configure script told me to abort" >&5
+$as_echo "$as_me: WARNING: MCA component configure script told me to abort" >&2;}
+                        as_fn_error $? "cannot continue" "$LINENO" 5
+                    fi
+
+                    line="`$GREP WRAPPER_EXTRA_LDFLAGS= $infile | cut -d= -f2-`"
+                            eval "line=$line"
+                            if test -n "$line"; then
+                                all_components_static_components_WRAPPER_EXTRA_LDFLAGS="$line"
+                            fi
+                        line="`$GREP WRAPPER_EXTRA_LIBS= $infile | cut -d= -f2-`"
+                            eval "line=$line"
+                            if test -n "$line"; then
+                                all_components_static_components_WRAPPER_EXTRA_LIBS="$line"
+                            fi
+                                        fi
+
+
+
+
+    # See if it dropped an output file for us to pick up some
+    # shell variables in.
+    infile="$srcdir/src/mca/pnet/$component/post_configure.sh"
+
+    # Add this subdir to the mast list of all MCA component subdirs
+    all_components="$all_components $component"
+
+    if test "$compile_mode" = "dso" ; then
+        dso_components="$dso_components $component"
+    else
+        if test "pnet" = "common"; then
+            # Static libraries in "common" frameworks are installed, and
+            # therefore must obey the $FRAMEWORK_LIB_PREFIX that was
+            # set.
+            static_ltlibs="mca/pnet/$component/lib${PMIX_LIB_PREFIX}mca_pnet_$component.la $static_ltlibs"
+        else
+            # Other frameworks do not have to obey the
+            # $FRAMEWORK_LIB_PREFIX prefix.
+            static_ltlibs="mca/pnet/$component/libmca_pnet_$component.la $static_ltlibs"
+        fi
+        echo "extern const pmix_mca_base_component_t mca_pnet_$component_component;" >> $outfile.extern
+        echo "  &mca_pnet_$component_component, " >> $outfile.struct
+        static_components="$static_components $component"
+    fi
+
+    # Output pretty results
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if MCA component pnet:$component can compile" >&5
+$as_echo_n "checking if MCA component pnet:$component can compile... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+                        if test -f $infile; then
+        # check for direct call header to include.  This will be
+        # AC_SUBSTed later.
+        if test "$DIRECT_pnet" = "$component" ; then
+            if test "`$GREP DIRECT_CALL_HEADER $infile`" != "" ; then
+                line="`$GREP DIRECT_CALL_HEADER $infile | cut -d= -f2-`"
+                str="MCA_pmix_pnet_DIRECT_CALL_HEADER=$line"
+                eval $str
+            else
+as_fn_error $? "*** pnet component $component was supposed to be direct-called, but
+*** does not appear to support direct calling.
+*** Aborting" "$LINENO" 5
+            fi
+        fi
+    else
+        # were we supposed to have found something in the
+        # post_configure.sh, but the file didn't exist?
+        if test "$DIRECT_pnet" = "$component" ; then
+as_fn_error $? "*** pnet component $component was supposed to be direct-called, but
+*** does not appear to support direct calling.
+*** Aborting" "$LINENO" 5
+        fi
+    fi
+
+    # if the component is building, add it's WRAPPER_EXTRA_LDFLAGS and
+    # WRAPPER_EXTRA_LIBS.  If the component doesn't specify it's
+    # WRAPPER_EXTRA_LIBS and WRAPPER_EXTRA_LDFLAGS, try using LDFLAGS and LIBS if
+    # component didn't have it's own configure script (in which case,
+    # we know it didn't set LDFLAGS and LIBS because it can't) Don't
+    # have to do this if the component is building dynamically,
+    # because it will link against these (without a dependency from
+    # libmpi.so to these flags)
+    if test "$compile_mode" = "static"; then
+        str="line=\$pnet_$component_WRAPPER_EXTRA_LDFLAGS"
+                      eval "$str"
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $line; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_ldflags}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_ldflags"; then :
+  mca_wrapper_extra_ldflags=$arg
+else
+  mca_wrapper_extra_ldflags="$mca_wrapper_extra_ldflags $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+str="line=\$pnet_$component_WRAPPER_EXTRA_LIBS"
+                      eval "$str"
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $line; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_libs}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_libs"; then :
+  mca_wrapper_extra_libs=$arg
+else
+  mca_wrapper_extra_libs="$mca_wrapper_extra_libs $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+    fi
+
+    # if needed, copy over WRAPPER_EXTRA_CPPFLAGS.  Since a configure script
+    # component can never be used in a STOP_AT_FIRST framework, we
+    # don't have to implement the else clause in the literal check...
+
+
+            else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if MCA component pnet:$component can compile" >&5
+$as_echo_n "checking if MCA component pnet:$component can compile... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+    # If this component was requested as the default for this
+    # type, then abort.
+    if test "$with_pnet" = "$component" ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MCA component \"$component\" failed to configure properly" >&5
+$as_echo "$as_me: WARNING: MCA component \"$component\" failed to configure properly" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This component was selected as the default" >&5
+$as_echo "$as_me: WARNING: This component was selected as the default" >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    if test ! -z "$DIRECT_pnet" ; then
+        if test "$DIRECT_pnet" = "$component" ; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MCA component \"$component\" failed to configure properly" >&5
+$as_echo "$as_me: WARNING: MCA component \"$component\" failed to configure properly" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This component was selected as the default (direct call)" >&5
+$as_echo "$as_me: WARNING: This component was selected as the default (direct call)" >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    fi
+
+            fi
+        fi
+    done
+
+fi
+
+    MCA_pmix_pnet_ALL_COMPONENTS="$all_components"
+    MCA_pmix_pnet_STATIC_COMPONENTS="$static_components"
+    MCA_pmix_pnet_DSO_COMPONENTS="$dso_components"
+    MCA_pmix_pnet_STATIC_LTLIBS="$static_ltlibs"
+
+
+
+
+
+
+
+    MCA_pmix_pnet_ALL_SUBDIRS=
+    for item in $all_components ; do
+       MCA_pmix_pnet_ALL_SUBDIRS="$MCA_pmix_pnet_ALL_SUBDIRS mca/pnet/$item"
+    done
+
+
+
+    MCA_pmix_pnet_STATIC_SUBDIRS=
+    for item in $static_components ; do
+       MCA_pmix_pnet_STATIC_SUBDIRS="$MCA_pmix_pnet_STATIC_SUBDIRS mca/pnet/$item"
+    done
+
+
+
+    MCA_pmix_pnet_DSO_SUBDIRS=
+    for item in $dso_components ; do
+       MCA_pmix_pnet_DSO_SUBDIRS="$MCA_pmix_pnet_DSO_SUBDIRS mca/pnet/$item"
+    done
+
+
+
+    # Create the final .h file that will be included in the type's
+    # top-level glue.  This lists all the static components.  We don't
+    # need to do this for "common".
+    if test "1" != "common"; then
+        cat > $outfile <<EOF
+/*
+ * \$HEADER\$
+ */
+#if defined(c_plusplus) || defined(__cplusplus)
+extern "C" {
+#endif
+
+`cat $outfile.extern`
+
+const pmix_mca_base_component_t *mca_pnet_base_static_components[] = {
+`cat $outfile.struct`
+  NULL
+};
+
+#if defined(c_plusplus) || defined(__cplusplus)
+}
+#endif
+
+EOF
+        # Only replace the header file if a) it doesn't previously
+        # exist, or b) the contents are different.  Do this to not
+        # trigger recompilation of certain .c files just because the
+        # timestamp changed on $outfile_real (similar to the way AC
+        # handles AC_CONFIG_HEADER files).
+        diff $outfile $outfile_real > /dev/null 2>&1
+        if test "$?" != "0"; then
+            mv $outfile $outfile_real
+        else
+            rm -f $outfile
+        fi
+    fi
+    rm -f $outfile.struct $outfile.extern
+
+    unset all_components static_components dso_components outfile outfile_real
+
+                                 MCA_pmix_FRAMEWORKS="$MCA_pmix_FRAMEWORKS psec"
+                                 MCA_pmix_FRAMEWORKS_SUBDIRS="$MCA_pmix_FRAMEWORKS_SUBDIRS mca/psec"
+                                 MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS="$MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS \$(MCA_pmix_psec_ALL_SUBDIRS)"
+                                 MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS="$MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS \$(MCA_pmix_psec_DSO_SUBDIRS)"
+                                 MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS="$MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS \$(MCA_pmix_psec_STATIC_SUBDIRS)"
+                                 MCA_pmix_FRAMEWORK_LIBS="$MCA_pmix_FRAMEWORK_LIBS mca/psec/libmca_psec.la"
+                          MCA_pmix_FRAMEWORK_LIBS="$MCA_pmix_FRAMEWORK_LIBS \$(MCA_pmix_psec_STATIC_LTLIBS)"
+
+    pmix_show_subsubtitle "Configuring MCA framework psec"
+
+
+
+
+    # setup for framework
+    all_components=
+    static_components=
+    dso_components=
+    static_ltlibs=
+
+    # Ensure that the directory where the #include file is to live
+    # exists.  Need to do this for VPATH builds, because the directory
+    # may not exist yet.  For the "common" type, it's not really a
+    # component, so it doesn't have a base.
+    outdir=src/mca/psec/base
+    as_dir=$outdir; as_fn_mkdir_p
+
+    # emit Makefile rule
+    ac_config_files="$ac_config_files src/mca/psec/Makefile"
+
+
+    # remove any previously generated #include files
+    outfile_real=$outdir/static-components.h
+    outfile=$outfile_real.new
+    rm -f $outfile $outfile.struct $outfile.extern
+    touch $outfile.struct $outfile.extern
+
+    # print some nice messages about what we're about to do...
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for no configure components in framework psec" >&5
+$as_echo_n "checking for no configure components in framework psec... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: native, none" >&5
+$as_echo "native, none" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for m4 configure components in framework psec" >&5
+$as_echo_n "checking for m4 configure components in framework psec... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: munge" >&5
+$as_echo "munge" >&6; }
+
+    # If there are components in the no configure list, but we're
+    # doing one of the "special" selection logics, abort with a
+    # reasonable message.
+
+
+
+    # run the configure logic for the no-config components
+
+    pmix_show_subsubsubtitle "MCA component psec:native (no configuration)"
+
+    pmix_show_verbose "PMIX_MCA_NO_CONFIG_COMPONENT: before, should_build=1"
+
+
+
+    component_path="$srcdir/src/mca/psec/native"
+    want_component=0
+
+    # build if:
+    # - the component type is direct and we are that component
+    # - there is no pmix_ignore file
+    # - there is an pmix_ignore, but there is an empty pmix_unignore
+    # - there is an pmix_ignore, but username is in pmix_unignore
+    if test -d $component_path ; then
+        # decide if we want the component to be built or not.  This
+        # is spread out because some of the logic is a little complex
+        # and test's syntax isn't exactly the greatest.  We want to
+        # build the component by default.
+        want_component=1
+        if test -f $component_path/.pmix_ignore ; then
+            # If there is an pmix_ignore file, don't build
+            # the component.  Note that this decision can be
+            # overridden by the unignore logic below.
+            want_component=0
+        fi
+        if test -f $component_path/.pmix_unignore ; then
+            # if there is an empty pmix_unignore, that is
+            # equivalent to having your userid in the unignore file.
+            # If userid is in the file, unignore the ignore file.
+            if test ! -s $component_path/.pmix_unignore ; then
+                want_component=1
+            elif test ! -z "`$GREP $PMIX_CONFIGURE_USER $component_path/.pmix_unignore`" ; then
+                want_component=1
+            fi
+        fi
+        # if this component type is direct and we are not it, we don't want
+        # to be built.  Otherwise, we do want to be built.
+        if test ! -z "$DIRECT_psec" ; then
+            if test "$DIRECT_psec" = "native" ; then
+                want_component=1
+            else
+                want_component=0
+            fi
+        fi
+    fi
+
+    # if we were explicitly disabled, don't build :)
+    if test "$DISABLE_psec" = "1"; then :
+  want_component=0
+fi
+    if test "$DISABLE_psec_native" = "1"; then :
+  want_component=0
+fi
+
+    if test "$want_component" = "1"; then :
+  should_build=1
+else
+  should_build=0
+fi
+
+
+    SHARED_FRAMEWORK="$DSO_psec"
+    SHARED_COMPONENT="$DSO_psec_native"
+
+    STATIC_FRAMEWORK="$STATIC_psec"
+    STATIC_COMPONENT="$STATIC_psec_native"
+
+    shared_mode_override=static
+
+    # Setup for either shared or static
+    if test "$STATIC_FRAMEWORK" = "1" || \
+       test "$STATIC_COMPONENT" = "1" || \
+       test "$STATIC_all" = "1" ; then
+        compile_mode="static"
+    elif test "$shared_mode_override" = "dso" || \
+         test "$SHARED_FRAMEWORK" = "1" || \
+         test "$SHARED_COMPONENT" = "1" || \
+         test "$DSO_all" = "1"; then
+        compile_mode="dso"
+    else
+        compile_mode="static"
+    fi
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MCA component psec:native compile mode" >&5
+$as_echo_n "checking for MCA component psec:native compile mode... " >&6; }
+    if test "$DIRECT_psec" = "native" ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $compile_mode - direct" >&5
+$as_echo "$compile_mode - direct" >&6; }
+    else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $compile_mode" >&5
+$as_echo "$compile_mode" >&6; }
+    fi
+
+    pmix_show_verbose "PMIX_MCA_NO_CONFIG_COMPONENT: after, should_build=$should_build"
+
+    if test "$should_build" = "1" ; then
+
+
+
+    # See if it dropped an output file for us to pick up some
+    # shell variables in.
+    infile="$srcdir/src/mca/psec/native/post_configure.sh"
+
+    # Add this subdir to the mast list of all MCA component subdirs
+    all_components="$all_components native"
+
+    if test "$compile_mode" = "dso" ; then
+        dso_components="$dso_components native"
+    else
+        if test "psec" = "common"; then
+            # Static libraries in "common" frameworks are installed, and
+            # therefore must obey the $FRAMEWORK_LIB_PREFIX that was
+            # set.
+            static_ltlibs="mca/psec/native/lib${PMIX_LIB_PREFIX}mca_psec_native.la $static_ltlibs"
+        else
+            # Other frameworks do not have to obey the
+            # $FRAMEWORK_LIB_PREFIX prefix.
+            static_ltlibs="mca/psec/native/libmca_psec_native.la $static_ltlibs"
+        fi
+        echo "extern const pmix_mca_base_component_t mca_psec_native_component;" >> $outfile.extern
+        echo "  &mca_psec_native_component, " >> $outfile.struct
+        static_components="$static_components native"
+    fi
+
+    # Output pretty results
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if MCA component psec:native can compile" >&5
+$as_echo_n "checking if MCA component psec:native can compile... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+                        if test -f $infile; then
+        # check for direct call header to include.  This will be
+        # AC_SUBSTed later.
+        if test "$DIRECT_psec" = "native" ; then
+            if test "`$GREP DIRECT_CALL_HEADER $infile`" != "" ; then
+                line="`$GREP DIRECT_CALL_HEADER $infile | cut -d= -f2-`"
+                str="MCA_pmix_psec_DIRECT_CALL_HEADER=$line"
+                eval $str
+            else
+as_fn_error $? "*** psec component native was supposed to be direct-called, but
+*** does not appear to support direct calling.
+*** Aborting" "$LINENO" 5
+            fi
+        fi
+    else
+        # were we supposed to have found something in the
+        # post_configure.sh, but the file didn't exist?
+        if test "$DIRECT_psec" = "native" ; then
+as_fn_error $? "*** psec component native was supposed to be direct-called, but
+*** does not appear to support direct calling.
+*** Aborting" "$LINENO" 5
+        fi
+    fi
+
+    # if the component is building, add it's WRAPPER_EXTRA_LDFLAGS and
+    # WRAPPER_EXTRA_LIBS.  If the component doesn't specify it's
+    # WRAPPER_EXTRA_LIBS and WRAPPER_EXTRA_LDFLAGS, try using LDFLAGS and LIBS if
+    # component didn't have it's own configure script (in which case,
+    # we know it didn't set LDFLAGS and LIBS because it can't) Don't
+    # have to do this if the component is building dynamically,
+    # because it will link against these (without a dependency from
+    # libmpi.so to these flags)
+    if test "$compile_mode" = "static"; then
+        if test "$psec_native_WRAPPER_EXTRA_LDFLAGS" = ""; then :
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $psec_native_LDFLAGS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_ldflags}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_ldflags"; then :
+  mca_wrapper_extra_ldflags=$arg
+else
+  mca_wrapper_extra_ldflags="$mca_wrapper_extra_ldflags $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+else
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $psec_native_WRAPPER_EXTRA_LDFLAGS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_ldflags}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_ldflags"; then :
+  mca_wrapper_extra_ldflags=$arg
+else
+  mca_wrapper_extra_ldflags="$mca_wrapper_extra_ldflags $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+fi
+                        if test "$psec_native_WRAPPER_EXTRA_LIBS" = ""; then :
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $psec_native_LIBS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_libs}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_libs"; then :
+  mca_wrapper_extra_libs=$arg
+else
+  mca_wrapper_extra_libs="$mca_wrapper_extra_libs $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+else
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $psec_native_WRAPPER_EXTRA_LIBS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_libs}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_libs"; then :
+  mca_wrapper_extra_libs=$arg
+else
+  mca_wrapper_extra_libs="$mca_wrapper_extra_libs $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+fi
+
+    fi
+
+    # if needed, copy over WRAPPER_EXTRA_CPPFLAGS.  Since a configure script
+    # component can never be used in a STOP_AT_FIRST framework, we
+    # don't have to implement the else clause in the literal check...
+    if test "$psec_native_WRAPPER_EXTRA_CPPFLAGS" != ""; then :
+  stop_at_first=0
+            if test "$compile_mode" = "static" && test "$stop_at_first" = "1"; then :
+  if test "$with_devel_headers" = "yes"; then :
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $psec_native_WRAPPER_EXTRA_CPPFLAGS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_cppflags}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_cppflags"; then :
+  mca_wrapper_extra_cppflags=$arg
+else
+  mca_wrapper_extra_cppflags="$mca_wrapper_extra_cppflags $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+fi
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ignoring psec_native_WRAPPER_EXTRA_CPPFLAGS ($psec_native_WRAPPER_EXTRA_CPPFLAGS): component conditions not met" >&5
+$as_echo "$as_me: WARNING: ignoring psec_native_WRAPPER_EXTRA_CPPFLAGS ($psec_native_WRAPPER_EXTRA_CPPFLAGS): component conditions not met" >&2;}
+fi
+fi
+
+    else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if MCA component psec:native can compile" >&5
+$as_echo_n "checking if MCA component psec:native can compile... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+    # If this component was requested as the default for this
+    # type, then abort.
+    if test "$with_psec" = "native" ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MCA component \"native\" failed to configure properly" >&5
+$as_echo "$as_me: WARNING: MCA component \"native\" failed to configure properly" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This component was selected as the default" >&5
+$as_echo "$as_me: WARNING: This component was selected as the default" >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    if test ! -z "$DIRECT_psec" ; then
+        if test "$DIRECT_psec" = "native" ; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MCA component \"native\" failed to configure properly" >&5
+$as_echo "$as_me: WARNING: MCA component \"native\" failed to configure properly" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This component was selected as the default (direct call)" >&5
+$as_echo "$as_me: WARNING: This component was selected as the default (direct call)" >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    fi
+
+        # add component to all component list
+        all_components="$all_components native"
+    fi
+
+    # set the AM_CONDITIONAL on how we should build
+    if test "$compile_mode" = "dso" ; then
+        BUILD_pmix_psec_native_DSO=1
+    else
+        BUILD_pmix_psec_native_DSO=0
+    fi
+     if test "$BUILD_pmix_psec_native_DSO" = "1"; then
+  MCA_BUILD_pmix_psec_native_DSO_TRUE=
+  MCA_BUILD_pmix_psec_native_DSO_FALSE='#'
+else
+  MCA_BUILD_pmix_psec_native_DSO_TRUE='#'
+  MCA_BUILD_pmix_psec_native_DSO_FALSE=
+fi
+
+
+    ac_config_files="$ac_config_files src/mca/psec/native/Makefile"
+
+
+    unset compile_mode
+
+    pmix_show_subsubsubtitle "MCA component psec:none (no configuration)"
+
+    pmix_show_verbose "PMIX_MCA_NO_CONFIG_COMPONENT: before, should_build=1"
+
+
+
+    component_path="$srcdir/src/mca/psec/none"
+    want_component=0
+
+    # build if:
+    # - the component type is direct and we are that component
+    # - there is no pmix_ignore file
+    # - there is an pmix_ignore, but there is an empty pmix_unignore
+    # - there is an pmix_ignore, but username is in pmix_unignore
+    if test -d $component_path ; then
+        # decide if we want the component to be built or not.  This
+        # is spread out because some of the logic is a little complex
+        # and test's syntax isn't exactly the greatest.  We want to
+        # build the component by default.
+        want_component=1
+        if test -f $component_path/.pmix_ignore ; then
+            # If there is an pmix_ignore file, don't build
+            # the component.  Note that this decision can be
+            # overridden by the unignore logic below.
+            want_component=0
+        fi
+        if test -f $component_path/.pmix_unignore ; then
+            # if there is an empty pmix_unignore, that is
+            # equivalent to having your userid in the unignore file.
+            # If userid is in the file, unignore the ignore file.
+            if test ! -s $component_path/.pmix_unignore ; then
+                want_component=1
+            elif test ! -z "`$GREP $PMIX_CONFIGURE_USER $component_path/.pmix_unignore`" ; then
+                want_component=1
+            fi
+        fi
+        # if this component type is direct and we are not it, we don't want
+        # to be built.  Otherwise, we do want to be built.
+        if test ! -z "$DIRECT_psec" ; then
+            if test "$DIRECT_psec" = "none" ; then
+                want_component=1
+            else
+                want_component=0
+            fi
+        fi
+    fi
+
+    # if we were explicitly disabled, don't build :)
+    if test "$DISABLE_psec" = "1"; then :
+  want_component=0
+fi
+    if test "$DISABLE_psec_none" = "1"; then :
+  want_component=0
+fi
+
+    if test "$want_component" = "1"; then :
+  should_build=1
+else
+  should_build=0
+fi
+
+
+    SHARED_FRAMEWORK="$DSO_psec"
+    SHARED_COMPONENT="$DSO_psec_none"
+
+    STATIC_FRAMEWORK="$STATIC_psec"
+    STATIC_COMPONENT="$STATIC_psec_none"
+
+    shared_mode_override=static
+
+    # Setup for either shared or static
+    if test "$STATIC_FRAMEWORK" = "1" || \
+       test "$STATIC_COMPONENT" = "1" || \
+       test "$STATIC_all" = "1" ; then
+        compile_mode="static"
+    elif test "$shared_mode_override" = "dso" || \
+         test "$SHARED_FRAMEWORK" = "1" || \
+         test "$SHARED_COMPONENT" = "1" || \
+         test "$DSO_all" = "1"; then
+        compile_mode="dso"
+    else
+        compile_mode="static"
+    fi
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MCA component psec:none compile mode" >&5
+$as_echo_n "checking for MCA component psec:none compile mode... " >&6; }
+    if test "$DIRECT_psec" = "none" ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $compile_mode - direct" >&5
+$as_echo "$compile_mode - direct" >&6; }
+    else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $compile_mode" >&5
+$as_echo "$compile_mode" >&6; }
+    fi
+
+    pmix_show_verbose "PMIX_MCA_NO_CONFIG_COMPONENT: after, should_build=$should_build"
+
+    if test "$should_build" = "1" ; then
+
+
+
+    # See if it dropped an output file for us to pick up some
+    # shell variables in.
+    infile="$srcdir/src/mca/psec/none/post_configure.sh"
+
+    # Add this subdir to the mast list of all MCA component subdirs
+    all_components="$all_components none"
+
+    if test "$compile_mode" = "dso" ; then
+        dso_components="$dso_components none"
+    else
+        if test "psec" = "common"; then
+            # Static libraries in "common" frameworks are installed, and
+            # therefore must obey the $FRAMEWORK_LIB_PREFIX that was
+            # set.
+            static_ltlibs="mca/psec/none/lib${PMIX_LIB_PREFIX}mca_psec_none.la $static_ltlibs"
+        else
+            # Other frameworks do not have to obey the
+            # $FRAMEWORK_LIB_PREFIX prefix.
+            static_ltlibs="mca/psec/none/libmca_psec_none.la $static_ltlibs"
+        fi
+        echo "extern const pmix_mca_base_component_t mca_psec_none_component;" >> $outfile.extern
+        echo "  &mca_psec_none_component, " >> $outfile.struct
+        static_components="$static_components none"
+    fi
+
+    # Output pretty results
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if MCA component psec:none can compile" >&5
+$as_echo_n "checking if MCA component psec:none can compile... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+                        if test -f $infile; then
+        # check for direct call header to include.  This will be
+        # AC_SUBSTed later.
+        if test "$DIRECT_psec" = "none" ; then
+            if test "`$GREP DIRECT_CALL_HEADER $infile`" != "" ; then
+                line="`$GREP DIRECT_CALL_HEADER $infile | cut -d= -f2-`"
+                str="MCA_pmix_psec_DIRECT_CALL_HEADER=$line"
+                eval $str
+            else
+as_fn_error $? "*** psec component none was supposed to be direct-called, but
+*** does not appear to support direct calling.
+*** Aborting" "$LINENO" 5
+            fi
+        fi
+    else
+        # were we supposed to have found something in the
+        # post_configure.sh, but the file didn't exist?
+        if test "$DIRECT_psec" = "none" ; then
+as_fn_error $? "*** psec component none was supposed to be direct-called, but
+*** does not appear to support direct calling.
+*** Aborting" "$LINENO" 5
+        fi
+    fi
+
+    # if the component is building, add it's WRAPPER_EXTRA_LDFLAGS and
+    # WRAPPER_EXTRA_LIBS.  If the component doesn't specify it's
+    # WRAPPER_EXTRA_LIBS and WRAPPER_EXTRA_LDFLAGS, try using LDFLAGS and LIBS if
+    # component didn't have it's own configure script (in which case,
+    # we know it didn't set LDFLAGS and LIBS because it can't) Don't
+    # have to do this if the component is building dynamically,
+    # because it will link against these (without a dependency from
+    # libmpi.so to these flags)
+    if test "$compile_mode" = "static"; then
+        if test "$psec_none_WRAPPER_EXTRA_LDFLAGS" = ""; then :
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $psec_none_LDFLAGS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_ldflags}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_ldflags"; then :
+  mca_wrapper_extra_ldflags=$arg
+else
+  mca_wrapper_extra_ldflags="$mca_wrapper_extra_ldflags $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+else
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $psec_none_WRAPPER_EXTRA_LDFLAGS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_ldflags}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_ldflags"; then :
+  mca_wrapper_extra_ldflags=$arg
+else
+  mca_wrapper_extra_ldflags="$mca_wrapper_extra_ldflags $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+fi
+                        if test "$psec_none_WRAPPER_EXTRA_LIBS" = ""; then :
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $psec_none_LIBS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_libs}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_libs"; then :
+  mca_wrapper_extra_libs=$arg
+else
+  mca_wrapper_extra_libs="$mca_wrapper_extra_libs $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+else
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $psec_none_WRAPPER_EXTRA_LIBS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_libs}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_libs"; then :
+  mca_wrapper_extra_libs=$arg
+else
+  mca_wrapper_extra_libs="$mca_wrapper_extra_libs $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+fi
+
+    fi
+
+    # if needed, copy over WRAPPER_EXTRA_CPPFLAGS.  Since a configure script
+    # component can never be used in a STOP_AT_FIRST framework, we
+    # don't have to implement the else clause in the literal check...
+    if test "$psec_none_WRAPPER_EXTRA_CPPFLAGS" != ""; then :
+  stop_at_first=0
+            if test "$compile_mode" = "static" && test "$stop_at_first" = "1"; then :
+  if test "$with_devel_headers" = "yes"; then :
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $psec_none_WRAPPER_EXTRA_CPPFLAGS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_cppflags}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_cppflags"; then :
+  mca_wrapper_extra_cppflags=$arg
+else
+  mca_wrapper_extra_cppflags="$mca_wrapper_extra_cppflags $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+fi
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ignoring psec_none_WRAPPER_EXTRA_CPPFLAGS ($psec_none_WRAPPER_EXTRA_CPPFLAGS): component conditions not met" >&5
+$as_echo "$as_me: WARNING: ignoring psec_none_WRAPPER_EXTRA_CPPFLAGS ($psec_none_WRAPPER_EXTRA_CPPFLAGS): component conditions not met" >&2;}
+fi
+fi
+
+    else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if MCA component psec:none can compile" >&5
+$as_echo_n "checking if MCA component psec:none can compile... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+    # If this component was requested as the default for this
+    # type, then abort.
+    if test "$with_psec" = "none" ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MCA component \"none\" failed to configure properly" >&5
+$as_echo "$as_me: WARNING: MCA component \"none\" failed to configure properly" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This component was selected as the default" >&5
+$as_echo "$as_me: WARNING: This component was selected as the default" >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    if test ! -z "$DIRECT_psec" ; then
+        if test "$DIRECT_psec" = "none" ; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MCA component \"none\" failed to configure properly" >&5
+$as_echo "$as_me: WARNING: MCA component \"none\" failed to configure properly" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This component was selected as the default (direct call)" >&5
+$as_echo "$as_me: WARNING: This component was selected as the default (direct call)" >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    fi
+
+        # add component to all component list
+        all_components="$all_components none"
+    fi
+
+    # set the AM_CONDITIONAL on how we should build
+    if test "$compile_mode" = "dso" ; then
+        BUILD_pmix_psec_none_DSO=1
+    else
+        BUILD_pmix_psec_none_DSO=0
+    fi
+     if test "$BUILD_pmix_psec_none_DSO" = "1"; then
+  MCA_BUILD_pmix_psec_none_DSO_TRUE=
+  MCA_BUILD_pmix_psec_none_DSO_FALSE='#'
+else
+  MCA_BUILD_pmix_psec_none_DSO_TRUE='#'
+  MCA_BUILD_pmix_psec_none_DSO_FALSE=
+fi
+
+
+    ac_config_files="$ac_config_files src/mca/psec/none/Makefile"
+
+
+    unset compile_mode
+
+
+    # configure components that use built-in configuration scripts
+
+
+
+    best_mca_component_priority=0
+    components_looking_for_succeed=1
+    components_last_result=0
+
+
+    pmix_show_subsubsubtitle "MCA component psec:munge (m4 configuration macro)"
+
+    pmix_show_verbose "PMIX_MCA_M4_CONFIG_COMPONENT: before, should_build=$components_looking_for_succeed"
+
+
+
+    component_path="$srcdir/src/mca/psec/munge"
+    want_component=0
+
+    # build if:
+    # - the component type is direct and we are that component
+    # - there is no pmix_ignore file
+    # - there is an pmix_ignore, but there is an empty pmix_unignore
+    # - there is an pmix_ignore, but username is in pmix_unignore
+    if test -d $component_path ; then
+        # decide if we want the component to be built or not.  This
+        # is spread out because some of the logic is a little complex
+        # and test's syntax isn't exactly the greatest.  We want to
+        # build the component by default.
+        want_component=1
+        if test -f $component_path/.pmix_ignore ; then
+            # If there is an pmix_ignore file, don't build
+            # the component.  Note that this decision can be
+            # overridden by the unignore logic below.
+            want_component=0
+        fi
+        if test -f $component_path/.pmix_unignore ; then
+            # if there is an empty pmix_unignore, that is
+            # equivalent to having your userid in the unignore file.
+            # If userid is in the file, unignore the ignore file.
+            if test ! -s $component_path/.pmix_unignore ; then
+                want_component=1
+            elif test ! -z "`$GREP $PMIX_CONFIGURE_USER $component_path/.pmix_unignore`" ; then
+                want_component=1
+            fi
+        fi
+        # if this component type is direct and we are not it, we don't want
+        # to be built.  Otherwise, we do want to be built.
+        if test ! -z "$DIRECT_psec" ; then
+            if test "$DIRECT_psec" = "munge" ; then
+                want_component=1
+            else
+                want_component=0
+            fi
+        fi
+    fi
+
+    # if we were explicitly disabled, don't build :)
+    if test "$DISABLE_psec" = "1"; then :
+  want_component=0
+fi
+    if test "$DISABLE_psec_munge" = "1"; then :
+  want_component=0
+fi
+
+    if test "$want_component" = "1"; then :
+  should_build=$components_looking_for_succeed
+else
+  should_build=0
+fi
+
+    # Allow the component to override the build mode if it really wants to.
+    # It is, of course, free to end up calling MCA_COMPONENT_COMPILE_MODE
+
+    SHARED_FRAMEWORK="$DSO_psec"
+    SHARED_COMPONENT="$DSO_psec_munge"
+
+    STATIC_FRAMEWORK="$STATIC_psec"
+    STATIC_COMPONENT="$STATIC_psec_munge"
+
+    shared_mode_override=static
+
+    # Setup for either shared or static
+    if test "$STATIC_FRAMEWORK" = "1" || \
+       test "$STATIC_COMPONENT" = "1" || \
+       test "$STATIC_all" = "1" ; then
+        compile_mode="static"
+    elif test "$shared_mode_override" = "dso" || \
+         test "$SHARED_FRAMEWORK" = "1" || \
+         test "$SHARED_COMPONENT" = "1" || \
+         test "$DSO_all" = "1"; then
+        compile_mode="dso"
+    else
+        compile_mode="static"
+    fi
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MCA component psec:munge compile mode" >&5
+$as_echo_n "checking for MCA component psec:munge compile mode... " >&6; }
+    if test "$DIRECT_psec" = "munge" ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $compile_mode - direct" >&5
+$as_echo "$compile_mode - direct" >&6; }
+    else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $compile_mode" >&5
+$as_echo "$compile_mode" >&6; }
+    fi
+
+
+    # try to configure the component
+
+    ac_config_files="$ac_config_files src/mca/psec/munge/Makefile"
+
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in psec_munge_support psec_munge_dir psec_munge_libdir save_cpp save_ld; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"psec_munge_support psec_munge_dir psec_munge_libdir save_cpp save_ld\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+
+# Check whether --with-munge was given.
+if test "${with_munge+set}" = set; then :
+  withval=$with_munge;
+fi
+
+
+
+# Check whether --with-munge-libdir was given.
+if test "${with_munge_libdir+set}" = set; then :
+  withval=$with_munge_libdir;
+fi
+
+
+    psec_munge_support=0
+    if test ! -z "$with_munge" && test "$with_munge" != "no"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for munge in" >&5
+$as_echo_n "checking for munge in... " >&6; }
+        if test -n "$with_munge" && test "$with_munge" != "yes"; then
+            if test -d $with_munge/include/munge; then
+                psec_munge_dir=$with_munge/include/munge
+            else
+                psec_munge_dir=$with_munge
+            fi
+            if test -d $with_munge/lib; then
+                psec_munge_libdir=$with_munge/lib
+            elif -d $with_munge/lib64; then
+                psec_munge_libdir=$with_munge/lib64
+            else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: Could not find $with_munge/lib or $with_munge/lib64" >&5
+$as_echo "Could not find $with_munge/lib or $with_munge/lib64" >&6; }
+                as_fn_error $? "Can not continue" "$LINENO" 5
+            fi
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $psec_munge_dir and $psec_munge_libdir" >&5
+$as_echo "$psec_munge_dir and $psec_munge_libdir" >&6; }
+        else
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: (default search paths)" >&5
+$as_echo "(default search paths)" >&6; }
+            psec_munge_dir=
+        fi
+        if test -n "$with_munge_libdir" && test "$with_munge_libdir" != "yes"; then :
+  psec_munge_libdir="$with_munge_libdir"
+fi
+
+        save_cpp=$CPPFLAGS
+        save_ld=$LDFLAGS
+
+
+    pmix_check_package_psec_munge_save_CPPFLAGS="$CPPFLAGS"
+    pmix_check_package_psec_munge_save_LDFLAGS="$LDFLAGS"
+    pmix_check_package_psec_munge_save_LIBS="$LIBS"
+
+    pmix_check_package_psec_munge_orig_CPPFLAGS="$psec_munge_CPPFLAGS"
+    pmix_check_package_psec_munge_orig_LDFLAGS="$psec_munge_LDFLAGS"
+    pmix_check_package_psec_munge_orig_LIBS="$psec_munge_LIBS"
+
+
+    # This is stolen from autoconf to peek under the covers to get the
+    # cache variable for the library check.  one should not copy this
+    # code into other places unless you want much pain and suffering
+
+
+    # so this sucks, but there's no way to get through the progression
+    # of header includes without killing off the cache variable and trying
+    # again...
+    unset ac_cv_header_munge_h
+
+    pmix_check_package_header_happy="no"
+    if test "$psec_munge_dir" = "/usr" || test "$psec_munge_dir" = "/usr/local"; then :
+   # try as is...
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: looking for header without includes" >&5
+$as_echo "looking for header without includes" >&6; }
+            for ac_header in munge.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "munge.h" "ac_cv_header_munge_h" "$ac_includes_default"
+if test "x$ac_cv_header_munge_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_MUNGE_H 1
+_ACEOF
+ pmix_check_package_header_happy="yes"
+fi
+
+done
+
+            if test "$pmix_check_package_header_happy" = "no"; then :
+  # no go on the as is - reset the cache and try again
+                   unset ac_cv_header_munge_h
+fi
+fi
+
+    if test "$pmix_check_package_header_happy" = "no"; then :
+  if test "$psec_munge_dir" != ""; then :
+  psec_munge_CPPFLAGS="$psec_munge_CPPFLAGS -I$psec_munge_dir/include"
+                  CPPFLAGS="$CPPFLAGS -I$psec_munge_dir/include"
+fi
+          for ac_header in munge.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "munge.h" "ac_cv_header_munge_h" "$ac_includes_default"
+if test "x$ac_cv_header_munge_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_MUNGE_H 1
+_ACEOF
+ pmix_check_package_header_happy="yes"
+fi
+
+done
+
+	  if test "$pmix_check_package_header_happy" = "yes"; then :
+
+    # This is stolen from autoconf to peek under the covers to get the
+    # cache variable for the library check.  one should not copy this
+    # code into other places unless you want much pain and suffering
+
+    # see comment above
+    unset ac_cv_lib_munge_munge_encode
+    pmix_check_package_lib_happy="no"
+    if test "$psec_munge_libdir" != ""; then :
+   # libdir was specified - search only there
+           psec_munge_LDFLAGS="$psec_munge_LDFLAGS -L$psec_munge_libdir"
+           LDFLAGS="$LDFLAGS -L$psec_munge_libdir"
+           { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing munge_encode" >&5
+$as_echo_n "checking for library containing munge_encode... " >&6; }
+if ${ac_cv_search_munge_encode+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+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 munge_encode ();
+int
+main ()
+{
+return munge_encode ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' munge; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib -lmunge $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_munge_encode=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_munge_encode+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_munge_encode+:} false; then :
+
+else
+  ac_cv_search_munge_encode=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_munge_encode" >&5
+$as_echo "$ac_cv_search_munge_encode" >&6; }
+ac_res=$ac_cv_search_munge_encode
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  pmix_check_package_lib_happy="yes"
+else
+  pmix_check_package_lib_happy="no"
+fi
+
+           if test "$pmix_check_package_lib_happy" = "no"; then :
+  LDFLAGS="$pmix_check_package_psec_munge_save_LDFLAGS"
+                  psec_munge_LDFLAGS="$pmix_check_package_psec_munge_orig_LDFLAGS"
+                  unset ac_cv_lib_munge_munge_encode
+fi
+else
+   # libdir was not specified - go through search path
+           pmix_check_package_libdir="$psec_munge_dir"
+           if test "$pmix_check_package_libdir" = "" || test "$pmix_check_package_libdir" = "/usr" || test "$pmix_check_package_libdir" = "/usr/local"; then :
+   # try as is...
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: looking for library without search path" >&5
+$as_echo "looking for library without search path" >&6; }
+                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing munge_encode" >&5
+$as_echo_n "checking for library containing munge_encode... " >&6; }
+if ${ac_cv_search_munge_encode+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+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 munge_encode ();
+int
+main ()
+{
+return munge_encode ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' munge; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib -lmunge $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_munge_encode=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_munge_encode+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_munge_encode+:} false; then :
+
+else
+  ac_cv_search_munge_encode=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_munge_encode" >&5
+$as_echo "$ac_cv_search_munge_encode" >&6; }
+ac_res=$ac_cv_search_munge_encode
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  pmix_check_package_lib_happy="yes"
+else
+  pmix_check_package_lib_happy="no"
+fi
+
+                if test "$pmix_check_package_lib_happy" = "no"; then :
+   # no go on the as is..  see what happens later...
+                     LDFLAGS="$pmix_check_package_psec_munge_save_LDFLAGS"
+                     psec_munge_LDFLAGS="$pmix_check_package_psec_munge_orig_LDFLAGS"
+                     unset ac_cv_lib_munge_munge_encode
+fi
+fi
+
+           if test "$pmix_check_package_lib_happy" = "no"; then :
+  if test "$pmix_check_package_libdir" != ""; then :
+  psec_munge_LDFLAGS="$psec_munge_LDFLAGS -L$pmix_check_package_libdir/lib"
+                     LDFLAGS="$LDFLAGS -L$pmix_check_package_libdir/lib"
+                     { $as_echo "$as_me:${as_lineno-$LINENO}: result: looking for library in lib" >&5
+$as_echo "looking for library in lib" >&6; }
+                     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing munge_encode" >&5
+$as_echo_n "checking for library containing munge_encode... " >&6; }
+if ${ac_cv_search_munge_encode+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+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 munge_encode ();
+int
+main ()
+{
+return munge_encode ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' munge; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib -lmunge $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_munge_encode=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_munge_encode+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_munge_encode+:} false; then :
+
+else
+  ac_cv_search_munge_encode=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_munge_encode" >&5
+$as_echo "$ac_cv_search_munge_encode" >&6; }
+ac_res=$ac_cv_search_munge_encode
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  pmix_check_package_lib_happy="yes"
+else
+  pmix_check_package_lib_happy="no"
+fi
+
+                     if test "$pmix_check_package_lib_happy" = "no"; then :
+   # no go on the as is..  see what happens later...
+                          LDFLAGS="$pmix_check_package_psec_munge_save_LDFLAGS"
+                          psec_munge_LDFLAGS="$pmix_check_package_psec_munge_orig_LDFLAGS"
+                          unset ac_cv_lib_munge_munge_encode
+fi
+fi
+fi
+
+           if test "$pmix_check_package_lib_happy" = "no"; then :
+  if test "$pmix_check_package_libdir" != ""; then :
+  psec_munge_LDFLAGS="$psec_munge_LDFLAGS -L$pmix_check_package_libdir/lib64"
+                     LDFLAGS="$LDFLAGS -L$pmix_check_package_libdir/lib64"
+                     { $as_echo "$as_me:${as_lineno-$LINENO}: result: looking for library in lib64" >&5
+$as_echo "looking for library in lib64" >&6; }
+                     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing munge_encode" >&5
+$as_echo_n "checking for library containing munge_encode... " >&6; }
+if ${ac_cv_search_munge_encode+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+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 munge_encode ();
+int
+main ()
+{
+return munge_encode ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' munge; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib -lmunge $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_munge_encode=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_munge_encode+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_munge_encode+:} false; then :
+
+else
+  ac_cv_search_munge_encode=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_munge_encode" >&5
+$as_echo "$ac_cv_search_munge_encode" >&6; }
+ac_res=$ac_cv_search_munge_encode
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  pmix_check_package_lib_happy="yes"
+else
+  pmix_check_package_lib_happy="no"
+fi
+
+                     if test "$pmix_check_package_lib_happy" = "no"; then :
+   # no go on the as is..  see what happens later...
+                          LDFLAGS="$pmix_check_package_psec_munge_save_LDFLAGS"
+                          psec_munge_LDFLAGS="$pmix_check_package_psec_munge_orig_LDFLAGS"
+                          unset ac_cv_lib_munge_munge_encode
+fi
+fi
+fi
+fi
+
+    if test "$pmix_check_package_lib_happy" = "yes"; then :
+  psec_munge_LIBS="-lmunge -lmunge"
+           pmix_check_package_happy="yes"
+else
+  pmix_check_package_happy="no"
+fi
+    if test "$pmix_check_package_lib_happy" = "yes"; then :
+   # The result of AC SEARCH_LIBS is cached in $ac_cv_search_[function]
+           if test "$ac_cv_search_munge_encode" != "no" &&
+                  test "$ac_cv_search_munge_encode" != "none required"; then :
+  psec_munge_LIBS="$ac_cv_search_munge_encode -lmunge"
+else
+  psec_munge_LIBS="-lmunge"
+fi
+           pmix_check_package_happy="yes"
+else
+  pmix_check_package_happy="no"
+fi
+
+
+else
+  pmix_check_package_happy="no"
+fi
+else
+
+    # This is stolen from autoconf to peek under the covers to get the
+    # cache variable for the library check.  one should not copy this
+    # code into other places unless you want much pain and suffering
+
+    # see comment above
+    unset ac_cv_lib_munge_munge_encode
+    pmix_check_package_lib_happy="no"
+    if test "$psec_munge_libdir" != ""; then :
+   # libdir was specified - search only there
+           psec_munge_LDFLAGS="$psec_munge_LDFLAGS -L$psec_munge_libdir"
+           LDFLAGS="$LDFLAGS -L$psec_munge_libdir"
+           { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing munge_encode" >&5
+$as_echo_n "checking for library containing munge_encode... " >&6; }
+if ${ac_cv_search_munge_encode+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+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 munge_encode ();
+int
+main ()
+{
+return munge_encode ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' munge; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib -lmunge $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_munge_encode=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_munge_encode+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_munge_encode+:} false; then :
+
+else
+  ac_cv_search_munge_encode=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_munge_encode" >&5
+$as_echo "$ac_cv_search_munge_encode" >&6; }
+ac_res=$ac_cv_search_munge_encode
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  pmix_check_package_lib_happy="yes"
+else
+  pmix_check_package_lib_happy="no"
+fi
+
+           if test "$pmix_check_package_lib_happy" = "no"; then :
+  LDFLAGS="$pmix_check_package_psec_munge_save_LDFLAGS"
+                  psec_munge_LDFLAGS="$pmix_check_package_psec_munge_orig_LDFLAGS"
+                  unset ac_cv_lib_munge_munge_encode
+fi
+else
+   # libdir was not specified - go through search path
+           pmix_check_package_libdir="$psec_munge_dir"
+           if test "$pmix_check_package_libdir" = "" || test "$pmix_check_package_libdir" = "/usr" || test "$pmix_check_package_libdir" = "/usr/local"; then :
+   # try as is...
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: looking for library without search path" >&5
+$as_echo "looking for library without search path" >&6; }
+                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing munge_encode" >&5
+$as_echo_n "checking for library containing munge_encode... " >&6; }
+if ${ac_cv_search_munge_encode+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+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 munge_encode ();
+int
+main ()
+{
+return munge_encode ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' munge; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib -lmunge $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_munge_encode=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_munge_encode+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_munge_encode+:} false; then :
+
+else
+  ac_cv_search_munge_encode=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_munge_encode" >&5
+$as_echo "$ac_cv_search_munge_encode" >&6; }
+ac_res=$ac_cv_search_munge_encode
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  pmix_check_package_lib_happy="yes"
+else
+  pmix_check_package_lib_happy="no"
+fi
+
+                if test "$pmix_check_package_lib_happy" = "no"; then :
+   # no go on the as is..  see what happens later...
+                     LDFLAGS="$pmix_check_package_psec_munge_save_LDFLAGS"
+                     psec_munge_LDFLAGS="$pmix_check_package_psec_munge_orig_LDFLAGS"
+                     unset ac_cv_lib_munge_munge_encode
+fi
+fi
+
+           if test "$pmix_check_package_lib_happy" = "no"; then :
+  if test "$pmix_check_package_libdir" != ""; then :
+  psec_munge_LDFLAGS="$psec_munge_LDFLAGS -L$pmix_check_package_libdir/lib"
+                     LDFLAGS="$LDFLAGS -L$pmix_check_package_libdir/lib"
+                     { $as_echo "$as_me:${as_lineno-$LINENO}: result: looking for library in lib" >&5
+$as_echo "looking for library in lib" >&6; }
+                     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing munge_encode" >&5
+$as_echo_n "checking for library containing munge_encode... " >&6; }
+if ${ac_cv_search_munge_encode+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+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 munge_encode ();
+int
+main ()
+{
+return munge_encode ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' munge; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib -lmunge $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_munge_encode=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_munge_encode+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_munge_encode+:} false; then :
+
+else
+  ac_cv_search_munge_encode=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_munge_encode" >&5
+$as_echo "$ac_cv_search_munge_encode" >&6; }
+ac_res=$ac_cv_search_munge_encode
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  pmix_check_package_lib_happy="yes"
+else
+  pmix_check_package_lib_happy="no"
+fi
+
+                     if test "$pmix_check_package_lib_happy" = "no"; then :
+   # no go on the as is..  see what happens later...
+                          LDFLAGS="$pmix_check_package_psec_munge_save_LDFLAGS"
+                          psec_munge_LDFLAGS="$pmix_check_package_psec_munge_orig_LDFLAGS"
+                          unset ac_cv_lib_munge_munge_encode
+fi
+fi
+fi
+
+           if test "$pmix_check_package_lib_happy" = "no"; then :
+  if test "$pmix_check_package_libdir" != ""; then :
+  psec_munge_LDFLAGS="$psec_munge_LDFLAGS -L$pmix_check_package_libdir/lib64"
+                     LDFLAGS="$LDFLAGS -L$pmix_check_package_libdir/lib64"
+                     { $as_echo "$as_me:${as_lineno-$LINENO}: result: looking for library in lib64" >&5
+$as_echo "looking for library in lib64" >&6; }
+                     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing munge_encode" >&5
+$as_echo_n "checking for library containing munge_encode... " >&6; }
+if ${ac_cv_search_munge_encode+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+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 munge_encode ();
+int
+main ()
+{
+return munge_encode ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' munge; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib -lmunge $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_munge_encode=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_munge_encode+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_munge_encode+:} false; then :
+
+else
+  ac_cv_search_munge_encode=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_munge_encode" >&5
+$as_echo "$ac_cv_search_munge_encode" >&6; }
+ac_res=$ac_cv_search_munge_encode
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  pmix_check_package_lib_happy="yes"
+else
+  pmix_check_package_lib_happy="no"
+fi
+
+                     if test "$pmix_check_package_lib_happy" = "no"; then :
+   # no go on the as is..  see what happens later...
+                          LDFLAGS="$pmix_check_package_psec_munge_save_LDFLAGS"
+                          psec_munge_LDFLAGS="$pmix_check_package_psec_munge_orig_LDFLAGS"
+                          unset ac_cv_lib_munge_munge_encode
+fi
+fi
+fi
+fi
+
+    if test "$pmix_check_package_lib_happy" = "yes"; then :
+  psec_munge_LIBS="-lmunge -lmunge"
+           pmix_check_package_happy="yes"
+else
+  pmix_check_package_happy="no"
+fi
+    if test "$pmix_check_package_lib_happy" = "yes"; then :
+   # The result of AC SEARCH_LIBS is cached in $ac_cv_search_[function]
+           if test "$ac_cv_search_munge_encode" != "no" &&
+                  test "$ac_cv_search_munge_encode" != "none required"; then :
+  psec_munge_LIBS="$ac_cv_search_munge_encode -lmunge"
+else
+  psec_munge_LIBS="-lmunge"
+fi
+           pmix_check_package_happy="yes"
+else
+  pmix_check_package_happy="no"
+fi
+
+
+fi
+    unset pmix_check_package_header_happy
+
+
+
+    if test "$pmix_check_package_happy" = "yes"; then :
+  psec_munge_support=1
+else
+  psec_munge_CPPFLAGS="$pmix_check_package_psec_munge_orig_CPPFLAGS"
+           psec_munge_LDFLAGS="$pmix_check_package_psec_munge_orig_LDFLAGS"
+           psec_munge_LIBS="$pmix_check_package_psec_munge_orig_LIBS"
+           psec_munge_support=0
+fi
+
+    CPPFLAGS="$pmix_check_package_psec_munge_save_CPPFLAGS"
+    LDFLAGS="$pmix_check_package_psec_munge_save_LDFLAGS"
+    LIBS="$pmix_check_package_psec_munge_save_LIBS"
+
+
+        CPPFLAGS=$save_cpp
+        LDFLAGS=$save_ld
+    fi
+
+    if test -n "$with_munge" && test "$with_munge" != "no" && test "$psec_munge_support" != "1"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MUNGE SUPPORT REQUESTED AND NOT FOUND." >&5
+$as_echo "$as_me: WARNING: MUNGE SUPPORT REQUESTED AND NOT FOUND." >&2;}
+        as_fn_error $? "CANNOT CONTINUE" "$LINENO" 5
+    fi
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking will munge support be built" >&5
+$as_echo_n "checking will munge support be built... " >&6; }
+    if test "$psec_munge_support" != "1"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+           should_build=0
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+           should_build=$should_build
+fi
+
+    # set build flags to use in makefile
+
+
+
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+    pmix_show_verbose "PMIX_MCA_M4_CONFIG_COMPONENT: after, should_build=$should_build"
+
+    if test "$should_build" = "1"; then :
+
+
+
+    # See if it dropped an output file for us to pick up some
+    # shell variables in.
+    infile="$srcdir/src/mca/psec/munge/post_configure.sh"
+
+    # Add this subdir to the mast list of all MCA component subdirs
+    all_components="$all_components munge"
+
+    if test "$compile_mode" = "dso" ; then
+        dso_components="$dso_components munge"
+    else
+        if test "psec" = "common"; then
+            # Static libraries in "common" frameworks are installed, and
+            # therefore must obey the $FRAMEWORK_LIB_PREFIX that was
+            # set.
+            static_ltlibs="mca/psec/munge/lib${PMIX_LIB_PREFIX}mca_psec_munge.la $static_ltlibs"
+        else
+            # Other frameworks do not have to obey the
+            # $FRAMEWORK_LIB_PREFIX prefix.
+            static_ltlibs="mca/psec/munge/libmca_psec_munge.la $static_ltlibs"
+        fi
+        echo "extern const pmix_mca_base_component_t mca_psec_munge_component;" >> $outfile.extern
+        echo "  &mca_psec_munge_component, " >> $outfile.struct
+        static_components="$static_components munge"
+    fi
+
+    # Output pretty results
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if MCA component psec:munge can compile" >&5
+$as_echo_n "checking if MCA component psec:munge can compile... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+                        if test -f $infile; then
+        # check for direct call header to include.  This will be
+        # AC_SUBSTed later.
+        if test "$DIRECT_psec" = "munge" ; then
+            if test "`$GREP DIRECT_CALL_HEADER $infile`" != "" ; then
+                line="`$GREP DIRECT_CALL_HEADER $infile | cut -d= -f2-`"
+                str="MCA_pmix_psec_DIRECT_CALL_HEADER=$line"
+                eval $str
+            else
+as_fn_error $? "*** psec component munge was supposed to be direct-called, but
+*** does not appear to support direct calling.
+*** Aborting" "$LINENO" 5
+            fi
+        fi
+    else
+        # were we supposed to have found something in the
+        # post_configure.sh, but the file didn't exist?
+        if test "$DIRECT_psec" = "munge" ; then
+as_fn_error $? "*** psec component munge was supposed to be direct-called, but
+*** does not appear to support direct calling.
+*** Aborting" "$LINENO" 5
+        fi
+    fi
+
+    # if the component is building, add it's WRAPPER_EXTRA_LDFLAGS and
+    # WRAPPER_EXTRA_LIBS.  If the component doesn't specify it's
+    # WRAPPER_EXTRA_LIBS and WRAPPER_EXTRA_LDFLAGS, try using LDFLAGS and LIBS if
+    # component didn't have it's own configure script (in which case,
+    # we know it didn't set LDFLAGS and LIBS because it can't) Don't
+    # have to do this if the component is building dynamically,
+    # because it will link against these (without a dependency from
+    # libmpi.so to these flags)
+    if test "$compile_mode" = "static"; then
+        if test "$psec_munge_WRAPPER_EXTRA_LDFLAGS" = ""; then :
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $psec_munge_LDFLAGS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_ldflags}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_ldflags"; then :
+  mca_wrapper_extra_ldflags=$arg
+else
+  mca_wrapper_extra_ldflags="$mca_wrapper_extra_ldflags $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+else
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $psec_munge_WRAPPER_EXTRA_LDFLAGS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_ldflags}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_ldflags"; then :
+  mca_wrapper_extra_ldflags=$arg
+else
+  mca_wrapper_extra_ldflags="$mca_wrapper_extra_ldflags $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+fi
+                        if test "$psec_munge_WRAPPER_EXTRA_LIBS" = ""; then :
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $psec_munge_LIBS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_libs}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_libs"; then :
+  mca_wrapper_extra_libs=$arg
+else
+  mca_wrapper_extra_libs="$mca_wrapper_extra_libs $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+else
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $psec_munge_WRAPPER_EXTRA_LIBS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_libs}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_libs"; then :
+  mca_wrapper_extra_libs=$arg
+else
+  mca_wrapper_extra_libs="$mca_wrapper_extra_libs $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+fi
+
+    fi
+
+    # if needed, copy over WRAPPER_EXTRA_CPPFLAGS.  Since a configure script
+    # component can never be used in a STOP_AT_FIRST framework, we
+    # don't have to implement the else clause in the literal check...
+    if test "$psec_munge_WRAPPER_EXTRA_CPPFLAGS" != ""; then :
+  stop_at_first=0
+            if test "$compile_mode" = "static" && test "$stop_at_first" = "1"; then :
+  if test "$with_devel_headers" = "yes"; then :
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $psec_munge_WRAPPER_EXTRA_CPPFLAGS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_cppflags}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_cppflags"; then :
+  mca_wrapper_extra_cppflags=$arg
+else
+  mca_wrapper_extra_cppflags="$mca_wrapper_extra_cppflags $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+fi
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ignoring psec_munge_WRAPPER_EXTRA_CPPFLAGS ($psec_munge_WRAPPER_EXTRA_CPPFLAGS): component conditions not met" >&5
+$as_echo "$as_me: WARNING: ignoring psec_munge_WRAPPER_EXTRA_CPPFLAGS ($psec_munge_WRAPPER_EXTRA_CPPFLAGS): component conditions not met" >&2;}
+fi
+fi
+
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if MCA component psec:munge can compile" >&5
+$as_echo_n "checking if MCA component psec:munge can compile... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+    # If this component was requested as the default for this
+    # type, then abort.
+    if test "$with_psec" = "munge" ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MCA component \"munge\" failed to configure properly" >&5
+$as_echo "$as_me: WARNING: MCA component \"munge\" failed to configure properly" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This component was selected as the default" >&5
+$as_echo "$as_me: WARNING: This component was selected as the default" >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    if test ! -z "$DIRECT_psec" ; then
+        if test "$DIRECT_psec" = "munge" ; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MCA component \"munge\" failed to configure properly" >&5
+$as_echo "$as_me: WARNING: MCA component \"munge\" failed to configure properly" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This component was selected as the default (direct call)" >&5
+$as_echo "$as_me: WARNING: This component was selected as the default (direct call)" >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    fi
+
+           # add component to all component list
+           all_components="$all_components munge"
+fi
+
+
+
+    # set the AM_CONDITIONAL on how we should build
+    if test "$compile_mode" = "dso"; then :
+  BUILD_pmix_psec_munge_DSO=1
+else
+  BUILD_pmix_psec_munge_DSO=0
+fi
+     if test "$BUILD_pmix_psec_munge_DSO" = "1"; then
+  MCA_BUILD_pmix_psec_munge_DSO_TRUE=
+  MCA_BUILD_pmix_psec_munge_DSO_FALSE='#'
+else
+  MCA_BUILD_pmix_psec_munge_DSO_TRUE='#'
+  MCA_BUILD_pmix_psec_munge_DSO_FALSE=
+fi
+
+
+    if test "$should_build" = "1"; then :
+  components_last_result=1
+else
+  components_last_result=0
+fi
+
+    unset compile_mode
+
+
+
+
+
+    # configure components that provide their own configure script.
+    # It would be really hard to run these for "find first that
+    # works", so we don't :)
+
+
+
+                  if test "1" != "0"; then :
+
+    for component_path in $srcdir/src/mca/psec/* ; do
+        component="`basename $component_path`"
+        if test -d $component_path && test -x $component_path/configure ; then
+            pmix_show_subsubsubtitle "MCA component psec:$component (need to configure)"
+
+            pmix_show_verbose "PMIX_MCA_ALL_CONFIG_COMPONENTS: before, should_build="
+
+
+
+    component_path="$srcdir/src/mca/psec/$component"
+    want_component=0
+
+    # build if:
+    # - the component type is direct and we are that component
+    # - there is no pmix_ignore file
+    # - there is an pmix_ignore, but there is an empty pmix_unignore
+    # - there is an pmix_ignore, but username is in pmix_unignore
+    if test -d $component_path ; then
+        # decide if we want the component to be built or not.  This
+        # is spread out because some of the logic is a little complex
+        # and test's syntax isn't exactly the greatest.  We want to
+        # build the component by default.
+        want_component=1
+        if test -f $component_path/.pmix_ignore ; then
+            # If there is an pmix_ignore file, don't build
+            # the component.  Note that this decision can be
+            # overridden by the unignore logic below.
+            want_component=0
+        fi
+        if test -f $component_path/.pmix_unignore ; then
+            # if there is an empty pmix_unignore, that is
+            # equivalent to having your userid in the unignore file.
+            # If userid is in the file, unignore the ignore file.
+            if test ! -s $component_path/.pmix_unignore ; then
+                want_component=1
+            elif test ! -z "`$GREP $PMIX_CONFIGURE_USER $component_path/.pmix_unignore`" ; then
+                want_component=1
+            fi
+        fi
+        # if this component type is direct and we are not it, we don't want
+        # to be built.  Otherwise, we do want to be built.
+        if test ! -z "$DIRECT_psec" ; then
+            if test "$DIRECT_psec" = "$component" ; then
+                want_component=1
+            else
+                want_component=0
+            fi
+        fi
+    fi
+
+    # if we were explicitly disabled, don't build :)
+    if test "$DISABLE_psec" = "1"; then :
+  want_component=0
+fi
+    str="DISABLED_COMPONENT_CHECK=\$DISABLE_psec_$component"
+         eval $str
+         if test "$DISABLED_COMPONENT_CHECK" = "1" ; then
+             want_component=0
+         fi
+
+    if test "$want_component" = "1"; then :
+  should_build=1
+else
+  should_build=0
+fi
+
+
+    SHARED_FRAMEWORK="$DSO_psec"
+    str="SHARED_COMPONENT=\$DSO_psec_$component"
+         eval $str
+
+    STATIC_FRAMEWORK="$STATIC_psec"
+    str="STATIC_COMPONENT=\$STATIC_psec_$component"
+         eval $str
+
+    shared_mode_override=static
+
+    # Setup for either shared or static
+    if test "$STATIC_FRAMEWORK" = "1" || \
+       test "$STATIC_COMPONENT" = "1" || \
+       test "$STATIC_all" = "1" ; then
+        compile_mode="static"
+    elif test "$shared_mode_override" = "dso" || \
+         test "$SHARED_FRAMEWORK" = "1" || \
+         test "$SHARED_COMPONENT" = "1" || \
+         test "$DSO_all" = "1"; then
+        compile_mode="dso"
+    else
+        compile_mode="static"
+    fi
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MCA component psec:$component compile mode" >&5
+$as_echo_n "checking for MCA component psec:$component compile mode... " >&6; }
+    if test "$DIRECT_psec" = "$component" ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $compile_mode - direct" >&5
+$as_echo "$compile_mode - direct" >&6; }
+    else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $compile_mode" >&5
+$as_echo "$compile_mode" >&6; }
+    fi
+
+            pmix_show_verbose "PMIX_MCA_ALL_CONFIG_COMPONENTS: after, should_build=$should_build"
+
+            if test "$should_build" = "1" ; then
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in subdir_parent sub_configure subdir_dir subdir_srcdir subdir_cache_file subdir_args subdir_dots total_dir dir_part temp; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"subdir_parent sub_configure subdir_dir subdir_srcdir subdir_cache_file subdir_args subdir_dots total_dir dir_part temp\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+#
+# Invoke configure in a specific subdirectory.
+#
+# src/mca/psec/$component is the directory to invoke in
+# $pmix_subdir_args is the list of arguments to pass
+# should_build=1 is actions to execute upon success
+# should_build=0 is actions to execute upon failure
+#
+subdir_dir="src/mca/psec/$component"
+subdir_args="$pmix_subdir_args"
+subdir_success="should_build=1"
+subdir_failure="should_build=0"
+
+#
+# Sanity checks
+#
+
+if test "$subdir_dir" != ":" && test -d $srcdir/$subdir_dir; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: PMIX configuring in $subdir_dir" >&5
+$as_echo "$as_me: PMIX configuring in $subdir_dir" >&6;}
+
+    #
+    # Gotta check where srcdir is for VPATH builds.  If srcdir is not
+    # ., then we need to mkdir the subdir.  Otherwise, we can just cd
+    # into it.
+    #
+
+    case $srcdir in
+    .)
+	;;
+    *)
+	{ case $subdir_dir in
+	[\\/]* | ?:[\\/]* ) total_dir=;;
+	*)                      total_dir=.;;
+	esac
+	temp=$subdir_dir
+	for dir_part in `IFS='/\\'; set X $temp; shift; echo "$@"`; do
+	    case $dir_part in
+	    # Skip DOS drivespec
+	    ?:) total_dir=$dir_part ;;
+	    *)  total_dir=$total_dir/$dir_part
+		test -d "$total_dir" ||
+		mkdir "$total_dir" ||
+		as_fn_error $? "cannot create $subdir_dir" "$LINENO" 5
+		;;
+	    esac
+	done; }
+
+	if test -d ./$subdir_dir; then :;
+	else
+	    as_fn_error $? "cannot create \`pwd\`/$subdir_dir" "$LINENO" 5
+	fi
+	;;
+    esac
+
+    #
+    # Move into the target directory
+    #
+
+    subdir_parent=`pwd`
+    cd $subdir_dir
+
+    #
+    # Make a "../" for each directory in $subdir_dir.
+    #
+
+    subdir_dots=`echo $subdir_dir | sed 's,^\./,,;s,[^/]$,&/,;s,[^/]*/,../,g'`
+    #
+    # Construct the --srcdir argument
+    #
+
+    case $srcdir in
+    .)
+	# In place
+	subdir_srcdir="$srcdir"
+	;;
+    [\\/]* | ?:[\\/]* )
+	# Absolute path
+	subdir_srcdir="$srcdir/$subdir_dir"
+	;;
+    *)
+	# Relative path
+	subdir_srcdir="$subdir_dots$srcdir/$subdir_dir"
+	;;
+    esac
+
+    #
+    # Construct the --cache-file argument
+    #
+
+    # BWB - subdir caching is a pain since we change CFLAGS and all that.
+    # Just disable it for now
+    subdir_cache_file="/dev/null"
+
+    #
+    # Invoke the configure script in the subdirectory
+    #
+
+    sub_configure="$SHELL '$subdir_srcdir/configure'"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: running $sub_configure $subdir_args --cache-file=$subdir_cache_file --srcdir=$subdir_srcdir --disable-option-checking" >&5
+$as_echo "$as_me: running $sub_configure $subdir_args --cache-file=$subdir_cache_file --srcdir=$subdir_srcdir --disable-option-checking" >&6;}
+    eval "$sub_configure $subdir_args \
+	--cache-file=\"\$subdir_cache_file\" --srcdir=\"$subdir_srcdir\" --disable-option-checking"
+    if test "$?" = "0"; then
+	eval $subdir_success
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: $sub_configure succeeded for $subdir_dir" >&5
+$as_echo "$as_me: $sub_configure succeeded for $subdir_dir" >&6;}
+    else
+	eval $subdir_failure
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: $sub_configure *failed* for $subdir_dir" >&5
+$as_echo "$as_me: $sub_configure *failed* for $subdir_dir" >&6;}
+    fi
+
+    #
+    # Go back to the topdir
+    #
+
+    cd $subdir_parent
+fi
+
+#
+# Clean up
+#
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+                pmix_show_verbose "PMIX_MCA_ALL_CONFIG_COMPONENTS: after subdir, should_build=$should_build"
+            fi
+
+            if test "$should_build" = "1" ; then
+                # do some extra work to pass flags back from the
+                # top-level configure, the way a configure.m4
+                # component would.
+                infile="$srcdir/src/mca/psec/all_components/post_configure.sh"
+                if test -f $infile; then
+
+                    # First check for the ABORT tag
+                    line="`$GREP ABORT= $infile | cut -d= -f2-`"
+                    if test -n "$line" && test "$line" != "no"; then
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MCA component configure script told me to abort" >&5
+$as_echo "$as_me: WARNING: MCA component configure script told me to abort" >&2;}
+                        as_fn_error $? "cannot continue" "$LINENO" 5
+                    fi
+
+                    line="`$GREP WRAPPER_EXTRA_LDFLAGS= $infile | cut -d= -f2-`"
+                            eval "line=$line"
+                            if test -n "$line"; then
+                                all_components_static_components_WRAPPER_EXTRA_LDFLAGS="$line"
+                            fi
+                        line="`$GREP WRAPPER_EXTRA_LIBS= $infile | cut -d= -f2-`"
+                            eval "line=$line"
+                            if test -n "$line"; then
+                                all_components_static_components_WRAPPER_EXTRA_LIBS="$line"
+                            fi
+                                        fi
+
+
+
+
+    # See if it dropped an output file for us to pick up some
+    # shell variables in.
+    infile="$srcdir/src/mca/psec/$component/post_configure.sh"
+
+    # Add this subdir to the mast list of all MCA component subdirs
+    all_components="$all_components $component"
+
+    if test "$compile_mode" = "dso" ; then
+        dso_components="$dso_components $component"
+    else
+        if test "psec" = "common"; then
+            # Static libraries in "common" frameworks are installed, and
+            # therefore must obey the $FRAMEWORK_LIB_PREFIX that was
+            # set.
+            static_ltlibs="mca/psec/$component/lib${PMIX_LIB_PREFIX}mca_psec_$component.la $static_ltlibs"
+        else
+            # Other frameworks do not have to obey the
+            # $FRAMEWORK_LIB_PREFIX prefix.
+            static_ltlibs="mca/psec/$component/libmca_psec_$component.la $static_ltlibs"
+        fi
+        echo "extern const pmix_mca_base_component_t mca_psec_$component_component;" >> $outfile.extern
+        echo "  &mca_psec_$component_component, " >> $outfile.struct
+        static_components="$static_components $component"
+    fi
+
+    # Output pretty results
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if MCA component psec:$component can compile" >&5
+$as_echo_n "checking if MCA component psec:$component can compile... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+                        if test -f $infile; then
+        # check for direct call header to include.  This will be
+        # AC_SUBSTed later.
+        if test "$DIRECT_psec" = "$component" ; then
+            if test "`$GREP DIRECT_CALL_HEADER $infile`" != "" ; then
+                line="`$GREP DIRECT_CALL_HEADER $infile | cut -d= -f2-`"
+                str="MCA_pmix_psec_DIRECT_CALL_HEADER=$line"
+                eval $str
+            else
+as_fn_error $? "*** psec component $component was supposed to be direct-called, but
+*** does not appear to support direct calling.
+*** Aborting" "$LINENO" 5
+            fi
+        fi
+    else
+        # were we supposed to have found something in the
+        # post_configure.sh, but the file didn't exist?
+        if test "$DIRECT_psec" = "$component" ; then
+as_fn_error $? "*** psec component $component was supposed to be direct-called, but
+*** does not appear to support direct calling.
+*** Aborting" "$LINENO" 5
+        fi
+    fi
+
+    # if the component is building, add it's WRAPPER_EXTRA_LDFLAGS and
+    # WRAPPER_EXTRA_LIBS.  If the component doesn't specify it's
+    # WRAPPER_EXTRA_LIBS and WRAPPER_EXTRA_LDFLAGS, try using LDFLAGS and LIBS if
+    # component didn't have it's own configure script (in which case,
+    # we know it didn't set LDFLAGS and LIBS because it can't) Don't
+    # have to do this if the component is building dynamically,
+    # because it will link against these (without a dependency from
+    # libmpi.so to these flags)
+    if test "$compile_mode" = "static"; then
+        str="line=\$psec_$component_WRAPPER_EXTRA_LDFLAGS"
+                      eval "$str"
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $line; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_ldflags}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_ldflags"; then :
+  mca_wrapper_extra_ldflags=$arg
+else
+  mca_wrapper_extra_ldflags="$mca_wrapper_extra_ldflags $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+str="line=\$psec_$component_WRAPPER_EXTRA_LIBS"
+                      eval "$str"
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $line; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_libs}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_libs"; then :
+  mca_wrapper_extra_libs=$arg
+else
+  mca_wrapper_extra_libs="$mca_wrapper_extra_libs $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+    fi
+
+    # if needed, copy over WRAPPER_EXTRA_CPPFLAGS.  Since a configure script
+    # component can never be used in a STOP_AT_FIRST framework, we
+    # don't have to implement the else clause in the literal check...
+
+
+            else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if MCA component psec:$component can compile" >&5
+$as_echo_n "checking if MCA component psec:$component can compile... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+    # If this component was requested as the default for this
+    # type, then abort.
+    if test "$with_psec" = "$component" ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MCA component \"$component\" failed to configure properly" >&5
+$as_echo "$as_me: WARNING: MCA component \"$component\" failed to configure properly" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This component was selected as the default" >&5
+$as_echo "$as_me: WARNING: This component was selected as the default" >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    if test ! -z "$DIRECT_psec" ; then
+        if test "$DIRECT_psec" = "$component" ; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MCA component \"$component\" failed to configure properly" >&5
+$as_echo "$as_me: WARNING: MCA component \"$component\" failed to configure properly" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This component was selected as the default (direct call)" >&5
+$as_echo "$as_me: WARNING: This component was selected as the default (direct call)" >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    fi
+
+            fi
+        fi
+    done
+
+fi
+
+    MCA_pmix_psec_ALL_COMPONENTS="$all_components"
+    MCA_pmix_psec_STATIC_COMPONENTS="$static_components"
+    MCA_pmix_psec_DSO_COMPONENTS="$dso_components"
+    MCA_pmix_psec_STATIC_LTLIBS="$static_ltlibs"
+
+
+
+
+
+
+
+    MCA_pmix_psec_ALL_SUBDIRS=
+    for item in $all_components ; do
+       MCA_pmix_psec_ALL_SUBDIRS="$MCA_pmix_psec_ALL_SUBDIRS mca/psec/$item"
+    done
+
+
+
+    MCA_pmix_psec_STATIC_SUBDIRS=
+    for item in $static_components ; do
+       MCA_pmix_psec_STATIC_SUBDIRS="$MCA_pmix_psec_STATIC_SUBDIRS mca/psec/$item"
+    done
+
+
+
+    MCA_pmix_psec_DSO_SUBDIRS=
+    for item in $dso_components ; do
+       MCA_pmix_psec_DSO_SUBDIRS="$MCA_pmix_psec_DSO_SUBDIRS mca/psec/$item"
+    done
+
+
+
+    # Create the final .h file that will be included in the type's
+    # top-level glue.  This lists all the static components.  We don't
+    # need to do this for "common".
+    if test "1" != "common"; then
+        cat > $outfile <<EOF
+/*
+ * \$HEADER\$
+ */
+#if defined(c_plusplus) || defined(__cplusplus)
+extern "C" {
+#endif
+
+`cat $outfile.extern`
+
+const pmix_mca_base_component_t *mca_psec_base_static_components[] = {
+`cat $outfile.struct`
+  NULL
+};
+
+#if defined(c_plusplus) || defined(__cplusplus)
+}
+#endif
+
+EOF
+        # Only replace the header file if a) it doesn't previously
+        # exist, or b) the contents are different.  Do this to not
+        # trigger recompilation of certain .c files just because the
+        # timestamp changed on $outfile_real (similar to the way AC
+        # handles AC_CONFIG_HEADER files).
+        diff $outfile $outfile_real > /dev/null 2>&1
+        if test "$?" != "0"; then
+            mv $outfile $outfile_real
+        else
+            rm -f $outfile
+        fi
+    fi
+    rm -f $outfile.struct $outfile.extern
+
+    unset all_components static_components dso_components outfile outfile_real
+
+                                 MCA_pmix_FRAMEWORKS="$MCA_pmix_FRAMEWORKS psensor"
+                                 MCA_pmix_FRAMEWORKS_SUBDIRS="$MCA_pmix_FRAMEWORKS_SUBDIRS mca/psensor"
+                                 MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS="$MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS \$(MCA_pmix_psensor_ALL_SUBDIRS)"
+                                 MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS="$MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS \$(MCA_pmix_psensor_DSO_SUBDIRS)"
+                                 MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS="$MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS \$(MCA_pmix_psensor_STATIC_SUBDIRS)"
+                                 MCA_pmix_FRAMEWORK_LIBS="$MCA_pmix_FRAMEWORK_LIBS mca/psensor/libmca_psensor.la"
+                          MCA_pmix_FRAMEWORK_LIBS="$MCA_pmix_FRAMEWORK_LIBS \$(MCA_pmix_psensor_STATIC_LTLIBS)"
+
+    pmix_show_subsubtitle "Configuring MCA framework psensor"
+
+
+
+
+    # setup for framework
+    all_components=
+    static_components=
+    dso_components=
+    static_ltlibs=
+
+    # Ensure that the directory where the #include file is to live
+    # exists.  Need to do this for VPATH builds, because the directory
+    # may not exist yet.  For the "common" type, it's not really a
+    # component, so it doesn't have a base.
+    outdir=src/mca/psensor/base
+    as_dir=$outdir; as_fn_mkdir_p
+
+    # emit Makefile rule
+    ac_config_files="$ac_config_files src/mca/psensor/Makefile"
+
+
+    # remove any previously generated #include files
+    outfile_real=$outdir/static-components.h
+    outfile=$outfile_real.new
+    rm -f $outfile $outfile.struct $outfile.extern
+    touch $outfile.struct $outfile.extern
+
+    # print some nice messages about what we're about to do...
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for no configure components in framework psensor" >&5
+$as_echo_n "checking for no configure components in framework psensor... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: file, heartbeat" >&5
+$as_echo "file, heartbeat" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for m4 configure components in framework psensor" >&5
+$as_echo_n "checking for m4 configure components in framework psensor... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+$as_echo "" >&6; }
+
+    # If there are components in the no configure list, but we're
+    # doing one of the "special" selection logics, abort with a
+    # reasonable message.
+
+
+
+    # run the configure logic for the no-config components
+
+    pmix_show_subsubsubtitle "MCA component psensor:file (no configuration)"
+
+    pmix_show_verbose "PMIX_MCA_NO_CONFIG_COMPONENT: before, should_build=1"
+
+
+
+    component_path="$srcdir/src/mca/psensor/file"
+    want_component=0
+
+    # build if:
+    # - the component type is direct and we are that component
+    # - there is no pmix_ignore file
+    # - there is an pmix_ignore, but there is an empty pmix_unignore
+    # - there is an pmix_ignore, but username is in pmix_unignore
+    if test -d $component_path ; then
+        # decide if we want the component to be built or not.  This
+        # is spread out because some of the logic is a little complex
+        # and test's syntax isn't exactly the greatest.  We want to
+        # build the component by default.
+        want_component=1
+        if test -f $component_path/.pmix_ignore ; then
+            # If there is an pmix_ignore file, don't build
+            # the component.  Note that this decision can be
+            # overridden by the unignore logic below.
+            want_component=0
+        fi
+        if test -f $component_path/.pmix_unignore ; then
+            # if there is an empty pmix_unignore, that is
+            # equivalent to having your userid in the unignore file.
+            # If userid is in the file, unignore the ignore file.
+            if test ! -s $component_path/.pmix_unignore ; then
+                want_component=1
+            elif test ! -z "`$GREP $PMIX_CONFIGURE_USER $component_path/.pmix_unignore`" ; then
+                want_component=1
+            fi
+        fi
+        # if this component type is direct and we are not it, we don't want
+        # to be built.  Otherwise, we do want to be built.
+        if test ! -z "$DIRECT_psensor" ; then
+            if test "$DIRECT_psensor" = "file" ; then
+                want_component=1
+            else
+                want_component=0
+            fi
+        fi
+    fi
+
+    # if we were explicitly disabled, don't build :)
+    if test "$DISABLE_psensor" = "1"; then :
+  want_component=0
+fi
+    if test "$DISABLE_psensor_file" = "1"; then :
+  want_component=0
+fi
+
+    if test "$want_component" = "1"; then :
+  should_build=1
+else
+  should_build=0
+fi
+
+
+    SHARED_FRAMEWORK="$DSO_psensor"
+    SHARED_COMPONENT="$DSO_psensor_file"
+
+    STATIC_FRAMEWORK="$STATIC_psensor"
+    STATIC_COMPONENT="$STATIC_psensor_file"
+
+    shared_mode_override=static
+
+    # Setup for either shared or static
+    if test "$STATIC_FRAMEWORK" = "1" || \
+       test "$STATIC_COMPONENT" = "1" || \
+       test "$STATIC_all" = "1" ; then
+        compile_mode="static"
+    elif test "$shared_mode_override" = "dso" || \
+         test "$SHARED_FRAMEWORK" = "1" || \
+         test "$SHARED_COMPONENT" = "1" || \
+         test "$DSO_all" = "1"; then
+        compile_mode="dso"
+    else
+        compile_mode="static"
+    fi
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MCA component psensor:file compile mode" >&5
+$as_echo_n "checking for MCA component psensor:file compile mode... " >&6; }
+    if test "$DIRECT_psensor" = "file" ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $compile_mode - direct" >&5
+$as_echo "$compile_mode - direct" >&6; }
+    else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $compile_mode" >&5
+$as_echo "$compile_mode" >&6; }
+    fi
+
+    pmix_show_verbose "PMIX_MCA_NO_CONFIG_COMPONENT: after, should_build=$should_build"
+
+    if test "$should_build" = "1" ; then
+
+
+
+    # See if it dropped an output file for us to pick up some
+    # shell variables in.
+    infile="$srcdir/src/mca/psensor/file/post_configure.sh"
+
+    # Add this subdir to the mast list of all MCA component subdirs
+    all_components="$all_components file"
+
+    if test "$compile_mode" = "dso" ; then
+        dso_components="$dso_components file"
+    else
+        if test "psensor" = "common"; then
+            # Static libraries in "common" frameworks are installed, and
+            # therefore must obey the $FRAMEWORK_LIB_PREFIX that was
+            # set.
+            static_ltlibs="mca/psensor/file/lib${PMIX_LIB_PREFIX}mca_psensor_file.la $static_ltlibs"
+        else
+            # Other frameworks do not have to obey the
+            # $FRAMEWORK_LIB_PREFIX prefix.
+            static_ltlibs="mca/psensor/file/libmca_psensor_file.la $static_ltlibs"
+        fi
+        echo "extern const pmix_mca_base_component_t mca_psensor_file_component;" >> $outfile.extern
+        echo "  &mca_psensor_file_component, " >> $outfile.struct
+        static_components="$static_components file"
+    fi
+
+    # Output pretty results
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if MCA component psensor:file can compile" >&5
+$as_echo_n "checking if MCA component psensor:file can compile... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+                        if test -f $infile; then
+        # check for direct call header to include.  This will be
+        # AC_SUBSTed later.
+        if test "$DIRECT_psensor" = "file" ; then
+            if test "`$GREP DIRECT_CALL_HEADER $infile`" != "" ; then
+                line="`$GREP DIRECT_CALL_HEADER $infile | cut -d= -f2-`"
+                str="MCA_pmix_psensor_DIRECT_CALL_HEADER=$line"
+                eval $str
+            else
+as_fn_error $? "*** psensor component file was supposed to be direct-called, but
+*** does not appear to support direct calling.
+*** Aborting" "$LINENO" 5
+            fi
+        fi
+    else
+        # were we supposed to have found something in the
+        # post_configure.sh, but the file didn't exist?
+        if test "$DIRECT_psensor" = "file" ; then
+as_fn_error $? "*** psensor component file was supposed to be direct-called, but
+*** does not appear to support direct calling.
+*** Aborting" "$LINENO" 5
+        fi
+    fi
+
+    # if the component is building, add it's WRAPPER_EXTRA_LDFLAGS and
+    # WRAPPER_EXTRA_LIBS.  If the component doesn't specify it's
+    # WRAPPER_EXTRA_LIBS and WRAPPER_EXTRA_LDFLAGS, try using LDFLAGS and LIBS if
+    # component didn't have it's own configure script (in which case,
+    # we know it didn't set LDFLAGS and LIBS because it can't) Don't
+    # have to do this if the component is building dynamically,
+    # because it will link against these (without a dependency from
+    # libmpi.so to these flags)
+    if test "$compile_mode" = "static"; then
+        if test "$psensor_file_WRAPPER_EXTRA_LDFLAGS" = ""; then :
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $psensor_file_LDFLAGS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_ldflags}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_ldflags"; then :
+  mca_wrapper_extra_ldflags=$arg
+else
+  mca_wrapper_extra_ldflags="$mca_wrapper_extra_ldflags $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+else
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $psensor_file_WRAPPER_EXTRA_LDFLAGS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_ldflags}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_ldflags"; then :
+  mca_wrapper_extra_ldflags=$arg
+else
+  mca_wrapper_extra_ldflags="$mca_wrapper_extra_ldflags $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+fi
+                        if test "$psensor_file_WRAPPER_EXTRA_LIBS" = ""; then :
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $psensor_file_LIBS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_libs}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_libs"; then :
+  mca_wrapper_extra_libs=$arg
+else
+  mca_wrapper_extra_libs="$mca_wrapper_extra_libs $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+else
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $psensor_file_WRAPPER_EXTRA_LIBS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_libs}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_libs"; then :
+  mca_wrapper_extra_libs=$arg
+else
+  mca_wrapper_extra_libs="$mca_wrapper_extra_libs $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+fi
+
+    fi
+
+    # if needed, copy over WRAPPER_EXTRA_CPPFLAGS.  Since a configure script
+    # component can never be used in a STOP_AT_FIRST framework, we
+    # don't have to implement the else clause in the literal check...
+    if test "$psensor_file_WRAPPER_EXTRA_CPPFLAGS" != ""; then :
+  stop_at_first=0
+            if test "$compile_mode" = "static" && test "$stop_at_first" = "1"; then :
+  if test "$with_devel_headers" = "yes"; then :
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $psensor_file_WRAPPER_EXTRA_CPPFLAGS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_cppflags}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_cppflags"; then :
+  mca_wrapper_extra_cppflags=$arg
+else
+  mca_wrapper_extra_cppflags="$mca_wrapper_extra_cppflags $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+fi
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ignoring psensor_file_WRAPPER_EXTRA_CPPFLAGS ($psensor_file_WRAPPER_EXTRA_CPPFLAGS): component conditions not met" >&5
+$as_echo "$as_me: WARNING: ignoring psensor_file_WRAPPER_EXTRA_CPPFLAGS ($psensor_file_WRAPPER_EXTRA_CPPFLAGS): component conditions not met" >&2;}
+fi
+fi
+
+    else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if MCA component psensor:file can compile" >&5
+$as_echo_n "checking if MCA component psensor:file can compile... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+    # If this component was requested as the default for this
+    # type, then abort.
+    if test "$with_psensor" = "file" ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MCA component \"file\" failed to configure properly" >&5
+$as_echo "$as_me: WARNING: MCA component \"file\" failed to configure properly" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This component was selected as the default" >&5
+$as_echo "$as_me: WARNING: This component was selected as the default" >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    if test ! -z "$DIRECT_psensor" ; then
+        if test "$DIRECT_psensor" = "file" ; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MCA component \"file\" failed to configure properly" >&5
+$as_echo "$as_me: WARNING: MCA component \"file\" failed to configure properly" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This component was selected as the default (direct call)" >&5
+$as_echo "$as_me: WARNING: This component was selected as the default (direct call)" >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    fi
+
+        # add component to all component list
+        all_components="$all_components file"
+    fi
+
+    # set the AM_CONDITIONAL on how we should build
+    if test "$compile_mode" = "dso" ; then
+        BUILD_pmix_psensor_file_DSO=1
+    else
+        BUILD_pmix_psensor_file_DSO=0
+    fi
+     if test "$BUILD_pmix_psensor_file_DSO" = "1"; then
+  MCA_BUILD_pmix_psensor_file_DSO_TRUE=
+  MCA_BUILD_pmix_psensor_file_DSO_FALSE='#'
+else
+  MCA_BUILD_pmix_psensor_file_DSO_TRUE='#'
+  MCA_BUILD_pmix_psensor_file_DSO_FALSE=
+fi
+
+
+    ac_config_files="$ac_config_files src/mca/psensor/file/Makefile"
+
+
+    unset compile_mode
+
+    pmix_show_subsubsubtitle "MCA component psensor:heartbeat (no configuration)"
+
+    pmix_show_verbose "PMIX_MCA_NO_CONFIG_COMPONENT: before, should_build=1"
+
+
+
+    component_path="$srcdir/src/mca/psensor/heartbeat"
+    want_component=0
+
+    # build if:
+    # - the component type is direct and we are that component
+    # - there is no pmix_ignore file
+    # - there is an pmix_ignore, but there is an empty pmix_unignore
+    # - there is an pmix_ignore, but username is in pmix_unignore
+    if test -d $component_path ; then
+        # decide if we want the component to be built or not.  This
+        # is spread out because some of the logic is a little complex
+        # and test's syntax isn't exactly the greatest.  We want to
+        # build the component by default.
+        want_component=1
+        if test -f $component_path/.pmix_ignore ; then
+            # If there is an pmix_ignore file, don't build
+            # the component.  Note that this decision can be
+            # overridden by the unignore logic below.
+            want_component=0
+        fi
+        if test -f $component_path/.pmix_unignore ; then
+            # if there is an empty pmix_unignore, that is
+            # equivalent to having your userid in the unignore file.
+            # If userid is in the file, unignore the ignore file.
+            if test ! -s $component_path/.pmix_unignore ; then
+                want_component=1
+            elif test ! -z "`$GREP $PMIX_CONFIGURE_USER $component_path/.pmix_unignore`" ; then
+                want_component=1
+            fi
+        fi
+        # if this component type is direct and we are not it, we don't want
+        # to be built.  Otherwise, we do want to be built.
+        if test ! -z "$DIRECT_psensor" ; then
+            if test "$DIRECT_psensor" = "heartbeat" ; then
+                want_component=1
+            else
+                want_component=0
+            fi
+        fi
+    fi
+
+    # if we were explicitly disabled, don't build :)
+    if test "$DISABLE_psensor" = "1"; then :
+  want_component=0
+fi
+    if test "$DISABLE_psensor_heartbeat" = "1"; then :
+  want_component=0
+fi
+
+    if test "$want_component" = "1"; then :
+  should_build=1
+else
+  should_build=0
+fi
+
+
+    SHARED_FRAMEWORK="$DSO_psensor"
+    SHARED_COMPONENT="$DSO_psensor_heartbeat"
+
+    STATIC_FRAMEWORK="$STATIC_psensor"
+    STATIC_COMPONENT="$STATIC_psensor_heartbeat"
+
+    shared_mode_override=static
+
+    # Setup for either shared or static
+    if test "$STATIC_FRAMEWORK" = "1" || \
+       test "$STATIC_COMPONENT" = "1" || \
+       test "$STATIC_all" = "1" ; then
+        compile_mode="static"
+    elif test "$shared_mode_override" = "dso" || \
+         test "$SHARED_FRAMEWORK" = "1" || \
+         test "$SHARED_COMPONENT" = "1" || \
+         test "$DSO_all" = "1"; then
+        compile_mode="dso"
+    else
+        compile_mode="static"
+    fi
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MCA component psensor:heartbeat compile mode" >&5
+$as_echo_n "checking for MCA component psensor:heartbeat compile mode... " >&6; }
+    if test "$DIRECT_psensor" = "heartbeat" ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $compile_mode - direct" >&5
+$as_echo "$compile_mode - direct" >&6; }
+    else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $compile_mode" >&5
+$as_echo "$compile_mode" >&6; }
+    fi
+
+    pmix_show_verbose "PMIX_MCA_NO_CONFIG_COMPONENT: after, should_build=$should_build"
+
+    if test "$should_build" = "1" ; then
+
+
+
+    # See if it dropped an output file for us to pick up some
+    # shell variables in.
+    infile="$srcdir/src/mca/psensor/heartbeat/post_configure.sh"
+
+    # Add this subdir to the mast list of all MCA component subdirs
+    all_components="$all_components heartbeat"
+
+    if test "$compile_mode" = "dso" ; then
+        dso_components="$dso_components heartbeat"
+    else
+        if test "psensor" = "common"; then
+            # Static libraries in "common" frameworks are installed, and
+            # therefore must obey the $FRAMEWORK_LIB_PREFIX that was
+            # set.
+            static_ltlibs="mca/psensor/heartbeat/lib${PMIX_LIB_PREFIX}mca_psensor_heartbeat.la $static_ltlibs"
+        else
+            # Other frameworks do not have to obey the
+            # $FRAMEWORK_LIB_PREFIX prefix.
+            static_ltlibs="mca/psensor/heartbeat/libmca_psensor_heartbeat.la $static_ltlibs"
+        fi
+        echo "extern const pmix_mca_base_component_t mca_psensor_heartbeat_component;" >> $outfile.extern
+        echo "  &mca_psensor_heartbeat_component, " >> $outfile.struct
+        static_components="$static_components heartbeat"
+    fi
+
+    # Output pretty results
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if MCA component psensor:heartbeat can compile" >&5
+$as_echo_n "checking if MCA component psensor:heartbeat can compile... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+                        if test -f $infile; then
+        # check for direct call header to include.  This will be
+        # AC_SUBSTed later.
+        if test "$DIRECT_psensor" = "heartbeat" ; then
+            if test "`$GREP DIRECT_CALL_HEADER $infile`" != "" ; then
+                line="`$GREP DIRECT_CALL_HEADER $infile | cut -d= -f2-`"
+                str="MCA_pmix_psensor_DIRECT_CALL_HEADER=$line"
+                eval $str
+            else
+as_fn_error $? "*** psensor component heartbeat was supposed to be direct-called, but
+*** does not appear to support direct calling.
+*** Aborting" "$LINENO" 5
+            fi
+        fi
+    else
+        # were we supposed to have found something in the
+        # post_configure.sh, but the file didn't exist?
+        if test "$DIRECT_psensor" = "heartbeat" ; then
+as_fn_error $? "*** psensor component heartbeat was supposed to be direct-called, but
+*** does not appear to support direct calling.
+*** Aborting" "$LINENO" 5
+        fi
+    fi
+
+    # if the component is building, add it's WRAPPER_EXTRA_LDFLAGS and
+    # WRAPPER_EXTRA_LIBS.  If the component doesn't specify it's
+    # WRAPPER_EXTRA_LIBS and WRAPPER_EXTRA_LDFLAGS, try using LDFLAGS and LIBS if
+    # component didn't have it's own configure script (in which case,
+    # we know it didn't set LDFLAGS and LIBS because it can't) Don't
+    # have to do this if the component is building dynamically,
+    # because it will link against these (without a dependency from
+    # libmpi.so to these flags)
+    if test "$compile_mode" = "static"; then
+        if test "$psensor_heartbeat_WRAPPER_EXTRA_LDFLAGS" = ""; then :
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $psensor_heartbeat_LDFLAGS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_ldflags}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_ldflags"; then :
+  mca_wrapper_extra_ldflags=$arg
+else
+  mca_wrapper_extra_ldflags="$mca_wrapper_extra_ldflags $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+else
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $psensor_heartbeat_WRAPPER_EXTRA_LDFLAGS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_ldflags}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_ldflags"; then :
+  mca_wrapper_extra_ldflags=$arg
+else
+  mca_wrapper_extra_ldflags="$mca_wrapper_extra_ldflags $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+fi
+                        if test "$psensor_heartbeat_WRAPPER_EXTRA_LIBS" = ""; then :
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $psensor_heartbeat_LIBS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_libs}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_libs"; then :
+  mca_wrapper_extra_libs=$arg
+else
+  mca_wrapper_extra_libs="$mca_wrapper_extra_libs $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+else
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $psensor_heartbeat_WRAPPER_EXTRA_LIBS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_libs}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_libs"; then :
+  mca_wrapper_extra_libs=$arg
+else
+  mca_wrapper_extra_libs="$mca_wrapper_extra_libs $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+fi
+
+    fi
+
+    # if needed, copy over WRAPPER_EXTRA_CPPFLAGS.  Since a configure script
+    # component can never be used in a STOP_AT_FIRST framework, we
+    # don't have to implement the else clause in the literal check...
+    if test "$psensor_heartbeat_WRAPPER_EXTRA_CPPFLAGS" != ""; then :
+  stop_at_first=0
+            if test "$compile_mode" = "static" && test "$stop_at_first" = "1"; then :
+  if test "$with_devel_headers" = "yes"; then :
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $psensor_heartbeat_WRAPPER_EXTRA_CPPFLAGS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_cppflags}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_cppflags"; then :
+  mca_wrapper_extra_cppflags=$arg
+else
+  mca_wrapper_extra_cppflags="$mca_wrapper_extra_cppflags $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+fi
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ignoring psensor_heartbeat_WRAPPER_EXTRA_CPPFLAGS ($psensor_heartbeat_WRAPPER_EXTRA_CPPFLAGS): component conditions not met" >&5
+$as_echo "$as_me: WARNING: ignoring psensor_heartbeat_WRAPPER_EXTRA_CPPFLAGS ($psensor_heartbeat_WRAPPER_EXTRA_CPPFLAGS): component conditions not met" >&2;}
+fi
+fi
+
+    else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if MCA component psensor:heartbeat can compile" >&5
+$as_echo_n "checking if MCA component psensor:heartbeat can compile... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+    # If this component was requested as the default for this
+    # type, then abort.
+    if test "$with_psensor" = "heartbeat" ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MCA component \"heartbeat\" failed to configure properly" >&5
+$as_echo "$as_me: WARNING: MCA component \"heartbeat\" failed to configure properly" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This component was selected as the default" >&5
+$as_echo "$as_me: WARNING: This component was selected as the default" >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    if test ! -z "$DIRECT_psensor" ; then
+        if test "$DIRECT_psensor" = "heartbeat" ; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MCA component \"heartbeat\" failed to configure properly" >&5
+$as_echo "$as_me: WARNING: MCA component \"heartbeat\" failed to configure properly" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This component was selected as the default (direct call)" >&5
+$as_echo "$as_me: WARNING: This component was selected as the default (direct call)" >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    fi
+
+        # add component to all component list
+        all_components="$all_components heartbeat"
+    fi
+
+    # set the AM_CONDITIONAL on how we should build
+    if test "$compile_mode" = "dso" ; then
+        BUILD_pmix_psensor_heartbeat_DSO=1
+    else
+        BUILD_pmix_psensor_heartbeat_DSO=0
+    fi
+     if test "$BUILD_pmix_psensor_heartbeat_DSO" = "1"; then
+  MCA_BUILD_pmix_psensor_heartbeat_DSO_TRUE=
+  MCA_BUILD_pmix_psensor_heartbeat_DSO_FALSE='#'
+else
+  MCA_BUILD_pmix_psensor_heartbeat_DSO_TRUE='#'
+  MCA_BUILD_pmix_psensor_heartbeat_DSO_FALSE=
+fi
+
+
+    ac_config_files="$ac_config_files src/mca/psensor/heartbeat/Makefile"
+
+
+    unset compile_mode
+
+
+    # configure components that use built-in configuration scripts
+
+
+
+    best_mca_component_priority=0
+    components_looking_for_succeed=1
+    components_last_result=0
+
+
+    # configure components that provide their own configure script.
+    # It would be really hard to run these for "find first that
+    # works", so we don't :)
+
+
+
+                  if test "1" != "0"; then :
+
+    for component_path in $srcdir/src/mca/psensor/* ; do
+        component="`basename $component_path`"
+        if test -d $component_path && test -x $component_path/configure ; then
+            pmix_show_subsubsubtitle "MCA component psensor:$component (need to configure)"
+
+            pmix_show_verbose "PMIX_MCA_ALL_CONFIG_COMPONENTS: before, should_build="
+
+
+
+    component_path="$srcdir/src/mca/psensor/$component"
+    want_component=0
+
+    # build if:
+    # - the component type is direct and we are that component
+    # - there is no pmix_ignore file
+    # - there is an pmix_ignore, but there is an empty pmix_unignore
+    # - there is an pmix_ignore, but username is in pmix_unignore
+    if test -d $component_path ; then
+        # decide if we want the component to be built or not.  This
+        # is spread out because some of the logic is a little complex
+        # and test's syntax isn't exactly the greatest.  We want to
+        # build the component by default.
+        want_component=1
+        if test -f $component_path/.pmix_ignore ; then
+            # If there is an pmix_ignore file, don't build
+            # the component.  Note that this decision can be
+            # overridden by the unignore logic below.
+            want_component=0
+        fi
+        if test -f $component_path/.pmix_unignore ; then
+            # if there is an empty pmix_unignore, that is
+            # equivalent to having your userid in the unignore file.
+            # If userid is in the file, unignore the ignore file.
+            if test ! -s $component_path/.pmix_unignore ; then
+                want_component=1
+            elif test ! -z "`$GREP $PMIX_CONFIGURE_USER $component_path/.pmix_unignore`" ; then
+                want_component=1
+            fi
+        fi
+        # if this component type is direct and we are not it, we don't want
+        # to be built.  Otherwise, we do want to be built.
+        if test ! -z "$DIRECT_psensor" ; then
+            if test "$DIRECT_psensor" = "$component" ; then
+                want_component=1
+            else
+                want_component=0
+            fi
+        fi
+    fi
+
+    # if we were explicitly disabled, don't build :)
+    if test "$DISABLE_psensor" = "1"; then :
+  want_component=0
+fi
+    str="DISABLED_COMPONENT_CHECK=\$DISABLE_psensor_$component"
+         eval $str
+         if test "$DISABLED_COMPONENT_CHECK" = "1" ; then
+             want_component=0
+         fi
+
+    if test "$want_component" = "1"; then :
+  should_build=1
+else
+  should_build=0
+fi
+
+
+    SHARED_FRAMEWORK="$DSO_psensor"
+    str="SHARED_COMPONENT=\$DSO_psensor_$component"
+         eval $str
+
+    STATIC_FRAMEWORK="$STATIC_psensor"
+    str="STATIC_COMPONENT=\$STATIC_psensor_$component"
+         eval $str
+
+    shared_mode_override=static
+
+    # Setup for either shared or static
+    if test "$STATIC_FRAMEWORK" = "1" || \
+       test "$STATIC_COMPONENT" = "1" || \
+       test "$STATIC_all" = "1" ; then
+        compile_mode="static"
+    elif test "$shared_mode_override" = "dso" || \
+         test "$SHARED_FRAMEWORK" = "1" || \
+         test "$SHARED_COMPONENT" = "1" || \
+         test "$DSO_all" = "1"; then
+        compile_mode="dso"
+    else
+        compile_mode="static"
+    fi
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MCA component psensor:$component compile mode" >&5
+$as_echo_n "checking for MCA component psensor:$component compile mode... " >&6; }
+    if test "$DIRECT_psensor" = "$component" ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $compile_mode - direct" >&5
+$as_echo "$compile_mode - direct" >&6; }
+    else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $compile_mode" >&5
+$as_echo "$compile_mode" >&6; }
+    fi
+
+            pmix_show_verbose "PMIX_MCA_ALL_CONFIG_COMPONENTS: after, should_build=$should_build"
+
+            if test "$should_build" = "1" ; then
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in subdir_parent sub_configure subdir_dir subdir_srcdir subdir_cache_file subdir_args subdir_dots total_dir dir_part temp; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"subdir_parent sub_configure subdir_dir subdir_srcdir subdir_cache_file subdir_args subdir_dots total_dir dir_part temp\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+#
+# Invoke configure in a specific subdirectory.
+#
+# src/mca/psensor/$component is the directory to invoke in
+# $pmix_subdir_args is the list of arguments to pass
+# should_build=1 is actions to execute upon success
+# should_build=0 is actions to execute upon failure
+#
+subdir_dir="src/mca/psensor/$component"
+subdir_args="$pmix_subdir_args"
+subdir_success="should_build=1"
+subdir_failure="should_build=0"
+
+#
+# Sanity checks
+#
+
+if test "$subdir_dir" != ":" && test -d $srcdir/$subdir_dir; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: PMIX configuring in $subdir_dir" >&5
+$as_echo "$as_me: PMIX configuring in $subdir_dir" >&6;}
+
+    #
+    # Gotta check where srcdir is for VPATH builds.  If srcdir is not
+    # ., then we need to mkdir the subdir.  Otherwise, we can just cd
+    # into it.
+    #
+
+    case $srcdir in
+    .)
+	;;
+    *)
+	{ case $subdir_dir in
+	[\\/]* | ?:[\\/]* ) total_dir=;;
+	*)                      total_dir=.;;
+	esac
+	temp=$subdir_dir
+	for dir_part in `IFS='/\\'; set X $temp; shift; echo "$@"`; do
+	    case $dir_part in
+	    # Skip DOS drivespec
+	    ?:) total_dir=$dir_part ;;
+	    *)  total_dir=$total_dir/$dir_part
+		test -d "$total_dir" ||
+		mkdir "$total_dir" ||
+		as_fn_error $? "cannot create $subdir_dir" "$LINENO" 5
+		;;
+	    esac
+	done; }
+
+	if test -d ./$subdir_dir; then :;
+	else
+	    as_fn_error $? "cannot create \`pwd\`/$subdir_dir" "$LINENO" 5
+	fi
+	;;
+    esac
+
+    #
+    # Move into the target directory
+    #
+
+    subdir_parent=`pwd`
+    cd $subdir_dir
+
+    #
+    # Make a "../" for each directory in $subdir_dir.
+    #
+
+    subdir_dots=`echo $subdir_dir | sed 's,^\./,,;s,[^/]$,&/,;s,[^/]*/,../,g'`
+    #
+    # Construct the --srcdir argument
+    #
+
+    case $srcdir in
+    .)
+	# In place
+	subdir_srcdir="$srcdir"
+	;;
+    [\\/]* | ?:[\\/]* )
+	# Absolute path
+	subdir_srcdir="$srcdir/$subdir_dir"
+	;;
+    *)
+	# Relative path
+	subdir_srcdir="$subdir_dots$srcdir/$subdir_dir"
+	;;
+    esac
+
+    #
+    # Construct the --cache-file argument
+    #
+
+    # BWB - subdir caching is a pain since we change CFLAGS and all that.
+    # Just disable it for now
+    subdir_cache_file="/dev/null"
+
+    #
+    # Invoke the configure script in the subdirectory
+    #
+
+    sub_configure="$SHELL '$subdir_srcdir/configure'"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: running $sub_configure $subdir_args --cache-file=$subdir_cache_file --srcdir=$subdir_srcdir --disable-option-checking" >&5
+$as_echo "$as_me: running $sub_configure $subdir_args --cache-file=$subdir_cache_file --srcdir=$subdir_srcdir --disable-option-checking" >&6;}
+    eval "$sub_configure $subdir_args \
+	--cache-file=\"\$subdir_cache_file\" --srcdir=\"$subdir_srcdir\" --disable-option-checking"
+    if test "$?" = "0"; then
+	eval $subdir_success
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: $sub_configure succeeded for $subdir_dir" >&5
+$as_echo "$as_me: $sub_configure succeeded for $subdir_dir" >&6;}
+    else
+	eval $subdir_failure
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: $sub_configure *failed* for $subdir_dir" >&5
+$as_echo "$as_me: $sub_configure *failed* for $subdir_dir" >&6;}
+    fi
+
+    #
+    # Go back to the topdir
+    #
+
+    cd $subdir_parent
+fi
+
+#
+# Clean up
+#
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+                pmix_show_verbose "PMIX_MCA_ALL_CONFIG_COMPONENTS: after subdir, should_build=$should_build"
+            fi
+
+            if test "$should_build" = "1" ; then
+                # do some extra work to pass flags back from the
+                # top-level configure, the way a configure.m4
+                # component would.
+                infile="$srcdir/src/mca/psensor/all_components/post_configure.sh"
+                if test -f $infile; then
+
+                    # First check for the ABORT tag
+                    line="`$GREP ABORT= $infile | cut -d= -f2-`"
+                    if test -n "$line" && test "$line" != "no"; then
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MCA component configure script told me to abort" >&5
+$as_echo "$as_me: WARNING: MCA component configure script told me to abort" >&2;}
+                        as_fn_error $? "cannot continue" "$LINENO" 5
+                    fi
+
+                    line="`$GREP WRAPPER_EXTRA_LDFLAGS= $infile | cut -d= -f2-`"
+                            eval "line=$line"
+                            if test -n "$line"; then
+                                all_components_static_components_WRAPPER_EXTRA_LDFLAGS="$line"
+                            fi
+                        line="`$GREP WRAPPER_EXTRA_LIBS= $infile | cut -d= -f2-`"
+                            eval "line=$line"
+                            if test -n "$line"; then
+                                all_components_static_components_WRAPPER_EXTRA_LIBS="$line"
+                            fi
+                                        fi
+
+
+
+
+    # See if it dropped an output file for us to pick up some
+    # shell variables in.
+    infile="$srcdir/src/mca/psensor/$component/post_configure.sh"
+
+    # Add this subdir to the mast list of all MCA component subdirs
+    all_components="$all_components $component"
+
+    if test "$compile_mode" = "dso" ; then
+        dso_components="$dso_components $component"
+    else
+        if test "psensor" = "common"; then
+            # Static libraries in "common" frameworks are installed, and
+            # therefore must obey the $FRAMEWORK_LIB_PREFIX that was
+            # set.
+            static_ltlibs="mca/psensor/$component/lib${PMIX_LIB_PREFIX}mca_psensor_$component.la $static_ltlibs"
+        else
+            # Other frameworks do not have to obey the
+            # $FRAMEWORK_LIB_PREFIX prefix.
+            static_ltlibs="mca/psensor/$component/libmca_psensor_$component.la $static_ltlibs"
+        fi
+        echo "extern const pmix_mca_base_component_t mca_psensor_$component_component;" >> $outfile.extern
+        echo "  &mca_psensor_$component_component, " >> $outfile.struct
+        static_components="$static_components $component"
+    fi
+
+    # Output pretty results
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if MCA component psensor:$component can compile" >&5
+$as_echo_n "checking if MCA component psensor:$component can compile... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+                        if test -f $infile; then
+        # check for direct call header to include.  This will be
+        # AC_SUBSTed later.
+        if test "$DIRECT_psensor" = "$component" ; then
+            if test "`$GREP DIRECT_CALL_HEADER $infile`" != "" ; then
+                line="`$GREP DIRECT_CALL_HEADER $infile | cut -d= -f2-`"
+                str="MCA_pmix_psensor_DIRECT_CALL_HEADER=$line"
+                eval $str
+            else
+as_fn_error $? "*** psensor component $component was supposed to be direct-called, but
+*** does not appear to support direct calling.
+*** Aborting" "$LINENO" 5
+            fi
+        fi
+    else
+        # were we supposed to have found something in the
+        # post_configure.sh, but the file didn't exist?
+        if test "$DIRECT_psensor" = "$component" ; then
+as_fn_error $? "*** psensor component $component was supposed to be direct-called, but
+*** does not appear to support direct calling.
+*** Aborting" "$LINENO" 5
+        fi
+    fi
+
+    # if the component is building, add it's WRAPPER_EXTRA_LDFLAGS and
+    # WRAPPER_EXTRA_LIBS.  If the component doesn't specify it's
+    # WRAPPER_EXTRA_LIBS and WRAPPER_EXTRA_LDFLAGS, try using LDFLAGS and LIBS if
+    # component didn't have it's own configure script (in which case,
+    # we know it didn't set LDFLAGS and LIBS because it can't) Don't
+    # have to do this if the component is building dynamically,
+    # because it will link against these (without a dependency from
+    # libmpi.so to these flags)
+    if test "$compile_mode" = "static"; then
+        str="line=\$psensor_$component_WRAPPER_EXTRA_LDFLAGS"
+                      eval "$str"
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $line; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_ldflags}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_ldflags"; then :
+  mca_wrapper_extra_ldflags=$arg
+else
+  mca_wrapper_extra_ldflags="$mca_wrapper_extra_ldflags $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+str="line=\$psensor_$component_WRAPPER_EXTRA_LIBS"
+                      eval "$str"
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $line; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_libs}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_libs"; then :
+  mca_wrapper_extra_libs=$arg
+else
+  mca_wrapper_extra_libs="$mca_wrapper_extra_libs $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+    fi
+
+    # if needed, copy over WRAPPER_EXTRA_CPPFLAGS.  Since a configure script
+    # component can never be used in a STOP_AT_FIRST framework, we
+    # don't have to implement the else clause in the literal check...
+
+
+            else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if MCA component psensor:$component can compile" >&5
+$as_echo_n "checking if MCA component psensor:$component can compile... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+    # If this component was requested as the default for this
+    # type, then abort.
+    if test "$with_psensor" = "$component" ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MCA component \"$component\" failed to configure properly" >&5
+$as_echo "$as_me: WARNING: MCA component \"$component\" failed to configure properly" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This component was selected as the default" >&5
+$as_echo "$as_me: WARNING: This component was selected as the default" >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    if test ! -z "$DIRECT_psensor" ; then
+        if test "$DIRECT_psensor" = "$component" ; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MCA component \"$component\" failed to configure properly" >&5
+$as_echo "$as_me: WARNING: MCA component \"$component\" failed to configure properly" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This component was selected as the default (direct call)" >&5
+$as_echo "$as_me: WARNING: This component was selected as the default (direct call)" >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    fi
+
+            fi
+        fi
+    done
+
+fi
+
+    MCA_pmix_psensor_ALL_COMPONENTS="$all_components"
+    MCA_pmix_psensor_STATIC_COMPONENTS="$static_components"
+    MCA_pmix_psensor_DSO_COMPONENTS="$dso_components"
+    MCA_pmix_psensor_STATIC_LTLIBS="$static_ltlibs"
+
+
+
+
+
+
+
+    MCA_pmix_psensor_ALL_SUBDIRS=
+    for item in $all_components ; do
+       MCA_pmix_psensor_ALL_SUBDIRS="$MCA_pmix_psensor_ALL_SUBDIRS mca/psensor/$item"
+    done
+
+
+
+    MCA_pmix_psensor_STATIC_SUBDIRS=
+    for item in $static_components ; do
+       MCA_pmix_psensor_STATIC_SUBDIRS="$MCA_pmix_psensor_STATIC_SUBDIRS mca/psensor/$item"
+    done
+
+
+
+    MCA_pmix_psensor_DSO_SUBDIRS=
+    for item in $dso_components ; do
+       MCA_pmix_psensor_DSO_SUBDIRS="$MCA_pmix_psensor_DSO_SUBDIRS mca/psensor/$item"
+    done
+
+
+
+    # Create the final .h file that will be included in the type's
+    # top-level glue.  This lists all the static components.  We don't
+    # need to do this for "common".
+    if test "1" != "common"; then
+        cat > $outfile <<EOF
+/*
+ * \$HEADER\$
+ */
+#if defined(c_plusplus) || defined(__cplusplus)
+extern "C" {
+#endif
+
+`cat $outfile.extern`
+
+const pmix_mca_base_component_t *mca_psensor_base_static_components[] = {
+`cat $outfile.struct`
+  NULL
+};
+
+#if defined(c_plusplus) || defined(__cplusplus)
+}
+#endif
+
+EOF
+        # Only replace the header file if a) it doesn't previously
+        # exist, or b) the contents are different.  Do this to not
+        # trigger recompilation of certain .c files just because the
+        # timestamp changed on $outfile_real (similar to the way AC
+        # handles AC_CONFIG_HEADER files).
+        diff $outfile $outfile_real > /dev/null 2>&1
+        if test "$?" != "0"; then
+            mv $outfile $outfile_real
+        else
+            rm -f $outfile
+        fi
+    fi
+    rm -f $outfile.struct $outfile.extern
+
+    unset all_components static_components dso_components outfile outfile_real
+
+                                 MCA_pmix_FRAMEWORKS="$MCA_pmix_FRAMEWORKS ptl"
+                                 MCA_pmix_FRAMEWORKS_SUBDIRS="$MCA_pmix_FRAMEWORKS_SUBDIRS mca/ptl"
+                                 MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS="$MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS \$(MCA_pmix_ptl_ALL_SUBDIRS)"
+                                 MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS="$MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS \$(MCA_pmix_ptl_DSO_SUBDIRS)"
+                                 MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS="$MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS \$(MCA_pmix_ptl_STATIC_SUBDIRS)"
+                                 MCA_pmix_FRAMEWORK_LIBS="$MCA_pmix_FRAMEWORK_LIBS mca/ptl/libmca_ptl.la"
+                          MCA_pmix_FRAMEWORK_LIBS="$MCA_pmix_FRAMEWORK_LIBS \$(MCA_pmix_ptl_STATIC_LTLIBS)"
+
+    pmix_show_subsubtitle "Configuring MCA framework ptl"
+
+
+
+
+    # setup for framework
+    all_components=
+    static_components=
+    dso_components=
+    static_ltlibs=
+
+    # Ensure that the directory where the #include file is to live
+    # exists.  Need to do this for VPATH builds, because the directory
+    # may not exist yet.  For the "common" type, it's not really a
+    # component, so it doesn't have a base.
+    outdir=src/mca/ptl/base
+    as_dir=$outdir; as_fn_mkdir_p
+
+    # emit Makefile rule
+    ac_config_files="$ac_config_files src/mca/ptl/Makefile"
+
+
+    # remove any previously generated #include files
+    outfile_real=$outdir/static-components.h
+    outfile=$outfile_real.new
+    rm -f $outfile $outfile.struct $outfile.extern
+    touch $outfile.struct $outfile.extern
+
+    # print some nice messages about what we're about to do...
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for no configure components in framework ptl" >&5
+$as_echo_n "checking for no configure components in framework ptl... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: tcp, usock" >&5
+$as_echo "tcp, usock" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for m4 configure components in framework ptl" >&5
+$as_echo_n "checking for m4 configure components in framework ptl... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+$as_echo "" >&6; }
+
+    # If there are components in the no configure list, but we're
+    # doing one of the "special" selection logics, abort with a
+    # reasonable message.
+
+
+
+    # run the configure logic for the no-config components
+
+    pmix_show_subsubsubtitle "MCA component ptl:tcp (no configuration)"
+
+    pmix_show_verbose "PMIX_MCA_NO_CONFIG_COMPONENT: before, should_build=1"
+
+
+
+    component_path="$srcdir/src/mca/ptl/tcp"
+    want_component=0
+
+    # build if:
+    # - the component type is direct and we are that component
+    # - there is no pmix_ignore file
+    # - there is an pmix_ignore, but there is an empty pmix_unignore
+    # - there is an pmix_ignore, but username is in pmix_unignore
+    if test -d $component_path ; then
+        # decide if we want the component to be built or not.  This
+        # is spread out because some of the logic is a little complex
+        # and test's syntax isn't exactly the greatest.  We want to
+        # build the component by default.
+        want_component=1
+        if test -f $component_path/.pmix_ignore ; then
+            # If there is an pmix_ignore file, don't build
+            # the component.  Note that this decision can be
+            # overridden by the unignore logic below.
+            want_component=0
+        fi
+        if test -f $component_path/.pmix_unignore ; then
+            # if there is an empty pmix_unignore, that is
+            # equivalent to having your userid in the unignore file.
+            # If userid is in the file, unignore the ignore file.
+            if test ! -s $component_path/.pmix_unignore ; then
+                want_component=1
+            elif test ! -z "`$GREP $PMIX_CONFIGURE_USER $component_path/.pmix_unignore`" ; then
+                want_component=1
+            fi
+        fi
+        # if this component type is direct and we are not it, we don't want
+        # to be built.  Otherwise, we do want to be built.
+        if test ! -z "$DIRECT_ptl" ; then
+            if test "$DIRECT_ptl" = "tcp" ; then
+                want_component=1
+            else
+                want_component=0
+            fi
+        fi
+    fi
+
+    # if we were explicitly disabled, don't build :)
+    if test "$DISABLE_ptl" = "1"; then :
+  want_component=0
+fi
+    if test "$DISABLE_ptl_tcp" = "1"; then :
+  want_component=0
+fi
+
+    if test "$want_component" = "1"; then :
+  should_build=1
+else
+  should_build=0
+fi
+
+
+    SHARED_FRAMEWORK="$DSO_ptl"
+    SHARED_COMPONENT="$DSO_ptl_tcp"
+
+    STATIC_FRAMEWORK="$STATIC_ptl"
+    STATIC_COMPONENT="$STATIC_ptl_tcp"
+
+    shared_mode_override=static
+
+    # Setup for either shared or static
+    if test "$STATIC_FRAMEWORK" = "1" || \
+       test "$STATIC_COMPONENT" = "1" || \
+       test "$STATIC_all" = "1" ; then
+        compile_mode="static"
+    elif test "$shared_mode_override" = "dso" || \
+         test "$SHARED_FRAMEWORK" = "1" || \
+         test "$SHARED_COMPONENT" = "1" || \
+         test "$DSO_all" = "1"; then
+        compile_mode="dso"
+    else
+        compile_mode="static"
+    fi
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MCA component ptl:tcp compile mode" >&5
+$as_echo_n "checking for MCA component ptl:tcp compile mode... " >&6; }
+    if test "$DIRECT_ptl" = "tcp" ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $compile_mode - direct" >&5
+$as_echo "$compile_mode - direct" >&6; }
+    else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $compile_mode" >&5
+$as_echo "$compile_mode" >&6; }
+    fi
+
+    pmix_show_verbose "PMIX_MCA_NO_CONFIG_COMPONENT: after, should_build=$should_build"
+
+    if test "$should_build" = "1" ; then
+
+
+
+    # See if it dropped an output file for us to pick up some
+    # shell variables in.
+    infile="$srcdir/src/mca/ptl/tcp/post_configure.sh"
+
+    # Add this subdir to the mast list of all MCA component subdirs
+    all_components="$all_components tcp"
+
+    if test "$compile_mode" = "dso" ; then
+        dso_components="$dso_components tcp"
+    else
+        if test "ptl" = "common"; then
+            # Static libraries in "common" frameworks are installed, and
+            # therefore must obey the $FRAMEWORK_LIB_PREFIX that was
+            # set.
+            static_ltlibs="mca/ptl/tcp/lib${PMIX_LIB_PREFIX}mca_ptl_tcp.la $static_ltlibs"
+        else
+            # Other frameworks do not have to obey the
+            # $FRAMEWORK_LIB_PREFIX prefix.
+            static_ltlibs="mca/ptl/tcp/libmca_ptl_tcp.la $static_ltlibs"
+        fi
+        echo "extern const pmix_mca_base_component_t mca_ptl_tcp_component;" >> $outfile.extern
+        echo "  &mca_ptl_tcp_component, " >> $outfile.struct
+        static_components="$static_components tcp"
+    fi
+
+    # Output pretty results
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if MCA component ptl:tcp can compile" >&5
+$as_echo_n "checking if MCA component ptl:tcp can compile... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+                        if test -f $infile; then
+        # check for direct call header to include.  This will be
+        # AC_SUBSTed later.
+        if test "$DIRECT_ptl" = "tcp" ; then
+            if test "`$GREP DIRECT_CALL_HEADER $infile`" != "" ; then
+                line="`$GREP DIRECT_CALL_HEADER $infile | cut -d= -f2-`"
+                str="MCA_pmix_ptl_DIRECT_CALL_HEADER=$line"
+                eval $str
+            else
+as_fn_error $? "*** ptl component tcp was supposed to be direct-called, but
+*** does not appear to support direct calling.
+*** Aborting" "$LINENO" 5
+            fi
+        fi
+    else
+        # were we supposed to have found something in the
+        # post_configure.sh, but the file didn't exist?
+        if test "$DIRECT_ptl" = "tcp" ; then
+as_fn_error $? "*** ptl component tcp was supposed to be direct-called, but
+*** does not appear to support direct calling.
+*** Aborting" "$LINENO" 5
+        fi
+    fi
+
+    # if the component is building, add it's WRAPPER_EXTRA_LDFLAGS and
+    # WRAPPER_EXTRA_LIBS.  If the component doesn't specify it's
+    # WRAPPER_EXTRA_LIBS and WRAPPER_EXTRA_LDFLAGS, try using LDFLAGS and LIBS if
+    # component didn't have it's own configure script (in which case,
+    # we know it didn't set LDFLAGS and LIBS because it can't) Don't
+    # have to do this if the component is building dynamically,
+    # because it will link against these (without a dependency from
+    # libmpi.so to these flags)
+    if test "$compile_mode" = "static"; then
+        if test "$ptl_tcp_WRAPPER_EXTRA_LDFLAGS" = ""; then :
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $ptl_tcp_LDFLAGS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_ldflags}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_ldflags"; then :
+  mca_wrapper_extra_ldflags=$arg
+else
+  mca_wrapper_extra_ldflags="$mca_wrapper_extra_ldflags $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+else
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $ptl_tcp_WRAPPER_EXTRA_LDFLAGS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_ldflags}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_ldflags"; then :
+  mca_wrapper_extra_ldflags=$arg
+else
+  mca_wrapper_extra_ldflags="$mca_wrapper_extra_ldflags $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+fi
+                        if test "$ptl_tcp_WRAPPER_EXTRA_LIBS" = ""; then :
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $ptl_tcp_LIBS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_libs}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_libs"; then :
+  mca_wrapper_extra_libs=$arg
+else
+  mca_wrapper_extra_libs="$mca_wrapper_extra_libs $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+else
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $ptl_tcp_WRAPPER_EXTRA_LIBS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_libs}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_libs"; then :
+  mca_wrapper_extra_libs=$arg
+else
+  mca_wrapper_extra_libs="$mca_wrapper_extra_libs $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+fi
+
+    fi
+
+    # if needed, copy over WRAPPER_EXTRA_CPPFLAGS.  Since a configure script
+    # component can never be used in a STOP_AT_FIRST framework, we
+    # don't have to implement the else clause in the literal check...
+    if test "$ptl_tcp_WRAPPER_EXTRA_CPPFLAGS" != ""; then :
+  stop_at_first=0
+            if test "$compile_mode" = "static" && test "$stop_at_first" = "1"; then :
+  if test "$with_devel_headers" = "yes"; then :
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $ptl_tcp_WRAPPER_EXTRA_CPPFLAGS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_cppflags}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_cppflags"; then :
+  mca_wrapper_extra_cppflags=$arg
+else
+  mca_wrapper_extra_cppflags="$mca_wrapper_extra_cppflags $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+fi
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ignoring ptl_tcp_WRAPPER_EXTRA_CPPFLAGS ($ptl_tcp_WRAPPER_EXTRA_CPPFLAGS): component conditions not met" >&5
+$as_echo "$as_me: WARNING: ignoring ptl_tcp_WRAPPER_EXTRA_CPPFLAGS ($ptl_tcp_WRAPPER_EXTRA_CPPFLAGS): component conditions not met" >&2;}
+fi
+fi
+
+    else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if MCA component ptl:tcp can compile" >&5
+$as_echo_n "checking if MCA component ptl:tcp can compile... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+    # If this component was requested as the default for this
+    # type, then abort.
+    if test "$with_ptl" = "tcp" ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MCA component \"tcp\" failed to configure properly" >&5
+$as_echo "$as_me: WARNING: MCA component \"tcp\" failed to configure properly" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This component was selected as the default" >&5
+$as_echo "$as_me: WARNING: This component was selected as the default" >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    if test ! -z "$DIRECT_ptl" ; then
+        if test "$DIRECT_ptl" = "tcp" ; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MCA component \"tcp\" failed to configure properly" >&5
+$as_echo "$as_me: WARNING: MCA component \"tcp\" failed to configure properly" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This component was selected as the default (direct call)" >&5
+$as_echo "$as_me: WARNING: This component was selected as the default (direct call)" >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    fi
+
+        # add component to all component list
+        all_components="$all_components tcp"
+    fi
+
+    # set the AM_CONDITIONAL on how we should build
+    if test "$compile_mode" = "dso" ; then
+        BUILD_pmix_ptl_tcp_DSO=1
+    else
+        BUILD_pmix_ptl_tcp_DSO=0
+    fi
+     if test "$BUILD_pmix_ptl_tcp_DSO" = "1"; then
+  MCA_BUILD_pmix_ptl_tcp_DSO_TRUE=
+  MCA_BUILD_pmix_ptl_tcp_DSO_FALSE='#'
+else
+  MCA_BUILD_pmix_ptl_tcp_DSO_TRUE='#'
+  MCA_BUILD_pmix_ptl_tcp_DSO_FALSE=
+fi
+
+
+    ac_config_files="$ac_config_files src/mca/ptl/tcp/Makefile"
+
+
+    unset compile_mode
+
+    pmix_show_subsubsubtitle "MCA component ptl:usock (no configuration)"
+
+    pmix_show_verbose "PMIX_MCA_NO_CONFIG_COMPONENT: before, should_build=1"
+
+
+
+    component_path="$srcdir/src/mca/ptl/usock"
+    want_component=0
+
+    # build if:
+    # - the component type is direct and we are that component
+    # - there is no pmix_ignore file
+    # - there is an pmix_ignore, but there is an empty pmix_unignore
+    # - there is an pmix_ignore, but username is in pmix_unignore
+    if test -d $component_path ; then
+        # decide if we want the component to be built or not.  This
+        # is spread out because some of the logic is a little complex
+        # and test's syntax isn't exactly the greatest.  We want to
+        # build the component by default.
+        want_component=1
+        if test -f $component_path/.pmix_ignore ; then
+            # If there is an pmix_ignore file, don't build
+            # the component.  Note that this decision can be
+            # overridden by the unignore logic below.
+            want_component=0
+        fi
+        if test -f $component_path/.pmix_unignore ; then
+            # if there is an empty pmix_unignore, that is
+            # equivalent to having your userid in the unignore file.
+            # If userid is in the file, unignore the ignore file.
+            if test ! -s $component_path/.pmix_unignore ; then
+                want_component=1
+            elif test ! -z "`$GREP $PMIX_CONFIGURE_USER $component_path/.pmix_unignore`" ; then
+                want_component=1
+            fi
+        fi
+        # if this component type is direct and we are not it, we don't want
+        # to be built.  Otherwise, we do want to be built.
+        if test ! -z "$DIRECT_ptl" ; then
+            if test "$DIRECT_ptl" = "usock" ; then
+                want_component=1
+            else
+                want_component=0
+            fi
+        fi
+    fi
+
+    # if we were explicitly disabled, don't build :)
+    if test "$DISABLE_ptl" = "1"; then :
+  want_component=0
+fi
+    if test "$DISABLE_ptl_usock" = "1"; then :
+  want_component=0
+fi
+
+    if test "$want_component" = "1"; then :
+  should_build=1
+else
+  should_build=0
+fi
+
+
+    SHARED_FRAMEWORK="$DSO_ptl"
+    SHARED_COMPONENT="$DSO_ptl_usock"
+
+    STATIC_FRAMEWORK="$STATIC_ptl"
+    STATIC_COMPONENT="$STATIC_ptl_usock"
+
+    shared_mode_override=static
+
+    # Setup for either shared or static
+    if test "$STATIC_FRAMEWORK" = "1" || \
+       test "$STATIC_COMPONENT" = "1" || \
+       test "$STATIC_all" = "1" ; then
+        compile_mode="static"
+    elif test "$shared_mode_override" = "dso" || \
+         test "$SHARED_FRAMEWORK" = "1" || \
+         test "$SHARED_COMPONENT" = "1" || \
+         test "$DSO_all" = "1"; then
+        compile_mode="dso"
+    else
+        compile_mode="static"
+    fi
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MCA component ptl:usock compile mode" >&5
+$as_echo_n "checking for MCA component ptl:usock compile mode... " >&6; }
+    if test "$DIRECT_ptl" = "usock" ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $compile_mode - direct" >&5
+$as_echo "$compile_mode - direct" >&6; }
+    else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $compile_mode" >&5
+$as_echo "$compile_mode" >&6; }
+    fi
+
+    pmix_show_verbose "PMIX_MCA_NO_CONFIG_COMPONENT: after, should_build=$should_build"
+
+    if test "$should_build" = "1" ; then
+
+
+
+    # See if it dropped an output file for us to pick up some
+    # shell variables in.
+    infile="$srcdir/src/mca/ptl/usock/post_configure.sh"
+
+    # Add this subdir to the mast list of all MCA component subdirs
+    all_components="$all_components usock"
+
+    if test "$compile_mode" = "dso" ; then
+        dso_components="$dso_components usock"
+    else
+        if test "ptl" = "common"; then
+            # Static libraries in "common" frameworks are installed, and
+            # therefore must obey the $FRAMEWORK_LIB_PREFIX that was
+            # set.
+            static_ltlibs="mca/ptl/usock/lib${PMIX_LIB_PREFIX}mca_ptl_usock.la $static_ltlibs"
+        else
+            # Other frameworks do not have to obey the
+            # $FRAMEWORK_LIB_PREFIX prefix.
+            static_ltlibs="mca/ptl/usock/libmca_ptl_usock.la $static_ltlibs"
+        fi
+        echo "extern const pmix_mca_base_component_t mca_ptl_usock_component;" >> $outfile.extern
+        echo "  &mca_ptl_usock_component, " >> $outfile.struct
+        static_components="$static_components usock"
+    fi
+
+    # Output pretty results
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if MCA component ptl:usock can compile" >&5
+$as_echo_n "checking if MCA component ptl:usock can compile... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+                        if test -f $infile; then
+        # check for direct call header to include.  This will be
+        # AC_SUBSTed later.
+        if test "$DIRECT_ptl" = "usock" ; then
+            if test "`$GREP DIRECT_CALL_HEADER $infile`" != "" ; then
+                line="`$GREP DIRECT_CALL_HEADER $infile | cut -d= -f2-`"
+                str="MCA_pmix_ptl_DIRECT_CALL_HEADER=$line"
+                eval $str
+            else
+as_fn_error $? "*** ptl component usock was supposed to be direct-called, but
+*** does not appear to support direct calling.
+*** Aborting" "$LINENO" 5
+            fi
+        fi
+    else
+        # were we supposed to have found something in the
+        # post_configure.sh, but the file didn't exist?
+        if test "$DIRECT_ptl" = "usock" ; then
+as_fn_error $? "*** ptl component usock was supposed to be direct-called, but
+*** does not appear to support direct calling.
+*** Aborting" "$LINENO" 5
+        fi
+    fi
+
+    # if the component is building, add it's WRAPPER_EXTRA_LDFLAGS and
+    # WRAPPER_EXTRA_LIBS.  If the component doesn't specify it's
+    # WRAPPER_EXTRA_LIBS and WRAPPER_EXTRA_LDFLAGS, try using LDFLAGS and LIBS if
+    # component didn't have it's own configure script (in which case,
+    # we know it didn't set LDFLAGS and LIBS because it can't) Don't
+    # have to do this if the component is building dynamically,
+    # because it will link against these (without a dependency from
+    # libmpi.so to these flags)
+    if test "$compile_mode" = "static"; then
+        if test "$ptl_usock_WRAPPER_EXTRA_LDFLAGS" = ""; then :
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $ptl_usock_LDFLAGS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_ldflags}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_ldflags"; then :
+  mca_wrapper_extra_ldflags=$arg
+else
+  mca_wrapper_extra_ldflags="$mca_wrapper_extra_ldflags $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+else
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $ptl_usock_WRAPPER_EXTRA_LDFLAGS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_ldflags}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_ldflags"; then :
+  mca_wrapper_extra_ldflags=$arg
+else
+  mca_wrapper_extra_ldflags="$mca_wrapper_extra_ldflags $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+fi
+                        if test "$ptl_usock_WRAPPER_EXTRA_LIBS" = ""; then :
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $ptl_usock_LIBS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_libs}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_libs"; then :
+  mca_wrapper_extra_libs=$arg
+else
+  mca_wrapper_extra_libs="$mca_wrapper_extra_libs $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+else
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $ptl_usock_WRAPPER_EXTRA_LIBS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_libs}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_libs"; then :
+  mca_wrapper_extra_libs=$arg
+else
+  mca_wrapper_extra_libs="$mca_wrapper_extra_libs $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+fi
+
+    fi
+
+    # if needed, copy over WRAPPER_EXTRA_CPPFLAGS.  Since a configure script
+    # component can never be used in a STOP_AT_FIRST framework, we
+    # don't have to implement the else clause in the literal check...
+    if test "$ptl_usock_WRAPPER_EXTRA_CPPFLAGS" != ""; then :
+  stop_at_first=0
+            if test "$compile_mode" = "static" && test "$stop_at_first" = "1"; then :
+  if test "$with_devel_headers" = "yes"; then :
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $ptl_usock_WRAPPER_EXTRA_CPPFLAGS; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_cppflags}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_cppflags"; then :
+  mca_wrapper_extra_cppflags=$arg
+else
+  mca_wrapper_extra_cppflags="$mca_wrapper_extra_cppflags $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+fi
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ignoring ptl_usock_WRAPPER_EXTRA_CPPFLAGS ($ptl_usock_WRAPPER_EXTRA_CPPFLAGS): component conditions not met" >&5
+$as_echo "$as_me: WARNING: ignoring ptl_usock_WRAPPER_EXTRA_CPPFLAGS ($ptl_usock_WRAPPER_EXTRA_CPPFLAGS): component conditions not met" >&2;}
+fi
+fi
+
+    else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if MCA component ptl:usock can compile" >&5
+$as_echo_n "checking if MCA component ptl:usock can compile... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+    # If this component was requested as the default for this
+    # type, then abort.
+    if test "$with_ptl" = "usock" ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MCA component \"usock\" failed to configure properly" >&5
+$as_echo "$as_me: WARNING: MCA component \"usock\" failed to configure properly" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This component was selected as the default" >&5
+$as_echo "$as_me: WARNING: This component was selected as the default" >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    if test ! -z "$DIRECT_ptl" ; then
+        if test "$DIRECT_ptl" = "usock" ; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MCA component \"usock\" failed to configure properly" >&5
+$as_echo "$as_me: WARNING: MCA component \"usock\" failed to configure properly" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This component was selected as the default (direct call)" >&5
+$as_echo "$as_me: WARNING: This component was selected as the default (direct call)" >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    fi
+
+        # add component to all component list
+        all_components="$all_components usock"
+    fi
+
+    # set the AM_CONDITIONAL on how we should build
+    if test "$compile_mode" = "dso" ; then
+        BUILD_pmix_ptl_usock_DSO=1
+    else
+        BUILD_pmix_ptl_usock_DSO=0
+    fi
+     if test "$BUILD_pmix_ptl_usock_DSO" = "1"; then
+  MCA_BUILD_pmix_ptl_usock_DSO_TRUE=
+  MCA_BUILD_pmix_ptl_usock_DSO_FALSE='#'
+else
+  MCA_BUILD_pmix_ptl_usock_DSO_TRUE='#'
+  MCA_BUILD_pmix_ptl_usock_DSO_FALSE=
+fi
+
+
+    ac_config_files="$ac_config_files src/mca/ptl/usock/Makefile"
+
+
+    unset compile_mode
+
+
+    # configure components that use built-in configuration scripts
+
+
+
+    best_mca_component_priority=0
+    components_looking_for_succeed=1
+    components_last_result=0
+
+
+    # configure components that provide their own configure script.
+    # It would be really hard to run these for "find first that
+    # works", so we don't :)
+
+
+
+                  if test "1" != "0"; then :
+
+    for component_path in $srcdir/src/mca/ptl/* ; do
+        component="`basename $component_path`"
+        if test -d $component_path && test -x $component_path/configure ; then
+            pmix_show_subsubsubtitle "MCA component ptl:$component (need to configure)"
+
+            pmix_show_verbose "PMIX_MCA_ALL_CONFIG_COMPONENTS: before, should_build="
+
+
+
+    component_path="$srcdir/src/mca/ptl/$component"
+    want_component=0
+
+    # build if:
+    # - the component type is direct and we are that component
+    # - there is no pmix_ignore file
+    # - there is an pmix_ignore, but there is an empty pmix_unignore
+    # - there is an pmix_ignore, but username is in pmix_unignore
+    if test -d $component_path ; then
+        # decide if we want the component to be built or not.  This
+        # is spread out because some of the logic is a little complex
+        # and test's syntax isn't exactly the greatest.  We want to
+        # build the component by default.
+        want_component=1
+        if test -f $component_path/.pmix_ignore ; then
+            # If there is an pmix_ignore file, don't build
+            # the component.  Note that this decision can be
+            # overridden by the unignore logic below.
+            want_component=0
+        fi
+        if test -f $component_path/.pmix_unignore ; then
+            # if there is an empty pmix_unignore, that is
+            # equivalent to having your userid in the unignore file.
+            # If userid is in the file, unignore the ignore file.
+            if test ! -s $component_path/.pmix_unignore ; then
+                want_component=1
+            elif test ! -z "`$GREP $PMIX_CONFIGURE_USER $component_path/.pmix_unignore`" ; then
+                want_component=1
+            fi
+        fi
+        # if this component type is direct and we are not it, we don't want
+        # to be built.  Otherwise, we do want to be built.
+        if test ! -z "$DIRECT_ptl" ; then
+            if test "$DIRECT_ptl" = "$component" ; then
+                want_component=1
+            else
+                want_component=0
+            fi
+        fi
+    fi
+
+    # if we were explicitly disabled, don't build :)
+    if test "$DISABLE_ptl" = "1"; then :
+  want_component=0
+fi
+    str="DISABLED_COMPONENT_CHECK=\$DISABLE_ptl_$component"
+         eval $str
+         if test "$DISABLED_COMPONENT_CHECK" = "1" ; then
+             want_component=0
+         fi
+
+    if test "$want_component" = "1"; then :
+  should_build=1
+else
+  should_build=0
+fi
+
+
+    SHARED_FRAMEWORK="$DSO_ptl"
+    str="SHARED_COMPONENT=\$DSO_ptl_$component"
+         eval $str
+
+    STATIC_FRAMEWORK="$STATIC_ptl"
+    str="STATIC_COMPONENT=\$STATIC_ptl_$component"
+         eval $str
+
+    shared_mode_override=static
+
+    # Setup for either shared or static
+    if test "$STATIC_FRAMEWORK" = "1" || \
+       test "$STATIC_COMPONENT" = "1" || \
+       test "$STATIC_all" = "1" ; then
+        compile_mode="static"
+    elif test "$shared_mode_override" = "dso" || \
+         test "$SHARED_FRAMEWORK" = "1" || \
+         test "$SHARED_COMPONENT" = "1" || \
+         test "$DSO_all" = "1"; then
+        compile_mode="dso"
+    else
+        compile_mode="static"
+    fi
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MCA component ptl:$component compile mode" >&5
+$as_echo_n "checking for MCA component ptl:$component compile mode... " >&6; }
+    if test "$DIRECT_ptl" = "$component" ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $compile_mode - direct" >&5
+$as_echo "$compile_mode - direct" >&6; }
+    else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $compile_mode" >&5
+$as_echo "$compile_mode" >&6; }
+    fi
+
+            pmix_show_verbose "PMIX_MCA_ALL_CONFIG_COMPONENTS: after, should_build=$should_build"
+
+            if test "$should_build" = "1" ; then
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in subdir_parent sub_configure subdir_dir subdir_srcdir subdir_cache_file subdir_args subdir_dots total_dir dir_part temp; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"subdir_parent sub_configure subdir_dir subdir_srcdir subdir_cache_file subdir_args subdir_dots total_dir dir_part temp\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+#
+# Invoke configure in a specific subdirectory.
+#
+# src/mca/ptl/$component is the directory to invoke in
+# $pmix_subdir_args is the list of arguments to pass
+# should_build=1 is actions to execute upon success
+# should_build=0 is actions to execute upon failure
+#
+subdir_dir="src/mca/ptl/$component"
+subdir_args="$pmix_subdir_args"
+subdir_success="should_build=1"
+subdir_failure="should_build=0"
+
+#
+# Sanity checks
+#
+
+if test "$subdir_dir" != ":" && test -d $srcdir/$subdir_dir; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: PMIX configuring in $subdir_dir" >&5
+$as_echo "$as_me: PMIX configuring in $subdir_dir" >&6;}
+
+    #
+    # Gotta check where srcdir is for VPATH builds.  If srcdir is not
+    # ., then we need to mkdir the subdir.  Otherwise, we can just cd
+    # into it.
+    #
+
+    case $srcdir in
+    .)
+	;;
+    *)
+	{ case $subdir_dir in
+	[\\/]* | ?:[\\/]* ) total_dir=;;
+	*)                      total_dir=.;;
+	esac
+	temp=$subdir_dir
+	for dir_part in `IFS='/\\'; set X $temp; shift; echo "$@"`; do
+	    case $dir_part in
+	    # Skip DOS drivespec
+	    ?:) total_dir=$dir_part ;;
+	    *)  total_dir=$total_dir/$dir_part
+		test -d "$total_dir" ||
+		mkdir "$total_dir" ||
+		as_fn_error $? "cannot create $subdir_dir" "$LINENO" 5
+		;;
+	    esac
+	done; }
+
+	if test -d ./$subdir_dir; then :;
+	else
+	    as_fn_error $? "cannot create \`pwd\`/$subdir_dir" "$LINENO" 5
+	fi
+	;;
+    esac
+
+    #
+    # Move into the target directory
+    #
+
+    subdir_parent=`pwd`
+    cd $subdir_dir
+
+    #
+    # Make a "../" for each directory in $subdir_dir.
+    #
+
+    subdir_dots=`echo $subdir_dir | sed 's,^\./,,;s,[^/]$,&/,;s,[^/]*/,../,g'`
+    #
+    # Construct the --srcdir argument
+    #
+
+    case $srcdir in
+    .)
+	# In place
+	subdir_srcdir="$srcdir"
+	;;
+    [\\/]* | ?:[\\/]* )
+	# Absolute path
+	subdir_srcdir="$srcdir/$subdir_dir"
+	;;
+    *)
+	# Relative path
+	subdir_srcdir="$subdir_dots$srcdir/$subdir_dir"
+	;;
+    esac
+
+    #
+    # Construct the --cache-file argument
+    #
+
+    # BWB - subdir caching is a pain since we change CFLAGS and all that.
+    # Just disable it for now
+    subdir_cache_file="/dev/null"
+
+    #
+    # Invoke the configure script in the subdirectory
+    #
+
+    sub_configure="$SHELL '$subdir_srcdir/configure'"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: running $sub_configure $subdir_args --cache-file=$subdir_cache_file --srcdir=$subdir_srcdir --disable-option-checking" >&5
+$as_echo "$as_me: running $sub_configure $subdir_args --cache-file=$subdir_cache_file --srcdir=$subdir_srcdir --disable-option-checking" >&6;}
+    eval "$sub_configure $subdir_args \
+	--cache-file=\"\$subdir_cache_file\" --srcdir=\"$subdir_srcdir\" --disable-option-checking"
+    if test "$?" = "0"; then
+	eval $subdir_success
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: $sub_configure succeeded for $subdir_dir" >&5
+$as_echo "$as_me: $sub_configure succeeded for $subdir_dir" >&6;}
+    else
+	eval $subdir_failure
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: $sub_configure *failed* for $subdir_dir" >&5
+$as_echo "$as_me: $sub_configure *failed* for $subdir_dir" >&6;}
+    fi
+
+    #
+    # Go back to the topdir
+    #
+
+    cd $subdir_parent
+fi
+
+#
+# Clean up
+#
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+                pmix_show_verbose "PMIX_MCA_ALL_CONFIG_COMPONENTS: after subdir, should_build=$should_build"
+            fi
+
+            if test "$should_build" = "1" ; then
+                # do some extra work to pass flags back from the
+                # top-level configure, the way a configure.m4
+                # component would.
+                infile="$srcdir/src/mca/ptl/all_components/post_configure.sh"
+                if test -f $infile; then
+
+                    # First check for the ABORT tag
+                    line="`$GREP ABORT= $infile | cut -d= -f2-`"
+                    if test -n "$line" && test "$line" != "no"; then
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MCA component configure script told me to abort" >&5
+$as_echo "$as_me: WARNING: MCA component configure script told me to abort" >&2;}
+                        as_fn_error $? "cannot continue" "$LINENO" 5
+                    fi
+
+                    line="`$GREP WRAPPER_EXTRA_LDFLAGS= $infile | cut -d= -f2-`"
+                            eval "line=$line"
+                            if test -n "$line"; then
+                                all_components_static_components_WRAPPER_EXTRA_LDFLAGS="$line"
+                            fi
+                        line="`$GREP WRAPPER_EXTRA_LIBS= $infile | cut -d= -f2-`"
+                            eval "line=$line"
+                            if test -n "$line"; then
+                                all_components_static_components_WRAPPER_EXTRA_LIBS="$line"
+                            fi
+                                        fi
+
+
+
+
+    # See if it dropped an output file for us to pick up some
+    # shell variables in.
+    infile="$srcdir/src/mca/ptl/$component/post_configure.sh"
+
+    # Add this subdir to the mast list of all MCA component subdirs
+    all_components="$all_components $component"
+
+    if test "$compile_mode" = "dso" ; then
+        dso_components="$dso_components $component"
+    else
+        if test "ptl" = "common"; then
+            # Static libraries in "common" frameworks are installed, and
+            # therefore must obey the $FRAMEWORK_LIB_PREFIX that was
+            # set.
+            static_ltlibs="mca/ptl/$component/lib${PMIX_LIB_PREFIX}mca_ptl_$component.la $static_ltlibs"
+        else
+            # Other frameworks do not have to obey the
+            # $FRAMEWORK_LIB_PREFIX prefix.
+            static_ltlibs="mca/ptl/$component/libmca_ptl_$component.la $static_ltlibs"
+        fi
+        echo "extern const pmix_mca_base_component_t mca_ptl_$component_component;" >> $outfile.extern
+        echo "  &mca_ptl_$component_component, " >> $outfile.struct
+        static_components="$static_components $component"
+    fi
+
+    # Output pretty results
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if MCA component ptl:$component can compile" >&5
+$as_echo_n "checking if MCA component ptl:$component can compile... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+                        if test -f $infile; then
+        # check for direct call header to include.  This will be
+        # AC_SUBSTed later.
+        if test "$DIRECT_ptl" = "$component" ; then
+            if test "`$GREP DIRECT_CALL_HEADER $infile`" != "" ; then
+                line="`$GREP DIRECT_CALL_HEADER $infile | cut -d= -f2-`"
+                str="MCA_pmix_ptl_DIRECT_CALL_HEADER=$line"
+                eval $str
+            else
+as_fn_error $? "*** ptl component $component was supposed to be direct-called, but
+*** does not appear to support direct calling.
+*** Aborting" "$LINENO" 5
+            fi
+        fi
+    else
+        # were we supposed to have found something in the
+        # post_configure.sh, but the file didn't exist?
+        if test "$DIRECT_ptl" = "$component" ; then
+as_fn_error $? "*** ptl component $component was supposed to be direct-called, but
+*** does not appear to support direct calling.
+*** Aborting" "$LINENO" 5
+        fi
+    fi
+
+    # if the component is building, add it's WRAPPER_EXTRA_LDFLAGS and
+    # WRAPPER_EXTRA_LIBS.  If the component doesn't specify it's
+    # WRAPPER_EXTRA_LIBS and WRAPPER_EXTRA_LDFLAGS, try using LDFLAGS and LIBS if
+    # component didn't have it's own configure script (in which case,
+    # we know it didn't set LDFLAGS and LIBS because it can't) Don't
+    # have to do this if the component is building dynamically,
+    # because it will link against these (without a dependency from
+    # libmpi.so to these flags)
+    if test "$compile_mode" = "static"; then
+        str="line=\$ptl_$component_WRAPPER_EXTRA_LDFLAGS"
+                      eval "$str"
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $line; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_ldflags}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_ldflags"; then :
+  mca_wrapper_extra_ldflags=$arg
+else
+  mca_wrapper_extra_ldflags="$mca_wrapper_extra_ldflags $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+str="line=\$ptl_$component_WRAPPER_EXTRA_LIBS"
+                      eval "$str"
+
+
+
+    # Is the private index set?  If not, set it.
+    if test "x$pmix_scope_index" = "x"; then
+        pmix_scope_index=1
+    fi
+
+    # First, check to see if any of these variables are already set.
+    # This is a simple sanity check to ensure we're not already
+    # overwriting pre-existing variables (that have a non-empty
+    # value).  It's not a perfect check, but at least it's something.
+    for pmix_var in pmix_tmp pmix_append; do
+        pmix_str="pmix_str=\"\$$pmix_var\""
+        eval $pmix_str
+
+        if test "x$pmix_str" != "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5
+$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_PUSH called on \"$pmix_var\"," >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$pmix_str\"" >&5
+$as_echo "$as_me: WARNING: but it is already defined with value \"$pmix_str\"" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    done
+
+    # Ok, we passed the simple sanity check.  Save all these names so
+    # that we can unset them at the end of the scope.
+    pmix_str="pmix_scope_$pmix_scope_index=\"pmix_tmp pmix_append\""
+    eval $pmix_str
+    unset pmix_str
+
+    env | grep pmix_scope
+    pmix_scope_index=`expr $pmix_scope_index + 1`
+
+
+    for arg in $line; do
+        pmix_tmp=`echo $arg | cut -c1-2`
+        pmix_append=1
+        if test "$pmix_tmp" = "-I" || test "$pmix_tmp" = "-L" || test "$pmix_tmp" = "-l"; then :
+  for val in ${mca_wrapper_extra_libs}; do
+                   if test "x$val" = "x$arg"; then :
+  pmix_append=0
+fi
+               done
+fi
+        if test "$pmix_append" = "1"; then :
+  if test -z "$mca_wrapper_extra_libs"; then :
+  mca_wrapper_extra_libs=$arg
+else
+  mca_wrapper_extra_libs="$mca_wrapper_extra_libs $arg"
+fi
+fi
+    done
+
+
+    # Unwind the index
+    pmix_scope_index=`expr $pmix_scope_index - 1`
+    pmix_scope_test=`expr $pmix_scope_index \> 0`
+    if test "$pmix_scope_test" = "0"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&5
+$as_echo "$as_me: WARNING: PMIX_VAR_SCOPE_POP popped too many PMIX configure scopes." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5
+$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    # Get the variable names from that index
+    pmix_str="pmix_str=\"\$pmix_scope_$pmix_scope_index\""
+    eval $pmix_str
+
+    # Iterate over all the variables and unset them all
+    for pmix_var in $pmix_str; do
+        unset $pmix_var
+    done
+
+
+    fi
+
+    # if needed, copy over WRAPPER_EXTRA_CPPFLAGS.  Since a configure script
+    # component can never be used in a STOP_AT_FIRST framework, we
+    # don't have to implement the else clause in the literal check...
+
+
+            else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if MCA component ptl:$component can compile" >&5
+$as_echo_n "checking if MCA component ptl:$component can compile... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+    # If this component was requested as the default for this
+    # type, then abort.
+    if test "$with_ptl" = "$component" ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MCA component \"$component\" failed to configure properly" >&5
+$as_echo "$as_me: WARNING: MCA component \"$component\" failed to configure properly" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This component was selected as the default" >&5
+$as_echo "$as_me: WARNING: This component was selected as the default" >&2;}
+        as_fn_error $? "Cannot continue" "$LINENO" 5
+    fi
+
+    if test ! -z "$DIRECT_ptl" ; then
+        if test "$DIRECT_ptl" = "$component" ; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MCA component \"$component\" failed to configure properly" >&5
+$as_echo "$as_me: WARNING: MCA component \"$component\" failed to configure properly" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This component was selected as the default (direct call)" >&5
+$as_echo "$as_me: WARNING: This component was selected as the default (direct call)" >&2;}
+            as_fn_error $? "Cannot continue" "$LINENO" 5
+        fi
+    fi
+
+            fi
+        fi
+    done
+
+fi
+
+    MCA_pmix_ptl_ALL_COMPONENTS="$all_components"
+    MCA_pmix_ptl_STATIC_COMPONENTS="$static_components"
+    MCA_pmix_ptl_DSO_COMPONENTS="$dso_components"
+    MCA_pmix_ptl_STATIC_LTLIBS="$static_ltlibs"
+
+
+
+
+
+
+
+    MCA_pmix_ptl_ALL_SUBDIRS=
+    for item in $all_components ; do
+       MCA_pmix_ptl_ALL_SUBDIRS="$MCA_pmix_ptl_ALL_SUBDIRS mca/ptl/$item"
+    done
+
+
+
+    MCA_pmix_ptl_STATIC_SUBDIRS=
+    for item in $static_components ; do
+       MCA_pmix_ptl_STATIC_SUBDIRS="$MCA_pmix_ptl_STATIC_SUBDIRS mca/ptl/$item"
+    done
+
+
+
+    MCA_pmix_ptl_DSO_SUBDIRS=
+    for item in $dso_components ; do
+       MCA_pmix_ptl_DSO_SUBDIRS="$MCA_pmix_ptl_DSO_SUBDIRS mca/ptl/$item"
+    done
+
+
+
+    # Create the final .h file that will be included in the type's
+    # top-level glue.  This lists all the static components.  We don't
+    # need to do this for "common".
+    if test "1" != "common"; then
+        cat > $outfile <<EOF
+/*
+ * \$HEADER\$
+ */
+#if defined(c_plusplus) || defined(__cplusplus)
+extern "C" {
+#endif
+
+`cat $outfile.extern`
+
+const pmix_mca_base_component_t *mca_ptl_base_static_components[] = {
+`cat $outfile.struct`
+  NULL
+};
+
+#if defined(c_plusplus) || defined(__cplusplus)
+}
+#endif
+
+EOF
+        # Only replace the header file if a) it doesn't previously
+        # exist, or b) the contents are different.  Do this to not
+        # trigger recompilation of certain .c files just because the
+        # timestamp changed on $outfile_real (similar to the way AC
+        # handles AC_CONFIG_HEADER files).
+        diff $outfile $outfile_real > /dev/null 2>&1
+        if test "$?" != "0"; then
+            mv $outfile $outfile_real
+        else
+            rm -f $outfile
+        fi
+    fi
+    rm -f $outfile.struct $outfile.extern
+
+    unset all_components static_components dso_components outfile outfile_real
+
+
+    # note that mca_wrapper_extra_* is a running list, and we take checkpoints at the end of our project
+    pmix_mca_wrapper_extra_cppflags="$mca_wrapper_extra_cppflags"
+    pmix_mca_wrapper_extra_ldflags="$mca_wrapper_extra_ldflags"
+    pmix_mca_wrapper_extra_libs="$mca_wrapper_extra_libs"
+
+
+
+
+
+
+
+
+
+
+
+
+    ##################################
+    # Dstore Locking
+    ##################################
+
+    pmix_show_title "Dstore Locking"
+
+
+    orig_libs=$LIBS
+    LIBS="-lpthread $LIBS"
+
+    _x_ac_pthread_lock_found="0"
+    _x_ac_fcntl_lock_found="0"
+
+    ac_fn_c_check_member "$LINENO" "struct flock" "l_type" "ac_cv_member_struct_flock_l_type" "#include <fcntl.h>
+"
+if test "x$ac_cv_member_struct_flock_l_type" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_FLOCK_L_TYPE 1
+_ACEOF
+
+
+
+$as_echo "#define HAVE_FCNTL_FLOCK 1" >>confdefs.h
+
+        _x_ac_fcntl_lock_found="1"
+
+fi
+
+
+    if test "$DSTORE_PTHREAD_LOCK" = "1"; then
+        ac_fn_c_check_func "$LINENO" "pthread_rwlockattr_setkind_np" "ac_cv_func_pthread_rwlockattr_setkind_np"
+if test "x$ac_cv_func_pthread_rwlockattr_setkind_np" = xyes; then :
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <pthread.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP" >/dev/null 2>&1; then :
+
+
+$as_echo "#define HAVE_PTHREAD_SETKIND 1" >>confdefs.h
+
+fi
+rm -f conftest*
+
+fi
+
+
+        ac_fn_c_check_func "$LINENO" "pthread_rwlockattr_setpshared" "ac_cv_func_pthread_rwlockattr_setpshared"
+if test "x$ac_cv_func_pthread_rwlockattr_setpshared" = xyes; then :
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <pthread.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "PTHREAD_PROCESS_SHARED" >/dev/null 2>&1; then :
+
+
+$as_echo "#define HAVE_PTHREAD_SHARED 1" >>confdefs.h
+
+                        _x_ac_pthread_lock_found="1"
+
+fi
+rm -f conftest*
+
+
+fi
+
+
+        if test "$_x_ac_pthread_lock_found" = "0"; then
+            if test "$_x_ac_fcntl_lock_found" = "1"; then
+                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: dstore: pthread-based locking not found, will use fcntl-based locking." >&5
+$as_echo "$as_me: WARNING: dstore: pthread-based locking not found, will use fcntl-based locking." >&2;}
+            else
+                as_fn_error $? "dstore: no available locking mechanisms was found. Can not continue. Try disabling dstore" "$LINENO" 5
+            fi
+        fi
+    else
+        if test "$_x_ac_fcntl_lock_found" = "0"; then
+            as_fn_error $? "dstore: no available locking mechanisms was found. Can not continue. Try disabling dstore" "$LINENO" 5
+        fi
+        LIBS="$orig_libs"
+    fi
+
+
+
+    ############################################################################
+    # final compiler config
+    ############################################################################
+
+    pmix_show_subtitle "Set path-related compiler flags"
+
+    #
+    # This is needed for VPATH builds, so that it will -I the appropriate
+    # include directory.  We delayed doing it until now just so that
+    # '-I$(top_srcdir)' doesn't show up in any of the configure output --
+    # purely aesthetic.
+    #
+    # Because pmix_config.h is created by AC_CONFIG_HEADERS, we
+    # don't need to -I the builddir for pmix/include. However, if we
+    # are VPATH building, we do need to include the source directories.
+    #
+    if test "$PMIX_top_builddir" != "$PMIX_top_srcdir"; then
+        # Note the embedded m4 directives here -- we must embed them
+        # rather than have successive assignments to these shell
+        # variables, lest the $(foo) names try to get evaluated here.
+        # Yuck!
+        CPPFLAGS="-I$PMIX_top_builddir -I$PMIX_top_srcdir -I$PMIX_top_srcdir/src -I$PMIX_top_builddir/include -I$PMIX_top_srcdir/include $CPPFLAGS"
+    else
+        CPPFLAGS="-I$PMIX_top_srcdir -I$PMIX_top_srcdir/src -I$PMIX_top_srcdir/include $CPPFLAGS"
+    fi
+
+    # pmixdatadir, pmixlibdir, and pmixinclude are essentially the same as
+    # pkg*dir, but will always be */pmix.
+    pmixdatadir='${datadir}/pmix'
+    pmixlibdir='${libdir}/pmix'
+    pmixincludedir='${includedir}/pmix'
+
+
+
+
+    ############################################################################
+    # final output
+    ############################################################################
+
+    pmix_show_subtitle "Final output"
+
+    ac_config_files="$ac_config_files Makefile config/Makefile include/Makefile src/Makefile src/util/keyval/Makefile src/mca/base/Makefile"
+
+
+    # publish any embedded flags so external wrappers can use them
+
+
+
+
+    # Success
+
+
+
+# Run the AM_CONDITIONALs
+
+    if test "$pmix_did_am_conditionals" != "yes"; then :
+
+         if test "x$pmix_mode" = "xembedded"; then
+  PMIX_EMBEDDED_MODE_TRUE=
+  PMIX_EMBEDDED_MODE_FALSE='#'
+else
+  PMIX_EMBEDDED_MODE_TRUE='#'
+  PMIX_EMBEDDED_MODE_FALSE=
+fi
+
+         if test "x$pmix_tests" = "xyes"; then
+  PMIX_TESTS_EXAMPLES_TRUE=
+  PMIX_TESTS_EXAMPLES_FALSE='#'
+else
+  PMIX_TESTS_EXAMPLES_TRUE='#'
+  PMIX_TESTS_EXAMPLES_FALSE=
+fi
+
+         if test "$WANT_TIMING" = "1"; then
+  PMIX_COMPILE_TIMING_TRUE=
+  PMIX_COMPILE_TIMING_FALSE='#'
+else
+  PMIX_COMPILE_TIMING_TRUE='#'
+  PMIX_COMPILE_TIMING_FALSE=
+fi
+
+         if test "$pmix_munge_support" = "1"; then
+  PMIX_WANT_MUNGE_TRUE=
+  PMIX_WANT_MUNGE_FALSE='#'
+else
+  PMIX_WANT_MUNGE_TRUE='#'
+  PMIX_WANT_MUNGE_FALSE=
+fi
+
+         if test "$pmix_sasl_support" = "1"; then
+  PMIX_WANT_SASL_TRUE=
+  PMIX_WANT_SASL_FALSE='#'
+else
+  PMIX_WANT_SASL_TRUE='#'
+  PMIX_WANT_SASL_FALSE=
+fi
+
+         if test "x$enable_dstore" != "xno"; then
+  WANT_DSTORE_TRUE=
+  WANT_DSTORE_FALSE='#'
+else
+  WANT_DSTORE_TRUE='#'
+  WANT_DSTORE_FALSE=
+fi
+
+         if test "x$pmix_install_primary_headers" = "xyes"; then
+  WANT_PRIMARY_HEADERS_TRUE=
+  WANT_PRIMARY_HEADERS_FALSE='#'
+else
+  WANT_PRIMARY_HEADERS_TRUE='#'
+  WANT_PRIMARY_HEADERS_FALSE=
+fi
+
+         if test "$WANT_INSTALL_HEADERS" = 1; then
+  WANT_INSTALL_HEADERS_TRUE=
+  WANT_INSTALL_HEADERS_FALSE='#'
+else
+  WANT_INSTALL_HEADERS_TRUE='#'
+  WANT_INSTALL_HEADERS_FALSE=
+fi
+
+         if test "$WANT_PMI_BACKWARD" = 1; then
+  WANT_PMI_BACKWARD_TRUE=
+  WANT_PMI_BACKWARD_FALSE='#'
+else
+  WANT_PMI_BACKWARD_TRUE='#'
+  WANT_PMI_BACKWARD_FALSE=
+fi
+
+
+fi
+    pmix_did_am_conditionals=yes
+
+
+####################################################################
+# Setup C compiler
+####################################################################
+
+
+if test -z "$CC_FOR_BUILD"; then :
+
+    CC_FOR_BUILD=$CC
+
+
+fi
+
+
+    # AM_PROG_CC_C_O AC_REQUIREs AC_PROG_CC, so we have to be a little
+    # careful about ordering here, and AC_REQUIRE these things so that
+    # they get stamped out in the right order.
+
+
+
+
+
+    # We require a C99 compiant compiler
+    # The result of AC_PROG_CC_C99 is stored in ac_cv_prog_cc_c99
+    if test "x$ac_cv_prog_cc_c99" = xno ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PMIx requires a C99 compiler" >&5
+$as_echo "$as_me: WARNING: PMIx requires a C99 compiler" >&2;}
+        as_fn_error $? "Aborting." "$LINENO" 5
+    fi
+
+
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the C compiler vendor" >&5
+$as_echo_n "checking for the C compiler vendor... " >&6; }
+if ${pmix_cv_c_compiler_vendor+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+    pmix_check_compiler_vendor_result="unknown"
+
+    # GNU is probably the most common, so check that one as soon as
+    # possible.  Intel pretends to be GNU, so need to check Intel
+    # before checking for GNU.
+
+    # Intel
+    if test "$pmix_check_compiler_vendor_result" = "unknown"; then :
+
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#if !( defined(__INTEL_COMPILER) || defined(__ICC) )
+#error "condition defined(__INTEL_COMPILER) || defined(__ICC) not met"
+choke me
+#endif
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  pmix_check_compiler_vendor_result="intel"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+    # Fujitsu
+    if test "$pmix_check_compiler_vendor_result" = "unknown"; then :
+
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#if !( defined(__FUJITSU) )
+#error "condition defined(__FUJITSU) not met"
+choke me
+#endif
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  pmix_check_compiler_vendor_result="fujitsu"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+    # GNU
+    if test "$pmix_check_compiler_vendor_result" = "unknown"; then :
+
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#ifndef __GNUC__
+#error "symbol __GNUC__ not defined"
+choke me
+#endif
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  pmix_check_compiler_vendor_result="gnu"
+
+               # We do not support gccfss as a compiler so die if
+               # someone tries to use said compiler.  gccfss (gcc
+               # for SPARC Systems) is a compiler that is no longer
+               # supported by Oracle and it has some major flaws
+               # that prevents it from actually compiling PMIX code.
+               # So if we detect it we automatically bail.
+
+               if ($CC --version | grep gccfss) >/dev/null 2>&1; then
+                   { $as_echo "$as_me:${as_lineno-$LINENO}: result: gccfss" >&5
+$as_echo "gccfss" >&6; }
+                   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Detected gccfss being used to compile PMIx." >&5
+$as_echo "$as_me: WARNING: Detected gccfss being used to compile PMIx." >&2;}
+                   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Because of several issues PMIx does not support" >&5
+$as_echo "$as_me: WARNING: Because of several issues PMIx does not support" >&2;}
+                   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: the gccfss compiler.  Please use a different compiler." >&5
+$as_echo "$as_me: WARNING: the gccfss compiler.  Please use a different compiler." >&2;}
+                   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: If you didn't think you used gccfss you may want to" >&5
+$as_echo "$as_me: WARNING: If you didn't think you used gccfss you may want to" >&2;}
+                   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: check to see if the compiler you think you used is" >&5
+$as_echo "$as_me: WARNING: check to see if the compiler you think you used is" >&2;}
+                   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: actually a link to gccfss." >&5
+$as_echo "$as_me: WARNING: actually a link to gccfss." >&2;}
+                   as_fn_error $? "Cannot continue" "$LINENO" 5
+               fi
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+    # Borland Turbo C
+    if test "$pmix_check_compiler_vendor_result" = "unknown"; then :
+
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#ifndef __TURBOC__
+#error "symbol __TURBOC__ not defined"
+choke me
+#endif
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  pmix_check_compiler_vendor_result="borland"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+    # Borland C++
+    if test "$pmix_check_compiler_vendor_result" = "unknown"; then :
+
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#ifndef __BORLANDC__
+#error "symbol __BORLANDC__ not defined"
+choke me
+#endif
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  pmix_check_compiler_vendor_result="borland"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+    # Comeau C++
+    if test "$pmix_check_compiler_vendor_result" = "unknown"; then :
+
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#ifndef __COMO__
+#error "symbol __COMO__ not defined"
+choke me
+#endif
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  pmix_check_compiler_vendor_result="comeau"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+    # Compaq C/C++
+    if test "$pmix_check_compiler_vendor_result" = "unknown"; then :
+
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#if !( defined(__DECC) || defined(VAXC) || defined(__VAXC) )
+#error "condition defined(__DECC) || defined(VAXC) || defined(__VAXC) not met"
+choke me
+#endif
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  pmix_check_compiler_vendor_result="compaq"
+else
+
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#if !( defined(__osf__) && defined(__LANGUAGE_C__) )
+#error "condition defined(__osf__) && defined(__LANGUAGE_C__) not met"
+choke me
+#endif
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  pmix_check_compiler_vendor_result="compaq"
+else
+
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#ifndef __DECCXX
+#error "symbol __DECCXX not defined"
+choke me
+#endif
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  pmix_check_compiler_vendor_result="compaq"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+    # Cray C/C++
+    if test "$pmix_check_compiler_vendor_result" = "unknown"; then :
+
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#ifndef _CRAYC
+#error "symbol _CRAYC not defined"
+choke me
+#endif
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  pmix_check_compiler_vendor_result="cray"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+    # Diab C/C++
+    if test "$pmix_check_compiler_vendor_result" = "unknown"; then :
+
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#ifndef __DCC__
+#error "symbol __DCC__ not defined"
+choke me
+#endif
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  pmix_check_compiler_vendor_result="diab"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+    # Digital Mars
+    if test "$pmix_check_compiler_vendor_result" = "unknown"; then :
+
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#if !( defined(__DMC__) || defined(__SC__) || defined(__ZTC__) )
+#error "condition defined(__DMC__) || defined(__SC__) || defined(__ZTC__) not met"
+choke me
+#endif
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  pmix_check_compiler_vendor_result="digital mars"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+    # HP ANSI C / aC++
+    if test "$pmix_check_compiler_vendor_result" = "unknown"; then :
+
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#if !( defined(__HP_cc) || defined(__HP_aCC) )
+#error "condition defined(__HP_cc) || defined(__HP_aCC) not met"
+choke me
+#endif
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  pmix_check_compiler_vendor_result="hp"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+    # IBM XL C/C++
+    if test "$pmix_check_compiler_vendor_result" = "unknown"; then :
+
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#if !( defined(__xlC__) || defined(__IBMC__) || defined(__IBMCPP__) )
+#error "condition defined(__xlC__) || defined(__IBMC__) || defined(__IBMCPP__) not met"
+choke me
+#endif
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  pmix_check_compiler_vendor_result="ibm"
+else
+
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#if !( defined(_AIX) && !defined(__GNUC__) )
+#error "condition defined(_AIX) && !defined(__GNUC__) not met"
+choke me
+#endif
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  pmix_check_compiler_vendor_result="ibm"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+    # KAI C++ (rest in peace)
+    if test "$pmix_check_compiler_vendor_result" = "unknown"; then :
+
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#ifndef __KCC
+#error "symbol __KCC not defined"
+choke me
+#endif
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  pmix_check_compiler_vendor_result="kai"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+    # LCC
+    if test "$pmix_check_compiler_vendor_result" = "unknown"; then :
+
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#ifndef __LCC__
+#error "symbol __LCC__ not defined"
+choke me
+#endif
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  pmix_check_compiler_vendor_result="lcc"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+    # MetaWare High C/C++
+    if test "$pmix_check_compiler_vendor_result" = "unknown"; then :
+
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#ifndef __HIGHC__
+#error "symbol __HIGHC__ not defined"
+choke me
+#endif
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  pmix_check_compiler_vendor_result="metaware high"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+    # Metrowerks Codewarrior
+    if test "$pmix_check_compiler_vendor_result" = "unknown"; then :
+
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#ifndef __MWERKS__
+#error "symbol __MWERKS__ not defined"
+choke me
+#endif
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  pmix_check_compiler_vendor_result="metrowerks"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+    # MIPSpro (SGI)
+    if test "$pmix_check_compiler_vendor_result" = "unknown"; then :
+
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#if !( defined(sgi) || defined(__sgi) )
+#error "condition defined(sgi) || defined(__sgi) not met"
+choke me
+#endif
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  pmix_check_compiler_vendor_result="sgi"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+    # MPW C++
+    if test "$pmix_check_compiler_vendor_result" = "unknown"; then :
+
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#if !( defined(__MRC__) || defined(MPW_C) || defined(MPW_CPLUS) )
+#error "condition defined(__MRC__) || defined(MPW_C) || defined(MPW_CPLUS) not met"
+choke me
+#endif
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  pmix_check_compiler_vendor_result="mpw"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+    # Norcroft C
+    if test "$pmix_check_compiler_vendor_result" = "unknown"; then :
+
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#ifndef __CC_NORCROFT
+#error "symbol __CC_NORCROFT not defined"
+choke me
+#endif
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  pmix_check_compiler_vendor_result="norcroft"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+    # Pelles C
+    if test "$pmix_check_compiler_vendor_result" = "unknown"; then :
+
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#ifndef __POCC__
+#error "symbol __POCC__ not defined"
+choke me
+#endif
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  pmix_check_compiler_vendor_result="pelles"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+    # Portland Group
+    if test "$pmix_check_compiler_vendor_result" = "unknown"; then :
+
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#ifndef __PGI
+#error "symbol __PGI not defined"
+choke me
+#endif
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  pmix_check_compiler_vendor_result="portland group"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+    # SAS/C
+    if test "$pmix_check_compiler_vendor_result" = "unknown"; then :
+
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#if !( defined(SASC) || defined(__SASC) || defined(__SASC__) )
+#error "condition defined(SASC) || defined(__SASC) || defined(__SASC__) not met"
+choke me
+#endif
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  pmix_check_compiler_vendor_result="sas"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+    # Sun Workshop C/C++
+    if test "$pmix_check_compiler_vendor_result" = "unknown"; then :
+
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#if !( defined(__SUNPRO_C) || defined(__SUNPRO_CC) )
+#error "condition defined(__SUNPRO_C) || defined(__SUNPRO_CC) not met"
+choke me
+#endif
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  pmix_check_compiler_vendor_result="sun"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+    # TenDRA C/C++
+    if test "$pmix_check_compiler_vendor_result" = "unknown"; then :
+
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#ifndef __TenDRA__
+#error "symbol __TenDRA__ not defined"
+choke me
+#endif
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  pmix_check_compiler_vendor_result="tendra"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+    # Tiny C
+    if test "$pmix_check_compiler_vendor_result" = "unknown"; then :
+
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#ifndef __TINYC__
+#error "symbol __TINYC__ not defined"
+choke me
+#endif
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  pmix_check_compiler_vendor_result="tiny"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+    # USL C
+    if test "$pmix_check_compiler_vendor_result" = "unknown"; then :
+
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#ifndef __USLC__
+#error "symbol __USLC__ not defined"
+choke me
+#endif
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  pmix_check_compiler_vendor_result="usl"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+    # Watcom C++
+    if test "$pmix_check_compiler_vendor_result" = "unknown"; then :
+
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#ifndef __WATCOMC__
+#error "symbol __WATCOMC__ not defined"
+choke me
+#endif
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  pmix_check_compiler_vendor_result="watcom"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+    pmix_cv_c_compiler_vendor="$pmix_check_compiler_vendor_result"
+    unset pmix_check_compiler_vendor_result
+
+         ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pmix_cv_c_compiler_vendor" >&5
+$as_echo "$pmix_cv_c_compiler_vendor" >&6; }
+
+    pmix_c_vendor="$pmix_cv_c_compiler_vendor"
+
+
+    # Check for standard headers, needed here because needed before
+    # the types checks.
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
+if ${ac_cv_header_stdc+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_header_stdc=yes
+else
+  ac_cv_header_stdc=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+if test $ac_cv_header_stdc = yes; then
+  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <string.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "memchr" >/dev/null 2>&1; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "free" >/dev/null 2>&1; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+  if test "$cross_compiling" = yes; then :
+  :
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ctype.h>
+#include <stdlib.h>
+#if ((' ' & 0x0FF) == 0x020)
+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+#else
+# define ISLOWER(c) \
+		   (('a' <= (c) && (c) <= 'i') \
+		     || ('j' <= (c) && (c) <= 'r') \
+		     || ('s' <= (c) && (c) <= 'z'))
+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+#endif
+
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+int
+main ()
+{
+  int i;
+  for (i = 0; i < 256; i++)
+    if (XOR (islower (i), ISLOWER (i))
+	|| toupper (i) != TOUPPER (i))
+      return 2;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
+if test $ac_cv_header_stdc = yes; then
+
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
+
+fi
+
+
+    # GNU C and autotools are inconsistent about whether this is
+    # defined so let's make it true everywhere for now...  However, IBM
+    # XL compilers on PPC Linux behave really badly when compiled with
+    # _GNU_SOURCE defined, so don't define it in that situation.
+    #
+    # Don't use AC_GNU_SOURCE because it requires that no compiler
+    # tests are done before setting it, and we need to at least do
+    # enough tests to figure out if we're using XL or not.
+    if test "$pmix_cv_c_compiler_vendor" != "ibm"; then :
+
+           $as_echo "#define _GNU_SOURCE 1" >>confdefs.h
+
+fi
+
+    # Do we want debugging?
+    if test "$WANT_DEBUG" = "1" && test "$enable_debug_symbols" != "no" ; then
+        CFLAGS="$CFLAGS -g"
+
+
+    # 1 is the variable name to be uniq-ized
+    pmix_name=CFLAGS
+
+    # Go through each item in the variable and only keep the unique ones
+
+    pmix_count=0
+    for val in ${CFLAGS}; do
+        pmix_done=0
+        pmix_i=1
+        pmix_found=0
+
+        # Loop over every token we've seen so far
+
+        pmix_done="`expr $pmix_i \> $pmix_count`"
+        while test "$pmix_found" = "0" && test "$pmix_done" = "0"; do
+
+            # Have we seen this token already?  Prefix the comparison
+            # with "x" so that "-Lfoo" values won't be cause an error.
+
+	    pmix_eval="expr x$val = x\$pmix_array_$pmix_i"
+	    pmix_found=`eval $pmix_eval`
+
+            # Check the ending condition
+
+	    pmix_done="`expr $pmix_i \>= $pmix_count`"
+
+            # Increment the counter
+
+	    pmix_i="`expr $pmix_i + 1`"
+        done
+
+        # Check for special cases where we do want to allow repeated
+        # arguments (per
+        # http://www.open-mpi.org/community/lists/devel/2012/08/11362.php
+        # and
+        # https://github.com/open-mpi/ompi/issues/324).
+
+        case $val in
+        -Xclang|-Xg)
+                pmix_found=0
+                pmix_i=`expr $pmix_count + 1`
+                ;;
+        -framework)
+                pmix_found=0
+                pmix_i=`expr $pmix_count + 1`
+                ;;
+        --param)
+                pmix_found=0
+                pmix_i=`expr $pmix_count + 1`
+                ;;
+        esac
+
+        # If we didn't find the token, add it to the "array"
+
+        if test "$pmix_found" = "0"; then
+	    pmix_eval="pmix_array_$pmix_i=$val"
+	    eval $pmix_eval
+	    pmix_count="`expr $pmix_count + 1`"
+        else
+	    pmix_i="`expr $pmix_i - 1`"
+        fi
+    done
+
+    # Take all the items in the "array" and assemble them back into a
+    # single variable
+
+    pmix_i=1
+    pmix_done="`expr $pmix_i \> $pmix_count`"
+    pmix_newval=
+    while test "$pmix_done" = "0"; do
+        pmix_eval="pmix_newval=\"$pmix_newval \$pmix_array_$pmix_i\""
+        eval $pmix_eval
+
+        pmix_eval="unset pmix_array_$pmix_i"
+        eval $pmix_eval
+
+        pmix_done="`expr $pmix_i \>= $pmix_count`"
+        pmix_i="`expr $pmix_i + 1`"
+    done
+
+    # Done; do the assignment
+
+    pmix_newval="`echo $pmix_newval`"
+    pmix_eval="$pmix_name=\"$pmix_newval\""
+    eval $pmix_eval
+
+    # Clean up
+
+    unset pmix_name pmix_i pmix_done pmix_newval pmix_eval pmix_count
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: -g has been added to CFLAGS (--enable-debug)" >&5
+$as_echo "$as_me: WARNING: -g has been added to CFLAGS (--enable-debug)" >&2;}
+    fi
+
+    # These flags are generally gcc-specific; even the
+    # gcc-impersonating compilers won't accept them.
+    PMIX_CFLAGS_BEFORE_PICKY="$CFLAGS"
+
+    if test $WANT_PICKY_COMPILER -eq 1; then
+        CFLAGS_orig=$CFLAGS
+        add=
+
+        # These flags are likely GCC-specific (or, more specifically,
+        # we don't have general tests for each one, and we know they
+        # work with all versions of GCC that we have used throughout
+        # the years, so we'll keep them limited just to GCC).
+        if test "$pmix_c_vendor" = "gnu" ; then
+            add="$add -Wall -Wundef -Wno-long-long -Wsign-compare"
+            add="$add -Wmissing-prototypes -Wstrict-prototypes"
+            add="$add -Wcomment -pedantic"
+        fi
+
+        # see if -Wno-long-double works...
+        # Starting with GCC-4.4, the compiler complains about not
+        # knowing -Wno-long-double, only if -Wstrict-prototypes is set, too.
+        #
+        # Actually, this is not real fix, as GCC will pass on any -Wno- flag,
+        # have fun with the warning: -Wno-britney
+        CFLAGS="$CFLAGS_orig $add -Wno-long-double -Wstrict-prototypes"
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wno-long-double" >&5
+$as_echo_n "checking if $CC supports -Wno-long-double... " >&6; }
+if ${pmix_cv_cc_wno_long_double+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+                                                                    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+long double test;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+                      pmix_cv_cc_wno_long_double="yes"
+                      if test -s conftest.err ; then
+                                                    for i in unknown invalid ignor unrecognized ; do
+                              $GREP -iq $i conftest.err
+                              if test "$?" = "0" ; then
+                                  pmix_cv_cc_wno_long_double="no"
+                                  break;
+                              fi
+                          done
+                      fi
+
+else
+  pmix_cv_cc_wno_long_double="no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+  pmix_cv_cc_wno_long_double="no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pmix_cv_cc_wno_long_double" >&5
+$as_echo "$pmix_cv_cc_wno_long_double" >&6; }
+
+        if test "$pmix_cv_cc_wno_long_double" = "yes" ; then
+            add="$add -Wno-long-double"
+        fi
+
+        # Per above, we know that this flag works with GCC / haven't
+        # really tested it elsewhere.
+        if test "$pmix_c_vendor" = "gnu" ; then
+            add="$add -Werror-implicit-function-declaration "
+        fi
+
+        CFLAGS="$CFLAGS_orig $add"
+
+    # 1 is the variable name to be uniq-ized
+    pmix_name=CFLAGS
+
+    # Go through each item in the variable and only keep the unique ones
+
+    pmix_count=0
+    for val in ${CFLAGS}; do
+        pmix_done=0
+        pmix_i=1
+        pmix_found=0
+
+        # Loop over every token we've seen so far
+
+        pmix_done="`expr $pmix_i \> $pmix_count`"
+        while test "$pmix_found" = "0" && test "$pmix_done" = "0"; do
+
+            # Have we seen this token already?  Prefix the comparison
+            # with "x" so that "-Lfoo" values won't be cause an error.
+
+	    pmix_eval="expr x$val = x\$pmix_array_$pmix_i"
+	    pmix_found=`eval $pmix_eval`
+
+            # Check the ending condition
+
+	    pmix_done="`expr $pmix_i \>= $pmix_count`"
+
+            # Increment the counter
+
+	    pmix_i="`expr $pmix_i + 1`"
+        done
+
+        # Check for special cases where we do want to allow repeated
+        # arguments (per
+        # http://www.open-mpi.org/community/lists/devel/2012/08/11362.php
+        # and
+        # https://github.com/open-mpi/ompi/issues/324).
+
+        case $val in
+        -Xclang|-Xg)
+                pmix_found=0
+                pmix_i=`expr $pmix_count + 1`
+                ;;
+        -framework)
+                pmix_found=0
+                pmix_i=`expr $pmix_count + 1`
+                ;;
+        --param)
+                pmix_found=0
+                pmix_i=`expr $pmix_count + 1`
+                ;;
+        esac
+
+        # If we didn't find the token, add it to the "array"
+
+        if test "$pmix_found" = "0"; then
+	    pmix_eval="pmix_array_$pmix_i=$val"
+	    eval $pmix_eval
+	    pmix_count="`expr $pmix_count + 1`"
+        else
+	    pmix_i="`expr $pmix_i - 1`"
+        fi
+    done
+
+    # Take all the items in the "array" and assemble them back into a
+    # single variable
+
+    pmix_i=1
+    pmix_done="`expr $pmix_i \> $pmix_count`"
+    pmix_newval=
+    while test "$pmix_done" = "0"; do
+        pmix_eval="pmix_newval=\"$pmix_newval \$pmix_array_$pmix_i\""
+        eval $pmix_eval
+
+        pmix_eval="unset pmix_array_$pmix_i"
+        eval $pmix_eval
+
+        pmix_done="`expr $pmix_i \>= $pmix_count`"
+        pmix_i="`expr $pmix_i + 1`"
+    done
+
+    # Done; do the assignment
+
+    pmix_newval="`echo $pmix_newval`"
+    pmix_eval="$pmix_name=\"$pmix_newval\""
+    eval $pmix_eval
+
+    # Clean up
+
+    unset pmix_name pmix_i pmix_done pmix_newval pmix_eval pmix_count
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $add has been added to CFLAGS (--enable-picky)" >&5
+$as_echo "$as_me: WARNING: $add has been added to CFLAGS (--enable-picky)" >&2;}
+        unset add
+    fi
+
+    # See if this version of gcc allows -finline-functions and/or
+    # -fno-strict-aliasing.  Even check the gcc-impersonating compilers.
+    if test "$GCC" = "yes"; then
+        CFLAGS_orig="$CFLAGS"
+
+        # Note: Some versions of clang (at least >= 3.5 -- perhaps
+        # older versions, too?) will *warn* about -finline-functions,
+        # but still allow it.  This is very annoying, so check for
+        # that warning, too.  The clang warning looks like this:
+        # clang: warning: optimization flag '-finline-functions' is not supported
+        # clang: warning: argument unused during compilation: '-finline-functions'
+        CFLAGS="$CFLAGS_orig -finline-functions"
+        add=
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -finline-functions" >&5
+$as_echo_n "checking if $CC supports -finline-functions... " >&6; }
+if ${pmix_cv_cc_finline_functions+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  pmix_cv_cc_finline_functions="yes"
+                                    if test -s conftest.err ; then
+                                        for i in unused 'not supported' ; do
+                                            if $GREP -iq "$i" conftest.err; then
+                                                pmix_cv_cc_finline_functions="no"
+                                                break;
+                                            fi
+                                        done
+                                    fi
+
+else
+  pmix_cv_cc_finline_functions="no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pmix_cv_cc_finline_functions" >&5
+$as_echo "$pmix_cv_cc_finline_functions" >&6; }
+        if test "$pmix_cv_cc_finline_functions" = "yes" ; then
+            add=" -finline-functions"
+        fi
+        CFLAGS="$CFLAGS_orig$add"
+
+        CFLAGS_orig="$CFLAGS"
+        CFLAGS="$CFLAGS_orig -fno-strict-aliasing"
+        add=
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -fno-strict-aliasing" >&5
+$as_echo_n "checking if $CC supports -fno-strict-aliasing... " >&6; }
+if ${pmix_cv_cc_fno_strict_aliasing+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  pmix_cv_cc_fno_strict_aliasing="yes"
+else
+  pmix_cv_cc_fno_strict_aliasing="no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pmix_cv_cc_fno_strict_aliasing" >&5
+$as_echo "$pmix_cv_cc_fno_strict_aliasing" >&6; }
+        if test "$pmix_cv_cc_fno_strict_aliasing" = "yes" ; then
+            add=" -fno-strict-aliasing"
+        fi
+        CFLAGS="$CFLAGS_orig$add"
+
+
+    # 1 is the variable name to be uniq-ized
+    pmix_name=CFLAGS
+
+    # Go through each item in the variable and only keep the unique ones
+
+    pmix_count=0
+    for val in ${CFLAGS}; do
+        pmix_done=0
+        pmix_i=1
+        pmix_found=0
+
+        # Loop over every token we've seen so far
+
+        pmix_done="`expr $pmix_i \> $pmix_count`"
+        while test "$pmix_found" = "0" && test "$pmix_done" = "0"; do
+
+            # Have we seen this token already?  Prefix the comparison
+            # with "x" so that "-Lfoo" values won't be cause an error.
+
+	    pmix_eval="expr x$val = x\$pmix_array_$pmix_i"
+	    pmix_found=`eval $pmix_eval`
+
+            # Check the ending condition
+
+	    pmix_done="`expr $pmix_i \>= $pmix_count`"
+
+            # Increment the counter
+
+	    pmix_i="`expr $pmix_i + 1`"
+        done
+
+        # Check for special cases where we do want to allow repeated
+        # arguments (per
+        # http://www.open-mpi.org/community/lists/devel/2012/08/11362.php
+        # and
+        # https://github.com/open-mpi/ompi/issues/324).
+
+        case $val in
+        -Xclang|-Xg)
+                pmix_found=0
+                pmix_i=`expr $pmix_count + 1`
+                ;;
+        -framework)
+                pmix_found=0
+                pmix_i=`expr $pmix_count + 1`
+                ;;
+        --param)
+                pmix_found=0
+                pmix_i=`expr $pmix_count + 1`
+                ;;
+        esac
+
+        # If we didn't find the token, add it to the "array"
+
+        if test "$pmix_found" = "0"; then
+	    pmix_eval="pmix_array_$pmix_i=$val"
+	    eval $pmix_eval
+	    pmix_count="`expr $pmix_count + 1`"
+        else
+	    pmix_i="`expr $pmix_i - 1`"
+        fi
+    done
+
+    # Take all the items in the "array" and assemble them back into a
+    # single variable
+
+    pmix_i=1
+    pmix_done="`expr $pmix_i \> $pmix_count`"
+    pmix_newval=
+    while test "$pmix_done" = "0"; do
+        pmix_eval="pmix_newval=\"$pmix_newval \$pmix_array_$pmix_i\""
+        eval $pmix_eval
+
+        pmix_eval="unset pmix_array_$pmix_i"
+        eval $pmix_eval
+
+        pmix_done="`expr $pmix_i \>= $pmix_count`"
+        pmix_i="`expr $pmix_i + 1`"
+    done
+
+    # Done; do the assignment
+
+    pmix_newval="`echo $pmix_newval`"
+    pmix_eval="$pmix_name=\"$pmix_newval\""
+    eval $pmix_eval
+
+    # Clean up
+
+    unset pmix_name pmix_i pmix_done pmix_newval pmix_eval pmix_count
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $add has been added to CFLAGS" >&5
+$as_echo "$as_me: WARNING: $add has been added to CFLAGS" >&2;}
+        unset add
+    fi
+
+    # Try to enable restrict keyword
+    RESTRICT_CFLAGS=
+    case "$pmix_c_vendor" in
+        intel)
+            RESTRICT_CFLAGS="-restrict"
+        ;;
+        sgi)
+            RESTRICT_CFLAGS="-LANG:restrict=ON"
+        ;;
+    esac
+    if test ! -z "$RESTRICT_CFLAGS" ; then
+        CFLAGS_orig="$CFLAGS"
+        CFLAGS="$CFLAGS_orig $RESTRICT_CFLAGS"
+        add=
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports $RESTRICT_CFLAGS" >&5
+$as_echo_n "checking if $CC supports $RESTRICT_CFLAGS... " >&6; }
+if ${pmix_cv_cc_restrict_cflags+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  pmix_cv_cc_restrict_cflags="yes"
+else
+  pmix_cv_cc_restrict_cflags="no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pmix_cv_cc_restrict_cflags" >&5
+$as_echo "$pmix_cv_cc_restrict_cflags" >&6; }
+        if test "$pmix_cv_cc_restrict_cflags" = "yes" ; then
+            add=" $RESTRICT_CFLAGS"
+        fi
+
+        CFLAGS="${CFLAGS_orig}${add}"
+
+    # 1 is the variable name to be uniq-ized
+    pmix_name=CFLAGS
+
+    # Go through each item in the variable and only keep the unique ones
+
+    pmix_count=0
+    for val in ${CFLAGS}; do
+        pmix_done=0
+        pmix_i=1
+        pmix_found=0
+
+        # Loop over every token we've seen so far
+
+        pmix_done="`expr $pmix_i \> $pmix_count`"
+        while test "$pmix_found" = "0" && test "$pmix_done" = "0"; do
+
+            # Have we seen this token already?  Prefix the comparison
+            # with "x" so that "-Lfoo" values won't be cause an error.
+
+	    pmix_eval="expr x$val = x\$pmix_array_$pmix_i"
+	    pmix_found=`eval $pmix_eval`
+
+            # Check the ending condition
+
+	    pmix_done="`expr $pmix_i \>= $pmix_count`"
+
+            # Increment the counter
+
+	    pmix_i="`expr $pmix_i + 1`"
+        done
+
+        # Check for special cases where we do want to allow repeated
+        # arguments (per
+        # http://www.open-mpi.org/community/lists/devel/2012/08/11362.php
+        # and
+        # https://github.com/open-mpi/ompi/issues/324).
+
+        case $val in
+        -Xclang|-Xg)
+                pmix_found=0
+                pmix_i=`expr $pmix_count + 1`
+                ;;
+        -framework)
+                pmix_found=0
+                pmix_i=`expr $pmix_count + 1`
+                ;;
+        --param)
+                pmix_found=0
+                pmix_i=`expr $pmix_count + 1`
+                ;;
+        esac
+
+        # If we didn't find the token, add it to the "array"
+
+        if test "$pmix_found" = "0"; then
+	    pmix_eval="pmix_array_$pmix_i=$val"
+	    eval $pmix_eval
+	    pmix_count="`expr $pmix_count + 1`"
+        else
+	    pmix_i="`expr $pmix_i - 1`"
+        fi
+    done
+
+    # Take all the items in the "array" and assemble them back into a
+    # single variable
+
+    pmix_i=1
+    pmix_done="`expr $pmix_i \> $pmix_count`"
+    pmix_newval=
+    while test "$pmix_done" = "0"; do
+        pmix_eval="pmix_newval=\"$pmix_newval \$pmix_array_$pmix_i\""
+        eval $pmix_eval
+
+        pmix_eval="unset pmix_array_$pmix_i"
+        eval $pmix_eval
+
+        pmix_done="`expr $pmix_i \>= $pmix_count`"
+        pmix_i="`expr $pmix_i + 1`"
+    done
+
+    # Done; do the assignment
+
+    pmix_newval="`echo $pmix_newval`"
+    pmix_eval="$pmix_name=\"$pmix_newval\""
+    eval $pmix_eval
+
+    # Clean up
+
+    unset pmix_name pmix_i pmix_done pmix_newval pmix_eval pmix_count
+
+        if test "$add" != "" ; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $add has been added to CFLAGS" >&5
+$as_echo "$as_me: WARNING: $add has been added to CFLAGS" >&2;}
+        fi
+        unset add
+    fi
+
+    # see if the C compiler supports __builtin_expect
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports __builtin_expect" >&5
+$as_echo_n "checking if $CC supports __builtin_expect... " >&6; }
+if ${pmix_cv_cc_supports___builtin_expect+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+void *ptr = (void*) 0;
+           if (__builtin_expect (ptr != (void*) 0, 1)) return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  pmix_cv_cc_supports___builtin_expect="yes"
+else
+  pmix_cv_cc_supports___builtin_expect="no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pmix_cv_cc_supports___builtin_expect" >&5
+$as_echo "$pmix_cv_cc_supports___builtin_expect" >&6; }
+    if test "$pmix_cv_cc_supports___builtin_expect" = "yes" ; then
+        have_cc_builtin_expect=1
+    else
+        have_cc_builtin_expect=0
+    fi
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_C_HAVE_BUILTIN_EXPECT $have_cc_builtin_expect
+_ACEOF
+
+
+    # see if the C compiler supports __builtin_prefetch
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports __builtin_prefetch" >&5
+$as_echo_n "checking if $CC supports __builtin_prefetch... " >&6; }
+if ${pmix_cv_cc_supports___builtin_prefetch+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+int ptr;
+           __builtin_prefetch(&ptr,0,0);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  pmix_cv_cc_supports___builtin_prefetch="yes"
+else
+  pmix_cv_cc_supports___builtin_prefetch="no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pmix_cv_cc_supports___builtin_prefetch" >&5
+$as_echo "$pmix_cv_cc_supports___builtin_prefetch" >&6; }
+    if test "$pmix_cv_cc_supports___builtin_prefetch" = "yes" ; then
+        have_cc_builtin_prefetch=1
+    else
+        have_cc_builtin_prefetch=0
+    fi
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_C_HAVE_BUILTIN_PREFETCH $have_cc_builtin_prefetch
+_ACEOF
+
+
+    # see if the C compiler supports __builtin_clz
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports __builtin_clz" >&5
+$as_echo_n "checking if $CC supports __builtin_clz... " >&6; }
+if ${pmix_cv_cc_supports___builtin_clz+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+int value = 0xffff; /* we know we have 16 bits set */
+             if ((8*sizeof(int)-16) != __builtin_clz(value)) return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  pmix_cv_cc_supports___builtin_clz="yes"
+else
+  pmix_cv_cc_supports___builtin_clz="no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pmix_cv_cc_supports___builtin_clz" >&5
+$as_echo "$pmix_cv_cc_supports___builtin_clz" >&6; }
+    if test "$pmix_cv_cc_supports___builtin_clz" = "yes" ; then
+        have_cc_builtin_clz=1
+    else
+        have_cc_builtin_clz=0
+    fi
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_C_HAVE_BUILTIN_CLZ $have_cc_builtin_clz
+_ACEOF
+
+
+    # Preload the optflags for the case where the user didn't specify
+    # any.  If we're using GNU compilers, use -O3 (since it GNU
+    # doesn't require all compilation units to be compiled with the
+    # same level of optimization -- selecting a high level of
+    # optimization is not prohibitive).  If we're using anything else,
+    # be conservative and just use -O.
+    #
+    # Note: gcc-impersonating compilers accept -O3
+    if test "$WANT_DEBUG" = "1"; then
+        OPTFLAGS=
+    else
+        if test "$GCC" = yes; then
+            OPTFLAGS="-O3"
+        else
+            OPTFLAGS="-O"
+        fi
+    fi
+
+
+
+# Modularize this setup so that sub-configure.in scripts can use this
+# same setup code.
+
+##################################
+# Optimization flags
+##################################
+
+# If the user did not specify optimization flags, add some (the value
+# from $OPTFLAGS)
+
+co_arg=""$PMIX_CFLAGS_BEFORE_PICKY""
+co_found=0
+for co_word in $co_arg; do
+    # See http://www.gnu.org/software/autoconf/manual/html_node/Quadrigraphs.html#Quadrigraphs
+    # for an explanation of [ and ] -- they m4 expand to [ and ]
+    case $co_word in
+    -g)              co_found=1 ;;
+    -g[1-3])   co_found=1 ;;
+    +K[0-5])   co_found=1 ;;
+    -O)              co_found=1 ;;
+    -O[0-9])   co_found=1 ;;
+    -xO)             co_found=1 ;;
+    -xO[0-9])  co_found=1 ;;
+    -fast)           co_found=1 ;;
+
+    # The below Sun Studio flags require or
+    # trigger -xO optimization
+    -xvector*)     co_found=1 ;;
+    -xdepend=yes)  co_found=1 ;;
+
+    esac
+done
+
+if test "$co_found" = "0"; then
+    co_result="$OPTFLAGS $co_arg"
+else
+    co_result="$co_arg"
+fi
+
+# Clean up
+
+unset co_found co_word co_arg
+
+    PMIX_CFLAGS_BEFORE_PICKY="$co_result"
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C optimization flags" >&5
+$as_echo_n "checking for C optimization flags... " >&6; }
+
+
+# Modularize this setup so that sub-configure.in scripts can use this
+# same setup code.
+
+##################################
+# Optimization flags
+##################################
+
+# If the user did not specify optimization flags, add some (the value
+# from $OPTFLAGS)
+
+co_arg=""$CFLAGS""
+co_found=0
+for co_word in $co_arg; do
+    # See http://www.gnu.org/software/autoconf/manual/html_node/Quadrigraphs.html#Quadrigraphs
+    # for an explanation of [ and ] -- they m4 expand to [ and ]
+    case $co_word in
+    -g)              co_found=1 ;;
+    -g[1-3])   co_found=1 ;;
+    +K[0-5])   co_found=1 ;;
+    -O)              co_found=1 ;;
+    -O[0-9])   co_found=1 ;;
+    -xO)             co_found=1 ;;
+    -xO[0-9])  co_found=1 ;;
+    -fast)           co_found=1 ;;
+
+    # The below Sun Studio flags require or
+    # trigger -xO optimization
+    -xvector*)     co_found=1 ;;
+    -xdepend=yes)  co_found=1 ;;
+
+    esac
+done
+
+if test "$co_found" = "0"; then
+    co_result="$OPTFLAGS $co_arg"
+else
+    co_result="$co_arg"
+fi
+
+# Clean up
+
+unset co_found co_word co_arg
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $co_result" >&5
+$as_echo "$co_result" >&6; }
+    CFLAGS="$co_result"
+
+    ##################################
+    # C compiler characteristics
+    ##################################
+    # Does the compiler support "ident"-like constructs?
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C ident string support" >&5
+$as_echo_n "checking for C ident string support... " >&6; }
+
+    pmix_pragma_ident_happy=0
+    pmix_ident_happy=0
+    pmix_static_const_char_happy=0
+
+    eval pmix_compiler="\$CC"
+    eval pmix_flags="\$CFLAGS"
+
+    pmix_ident="string_not_coincidentally_inserted_by_the_compiler"
+    cat > conftest.c <<EOF
+#pragma ident "$pmix_ident"
+int main(int argc, char** argv);
+int main(int argc, char** argv) { return 0; }
+EOF
+
+    # "strings" won't always return the ident string.  objdump isn't
+    # universal (e.g., OS X doesn't have it), and ...other
+    # complications.  So just try to "grep" for the string in the
+    # resulting object file.  If the ident is found in "strings" or
+    # the grep succeeds, rule that we have this flavor of ident.
+
+    echo "configure:53625: CC" >&5
+    pmix_output=`$pmix_compiler $pmix_flags -c conftest.c -o conftest.${OBJEXT} 2>&1 1>/dev/null`
+    pmix_status=$?
+    if test $pmix_status = 0; then :
+  test -z "$pmix_output"
+           pmix_status=$?
+fi
+
+# 1 is the message
+# 2 is whether to put a prefix or not
+if test -n "1"; then
+    echo "configure:53636: \$? = $pmix_status" >&5
+else
+    echo \$? = $pmix_status >&5
+fi
+    if test $pmix_status = 0 && test -f conftest.${OBJEXT}; then :
+  pmix_output="`strings -a conftest.${OBJEXT} | grep $pmix_ident`"
+           grep $pmix_ident conftest.${OBJEXT} 2>&1 1>/dev/null
+           pmix_status=$?
+           if test "$pmix_output" != "" || test "$pmix_status" = "0"; then :
+  pmix_pragma_ident_happy=1
+         pmix_message="#pragma ident"
+else
+
+    eval pmix_compiler="\$CC"
+    eval pmix_flags="\$CFLAGS"
+
+    pmix_ident="string_not_coincidentally_inserted_by_the_compiler"
+    cat > conftest.c <<EOF
+#ident "$pmix_ident"
+int main(int argc, char** argv);
+int main(int argc, char** argv) { return 0; }
+EOF
+
+    # "strings" won't always return the ident string.  objdump isn't
+    # universal (e.g., OS X doesn't have it), and ...other
+    # complications.  So just try to "grep" for the string in the
+    # resulting object file.  If the ident is found in "strings" or
+    # the grep succeeds, rule that we have this flavor of ident.
+
+    echo "configure:53665: CC" >&5
+    pmix_output=`$pmix_compiler $pmix_flags -c conftest.c -o conftest.${OBJEXT} 2>&1 1>/dev/null`
+    pmix_status=$?
+    if test $pmix_status = 0; then :
+  test -z "$pmix_output"
+           pmix_status=$?
+fi
+
+# 1 is the message
+# 2 is whether to put a prefix or not
+if test -n "1"; then
+    echo "configure:53676: \$? = $pmix_status" >&5
+else
+    echo \$? = $pmix_status >&5
+fi
+    if test $pmix_status = 0 && test -f conftest.${OBJEXT}; then :
+  pmix_output="`strings -a conftest.${OBJEXT} | grep $pmix_ident`"
+           grep $pmix_ident conftest.${OBJEXT} 2>&1 1>/dev/null
+           pmix_status=$?
+           if test "$pmix_output" != "" || test "$pmix_status" = "0"; then :
+  pmix_ident_happy=1
+             pmix_message="#ident"
+else
+
+    eval pmix_compiler="\$CC"
+    eval pmix_flags="\$CFLAGS"
+
+    pmix_ident="string_not_coincidentally_inserted_by_the_compiler"
+    cat > conftest.c <<EOF
+#pragma comment(exestr,  "$pmix_ident" )
+int main(int argc, char** argv);
+int main(int argc, char** argv) { return 0; }
+EOF
+
+    # "strings" won't always return the ident string.  objdump isn't
+    # universal (e.g., OS X doesn't have it), and ...other
+    # complications.  So just try to "grep" for the string in the
+    # resulting object file.  If the ident is found in "strings" or
+    # the grep succeeds, rule that we have this flavor of ident.
+
+    echo "configure:53705: CC" >&5
+    pmix_output=`$pmix_compiler $pmix_flags -c conftest.c -o conftest.${OBJEXT} 2>&1 1>/dev/null`
+    pmix_status=$?
+    if test $pmix_status = 0; then :
+  test -z "$pmix_output"
+           pmix_status=$?
+fi
+
+# 1 is the message
+# 2 is whether to put a prefix or not
+if test -n "1"; then
+    echo "configure:53716: \$? = $pmix_status" >&5
+else
+    echo \$? = $pmix_status >&5
+fi
+    if test $pmix_status = 0 && test -f conftest.${OBJEXT}; then :
+  pmix_output="`strings -a conftest.${OBJEXT} | grep $pmix_ident`"
+           grep $pmix_ident conftest.${OBJEXT} 2>&1 1>/dev/null
+           pmix_status=$?
+           if test "$pmix_output" != "" || test "$pmix_status" = "0"; then :
+  pmix_pragma_comment_happy=1
+                 pmix_message="#pragma comment"
+else
+  pmix_static_const_char_happy=1
+                 pmix_message="static const char"
+fi
+else
+
+# 1 is the message
+# 2 is whether to put a prefix or not
+if test -n ""; then
+    echo "configure:53736: the failed program was:" >&5
+else
+    echo the failed program was: >&5
+fi
+
+# 1 is the filename
+if test -n "conftest.c" && test -f "conftest.c"; then
+    cat conftest.c >&5
+fi
+           pmix_static_const_char_happy=1
+                 pmix_message="static const char"
+fi
+
+    unset pmix_compiler pmix_flags pmix_output pmix_status
+    rm -rf conftest.* conftest${EXEEXT}
+
+fi
+else
+
+# 1 is the message
+# 2 is whether to put a prefix or not
+if test -n ""; then
+    echo "configure:53758: the failed program was:" >&5
+else
+    echo the failed program was: >&5
+fi
+
+# 1 is the filename
+if test -n "conftest.c" && test -f "conftest.c"; then
+    cat conftest.c >&5
+fi
+
+    eval pmix_compiler="\$CC"
+    eval pmix_flags="\$CFLAGS"
+
+    pmix_ident="string_not_coincidentally_inserted_by_the_compiler"
+    cat > conftest.c <<EOF
+#pragma comment(exestr,  "$pmix_ident" )
+int main(int argc, char** argv);
+int main(int argc, char** argv) { return 0; }
+EOF
+
+    # "strings" won't always return the ident string.  objdump isn't
+    # universal (e.g., OS X doesn't have it), and ...other
+    # complications.  So just try to "grep" for the string in the
+    # resulting object file.  If the ident is found in "strings" or
+    # the grep succeeds, rule that we have this flavor of ident.
+
+    echo "configure:53784: CC" >&5
+    pmix_output=`$pmix_compiler $pmix_flags -c conftest.c -o conftest.${OBJEXT} 2>&1 1>/dev/null`
+    pmix_status=$?
+    if test $pmix_status = 0; then :
+  test -z "$pmix_output"
+           pmix_status=$?
+fi
+
+# 1 is the message
+# 2 is whether to put a prefix or not
+if test -n "1"; then
+    echo "configure:53795: \$? = $pmix_status" >&5
+else
+    echo \$? = $pmix_status >&5
+fi
+    if test $pmix_status = 0 && test -f conftest.${OBJEXT}; then :
+  pmix_output="`strings -a conftest.${OBJEXT} | grep $pmix_ident`"
+           grep $pmix_ident conftest.${OBJEXT} 2>&1 1>/dev/null
+           pmix_status=$?
+           if test "$pmix_output" != "" || test "$pmix_status" = "0"; then :
+  pmix_pragma_comment_happy=1
+                 pmix_message="#pragma comment"
+else
+  pmix_static_const_char_happy=1
+                 pmix_message="static const char"
+fi
+else
+
+# 1 is the message
+# 2 is whether to put a prefix or not
+if test -n ""; then
+    echo "configure:53815: the failed program was:" >&5
+else
+    echo the failed program was: >&5
+fi
+
+# 1 is the filename
+if test -n "conftest.c" && test -f "conftest.c"; then
+    cat conftest.c >&5
+fi
+           pmix_static_const_char_happy=1
+                 pmix_message="static const char"
+fi
+
+    unset pmix_compiler pmix_flags pmix_output pmix_status
+    rm -rf conftest.* conftest${EXEEXT}
+
+fi
+
+    unset pmix_compiler pmix_flags pmix_output pmix_status
+    rm -rf conftest.* conftest${EXEEXT}
+
+fi
+else
+
+# 1 is the message
+# 2 is whether to put a prefix or not
+if test -n ""; then
+    echo "configure:53842: the failed program was:" >&5
+else
+    echo the failed program was: >&5
+fi
+
+# 1 is the filename
+if test -n "conftest.c" && test -f "conftest.c"; then
+    cat conftest.c >&5
+fi
+
+    eval pmix_compiler="\$CC"
+    eval pmix_flags="\$CFLAGS"
+
+    pmix_ident="string_not_coincidentally_inserted_by_the_compiler"
+    cat > conftest.c <<EOF
+#ident "$pmix_ident"
+int main(int argc, char** argv);
+int main(int argc, char** argv) { return 0; }
+EOF
+
+    # "strings" won't always return the ident string.  objdump isn't
+    # universal (e.g., OS X doesn't have it), and ...other
+    # complications.  So just try to "grep" for the string in the
+    # resulting object file.  If the ident is found in "strings" or
+    # the grep succeeds, rule that we have this flavor of ident.
+
+    echo "configure:53868: CC" >&5
+    pmix_output=`$pmix_compiler $pmix_flags -c conftest.c -o conftest.${OBJEXT} 2>&1 1>/dev/null`
+    pmix_status=$?
+    if test $pmix_status = 0; then :
+  test -z "$pmix_output"
+           pmix_status=$?
+fi
+
+# 1 is the message
+# 2 is whether to put a prefix or not
+if test -n "1"; then
+    echo "configure:53879: \$? = $pmix_status" >&5
+else
+    echo \$? = $pmix_status >&5
+fi
+    if test $pmix_status = 0 && test -f conftest.${OBJEXT}; then :
+  pmix_output="`strings -a conftest.${OBJEXT} | grep $pmix_ident`"
+           grep $pmix_ident conftest.${OBJEXT} 2>&1 1>/dev/null
+           pmix_status=$?
+           if test "$pmix_output" != "" || test "$pmix_status" = "0"; then :
+  pmix_ident_happy=1
+             pmix_message="#ident"
+else
+
+    eval pmix_compiler="\$CC"
+    eval pmix_flags="\$CFLAGS"
+
+    pmix_ident="string_not_coincidentally_inserted_by_the_compiler"
+    cat > conftest.c <<EOF
+#pragma comment(exestr,  "$pmix_ident" )
+int main(int argc, char** argv);
+int main(int argc, char** argv) { return 0; }
+EOF
+
+    # "strings" won't always return the ident string.  objdump isn't
+    # universal (e.g., OS X doesn't have it), and ...other
+    # complications.  So just try to "grep" for the string in the
+    # resulting object file.  If the ident is found in "strings" or
+    # the grep succeeds, rule that we have this flavor of ident.
+
+    echo "configure:53908: CC" >&5
+    pmix_output=`$pmix_compiler $pmix_flags -c conftest.c -o conftest.${OBJEXT} 2>&1 1>/dev/null`
+    pmix_status=$?
+    if test $pmix_status = 0; then :
+  test -z "$pmix_output"
+           pmix_status=$?
+fi
+
+# 1 is the message
+# 2 is whether to put a prefix or not
+if test -n "1"; then
+    echo "configure:53919: \$? = $pmix_status" >&5
+else
+    echo \$? = $pmix_status >&5
+fi
+    if test $pmix_status = 0 && test -f conftest.${OBJEXT}; then :
+  pmix_output="`strings -a conftest.${OBJEXT} | grep $pmix_ident`"
+           grep $pmix_ident conftest.${OBJEXT} 2>&1 1>/dev/null
+           pmix_status=$?
+           if test "$pmix_output" != "" || test "$pmix_status" = "0"; then :
+  pmix_pragma_comment_happy=1
+                 pmix_message="#pragma comment"
+else
+  pmix_static_const_char_happy=1
+                 pmix_message="static const char"
+fi
+else
+
+# 1 is the message
+# 2 is whether to put a prefix or not
+if test -n ""; then
+    echo "configure:53939: the failed program was:" >&5
+else
+    echo the failed program was: >&5
+fi
+
+# 1 is the filename
+if test -n "conftest.c" && test -f "conftest.c"; then
+    cat conftest.c >&5
+fi
+           pmix_static_const_char_happy=1
+                 pmix_message="static const char"
+fi
+
+    unset pmix_compiler pmix_flags pmix_output pmix_status
+    rm -rf conftest.* conftest${EXEEXT}
+
+fi
+else
+
+# 1 is the message
+# 2 is whether to put a prefix or not
+if test -n ""; then
+    echo "configure:53961: the failed program was:" >&5
+else
+    echo the failed program was: >&5
+fi
+
+# 1 is the filename
+if test -n "conftest.c" && test -f "conftest.c"; then
+    cat conftest.c >&5
+fi
+
+    eval pmix_compiler="\$CC"
+    eval pmix_flags="\$CFLAGS"
+
+    pmix_ident="string_not_coincidentally_inserted_by_the_compiler"
+    cat > conftest.c <<EOF
+#pragma comment(exestr,  "$pmix_ident" )
+int main(int argc, char** argv);
+int main(int argc, char** argv) { return 0; }
+EOF
+
+    # "strings" won't always return the ident string.  objdump isn't
+    # universal (e.g., OS X doesn't have it), and ...other
+    # complications.  So just try to "grep" for the string in the
+    # resulting object file.  If the ident is found in "strings" or
+    # the grep succeeds, rule that we have this flavor of ident.
+
+    echo "configure:53987: CC" >&5
+    pmix_output=`$pmix_compiler $pmix_flags -c conftest.c -o conftest.${OBJEXT} 2>&1 1>/dev/null`
+    pmix_status=$?
+    if test $pmix_status = 0; then :
+  test -z "$pmix_output"
+           pmix_status=$?
+fi
+
+# 1 is the message
+# 2 is whether to put a prefix or not
+if test -n "1"; then
+    echo "configure:53998: \$? = $pmix_status" >&5
+else
+    echo \$? = $pmix_status >&5
+fi
+    if test $pmix_status = 0 && test -f conftest.${OBJEXT}; then :
+  pmix_output="`strings -a conftest.${OBJEXT} | grep $pmix_ident`"
+           grep $pmix_ident conftest.${OBJEXT} 2>&1 1>/dev/null
+           pmix_status=$?
+           if test "$pmix_output" != "" || test "$pmix_status" = "0"; then :
+  pmix_pragma_comment_happy=1
+                 pmix_message="#pragma comment"
+else
+  pmix_static_const_char_happy=1
+                 pmix_message="static const char"
+fi
+else
+
+# 1 is the message
+# 2 is whether to put a prefix or not
+if test -n ""; then
+    echo "configure:54018: the failed program was:" >&5
+else
+    echo the failed program was: >&5
+fi
+
+# 1 is the filename
+if test -n "conftest.c" && test -f "conftest.c"; then
+    cat conftest.c >&5
+fi
+           pmix_static_const_char_happy=1
+                 pmix_message="static const char"
+fi
+
+    unset pmix_compiler pmix_flags pmix_output pmix_status
+    rm -rf conftest.* conftest${EXEEXT}
+
+fi
+
+    unset pmix_compiler pmix_flags pmix_output pmix_status
+    rm -rf conftest.* conftest${EXEEXT}
+
+fi
+
+    unset pmix_compiler pmix_flags pmix_output pmix_status
+    rm -rf conftest.* conftest${EXEEXT}
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_CC_USE_PRAGMA_IDENT $pmix_pragma_ident_happy
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_CC_USE_IDENT $pmix_ident_happy
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_CC_USE_PRAGMA_COMMENT $pmix_pragma_comment_happy
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PMIX_CC_USE_CONST_CHAR_IDENT $pmix_static_const_char_happy
+_ACEOF
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pmix_message" >&5
+$as_echo "$pmix_message" >&6; }
+
+    unset pmix_pragma_ident_happy pmix_ident_happy pmix_static_const_char_happy pmix_message
+
+
+
+
+# Cleanup duplicate flags
+
+    # 1 is the variable name to be uniq-ized
+    pmix_name=CPPFLAGS
+
+    # Go through each item in the variable and only keep the unique ones
+
+    pmix_count=0
+    for val in ${CPPFLAGS}; do
+        pmix_done=0
+        pmix_i=1
+        pmix_found=0
+
+        # Loop over every token we've seen so far
+
+        pmix_done="`expr $pmix_i \> $pmix_count`"
+        while test "$pmix_found" = "0" && test "$pmix_done" = "0"; do
+
+            # Have we seen this token already?  Prefix the comparison
+            # with "x" so that "-Lfoo" values won't be cause an error.
+
+	    pmix_eval="expr x$val = x\$pmix_array_$pmix_i"
+	    pmix_found=`eval $pmix_eval`
+
+            # Check the ending condition
+
+	    pmix_done="`expr $pmix_i \>= $pmix_count`"
+
+            # Increment the counter
+
+	    pmix_i="`expr $pmix_i + 1`"
+        done
+
+        # Check for special cases where we do want to allow repeated
+        # arguments (per
+        # http://www.open-mpi.org/community/lists/devel/2012/08/11362.php
+        # and
+        # https://github.com/open-mpi/ompi/issues/324).
+
+        case $val in
+        -Xclang|-Xg)
+                pmix_found=0
+                pmix_i=`expr $pmix_count + 1`
+                ;;
+        -framework)
+                pmix_found=0
+                pmix_i=`expr $pmix_count + 1`
+                ;;
+        --param)
+                pmix_found=0
+                pmix_i=`expr $pmix_count + 1`
+                ;;
+        esac
+
+        # If we didn't find the token, add it to the "array"
+
+        if test "$pmix_found" = "0"; then
+	    pmix_eval="pmix_array_$pmix_i=$val"
+	    eval $pmix_eval
+	    pmix_count="`expr $pmix_count + 1`"
+        else
+	    pmix_i="`expr $pmix_i - 1`"
+        fi
+    done
+
+    # Take all the items in the "array" and assemble them back into a
+    # single variable
+
+    pmix_i=1
+    pmix_done="`expr $pmix_i \> $pmix_count`"
+    pmix_newval=
+    while test "$pmix_done" = "0"; do
+        pmix_eval="pmix_newval=\"$pmix_newval \$pmix_array_$pmix_i\""
+        eval $pmix_eval
+
+        pmix_eval="unset pmix_array_$pmix_i"
+        eval $pmix_eval
+
+        pmix_done="`expr $pmix_i \>= $pmix_count`"
+        pmix_i="`expr $pmix_i + 1`"
+    done
+
+    # Done; do the assignment
+
+    pmix_newval="`echo $pmix_newval`"
+    pmix_eval="$pmix_name=\"$pmix_newval\""
+    eval $pmix_eval
+
+    # Clean up
+
+    unset pmix_name pmix_i pmix_done pmix_newval pmix_eval pmix_count
+
+
+    # 1 is the variable name to be uniq-ized
+    pmix_name=LDFLAGS
+
+    # Go through each item in the variable and only keep the unique ones
+
+    pmix_count=0
+    for val in ${LDFLAGS}; do
+        pmix_done=0
+        pmix_i=1
+        pmix_found=0
+
+        # Loop over every token we've seen so far
+
+        pmix_done="`expr $pmix_i \> $pmix_count`"
+        while test "$pmix_found" = "0" && test "$pmix_done" = "0"; do
+
+            # Have we seen this token already?  Prefix the comparison
+            # with "x" so that "-Lfoo" values won't be cause an error.
+
+	    pmix_eval="expr x$val = x\$pmix_array_$pmix_i"
+	    pmix_found=`eval $pmix_eval`
+
+            # Check the ending condition
+
+	    pmix_done="`expr $pmix_i \>= $pmix_count`"
+
+            # Increment the counter
+
+	    pmix_i="`expr $pmix_i + 1`"
+        done
+
+        # Check for special cases where we do want to allow repeated
+        # arguments (per
+        # http://www.open-mpi.org/community/lists/devel/2012/08/11362.php
+        # and
+        # https://github.com/open-mpi/ompi/issues/324).
+
+        case $val in
+        -Xclang|-Xg)
+                pmix_found=0
+                pmix_i=`expr $pmix_count + 1`
+                ;;
+        -framework)
+                pmix_found=0
+                pmix_i=`expr $pmix_count + 1`
+                ;;
+        --param)
+                pmix_found=0
+                pmix_i=`expr $pmix_count + 1`
+                ;;
+        esac
+
+        # If we didn't find the token, add it to the "array"
+
+        if test "$pmix_found" = "0"; then
+	    pmix_eval="pmix_array_$pmix_i=$val"
+	    eval $pmix_eval
+	    pmix_count="`expr $pmix_count + 1`"
+        else
+	    pmix_i="`expr $pmix_i - 1`"
+        fi
+    done
+
+    # Take all the items in the "array" and assemble them back into a
+    # single variable
+
+    pmix_i=1
+    pmix_done="`expr $pmix_i \> $pmix_count`"
+    pmix_newval=
+    while test "$pmix_done" = "0"; do
+        pmix_eval="pmix_newval=\"$pmix_newval \$pmix_array_$pmix_i\""
+        eval $pmix_eval
+
+        pmix_eval="unset pmix_array_$pmix_i"
+        eval $pmix_eval
+
+        pmix_done="`expr $pmix_i \>= $pmix_count`"
+        pmix_i="`expr $pmix_i + 1`"
+    done
+
+    # Done; do the assignment
+
+    pmix_newval="`echo $pmix_newval`"
+    pmix_eval="$pmix_name=\"$pmix_newval\""
+    eval $pmix_eval
+
+    # Clean up
+
+    unset pmix_name pmix_i pmix_done pmix_newval pmix_eval pmix_count
+
+
+    # 1 is the variable name to be uniq-ized
+    pmix_name=LIBS
+
+    # Go through each item in the variable and only keep the unique ones
+
+    pmix_count=0
+    for val in ${LIBS}; do
+        pmix_done=0
+        pmix_i=1
+        pmix_found=0
+
+        # Loop over every token we've seen so far
+
+        pmix_done="`expr $pmix_i \> $pmix_count`"
+        while test "$pmix_found" = "0" && test "$pmix_done" = "0"; do
+
+            # Have we seen this token already?  Prefix the comparison
+            # with "x" so that "-Lfoo" values won't be cause an error.
+
+	    pmix_eval="expr x$val = x\$pmix_array_$pmix_i"
+	    pmix_found=`eval $pmix_eval`
+
+            # Check the ending condition
+
+	    pmix_done="`expr $pmix_i \>= $pmix_count`"
+
+            # Increment the counter
+
+	    pmix_i="`expr $pmix_i + 1`"
+        done
+
+        # Check for special cases where we do want to allow repeated
+        # arguments (per
+        # http://www.open-mpi.org/community/lists/devel/2012/08/11362.php
+        # and
+        # https://github.com/open-mpi/ompi/issues/324).
+
+        case $val in
+        -Xclang|-Xg)
+                pmix_found=0
+                pmix_i=`expr $pmix_count + 1`
+                ;;
+        -framework)
+                pmix_found=0
+                pmix_i=`expr $pmix_count + 1`
+                ;;
+        --param)
+                pmix_found=0
+                pmix_i=`expr $pmix_count + 1`
+                ;;
+        esac
+
+        # If we didn't find the token, add it to the "array"
+
+        if test "$pmix_found" = "0"; then
+	    pmix_eval="pmix_array_$pmix_i=$val"
+	    eval $pmix_eval
+	    pmix_count="`expr $pmix_count + 1`"
+        else
+	    pmix_i="`expr $pmix_i - 1`"
+        fi
+    done
+
+    # Take all the items in the "array" and assemble them back into a
+    # single variable
+
+    pmix_i=1
+    pmix_done="`expr $pmix_i \> $pmix_count`"
+    pmix_newval=
+    while test "$pmix_done" = "0"; do
+        pmix_eval="pmix_newval=\"$pmix_newval \$pmix_array_$pmix_i\""
+        eval $pmix_eval
+
+        pmix_eval="unset pmix_array_$pmix_i"
+        eval $pmix_eval
+
+        pmix_done="`expr $pmix_i \>= $pmix_count`"
+        pmix_i="`expr $pmix_i + 1`"
+    done
+
+    # Done; do the assignment
+
+    pmix_newval="`echo $pmix_newval`"
+    pmix_eval="$pmix_name=\"$pmix_newval\""
+    eval $pmix_eval
+
+    # Clean up
+
+    unset pmix_name pmix_i pmix_done pmix_newval pmix_eval pmix_count
+
+
+#
+# Delayed the substitution of CFLAGS and CXXFLAGS until now because
+# they may have been modified throughout the course of this script.
+#
+
+
+
+
+pmix_show_title "Final compiler flags"
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking final CPPFLAGS" >&5
+$as_echo_n "checking final CPPFLAGS... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPPFLAGS" >&5
+$as_echo "$CPPFLAGS" >&6; }
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking final CFLAGS" >&5
+$as_echo_n "checking final CFLAGS... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CFLAGS" >&5
+$as_echo "$CFLAGS" >&6; }
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking final LDFLAGS" >&5
+$as_echo_n "checking final LDFLAGS... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LDFLAGS" >&5
+$as_echo "$LDFLAGS" >&6; }
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking final LIBS" >&5
+$as_echo_n "checking final LIBS... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBS" >&5
+$as_echo "$LIBS" >&6; }
+
+####################################################################
+# Version information
+####################################################################
+
+# PMIX_VERSION was setup by PMIX_SETUP_CORE above.
+
+# Make configure depend on the VERSION file, since it's used in AC_INIT
+CONFIGURE_DEPENDENCIES='$(top_srcdir)/VERSION'
+
+
+. $srcdir/VERSION
+
+
+ac_config_files="$ac_config_files contrib/Makefile examples/Makefile man/Makefile test/Makefile test/simple/Makefile"
+
+
+pmix_show_title "Configuration complete"
+
+cat >confcache <<\_ACEOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs, see configure's option --config-cache.
+# It is not useful on other systems.  If it contains results you don't
+# want to keep, you may remove or edit it.
+#
+# config.status only pays attention to the cache file if you give it
+# the --recheck option to rerun configure.
+#
+# `ac_cv_env_foo' variables (set or unset) will be overridden when
+# loading this file, other *unset* `ac_cv_foo' will be assigned the
+# following values.
+
+_ACEOF
+
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, we kill variables containing newlines.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+(
+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) { eval $ac_var=; unset $ac_var;} ;;
+      esac ;;
+    esac
+  done
+
+  (set) 2>&1 |
+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
+    *${as_nl}ac_space=\ *)
+      # `set' does not quote correctly, so add quotes: double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \.
+      sed -n \
+	"s/'/'\\\\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+      ;; #(
+    *)
+      # `set' quotes correctly as required by POSIX, so do not add quotes.
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+      ;;
+    esac |
+    sort
+) |
+  sed '
+     /^ac_cv_env_/b end
+     t clear
+     :clear
+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+     t end
+     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     :end' >>confcache
+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
+  if test -w "$cache_file"; then
+    if test "x$cache_file" != "x/dev/null"; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
+      if test ! -f "$cache_file" || test -h "$cache_file"; then
+	cat confcache >"$cache_file"
+      else
+        case $cache_file in #(
+        */* | ?:*)
+	  mv -f confcache "$cache_file"$$ &&
+	  mv -f "$cache_file"$$ "$cache_file" ;; #(
+        *)
+	  mv -f confcache "$cache_file" ;;
+	esac
+      fi
+    fi
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+  fi
+fi
+rm -f confcache
+
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+# Let make expand exec_prefix.
+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+
+DEFS=-DHAVE_CONFIG_H
+
+ac_libobjs=
+ac_ltlibobjs=
+U=
+for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
+  # 1. Remove the extension, and $U if already installed.
+  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
+  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
+  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
+  #    will be set to the directory where LIBOBJS objects are built.
+  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
+done
+LIBOBJS=$ac_libobjs
+
+LTLIBOBJS=$ac_ltlibobjs
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
+$as_echo_n "checking that generated files are newer than configure... " >&6; }
+   if test -n "$am_sleep_pid"; then
+     # Hide warnings about reused PIDs.
+     wait $am_sleep_pid 2>/dev/null
+   fi
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
+$as_echo "done" >&6; }
+ if test -n "$EXEEXT"; then
+  am__EXEEXT_TRUE=
+  am__EXEEXT_FALSE='#'
+else
+  am__EXEEXT_TRUE='#'
+  am__EXEEXT_FALSE=
+fi
+
+if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
+  as_fn_error $? "conditional \"AMDEP\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
+  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${WANT_INSTALL_HEADERS_TRUE}" && test -z "${WANT_INSTALL_HEADERS_FALSE}"; then
+  as_fn_error $? "conditional \"WANT_INSTALL_HEADERS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
+  as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${am__fastdepCCAS_TRUE}" && test -z "${am__fastdepCCAS_FALSE}"; then
+  as_fn_error $? "conditional \"am__fastdepCCAS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${PMIX_DESTRUCTOR_USE_FINI_TRUE}" && test -z "${PMIX_DESTRUCTOR_USE_FINI_FALSE}"; then
+  as_fn_error $? "conditional \"PMIX_DESTRUCTOR_USE_FINI\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${PMIX_HAVE_PANDOC_TRUE}" && test -z "${PMIX_HAVE_PANDOC_FALSE}"; then
+  as_fn_error $? "conditional \"PMIX_HAVE_PANDOC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+
+if test -z "${WANT_HIDDEN_TRUE}" && test -z "${WANT_HIDDEN_FALSE}"; then
+  as_fn_error $? "conditional \"WANT_HIDDEN\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${MCA_BUILD_pmix_pdl_pdlopen_DSO_TRUE}" && test -z "${MCA_BUILD_pmix_pdl_pdlopen_DSO_FALSE}"; then
+  as_fn_error $? "conditional \"MCA_BUILD_pmix_pdl_pdlopen_DSO\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${MCA_BUILD_pmix_pdl_plibltdl_DSO_TRUE}" && test -z "${MCA_BUILD_pmix_pdl_plibltdl_DSO_FALSE}"; then
+  as_fn_error $? "conditional \"MCA_BUILD_pmix_pdl_plibltdl_DSO\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${MCA_BUILD_pmix_pif_bsdx_ipv4_DSO_TRUE}" && test -z "${MCA_BUILD_pmix_pif_bsdx_ipv4_DSO_FALSE}"; then
+  as_fn_error $? "conditional \"MCA_BUILD_pmix_pif_bsdx_ipv4_DSO\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${MCA_BUILD_pmix_pif_bsdx_ipv6_DSO_TRUE}" && test -z "${MCA_BUILD_pmix_pif_bsdx_ipv6_DSO_FALSE}"; then
+  as_fn_error $? "conditional \"MCA_BUILD_pmix_pif_bsdx_ipv6_DSO\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${MCA_BUILD_pmix_pif_linux_ipv6_DSO_TRUE}" && test -z "${MCA_BUILD_pmix_pif_linux_ipv6_DSO_FALSE}"; then
+  as_fn_error $? "conditional \"MCA_BUILD_pmix_pif_linux_ipv6_DSO\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${MCA_BUILD_pmix_pif_posix_ipv4_DSO_TRUE}" && test -z "${MCA_BUILD_pmix_pif_posix_ipv4_DSO_FALSE}"; then
+  as_fn_error $? "conditional \"MCA_BUILD_pmix_pif_posix_ipv4_DSO\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${MCA_BUILD_pmix_pif_solaris_ipv6_DSO_TRUE}" && test -z "${MCA_BUILD_pmix_pif_solaris_ipv6_DSO_FALSE}"; then
+  as_fn_error $? "conditional \"MCA_BUILD_pmix_pif_solaris_ipv6_DSO\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${MCA_BUILD_pmix_pinstalldirs_env_DSO_TRUE}" && test -z "${MCA_BUILD_pmix_pinstalldirs_env_DSO_FALSE}"; then
+  as_fn_error $? "conditional \"MCA_BUILD_pmix_pinstalldirs_env_DSO\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${MCA_BUILD_pmix_pinstalldirs_config_DSO_TRUE}" && test -z "${MCA_BUILD_pmix_pinstalldirs_config_DSO_FALSE}"; then
+  as_fn_error $? "conditional \"MCA_BUILD_pmix_pinstalldirs_config_DSO\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${MCA_BUILD_pmix_pnet_opa_DSO_TRUE}" && test -z "${MCA_BUILD_pmix_pnet_opa_DSO_FALSE}"; then
+  as_fn_error $? "conditional \"MCA_BUILD_pmix_pnet_opa_DSO\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${MCA_BUILD_pmix_psec_native_DSO_TRUE}" && test -z "${MCA_BUILD_pmix_psec_native_DSO_FALSE}"; then
+  as_fn_error $? "conditional \"MCA_BUILD_pmix_psec_native_DSO\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${MCA_BUILD_pmix_psec_none_DSO_TRUE}" && test -z "${MCA_BUILD_pmix_psec_none_DSO_FALSE}"; then
+  as_fn_error $? "conditional \"MCA_BUILD_pmix_psec_none_DSO\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${MCA_BUILD_pmix_psec_munge_DSO_TRUE}" && test -z "${MCA_BUILD_pmix_psec_munge_DSO_FALSE}"; then
+  as_fn_error $? "conditional \"MCA_BUILD_pmix_psec_munge_DSO\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${MCA_BUILD_pmix_psensor_file_DSO_TRUE}" && test -z "${MCA_BUILD_pmix_psensor_file_DSO_FALSE}"; then
+  as_fn_error $? "conditional \"MCA_BUILD_pmix_psensor_file_DSO\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${MCA_BUILD_pmix_psensor_heartbeat_DSO_TRUE}" && test -z "${MCA_BUILD_pmix_psensor_heartbeat_DSO_FALSE}"; then
+  as_fn_error $? "conditional \"MCA_BUILD_pmix_psensor_heartbeat_DSO\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${MCA_BUILD_pmix_ptl_tcp_DSO_TRUE}" && test -z "${MCA_BUILD_pmix_ptl_tcp_DSO_FALSE}"; then
+  as_fn_error $? "conditional \"MCA_BUILD_pmix_ptl_tcp_DSO\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${MCA_BUILD_pmix_ptl_usock_DSO_TRUE}" && test -z "${MCA_BUILD_pmix_ptl_usock_DSO_FALSE}"; then
+  as_fn_error $? "conditional \"MCA_BUILD_pmix_ptl_usock_DSO\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${PMIX_EMBEDDED_MODE_TRUE}" && test -z "${PMIX_EMBEDDED_MODE_FALSE}"; then
+  as_fn_error $? "conditional \"PMIX_EMBEDDED_MODE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${PMIX_TESTS_EXAMPLES_TRUE}" && test -z "${PMIX_TESTS_EXAMPLES_FALSE}"; then
+  as_fn_error $? "conditional \"PMIX_TESTS_EXAMPLES\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${PMIX_COMPILE_TIMING_TRUE}" && test -z "${PMIX_COMPILE_TIMING_FALSE}"; then
+  as_fn_error $? "conditional \"PMIX_COMPILE_TIMING\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${PMIX_WANT_MUNGE_TRUE}" && test -z "${PMIX_WANT_MUNGE_FALSE}"; then
+  as_fn_error $? "conditional \"PMIX_WANT_MUNGE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${PMIX_WANT_SASL_TRUE}" && test -z "${PMIX_WANT_SASL_FALSE}"; then
+  as_fn_error $? "conditional \"PMIX_WANT_SASL\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${WANT_DSTORE_TRUE}" && test -z "${WANT_DSTORE_FALSE}"; then
+  as_fn_error $? "conditional \"WANT_DSTORE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${WANT_PRIMARY_HEADERS_TRUE}" && test -z "${WANT_PRIMARY_HEADERS_FALSE}"; then
+  as_fn_error $? "conditional \"WANT_PRIMARY_HEADERS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${WANT_INSTALL_HEADERS_TRUE}" && test -z "${WANT_INSTALL_HEADERS_FALSE}"; then
+  as_fn_error $? "conditional \"WANT_INSTALL_HEADERS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${WANT_PMI_BACKWARD_TRUE}" && test -z "${WANT_PMI_BACKWARD_FALSE}"; then
+  as_fn_error $? "conditional \"WANT_PMI_BACKWARD\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+
+: "${CONFIG_STATUS=./config.status}"
+ac_write_fail=0
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+as_write_fail=0
+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
+#! $SHELL
+# Generated by $as_me.
+# Run this file to recreate the current configuration.
+# Compiler output produced by configure, useful for debugging
+# configure, is in config.log if it exists.
+
+debug=false
+ac_cs_recheck=false
+ac_cs_silent=false
+
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
+
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
+fi
+
+
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in #(
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
+fi
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" ""	$as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
+case $0 in #((
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  done
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  exit 1
+fi
+
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+  fi
+  $as_echo "$as_me: error: $2" >&2
+  as_fn_exit $as_status
+} # as_fn_error
+
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} # as_fn_exit
+
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
+else
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
+else
+  as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  }
+fi # as_fn_arith
+
+
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+  as_basename=basename
+else
+  as_basename=false
+fi
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in #(((((
+-n*)
+  case `echo 'xy\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
+  esac;;
+*)
+  ECHO_N='-n';;
+esac
+
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
+else
+  rm -f conf$$.dir
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -pR'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -pR'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
+    as_ln_s='cp -pR'
+  fi
+else
+  as_ln_s='cp -pR'
+fi
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
+
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
+if mkdir -p . 2>/dev/null; then
+  as_mkdir_p='mkdir -p "$as_dir"'
+else
+  test -d ./-p && rmdir ./-p
+  as_mkdir_p=false
+fi
+
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+
+exec 6>&1
+## ----------------------------------- ##
+## Main body of $CONFIG_STATUS script. ##
+## ----------------------------------- ##
+_ASEOF
+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# Save the log message, to keep $0 and so on meaningful, and to
+# report actual input values of CONFIG_FILES etc. instead of their
+# values after options handling.
+ac_log="
+This file was extended by pmix $as_me 2.0.1, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
+
+  CONFIG_FILES    = $CONFIG_FILES
+  CONFIG_HEADERS  = $CONFIG_HEADERS
+  CONFIG_LINKS    = $CONFIG_LINKS
+  CONFIG_COMMANDS = $CONFIG_COMMANDS
+  $ $0 $@
+
+on `(hostname || uname -n) 2>/dev/null | sed 1q`
+"
+
+_ACEOF
+
+case $ac_config_files in *"
+"*) set x $ac_config_files; shift; ac_config_files=$*;;
+esac
+
+case $ac_config_headers in *"
+"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
+esac
+
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+# Files that config.status was made for.
+config_files="$ac_config_files"
+config_headers="$ac_config_headers"
+config_commands="$ac_config_commands"
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+ac_cs_usage="\
+\`$as_me' instantiates files and other configuration actions
+from templates according to the current configuration.  Unless the files
+and actions are specified as TAGs, all are instantiated by default.
+
+Usage: $0 [OPTION]... [TAG]...
+
+  -h, --help       print this help, then exit
+  -V, --version    print version number and configuration settings, then exit
+      --config     print configuration, then exit
+  -q, --quiet, --silent
+                   do not print progress messages
+  -d, --debug      don't remove temporary files
+      --recheck    update $as_me by reconfiguring in the same conditions
+      --file=FILE[:TEMPLATE]
+                   instantiate the configuration file FILE
+      --header=FILE[:TEMPLATE]
+                   instantiate the configuration header FILE
+
+Configuration files:
+$config_files
+
+Configuration headers:
+$config_headers
+
+Configuration commands:
+$config_commands
+
+Report bugs to <http://pmix.github.io/master>."
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
+ac_cs_version="\\
+pmix config.status 2.0.1
+configured by $0, generated by GNU Autoconf 2.69,
+  with options \\"\$ac_cs_config\\"
+
+Copyright (C) 2012 Free Software Foundation, Inc.
+This config.status script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it."
+
+ac_pwd='$ac_pwd'
+srcdir='$srcdir'
+INSTALL='$INSTALL'
+MKDIR_P='$MKDIR_P'
+AWK='$AWK'
+test -n "\$AWK" || AWK=awk
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# The default lists apply if the user does not specify any file.
+ac_need_defaults=:
+while test $# != 0
+do
+  case $1 in
+  --*=?*)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
+    ac_shift=:
+    ;;
+  --*=)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=
+    ac_shift=:
+    ;;
+  *)
+    ac_option=$1
+    ac_optarg=$2
+    ac_shift=shift
+    ;;
+  esac
+
+  case $ac_option in
+  # Handling of the options.
+  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+    ac_cs_recheck=: ;;
+  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+    $as_echo "$ac_cs_version"; exit ;;
+  --config | --confi | --conf | --con | --co | --c )
+    $as_echo "$ac_cs_config"; exit ;;
+  --debug | --debu | --deb | --de | --d | -d )
+    debug=: ;;
+  --file | --fil | --fi | --f )
+    $ac_shift
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    '') as_fn_error $? "missing file argument" ;;
+    esac
+    as_fn_append CONFIG_FILES " '$ac_optarg'"
+    ac_need_defaults=false;;
+  --header | --heade | --head | --hea )
+    $ac_shift
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    as_fn_append CONFIG_HEADERS " '$ac_optarg'"
+    ac_need_defaults=false;;
+  --he | --h)
+    # Conflict between --help and --header
+    as_fn_error $? "ambiguous option: \`$1'
+Try \`$0 --help' for more information.";;
+  --help | --hel | -h )
+    $as_echo "$ac_cs_usage"; exit ;;
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil | --si | --s)
+    ac_cs_silent=: ;;
+
+  # This is an error.
+  -*) as_fn_error $? "unrecognized option: \`$1'
+Try \`$0 --help' for more information." ;;
+
+  *) as_fn_append ac_config_targets " $1"
+     ac_need_defaults=false ;;
+
+  esac
+  shift
+done
+
+ac_configure_extra_args=
+
+if $ac_cs_silent; then
+  exec 6>/dev/null
+  ac_configure_extra_args="$ac_configure_extra_args --silent"
+fi
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+if \$ac_cs_recheck; then
+  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  shift
+  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+  CONFIG_SHELL='$SHELL'
+  export CONFIG_SHELL
+  exec "\$@"
+fi
+
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+exec 5>>config.log
+{
+  echo
+  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+## Running $as_me. ##
+_ASBOX
+  $as_echo "$ac_log"
+} >&5
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+#
+# INIT-COMMANDS
+#
+AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+sed_quote_subst='$sed_quote_subst'
+double_quote_subst='$double_quote_subst'
+delay_variable_subst='$delay_variable_subst'
+enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
+enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
+macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
+macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
+pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
+enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
+shared_archive_member_spec='`$ECHO "$shared_archive_member_spec" | $SED "$delay_single_quote_subst"`'
+SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
+ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
+PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
+host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
+host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
+host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
+build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`'
+build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`'
+build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`'
+SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`'
+Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`'
+GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`'
+EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`'
+FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`'
+LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`'
+NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`'
+LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`'
+max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`'
+ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`'
+exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
+lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
+lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
+lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
+reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
+reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
+OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
+deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
+file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
+AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
+AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
+STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
+RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
+old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
+old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
+old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`'
+lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`'
+CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`'
+CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`'
+compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`'
+GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_import='`$ECHO "$lt_cv_sys_global_symbol_to_import" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
+lt_cv_nm_interface='`$ECHO "$lt_cv_nm_interface" | $SED "$delay_single_quote_subst"`'
+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
+lt_cv_truncate_bin='`$ECHO "$lt_cv_truncate_bin" | $SED "$delay_single_quote_subst"`'
+objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
+MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
+lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
+need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
+DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
+NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
+LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
+OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`'
+OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`'
+libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`'
+shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`'
+extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
+archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`'
+enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`'
+export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`'
+whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`'
+compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`'
+old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`'
+old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
+archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`'
+archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`'
+module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`'
+module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`'
+with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`'
+allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
+no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
+hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
+hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
+hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`'
+hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`'
+hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
+inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
+link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
+always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
+export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
+exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
+include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
+prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
+file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
+variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
+need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
+need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`'
+version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`'
+runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`'
+shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`'
+shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`'
+libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`'
+library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`'
+soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`'
+install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`'
+postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`'
+postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
+finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'
+finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
+hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
+sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
+configure_time_dlsearch_path='`$ECHO "$configure_time_dlsearch_path" | $SED "$delay_single_quote_subst"`'
+configure_time_lt_sys_library_path='`$ECHO "$configure_time_lt_sys_library_path" | $SED "$delay_single_quote_subst"`'
+hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
+enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
+enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
+enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`'
+old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`'
+striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`'
+compiler_lib_search_dirs='`$ECHO "$compiler_lib_search_dirs" | $SED "$delay_single_quote_subst"`'
+predep_objects='`$ECHO "$predep_objects" | $SED "$delay_single_quote_subst"`'
+postdep_objects='`$ECHO "$postdep_objects" | $SED "$delay_single_quote_subst"`'
+predeps='`$ECHO "$predeps" | $SED "$delay_single_quote_subst"`'
+postdeps='`$ECHO "$postdeps" | $SED "$delay_single_quote_subst"`'
+compiler_lib_search_path='`$ECHO "$compiler_lib_search_path" | $SED "$delay_single_quote_subst"`'
+LD_CXX='`$ECHO "$LD_CXX" | $SED "$delay_single_quote_subst"`'
+reload_flag_CXX='`$ECHO "$reload_flag_CXX" | $SED "$delay_single_quote_subst"`'
+reload_cmds_CXX='`$ECHO "$reload_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`'
+GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`'
+lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`'
+archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`'
+enable_shared_with_static_runtimes_CXX='`$ECHO "$enable_shared_with_static_runtimes_CXX" | $SED "$delay_single_quote_subst"`'
+export_dynamic_flag_spec_CXX='`$ECHO "$export_dynamic_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
+whole_archive_flag_spec_CXX='`$ECHO "$whole_archive_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
+compiler_needs_object_CXX='`$ECHO "$compiler_needs_object_CXX" | $SED "$delay_single_quote_subst"`'
+old_archive_from_new_cmds_CXX='`$ECHO "$old_archive_from_new_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+old_archive_from_expsyms_cmds_CXX='`$ECHO "$old_archive_from_expsyms_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+archive_cmds_CXX='`$ECHO "$archive_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+archive_expsym_cmds_CXX='`$ECHO "$archive_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+module_cmds_CXX='`$ECHO "$module_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+module_expsym_cmds_CXX='`$ECHO "$module_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+with_gnu_ld_CXX='`$ECHO "$with_gnu_ld_CXX" | $SED "$delay_single_quote_subst"`'
+allow_undefined_flag_CXX='`$ECHO "$allow_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
+no_undefined_flag_CXX='`$ECHO "$no_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec_CXX='`$ECHO "$hardcode_libdir_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_separator_CXX='`$ECHO "$hardcode_libdir_separator_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_direct_CXX='`$ECHO "$hardcode_direct_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_direct_absolute_CXX='`$ECHO "$hardcode_direct_absolute_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_minus_L_CXX='`$ECHO "$hardcode_minus_L_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`'
+inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`'
+link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`'
+always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`'
+export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
+include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
+prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`'
+compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`'
+predep_objects_CXX='`$ECHO "$predep_objects_CXX" | $SED "$delay_single_quote_subst"`'
+postdep_objects_CXX='`$ECHO "$postdep_objects_CXX" | $SED "$delay_single_quote_subst"`'
+predeps_CXX='`$ECHO "$predeps_CXX" | $SED "$delay_single_quote_subst"`'
+postdeps_CXX='`$ECHO "$postdeps_CXX" | $SED "$delay_single_quote_subst"`'
+compiler_lib_search_path_CXX='`$ECHO "$compiler_lib_search_path_CXX" | $SED "$delay_single_quote_subst"`'
+
+LTCC='$LTCC'
+LTCFLAGS='$LTCFLAGS'
+compiler='$compiler_DEFAULT'
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+\$1
+_LTECHO_EOF'
+}
+
+# Quote evaled strings.
+for var in SHELL \
+ECHO \
+PATH_SEPARATOR \
+SED \
+GREP \
+EGREP \
+FGREP \
+LD \
+NM \
+LN_S \
+lt_SP2NL \
+lt_NL2SP \
+reload_flag \
+OBJDUMP \
+deplibs_check_method \
+file_magic_cmd \
+file_magic_glob \
+want_nocaseglob \
+DLLTOOL \
+sharedlib_from_linklib_cmd \
+AR \
+AR_FLAGS \
+archiver_list_spec \
+STRIP \
+RANLIB \
+CC \
+CFLAGS \
+compiler \
+lt_cv_sys_global_symbol_pipe \
+lt_cv_sys_global_symbol_to_cdecl \
+lt_cv_sys_global_symbol_to_import \
+lt_cv_sys_global_symbol_to_c_name_address \
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
+lt_cv_nm_interface \
+nm_file_list_spec \
+lt_cv_truncate_bin \
+lt_prog_compiler_no_builtin_flag \
+lt_prog_compiler_pic \
+lt_prog_compiler_wl \
+lt_prog_compiler_static \
+lt_cv_prog_compiler_c_o \
+need_locks \
+MANIFEST_TOOL \
+DSYMUTIL \
+NMEDIT \
+LIPO \
+OTOOL \
+OTOOL64 \
+shrext_cmds \
+export_dynamic_flag_spec \
+whole_archive_flag_spec \
+compiler_needs_object \
+with_gnu_ld \
+allow_undefined_flag \
+no_undefined_flag \
+hardcode_libdir_flag_spec \
+hardcode_libdir_separator \
+exclude_expsyms \
+include_expsyms \
+file_list_spec \
+variables_saved_for_relink \
+libname_spec \
+library_names_spec \
+soname_spec \
+install_override_mode \
+finish_eval \
+old_striplib \
+striplib \
+compiler_lib_search_dirs \
+predep_objects \
+postdep_objects \
+predeps \
+postdeps \
+compiler_lib_search_path \
+LD_CXX \
+reload_flag_CXX \
+compiler_CXX \
+lt_prog_compiler_no_builtin_flag_CXX \
+lt_prog_compiler_pic_CXX \
+lt_prog_compiler_wl_CXX \
+lt_prog_compiler_static_CXX \
+lt_cv_prog_compiler_c_o_CXX \
+export_dynamic_flag_spec_CXX \
+whole_archive_flag_spec_CXX \
+compiler_needs_object_CXX \
+with_gnu_ld_CXX \
+allow_undefined_flag_CXX \
+no_undefined_flag_CXX \
+hardcode_libdir_flag_spec_CXX \
+hardcode_libdir_separator_CXX \
+exclude_expsyms_CXX \
+include_expsyms_CXX \
+file_list_spec_CXX \
+compiler_lib_search_dirs_CXX \
+predep_objects_CXX \
+postdep_objects_CXX \
+predeps_CXX \
+postdeps_CXX \
+compiler_lib_search_path_CXX; do
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+    *[\\\\\\\`\\"\\\$]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+# Double-quote double-evaled strings.
+for var in reload_cmds \
+old_postinstall_cmds \
+old_postuninstall_cmds \
+old_archive_cmds \
+extract_expsyms_cmds \
+old_archive_from_new_cmds \
+old_archive_from_expsyms_cmds \
+archive_cmds \
+archive_expsym_cmds \
+module_cmds \
+module_expsym_cmds \
+export_symbols_cmds \
+prelink_cmds \
+postlink_cmds \
+postinstall_cmds \
+postuninstall_cmds \
+finish_cmds \
+sys_lib_search_path_spec \
+configure_time_dlsearch_path \
+configure_time_lt_sys_library_path \
+reload_cmds_CXX \
+old_archive_cmds_CXX \
+old_archive_from_new_cmds_CXX \
+old_archive_from_expsyms_cmds_CXX \
+archive_cmds_CXX \
+archive_expsym_cmds_CXX \
+module_cmds_CXX \
+module_expsym_cmds_CXX \
+export_symbols_cmds_CXX \
+prelink_cmds_CXX \
+postlink_cmds_CXX; do
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+    *[\\\\\\\`\\"\\\$]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+ac_aux_dir='$ac_aux_dir'
+
+# See if we are running on zsh, and set the options that allow our
+# commands through without removal of \ escapes INIT.
+if test -n "\${ZSH_VERSION+set}"; then
+   setopt NO_GLOB_SUBST
+fi
+
+
+    PACKAGE='$PACKAGE'
+    VERSION='$VERSION'
+    RM='$RM'
+    ofile='$ofile'
+
+
+
+
+
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+
+# Handling of arguments.
+for ac_config_target in $ac_config_targets
+do
+  case $ac_config_target in
+    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+    "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
+    "include/pmix_version.h") CONFIG_FILES="$CONFIG_FILES include/pmix_version.h" ;;
+    "src/include/pmix_config.h") CONFIG_HEADERS="$CONFIG_HEADERS src/include/pmix_config.h" ;;
+    "include/pmix_rename.h") CONFIG_FILES="$CONFIG_FILES include/pmix_rename.h" ;;
+    "src/mca/pdl/Makefile") CONFIG_FILES="$CONFIG_FILES src/mca/pdl/Makefile" ;;
+    "src/mca/pdl/pdlopen/Makefile") CONFIG_FILES="$CONFIG_FILES src/mca/pdl/pdlopen/Makefile" ;;
+    "src/mca/pdl/plibltdl/Makefile") CONFIG_FILES="$CONFIG_FILES src/mca/pdl/plibltdl/Makefile" ;;
+    "src/mca/pif/Makefile") CONFIG_FILES="$CONFIG_FILES src/mca/pif/Makefile" ;;
+    "src/mca/pif/bsdx_ipv4/Makefile") CONFIG_FILES="$CONFIG_FILES src/mca/pif/bsdx_ipv4/Makefile" ;;
+    "src/mca/pif/bsdx_ipv6/Makefile") CONFIG_FILES="$CONFIG_FILES src/mca/pif/bsdx_ipv6/Makefile" ;;
+    "src/mca/pif/linux_ipv6/Makefile") CONFIG_FILES="$CONFIG_FILES src/mca/pif/linux_ipv6/Makefile" ;;
+    "src/mca/pif/posix_ipv4/Makefile") CONFIG_FILES="$CONFIG_FILES src/mca/pif/posix_ipv4/Makefile" ;;
+    "src/mca/pif/solaris_ipv6/Makefile") CONFIG_FILES="$CONFIG_FILES src/mca/pif/solaris_ipv6/Makefile" ;;
+    "src/mca/pinstalldirs/Makefile") CONFIG_FILES="$CONFIG_FILES src/mca/pinstalldirs/Makefile" ;;
+    "src/mca/pinstalldirs/env/Makefile") CONFIG_FILES="$CONFIG_FILES src/mca/pinstalldirs/env/Makefile" ;;
+    "src/mca/pinstalldirs/config/Makefile") CONFIG_FILES="$CONFIG_FILES src/mca/pinstalldirs/config/Makefile" ;;
+    "src/mca/pinstalldirs/config/pinstall_dirs.h") CONFIG_FILES="$CONFIG_FILES src/mca/pinstalldirs/config/pinstall_dirs.h" ;;
+    "src/mca/pnet/Makefile") CONFIG_FILES="$CONFIG_FILES src/mca/pnet/Makefile" ;;
+    "src/mca/pnet/opa/Makefile") CONFIG_FILES="$CONFIG_FILES src/mca/pnet/opa/Makefile" ;;
+    "src/mca/psec/Makefile") CONFIG_FILES="$CONFIG_FILES src/mca/psec/Makefile" ;;
+    "src/mca/psec/native/Makefile") CONFIG_FILES="$CONFIG_FILES src/mca/psec/native/Makefile" ;;
+    "src/mca/psec/none/Makefile") CONFIG_FILES="$CONFIG_FILES src/mca/psec/none/Makefile" ;;
+    "src/mca/psec/munge/Makefile") CONFIG_FILES="$CONFIG_FILES src/mca/psec/munge/Makefile" ;;
+    "src/mca/psensor/Makefile") CONFIG_FILES="$CONFIG_FILES src/mca/psensor/Makefile" ;;
+    "src/mca/psensor/file/Makefile") CONFIG_FILES="$CONFIG_FILES src/mca/psensor/file/Makefile" ;;
+    "src/mca/psensor/heartbeat/Makefile") CONFIG_FILES="$CONFIG_FILES src/mca/psensor/heartbeat/Makefile" ;;
+    "src/mca/ptl/Makefile") CONFIG_FILES="$CONFIG_FILES src/mca/ptl/Makefile" ;;
+    "src/mca/ptl/tcp/Makefile") CONFIG_FILES="$CONFIG_FILES src/mca/ptl/tcp/Makefile" ;;
+    "src/mca/ptl/usock/Makefile") CONFIG_FILES="$CONFIG_FILES src/mca/ptl/usock/Makefile" ;;
+    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+    "config/Makefile") CONFIG_FILES="$CONFIG_FILES config/Makefile" ;;
+    "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
+    "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
+    "src/util/keyval/Makefile") CONFIG_FILES="$CONFIG_FILES src/util/keyval/Makefile" ;;
+    "src/mca/base/Makefile") CONFIG_FILES="$CONFIG_FILES src/mca/base/Makefile" ;;
+    "contrib/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/Makefile" ;;
+    "examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;;
+    "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
+    "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
+    "test/simple/Makefile") CONFIG_FILES="$CONFIG_FILES test/simple/Makefile" ;;
+
+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+  esac
+done
+
+
+# If the user did not use the arguments to specify the items to instantiate,
+# then the envvar interface is used.  Set only those that are not.
+# We use the long form for the default assignment because of an extremely
+# bizarre bug on SunOS 4.1.3.
+if $ac_need_defaults; then
+  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
+  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
+  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
+fi
+
+# Have a temporary directory for convenience.  Make it in the build tree
+# simply because there is no reason against having it here, and in addition,
+# creating and moving files from /tmp can sometimes cause problems.
+# Hook for its removal unless debugging.
+# Note that there is a small window in which the directory will not be cleaned:
+# after its creation but before its name has been assigned to `$tmp'.
+$debug ||
+{
+  tmp= ac_tmp=
+  trap 'exit_status=$?
+  : "${ac_tmp:=$tmp}"
+  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
+' 0
+  trap 'as_fn_exit 1' 1 2 13 15
+}
+# Create a (secure) tmp directory for tmp files.
+
+{
+  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
+  test -d "$tmp"
+}  ||
+{
+  tmp=./conf$$-$RANDOM
+  (umask 077 && mkdir "$tmp")
+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+ac_tmp=$tmp
+
+# Set up the scripts for CONFIG_FILES section.
+# No need to generate them if there are no CONFIG_FILES.
+# This happens for instance with `./config.status config.h'.
+if test -n "$CONFIG_FILES"; then
+
+
+ac_cr=`echo X | tr X '\015'`
+# On cygwin, bash can eat \r inside `` if the user requested igncr.
+# But we know of no other shell where ac_cr would be empty at this
+# point, so we can use a bashism as a fallback.
+if test "x$ac_cr" = x; then
+  eval ac_cr=\$\'\\r\'
+fi
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+  ac_cs_awk_cr='\\r'
+else
+  ac_cs_awk_cr=$ac_cr
+fi
+
+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
+_ACEOF
+
+
+{
+  echo "cat >conf$$subs.awk <<_ACEOF" &&
+  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+  echo "_ACEOF"
+} >conf$$subs.sh ||
+  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+  . ./conf$$subs.sh ||
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+
+  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+  if test $ac_delim_n = $ac_delim_num; then
+    break
+  elif $ac_last_try; then
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+rm -f conf$$subs.sh
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
+_ACEOF
+sed -n '
+h
+s/^/S["/; s/!.*/"]=/
+p
+g
+s/^[^!]*!//
+:repl
+t repl
+s/'"$ac_delim"'$//
+t delim
+:nl
+h
+s/\(.\{148\}\)..*/\1/
+t more1
+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+p
+n
+b repl
+:more1
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t nl
+:delim
+h
+s/\(.\{148\}\)..*/\1/
+t more2
+s/["\\]/\\&/g; s/^/"/; s/$/"/
+p
+b
+:more2
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t delim
+' <conf$$subs.awk | sed '
+/^[^""]/{
+  N
+  s/\n//
+}
+' >>$CONFIG_STATUS || ac_write_fail=1
+rm -f conf$$subs.awk
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACAWK
+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
+  for (key in S) S_is_set[key] = 1
+  FS = ""
+
+}
+{
+  line = $ 0
+  nfields = split(line, field, "@")
+  substed = 0
+  len = length(field[1])
+  for (i = 2; i < nfields; i++) {
+    key = field[i]
+    keylen = length(key)
+    if (S_is_set[key]) {
+      value = S[key]
+      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+      len += length(value) + length(field[++i])
+      substed = 1
+    } else
+      len += 1 + keylen
+  }
+
+  print line
+}
+
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+else
+  cat
+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
+  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
+_ACEOF
+
+# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
+# trailing colons and then remove the whole line if VPATH becomes empty
+# (actually we leave an empty line to preserve line numbers).
+if test "x$srcdir" = x.; then
+  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
+h
+s///
+s/^/:/
+s/[	 ]*$/:/
+s/:\$(srcdir):/:/g
+s/:\${srcdir}:/:/g
+s/:@srcdir@:/:/g
+s/^:*//
+s/:*$//
+x
+s/\(=[	 ]*\).*/\1/
+G
+s/\n//
+s/^[^=]*=[	 ]*$//
+}'
+fi
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+fi # test -n "$CONFIG_FILES"
+
+# Set up the scripts for CONFIG_HEADERS section.
+# No need to generate them if there are no CONFIG_HEADERS.
+# This happens for instance with `./config.status Makefile'.
+if test -n "$CONFIG_HEADERS"; then
+cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
+BEGIN {
+_ACEOF
+
+# Transform confdefs.h into an awk script `defines.awk', embedded as
+# here-document in config.status, that substitutes the proper values into
+# config.h.in to produce config.h.
+
+# Create a delimiter string that does not exist in confdefs.h, to ease
+# handling of long lines.
+ac_delim='%!_!# '
+for ac_last_try in false false :; do
+  ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
+  if test -z "$ac_tt"; then
+    break
+  elif $ac_last_try; then
+    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+
+# For the awk script, D is an array of macro values keyed by name,
+# likewise P contains macro parameters if any.  Preserve backslash
+# newline sequences.
+
+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
+sed -n '
+s/.\{148\}/&'"$ac_delim"'/g
+t rset
+:rset
+s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
+t def
+d
+:def
+s/\\$//
+t bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3"/p
+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2"/p
+d
+:bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3\\\\\\n"\\/p
+t cont
+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
+t cont
+d
+:cont
+n
+s/.\{148\}/&'"$ac_delim"'/g
+t clear
+:clear
+s/\\$//
+t bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/"/p
+d
+:bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
+b cont
+' <confdefs.h | sed '
+s/'"$ac_delim"'/"\\\
+"/g' >>$CONFIG_STATUS || ac_write_fail=1
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  for (key in D) D_is_set[key] = 1
+  FS = ""
+}
+/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
+  line = \$ 0
+  split(line, arg, " ")
+  if (arg[1] == "#") {
+    defundef = arg[2]
+    mac1 = arg[3]
+  } else {
+    defundef = substr(arg[1], 2)
+    mac1 = arg[2]
+  }
+  split(mac1, mac2, "(") #)
+  macro = mac2[1]
+  prefix = substr(line, 1, index(line, defundef) - 1)
+  if (D_is_set[macro]) {
+    # Preserve the white space surrounding the "#".
+    print prefix "define", macro P[macro] D[macro]
+    next
+  } else {
+    # Replace #undef with comments.  This is necessary, for example,
+    # in the case of _POSIX_SOURCE, which is predefined and required
+    # on some systems where configure will not decide to define it.
+    if (defundef == "undef") {
+      print "/*", prefix defundef, macro, "*/"
+      next
+    }
+  }
+}
+{ print }
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
+fi # test -n "$CONFIG_HEADERS"
+
+
+eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
+shift
+for ac_tag
+do
+  case $ac_tag in
+  :[FHLC]) ac_mode=$ac_tag; continue;;
+  esac
+  case $ac_mode$ac_tag in
+  :[FHL]*:*);;
+  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
+  :[FH]-) ac_tag=-:-;;
+  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
+  esac
+  ac_save_IFS=$IFS
+  IFS=:
+  set x $ac_tag
+  IFS=$ac_save_IFS
+  shift
+  ac_file=$1
+  shift
+
+  case $ac_mode in
+  :L) ac_source=$1;;
+  :[FH])
+    ac_file_inputs=
+    for ac_f
+    do
+      case $ac_f in
+      -) ac_f="$ac_tmp/stdin";;
+      *) # Look for the file first in the build tree, then in the source tree
+	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
+	 # because $ac_f cannot contain `:'.
+	 test -f "$ac_f" ||
+	   case $ac_f in
+	   [\\/$]*) false;;
+	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
+	   esac ||
+	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+      esac
+      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      as_fn_append ac_file_inputs " '$ac_f'"
+    done
+
+    # Let's still pretend it is `configure' which instantiates (i.e., don't
+    # use $as_me), people would be surprised to read:
+    #    /* config.h.  Generated by config.status.  */
+    configure_input='Generated from '`
+	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	`' by configure.'
+    if test x"$ac_file" != x-; then
+      configure_input="$ac_file.  $configure_input"
+      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
+    fi
+    # Neutralize special characters interpreted by sed in replacement strings.
+    case $configure_input in #(
+    *\&* | *\|* | *\\* )
+       ac_sed_conf_input=`$as_echo "$configure_input" |
+       sed 's/[\\\\&|]/\\\\&/g'`;; #(
+    *) ac_sed_conf_input=$configure_input;;
+    esac
+
+    case $ac_tag in
+    *:-:* | *:-) cat >"$ac_tmp/stdin" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
+    esac
+    ;;
+  esac
+
+  ac_dir=`$as_dirname -- "$ac_file" ||
+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$ac_file" : 'X\(//\)[^/]' \| \
+	 X"$ac_file" : 'X\(//\)$' \| \
+	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$ac_file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+  as_dir="$ac_dir"; as_fn_mkdir_p
+  ac_builddir=.
+
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
+
+case $srcdir in
+  .)  # We are building in place.
+    ac_srcdir=.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+
+  case $ac_mode in
+  :F)
+  #
+  # CONFIG_FILE
+  #
+
+  case $INSTALL in
+  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
+  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
+  esac
+  ac_MKDIR_P=$MKDIR_P
+  case $MKDIR_P in
+  [\\/$]* | ?:[\\/]* ) ;;
+  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
+  esac
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# If the template does not know about datarootdir, expand it.
+# FIXME: This hack should be removed a few years after 2.60.
+ac_datarootdir_hack=; ac_datarootdir_seen=
+ac_sed_dataroot='
+/datarootdir/ {
+  p
+  q
+}
+/@datadir@/p
+/@docdir@/p
+/@infodir@/p
+/@localedir@/p
+/@mandir@/p'
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
+*datarootdir*) ac_datarootdir_seen=yes;;
+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  ac_datarootdir_hack='
+  s&@datadir@&$datadir&g
+  s&@docdir@&$docdir&g
+  s&@infodir@&$infodir&g
+  s&@localedir@&$localedir&g
+  s&@mandir@&$mandir&g
+  s&\\\${datarootdir}&$datarootdir&g' ;;
+esac
+_ACEOF
+
+# Neutralize VPATH when `$srcdir' = `.'.
+# Shell code in configure.ac might set extrasub.
+# FIXME: do we really want to maintain this feature?
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_sed_extra="$ac_vpsub
+$extrasub
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+:t
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+s|@configure_input@|$ac_sed_conf_input|;t t
+s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
+s&@srcdir@&$ac_srcdir&;t t
+s&@abs_srcdir@&$ac_abs_srcdir&;t t
+s&@top_srcdir@&$ac_top_srcdir&;t t
+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
+s&@builddir@&$ac_builddir&;t t
+s&@abs_builddir@&$ac_abs_builddir&;t t
+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
+s&@INSTALL@&$ac_INSTALL&;t t
+s&@MKDIR_P@&$ac_MKDIR_P&;t t
+$ac_datarootdir_hack
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
+  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+
+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
+      "$ac_tmp/out"`; test -z "$ac_out"; } &&
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined" >&5
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined" >&2;}
+
+  rm -f "$ac_tmp/stdin"
+  case $ac_file in
+  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
+  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
+  esac \
+  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ ;;
+  :H)
+  #
+  # CONFIG_HEADER
+  #
+  if test x"$ac_file" != x-; then
+    {
+      $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
+    } >"$ac_tmp/config.h" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+    if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
+$as_echo "$as_me: $ac_file is unchanged" >&6;}
+    else
+      rm -f "$ac_file"
+      mv "$ac_tmp/config.h" "$ac_file" \
+	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
+    fi
+  else
+    $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
+      || as_fn_error $? "could not create -" "$LINENO" 5
+  fi
+# Compute "$ac_file"'s index in $config_headers.
+_am_arg="$ac_file"
+_am_stamp_count=1
+for _am_header in $config_headers :; do
+  case $_am_header in
+    $_am_arg | $_am_arg:* )
+      break ;;
+    * )
+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+  esac
+done
+echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
+$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$_am_arg" : 'X\(//\)[^/]' \| \
+	 X"$_am_arg" : 'X\(//\)$' \| \
+	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$_am_arg" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`/stamp-h$_am_stamp_count
+ ;;
+
+  :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
+$as_echo "$as_me: executing $ac_file commands" >&6;}
+ ;;
+  esac
+
+
+  case $ac_file$ac_mode in
+    "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
+  # Older Autoconf quotes --file arguments for eval, but not when files
+  # are listed without --file.  Let's play safe and only enable the eval
+  # if we detect the quoting.
+  case $CONFIG_FILES in
+  *\'*) eval set x "$CONFIG_FILES" ;;
+  *)   set x $CONFIG_FILES ;;
+  esac
+  shift
+  for mf
+  do
+    # Strip MF so we end up with the name of the file.
+    mf=`echo "$mf" | sed -e 's/:.*$//'`
+    # Check whether this is an Automake generated Makefile or not.
+    # We used to match only the files named 'Makefile.in', but
+    # some people rename them; so instead we look at the file content.
+    # Grep'ing the first line is not enough: some people post-process
+    # each Makefile.in and add a new line on top of each file to say so.
+    # Grep'ing the whole file is not good either: AIX grep has a line
+    # limit of 2048, but all sed's we know have understand at least 4000.
+    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+      dirpart=`$as_dirname -- "$mf" ||
+$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$mf" : 'X\(//\)[^/]' \| \
+	 X"$mf" : 'X\(//\)$' \| \
+	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$mf" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+    else
+      continue
+    fi
+    # Extract the definition of DEPDIR, am__include, and am__quote
+    # from the Makefile without running 'make'.
+    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+    test -z "$DEPDIR" && continue
+    am__include=`sed -n 's/^am__include = //p' < "$mf"`
+    test -z "$am__include" && continue
+    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+    # Find all dependency output files, they are included files with
+    # $(DEPDIR) in their names.  We invoke sed twice because it is the
+    # simplest approach to changing $(DEPDIR) to its actual value in the
+    # expansion.
+    for file in `sed -n "
+      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
+      # Make sure the directory exists.
+      test -f "$dirpart/$file" && continue
+      fdir=`$as_dirname -- "$file" ||
+$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$file" : 'X\(//\)[^/]' \| \
+	 X"$file" : 'X\(//\)$' \| \
+	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      as_dir=$dirpart/$fdir; as_fn_mkdir_p
+      # echo "creating $dirpart/$file"
+      echo '# dummy' > "$dirpart/$file"
+    done
+  done
+}
+ ;;
+    "libtool":C)
+
+    # See if we are running on zsh, and set the options that allow our
+    # commands through without removal of \ escapes.
+    if test -n "${ZSH_VERSION+set}"; then
+      setopt NO_GLOB_SUBST
+    fi
+
+    cfgfile=${ofile}T
+    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
+    $RM "$cfgfile"
+
+    cat <<_LT_EOF >> "$cfgfile"
+#! $SHELL
+# Generated automatically by $as_me ($PACKAGE) $VERSION
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+
+# Provide generalized library-building support services.
+# Written by Gordon Matzigkeit, 1996
+
+# Copyright (C) 2014 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions.  There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# GNU Libtool is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of of the License, or
+# (at your option) any later version.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program or library that is built
+# using GNU Libtool, you may include this file under the  same
+# distribution terms that you use for the rest of that program.
+#
+# GNU Libtool is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+# The names of the tagged configurations supported by this script.
+available_tags='CXX '
+
+# Configured defaults for sys_lib_dlsearch_path munging.
+: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"}
+
+# ### BEGIN LIBTOOL CONFIG
+
+# Whether or not to build shared libraries.
+build_libtool_libs=$enable_shared
+
+# Whether or not to build static libraries.
+build_old_libs=$enable_static
+
+# Which release of libtool.m4 was used?
+macro_version=$macro_version
+macro_revision=$macro_revision
+
+# What type of objects to build.
+pic_mode=$pic_mode
+
+# Whether or not to optimize for fast installation.
+fast_install=$enable_fast_install
+
+# Shared archive member basename,for filename based shared library versioning on AIX.
+shared_archive_member_spec=$shared_archive_member_spec
+
+# Shell to use when invoking shell scripts.
+SHELL=$lt_SHELL
+
+# An echo program that protects backslashes.
+ECHO=$lt_ECHO
+
+# The PATH separator for the build system.
+PATH_SEPARATOR=$lt_PATH_SEPARATOR
+
+# The host system.
+host_alias=$host_alias
+host=$host
+host_os=$host_os
+
+# The build system.
+build_alias=$build_alias
+build=$build
+build_os=$build_os
+
+# A sed program that does not truncate output.
+SED=$lt_SED
+
+# Sed that helps us avoid accidentally triggering echo(1) options like -n.
+Xsed="\$SED -e 1s/^X//"
+
+# A grep program that handles long lines.
+GREP=$lt_GREP
+
+# An ERE matcher.
+EGREP=$lt_EGREP
+
+# A literal string matcher.
+FGREP=$lt_FGREP
+
+# A BSD- or MS-compatible name lister.
+NM=$lt_NM
+
+# Whether we need soft or hard links.
+LN_S=$lt_LN_S
+
+# What is the maximum length of a command?
+max_cmd_len=$max_cmd_len
+
+# Object file suffix (normally "o").
+objext=$ac_objext
+
+# Executable file suffix (normally "").
+exeext=$exeext
+
+# whether the shell understands "unset".
+lt_unset=$lt_unset
+
+# turn spaces into newlines.
+SP2NL=$lt_lt_SP2NL
+
+# turn newlines into spaces.
+NL2SP=$lt_lt_NL2SP
+
+# convert \$build file names to \$host format.
+to_host_file_cmd=$lt_cv_to_host_file_cmd
+
+# convert \$build files to toolchain format.
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
+
+# An object symbol dumper.
+OBJDUMP=$lt_OBJDUMP
+
+# Method to check whether dependent libraries are shared objects.
+deplibs_check_method=$lt_deplibs_check_method
+
+# Command to use when deplibs_check_method = "file_magic".
+file_magic_cmd=$lt_file_magic_cmd
+
+# How to find potential files when deplibs_check_method = "file_magic".
+file_magic_glob=$lt_file_magic_glob
+
+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
+want_nocaseglob=$lt_want_nocaseglob
+
+# DLL creation program.
+DLLTOOL=$lt_DLLTOOL
+
+# Command to associate shared and link libraries.
+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
+
+# The archiver.
+AR=$lt_AR
+
+# Flags to create an archive.
+AR_FLAGS=$lt_AR_FLAGS
+
+# How to feed a file listing to the archiver.
+archiver_list_spec=$lt_archiver_list_spec
+
+# A symbol stripping program.
+STRIP=$lt_STRIP
+
+# Commands used to install an old-style archive.
+RANLIB=$lt_RANLIB
+old_postinstall_cmds=$lt_old_postinstall_cmds
+old_postuninstall_cmds=$lt_old_postuninstall_cmds
+
+# Whether to use a lock for old archive extraction.
+lock_old_archive_extraction=$lock_old_archive_extraction
+
+# A C compiler.
+LTCC=$lt_CC
+
+# LTCC compiler flags.
+LTCFLAGS=$lt_CFLAGS
+
+# Take the output of nm and produce a listing of raw symbols and C names.
+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
+
+# Transform the output of nm in a proper C declaration.
+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+
+# Transform the output of nm into a list of symbols to manually relocate.
+global_symbol_to_import=$lt_lt_cv_sys_global_symbol_to_import
+
+# Transform the output of nm in a C name address pair.
+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+
+# Transform the output of nm in a C name address pair when lib prefix is needed.
+global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
+
+# The name lister interface.
+nm_interface=$lt_lt_cv_nm_interface
+
+# Specify filename containing input files for \$NM.
+nm_file_list_spec=$lt_nm_file_list_spec
+
+# The root where to search for dependent libraries,and where our libraries should be installed.
+lt_sysroot=$lt_sysroot
+
+# Command to truncate a binary pipe.
+lt_truncate_bin=$lt_lt_cv_truncate_bin
+
+# The name of the directory that contains temporary libtool files.
+objdir=$objdir
+
+# Used to examine libraries when file_magic_cmd begins with "file".
+MAGIC_CMD=$MAGIC_CMD
+
+# Must we lock files when doing compilation?
+need_locks=$lt_need_locks
+
+# Manifest tool.
+MANIFEST_TOOL=$lt_MANIFEST_TOOL
+
+# Tool to manipulate archived DWARF debug symbol files on Mac OS X.
+DSYMUTIL=$lt_DSYMUTIL
+
+# Tool to change global to local symbols on Mac OS X.
+NMEDIT=$lt_NMEDIT
+
+# Tool to manipulate fat objects and archives on Mac OS X.
+LIPO=$lt_LIPO
+
+# ldd/readelf like tool for Mach-O binaries on Mac OS X.
+OTOOL=$lt_OTOOL
+
+# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4.
+OTOOL64=$lt_OTOOL64
+
+# Old archive suffix (normally "a").
+libext=$libext
+
+# Shared library suffix (normally ".so").
+shrext_cmds=$lt_shrext_cmds
+
+# The commands to extract the exported symbol list from a shared archive.
+extract_expsyms_cmds=$lt_extract_expsyms_cmds
+
+# Variables whose values should be saved in libtool wrapper scripts and
+# restored at link time.
+variables_saved_for_relink=$lt_variables_saved_for_relink
+
+# Do we need the "lib" prefix for modules?
+need_lib_prefix=$need_lib_prefix
+
+# Do we need a version for libraries?
+need_version=$need_version
+
+# Library versioning type.
+version_type=$version_type
+
+# Shared library runtime path variable.
+runpath_var=$runpath_var
+
+# Shared library path variable.
+shlibpath_var=$shlibpath_var
+
+# Is shlibpath searched before the hard-coded library search path?
+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+
+# Format of library name prefix.
+libname_spec=$lt_libname_spec
+
+# List of archive names.  First name is the real one, the rest are links.
+# The last name is the one that the linker finds with -lNAME
+library_names_spec=$lt_library_names_spec
+
+# The coded name of the library, if different from the real name.
+soname_spec=$lt_soname_spec
+
+# Permission mode override for installation of shared libraries.
+install_override_mode=$lt_install_override_mode
+
+# Command to use after installation of a shared archive.
+postinstall_cmds=$lt_postinstall_cmds
+
+# Command to use after uninstallation of a shared archive.
+postuninstall_cmds=$lt_postuninstall_cmds
+
+# Commands used to finish a libtool library installation in a directory.
+finish_cmds=$lt_finish_cmds
+
+# As "finish_cmds", except a single script fragment to be evaled but
+# not shown.
+finish_eval=$lt_finish_eval
+
+# Whether we should hardcode library paths into libraries.
+hardcode_into_libs=$hardcode_into_libs
+
+# Compile-time system search path for libraries.
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+
+# Detected run-time system search path for libraries.
+sys_lib_dlsearch_path_spec=$lt_configure_time_dlsearch_path
+
+# Explicit LT_SYS_LIBRARY_PATH set during ./configure time.
+configure_time_lt_sys_library_path=$lt_configure_time_lt_sys_library_path
+
+# Whether dlopen is supported.
+dlopen_support=$enable_dlopen
+
+# Whether dlopen of programs is supported.
+dlopen_self=$enable_dlopen_self
+
+# Whether dlopen of statically linked programs is supported.
+dlopen_self_static=$enable_dlopen_self_static
+
+# Commands to strip libraries.
+old_striplib=$lt_old_striplib
+striplib=$lt_striplib
+
+
+# The linker used to build libraries.
+LD=$lt_LD
+
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag
+reload_cmds=$lt_reload_cmds
+
+# Commands used to build an old-style archive.
+old_archive_cmds=$lt_old_archive_cmds
+
+# A language specific compiler.
+CC=$lt_compiler
+
+# Is the compiler the GNU compiler?
+with_gcc=$GCC
+
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
+
+# Additional compiler flags for building library objects.
+pic_flag=$lt_lt_prog_compiler_pic
+
+# How to pass a linker flag through the compiler.
+wl=$lt_lt_prog_compiler_wl
+
+# Compiler flag to prevent dynamic linking.
+link_static_flag=$lt_lt_prog_compiler_static
+
+# Does compiler simultaneously support -c and -o options?
+compiler_c_o=$lt_lt_cv_prog_compiler_c_o
+
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=$archive_cmds_need_lc
+
+# Whether or not to disallow shared libs when runtime libs are static.
+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
+
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
+
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec=$lt_whole_archive_flag_spec
+
+# Whether the compiler copes with passing no objects directly.
+compiler_needs_object=$lt_compiler_needs_object
+
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
+
+# Create a temporary old-style archive to link instead of a shared archive.
+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
+
+# Commands used to build a shared archive.
+archive_cmds=$lt_archive_cmds
+archive_expsym_cmds=$lt_archive_expsym_cmds
+
+# Commands used to build a loadable module if different from building
+# a shared archive.
+module_cmds=$lt_module_cmds
+module_expsym_cmds=$lt_module_expsym_cmds
+
+# Whether we are building with GNU ld or not.
+with_gnu_ld=$lt_with_gnu_ld
+
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=$lt_allow_undefined_flag
+
+# Flag that enforces no undefined symbols.
+no_undefined_flag=$lt_no_undefined_flag
+
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist
+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
+
+# Whether we need a single "-rpath" flag with a separated argument.
+hardcode_libdir_separator=$lt_hardcode_libdir_separator
+
+# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
+# DIR into the resulting binary.
+hardcode_direct=$hardcode_direct
+
+# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
+# DIR into the resulting binary and the resulting library dependency is
+# "absolute",i.e impossible to change by setting \$shlibpath_var if the
+# library is relocated.
+hardcode_direct_absolute=$hardcode_direct_absolute
+
+# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
+# into the resulting binary.
+hardcode_minus_L=$hardcode_minus_L
+
+# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
+# into the resulting binary.
+hardcode_shlibpath_var=$hardcode_shlibpath_var
+
+# Set to "yes" if building a shared library automatically hardcodes DIR
+# into the library and all subsequent libraries and executables linked
+# against it.
+hardcode_automatic=$hardcode_automatic
+
+# Set to yes if linker adds runtime paths of dependent libraries
+# to runtime path list.
+inherit_rpath=$inherit_rpath
+
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=$link_all_deplibs
+
+# Set to "yes" if exported symbols are required.
+always_export_symbols=$always_export_symbols
+
+# The commands to list exported symbols.
+export_symbols_cmds=$lt_export_symbols_cmds
+
+# Symbols that should not be listed in the preloaded symbols.
+exclude_expsyms=$lt_exclude_expsyms
+
+# Symbols that must always be exported.
+include_expsyms=$lt_include_expsyms
+
+# Commands necessary for linking programs (against libraries) with templates.
+prelink_cmds=$lt_prelink_cmds
+
+# Commands necessary for finishing linking programs.
+postlink_cmds=$lt_postlink_cmds
+
+# Specify filename containing input files.
+file_list_spec=$lt_file_list_spec
+
+# How to hardcode a shared library path into an executable.
+hardcode_action=$hardcode_action
+
+# The directories searched by this compiler when creating a shared library.
+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs
+
+# Dependencies to place before and after the objects being linked to
+# create a shared library.
+predep_objects=$lt_predep_objects
+postdep_objects=$lt_postdep_objects
+predeps=$lt_predeps
+postdeps=$lt_postdeps
+
+# The library search path used internally by the compiler when linking
+# a shared library.
+compiler_lib_search_path=$lt_compiler_lib_search_path
+
+# ### END LIBTOOL CONFIG
+
+_LT_EOF
+
+    cat <<'_LT_EOF' >> "$cfgfile"
+
+# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE
+
+# func_munge_path_list VARIABLE PATH
+# -----------------------------------
+# VARIABLE is name of variable containing _space_ separated list of
+# directories to be munged by the contents of PATH, which is string
+# having a format:
+# "DIR[:DIR]:"
+#       string "DIR[ DIR]" will be prepended to VARIABLE
+# ":DIR[:DIR]"
+#       string "DIR[ DIR]" will be appended to VARIABLE
+# "DIRP[:DIRP]::[DIRA:]DIRA"
+#       string "DIRP[ DIRP]" will be prepended to VARIABLE and string
+#       "DIRA[ DIRA]" will be appended to VARIABLE
+# "DIR[:DIR]"
+#       VARIABLE will be replaced by "DIR[ DIR]"
+func_munge_path_list ()
+{
+    case x$2 in
+    x)
+        ;;
+    *:)
+        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
+        ;;
+    x:*)
+        eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
+        ;;
+    *::*)
+        eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
+        eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\"
+        ;;
+    *)
+        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\"
+        ;;
+    esac
+}
+
+
+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+func_cc_basename ()
+{
+    for cc_temp in $*""; do
+      case $cc_temp in
+        compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+        distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+        \-*) ;;
+        *) break;;
+      esac
+    done
+    func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+}
+
+
+# ### END FUNCTIONS SHARED WITH CONFIGURE
+
+_LT_EOF
+
+  case $host_os in
+  aix3*)
+    cat <<\_LT_EOF >> "$cfgfile"
+# AIX sometimes has problems with the GCC collect2 program.  For some
+# reason, if we set the COLLECT_NAMES environment variable, the problems
+# vanish in a puff of smoke.
+if test set != "${COLLECT_NAMES+set}"; then
+  COLLECT_NAMES=
+  export COLLECT_NAMES
+fi
+_LT_EOF
+    ;;
+  esac
+
+
+ltmain=$ac_aux_dir/ltmain.sh
+
+
+  # We use sed instead of cat because bash on DJGPP gets confused if
+  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
+  # text mode, it properly converts lines to CR/LF.  This bash problem
+  # is reportedly fixed, but why not run on old versions too?
+  sed '$q' "$ltmain" >> "$cfgfile" \
+     || (rm -f "$cfgfile"; exit 1)
+
+   mv -f "$cfgfile" "$ofile" ||
+    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+  chmod +x "$ofile"
+
+
+    cat <<_LT_EOF >> "$ofile"
+
+# ### BEGIN LIBTOOL TAG CONFIG: CXX
+
+# The linker used to build libraries.
+LD=$lt_LD_CXX
+
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag_CXX
+reload_cmds=$lt_reload_cmds_CXX
+
+# Commands used to build an old-style archive.
+old_archive_cmds=$lt_old_archive_cmds_CXX
+
+# A language specific compiler.
+CC=$lt_compiler_CXX
+
+# Is the compiler the GNU compiler?
+with_gcc=$GCC_CXX
+
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
+
+# Additional compiler flags for building library objects.
+pic_flag=$lt_lt_prog_compiler_pic_CXX
+
+# How to pass a linker flag through the compiler.
+wl=$lt_lt_prog_compiler_wl_CXX
+
+# Compiler flag to prevent dynamic linking.
+link_static_flag=$lt_lt_prog_compiler_static_CXX
+
+# Does compiler simultaneously support -c and -o options?
+compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
+
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=$archive_cmds_need_lc_CXX
+
+# Whether or not to disallow shared libs when runtime libs are static.
+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
+
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
+
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
+
+# Whether the compiler copes with passing no objects directly.
+compiler_needs_object=$lt_compiler_needs_object_CXX
+
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
+
+# Create a temporary old-style archive to link instead of a shared archive.
+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
+
+# Commands used to build a shared archive.
+archive_cmds=$lt_archive_cmds_CXX
+archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
+
+# Commands used to build a loadable module if different from building
+# a shared archive.
+module_cmds=$lt_module_cmds_CXX
+module_expsym_cmds=$lt_module_expsym_cmds_CXX
+
+# Whether we are building with GNU ld or not.
+with_gnu_ld=$lt_with_gnu_ld_CXX
+
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=$lt_allow_undefined_flag_CXX
+
+# Flag that enforces no undefined symbols.
+no_undefined_flag=$lt_no_undefined_flag_CXX
+
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist
+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
+
+# Whether we need a single "-rpath" flag with a separated argument.
+hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
+
+# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
+# DIR into the resulting binary.
+hardcode_direct=$hardcode_direct_CXX
+
+# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
+# DIR into the resulting binary and the resulting library dependency is
+# "absolute",i.e impossible to change by setting \$shlibpath_var if the
+# library is relocated.
+hardcode_direct_absolute=$hardcode_direct_absolute_CXX
+
+# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
+# into the resulting binary.
+hardcode_minus_L=$hardcode_minus_L_CXX
+
+# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
+# into the resulting binary.
+hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX
+
+# Set to "yes" if building a shared library automatically hardcodes DIR
+# into the library and all subsequent libraries and executables linked
+# against it.
+hardcode_automatic=$hardcode_automatic_CXX
+
+# Set to yes if linker adds runtime paths of dependent libraries
+# to runtime path list.
+inherit_rpath=$inherit_rpath_CXX
+
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=$link_all_deplibs_CXX
+
+# Set to "yes" if exported symbols are required.
+always_export_symbols=$always_export_symbols_CXX
+
+# The commands to list exported symbols.
+export_symbols_cmds=$lt_export_symbols_cmds_CXX
+
+# Symbols that should not be listed in the preloaded symbols.
+exclude_expsyms=$lt_exclude_expsyms_CXX
+
+# Symbols that must always be exported.
+include_expsyms=$lt_include_expsyms_CXX
+
+# Commands necessary for linking programs (against libraries) with templates.
+prelink_cmds=$lt_prelink_cmds_CXX
+
+# Commands necessary for finishing linking programs.
+postlink_cmds=$lt_postlink_cmds_CXX
+
+# Specify filename containing input files.
+file_list_spec=$lt_file_list_spec_CXX
+
+# How to hardcode a shared library path into an executable.
+hardcode_action=$hardcode_action_CXX
+
+# The directories searched by this compiler when creating a shared library.
+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX
+
+# Dependencies to place before and after the objects being linked to
+# create a shared library.
+predep_objects=$lt_predep_objects_CXX
+postdep_objects=$lt_postdep_objects_CXX
+predeps=$lt_predeps_CXX
+postdeps=$lt_postdeps_CXX
+
+# The library search path used internally by the compiler when linking
+# a shared library.
+compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
+
+# ### END LIBTOOL TAG CONFIG: CXX
+_LT_EOF
+
+ ;;
+
+  esac
+done # for ac_tag
+
+
+as_fn_exit 0
+_ACEOF
+ac_clean_files=$ac_clean_files_save
+
+test $ac_write_fail = 0 ||
+  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
+
+
+# configure is writing to config.log, and then calls config.status.
+# config.status does its own redirection, appending to config.log.
+# Unfortunately, on DOS this fails, as config.log is still kept open
+# by configure, so config.status won't be able to write to it; its
+# output is simply discarded.  So we exec the FD to /dev/null,
+# effectively closing config.log, so it can be properly (re)opened and
+# appended to by config.status.  When coming back to configure, we
+# need to make the FD available again.
+if test "$no_create" != yes; then
+  ac_cs_success=:
+  ac_config_status_args=
+  test "$silent" = yes &&
+    ac_config_status_args="$ac_config_status_args --quiet"
+  exec 5>/dev/null
+  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
+  exec 5>>config.log
+  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
+  # would make configure fail if this is the last instruction.
+  $ac_cs_success || as_fn_exit 1
+fi
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+fi
+
diff --git a/configure.ac b/configure.ac
new file mode 100644
index 0000000..f8abb60
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,236 @@
+# -*- shell-script -*-
+#
+# Copyright (c) 2004-2009 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2010 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2007 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2006-2016 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2006-2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright (c) 2006-2017 Los Alamos National Security, LLC.  All rights
+#                         reserved.
+# Copyright (c) 2009      Oak Ridge National Labs.  All rights reserved.
+# Copyright (c) 2011-2013 NVIDIA Corporation.  All rights reserved.
+# Copyright (c) 2012      Oracle and/or its affiliates.  All rights reserved.
+# Copyright (c) 2013      Mellanox Technologies, Inc.
+#                         All rights reserved.
+# Copyright (c) 2014-2017 Intel, Inc. All rights reserved.
+# Copyright (c) 2016      IBM Corporation.  All rights reserved.
+# Copyright (c) 2016      Research Organization for Information Science
+#                         and Technology (RIST). All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+
+############################################################################
+# Initialization, version number, and other random setup/init stuff
+############################################################################
+
+# Load in everything found by autogen.pl
+m4_include([config/autogen_found_items.m4])
+
+# We don't have the version number to put in here yet, and we can't
+# call PMIX_GET_VERSION (etc.) before AC_INIT.  So use the shell
+# version.
+
+AC_INIT([pmix],
+        [m4_normalize(esyscmd([config/pmix_get_version.sh VERSION --tarball]))],
+        [http://pmix.github.io/master], [pmix])
+AC_PREREQ(2.69)
+AC_CONFIG_AUX_DIR(./config)
+# Note that this directory must *exactly* match what was specified via
+# -I in ACLOCAL_AMFLAGS in the top-level Makefile.am.
+AC_CONFIG_MACRO_DIR(./config)
+
+# Get our platform support file.  This has to be done very, very early
+# because it twiddles random bits of autoconf
+PMIX_LOAD_PLATFORM
+
+# setup configure options (e.g., show_title and friends)
+PMIX_CONFIGURE_SETUP
+pmix_show_title "Configuring PMIx"
+
+# This must be before AM_INIT_AUTOMAKE
+AC_CANONICAL_TARGET
+
+# Init automake
+AM_INIT_AUTOMAKE([foreign dist-bzip2 subdir-objects no-define 1.13.4 -Wall -Werror])
+
+# SILENT_RULES is new in AM 1.11, but we require 1.13.4 or higher via
+# autogen.  Limited testing shows that calling SILENT_RULES directly
+# works in more cases than adding "silent-rules" to INIT_AUTOMAKE
+# (even though they're supposed to be identical).  Shrug.
+AM_SILENT_RULES([yes])
+
+# set the language
+AC_LANG([C])
+
+# AC_USE_SYSTEM_EXTENSIONS will modify CFLAGS if nothing was in there
+# beforehand.  We don't want that.  So if there was nothing in
+# CFLAGS, put nothing back in there.
+PMIX_VAR_SCOPE_PUSH([CFLAGS_save])
+CFLAGS_save=$CFLAGS
+AC_USE_SYSTEM_EXTENSIONS
+AS_IF([test -z "$CFLAGS_save"], [CFLAGS=])
+PMIX_VAR_SCOPE_POP
+
+####################################################################
+# Setup the configure header files
+####################################################################
+
+AH_TOP([/* -*- c -*-
+ *
+ * Copyright (c) 2004-2005 The Trustees of Indiana University.
+ *                         All rights reserved.
+ * Copyright (c) 2004-2005 The Trustees of the University of Tennessee.
+ *                         All rights reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2013-2015 Intel, Inc. All rights reserved
+ * Copyright (c) 2016      IBM Corporation.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ *
+ * This file is automatically generated by configure.  Edits will be lost
+ * the next time you run configure!
+ */
+
+#ifndef PMIX_CONFIG_H
+#define PMIX_CONFIG_H
+
+#include <src/include/pmix_config_top.h>
+
+])
+AH_BOTTOM([
+#include <src/include/pmix_config_bottom.h>
+#endif /* PMIX_CONFIG_H */
+])
+
+############################################################################
+# Setup Libtool
+############################################################################
+
+# We want new Libtool.  None of that old stuff.  Pfft.
+m4_ifdef([LT_PREREQ], [],
+         [m4_fatal([libtool version 2.2.6 or higher is required], [63])])
+LT_PREREQ([2.2.6])
+
+#
+# Enable static so that we have the --with tests done up here and can
+# check for OS.  Save the values of $enable_static and $enable_shared
+# before setting the defaults, because if the user specified
+# --[en|dis]able-[static|shared] on the command line, they'll already
+# be set.  In this way, we can tell if the user requested something or
+# if the default was set here.
+#
+
+pmix_enable_shared="$enable_shared"
+pmix_enable_static="$enable_static"
+AM_ENABLE_SHARED
+AM_DISABLE_STATIC
+
+# This did not exist pre AM 1.11.x (where x is somewhere >0 and <3),
+# but it is necessary in AM 1.12.x.
+m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
+AM_PROG_LEX
+
+############################################################################
+# Configuration options
+############################################################################
+
+# Define PMIx configure arguments
+PMIX_DEFINE_ARGS
+# Define some basic useful values
+PMIX_BASIC_SETUP
+
+# If debug mode, add -g
+AS_IF([test "$pmix_debug" = "1"],
+      [CFLAGS="$CFLAGS -g"])
+
+LT_INIT()
+LT_LANG([C])
+LT_LANG([C++])
+
+############################################################################
+# Setup the core
+############################################################################
+
+# Setup the pmix core
+PMIX_SETUP_CORE()
+
+# Run the AM_CONDITIONALs
+PMIX_DO_AM_CONDITIONALS
+
+####################################################################
+# Setup C compiler
+####################################################################
+
+AC_ARG_VAR(CC_FOR_BUILD,[build system C compiler])
+AS_IF([test -z "$CC_FOR_BUILD"],[
+    AC_SUBST([CC_FOR_BUILD], [$CC])
+])
+
+PMIX_SETUP_CC
+
+# Cleanup duplicate flags
+PMIX_FLAGS_UNIQ(CPPFLAGS)
+PMIX_FLAGS_UNIQ(LDFLAGS)
+PMIX_FLAGS_UNIQ(LIBS)
+
+#
+# Delayed the substitution of CFLAGS and CXXFLAGS until now because
+# they may have been modified throughout the course of this script.
+#
+
+AC_SUBST(CFLAGS)
+AC_SUBST(CPPFLAGS)
+
+pmix_show_title "Final compiler flags"
+
+AC_MSG_CHECKING([final CPPFLAGS])
+AC_MSG_RESULT([$CPPFLAGS])
+
+AC_MSG_CHECKING([final CFLAGS])
+AC_MSG_RESULT([$CFLAGS])
+
+AC_MSG_CHECKING([final LDFLAGS])
+AC_MSG_RESULT([$LDFLAGS])
+
+AC_MSG_CHECKING([final LIBS])
+AC_MSG_RESULT([$LIBS])
+
+####################################################################
+# Version information
+####################################################################
+
+# PMIX_VERSION was setup by PMIX_SETUP_CORE above.
+
+# Make configure depend on the VERSION file, since it's used in AC_INIT
+AC_SUBST([CONFIGURE_DEPENDENCIES], ['$(top_srcdir)/VERSION'])
+
+. $srcdir/VERSION
+AC_SUBST([libpmix_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])
+
+pmix_show_title "Configuration complete"
+
+AC_OUTPUT
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
new file mode 100644
index 0000000..131dfd2
--- /dev/null
+++ b/contrib/Makefile.am
@@ -0,0 +1,39 @@
+#
+# Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2009      Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2010      IBM Corporation.  All rights reserved.
+# Copyright (c) 2010-2011 Oak Ridge National Labs.  All rights reserved.
+# Copyright (c) 2013-2016 Los Alamos National Security, Inc.  All rights
+#                         reserved.
+# Copyright (c) 2013-2016 Intel, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+EXTRA_DIST = \
+	make_dist_tarball \
+	buildrpm.sh \
+	cron-run-all-md2nroff.pl \
+        md2nroff.pl \
+	platform/optimized \
+        pmix_jenkins.sh \
+        pmix-release.sh \
+        pmix.spec \
+        update-my-copyright.pl \
+        whitespace-purge.sh
+
+include perf_tools/Makefile.include
+
+dist_pmixdata_DATA = pmix-valgrind.supp
diff --git a/contrib/Makefile.in b/contrib/Makefile.in
new file mode 100644
index 0000000..1c6af19
--- /dev/null
+++ b/contrib/Makefile.in
@@ -0,0 +1,715 @@
+# Makefile.in generated by automake 1.15 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+#
+# Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2009      Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2010      IBM Corporation.  All rights reserved.
+# Copyright (c) 2010-2011 Oak Ridge National Labs.  All rights reserved.
+# Copyright (c) 2013-2016 Los Alamos National Security, Inc.  All rights
+#                         reserved.
+# Copyright (c) 2013-2016 Intel, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# -*- makefile -*-
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2007 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2013-2016 Intel, Inc. All rights reserved
+# Copyright (c) 2016      Cisco Systems, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# This makefile.am does not stand on its own - it is included from
+# Makefile.am
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+subdir = contrib
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/config/c_get_alignment.m4 \
+	$(top_srcdir)/config/libtool.m4 \
+	$(top_srcdir)/config/ltoptions.m4 \
+	$(top_srcdir)/config/ltsugar.m4 \
+	$(top_srcdir)/config/ltversion.m4 \
+	$(top_srcdir)/config/lt~obsolete.m4 \
+	$(top_srcdir)/config/pmix.m4 \
+	$(top_srcdir)/config/pmix_check_attributes.m4 \
+	$(top_srcdir)/config/pmix_check_broken_qsort.m4 \
+	$(top_srcdir)/config/pmix_check_compiler_version.m4 \
+	$(top_srcdir)/config/pmix_check_icc.m4 \
+	$(top_srcdir)/config/pmix_check_ident.m4 \
+	$(top_srcdir)/config/pmix_check_lock.m4 \
+	$(top_srcdir)/config/pmix_check_os_flavors.m4 \
+	$(top_srcdir)/config/pmix_check_package.m4 \
+	$(top_srcdir)/config/pmix_check_psm2.m4 \
+	$(top_srcdir)/config/pmix_check_pthread_pids.m4 \
+	$(top_srcdir)/config/pmix_check_vendor.m4 \
+	$(top_srcdir)/config/pmix_check_visibility.m4 \
+	$(top_srcdir)/config/pmix_check_withdir.m4 \
+	$(top_srcdir)/config/pmix_config_asm.m4 \
+	$(top_srcdir)/config/pmix_config_pthreads.m4 \
+	$(top_srcdir)/config/pmix_config_subdir.m4 \
+	$(top_srcdir)/config/pmix_config_subdir_args.m4 \
+	$(top_srcdir)/config/pmix_config_threads.m4 \
+	$(top_srcdir)/config/pmix_ensure_contains_optflags.m4 \
+	$(top_srcdir)/config/pmix_functions.m4 \
+	$(top_srcdir)/config/pmix_load_platform.m4 \
+	$(top_srcdir)/config/pmix_mca.m4 \
+	$(top_srcdir)/config/pmix_search_libs.m4 \
+	$(top_srcdir)/config/pmix_setup_cc.m4 \
+	$(top_srcdir)/config/pmix_setup_libevent.m4 \
+	$(top_srcdir)/config/pmix_setup_zlib.m4 \
+	$(top_srcdir)/config/pmix_try_assemble.m4 \
+	$(top_srcdir)/config/autogen_found_items.m4 \
+	$(top_srcdir)/src/mca/pdl/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/configure.m4 \
+	$(top_srcdir)/src/mca/pdl/pdlopen/configure.m4 \
+	$(top_srcdir)/src/mca/pdl/plibltdl/configure.m4 \
+	$(top_srcdir)/src/mca/pif/bsdx_ipv4/configure.m4 \
+	$(top_srcdir)/src/mca/pif/bsdx_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pif/linux_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pif/posix_ipv4/configure.m4 \
+	$(top_srcdir)/src/mca/pif/solaris_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/config/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/env/configure.m4 \
+	$(top_srcdir)/src/mca/pnet/opa/configure.m4 \
+	$(top_srcdir)/src/mca/psec/munge/configure.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(dist_pmixdata_DATA) \
+	$(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/src/include/pmix_config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+SOURCES =
+DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(pmixdatadir)"
+DATA = $(dist_pmixdata_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+	$(srcdir)/perf_tools/Makefile.include
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CFLAGS = @CFLAGS@
+CLEANFILES = @CLEANFILES@
+CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MCA_PROJECT_SUBDIRS = @MCA_PROJECT_SUBDIRS@
+MCA_pmix_FRAMEWORKS = @MCA_pmix_FRAMEWORKS@
+MCA_pmix_FRAMEWORKS_SUBDIRS = @MCA_pmix_FRAMEWORKS_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS@
+MCA_pmix_FRAMEWORK_LIBS = @MCA_pmix_FRAMEWORK_LIBS@
+MCA_pmix_pdl_ALL_COMPONENTS = @MCA_pmix_pdl_ALL_COMPONENTS@
+MCA_pmix_pdl_ALL_SUBDIRS = @MCA_pmix_pdl_ALL_SUBDIRS@
+MCA_pmix_pdl_DSO_COMPONENTS = @MCA_pmix_pdl_DSO_COMPONENTS@
+MCA_pmix_pdl_DSO_SUBDIRS = @MCA_pmix_pdl_DSO_SUBDIRS@
+MCA_pmix_pdl_STATIC_COMPONENTS = @MCA_pmix_pdl_STATIC_COMPONENTS@
+MCA_pmix_pdl_STATIC_LTLIBS = @MCA_pmix_pdl_STATIC_LTLIBS@
+MCA_pmix_pdl_STATIC_SUBDIRS = @MCA_pmix_pdl_STATIC_SUBDIRS@
+MCA_pmix_pif_ALL_COMPONENTS = @MCA_pmix_pif_ALL_COMPONENTS@
+MCA_pmix_pif_ALL_SUBDIRS = @MCA_pmix_pif_ALL_SUBDIRS@
+MCA_pmix_pif_DSO_COMPONENTS = @MCA_pmix_pif_DSO_COMPONENTS@
+MCA_pmix_pif_DSO_SUBDIRS = @MCA_pmix_pif_DSO_SUBDIRS@
+MCA_pmix_pif_STATIC_COMPONENTS = @MCA_pmix_pif_STATIC_COMPONENTS@
+MCA_pmix_pif_STATIC_LTLIBS = @MCA_pmix_pif_STATIC_LTLIBS@
+MCA_pmix_pif_STATIC_SUBDIRS = @MCA_pmix_pif_STATIC_SUBDIRS@
+MCA_pmix_pinstalldirs_ALL_COMPONENTS = @MCA_pmix_pinstalldirs_ALL_COMPONENTS@
+MCA_pmix_pinstalldirs_ALL_SUBDIRS = @MCA_pmix_pinstalldirs_ALL_SUBDIRS@
+MCA_pmix_pinstalldirs_DSO_COMPONENTS = @MCA_pmix_pinstalldirs_DSO_COMPONENTS@
+MCA_pmix_pinstalldirs_DSO_SUBDIRS = @MCA_pmix_pinstalldirs_DSO_SUBDIRS@
+MCA_pmix_pinstalldirs_STATIC_COMPONENTS = @MCA_pmix_pinstalldirs_STATIC_COMPONENTS@
+MCA_pmix_pinstalldirs_STATIC_LTLIBS = @MCA_pmix_pinstalldirs_STATIC_LTLIBS@
+MCA_pmix_pinstalldirs_STATIC_SUBDIRS = @MCA_pmix_pinstalldirs_STATIC_SUBDIRS@
+MCA_pmix_pnet_ALL_COMPONENTS = @MCA_pmix_pnet_ALL_COMPONENTS@
+MCA_pmix_pnet_ALL_SUBDIRS = @MCA_pmix_pnet_ALL_SUBDIRS@
+MCA_pmix_pnet_DSO_COMPONENTS = @MCA_pmix_pnet_DSO_COMPONENTS@
+MCA_pmix_pnet_DSO_SUBDIRS = @MCA_pmix_pnet_DSO_SUBDIRS@
+MCA_pmix_pnet_STATIC_COMPONENTS = @MCA_pmix_pnet_STATIC_COMPONENTS@
+MCA_pmix_pnet_STATIC_LTLIBS = @MCA_pmix_pnet_STATIC_LTLIBS@
+MCA_pmix_pnet_STATIC_SUBDIRS = @MCA_pmix_pnet_STATIC_SUBDIRS@
+MCA_pmix_psec_ALL_COMPONENTS = @MCA_pmix_psec_ALL_COMPONENTS@
+MCA_pmix_psec_ALL_SUBDIRS = @MCA_pmix_psec_ALL_SUBDIRS@
+MCA_pmix_psec_DSO_COMPONENTS = @MCA_pmix_psec_DSO_COMPONENTS@
+MCA_pmix_psec_DSO_SUBDIRS = @MCA_pmix_psec_DSO_SUBDIRS@
+MCA_pmix_psec_STATIC_COMPONENTS = @MCA_pmix_psec_STATIC_COMPONENTS@
+MCA_pmix_psec_STATIC_LTLIBS = @MCA_pmix_psec_STATIC_LTLIBS@
+MCA_pmix_psec_STATIC_SUBDIRS = @MCA_pmix_psec_STATIC_SUBDIRS@
+MCA_pmix_psensor_ALL_COMPONENTS = @MCA_pmix_psensor_ALL_COMPONENTS@
+MCA_pmix_psensor_ALL_SUBDIRS = @MCA_pmix_psensor_ALL_SUBDIRS@
+MCA_pmix_psensor_DSO_COMPONENTS = @MCA_pmix_psensor_DSO_COMPONENTS@
+MCA_pmix_psensor_DSO_SUBDIRS = @MCA_pmix_psensor_DSO_SUBDIRS@
+MCA_pmix_psensor_STATIC_COMPONENTS = @MCA_pmix_psensor_STATIC_COMPONENTS@
+MCA_pmix_psensor_STATIC_LTLIBS = @MCA_pmix_psensor_STATIC_LTLIBS@
+MCA_pmix_psensor_STATIC_SUBDIRS = @MCA_pmix_psensor_STATIC_SUBDIRS@
+MCA_pmix_ptl_ALL_COMPONENTS = @MCA_pmix_ptl_ALL_COMPONENTS@
+MCA_pmix_ptl_ALL_SUBDIRS = @MCA_pmix_ptl_ALL_SUBDIRS@
+MCA_pmix_ptl_DSO_COMPONENTS = @MCA_pmix_ptl_DSO_COMPONENTS@
+MCA_pmix_ptl_DSO_SUBDIRS = @MCA_pmix_ptl_DSO_SUBDIRS@
+MCA_pmix_ptl_STATIC_COMPONENTS = @MCA_pmix_ptl_STATIC_COMPONENTS@
+MCA_pmix_ptl_STATIC_LTLIBS = @MCA_pmix_ptl_STATIC_LTLIBS@
+MCA_pmix_ptl_STATIC_SUBDIRS = @MCA_pmix_ptl_STATIC_SUBDIRS@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PMIX_ASM_GSYM = @PMIX_ASM_GSYM@
+PMIX_ASM_LSYM = @PMIX_ASM_LSYM@
+PMIX_ASM_SUPPORT_64BIT = @PMIX_ASM_SUPPORT_64BIT@
+PMIX_ASM_TEXT = @PMIX_ASM_TEXT@
+PMIX_ASM_TYPE = @PMIX_ASM_TYPE@
+PMIX_ASSEMBLY_ARCH = @PMIX_ASSEMBLY_ARCH@
+PMIX_ASSEMBLY_BUILTIN = @PMIX_ASSEMBLY_BUILTIN@
+PMIX_ASSEMBLY_FORMAT = @PMIX_ASSEMBLY_FORMAT@
+PMIX_AS_GLOBAL = @PMIX_AS_GLOBAL@
+PMIX_AS_LABEL_SUFFIX = @PMIX_AS_LABEL_SUFFIX@
+PMIX_CC_ABSOLUTE = @PMIX_CC_ABSOLUTE@
+PMIX_CONFIGURE_DATE = @PMIX_CONFIGURE_DATE@
+PMIX_CONFIGURE_HOST = @PMIX_CONFIGURE_HOST@
+PMIX_CONFIGURE_USER = @PMIX_CONFIGURE_USER@
+PMIX_EMBEDDED_CPPFLAGS = @PMIX_EMBEDDED_CPPFLAGS@
+PMIX_EMBEDDED_LDFLAGS = @PMIX_EMBEDDED_LDFLAGS@
+PMIX_EMBEDDED_LIBS = @PMIX_EMBEDDED_LIBS@
+PMIX_MAJOR_VERSION = @PMIX_MAJOR_VERSION@
+PMIX_MINOR_VERSION = @PMIX_MINOR_VERSION@
+PMIX_RELEASE_DATE = @PMIX_RELEASE_DATE@
+PMIX_RELEASE_VERSION = @PMIX_RELEASE_VERSION@
+PMIX_RENAME = @PMIX_RENAME@
+PMIX_VERSION = @PMIX_VERSION@
+PMIX_top_builddir = @PMIX_top_builddir@
+PMIX_top_srcdir = @PMIX_top_srcdir@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_prefix_program = @ac_prefix_program@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+libpmix_so_version = @libpmix_so_version@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pmix_have_pandoc = @pmix_have_pandoc@
+pmix_pdl_pdlopen_LIBS = @pmix_pdl_pdlopen_LIBS@
+pmix_pdl_plibltdl_CPPFLAGS = @pmix_pdl_plibltdl_CPPFLAGS@
+pmix_pdl_plibltdl_LDFLAGS = @pmix_pdl_plibltdl_LDFLAGS@
+pmix_pdl_plibltdl_LIBS = @pmix_pdl_plibltdl_LIBS@
+pmixdatadir = @pmixdatadir@
+pmixincludedir = @pmixincludedir@
+pmixlibdir = @pmixlibdir@
+pmixmajor = @pmixmajor@
+pmixminor = @pmixminor@
+pnet_opa_CFLAGS = @pnet_opa_CFLAGS@
+pnet_opa_CPPFLAGS = @pnet_opa_CPPFLAGS@
+pnet_opa_LDFLAGS = @pnet_opa_LDFLAGS@
+pnet_opa_LIBS = @pnet_opa_LIBS@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+psec_munge_CPPFLAGS = @psec_munge_CPPFLAGS@
+psec_munge_LDFLAGS = @psec_munge_LDFLAGS@
+psec_munge_LIBS = @psec_munge_LIBS@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+EXTRA_DIST = make_dist_tarball buildrpm.sh cron-run-all-md2nroff.pl \
+	md2nroff.pl platform/optimized pmix_jenkins.sh pmix-release.sh \
+	pmix.spec update-my-copyright.pl whitespace-purge.sh \
+	perf_tools/Makefile perf_tools/pmi_intra_perf.c \
+	perf_tools/pmi.h perf_tools/pmi2_pmap_parser.c \
+	perf_tools/pmi2_pmap_parser.h perf_tools/pmi2_utils.c \
+	perf_tools/pmi2_utils.h perf_tools/pmi2.c perf_tools/pmix.c \
+	perf_tools/README perf_tools/run.sh
+dist_pmixdata_DATA = pmix-valgrind.supp
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/perf_tools/Makefile.include $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign contrib/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign contrib/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+$(srcdir)/perf_tools/Makefile.include $(am__empty):
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-dist_pmixdataDATA: $(dist_pmixdata_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(dist_pmixdata_DATA)'; test -n "$(pmixdatadir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(pmixdatadir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(pmixdatadir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pmixdatadir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pmixdatadir)" || exit $$?; \
+	done
+
+uninstall-dist_pmixdataDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_pmixdata_DATA)'; test -n "$(pmixdatadir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(pmixdatadir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
+
+cscope cscopelist:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+	for dir in "$(DESTDIR)$(pmixdatadir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-dist_pmixdataDATA
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-dist_pmixdataDATA
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am \
+	install-dist_pmixdataDATA 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-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
+	uninstall-am uninstall-dist_pmixdataDATA
+
+.PRECIOUS: Makefile
+
+
+# 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/contrib/buildrpm.sh b/contrib/buildrpm.sh
new file mode 100755
index 0000000..9b65cee
--- /dev/null
+++ b/contrib/buildrpm.sh
@@ -0,0 +1,288 @@
+#!/bin/sh -f
+#
+# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2006      Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2015      Intel, Inc. All rights reserved.
+#
+
+#
+# General config vars
+# The following vars can be set from outside and will affect script behave:
+# prefix,rpmbuild_options,configure_options,build_srpm,build_single,build_multiple,rpmtopdir
+#
+
+
+specfile="pmix.spec"
+prefix=${prefix:-"/opt/pmix"}
+rpmbuild_options=${rpmbuild_options:-"--define 'mflags -j4' --define '_source_filedigest_algorithm md5'  --define '_binary_filedigest_algorithm md5'"}
+configure_options=${configure_options:-""}
+
+# Helpful when debugging
+#rpmbuild_options="--define 'mflags -j4' --define 'install_in_opt 1' --define 'cflags -g' --define 'install_modulefile 1' --define 'modules_rpm_name dhcp'"
+#configure_options="--disable-mpi-f77 --without-io-romio --disable-mpi-f90"
+
+# Some distro's will attempt to force using bizarre, custom compiler
+# names (e.g., i386-redhat-linux-gnu-gcc).  So hardwire them to use
+# "normal" names.
+#export CC=gcc
+#export CXX=g++
+#export F77=f77
+#export FC=
+
+# Note that this script can build one or all of the following RPMs:
+# SRPM, all-in-one, multiple.
+
+# If you want to build the SRPM, put "yes" here
+build_srpm=${build_srpm:-"yes"}
+# If you want to build the "all in one RPM", put "yes" here
+build_single=${build_single:-"no"}
+# If you want to build the "multiple" RPMs, put "yes" here
+build_multiple=${build_multiple:-"no"}
+
+#########################################################################
+# You should not need to change anything below this line
+#########################################################################
+
+#
+# get the tarball name
+#
+
+tarball="$1"
+if test "$tarball" = ""; then
+    echo "Usage: buildrpm.sh <tarball>"
+    exit 1
+fi
+if test ! -f $tarball; then
+    echo "Can't find $tarball"
+    exit 1
+fi
+echo "--> Found tarball: $tarball"
+
+#
+# get the extension from the tarball (gz or bz2)
+#
+
+extension=`echo $tarball | egrep '\.bz2'`
+if test -n "$extension"; then
+    extension=bz2
+else
+    extension=gz
+fi
+
+#
+# Get the version number
+#
+
+first="`basename $tarball | cut -d- -f2`"
+version="`echo $first | sed -e 's/\.tar\.'$extension'//'`"
+unset first
+echo "--> Found PMIx version: $version"
+
+#
+# do we have the spec files?
+#
+
+if test ! -f $specfile; then
+    echo "can't find $specfile"
+    exit 1
+fi
+echo "--> Found specfile: $specfile"
+
+#
+# Find where the top RPM-building directory is
+#
+
+rpmtopdir=${rpmtopdir:-"`grep %_topdir $HOME/.rpmmacros | awk '{ print $2 }'`"}
+if test "$rpmtopdir" != ""; then
+	rpmbuild_options="$rpmbuild_options --define '_topdir $rpmtopdir'"
+    if test ! -d "$rpmtopdir"; then
+	mkdir -p "$rpmtopdir"
+	mkdir -p "$rpmtopdir/BUILD"
+	mkdir -p "$rpmtopdir/RPMS"
+	mkdir -p "$rpmtopdir/RPMS/i386"
+	mkdir -p "$rpmtopdir/RPMS/i586"
+	mkdir -p "$rpmtopdir/RPMS/i686"
+	mkdir -p "$rpmtopdir/RPMS/noarch"
+	mkdir -p "$rpmtopdir/RPMS/athlon"
+	mkdir -p "$rpmtopdir/SOURCES"
+	mkdir -p "$rpmtopdir/SPECS"
+	mkdir -p "$rpmtopdir/SRPMS"
+    fi
+    need_root=0
+elif test -d /usr/src/RPM; then
+    need_root=1
+    rpmtopdir="/usr/src/RPM"
+elif test -d /usr/src/packages; then
+    need_root=1
+    rpmtopdir="/usr/src/packages"
+else
+    need_root=1
+    rpmtopdir="/usr/src/redhat"
+fi
+echo "--> Found RPM top dir: $rpmtopdir"
+
+#
+# If we're not root, try to sudo
+#
+
+if test "$need_root" = "1" -a "`whoami`" != "root"; then
+    echo "--> Trying to sudo: \"$0 $*\""
+    echo "------------------------------------------------------------"
+    sudo -u root sh -c "$0 $tarball"
+    echo "------------------------------------------------------------"
+    echo "--> sudo finished"
+    exit 0
+fi
+
+#
+# make sure we have write access to the directories we need
+#
+
+if test ! -w $rpmtopdir/SOURCES ; then
+    echo "Problem creating rpms: You do not have a $rpmtopdir directory"
+    echo "tree or you do not have write access to the $rpmtopdir directory"
+    echo "tree.  Please remedy and try again."
+    exit 1
+fi
+echo "--> Have write access to $rpmtopdir/SOURCES"
+
+#
+# move the tarball file to the rpm directory
+#
+
+cp $tarball $rpmtopdir/SOURCES
+
+#
+# Print out the compilers
+#
+
+cat <<EOF
+--> Hard-wired for compilers:
+    CC = $CC
+    CXX = $CXX
+    F77 = $F77
+    FC = $FC
+EOF
+
+#
+# what command should we use?
+# RH 8.0 changed from using "rpm -ba" to "rpmbuild -ba".  ARRGGH!!!
+#
+
+which rpmbuild 2>&1 >/dev/null
+if test "$?" = "0"; then
+    rpm_cmd="rpmbuild"
+else
+    rpm_cmd="rpm"
+fi
+
+
+#
+# from the specfile
+#
+
+specdest="$rpmtopdir/SPECS/pmix-$version.spec"
+sed -e 's/\$VERSION/'$version'/g' \
+    -e 's/\$EXTENSION/'$extension'/g' \
+    $specfile > "$specdest"
+echo "--> Created destination specfile: $specdest"
+release=`egrep -i release: $specdest | cut -d\  -f2`
+
+#
+# Setup compiler string
+#
+
+if test "$CC" != ""; then
+    configure_options="$configure_options CC=$CC"
+fi
+if test "$CXX" != ""; then
+    configure_options="$configure_options CXX=$CXX"
+fi
+if test "$F77" != ""; then
+    configure_options="$configure_options F77=$F77"
+fi
+if test "$FC" != ""; then
+    configure_options="$configure_options FC=$FC"
+fi
+
+#
+# Make the SRPM
+#
+
+if test "$build_srpm" = "yes"; then
+    echo "--> Building the PMIx SRPM"
+    rpmbuild_options="$rpmbuild_options --define 'dist %{nil}'"
+    cmd="$rpm_cmd $rpmbuild_options -bs $specdest"
+    echo "--> $cmd"
+    eval $cmd
+
+    if test $? != 0; then
+        echo "*** FAILURE BUILDING SRPM!"
+        echo "Aborting"
+        exit 1
+    fi
+    echo "--> Done building the SRPM"
+fi
+
+#
+# Make the single RPM
+#
+
+if test "$build_single" = "yes"; then
+    echo "--> Building the single PMIx RPM"
+    cmd="$rpm_cmd -bb $rpmbuild_options --define 'build_all_in_one_rpm 1'"
+    if test "$configure_options" != ""; then
+        cmd="$cmd --define 'configure_options $configure_options'"
+    fi
+    cmd="$cmd $specdest"
+    echo "--> $cmd"
+    eval $cmd
+
+    if test $? != 0; then
+        echo "*** FAILURE BUILDING SINGLE RPM!"
+        echo "Aborting"
+        exit 1
+    fi
+    echo "--> Done building the single RPM"
+fi
+
+#
+# Make the multi RPM
+#
+
+if test "$build_multiple" = "yes"; then
+    echo "--> Building the multiple PMIx RPM"
+    cmd="$rpm_cmd -bb $rpmbuild_options --define 'build_all_in_one_rpm 0'"
+    if test "$configure_options" != ""; then
+        cmd="$cmd --define 'configure_options $configure_options'"
+    fi
+    cmd="$cmd $specdest"
+    echo "--> $cmd"
+    eval $cmd
+
+    if test $? != 0; then
+        echo "*** FAILURE BUILDING MULTIPLE RPM!"
+        echo "Aborting"
+        exit 1
+    fi
+    echo "--> Done building the multiple RPM"
+fi
+
+#
+# Done
+#
+
+cat <<EOF
+
+------------------------------------------------------------------------------
+====                FINISHED BUILDING PMIx RPM                        ====
+------------------------------------------------------------------------------
+A copy of the tarball is located in: $rpmtopdir/SOURCES/
+The completed rpms are located in:   $rpmtopdir/RPMS/i<something>86/
+The sources rpms are located in:     $rpmtopdir/SRPMS/
+The spec files are located in:       $rpmtopdir/SPECS/
+------------------------------------------------------------------------------
+
+EOF
diff --git a/contrib/cron-run-all-md2nroff.pl b/contrib/cron-run-all-md2nroff.pl
new file mode 100755
index 0000000..2aac990
--- /dev/null
+++ b/contrib/cron-run-all-md2nroff.pl
@@ -0,0 +1,187 @@
+#!/usr/bin/env perl
+
+# Script to pull down the latest markdown man pages from the PMIx
+# git repo.  Iterate over them, converting each to an nroff man page
+# and also copying+committing them to the gh-pages branch.  Finally,
+# git push them back upstream (so that Github will render + serve them
+# up as web pages).
+
+use strict;
+use warnings;
+
+use POSIX;
+use File::Basename;
+use Getopt::Long;
+use File::Temp;
+
+my $repo_arg;
+my $source_branch_arg = "master";
+my $pages_branch_arg = "gh-pages";
+my $logfile_dir_arg = "/tmp";
+my $verbose_arg;
+my $help_arg;
+
+my $ok = Getopt::Long::GetOptions("repo=s" => \$repo_arg,
+                                  "source-branch=s" => \$source_branch_arg,
+                                  "pages-branch=s" => \$pages_branch_arg,
+                                  "logfile-dir=s" => \$logfile_dir_arg,
+                                  "help|h" => \$help_arg,
+                                  "verbose" => \$verbose_arg,
+                                  );
+
+if (!$ok || $help_arg) {
+    print "Invalid command line argument.\n\n"
+        if (!$ok);
+    print "Options:
+  --help | -h      Print this message
+  --repo           Git repo to be updated
+  --source-branch  Branch containing source files (default: master)
+  --pages-branch   Branch where man pages are to be output (default: gh-pages)
+  --logfile-dir    Directory where execution log is to be written (default: /tmp)
+  --verbose        Print debug info during execution\n";
+    exit($ok ? 0 : 1);
+}
+
+# Sanity checks
+die "Must specify a git repo"
+    if (!defined($repo_arg));
+
+#####################################################################
+
+my $logfile_dir = $logfile_dir_arg;
+my $logfile_counter = 1;
+
+sub doit {
+    my $allowed_to_fail = shift;
+    my $cmd = shift;
+    my $stdout_file = shift;
+
+    # Put a prefix on the logfiles so that we know that they belong to
+    # this script, and put a counter so that we know the sequence of
+    # logfiles
+    $stdout_file = "runall-md2nroff-$logfile_counter-$stdout_file";
+    ++$logfile_counter;
+
+    # Redirect stdout if requested
+    if (defined $stdout_file) {
+        $stdout_file = "$logfile_dir/$stdout_file.log";
+        unlink($stdout_file);
+        $cmd .= " >$stdout_file";
+    } elsif (!$verbose_arg && $cmd !~ />/) {
+        $cmd .= " >/dev/null";
+    }
+    $cmd .= " 2>&1";
+
+    my $rc = system($cmd);
+    if (0 != $rc && !$allowed_to_fail) {
+        # If we die/fail, ensure to change out of the temp tree so
+        # that it can be removed upon exit.
+        chdir("/");
+        die "Command $cmd failed: exit status $rc";
+    }
+
+    system("cat $stdout_file")
+        if ($verbose_arg && defined($stdout_file) && -f $stdout_file);
+}
+
+sub verbose {
+    print @_
+        if ($verbose_arg);
+}
+
+#####################################################################
+
+# Setup a logfile dir just for this run
+my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) =
+    localtime(time);
+$logfile_dir =
+    sprintf("%s/cron-run-all-md2nroff-logs-%04d-%02d-%02d-%02d%02d",
+            $logfile_dir_arg, $year + 1900, $mon + 1, $mday,
+            $hour, $min);
+my $rc = system("mkdir $logfile_dir");
+if ($rc != 0 || ! -d $logfile_dir || ! -w $logfile_dir) {
+    chdir("/");
+    die "mkdir of $logfile_dir failed, or can't write to it";
+}
+
+# First, git clone the source branch of the repo
+verbose("*** Cloning repo: $repo_arg / $source_branch_arg...\n");
+my $tmpdir = File::Temp->newdir();
+
+chdir($tmpdir);
+doit(0, "git clone --single-branch --branch $source_branch_arg $repo_arg source", "git-clone");
+
+# Next, git clone the pages branch of repo
+if (defined($pages_branch_arg)) {
+    verbose("*** Cloning repo: $repo_arg / $pages_branch_arg...\n");
+    doit(0, "git clone --single-branch --branch $pages_branch_arg $repo_arg pages", "git-clone2");
+}
+
+#####################################################################
+
+# Find all the *.\d.md files in the source repo
+verbose("*** Finding markdown man pages...\n");
+opendir(DIR, "source/man");
+my @markdown_files = grep { /\.\d\.md$/ && -f "source/man/$_" } readdir(DIR);
+closedir(DIR);
+verbose("Found: @markdown_files\n");
+
+#####################################################################
+
+# Copy each of the markdown files to the pages branch checkout
+if (defined($pages_branch_arg)) {
+    chdir("pages/master");
+    foreach my $file (@markdown_files) {
+        doit(0, "cp ../../source/man/$file man/$file", "loop-cp");
+
+        # Is there a new man page?  If so, we need to "git add" it.
+        my $out = `git status --porcelain man/$file`;
+        doit(0, "git add man/$file", "loop-git-add")
+            if ($out =~ /^\?\?/);
+    }
+
+    # Git commit those files in the pages repo and push them to the
+    # upstream repo so that they go live.  If nothing changed, the commit
+    # and push will be no-ops.
+    chdir("..");
+    doit(1, "git commit --no-verify -a -m \"Updated Markdown man pages from $source_branch_arg\"",
+         "git-commit-first");
+    doit(1, "git push", "git-push-first");
+}
+
+#####################################################################
+
+# Now process each of the Markdown files in the source repo and
+# generate new nroff man pages.
+chdir("$tmpdir/source/man");
+foreach my $file (@markdown_files) {
+    doit(0, "../contrib/md2nroff.pl --source $file", "loop2-md2nroff");
+
+    # Did we generate a new man page?  If so, we need to "git add" it.
+    my $man_file = basename($file);
+
+    $man_file =~ m/\.(\d)\.md$/;
+    my $section = $1;
+
+    $man_file =~ s/\.md$//;
+
+    my $full_filename = "man$section/$man_file";
+
+    my $out = `git status --porcelain $full_filename`;
+    doit(0, "git add $full_filename", "loop2-git-add")
+        if ($out =~ /^\?\?/);
+}
+
+# Similar to above: commit the newly-generated nroff pages and push
+# them back upstream.  If nothing changed, these will be no-ops.
+doit(1, "git commit --no-verify -a -m \"Updated nroff-generated man pages\"", "git-commit-final");
+doit(1, "git push", "git-push-final");
+
+# chdir out of the tmpdir so that it can be removed
+chdir("/");
+
+# If we get here, we finished successfully, so there's no need to keep
+# the logfile dir around
+system("rm -rf $logfile_dir");
+
+exit(0);
diff --git a/contrib/make_dist_tarball b/contrib/make_dist_tarball
new file mode 100755
index 0000000..c9a6d19
--- /dev/null
+++ b/contrib/make_dist_tarball
@@ -0,0 +1,428 @@
+#!/bin/sh
+#
+# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2008-2013 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2015      Intel, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+#
+# Version of auto tools that we want
+#
+
+M4_TARGET_VERSION=1.4.17
+AM_TARGET_VERSION=1.15
+AC_TARGET_VERSION=2.69
+LT_TARGET_VERSION=2.4.6
+
+#
+# When running "make distcheck", use these parallelization flags.  Can
+# significantly decrease the time required for "make distcheck" because
+# that target includes multiple builds of the entire code base.
+#
+
+DISTCHECK_MAKE_FLAGS=-j4
+
+#########################################################################
+
+#
+# Check command line flags
+#
+
+# Default to requiring *exact* versions if we're making distribution
+# tarballs; but higher-than-expected versions are ok for
+# non-distribution tarballs.
+dirty_ok=0
+gnu_version_ignore=0
+mac=0
+dist_target=distcheck
+distcheck_flags="AM_MAKEFLAGS=$DISTCHECK_MAKE_FLAGS"
+if test "`basename $0`" = "make_tarball"; then
+    dist_target=dist
+    distcheck_flags=
+    highok=1
+    dirty_ok=1
+else
+    highok=0
+fi
+
+greekonly=0
+autogen_args=
+config_args=
+distdir=".."
+for i in "$@"; do
+    case $i in
+        -greekonly) greekonly=1 ;;
+        --greekonly) greekonly=1 ;;
+        -highok) highok=1 ;;
+        --highok) highok=1 ;;
+        -autogen-args=*) autogen_args="${i#*=}"; shift ;;
+        --autogen-args=*) autogen_args="${i#*=}"; shift ;;
+        -config-args=*) config_args="${i#*=}"; shift ;;
+        --config-args=*) config_args="${i#*=}"; shift ;;
+        -distdir=*) distdir="${i#*=}"; shift ;;
+        --distdir=*) distdir="${i#*=}"; shift ;;
+        --dirtyok) dirty_ok=1; shift ;;
+        --verok) gnu_version_ignore=1 ;;
+        -verok) gnu_version_ignore=1 ;;
+        --macosx) mac=1 ;;
+        -macosx) mac=1 ;;
+        *)
+            cat <<EOF
+Unrecognized argument: $1
+
+Valid arguments:
+  --greekonly     Only build the greek tarball (vs. both tarballs)
+  --highok        Ok if Autotools versions are too high
+  --autogen-args  Arguments to pass to autogen
+  --config-args   Arguments to pass to configure (e.g., --with-libevent=<foo>)
+  --distdir       Move the tarball(s) to this directory when done
+  --dirtyok       Ok if the source tree is dirty
+  --verok         Ignore result of autotools version checking
+  --macosx        Executing on Mac OSX, so do not check libtool version
+EOF
+            exit 1
+            ;;
+    esac
+    shift
+done
+
+# pmix needs libevent to build.  If $LIBEVENT is set in the
+# environment, automatically add it to the config_args.
+if test "$LIBEVENT" != ""; then
+    echo "*** Found \$LIBEVENT: $LIBEVENT"
+    echo "*** Adding --with-libevent=$LIBEVENT to config_args"
+    config_args="--with-libevent=$LIBEVENT $config_args"
+fi
+
+# if config_args isn't empty, then add that to the distcheck_flags
+# (because we'll assumedly need those to run configure under "make
+# distcheck").
+if test "$config_args" != ""; then
+    echo "*** Adding to distcheck_flags: $config_args"
+    distcheck_flags="$distcheck_flags AM_DISTCHECK_CONFIGURE_FLAGS=\"$config_args\""
+fi
+
+export DISTCHECK_CONFIGURE_FLAGS=$config_args
+
+#
+# First things first -- check that the auto versions that we have are
+# the ones that we want.
+#
+
+check_gnu_version() {
+    prog="$1"
+    target="$2"
+
+    ver="`$prog --version | head -n 1 | sed -e's/([^)]*)//g' -e's/[^0-9 .][^ ]* / /g' -e's/ //g'`"
+    echo $prog version is $ver
+
+    ver_major=`echo $ver | cut -d. -f1`
+    ver_minor=`echo $ver | cut -d. -f2`
+    ver_release=`echo $ver | cut -d. -f3`
+    if test "$ver_release" = ""; then
+        ver_release=0
+    fi
+
+    target_major=`echo $target | cut -d. -f1`
+    target_minor=`echo $target | cut -d. -f2`
+    target_release=`echo $target | cut -d. -f3`
+    if test "$target_release" = ""; then
+        target_release=0
+    fi
+
+    # Gah -- Libtool released version 2.2.6b, the "b" of which totally
+    # screws up the -lt and -gt comparisons, below.  So strip out any
+    # trailing letters in the target_release and ver_release variables
+    # -- if they don't match, we'll just get a "they don't match
+    # somehow" kind of message (because I'm not going to code up a
+    # complex/clever alphanumeric lower/higher comparison thingy).
+    # Sigh.
+    ver_release=`echo $ver_release | sed 's/[A-Za-z]//g'`
+    target_release=`echo $target_release | sed 's/[A-Za-z]//g'`
+
+    result=same
+    if test "$ver" != "$target"; then
+        if test "$ver_major" -lt "$target_major"; then
+            result=low
+        elif test "$ver_major" = "$target_major" -a "$ver_minor" -lt "$target_minor"; then
+            result=low
+        elif test "$ver_major" = "$target_major" -a "$ver_minor" = "$target_minor" -a "$ver_release" -lt "$target_release"; then
+            result=low
+        elif test "$ver_major" -gt "$target_major"; then
+            result=high
+        elif test "$ver_major" = "$target_major" -a "$ver_minor" -gt "$target_minor"; then
+            result=high
+        elif test "$ver_major" = "$target_major" -a "$ver_minor" = "$target_minor" -a "$ver_release" = "$target_release"; then
+            result=same
+        elif test "$ver_major" = "$target_major" -a "$ver_minor" = "$target_minor" -a "$ver_release" -gt "$target_release"; then
+            result=high
+        elif test "$ver_major" = "$target_major" -a "$ver_minor" = "$target_minor" -a "$ver_release" -lt "$target_release"; then
+            result=low
+        else
+            result=unknown
+        fi
+    fi
+
+    if test "$result" = "low"; then
+        cat <<EOF
+----------------------------------------------------------------------
+ERROR: Program "$prog" does not have a high enough version:
+       Found: $ver
+       Expected: $target
+
+Expected versions:
+m4: $M4_TARGET_VERSION
+Automake: $AM_TARGET_VERSION
+Autoconf: $AC_TARGET_VERSION
+Libtool:  $LT_TARGET_VERSION
+
+Either change this script to match the found version, or install
+the correct version of the tools.
+----------------------------------------------------------------------
+EOF
+        if test "$gnu_version_ignore" = "0"; then
+            exit 1
+        fi
+
+    elif test "$result" = "high"; then
+        if test "$highok" = "0"; then
+            cat <<EOF
+----------------------------------------------------------------------
+ERROR: Program "$prog" has a higher version than expected:
+       Found: $ver
+       Expected: $target
+
+Expected versions:
+m4: $M4_TARGET_VERSION
+Automake: $AM_TARGET_VERSION
+Autoconf: $AC_TARGET_VERSION
+Libtool:  $LT_TARGET_VERSION
+
+Either change this script to match the found version, or install
+the correct version of the tools.
+----------------------------------------------------------------------
+EOF
+        if test "$gnu_version_ignore" = "0"; then
+            exit 1
+        fi
+        else
+            cat <<EOF
+----------------------------------------------------------------------
+WARNING: Program "$prog" has a higher version than expected:
+         Found: $ver
+         Expected: $target
+
+Expected versions:
+m4: $M4_TARGET_VERSION
+Automake: $AM_TARGET_VERSION
+Autoconf: $AC_TARGET_VERSION
+Libtool:  $LT_TARGET_VERSION
+
+----------------------------------------------------------------------
+EOF
+        fi
+
+    elif test "$result" = "unknown"; then
+        cat <<EOF
+----------------------------------------------------------------------
+ERROR: Program "$prog" does not have the correct version:
+       Found: $ver
+       Expected: $target
+
+Expected versions:
+m4: $M4_TARGET_VERSION
+Automake: $AM_TARGET_VERSION
+Autoconf: $AC_TARGET_VERSION
+Libtool:  $LT_TARGET_VERSION
+
+Either change this script to match the found version, or install
+the correct version of the tools.
+----------------------------------------------------------------------
+EOF
+        if test "$gnu_version_ignore" = "0"; then
+            exit 1
+        fi
+    fi
+
+}
+
+#
+# Subroutine to actually make a tarball
+#
+
+make_tarball() {
+    #
+    # Autogen
+    #
+    echo "*** Running autogen $autogen_args..."
+    rm -f success
+    (./autogen.sh $autogen_args 2>&1 && touch success) | tee auto.out
+    if test ! -f success; then
+        echo "Autogen failed.  Aborting"
+        exit 1
+    fi
+
+    #
+    # Configure
+    #
+    echo "*** Running configure..."
+    rm -f success
+    (./configure $config_args 2>&1 && touch success) | tee config.out
+    if test ! -f success; then
+        echo "Configure failed.  Aborting"
+        exit 1
+    fi
+
+    #
+    #
+    # make tarball
+    #
+    echo "*** Running make $dist_target..."
+    save_LD=$LD_LIBRARY_PATH
+    LD_LIBRARY_PATH=
+    rm -f success
+    (eval make $distcheck_flags $dist_target 2>&1 && touch success) | tee dist.out
+    if test ! -f success; then
+        echo "Make $dist_target failed.  Aborting"
+        exit 1
+    fi
+    rm -f success
+    LD_LIBRARY_PATH=$save_LD
+
+    #
+    # move
+    #
+    echo "*** Moving tarballs..."
+    mv pmix-* $distdir
+
+    echo "*** All done"
+}
+
+#########################################################################
+# main
+#########################################################################
+
+start=`date`
+echo "*** Start time: $start"
+
+echo "*** Checking tools versions..."
+check_gnu_version m4 $M4_TARGET_VERSION
+check_gnu_version automake $AM_TARGET_VERSION
+check_gnu_version autoconf $AC_TARGET_VERSION
+if test $mac -eq 0; then
+    check_gnu_version libtool $LT_TARGET_VERSION
+fi
+#
+# Verify that we're in a top PMIx dir
+#
+echo "*** Checking to ensure in top-level PMIx directory..."
+if test -f VERSION -a -f configure.ac -a -f config/pmix.m4 ; then
+    happy=1
+else
+    echo "Do not appear to be in an PMIx top directory.  Abort!"
+    exit 1
+fi
+
+echo "*** Removing old VERSION file..."
+rm -f VERSION
+echo "*** Restoring pristine VERSION file..."
+git checkout VERSION
+echo "*** Getting git version number..."
+repo_rev=git`git log -1 --oneline | head -1 | cut -d' ' -f1`
+echo "    Repo rev number: $repo_rev"
+
+# Sanity checks
+if test "$repo_rev" = ""; then
+    echo "Somehow the repo rev number is empty.  Abort!"
+    exit 1
+elif test "`echo $repo_rev | grep ' '`" != ""; then
+    echo "Somehow the repo rev number has a space in it -- bad!"
+    exit 1
+fi
+
+# Ensure we have a clean repo
+if test $dirty_ok -eq 0; then
+    echo "*** Checking if source tree is dirty..."
+    dirty=0
+    if test "`git status | grep 'Changes not staged for commit'`" != ""; then
+        dirty=1
+    fi
+
+    if test $dirty -eq 1; then
+        echo "    Source tree is dirty.  Cannot continue."
+        exit 1
+    fi
+fi
+
+#
+# Ditch repo rev from all version numbers
+#
+echo "*** Removing git version numbers from VERSION..."
+version_files=VERSION
+release_date=`date '+%b %d, %Y'`
+echo "    Release date: $release_date"
+for file in $version_files; do
+    echo " - $file"
+    sed -e 's/^want_repo_rev=.*/want_repo_rev=0/' \
+        -e 's/^repo_rev=.*/'repo_rev=$repo_rev/ \
+        -e "s/^date=.*/date=\"$release_date\"/" \
+        $file > $file.new
+    cp -f $file.new $file
+    rm $file.new
+done
+
+#
+# Make 2 tarballs:
+#
+# - one with the greek
+# - one without the greek
+#
+# unless the user specifically said --greekonly, then only make the
+# greek tarball.  Making both tarballs at once allows us to guarantee
+# to have two tarballs -- one greek and one not -- that have exactly
+# the same GIT r number (as opposed to, for example, running this
+# script to make a greek tarball, then running it again to make a
+# non-greek tarball -- there is a race condition that someone could
+# commit in the meantime and change the GIT r number in the 2nd
+# tarball)
+#
+
+# First, make greek tarball
+
+echo "*** Making greek tarball"
+make_tarball
+
+# Now if ! --greekonly, make the non-greek tarball
+
+if test "$greekonly" = "0"; then
+    echo "*** REMOVING ALL GREEK FROM VERSION NUMBERS!!"
+    for file in $version_files; do
+        echo " - $file"
+        sed -e 's/^greek=.*/greek=/' $file > $file.new
+        cp -f $file.new $file
+        rm $file.new
+    done
+    echo "Making non-greek tarball"
+    make_tarball
+fi
+
+# Put the VERSION file back the way it was
+git checkout VERSION
+
+echo " "
+echo "*** Start time:  $start"
+echo "*** Finish time: `date`"
diff --git a/contrib/md2nroff.pl b/contrib/md2nroff.pl
new file mode 100755
index 0000000..9eb33fe
--- /dev/null
+++ b/contrib/md2nroff.pl
@@ -0,0 +1,164 @@
+#!/usr/bin/env perl
+
+# Script to convert markdown to nroff man pages.
+#
+# The main conversion work is done via pandoc.  But pandoc doesn't do
+# everything exactly the way we want it, so use some perl regular
+# expressions to fix up what pandoc doesn't get right.
+#
+# Do a "smart" write of the resulting output man page -- only write to
+# the output file if the contents have actually changed compared to
+# what was already there.
+
+use strict;
+use warnings;
+
+use POSIX;
+use File::Basename;
+use Getopt::Long;
+use File::Temp qw/tempfile/;
+
+my $source_arg;
+my $target_arg;
+my $help_arg;
+
+my $ok = Getopt::Long::GetOptions("source=s" => \$source_arg,
+                                  "target=s" => \$target_arg,
+                                  "help|h" => \$help_arg,
+                                  );
+
+if ($help_arg) {
+    print "$0 --source input_MD_file --target output_nroff_file\n";
+    exit(0);
+}
+
+# Sanity checks
+die "Must specify a source file"
+    if (!defined($source_arg));
+die "Source file does not exist ($source_arg)"
+    if (! -r $source_arg);
+
+my $pandoc = `which pandoc`;
+die "Cannot find pandoc executable"
+    if ($pandoc eq "");
+
+#####################################################################
+
+my $file = $source_arg;
+$file =~ m/(\d+).md/;
+my $section = $1;
+die "Could not figure out the man page section: $source_arg"
+    if (!defined($section));
+my $shortfile = basename($file);
+$shortfile =~ s/\.$section\.md$//;
+
+# If the target file was not specified, derive it from the source file
+my $target;
+if (!defined($target_arg)) {
+    $target_arg = $source_arg;
+
+    $target_arg =~ m/\.(\d)\.md$/;
+    my $section = $1;
+
+    my $dirname = dirname($target_arg);
+    my $basename = basename($target_arg);
+    $basename =~ s/\.md$//;
+
+    $target = "$dirname/man$section/$basename";
+} else {
+    $target = $target_arg;
+}
+
+print "*** Processing: $file -> $target\n";
+
+# Read in the file
+my $pandoc_input;
+open(IN, $file)
+    || die "Can't open $file";
+$pandoc_input .= $_
+    while (<IN>);
+close(IN);
+
+# Remove the Jekyll header
+$pandoc_input =~ s/.*---\n.+?---\n//s;
+
+# Remove the {% include ... %} directives
+$pandoc_input =~ s/\n{0,1}\s*{%\s+include .+?\s+%}\s*\n/\n/g;
+
+# Change {% highlight c %} to ```c
+$pandoc_input =~ s/^\s*{%\s+highlight\s+c\s+%}\s*$/\n```c/gmi;
+
+# Change {% endhighlight %} to ```
+$pandoc_input =~ s/^\s*\{\%\s+endhighlight\s+\%\}\s*$/```\n/gmi;
+
+# Pandoc does not handle markdown links in output nroff properly,
+# so just remove all links.
+while ($pandoc_input =~ m/\[(.+?)\]\(.+?\)/) {
+    my $text = $1;
+    $pandoc_input =~ s/\[(.+?)\]\(.+?\)/$text/;
+}
+
+# Add the pandoc header
+$pandoc_input = "% $shortfile($section) PMIx Programmer's Manual | \@VERSION\@
+% PMIx
+% \@DATE\@\n\n$pandoc_input";
+
+# Generate the nroff output
+my ($fh, $temp_filename) = tempfile();
+print $fh $pandoc_input;
+close($fh);
+
+open(IN, "pandoc -s --from=markdown --to=man $temp_filename|")
+    || die "Can't run pandoc";
+my $pandoc_nroff;
+$pandoc_nroff .= $_
+    while (<IN>);
+close(IN);
+unlink($temp_filename);
+
+# Now that we have the nroff string result, is it different than the
+# target file?
+my $write_nroff = 1;
+if (-r $target) {
+    # If the target file exists, read it in
+    open(IN, $target)
+        || die "Can't open $target";
+    my $target_nroff;
+    $target_nroff .= $_
+        while (<IN>);
+    close(IN);
+
+    # Remove the date from the target nroff string so that we can
+    # compare and ignore if the date has changed.  Note that some
+    # versions of pandoc render dates as xxxx\-xx\-xx, and others
+    # render it as xxxx-xx-xx.  Handle both.
+    $target_nroff =~ s/\"\d\d\d\d\\\-\d\d\\\-\d\d\"/\"\\\@DATE\\\@\"/;
+    $target_nroff =~ s/\"\d\d\d\d\-\d\d\-\d\d\"/\"\\\@DATE\\\@\"/;
+
+    $write_nroff = 0
+        if ($pandoc_nroff eq $target_nroff);
+}
+
+# Do we need to write a new target nroff?
+if ($write_nroff) {
+
+    # What's the date right now?
+    my $now_string = strftime "%Y\\-%m\\-%d", localtime;
+    $pandoc_nroff =~ s/\\\@DATE\\\@/$now_string/g;
+
+    # Make sure the target directory exists
+    my $dirname = dirname($target);
+    mkdir($dirname)
+        if (! -d $dirname);
+
+    open(OUT, ">$target")
+        || die "Can't write to $target";
+    print OUT $pandoc_nroff;
+    close(OUT);
+
+    print "--> Wrote new $target\n";
+} else {
+    print "--> $target unchanged; not written\n";
+}
+
+exit(0);
diff --git a/contrib/perf_tools/Makefile b/contrib/perf_tools/Makefile
new file mode 100644
index 0000000..2950748
--- /dev/null
+++ b/contrib/perf_tools/Makefile
@@ -0,0 +1,21 @@
+PMIX_BASE = <pmix-path>
+PMIX_INC= -I$(PMIX_BASE)/include/
+PMIX_LIB= -L$(PMIX_BASE)/lib/ -lpmix
+
+PMI2_BASE = /usr/
+#PMI2_INC= -I$(PMI2_BASE)/include/
+#PMI2_LIB= -L$(PMI2_BASE)/lib/ -lpmi2
+PMI2_LIB= -lpmi2
+
+CFLAGS = -O2 -g
+
+all: pmix pmi2
+
+pmix: pmi_intra_perf.c pmi.h pmix.c
+	gcc $(PMIX_INC) $(CFLAGS) -o pmix_intra_perf pmi_intra_perf.c pmix.c $(PMIX_LIB) -lrt
+
+pmi2: pmi_intra_perf.c pmi.h pmi2.c pmi2_pmap_parser.c pmi2_pmap_parser.h pmi2_utils.c pmi2_utils.h
+	gcc $(PMI2_INC) $(CFLAGS) -o pmi2_intra_perf pmi_intra_perf.c pmi2.c pmi2_utils.c pmi2_pmap_parser.c -lrt $(PMI2_LIB)
+
+clean:
+	rm -f pmix_intra_perf pmi2_intra_perf
diff --git a/contrib/perf_tools/Makefile.include b/contrib/perf_tools/Makefile.include
new file mode 100644
index 0000000..991a7b9
--- /dev/null
+++ b/contrib/perf_tools/Makefile.include
@@ -0,0 +1,36 @@
+# -*- makefile -*-
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2007 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2013-2016 Intel, Inc. All rights reserved
+# Copyright (c) 2016      Cisco Systems, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# This makefile.am does not stand on its own - it is included from
+# Makefile.am
+
+EXTRA_DIST += \
+        perf_tools/Makefile \
+        perf_tools/pmi_intra_perf.c \
+        perf_tools/pmi.h \
+        perf_tools/pmi2_pmap_parser.c \
+        perf_tools/pmi2_pmap_parser.h \
+        perf_tools/pmi2_utils.c \
+        perf_tools/pmi2_utils.h \
+        perf_tools/pmi2.c \
+        perf_tools/pmix.c \
+        perf_tools/README \
+        perf_tools/run.sh
diff --git a/contrib/perf_tools/README b/contrib/perf_tools/README
new file mode 100644
index 0000000..a667758
--- /dev/null
+++ b/contrib/perf_tools/README
@@ -0,0 +1,35 @@
+Building instructions:
+
+* Open the Makefile and fix the following variables:
+  * PMIX_BASE should point to the directory where PMIx is installed.
+    If you don't want to test PMIx - remove pmix from the list of "all" targets.
+  * PMI2_BASE should point to the directory where SLURM is installed.
+    If you don't want to test PMI2 - remove pmi2 from the list of "all" targets.
+* run `make`.
+
+The follwoing files (or one of them) will be built as the result:
+* pmix_intra_perf - that is for testing pmix performance
+- pmi2_intra_perf - for testing pmi2 performance
+
+Running instructions:
+
+The following options are supported by both of the binaries:
+  -s, --key-size=<size>     size of the key's submitted (default is 100 * sizeof(int) bytes)
+  -c, --key-count=<size>    number of keys submitted to local and remote parts (default is 10)
+  -d, --direct-modex        use direct modex if available
+  --debug                   force all processes to print out the timings themself
+
+You can run it directly with your favorite launcher (mpirun/srun), just
+make sure that both MPI and PMIx libraries are visible for the loader.
+
+For PMIx testing "convenience" there is a `run.sh` script that can be used to
+ensure that environment is set properly (not a production grade so may not work
+for all environments). To use it open it and fix:
+- OMPI_BASE to point to your MPI installation
+- PMIX_LIB to point to your PMIx installation
+
+If you are running inside the supported batch system you shoud be fine to
+just run fixed `run.sh` with the first argument defining how many processes
+needs to be launched and all other parameters will be passed to the performance
+tool. For example:
+$ ./run.sh 10 -d
diff --git a/contrib/perf_tools/pmi.h b/contrib/perf_tools/pmi.h
new file mode 100644
index 0000000..4782a19
--- /dev/null
+++ b/contrib/perf_tools/pmi.h
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2016      Mellanox Technologies, Inc.
+ *                         All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#ifndef PMI_INTERFACE_H
+#define PMI_INTERFACE_H
+
+#include <stdio.h>
+
+void pmi_init(int *rank, int *size);
+void pmi_get_local_ranks(int **local_ranks, int *local_cnt);
+void pmi_put_key_loc(char *key, int *key_val, int key_size);
+void pmi_put_key_rem(char *key, int *key_val, int key_size);
+void pmi_put_double(char *key, double val);
+void pmi_commit();
+void pmi_fence(int collect);
+void pmi_fini();
+void pmi_get_key_loc(int rank, char *key_name, int **key_val, int *key_size);
+void pmi_get_key_rem(int rank, char *key_name, int **key_val, int *key_size);
+double pmi_get_double(int rank, char *key);
+
+#endif
diff --git a/contrib/perf_tools/pmi2.c b/contrib/perf_tools/pmi2.c
new file mode 100644
index 0000000..b6b3412
--- /dev/null
+++ b/contrib/perf_tools/pmi2.c
@@ -0,0 +1,186 @@
+/*
+ * Copyright (c) 2016      Mellanox Technologies, Inc.
+ *                         All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <stdio.h>
+#include <slurm/pmi2.h>
+#include "pmi2_pmap_parser.h"
+#include "pmi2_utils.h"
+
+static int my_rank, my_node;
+static char * kvs_name;
+
+void pmi_init(int *rank, int *size)
+{
+    int spawned, appnum;
+    int rc;
+
+    *size = -1;
+    *rank = -1;
+    appnum = -1;
+
+    if (PMI2_SUCCESS != (rc = PMI2_Init(&spawned, size, rank, &appnum))) {
+        fprintf(stderr, "pmi2: PMI2_Init: error rc = %d\n", rc);
+        abort();
+    }
+    if( *size < 0 || *rank < 0 ){
+        fprintf(stderr, "pmi2: PMI2_Init: bad size=%d or rank=%d values\n",
+               *size, *rank);
+        abort();
+    }
+    my_rank = *rank;
+
+    kvs_name = (char*)malloc(PMI2_MAX_VALLEN);
+    if( kvs_name == NULL ){
+        fprintf(stderr, "pmi_init (pmi2): cannot malloc kvs name buffer\n");
+        abort();
+    }
+    rc = PMI2_Job_GetId(kvs_name, PMI2_MAX_VALLEN);
+    if( PMI2_SUCCESS != rc ){
+        fprintf(stderr, "pmi_init (pmi2): cannot get kvs name: rc = %d\n", rc);
+        abort();
+    }
+}
+
+void pmi_get_local_ranks(int **local_ranks, int *local_cnt)
+{
+    int rc, found;
+
+    char *pmapping = (char*)malloc(PMI2_MAX_VALLEN);
+    if( pmapping == NULL ){
+        fprintf(stderr,"pmi_get_local_ranks (pmi2): cannot mallic for pmappig\n");
+        abort();
+    }
+
+
+    rc = PMI2_Info_GetJobAttr("PMI_process_mapping", pmapping, PMI2_MAX_VALLEN, &found);
+    if( !found || PMI2_SUCCESS != rc ) {
+        fprintf(stderr,"pmi_get_local_ranks (pmi2): PMI2_Info_GetJobAttr rc = %d\n", rc);
+        abort();
+    }
+
+    *local_ranks = NULL;
+    *local_ranks = mca_common_pmi2_parse_pmap(pmapping, my_rank, &my_node, local_cnt);
+    if (NULL == *local_ranks) {
+        fprintf(stderr,"mca_common_pmi2_parse_pmap: error\n");
+        abort();
+    }
+
+    free(pmapping);
+}
+
+void pmi_put_key_loc(char *key, int *key_val, int key_size)
+{
+    char *encoded = pmi_encode(key_val, key_size * sizeof(int));
+    if( NULL == encoded ){
+        fprintf(stderr, "pmi_encode: error on key: %s\n", key);
+        abort();
+    }
+    PMI2_Info_PutNodeAttr(key, encoded);
+}
+
+void pmi_put_key_rem(char *key, int *key_val, int key_size)
+{
+    char *encoded = pmi_encode(key_val, key_size * sizeof(int));
+    if( NULL == encoded ){
+        fprintf(stderr, "pmi_encode: error on key: %s\n", key);
+        abort();
+    }
+
+    PMI2_KVS_Put(key, encoded);
+}
+
+void pmi_put_double(char *key, double val)
+{
+    char buf[128];
+    sprintf(buf, "%lf", val);
+    PMI2_KVS_Put(key, buf);
+}
+
+
+void pmi_commit()
+{
+
+}
+
+void pmi_fence(int collect)
+{
+    int rc;
+    /* now call fence */
+    if (PMI2_SUCCESS != (rc = PMI2_KVS_Fence()) ) {
+        fprintf(stderr, "PMI2_KVS_Fence: error %d\n", rc);
+        abort();
+    }
+}
+
+void pmi_fini()
+{
+    PMI2_Finalize();
+}
+
+void pmi_get_key_loc(int rank, char *key_name, int **key_val, int *key_size)
+{
+    int found, rc;
+    size_t tmp_size;
+    char *tmp = calloc(PMI2_MAX_VALLEN, sizeof(char));
+    if( (rc = PMI2_Info_GetNodeAttr(key_name, tmp, PMI2_MAX_VALLEN, &found, 1) ) ){
+        fprintf(stderr,"PMI2_Info_GetNodeAttr: error rc = %d\n", rc);
+        abort();
+    }
+    if( !found ){
+        fprintf(stderr,"pmi_get_key_loc: key %s not found\n", key_name);
+        abort();
+    }
+
+    *key_val = (int*)pmi_decode(tmp, &tmp_size);
+    *key_size = tmp_size / sizeof(int);
+
+    if( NULL == *key_val ){
+        fprintf(stderr,"pmi_decode: cannot decode key %s\n", key_name);
+        abort();
+    }
+    free(tmp);
+}
+
+void pmi_get_key_rem(int rank, char *key_name, int **key_val, int *key_size)
+{
+    int len, rc;
+    size_t tmp_size;
+
+    char *tmp = calloc(PMI2_MAX_VALLEN, sizeof(char));
+    if( (rc = PMI2_KVS_Get(kvs_name, PMI2_ID_NULL, key_name, tmp, PMI2_MAX_VALLEN, &len) ) ){
+        fprintf(stderr,"PMI2_Info_GetNodeAttr: error rc = %d\n", rc);
+        abort();
+    }
+
+    *key_val = (int*)pmi_decode(tmp, &tmp_size);
+    *key_size = tmp_size / sizeof(int);
+
+    if( NULL == *key_val ){
+        fprintf(stderr,"pmi_decode: cannot decode key %s\n", key_name);
+        abort();
+    }
+    free(tmp);
+}
+
+float pmi_get_double(int rank, char *key)
+{
+    int len, rc;
+    size_t tmp_size;
+    char *tmp = calloc(PMI2_MAX_VALLEN, sizeof(char));
+    double v;
+
+    if( (rc = PMI2_KVS_Get(kvs_name, PMI2_ID_NULL, key, tmp, PMI2_MAX_VALLEN, &len) ) ){
+        fprintf(stderr,"PMI2_Info_GetNodeAttr: error rc = %d\n", rc);
+        abort();
+    }
+    sscanf(tmp, "%lf", &v);
+    free(tmp);
+    return v;
+}
diff --git a/contrib/perf_tools/pmi2_pmap_parser.c b/contrib/perf_tools/pmi2_pmap_parser.c
new file mode 100644
index 0000000..0d14b98
--- /dev/null
+++ b/contrib/perf_tools/pmi2_pmap_parser.c
@@ -0,0 +1,244 @@
+/* -*- Mode: C; c-basic-offset:4 ; -*- */
+/*
+ *
+ * Copyright (c) 2013      Mellanox Technologies, Inc.
+ *                         All rights reserved.
+ * Copyright (c) 2014-2016 Intel, Inc.  All rights reserved.
+ * $COPYRIGHT$
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ *
+ */
+
+/* This code was taken from Open MPI project, file
+   opal/mca/pmix/s2/pmi2_pmap_parser.c
+*/
+
+#include "pmi2_pmap_parser.h"
+
+/**
+ pmi2 process mapping is returned as a
+ comma separated list of tuples:
+ex: (vector,(0,4,4),(0,4,1))
+slurm cyclic distro of 4 ranks over 2 nodes:
+(vector,(0,2,1),(0,2,1))
+slurm block distro of 4 ranks over 2 nodes:
+(vector,(0,2,2))
+
+
+ Format of each tuple is (base, H, L), where
+ H is number of nodes spawned by tuple,
+ L is number of ranks per node,
+ base is offset from node 0.
+
+ Tuple can be visualized as a rectangle on two
+ dimensional (Hosts, Local Ranks) plane:
+
+           ------------------------------------ Hosts ->
+           |              H
+           |           +--------+
+           |<- base -->|        |
+           |           |        | L
+           |           +--------+
+        Local Ranks
+           V
+
+Note that ranks increase by column. Tuple (0,2,3) looks like:
+0 3
+1 4
+2 5
+
+*/
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+static int find_my_node(char *map, int me)
+{
+    int abs_rank;
+    int base, H, L;
+    char *p;
+
+    p = map;
+    abs_rank = 0;
+    while (NULL != (p = strstr(p+1, ",("))) {
+        if (3 != sscanf(p, ",(%d,%d,%d)", &base, &H, &L)) {
+            return -1;
+        }
+        if (me >= abs_rank && me < abs_rank + H*L) {
+            /* found my rectangle, compute node */
+            return base + (me - abs_rank)/L;
+        }
+        abs_rank += H*L;
+    }
+    return -1;
+}
+
+static int *find_lrs(char *map, int my_node, int *nlrs)
+{
+    int abs_rank;
+    int base, H, L;
+    char *p;
+    int *lrs;
+    int max_lr;
+    int i;
+
+    p = map;
+    abs_rank = 0;
+    *nlrs = 0;
+    max_lr = 16;
+    lrs = malloc(max_lr * sizeof(int));
+    while (NULL != (p = strstr(p+1, ",("))) {
+        if (3 != sscanf(p, ",(%d,%d,%d)", &base, &H, &L)) {
+            free(lrs);
+            return NULL;
+        }
+        if (base <= my_node && my_node < base + H) {
+            if (*nlrs + L >= max_lr) {
+                lrs = realloc(lrs, (max_lr + L) * sizeof(int));
+                if (NULL == lrs) {
+                    *nlrs = 0;
+                    free(lrs);
+                    return NULL;
+                }
+                max_lr += L;
+            }
+            /* skip (my_node - base) columns of L elems,
+             * numbers in my column are local to me
+             */
+            for (i = 0; i < L; i++) {
+                lrs[*nlrs] = (my_node - base) * L + i + abs_rank;
+                (*nlrs) ++;
+            }
+        }
+        abs_rank += H*L;
+    }
+
+    if (0 == *nlrs) {
+        free(lrs);
+        lrs = 0;
+    }
+    return lrs;
+}
+
+/**
+ * @param pmap process map as returned by PMI_process_mapping
+ *             attribute
+ * @param my_rank
+ * @param node set to my node id
+ * @param nlrs set to the number of local ranks returned
+ *
+ * @return array that contains ranks local to my_rank or NULL
+ * on failure. Array must be freed by the caller.
+ */
+int *mca_common_pmi2_parse_pmap(char *pmap, int my_rank,
+                                  int *node, int *nlrs)
+{
+    char *p;
+
+    p = strstr(pmap, "(vector");
+    if (NULL == p) {
+        return NULL;
+    }
+
+    *node = find_my_node(p, my_rank);
+    if (0 > *node) {
+       return NULL;
+    }
+
+    return find_lrs(p, *node, nlrs);
+}
+
+
+#ifdef STANDALONE_TEST
+#include <assert.h>
+static void dump_lrs(int *lrs, int me, int node, int n)
+{
+    int i;
+
+    printf("Total %d ranks/node, node %d me %d\n", n, node, me);
+    for (i = 0; i < n; i++) {
+        printf("%d ", lrs[i]);
+    }
+    printf("\n");
+    free(lrs);
+}
+
+int main(int argc, char **argv)
+{
+    int me, n, node;
+    int *lrs;
+    char *pmap;
+    int a1[] = {0, 1};
+    int a2[] = {2, 3};
+    int a3[] = {0, 2};
+    int a4[] = {1, 3};
+    int a5[] = {0,1,3,2,16,17};
+    int a6[] = {8,9,10,11,19};
+
+
+    if (argc == 3) {
+        me = atoi(argv[1]);
+        lrs = orte_grpcomm_pmi2_parse_pmap(argv[2], me, &node, &n);
+        if (NULL == lrs) {
+            printf("can not parse pmap\n");
+            exit(1);
+        }
+        dump_lrs(lrs, me, node, n);
+        exit(0);
+    }
+    /* built in cases */
+
+    pmap = "(vector,(0,2,2))";
+    me = 1;
+    lrs = orte_grpcomm_pmi2_parse_pmap(pmap, me, &node, &n);
+    assert(lrs);
+    assert(n == 2);
+    assert(memcmp(lrs, a1, 2) == 0);
+    free(lrs);
+
+
+    pmap = "(vector,(0,2,2))";
+    me = 2;
+    lrs = orte_grpcomm_pmi2_parse_pmap(pmap, me, &node, &n);
+    assert(lrs);
+    assert(n == 2);
+    assert(memcmp(lrs, a2, 2) == 0);
+    free(lrs);
+
+
+    /* cyclic distro which skips node 0 */
+    pmap = "(vector,(1,2,1),(1,2,1))";
+    me = 0;
+    lrs = orte_grpcomm_pmi2_parse_pmap(pmap, me, &node, &n);
+    assert(lrs);
+    assert(n == 2);
+    assert(memcmp(lrs, a3, n) == 0);
+    free(lrs);
+
+    pmap = "(vector,(1,2,1),(1,2,1))";
+    me = 3;
+    lrs = orte_grpcomm_pmi2_parse_pmap(pmap, me, &node, &n);
+    assert(lrs);
+    assert(n == 2);
+    assert(memcmp(lrs, a4, n) == 0);
+    free(lrs);
+
+    pmap = "(vector,(0,4,4),(0,1,2),(1,3,1))";
+    me = 3;
+    lrs = orte_grpcomm_pmi2_parse_pmap(pmap, me, &node, &n);
+    assert(lrs);
+    assert(n == 6);
+    assert(memcmp(lrs, a5, n) == 0);
+    free(lrs);
+
+    pmap = "(vector,(0,4,4),(0,1,2),(1,3,1))";
+    me = 10;
+    lrs = orte_grpcomm_pmi2_parse_pmap(pmap, me, &node, &n);
+    assert(lrs);
+    assert(n == 5);
+    assert(memcmp(lrs, a6, n) == 0);
+    free(lrs);
+    return 0;
+}
+#endif
diff --git a/contrib/perf_tools/pmi2_pmap_parser.h b/contrib/perf_tools/pmi2_pmap_parser.h
new file mode 100644
index 0000000..24ab376
--- /dev/null
+++ b/contrib/perf_tools/pmi2_pmap_parser.h
@@ -0,0 +1,24 @@
+/* -*- Mode: C; c-basic-offset:4 ; -*- */
+/*
+ *
+ * Copyright (c) 2013      Mellanox Technologies, Inc.
+ *                         All rights reserved.
+ * Copyright (c) 2014-2016 Intel, Inc.  All rights reserved.
+ * $COPYRIGHT$
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ *
+ */
+
+/* This code was taken from Open MPI project, file
+   opal/mca/pmix/s2/pmi2_pmap_parser.h
+*/
+
+
+#ifndef PMI2_PMAP_PARSER_H
+#define PMI2_PMAP_PARSER_H
+
+int *mca_common_pmi2_parse_pmap(char *pmap, int my_rank,
+                                  int *node, int *nlrs);
+#endif
diff --git a/contrib/perf_tools/pmi2_utils.c b/contrib/perf_tools/pmi2_utils.c
new file mode 100644
index 0000000..7d27deb
--- /dev/null
+++ b/contrib/perf_tools/pmi2_utils.c
@@ -0,0 +1,132 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2012-2015 Los Alamos National Security, LLC.  All rights
+ *                         reserved.
+ * Copyright (c) 2014-2016 Intel, Inc. All rights reserved.
+ * Copyright (c) 2014-2016 Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2016      Mellanox Technologies, Inc.
+ *                         All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ *
+ */
+
+/* This code was taken from Open MPI project, file
+   opal/mca/pmix/base/pmix_base_fns.c
+*/
+
+#include <assert.h>
+#include <string.h>
+#include "pmi2_utils.h"
+
+/* base64 encoding with illegal (to Cray PMI) characters removed ('=' is replaced by ' ') */
+static inline unsigned char pmi_base64_encsym (unsigned char value) {
+    assert (value < 64);
+
+    if (value < 26) {
+    return 'A' + value;
+    } else if (value < 52) {
+    return 'a' + (value - 26);
+    } else if (value < 62) {
+    return '0' + (value - 52);
+    }
+
+    return (62 == value) ? '+' : '/';
+}
+
+static inline unsigned char pmi_base64_decsym (unsigned char value) {
+    if ('+' == value) {
+    return 62;
+    } else if ('/' == value) {
+    return 63;
+    } else if (' ' == value) {
+    return 64;
+    } else if (value <= '9') {
+    return (value - '0') + 52;
+    } else if (value <= 'Z') {
+    return (value - 'A');
+    } else if (value <= 'z') {
+    return (value - 'a') + 26;
+    }
+
+    return 64;
+}
+
+static inline void pmi_base64_encode_block (const unsigned char in[3], char out[4], int len) {
+    out[0] = pmi_base64_encsym (in[0] >> 2);
+    out[1] = pmi_base64_encsym (((in[0] & 0x03) << 4) | ((in[1] & 0xf0) >> 4));
+    /* Cray PMI doesn't allow = in PMI attributes so pad with spaces */
+    out[2] = 1 < len ? pmi_base64_encsym(((in[1] & 0x0f) << 2) | ((in[2] & 0xc0) >> 6)) : ' ';
+    out[3] = 2 < len ? pmi_base64_encsym(in[2] & 0x3f) : ' ';
+}
+
+static inline int pmi_base64_decode_block (const char in[4], unsigned char out[3]) {
+    char in_dec[4];
+
+    in_dec[0] = pmi_base64_decsym (in[0]);
+    in_dec[1] = pmi_base64_decsym (in[1]);
+    in_dec[2] = pmi_base64_decsym (in[2]);
+    in_dec[3] = pmi_base64_decsym (in[3]);
+
+    out[0] = in_dec[0] << 2 | in_dec[1] >> 4;
+    if (64 == in_dec[2]) {
+    return 1;
+    }
+
+    out[1] = in_dec[1] << 4 | in_dec[2] >> 2;
+    if (64 == in_dec[3]) {
+    return 2;
+    }
+
+    out[2] = ((in_dec[2] << 6) & 0xc0) | in_dec[3];
+    return 3;
+}
+
+
+/* PMI only supports strings. For now, do a simple base64. */
+char *pmi_encode(const void *val, size_t vallen)
+{
+    char *outdata, *tmp;
+    size_t i;
+
+    outdata = calloc (((2 + vallen) * 4) / 3 + 2, 1);
+    if (NULL == outdata) {
+    return NULL;
+    }
+
+    for (i = 0, tmp = outdata ; i < vallen ; i += 3, tmp += 4) {
+        pmi_base64_encode_block((unsigned char *) val + i, tmp, vallen - i);
+    }
+
+    tmp[0] = (unsigned char)'\0';
+
+    return outdata;
+}
+
+uint8_t *pmi_decode (const char *data, size_t *retlen)
+{
+    size_t input_len = strlen(data) / 4;
+    unsigned char *ret;
+    int out_len;
+    size_t i;
+
+    /* default */
+    *retlen = 0;
+
+    ret = calloc (1, 3 * input_len + 1);
+    if (NULL == ret) {
+        return ret;
+    }
+
+    for (i = 0, out_len = 0 ; i < input_len ; i++, data += 4) {
+    out_len += pmi_base64_decode_block(data, ret + 3 * i);
+    }
+
+    ret[out_len] = '\0';
+    *retlen = out_len;
+    return ret;
+}
diff --git a/contrib/perf_tools/pmi2_utils.h b/contrib/perf_tools/pmi2_utils.h
new file mode 100644
index 0000000..4de48a1
--- /dev/null
+++ b/contrib/perf_tools/pmi2_utils.h
@@ -0,0 +1,11 @@
+#ifndef PMI2_UTILS_H
+#define PMI2_UTILS_H
+
+#include <stdlib.h>
+#include <stdint.h>
+#include <inttypes.h>
+
+char *pmi_encode(const void *val, size_t vallen);
+uint8_t *pmi_decode (const char *data, size_t *retlen);
+
+#endif // PMI2_UTILS_H
diff --git a/contrib/perf_tools/pmi_intra_perf.c b/contrib/perf_tools/pmi_intra_perf.c
new file mode 100644
index 0000000..680b825
--- /dev/null
+++ b/contrib/perf_tools/pmi_intra_perf.c
@@ -0,0 +1,517 @@
+/*
+ * Copyright (c) 2015      Mellanox Technologies, Inc.  All rights reserved.
+ * Copyright (c) 2016      Intel, Inc.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <time.h>
+#include <getopt.h>
+#include <limits.h>
+#include <string.h>
+
+#include "pmi.h"
+
+#include <time.h>
+#define GET_TS ({ \
+    struct timespec ts;                     \
+    double ret;                             \
+    clock_gettime(CLOCK_MONOTONIC, &ts);    \
+    ret = ts.tv_sec + 1E-9 * ts.tv_nsec;    \
+    ret;                                    \
+})
+
+
+int key_size = 100, key_count = 10, rank_shift;
+int direct_modex = 0, debug_on = 0;
+
+static void usage(const char *argv0)
+{
+    printf("Usage:\n");
+    printf("  %s [options]              start the benchmark\n", argv0);
+    printf("\n");
+    printf("  -s, --key-size=<size>     size of the key's submitted\n");
+    printf("  -c, --key-count=<size>    number of keys submitted to local and remote parts\n");
+    printf("  -d, --direct-modex        use direct modex if available\n");
+    printf("  --debug                   force all processes to print out the timings themself\n");
+}
+
+
+void parse_options(int argc, char **argv)
+{
+    extern char *optarg;
+    extern int optind;
+    struct option long_options[] = {
+        { "help",           0, NULL, 'h' },
+        /* IB options */
+        { "key-size",       1, NULL, 's' },
+        { "key-count",      1, NULL, 'c' },
+        { "direct-modex",   0, NULL, 'd' },
+        { "debug",          0, NULL, '0' },
+        { 0 }
+    };
+
+    while (1) {
+        int c;
+        c = getopt_long(argc, argv, "hs:c:d0", long_options, NULL);
+
+        if (c == -1)
+            break;
+        switch (c) {
+        case 's':
+            key_size = atoi(optarg);
+            break;
+        case 'c':
+            key_count = atoi(optarg);
+            break;
+        case 'd':
+            direct_modex = 1;
+            break;
+        case '0':
+            debug_on = 1;
+            break;
+        case 'h':
+        default:
+            usage(argv[0]);
+            exit(0);
+        }
+    }
+
+    rank_shift = 10;
+    while( rank_shift <= key_count ){
+        rank_shift *= 10;
+    }
+}
+
+void fill_remote_ranks(int *local_ranks, int local_cnt, int *remote_ranks, int size)
+{
+    int i, k;
+    for(i = 0, k = 0; i < size && k < (size - local_cnt); i++ ){
+        int j, flag = 1;
+        for(j=0; j < local_cnt; j++){
+            if( i == local_ranks[j] ){
+                flag = 0;
+                break;
+            }
+        }
+        if( flag ){
+            remote_ranks[k] = i;
+            k++;
+        }
+    }
+}
+
+int store_double(char *name, double val)
+{
+    char buf[128];
+    sprintf(buf,"%lf",val);
+
+}
+
+int get_mem_usage(double *_pss, double *_rss) {
+    char data[PATH_MAX];
+    FILE *smaps;
+    double pss = 0.0, rss = 0.0;
+    char *line = NULL;
+    size_t size = 0;
+    pid_t pid = getpid();
+
+    *_pss = 0.0;
+    *_rss = 0.0;
+
+    memset(data, 0, sizeof(data));
+    snprintf(data, sizeof(data), "/proc/%d/smaps", pid);
+
+    if (NULL == (smaps = fopen(data, "r"))) {
+        return -1;
+    }
+
+    while ((size = getline(&line, &size, smaps)) != -1) {
+        if (0 == strncmp(line, "Pss", strlen("Pss"))) {
+            sscanf(line, "Pss: %lf", &pss);
+            *_pss += pss;
+        }
+        if (0 == strncmp(line, "Rss", strlen("Pss"))) {
+            sscanf(line, "Rss: %lf", &rss);
+            *_rss += pss;
+        }
+    }
+    free(line);
+    fclose(smaps);
+
+    return 0;
+}
+
+int main(int argc, char **argv)
+{
+    int rc;
+    char *key_name;
+    int *key_val;
+    int rank, nproc;
+    int cnt;
+    int *local_ranks, local_cnt;
+    int *remote_ranks, remote_cnt;
+    double start, total_start, get_loc_time = 0, get_rem_time = 0, put_loc_time = 0,
+            put_rem_time = 0, commit_time = 0, fence_time = 0, init_time = 0, total_time = 0;
+    int get_loc_cnt = 0, get_rem_cnt = 0, put_loc_cnt = 0, put_rem_cnt = 0;
+    double mem_pss = 0.0, mem_rss = 0.0;
+
+    parse_options(argc, argv);
+
+    total_start = GET_TS;
+    start = GET_TS;
+    pmi_init(&rank, &nproc);
+    init_time += GET_TS - start;
+
+    pmi_get_local_ranks(&local_ranks, &local_cnt);
+    remote_cnt = nproc - local_cnt;
+    if( remote_cnt ){
+        remote_ranks = calloc(remote_cnt, sizeof(int));
+        fill_remote_ranks(local_ranks, local_cnt, remote_ranks, nproc);
+    }
+
+    if( 0 == rank && debug_on ){
+        int i;
+        fprintf(stderr,"%d: local ranks: ", rank);
+        for(i = 0; i < local_cnt; i++){
+            fprintf(stderr,"%d ", local_ranks[i]);
+        }
+        fprintf(stderr,"\n");
+        fflush(stderr);
+    }
+
+    key_val = calloc(key_size, sizeof(int));
+    for (cnt=0; cnt < key_count; cnt++) {
+        int i;
+        if( local_cnt > 0 ){
+            (void)asprintf(&key_name, "KEY-%d-local-%d", rank, cnt);
+            for(i=0; i < key_size; i++){
+                key_val[i] = rank * rank_shift + cnt;
+            }
+            put_loc_cnt++;
+            start = GET_TS;
+            pmi_put_key_loc(key_name, key_val, key_size);
+            put_loc_time += GET_TS - start;
+            free(key_name);
+        }
+        if( remote_cnt > 0 ){
+            (void)asprintf(&key_name, "KEY-%d-remote-%d", rank, cnt);
+            for(i=0; i < key_size; i++){
+                key_val[i] = rank * rank_shift + cnt;
+            }
+            put_rem_cnt++;
+            start = GET_TS;
+            pmi_put_key_rem(key_name, key_val, key_size);
+            put_rem_time += GET_TS - start;
+            free(key_name);
+        }
+    }
+    free(key_val);
+
+    start = GET_TS;
+    pmi_commit();
+    commit_time += GET_TS - start;
+
+    start = GET_TS;
+    pmi_fence( !direct_modex );
+    fence_time += GET_TS - start;
+
+
+
+    for (cnt=0; cnt < key_count; cnt++) {
+        int i;
+
+        for(i = 0; i < remote_cnt; i++){
+            int rank = remote_ranks[i], j;
+            int *key_val, key_size_new;
+            double start;
+            (void)asprintf(&key_name, "KEY-%d-remote-%d", rank, cnt);
+
+            start = GET_TS;
+            pmi_get_key_rem(rank, key_name, &key_val, &key_size_new);
+            get_rem_time += GET_TS - start;
+            get_rem_cnt++;
+
+            if( key_size != key_size_new ){
+                fprintf(stderr,"%d: error in key %s sizes: %d vs %d\n",
+                        rank, key_name, key_size, key_size_new);
+                abort();
+            }
+
+            for(j=0; j < key_size; j++){
+                if( key_val[j] != rank * rank_shift + cnt ){
+                    fprintf(stderr, "%d: error in key %s value (byte %d)\n",
+                            rank, key_name, j);
+                    abort();
+                }
+            }
+            free(key_name);
+            free(key_val);
+        }
+
+         // check the returned data
+        for(i = 0; i < local_cnt; i++){
+            int rank = local_ranks[i], j;
+            int *key_val, key_size_new;
+            double start;
+            (void)asprintf(&key_name, "KEY-%d-local-%d", rank, cnt);
+
+            start = GET_TS;
+            pmi_get_key_loc(rank, key_name, &key_val, &key_size_new);
+            get_loc_time += GET_TS - start;
+            get_loc_cnt++;
+
+            if( key_size != key_size_new ){
+                fprintf(stderr,"%d: error in key %s sizes: %d vs %d\n",
+                        rank, key_name, key_size, key_size_new);
+                abort();
+            }
+
+            for(j=0; j < key_size; j++){
+                if( key_val[j] != rank * rank_shift + cnt ){
+                    fprintf(stderr, "%d: error in key %s value (byte %d)",
+                            rank, key_name, j);
+                    abort();
+                }
+            }
+            free(key_name);
+            free(key_val);
+        }
+    }
+
+    total_time = GET_TS - total_start;
+
+    if (0 != get_mem_usage(&mem_pss, &mem_rss)) {
+        fprintf(stderr, "Rank %d: error get memory usage", rank);
+        abort();
+    }
+
+    if( debug_on ){
+        fprintf(stderr,"%d: get: total %lf avg loc %lf rem %lf all %lf ; put: %lf %lf commit: %lf fence %lf\n",
+                rank, (get_loc_time + get_rem_time),
+                get_loc_time/get_loc_cnt, get_rem_time/get_rem_cnt,
+                (get_loc_time + get_rem_time)/(get_loc_cnt + get_rem_cnt),
+                put_loc_time/put_loc_cnt, put_rem_time/put_rem_cnt,
+                commit_time, fence_time);
+    }
+
+    /* Out of the perf path - send our results to rank 0 using same PMI */
+    char key[128];
+    sprintf(key, "PMIX_PERF_get_total_time.%d", rank);
+    pmi_put_double(key, get_rem_time + get_loc_time);
+
+    sprintf(key, "PMIX_PERF_get_loc_time.%d", rank);
+    pmi_put_double(key, get_loc_cnt ? get_loc_time/get_loc_cnt : 0 );
+
+    sprintf(key, "PMIX_PERF_get_rem_time.%d", rank);
+    pmi_put_double(key, get_rem_cnt ? get_rem_time/get_rem_cnt : 0);
+
+    sprintf(key, "PMIX_PERF_get_time.%d", rank);
+    pmi_put_double(key, (get_loc_time + get_rem_time)/(get_loc_cnt + get_rem_cnt) );
+
+    sprintf(key, "PMIX_PERF_put_loc_time.%d", rank);
+    pmi_put_double(key, put_loc_cnt ? put_loc_time / put_loc_cnt : 0);
+
+    sprintf(key, "PMIX_PERF_put_rem_time.%d", rank);
+    pmi_put_double(key, put_rem_cnt ? put_rem_time / put_rem_cnt : 0);
+
+    sprintf(key, "PMIX_PERF_commit_time.%d", rank);
+    pmi_put_double(key, commit_time);
+
+    sprintf(key, "PMIX_PERF_fence_time.%d", rank);
+    pmi_put_double(key, fence_time);
+
+    sprintf(key, "PMIX_PERF_init_time.%d", rank);
+    pmi_put_double(key, init_time);
+
+    sprintf(key, "PMIX_PERF_total_time.%d", rank);
+    pmi_put_double(key, total_time);
+
+    sprintf(key, "PMIX_PERF_mem_pss.%d", rank);
+    pmi_put_double(key, mem_pss);
+
+    sprintf(key, "PMIX_PERF_mem_rss.%d", rank);
+    pmi_put_double(key, mem_rss);
+
+    pmi_commit();
+    pmi_fence( 1 );
+
+    if( rank == 0 ){
+        double  cum_get_total_time = 0,
+                cum_get_loc_time = 0,
+                cum_get_rem_time = 0,
+                cum_get_time = 0,
+                cum_put_total_time = 0,
+                cum_put_loc_time = 0,
+                cum_put_rem_time = 0,
+                cum_commit_time = 0,
+                cum_fence_time = 0,
+                cum_init_time = 0,
+                cum_total_time = 0,
+                cum_mem_pss = 0.0;
+
+        double  min_get_loc_time = get_loc_time / get_loc_cnt,
+                max_get_loc_time = get_loc_time / get_loc_cnt,
+                min_get_rem_time = get_rem_time / get_rem_cnt,
+                max_get_rem_time = get_rem_time / get_rem_cnt,
+                min_init_time = init_time,
+                max_init_time = init_time,
+                min_total_time = total_time,
+                max_total_time = total_time,
+                min_mem_pss = mem_pss,
+                max_mem_pss = 0.0;
+
+        int min_get_loc_idx = 0, max_get_loc_idx = 0;
+        int min_get_rem_idx = 0, max_get_rem_idx = 0;
+
+        char c_get_ltime[128], c_get_rtime[128], c_get_ttime[128];
+        char c_put_ltime[128], c_put_rtime[128];
+        int i;
+        for(i = 0; i < nproc; i++){
+            double val;
+            sprintf(key, "PMIX_PERF_get_total_time.%d", i);
+            cum_get_total_time += pmi_get_double(i, key);
+
+            sprintf(key, "PMIX_PERF_get_loc_time.%d", i);
+            val = pmi_get_double(i, key);
+            cum_get_loc_time += val;
+            if( min_get_loc_time > val ){
+                min_get_loc_time = val;
+                min_get_loc_idx = i;
+            }
+            if( max_get_loc_time < val ){
+                max_get_loc_time = val;
+                max_get_loc_idx = i;
+            }
+
+            sprintf(key, "PMIX_PERF_get_rem_time.%d", i);
+            val = pmi_get_double(i, key);
+            cum_get_rem_time += val;
+            if( min_get_rem_time > val ){
+                min_get_rem_time = val;
+                min_get_rem_idx = i;
+            }
+            if( max_get_rem_time < val ){
+                max_get_rem_time = val;
+                max_get_rem_idx = i;
+            }
+
+            sprintf(key, "PMIX_PERF_get_time.%d", i);
+            cum_get_time += pmi_get_double(i, key);
+
+            sprintf(key, "PMIX_PERF_put_loc_time.%d", i);
+            cum_put_loc_time += pmi_get_double(i, key);
+
+            sprintf(key, "PMIX_PERF_put_rem_time.%d", i);
+            cum_put_rem_time += pmi_get_double(i, key);
+
+            sprintf(key, "PMIX_PERF_commit_time.%d", i);
+            cum_commit_time += pmi_get_double(i, key);
+
+            sprintf(key, "PMIX_PERF_fence_time.%d", i);
+            cum_fence_time += pmi_get_double(i, key);
+
+            sprintf(key, "PMIX_PERF_init_time.%d", i);
+            val = pmi_get_double(i, key);
+            cum_init_time += val;
+            if (min_init_time > val) {
+                min_init_time = val;
+            }
+            if (max_init_time < val) {
+                max_init_time = val;
+            }
+
+            sprintf(key, "PMIX_PERF_total_time.%d", i);
+            val = pmi_get_double(i, key);
+            cum_total_time += val;
+            if (min_total_time > val) {
+                min_total_time = val;
+            }
+            if (max_total_time < val) {
+                max_total_time = val;
+            }
+
+            sprintf(key, "PMIX_PERF_mem_pss.%d", i);
+            val = pmi_get_double(i, key);
+            cum_mem_pss += val;
+            if (min_mem_pss > val) {
+                min_mem_pss = val;
+            }
+            if (max_mem_pss < val) {
+                max_mem_pss = val;
+            }
+        }
+
+        if( get_loc_cnt ){
+            sprintf(c_get_ltime,"%lf", cum_get_loc_time / nproc);
+        } else {
+            sprintf(c_get_ltime,"--------");
+        }
+        if( get_rem_cnt ){
+            sprintf(c_get_rtime,"%lf", cum_get_rem_time / nproc);
+        } else {
+            sprintf(c_get_rtime,"--------");
+        }
+
+        if( get_loc_cnt + get_rem_cnt ){
+            sprintf(c_get_ttime,"%lf", cum_get_time / nproc);
+        } else {
+            sprintf(c_get_ttime,"--------");
+        }
+
+        if( put_loc_cnt ){
+            sprintf(c_put_ltime,"%lf", cum_put_loc_time / nproc);
+            cum_put_total_time += cum_put_loc_time;
+        } else {
+            sprintf(c_put_ltime,"--------");
+        }
+        if( put_rem_cnt ){
+            sprintf(c_put_rtime,"%lf", cum_put_rem_time / nproc);
+            cum_put_total_time += cum_put_rem_time;
+        } else {
+            sprintf(c_put_rtime,"--------");
+        }
+
+        fprintf(stderr,"init: %lf; put: %lf; commit: %lf; fence: %lf; get: %lf; total: %lf\n",
+                cum_init_time / nproc,
+                cum_put_total_time / nproc,
+                cum_commit_time / nproc, cum_fence_time / nproc,
+                cum_get_total_time / nproc,
+                cum_total_time / nproc);
+        fprintf(stderr,"init:          max %lf min %lf\n",  max_init_time, min_init_time);
+        fprintf(stderr,"put:           loc %s rem %s\n", c_put_ltime, c_put_rtime);
+        fprintf(stderr,"get:           loc %s rem %s all %s\n", c_get_ltime, c_get_rtime, c_get_ttime);
+        fprintf(stderr,"get:           min loc %lf rem %lf (loc: %d, rem: %d)\n",
+                min_get_loc_time, min_get_rem_time, min_get_loc_idx, min_get_rem_idx);
+        fprintf(stderr,"get:           max loc %lf rem %lf (loc: %d, rem: %d)\n",
+                max_get_loc_time, max_get_rem_time, max_get_loc_idx, max_get_rem_idx);
+        fprintf(stderr,"total:         max %lf min %lf\n", max_total_time, min_total_time);
+        fprintf(stderr,"mem:           loc %0.2lf avg %0.2lf min %0.2lf max %0.2lf total %0.2lf Kb\n",
+                mem_pss, cum_mem_pss / nproc, min_mem_pss, max_mem_pss, cum_mem_pss);
+
+
+        /* debug printout */
+/*
+        for(i = 0; i < nproc; i++){
+            double val;
+            printf("%d: ", i);
+            sprintf(key, "PMIX_PERF_get_loc_time.%d", i);
+            printf("local = %lf ", pmi_get_double(i, key));
+
+            sprintf(key, "PMIX_PERF_get_rem_time.%d", i);
+            printf("remote = %lf\n", pmi_get_double(i, key));
+        }
+*/
+    }
+
+    pmi_fini();
+
+    return 0;
+}
diff --git a/contrib/perf_tools/pmix.c b/contrib/perf_tools/pmix.c
new file mode 100644
index 0000000..9bac8fd
--- /dev/null
+++ b/contrib/perf_tools/pmix.c
@@ -0,0 +1,236 @@
+/*
+ * Copyright (c) 2015      Mellanox Technologies, Inc.  All rights reserved.
+ * Copyright (c) 2016      Intel, Inc.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ *
+ */
+
+#include <stdio.h>
+#include <pmix.h>
+
+pmix_proc_t this_proc;
+
+void pmi_init(int *rank, int *size)
+{
+    pmix_value_t value, *val = &value;
+    pmix_proc_t job_proc;
+    int rc;
+
+    /* init us */
+#if (PMIX_VERSION_MAJOR == 1 )
+    if (PMIX_SUCCESS != (rc = PMIx_Init(&this_proc)))
+#else
+    if (PMIX_SUCCESS != (rc = PMIx_Init(&this_proc, NULL, 0)))
+#endif
+    {
+        fprintf(stderr, "Client ns %s rank %d: PMIx_Init failed: %d", this_proc.nspace, this_proc.rank, rc);
+        abort();
+    }
+
+    job_proc = this_proc;
+#if (PMIX_VERSION_MAJOR > 1 )
+    job_proc.rank = PMIX_RANK_WILDCARD;
+#endif
+    /* get our job size */
+    if (PMIX_SUCCESS != (rc = PMIx_Get(&job_proc, PMIX_JOB_SIZE, NULL, 0, &val))) {
+        fprintf(stderr, "Client ns %s rank %d: PMIx_Get job size failed: %d", this_proc.nspace, this_proc.rank, rc);
+        abort();
+    }
+    *size = val->data.uint32;
+    *rank = this_proc.rank;
+    PMIX_VALUE_RELEASE(val);
+}
+
+void pmi_get_local_ranks(int **local_ranks, int *local_cnt)
+{
+    pmix_value_t value, *val = &value;
+    char *ptr;
+    int i, rc;
+    pmix_proc_t job_proc = this_proc;
+#if (PMIX_VERSION_MAJOR > 1 )
+    job_proc.rank = PMIX_RANK_WILDCARD;
+#endif
+
+    /* get our job size */
+    if (PMIX_SUCCESS != (rc = PMIx_Get(&job_proc, PMIX_LOCAL_SIZE, NULL, 0, &val))) {
+        fprintf(stderr, "Client ns %s rank %d: PMIx_Get PMIX_LOCAL_SIZE failed: %d", this_proc.nspace, this_proc.rank, rc);
+        abort();
+    }
+    *local_cnt = val->data.uint32;
+    PMIX_VALUE_RELEASE(val);
+
+    *local_ranks = calloc(*local_cnt, sizeof(int));
+    /* get our job size */
+    if (PMIX_SUCCESS != (rc = PMIx_Get(&job_proc, PMIX_LOCAL_PEERS, NULL, 0, &val))) {
+        fprintf(stderr, "Client ns %s rank %d: PMIx_Get PMIX_LOCAL_PEERS failed: %d", this_proc.nspace, this_proc.rank, rc);
+        abort();
+    }
+    ptr = val->data.string;
+    for(i=0; NULL != ptr && i < *local_cnt; i++ ){
+         char *loc_rank = strsep(&ptr, ",");
+         (*local_ranks)[i] = atoi(loc_rank);
+    }
+    if( i != *local_cnt || NULL != ptr ){
+        fprintf(stderr, "Client ns %s rank %d: number of local peers doesn't match",
+                this_proc.nspace, this_proc.rank);
+        abort();
+    }
+}
+
+static void _put_key(char *key, int *key_val, int key_size, pmix_scope_t scope)
+{
+    pmix_value_t value;
+    int rc;
+
+    value.type = PMIX_BYTE_OBJECT;
+    value.data.bo.size = key_size * sizeof(int);
+    value.data.bo.bytes = (char*)key_val;
+    if (PMIX_SUCCESS != (rc = PMIx_Put(scope, key, &value))) {
+        fprintf(stderr, "Client ns %s rank %d: PMIx_Put internal failed: %d", this_proc.nspace, this_proc.rank, rc);
+        abort();
+    }
+}
+
+void pmi_put_key_loc(char *key, int *key_val, int key_size)
+{
+    _put_key(key, key_val, key_size, PMIX_LOCAL);
+}
+
+void pmi_put_key_rem(char *key, int *key_val, int key_size)
+{
+    _put_key(key, key_val, key_size, PMIX_REMOTE);
+}
+
+void pmi_put_double(char *key, double v)
+{
+    pmix_value_t value;
+    int rc;
+
+    value.type = PMIX_DOUBLE;
+    value.data.dval = v;
+    if (PMIX_SUCCESS != (rc = PMIx_Put(PMIX_GLOBAL, key, &value))) {
+        fprintf(stderr, "Client ns %s rank %d: PMIx_Put internal failed: %d", this_proc.nspace, this_proc.rank, rc);
+        abort();
+    }
+}
+
+void pmi_commit()
+{
+    int rc;
+
+    if (PMIX_SUCCESS != (rc = PMIx_Commit())) {
+        fprintf(stderr, "Client ns %s rank %d: PMIx_Commit failed: %d",
+                this_proc.nspace, this_proc.rank, rc);
+        abort();
+    }
+}
+
+
+void pmi_fence(int collect)
+{
+    pmix_info_t *info = NULL;
+    pmix_proc_t proc;
+    bool value = 1;
+    int ninfo = 0;
+    int rc;
+
+    if( collect ){
+        PMIX_INFO_CREATE(info, 1);
+        (void)strncpy(info->key, PMIX_COLLECT_DATA, PMIX_MAX_KEYLEN);
+        pmix_value_load(&info->value, &value, PMIX_BOOL);
+        ninfo = 1;
+    }
+
+    /* call fence to ensure the data is received */
+    PMIX_PROC_CONSTRUCT(&proc);
+    (void)strncpy(proc.nspace, this_proc.nspace, PMIX_MAX_NSLEN);
+    proc.rank = PMIX_RANK_WILDCARD;
+
+    if (PMIX_SUCCESS != (rc = PMIx_Fence(&proc, 1, info, ninfo))) {
+        fprintf(stderr,  "Client ns %s rank %d: PMIx_Fence failed: %d",
+                this_proc.nspace, this_proc.rank, rc);
+        abort();
+    }
+
+    if( collect ){
+        PMIX_INFO_FREE(info, ninfo);
+    }
+}
+
+void _get_key(int rank, char *key_name, int **key_val, int *key_size)
+{
+    pmix_proc_t proc;
+    pmix_value_t value, *val = &value;
+    int rc;
+
+    (void)strncpy(proc.nspace, this_proc.nspace, PMIX_MAX_NSLEN);
+    proc.rank = rank;
+    if (PMIX_SUCCESS != (rc = PMIx_Get(&proc, key_name, NULL, 0, &val))) {
+        fprintf(stderr, "Client ns %s rank %d: PMIx_Get %s failed: %d",
+                this_proc.nspace, this_proc.rank, key_name, rc);
+        abort();
+    }
+    if (PMIX_BYTE_OBJECT != val->type) {
+        fprintf(stderr, "Client ns %s rank %d: PMIx_Get %s returned wrong type: %d",
+                this_proc.nspace, this_proc.rank, key_name, val->type);
+        PMIX_VALUE_RELEASE(val);
+        abort();
+    }
+    *key_val = (int*)val->data.bo.bytes;
+    *key_size = val->data.bo.size / sizeof(int);
+    val->data.bo.bytes = NULL;
+    PMIX_VALUE_RELEASE(val);
+}
+
+void pmi_get_key_loc(int rank, char *key_name, int **key_val, int *key_size)
+{
+    _get_key(rank, key_name, key_val, key_size);
+}
+
+void pmi_get_key_rem(int rank, char *key_name, int **key_val, int *key_size)
+{
+    _get_key(rank, key_name, key_val, key_size);
+}
+
+double pmi_get_double(int rank, char *key_name)
+{
+    pmix_proc_t proc;
+    pmix_value_t value, *val = &value;
+    int rc;
+    double v;
+
+    (void)strncpy(proc.nspace, this_proc.nspace, PMIX_MAX_NSLEN);
+    proc.rank = rank;
+    if (PMIX_SUCCESS != (rc = PMIx_Get(&proc, key_name, NULL, 0, &val))) {
+        fprintf(stderr, "Client ns %s rank %d: PMIx_Get %s failed: %d",
+                this_proc.nspace, this_proc.rank, key_name, rc);
+        abort();
+    }
+    if (PMIX_DOUBLE != val->type) {
+        fprintf(stderr, "Client ns %s rank %d: PMIx_Get %s returned wrong type: %d",
+                this_proc.nspace, this_proc.rank, key_name, val->type);
+        PMIX_VALUE_RELEASE(val);
+        abort();
+    }
+    v = val->data.dval;
+    PMIX_VALUE_RELEASE(val);
+    return v;
+}
+
+pmi_fini()
+{
+    int rc;
+#if (PMIX_VERSION_MAJOR == 1 )
+    if (PMIX_SUCCESS != (rc = PMIx_Finalize()))
+#else
+    if (PMIX_SUCCESS != (rc = PMIx_Finalize(NULL, 0)))
+#endif
+    {
+        fprintf(stderr, "Client ns %s rank %d:PMIx_Finalize failed: %d\n", this_proc.nspace, this_proc.rank, rc);
+        abort();
+    }
+}
diff --git a/contrib/perf_tools/run.sh b/contrib/perf_tools/run.sh
new file mode 100755
index 0000000..0e6181e
--- /dev/null
+++ b/contrib/perf_tools/run.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+OMPI_BASE=<path_to_ompi>/install/
+PMIX_LIB=<path_to_pmix>/lib/
+#LIBEVENT=/hpc/mtr_scrap/users/artemp/PMIx_paper/libevent-2.0.22-stable/install/lib/
+#HWLOC=/hpc/mtr_scrap/users/artemp/PMIx_paper/hwloc-1.11.3/install/lib/
+
+export PATH="$OMPI_BASE/bin:$PATH"
+export LD_LIBRARY_PATH="$OMPI_BASE/lib:$PMIX_LIB:$LD_LIBRARY_PATH"
+
+np=$1
+shift
+mpirun -np $np `pwd`/pmix_intra_perf $@
diff --git a/contrib/platform/optimized b/contrib/platform/optimized
new file mode 100644
index 0000000..e2c6fd0
--- /dev/null
+++ b/contrib/platform/optimized
@@ -0,0 +1,3 @@
+enable_mem_debug=no
+enable_mem_profile=no
+enable_debug=no
diff --git a/contrib/pmix-release.sh b/contrib/pmix-release.sh
new file mode 100755
index 0000000..ec64d55
--- /dev/null
+++ b/contrib/pmix-release.sh
@@ -0,0 +1,52 @@
+#!/bin/sh -x
+
+# The tarballs to make
+if [ $# -eq 0 ] ; then
+    branches="v1.0"
+else
+    branches=$1
+    shift
+fi
+
+# Build root - scratch space
+build_root=/home/mpiteam/pmix/release
+
+# Script to execute
+script=contrib/make_dist_tarball
+
+export PATH=$HOME/local/bin:$PATH
+export LD_LIBRARY_PATH=$HOME/local/lib:$LD_LIBRARY_PATH
+
+#####
+#
+# Actually do stuff
+#
+#####
+
+# load the modules configuration
+. /etc/profile.d/modules.sh
+module use ~/modules
+
+# move to the directory
+# Loop making them
+for branch in $branches; do
+    cd $build_root/$branch
+
+    module load "autotools/pmix-$branch"
+    module load libevent/pmix-$branch
+
+    ./$script $@ >dist.out 2>&1
+	if test "$?" != "0"; then
+		cat <<EOF
+=============================================================================
+== Dist failure
+== Last few lines of output (full results in dist.out file):
+=============================================================================
+EOF
+		tail -n 20 dist.out
+		exit 1
+	fi
+
+    module unload libevent
+    module unload autotools
+done
diff --git a/contrib/pmix-valgrind.supp b/contrib/pmix-valgrind.supp
new file mode 100644
index 0000000..4de2cf6
--- /dev/null
+++ b/contrib/pmix-valgrind.supp
@@ -0,0 +1,48 @@
+# -*- text -*-
+#
+# Copyright (c) 2015      Intel, Inc. All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+{
+   fin1
+   Memcheck:Leak
+   fun:malloc
+   fun:evthread_posix_lock_alloc
+   fun:evutil_secure_rng_global_setup_locks_
+   fun:event_global_setup_locks_
+   fun:evthread_use_pthreads
+   fun:pmix_start_progress_thread
+   fun:PMIx_server_init
+   fun:main
+}
+{
+   fin2
+   Memcheck:Leak
+   fun:malloc
+   fun:evthread_posix_lock_alloc
+   fun:evsig_global_setup_locks_
+   fun:event_global_setup_locks_
+   fun:evthread_use_pthreads
+   fun:pmix_start_progress_thread
+   fun:PMIx_Init
+   fun:main
+}
+{
+   fin3
+   Memcheck:Leak
+   fun:malloc
+   fun:evthread_posix_lock_alloc
+   fun:evutil_secure_rng_global_setup_locks_
+   fun:event_global_setup_locks_
+   fun:evthread_use_pthreads
+   fun:pmix_start_progress_thread
+   fun:PMIx_init
+   fun:main
+}
+
+
diff --git a/contrib/pmix.spec b/contrib/pmix.spec
new file mode 100644
index 0000000..2369861
--- /dev/null
+++ b/contrib/pmix.spec
@@ -0,0 +1,686 @@
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2006-2014 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2013      Mellanox Technologies, Inc.
+#                         All rights reserved.
+# Copyright (c) 2015      Intel, Inc. All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+############################################################################
+#
+# Copyright (c) 2003, The Regents of the University of California, through
+# Lawrence Berkeley National Laboratory (subject to receipt of any
+# required approvals from the U.S. Dept. of Energy).  All rights reserved.
+#
+# Initially written by:
+#       Greg Kurtzer, <gmkurtzer at lbl.gov>
+#
+############################################################################
+
+
+#############################################################################
+#
+# Configuration Options
+#
+# Options that can be passed in via rpmbuild's --define option.  Note
+# that --define takes *1* argument: a multi-token string where the first
+# token is the name of the variable to define, and all remaining tokens
+# are the value.  For example:
+#
+# shell$ rpmbuild ... --define 'install_in_opt 1' ...
+#
+# Or (a multi-token example):
+#
+# shell$ rpmbuild ... \
+#    --define 'configure_options CFLAGS=-g --with-openib=/usr/local/ofed' ...
+#
+#############################################################################
+
+# Define this if you want to make this SRPM build in
+# /opt/NAME/VERSION-RELEASE instead of the default /usr/.
+# type: bool (0/1)
+%{!?install_in_opt: %define install_in_opt 0}
+
+# Define this if you want this RPM to install environment setup
+# shell scripts.
+# type: bool (0/1)
+%{!?install_shell_scripts: %define install_shell_scripts 0}
+# type: string (root path to install shell scripts)
+%{!?shell_scripts_path: %define shell_scripts_path %{_bindir}}
+# type: string (base name of the shell scripts)
+%{!?shell_scripts_basename: %define shell_scripts_basename mpivars}
+
+# Define this to 1 if you want this RPM to install a modulefile.
+# type: bool (0/1)
+%{!?install_modulefile: %define install_modulefile 0}
+# type: string (root path to install modulefiles)
+%{!?modulefile_path: %define modulefile_path /usr/share/Modules/modulefiles}
+# type: string (subdir to install modulefile)
+%{!?modulefile_subdir: %define modulefile_subdir %{name}}
+# type: string (name of modulefile)
+%{!?modulefile_name: %define modulefile_name %{version}}
+
+# The name of the modules RPM.  Can vary from system to system.
+# RHEL6 calls it "environment-modules".
+# type: string (name of modules RPM)
+%{!?modules_rpm_name: %define modules_rpm_name environment-modules}
+
+# Should we use the mpi-selector functionality?
+# type: bool (0/1)
+%{!?use_mpi_selector: %define use_mpi_selector 0}
+# The name of the mpi-selector RPM.  Can vary from system to system.
+# type: string (name of mpi-selector RPM)
+%{!?mpi_selector_rpm_name: %define mpi_selector_rpm_name mpi-selector}
+# The location of the mpi-selector executable (can be a relative path
+# name if "mpi-selector" can be found in the path)
+# type: string (path to mpi-selector exectuable)
+%{!?mpi_selector: %define mpi_selector mpi-selector}
+
+# Should we build a debuginfo RPM or not?
+# type: bool (0/1)
+%{!?build_debuginfo_rpm: %define build_debuginfo_rpm 0}
+
+# Should we build an all-in-one RPM, or several sub-package RPMs?
+# type: bool (0/1)
+%{!?build_all_in_one_rpm: %define build_all_in_one_rpm 1}
+
+# Should we use the default "check_files" RPM step (i.e., check for
+# unpackaged files)?  It is discouraged to disable this, but some
+# installers need it (e.g., older versions of OFED, because they
+# installed lots of other stuff in the BUILD_ROOT before PMIx/SHMEM).
+# type: bool (0/1)
+%{!?use_check_files: %define use_check_files 1}
+
+# By default, RPM supplies a bunch of optimization flags, some of
+# which may not work with non-gcc compilers.  We attempt to weed some
+# of these out (below), but sometimes it's better to just ignore them
+# altogether (e.g., PGI 6.2 will warn about unknown compiler flags,
+# but PGI 7.0 will error -- and RPM_OPT_FLAGS contains a lot of flags
+# that PGI 7.0 does not understand).  The default is to use the flags,
+# but you can set this variable to 0, indicating that RPM_OPT_FLAGS
+# should be erased (in which case you probabl want to supply your own
+# optimization flags!).
+# type: bool (0/1)
+%{!?use_default_rpm_opt_flags: %define use_default_rpm_opt_flags 1}
+
+# Some compilers can be installed via tarball or RPM (e.g., Intel,
+# PGI).  If they're installed via RPM, then rpmbuild's auto-dependency
+# generation stuff will work fine.  But if they're installed via
+# tarball, then rpmbuild's auto-dependency generation stuff will
+# break; complaining that it can't find a bunch of compiler .so files.
+# So provide an option to turn this stuff off.
+# type: bool (0/1)
+%{!?disable_auto_requires: %define disable_auto_requires 0}
+
+# On some platforms, PMIx/SHMEM just flat-out doesn't work with
+# -D_FORTIFY_SOURCE (e.g., some users have reported that there are
+# problems on ioa64 platforms).  In this case, just turn it off
+# (meaning: this specfile will strip out that flag from the
+# OS-provided compiler flags).  We already strip out _FORTIFY_SOURCE
+# for non-GCC compilers; setting this option to 0 will *always* strip
+# it out, even if you're using GCC.
+# type: bool (0/1)
+%{!?allow_fortify_source: %define allow_fortify_source 1}
+
+# Select md5 packing algorithm, that src.rpm created on one distro can be read on another.
+%global _binary_filedigest_algorithm 1
+%global _source_filedigest_algorithm 1
+
+#############################################################################
+#
+# Configuration Logic
+#
+#############################################################################
+
+%if %{install_in_opt}
+%define _prefix /opt/%{name}/%{version}
+%define _sysconfdir /opt/%{name}/%{version}/etc
+%define _libdir /opt/%{name}/%{version}/lib
+%define _includedir /opt/%{name}/%{version}/include
+%define _mandir /opt/%{name}/%{version}/man
+# Note that the name "pmix" is hard-coded in
+# opal/mca/installdirs/config for pkgdatadir; there is currently no
+# easy way to have PMIx change this directory name internally.  So we
+# just hard-code that name here as well (regardless of the value of
+# %{name} or %{_name}).
+%define _pkgdatadir /opt/%{name}/%{version}/share/pmix
+# Per advice from Doug Ledford at Red Hat, docdir is supposed to be in
+# a fixed location.  But if you're installing a package in /opt, all
+# bets are off.  So feel free to install it anywhere in your tree.  He
+# suggests $prefix/doc.
+%define _defaultdocdir /opt/%{name}/%{version}/doc
+%endif
+
+%if !%{build_debuginfo_rpm}
+%define debug_package %{nil}
+%endif
+
+%if %(test "%{_prefix}" = "/usr" && echo 1 || echo 0)
+%global _sysconfdir /etc
+%else
+%global _sysconfdir %{_prefix}/etc
+%endif
+
+# Is the sysconfdir under the prefix directory?  This affects
+# whether we list the sysconfdir separately in the files sections,
+# below.
+%define sysconfdir_in_prefix %(test "`echo %{_sysconfdir} | grep %{_prefix}`" = "" && echo 0 || echo 1)
+
+%{!?_pkgdatadir: %define _pkgdatadir %{_datadir}/pmix}
+
+%if !%{use_check_files}
+%define __check_files %{nil}
+%endif
+
+%{!?configure_options: %define configure_options %{nil}}
+
+%if !%{use_default_rpm_opt_flags}
+%define optflags ""
+%endif
+
+%if %{use_mpi_selector}
+%define install_shell_scripts 1
+%endif
+
+#############################################################################
+#
+# Preamble Section
+#
+#############################################################################
+
+Summary: An extended/exascale implementation of PMI
+Name: %{?_name:%{_name}}%{!?_name:pmix}
+Version: $VERSION
+Release: 1%{?dist}
+License: BSD
+Group: Development/Libraries
+Source: pmix-%{version}.tar.$EXTENSION
+Packager: %{?_packager:%{_packager}}%{!?_packager:%{_vendor}}
+Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:%{_vendor}}
+Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
+Prefix: %{_prefix}
+Provides: mpi
+Provides: pmix = %{version}
+BuildRoot: /var/tmp/%{name}-%{version}-%{release}-root
+%if %{disable_auto_requires}
+AutoReq: no
+%endif
+%if %{install_modulefile}
+Requires: %{modules_rpm_name}
+%endif
+%if %{use_mpi_selector}
+Requires: %{mpi_selector_rpm_name}
+%endif
+
+%description
+The Process Management Interface (PMI) has been used for quite some time as a
+means of exchanging wireup information needed for interprocess communication. Two
+versions (PMI-1 and PMI-2) have been released as part of the MPICH effort. While
+PMI-2 demonstrates better scaling properties than its PMI-1 predecessor, attaining
+rapid launch and wireup of the roughly 1M processes executing across 100k nodes
+expected for exascale operations remains challenging.
+
+PMI Exascale (PMIx) represents an attempt to resolve these questions by providing
+an extended version of the PMI standard specifically designed to support clusters
+up to and including exascale sizes. The overall objective of the project is not to
+branch the existing pseudo-standard definitions - in fact, PMIx fully supports both
+of the existing PMI-1 and PMI-2 APIs - but rather to (a) augment and extend those
+APIs to eliminate some current restrictions that impact scalability, and (b) provide
+a reference implementation of the PMI-server that demonstrates the desired level of
+scalability.
+
+This RPM contains all the tools necessary to compile and link against PMIx.
+
+#############################################################################
+#
+# Prepatory Section
+#
+#############################################################################
+%prep
+# Unbelievably, some versions of RPM do not first delete the previous
+# installation root (e.g., it may have been left over from a prior
+# failed build).  This can lead to Badness later if there's files in
+# there that are not meant to be packaged.
+rm -rf $RPM_BUILD_ROOT
+
+%setup -q -n pmix-%{version}
+
+#############################################################################
+#
+# Build Section
+#
+#############################################################################
+
+%build
+
+# rpmbuild processes seem to be geared towards the GNU compilers --
+# they pass in some flags that will only work with gcc.  So if we're
+# trying to build with some other compiler, the process will choke.
+# This is *not* something the user can override with a well-placed
+# --define on the rpmbuild command line, unless they find and override
+# all "global" CFLAGS kinds of RPM macros (every distro names them
+# differently).  For example, non-gcc compilers cannot use
+# FORTIFY_SOURCE (at least, not as of 6 Oct 2006).  We can really only
+# examine the basename of the compiler, so search for it in a few
+# places.
+
+%if %{allow_fortify_source}
+using_gcc=1
+if test "$CC" != ""; then
+    # Do horrible things to get the basename of just the compiler,
+    # particularly in the case of multword values for $CC
+    eval "set $CC"
+    if test "`basename $1`" != "gcc"; then
+        using_gcc=0
+    fi
+fi
+
+if test "$using_gcc" = "1"; then
+    # Do wretched things to find a CC=* token
+    eval "set -- %{configure_options}"
+    compiler=
+    while test "$1" != "" -a "$compiler" = ""; do
+         case "$1" in
+         CC=*)
+                 compiler=`echo $1 | cut -d= -f2-`
+                 ;;
+         esac
+         shift
+    done
+
+    # Now that we *might* have the compiler name, do a best-faith
+    # effort to see if it's gcc.  Blah!
+    if test "$compiler" != ""; then
+        if test "`basename $compiler`" != "gcc"; then
+            using_gcc=0
+        fi
+    fi
+fi
+%else
+# If we're not allowing _FORTIFY_SOURCE, then just set using_gcc to 0 and
+# the logic below will strip _FORTIFY_SOURCE out if it's present.
+using_gcc=0
+%endif
+
+# If we're not using the default RPM_OPT_FLAGS, then wipe them clean
+# (the "optflags" macro has already been wiped clean, above).
+
+%if !%{use_default_rpm_opt_flags}
+RPM_OPT_FLAGS=
+export RPM_OPT_FLAGS
+%endif
+
+# If we're not GCC, strip out any GCC-specific arguments in the
+# RPM_OPT_FLAGS before potentially propagating them everywhere.
+
+if test "$using_gcc" = 0; then
+
+    # Non-gcc compilers cannot handle FORTIFY_SOURCE (at least, not as
+    # of Oct 2006)
+    RPM_OPT_FLAGS="`echo $RPM_OPT_FLAGS | sed -e 's at -D_FORTIFY_SOURCE[=0-9]*@@'`"
+
+    # Non-gcc compilers will generate warnings for several flags
+    # placed in RPM_OPT_FLAGS by RHEL5, but -mtune=generic will cause
+    # an error for icc 9.1.
+    RPM_OPT_FLAGS="`echo $RPM_OPT_FLAGS | sed -e 's at -mtune=generic@@'`"
+fi
+
+CFLAGS="%{?cflags:%{cflags}}%{!?cflags:$RPM_OPT_FLAGS}"
+CXXFLAGS="%{?cxxflags:%{cxxflags}}%{!?cxxflags:$RPM_OPT_FLAGS}"
+FFLAGS="%{?f77flags:%{f77flags}}%{!?f7flags:$RPM_OPT_FLAGS}"
+FCFLAGS="%{?fcflags:%{fcflags}}%{!?fcflags:$RPM_OPT_FLAGS}"
+export CFLAGS CXXFLAGS F77FLAGS FCFLAGS
+
+%configure %{configure_options}
+%{__make} %{?mflags}
+
+
+#############################################################################
+#
+# Install Section
+#
+#############################################################################
+
+%install
+%{__make} install DESTDIR=$RPM_BUILD_ROOT %{?mflags_install}
+
+# We've had cases of config.log being left in the installation tree.
+# We don't need that in an RPM.
+find $RPM_BUILD_ROOT -name config.log -exec rm -f {} \;
+
+# First, the [optional] modulefile
+
+%if %{install_modulefile}
+%{__mkdir_p} $RPM_BUILD_ROOT/%{modulefile_path}/%{modulefile_subdir}/
+cat <<EOF >$RPM_BUILD_ROOT/%{modulefile_path}/%{modulefile_subdir}/%{modulefile_name}
+#%Module
+
+# NOTE: This is an automatically-generated file!  (generated by the
+# PMIx/SHMEM RPM).  Any changes made here will be lost a) if the RPM is
+# uninstalled, or b) if the RPM is upgraded or uninstalled.
+
+proc ModulesHelp { } {
+   puts stderr "This module adds PMIx/SHMEM v%{version} to various paths"
+}
+
+module-whatis   "Sets up PMIx/SHMEM v%{version} in your enviornment"
+
+prepend-path PATH "%{_prefix}/bin/"
+prepend-path LD_LIBRARY_PATH %{_libdir}
+prepend-path MANPATH %{_mandir}
+EOF
+%endif
+# End of modulefile if
+
+# Next, the [optional] shell scripts
+
+%if %{install_shell_scripts}
+%{__mkdir_p} $RPM_BUILD_ROOT/%{shell_scripts_path}
+cat <<EOF > $RPM_BUILD_ROOT/%{shell_scripts_path}/%{shell_scripts_basename}.sh
+# NOTE: This is an automatically-generated file!  (generated by the
+# PMIx/SHMEM RPM).  Any changes made here will be lost if the RPM is
+# uninstalled or upgraded.
+
+# PATH
+if test -z "\`echo \$PATH | grep %{_bindir}\`"; then
+    PATH=%{_bindir}:\${PATH}
+    export PATH
+fi
+
+# LD_LIBRARY_PATH
+if test -z "\`echo \$LD_LIBRARY_PATH | grep %{_libdir}\`"; then
+    LD_LIBRARY_PATH=%{_libdir}\${LD_LIBRARY_PATH:+:}\${LD_LIBRARY_PATH}
+    export LD_LIBRARY_PATH
+fi
+
+# MANPATH
+if test -z "\`echo \$MANPATH | grep %{_mandir}\`"; then
+    MANPATH=%{_mandir}:\${MANPATH}
+    export MANPATH
+fi
+
+# MPI_ROOT
+MPI_ROOT=%{_prefix}
+export MPI_ROOT
+EOF
+cat <<EOF > $RPM_BUILD_ROOT/%{shell_scripts_path}/%{shell_scripts_basename}.csh
+# NOTE: This is an automatically-generated file!  (generated by the
+# PMIx/SHMEM RPM).  Any changes made here will be lost if the RPM is
+# uninstalled or upgraded.
+
+# path
+if ("" == "\`echo \$path | grep %{_bindir}\`") then
+    set path=(%{_bindir} \$path)
+endif
+
+# LD_LIBRARY_PATH
+if ("1" == "\$?LD_LIBRARY_PATH") then
+    if ("\$LD_LIBRARY_PATH" !~ *%{_libdir}*) then
+        setenv LD_LIBRARY_PATH %{_libdir}:\${LD_LIBRARY_PATH}
+    endif
+else
+    setenv LD_LIBRARY_PATH %{_libdir}
+endif
+
+# MANPATH
+if ("1" == "\$?MANPATH") then
+    if ("\$MANPATH" !~ *%{_mandir}*) then
+        setenv MANPATH %{_mandir}:\${MANPATH}
+    endif
+else
+    setenv MANPATH %{_mandir}:
+endif
+
+# MPI_ROOT
+setenv MPI_ROOT %{_prefix}
+EOF
+%endif
+# End of shell_scripts if
+
+#############################################################################
+#
+# Clean Section
+#
+#############################################################################
+%clean
+# We may be in the directory that we're about to remove, so cd out of
+# there before we remove it
+cd /tmp
+
+# Remove installed driver after rpm build finished
+rm -rf $RPM_BUILD_DIR/%{name}-%{version}
+
+test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
+
+#############################################################################
+#
+# Post Install Section
+#
+#############################################################################
+%if %{use_mpi_selector}
+%post
+%{mpi_selector} \
+	--register %{name}-%{version} \
+	--source-dir %{shell_scripts_path} \
+        --yes
+%endif
+
+#############################################################################
+#
+# Pre Uninstall Section
+#
+#############################################################################
+%if %{use_mpi_selector}
+%preun
+%{mpi_selector} --unregister %{name}-%{version} --yes || \
+      /bin/true > /dev/null 2> /dev/null
+%endif
+
+#############################################################################
+#
+# Files Section
+#
+#############################################################################
+
+#
+# All in one RPM
+#
+# Easy; just list the prefix and then specifically call out the doc
+# files.
+#
+
+%files
+%defattr(-, root, root, -)
+%{_prefix}
+# If the sysconfdir is not under the prefix, then list it explicitly.
+%if !%{sysconfdir_in_prefix}
+%{_sysconfdir}
+%endif
+# If %{install_in_opt}, then we're installing PMIx to
+# /opt/pmix/<version>.  But be sure to also explicitly mention
+# /opt/pmix so that it can be removed by RPM when everything under
+# there is also removed.
+%if %{install_in_opt}
+%dir /opt/%{name}
+%endif
+# If we're installing the modulefile, get that, too
+%if %{install_modulefile}
+%{modulefile_path}
+%endif
+# If we're installing the shell scripts, get those, too
+%if %{install_shell_scripts}
+%{shell_scripts_path}/%{shell_scripts_basename}.sh
+%{shell_scripts_path}/%{shell_scripts_basename}.csh
+%endif
+%doc README INSTALL LICENSE
+
+#############################################################################
+#
+# Changelog
+#
+#############################################################################
+%changelog
+* Fri Jun 19 2015 Ralph H. Castain <rhc at open-mpi.org>
+- Port to PMIx
+
+* Tue Jan 20 2015 Bert Wesarg <bert.wesarg at tu-dresden.de>
+- Remove VampirTrace wrapper from package.
+
+* Mon Jul 07 2014 Jeff Squyres <jsquyres at cisco.com>
+- Several minor fixes from Oliver Lahaye: fix dates in changelog,
+  added %{?dist} tag to the Release field, and added some Provides
+  fields in case %{name} is overridden.
+
+* Mon Jun 24 2013 Igor Ivanov <Igor.Ivanov at itseez.com>
+- Add Open SHMEM parallel programming library as part of Open MPI
+
+* Tue Dec 11 2012 Jeff Squyres <jsquyres at cisco.com>
+- Re-release 1.6.0-1.6.3 SRPMs (with new SRPM Release numbers) with
+  patch for VampirTrace's configure script to make it install the
+  private "libtool" script in the right location (the script is used
+  to build user VT applications).
+- Update the regexps/methodology used to generate the lists of files
+  in the multi-RPM sub-packages; it's been broken for a little while.
+- No longer explicitly list the bin dir executables in the multi-RPM
+  sub-packages
+- Per https://svn.open-mpi.org/trac/ompi/ticket/3382, remove all files
+  named "config.log" from the install tree so that we can use this
+  spec file to re-release all OMPI v1.6.x SRPMs.
+
+* Wed Jun 27 2012 Jeff Squyres <jsquyres at cisco.com>
+- Remove the "ofed" and "munge_build_into_install" options, because
+  OFED no longer distributes MPI implementations.  Yay!
+
+* Mon Jun 04 2012 Jeff Squyres <jsquyres at cisco.com>
+- Didn't change the specfile, but changed the script that generates
+  the SRPM to force the use of MD5 checksums (vs. SHA1 checksums) so
+  that the SRPM is friendly to older versions of RPM, such as that on
+  RHEL 5.x.
+
+* Fri Feb 17 2012 Jeff Squyres <jsquyres at cisco.com>
+- Removed OSCAR defines.
+- If use_mpi_selector==1, then also set install_shell_scripts to 1.
+- Change modules default RPM name and modulefiles path to the defaults
+  on RHEL6.
+
+* Mon Dec 14 2009 Jeff Squyres <jsquyres at cisco.com>
+- Add missing executables to specfile (ompi-server, etc.)
+- Fix: pull in VT files when building multiple RPMs (reported by Jim
+  Kusznir).
+- Add allow_fortify_source option to let users selectively disable
+  _FORTIFY_SOURCE processing on platforms where it just doesn't work
+  (even with gcc; also reported by Jim Kusznir).
+
+* Tue Sep  8 2009 Jeff Squyres <jsquyres at cisco.com>
+- Change shell_scripts_basename to not include version number to
+  accomodate what mpi-selector expects.
+
+* Mon Feb  4 2008 Jeff Squyres <jsquyres at cisco.com>
+- OFED 1.3 has a much better installer; remove all the
+  leave_build_root kludge nastyness.  W00t!
+
+* Fri Jan 18 2008 Jeff Squyres <jsquyres at cisco.com>
+- Remove the hard-coded "pmix" name from two Requires statements
+  and use %{name} instead (FWIW, %{_name} caused rpmbuild to barf).
+
+* Wed Jan  2 2008 Jeff Squyres <jsquyres at cisco.com>
+- Remove duplicate %{_sysconfdir} in the % files sections when
+  building the sub-packages.
+- When building the sub-packages, ensure that devel.files also picks
+  up the F90 module.
+- Hard-code the directory name "openmpi" into _pkglibdir (vs. using
+  %{name}) because the OMPI code base has it hard-coded as well.
+  Thanks to Jim Kusznir for noticing the problem.
+
+* Tue Dec  4 2007 Jeff Squyres <jsquyres at cisco.com>
+- Added define option for disabling the use of rpmbuild's
+  auto-dependency generation stuff.  This is necessary for some
+  compilers that allow themselves to be installed via tarball (not
+  RPM), such as the Portland Group compiler.
+
+* Thu Jul 12 2007 Jeff Squyres <jsquyres at cisco.com>
+- Change default doc location when using install_in_opt.  Thanks to
+  Alex Tumanov for pointing this out and to Doug Ledford for
+  suggestions where to put docdir in this case.
+
+* Thu May  3 2007 Jeff Squyres <jsquyres at cisco.com>
+- Ensure to move out of $RPM_BUILD_ROOT before deleting it in % clean.
+- Remove a debugging "echo" that somehow got left in there
+
+* Thu Apr 12 2007 Jeff Squyres <jsquyres at cisco.com>
+- Ensure that _pkglibdir is always defined, suggested by Greg Kurtzer.
+
+* Wed Apr  4 2007 Jeff Squyres <jsquyres at cisco.com>
+- Fix several mistakes in the generated profile.d scripts
+- Fix several bugs with identifying non-GNU compilers, stripping of
+  FORTIFY_SOURCE, -mtune, etc.
+
+* Fri Feb  9 2007 Jeff Squyres <jsquyres at cisco.com>
+- Revamp to make profile.d scripts more general: default to making the
+  shell script files be %{_bindir}/mpivars.{sh|csh}
+- Add %{munge_build_into_install} option for OFED 1.2 installer on SLES
+- Change shell script files and modulefile to *pre*pend all the OMPI paths
+- Make shell script and modulefile installation indepdendent of
+  %{install_in_opt} (they're really separate issues)
+- Add more "ofed" shortcut qualifiers
+- Slightly better test for basename CC in the fortify source section
+- Fix some problems in the csh shell script
+
+* Fri Oct  6 2006 Jeff Squyres <jsquyres at cisco.com>
+- Remove LANL section; they don't want it
+- Add some help for OFED building
+- Remove some outdated "rm -f" lines for executables that we no longer ship
+
+* Wed Apr 26 2006 Jeff Squyres <jsquyres at cisco.com>
+- Revamp files listings to ensure that rpm -e will remove directories
+  if rpm -i created them.
+- Simplify options for making modulefiles and profile.d scripts.
+- Add oscar define.
+- Ensure to remove the previous installation root during prep.
+- Cleanup the modulefile specification and installation; also ensure
+  that the profile.d scripts get installed if selected.
+- Ensure to list sysconfdir in the files list if it's outside of the
+  prefix.
+
+* Thu Mar 30 2006 Jeff Squyres <jsquyres at cisco.com>
+- Lots of bit rot updates
+- Reorganize and rename the subpackages
+- Add / formalize a variety of rpmbuild --define options
+- Comment out the docs subpackage for the moment (until we have some
+  documentation -- coming in v1.1!)
+
+* Tue May 03 2005 Jeff Squyres <jsquyres at open-mpi.org>
+- Added some defines for LANL defaults
+- Added more defines for granulatirty of installation location for
+  modulefile
+- Differentiate between installing in /opt and whether we want to
+  install environment script files
+- Filled in files for man and mca-general subpackages
+
+* Thu Apr 07 2005 Greg Kurtzer <GMKurtzer at lbl.gov>
+- Added opt building
+- Added profile.d/modulefile logic and creation
+- Minor cleanups
+
+* Fri Apr 01 2005 Greg Kurtzer <GMKurtzer at lbl.gov>
+- Added comments
+- Split package into subpackages
+- Cleaned things up a bit
+- Sold the code to Microsoft, and now I am retiring. Thanks guys!
+
+* Wed Mar 23 2005 Mezzanine <mezzanine at kainx.org>
+- Specfile auto-generated by Mezzanine
+
diff --git a/contrib/pmix_jenkins.sh b/contrib/pmix_jenkins.sh
new file mode 100755
index 0000000..870b22d
--- /dev/null
+++ b/contrib/pmix_jenkins.sh
@@ -0,0 +1,398 @@
+#!/bin/bash -xeE
+export PATH=/hpc/local/bin::/usr/local/bin:/bin:/usr/bin:/usr/sbin:${PATH}
+
+rel_path=$(dirname $0)
+abs_path=$(readlink -f $rel_path)
+
+jenkins_test_build=${jenkins_test_build:="yes"}
+jenkins_test_check=${jenkins_test_check:="yes"}
+jenkins_test_src_rpm=${jenkins_test_src_rpm:="yes"}
+jenkins_test_cov=${jenkins_test_cov:="yes"}
+jenkins_test_comments=${jenkins_test_comments:="no"}
+jenkins_test_vg=${jenkins_test_vg:="no"}
+
+timeout_exe=${timout_exe:="timeout -s SIGKILL 1m"}
+
+# prepare to run from command line w/o jenkins
+if [ -z "$WORKSPACE" ]; then
+    WORKSPACE=$PWD
+    JOB_URL=$WORKSPACE
+    BUILD_NUMBER=1
+    JENKINS_RUN_TESTS=yes
+    NOJENKINS=${NOJENKINS:="yes"}
+fi
+
+prefix=jenkins
+rm -rf ${WORKSPACE}/${prefix}
+mkdir -p ${WORKSPACE}/${prefix}
+pmix_dir=${WORKSPACE}/${prefix}/install
+build_dir=${WORKSPACE}/${prefix}/build
+rpm_dir=${WORKSPACE}/${prefix}/rpms
+cov_dir=${WORKSPACE}/${prefix}/cov
+tarball_dir=${WORKSPACE}/${prefix}/tarball
+
+
+make_opt="-j$(nproc)"
+
+# extract jenkins commands from function args
+function check_commands
+{
+    local cmd=$1
+    local pat=""
+    local test_list="threads src_rpm oshmem check help_txt known_issues cov all"
+    for pat in $(echo $test_list); do
+        echo -n "checking $pat "
+        if [[ $cmd =~ jenkins\:.*no${pat}.* ]]; then
+            echo disabling
+            eval "jenkins_test_${pat}=no"
+        elif [[ $cmd =~ jenkins\:.*${pat}.* ]]; then
+            echo enabling
+            eval "jenkins_test_${pat}=yes"
+        else
+            echo no directive for ${pat}
+        fi
+    done
+
+    if [ "$jenkins_test_all" = "yes" ]; then
+        echo Enabling all tests
+        for pat in $(echo $test_list); do
+            eval "jenkins_test_${pat}=yes"
+        done
+    fi
+}
+
+function test_cov
+{
+    local cov_root_dir=$1
+    local cov_proj=$2
+    local cov_make_cmd=$3
+    local cov_directive=$4
+
+    local nerrors=0;
+
+    module load tools/cov
+
+    local cov_build_dir=$cov_dir/$cov_proj
+
+    rm -rf $cov_build_dir
+    cov-build   --dir $cov_build_dir $cov_make_cmd
+
+    for excl in $cov_exclude_file_list; do
+        cov-manage-emit --dir $cov_build_dir --tu-pattern "file('$excl')" delete
+    done
+
+    cov-analyze --dir $cov_build_dir
+    nerrors=$(cov-format-errors --dir $cov_build_dir | awk '/Processing [0-9]+ errors?/ { print $2 }')
+
+    index_html=$(cd $cov_build_dir && find . -name index.html | cut -c 3-)
+
+    if [ -n "$nerrors" ]; then
+        if [ "$nerrors" = "0" ]; then
+            echo ok - coverity found no issues for $cov_proj >> $cov_stat_tap
+        else
+            echo "not ok - coverity detected $nerrors failures in $cov_proj # $cov_directive" >> $cov_stat_tap
+            local cov_proj_disp="$(echo $cov_proj|cut -f1 -d_)"
+            echo "" >> $gh_cov_msg
+            echo "* Coverity found $nerrors errors for ${cov_proj_disp}" >> $gh_cov_msg
+            echo "<li><a href=${cov_proj}/output/errors/index.html>Report for ${cov_proj}</a>" >> $cov_dir/index.html
+        fi
+    else
+        echo "not ok - coverity failed to run for $cov_proj # SKIP failed to init coverity" >> $cov_stat_tap
+    fi
+
+    module unload tools/cov
+
+    return $nerrors
+}
+
+# check for jenkins commands in PR title
+if [ -n "$ghprbPullTitle" ]; then
+    check_commands "$ghprbPullTitle"
+fi
+
+# check for jenkins command in PR last comment
+if [ -n "$ghprbPullLink" ]; then
+    set +xeE
+    pr_url=$(echo $ghprbPullLink | sed -e s,github.com,api.github.com/repos,g -e s,pull,issues,g)
+    pr_url="${pr_url}/comments"
+    pr_file="$WORKSPACE/github_pr_${ghprbPullId}.json"
+    curl -s $pr_url > $pr_file
+    echo Fetching PR comments from URL: $pr_url
+
+    # extracting last comment
+    pr_comments="$(cat $pr_file | jq -M -a '.[length-1] | .body')"
+
+    echo Last comment: $pr_comments
+    if [ -n "$pr_comments" ]; then
+        check_commands "$pr_comments"
+    fi
+    set -xeE
+fi
+
+echo Running following tests:
+set|grep jenkins_test_
+
+function on_start()
+{
+    echo Starting on host: $(hostname)
+
+    export distro_name=$(python -c 'import platform ; print platform.dist()[0]' | tr '[:upper:]' '[:lower:]')
+    export distro_ver=$(python  -c 'import platform ; print platform.dist()[1]' | tr '[:upper:]' '[:lower:]')
+    if [ "$distro_name" == "suse" ]; then
+        patch_level=$(egrep PATCHLEVEL /etc/SuSE-release|cut -f2 -d=|sed -e "s/ //g")
+        if [ -n "$patch_level" ]; then
+            export distro_ver="${distro_ver}.${patch_level}"
+        fi
+    fi
+    echo $distro_name -- $distro_ver
+
+    # save current environment to support debugging
+#    set +x
+#    env| sed -ne "s/\(\w*\)=\(.*\)\$/export \1='\2'/p" > $WORKSPACE/test_env.sh
+#    chmod 755 $WORKSPACE/test_env.sh
+#    set -x
+}
+
+function on_exit
+{
+    set +x
+    rc=$((rc + $?))
+    echo exit code=$rc
+    if [ $rc -ne 0 ]; then
+        # FIX: when rpmbuild fails, it leaves folders w/o any permissions even for owner
+        # jenkins fails to remove such and fails
+        find $rpm_dir -type d -exec chmod +x {} \;
+    fi
+}
+
+# $1 - test name
+# $2 - test command
+function check_result()
+{
+    set +e
+    eval $timeout_exe $2
+    ret=$?
+    set -e
+    if [ $ret -gt 0 ]; then
+        echo "not ok $test_id $1" >> $run_tap
+    else
+        echo "ok $test_id $1" >> $run_tap
+    fi
+    test_id=$((test_id+1))
+}
+
+trap "on_exit" INT TERM ILL KILL FPE SEGV ALRM
+
+on_start
+
+
+cd $WORKSPACE
+if [ "$jenkins_test_build" = "yes" ]; then
+    echo "Checking for build ..."
+
+    cd ${WORKSPACE}/${prefix}
+    wget http://downloads.sourceforge.net/levent/libevent-2.0.22-stable.tar.gz
+    tar zxf libevent-2.0.22-stable.tar.gz
+    cd libevent-2.0.22-stable
+    libevent_dir=$PWD/install
+    ./autogen.sh && ./configure --prefix=$libevent_dir && make && make install
+
+    cd $WORKSPACE
+    if [ -x "autogen.sh" ]; then
+        autogen_script=./autogen.sh
+    else
+        autogen_script=./autogen.pl
+    fi
+
+    configure_args="--with-libevent=$libevent_dir"
+
+    # build pmix
+    $autogen_script
+    echo ./configure --prefix=$pmix_dir $configure_args | bash -xeE
+    make $make_opt install
+    jenkins_build_passed=1
+
+    # make check
+    if [ "$jenkins_test_check" = "yes" ]; then
+        make $make_opt check || exit 12
+    fi
+fi
+
+cd $WORKSPACE
+if [ -n "jenkins_build_passed" -a "$jenkins_test_cov" = "yes" ]; then
+    echo "Checking for coverity ..."
+
+    vpath_dir=$WORKSPACE
+    cov_proj="all"
+    gh_cov_msg=$WORKSPACE/cov_gh_msg.txt
+    cov_stat=$vpath_dir/cov_stat.txt
+    cov_stat_tap=$vpath_dir/cov_stat.tap
+    cov_build_dir=$vpath_dir/${prefix}/cov_build
+    cov_url_webroot=${JOB_URL}/${BUILD_ID}/Coverity_Report
+
+    rm -f $cov_stat $cov_stat_tap
+
+    if [ -d "$vpath_dir" ]; then
+        mkdir -p $cov_build_dir
+        pushd $vpath_dir
+        for dir in $cov_proj; do
+            if [ "$dir" = "all" ]; then
+                make_cov_opt=""
+                cov_directive="SKIP"
+            else
+                if [ ! -d "$dir" ]; then
+                    continue
+                fi
+                cov_directive="TODO"
+                make_cov_opt="-C $dir"
+            fi
+            echo Working on $dir
+
+            cov_proj="cov_$(basename $dir)"
+            set +eE
+            make $make_cov_opt $make_opt clean 2>&1 > /dev/null
+            test_cov $cov_build_dir $cov_proj "make $make_cov_opt $make_opt all" $cov_directive
+            set -eE
+        done
+        if [ -n "$ghprbPullId" -a -f "$gh_cov_msg" ]; then
+            echo "* Coverity report at $cov_url_webroot" >> $gh_cov_msg
+            if [ "$jenkins_test_comments" = "yes" ]; then
+                gh pr $ghprbPullId --comment "$(cat $gh_cov_msg)"
+            fi
+        fi
+        popd
+    fi
+fi
+
+cd $WORKSPACE
+if [ "$jenkins_test_src_rpm" = "yes" ]; then
+    echo "Checking for rpm ..."
+
+    # check distclean
+    make $make_opt distclean
+    $autogen_script
+    echo ./configure --prefix=$pmix_dir $configure_args | bash -xeE || exit 11
+
+    if [ -x /usr/bin/dpkg-buildpackage ]; then
+        echo "Do not support PMIX on debian"
+    else
+        echo "Building PMIX src.rpm"
+        rm -rf $tarball_dir
+        mkdir -p $tarball_dir
+
+        make_dist_args="--highok --distdir=$tarball_dir --greekonly"
+
+        for arg in no-git-update dirtyok verok; do
+            if grep $arg contrib/make_tarball 2>&1 > /dev/null; then
+                make_dist_args="$make_dist_args --${arg}"
+            fi
+        done
+
+        # ugly hack, make_tarball has hardcoded "-j32" and sometimes it fails on some race
+        sed -i -e s,-j32,-j8,g contrib/make_tarball
+
+        export LIBEVENT=$libevent_dir
+        chmod +x ./contrib/make* ./contrib/buildrpm.sh
+        echo contrib/make_tarball $make_dist_args | bash -xeE || exit 11
+
+        # build src.rpm
+        # svn_r=$(git rev-parse --short=7 HEAD| tr -d '\n') ./contrib/make_tarball --distdir=$tarball_dir
+        tarball_src=$(ls -1 $tarball_dir/pmix-*.tar.bz2|sort -r|head -1)
+
+        echo "Building PMIX bin.rpm"
+        rpm_flags="--define 'mflags -j8' --define '_source_filedigest_algorithm md5' --define '_binary_filedigest_algorithm md5'"
+        (cd ./contrib/ && env rpmbuild_options="$rpm_flags" rpmtopdir=$rpm_dir ./buildrpm.sh $tarball_src)
+    fi
+fi
+
+#
+# JENKINS_RUN_TESTS should be set in jenkins slave node to indicate that node can run tests
+#
+cd $WORKSPACE
+if [ -n "$JENKINS_RUN_TESTS" -a "$JENKINS_RUN_TESTS" -ne "0" ]; then
+    echo "Checking for tests ..."
+
+    run_tap=$WORKSPACE/run_test.tap
+    rm -rf $run_tap
+
+    # build pmix
+    $autogen_script
+    echo ./configure --prefix=$pmix_dir $configure_args --disable-visibility | bash -xeE
+    make $make_opt install
+
+    cd $WORKSPACE/test
+
+    echo "1..11" > $run_tap
+
+    test_id=1
+    # 1 blocking fence with data exchange among all processes from two namespaces:
+    test_exec='./pmix_test -n 4 --ns-dist 3:1 --fence "[db | 0:0-2;1:3]"'
+    check_result "blocking fence w/ data all" "$test_exec"
+    test_exec='./pmix_test -n 4 --ns-dist 3:1 --fence "[db | 0:;1:3]"'
+    check_result "blocking fence w/ data all" "$test_exec"
+    test_exec='./pmix_test -n 4 --ns-dist 3:1 --fence "[db | 0:;1:]"'
+    check_result "blocking fence w/ data all" "$test_exec"
+
+    # 1 non-blocking fence without data exchange among processes from the 1st namespace
+    test_exec='./pmix_test -n 4 --ns-dist 3:1 --fence "[0:]"'
+    check_result "non-blocking fence w/o data" "$test_exec"
+
+    # blocking fence without data exchange among processes from the 1st namespace
+    test_exec='./pmix_test -n 4 --ns-dist 3:1 --fence "[b | 0:]"'
+    check_result "blocking fence w/ data" "$test_exec"
+
+    # non-blocking fence with data exchange among processes from the 1st namespace. Ranks 0, 1 from ns 0 are sleeping for 2 sec before doing fence test.
+    test_exec='./pmix_test -n 4 --ns-dist 3:1 --fence "[d | 0:]" --noise "[0:0,1]"'
+    check_result "non-blocking fence w/ data" "$test_exec"
+
+    # blocking fence with data exchange across processes from the same namespace.
+    test_exec='./pmix_test -n 4 --job-fence -c'
+    check_result "blocking fence w/ data on the same nspace" "$test_exec"
+
+    # 3 fences: 1 - non-blocking without data exchange across processes from ns 0,
+    # 2 - non-blocking across processes 0 and 1 from ns 0 and process 3 from ns 1,
+    # 3 - blocking with data exchange across processes from their own namespace.
+#    Disabled as incorrect at the moment
+#    test_exec='./pmix_test -n 4 --job-fence -c --fence "[0:][d|0:0-1;1:]" --use-same-keys --ns-dist "3:1"'
+#    check_result "mix fence" $test_exec
+
+    # test publish/lookup/unpublish functionality.
+    test_exec='./pmix_test -n 2 --test-publish'
+    check_result "publish" "$test_exec"
+
+    # test spawn functionality.
+    test_exec='./pmix_test -n 2 --test-spawn'
+    check_result "spawn" "$test_exec"
+
+    # test connect/disconnect between processes from the same namespace.
+    test_exec='./pmix_test -n 2 --test-connect'
+    check_result "connect" "$test_exec"
+
+    # resolve peers from different namespaces.
+    test_exec='./pmix_test -n 5 --test-resolve-peers --ns-dist "1:2:2"'
+    check_result "resolve peers" "$test_exec"
+
+    # run valgrind
+    if [ "$jenkins_test_vg" = "yes" ]; then
+        set +e
+        module load tools/valgrind
+
+        vg_opt="--tool=memcheck --leak-check=full --error-exitcode=0 --trace-children=yes  --trace-children-skip=*/sed,*/collect2,*/gcc,*/cat,*/rm,*/ls --track-origins=yes --xml=yes --xml-file=valgrind%p.xml --fair-sched=try --gen-suppressions=all"
+
+        valgrind $vg_opt  ./pmix_test -n 4 --timeout 60 --ns-dist 3:1 --fence "[db | 0:;1:3]"
+
+        valgrind $vg_opt  ./pmix_test -n 4 --timeout 60 --job-fence -c
+
+        valgrind $vg_opt  ./pmix_test -n 2 --timeout 60 --test-publish
+
+        valgrind $vg_opt  ./pmix_test -n 2 --timeout 60 --test-spawn
+
+        valgrind $vg_opt  ./pmix_test -n 2 --timeout 60 --test-connect
+
+        valgrind $vg_opt  ./pmix_test -n 5 --timeout 60 --test-resolve-peers --ns-dist "1:2:2"
+
+        module unload tools/valgrind
+        set -e
+    fi
+fi
+
diff --git a/contrib/update-my-copyright.pl b/contrib/update-my-copyright.pl
new file mode 100755
index 0000000..c673033
--- /dev/null
+++ b/contrib/update-my-copyright.pl
@@ -0,0 +1,347 @@
+#!/usr/bin/env perl
+#
+# Copyright (c) 2010-2014 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2016      Intel, Inc. All rights reserved.
+# $COPYRIGHT$
+#
+
+# Short version:
+#
+# This script automates the tedious task of updating copyright notices
+# in the tops of PMIX source files before committing back to
+# the respository.  Set the environment variable
+# PMIX_COPYRIGHT_SEARCH_NAME to a short (case-insensitive) name that
+# indicates your copyright line (e.g., "cisco"), and set the env
+# variable PMIX_COPYRIGHT_FORMAL_NAME with your organization's formal
+# name and copyright statement (e.g., "Cisco Systems, Inc.  All rights
+# reserved.") before running the script.
+
+# More details:
+#
+# This is a simple script to traverse the tree looking for added and
+# changed files (via "svn st ." or "hg st .", depending on what meta
+# directory is found in this tree).  Note that the search starts in
+# the current directory -- not the top-level directory.
+#
+# All added and changed files are examined.  If the special
+# "$COPYRIGHT$" token is found, then lines above that token are
+# examined to find the "search" copyright name.
+#
+# - If the search name is found, that line is examined to see if the
+#   current year is in the copyright year range.  If it is not, the line
+#   is modified to include the current year.
+# - If the search name is not found, a new line is created in the
+#   copyright block of the file using the formal name and the current
+#   year.
+#
+# NOTE: this script currently doesn't handle multi-line copyright
+# statements, such as:
+#
+# Copyright (c) 2010 University of Blabbityblah and the Trustees of
+#                    Schblitbittyboo.  All rights reserved.
+#
+# Someone could certainly extend this script to do so, if they cared
+# (my organizations' copyright fits on a single line, so I wasn't
+# motivated to handle the multi-line case :-) ).
+#
+
+use strict;
+use Cwd;
+use Getopt::Long;
+
+# Set to true if the script should merely check for up-to-date copyrights.
+# Will exit with status 111 if there are out of date copyrights which this
+# script can correct.
+my $CHECK_ONLY = 0;
+# used by $CHECK_ONLY logic for bookeeping
+my $would_replace = 0;
+
+# Set to true to suppress most informational messages.  Only out of date files
+# will be printed.
+my $QUIET = 0;
+
+# Set to true if we just want to see the help message
+my $HELP = 0;
+
+# Defaults
+my $my_search_name = "Intel";
+my $my_formal_name = "Intel, Inc.  All rights reserved.";
+
+# Override the defaults if some values are set in the environment
+$my_search_name = $ENV{PMIX_COPYRIGHT_SEARCH_NAME}
+    if (defined($ENV{PMIX_COPYRIGHT_SEARCH_NAME}));
+$my_formal_name = $ENV{PMIX_COPYRIGHT_FORMAL_NAME}
+    if (defined($ENV{PMIX_COPYRIGHT_FORMAL_NAME}));
+
+GetOptions(
+    "help" => \$HELP,
+    "quiet" => \$QUIET,
+    "check-only" => \$CHECK_ONLY,
+    "search-name=s" => \$my_search_name,
+    "formal-name=s" => \$my_formal_name,
+) or die "unable to parse options, stopped";
+
+if ($HELP) {
+    print <<EOT;
+$0 [options]
+
+--help | -h          This help message
+--quiet | -q         Only output critical messages to stdout
+--check-only         exit(111) if there are files with copyrights to edit
+--search-name=NAME   Set search name to NAME
+--formal-same=NAME   Set formal name to NAME
+EOT
+    exit(0);
+}
+
+#-------------------------------------------------------------------------------
+# predeclare sub for print-like syntax
+sub quiet_print {
+    unless ($QUIET) {
+        print @_;
+    }
+}
+
+#-------------------------------------------------------------------------------
+
+quiet_print "==> Copyright search name: $my_search_name\n";
+quiet_print "==> Copyright formal name: $my_formal_name\n";
+
+# Get the year
+my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime;
+$year += 1900;
+quiet_print "==> This year: $year\n";
+
+# Find the top-level PMIx source tree dir
+my $start = cwd();
+my $top = $start;
+while (! -f "$top/VERSION") {
+    chdir("..");
+    $top = cwd();
+    die "Can't find top-level PMIx directory"
+        if ($top eq "/");
+}
+chdir($start);
+
+quiet_print "==> Top-level PMIx dir: $top\n";
+quiet_print "==> Current directory: $start\n";
+
+# Select VCS used to obtain modification info.  Choose in increasing priority
+# order (last hit wins).
+my $vcs;
+$vcs = "git"
+    if (-d "$top/.git");
+$vcs = "hg"
+    if (-d "$top/.hg");
+$vcs = "svn"
+    if (-d "$top/.svn");
+
+my @files = find_modified_files($vcs);
+
+if ($#files < 0) {
+    quiet_print "No added / changed files -- nothing to do\n";
+    exit(0);
+}
+
+# Examine each of the files and see if they need an updated copyright
+foreach my $f (@files) {
+    quiet_print "Processing added/changed file: $f\n";
+    open(FILE, $f) || die "Can't open file: $f";
+
+    # Read in the file, and look for the "$COPYRIGHT$" token; that's
+    # the end of the copyright block that we're allowed to edit.  Do
+    # not edit any copyright notices that may appear below that.
+
+    my $i = 0;
+    my $found_copyright = 0;
+    my $found_me = 0;
+    my @lines;
+    my $my_line_index;
+    my $token_line_index;
+    while (<FILE>) {
+        push(@lines, $_);
+        if (!$found_copyright && $_ =~ /\$COPYRIGHT\$/) {
+            $token_line_index = $i;
+            $found_copyright = 1;
+        }
+        if (!$found_me &&
+            !defined($token_line_index) && $_ =~ /$my_search_name/i) {
+            $my_line_index = $i;
+            $found_me = 1;
+        }
+        ++$i;
+    }
+    close(FILE);
+
+    # If there was not copyright token, don't do anything
+    if (!defined($token_line_index)) {
+        quiet_print "==> WARNING: Did not find the \$COPYRIGHT\$ token!\n";
+        quiet_print "    File left unchanged\n";
+        next;
+    }
+
+    # Figure out the line prefix
+    $lines[$token_line_index] =~ m/^(.+)\$COPYRIGHT\$/;
+    my $prefix = $1;
+
+    # Now act on it
+    if (!defined($my_line_index)) {
+        quiet_print "--- My copyright line not found; adding:\n";
+        my $str = "${prefix}Copyright (c) $year      $my_formal_name\n";
+        quiet_print "    $str";
+        $lines[$token_line_index] = $str . $lines[$token_line_index];
+    } else {
+        quiet_print "--- Found existing copyright line:\n";
+        quiet_print "    $lines[$my_line_index]";
+        $lines[$my_line_index] =~ m/([\d+\-]+)/;
+        my $years = $1;
+        die "Could not find years in copyright line!"
+            if (!defined($years));
+
+        # If it's a range, separate them out
+        my $first_year;
+        my $last_year;
+        if ($years =~ /\-/) {
+            $years =~ m/(\d+)\s*-\s*(\d+)/;
+            $first_year = $1;
+            $last_year = $2;
+        } else {
+            $first_year = $last_year = $years;
+        }
+
+        # Sanity check
+        die "Copyright looks like it extends before 1990...?"
+            if ($first_year < 1990);
+        die "Copyright in the future...?"
+            if ($last_year > $year);
+
+        # Do we need to do anything?
+        if ($year > $last_year) {
+            $lines[$my_line_index] = "${prefix}Copyright (c) $first_year-$year $my_formal_name\n";
+            quiet_print "    Updated to:\n";
+            quiet_print "    $lines[$my_line_index]";
+        } else {
+            quiet_print "    This year already included in copyright; not changing file\n";
+            next;
+        }
+    }
+
+    # If we got this far, we want to write out a new file
+    my $newf = "$f.new-copyright";
+    unlink($newf);
+    open(FILE, ">$newf") || die "Can't open file: $newf";
+    print FILE join('', @lines);
+    close(FILE);
+
+    if ($CHECK_ONLY) {
+        # intentional "loud" print to be more useful in a pre-commit hook
+        print "==> '$f' has a stale/missing copyright\n";
+        unlink($newf);
+        ++$would_replace;
+    }
+    else {
+        # Now replace the old one
+        unlink($f);
+        rename($newf, $f);
+    }
+}
+
+if ($CHECK_ONLY and $would_replace) {
+    exit(111);
+}
+
+#-------------------------------------------------------------------------------
+
+# Takes two arguments, the top level directory and the VCS method.  Returns a
+# list of file names (relative to pwd) which the VCS considers to be modified.
+sub find_modified_files {
+    my $vcs = shift;
+    my @files = ();
+
+    if ($vcs eq "git") {
+        # Number of path entries to remove from ${top}-relative paths.
+        # (--show-cdup either returns the empty string or sequence of "../"
+        # entries, always ending in a "/")
+        my $n_strip = scalar(split(m!/!, scalar(`git rev-parse --show-cdup`))) - 1;
+
+        # "." restricts scope, but does not get us relative path names
+        my $cmd = "git status -z --porcelain --untracked-files=no .";
+        quiet_print "==> Running: \"$cmd\"\n";
+        my $lines = `$cmd`;
+
+        # From git-status(1):
+        # X          Y     Meaning
+        # -------------------------------------------------
+        #           [MD]   not updated
+        # M        [ MD]   updated in index
+        # A        [ MD]   added to index
+        # D         [ M]   deleted from index
+        # R        [ MD]   renamed in index
+        # C        [ MD]   copied in index
+        # [MARC]           index and work tree matches
+        # [ MARC]     M    work tree changed since index
+        # [ MARC]     D    deleted in work tree
+        # -------------------------------------------------
+        # D           D    unmerged, both deleted
+        # A           U    unmerged, added by us
+        # U           D    unmerged, deleted by them
+        # U           A    unmerged, added by them
+        # D           U    unmerged, deleted by us
+        # A           A    unmerged, both added
+        # U           U    unmerged, both modified
+        # -------------------------------------------------
+        # ?           ?    untracked
+        # -------------------------------------------------
+        foreach my $line (split /\x{00}/, $lines) {
+            my $keep = 0;
+            my ($s1, $s2, $fullname) = $line =~ m/^(.)(.) (.*)$/;
+
+            # ignore all merge cases
+            next if ($s1 eq "D" and $s2 eq "D");
+            next if ($s1 eq "A" and $s2 eq "A");
+            next if ($s1 eq "U" or $s2 eq "U");
+
+            # only update for actually added/modified cases, no copies,
+            # renames, etc.
+            $keep = 1 if ($s1 eq "M" or $s2 eq "M");
+            $keep = 1 if ($s1 eq "A");
+
+            if ($keep) {
+                my $relname = $fullname;
+                $relname =~ s!^([^/]*/){$n_strip}!!g;
+
+                push @files, $relname
+                    if (-f $relname);
+            }
+        }
+    }
+    elsif ($vcs eq "hg" or $vcs eq "svn") {
+        my $cmd = "$vcs st .";
+
+        # Run the command, parsing the output.  Make a list of files that are
+        # added or modified.
+        quiet_print "==> Running: \"$cmd\"\n";
+        open(CMD, "$cmd|") || die "Can't run command";
+        while (<CMD>) {
+            chomp;
+            if ($_ =~ /^M/ || $_ =~ /^A/) {
+                my @tokens = split(/\s+/, $_);
+                # Handle output of both forms:
+                # M       filenameA
+                # A  +    filenameB
+                my $filename = $tokens[1];
+                $filename = $tokens[2]
+                if ($tokens[1] =~ /\+/);
+                # Don't bother saving directory names
+                push(@files, $filename)
+                    if (-f $filename);
+            }
+        }
+        close(CMD);
+    }
+    else {
+        die "unknown VCS '$vcs', stopped";
+    }
+
+    return @files;
+}
diff --git a/contrib/whitespace-purge.sh b/contrib/whitespace-purge.sh
new file mode 100755
index 0000000..9c9d8fe
--- /dev/null
+++ b/contrib/whitespace-purge.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+#
+# Copyright (c) 2015      Intel, Inc. All rights reserved.
+# Copyright (c) 2015      Los Alamos National Security, LLC. All rights
+#                         reserved
+# Copyright (c) 2015 Cisco Systems, Inc.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+for file in $(git ls-files) ; do
+    # check for the mime-type and do not follow symbolic links. this
+    # will cause file to print application/x-symlink for the mime-type
+    # allowing us to only have to check if the type is application to
+    # skip sym links, pdfs, etc. If any other file types should be
+    # skipped add the check here.
+    type=$(file -b --mime-type -h $file)
+    if test ${type::4} == "text" ; then
+        # Eliminate whitespace at the end of lines
+        perl -pi -e 's/\s*$/\n/' $file
+    fi
+done
diff --git a/examples/Makefile.am b/examples/Makefile.am
new file mode 100644
index 0000000..07ae006
--- /dev/null
+++ b/examples/Makefile.am
@@ -0,0 +1,78 @@
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2006-2010 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2012-2013 Los Alamos National Security, Inc.  All rights reserved.
+# Copyright (c) 2013-2017 Intel, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+AM_CPPFLAGS = -I$(top_builddir)/src -I$(top_builddir)/src/include -I$(top_builddir)/include -I$(top_builddir)/include/pmix
+
+noinst_PROGRAMS = client dmodex dynamic fault pub tool debugger debuggerd alloc jctrl
+if !WANT_HIDDEN
+# these examples use internal symbols
+# use --disable-visibility
+noinst_PROGRAMS += server
+endif
+
+client_SOURCES = client.c
+client_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
+client_LDADD =  $(top_builddir)/src/libpmix.la
+
+debugger_SOURCES = debugger.c
+debugger_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
+debugger_LDADD =  $(top_builddir)/src/libpmix.la
+
+debuggerd_SOURCES = debuggerd.c
+debuggerd_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
+debuggerd_LDADD =  $(top_builddir)/src/libpmix.la
+
+alloc_SOURCES = alloc.c
+alloc_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
+alloc_LDADD =  $(top_builddir)/src/libpmix.la
+
+jctrl_SOURCES = jctrl.c
+jctrl_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
+jctrl_LDADD =  $(top_builddir)/src/libpmix.la
+
+dmodex_SOURCES = dmodex.c
+dmodex_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
+dmodex_LDADD =  $(top_builddir)/src/libpmix.la
+
+dynamic_SOURCES = dynamic.c
+dynamic_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
+dynamic_LDADD = $(top_builddir)/src/libpmix.la
+
+fault_SOURCES = fault.c
+fault_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
+fault_LDADD = $(top_builddir)/src/libpmix.la
+
+pub_SOURCES = pub.c
+pub_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
+pub_LDADD = $(top_builddir)/src/libpmix.la
+
+tool_SOURCES = tool.c
+tool_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
+tool_LDADD = $(top_builddir)/src/libpmix.la
+
+if !WANT_HIDDEN
+server_SOURCES = server.c
+server_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
+server_LDADD = $(top_builddir)/src/libpmix.la
+endif
+
+distclean-local:
+	rm -f *.o client debugger debuggerd dmodex dynamic fault pub server
diff --git a/examples/Makefile.in b/examples/Makefile.in
new file mode 100644
index 0000000..113d649
--- /dev/null
+++ b/examples/Makefile.in
@@ -0,0 +1,935 @@
+# Makefile.in generated by automake 1.15 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2006-2010 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2012-2013 Los Alamos National Security, Inc.  All rights reserved.
+# Copyright (c) 2013-2017 Intel, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+noinst_PROGRAMS = client$(EXEEXT) dmodex$(EXEEXT) dynamic$(EXEEXT) \
+	fault$(EXEEXT) pub$(EXEEXT) tool$(EXEEXT) debugger$(EXEEXT) \
+	debuggerd$(EXEEXT) alloc$(EXEEXT) jctrl$(EXEEXT) \
+	$(am__EXEEXT_1)
+# these examples use internal symbols
+# use --disable-visibility
+ at WANT_HIDDEN_FALSE@am__append_1 = server
+subdir = examples
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/config/c_get_alignment.m4 \
+	$(top_srcdir)/config/libtool.m4 \
+	$(top_srcdir)/config/ltoptions.m4 \
+	$(top_srcdir)/config/ltsugar.m4 \
+	$(top_srcdir)/config/ltversion.m4 \
+	$(top_srcdir)/config/lt~obsolete.m4 \
+	$(top_srcdir)/config/pmix.m4 \
+	$(top_srcdir)/config/pmix_check_attributes.m4 \
+	$(top_srcdir)/config/pmix_check_broken_qsort.m4 \
+	$(top_srcdir)/config/pmix_check_compiler_version.m4 \
+	$(top_srcdir)/config/pmix_check_icc.m4 \
+	$(top_srcdir)/config/pmix_check_ident.m4 \
+	$(top_srcdir)/config/pmix_check_lock.m4 \
+	$(top_srcdir)/config/pmix_check_os_flavors.m4 \
+	$(top_srcdir)/config/pmix_check_package.m4 \
+	$(top_srcdir)/config/pmix_check_psm2.m4 \
+	$(top_srcdir)/config/pmix_check_pthread_pids.m4 \
+	$(top_srcdir)/config/pmix_check_vendor.m4 \
+	$(top_srcdir)/config/pmix_check_visibility.m4 \
+	$(top_srcdir)/config/pmix_check_withdir.m4 \
+	$(top_srcdir)/config/pmix_config_asm.m4 \
+	$(top_srcdir)/config/pmix_config_pthreads.m4 \
+	$(top_srcdir)/config/pmix_config_subdir.m4 \
+	$(top_srcdir)/config/pmix_config_subdir_args.m4 \
+	$(top_srcdir)/config/pmix_config_threads.m4 \
+	$(top_srcdir)/config/pmix_ensure_contains_optflags.m4 \
+	$(top_srcdir)/config/pmix_functions.m4 \
+	$(top_srcdir)/config/pmix_load_platform.m4 \
+	$(top_srcdir)/config/pmix_mca.m4 \
+	$(top_srcdir)/config/pmix_search_libs.m4 \
+	$(top_srcdir)/config/pmix_setup_cc.m4 \
+	$(top_srcdir)/config/pmix_setup_libevent.m4 \
+	$(top_srcdir)/config/pmix_setup_zlib.m4 \
+	$(top_srcdir)/config/pmix_try_assemble.m4 \
+	$(top_srcdir)/config/autogen_found_items.m4 \
+	$(top_srcdir)/src/mca/pdl/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/configure.m4 \
+	$(top_srcdir)/src/mca/pdl/pdlopen/configure.m4 \
+	$(top_srcdir)/src/mca/pdl/plibltdl/configure.m4 \
+	$(top_srcdir)/src/mca/pif/bsdx_ipv4/configure.m4 \
+	$(top_srcdir)/src/mca/pif/bsdx_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pif/linux_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pif/posix_ipv4/configure.m4 \
+	$(top_srcdir)/src/mca/pif/solaris_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/config/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/env/configure.m4 \
+	$(top_srcdir)/src/mca/pnet/opa/configure.m4 \
+	$(top_srcdir)/src/mca/psec/munge/configure.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/src/include/pmix_config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+ at WANT_HIDDEN_FALSE@am__EXEEXT_1 = server$(EXEEXT)
+PROGRAMS = $(noinst_PROGRAMS)
+am_alloc_OBJECTS = alloc.$(OBJEXT)
+alloc_OBJECTS = $(am_alloc_OBJECTS)
+alloc_DEPENDENCIES = $(top_builddir)/src/libpmix.la
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+alloc_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(alloc_LDFLAGS) $(LDFLAGS) -o $@
+am_client_OBJECTS = client.$(OBJEXT)
+client_OBJECTS = $(am_client_OBJECTS)
+client_DEPENDENCIES = $(top_builddir)/src/libpmix.la
+client_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(client_LDFLAGS) $(LDFLAGS) -o $@
+am_debugger_OBJECTS = debugger.$(OBJEXT)
+debugger_OBJECTS = $(am_debugger_OBJECTS)
+debugger_DEPENDENCIES = $(top_builddir)/src/libpmix.la
+debugger_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(debugger_LDFLAGS) $(LDFLAGS) -o $@
+am_debuggerd_OBJECTS = debuggerd.$(OBJEXT)
+debuggerd_OBJECTS = $(am_debuggerd_OBJECTS)
+debuggerd_DEPENDENCIES = $(top_builddir)/src/libpmix.la
+debuggerd_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(debuggerd_LDFLAGS) $(LDFLAGS) -o $@
+am_dmodex_OBJECTS = dmodex.$(OBJEXT)
+dmodex_OBJECTS = $(am_dmodex_OBJECTS)
+dmodex_DEPENDENCIES = $(top_builddir)/src/libpmix.la
+dmodex_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(dmodex_LDFLAGS) $(LDFLAGS) -o $@
+am_dynamic_OBJECTS = dynamic.$(OBJEXT)
+dynamic_OBJECTS = $(am_dynamic_OBJECTS)
+dynamic_DEPENDENCIES = $(top_builddir)/src/libpmix.la
+dynamic_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(dynamic_LDFLAGS) $(LDFLAGS) -o $@
+am_fault_OBJECTS = fault.$(OBJEXT)
+fault_OBJECTS = $(am_fault_OBJECTS)
+fault_DEPENDENCIES = $(top_builddir)/src/libpmix.la
+fault_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(fault_LDFLAGS) $(LDFLAGS) -o $@
+am_jctrl_OBJECTS = jctrl.$(OBJEXT)
+jctrl_OBJECTS = $(am_jctrl_OBJECTS)
+jctrl_DEPENDENCIES = $(top_builddir)/src/libpmix.la
+jctrl_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(jctrl_LDFLAGS) $(LDFLAGS) -o $@
+am_pub_OBJECTS = pub.$(OBJEXT)
+pub_OBJECTS = $(am_pub_OBJECTS)
+pub_DEPENDENCIES = $(top_builddir)/src/libpmix.la
+pub_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(pub_LDFLAGS) $(LDFLAGS) -o $@
+am__server_SOURCES_DIST = server.c
+ at WANT_HIDDEN_FALSE@am_server_OBJECTS = server.$(OBJEXT)
+server_OBJECTS = $(am_server_OBJECTS)
+ at WANT_HIDDEN_FALSE@server_DEPENDENCIES =  \
+ at WANT_HIDDEN_FALSE@	$(top_builddir)/src/libpmix.la
+server_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(server_LDFLAGS) $(LDFLAGS) -o $@
+am_tool_OBJECTS = tool.$(OBJEXT)
+tool_OBJECTS = $(am_tool_OBJECTS)
+tool_DEPENDENCIES = $(top_builddir)/src/libpmix.la
+tool_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(tool_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/src/include
+depcomp = $(SHELL) $(top_srcdir)/./config/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(alloc_SOURCES) $(client_SOURCES) $(debugger_SOURCES) \
+	$(debuggerd_SOURCES) $(dmodex_SOURCES) $(dynamic_SOURCES) \
+	$(fault_SOURCES) $(jctrl_SOURCES) $(pub_SOURCES) \
+	$(server_SOURCES) $(tool_SOURCES)
+DIST_SOURCES = $(alloc_SOURCES) $(client_SOURCES) $(debugger_SOURCES) \
+	$(debuggerd_SOURCES) $(dmodex_SOURCES) $(dynamic_SOURCES) \
+	$(fault_SOURCES) $(jctrl_SOURCES) $(pub_SOURCES) \
+	$(am__server_SOURCES_DIST) $(tool_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/./config/depcomp
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CFLAGS = @CFLAGS@
+CLEANFILES = @CLEANFILES@
+CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MCA_PROJECT_SUBDIRS = @MCA_PROJECT_SUBDIRS@
+MCA_pmix_FRAMEWORKS = @MCA_pmix_FRAMEWORKS@
+MCA_pmix_FRAMEWORKS_SUBDIRS = @MCA_pmix_FRAMEWORKS_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS@
+MCA_pmix_FRAMEWORK_LIBS = @MCA_pmix_FRAMEWORK_LIBS@
+MCA_pmix_pdl_ALL_COMPONENTS = @MCA_pmix_pdl_ALL_COMPONENTS@
+MCA_pmix_pdl_ALL_SUBDIRS = @MCA_pmix_pdl_ALL_SUBDIRS@
+MCA_pmix_pdl_DSO_COMPONENTS = @MCA_pmix_pdl_DSO_COMPONENTS@
+MCA_pmix_pdl_DSO_SUBDIRS = @MCA_pmix_pdl_DSO_SUBDIRS@
+MCA_pmix_pdl_STATIC_COMPONENTS = @MCA_pmix_pdl_STATIC_COMPONENTS@
+MCA_pmix_pdl_STATIC_LTLIBS = @MCA_pmix_pdl_STATIC_LTLIBS@
+MCA_pmix_pdl_STATIC_SUBDIRS = @MCA_pmix_pdl_STATIC_SUBDIRS@
+MCA_pmix_pif_ALL_COMPONENTS = @MCA_pmix_pif_ALL_COMPONENTS@
+MCA_pmix_pif_ALL_SUBDIRS = @MCA_pmix_pif_ALL_SUBDIRS@
+MCA_pmix_pif_DSO_COMPONENTS = @MCA_pmix_pif_DSO_COMPONENTS@
+MCA_pmix_pif_DSO_SUBDIRS = @MCA_pmix_pif_DSO_SUBDIRS@
+MCA_pmix_pif_STATIC_COMPONENTS = @MCA_pmix_pif_STATIC_COMPONENTS@
+MCA_pmix_pif_STATIC_LTLIBS = @MCA_pmix_pif_STATIC_LTLIBS@
+MCA_pmix_pif_STATIC_SUBDIRS = @MCA_pmix_pif_STATIC_SUBDIRS@
+MCA_pmix_pinstalldirs_ALL_COMPONENTS = @MCA_pmix_pinstalldirs_ALL_COMPONENTS@
+MCA_pmix_pinstalldirs_ALL_SUBDIRS = @MCA_pmix_pinstalldirs_ALL_SUBDIRS@
+MCA_pmix_pinstalldirs_DSO_COMPONENTS = @MCA_pmix_pinstalldirs_DSO_COMPONENTS@
+MCA_pmix_pinstalldirs_DSO_SUBDIRS = @MCA_pmix_pinstalldirs_DSO_SUBDIRS@
+MCA_pmix_pinstalldirs_STATIC_COMPONENTS = @MCA_pmix_pinstalldirs_STATIC_COMPONENTS@
+MCA_pmix_pinstalldirs_STATIC_LTLIBS = @MCA_pmix_pinstalldirs_STATIC_LTLIBS@
+MCA_pmix_pinstalldirs_STATIC_SUBDIRS = @MCA_pmix_pinstalldirs_STATIC_SUBDIRS@
+MCA_pmix_pnet_ALL_COMPONENTS = @MCA_pmix_pnet_ALL_COMPONENTS@
+MCA_pmix_pnet_ALL_SUBDIRS = @MCA_pmix_pnet_ALL_SUBDIRS@
+MCA_pmix_pnet_DSO_COMPONENTS = @MCA_pmix_pnet_DSO_COMPONENTS@
+MCA_pmix_pnet_DSO_SUBDIRS = @MCA_pmix_pnet_DSO_SUBDIRS@
+MCA_pmix_pnet_STATIC_COMPONENTS = @MCA_pmix_pnet_STATIC_COMPONENTS@
+MCA_pmix_pnet_STATIC_LTLIBS = @MCA_pmix_pnet_STATIC_LTLIBS@
+MCA_pmix_pnet_STATIC_SUBDIRS = @MCA_pmix_pnet_STATIC_SUBDIRS@
+MCA_pmix_psec_ALL_COMPONENTS = @MCA_pmix_psec_ALL_COMPONENTS@
+MCA_pmix_psec_ALL_SUBDIRS = @MCA_pmix_psec_ALL_SUBDIRS@
+MCA_pmix_psec_DSO_COMPONENTS = @MCA_pmix_psec_DSO_COMPONENTS@
+MCA_pmix_psec_DSO_SUBDIRS = @MCA_pmix_psec_DSO_SUBDIRS@
+MCA_pmix_psec_STATIC_COMPONENTS = @MCA_pmix_psec_STATIC_COMPONENTS@
+MCA_pmix_psec_STATIC_LTLIBS = @MCA_pmix_psec_STATIC_LTLIBS@
+MCA_pmix_psec_STATIC_SUBDIRS = @MCA_pmix_psec_STATIC_SUBDIRS@
+MCA_pmix_psensor_ALL_COMPONENTS = @MCA_pmix_psensor_ALL_COMPONENTS@
+MCA_pmix_psensor_ALL_SUBDIRS = @MCA_pmix_psensor_ALL_SUBDIRS@
+MCA_pmix_psensor_DSO_COMPONENTS = @MCA_pmix_psensor_DSO_COMPONENTS@
+MCA_pmix_psensor_DSO_SUBDIRS = @MCA_pmix_psensor_DSO_SUBDIRS@
+MCA_pmix_psensor_STATIC_COMPONENTS = @MCA_pmix_psensor_STATIC_COMPONENTS@
+MCA_pmix_psensor_STATIC_LTLIBS = @MCA_pmix_psensor_STATIC_LTLIBS@
+MCA_pmix_psensor_STATIC_SUBDIRS = @MCA_pmix_psensor_STATIC_SUBDIRS@
+MCA_pmix_ptl_ALL_COMPONENTS = @MCA_pmix_ptl_ALL_COMPONENTS@
+MCA_pmix_ptl_ALL_SUBDIRS = @MCA_pmix_ptl_ALL_SUBDIRS@
+MCA_pmix_ptl_DSO_COMPONENTS = @MCA_pmix_ptl_DSO_COMPONENTS@
+MCA_pmix_ptl_DSO_SUBDIRS = @MCA_pmix_ptl_DSO_SUBDIRS@
+MCA_pmix_ptl_STATIC_COMPONENTS = @MCA_pmix_ptl_STATIC_COMPONENTS@
+MCA_pmix_ptl_STATIC_LTLIBS = @MCA_pmix_ptl_STATIC_LTLIBS@
+MCA_pmix_ptl_STATIC_SUBDIRS = @MCA_pmix_ptl_STATIC_SUBDIRS@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PMIX_ASM_GSYM = @PMIX_ASM_GSYM@
+PMIX_ASM_LSYM = @PMIX_ASM_LSYM@
+PMIX_ASM_SUPPORT_64BIT = @PMIX_ASM_SUPPORT_64BIT@
+PMIX_ASM_TEXT = @PMIX_ASM_TEXT@
+PMIX_ASM_TYPE = @PMIX_ASM_TYPE@
+PMIX_ASSEMBLY_ARCH = @PMIX_ASSEMBLY_ARCH@
+PMIX_ASSEMBLY_BUILTIN = @PMIX_ASSEMBLY_BUILTIN@
+PMIX_ASSEMBLY_FORMAT = @PMIX_ASSEMBLY_FORMAT@
+PMIX_AS_GLOBAL = @PMIX_AS_GLOBAL@
+PMIX_AS_LABEL_SUFFIX = @PMIX_AS_LABEL_SUFFIX@
+PMIX_CC_ABSOLUTE = @PMIX_CC_ABSOLUTE@
+PMIX_CONFIGURE_DATE = @PMIX_CONFIGURE_DATE@
+PMIX_CONFIGURE_HOST = @PMIX_CONFIGURE_HOST@
+PMIX_CONFIGURE_USER = @PMIX_CONFIGURE_USER@
+PMIX_EMBEDDED_CPPFLAGS = @PMIX_EMBEDDED_CPPFLAGS@
+PMIX_EMBEDDED_LDFLAGS = @PMIX_EMBEDDED_LDFLAGS@
+PMIX_EMBEDDED_LIBS = @PMIX_EMBEDDED_LIBS@
+PMIX_MAJOR_VERSION = @PMIX_MAJOR_VERSION@
+PMIX_MINOR_VERSION = @PMIX_MINOR_VERSION@
+PMIX_RELEASE_DATE = @PMIX_RELEASE_DATE@
+PMIX_RELEASE_VERSION = @PMIX_RELEASE_VERSION@
+PMIX_RENAME = @PMIX_RENAME@
+PMIX_VERSION = @PMIX_VERSION@
+PMIX_top_builddir = @PMIX_top_builddir@
+PMIX_top_srcdir = @PMIX_top_srcdir@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_prefix_program = @ac_prefix_program@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+libpmix_so_version = @libpmix_so_version@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pmix_have_pandoc = @pmix_have_pandoc@
+pmix_pdl_pdlopen_LIBS = @pmix_pdl_pdlopen_LIBS@
+pmix_pdl_plibltdl_CPPFLAGS = @pmix_pdl_plibltdl_CPPFLAGS@
+pmix_pdl_plibltdl_LDFLAGS = @pmix_pdl_plibltdl_LDFLAGS@
+pmix_pdl_plibltdl_LIBS = @pmix_pdl_plibltdl_LIBS@
+pmixdatadir = @pmixdatadir@
+pmixincludedir = @pmixincludedir@
+pmixlibdir = @pmixlibdir@
+pmixmajor = @pmixmajor@
+pmixminor = @pmixminor@
+pnet_opa_CFLAGS = @pnet_opa_CFLAGS@
+pnet_opa_CPPFLAGS = @pnet_opa_CPPFLAGS@
+pnet_opa_LDFLAGS = @pnet_opa_LDFLAGS@
+pnet_opa_LIBS = @pnet_opa_LIBS@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+psec_munge_CPPFLAGS = @psec_munge_CPPFLAGS@
+psec_munge_LDFLAGS = @psec_munge_LDFLAGS@
+psec_munge_LIBS = @psec_munge_LIBS@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+AM_CPPFLAGS = -I$(top_builddir)/src -I$(top_builddir)/src/include -I$(top_builddir)/include -I$(top_builddir)/include/pmix
+client_SOURCES = client.c
+client_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
+client_LDADD = $(top_builddir)/src/libpmix.la
+debugger_SOURCES = debugger.c
+debugger_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
+debugger_LDADD = $(top_builddir)/src/libpmix.la
+debuggerd_SOURCES = debuggerd.c
+debuggerd_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
+debuggerd_LDADD = $(top_builddir)/src/libpmix.la
+alloc_SOURCES = alloc.c
+alloc_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
+alloc_LDADD = $(top_builddir)/src/libpmix.la
+jctrl_SOURCES = jctrl.c
+jctrl_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
+jctrl_LDADD = $(top_builddir)/src/libpmix.la
+dmodex_SOURCES = dmodex.c
+dmodex_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
+dmodex_LDADD = $(top_builddir)/src/libpmix.la
+dynamic_SOURCES = dynamic.c
+dynamic_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
+dynamic_LDADD = $(top_builddir)/src/libpmix.la
+fault_SOURCES = fault.c
+fault_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
+fault_LDADD = $(top_builddir)/src/libpmix.la
+pub_SOURCES = pub.c
+pub_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
+pub_LDADD = $(top_builddir)/src/libpmix.la
+tool_SOURCES = tool.c
+tool_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
+tool_LDADD = $(top_builddir)/src/libpmix.la
+ at WANT_HIDDEN_FALSE@server_SOURCES = server.c
+ at WANT_HIDDEN_FALSE@server_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
+ at WANT_HIDDEN_FALSE@server_LDADD = $(top_builddir)/src/libpmix.la
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign examples/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign examples/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstPROGRAMS:
+	@list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
+
+alloc$(EXEEXT): $(alloc_OBJECTS) $(alloc_DEPENDENCIES) $(EXTRA_alloc_DEPENDENCIES) 
+	@rm -f alloc$(EXEEXT)
+	$(AM_V_CCLD)$(alloc_LINK) $(alloc_OBJECTS) $(alloc_LDADD) $(LIBS)
+
+client$(EXEEXT): $(client_OBJECTS) $(client_DEPENDENCIES) $(EXTRA_client_DEPENDENCIES) 
+	@rm -f client$(EXEEXT)
+	$(AM_V_CCLD)$(client_LINK) $(client_OBJECTS) $(client_LDADD) $(LIBS)
+
+debugger$(EXEEXT): $(debugger_OBJECTS) $(debugger_DEPENDENCIES) $(EXTRA_debugger_DEPENDENCIES) 
+	@rm -f debugger$(EXEEXT)
+	$(AM_V_CCLD)$(debugger_LINK) $(debugger_OBJECTS) $(debugger_LDADD) $(LIBS)
+
+debuggerd$(EXEEXT): $(debuggerd_OBJECTS) $(debuggerd_DEPENDENCIES) $(EXTRA_debuggerd_DEPENDENCIES) 
+	@rm -f debuggerd$(EXEEXT)
+	$(AM_V_CCLD)$(debuggerd_LINK) $(debuggerd_OBJECTS) $(debuggerd_LDADD) $(LIBS)
+
+dmodex$(EXEEXT): $(dmodex_OBJECTS) $(dmodex_DEPENDENCIES) $(EXTRA_dmodex_DEPENDENCIES) 
+	@rm -f dmodex$(EXEEXT)
+	$(AM_V_CCLD)$(dmodex_LINK) $(dmodex_OBJECTS) $(dmodex_LDADD) $(LIBS)
+
+dynamic$(EXEEXT): $(dynamic_OBJECTS) $(dynamic_DEPENDENCIES) $(EXTRA_dynamic_DEPENDENCIES) 
+	@rm -f dynamic$(EXEEXT)
+	$(AM_V_CCLD)$(dynamic_LINK) $(dynamic_OBJECTS) $(dynamic_LDADD) $(LIBS)
+
+fault$(EXEEXT): $(fault_OBJECTS) $(fault_DEPENDENCIES) $(EXTRA_fault_DEPENDENCIES) 
+	@rm -f fault$(EXEEXT)
+	$(AM_V_CCLD)$(fault_LINK) $(fault_OBJECTS) $(fault_LDADD) $(LIBS)
+
+jctrl$(EXEEXT): $(jctrl_OBJECTS) $(jctrl_DEPENDENCIES) $(EXTRA_jctrl_DEPENDENCIES) 
+	@rm -f jctrl$(EXEEXT)
+	$(AM_V_CCLD)$(jctrl_LINK) $(jctrl_OBJECTS) $(jctrl_LDADD) $(LIBS)
+
+pub$(EXEEXT): $(pub_OBJECTS) $(pub_DEPENDENCIES) $(EXTRA_pub_DEPENDENCIES) 
+	@rm -f pub$(EXEEXT)
+	$(AM_V_CCLD)$(pub_LINK) $(pub_OBJECTS) $(pub_LDADD) $(LIBS)
+
+server$(EXEEXT): $(server_OBJECTS) $(server_DEPENDENCIES) $(EXTRA_server_DEPENDENCIES) 
+	@rm -f server$(EXEEXT)
+	$(AM_V_CCLD)$(server_LINK) $(server_OBJECTS) $(server_LDADD) $(LIBS)
+
+tool$(EXEEXT): $(tool_OBJECTS) $(tool_DEPENDENCIES) $(EXTRA_tool_DEPENDENCIES) 
+	@rm -f tool$(EXEEXT)
+	$(AM_V_CCLD)$(tool_LINK) $(tool_OBJECTS) $(tool_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/alloc.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/client.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/debugger.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/debuggerd.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/dmodex.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/dynamic.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/fault.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/jctrl.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pub.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/server.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/tool.Po at am__quote@
+
+.c.o:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+ at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(PROGRAMS)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-local distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstPROGRAMS cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-local 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-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
+
+.PRECIOUS: Makefile
+
+
+distclean-local:
+	rm -f *.o client debugger debuggerd dmodex dynamic fault pub server
+
+# 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/examples/alloc.c b/examples/alloc.c
new file mode 100644
index 0000000..ab171ee
--- /dev/null
+++ b/examples/alloc.c
@@ -0,0 +1,235 @@
+/*
+ * Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2011 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2006-2013 Los Alamos National Security, LLC.
+ *                         All rights reserved.
+ * Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2011      Oak Ridge National Labs.  All rights reserved.
+ * Copyright (c) 2013-2017 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2015      Mellanox Technologies, Inc.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ *
+ */
+
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <time.h>
+
+#include <pmix.h>
+
+/* define a structure for collecting returned
+ * info from an allocation request */
+typedef struct {
+    volatile bool active;
+    pmix_info_t *info;
+    size_t ninfo;
+} mydata_t;
+
+static volatile bool waiting_for_allocation = true;
+
+/* this is a callback function for the PMIx_Query and
+ * PMIx_Allocate APIs. The query will callback with a status indicating
+ * if the request could be fully satisfied, partially
+ * satisfied, or completely failed. The info parameter
+ * contains an array of the returned data, with the
+ * info->key field being the key that was provided in
+ * the query call. Thus, you can correlate the returned
+ * data in the info->value field to the requested key.
+ *
+ * Once we have dealt with the returned data, we must
+ * call the release_fn so that the PMIx library can
+ * cleanup */
+static void infocbfunc(pmix_status_t status,
+                       pmix_info_t *info, size_t ninfo,
+                       void *cbdata,
+                       pmix_release_cbfunc_t release_fn,
+                       void *release_cbdata)
+{
+    mydata_t *mq = (mydata_t*)cbdata;
+    size_t n;
+
+    fprintf(stderr, "Allocation request returned %s", PMIx_Error_string(status));
+
+    /* save the returned info - the PMIx library "owns" it
+     * and will release it and perform other cleanup actions
+     * when release_fn is called */
+    if (0 < ninfo) {
+        PMIX_INFO_CREATE(mq->info, ninfo);
+        mq->ninfo = ninfo;
+        for (n=0; n < ninfo; n++) {
+            fprintf(stderr, "Transferring %s\n", info[n].key);
+            PMIX_INFO_XFER(&mq->info[n], &info[n]);
+        }
+    }
+
+    /* let the library release the data and cleanup from
+     * the operation */
+    if (NULL != release_fn) {
+        release_fn(release_cbdata);
+    }
+
+    /* release the block */
+    mq->active = false;
+}
+
+/* this is an event notification function that we explicitly request
+ * be called when the PMIX_ERR_ALLOC_COMPLETE notification is issued.
+ * We could catch it in the general event notification function and test
+ * the status to see if it was "alloc complete", but it often is simpler
+ * to declare a use-specific notification callback point. In this case,
+ * we are asking to know when the allocation request completes */
+static void release_fn(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)
+{
+    /* tell the event handler state machine that we are the last step */
+    if (NULL != cbfunc) {
+        cbfunc(PMIX_EVENT_ACTION_COMPLETE, NULL, 0, NULL, NULL, cbdata);
+    }
+    /* flag that the allocation is complete so we can exit */
+    waiting_for_allocation = false;
+}
+
+/* event handler registration is done asynchronously because it
+ * may involve the PMIx server registering with the host RM for
+ * external events. So we provide a callback function that returns
+ * the status of the request (success or an error), plus a numerical index
+ * to the registered event. The index is used later on to deregister
+ * an event handler - if we don't explicitly deregister it, then the
+ * PMIx server will do so when it see us exit */
+static void evhandler_reg_callbk(pmix_status_t status,
+                                 size_t evhandler_ref,
+                                 void *cbdata)
+{
+    volatile int *active = (volatile int*)cbdata;
+
+    if (PMIX_SUCCESS != status) {
+        fprintf(stderr, "EVENT HANDLER REGISTRATION FAILED WITH STATUS %d, ref=%lu\n",
+                status, (unsigned long)evhandler_ref);
+    }
+    *active = status;
+}
+
+int main(int argc, char **argv)
+{
+    pmix_proc_t myproc;
+    int rc;
+    pmix_value_t value;
+    pmix_value_t *val = &value;
+    pmix_proc_t proc;
+    uint32_t nprocs;
+    pmix_info_t *info;
+    uint64_t nnodes = 12;
+    mydata_t mydata;
+    pmix_query_t *query;
+    char *myallocation = "MYALLOCATION";
+    volatile int active;
+    pmix_status_t code = PMIX_NOTIFY_ALLOC_COMPLETE;
+
+    /* init us */
+    if (PMIX_SUCCESS != (rc = PMIx_Init(&myproc, NULL, 0))) {
+        fprintf(stderr, "Client ns %s rank %d: PMIx_Init failed: %d\n", myproc.nspace, myproc.rank, rc);
+        exit(0);
+    }
+    fprintf(stderr, "Client ns %s rank %d: Running\n", myproc.nspace, myproc.rank);
+
+    /* get our universe size */
+    PMIX_PROC_CONSTRUCT(&proc);
+    (void)strncpy(proc.nspace, myproc.nspace, PMIX_MAX_NSLEN);
+    proc.rank = PMIX_RANK_WILDCARD;
+    if (PMIX_SUCCESS != (rc = PMIx_Get(&proc, PMIX_UNIV_SIZE, NULL, 0, &val))) {
+        fprintf(stderr, "Client ns %s rank %d: PMIx_Get universe size failed: %d\n", myproc.nspace, myproc.rank, rc);
+        goto done;
+    }
+    nprocs = val->data.uint32;
+    PMIX_VALUE_RELEASE(val);
+    fprintf(stderr, "Client %s:%d universe size %d\n", myproc.nspace, myproc.rank, nprocs);
+
+    /* initialize the return info struct */
+    mydata.info = NULL;
+    mydata.ninfo = 0;
+
+    if (0 == myproc.rank) {
+        /* try to get an allocation */
+        mydata.active = true;
+        PMIX_INFO_CREATE(info, 2);
+        PMIX_INFO_LOAD(&info[0], PMIX_ALLOC_NUM_NODES, &nnodes, PMIX_UINT64);
+        PMIX_INFO_LOAD(&info[0], PMIX_ALLOC_ID, myallocation, PMIX_STRING);
+        if (PMIX_SUCCESS != (rc = PMIx_Allocation_request_nb(PMIX_ALLOC_NEW, info, 2, infocbfunc, NULL))) {
+            fprintf(stderr, "Client ns %s rank %d: PMIx_Allocation_request_nb failed: %d\n", myproc.nspace, myproc.rank, rc);
+            goto done;
+        }
+        while (mydata.active) {
+            usleep(10);
+        }
+        PMIX_INFO_FREE(info, 2);
+        if (NULL != mydata.info) {
+            PMIX_INFO_FREE(mydata.info, mydata.ninfo);
+        }
+    } else if (1 == myproc.rank) {
+        /* register a handler specifically for when the allocation
+         * operation completes */
+        PMIX_INFO_CREATE(info, 1);
+        PMIX_INFO_LOAD(&info[0], PMIX_ALLOC_ID, myallocation, PMIX_STRING);
+        active = -1;
+        PMIx_Register_event_handler(&code, 1, info, 1,
+                                    release_fn, evhandler_reg_callbk, (void*)&active);
+        while (-1 == active) {
+            usleep(10);
+        }
+        if (0 != active) {
+            exit(active);
+        }
+        PMIX_INFO_FREE(info, 1);
+        /* now wait to hear that the request is complete */
+        while (waiting_for_allocation) {
+            usleep(10);
+        }
+    } else {
+        /* I am not the root rank, so let me wait a little while and then
+         * query the status of the allocation request */
+        usleep(10);
+        PMIX_QUERY_CREATE(query, 1);
+        PMIX_ARGV_APPEND(query[0].keys, PMIX_QUERY_ALLOC_STATUS);
+        PMIX_INFO_CREATE(query[0].qualifiers, 1);
+        PMIX_INFO_LOAD(&query[0].qualifiers[0], PMIX_ALLOC_ID, myallocation, PMIX_STRING);
+        mydata.active = true;
+        if (PMIX_SUCCESS != (rc = PMIx_Query_info_nb(query, 1, infocbfunc, (void*)&mydata))) {
+            fprintf(stderr, "PMIx_Query_info failed: %d\n", rc);
+            goto done;
+        }
+        while (mydata.active) {
+            usleep(10);
+        }
+        PMIX_QUERY_FREE(query, 1);
+    }
+
+  done:
+    /* finalize us */
+    fprintf(stderr, "Client ns %s rank %d: Finalizing\n", myproc.nspace, myproc.rank);
+    if (PMIX_SUCCESS != (rc = PMIx_Finalize(NULL, 0))) {
+        fprintf(stderr, "Client ns %s rank %d:PMIx_Finalize failed: %d\n", myproc.nspace, myproc.rank, rc);
+    } else {
+        fprintf(stderr, "Client ns %s rank %d:PMIx_Finalize successfully completed\n", myproc.nspace, myproc.rank);
+    }
+    fflush(stderr);
+    return(0);
+}
diff --git a/examples/client.c b/examples/client.c
new file mode 100644
index 0000000..3f304fd
--- /dev/null
+++ b/examples/client.c
@@ -0,0 +1,284 @@
+/*
+ * Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2011 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2006-2013 Los Alamos National Security, LLC.
+ *                         All rights reserved.
+ * Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2011      Oak Ridge National Labs.  All rights reserved.
+ * Copyright (c) 2013-2016 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2015      Mellanox Technologies, Inc.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ *
+ */
+
+#define _GNU_SOURCE
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <time.h>
+
+#include <pmix.h>
+
+static volatile bool waiting_for_debugger = true;
+static pmix_proc_t myproc;
+
+/* this is the event notification function we pass down below
+ * when registering for general events - i.e.,, the default
+ * handler. We don't technically need to register one, but it
+ * is usually good practice to catch any events that occur */
+static void notification_fn(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)
+{
+    if (NULL != cbfunc) {
+        cbfunc(PMIX_EVENT_ACTION_COMPLETE, NULL, 0, NULL, NULL, cbdata);
+    }
+}
+
+/* this is an event notification function that we explicitly request
+ * be called when the PMIX_ERR_DEBUGGER_RELEASE notification is issued.
+ * We could catch it in the general event notification function and test
+ * the status to see if it was "debugger release", but it often is simpler
+ * to declare a use-specific notification callback point. In this case,
+ * we are asking to know when we are told the debugger released us */
+static void release_fn(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)
+{
+    if (NULL != cbfunc) {
+        cbfunc(PMIX_EVENT_ACTION_COMPLETE, NULL, 0, NULL, NULL, cbdata);
+    }
+    waiting_for_debugger = false;
+}
+
+/* event handler registration is done asynchronously because it
+ * may involve the PMIx server registering with the host RM for
+ * external events. So we provide a callback function that returns
+ * the status of the request (success or an error), plus a numerical index
+ * to the registered event. The index is used later on to deregister
+ * an event handler - if we don't explicitly deregister it, then the
+ * PMIx server will do so when it see us exit */
+static void evhandler_reg_callbk(pmix_status_t status,
+                                 size_t evhandler_ref,
+                                 void *cbdata)
+{
+    volatile int *active = (volatile int*)cbdata;
+
+    if (PMIX_SUCCESS != status) {
+        fprintf(stderr, "Client %s:%d EVENT HANDLER REGISTRATION FAILED WITH STATUS %d, ref=%lu\n",
+                   myproc.nspace, myproc.rank, status, (unsigned long)evhandler_ref);
+    }
+    *active = status;
+}
+
+int main(int argc, char **argv)
+{
+    int rc;
+    pmix_value_t value;
+    pmix_value_t *val = &value;
+    char *tmp;
+    pmix_proc_t proc;
+    uint32_t nprocs, n;
+    pmix_info_t *info;
+    bool flag;
+    volatile int active;
+    pmix_status_t dbg = PMIX_ERR_DEBUGGER_RELEASE;
+
+    /* init us - note that the call to "init" includes the return of
+     * any job-related info provided by the RM. This includes any
+     * debugger flag instructing us to stop-in-init. If such a directive
+     * is included, then the process will be stopped in this call until
+     * the "debugger release" notification arrives */
+    if (PMIX_SUCCESS != (rc = PMIx_Init(&myproc, NULL, 0))) {
+        fprintf(stderr, "Client ns %s rank %d: PMIx_Init failed: %d\n", myproc.nspace, myproc.rank, rc);
+        exit(0);
+    }
+    fprintf(stderr, "Client ns %s rank %d: Running\n", myproc.nspace, myproc.rank);
+
+
+    /* register our default event handler - again, this isn't strictly
+     * required, but is generally good practice */
+    active = -1;
+    PMIx_Register_event_handler(NULL, 0, NULL, 0,
+                                notification_fn, evhandler_reg_callbk, (void*)&active);
+    while (-1 == active) {
+        sleep(1);
+    }
+    if (0 != active) {
+        fprintf(stderr, "[%s:%d] Default handler registration failed\n", myproc.nspace, myproc.rank);
+        exit(active);
+    }
+
+    /* job-related info is found in our nspace, assigned to the
+     * wildcard rank as it doesn't relate to a specific rank. Setup
+     * a name to retrieve such values */
+    PMIX_PROC_CONSTRUCT(&proc);
+    (void)strncpy(proc.nspace, myproc.nspace, PMIX_MAX_NSLEN);
+    proc.rank = PMIX_RANK_WILDCARD;
+
+    /* check to see if we have been instructed to wait for a debugger
+     * to attach to us. We won't get both a stop-in-init AND a
+     * wait-for-notify directive, so we should never stop twice. This
+     * directive is provided so that something like an MPI implementation
+     * can do some initial setup in MPI_Init prior to pausing for the
+     * debugger */
+    if (PMIX_SUCCESS == (rc = PMIx_Get(&proc, PMIX_DEBUG_WAIT_FOR_NOTIFY, NULL, 0, &val))) {
+        /* register for debugger release */
+        active = -1;
+        PMIx_Register_event_handler(&dbg, 1, NULL, 0,
+                                    release_fn, evhandler_reg_callbk, (void*)&active);
+        /* wait for registration to complete */
+        while (-1 == active) {
+            sleep(1);
+        }
+        if (0 != active) {
+            fprintf(stderr, "[%s:%d] Debug handler registration failed\n", myproc.nspace, myproc.rank);
+            exit(active);
+        }
+        /* wait for debugger release */
+        while (waiting_for_debugger) {
+            sleep(1);
+        }
+    }
+
+    /* get our universe size */
+    if (PMIX_SUCCESS != (rc = PMIx_Get(&proc, PMIX_UNIV_SIZE, NULL, 0, &val))) {
+        fprintf(stderr, "Client ns %s rank %d: PMIx_Get universe size failed: %d\n", myproc.nspace, myproc.rank, rc);
+        goto done;
+    }
+    nprocs = val->data.uint32;
+    PMIX_VALUE_RELEASE(val);
+    fprintf(stderr, "Client %s:%d universe size %d\n", myproc.nspace, myproc.rank, nprocs);
+
+    /* put a few values */
+    if (0 > asprintf(&tmp, "%s-%d-internal", myproc.nspace, myproc.rank)) {
+        exit(1);
+    }
+    value.type = PMIX_UINT32;
+    value.data.uint32 = 1234;
+    if (PMIX_SUCCESS != (rc = PMIx_Store_internal(&myproc, tmp, &value))) {
+        fprintf(stderr, "Client ns %s rank %d: PMIx_Store_internal failed: %d\n", myproc.nspace, myproc.rank, rc);
+        goto done;
+    }
+    free(tmp);
+
+    if (0 > asprintf(&tmp, "%s-%d-local", myproc.nspace, myproc.rank)) {
+        exit(1);
+    }
+    value.type = PMIX_UINT64;
+    value.data.uint64 = 1234;
+    if (PMIX_SUCCESS != (rc = PMIx_Put(PMIX_LOCAL, tmp, &value))) {
+        fprintf(stderr, "Client ns %s rank %d: PMIx_Put internal failed: %d\n", myproc.nspace, myproc.rank, rc);
+        goto done;
+    }
+    free(tmp);
+
+    if (0 > asprintf(&tmp, "%s-%d-remote", myproc.nspace, myproc.rank)) {
+        exit(1);
+    }
+    value.type = PMIX_STRING;
+    value.data.string = "1234";
+    if (PMIX_SUCCESS != (rc = PMIx_Put(PMIX_REMOTE, tmp, &value))) {
+        fprintf(stderr, "Client ns %s rank %d: PMIx_Put internal failed: %d\n", myproc.nspace, myproc.rank, rc);
+        goto done;
+    }
+    free(tmp);
+
+    /* push the data to our PMIx server */
+    if (PMIX_SUCCESS != (rc = PMIx_Commit())) {
+        fprintf(stderr, "Client ns %s rank %d: PMIx_Commit failed: %d\n", myproc.nspace, myproc.rank, rc);
+        goto done;
+    }
+
+    /* call fence to synchronize with our peers - instruct
+     * the fence operation to collect and return all "put"
+     * data from our peers */
+    PMIX_INFO_CREATE(info, 1);
+    flag = true;
+    PMIX_INFO_LOAD(info, PMIX_COLLECT_DATA, &flag, PMIX_BOOL);
+    if (PMIX_SUCCESS != (rc = PMIx_Fence(&proc, 1, info, 1))) {
+        fprintf(stderr, "Client ns %s rank %d: PMIx_Fence failed: %d\n", myproc.nspace, myproc.rank, rc);
+        goto done;
+    }
+    PMIX_INFO_FREE(info, 1);
+
+    /* check the returned data */
+    for (n=0; n < nprocs; n++) {
+        if (0 > asprintf(&tmp, "%s-%d-local", myproc.nspace, myproc.rank)) {
+            exit(1);
+        }
+        if (PMIX_SUCCESS != (rc = PMIx_Get(&myproc, tmp, NULL, 0, &val))) {
+            fprintf(stderr, "Client ns %s rank %d: PMIx_Get %s failed: %d\n", myproc.nspace, myproc.rank, tmp, rc);
+            goto done;
+        }
+        if (PMIX_UINT64 != val->type) {
+            fprintf(stderr, "Client ns %s rank %d: PMIx_Get %s returned wrong type: %d\n", myproc.nspace, myproc.rank, tmp, val->type);
+            PMIX_VALUE_RELEASE(val);
+            free(tmp);
+            goto done;
+        }
+        if (1234 != val->data.uint64) {
+            fprintf(stderr, "Client ns %s rank %d: PMIx_Get %s returned wrong value: %d\n", myproc.nspace, myproc.rank, tmp, (int)val->data.uint64);
+            PMIX_VALUE_RELEASE(val);
+            free(tmp);
+            goto done;
+        }
+        fprintf(stderr, "Client ns %s rank %d: PMIx_Get %s returned correct\n", myproc.nspace, myproc.rank, tmp);
+        PMIX_VALUE_RELEASE(val);
+        free(tmp);
+        if (0 > asprintf(&tmp, "%s-%d-remote", myproc.nspace, myproc.rank)) {
+            exit(1);
+        }
+        if (PMIX_SUCCESS != (rc = PMIx_Get(&myproc, tmp, NULL, 0, &val))) {
+            fprintf(stderr, "Client ns %s rank %d: PMIx_Get %s failed: %d\n", myproc.nspace, myproc.rank, tmp, rc);
+            goto done;
+        }
+        if (PMIX_STRING != val->type) {
+            fprintf(stderr, "Client ns %s rank %d: PMIx_Get %s returned wrong type: %d\n", myproc.nspace, myproc.rank, tmp, val->type);
+            PMIX_VALUE_RELEASE(val);
+            free(tmp);
+            goto done;
+        }
+        if (0 != strcmp(val->data.string, "1234")) {
+            fprintf(stderr, "Client ns %s rank %d: PMIx_Get %s returned wrong value: %s\n", myproc.nspace, myproc.rank, tmp, val->data.string);
+            PMIX_VALUE_RELEASE(val);
+            free(tmp);
+            goto done;
+        }
+        fprintf(stderr, "Client ns %s rank %d: PMIx_Get %s returned correct\n", myproc.nspace, myproc.rank, tmp);
+        PMIX_VALUE_RELEASE(val);
+        free(tmp);
+    }
+
+ done:
+    /* finalize us */
+    fprintf(stderr, "Client ns %s rank %d: Finalizing\n", myproc.nspace, myproc.rank);
+    if (PMIX_SUCCESS != (rc = PMIx_Finalize(NULL, 0))) {
+        fprintf(stderr, "Client ns %s rank %d:PMIx_Finalize failed: %d\n", myproc.nspace, myproc.rank, rc);
+    } else {
+        fprintf(stderr, "Client ns %s rank %d:PMIx_Finalize successfully completed\n", myproc.nspace, myproc.rank);
+    }
+    fflush(stderr);
+    return(0);
+}
diff --git a/examples/debugger.c b/examples/debugger.c
new file mode 100644
index 0000000..62bc8e5
--- /dev/null
+++ b/examples/debugger.c
@@ -0,0 +1,543 @@
+/*
+ * Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2011 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2006-2013 Los Alamos National Security, LLC.
+ *                         All rights reserved.
+ * Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2011      Oak Ridge National Labs.  All rights reserved.
+ * Copyright (c) 2013-2017 Intel, Inc. All rights reserved.
+ * Copyright (c) 2015      Mellanox Technologies, Inc.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <time.h>
+
+#include <pmix_tool.h>
+
+
+/* define a structure for collecting returned
+ * info from a query */
+typedef struct {
+    volatile bool active;
+    pmix_info_t *info;
+    size_t ninfo;
+} myquery_data_t;
+
+static int attach_to_running_job(char *nspace);
+static bool waiting_for_debugger = true;
+static pmix_proc_t myproc;
+
+/* this is a callback function for the PMIx_Query
+ * API. The query will callback with a status indicating
+ * if the request could be fully satisfied, partially
+ * satisfied, or completely failed. The info parameter
+ * contains an array of the returned data, with the
+ * info->key field being the key that was provided in
+ * the query call. Thus, you can correlate the returned
+ * data in the info->value field to the requested key.
+ *
+ * Once we have dealt with the returned data, we must
+ * call the release_fn so that the PMIx library can
+ * cleanup */
+static void cbfunc(pmix_status_t status,
+                   pmix_info_t *info, size_t ninfo,
+                   void *cbdata,
+                   pmix_release_cbfunc_t release_fn,
+                   void *release_cbdata)
+{
+    myquery_data_t *mq = (myquery_data_t*)cbdata;
+    size_t n;
+
+    /* save the returned info - the PMIx library "owns" it
+     * and will release it and perform other cleanup actions
+     * when release_fn is called */
+    if (0 < ninfo) {
+        PMIX_INFO_CREATE(mq->info, ninfo);
+        mq->ninfo = ninfo;
+        for (n=0; n < ninfo; n++) {
+            fprintf(stderr, "Transferring %s\n", info[n].key);
+            PMIX_INFO_XFER(&mq->info[n], &info[n]);
+        }
+    }
+
+    /* let the library release the data and cleanup from
+     * the operation */
+    if (NULL != release_fn) {
+        release_fn(release_cbdata);
+    }
+
+    /* release the block */
+    mq->active = false;
+}
+
+/* this is the event notification function we pass down below
+ * when registering for general events - i.e.,, the default
+ * handler. We don't technically need to register one, but it
+ * is usually good practice to catch any events that occur */
+static void notification_fn(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)
+{
+    /* this example doesn't do anything with default events */
+    if (NULL != cbfunc) {
+        cbfunc(PMIX_EVENT_ACTION_COMPLETE, NULL, 0, NULL, NULL, cbdata);
+    }
+}
+
+/* this is an event notification function that we explicitly request
+ * be called when the PMIX_ERR_JOB_TERMINATED notification is issued.
+ * We could catch it in the general event notification function and test
+ * the status to see if it was "job terminated", but it often is simpler
+ * to declare a use-specific notification callback point. In this case,
+ * we are asking to know whenever a job terminates, and we will then
+ * know we can exit */
+static void release_fn(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)
+{
+    /* tell the event handler state machine that we are the last step */
+    if (NULL != cbfunc) {
+        cbfunc(PMIX_EVENT_ACTION_COMPLETE, NULL, 0, NULL, NULL, cbdata);
+    }
+    /* flag that the debugger is complete so we can exit */
+    waiting_for_debugger = false;
+}
+
+/* event handler registration is done asynchronously because it
+ * may involve the PMIx server registering with the host RM for
+ * external events. So we provide a callback function that returns
+ * the status of the request (success or an error), plus a numerical index
+ * to the registered event. The index is used later on to deregister
+ * an event handler - if we don't explicitly deregister it, then the
+ * PMIx server will do so when it see us exit */
+static void evhandler_reg_callbk(pmix_status_t status,
+                                 size_t evhandler_ref,
+                                 void *cbdata)
+{
+    volatile int *active = (volatile int*)cbdata;
+
+    if (PMIX_SUCCESS != status) {
+        fprintf(stderr, "Client %s:%d EVENT HANDLER REGISTRATION FAILED WITH STATUS %d, ref=%lu\n",
+                   myproc.nspace, myproc.rank, status, (unsigned long)evhandler_ref);
+    }
+    *active = status;
+}
+
+int main(int argc, char **argv)
+{
+    pmix_status_t rc;
+    pmix_info_t *info, *dinfo;
+    pmix_app_t *app, *debugger;
+    size_t ninfo, napps, dninfo;
+    char *tdir, *nspace = NULL;
+    char appspace[PMIX_MAX_NSLEN+1], dspace[PMIX_MAX_NSLEN+1];
+    int i;
+    pmix_query_t *query;
+    size_t nq, n;
+    myquery_data_t myquery_data;
+    bool cospawn = false, stop_on_exec = false;
+    char cwd[1024];
+    volatile int active;
+    pmix_status_t code = PMIX_ERR_JOB_TERMINATED;
+
+    /* Process any arguments we were given */
+    for (i=1; i < argc; i++) {
+        if (0 == strcmp(argv[i], "-h") ||
+            0 == strcmp(argv[i], "--help")) {
+            /* print the usage message and exit */
+
+        }
+        if (0 == strcmp(argv[i], "-a") ||
+            0 == strcmp(argv[i], "--attach")) {
+            if (NULL != nspace) {
+                /* can only support one */
+                fprintf(stderr, "Cannot attach to more than one nspace\n");
+                exit(1);
+            }
+            /* the next argument must be the nspace */
+            ++i;
+            if (argc == i) {
+                /* they goofed */
+                fprintf(stderr, "The %s option requires an <nspace> argument\n", argv[i]);
+                exit(1);
+            }
+            nspace = strdup(argv[i]);
+        } else {
+            fprintf(stderr, "Unknown option: %s\n", argv[i]);
+            exit(1);
+        }
+    }
+
+    /* we need to provide some info to the PMIx tool library so
+     * it can find the server's contact info. The simplest way
+     * of doing this here is to look for an environmental variable
+     * that tells us where to look. The PMIx reference server only
+     * allows one instantiation of the server per user, so setting
+     * this up is something a user could do in their login script.
+     * The reference server is based on OpenMPI, and so the contact
+     * info will always be found at:
+     *
+     * $TMPDIR/ompi.<nodename>.<numerical-userid>/dvm
+     *
+     * NOTE: we will eliminate this requirement in a future version
+     */
+
+    if (NULL == (tdir = getenv("PMIX_SERVER_TMPDIR"))) {
+        fprintf(stderr, "Tool usage requires that the PMIX_SERVER_TMPDIR envar\n");
+        fprintf(stderr, "be set to point at the directory where the PMIx Reference\n");
+        fprintf(stderr, "Server leaves its contact info file.\n");
+        exit(1);
+    }
+
+    /* init us - pass along the location of the contact file */
+    ninfo = 1;
+    PMIX_INFO_CREATE(info, ninfo);
+    PMIX_INFO_LOAD(&info[0], PMIX_SERVER_TMPDIR, tdir, PMIX_STRING);
+
+    if (PMIX_SUCCESS != (rc = PMIx_tool_init(&myproc, info, ninfo))) {
+        fprintf(stderr, "PMIx_tool_init failed: %d\n", rc);
+        exit(rc);
+    }
+    PMIX_INFO_FREE(info, ninfo);
+
+    fprintf(stderr, "Tool ns %s rank %d: Running\n", myproc.nspace, myproc.rank);
+
+    /* register a default event handler */
+    active = -1;
+    PMIx_Register_event_handler(NULL, 0, NULL, 0,
+                                notification_fn, evhandler_reg_callbk, (void*)&active);
+    while (-1 == active) {
+        usleep(10);
+    }
+    if (0 != active) {
+        exit(active);
+    }
+
+    /* register another handler specifically for when the debugger
+     * job completes */
+    active = -1;
+    PMIx_Register_event_handler(&code, 1, NULL, 0,
+                                release_fn, evhandler_reg_callbk, (void*)&active);
+    while (-1 == active) {
+        usleep(10);
+    }
+    if (0 != active) {
+        exit(active);
+    }
+
+    /* if we are attaching to a running job, then attach to it */
+    if (NULL != nspace) {
+        if (PMIX_SUCCESS != (rc = attach_to_running_job(nspace))) {
+            fprintf(stderr, "Failed to attach to nspace %s: error code %d\n",
+                    nspace, rc);
+            goto done;
+        }
+    } else {
+        /* this is an initial launch - we need to launch the application
+         * plus the debugger daemons, letting the RM know we are debugging
+         * so that it will "pause" the app procs until we are ready. First
+         * we need to know if this RM supports co-spawning of daemons with
+         * the application, or if we need to launch the daemons as a separate
+         * spawn command. The former is faster and more scalable, but not
+         * every RM may support it. We also need to ask for debug support
+         * so we know if the RM can stop-on-exec, or only supports stop-in-init */
+        nq = 1;
+        PMIX_QUERY_CREATE(query, nq);
+        PMIX_ARGV_APPEND(query[0].keys, PMIX_QUERY_SPAWN_SUPPORT);
+        PMIX_ARGV_APPEND(query[0].keys, PMIX_QUERY_DEBUG_SUPPORT);
+        /* setup the caddy to retrieve the data */
+        myquery_data.info = NULL;
+        myquery_data.ninfo = 0;
+        myquery_data.active = true;
+        /* execute the query */
+        fprintf(stderr, "Debugger: querying capabilities\n");
+        if (PMIX_SUCCESS != (rc = PMIx_Query_info_nb(query, nq, cbfunc, (void*)&myquery_data))) {
+            fprintf(stderr, "PMIx_Query_info failed: %d\n", rc);
+            goto done;
+        }
+        while (myquery_data.active) {
+            usleep(10);
+        }
+
+        /* we should have received back two info structs, one containing
+         * a comma-delimited list of PMIx spawn attributes the RM supports,
+         * and the other containing a comma-delimited list of PMIx debugger
+         * attributes it supports */
+        if (2 != myquery_data.ninfo) {
+            /* this is an error */
+            fprintf(stderr, "PMIx Query returned an incorrect number of results: %lu\n", myquery_data.ninfo);
+            PMIX_INFO_FREE(myquery_data.info, myquery_data.ninfo);
+            goto done;
+        }
+
+        /* we would like to co-spawn the debugger daemons with the app, but
+         * let's first check to see if this RM supports that operation by
+         * looking for the PMIX_COSPAWN_APP attribute in the spawn support
+         *
+         * We will also check to see if "stop_on_exec" is supported. Few RMs
+         * do so, which is why we have to check. The reference server sadly is
+         * not one of them, so we shouldn't find it here
+         *
+         * Note that the PMIx reference server always returns the query results
+         * in the same order as the query keys. However, this is not guaranteed,
+         * so we should search the returned info structures to find the desired key
+         */
+        for (n=0; n < myquery_data.ninfo; n++) {
+            if (0 == strcmp(myquery_data.info[n].key, PMIX_QUERY_SPAWN_SUPPORT)) {
+                /* see if the cospawn attribute is included */
+                if (NULL != strstr(myquery_data.info[n].value.data.string, PMIX_COSPAWN_APP)) {
+                    cospawn = true;
+                } else {
+                    cospawn = false;
+                }
+            } else if (0 == strcmp(myquery_data.info[n].key, PMIX_QUERY_DEBUG_SUPPORT)) {
+                if (NULL != strstr(myquery_data.info[n].value.data.string, PMIX_DEBUG_STOP_ON_EXEC)) {
+                    stop_on_exec = true;
+                } else {
+                    stop_on_exec = false;
+                }
+            }
+        }
+
+        /* if cospawn is true, then we can launch both the app and the debugger
+         * daemons at the same time */
+        if (cospawn) {
+
+        } else {
+            /* we must do these as separate launches, so do the app first */
+            napps = 1;
+            PMIX_APP_CREATE(app, napps);
+            /* setup the executable */
+            app[0].cmd = strdup("client");
+            PMIX_ARGV_APPEND(app[0].argv, "./client");
+            getcwd(cwd, 1024);  // point us to our current directory
+            app[0].cwd = strdup(cwd);
+            app[0].maxprocs = 2;
+            /* provide job-level directives so the apps do what the user requested */
+            ninfo = 2;
+            PMIX_INFO_CREATE(info, ninfo);
+            PMIX_INFO_LOAD(&info[0], PMIX_MAPBY, "slot", PMIX_STRING);  // map by slot
+            if (stop_on_exec) {
+                PMIX_INFO_LOAD(&info[1], PMIX_DEBUG_STOP_ON_EXEC, NULL, PMIX_BOOL);  // procs are to stop on first instruction
+            } else {
+                PMIX_INFO_LOAD(&info[1], PMIX_DEBUG_STOP_IN_INIT, NULL, PMIX_BOOL);  // procs are to pause in PMIx_Init for debugger attach
+            }
+            /* spawn the job - the function will return when the app
+             * has been launched */
+            fprintf(stderr, "Debugger: spawning %s\n", app[0].cmd);
+            if (PMIX_SUCCESS != (rc = PMIx_Spawn(info, ninfo, app, napps, appspace))) {
+                fprintf(stderr, "Application failed to launch with error: %s\n", PMIx_Error_string(rc));
+                goto done;
+            }
+            PMIX_INFO_FREE(info, ninfo);
+            PMIX_APP_FREE(app, napps);
+
+            /* setup the debugger */
+            PMIX_APP_CREATE(debugger, 1);
+            debugger[0].cmd = strdup("./debuggerd");
+            PMIX_ARGV_APPEND(debugger[0].argv, "./debuggerd");
+            debugger[0].cwd = strdup(cwd);
+            /* provide directives so the daemons go where we want, and
+             * let the RM know these are debugger daemons */
+            dninfo = 5;
+            PMIX_INFO_CREATE(dinfo, dninfo);
+            PMIX_INFO_LOAD(&dinfo[0], PMIX_MAPBY, "ppr:1:node", PMIX_STRING);  // instruct the RM to launch one copy of the executable on each node
+            PMIX_INFO_LOAD(&dinfo[1], PMIX_DEBUGGER_DAEMONS, NULL, PMIX_BOOL); // these are debugger daemons
+            PMIX_INFO_LOAD(&dinfo[2], PMIX_DEBUG_JOB, appspace, PMIX_STRING); // the nspace being debugged
+            PMIX_INFO_LOAD(&dinfo[3], PMIX_NOTIFY_COMPLETION, NULL, PMIX_BOOL); // notify us when the debugger job completes
+            PMIX_INFO_LOAD(&dinfo[4], PMIX_DEBUG_WAITING_FOR_NOTIFY, NULL, PMIX_BOOL);  // tell the daemon that the proc is waiting to be released
+            /* spawn the daemons */
+            fprintf(stderr, "Debugger: spawning %s\n", debugger[0].cmd);
+            if (PMIX_SUCCESS != (rc = PMIx_Spawn(dinfo, dninfo, debugger, 1, dspace))) {
+                fprintf(stderr, "Debugger daemons failed to launch with error: %s\n", PMIx_Error_string(rc));
+                goto done;
+            }
+
+            /* cleanup */
+            PMIX_INFO_FREE(dinfo, dninfo);
+            PMIX_APP_FREE(debugger, 1);
+        }
+
+
+        /* this is where a debugger tool would wait until the debug operation is complete */
+        while (waiting_for_debugger) {
+            sleep(1);
+        }
+    }
+
+  done:
+    PMIx_tool_finalize();
+
+    return(rc);
+}
+
+typedef struct {
+    volatile bool active;
+    pmix_status_t status;
+    pmix_info_t *info;
+    size_t ninfo;
+} mydbug_query_t;
+
+
+static void infocbfunc(pmix_status_t status,
+                       pmix_info_t *info, size_t ninfo,
+                       void *cbdata,
+                       pmix_release_cbfunc_t release_fn,
+                       void *release_cbdata)
+{
+    mydbug_query_t *q = (mydbug_query_t*)cbdata;
+    size_t n;
+
+    q->status = status;
+    q->info = NULL;
+    q->ninfo = ninfo;
+    if (0 < ninfo) {
+        PMIX_INFO_CREATE(q->info, q->ninfo);
+        for (n=0; n < ninfo; n++) {
+            PMIX_INFO_XFER(&q->info[n], &info[n]);
+        }
+    }
+    if (NULL != release_fn) {
+        release_fn(release_cbdata);
+    }
+    q->active = false;
+}
+
+static int attach_to_running_job(char *nspace)
+{
+    pmix_status_t rc;
+    pmix_query_t *query;
+    size_t nq;
+    mydbug_query_t *q;
+
+    /* query the active nspaces so we can verify that the
+     * specified one exists */
+    nq = 1;
+    PMIX_QUERY_CREATE(query, nq);
+    query[0].keys = (char**)malloc(2 * sizeof(char*));
+    query[0].keys[0] = strdup(PMIX_QUERY_NAMESPACES);
+    query[0].keys[1] = NULL;
+
+    q = (mydbug_query_t*)malloc(sizeof(mydbug_query_t));
+    q->active = true;
+
+    if (PMIX_SUCCESS != (rc = PMIx_Query_info_nb(query, nq, infocbfunc, (void*)q))) {
+        fprintf(stderr, "Client ns %s rank %d: PMIx_Query_info failed: %d\n", myproc.nspace, myproc.rank, rc);
+        return -1;
+    }
+    /* wait for a response */
+    while (q->active) {
+        sleep(1);
+    }
+
+    if (NULL == q->info) {
+        fprintf(stderr, "Query returned no info\n");
+        return -1;
+    }
+    /* the query should have returned a comma-delimited list of nspaces */
+    if (PMIX_STRING != q->info[0].value.type) {
+        fprintf(stderr, "Query returned incorrect data type: %d\n", q->info[0].value.type);
+        return -1;
+    }
+    if (NULL == q->info[0].value.data.string) {
+        fprintf(stderr, "Query returned no active nspaces\n");
+        return -1;
+    }
+
+    fprintf(stderr, "Query returned %s\n", q->info[0].value.data.string);
+    return 0;
+
+#if 0
+    /* split the returned string and look for the given nspace */
+
+    /* if not found, then we have an error */
+    PMIX_INFO_FREE(info, ninfo);
+
+    /* get the proctable for this nspace */
+    ninfo = 1;
+    PMIX_INFO_CREATE(info, ninfo);
+    (void)strncpy(info[0].key, PMIX_QUERY_PROC_TABLE, PMIX_MAX_KEYLEN);
+    (void)strncpy(info[0].qualifier, nspace, PMIX_MAX_KEYLEN);
+    if (PMIX_SUCCESS != (rc = PMIx_Query_info_nb(info, ninfo, infocbfunc, (void*)&active))) {
+        fprintf(stderr, "Client ns %s rank %d: PMIx_Query_info_nb failed: %d\n", myproc.nspace, myproc.rank, rc);
+        return -1;
+    }
+    /* wait to get a response */
+
+    /* the query should have returned a data_array */
+    if (PMIX_DATA_ARRAY != info[0].type) {
+        fprintf(stderr, "Query returned incorrect data type: %d\n", info[0].type);
+        return -1;
+    }
+    if (NULL == info[0].data.darray.array) {
+        fprintf(stderr, "Query returned no proctable info\n");
+        return -1;
+    }
+    /* the data array consists of a struct:
+     *     size_t size;
+     *     void* array;
+     *
+     * In this case, the array is composed of pmix_proc_info_t structs:
+     *     pmix_proc_t proc;   // contains the nspace,rank of this proc
+     *     char* hostname;
+     *     char* executable_name;
+     *     pid_t pid;
+     *     int exit_code;
+     *     pmix_proc_state_t state;
+     */
+
+    /* this is where a debugger tool would process the proctable to
+     * create whatever blob it needs to provide to its daemons */
+    PMIX_INFO_FREE(info, ninfo);
+
+    /* setup the debugger daemon spawn request */
+    napps = 1;
+    PMIX_APP_CREATE(app, napps);
+    /* setup the name of the daemon executable to launch */
+    app[0].cmd = strdup("debuggerdaemon");
+    app[0].argc = 1;
+    app[0].argv = (char**)malloc(2*sizeof(char*));
+    app[0].argv[0] = strdup("debuggerdaemon");
+    app[0].argv[1] = NULL;
+    /* provide directives so the daemons go where we want, and
+     * let the RM know these are debugger daemons */
+    ninfo = 3;
+    PMIX_INFO_CREATE(app[0].info, ninfo);
+    PMIX_INFO_LOAD(&app[0].info[0], PMIX_MAPBY, "ppr:1:node", PMIX_STRING);  // instruct the RM to launch one copy of the executable on each node
+    PMIX_INFO_LOAD(&app[0].info[1], PMIX_DEBUGGER_DAEMONS, true, PMIX_BOOL); // these are debugger daemons
+    PMIX_INFO_LOAD(&app[0].info[2], PMIX_DEBUG_TARGET, nspace, PMIX_STRING); // the "jobid" of the application to be debugged
+
+    /* spawn the daemons */
+    PMIx_Spawn(NULL, 0, app, napps, dspace);
+    /* cleanup */
+    PMIX_APP_FREE(app, napps);
+
+    /* this is where a debugger tool would wait until the debug operation is complete */
+
+    return 0;
+#endif
+}
diff --git a/examples/debuggerd.c b/examples/debuggerd.c
new file mode 100644
index 0000000..fa843fa
--- /dev/null
+++ b/examples/debuggerd.c
@@ -0,0 +1,227 @@
+/*
+ * Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2011 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2006-2013 Los Alamos National Security, LLC.
+ *                         All rights reserved.
+ * Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2011      Oak Ridge National Labs.  All rights reserved.
+ * Copyright (c) 2013-2016 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2015      Mellanox Technologies, Inc.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ *
+ */
+
+#define _GNU_SOURCE
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <time.h>
+
+#include <pmix_tool.h>
+
+/* define a structure for collecting returned
+ * info from a query */
+typedef struct {
+    volatile bool active;
+    pmix_info_t *info;
+    size_t ninfo;
+} myquery_data_t;
+
+
+static pmix_proc_t myproc;
+
+/* this is a callback function for the PMIx_Query
+ * API. The query will callback with a status indicating
+ * if the request could be fully satisfied, partially
+ * satisfied, or completely failed. The info parameter
+ * contains an array of the returned data, with the
+ * info->key field being the key that was provided in
+ * the query call. Thus, you can correlate the returned
+ * data in the info->value field to the requested key.
+ *
+ * Once we have dealt with the returned data, we must
+ * call the release_fn so that the PMIx library can
+ * cleanup */
+static void cbfunc(pmix_status_t status,
+                   pmix_info_t *info, size_t ninfo,
+                   void *cbdata,
+                   pmix_release_cbfunc_t release_fn,
+                   void *release_cbdata)
+{
+    myquery_data_t *mq = (myquery_data_t*)cbdata;
+    size_t n;
+
+    /* save the returned info - it will be
+     * released in the release_fn */
+    if (0 < ninfo) {
+        PMIX_INFO_CREATE(mq->info, ninfo);
+        mq->ninfo = ninfo;
+        for (n=0; n < ninfo; n++) {
+            fprintf(stderr, "Transferring %s\n", info[n].key);
+            PMIX_INFO_XFER(&mq->info[n], &info[n]);
+        }
+    }
+
+    /* let the library release the data */
+    if (NULL != release_fn) {
+        release_fn(release_cbdata);
+    }
+
+    /* release the block */
+    mq->active = false;
+}
+
+/* this is the event notification function we pass down below
+ * when registering for general events - i.e.,, the default
+ * handler. We don't technically need to register one, but it
+ * is usually good practice to catch any events that occur */
+static void notification_fn(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)
+{
+    if (NULL != cbfunc) {
+        cbfunc(PMIX_EVENT_ACTION_COMPLETE, NULL, 0, NULL, NULL, cbdata);
+    }
+}
+
+/* event handler registration is done asynchronously because it
+ * may involve the PMIx server registering with the host RM for
+ * external events. So we provide a callback function that returns
+ * the status of the request (success or an error), plus a numerical index
+ * to the registered event. The index is used later on to deregister
+ * an event handler - if we don't explicitly deregister it, then the
+ * PMIx server will do so when it see us exit */
+static void evhandler_reg_callbk(pmix_status_t status,
+                                 size_t evhandler_ref,
+                                 void *cbdata)
+{
+    volatile int *active = (volatile int*)cbdata;
+
+    if (PMIX_SUCCESS != status) {
+        fprintf(stderr, "Client %s:%d EVENT HANDLER REGISTRATION FAILED WITH STATUS %d, ref=%lu\n",
+                   myproc.nspace, myproc.rank, status, (unsigned long)evhandler_ref);
+    }
+    *active = status;
+}
+
+int main(int argc, char **argv)
+{
+    pmix_status_t rc;
+    pmix_value_t *val;
+    pmix_proc_t proc;
+    pmix_info_t *info;
+    size_t ninfo;
+    volatile int active;
+    pmix_query_t *query;
+    size_t nq, n;
+    myquery_data_t myquery_data;
+
+    /* init us - since we were launched by the RM, our connection info
+     * will have been provided at startup. */
+    if (PMIX_SUCCESS != (rc = PMIx_tool_init(&myproc, NULL, 0))) {
+        fprintf(stderr, "Debugger daemon ns %s rank %d: PMIx_tool_init failed: %d\n", myproc.nspace, myproc.rank, rc);
+        exit(0);
+    }
+    fprintf(stderr, "Debugger daemon ns %s rank %d: Running\n", myproc.nspace, myproc.rank);
+
+
+    /* register our default event handler */
+    active = -1;
+    PMIx_Register_event_handler(NULL, 0, NULL, 0,
+                                notification_fn, evhandler_reg_callbk, (void*)&active);
+    while (-1 == active) {
+        usleep(10);
+    }
+    if (0 != active) {
+        exit(active);
+    }
+
+    /* get the nspace of the job we are to debug */
+    (void)strncpy(proc.nspace, myproc.nspace, PMIX_MAX_NSLEN);
+    proc.rank = PMIX_RANK_WILDCARD;
+    if (PMIX_SUCCESS != (rc = PMIx_Get(&proc, PMIX_DEBUG_JOB, NULL, 0, &val))) {
+        fprintf(stderr, "[%s:%d] Failed to get job being debugged - error %d\n", myproc.nspace, myproc.rank, rc);
+        goto done;
+    }
+    if (NULL == val) {
+        fprintf(stderr, "Got NULL return\n");
+        goto done;
+    }
+    fprintf(stderr, "[%s:%d] Debugging %s\n", myproc.nspace, myproc.rank, val->data.string);
+
+    /* get our local proctable - for scalability reasons, we don't want to
+     * have our "root" debugger process get the proctable for everybody and
+     * send it out to us. So ask the local PMIx server for the pid's of
+     * our local target processes */
+    nq = 1;
+    PMIX_QUERY_CREATE(query, nq);
+    PMIX_ARGV_APPEND(query[0].keys, PMIX_QUERY_LOCAL_PROC_TABLE);
+    query[0].nqual = 1;
+    PMIX_INFO_CREATE(query[0].qualifiers, 1);
+    PMIX_INFO_LOAD(&query[0].qualifiers[0], PMIX_NSPACE, val->data.string, PMIX_STRING);  // the nspace we are enquiring about
+    /* setup the caddy to retrieve the data */
+    myquery_data.info = NULL;
+    myquery_data.ninfo = 0;
+    myquery_data.active = true;
+    /* execute the query */
+    if (PMIX_SUCCESS != (rc = PMIx_Query_info_nb(query, nq, cbfunc, (void*)&myquery_data))) {
+        fprintf(stderr, "PMIx_Query_info failed: %d\n", rc);
+        goto done;
+    }
+    while (myquery_data.active) {
+        usleep(10);
+    }
+    fprintf(stderr, "[%s:%d] Local proctable received\n", myproc.nspace, myproc.rank);
+
+
+    /* now that we have the proctable for our local processes, we can do our
+     * magic debugger stuff and attach to them. We then send a "release" event
+     * to them - i.e., it's the equivalent to setting the MPIR breakpoint. We
+     * do this with the event notification system */
+    (void)strncpy(proc.nspace, val->data.string, PMIX_MAX_NSLEN);
+    proc.rank = PMIX_RANK_WILDCARD;
+    /* we send the notification to just the local procs of the job being debugged */
+    ninfo = 1;
+    PMIX_INFO_CREATE(info, ninfo);
+    PMIX_INFO_LOAD(&info[0], PMIX_EVENT_CUSTOM_RANGE, &proc, PMIX_PROC);  // deliver to the target nspace
+    fprintf(stderr, "[%s:%u] Sending release\n", myproc.nspace, myproc.rank);
+    PMIx_Notify_event(PMIX_ERR_DEBUGGER_RELEASE,
+                      NULL, PMIX_RANGE_LOCAL,
+                      info, ninfo, NULL, NULL);
+
+    /* do some debugger magic */
+    n = 0;
+    fprintf(stderr, "[%s:%u] Hanging around awhile, doing debugger magic\n", myproc.nspace, myproc.rank);
+    while (n < 5) {
+        usleep(10);
+        ++n;
+    }
+
+  done:
+    /* finalize us */
+    fprintf(stderr, "Debugger daemon ns %s rank %d: Finalizing\n", myproc.nspace, myproc.rank);
+    if (PMIX_SUCCESS != (rc = PMIx_Finalize(NULL, 0))) {
+        fprintf(stderr, "Debugger daemon ns %s rank %d:PMIx_Finalize failed: %d\n", myproc.nspace, myproc.rank, rc);
+    } else {
+        fprintf(stderr, "Debugger daemon ns %s rank %d:PMIx_Finalize successfully completed\n", myproc.nspace, myproc.rank);
+    }
+    fflush(stderr);
+    return(0);
+}
diff --git a/examples/dmodex.c b/examples/dmodex.c
new file mode 100644
index 0000000..c093d5b
--- /dev/null
+++ b/examples/dmodex.c
@@ -0,0 +1,234 @@
+/*
+ * Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2011 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2006-2013 Los Alamos National Security, LLC.
+ *                         All rights reserved.
+ * Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2011      Oak Ridge National Labs.  All rights reserved.
+ * Copyright (c) 2013-2016 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2015      Mellanox Technologies, Inc.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ *
+ */
+
+#include <stdbool.h>
+
+#define _GNU_SOURCE
+#include <stdio.h>
+
+#include <stdlib.h>
+#include <unistd.h>
+#include <time.h>
+
+#include <pmix.h>
+
+static uint32_t nprocs;
+static pmix_proc_t myproc;
+static uint32_t getcount = 0;
+
+#define WAIT_FOR_COMPLETION(a)                  \
+    do {                                        \
+        while ((a)) {                           \
+            usleep(10);                         \
+        }                                       \
+    } while (0)
+
+static void opcbfunc(pmix_status_t status, void *cbdata)
+{
+    bool *active = (bool*)cbdata;
+
+    fprintf(stderr, "%s:%d completed fence_nb\n", myproc.nspace, myproc.rank);
+    *active = false;
+}
+
+static void valcbfunc(pmix_status_t status,
+                      pmix_value_t *val, void *cbdata)
+{
+    char *key = (char*)cbdata;
+
+    if (PMIX_SUCCESS == status) {
+        if (NULL != strstr(key, "local")) {
+            if (PMIX_UINT64 != val->type) {
+                fprintf(stderr, "%s:%d: PMIx_Get_nb Key %s returned wrong type: %d\n", myproc.nspace, myproc.rank, key, val->type);
+                goto done;
+            }
+            if (1234 != val->data.uint64) {
+                fprintf(stderr, "%s:%d: PMIx_Get_nb Key %s returned wrong value: %d\n", myproc.nspace, myproc.rank, key, (int)val->data.uint64);
+                goto done;
+            }
+        } else if (NULL != strstr(key, "remote")) {
+            if (PMIX_STRING != val->type) {
+                fprintf(stderr, "%s:%d: PMIx_Get_nb Key %s returned wrong type: %d\n", myproc.nspace, myproc.rank, key, val->type);
+                goto done;
+            }
+            if (0 != strcmp(val->data.string, "1234")) {
+                fprintf(stderr, "%s:%d: PMIx_Get_nb Key %s returned wrong value: %s\n", myproc.nspace, myproc.rank, key, val->data.string);
+                goto done;
+            }
+        } else {
+            fprintf(stderr, "%s:%d PMIx_Get_nb returned wrong key: %s\n", myproc.nspace, myproc.rank, key);
+            goto done;
+        }
+        fprintf(stderr, "%s:%d PMIx_Get_nb Key %s returned correctly\n", myproc.nspace, myproc.rank, key);
+    } else {
+        fprintf(stderr, "%s:%d PMIx_Get_nb Key %s failed\n", myproc.nspace, myproc.rank, key);
+    }
+ done:
+    free(key);
+    getcount++;
+}
+
+int main(int argc, char **argv)
+{
+    int rc;
+    pmix_value_t value;
+    pmix_value_t *val = &value;
+    char *tmp;
+    pmix_proc_t proc;
+    uint32_t n, num_gets;
+    bool active;
+
+    /* init us */
+    if (PMIX_SUCCESS != (rc = PMIx_Init(&myproc, NULL, 0))) {
+        fprintf(stderr, "Client ns %s rank %d: PMIx_Init failed: %d\n", myproc.nspace, myproc.rank, rc);
+        exit(0);
+    }
+    fprintf(stderr, "Client ns %s rank %d: Running\n", myproc.nspace, myproc.rank);
+
+    /* get our universe size */
+    PMIX_PROC_CONSTRUCT(&proc);
+    (void)strncpy(proc.nspace, myproc.nspace, PMIX_MAX_NSLEN);
+    proc.rank = PMIX_RANK_WILDCARD;
+    if (PMIX_SUCCESS != (rc = PMIx_Get(&proc, PMIX_UNIV_SIZE, NULL, 0, &val))) {
+        fprintf(stderr, "Client ns %s rank %d: PMIx_Get universe size failed: %d\n", myproc.nspace, myproc.rank, rc);
+        goto done;
+    }
+    nprocs = val->data.uint32;
+    PMIX_VALUE_RELEASE(val);
+    fprintf(stderr, "Client %s:%d universe size %d\n", myproc.nspace, myproc.rank, nprocs);
+
+    /* put a few values */
+    if (0 > asprintf(&tmp, "%s-%d-internal", myproc.nspace, myproc.rank)) {
+        exit(1);
+    }
+    value.type = PMIX_UINT32;
+    value.data.uint32 = 1234;
+    if (PMIX_SUCCESS != (rc = PMIx_Store_internal(&myproc, tmp, &value))) {
+        fprintf(stderr, "Client ns %s rank %d: PMIx_Store_internal failed: %d\n", myproc.nspace, myproc.rank, rc);
+        goto done;
+    }
+    free(tmp);
+
+    if (0 > asprintf(&tmp, "%s-%d-local", myproc.nspace, myproc.rank)) {
+        exit(1);
+    }
+    value.type = PMIX_UINT64;
+    value.data.uint64 = 1234;
+    if (PMIX_SUCCESS != (rc = PMIx_Put(PMIX_LOCAL, tmp, &value))) {
+        fprintf(stderr, "Client ns %s rank %d: PMIx_Put internal failed: %d\n", myproc.nspace, myproc.rank, rc);
+        goto done;
+    }
+    free(tmp);
+
+    if (0 > asprintf(&tmp, "%s-%d-remote", myproc.nspace, myproc.rank)) {
+        exit(1);
+    }
+    value.type = PMIX_STRING;
+    value.data.string = "1234";
+    if (PMIX_SUCCESS != (rc = PMIx_Put(PMIX_REMOTE, tmp, &value))) {
+        fprintf(stderr, "Client ns %s rank %d: PMIx_Put internal failed: %d\n", myproc.nspace, myproc.rank, rc);
+        goto done;
+    }
+    free(tmp);
+
+    /* introduce a delay by one rank so we can check what happens
+     * if a "get" is received prior to data being provided */
+
+    if (0 == myproc.rank) {
+        sleep(2);
+    }
+
+    /* commit the data to the server */
+    if (PMIX_SUCCESS != (rc = PMIx_Commit())) {
+        fprintf(stderr, "Client ns %s rank %d: PMIx_Commit failed: %d\n", myproc.nspace, myproc.rank, rc);
+        goto done;
+    }
+
+    /* call fence_nb, but don't return any data */
+    PMIX_PROC_CONSTRUCT(&proc);
+    (void)strncpy(proc.nspace, myproc.nspace, PMIX_MAX_NSLEN);
+    proc.rank = PMIX_RANK_WILDCARD;
+    active = true;
+    if (PMIX_SUCCESS != (rc = PMIx_Fence_nb(&proc, 1, NULL, 0, opcbfunc, &active))) {
+        fprintf(stderr, "Client ns %s rank %d: PMIx_Fence failed: %d\n", myproc.nspace, myproc.rank, rc);
+        goto done;
+    }
+
+    /* get the committed data - ask for someone who doesn't exist as well */
+    num_gets = 0;
+    for (n=0; n <= nprocs; n++) {
+        if (0 > asprintf(&tmp, "%s-%d-local", myproc.nspace, n)) {
+            exit(1);
+        }
+        (void)strncpy(proc.nspace, tmp, PMIX_MAX_NSLEN);
+        proc.rank = n;
+        if (PMIX_SUCCESS != (rc = PMIx_Get_nb(&proc, tmp,
+                                              NULL, 0, valcbfunc, tmp))) {
+            fprintf(stderr, "Client ns %s rank %d: PMIx_Get %s failed: %d\n", myproc.nspace, n, tmp, rc);
+            goto done;
+        }
+        ++num_gets;
+        if (0 > asprintf(&tmp, "%s-%d-remote", myproc.nspace, n)) {
+            exit(1);
+        }
+        (void)strncpy(proc.nspace, tmp, PMIX_MAX_NSLEN);
+        if (PMIX_SUCCESS != (rc = PMIx_Get_nb(&proc, tmp,
+                                              NULL, 0, valcbfunc, tmp))) {
+            fprintf(stderr, "Client ns %s rank %d: PMIx_Get %s failed: %d\n", myproc.nspace, n, tmp, rc);
+            goto done;
+        }
+        ++num_gets;
+    }
+
+    /* wait for the first fence to finish */
+    WAIT_FOR_COMPLETION(active);
+
+    /* wait for all my "get" calls to complete */
+    while (getcount < num_gets) {
+        struct timespec ts;
+        ts.tv_sec = 0;
+        ts.tv_nsec = 100000;
+        nanosleep(&ts, NULL);
+    }
+
+    /* call fence again so everyone waits before leaving */
+    (void)strncpy(proc.nspace, myproc.nspace, PMIX_MAX_NSLEN);
+    proc.rank = PMIX_RANK_WILDCARD;
+    if (PMIX_SUCCESS != (rc = PMIx_Fence(&proc, 1, NULL, 0))) {
+        fprintf(stderr, "Client ns %s rank %d: PMIx_Fence failed: %d\n", myproc.nspace, myproc.rank, rc);
+        goto done;
+    }
+
+ done:
+    /* finalize us */
+    fprintf(stderr, "Client ns %s rank %d: Finalizing", myproc.nspace, myproc.rank);
+    if (PMIX_SUCCESS != (rc = PMIx_Finalize(NULL, 0))) {
+        fprintf(stderr, "Client ns %s rank %d:PMIx_Finalize failed: %d\n", myproc.nspace, myproc.rank, rc);
+    } else {
+        fprintf(stderr, "Client ns %s rank %d:PMIx_Finalize successfully completed\n", myproc.nspace, myproc.rank);
+    }
+    fflush(stderr);
+    return(0);
+}
diff --git a/examples/dynamic.c b/examples/dynamic.c
new file mode 100644
index 0000000..3d0942b
--- /dev/null
+++ b/examples/dynamic.c
@@ -0,0 +1,203 @@
+/*
+ * Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2011 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2006-2013 Los Alamos National Security, LLC.
+ *                         All rights reserved.
+ * Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2011      Oak Ridge National Labs.  All rights reserved.
+ * Copyright (c) 2013-2016 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2015      Mellanox Technologies, Inc.  All rights reserved.
+ * Copyright (c) 2016      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ *
+ */
+
+#include <stdbool.h>
+
+#define _GNU_SOURCE
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <time.h>
+#include <sys/param.h>
+
+#include <pmix.h>
+
+
+static pmix_proc_t myproc;
+
+int main(int argc, char **argv)
+{
+    int rc;
+    pmix_value_t value;
+    pmix_value_t *val = &value;
+    pmix_proc_t proc;
+    uint32_t nprocs;
+    char nsp2[PMIX_MAX_NSLEN+1];
+    pmix_app_t *app;
+    char hostname[1024], dir[1024];
+    pmix_proc_t *peers;
+    size_t npeers, ntmp=0;
+    char *nodelist;
+
+    if (0 > gethostname(hostname, sizeof(hostname))) {
+        exit(1);
+    }
+    if (NULL == getcwd(dir, 1024)) {
+        exit(1);
+    }
+
+    /* init us */
+    if (PMIX_SUCCESS != (rc = PMIx_Init(&myproc, NULL, 0))) {
+        fprintf(stderr, "Client ns %s rank %d: PMIx_Init failed: %d\n", myproc.nspace, myproc.rank, rc);
+        exit(0);
+    }
+    fprintf(stderr, "Client ns %s rank %d: Running\n", myproc.nspace, myproc.rank);
+
+    PMIX_PROC_CONSTRUCT(&proc);
+    (void)strncpy(proc.nspace, myproc.nspace, PMIX_MAX_NSLEN);
+    proc.rank = PMIX_RANK_WILDCARD;
+
+    /* get our universe size */
+    if (PMIX_SUCCESS != (rc = PMIx_Get(&proc, PMIX_UNIV_SIZE, NULL, 0, &val))) {
+        fprintf(stderr, "Client ns %s rank %d: PMIx_Get universe size failed: %d\n", myproc.nspace, myproc.rank, rc);
+        goto done;
+    }
+    nprocs = val->data.uint32;
+    PMIX_VALUE_RELEASE(val);
+    fprintf(stderr, "Client %s:%d universe size %d\n", myproc.nspace, myproc.rank, nprocs);
+
+    /* call fence to sync */
+    (void)strncpy(proc.nspace, myproc.nspace, PMIX_MAX_NSLEN);
+    proc.rank = PMIX_RANK_WILDCARD;
+    if (PMIX_SUCCESS != (rc = PMIx_Fence(&proc, 1, NULL, 0))) {
+        fprintf(stderr, "Client ns %s rank %d: PMIx_Fence failed: %d\n", myproc.nspace, myproc.rank, rc);
+        goto done;
+    }
+
+    /* rank=0 calls spawn */
+    if (0 == myproc.rank) {
+        PMIX_APP_CREATE(app, 1);
+        if (0 > asprintf(&app->cmd, "%s/client", dir)) {
+            exit(1);
+        }
+        app->maxprocs = 2;
+        app->argv = (char**)malloc(2 * sizeof(char*));
+        if (0 > asprintf(&app->argv[0], "%s/client", dir)) {
+            exit(1);
+        }
+        app->argv[1] = NULL;
+        app->env = (char**)malloc(2 * sizeof(char*));
+        app->env[0] = strdup("PMIX_ENV_VALUE=3");
+        app->env[1] = NULL;
+        PMIX_INFO_CREATE(app->info, 2);
+        (void)strncpy(app->info[0].key, "DARTH", PMIX_MAX_KEYLEN);
+        app->info[0].value.type = PMIX_INT8;
+        app->info[0].value.data.int8 = 12;
+        (void)strncpy(app->info[1].key, "VADER", PMIX_MAX_KEYLEN);
+        app->info[1].value.type = PMIX_DOUBLE;
+        app->info[1].value.data.dval = 12.34;
+
+        fprintf(stderr, "Client ns %s rank %d: calling PMIx_Spawn\n", myproc.nspace, myproc.rank);
+        if (PMIX_SUCCESS != (rc = PMIx_Spawn(NULL, 0, app, 1, nsp2))) {
+            fprintf(stderr, "Client ns %s rank %d: PMIx_Spawn failed: %d\n", myproc.nspace, myproc.rank, rc);
+            goto done;
+        }
+        PMIX_APP_FREE(app, 1);
+
+        /* get their universe size */
+        val = NULL;
+        (void)strncpy(proc.nspace, nsp2, PMIX_MAX_NSLEN);
+        proc.rank = PMIX_RANK_WILDCARD;
+        if (PMIX_SUCCESS != (rc = PMIx_Get(&proc, PMIX_UNIV_SIZE, NULL, 0, &val)) ||
+            NULL == val) {
+            fprintf(stderr, "Client ns %s rank %d: PMIx_Get universe size failed: %d\n", myproc.nspace, myproc.rank, rc);
+            goto done;
+        }
+        ntmp = val->data.uint32;
+        PMIX_VALUE_RELEASE(val);
+        fprintf(stderr, "Client %s:%d universe %s size %d\n", myproc.nspace, myproc.rank, nsp2, (int)ntmp);
+    }
+
+    /* just cycle the connect/disconnect functions */
+    (void)strncpy(proc.nspace, myproc.nspace, PMIX_MAX_NSLEN);
+    proc.rank = PMIX_RANK_WILDCARD;
+    if (PMIX_SUCCESS != (rc = PMIx_Connect(&proc, 1, NULL, 0))) {
+        fprintf(stderr, "Client ns %s rank %d: PMIx_Connect failed: %d\n", myproc.nspace, myproc.rank, rc);
+        goto done;
+    }
+    fprintf(stderr, "Client ns %s rank %d: PMIx_Connect succeeded\n", myproc.nspace, myproc.rank);
+    if (PMIX_SUCCESS != (rc = PMIx_Disconnect(&proc, 1, NULL, 0))) {
+        fprintf(stderr, "Client ns %s rank %d: PMIx_Disonnect failed: %d\n", myproc.nspace, myproc.rank, rc);
+        goto done;
+    }
+    fprintf(stderr, "Client ns %s rank %d: PMIx_Disconnect succeeded\n", myproc.nspace, myproc.rank);
+
+    /* finally, test the resolve functions */
+    if (0 == myproc.rank) {
+        if (PMIX_SUCCESS != (rc = PMIx_Resolve_peers(hostname, NULL, &peers, &npeers))) {
+            fprintf(stderr, "Client ns %s rank %d: PMIx_Resolve_peers failed for nspace %s: %d\n", myproc.nspace, myproc.rank, nsp2, rc);
+            goto done;
+        }
+        if ((nprocs+ntmp) != npeers) {
+            fprintf(stderr, "Client ns %s rank %d: PMIx_Resolve_peers returned incorrect npeers: %d vs %d\n", myproc.nspace, myproc.rank, (int)(nprocs+ntmp), (int)npeers);
+            goto done;
+        }
+        fprintf(stderr, "Client ns %s rank %d: PMIx_Resolve_peers returned %d npeers\n", myproc.nspace, myproc.rank, (int)npeers);
+        if (PMIX_SUCCESS != (rc = PMIx_Resolve_nodes(nsp2, &nodelist))) {
+            fprintf(stderr, "Client ns %s rank %d: PMIx_Resolve_nodes failed for nspace %s: %d\n", myproc.nspace, myproc.rank, nsp2, rc);
+            goto done;
+        }
+        fprintf(stderr, "Client ns %s rank %d: PMIx_Resolve_nodes %s", myproc.nspace, myproc.rank, nodelist);
+    } else {
+        if (PMIX_SUCCESS != (rc = PMIx_Resolve_peers(hostname, myproc.nspace, &peers, &npeers))) {
+            fprintf(stderr, "Client ns %s rank %d: PMIx_Resolve_peers failed for nspace %s: %d\n", myproc.nspace, myproc.rank, myproc.nspace, rc);
+            goto done;
+        }
+        if (nprocs != npeers) {
+            fprintf(stderr, "Client ns %s rank %d: PMIx_Resolve_peers returned incorrect npeers: %d vs %d\n", myproc.nspace, myproc.rank, nprocs, (int)npeers);
+            goto done;
+        }
+        fprintf(stderr, "Client ns %s rank %d: PMIx_Resolve_peers returned %d npeers\n", myproc.nspace, myproc.rank, (int)npeers);
+        if (PMIX_SUCCESS != (rc = PMIx_Resolve_nodes(myproc.nspace, &nodelist))) {
+            fprintf(stderr, "Client ns %s rank %d: PMIx_Resolve_nodes failed: %d\n", myproc.nspace, myproc.rank, rc);
+            goto done;
+        }
+        fprintf(stderr, "Client ns %s rank %d: PMIx_Resolve_nodes %s\n", myproc.nspace, myproc.rank, nodelist);
+    }
+    PMIX_PROC_FREE(peers, npeers);
+    free(nodelist);
+
+ done:
+    /* call fence to sync */
+    (void)strncpy(proc.nspace, myproc.nspace, PMIX_MAX_NSLEN);
+    proc.rank = PMIX_RANK_WILDCARD;
+    if (PMIX_SUCCESS != (rc = PMIx_Fence(&proc, 1, NULL, 0))) {
+        fprintf(stderr, "Client ns %s rank %d: PMIx_Fence failed: %d\n", myproc.nspace, myproc.rank, rc);
+        goto done;
+    }
+
+    /* finalize us */
+    fprintf(stderr, "Client ns %s rank %d: Finalizing\n", myproc.nspace, myproc.rank);
+
+    if (PMIX_SUCCESS != (rc = PMIx_Finalize(NULL, 0))) {
+        fprintf(stderr, "Client ns %s rank %d:PMIx_Finalize failed: %d\n", myproc.nspace, myproc.rank, rc);
+    } else {
+        fprintf(stderr, "Client ns %s rank %d:PMIx_Finalize successfully completed\n", myproc.nspace, myproc.rank);
+    }
+    fflush(stderr);
+    return(0);
+}
diff --git a/examples/fault.c b/examples/fault.c
new file mode 100644
index 0000000..a197f58
--- /dev/null
+++ b/examples/fault.c
@@ -0,0 +1,131 @@
+/*
+ * Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2011 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2006-2013 Los Alamos National Security, LLC.
+ *                         All rights reserved.
+ * Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2011      Oak Ridge National Labs.  All rights reserved.
+ * Copyright (c) 2013-2016 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2015      Mellanox Technologies, Inc.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ *
+ */
+
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <time.h>
+
+#include <pmix.h>
+
+static pmix_proc_t myproc;
+static bool completed;
+
+static void notification_fn(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)
+{
+    fprintf(stderr, "Client %s:%d NOTIFIED with status %d\n", myproc.nspace, myproc.rank, status);
+    completed = true;
+}
+
+static void op_callbk(pmix_status_t status,
+                      void *cbdata)
+{
+    fprintf(stderr, "Client %s:%d OP CALLBACK CALLED WITH STATUS %d\n", myproc.nspace, myproc.rank, status);
+}
+
+static void errhandler_reg_callbk(pmix_status_t status,
+                                  size_t errhandler_ref,
+                                  void *cbdata)
+{
+    fprintf(stderr, "Client %s:%d ERRHANDLER REGISTRATION CALLBACK CALLED WITH STATUS %d, ref=%lu\n",
+               myproc.nspace, myproc.rank, status, (unsigned long)errhandler_ref);
+}
+
+int main(int argc, char **argv)
+{
+    int rc;
+    pmix_value_t value;
+    pmix_value_t *val = &value;
+    pmix_proc_t proc;
+    uint32_t nprocs;
+
+    /* init us */
+    if (PMIX_SUCCESS != (rc = PMIx_Init(&myproc, NULL, 0))) {
+        fprintf(stderr, "Client ns %s rank %d: PMIx_Init failed: %d\n", myproc.nspace, myproc.rank, rc);
+        exit(0);
+    }
+    fprintf(stderr, "Client ns %s rank %d: Running\n", myproc.nspace, myproc.rank);
+
+    PMIX_PROC_CONSTRUCT(&proc);
+    (void)strncpy(proc.nspace, myproc.nspace, PMIX_MAX_NSLEN);
+    proc.rank = PMIX_RANK_WILDCARD;
+
+    /* get our universe size */
+    if (PMIX_SUCCESS != (rc = PMIx_Get(&proc, PMIX_UNIV_SIZE, NULL, 0, &val))) {
+        fprintf(stderr, "Client ns %s rank %d: PMIx_Get universe size failed: %d\n", myproc.nspace, myproc.rank, rc);
+        goto done;
+    }
+    nprocs = val->data.uint32;
+    PMIX_VALUE_RELEASE(val);
+    fprintf(stderr, "Client %s:%d universe size %d\n", myproc.nspace, myproc.rank, nprocs);
+    completed = false;
+
+    /* register our errhandler */
+    PMIx_Register_event_handler(NULL, 0, NULL, 0,
+                                notification_fn, errhandler_reg_callbk, NULL);
+
+    /* call fence to sync */
+    PMIX_PROC_CONSTRUCT(&proc);
+    (void)strncpy(proc.nspace, myproc.nspace, PMIX_MAX_NSLEN);
+    proc.rank = PMIX_RANK_WILDCARD;
+    if (PMIX_SUCCESS != (rc = PMIx_Fence(&proc, 1, NULL, 0))) {
+        fprintf(stderr, "Client ns %s rank %d: PMIx_Fence failed: %d\n", myproc.nspace, myproc.rank, rc);
+        goto done;
+    }
+
+    /* rank=0 calls abort */
+    if (0 == myproc.rank) {
+        sleep(2);
+        fprintf(stderr, "Client ns %s rank %d: exiting with error\n", myproc.nspace, myproc.rank);
+        exit(1);
+    }
+    /* everyone simply waits */
+    while (!completed) {
+        struct timespec ts;
+        ts.tv_sec = 0;
+        ts.tv_nsec = 100000;
+        nanosleep(&ts, NULL);
+    }
+
+ done:
+    /* finalize us */
+    fprintf(stderr, "Client ns %s rank %d: Finalizing\n", myproc.nspace, myproc.rank);
+    PMIx_Deregister_event_handler(1, op_callbk, NULL);
+
+    if (PMIX_SUCCESS != (rc = PMIx_Finalize(NULL, 0))) {
+        fprintf(stderr, "Client ns %s rank %d:PMIx_Finalize failed: %d\n", myproc.nspace, myproc.rank, rc);
+    } else {
+        fprintf(stderr, "Client ns %s rank %d:PMIx_Finalize successfully completed\n", myproc.nspace, myproc.rank);
+    }
+    fflush(stderr);
+    return(0);
+}
diff --git a/examples/jctrl.c b/examples/jctrl.c
new file mode 100644
index 0000000..5c1c1d1
--- /dev/null
+++ b/examples/jctrl.c
@@ -0,0 +1,229 @@
+/*
+ * Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2011 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2006-2013 Los Alamos National Security, LLC.
+ *                         All rights reserved.
+ * Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2011      Oak Ridge National Labs.  All rights reserved.
+ * Copyright (c) 2013-2017 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2015      Mellanox Technologies, Inc.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ *
+ */
+
+#define _GNU_SOURCE
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <time.h>
+#include <signal.h>
+
+#include <pmix.h>
+
+static pmix_proc_t myproc;
+
+/* this is the event notification function we pass down below
+ * when registering for general events - i.e.,, the default
+ * handler. We don't technically need to register one, but it
+ * is usually good practice to catch any events that occur */
+static void notification_fn(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)
+{
+    if (NULL != cbfunc) {
+        cbfunc(PMIX_EVENT_ACTION_COMPLETE, NULL, 0, NULL, NULL, cbdata);
+    }
+}
+
+/* event handler registration is done asynchronously because it
+ * may involve the PMIx server registering with the host RM for
+ * external events. So we provide a callback function that returns
+ * the status of the request (success or an error), plus a numerical index
+ * to the registered event. The index is used later on to deregister
+ * an event handler - if we don't explicitly deregister it, then the
+ * PMIx server will do so when it see us exit */
+static void evhandler_reg_callbk(pmix_status_t status,
+                                 size_t evhandler_ref,
+                                 void *cbdata)
+{
+    volatile int *active = (volatile int*)cbdata;
+
+    if (PMIX_SUCCESS != status) {
+        fprintf(stderr, "Client %s:%d EVENT HANDLER REGISTRATION FAILED WITH STATUS %d, ref=%lu\n",
+                   myproc.nspace, myproc.rank, status, (unsigned long)evhandler_ref);
+    }
+    *active = status;
+}
+
+static void infocbfunc(pmix_status_t status,
+                       pmix_info_t *info, size_t ninfo,
+                       void *cbdata,
+                       pmix_release_cbfunc_t release_fn,
+                       void *release_cbdata)
+{
+    volatile int *active = (volatile int*)cbdata;
+
+    /* release the caller */
+    if (NULL != release_fn) {
+        release_fn(release_cbdata);
+    }
+
+    *active = status;
+}
+
+int main(int argc, char **argv)
+{
+    int rc;
+    pmix_value_t value;
+    pmix_value_t *val = &value;
+    pmix_proc_t proc;
+    uint32_t nprocs, n;
+    pmix_info_t *info, *iptr;
+    bool flag;
+    volatile int active;
+    pmix_data_array_t *dptr;
+
+    /* init us - note that the call to "init" includes the return of
+     * any job-related info provided by the RM. */
+    if (PMIX_SUCCESS != (rc = PMIx_Init(&myproc, NULL, 0))) {
+        fprintf(stderr, "Client ns %s rank %d: PMIx_Init failed: %d\n", myproc.nspace, myproc.rank, rc);
+        exit(0);
+    }
+    fprintf(stderr, "Client ns %s rank %d: Running\n", myproc.nspace, myproc.rank);
+
+
+    /* register our default event handler - again, this isn't strictly
+     * required, but is generally good practice */
+    active = -1;
+    PMIx_Register_event_handler(NULL, 0, NULL, 0,
+                                notification_fn, evhandler_reg_callbk, (void*)&active);
+    while (-1 == active) {
+        sleep(1);
+    }
+    if (0 != active) {
+        fprintf(stderr, "[%s:%d] Default handler registration failed\n", myproc.nspace, myproc.rank);
+        exit(active);
+    }
+
+    /* job-related info is found in our nspace, assigned to the
+     * wildcard rank as it doesn't relate to a specific rank. Setup
+     * a name to retrieve such values */
+    PMIX_PROC_CONSTRUCT(&proc);
+    (void)strncpy(proc.nspace, myproc.nspace, PMIX_MAX_NSLEN);
+    proc.rank = PMIX_RANK_WILDCARD;
+
+    /* get our universe size */
+    if (PMIX_SUCCESS != (rc = PMIx_Get(&proc, PMIX_UNIV_SIZE, NULL, 0, &val))) {
+        fprintf(stderr, "Client ns %s rank %d: PMIx_Get universe size failed: %d\n", myproc.nspace, myproc.rank, rc);
+        goto done;
+    }
+    nprocs = val->data.uint32;
+    PMIX_VALUE_RELEASE(val);
+    fprintf(stderr, "Client %s:%d universe size %d\n", myproc.nspace, myproc.rank, nprocs);
+
+    /* inform the RM that we are preemptible, and that our checkpoint methods are
+     * "signal" on SIGUSR2 and event on PMIX_JCTRL_CHECKPOINT */
+    PMIX_INFO_CREATE(info, 2);
+    flag = true;
+    PMIX_INFO_LOAD(&info[0], PMIX_JOB_CTRL_PREEMPTIBLE, (void*)&flag, PMIX_BOOL);
+    /* can't use "load" to load a pmix_data_array_t */
+    (void)strncpy(info[1].key, PMIX_JOB_CTRL_CHECKPOINT_METHOD, PMIX_MAX_KEYLEN);
+    info[1].value.type = PMIX_DATA_ARRAY;
+    dptr = (pmix_data_array_t*)malloc(sizeof(pmix_data_array_t));
+    info[1].value.data.darray = dptr;
+    dptr->type = PMIX_INFO;
+    dptr->size = 2;
+    PMIX_INFO_CREATE(dptr->array, dptr->size);
+    rc = SIGUSR2;
+    iptr = (pmix_info_t*)dptr->array;
+    PMIX_INFO_LOAD(&iptr[0], PMIX_JOB_CTRL_CHECKPOINT_SIGNAL, &rc, PMIX_INT);
+    rc = PMIX_JCTRL_CHECKPOINT;
+    PMIX_INFO_LOAD(&iptr[1], PMIX_JOB_CTRL_CHECKPOINT_EVENT, &rc, PMIX_STATUS);
+
+    /* since this is informational and not a requested operation, the target parameter
+     * doesn't mean anything and can be ignored */
+    active = -1;
+    if (PMIX_SUCCESS != (rc = PMIx_Job_control_nb(NULL, 0, info, 2, infocbfunc, (void*)&active))) {
+        fprintf(stderr, "Client ns %s rank %d: PMIx_Job_control_nb failed: %d\n", myproc.nspace, myproc.rank, rc);
+        goto done;
+    }
+    while (-1 == active) {
+        sleep(1);
+    }
+    PMIX_INFO_FREE(info, 2);
+    if (0 != active) {
+        fprintf(stderr, "Client ns %s rank %d: PMIx_Job_control_nb failed: %d\n", myproc.nspace, myproc.rank, rc);
+        exit(active);
+    }
+
+    /* now request that this process be monitored using heartbeats */
+    PMIX_INFO_CREATE(iptr, 1);
+    PMIX_INFO_LOAD(&iptr[0], PMIX_MONITOR_HEARTBEAT, NULL, PMIX_POINTER);
+
+    PMIX_INFO_CREATE(info, 3);
+    PMIX_INFO_LOAD(&info[0], PMIX_MONITOR_ID, "MONITOR1", PMIX_STRING);
+    n = 5;  // require a heartbeat every 5 seconds
+    PMIX_INFO_LOAD(&info[1], PMIX_MONITOR_HEARTBEAT_TIME, &n, PMIX_UINT32);
+    n = 2;  // two heartbeats can be missed before declaring us "stalled"
+    PMIX_INFO_LOAD(&info[2], PMIX_MONITOR_HEARTBEAT_DROPS, &n, PMIX_UINT32);
+
+    /* make the request */
+    active = -1;
+    if (PMIX_SUCCESS != (rc = PMIx_Process_monitor_nb(iptr, PMIX_MONITOR_HEARTBEAT_ALERT,
+                                                      info, 3, infocbfunc, (void*)&active))) {
+        fprintf(stderr, "Client ns %s rank %d: PMIx_Process_monitor_nb failed: %d\n", myproc.nspace, myproc.rank, rc);
+        goto done;
+    }
+    while (-1 == active) {
+        sleep(1);
+    }
+    PMIX_INFO_FREE(iptr, 1);
+    PMIX_INFO_FREE(info, 3);
+    if (0 != active) {
+        fprintf(stderr, "Client ns %s rank %d: PMIx_Process_monitor_nb failed: %d\n", myproc.nspace, myproc.rank, rc);
+        exit(active);
+    }
+
+    /* send a heartbeat */
+    PMIx_Heartbeat();
+
+    /* call fence to synchronize with our peers - no need to
+     * collect any info as we didn't "put" anything */
+    PMIX_INFO_CREATE(info, 1);
+    flag = false;
+    PMIX_INFO_LOAD(info, PMIX_COLLECT_DATA, &flag, PMIX_BOOL);
+    if (PMIX_SUCCESS != (rc = PMIx_Fence(&proc, 1, info, 1))) {
+        fprintf(stderr, "Client ns %s rank %d: PMIx_Fence failed: %d\n", myproc.nspace, myproc.rank, rc);
+        goto done;
+    }
+    PMIX_INFO_FREE(info, 1);
+
+
+  done:
+    /* finalize us */
+    fprintf(stderr, "Client ns %s rank %d: Finalizing\n", myproc.nspace, myproc.rank);
+    if (PMIX_SUCCESS != (rc = PMIx_Finalize(NULL, 0))) {
+        fprintf(stderr, "Client ns %s rank %d:PMIx_Finalize failed: %d\n", myproc.nspace, myproc.rank, rc);
+    } else {
+        fprintf(stderr, "Client ns %s rank %d:PMIx_Finalize successfully completed\n", myproc.nspace, myproc.rank);
+    }
+    fflush(stderr);
+    return(0);
+}
diff --git a/examples/pub.c b/examples/pub.c
new file mode 100644
index 0000000..d7e02c9
--- /dev/null
+++ b/examples/pub.c
@@ -0,0 +1,164 @@
+/*
+ * Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2011 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2006-2013 Los Alamos National Security, LLC.
+ *                         All rights reserved.
+ * Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2011      Oak Ridge National Labs.  All rights reserved.
+ * Copyright (c) 2013-2016 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2015      Mellanox Technologies, Inc.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ *
+ */
+
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <time.h>
+
+#include <pmix.h>
+
+int main(int argc, char **argv)
+{
+    pmix_proc_t myproc;
+    int rc;
+    pmix_value_t value;
+    pmix_value_t *val = &value;
+    pmix_proc_t proc;
+    uint32_t nprocs;
+    pmix_info_t *info;
+    pmix_pdata_t *pdata;
+
+    /* init us */
+    if (PMIX_SUCCESS != (rc = PMIx_Init(&myproc, NULL, 0))) {
+        fprintf(stderr, "Client ns %s rank %d: PMIx_Init failed: %d\n", myproc.nspace, myproc.rank, rc);
+        exit(0);
+    }
+    fprintf(stderr, "Client ns %s rank %d: Running\n", myproc.nspace, myproc.rank);
+
+    /* get our universe size */
+    PMIX_PROC_CONSTRUCT(&proc);
+    (void)strncpy(proc.nspace, myproc.nspace, PMIX_MAX_NSLEN);
+    proc.rank = PMIX_RANK_WILDCARD;
+    if (PMIX_SUCCESS != (rc = PMIx_Get(&proc, PMIX_UNIV_SIZE, NULL, 0, &val))) {
+        fprintf(stderr, "Client ns %s rank %d: PMIx_Get universe size failed: %d\n", myproc.nspace, myproc.rank, rc);
+        goto done;
+    }
+    nprocs = val->data.uint32;
+    PMIX_VALUE_RELEASE(val);
+    fprintf(stderr, "Client %s:%d universe size %d\n", myproc.nspace, myproc.rank, nprocs);
+
+    /* call fence to ensure the data is received */
+    if (PMIX_SUCCESS != (rc = PMIx_Fence(&proc, 1, NULL, 0))) {
+        fprintf(stderr, "Client ns %s rank %d: PMIx_Fence failed: %d\n", myproc.nspace, myproc.rank, rc);
+        goto done;
+    }
+
+    /* publish something */
+    if (0 == myproc.rank) {
+        PMIX_INFO_CREATE(info, 2);
+        (void)strncpy(info[0].key, "FOOBAR", PMIX_MAX_KEYLEN);
+        info[0].value.type = PMIX_UINT8;
+        info[0].value.data.uint8 = 1;
+        (void)strncpy(info[1].key, "PANDA", PMIX_MAX_KEYLEN);
+        info[1].value.type = PMIX_SIZE;
+        info[1].value.data.size = 123456;
+        if (PMIX_SUCCESS != (rc = PMIx_Publish(info, 2))) {
+            fprintf(stderr, "Client ns %s rank %d: PMIx_Publish failed: %d\n", myproc.nspace, myproc.rank, rc);
+            goto done;
+        }
+        PMIX_INFO_FREE(info, 2);
+    }
+
+    /* call fence again so all procs know the data
+     * has been published */
+    if (PMIX_SUCCESS != (rc = PMIx_Fence(&proc, 1, NULL, 0))) {
+        fprintf(stderr, "Client ns %s rank %d: PMIx_Fence failed: %d\n", myproc.nspace, myproc.rank, rc);
+        goto done;
+    }
+
+    /* lookup something */
+    if (0 != myproc.rank) {
+        PMIX_PDATA_CREATE(pdata, 1);
+        (void)strncpy(pdata[0].key, "FOOBAR", PMIX_MAX_KEYLEN);
+        if (PMIX_SUCCESS != (rc = PMIx_Lookup(pdata, 1, NULL, 0))) {
+            fprintf(stderr, "Client ns %s rank %d: PMIx_Lookup failed: %d\n", myproc.nspace, myproc.rank, rc);
+            goto done;
+        }
+        /* check the return for value and source */
+        if (0 != strncmp(myproc.nspace, pdata[0].proc.nspace, PMIX_MAX_NSLEN)) {
+            fprintf(stderr, "Client ns %s rank %d: PMIx_Lookup returned wrong nspace: %s\n",
+                        myproc.nspace, myproc.rank, pdata[0].proc.nspace);
+            goto done;
+        }
+        if (0 != pdata[0].proc.rank) {
+            fprintf(stderr, "Client ns %s rank %d: PMIx_Lookup returned wrong rank: %d\n",
+                        myproc.nspace, myproc.rank, pdata[0].proc.rank);
+            goto done;
+        }
+        if (PMIX_UINT8 != pdata[0].value.type) {
+            fprintf(stderr, "Client ns %s rank %d: PMIx_Lookup returned wrong type: %d\n",
+                        myproc.nspace, myproc.rank, pdata[0].value.type);
+            goto done;
+        }
+        if (1 != pdata[0].value.data.uint8) {
+            fprintf(stderr, "Client ns %s rank %d: PMIx_Lookup returned wrong value: %d\n",
+                        myproc.nspace, myproc.rank, (int)pdata[0].value.data.uint8);
+            goto done;
+        }
+        PMIX_PDATA_FREE(pdata, 1);
+        fprintf(stderr, "PUBLISH-LOOKUP SUCCEEDED\n");
+    }
+
+    /* call fence again so rank 0 waits before leaving */
+    if (PMIX_SUCCESS != (rc = PMIx_Fence(&proc, 1, NULL, 0))) {
+        fprintf(stderr, "Client ns %s rank %d: PMIx_Fence failed: %d\n", myproc.nspace, myproc.rank, rc);
+        goto done;
+    }
+
+    if (0 == myproc.rank) {
+        char **keys;
+        keys = (char**)malloc(3 * sizeof(char*));
+        keys[0] = "FOOBAR";
+        keys[1] = "PANDA";
+        keys[2] = NULL;
+
+        if (PMIX_SUCCESS != (rc = PMIx_Unpublish(keys, NULL, 0))) {
+            fprintf(stderr, "Client ns %s rank %d: PMIx_Unpublish failed: %d\n", myproc.nspace, myproc.rank, rc);
+            free(keys);
+            goto done;
+        }
+        free(keys);
+        fprintf(stderr, "UNPUBLISH SUCCEEDED\n");
+    }
+
+    /* call fence again so everyone waits for rank 0 before leaving */
+    if (PMIX_SUCCESS != (rc = PMIx_Fence(&proc, 1, NULL, 0))) {
+        fprintf(stderr, "Client ns %s rank %d: PMIx_Fence failed: %d\n", myproc.nspace, myproc.rank, rc);
+        goto done;
+    }
+
+ done:
+    /* finalize us */
+    fprintf(stderr, "Client ns %s rank %d: Finalizing\n", myproc.nspace, myproc.rank);
+    if (PMIX_SUCCESS != (rc = PMIx_Finalize(NULL, 0))) {
+        fprintf(stderr, "Client ns %s rank %d:PMIx_Finalize failed: %d\n", myproc.nspace, myproc.rank, rc);
+    } else {
+        fprintf(stderr, "Client ns %s rank %d:PMIx_Finalize successfully completed\n", myproc.nspace, myproc.rank);
+    }
+    fflush(stderr);
+    return(0);
+}
diff --git a/examples/server.c b/examples/server.c
new file mode 100644
index 0000000..5a1ccaa
--- /dev/null
+++ b/examples/server.c
@@ -0,0 +1,893 @@
+/*
+ * Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2011 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2006-2013 Los Alamos National Security, LLC.
+ *                         All rights reserved.
+ * Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2011      Oak Ridge National Labs.  All rights reserved.
+ * Copyright (c) 2013-2017 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2016      IBM Corporation.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ *
+ */
+
+#include <src/include/pmix_config.h>
+#include <pmix_server.h>
+#include <src/include/types.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <time.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <errno.h>
+#include <signal.h>
+#include <pwd.h>
+#include <sys/stat.h>
+#include <dirent.h>
+
+#include PMIX_EVENT_HEADER
+
+#include "src/class/pmix_list.h"
+#include "src/util/pmix_environ.h"
+#include "src/util/output.h"
+#include "src/util/printf.h"
+#include "src/util/argv.h"
+#include "src/buffer_ops/buffer_ops.h"
+
+static pmix_status_t connected(const pmix_proc_t *proc, void *server_object,
+                               pmix_op_cbfunc_t cbfunc, void *cbdata);
+static pmix_status_t finalized(const pmix_proc_t *proc, void *server_object,
+                               pmix_op_cbfunc_t cbfunc, void *cbdata);
+static pmix_status_t abort_fn(const pmix_proc_t *proc, void *server_object,
+                              int status, const char msg[],
+                              pmix_proc_t procs[], size_t nprocs,
+                              pmix_op_cbfunc_t cbfunc, void *cbdata);
+static pmix_status_t fencenb_fn(const pmix_proc_t procs[], size_t nprocs,
+                                const pmix_info_t info[], size_t ninfo,
+                                char *data, size_t ndata,
+                                pmix_modex_cbfunc_t cbfunc, void *cbdata);
+static pmix_status_t dmodex_fn(const pmix_proc_t *proc,
+                               const pmix_info_t info[], size_t ninfo,
+                               pmix_modex_cbfunc_t cbfunc, void *cbdata);
+static pmix_status_t publish_fn(const pmix_proc_t *proc,
+                                const pmix_info_t info[], size_t ninfo,
+                                pmix_op_cbfunc_t cbfunc, void *cbdata);
+static pmix_status_t lookup_fn(const pmix_proc_t *proc, char **keys,
+                               const pmix_info_t info[], size_t ninfo,
+                               pmix_lookup_cbfunc_t cbfunc, void *cbdata);
+static pmix_status_t unpublish_fn(const pmix_proc_t *proc, char **keys,
+                                  const pmix_info_t info[], size_t ninfo,
+                                  pmix_op_cbfunc_t cbfunc, void *cbdata);
+static pmix_status_t spawn_fn(const pmix_proc_t *proc,
+                              const pmix_info_t job_info[], size_t ninfo,
+                              const pmix_app_t apps[], size_t napps,
+                              pmix_spawn_cbfunc_t cbfunc, void *cbdata);
+static pmix_status_t connect_fn(const pmix_proc_t procs[], size_t nprocs,
+                                const pmix_info_t info[], size_t ninfo,
+                                pmix_op_cbfunc_t cbfunc, void *cbdata);
+static pmix_status_t disconnect_fn(const pmix_proc_t procs[], size_t nprocs,
+                                   const pmix_info_t info[], size_t ninfo,
+                                   pmix_op_cbfunc_t cbfunc, void *cbdata);
+static pmix_status_t register_event_fn(pmix_status_t *codes, size_t ncodes,
+                                       const pmix_info_t info[], size_t ninfo,
+                                       pmix_op_cbfunc_t cbfunc, void *cbdata);
+static pmix_status_t deregister_events(pmix_status_t *codes, size_t ncodes,
+                                       pmix_op_cbfunc_t cbfunc, void *cbdata);
+static pmix_status_t notify_event(pmix_status_t code,
+                                  const pmix_proc_t *source,
+                                  pmix_data_range_t range,
+                                  pmix_info_t info[], size_t ninfo,
+                                  pmix_op_cbfunc_t cbfunc, void *cbdata);
+static pmix_status_t query_fn(pmix_proc_t *proct,
+                              pmix_query_t *queries, size_t nqueries,
+                              pmix_info_cbfunc_t cbfunc,
+                              void *cbdata);
+static void tool_connect_fn(pmix_info_t *info, size_t ninfo,
+                            pmix_tool_connection_cbfunc_t cbfunc,
+                            void *cbdata);
+static void log_fn(const pmix_proc_t *client,
+                   const pmix_info_t data[], size_t ndata,
+                   const pmix_info_t directives[], size_t ndirs,
+                   pmix_op_cbfunc_t cbfunc, void *cbdata);
+
+static pmix_server_module_t mymodule = {
+    .client_connected = connected,
+    .client_finalized = finalized,
+    .abort = abort_fn,
+    .fence_nb = fencenb_fn,
+    .direct_modex = dmodex_fn,
+    .publish = publish_fn,
+    .lookup = lookup_fn,
+    .unpublish = unpublish_fn,
+    .spawn = spawn_fn,
+    .connect = connect_fn,
+    .disconnect = disconnect_fn,
+    .register_events = register_event_fn,
+    .deregister_events = deregister_events,
+    .notify_event = notify_event,
+    .query = query_fn,
+    .tool_connected = tool_connect_fn,
+    .log = log_fn
+};
+
+typedef struct {
+    pmix_list_item_t super;
+    pmix_pdata_t pdata;
+} pmix_locdat_t;
+PMIX_CLASS_INSTANCE(pmix_locdat_t,
+                    pmix_list_item_t,
+                    NULL, NULL);
+
+typedef struct {
+    pmix_object_t super;
+    volatile bool active;
+    pmix_proc_t caller;
+    pmix_info_t *info;
+    size_t ninfo;
+    pmix_op_cbfunc_t cbfunc;
+    pmix_spawn_cbfunc_t spcbfunc;
+    void *cbdata;
+} myxfer_t;
+static void xfcon(myxfer_t *p)
+{
+    p->info = NULL;
+    p->ninfo = 0;
+    p->active = true;
+    p->cbfunc = NULL;
+    p->spcbfunc = NULL;
+    p->cbdata = NULL;
+}
+static void xfdes(myxfer_t *p)
+{
+    if (NULL != p->info) {
+        PMIX_INFO_FREE(p->info, p->ninfo);
+    }
+}
+PMIX_CLASS_INSTANCE(myxfer_t,
+                    pmix_object_t,
+                    xfcon, xfdes);
+
+typedef struct {
+    pmix_list_item_t super;
+    pid_t pid;
+} wait_tracker_t;
+PMIX_CLASS_INSTANCE(wait_tracker_t,
+                    pmix_list_item_t,
+                    NULL, NULL);
+
+static volatile int wakeup;
+static pmix_list_t pubdata;
+static pmix_event_t handler;
+static pmix_list_t children;
+
+static void set_namespace(int nprocs, char *ranks, char *nspace,
+                          pmix_op_cbfunc_t cbfunc, myxfer_t *x);
+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);
+static void wait_signal_callback(int fd, short event, void *arg);
+static void errhandler_reg_callbk (pmix_status_t status,
+                                   size_t errhandler_ref,
+                                   void *cbdata);
+
+static void opcbfunc(pmix_status_t status, void *cbdata)
+{
+    myxfer_t *x = (myxfer_t*)cbdata;
+
+    /* release the caller, if necessary */
+    if (NULL != x->cbfunc) {
+        x->cbfunc(PMIX_SUCCESS, x->cbdata);
+    }
+    x->active = false;
+}
+
+int main(int argc, char **argv)
+{
+    char **client_env=NULL;
+    char **client_argv=NULL;
+    char *tmp, **atmp, *executable=NULL, *tmpdir, *cleanup;
+    int rc, nprocs=1, n, k;
+    uid_t myuid;
+    gid_t mygid;
+    pid_t pid;
+    myxfer_t *x;
+    pmix_proc_t proc;
+    wait_tracker_t *child;
+    char *tdir;
+    uid_t uid = geteuid();
+    pmix_info_t *info;
+    struct stat buf;
+
+    /* define and pass a personal tmpdir to protect the system */
+    if (NULL == (tdir = getenv("TMPDIR"))) {
+        if (NULL == (tdir = getenv("TEMP"))) {
+            if (NULL == (tdir = getenv("TMP"))) {
+                tdir = "/tmp";
+            }
+        }
+    }
+    if (0 > asprintf(&tmpdir, "%s/pmix.%lu", tdir, (long unsigned)uid)) {
+        fprintf(stderr, "Out of memory\n");
+        exit(1);
+    }
+    /* create the directory */
+    if (0 != stat(tmpdir, &buf)) {
+        /* try to make directory */
+        if (0 != mkdir(tmpdir, S_IRWXU)) {
+            fprintf(stderr, "Cannot make tmpdir %s", tmpdir);
+            exit(1);
+        }
+    }
+    asprintf(&cleanup, "rm -rf %s", tmpdir);
+    PMIX_INFO_CREATE(info, 1);
+    PMIX_INFO_LOAD(&info[0], PMIX_SERVER_TMPDIR, tmpdir, PMIX_STRING);
+
+    /* setup the server library */
+    if (PMIX_SUCCESS != (rc = PMIx_server_init(&mymodule, info, 1))) {
+        fprintf(stderr, "Init failed with error %d\n", rc);
+        return rc;
+    }
+    PMIX_INFO_FREE(info, 1);
+
+    /* register the errhandler */
+    PMIx_Register_event_handler(NULL, 0, NULL, 0,
+                                errhandler, errhandler_reg_callbk, NULL);
+
+    /* setup the pub data, in case it is used */
+    PMIX_CONSTRUCT(&pubdata, pmix_list_t);
+
+    /* setup to see sigchld on the forked tests */
+    PMIX_CONSTRUCT(&children, pmix_list_t);
+    event_assign(&handler, pmix_globals.evbase, SIGCHLD,
+                 EV_SIGNAL|EV_PERSIST,wait_signal_callback, &handler);
+    event_add(&handler, NULL);
+
+    /* see if we were passed the number of procs to run or
+     * the executable to use */
+    for (n=1; n < (argc-1); n++) {
+        if (0 == strcmp("-n", argv[n]) &&
+            NULL != argv[n+1]) {
+            nprocs = strtol(argv[n+1], NULL, 10);
+            ++n;  // step over the argument
+        } else if (0 == strcmp("-e", argv[n]) &&
+                   NULL != argv[n+1]) {
+            executable = strdup(argv[n+1]);
+            for (k=n+2; NULL != argv[k]; k++) {
+                pmix_argv_append_nosize(&client_argv, argv[k]);
+            }
+            n += k;
+        }
+    }
+    if (NULL == executable) {
+        executable = strdup("./simpclient");
+    }
+
+    /* we have a single namespace for all clients */
+    atmp = NULL;
+    for (n=0; n < nprocs; n++) {
+        asprintf(&tmp, "%d", n);
+        pmix_argv_append_nosize(&atmp, tmp);
+        free(tmp);
+    }
+    tmp = pmix_argv_join(atmp, ',');
+    pmix_argv_free(atmp);
+    /* register the nspace */
+    x = PMIX_NEW(myxfer_t);
+    set_namespace(nprocs, tmp, "foobar", opcbfunc, x);
+
+    /* set common argv and env */
+    client_env = pmix_argv_copy(environ);
+    pmix_argv_prepend_nosize(&client_argv, executable);
+
+    wakeup = nprocs;
+    myuid = getuid();
+    mygid = getgid();
+
+    /* if the nspace registration hasn't completed yet,
+     * wait for it here */
+    PMIX_WAIT_FOR_COMPLETION(x->active);
+    free(tmp);
+    PMIX_RELEASE(x);
+
+    /* prep the local node for launch */
+    x = PMIX_NEW(myxfer_t);
+    if (PMIX_SUCCESS != (rc = PMIx_server_setup_local_support("foobar", NULL, 0, opcbfunc, x))) {
+        fprintf(stderr, "Setup local support failed: %d\n", rc);
+        PMIx_server_finalize();
+        system(cleanup);
+        return rc;
+    }
+    PMIX_WAIT_FOR_COMPLETION(x->active);
+    PMIX_RELEASE(x);
+
+    /* fork/exec the test */
+    (void)strncpy(proc.nspace, "foobar", PMIX_MAX_NSLEN);
+    for (n = 0; n < nprocs; n++) {
+        proc.rank = n;
+        if (PMIX_SUCCESS != (rc = PMIx_server_setup_fork(&proc, &client_env))) {//n
+            fprintf(stderr, "Server fork setup failed with error %d\n", rc);
+            PMIx_server_finalize();
+            system(cleanup);
+            return rc;
+        }
+        x = PMIX_NEW(myxfer_t);
+        if (PMIX_SUCCESS != (rc = PMIx_server_register_client(&proc, myuid, mygid,
+                                                              NULL, opcbfunc, x))) {
+            fprintf(stderr, "Server fork setup failed with error %d\n", rc);
+            PMIx_server_finalize();
+            system(cleanup);
+            return rc;
+        }
+        /* don't fork/exec the client until we know it is registered
+         * so we avoid a potential race condition in the server */
+        PMIX_WAIT_FOR_COMPLETION(x->active);
+        PMIX_RELEASE(x);
+        pid = fork();
+        if (pid < 0) {
+            fprintf(stderr, "Fork failed\n");
+            PMIx_server_finalize();
+            system(cleanup);
+            return -1;
+        }
+        child = PMIX_NEW(wait_tracker_t);
+        child->pid = pid;
+        pmix_list_append(&children, &child->super);
+
+        if (pid == 0) {
+            execve(executable, client_argv, client_env);
+            /* Does not return */
+            exit(0);
+        }
+    }
+    free(executable);
+    pmix_argv_free(client_argv);
+    pmix_argv_free(client_env);
+
+    /* hang around until the client(s) finalize */
+    while (0 < wakeup) {
+        struct timespec ts;
+        ts.tv_sec = 0;
+        ts.tv_nsec = 100000;
+        nanosleep(&ts, NULL);
+    }
+
+    /* deregister the errhandler */
+    PMIx_Deregister_event_handler(0, NULL, NULL);
+
+    /* release any pub data */
+    PMIX_LIST_DESTRUCT(&pubdata);
+
+    /* finalize the server library */
+    if (PMIX_SUCCESS != (rc = PMIx_server_finalize())) {
+        fprintf(stderr, "Finalize failed with error %d\n", rc);
+    }
+
+    fprintf(stderr, "Test finished OK!\n");
+    system(cleanup);
+
+    return rc;
+}
+
+static void setup_cbfunc(pmix_status_t status,
+                         pmix_info_t info[], size_t ninfo,
+                         void *provided_cbdata,
+                         pmix_op_cbfunc_t cbfunc, void *cbdata)
+{
+    myxfer_t *myxfer = (myxfer_t*)provided_cbdata;
+    size_t i;
+
+    if (PMIX_SUCCESS == status && 0 < ninfo) {
+        myxfer->ninfo = ninfo;
+        PMIX_INFO_CREATE(myxfer->info, ninfo);
+        for (i=0; i < ninfo; i++) {
+            PMIX_INFO_XFER(&myxfer->info[i], &info[i]);
+        }
+    }
+    if (NULL != cbfunc) {
+        cbfunc(PMIX_SUCCESS, cbdata);
+    }
+    myxfer->active = false;
+}
+
+static void set_namespace(int nprocs, char *ranks, char *nspace,
+                          pmix_op_cbfunc_t cbfunc, myxfer_t *x)
+{
+    char *regex, *ppn;
+    char hostname[PMIX_MAXHOSTNAMELEN];
+    pmix_status_t rc;
+    myxfer_t myxfer;
+    size_t i;
+
+    gethostname(hostname, sizeof(hostname));
+
+    /* request application setup information - e.g., network
+     * security keys or endpoint info */
+    PMIX_CONSTRUCT(&myxfer, myxfer_t);
+    myxfer.active = true;
+    if (PMIX_SUCCESS != (rc = PMIx_server_setup_application(nspace, NULL, 0, setup_cbfunc, &myxfer))) {
+        PMIX_DESTRUCT(&myxfer);
+        fprintf(stderr, "Failed to setup application: %d\n", rc);
+        exit(1);
+    }
+    PMIX_WAIT_FOR_COMPLETION(myxfer.active);
+    x->ninfo = myxfer.ninfo + 7;
+
+    PMIX_INFO_CREATE(x->info, x->ninfo);
+    if (0 < myxfer.ninfo) {
+        for (i=0; i < myxfer.ninfo; i++) {
+            PMIX_INFO_XFER(&x->info[i], &myxfer.info[i]);
+        }
+    }
+    PMIX_DESTRUCT(&myxfer);
+
+    (void)strncpy(x->info[i].key, PMIX_UNIV_SIZE, PMIX_MAX_KEYLEN);
+    x->info[i].value.type = PMIX_UINT32;
+    x->info[i].value.data.uint32 = nprocs;
+
+    ++i;
+    (void)strncpy(x->info[i].key, PMIX_SPAWNED, PMIX_MAX_KEYLEN);
+    x->info[i].value.type = PMIX_UINT32;
+    x->info[i].value.data.uint32 = 0;
+
+    ++i;
+    (void)strncpy(x->info[i].key, PMIX_LOCAL_SIZE, PMIX_MAX_KEYLEN);
+    x->info[i].value.type = PMIX_UINT32;
+    x->info[i].value.data.uint32 = nprocs;
+
+    ++i;
+    (void)strncpy(x->info[i].key, PMIX_LOCAL_PEERS, PMIX_MAX_KEYLEN);
+    x->info[i].value.type = PMIX_STRING;
+    x->info[i].value.data.string = strdup(ranks);
+
+    ++i;
+    PMIx_generate_regex(hostname, &regex);
+    (void)strncpy(x->info[i].key, PMIX_NODE_MAP, PMIX_MAX_KEYLEN);
+    x->info[i].value.type = PMIX_STRING;
+    x->info[i].value.data.string = regex;
+
+    ++i;
+    PMIx_generate_ppn(ranks, &ppn);
+    (void)strncpy(x->info[i].key, PMIX_PROC_MAP, PMIX_MAX_KEYLEN);
+    x->info[i].value.type = PMIX_STRING;
+    x->info[i].value.data.string = ppn;
+
+    ++i;
+    (void)strncpy(x->info[i].key, PMIX_JOB_SIZE, PMIX_MAX_KEYLEN);
+    x->info[i].value.type = PMIX_UINT32;
+    x->info[i].value.data.uint32 = nprocs;
+
+    PMIx_server_register_nspace(nspace, nprocs, x->info, x->ninfo,
+                                cbfunc, x);
+}
+
+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)
+{
+    pmix_output(0, "SERVER: ERRHANDLER CALLED WITH STATUS %d", status);
+}
+
+static void errhandler_reg_callbk (pmix_status_t status,
+                                   size_t errhandler_ref,
+                                   void *cbdata)
+{
+    return;
+}
+
+static pmix_status_t connected(const pmix_proc_t *proc, void *server_object,
+                               pmix_op_cbfunc_t cbfunc, void *cbdata)
+{
+    if (NULL != cbfunc) {
+        cbfunc(PMIX_SUCCESS, cbdata);
+    }
+    return PMIX_SUCCESS;
+}
+static pmix_status_t finalized(const pmix_proc_t *proc, void *server_object,
+                     pmix_op_cbfunc_t cbfunc, void *cbdata)
+{
+    pmix_output(0, "SERVER: FINALIZED %s:%d",
+                proc->nspace, proc->rank);
+    --wakeup;
+    /* ensure we call the cbfunc so the proc can exit! */
+    if (NULL != cbfunc) {
+        cbfunc(PMIX_SUCCESS, cbdata);
+    }
+    return PMIX_SUCCESS;
+}
+
+static void abcbfunc(pmix_status_t status, void *cbdata)
+{
+    myxfer_t *x = (myxfer_t*)cbdata;
+
+    /* be sure to release the caller */
+    if (NULL != x->cbfunc) {
+        x->cbfunc(status, x->cbdata);
+    }
+    PMIX_RELEASE(x);
+}
+
+static pmix_status_t abort_fn(const pmix_proc_t *proc,
+                              void *server_object,
+                              int status, const char msg[],
+                              pmix_proc_t procs[], size_t nprocs,
+                              pmix_op_cbfunc_t cbfunc, void *cbdata)
+{
+    pmix_status_t rc;
+    myxfer_t *x;
+
+    if (NULL != procs) {
+        pmix_output(0, "SERVER: ABORT on %s:%d", procs[0].nspace, procs[0].rank);
+    } else {
+        pmix_output(0, "SERVER: ABORT OF ALL PROCS IN NSPACE %s", proc->nspace);
+    }
+
+    /* instead of aborting the specified procs, notify them
+     * (if they have registered their errhandler) */
+
+    /* use the myxfer_t object to ensure we release
+     * the caller when notification has been queued */
+    x = PMIX_NEW(myxfer_t);
+    (void)strncpy(x->caller.nspace, proc->nspace, PMIX_MAX_NSLEN);
+    x->caller.rank = proc->rank;
+
+    PMIX_INFO_CREATE(x->info, 2);
+    (void)strncpy(x->info[0].key, "DARTH", PMIX_MAX_KEYLEN);
+    x->info[0].value.type = PMIX_INT8;
+    x->info[0].value.data.int8 = 12;
+    (void)strncpy(x->info[1].key, "VADER", PMIX_MAX_KEYLEN);
+    x->info[1].value.type = PMIX_DOUBLE;
+    x->info[1].value.data.dval = 12.34;
+    x->cbfunc = cbfunc;
+    x->cbdata = cbdata;
+
+    if (PMIX_SUCCESS != (rc = PMIx_Notify_event(status, &x->caller,
+                                                PMIX_RANGE_NAMESPACE,
+                                                x->info, 2,
+                                                abcbfunc, x))) {
+        pmix_output(0, "SERVER: FAILED NOTIFY ERROR %d", (int)rc);
+    }
+
+    return PMIX_SUCCESS;
+}
+
+
+static pmix_status_t fencenb_fn(const pmix_proc_t procs[], size_t nprocs,
+                      const pmix_info_t info[], size_t ninfo,
+                      char *data, size_t ndata,
+                      pmix_modex_cbfunc_t cbfunc, void *cbdata)
+{
+    pmix_output(0, "SERVER: FENCENB");
+    /* pass the provided data back to each participating proc */
+    if (NULL != cbfunc) {
+        cbfunc(PMIX_SUCCESS, data, ndata, cbdata, NULL, NULL);
+    }
+    return PMIX_SUCCESS;
+}
+
+
+static pmix_status_t dmodex_fn(const pmix_proc_t *proc,
+                     const pmix_info_t info[], size_t ninfo,
+                     pmix_modex_cbfunc_t cbfunc, void *cbdata)
+{
+    pmix_output(0, "SERVER: DMODEX");
+
+    /* we don't have any data for remote procs as this
+     * test only runs one server - so report accordingly */
+    if (NULL != cbfunc) {
+        cbfunc(PMIX_ERR_NOT_FOUND, NULL, 0, cbdata, NULL, NULL);
+    }
+    return PMIX_SUCCESS;
+}
+
+
+static pmix_status_t publish_fn(const pmix_proc_t *proc,
+                      const pmix_info_t info[], size_t ninfo,
+                      pmix_op_cbfunc_t cbfunc, void *cbdata)
+{
+    pmix_locdat_t *p;
+    size_t n;
+
+    pmix_output(0, "SERVER: PUBLISH");
+
+    for (n=0; n < ninfo; n++) {
+        p = PMIX_NEW(pmix_locdat_t);
+        (void)strncpy(p->pdata.proc.nspace, proc->nspace, PMIX_MAX_NSLEN);
+        p->pdata.proc.rank = proc->rank;
+        (void)strncpy(p->pdata.key, info[n].key, PMIX_MAX_KEYLEN);
+        pmix_value_xfer(&p->pdata.value, (pmix_value_t*)&info[n].value);
+        pmix_list_append(&pubdata, &p->super);
+    }
+    if (NULL != cbfunc) {
+        cbfunc(PMIX_SUCCESS, cbdata);
+    }
+    return PMIX_SUCCESS;
+}
+
+
+static pmix_status_t lookup_fn(const pmix_proc_t *proc, char **keys,
+                     const pmix_info_t info[], size_t ninfo,
+                     pmix_lookup_cbfunc_t cbfunc, void *cbdata)
+{
+    pmix_locdat_t *p, *p2;
+    pmix_list_t results;
+    size_t i, n;
+    pmix_pdata_t *pd = NULL;
+    pmix_status_t ret = PMIX_ERR_NOT_FOUND;
+
+    pmix_output(0, "SERVER: LOOKUP");
+
+    PMIX_CONSTRUCT(&results, pmix_list_t);
+
+    for (n=0; NULL != keys[n]; n++) {
+        PMIX_LIST_FOREACH(p, &pubdata, pmix_locdat_t) {
+            if (0 == strncmp(keys[n], p->pdata.key, PMIX_MAX_KEYLEN)) {
+                p2 = PMIX_NEW(pmix_locdat_t);
+                (void)strncpy(p2->pdata.proc.nspace, p->pdata.proc.nspace, PMIX_MAX_NSLEN);
+                p2->pdata.proc.rank = p->pdata.proc.rank;
+                (void)strncpy(p2->pdata.key, p->pdata.key, PMIX_MAX_KEYLEN);
+                pmix_value_xfer(&p2->pdata.value, &p->pdata.value);
+                pmix_list_append(&results, &p2->super);
+                break;
+            }
+        }
+    }
+    if (0 < (n = pmix_list_get_size(&results))) {
+        ret = PMIX_SUCCESS;
+        PMIX_PDATA_CREATE(pd, n);
+        for (i=0; i < n; i++) {
+            p = (pmix_locdat_t*)pmix_list_remove_first(&results);
+            if (p) {
+                (void)strncpy(pd[i].proc.nspace, p->pdata.proc.nspace, PMIX_MAX_NSLEN);
+                pd[i].proc.rank = p->pdata.proc.rank;
+                (void)strncpy(pd[i].key, p->pdata.key, PMIX_MAX_KEYLEN);
+                pmix_value_xfer(&pd[i].value, &p->pdata.value);
+            }
+        }
+    }
+    PMIX_LIST_DESTRUCT(&results);
+    if (NULL != cbfunc) {
+        cbfunc(ret, pd, n, cbdata);
+    }
+    if (0 < n) {
+        PMIX_PDATA_FREE(pd, n);
+    }
+    return PMIX_SUCCESS;
+}
+
+
+static pmix_status_t unpublish_fn(const pmix_proc_t *proc, char **keys,
+                        const pmix_info_t info[], size_t ninfo,
+                        pmix_op_cbfunc_t cbfunc, void *cbdata)
+{
+    pmix_locdat_t *p, *p2;
+    size_t n;
+
+    pmix_output(0, "SERVER: UNPUBLISH");
+
+    for (n=0; NULL != keys[n]; n++) {
+        PMIX_LIST_FOREACH_SAFE(p, p2, &pubdata, pmix_locdat_t) {
+            if (0 == strncmp(keys[n], p->pdata.key, PMIX_MAX_KEYLEN)) {
+                pmix_list_remove_item(&pubdata, &p->super);
+                PMIX_RELEASE(p);
+                break;
+            }
+        }
+    }
+    if (NULL != cbfunc) {
+        cbfunc(PMIX_SUCCESS, cbdata);
+    }
+    return PMIX_SUCCESS;
+}
+
+static void spcbfunc(pmix_status_t status, void *cbdata)
+{
+    myxfer_t *x = (myxfer_t*)cbdata;
+
+    if (NULL != x->spcbfunc) {
+        x->spcbfunc(PMIX_SUCCESS, "DYNSPACE", x->cbdata);
+    }
+}
+
+static pmix_status_t spawn_fn(const pmix_proc_t *proc,
+                    const pmix_info_t job_info[], size_t ninfo,
+                    const pmix_app_t apps[], size_t napps,
+                    pmix_spawn_cbfunc_t cbfunc, void *cbdata)
+{
+    myxfer_t *x;
+
+    pmix_output(0, "SERVER: SPAWN");
+
+    /* in practice, we would pass this request to the local
+     * resource manager for launch, and then have that server
+     * execute our callback function. For now, we will fake
+     * the spawn and just pretend */
+
+    /* must register the nspace for the new procs before
+     * we return to the caller */
+    x = PMIX_NEW(myxfer_t);
+    x->spcbfunc = cbfunc;
+    x->cbdata = cbdata;
+
+    set_namespace(2, "0,1", "DYNSPACE", spcbfunc, x);
+
+    return PMIX_SUCCESS;
+}
+
+
+static pmix_status_t connect_fn(const pmix_proc_t procs[], size_t nprocs,
+                                const pmix_info_t info[], size_t ninfo,
+                                pmix_op_cbfunc_t cbfunc, void *cbdata)
+{
+    pmix_output(0, "SERVER: CONNECT");
+
+    /* in practice, we would pass this request to the local
+     * resource manager for handling */
+
+    if (NULL != cbfunc) {
+        cbfunc(PMIX_SUCCESS, cbdata);
+    }
+
+    return PMIX_SUCCESS;
+}
+
+
+static pmix_status_t disconnect_fn(const pmix_proc_t procs[], size_t nprocs,
+                                   const pmix_info_t info[], size_t ninfo,
+                                   pmix_op_cbfunc_t cbfunc, void *cbdata)
+{
+    pmix_output(0, "SERVER: DISCONNECT");
+
+    /* in practice, we would pass this request to the local
+     * resource manager for handling */
+
+    if (NULL != cbfunc) {
+        cbfunc(PMIX_SUCCESS, cbdata);
+    }
+
+    return PMIX_SUCCESS;
+}
+
+static pmix_status_t register_event_fn(pmix_status_t *codes, size_t ncodes,
+                                       const pmix_info_t info[], size_t ninfo,
+                                       pmix_op_cbfunc_t cbfunc, void *cbdata)
+{
+    if (NULL != cbfunc) {
+        cbfunc(PMIX_SUCCESS, cbdata);
+    }
+    return PMIX_SUCCESS;
+}
+
+static pmix_status_t deregister_events(pmix_status_t *codes, size_t ncodes,
+                                       pmix_op_cbfunc_t cbfunc, void *cbdata)
+{
+    return PMIX_SUCCESS;
+}
+
+static pmix_status_t notify_event(pmix_status_t code,
+                                  const pmix_proc_t *source,
+                                  pmix_data_range_t range,
+                                  pmix_info_t info[], size_t ninfo,
+                                  pmix_op_cbfunc_t cbfunc, void *cbdata)
+{
+    return PMIX_SUCCESS;
+}
+
+typedef struct query_data_t {
+    pmix_info_t *data;
+    size_t ndata;
+} query_data_t;
+
+static pmix_status_t query_fn(pmix_proc_t *proct,
+                              pmix_query_t *queries, size_t nqueries,
+                              pmix_info_cbfunc_t cbfunc,
+                              void *cbdata)
+{
+    size_t n;
+    pmix_info_t *info;
+
+    pmix_output(0, "SERVER: QUERY");
+
+    if (NULL == cbfunc) {
+        return PMIX_ERROR;
+    }
+    /* keep this simple */
+    PMIX_INFO_CREATE(info, nqueries);
+    for (n=0; n < nqueries; n++) {
+        (void)strncpy(info[n].key, queries[n].keys[0], PMIX_MAX_KEYLEN);
+        info[n].value.type = PMIX_STRING;
+        if (0 > asprintf(&info[n].value.data.string, "%d", (int)n)) {
+            return PMIX_ERROR;
+        }
+    }
+    cbfunc(PMIX_SUCCESS, info, nqueries, cbdata, NULL, NULL);
+    return PMIX_SUCCESS;
+}
+
+static void tool_connect_fn(pmix_info_t *info, size_t ninfo,
+                            pmix_tool_connection_cbfunc_t cbfunc,
+                            void *cbdata)
+{
+    pmix_proc_t proc;
+
+    pmix_output(0, "SERVER: TOOL CONNECT");
+
+    /* just pass back an arbitrary nspace */
+    (void)strncpy(proc.nspace, "TOOL", PMIX_MAX_NSLEN);
+    proc.rank = 0;
+
+    if (NULL != cbfunc) {
+        cbfunc(PMIX_SUCCESS, &proc, cbdata);
+    }
+}
+
+static void log_fn(const pmix_proc_t *client,
+                   const pmix_info_t data[], size_t ndata,
+                   const pmix_info_t directives[], size_t ndirs,
+                   pmix_op_cbfunc_t cbfunc, void *cbdata)
+{
+    pmix_output(0, "SERVER: LOG");
+
+    if (NULL != cbfunc) {
+        cbfunc(PMIX_SUCCESS, cbdata);
+    }
+}
+
+static void wait_signal_callback(int fd, short event, void *arg)
+{
+    pmix_event_t *sig = (pmix_event_t*) arg;
+    int status;
+    pid_t pid;
+    wait_tracker_t *t2;
+
+    if (SIGCHLD != event_get_signal(sig)) {
+        return;
+    }
+
+    /* we can have multiple children leave but only get one
+     * sigchild callback, so reap all the waitpids until we
+     * don't get anything valid back */
+    while (1) {
+        pid = waitpid(-1, &status, WNOHANG);
+        if (-1 == pid && EINTR == errno) {
+            /* try it again */
+            continue;
+        }
+        /* if we got garbage, then nothing we can do */
+        if (pid <= 0) {
+            return;
+        }
+
+        /* we are already in an event, so it is safe to access the list */
+        PMIX_LIST_FOREACH(t2, &children, wait_tracker_t) {
+            if (pid == t2->pid) {
+                /* found it! */
+                --wakeup;
+                break;
+            }
+        }
+    }
+}
diff --git a/examples/tool.c b/examples/tool.c
new file mode 100644
index 0000000..6818e49
--- /dev/null
+++ b/examples/tool.c
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2011 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2006-2013 Los Alamos National Security, LLC.
+ *                         All rights reserved.
+ * Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2011      Oak Ridge National Labs.  All rights reserved.
+ * Copyright (c) 2013-2016 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2015      Mellanox Technologies, Inc.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <time.h>
+
+#include <pmix_tool.h>
+
+static void cbfunc(pmix_status_t status,
+                   pmix_info_t *info, size_t ninfo,
+                   void *cbdata,
+                   pmix_release_cbfunc_t release_fn,
+                   void *release_cbdata)
+{
+    volatile bool *active = (volatile bool*)cbdata;
+
+    /* do something with the returned info - it will be
+     * released in the release_fn */
+
+    if (NULL != release_fn) {
+        release_fn(release_cbdata);
+    }
+    *active = false;
+}
+
+int main(int argc, char **argv)
+{
+    pmix_status_t rc;
+    pmix_proc_t myproc;
+    pmix_query_t *query;
+    size_t nq;
+    volatile bool active;
+
+    /* init us */
+    if (PMIX_SUCCESS != (rc = PMIx_tool_init(&myproc, NULL, 0))) {
+        fprintf(stderr, "PMIx_tool_init failed: %d\n", rc);
+        exit(rc);
+    }
+
+    /* query something */
+    nq = 2;
+    PMIX_QUERY_CREATE(query, nq);
+    query[0].keys = (char**)malloc(2 * sizeof(char*));
+    query[0].keys[0] = strdup("foobar");
+    query[0].keys[1] = NULL;
+    query[1].keys = (char**)malloc(2 * sizeof(char*));
+    query[1].keys[0] = strdup("spastic");
+    query[1].keys[1] = NULL;
+    active = true;
+    if (PMIX_SUCCESS != (rc = PMIx_Query_info_nb(query, nq, cbfunc, (void*)&active))) {
+        fprintf(stderr, "Client ns %s rank %d: PMIx_Query_info failed: %d\n", myproc.nspace, myproc.rank, rc);
+        goto done;
+    }
+    while(active) {
+        usleep(10);
+    }
+
+ done:
+    /* finalize us */
+    PMIx_Finalize(NULL, 0);
+    return(rc);
+}
diff --git a/include/Makefile.am b/include/Makefile.am
new file mode 100644
index 0000000..35bcf6d
--- /dev/null
+++ b/include/Makefile.am
@@ -0,0 +1,30 @@
+#
+# Copyright (c) 2015-2017 Intel, Inc.  All rights reserved.
+#
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# Only install the headers if we're in standalone mode
+
+if WANT_PRIMARY_HEADERS
+include_HEADERS = \
+        pmix.h \
+        pmix_common.h \
+        pmix_server.h \
+        pmix_tool.h
+
+if WANT_PMI_BACKWARD
+include_HEADERS += \
+        pmi.h \
+        pmi2.h
+endif
+
+nodist_include_HEADERS = \
+    pmix_version.h \
+    pmix_rename.h
+
+endif
diff --git a/include/Makefile.in b/include/Makefile.in
new file mode 100644
index 0000000..1b513e2
--- /dev/null
+++ b/include/Makefile.in
@@ -0,0 +1,773 @@
+# Makefile.in generated by automake 1.15 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+#
+# Copyright (c) 2015-2017 Intel, Inc.  All rights reserved.
+#
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# Only install the headers if we're in standalone mode
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+ at WANT_PMI_BACKWARD_TRUE@@WANT_PRIMARY_HEADERS_TRUE at am__append_1 = \
+ at WANT_PMI_BACKWARD_TRUE@@WANT_PRIMARY_HEADERS_TRUE@        pmi.h \
+ at WANT_PMI_BACKWARD_TRUE@@WANT_PRIMARY_HEADERS_TRUE@        pmi2.h
+
+subdir = include
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/config/c_get_alignment.m4 \
+	$(top_srcdir)/config/libtool.m4 \
+	$(top_srcdir)/config/ltoptions.m4 \
+	$(top_srcdir)/config/ltsugar.m4 \
+	$(top_srcdir)/config/ltversion.m4 \
+	$(top_srcdir)/config/lt~obsolete.m4 \
+	$(top_srcdir)/config/pmix.m4 \
+	$(top_srcdir)/config/pmix_check_attributes.m4 \
+	$(top_srcdir)/config/pmix_check_broken_qsort.m4 \
+	$(top_srcdir)/config/pmix_check_compiler_version.m4 \
+	$(top_srcdir)/config/pmix_check_icc.m4 \
+	$(top_srcdir)/config/pmix_check_ident.m4 \
+	$(top_srcdir)/config/pmix_check_lock.m4 \
+	$(top_srcdir)/config/pmix_check_os_flavors.m4 \
+	$(top_srcdir)/config/pmix_check_package.m4 \
+	$(top_srcdir)/config/pmix_check_psm2.m4 \
+	$(top_srcdir)/config/pmix_check_pthread_pids.m4 \
+	$(top_srcdir)/config/pmix_check_vendor.m4 \
+	$(top_srcdir)/config/pmix_check_visibility.m4 \
+	$(top_srcdir)/config/pmix_check_withdir.m4 \
+	$(top_srcdir)/config/pmix_config_asm.m4 \
+	$(top_srcdir)/config/pmix_config_pthreads.m4 \
+	$(top_srcdir)/config/pmix_config_subdir.m4 \
+	$(top_srcdir)/config/pmix_config_subdir_args.m4 \
+	$(top_srcdir)/config/pmix_config_threads.m4 \
+	$(top_srcdir)/config/pmix_ensure_contains_optflags.m4 \
+	$(top_srcdir)/config/pmix_functions.m4 \
+	$(top_srcdir)/config/pmix_load_platform.m4 \
+	$(top_srcdir)/config/pmix_mca.m4 \
+	$(top_srcdir)/config/pmix_search_libs.m4 \
+	$(top_srcdir)/config/pmix_setup_cc.m4 \
+	$(top_srcdir)/config/pmix_setup_libevent.m4 \
+	$(top_srcdir)/config/pmix_setup_zlib.m4 \
+	$(top_srcdir)/config/pmix_try_assemble.m4 \
+	$(top_srcdir)/config/autogen_found_items.m4 \
+	$(top_srcdir)/src/mca/pdl/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/configure.m4 \
+	$(top_srcdir)/src/mca/pdl/pdlopen/configure.m4 \
+	$(top_srcdir)/src/mca/pdl/plibltdl/configure.m4 \
+	$(top_srcdir)/src/mca/pif/bsdx_ipv4/configure.m4 \
+	$(top_srcdir)/src/mca/pif/bsdx_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pif/linux_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pif/posix_ipv4/configure.m4 \
+	$(top_srcdir)/src/mca/pif/solaris_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/config/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/env/configure.m4 \
+	$(top_srcdir)/src/mca/pnet/opa/configure.m4 \
+	$(top_srcdir)/src/mca/psec/munge/configure.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__include_HEADERS_DIST) \
+	$(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/src/include/pmix_config.h
+CONFIG_CLEAN_FILES = pmix_version.h pmix_rename.h
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+SOURCES =
+DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__include_HEADERS_DIST = pmix.h pmix_common.h pmix_server.h \
+	pmix_tool.h pmi.h pmi2.h
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)"
+HEADERS = $(include_HEADERS) $(nodist_include_HEADERS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/pmix_rename.h.in \
+	$(srcdir)/pmix_version.h.in
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CFLAGS = @CFLAGS@
+CLEANFILES = @CLEANFILES@
+CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MCA_PROJECT_SUBDIRS = @MCA_PROJECT_SUBDIRS@
+MCA_pmix_FRAMEWORKS = @MCA_pmix_FRAMEWORKS@
+MCA_pmix_FRAMEWORKS_SUBDIRS = @MCA_pmix_FRAMEWORKS_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS@
+MCA_pmix_FRAMEWORK_LIBS = @MCA_pmix_FRAMEWORK_LIBS@
+MCA_pmix_pdl_ALL_COMPONENTS = @MCA_pmix_pdl_ALL_COMPONENTS@
+MCA_pmix_pdl_ALL_SUBDIRS = @MCA_pmix_pdl_ALL_SUBDIRS@
+MCA_pmix_pdl_DSO_COMPONENTS = @MCA_pmix_pdl_DSO_COMPONENTS@
+MCA_pmix_pdl_DSO_SUBDIRS = @MCA_pmix_pdl_DSO_SUBDIRS@
+MCA_pmix_pdl_STATIC_COMPONENTS = @MCA_pmix_pdl_STATIC_COMPONENTS@
+MCA_pmix_pdl_STATIC_LTLIBS = @MCA_pmix_pdl_STATIC_LTLIBS@
+MCA_pmix_pdl_STATIC_SUBDIRS = @MCA_pmix_pdl_STATIC_SUBDIRS@
+MCA_pmix_pif_ALL_COMPONENTS = @MCA_pmix_pif_ALL_COMPONENTS@
+MCA_pmix_pif_ALL_SUBDIRS = @MCA_pmix_pif_ALL_SUBDIRS@
+MCA_pmix_pif_DSO_COMPONENTS = @MCA_pmix_pif_DSO_COMPONENTS@
+MCA_pmix_pif_DSO_SUBDIRS = @MCA_pmix_pif_DSO_SUBDIRS@
+MCA_pmix_pif_STATIC_COMPONENTS = @MCA_pmix_pif_STATIC_COMPONENTS@
+MCA_pmix_pif_STATIC_LTLIBS = @MCA_pmix_pif_STATIC_LTLIBS@
+MCA_pmix_pif_STATIC_SUBDIRS = @MCA_pmix_pif_STATIC_SUBDIRS@
+MCA_pmix_pinstalldirs_ALL_COMPONENTS = @MCA_pmix_pinstalldirs_ALL_COMPONENTS@
+MCA_pmix_pinstalldirs_ALL_SUBDIRS = @MCA_pmix_pinstalldirs_ALL_SUBDIRS@
+MCA_pmix_pinstalldirs_DSO_COMPONENTS = @MCA_pmix_pinstalldirs_DSO_COMPONENTS@
+MCA_pmix_pinstalldirs_DSO_SUBDIRS = @MCA_pmix_pinstalldirs_DSO_SUBDIRS@
+MCA_pmix_pinstalldirs_STATIC_COMPONENTS = @MCA_pmix_pinstalldirs_STATIC_COMPONENTS@
+MCA_pmix_pinstalldirs_STATIC_LTLIBS = @MCA_pmix_pinstalldirs_STATIC_LTLIBS@
+MCA_pmix_pinstalldirs_STATIC_SUBDIRS = @MCA_pmix_pinstalldirs_STATIC_SUBDIRS@
+MCA_pmix_pnet_ALL_COMPONENTS = @MCA_pmix_pnet_ALL_COMPONENTS@
+MCA_pmix_pnet_ALL_SUBDIRS = @MCA_pmix_pnet_ALL_SUBDIRS@
+MCA_pmix_pnet_DSO_COMPONENTS = @MCA_pmix_pnet_DSO_COMPONENTS@
+MCA_pmix_pnet_DSO_SUBDIRS = @MCA_pmix_pnet_DSO_SUBDIRS@
+MCA_pmix_pnet_STATIC_COMPONENTS = @MCA_pmix_pnet_STATIC_COMPONENTS@
+MCA_pmix_pnet_STATIC_LTLIBS = @MCA_pmix_pnet_STATIC_LTLIBS@
+MCA_pmix_pnet_STATIC_SUBDIRS = @MCA_pmix_pnet_STATIC_SUBDIRS@
+MCA_pmix_psec_ALL_COMPONENTS = @MCA_pmix_psec_ALL_COMPONENTS@
+MCA_pmix_psec_ALL_SUBDIRS = @MCA_pmix_psec_ALL_SUBDIRS@
+MCA_pmix_psec_DSO_COMPONENTS = @MCA_pmix_psec_DSO_COMPONENTS@
+MCA_pmix_psec_DSO_SUBDIRS = @MCA_pmix_psec_DSO_SUBDIRS@
+MCA_pmix_psec_STATIC_COMPONENTS = @MCA_pmix_psec_STATIC_COMPONENTS@
+MCA_pmix_psec_STATIC_LTLIBS = @MCA_pmix_psec_STATIC_LTLIBS@
+MCA_pmix_psec_STATIC_SUBDIRS = @MCA_pmix_psec_STATIC_SUBDIRS@
+MCA_pmix_psensor_ALL_COMPONENTS = @MCA_pmix_psensor_ALL_COMPONENTS@
+MCA_pmix_psensor_ALL_SUBDIRS = @MCA_pmix_psensor_ALL_SUBDIRS@
+MCA_pmix_psensor_DSO_COMPONENTS = @MCA_pmix_psensor_DSO_COMPONENTS@
+MCA_pmix_psensor_DSO_SUBDIRS = @MCA_pmix_psensor_DSO_SUBDIRS@
+MCA_pmix_psensor_STATIC_COMPONENTS = @MCA_pmix_psensor_STATIC_COMPONENTS@
+MCA_pmix_psensor_STATIC_LTLIBS = @MCA_pmix_psensor_STATIC_LTLIBS@
+MCA_pmix_psensor_STATIC_SUBDIRS = @MCA_pmix_psensor_STATIC_SUBDIRS@
+MCA_pmix_ptl_ALL_COMPONENTS = @MCA_pmix_ptl_ALL_COMPONENTS@
+MCA_pmix_ptl_ALL_SUBDIRS = @MCA_pmix_ptl_ALL_SUBDIRS@
+MCA_pmix_ptl_DSO_COMPONENTS = @MCA_pmix_ptl_DSO_COMPONENTS@
+MCA_pmix_ptl_DSO_SUBDIRS = @MCA_pmix_ptl_DSO_SUBDIRS@
+MCA_pmix_ptl_STATIC_COMPONENTS = @MCA_pmix_ptl_STATIC_COMPONENTS@
+MCA_pmix_ptl_STATIC_LTLIBS = @MCA_pmix_ptl_STATIC_LTLIBS@
+MCA_pmix_ptl_STATIC_SUBDIRS = @MCA_pmix_ptl_STATIC_SUBDIRS@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PMIX_ASM_GSYM = @PMIX_ASM_GSYM@
+PMIX_ASM_LSYM = @PMIX_ASM_LSYM@
+PMIX_ASM_SUPPORT_64BIT = @PMIX_ASM_SUPPORT_64BIT@
+PMIX_ASM_TEXT = @PMIX_ASM_TEXT@
+PMIX_ASM_TYPE = @PMIX_ASM_TYPE@
+PMIX_ASSEMBLY_ARCH = @PMIX_ASSEMBLY_ARCH@
+PMIX_ASSEMBLY_BUILTIN = @PMIX_ASSEMBLY_BUILTIN@
+PMIX_ASSEMBLY_FORMAT = @PMIX_ASSEMBLY_FORMAT@
+PMIX_AS_GLOBAL = @PMIX_AS_GLOBAL@
+PMIX_AS_LABEL_SUFFIX = @PMIX_AS_LABEL_SUFFIX@
+PMIX_CC_ABSOLUTE = @PMIX_CC_ABSOLUTE@
+PMIX_CONFIGURE_DATE = @PMIX_CONFIGURE_DATE@
+PMIX_CONFIGURE_HOST = @PMIX_CONFIGURE_HOST@
+PMIX_CONFIGURE_USER = @PMIX_CONFIGURE_USER@
+PMIX_EMBEDDED_CPPFLAGS = @PMIX_EMBEDDED_CPPFLAGS@
+PMIX_EMBEDDED_LDFLAGS = @PMIX_EMBEDDED_LDFLAGS@
+PMIX_EMBEDDED_LIBS = @PMIX_EMBEDDED_LIBS@
+PMIX_MAJOR_VERSION = @PMIX_MAJOR_VERSION@
+PMIX_MINOR_VERSION = @PMIX_MINOR_VERSION@
+PMIX_RELEASE_DATE = @PMIX_RELEASE_DATE@
+PMIX_RELEASE_VERSION = @PMIX_RELEASE_VERSION@
+PMIX_RENAME = @PMIX_RENAME@
+PMIX_VERSION = @PMIX_VERSION@
+PMIX_top_builddir = @PMIX_top_builddir@
+PMIX_top_srcdir = @PMIX_top_srcdir@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_prefix_program = @ac_prefix_program@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+libpmix_so_version = @libpmix_so_version@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pmix_have_pandoc = @pmix_have_pandoc@
+pmix_pdl_pdlopen_LIBS = @pmix_pdl_pdlopen_LIBS@
+pmix_pdl_plibltdl_CPPFLAGS = @pmix_pdl_plibltdl_CPPFLAGS@
+pmix_pdl_plibltdl_LDFLAGS = @pmix_pdl_plibltdl_LDFLAGS@
+pmix_pdl_plibltdl_LIBS = @pmix_pdl_plibltdl_LIBS@
+pmixdatadir = @pmixdatadir@
+pmixincludedir = @pmixincludedir@
+pmixlibdir = @pmixlibdir@
+pmixmajor = @pmixmajor@
+pmixminor = @pmixminor@
+pnet_opa_CFLAGS = @pnet_opa_CFLAGS@
+pnet_opa_CPPFLAGS = @pnet_opa_CPPFLAGS@
+pnet_opa_LDFLAGS = @pnet_opa_LDFLAGS@
+pnet_opa_LIBS = @pnet_opa_LIBS@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+psec_munge_CPPFLAGS = @psec_munge_CPPFLAGS@
+psec_munge_LDFLAGS = @psec_munge_LDFLAGS@
+psec_munge_LIBS = @psec_munge_LIBS@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+ at WANT_PRIMARY_HEADERS_TRUE@include_HEADERS = pmix.h pmix_common.h \
+ at WANT_PRIMARY_HEADERS_TRUE@	pmix_server.h pmix_tool.h \
+ at WANT_PRIMARY_HEADERS_TRUE@	$(am__append_1)
+ at WANT_PRIMARY_HEADERS_TRUE@nodist_include_HEADERS = \
+ at WANT_PRIMARY_HEADERS_TRUE@    pmix_version.h \
+ at WANT_PRIMARY_HEADERS_TRUE@    pmix_rename.h
+
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign include/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign include/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+pmix_version.h: $(top_builddir)/config.status $(srcdir)/pmix_version.h.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+pmix_rename.h: $(top_builddir)/config.status $(srcdir)/pmix_rename.h.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-includeHEADERS: $(include_HEADERS)
+	@$(NORMAL_INSTALL)
+	@list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(includedir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(includedir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includedir)'"; \
+	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(includedir)" || exit $$?; \
+	done
+
+uninstall-includeHEADERS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir)
+install-nodist_includeHEADERS: $(nodist_include_HEADERS)
+	@$(NORMAL_INSTALL)
+	@list='$(nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(includedir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(includedir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includedir)'"; \
+	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(includedir)" || exit $$?; \
+	done
+
+uninstall-nodist_includeHEADERS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir)
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(HEADERS)
+installdirs:
+	for dir in "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-includeHEADERS install-nodist_includeHEADERS
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-includeHEADERS uninstall-nodist_includeHEADERS
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool cscopelist-am ctags ctags-am distclean \
+	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-includeHEADERS install-info install-info-am \
+	install-man install-nodist_includeHEADERS install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+	uninstall-am uninstall-includeHEADERS \
+	uninstall-nodist_includeHEADERS
+
+.PRECIOUS: Makefile
+
+
+# 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/include/pmi.h b/include/pmi.h
new file mode 100644
index 0000000..f0d970e
--- /dev/null
+++ b/include/pmi.h
@@ -0,0 +1,836 @@
+/*****************************************************************************\
+ *  pmi.h - Process Management Interface for MPICH2
+ *  See http://www-unix.mcs.anl.gov/mpi/mpich2/
+ *
+ *  NOTE: Dynamic Process Management functions (PMI part 2) are not supported
+ *  at this time. Functions required for MPI-1 (PMI part 1) are supported.
+ *****************************************************************************
+ *  COPYRIGHT
+ *
+ *  The following is a notice of limited availability of the code, and
+ *  disclaimer which must be included in the prologue of the code and in all
+ *  source listings of the code.
+ *
+ *  Copyright Notice + 2002 University of Chicago
+ *
+ *  Permission is hereby granted to use, reproduce, prepare derivative
+ *  works, and to redistribute to others. This software was authored by:
+ *
+ *  Argonne National Laboratory Group
+ *  W. Gropp: (630) 252-4318; FAX: (630) 252-5986; e-mail: gropp at mcs.anl.gov
+ *  E. Lusk: (630) 252-7852; FAX: (630) 252-5986; e-mail: lusk at mcs.anl.gov
+ *  Mathematics and Computer Science Division Argonne National Laboratory,
+ *  Argonne IL 60439
+ *
+ *  GOVERNMENT LICENSE
+ *
+ *  Portions of this material resulted from work developed under a U.S.
+ *  Government Contract and are subject to the following license: the
+ *  Government is granted for itself and others acting on its behalf a
+ *  paid-up, nonexclusive, irrevocable worldwide license in this computer
+ *  software to reproduce, prepare derivative works, and perform publicly
+ *  and display publicly.
+ *
+ *  DISCLAIMER
+ *
+ *  This computer code material was prepared, in part, as an account of work
+ *  sponsored by an agency of the United States Government. Neither the
+ *  United States, nor the University of Chicago, nor any of their
+ *  employees, makes any warranty express or implied, or assumes any legal
+ *  liability or responsibility for the accuracy, completeness, or
+ *  usefulness of any information, apparatus, product, or process disclosed,
+ *  or represents that its use would not infringe privately owned rights.
+ *
+ *  MCS Division <http://www.mcs.anl.gov>        Argonne National Laboratory
+ *  <http://www.anl.gov>     University of Chicago <http://www.uchicago.edu>
+\*****************************************************************************/
+
+#ifndef PMI_H
+#define PMI_H
+
+#ifdef PMIX_HAVE_VISIBILITY
+#define PMIX_EXPORT __attribute__((__visibility__("default")))
+#else
+#define PMIX_EXPORT
+#endif
+
+
+/* prototypes for the PMI interface in MPICH2 */
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
+/*D
+PMI_CONSTANTS - PMI definitions
+
+Error Codes:
++ PMI_SUCCESS - operation completed successfully
+. PMI_FAIL - operation failed
+. PMI_ERR_NOMEM - input buffer not large enough
+. PMI_ERR_INIT - PMI not initialized
+. PMI_ERR_INVALID_ARG - invalid argument
+. PMI_ERR_INVALID_KEY - invalid key argument
+. PMI_ERR_INVALID_KEY_LENGTH - invalid key length argument
+. PMI_ERR_INVALID_VAL - invalid val argument
+. PMI_ERR_INVALID_VAL_LENGTH - invalid val length argument
+. PMI_ERR_INVALID_LENGTH - invalid length argument
+. PMI_ERR_INVALID_NUM_ARGS - invalid number of arguments
+. PMI_ERR_INVALID_ARGS - invalid args argument
+. PMI_ERR_INVALID_NUM_PARSED - invalid num_parsed length argument
+. PMI_ERR_INVALID_KEYVALP - invalid keyvalp argument
+- PMI_ERR_INVALID_SIZE - invalid size argument
+
+Booleans:
++ PMI_TRUE - true
+- PMI_FALSE - false
+
+D*/
+#define PMI_SUCCESS                  0
+#define PMI_FAIL                    -1
+#define PMI_ERR_INIT                 1
+#define PMI_ERR_NOMEM                2
+#define PMI_ERR_INVALID_ARG          3
+#define PMI_ERR_INVALID_KEY          4
+#define PMI_ERR_INVALID_KEY_LENGTH   5
+#define PMI_ERR_INVALID_VAL          6
+#define PMI_ERR_INVALID_VAL_LENGTH   7
+#define PMI_ERR_INVALID_LENGTH       8
+#define PMI_ERR_INVALID_NUM_ARGS     9
+#define PMI_ERR_INVALID_ARGS        10
+#define PMI_ERR_INVALID_NUM_PARSED  11
+#define PMI_ERR_INVALID_KEYVALP     12
+#define PMI_ERR_INVALID_SIZE        13
+#define PMI_ERR_INVALID_KVS         14
+
+typedef int PMI_BOOL;
+#define PMI_TRUE     1
+#define PMI_FALSE    0
+
+/* PMI Group functions */
+
+/*@
+PMI_Init - initialize the Process Manager Interface
+
+Output Parameter:
+. spawned - spawned flag
+
+Return values:
++ PMI_SUCCESS - initialization completed successfully
+. PMI_ERR_INVALID_ARG - invalid argument
+- PMI_FAIL - initialization failed
+
+Notes:
+Initialize PMI for this process group. The value of spawned indicates whether
+this process was created by 'PMI_Spawn_multiple'.  'spawned' will be 'PMI_TRUE' if
+this process group has a parent and 'PMI_FALSE' if it does not.
+
+@*/
+PMIX_EXPORT int PMI_Init( int *spawned );
+
+/*@
+PMI_Initialized - check if PMI has been initialized
+
+Output Parameter:
+. initialized - boolean value
+
+Return values:
++ PMI_SUCCESS - initialized successfully set
+. PMI_ERR_INVALID_ARG - invalid argument
+- PMI_FAIL - unable to set the variable
+
+Notes:
+On successful output, initialized will either be 'PMI_TRUE' or 'PMI_FALSE'.
+
++ PMI_TRUE - initialize has been called.
+- PMI_FALSE - initialize has not been called or previously failed.
+
+@*/
+PMIX_EXPORT int PMI_Initialized( PMI_BOOL *initialized );
+
+/*@
+PMI_Finalize - finalize the Process Manager Interface
+
+Return values:
++ PMI_SUCCESS - finalization completed successfully
+- PMI_FAIL - finalization failed
+
+Notes:
+ Finalize PMI for this process group.
+
+@*/
+PMIX_EXPORT int PMI_Finalize( void );
+
+/*@
+PMI_Get_size - obtain the size of the process group
+
+Output Parameters:
+. size - pointer to an integer that receives the size of the process group
+
+Return values:
++ PMI_SUCCESS - size successfully obtained
+. PMI_ERR_INVALID_ARG - invalid argument
+- PMI_FAIL - unable to return the size
+
+Notes:
+This function returns the size of the process group to which the local process
+belongs.
+
+@*/
+PMIX_EXPORT int PMI_Get_size( int *size );
+
+/*@
+PMI_Get_rank - obtain the rank of the local process in the process group
+
+Output Parameters:
+. rank - pointer to an integer that receives the rank in the process group
+
+Return values:
++ PMI_SUCCESS - rank successfully obtained
+. PMI_ERR_INVALID_ARG - invalid argument
+- PMI_FAIL - unable to return the rank
+
+Notes:
+This function returns the rank of the local process in its process group.
+
+@*/
+PMIX_EXPORT int PMI_Get_rank( int *rank );
+
+/*@
+PMI_Get_universe_size - obtain the universe size
+
+Output Parameters:
+. size - pointer to an integer that receives the size
+
+Return values:
++ PMI_SUCCESS - size successfully obtained
+. PMI_ERR_INVALID_ARG - invalid argument
+- PMI_FAIL - unable to return the size
+
+
+@*/
+PMIX_EXPORT int PMI_Get_universe_size( int *size );
+
+/*@
+PMI_Get_appnum - obtain the application number
+
+Output parameters:
+. appnum - pointer to an integer that receives the appnum
+
+Return values:
++ PMI_SUCCESS - appnum successfully obtained
+. PMI_ERR_INVALID_ARG - invalid argument
+- PMI_FAIL - unable to return the size
+
+
+@*/
+PMIX_EXPORT int PMI_Get_appnum( int *appnum );
+
+/*@
+PMI_Publish_name - publish a name
+
+Input parameters:
+. service_name - string representing the service being published
+. port - string representing the port on which to contact the service
+
+Return values:
++ PMI_SUCCESS - port for service successfully published
+. PMI_ERR_INVALID_ARG - invalid argument
+- PMI_FAIL - unable to publish service
+
+
+@*/
+PMIX_EXPORT int PMI_Publish_name( const char service_name[], const char port[] );
+
+/*@
+PMI_Unpublish_name - unpublish a name
+
+Input parameters:
+. service_name - string representing the service being unpublished
+
+Return values:
++ PMI_SUCCESS - port for service successfully published
+. PMI_ERR_INVALID_ARG - invalid argument
+- PMI_FAIL - unable to unpublish service
+
+
+@*/
+PMIX_EXPORT int PMI_Unpublish_name( const char service_name[] );
+
+/*@
+PMI_Lookup_name - lookup a service by name
+
+Input parameters:
+. service_name - string representing the service being published
+
+Output parameters:
+. port - string representing the port on which to contact the service
+
+Return values:
++ PMI_SUCCESS - port for service successfully obtained
+. PMI_ERR_INVALID_ARG - invalid argument
+- PMI_FAIL - unable to lookup service
+
+
+@*/
+PMIX_EXPORT int PMI_Lookup_name( const char service_name[], char port[] );
+
+/*@
+PMI_Get_id - obtain the id of the process group
+
+Input Parameter:
+. length - length of the id_str character array
+
+Output Parameter:
+. id_str - character array that receives the id of the process group
+
+Return values:
++ PMI_SUCCESS - id successfully obtained
+. PMI_ERR_INVALID_ARG - invalid rank argument
+. PMI_ERR_INVALID_LENGTH - invalid length argument
+- PMI_FAIL - unable to return the id
+
+Notes:
+This function returns a string that uniquely identifies the process group
+that the local process belongs to.  The string passed in must be at least
+as long as the number returned by 'PMI_Get_id_length_max()'.
+
+@*/
+PMIX_EXPORT int PMI_Get_id( char id_str[], int length );
+
+/*@
+PMI_Get_kvs_domain_id - obtain the id of the PMI domain
+
+Input Parameter:
+. length - length of id_str character array
+
+Output Parameter:
+. id_str - character array that receives the id of the PMI domain
+
+Return values:
++ PMI_SUCCESS - id successfully obtained
+. PMI_ERR_INVALID_ARG - invalid argument
+. PMI_ERR_INVALID_LENGTH - invalid length argument
+- PMI_FAIL - unable to return the id
+
+Notes:
+This function returns a string that uniquely identifies the PMI domain
+where keyval spaces can be shared.  The string passed in must be at least
+as long as the number returned by 'PMI_Get_id_length_max()'.
+
+@*/
+PMIX_EXPORT int PMI_Get_kvs_domain_id( char id_str[], int length );
+
+/*@
+PMI_Get_id_length_max - obtain the maximum length of an id string
+
+Output Parameters:
+. length - the maximum length of an id string
+
+Return values:
++ PMI_SUCCESS - length successfully set
+. PMI_ERR_INVALID_ARG - invalid argument
+- PMI_FAIL - unable to return the maximum length
+
+Notes:
+This function returns the maximum length of a process group id string.
+
+@*/
+PMIX_EXPORT int PMI_Get_id_length_max( int *length );
+
+/*@
+PMI_Barrier - barrier across the process group
+
+Return values:
++ PMI_SUCCESS - barrier successfully finished
+- PMI_FAIL - barrier failed
+
+Notes:
+This function is a collective call across all processes in the process group
+the local process belongs to.  It will not return until all the processes
+have called 'PMI_Barrier()'.
+
+@*/
+PMIX_EXPORT int PMI_Barrier( void );
+
+/*@
+PMI_Get_clique_size - obtain the number of processes on the local node
+
+Output Parameters:
+. size - pointer to an integer that receives the size of the clique
+
+Return values:
++ PMI_SUCCESS - size successfully obtained
+. PMI_ERR_INVALID_ARG - invalid argument
+- PMI_FAIL - unable to return the clique size
+
+Notes:
+This function returns the number of processes in the local process group that
+are on the local node along with the local process.  This is a simple topology
+function to distinguish between processes that can communicate through IPC
+mechanisms (e.g., shared memory) and other network mechanisms.
+
+@*/
+PMIX_EXPORT int PMI_Get_clique_size( int *size );
+
+/*@
+PMI_Get_clique_ranks - get the ranks of the local processes in the process group
+
+Input Parameters:
+. length - length of the ranks array
+
+Output Parameters:
+. ranks - pointer to an array of integers that receive the local ranks
+
+Return values:
++ PMI_SUCCESS - ranks successfully obtained
+. PMI_ERR_INVALID_ARG - invalid argument
+. PMI_ERR_INVALID_LENGTH - invalid length argument
+- PMI_FAIL - unable to return the ranks
+
+Notes:
+This function returns the ranks of the processes on the local node.  The array
+must be at least as large as the size returned by 'PMI_Get_clique_size()'.  This
+is a simple topology function to distinguish between processes that can
+communicate through IPC mechanisms (e.g., shared memory) and other network
+mechanisms.
+
+@*/
+PMIX_EXPORT int PMI_Get_clique_ranks( int ranks[], int length);
+
+/*@
+PMI_Abort - abort the process group associated with this process
+
+Input Parameters:
++ exit_code - exit code to be returned by this process
+- error_msg - error message to be printed
+
+Return values:
+. none - this function should not return
+@*/
+PMIX_EXPORT int PMI_Abort(int exit_code, const char error_msg[]);
+
+/* PMI Keymap functions */
+/*@
+PMI_KVS_Get_my_name - obtain the name of the keyval space the local process group has access to
+
+Input Parameters:
+. length - length of the kvsname character array
+
+Output Parameters:
+. kvsname - a string that receives the keyval space name
+
+Return values:
++ PMI_SUCCESS - kvsname successfully obtained
+. PMI_ERR_INVALID_ARG - invalid argument
+. PMI_ERR_INVALID_LENGTH - invalid length argument
+- PMI_FAIL - unable to return the kvsname
+
+Notes:
+This function returns the name of the keyval space that this process and all
+other processes in the process group have access to.  The output parameter,
+kvsname, must be at least as long as the value returned by
+'PMI_KVS_Get_name_length_max()'.
+
+@*/
+PMIX_EXPORT int PMI_KVS_Get_my_name( char kvsname[], int length );
+
+/*@
+PMI_KVS_Get_name_length_max - obtain the length necessary to store a kvsname
+
+Output Parameter:
+. length - maximum length required to hold a keyval space name
+
+Return values:
++ PMI_SUCCESS - length successfully set
+. PMI_ERR_INVALID_ARG - invalid argument
+- PMI_FAIL - unable to set the length
+
+Notes:
+This function returns the string length required to store a keyval space name.
+
+A routine is used rather than setting a maximum value in 'pmi.h' to allow
+different implementations of PMI to be used with the same executable.  These
+different implementations may allow different maximum lengths; by using a
+routine here, we can interface with a variety of implementations of PMI.
+
+@*/
+PMIX_EXPORT int PMI_KVS_Get_name_length_max( int *length );
+
+/*@
+PMI_KVS_Get_key_length_max - obtain the length necessary to store a key
+
+Output Parameter:
+. length - maximum length required to hold a key string.
+
+Return values:
++ PMI_SUCCESS - length successfully set
+. PMI_ERR_INVALID_ARG - invalid argument
+- PMI_FAIL - unable to set the length
+
+Notes:
+This function returns the string length required to store a key.
+
+@*/
+PMIX_EXPORT int PMI_KVS_Get_key_length_max( int *length );
+
+/*@
+PMI_KVS_Get_value_length_max - obtain the length necessary to store a value
+
+Output Parameter:
+. length - maximum length required to hold a keyval space value
+
+Return values:
++ PMI_SUCCESS - length successfully set
+. PMI_ERR_INVALID_ARG - invalid argument
+- PMI_FAIL - unable to set the length
+
+Notes:
+This function returns the string length required to store a value from a
+keyval space.
+
+@*/
+PMIX_EXPORT int PMI_KVS_Get_value_length_max( int *length );
+
+/*@
+PMI_KVS_Create - create a new keyval space
+
+Input Parameter:
+. length - length of the kvsname character array
+
+Output Parameters:
+. kvsname - a string that receives the keyval space name
+
+Return values:
++ PMI_SUCCESS - keyval space successfully created
+. PMI_ERR_INVALID_ARG - invalid argument
+. PMI_ERR_INVALID_LENGTH - invalid length argument
+- PMI_FAIL - unable to create a new keyval space
+
+Notes:
+This function creates a new keyval space.  Everyone in the same process group
+can access this keyval space by the name returned by this function.  The
+function is not collective.  Only one process calls this function.  The output
+parameter, kvsname, must be at least as long as the value returned by
+'PMI_KVS_Get_name_length_max()'.
+
+@*/
+PMIX_EXPORT int PMI_KVS_Create( char kvsname[], int length );
+
+/*@
+PMI_KVS_Destroy - destroy keyval space
+
+Input Parameters:
+. kvsname - keyval space name
+
+Return values:
++ PMI_SUCCESS - keyval space successfully destroyed
+. PMI_ERR_INVALID_ARG - invalid argument
+- PMI_FAIL - unable to destroy the keyval space
+
+Notes:
+This function destroys a keyval space created by 'PMI_KVS_Create()'.
+
+@*/
+PMIX_EXPORT int PMI_KVS_Destroy( const char kvsname[] );
+
+/*@
+PMI_KVS_Put - put a key/value pair in a keyval space
+
+Input Parameters:
++ kvsname - keyval space name
+. key - key
+- value - value
+
+Return values:
++ PMI_SUCCESS - keyval pair successfully put in keyval space
+. PMI_ERR_INVALID_KVS - invalid kvsname argument
+. PMI_ERR_INVALID_KEY - invalid key argument
+. PMI_ERR_INVALID_VAL - invalid val argument
+- PMI_FAIL - put failed
+
+Notes:
+This function puts the key/value pair in the specified keyval space.  The
+value is not visible to other processes until 'PMI_KVS_Commit()' is called.
+The function may complete locally.  After 'PMI_KVS_Commit()' is called, the
+value may be retrieved by calling 'PMI_KVS_Get()'.  All keys put to a keyval
+space must be unique to the keyval space.  You may not put more than once
+with the same key.
+
+@*/
+PMIX_EXPORT int PMI_KVS_Put( const char kvsname[], const char key[], const char value[]);
+
+/*@
+PMI_KVS_Commit - commit all previous puts to the keyval space
+
+Input Parameters:
+. kvsname - keyval space name
+
+Return values:
++ PMI_SUCCESS - commit succeeded
+. PMI_ERR_INVALID_ARG - invalid argument
+- PMI_FAIL - commit failed
+
+Notes:
+This function commits all previous puts since the last 'PMI_KVS_Commit()' into
+the specified keyval space. It is a process local operation.
+
+@*/
+PMIX_EXPORT int PMI_KVS_Commit( const char kvsname[] );
+
+/*@
+PMI_KVS_Get - get a key/value pair from a keyval space
+
+Input Parameters:
++ kvsname - keyval space name
+. key - key
+- length - length of value character array
+
+Output Parameters:
+. value - value
+
+Return values:
++ PMI_SUCCESS - get succeeded
+. PMI_ERR_INVALID_KVS - invalid kvsname argument
+. PMI_ERR_INVALID_KEY - invalid key argument
+. PMI_ERR_INVALID_VAL - invalid val argument
+. PMI_ERR_INVALID_LENGTH - invalid length argument
+- PMI_FAIL - get failed
+
+Notes:
+This function gets the value of the specified key in the keyval space.
+
+@*/
+PMIX_EXPORT int PMI_KVS_Get( const char kvsname[], const char key[], char value[], int length);
+
+/*@
+PMI_KVS_Iter_first - initialize the iterator and get the first value
+
+Input Parameters:
++ kvsname - keyval space name
+. key_len - length of key character array
+- val_len - length of val character array
+
+Output Parameters:
++ key - key
+- value - value
+
+Return values:
++ PMI_SUCCESS - keyval pair successfully retrieved from the keyval space
+. PMI_ERR_INVALID_KVS - invalid kvsname argument
+. PMI_ERR_INVALID_KEY - invalid key argument
+. PMI_ERR_INVALID_KEY_LENGTH - invalid key length argument
+. PMI_ERR_INVALID_VAL - invalid val argument
+. PMI_ERR_INVALID_VAL_LENGTH - invalid val length argument
+- PMI_FAIL - failed to initialize the iterator and get the first keyval pair
+
+Notes:
+This function initializes the iterator for the specified keyval space and
+retrieves the first key/val pair.  The end of the keyval space is specified
+by returning an empty key string.  key and val must be at least as long as
+the values returned by 'PMI_KVS_Get_key_length_max()' and
+'PMI_KVS_Get_value_length_max()'.
+
+@*/
+PMIX_EXPORT int PMI_KVS_Iter_first(const char kvsname[], char key[], int key_len, char val[], int val_len);
+
+/*@
+PMI_KVS_Iter_next - get the next keyval pair from the keyval space
+
+Input Parameters:
++ kvsname - keyval space name
+. key_len - length of key character array
+- val_len - length of val character array
+
+Output Parameters:
++ key - key
+- value - value
+
+Return values:
++ PMI_SUCCESS - keyval pair successfully retrieved from the keyval space
+. PMI_ERR_INVALID_KVS - invalid kvsname argument
+. PMI_ERR_INVALID_KEY - invalid key argument
+. PMI_ERR_INVALID_KEY_LENGTH - invalid key length argument
+. PMI_ERR_INVALID_VAL - invalid val argument
+. PMI_ERR_INVALID_VAL_LENGTH - invalid val length argument
+- PMI_FAIL - failed to get the next keyval pair
+
+Notes:
+This function retrieves the next keyval pair from the specified keyval space.
+'PMI_KVS_Iter_first()' must have been previously called.  The end of the keyval
+space is specified by returning an empty key string.  The output parameters,
+key and val, must be at least as long as the values returned by
+'PMI_KVS_Get_key_length_max()' and 'PMI_KVS_Get_value_length_max()'.
+
+@*/
+PMIX_EXPORT int PMI_KVS_Iter_next(const char kvsname[], char key[], int key_len, char val[], int val_len);
+
+/* PMI Process Creation functions */
+
+/*S
+PMI_keyval_t - keyval structure used by PMI_Spawn_mulitiple
+
+Fields:
++ key - name of the key
+- val - value of the key
+
+S*/
+typedef struct PMI_keyval_t
+{
+    char * key;
+    char * val;
+} PMI_keyval_t;
+
+/*@
+PMI_Spawn_multiple - spawn a new set of processes
+
+Input Parameters:
++ count - count of commands
+. cmds - array of command strings
+. argvs - array of argv arrays for each command string
+. maxprocs - array of maximum processes to spawn for each command string
+. info_keyval_sizes - array giving the number of elements in each of the
+  'info_keyval_vectors'
+. info_keyval_vectors - array of keyval vector arrays
+. preput_keyval_size - Number of elements in 'preput_keyval_vector'
+- preput_keyval_vector - array of keyvals to be pre-put in the spawned keyval space
+
+Output Parameter:
+. errors - array of errors for each command
+
+Return values:
++ PMI_SUCCESS - spawn successful
+. PMI_ERR_INVALID_ARG - invalid argument
+- PMI_FAIL - spawn failed
+
+Notes:
+This function spawns a set of processes into a new process group.  The 'count'
+field refers to the size of the array parameters - 'cmd', 'argvs', 'maxprocs',
+'info_keyval_sizes' and 'info_keyval_vectors'.  The 'preput_keyval_size' refers
+to the size of the 'preput_keyval_vector' array.  The 'preput_keyval_vector'
+contains keyval pairs that will be put in the keyval space of the newly
+created process group before the processes are started.  The 'maxprocs' array
+specifies the desired number of processes to create for each 'cmd' string.
+The actual number of processes may be less than the numbers specified in
+maxprocs.  The acceptable number of processes spawned may be controlled by
+``soft'' keyvals in the info arrays.  The ``soft'' option is specified by
+mpiexec in the MPI-2 standard.  Environment variables may be passed to the
+spawned processes through PMI implementation specific 'info_keyval' parameters.
+@*/
+PMIX_EXPORT int PMI_Spawn_multiple(int count,
+                                   const char * cmds[],
+                                   const char ** argvs[],
+                                   const int maxprocs[],
+                                   const int info_keyval_sizesp[],
+                                   const PMI_keyval_t * info_keyval_vectors[],
+                                   int preput_keyval_size,
+                                   const PMI_keyval_t preput_keyval_vector[],
+                                   int errors[]);
+
+
+/*@
+PMI_Parse_option - create keyval structures from a single command line argument
+
+Input Parameters:
++ num_args - length of args array
+- args - array of command line arguments starting with the argument to be parsed
+
+Output Parameters:
++ num_parsed - number of elements of the argument array parsed
+. keyvalp - pointer to an array of keyvals
+- size - size of the allocated array
+
+Return values:
++ PMI_SUCCESS - success
+. PMI_ERR_INVALID_NUM_ARGS - invalid number of arguments
+. PMI_ERR_INVALID_ARGS - invalid args argument
+. PMI_ERR_INVALID_NUM_PARSED - invalid num_parsed length argument
+. PMI_ERR_INVALID_KEYVALP - invalid keyvalp argument
+. PMI_ERR_INVALID_SIZE - invalid size argument
+- PMI_FAIL - fail
+
+Notes:
+This function removes one PMI specific argument from the command line and
+creates the corresponding 'PMI_keyval_t' structure for it.  It returns
+an array and size to the caller.  The array must be freed by 'PMI_Free_keyvals()'.
+If the first element of the args array is not a PMI specific argument, the function
+returns success and sets num_parsed to zero.  If there are multiple PMI specific
+arguments in the args array, this function may parse more than one argument as long
+as the options are contiguous in the args array.
+
+@*/
+PMIX_EXPORT int PMI_Parse_option(int num_args, char *args[], int *num_parsed, PMI_keyval_t **keyvalp, int *size);
+
+/*@
+PMI_Args_to_keyval - create keyval structures from command line arguments
+
+Input Parameters:
++ argcp - pointer to argc
+- argvp - pointer to argv
+
+Output Parameters:
++ keyvalp - pointer to an array of keyvals
+- size - size of the allocated array
+
+Return values:
++ PMI_SUCCESS - success
+. PMI_ERR_INVALID_ARG - invalid argument
+- PMI_FAIL - fail
+
+Notes:
+This function removes PMI specific arguments from the command line and
+creates the corresponding 'PMI_keyval_t' structures for them.  It returns
+an array and size to the caller that can then be passed to 'PMI_Spawn_multiple()'.
+The array can be freed by 'PMI_Free_keyvals()'.  The routine 'free()' should
+not be used to free this array as there is no requirement that the array be
+allocated with 'malloc()'.
+
+@*/
+PMIX_EXPORT int PMI_Args_to_keyval(int *argcp, char *((*argvp)[]), PMI_keyval_t **keyvalp, int *size);
+
+/*@
+PMI_Free_keyvals - free the keyval structures created by PMI_Args_to_keyval
+
+Input Parameters:
++ keyvalp - array of keyvals
+- size - size of the array
+
+Return values:
++ PMI_SUCCESS - success
+. PMI_ERR_INVALID_ARG - invalid argument
+- PMI_FAIL - fail
+
+Notes:
+ This function frees the data returned by 'PMI_Args_to_keyval' and 'PMI_Parse_option'.
+ Using this routine instead of 'free' allows the PMI package to track
+ allocation of storage or to use interal storage as it sees fit.
+@*/
+PMIX_EXPORT int PMI_Free_keyvals(PMI_keyval_t keyvalp[], int size);
+
+/*@
+PMI_Get_options - get a string of command line argument descriptions that may be printed to the user
+
+Input Parameters:
+. length - length of str
+
+Output Parameters:
++ str - description string
+- length - length of string or necessary length if input is not large enough
+
+Return values:
++ PMI_SUCCESS - success
+. PMI_ERR_INVALID_ARG - invalid argument
+. PMI_ERR_INVALID_LENGTH - invalid length argument
+. PMI_ERR_NOMEM - input length too small
+- PMI_FAIL - fail
+
+Notes:
+ This function returns the command line options specific to the pmi implementation
+@*/
+PMIX_EXPORT int PMI_Get_options(char *str, int *length);
+
+#if defined(__cplusplus)
+}
+#endif
+
+#endif
diff --git a/include/pmi2.h b/include/pmi2.h
new file mode 100644
index 0000000..c217ff7
--- /dev/null
+++ b/include/pmi2.h
@@ -0,0 +1,569 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil ; -*- */
+/*
+ *  (C) 2007 by Argonne National Laboratory.
+ *      See COPYRIGHT in top-level directory.
+ */
+
+#ifndef PMI2_H_INCLUDED
+#define PMI2_H_INCLUDED
+
+#define PMI2_MAX_KEYLEN 64
+#define PMI2_MAX_VALLEN 1024
+#define PMI2_MAX_ATTRVALUE 1024
+#define PMI2_ID_NULL -1
+
+#ifdef PMIX_HAVE_VISIBILITY
+#define PMIX_EXPORT __attribute__((__visibility__("default")))
+#else
+#define PMIX_EXPORT
+#endif
+
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
+/*D
+PMI2_CONSTANTS - PMI2 definitions
+
+Error Codes:
++ PMI2_SUCCESS - operation completed successfully
+. PMI2_FAIL - operation failed
+. PMI2_ERR_NOMEM - input buffer not large enough
+. PMI2_ERR_INIT - PMI not initialized
+. PMI2_ERR_INVALID_ARG - invalid argument
+. PMI2_ERR_INVALID_KEY - invalid key argument
+. PMI2_ERR_INVALID_KEY_LENGTH - invalid key length argument
+. PMI2_ERR_INVALID_VAL - invalid val argument
+. PMI2_ERR_INVALID_VAL_LENGTH - invalid val length argument
+. PMI2_ERR_INVALID_LENGTH - invalid length argument
+. PMI2_ERR_INVALID_NUM_ARGS - invalid number of arguments
+. PMI2_ERR_INVALID_ARGS - invalid args argument
+. PMI2_ERR_INVALID_NUM_PARSED - invalid num_parsed length argument
+. PMI2_ERR_INVALID_KEYVALP - invalid keyvalp argument
+. PMI2_ERR_INVALID_SIZE - invalid size argument
+- PMI2_ERR_OTHER - other unspecified error
+
+D*/
+#define PMI2_SUCCESS                0
+#define PMI2_FAIL                   -1
+#define PMI2_ERR_INIT               1
+#define PMI2_ERR_NOMEM              2
+#define PMI2_ERR_INVALID_ARG        3
+#define PMI2_ERR_INVALID_KEY        4
+#define PMI2_ERR_INVALID_KEY_LENGTH 5
+#define PMI2_ERR_INVALID_VAL        6
+#define PMI2_ERR_INVALID_VAL_LENGTH 7
+#define PMI2_ERR_INVALID_LENGTH     8
+#define PMI2_ERR_INVALID_NUM_ARGS   9
+#define PMI2_ERR_INVALID_ARGS       10
+#define PMI2_ERR_INVALID_NUM_PARSED 11
+#define PMI2_ERR_INVALID_KEYVALP    12
+#define PMI2_ERR_INVALID_SIZE       13
+#define PMI2_ERR_OTHER              14
+
+/* This is here to allow spawn multiple functions to compile.  This
+   needs to be removed once those functions are fixed for pmi2 */
+typedef struct PMI_keyval_t
+{
+    char * key;
+    char * val;
+} PMI_keyval_t;
+
+
+/*@
+  PMI2_Connect_comm_t - connection structure used when connecting to other jobs
+
+  Fields:
+  + read - Read from a connection to the leader of the job to which
+    this process will be connecting. Returns 0 on success or an MPI
+    error code on failure.
+  . write - Write to a connection to the leader of the job to which
+    this process will be connecting. Returns 0 on success or an MPI
+    error code on failure.
+  . ctx - An anonymous pointer to data that may be used by the read
+    and write members.
+  - isMaster - Indicates which process is the "master"; may have the
+    values 1 (is the master), 0 (is not the master), or -1 (neither is
+    designated as the master). The two processes must agree on which
+    process is the master, or both must select -1 (neither is the
+    master).
+
+  Notes:
+  A typical implementation of these functions will use the read and
+  write calls on a pre-established file descriptor (fd) between the
+  two leading processes. This will be needed only if the PMI server
+  cannot access the KVS spaces of another job (this may happen, for
+  example, if each mpiexec creates the KVS spaces for the processes
+  that it manages).
+
+@*/
+typedef struct PMI2_Connect_comm {
+    int (*read)( void *buf, int maxlen, void *ctx );
+    int (*write)( const void *buf, int len, void *ctx );
+    void *ctx;
+    int  isMaster;
+} PMI2_Connect_comm_t;
+
+
+/*@
+  PMI2_Init - initialize the Process Manager Interface
+
+  Output Parameter:
+  + spawned - spawned flag
+  . size - number of processes in the job
+  . rank - rank of this process in the job
+  - appnum - which executable is this on the mpiexec commandline
+
+  Return values:
+  Returns 'PMI2_SUCCESS' on success and an PMI error code on failure.
+
+  Notes:
+  Initialize PMI for this process group. The value of spawned indicates whether
+  this process was created by 'PMI2_Spawn_multiple'.  'spawned' will be non-zero
+  iff this process group has a parent.
+
+@*/
+PMIX_EXPORT int PMI2_Init(int *spawned, int *size, int *rank, int *appnum);
+
+/*@
+  PMI2_Finalize - finalize the Process Manager Interface
+
+  Return values:
+  Returns 'PMI2_SUCCESS' on success and an PMI error code on failure.
+
+  Notes:
+  Finalize PMI for this job.
+
+@*/
+PMIX_EXPORT int PMI2_Finalize(void);
+
+/*@
+  PMI2_Initialized - check if PMI has been initialized
+
+  Return values:
+  Non-zero if PMI2_Initialize has been called successfully, zero otherwise.
+
+@*/
+PMIX_EXPORT int PMI2_Initialized(void);
+
+/*@
+  PMI2_Abort - abort the process group associated with this process
+
+  Input Parameters:
+  + flag - non-zero if all processes in this job should abort, zero otherwise
+  - error_msg - error message to be printed
+
+  Return values:
+  If the abort succeeds this function will not return.  Returns an MPI
+  error code otherwise.
+
+@*/
+PMIX_EXPORT int PMI2_Abort(int flag, const char msg[]);
+
+/*@
+  PMI2_Spawn - spawn a new set of processes
+
+  Input Parameters:
+  + count - count of commands
+  . cmds - array of command strings
+  . argcs - size of argv arrays for each command string
+  . argvs - array of argv arrays for each command string
+  . maxprocs - array of maximum processes to spawn for each command string
+  . info_keyval_sizes - array giving the number of elements in each of the
+    'info_keyval_vectors'
+  . info_keyval_vectors - array of keyval vector arrays
+  . preput_keyval_size - Number of elements in 'preput_keyval_vector'
+  . preput_keyval_vector - array of keyvals to be pre-put in the spawned keyval space
+  - jobIdSize - size of the buffer provided in jobId
+
+  Output Parameter:
+  + jobId - job id of the spawned processes
+  - errors - array of errors for each command
+
+  Return values:
+  Returns 'PMI2_SUCCESS' on success and an PMI error code on failure.
+
+  Notes:
+  This function spawns a set of processes into a new job.  The 'count'
+  field refers to the size of the array parameters - 'cmd', 'argvs', 'maxprocs',
+  'info_keyval_sizes' and 'info_keyval_vectors'.  The 'preput_keyval_size' refers
+  to the size of the 'preput_keyval_vector' array.  The 'preput_keyval_vector'
+  contains keyval pairs that will be put in the keyval space of the newly
+  created job before the processes are started.  The 'maxprocs' array
+  specifies the desired number of processes to create for each 'cmd' string.
+  The actual number of processes may be less than the numbers specified in
+  maxprocs.  The acceptable number of processes spawned may be controlled by
+  ``soft'' keyvals in the info arrays.  The ``soft'' option is specified by
+  mpiexec in the MPI-2 standard.  Environment variables may be passed to the
+  spawned processes through PMI implementation specific 'info_keyval' parameters.
+@*/
+PMIX_EXPORT int PMI2_Job_Spawn(int count, const char * cmds[],
+                               int argcs[], const char ** argvs[],
+                               const int maxprocs[],
+                               const int info_keyval_sizes[],
+                               const PMI_keyval_t *info_keyval_vectors[],
+                               int preput_keyval_size,
+                               const PMI_keyval_t *preput_keyval_vector[],
+                               char jobId[], int jobIdSize,
+                               int errors[]);
+
+/*@
+  PMI2_Job_GetId - get job id of this job
+
+  Input parameters:
+  . jobid_size - size of buffer provided in jobid
+
+  Output parameters:
+  . jobid - the job id of this job
+
+  Return values:
+  Returns 'PMI2_SUCCESS' on success and an PMI error code on failure.
+
+@*/
+PMIX_EXPORT int PMI2_Job_GetId(char jobid[], int jobid_size);
+
+/*@
+  PMI2_Job_GetRank - get rank of this job
+  Output parameters:
+  . rank - the rank of this job
+  Return values:
+  Returns 'PMI2_SUCCESS' on success and an PMI error code on failure.
+@*/
+PMIX_EXPORT int PMI2_Job_GetRank(int* rank);
+
+/*@
+  PMI2_Info_GetSize - get the number of processes on the node
+  Output parameters:
+  . rank - the rank of this job
+  Return values:
+  Returns 'PMI2_SUCCESS' on success and an PMI error code on failure.
+@*/
+PMIX_EXPORT int PMI2_Info_GetSize(int* size);
+
+/*@
+  PMI2_Job_Connect - connect to the parallel job with ID jobid
+
+  Input parameters:
+  . jobid - job id of the job to connect to
+
+  Output parameters:
+  . conn - connection structure used to exteblish communication with
+    the remote job
+
+  Return values:
+  Returns 'PMI2_SUCCESS' on success and an PMI error code on failure.
+
+  Notes:
+  This just "registers" the other parallel job as part of a parallel
+  program, and is used in the PMI2_KVS_xxx routines (see below). This
+  is not a collective call and establishes a connection between all
+  processes that are connected to the calling processes (on the one
+  side) and that are connected to the named jobId on the other
+  side. Processes that are already connected may call this routine.
+
+@*/
+PMIX_EXPORT int PMI2_Job_Connect(const char jobid[], PMI2_Connect_comm_t *conn);
+
+/*@
+  PMI2_Job_Disconnect - disconnects from the job with ID jobid
+
+  Input parameters:
+  . jobid - job id of the job to connect to
+
+  Return values:
+  Returns 'PMI2_SUCCESS' on success and an PMI error code on failure.
+
+@*/
+PMIX_EXPORT int PMI2_Job_Disconnect(const char jobid[]);
+
+/*@
+  PMI2_KVS_Put - put a key/value pair in the keyval space for this job
+
+  Input Parameters:
+  + key - key
+  - value - value
+
+  Return values:
+  Returns 'PMI2_SUCCESS' on success and an PMI error code on failure.
+
+  Notes:
+  If multiple PMI2_KVS_Put calls are made with the same key between
+  calls to PMI2_KVS_Fence, the behavior is undefined. That is, the
+  value returned by PMI2_KVS_Get for that key after the PMI2_KVS_Fence
+  is not defined.
+
+@*/
+PMIX_EXPORT int PMI2_KVS_Put(const char key[], const char value[]);
+/*@
+  PMI2_KVS_Fence - commit all PMI2_KVS_Put calls made before this fence
+
+  Return values:
+  Returns 'PMI2_SUCCESS' on success and an PMI error code on failure.
+
+  Notes:
+  This is a collective call across the job.  It has semantics that are
+  similar to those for MPI_Win_fence and hence is most easily
+  implemented as a barrier across all of the processes in the job.
+  Specifically, all PMI2_KVS_Put operations performed by any process in
+  the same job must be visible to all processes (by using PMI2_KVS_Get)
+  after PMI2_KVS_Fence completes.  However, a PMI implementation could
+  make this a lazy operation by not waiting for all processes to enter
+  their corresponding PMI2_KVS_Fence until some process issues a
+  PMI2_KVS_Get. This might be appropriate for some wide-area
+  implementations.
+
+@*/
+PMIX_EXPORT int PMI2_KVS_Fence(void);
+
+/*@
+  PMI2_KVS_Get - returns the value associated with key in the key-value
+      space associated with the job ID jobid
+
+  Input Parameters:
+  + jobid - the job id identifying the key-value space in which to look
+    for key.  If jobid is NULL, look in the key-value space of this job.
+  . src_pmi_id - the pmi id of the process which put this keypair.  This
+    is just a hint to the server.  PMI2_ID_NULL should be passed if no
+    hint is provided.
+  . key - key
+  - maxvalue - size of the buffer provided in value
+
+  Output Parameters:
+  + value - value associated with key
+  - vallen - length of the returned value, or, if the length is longer
+    than maxvalue, the negative of the required length is returned
+
+  Return values:
+  Returns 'PMI2_SUCCESS' on success and an PMI error code on failure.
+
+@*/
+PMIX_EXPORT int PMI2_KVS_Get(const char *jobid, int src_pmi_id, const char key[], char value [], int maxvalue, int *vallen);
+
+/*@
+  PMI2_Info_GetNodeAttr - returns the value of the attribute associated
+      with this node
+
+  Input Parameters:
+  + name - name of the node attribute
+  . valuelen - size of the buffer provided in value
+  - waitfor - if non-zero, the function will not return until the
+    attribute is available
+
+  Output Parameters:
+  + value - value of the attribute
+  - found - non-zero indicates that the attribute was found
+
+  Return values:
+  Returns 'PMI2_SUCCESS' on success and an PMI error code on failure.
+
+  Notes:
+  This provides a way, when combined with PMI2_Info_PutNodeAttr, for
+  processes on the same node to share information without requiring a
+  more general barrier across the entire job.
+
+  If waitfor is non-zero, the function will never return with found
+  set to zero.
+
+  Predefined attributes:
+  + memPoolType - If the process manager allocated a shared memory
+    pool for the MPI processes in this job and on this node, return
+    the type of that pool. Types include sysv, anonmmap and ntshm.
+  . memSYSVid - Return the SYSV memory segment id if the memory pool
+    type is sysv. Returned as a string.
+  . memAnonMMAPfd - Return the FD of the anonymous mmap segment. The
+    FD is returned as a string.
+  - memNTName - Return the name of the Windows NT shared memory
+    segment, file mapping object backed by system paging
+    file.  Returned as a string.
+
+@*/
+PMIX_EXPORT int PMI2_Info_GetNodeAttr(const char name[], char value[], int valuelen, int *found, int waitfor);
+
+/*@
+  PMI2_Info_GetNodeAttrIntArray - returns the value of the attribute associated
+      with this node.  The value must be an array of integers.
+
+  Input Parameters:
+  + name - name of the node attribute
+  - arraylen - number of elements in array
+
+  Output Parameters:
+  + array - value of attribute
+  . outlen - number of elements returned
+  - found - non-zero if attribute was found
+
+  Return values:
+  Returns 'PMI2_SUCCESS' on success and an PMI error code on failure.
+
+  Notes:
+  Notice that, unlike PMI2_Info_GetNodeAttr, this function does not
+  have a waitfor parameter, and will return immediately with found=0
+  if the attribute was not found.
+
+  Predefined array attribute names:
+  + localRanksCount - Return the number of local ranks that will be
+    returned by the key localRanks.
+  . localRanks - Return the ranks in MPI_COMM_WORLD of the processes
+    that are running on this node.
+  - cartCoords - Return the Cartesian coordinates of this process in
+    the underlying network topology. The coordinates are indexed from
+    zero. Value only if the Job attribute for physTopology includes
+    cartesian.
+
+@*/
+PMIX_EXPORT int PMI2_Info_GetNodeAttrIntArray(const char name[], int array[], int arraylen, int *outlen, int *found);
+
+/*@
+  PMI2_Info_PutNodeAttr - stores the value of the named attribute
+  associated with this node
+
+  Input Parameters:
+  + name - name of the node attribute
+  - value - the value of the attribute
+
+  Return values:
+  Returns 'PMI2_SUCCESS' on success and an PMI error code on failure.
+
+  Notes:
+  For example, it might be used to share segment ids with other
+  processes on the same SMP node.
+
+@*/
+PMIX_EXPORT int PMI2_Info_PutNodeAttr(const char name[], const char value[]);
+
+/*@
+  PMI2_Info_GetJobAttr - returns the value of the attribute associated
+  with this job
+
+  Input Parameters:
+  + name - name of the job attribute
+  - valuelen - size of the buffer provided in value
+
+  Output Parameters:
+  + value - value of the attribute
+  - found - non-zero indicates that the attribute was found
+
+  Return values:
+  Returns 'PMI2_SUCCESS' on success and an PMI error code on failure.
+
+@*/
+PMIX_EXPORT int PMI2_Info_GetJobAttr(const char name[], char value[], int valuelen, int *found);
+
+/*@
+  PMI2_Info_GetJobAttrIntArray - returns the value of the attribute associated
+      with this job.  The value must be an array of integers.
+
+  Input Parameters:
+  + name - name of the job attribute
+  - arraylen - number of elements in array
+
+  Output Parameters:
+  + array - value of attribute
+  . outlen - number of elements returned
+  - found - non-zero if attribute was found
+
+  Return values:
+  Returns 'PMI2_SUCCESS' on success and an PMI error code on failure.
+
+  Predefined array attribute names:
+
+  + universeSize - The size of the "universe" (defined for the MPI
+    attribute MPI_UNIVERSE_SIZE
+
+  . hasNameServ - The value hasNameServ is true if the PMI2 environment
+    supports the name service operations (publish, lookup, and
+    unpublish).
+
+  . physTopology - Return the topology of the underlying network. The
+    valid topology types include cartesian, hierarchical, complete,
+    kautz, hypercube; additional types may be added as necessary. If
+    the type is hierarchical, then additional attributes may be
+    queried to determine the details of the topology. For example, a
+    typical cluster has a hierarchical physical topology, consisting
+    of two levels of complete networks - the switched Ethernet or
+    Infiniband and the SMP nodes. Other systems, such as IBM BlueGene,
+    have one level that is cartesian (and in virtual node mode, have a
+    single-level physical topology).
+
+  . physTopologyLevels - Return a string describing the topology type
+    for each level of the underlying network. Only valid if the
+    physTopology is hierarchical. The value is a comma-separated list
+    of physical topology types (except for hierarchical). The levels
+    are ordered starting at the top, with the network closest to the
+    processes last. The lower level networks may connect only a subset
+    of processes. For example, for a cartesian mesh of SMPs, the value
+    is cartesian,complete. All processes are connected by the
+    cartesian part of this, but for each complete network, only the
+    processes on the same node are connected.
+
+  . cartDims - Return a string of comma-separated values describing
+    the dimensions of the Cartesian topology. This must be consistent
+    with the value of cartCoords that may be returned by
+    PMI2_Info_GetNodeAttrIntArray.
+
+    These job attributes are just a start, but they provide both an
+    example of the sort of external data that is available through the
+    PMI interface and how extensions can be added within the same API
+    and wire protocol. For example, adding more complex network
+    topologies requires only adding new keys, not new routines.
+
+  . isHeterogeneous - The value isHeterogeneous is true if the
+    processes belonging to the job are running on nodes with different
+    underlying data models.
+
+@*/
+PMIX_EXPORT int PMI2_Info_GetJobAttrIntArray(const char name[], int array[], int arraylen, int *outlen, int *found);
+
+/*@
+  PMI2_Nameserv_publish - publish a name
+
+  Input parameters:
+  + service_name - string representing the service being published
+  . info_ptr -
+  - port - string representing the port on which to contact the service
+
+  Return values:
+  Returns 'PMI2_SUCCESS' on success and an PMI error code on failure.
+
+@*/
+PMIX_EXPORT int PMI2_Nameserv_publish(const char service_name[], const PMI_keyval_t *info_ptr, const char port[]);
+
+/*@
+  PMI2_Nameserv_lookup - lookup a service by name
+
+  Input parameters:
+  + service_name - string representing the service being published
+  . info_ptr -
+  - portLen - size of buffer provided in port
+
+  Output parameters:
+  . port - string representing the port on which to contact the service
+
+  Return values:
+  Returns 'PMI2_SUCCESS' on success and an PMI error code on failure.
+
+@*/
+PMIX_EXPORT int PMI2_Nameserv_lookup(const char service_name[], const PMI_keyval_t *info_ptr,
+                                     char port[], int portLen);
+/*@
+  PMI2_Nameserv_unpublish - unpublish a name
+
+  Input parameters:
+  + service_name - string representing the service being unpublished
+  - info_ptr -
+
+  Return values:
+  Returns 'PMI2_SUCCESS' on success and an PMI error code on failure.
+
+@*/
+PMIX_EXPORT int PMI2_Nameserv_unpublish(const char service_name[],
+                                        const PMI_keyval_t *info_ptr);
+
+
+
+#if defined(__cplusplus)
+}
+#endif
+
+#endif /* PMI2_H_INCLUDED */
diff --git a/include/pmix.h b/include/pmix.h
new file mode 100644
index 0000000..eada00d
--- /dev/null
+++ b/include/pmix.h
@@ -0,0 +1,539 @@
+/*
+ * Copyright (c) 2013-2017 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2016      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer listed
+ *   in this license in the documentation and/or other materials
+ *   provided with the distribution.
+ *
+ * - Neither the name of the copyright holders nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * The copyright holders provide no reassurances that the source code
+ * provided does not infringe any patent, copyright, or any other
+ * intellectual property rights of third parties.  The copyright holders
+ * disclaim any liability to any recipient for claims brought against
+ * recipient by any third party for infringement of that parties
+ * intellectual property rights.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#ifndef PMIx_H
+#define PMIx_H
+
+/* Structure and constant definitions */
+#include <pmix_common.h>
+
+#if defined(c_plusplus) || defined(__cplusplus)
+extern "C" {
+#endif
+
+/****    PMIX API    ****/
+
+/* Initialize the PMIx client, returning the process identifier assigned
+ * to this client's application in the provided pmix_proc_t struct.
+ * Passing a parameter of _NULL_ for this parameter is allowed if the user
+ * wishes solely to initialize the PMIx system and does not require
+ * return of the identifier at that time.
+ *
+ * When called the PMIx client will check for the required connection
+ * information of the local PMIx server and will establish the connection.
+ * If the information is not found, or the server connection fails, then
+ * an appropriate error constant will be returned.
+ *
+ * If successful, the function will return PMIX_SUCCESS and will fill the
+ * provided structure with the server-assigned namespace and rank of the
+ * process within the application.
+ *
+ * Note that the PMIx client library is referenced counted, and so multiple
+ * calls to PMIx_Init are allowed. Thus, one way to obtain the namespace and
+ * rank of the process is to simply call PMIx_Init with a non-NULL parameter.
+ *
+ * The info array is used to pass user requests pertaining to the init
+ * and subsequent operations. Pass a _NULL_ value for the array pointer
+ * is supported if no directives are desired.
+ */
+PMIX_EXPORT pmix_status_t PMIx_Init(pmix_proc_t *proc,
+                                    pmix_info_t info[], size_t ninfo);
+
+/* Finalize the PMIx client, closing the connection to the local server.
+ * An error code will be returned if, for some reason, the connection
+ * cannot be closed.
+ *
+ * The info array is used to pass user requests regarding the finalize
+ * operation. This can include:
+ *
+ * (a) PMIX_EMBED_BARRIER - By default, PMIx_Finalize does not include an
+ * internal barrier operation. This attribute directs PMIx_Finalize to
+ * execute a barrier as part of the finalize operation.
+ */
+PMIX_EXPORT pmix_status_t PMIx_Finalize(const pmix_info_t info[], size_t ninfo);
+
+
+/* Returns _true_ if the PMIx client has been successfully initialized,
+ * returns _false_ otherwise. Note that the function only reports the
+ * internal state of the PMIx client - it does not verify an active
+ * connection with the server, nor that the server is functional. */
+PMIX_EXPORT int PMIx_Initialized(void);
+
+
+/* Request that the provided array of procs be aborted, returning the
+ * provided _status_ and printing the provided message. A _NULL_
+ * for the proc array indicates that all processes in the caller's
+ * nspace are to be aborted.
+ *
+ * The response to this request is somewhat dependent on the specific resource
+ * manager and its configuration (e.g., some resource managers will
+ * not abort the application if the provided _status_ is zero unless
+ * specifically configured to do so), and thus lies outside the control
+ * of PMIx itself. However, the client will inform the RM of
+ * the request that the application be aborted, regardless of the
+ * value of the provided _status_.
+ *
+ * Passing a _NULL_ msg parameter is allowed. Note that race conditions
+ * caused by multiple processes calling PMIx_Abort are left to the
+ * server implementation to resolve with regard to which status is
+ * returned and what messages (if any) are printed. */
+PMIX_EXPORT pmix_status_t PMIx_Abort(int status, const char msg[],
+                                     pmix_proc_t procs[], size_t nprocs);
+
+
+/* Push a value into the client's namespace. The client library will cache
+ * the information locally until _PMIx_Commit_ is called. The provided scope
+ * value is passed to the local PMIx server, which will distribute the data
+ * as directed. */
+PMIX_EXPORT pmix_status_t PMIx_Put(pmix_scope_t scope, const char key[], pmix_value_t *val);
+
+
+/* Push all previously _PMIx_Put_ values to the local PMIx server.
+ * This is an asynchronous operation - the library will immediately
+ * return to the caller while the data is transmitted to the local
+ * server in the background */
+PMIX_EXPORT pmix_status_t PMIx_Commit(void);
+
+
+/* Execute a blocking barrier across the processes identified in the
+ * specified array. Passing a _NULL_ pointer as the _procs_ parameter
+ * indicates that the barrier is to span all processes in the client's
+ * namespace. Each provided pmix_proc_t struct can pass PMIX_RANK_WILDCARD to
+ * indicate that all processes in the given namespace are
+ * participating.
+ *
+ * The info array is used to pass user requests regarding the fence
+ * operation. This can include:
+ *
+ * (a) PMIX_COLLECT_DATA - a boolean indicating whether or not the barrier
+ *     operation is to return the _put_ data from all participating processes.
+ *     A value of _false_ indicates that the callback is just used as a release
+ *     and no data is to be returned at that time. A value of _true_ indicates
+ *     that all _put_ data is to be collected by the barrier. Returned data is
+ *     cached at the server to reduce memory footprint, and can be retrieved
+ *     as needed by calls to PMIx_Get(nb).
+ *
+ *     Note that for scalability reasons, the default behavior for PMIx_Fence
+ *     is to _not_ collect the data.
+ *
+ * (b) PMIX_COLLECTIVE_ALGO - a comma-delimited string indicating the algos
+ *     to be used for executing the barrier, in priority order.
+ *
+ * (c) PMIX_COLLECTIVE_ALGO_REQD - instructs the host RM that it should return
+ *     an error if none of the specified algos are available. Otherwise, the RM
+ *     is to use one of the algos if possible, but is otherwise free to use any
+ *     of its available methods to execute the operation.
+ *
+ * (d) PMIX_TIMEOUT - maximum time for the fence to execute before declaring
+ *     an error. By default, the RM shall terminate the operation and notify participants
+ *     if one or more of the indicated procs fails during the fence. However,
+ *     the timeout parameter can help avoid "hangs" due to programming errors
+ *     that prevent one or more procs from reaching the "fence".
+ */
+PMIX_EXPORT pmix_status_t PMIx_Fence(const pmix_proc_t procs[], size_t nprocs,
+                                     const pmix_info_t info[], size_t ninfo);
+
+/* Non-blocking version of PMIx_Fence. Note that the function will return
+ * an error if a _NULL_ callback function is given. */
+PMIX_EXPORT pmix_status_t PMIx_Fence_nb(const pmix_proc_t procs[], size_t nprocs,
+                                        const pmix_info_t info[], size_t ninfo,
+                                        pmix_op_cbfunc_t cbfunc, void *cbdata);
+
+
+/* Retrieve information for the specified _key_ as published by the process
+ * identified in the given pmix_proc_t, returning a pointer to the value in the
+ * given address.
+ *
+ * This is a blocking operation - the caller will block until
+ * the specified data has been _PMIx_Put_ by the specified rank. The caller is
+ * responsible for freeing all memory associated with the returned value when
+ * no longer required.
+ *
+ * The info array is used to pass user requests regarding the get
+ * operation. This can include:
+ *
+ * (a) PMIX_TIMEOUT - maximum time for the get to execute before declaring
+ *     an error. The timeout parameter can help avoid "hangs" due to programming
+ *     errors that prevent the target proc from ever exposing its data.
+ */
+PMIX_EXPORT pmix_status_t PMIx_Get(const pmix_proc_t *proc, const char key[],
+                                   const pmix_info_t info[], size_t ninfo,
+                                   pmix_value_t **val);
+
+/* A non-blocking operation version of PMIx_Get - the callback function will
+ * be executed once the specified data has been _PMIx_Put_
+ * by the identified process and retrieved by the local server. The info
+ * array is used as described above for the blocking form of this call. */
+PMIX_EXPORT pmix_status_t PMIx_Get_nb(const pmix_proc_t *proc, const char key[],
+                                      const pmix_info_t info[], size_t ninfo,
+                                      pmix_value_cbfunc_t cbfunc, void *cbdata);
+
+
+/* Publish the data in the info array for lookup. By default,
+ * the data will be published into the PMIX_SESSION range and
+ * with PMIX_PERSIST_APP persistence. Changes to those values,
+ * and any additional directives, can be included in the pmix_info_t
+ * array.
+ *
+ * Note that the keys must be unique within the specified
+ * data range or else an error will be returned (first published
+ * wins). Attempts to access the data by procs outside of
+ * the provided data range will be rejected.
+ *
+ * The persistence parameter instructs the server as to how long
+ * the data is to be retained.
+ *
+ * The blocking form will block until the server confirms that the
+ * data has been posted and is available. The non-blocking form will
+ * return immediately, executing the callback when the server confirms
+ * availability of the data.
+ */
+PMIX_EXPORT pmix_status_t PMIx_Publish(const pmix_info_t info[], size_t ninfo);
+PMIX_EXPORT pmix_status_t PMIx_Publish_nb(const pmix_info_t info[], size_t ninfo,
+                                          pmix_op_cbfunc_t cbfunc, void *cbdata);
+
+
+/* Lookup information published by this or another process. By default,
+ * the search will be conducted across the PMIX_SESSION range. Changes
+ * to the range, and any additional directives, can be provided
+ * in the pmix_info_t array. Note that the search is also constrained
+ * to only data published by the current user ID - i.e., the search
+ * will not return data published by an application being executed
+ * by another user. There currently is no option to override this
+ * behavior - such an option may become available later via an
+ * appropriate pmix_info_t directive.
+ *
+ * The "data" parameter consists of an array of pmix_pdata_t struct with the
+ * keys specifying the requested information. Data will be returned
+ * for each key in the associated info struct - any key that cannot
+ * be found will return with a data type of "PMIX_UNDEF". The function
+ * will return SUCCESS if _any_ values can be found, so the caller
+ * must check each data element to ensure it was returned.
+ *
+ * The proc field in each pmix_pdata_t struct will contain the
+ * nspace/rank of the process that published the data.
+ *
+ * Note: although this is a blocking function, it will _not_ wait
+ * by default for the requested data to be published. Instead, it
+ * will block for the time required by the server to lookup its current
+ * data and return any found items. Thus, the caller is responsible for
+ * ensuring that data is published prior to executing a lookup, or
+ * for retrying until the requested data is found
+ *
+ * Optionally, the info array can be used to modify this behavior
+ * by including:
+ *
+ * (a) PMIX_WAIT - wait for the requested data to be published. The
+ *     server is to wait until all data has become available.
+ *
+ * (b) PMIX_TIMEOUT - max time to wait for data to become available.
+ *
+ */
+PMIX_EXPORT pmix_status_t PMIx_Lookup(pmix_pdata_t data[], size_t ndata,
+                                      const pmix_info_t info[], size_t ninfo);
+
+/* Non-blocking form of the _PMIx_Lookup_ function. Data for
+ * the provided NULL-terminated keys array will be returned
+ * in the provided callback function. As above, the default
+ * behavior is to _not_ wait for data to be published. The
+ * info keys can be used to modify the behavior as previously
+ * described */
+PMIX_EXPORT pmix_status_t PMIx_Lookup_nb(char **keys, const pmix_info_t info[], size_t ninfo,
+                                         pmix_lookup_cbfunc_t cbfunc, void *cbdata);
+
+
+/* Unpublish data posted by this process using the given keys.
+ * The function will block until the data has been removed by
+ * the server. A value of _NULL_ for the keys parameter instructs
+ * the server to remove _all_ data published by this process.
+ *
+ * By default, the range is assumed to be PMIX_SESSION. Changes
+ * to the range, and any additional directives, can be provided
+ * in the pmix_info_t array */
+PMIX_EXPORT pmix_status_t PMIx_Unpublish(char **keys,
+                                         const pmix_info_t info[], size_t ninfo);
+
+/* Non-blocking form of the _PMIx_Unpublish_ function. The
+ * callback function will be executed once the server confirms
+ * removal of the specified data. */
+PMIX_EXPORT pmix_status_t PMIx_Unpublish_nb(char **keys,
+                                            const pmix_info_t info[], size_t ninfo,
+                                            pmix_op_cbfunc_t cbfunc, void *cbdata);
+
+
+/* Spawn a new job. The assigned namespace of the spawned applications
+ * is returned in the nspace parameter - a _NULL_ value in that
+ * location indicates that the caller doesn't wish to have the
+ * namespace returned. The nspace array must be at least of size
+ * PMIX_MAX_NSLEN+1. Behavior of individual resource managers
+ * may differ, but it is expected that failure of any application
+ * process to start will result in termination/cleanup of _all_
+ * processes in the newly spawned job and return of an error
+ * code to the caller.
+ *
+ * By default, the spawned processes will be PMIx "connected" to
+ * the parent process upon successful launch (see PMIx_Connect
+ * description for details). Note that this only means that the
+ * parent process (a) will be given a copy of the  new job's
+ * information so it can query job-level info without
+ * incurring any communication penalties, and (b) will receive
+ * notification of errors from process in the child job.
+ *
+ * Job-level directives can be specified in the job_info array. This
+ * can include:
+ *
+ * (a) PMIX_NON_PMI - processes in the spawned job will
+ *     not be calling PMIx_Init
+ *
+ * (b) PMIX_TIMEOUT - declare the spawn as having failed if the launched
+ *     procs do not call PMIx_Init within the specified time
+ *
+ * (c) PMIX_NOTIFY_COMPLETION - notify the parent process when the
+ *     child job terminates, either normally or with error
+ */
+PMIX_EXPORT pmix_status_t PMIx_Spawn(const pmix_info_t job_info[], size_t ninfo,
+                                     const pmix_app_t apps[], size_t napps,
+                                     char nspace[]);
+
+
+/* Non-blocking form of the _PMIx_Spawn_ function. The callback
+ * will be executed upon launch of the specified applications,
+ * or upon failure to launch any of them. */
+PMIX_EXPORT pmix_status_t PMIx_Spawn_nb(const pmix_info_t job_info[], size_t ninfo,
+                                        const pmix_app_t apps[], size_t napps,
+                                        pmix_spawn_cbfunc_t cbfunc, void *cbdata);
+
+/* Record the specified processes as "connected". Both blocking and non-blocking
+ * versions are provided. This means that the resource manager should treat the
+ * failure of any process in the specified group as a reportable event, and take
+ * appropriate action. Note that different resource managers may respond to
+ * failures in different manners.
+ *
+ * The callback function is to be called once all participating processes have
+ * called connect. The server is required to return any job-level info for the
+ * connecting processes that might not already have - i.e., if the connect
+ * request involves procs from different nspaces, then each proc shall receive
+ * the job-level info from those nspaces other than their own.
+ *
+ * Note: a process can only engage in _one_ connect operation involving the identical
+ * set of processes at a time. However, a process _can_ be simultaneously engaged
+ * in multiple connect operations, each involving a different set of processes
+ *
+ * As in the case of the fence operation, the info array can be used to pass
+ * user-level directives regarding the algorithm to be used for the collective
+ * operation involved in the "connect", timeout constraints, and other options
+ * available from the host RM */
+PMIX_EXPORT pmix_status_t PMIx_Connect(const pmix_proc_t procs[], size_t nprocs,
+                                       const pmix_info_t info[], size_t ninfo);
+
+PMIX_EXPORT pmix_status_t PMIx_Connect_nb(const pmix_proc_t procs[], size_t nprocs,
+                                          const pmix_info_t info[], size_t ninfo,
+                                          pmix_op_cbfunc_t cbfunc, void *cbdata);
+
+/* Disconnect a previously connected set of processes. An error will be returned
+ * if the specified set of procs was not previously "connected". As above, a process
+ * may be involved in multiple simultaneous disconnect operations. However, a process
+ * is not allowed to reconnect to a set of procs that has not fully completed
+ * disconnect - i.e., you have to fully disconnect before you can reconnect to the
+ * _same_ group of processes. The info array is used as above. */
+PMIX_EXPORT pmix_status_t PMIx_Disconnect(const pmix_proc_t procs[], size_t nprocs,
+                                          const pmix_info_t info[], size_t ninfo);
+
+PMIX_EXPORT pmix_status_t PMIx_Disconnect_nb(const pmix_proc_t ranges[], size_t nprocs,
+                                             const pmix_info_t info[], size_t ninfo,
+                                             pmix_op_cbfunc_t cbfunc, void *cbdata);
+
+/* Given a node name, return an array of processes within the specified nspace
+ * on that node. If the nspace is NULL, then all processes on the node will
+ * be returned. If the specified node does not currently host any processes,
+ * then the returned array will be NULL, and nprocs=0. The caller is responsible
+ * for releasing the array when done with it - the PMIX_PROC_FREE macro is
+ * provided for this purpose.
+ */
+PMIX_EXPORT pmix_status_t PMIx_Resolve_peers(const char *nodename, const char *nspace,
+                                             pmix_proc_t **procs, size_t *nprocs);
+
+
+/* Given an nspace, return the list of nodes hosting processes within
+ * that nspace. The returned string will contain a comma-delimited list
+ * of nodenames. The caller is responsible for releasing the string
+ * when done with it */
+PMIX_EXPORT pmix_status_t PMIx_Resolve_nodes(const char *nspace, char **nodelist);
+
+/* Query information about the system in general - can include
+ * a list of active nspaces, network topology, etc. Also can be
+ * used to query node-specific info such as the list of peers
+ * executing on a given node. We assume that the host RM will
+ * exercise appropriate access control on the information.
+ *
+ * NOTE: there is no blocking form of this API as the structures
+ * passed to query info differ from those for receiving the results
+ *
+ * The following return status codes are provided in the callback:
+ *
+ * PMIX_SUCCESS - all data has been returned
+ * PMIX_ERR_NOT_FOUND - none of the requested data was available
+ * PMIX_ERR_PARTIAL_SUCCESS - some of the data has been returned
+ * PMIX_ERR_NOT_SUPPORTED - the host RM does not support this function
+ */
+PMIX_EXPORT pmix_status_t PMIx_Query_info_nb(pmix_query_t queries[], size_t nqueries,
+                                             pmix_info_cbfunc_t cbfunc, void *cbdata);
+
+/* Log data to a central data service/store, subject to the
+ * services offered by the host resource manager. The data to
+ * be logged is provided in the data array. The (optional) directives
+ * can be used to request specific storage options and direct
+ * the choice of storage option.
+ *
+ * The callback function will be executed when the log operation
+ * has been completed. The data array must be maintained until
+ * the callback is provided
+ */
+PMIX_EXPORT pmix_status_t PMIx_Log_nb(const pmix_info_t data[], size_t ndata,
+                                      const pmix_info_t directives[], size_t ndirs,
+                                      pmix_op_cbfunc_t cbfunc, void *cbdata);
+
+/* Request an allocation operation from the host resource manager.
+ * Several broad categories are envisioned, including the ability to:
+ *
+ * - request allocation of additional resources, including memory,
+ *   bandwidth, and compute. This should be accomplished in a
+ *   non-blocking manner so that the application can continue to
+ *   progress while waiting for resources to become available. Note
+ *   that the new allocation will be disjoint from (i.e., not
+ *   affiliated with) the allocation of the requestor - thus the
+ *   termination of one allocation will not impact the other.
+ *
+ * - extend the reservation on currently allocated resources, subject
+ *   to scheduling availability and priorities. This includes extending
+ *   the time limit on current resources, and/or requesting additional
+ *   resources be allocated to the requesting job. Any additional
+ *   allocated resources will be considered as part of the current
+ *   allocation, and thus will be released at the same time.
+ *
+ * - release currently allocated resources that are no longer required.
+ *   This is intended to support partial release of resources since all
+ *   resources are normally released upon termination of the job. The
+ *   identified use-cases include resource variations across discrete steps
+ *   of a workflow, as well as applications that spawn sub-jobs and/or
+ *   dynamically grow/shrink over time
+ *
+ * - "lend" resources back to the scheduler with an expectation of getting
+ *   them back at some later time in the job. This can be a proactive
+ *   operation (e.g., to save on computing costs when resources are
+ *   temporarily not required), or in response to scheduler requests in
+ *   lieue of preemption. A corresponding ability to "reacquire" resources
+ *   previously released is included.
+ */
+PMIX_EXPORT pmix_status_t PMIx_Allocation_request_nb(pmix_alloc_directive_t directive,
+                                                     pmix_info_t *info, size_t ninfo,
+                                                     pmix_info_cbfunc_t cbfunc, void *cbdata);
+
+/* Request a job control action. The targets array identifies the
+ * processes to which the requested job control action is to be applied.
+ * A NULL value can be used to indicate all processes in the caller's
+ * nspace. The use of PMIX_RANK_WILDARD can also be used to indicate
+ * that all processes in the given nspace are to be included.
+ *
+ * The directives are provided as pmix_info_t structs in the directives
+ * array. The callback function provides a status to indicate whether or
+ * not the request was granted, and to provide some information as to
+ * the reason for any denial in the pmix_info_cbfunc_t array of pmix_info_t
+ * structures. If non-NULL, then the specified release_fn must be called
+ * when the callback function completes - this will be used to release
+ * any provided pmix_info_t array.
+ */
+PMIX_EXPORT pmix_status_t PMIx_Job_control_nb(const pmix_proc_t targets[], size_t ntargets,
+                                              const pmix_info_t directives[], size_t ndirs,
+                                              pmix_info_cbfunc_t cbfunc, void *cbdata);
+
+/* Request that something be monitored - e.g., that the server monitor
+ * this process for periodic heartbeats as an indication that the process
+ * has not become "wedged". When a monitor detects the specified alarm
+ * condition, it will generate an event notification using the provided
+ * error code and passing along any available relevant information. It is
+ * up to the caller to register a corresponding event handler.
+ *
+ * Params:
+ *
+ * monitor: attribute indicating the type of monitor being requested - e.g.,
+ *          PMIX_MONITOR_FILE to indicate that the requestor is asking that
+ *          a file be monitored.
+ *
+ * error: the status code to be used when generating an event notification
+ *        alerting that the monitor has been triggered. The range of the
+ *        notification defaults to PMIX_RANGE_NAMESPACE - this can be
+ *        changed by providing a PMIX_RANGE directive
+ *
+ * directives: characterize the monitoring request (e.g., monitor file size)
+ *             and frequency of checking to be done
+ *
+ * cbfunc: provides a status to indicate whether or not the request was granted,
+ *         and to provide some information as to the reason for any denial in
+ *         the pmix_info_cbfunc_t array of pmix_info_t structures.
+ *
+ * Note: a process can send a heartbeat to the server using the PMIx_Heartbeat
+ * macro provided below*/
+PMIX_EXPORT pmix_status_t PMIx_Process_monitor_nb(const pmix_info_t *monitor, pmix_status_t error,
+                                                  const pmix_info_t directives[], size_t ndirs,
+                                                  pmix_info_cbfunc_t cbfunc, void *cbdata);
+
+/* define a special macro to simplify sending of a heartbeat */
+#define PMIx_Heartbeat()                                                    \
+    do {                                                                    \
+        pmix_info_t _in;                                                    \
+        PMIX_INFO_CONSTRUCT(&_in);                                          \
+        PMIX_INFO_LOAD(&_in, PMIX_SEND_HEARTBEAT, NULL, PMIX_POINTER);      \
+        PMIx_Process_monitor_nb(&_in, PMIX_SUCCESS, NULL, 0, NULL, NULL);   \
+        PMIX_INFO_DESTRUCT(&_in);                                           \
+    } while(0)
+
+#if defined(c_plusplus) || defined(__cplusplus)
+}
+#endif
+
+#endif
diff --git a/include/pmix_common.h b/include/pmix_common.h
new file mode 100644
index 0000000..df03dcb
--- /dev/null
+++ b/include/pmix_common.h
@@ -0,0 +1,1823 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2013-2017 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2016-2017 Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2016      IBM Corporation.  All rights reserved.
+ * Copyright (c) 2016      Mellanox Technologies, Inc.
+ *                         All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer listed
+ *   in this license in the documentation and/or other materials
+ *   provided with the distribution.
+ *
+ * - Neither the name of the copyright holders nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * The copyright holders provide no reassurances that the source code
+ * provided does not infringe any patent, copyright, or any other
+ * intellectual property rights of third parties.  The copyright holders
+ * disclaim any liability to any recipient for claims brought against
+ * recipient by any third party for infringement of that parties
+ * intellectual property rights.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#ifndef PMIx_COMMON_H
+#define PMIx_COMMON_H
+
+#include <stdbool.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
+#include <time.h>
+#include <sys/time.h> /* for struct timeval */
+#include <unistd.h> /* for uid_t and gid_t */
+#include <sys/types.h> /* for uid_t and gid_t */
+#include <pmix_rename.h>
+#include <pmix_version.h>
+
+#ifdef PMIX_HAVE_VISIBILITY
+#define PMIX_EXPORT __attribute__((__visibility__("default")))
+#else
+#define PMIX_EXPORT
+#endif
+
+
+#if defined(c_plusplus) || defined(__cplusplus)
+extern "C" {
+#endif
+
+/****  PMIX CONSTANTS    ****/
+
+/* define maximum value and key sizes */
+#define PMIX_MAX_NSLEN     255
+#define PMIX_MAX_KEYLEN    511
+
+/* define a type for rank values */
+typedef uint32_t pmix_rank_t;
+
+/* define a value for requests for job-level data
+ * where the info itself isn't associated with any
+ * specific rank, or when a request involves
+ * a rank that isn't known - e.g., when someone requests
+ * info thru one of the legacy interfaces where the rank
+ * is typically encoded into the key itself since there is
+ * no rank parameter in the API itself */
+#define PMIX_RANK_UNDEF     UINT32_MAX
+/* define a value to indicate that the user wants the
+ * data for the given key from every rank that posted
+ * that key */
+#define PMIX_RANK_WILDCARD  UINT32_MAX-1
+
+/* other special rank values will be used to define
+ * groups of ranks for use in collectives */
+#define PMIX_RANK_LOCAL_NODE    UINT32_MAX-2        // all ranks on local node
+
+
+/* define a set of "standard" PMIx attributes that can
+ * be queried. Implementations (and users) are free to extend as
+ * desired, so the get functions need to be capable
+ * of handling the "not found" condition. Note that these
+ * are attributes of the system and the job as opposed to
+ * values the application (or underlying MPI library)
+ * might choose to expose - i.e., they are values provided
+ * by the resource manager as opposed to the application. Thus,
+ * these keys are RESERVED */
+#define PMIX_ATTR_UNDEF      NULL
+
+/* initialization attributes */
+#define PMIX_EVENT_BASE                     "pmix.evbase"           // (struct event_base *) pointer to libevent event_base to use in place
+                                                                    //                       of the internal progress thread
+#define PMIX_SERVER_TOOL_SUPPORT            "pmix.srvr.tool"        // (bool) The host RM wants to declare itself as willing to
+                                                                    //        accept tool connection requests
+#define PMIX_SERVER_REMOTE_CONNECTIONS      "pmix.srvr.remote"      // (bool) Allow connections from remote tools (do not use loopback device)
+#define PMIX_SERVER_SYSTEM_SUPPORT          "pmix.srvr.sys"         // (bool) The host RM wants to declare itself as being the local
+                                                                    //        system server for PMIx connection requests
+#define PMIX_SERVER_TMPDIR                  "pmix.srvr.tmpdir"      // (char*) temp directory where PMIx server will place
+                                                                    //        client rendezvous points and contact info
+#define PMIX_SYSTEM_TMPDIR                  "pmix.sys.tmpdir"       // (char*) temp directory for this system, where PMIx
+                                                                    //        server will place tool rendezvous points and contact info
+#define PMIX_SERVER_ENABLE_MONITORING       "pmix.srv.monitor"      // (bool) Enable PMIx internal monitoring by server
+#define PMIX_SERVER_NSPACE                  "pmix.srv.nspace"       // (char*) Name of the nspace to use for this server
+#define PMIX_SERVER_RANK                    "pmix.srv.rank"         // (pmix_rank_t) Rank of this server
+
+
+/* tool-related attributes */
+#define PMIX_SERVER_PIDINFO                 "pmix.srvr.pidinfo"     // (pid_t) pid of the target server for a tool
+#define PMIX_CONNECT_TO_SYSTEM              "pmix.cnct.sys"         // (bool) The requestor requires that a connection be made only to
+                                                                    //        a local system-level PMIx server
+#define PMIX_CONNECT_SYSTEM_FIRST           "pmix.cnct.sys.first"   // (bool) Preferentially look for a system-level PMIx server first
+#define PMIX_SERVER_URI                     "pmix.srvr.uri"         // (char*) URI of server to be contacted
+#define PMIX_SERVER_HOSTNAME                "pmix.srvr.host"        // (char*) node where target server is located
+#define PMIX_CONNECT_MAX_RETRIES            "pmix.tool.mretries"    // (uint32_t) maximum number of times to try to connect to server
+#define PMIX_CONNECT_RETRY_DELAY            "pmix.tool.retry"       // (uint32_t) time in seconds between connection attempts
+
+
+/* identification attributes */
+#define PMIX_USERID                         "pmix.euid"             // (uint32_t) effective user id
+#define PMIX_GRPID                          "pmix.egid"             // (uint32_t) effective group id
+#define PMIX_DSTPATH                        "pmix.dstpath"          // (char*) path to dstore files
+#define PMIX_VERSION_INFO                   "pmix.version"          // (char*) PMIx version of contactor
+#define PMIX_PROGRAMMING_MODEL              "pmix.pgm.model"        // (char*) programming model being initialized (e.g., "MPI" or "OpenMP")
+#define PMIX_MODEL_LIBRARY_NAME             "pmix.mdl.name"         // (char*) programming model implementation ID (e.g., "OpenMPI" or "MPICH")
+#define PMIX_MODEL_LIBRARY_VERSION          "pmix.mld.vrs"          // (char*) programming model version string (e.g., "2.1.1")
+#define PMIX_THREADING_MODEL                "pmix.threads"          // (char*) threading model used (e.g., "pthreads")
+
+
+/* attributes for the USOCK rendezvous socket  */
+#define PMIX_USOCK_DISABLE                  "pmix.usock.disable"    // (bool) disable legacy usock support
+#define PMIX_SOCKET_MODE                    "pmix.sockmode"         // (uint32_t) POSIX mode_t (9 bits valid)
+#define PMIX_SINGLE_LISTENER                "pmix.sing.listnr"      // (bool) use only one rendezvous socket, letting priorities and/or
+                                                                    //        MCA param select the active transport
+
+/* attributes for TCP connections */
+#define PMIX_TCP_URI                        "pmix.tcp.uri"          // (char*) URI of server to connect to
+#define PMIX_TCP_IF_INCLUDE                 "pmix.tcp.ifinclude"    // (char*) comma-delimited list of devices and/or CIDR notation
+#define PMIX_TCP_IF_EXCLUDE                 "pmix.tcp.ifexclude"    // (char*) comma-delimited list of devices and/or CIDR notation
+#define PMIX_TCP_IPV4_PORT                  "pmix.tcp.ipv4"         // (int) IPv4 port to be used
+#define PMIX_TCP_IPV6_PORT                  "pmix.tcp.ipv6"         // (int) IPv6 port to be used
+#define PMIX_TCP_DISABLE_IPV4               "pmix.tcp.disipv4"      // (bool) true to disable IPv4 family
+#define PMIX_TCP_DISABLE_IPV6               "pmix.tcp.disipv6"      // (bool) true to disable IPv6 family
+
+/* general proc-level attributes */
+#define PMIX_CPUSET                         "pmix.cpuset"           // (char*) hwloc bitmap applied to proc upon launch
+#define PMIX_CREDENTIAL                     "pmix.cred"             // (char*) security credential assigned to proc
+#define PMIX_SPAWNED                        "pmix.spawned"          // (bool) true if this proc resulted from a call to PMIx_Spawn
+#define PMIX_ARCH                           "pmix.arch"             // (uint32_t) datatype architecture flag
+
+/* scratch directory locations for use by applications */
+#define PMIX_TMPDIR                         "pmix.tmpdir"           // (char*) top-level tmp dir assigned to session
+#define PMIX_NSDIR                          "pmix.nsdir"            // (char*) sub-tmpdir assigned to namespace
+#define PMIX_PROCDIR                        "pmix.pdir"             // (char*) sub-nsdir assigned to proc
+#define PMIX_TDIR_RMCLEAN                   "pmix.tdir.rmclean"     // (bool)  Resource Manager will clean session directories
+
+/* information about relative ranks as assigned by the RM */
+#define PMIX_PROCID                         "pmix.procid"           // (pmix_proc_t) process identifier
+#define PMIX_NSPACE                         "pmix.nspace"           // (char*) nspace of a job
+#define PMIX_JOBID                          "pmix.jobid"            // (char*) jobid assigned by scheduler
+#define PMIX_APPNUM                         "pmix.appnum"           // (uint32_t) app number within the job
+#define PMIX_RANK                           "pmix.rank"             // (pmix_rank_t) process rank within the job
+#define PMIX_GLOBAL_RANK                    "pmix.grank"            // (pmix_rank_t) rank spanning across all jobs in this session
+#define PMIX_APP_RANK                       "pmix.apprank"          // (pmix_rank_t) rank within this app
+#define PMIX_NPROC_OFFSET                   "pmix.offset"           // (pmix_rank_t) starting global rank of this job
+#define PMIX_LOCAL_RANK                     "pmix.lrank"            // (uint16_t) rank on this node within this job
+#define PMIX_NODE_RANK                      "pmix.nrank"            // (uint16_t) rank on this node spanning all jobs
+#define PMIX_LOCALLDR                       "pmix.lldr"             // (pmix_rank_t) lowest rank on this node within this job
+#define PMIX_APPLDR                         "pmix.aldr"             // (pmix_rank_t) lowest rank in this app within this job
+#define PMIX_PROC_PID                       "pmix.ppid"             // (pid_t) pid of specified proc
+#define PMIX_SESSION_ID                     "pmix.session.id"       // (uint32_t) session identifier
+
+#define PMIX_NODE_LIST                      "pmix.nlist"            // (char*) comma-delimited list of nodes running procs for the specified nspace
+#define PMIX_ALLOCATED_NODELIST             "pmix.alist"            // (char*) comma-delimited list of all nodes in this allocation regardless of
+                                                                    //           whether or not they currently host procs.
+#define PMIX_HOSTNAME                       "pmix.hname"            // (char*) name of the host the specified proc is on
+#define PMIX_NODEID                         "pmix.nodeid"           // (uint32_t) node identifier where the specified proc is located
+#define PMIX_LOCAL_PEERS                    "pmix.lpeers"           // (char*) comma-delimited string of ranks on this node within the specified nspace
+#define PMIX_LOCAL_PROCS                    "pmix.lprocs"           // (pmix_proc_t array) array of pmix_proc_t of procs on the specified node
+#define PMIX_LOCAL_CPUSETS                  "pmix.lcpus"            // (char*) colon-delimited cpusets of local peers within the specified nspace
+#define PMIX_PROC_URI                       "pmix.puri"             // (char*) URI containing contact info for proc
+#define PMIX_LOCALITY                       "pmix.loc"              // (uint16_t) relative locality of two procs
+
+/* size info */
+#define PMIX_UNIV_SIZE                      "pmix.univ.size"        // (uint32_t) #procs in this nspace
+#define PMIX_JOB_SIZE                       "pmix.job.size"         // (uint32_t) #procs in this job
+#define PMIX_JOB_NUM_APPS                   "pmix.job.napps"        // (uint32_t) #apps in this job
+#define PMIX_APP_SIZE                       "pmix.app.size"         // (uint32_t) #procs in this application
+#define PMIX_LOCAL_SIZE                     "pmix.local.size"       // (uint32_t) #procs in this job on this node
+#define PMIX_NODE_SIZE                      "pmix.node.size"        // (uint32_t) #procs across all jobs on this node
+#define PMIX_MAX_PROCS                      "pmix.max.size"         // (uint32_t) max #procs for this job
+#define PMIX_NUM_NODES                      "pmix.num.nodes"        // (uint32_t) #nodes in this nspace
+
+/* Memory info */
+#define PMIX_AVAIL_PHYS_MEMORY              "pmix.pmem"             // (uint64_t) total available physical memory on this node
+#define PMIX_DAEMON_MEMORY                  "pmix.dmn.mem"          // (float) Mbytes of memory currently used by daemon
+#define PMIX_CLIENT_AVG_MEMORY              "pmix.cl.mem.avg"       // (float) Average Mbytes of memory used by client processes
+
+/* topology info */
+#define PMIX_NET_TOPO                       "pmix.ntopo"            // (char*) xml-representation of network topology
+#define PMIX_LOCAL_TOPO                     "pmix.ltopo"            // (char*) xml-representation of local node topology
+#define PMIX_NODE_LIST                      "pmix.nlist"            // (char*) comma-delimited list of nodes running procs for this job
+#define PMIX_TOPOLOGY                       "pmix.topo"             // (hwloc_topology_t) pointer to the PMIx client's internal topology object
+#define PMIX_TOPOLOGY_SIGNATURE             "pmix.toposig"          // (char*) topology signature string
+#define PMIX_LOCALITY_STRING                "pmix.locstr"           // (char*) string describing a proc's location
+#define PMIX_HWLOC_SHMEM_ADDR               "pmix.hwlocaddr"        // (size_t) address of HWLOC shared memory segment
+#define PMIX_HWLOC_SHMEM_SIZE               "pmix.hwlocsize"        // (size_t) size of HWLOC shared memory segment
+#define PMIX_HWLOC_SHMEM_FILE               "pmix.hwlocfile"        // (char*) path to HWLOC shared memory file
+
+/* request-related info */
+#define PMIX_COLLECT_DATA                   "pmix.collect"          // (bool) collect data and return it at the end of the operation
+#define PMIX_TIMEOUT                        "pmix.timeout"          // (int) time in sec before specified operation should time out (0 => infinite)
+#define PMIX_IMMEDIATE                      "pmix.immediate"        // (bool) specified operation should immediately return an error if requested
+                                                                    //        data cannot be found - do not request it from the host RM
+#define PMIX_WAIT                           "pmix.wait"             // (int) caller requests that the server wait until at least the specified
+                                                                    //       #values are found (0 => all and is the default)
+#define PMIX_COLLECTIVE_ALGO                "pmix.calgo"            // (char*) comma-delimited list of algorithms to use for collective
+#define PMIX_COLLECTIVE_ALGO_REQD           "pmix.calreqd"          // (bool) if true, indicates that the requested choice of algo is mandatory
+#define PMIX_NOTIFY_COMPLETION              "pmix.notecomp"         // (bool) notify parent process upon termination of child job
+#define PMIX_RANGE                          "pmix.range"            // (pmix_data_range_t) value for calls to publish/lookup/unpublish or for
+                                                                    //        monitoring event notifications
+#define PMIX_PERSISTENCE                    "pmix.persist"          // (pmix_persistence_t) value for calls to publish
+#define PMIX_OPTIONAL                       "pmix.optional"         // (bool) look only in the immediate data store for the requested value - do
+                                                                    //        not request data from the server if not found
+#define PMIX_EMBED_BARRIER                  "pmix.embed.barrier"    // (bool) execute a blocking fence operation before executing the
+                                                                    //        specified operation
+
+/* attributes used by host server to pass data to the server convenience library - the
+ * data will then be parsed and provided to the local clients */
+#define PMIX_REGISTER_NODATA                "pmix.reg.nodata"       // (bool) Registration is for nspace only, do not copy job data
+#define PMIX_PROC_DATA                      "pmix.pdata"            // (pmix_data_array_t) starts with rank, then contains more data
+#define PMIX_NODE_MAP                       "pmix.nmap"             // (char*) regex of nodes containing procs for this job
+#define PMIX_PROC_MAP                       "pmix.pmap"             // (char*) regex describing procs on each node within this job
+#define PMIX_ANL_MAP                        "pmix.anlmap"           // (char*) process mapping in ANL notation (used in PMI-1/PMI-2)
+#define PMIX_APP_MAP_TYPE                   "pmix.apmap.type"       // (char*) type of mapping used to layout the application (e.g., cyclic)
+#define PMIX_APP_MAP_REGEX                  "pmix.apmap.regex"      // (char*) regex describing the result of the mapping
+
+/* attributes used internally to communicate data from the server to the client */
+#define PMIX_PROC_BLOB                      "pmix.pblob"            // (pmix_byte_object_t) packed blob of process data
+#define PMIX_MAP_BLOB                       "pmix.mblob"            // (pmix_byte_object_t) packed blob of process location
+
+/* event handler registration and notification info keys */
+#define PMIX_EVENT_HDLR_NAME                "pmix.evname"           // (char*) string name identifying this handler
+#define PMIX_EVENT_JOB_LEVEL                "pmix.evjob"            // (bool) register for job-specific events only
+#define PMIX_EVENT_ENVIRO_LEVEL             "pmix.evenv"            // (bool) register for environment events only
+#define PMIX_EVENT_HDLR_FIRST               "pmix.evfirst"          // (bool) invoke this event handler before any other handlers
+#define PMIX_EVENT_HDLR_LAST                "pmix.evlast"           // (bool) invoke this event handler after all other handlers have been called
+#define PMIX_EVENT_HDLR_FIRST_IN_CATEGORY   "pmix.evfirstcat"       // (bool) invoke this event handler before any other handlers in this category
+#define PMIX_EVENT_HDLR_LAST_IN_CATEGORY    "pmix.evlastcat"        // (bool) invoke this event handler after all other handlers in this category have been called
+#define PMIX_EVENT_HDLR_BEFORE              "pmix.evbefore"         // (char*) put this event handler immediately before the one specified in the (char*) value
+#define PMIX_EVENT_HDLR_AFTER               "pmix.evafter"          // (char*) put this event handler immediately after the one specified in the (char*) value
+#define PMIX_EVENT_HDLR_PREPEND             "pmix.evprepend"        // (bool) prepend this handler to the precedence list within its category
+#define PMIX_EVENT_HDLR_APPEND              "pmix.evappend"         // (bool) append this handler to the precedence list within its category
+#define PMIX_EVENT_CUSTOM_RANGE             "pmix.evrange"          // (pmix_data_array_t*) array of pmix_proc_t defining range of event notification
+#define PMIX_EVENT_AFFECTED_PROC            "pmix.evproc"           // (pmix_proc_t) single proc that was affected
+#define PMIX_EVENT_AFFECTED_PROCS           "pmix.evaffected"       // (pmix_data_array_t*) array of pmix_proc_t defining affected procs
+#define PMIX_EVENT_NON_DEFAULT              "pmix.evnondef"         // (bool) event is not to be delivered to default event handlers
+#define PMIX_EVENT_RETURN_OBJECT            "pmix.evobject"         // (void*) object to be returned whenever the registered cbfunc is invoked
+                                                                    //     NOTE: the object will _only_ be returned to the process that
+                                                                    //           registered it
+
+/* fault tolerance-related events */
+#define PMIX_EVENT_TERMINATE_SESSION        "pmix.evterm.sess"      // (bool) RM intends to terminate session
+#define PMIX_EVENT_TERMINATE_JOB            "pmix.evterm.job"       // (bool) RM intends to terminate this job
+#define PMIX_EVENT_TERMINATE_NODE           "pmix.evterm.node"      // (bool) RM intends to terminate all procs on this node
+#define PMIX_EVENT_TERMINATE_PROC           "pmix.evterm.proc"      // (bool) RM intends to terminate just this process
+#define PMIX_EVENT_ACTION_TIMEOUT           "pmix.evtimeout"        // (int) time in sec before RM will execute error response
+#define PMIX_EVENT_NO_TERMINATION           "pmix.evnoterm"         // (bool) indicates that the handler has satisfactorily handled
+                                                                    //        the event and believes termination of the application is not required
+#define PMIX_EVENT_WANT_TERMINATION         "pmix.evterm"           // (bool) indicates that the handler has determined that the application should be terminated
+
+
+/* attributes used to describe "spawn" attributes */
+#define PMIX_PERSONALITY                    "pmix.pers"             // (char*) name of personality to use
+#define PMIX_HOST                           "pmix.host"             // (char*) comma-delimited list of hosts to use for spawned procs
+#define PMIX_HOSTFILE                       "pmix.hostfile"         // (char*) hostfile to use for spawned procs
+#define PMIX_ADD_HOST                       "pmix.addhost"          // (char*) comma-delimited list of hosts to add to allocation
+#define PMIX_ADD_HOSTFILE                   "pmix.addhostfile"      // (char*) hostfile to add to existing allocation
+#define PMIX_PREFIX                         "pmix.prefix"           // (char*) prefix to use for starting spawned procs
+#define PMIX_WDIR                           "pmix.wdir"             // (char*) working directory for spawned procs
+#define PMIX_MAPPER                         "pmix.mapper"           // (char*) mapper to use for placing spawned procs
+#define PMIX_DISPLAY_MAP                    "pmix.dispmap"          // (bool) display process map upon spawn
+#define PMIX_PPR                            "pmix.ppr"              // (char*) #procs to spawn on each identified resource
+#define PMIX_MAPBY                          "pmix.mapby"            // (char*) mapping policy
+#define PMIX_RANKBY                         "pmix.rankby"           // (char*) ranking policy
+#define PMIX_BINDTO                         "pmix.bindto"           // (char*) binding policy
+#define PMIX_PRELOAD_BIN                    "pmix.preloadbin"       // (bool) preload binaries
+#define PMIX_PRELOAD_FILES                  "pmix.preloadfiles"     // (char*) comma-delimited list of files to pre-position
+#define PMIX_NON_PMI                        "pmix.nonpmi"           // (bool) spawned procs will not call PMIx_Init
+#define PMIX_STDIN_TGT                      "pmix.stdin"            // (uint32_t) spawned proc rank that is to receive stdin
+#define PMIX_FWD_STDIN                      "pmix.fwd.stdin"        // (bool) forward my stdin to the designated proc
+#define PMIX_FWD_STDOUT                     "pmix.fwd.stdout"       // (bool) forward stdout from spawned procs to me
+#define PMIX_FWD_STDERR                     "pmix.fwd.stderr"       // (bool) forward stderr from spawned procs to me
+#define PMIX_DEBUGGER_DAEMONS               "pmix.debugger"         // (bool) spawned app consists of debugger daemons
+#define PMIX_COSPAWN_APP                    "pmix.cospawn"          // (bool) designated app is to be spawned as a disconnected
+                                                                    //     job - i.e., not part of the "comm_world" of the job
+
+/* query attributes */
+#define PMIX_QUERY_NAMESPACES               "pmix.qry.ns"           // (char*) request a comma-delimited list of active nspaces
+#define PMIX_QUERY_JOB_STATUS               "pmix.qry.jst"          // (pmix_status_t) status of a specified currently executing job
+#define PMIX_QUERY_QUEUE_LIST               "pmix.qry.qlst"         // (char*) request a comma-delimited list of scheduler queues
+#define PMIX_QUERY_QUEUE_STATUS             "pmix.qry.qst"          // (TBD) status of a specified scheduler queue
+#define PMIX_QUERY_PROC_TABLE               "pmix.qry.ptable"       // (char*) input nspace of job whose info is being requested
+                                                                    //         returns (pmix_data_array_t) an array of pmix_proc_info_t
+#define PMIX_QUERY_LOCAL_PROC_TABLE         "pmix.qry.lptable"      // (char*) input nspace of job whose info is being requested
+                                                                    //         returns (pmix_data_array_t) an array of pmix_proc_info_t for
+                                                                    //         procs in job on same node
+#define PMIX_QUERY_AUTHORIZATIONS           "pmix.qry.auths"        // (bool) return operations tool is authorized to perform
+#define PMIX_QUERY_SPAWN_SUPPORT            "pmix.qry.spawn"        // (bool) return a comma-delimited list of supported spawn attributes
+#define PMIX_QUERY_DEBUG_SUPPORT            "pmix.qry.debug"        // (bool) return a comma-delimited list of supported debug attributes
+#define PMIX_QUERY_MEMORY_USAGE             "pmix.qry.mem"          // (bool) return info on memory usage for the procs indicated in the qualifiers
+#define PMIX_QUERY_LOCAL_ONLY               "pmix.qry.local"        // (bool) constrain the query to local information only
+#define PMIX_QUERY_REPORT_AVG               "pmix.qry.avg"          // (bool) report average values
+#define PMIX_QUERY_REPORT_MINMAX            "pmix.qry.minmax"       // (bool) report minimum and maximum value
+#define PMIX_QUERY_ALLOC_STATUS             "pmix.query.alloc"      // (char*) string identifier of the allocation whose status
+                                                                    //         is being requested
+#define PMIX_TIME_REMAINING                 "pmix.time.remaining"   // (char*) query number of seconds (uint32_t) remaining in allocation
+                                                                    //         for the specified nspace
+
+/* log attributes */
+#define PMIX_LOG_STDERR                     "pmix.log.stderr"       // (char*) log string to stderr
+#define PMIX_LOG_STDOUT                     "pmix.log.stdout"       // (char*) log string to stdout
+#define PMIX_LOG_SYSLOG                     "pmix.log.syslog"       // (char*) log data to syslog - defaults to ERROR priority unless
+#define PMIX_LOG_MSG                        "pmix.log.msg"          // (pmix_byte_object_t) message blob to be sent somewhere
+#define PMIX_LOG_EMAIL                      "pmix.log.email"        // (pmix_data_array_t) log via email based on pmix_info_t containing directives
+#define PMIX_LOG_EMAIL_ADDR                 "pmix.log.emaddr"       // (char*) comma-delimited list of email addresses that are to recv msg
+#define PMIX_LOG_EMAIL_SUBJECT              "pmix.log.emsub"        // (char*) subject line for email
+#define PMIX_LOG_EMAIL_MSG                  "pmix.log.emmsg"        // (char*) msg to be included in email
+
+/* debugger attributes */
+#define PMIX_DEBUG_STOP_ON_EXEC             "pmix.dbg.exec"         // (bool) job is being spawned under debugger - instruct it to pause on start
+#define PMIX_DEBUG_STOP_IN_INIT             "pmix.dbg.init"         // (bool) instruct job to stop during PMIx init
+#define PMIX_DEBUG_WAIT_FOR_NOTIFY          "pmix.dbg.notify"       // (bool) block at desired point until receiving debugger release notification
+#define PMIX_DEBUG_JOB                      "pmix.dbg.job"          // (char*) nspace of the job to be debugged - the RM/PMIx server are
+#define PMIX_DEBUG_WAITING_FOR_NOTIFY       "pmix.dbg.waiting"      // (bool) job to be debugged is waiting for a release
+
+/* Resource Manager identification */
+#define PMIX_RM_NAME                        "pmix.rm.name"          // (char*) string name of the resource manager
+#define PMIX_RM_VERSION                     "pmix.rm.version"       // (char*) RM version string
+
+/* attributes for setting envars */
+#define PMIX_SET_ENVAR                      "pmix.set.envar"        // (char*) string "key=value" value shall be put into the environment
+#define PMIX_UNSET_ENVAR                    "pmix.unset.envar"      // (char*) unset envar specified in string
+
+/* attributes relating to allocations */
+#define PMIX_ALLOC_ID                       "pmix.alloc.id"         // (char*) provide a string identifier for this allocation request
+                                                                    //         which can later be used to query status of the request
+#define PMIX_ALLOC_NUM_NODES                "pmix.alloc.nnodes"     // (uint64_t) number of nodes
+#define PMIX_ALLOC_NODE_LIST                "pmix.alloc.nlist"      // (char*) regex of specific nodes
+#define PMIX_ALLOC_NUM_CPUS                 "pmix.alloc.ncpus"      // (uint64_t) number of cpus
+#define PMIX_ALLOC_NUM_CPU_LIST             "pmix.alloc.ncpulist"   // (char*) regex of #cpus for each node
+#define PMIX_ALLOC_CPU_LIST                 "pmix.alloc.cpulist"    // (char*) regex of specific cpus indicating the cpus involved.
+#define PMIX_ALLOC_MEM_SIZE                 "pmix.alloc.msize"      // (float) number of Mbytes
+#define PMIX_ALLOC_NETWORK                  "pmix.alloc.net"        // (array) array of pmix_info_t describing network resources. If not
+                                                                    //         given as part of an info struct that identifies the
+                                                                    //         impacted nodes, then the description will be applied
+                                                                    //         across all nodes in the requestor's allocation
+#define PMIX_ALLOC_NETWORK_ID               "pmix.alloc.netid"      // (char*) name of network
+#define PMIX_ALLOC_BANDWIDTH                "pmix.alloc.bw"         // (float) Mbits/sec
+#define PMIX_ALLOC_NETWORK_QOS              "pmix.alloc.netqos"     // (char*) quality of service level
+#define PMIX_ALLOC_TIME                     "pmix.alloc.time"       // (uint32_t) time in seconds
+
+/* job control attributes */
+#define PMIX_JOB_CTRL_ID                    "pmix.jctrl.id"         // (char*) provide a string identifier for this request
+#define PMIX_JOB_CTRL_PAUSE                 "pmix.jctrl.pause"      // (bool) pause the specified processes
+#define PMIX_JOB_CTRL_RESUME                "pmix.jctrl.resume"     // (bool) "un-pause" the specified processes
+#define PMIX_JOB_CTRL_CANCEL                "pmix.jctrl.cancel"     // (char*) cancel the specified request
+                                                                    //         (NULL => cancel all requests from this requestor)
+#define PMIX_JOB_CTRL_KILL                  "pmix.jctrl.kill"       // (bool) forcibly terminate the specified processes and cleanup
+#define PMIX_JOB_CTRL_RESTART               "pmix.jctrl.restart"    // (char*) restart the specified processes using the given checkpoint ID
+#define PMIX_JOB_CTRL_CHECKPOINT            "pmix.jctrl.ckpt"       // (char*) checkpoint the specified processes and assign the given ID to it
+#define PMIX_JOB_CTRL_CHECKPOINT_EVENT      "pmix.jctrl.ckptev"     // (bool) use event notification to trigger process checkpoint
+#define PMIX_JOB_CTRL_CHECKPOINT_SIGNAL     "pmix.jctrl.ckptsig"    // (int) use the given signal to trigger process checkpoint
+#define PMIX_JOB_CTRL_CHECKPOINT_TIMEOUT    "pmix.jctrl.ckptsig"    // (int) time in seconds to wait for checkpoint to complete
+#define PMIX_JOB_CTRL_CHECKPOINT_METHOD     "pmix.jctrl.ckmethod"   // (pmix_data_array_t) array of pmix_info_t declaring each
+                                                                    //      method and value supported by this application
+#define PMIX_JOB_CTRL_SIGNAL                "pmix.jctrl.sig"        // (int) send given signal to specified processes
+#define PMIX_JOB_CTRL_PROVISION             "pmix.jctrl.pvn"        // (char*) regex identifying nodes that are to be provisioned
+#define PMIX_JOB_CTRL_PROVISION_IMAGE       "pmix.jctrl.pvnimg"     // (char*) name of the image that is to be provisioned
+#define PMIX_JOB_CTRL_PREEMPTIBLE           "pmix.jctrl.preempt"    // (bool) job can be pre-empted
+
+/* monitoring attributes */
+#define PMIX_MONITOR_ID                     "pmix.monitor.id"       // (char*) provide a string identifier for this request
+#define PMIX_MONITOR_CANCEL                 "pmix.monitor.cancel"   // (char*) identifier to be canceled (NULL = cancel all
+                                                                    //         monitoring for this process)
+#define PMIX_MONITOR_APP_CONTROL            "pmix.monitor.appctrl"  // (bool) the application desires to control the response to
+                                                                    //        a monitoring event
+#define PMIX_MONITOR_HEARTBEAT              "pmix.monitor.mbeat"    // (void) register to have the server monitor the requestor for heartbeats
+#define PMIX_SEND_HEARTBEAT                 "pmix.monitor.beat"     // (void) send heartbeat to local server
+#define PMIX_MONITOR_HEARTBEAT_TIME         "pmix.monitor.btime"    // (uint32_t) time in seconds before declaring heartbeat missed
+#define PMIX_MONITOR_HEARTBEAT_DROPS        "pmix.monitor.bdrop"    // (uint32_t) number of heartbeats that can be missed before
+                                                                    //            generating the event
+#define PMIX_MONITOR_FILE                   "pmix.monitor.fmon"     // (char*) register to monitor file for signs of life
+#define PMIX_MONITOR_FILE_SIZE              "pmix.monitor.fsize"    // (bool) monitor size of given file is growing to determine app is running
+#define PMIX_MONITOR_FILE_ACCESS            "pmix.monitor.faccess"  // (char*) monitor time since last access of given file to determine app is running
+#define PMIX_MONITOR_FILE_MODIFY            "pmix.monitor.fmod"     // (char*) monitor time since last modified of given file to determine app is running
+#define PMIX_MONITOR_FILE_CHECK_TIME        "pmix.monitor.ftime"    // (uint32_t) time in seconds between checking file
+#define PMIX_MONITOR_FILE_DROPS             "pmix.monitor.fdrop"    // (uint32_t) number of file checks that can be missed before
+                                                                    //            generating the event
+
+/****    PROCESS STATE DEFINITIONS    ****/
+typedef uint8_t pmix_proc_state_t;
+#define PMIX_PROC_STATE_UNDEF                    0  /* undefined process state */
+#define PMIX_PROC_STATE_PREPPED                  1  /* process is ready to be launched */
+#define PMIX_PROC_STATE_LAUNCH_UNDERWAY          2  /* launch process underway */
+#define PMIX_PROC_STATE_RESTART                  3  /* the proc is ready for restart */
+#define PMIX_PROC_STATE_TERMINATE                4  /* process is marked for termination */
+#define PMIX_PROC_STATE_RUNNING                  5  /* daemon has locally fork'd process */
+#define PMIX_PROC_STATE_CONNECTED                6  /* proc connected to PMIx server */
+/*
+* Define a "boundary" so users can easily and quickly determine
+* if a proc is still running or not - any value less than
+* this one means that the proc has not terminated
+*/
+#define PMIX_PROC_STATE_UNTERMINATED            15
+
+#define PMIX_PROC_STATE_TERMINATED              20  /* process has terminated and is no longer running */
+/* Define a boundary so users can easily and quickly determine
+* if a proc abnormally terminated - leave a little room
+* for future expansion
+*/
+#define PMIX_PROC_STATE_ERROR                   50
+/* Define specific error code values */
+#define PMIX_PROC_STATE_KILLED_BY_CMD           (PMIX_PROC_STATE_ERROR +  1)  /* process was killed by cmd */
+#define PMIX_PROC_STATE_ABORTED                 (PMIX_PROC_STATE_ERROR +  2)  /* process aborted */
+#define PMIX_PROC_STATE_FAILED_TO_START         (PMIX_PROC_STATE_ERROR +  3)  /* process failed to start */
+#define PMIX_PROC_STATE_ABORTED_BY_SIG          (PMIX_PROC_STATE_ERROR +  4)  /* process aborted by signal */
+#define PMIX_PROC_STATE_TERM_WO_SYNC            (PMIX_PROC_STATE_ERROR +  5)  /* process exit'd w/o calling PMIx_Finalize */
+#define PMIX_PROC_STATE_COMM_FAILED             (PMIX_PROC_STATE_ERROR +  6)  /* process communication has failed */
+#define PMIX_PROC_STATE_CALLED_ABORT            (PMIX_PROC_STATE_ERROR +  7)  /* process called "PMIx_Abort" */
+#define PMIX_PROC_STATE_MIGRATING               (PMIX_PROC_STATE_ERROR +  8)  /* process failed and is waiting for resources before restarting */
+#define PMIX_PROC_STATE_CANNOT_RESTART          (PMIX_PROC_STATE_ERROR +  9)  /* process failed and cannot be restarted */
+#define PMIX_PROC_STATE_TERM_NON_ZERO           (PMIX_PROC_STATE_ERROR + 10)  /* process exited with a non-zero status, indicating abnormal */
+#define PMIX_PROC_STATE_FAILED_TO_LAUNCH        (PMIX_PROC_STATE_ERROR + 11)  /* unable to launch process */
+
+
+/****    PMIX ERROR CONSTANTS    ****/
+/* PMIx errors are always negative, with 0 reserved for success */
+#define PMIX_ERR_BASE                   0
+
+typedef int pmix_status_t;
+
+/* v1.x error values - must be fixed in place for backward
+ * compatability. Note that some number of these have been
+ * deprecated and may not be returned by v2.x and above
+ * clients or servers. However, they must always be
+ * at least defined to ensure older codes will compile */
+#define PMIX_SUCCESS                                 0
+#define PMIX_ERROR                                  -1          // general error
+#define PMIX_ERR_SILENT                             -2          // internal-only
+/* debugger release flag */
+#define PMIX_ERR_DEBUGGER_RELEASE                   -3
+/* fault tolerance */
+#define PMIX_ERR_PROC_RESTART                       -4
+#define PMIX_ERR_PROC_CHECKPOINT                    -5
+#define PMIX_ERR_PROC_MIGRATE                       -6
+/* abort */
+#define PMIX_ERR_PROC_ABORTED                       -7
+#define PMIX_ERR_PROC_REQUESTED_ABORT               -8
+#define PMIX_ERR_PROC_ABORTING                      -9
+/* communication failures */
+#define PMIX_ERR_SERVER_FAILED_REQUEST              -10
+#define PMIX_EXISTS                                 -11
+#define PMIX_ERR_INVALID_CRED                       -12         // internal-only
+#define PMIX_ERR_HANDSHAKE_FAILED                   -13         // internal-only
+#define PMIX_ERR_READY_FOR_HANDSHAKE                -14         // internal-only
+#define PMIX_ERR_WOULD_BLOCK                        -15
+#define PMIX_ERR_UNKNOWN_DATA_TYPE                  -16         // internal-only
+#define PMIX_ERR_PROC_ENTRY_NOT_FOUND               -17         // internal-only
+#define PMIX_ERR_TYPE_MISMATCH                      -18         // internal-only
+#define PMIX_ERR_UNPACK_INADEQUATE_SPACE            -19         // internal-only
+#define PMIX_ERR_UNPACK_FAILURE                     -20         // internal-only
+#define PMIX_ERR_PACK_FAILURE                       -21         // internal-only
+#define PMIX_ERR_PACK_MISMATCH                      -22         // internal-only
+#define PMIX_ERR_NO_PERMISSIONS                     -23
+#define PMIX_ERR_TIMEOUT                            -24
+#define PMIX_ERR_UNREACH                            -25
+#define PMIX_ERR_IN_ERRNO                           -26         // internal-only
+#define PMIX_ERR_BAD_PARAM                          -27
+#define PMIX_ERR_RESOURCE_BUSY                      -28         // internal-only
+#define PMIX_ERR_OUT_OF_RESOURCE                    -29
+#define PMIX_ERR_DATA_VALUE_NOT_FOUND               -30
+#define PMIX_ERR_INIT                               -31
+#define PMIX_ERR_NOMEM                              -32         // internal-only
+#define PMIX_ERR_INVALID_ARG                        -33         // internal-only
+#define PMIX_ERR_INVALID_KEY                        -34         // internal-only
+#define PMIX_ERR_INVALID_KEY_LENGTH                 -35         // internal-only
+#define PMIX_ERR_INVALID_VAL                        -36         // internal-only
+#define PMIX_ERR_INVALID_VAL_LENGTH                 -37         // internal-only
+#define PMIX_ERR_INVALID_LENGTH                     -38         // internal-only
+#define PMIX_ERR_INVALID_NUM_ARGS                   -39         // internal-only
+#define PMIX_ERR_INVALID_ARGS                       -40         // internal-only
+#define PMIX_ERR_INVALID_NUM_PARSED                 -41         // internal-only
+#define PMIX_ERR_INVALID_KEYVALP                    -42         // internal-only
+#define PMIX_ERR_INVALID_SIZE                       -43
+#define PMIX_ERR_INVALID_NAMESPACE                  -44
+#define PMIX_ERR_SERVER_NOT_AVAIL                   -45         // internal-only
+#define PMIX_ERR_NOT_FOUND                          -46
+#define PMIX_ERR_NOT_SUPPORTED                      -47
+#define PMIX_ERR_NOT_IMPLEMENTED                    -48
+#define PMIX_ERR_COMM_FAILURE                       -49
+#define PMIX_ERR_UNPACK_READ_PAST_END_OF_BUFFER     -50         // internal-only
+
+/* define a starting point for v2.x error values */
+#define PMIX_ERR_V2X_BASE                   -100
+
+/* v2.x communication errors */
+#define PMIX_ERR_LOST_CONNECTION_TO_SERVER      (PMIX_ERR_V2X_BASE -  1)
+#define PMIX_ERR_LOST_PEER_CONNECTION           (PMIX_ERR_V2X_BASE -  2)
+#define PMIX_ERR_LOST_CONNECTION_TO_CLIENT      (PMIX_ERR_V2X_BASE -  3)
+/* used by the query system */
+#define PMIX_QUERY_PARTIAL_SUCCESS              (PMIX_ERR_V2X_BASE -  4)
+/* request responses */
+#define PMIX_NOTIFY_ALLOC_COMPLETE              (PMIX_ERR_V2X_BASE -  5)
+/* job control */
+#define PMIX_JCTRL_CHECKPOINT                   (PMIX_ERR_V2X_BASE -  6)    // monitored by client to trigger checkpoint operation
+#define PMIX_JCTRL_CHECKPOINT_COMPLETE          (PMIX_ERR_V2X_BASE -  7)    // sent by client and monitored by server to notify that requested
+                                                                            //     checkpoint operation has completed
+#define PMIX_JCTRL_PREEMPT_ALERT                (PMIX_ERR_V2X_BASE -  8)    // monitored by client to detect RM intends to preempt
+/* monitoring */
+#define PMIX_MONITOR_HEARTBEAT_ALERT            (PMIX_ERR_V2X_BASE -  9)
+#define PMIX_MONITOR_FILE_ALERT                 (PMIX_ERR_V2X_BASE - 10)
+
+/* define a starting point for operational error constants so
+ * we avoid renumbering when making additions */
+#define PMIX_ERR_OP_BASE    PMIX_ERR_V2X_BASE-30
+
+/* operational */
+#define PMIX_ERR_EVENT_REGISTRATION             (PMIX_ERR_OP_BASE - 14)
+#define PMIX_ERR_JOB_TERMINATED                 (PMIX_ERR_OP_BASE - 15)
+#define PMIX_ERR_UPDATE_ENDPOINTS               (PMIX_ERR_OP_BASE - 16)
+#define PMIX_MODEL_DECLARED                     (PMIX_ERR_OP_BASE - 17)
+
+/* define a starting point for system error constants so
+ * we avoid renumbering when making additions */
+#define PMIX_ERR_SYS_BASE    PMIX_ERR_OP_BASE-100
+
+/* system failures */
+#define PMIX_ERR_NODE_DOWN                      (PMIX_ERR_SYS_BASE -  1)
+#define PMIX_ERR_NODE_OFFLINE                   (PMIX_ERR_SYS_BASE -  2)
+
+
+/* define a starting point for event handler error constants so
+ * we avoid renumbering when making additions */
+#define PMIX_ERR_EVHDLR_BASE    PMIX_ERR_SYS_BASE-100
+
+/* used by event handlers */
+#define PMIX_EVENT_NO_ACTION_TAKEN              (PMIX_ERR_EVHDLR_BASE -  1)
+#define PMIX_EVENT_PARTIAL_ACTION_TAKEN         (PMIX_ERR_EVHDLR_BASE -  2)
+#define PMIX_EVENT_ACTION_DEFERRED              (PMIX_ERR_EVHDLR_BASE -  3)
+#define PMIX_EVENT_ACTION_COMPLETE              (PMIX_ERR_EVHDLR_BASE -  4)
+
+
+/* define a starting point for PMIx internal error codes
+ * that are never exposed outside the library */
+#define PMIX_INTERNAL_ERR_BASE          -1000
+
+/* define a starting point for user-level defined error
+ * constants - negative values larger than this are guaranteed
+ * not to conflict with PMIx values. Definitions should always
+ * be based on the PMIX_EXTERNAL_ERR_BASE constant and -not- a
+ * specific value as the value of the constant may change */
+#define PMIX_EXTERNAL_ERR_BASE           -2000
+
+/****    PMIX DATA TYPES    ****/
+typedef uint16_t pmix_data_type_t;
+#define PMIX_UNDEF               0
+#define PMIX_BOOL                1  // converted to/from native true/false to uint8 for pack/unpack
+#define PMIX_BYTE                2  // a byte of data
+#define PMIX_STRING              3  // NULL-terminated string
+#define PMIX_SIZE                4  // size_t
+#define PMIX_PID                 5  // OS-pid
+#define PMIX_INT                 6
+#define PMIX_INT8                7
+#define PMIX_INT16               8
+#define PMIX_INT32               9
+#define PMIX_INT64              10
+#define PMIX_UINT               11
+#define PMIX_UINT8              12
+#define PMIX_UINT16             13
+#define PMIX_UINT32             14
+#define PMIX_UINT64             15
+#define PMIX_FLOAT              16
+#define PMIX_DOUBLE             17
+#define PMIX_TIMEVAL            18
+#define PMIX_TIME               19
+#define PMIX_STATUS             20  // needs to be tracked separately from integer for those times
+                                    // when we are embedded and it needs to be converted to the
+                                    // host error definitions
+#define PMIX_VALUE              21
+#define PMIX_PROC               22
+#define PMIX_APP                23
+#define PMIX_INFO               24
+#define PMIX_PDATA              25
+#define PMIX_BUFFER             26
+#define PMIX_BYTE_OBJECT        27
+#define PMIX_KVAL               28
+#define PMIX_MODEX              29
+#define PMIX_PERSIST            30
+#define PMIX_POINTER            31
+#define PMIX_SCOPE              32
+#define PMIX_DATA_RANGE         33
+#define PMIX_COMMAND            34
+#define PMIX_INFO_DIRECTIVES    35
+#define PMIX_DATA_TYPE          36
+#define PMIX_PROC_STATE         37
+#define PMIX_PROC_INFO          38
+#define PMIX_DATA_ARRAY         39
+#define PMIX_PROC_RANK          40
+#define PMIX_QUERY              41
+#define PMIX_COMPRESSED_STRING  42  // string compressed with zlib
+#define PMIX_ALLOC_DIRECTIVE    43
+/**** DEPRECATED ****/
+#define PMIX_INFO_ARRAY         44
+/********************/
+
+/* define a boundary for implementers so they can add their own data types */
+#define PMIX_DATA_TYPE_MAX     500
+
+
+/* define a scope for data "put" by PMI per the following:
+ *
+ * PMI_LOCAL - the data is intended only for other application
+ *             processes on the same node. Data marked in this way
+ *             will not be included in data packages sent to remote requestors
+ * PMI_REMOTE - the data is intended solely for applications processes on
+ *              remote nodes. Data marked in this way will not be shared with
+ *              other processes on the same node
+ * PMI_GLOBAL - the data is to be shared with all other requesting processes,
+ *              regardless of location
+ */
+typedef uint8_t pmix_scope_t;
+#define PMIX_SCOPE_UNDEF    0
+#define PMIX_LOCAL          1   // share to procs also on this node
+#define PMIX_REMOTE         2   // share with procs not on this node
+#define PMIX_GLOBAL         3   // share with all procs (local + remote)
+
+/* define a range for data "published" by PMI
+ */
+typedef uint8_t pmix_data_range_t;
+#define PMIX_RANGE_UNDEF        0
+#define PMIX_RANGE_RM           1   // data is intended for the host resource manager
+#define PMIX_RANGE_LOCAL        2   // available on local node only
+#define PMIX_RANGE_NAMESPACE    3   // data is available to procs in the same nspace only
+#define PMIX_RANGE_SESSION      4   // data available to all procs in session
+#define PMIX_RANGE_GLOBAL       5   // data available to all procs
+#define PMIX_RANGE_CUSTOM       6   // range is specified in a pmix_info_t
+#define PMIX_RANGE_PROC_LOCAL   7   // restrict range to the local proc
+
+/* define a "persistence" policy for data published by clients */
+typedef uint8_t pmix_persistence_t;
+#define PMIX_PERSIST_INDEF          0   // retain until specifically deleted
+#define PMIX_PERSIST_FIRST_READ     1   // delete upon first access
+#define PMIX_PERSIST_PROC           2   // retain until publishing process terminates
+#define PMIX_PERSIST_APP            3   // retain until application terminates
+#define PMIX_PERSIST_SESSION        4   // retain until session/allocation terminates
+
+/* define a set of bit-mask flags for specifying behavior of
+ * command directives via pmix_info_t arrays */
+typedef uint32_t pmix_info_directives_t;
+#define PMIX_INFO_REQD          0x0001
+
+
+/* define a set of directives for allocation requests */
+typedef uint8_t pmix_alloc_directive_t;
+#define PMIX_ALLOC_NEW          1  // new allocation is being requested. The resulting allocation will be
+                                   // disjoint (i.e., not connected in a job sense) from the requesting allocation
+#define PMIX_ALLOC_EXTEND       2  // extend the existing allocation, either in time or as additional resources
+#define PMIX_ALLOC_RELEASE      3  // release part of the existing allocation. Attributes in the accompanying
+                                   // pmix\_info\_t array may be used to specify permanent release of the
+                                   // identified resources, or "lending" of those resources for some period
+                                   // of time.
+#define PMIX_ALLOC_REAQUIRE     4  // reacquire resources that were previously "lent" back to the scheduler
+
+/* define a value boundary beyond which implementers are free
+ * to define their own directive values */
+#define PMIX_ALLOC_EXTERNAL     128
+
+
+/****    PMIX BYTE OBJECT    ****/
+typedef struct pmix_byte_object {
+    char *bytes;
+    size_t size;
+} pmix_byte_object_t;
+
+
+/****    PMIX DATA BUFFER    ****/
+typedef struct pmix_data_buffer {
+    /** Start of my memory */
+    char *base_ptr;
+    /** Where the next data will be packed to (within the allocated
+        memory starting at base_ptr) */
+    char *pack_ptr;
+    /** Where the next data will be unpacked from (within the
+        allocated memory starting as base_ptr) */
+    char *unpack_ptr;
+    /** Number of bytes allocated (starting at base_ptr) */
+    size_t bytes_allocated;
+    /** Number of bytes used by the buffer (i.e., amount of data --
+        including overhead -- packed in the buffer) */
+    size_t bytes_used;
+} pmix_data_buffer_t;
+#define PMIX_DATA_BUFFER_CREATE(m)                                          \
+    do {                                                                    \
+        (m) = (pmix_data_buffer_t*)calloc(1, sizeof(pmix_data_buffer_t));   \
+    } while (0)
+#define PMIX_DATA_BUFFER_RELEASE(m)             \
+    do {                                        \
+        if (NULL != (m)->base_ptr) {            \
+            free((m)->base_ptr);                \
+        }                                       \
+        free((m));                              \
+        (m) = NULL;                             \
+    } while (0)
+#define PMIX_DATA_BUFFER_CONSTRUCT(m)       \
+    memset((m), 0, sizeof(pmix_data_buffer_t))
+#define PMIX_DATA_BUFFER_DESTRUCT(m)        \
+    do {                                    \
+        if (NULL != (m)->base_ptr) {        \
+            free((m)->base_ptr);            \
+        }                                   \
+    } while (0)
+
+
+/****    PMIX PROC OBJECT    ****/
+typedef struct pmix_proc {
+    char nspace[PMIX_MAX_NSLEN+1];
+    pmix_rank_t rank;
+} pmix_proc_t;
+#define PMIX_PROC_CREATE(m, n)                                  \
+    do {                                                        \
+        (m) = (pmix_proc_t*)calloc((n) , sizeof(pmix_proc_t));  \
+    } while (0)
+
+#define PMIX_PROC_RELEASE(m)    \
+    do {                        \
+        free((m));              \
+        (m) = NULL;             \
+    } while (0)
+
+#define PMIX_PROC_CONSTRUCT(m)                  \
+    do {                                        \
+        memset((m), 0, sizeof(pmix_proc_t));    \
+    } while (0)
+
+#define PMIX_PROC_DESTRUCT(m)
+
+#define PMIX_PROC_FREE(m, n)                    \
+    do {                                        \
+        if (NULL != (m)) {                      \
+            free((m));                          \
+        }                                       \
+    } while (0)
+
+
+/****    PMIX PROC INFO STRUCT    ****/
+typedef struct pmix_proc_info {
+    pmix_proc_t proc;
+    char *hostname;
+    char *executable_name;
+    pid_t pid;
+    int exit_code;
+    pmix_proc_state_t state;
+} pmix_proc_info_t;
+#define PMIX_PROC_INFO_CREATE(m, n)                                         \
+    do {                                                                    \
+        (m) = (pmix_proc_info_t*)calloc((n) , sizeof(pmix_proc_info_t));    \
+    } while (0)
+
+#define PMIX_PROC_INFO_RELEASE(m)   \
+    do {                            \
+        PMIX_PROC_INFO_FREE((m));   \
+    } while (0)
+
+#define PMIX_PROC_INFO_CONSTRUCT(m)                 \
+    do {                                            \
+        memset((m), 0, sizeof(pmix_proc_info_t));   \
+    } while (0)
+
+#define PMIX_PROC_INFO_DESTRUCT(m)              \
+    do {                                        \
+        if (NULL != (m)->hostname) {            \
+            free((m)->hostname);                \
+        }                                       \
+        if (NULL != (m)->executable_name) {     \
+            free((m)->executable_name);         \
+        }                                       \
+    } while(0)
+
+#define PMIX_PROC_INFO_FREE(m, n)                   \
+    do {                                            \
+        size_t _k;                                  \
+        if (NULL != (m)) {                          \
+            for (_k=0; _k < (n); _k++) {            \
+                PMIX_PROC_INFO_DESTRUCT(&(m)[_k]);  \
+            }                                       \
+            free((m));                              \
+        }                                           \
+    } while (0)
+
+
+/****    PMIX VALUE STRUCT    ****/
+typedef struct pmix_info_t pmix_info_t;
+
+typedef struct pmix_data_array {
+    pmix_data_type_t type;
+    size_t size;
+    void *array;
+} pmix_data_array_t;
+
+typedef struct pmix_info_array {
+    size_t size;
+    pmix_info_t *array;
+} pmix_info_array_t;
+/********************/
+
+/* NOTE: operations can supply a collection of values under
+ * a single key by passing a pmix_value_t containing an
+ * array of type PMIX_INFO_ARRAY, with each array element
+ * containing its own pmix_info_t object */
+
+typedef struct pmix_value {
+    pmix_data_type_t type;
+    union {
+        bool flag;
+        uint8_t byte;
+        char *string;
+        size_t size;
+        pid_t pid;
+        int integer;
+        int8_t int8;
+        int16_t int16;
+        int32_t int32;
+        int64_t int64;
+        unsigned int uint;
+        uint8_t uint8;
+        uint16_t uint16;
+        uint32_t uint32;
+        uint64_t uint64;
+        float fval;
+        double dval;
+        struct timeval tv;
+        time_t time;
+        pmix_status_t status;
+        pmix_rank_t rank;
+        pmix_proc_t *proc;
+        pmix_byte_object_t bo;
+        pmix_persistence_t persist;
+        pmix_scope_t scope;
+        pmix_data_range_t range;
+        pmix_proc_state_t state;
+        pmix_proc_info_t *pinfo;
+        pmix_data_array_t *darray;
+        void *ptr;
+        /**** DEPRECATED ****/
+        pmix_info_array_t *array;
+        /********************/
+    } data;
+} pmix_value_t;
+/* allocate and initialize a specified number of value structs */
+#define PMIX_VALUE_CREATE(m, n)                                 \
+    do {                                                        \
+        int _ii;                                                \
+        pmix_value_t *_v;                                       \
+        (m) = (pmix_value_t*)calloc((n), sizeof(pmix_value_t)); \
+        _v = (pmix_value_t*)(m);                                \
+        if (NULL != (m)) {                                      \
+            for (_ii=0; _ii < (int)(n); _ii++) {                \
+                _v[_ii].type = PMIX_UNDEF;                     \
+            }                                                   \
+        }                                                       \
+    } while (0)
+
+/* release a single pmix_value_t struct, including its data */
+#define PMIX_VALUE_RELEASE(m)       \
+    do {                            \
+        PMIX_VALUE_DESTRUCT((m));   \
+        free((m));                  \
+    } while (0)
+
+/* initialize a single value struct */
+#define PMIX_VALUE_CONSTRUCT(m)                 \
+    do {                                        \
+        memset((m), 0, sizeof(pmix_value_t));   \
+        (m)->type = PMIX_UNDEF;                 \
+    } while (0)
+
+/* release the memory in the value struct data field */
+#define PMIX_VALUE_DESTRUCT(m)                                                      \
+    do {                                                                            \
+        size_t _n;                                                                  \
+        if (PMIX_STRING == (m)->type) {                                             \
+            if (NULL != (m)->data.string) {                                         \
+                free((m)->data.string);                                             \
+            }                                                                       \
+        } else if ((PMIX_BYTE_OBJECT == (m)->type) ||                               \
+                   (PMIX_COMPRESSED_STRING == (m)->type)) {                         \
+            if (NULL != (m)->data.bo.bytes) {                                       \
+                free((m)->data.bo.bytes);                                           \
+            }                                                                       \
+        } else if (PMIX_DATA_ARRAY == (m)->type) {                                  \
+            if (NULL != (m)->data.darray && NULL != (m)->data.darray->array) {      \
+                if (PMIX_STRING == (m)->data.darray->type) {                        \
+                    char **_str = (char**)(m)->data.darray->array;                  \
+                    for (_n=0; _n < (m)->data.darray->size; _n++) {                 \
+                        if (NULL != _str[_n]) {                                     \
+                            free(_str[_n]);                                         \
+                        }                                                           \
+                    }                                                               \
+                } else if (PMIX_PROC_INFO == (m)->data.darray->type) {              \
+                    pmix_proc_info_t *_info =                                       \
+                                (pmix_proc_info_t*)(m)->data.darray->array;         \
+                    for (_n=0; _n < (m)->data.darray->size; _n++) {                 \
+                        PMIX_PROC_INFO_DESTRUCT(&_info[_n]);                        \
+                    }                                                               \
+                } else if (PMIX_INFO == (m)->data.darray->type) {                   \
+                    pmix_info_t *_info =                                            \
+                                (pmix_info_t*)(m)->data.darray->array;              \
+                    for (_n=0; _n < (m)->data.darray->size; _n++) {                 \
+                        /* cannot use info destruct as that loops back */           \
+                        if (PMIX_STRING == _info[_n].value.type) {                  \
+                            if (NULL != _info[_n].value.data.string) {              \
+                                free(_info[_n].value.data.string);                  \
+                            }                                                       \
+                        } else if (PMIX_BYTE_OBJECT == _info[_n].value.type) {      \
+                            if (NULL != _info[_n].value.data.bo.bytes) {            \
+                                free(_info[_n].value.data.bo.bytes);                \
+                            }                                                       \
+                        } else if (PMIX_PROC_INFO == _info[_n].value.type) {        \
+                            PMIX_PROC_INFO_DESTRUCT(_info[_n].value.data.pinfo);    \
+                        }                                                           \
+                    }                                                               \
+                } else if (PMIX_BYTE_OBJECT == (m)->data.darray->type) {            \
+                    pmix_byte_object_t *_obj =                                      \
+                                (pmix_byte_object_t*)(m)->data.darray->array;       \
+                    for (_n=0; _n < (m)->data.darray->size; _n++) {                 \
+                        if (NULL != _obj[_n].bytes) {                               \
+                            free(_obj[_n].bytes);                                   \
+                        }                                                           \
+                    }                                                               \
+                }                                                                   \
+                free((m)->data.darray->array);                                      \
+            }                                                                       \
+            if (NULL != (m)->data.darray) {                                         \
+                free((m)->data.darray);                                             \
+            }                                                                       \
+        /**** DEPRECATED ****/                                                      \
+        } else if (PMIX_INFO_ARRAY == (m)->type) {                                  \
+            pmix_info_t *_p = (pmix_info_t*)((m)->data.array->array);               \
+            for (_n=0; _n < (m)->data.array->size; _n++) {                          \
+                if (PMIX_STRING == _p[_n].value.type) {                             \
+                    if (NULL != _p[_n].value.data.string) {                         \
+                        free(_p[_n].value.data.string);                             \
+                    }                                                               \
+                } else if (PMIX_BYTE_OBJECT == _p[_n].value.type) {                 \
+                    if (NULL != _p[_n].value.data.bo.bytes) {                       \
+                        free(_p[_n].value.data.bo.bytes);                           \
+                    }                                                               \
+                } else if (PMIX_PROC_INFO == _p[_n].value.type) {                   \
+                    PMIX_PROC_INFO_DESTRUCT(_p[_n].value.data.pinfo);               \
+                }                                                                   \
+            }                                                                       \
+            free(_p);                                                               \
+        /********************/                                                      \
+        }                                                                           \
+    } while (0)
+
+#define PMIX_VALUE_FREE(m, n)                           \
+    do {                                                \
+        size_t _s;                                      \
+        if (NULL != (m)) {                              \
+            for (_s=0; _s < (n); _s++) {                \
+                PMIX_VALUE_DESTRUCT(&((m)[_s]));        \
+            }                                           \
+            free((m));                                  \
+        }                                               \
+    } while (0)
+
+/* expose some functions that are resolved in the
+ * PMIx library, but part of a header that
+ * includes internal functions - we don't
+ * want to expose the entire header here
+ */
+void pmix_value_load(pmix_value_t *v, const void *data, pmix_data_type_t type);
+pmix_status_t pmix_value_xfer(pmix_value_t *kv, pmix_value_t *src);
+pmix_status_t pmix_argv_append_nosize(char ***argv, const char *arg);
+pmix_status_t pmix_setenv(const char *name, const char *value,
+                              bool overwrite, char ***env);
+
+#define PMIX_ARGV_APPEND(a, b) \
+    pmix_argv_append_nosize(&(a), (b))
+#define PMIX_SETENV(a, b, c) \
+    pmix_setenv((a), (b), true, (c))
+
+/****    PMIX INFO STRUCT    ****/
+struct pmix_info_t {
+    char key[PMIX_MAX_KEYLEN+1];    // ensure room for the NULL terminator
+    pmix_info_directives_t flags;   // bit-mask of flags
+    pmix_value_t value;
+};
+
+/* utility macros for working with pmix_info_t structs */
+#define PMIX_INFO_CREATE(m, n)                                  \
+    do {                                                        \
+        (m) = (pmix_info_t*)calloc((n), sizeof(pmix_info_t));   \
+    } while (0)
+
+#define PMIX_INFO_CONSTRUCT(m)                  \
+    do {                                        \
+        memset((m), 0, sizeof(pmix_info_t));    \
+        (m)->value.type = PMIX_UNDEF;           \
+    } while (0)
+
+#define PMIX_INFO_DESTRUCT(m) \
+    do {                                        \
+        PMIX_VALUE_DESTRUCT(&(m)->value);       \
+    } while (0)
+
+#define PMIX_INFO_FREE(m, n)                    \
+    do {                                        \
+        size_t _s;                              \
+        if (NULL != (m)) {                      \
+            for (_s=0; _s < (n); _s++) {        \
+                PMIX_INFO_DESTRUCT(&((m)[_s])); \
+            }                                   \
+            free((m));                          \
+        }                                       \
+    } while (0)
+
+#define PMIX_INFO_LOAD(m, k, v, t)                      \
+    do {                                                \
+        (void)strncpy((m)->key, (k), PMIX_MAX_KEYLEN);  \
+        pmix_value_load(&((m)->value), (v), (t));       \
+    } while (0)
+#define PMIX_INFO_XFER(d, s)                                \
+    do {                                                    \
+        (void)strncpy((d)->key, (s)->key, PMIX_MAX_KEYLEN); \
+        (d)->flags = (s)->flags;                      \
+        pmix_value_xfer(&(d)->value, &(s)->value);          \
+    } while(0)
+
+#define PMIX_INFO_REQUIRED(m)       \
+    (m)->flags |= PMIX_INFO_REQD;
+#define PMIX_INFO_OPTIONAL(m)       \
+    (m)->flags &= ~PMIX_INFO_REQD;
+
+
+/****    PMIX LOOKUP RETURN STRUCT    ****/
+typedef struct pmix_pdata {
+    pmix_proc_t proc;
+    char key[PMIX_MAX_KEYLEN+1];  // ensure room for the NULL terminator
+    pmix_value_t value;
+} pmix_pdata_t;
+
+/* utility macros for working with pmix_pdata_t structs */
+#define PMIX_PDATA_CREATE(m, n)                                 \
+    do {                                                        \
+        (m) = (pmix_pdata_t*)calloc((n), sizeof(pmix_pdata_t)); \
+    } while (0)
+
+#define PMIX_PDATA_RELEASE(m)                   \
+    do {                                        \
+        PMIX_VALUE_DESTRUCT(&(m)->value);       \
+        free((m));                              \
+    } while (0)
+
+#define PMIX_PDATA_CONSTRUCT(m)                 \
+    do {                                        \
+        memset((m), 0, sizeof(pmix_pdata_t));   \
+        (m)->value.type = PMIX_UNDEF;           \
+    } while (0)
+
+#define PMIX_PDATA_DESTRUCT(m)                  \
+    do {                                        \
+        PMIX_VALUE_DESTRUCT(&(m)->value);       \
+    } while (0)
+
+#define PMIX_PDATA_FREE(m, n)                           \
+    do {                                                \
+        size_t _s;                                      \
+        if (NULL != (m)) {                              \
+            for (_s=0; _s < (n); _s++) {                \
+                PMIX_PDATA_DESTRUCT(&((m)[_s]));        \
+            }                                           \
+            free((m));                                  \
+        }                                               \
+    } while (0)
+
+#define PMIX_PDATA_LOAD(m, p, k, v, t)                                      \
+    do {                                                                    \
+        if (NULL != (m)) {                                                  \
+            memset((m), 0, sizeof(pmix_pdata_t));                           \
+            (void)strncpy((m)->proc.nspace, (p)->nspace, PMIX_MAX_NSLEN);   \
+            (m)->proc.rank = (p)->rank;                                     \
+            (void)strncpy((m)->key, (k), PMIX_MAX_KEYLEN);                  \
+            pmix_value_load(&((m)->value), (v), (t));                       \
+        }                                                                   \
+    } while (0)
+
+
+/****    PMIX APP STRUCT    ****/
+typedef struct pmix_app {
+    char *cmd;
+    char **argv;
+    char **env;
+    char *cwd;
+    int maxprocs;
+    pmix_info_t *info;
+    size_t ninfo;
+} pmix_app_t;
+/* utility macros for working with pmix_app_t structs */
+#define PMIX_APP_CREATE(m, n)                                   \
+    do {                                                        \
+        (m) = (pmix_app_t*)calloc((n), sizeof(pmix_app_t));     \
+    } while (0)
+
+#define PMIX_APP_RELEASE(m)                     \
+    do {                                        \
+        PMIX_APP_DESTRUCT((m));                 \
+        free((m));                              \
+    } while (0)
+
+#define PMIX_APP_CONSTRUCT(m)                   \
+    do {                                        \
+        memset((m), 0, sizeof(pmix_app_t));     \
+    } while (0)
+
+#define PMIX_APP_DESTRUCT(m)                                    \
+    do {                                                        \
+        size_t _ii;                                             \
+        if (NULL != (m)->cmd) {                                 \
+            free((m)->cmd);                                     \
+        }                                                       \
+        if (NULL != (m)->argv) {                                \
+            for (_ii=0; NULL != (m)->argv[_ii]; _ii++) {        \
+                free((m)->argv[_ii]);                           \
+            }                                                   \
+            free((m)->argv);                                    \
+        }                                                       \
+        if (NULL != (m)->env) {                                 \
+            for (_ii=0; NULL != (m)->env[_ii]; _ii++) {         \
+                free((m)->env[_ii]);                            \
+            }                                                   \
+            free((m)->env);                                     \
+        }                                                       \
+        if (NULL != (m)->cwd) {                                 \
+            free((m)->cwd);                                     \
+        }                                                       \
+        if (NULL != (m)->info) {                                \
+            for (_ii=0; _ii < (m)->ninfo; _ii++) {              \
+                PMIX_INFO_DESTRUCT(&(m)->info[_ii]);            \
+            }                                                   \
+            free((m)->info);                                    \
+        }                                                       \
+    } while (0)
+
+#define PMIX_APP_FREE(m, n)                     \
+    do {                                        \
+        size_t _s;                              \
+        if (NULL != (m)) {                      \
+            for (_s=0; _s < (n); _s++) {        \
+                PMIX_APP_DESTRUCT(&((m)[_s]));  \
+            }                                   \
+            free((m));                          \
+        }                                       \
+    } while (0)
+
+
+/****    PMIX QUERY STRUCT    ****/
+typedef struct pmix_query {
+    char **keys;
+    pmix_info_t *qualifiers;
+    size_t nqual;
+} pmix_query_t;
+/* utility macros for working with pmix_query_t structs */
+#define PMIX_QUERY_CREATE(m, n)                                     \
+    do {                                                            \
+        (m) = (pmix_query_t*)calloc((n) , sizeof(pmix_query_t));    \
+    } while (0)
+
+#define PMIX_QUERY_RELEASE(m)       \
+    do {                            \
+        PMIX_QUERY_DESTRUCT((m));   \
+        free((m));                  \
+    } while (0)
+
+#define PMIX_QUERY_CONSTRUCT(m)                 \
+    do {                                        \
+        memset((m), 0, sizeof(pmix_query_t));   \
+    } while (0)
+
+#define PMIX_QUERY_DESTRUCT(m)                                  \
+    do {                                                        \
+        size_t _ii;                                             \
+        if (NULL != (m)->keys) {                                \
+            for (_ii=0; NULL != (m)->keys[_ii]; _ii++) {        \
+                free((m)->keys[_ii]);                           \
+            }                                                   \
+            free((m)->keys);                                    \
+        }                                                       \
+        if (NULL != (m)->qualifiers) {                          \
+            for (_ii=0; _ii < (m)->nqual; _ii++) {              \
+                PMIX_INFO_DESTRUCT(&(m)->qualifiers[_ii]);      \
+            }                                                   \
+            free((m)->qualifiers);                              \
+        }                                                       \
+    } while (0)
+
+#define PMIX_QUERY_FREE(m, n)                       \
+    do {                                            \
+        size_t _s;                                  \
+        if (NULL != (m)) {                          \
+            for (_s=0; _s < (n); _s++) {            \
+                PMIX_QUERY_DESTRUCT(&((m)[_s]));    \
+            }                                       \
+            free((m));                              \
+        }                                           \
+    } while (0)
+
+
+
+
+/****    PMIX MODEX STRUCT    ****/
+typedef struct pmix_modex_data {
+    char nspace[PMIX_MAX_NSLEN+1];
+    int rank;
+    uint8_t *blob;
+    size_t size;
+} pmix_modex_data_t;
+/* utility macros for working with pmix_modex_t structs */
+#define PMIX_MODEX_CREATE(m, n)                                             \
+    do {                                                                    \
+        (m) = (pmix_modex_data_t*)calloc((n) , sizeof(pmix_modex_data_t));  \
+    } while (0)
+
+#define PMIX_MODEX_RELEASE(m)                   \
+    do {                                        \
+        PMIX_MODEX_DESTRUCT((m));               \
+        free((m));                              \
+    } while (0)
+
+#define PMIX_MODEX_CONSTRUCT(m)                         \
+    do {                                                \
+        memset((m), 0, sizeof(pmix_modex_data_t));      \
+    } while (0)
+
+#define PMIX_MODEX_DESTRUCT(m)                  \
+    do {                                        \
+        if (NULL != (m)->blob) {                \
+            free((m)->blob);                    \
+        }                                       \
+    } while (0)
+
+#define PMIX_MODEX_FREE(m, n)                           \
+    do {                                                \
+        size_t _s;                                      \
+        if (NULL != (m)) {                              \
+            for (_s=0; _s < (n); _s++) {                \
+                PMIX_MODEX_DESTRUCT(&((m)[_s]));        \
+            }                                           \
+            free((m));                                  \
+        }                                               \
+    } while (0)
+
+
+/****    CALLBACK FUNCTIONS FOR NON-BLOCKING OPERATIONS    ****/
+
+typedef void (*pmix_release_cbfunc_t)(void *cbdata);
+
+/* define a callback function that is solely used by servers, and
+ * not clients, to return modex data in response to "fence" and "get"
+ * operations. The returned blob contains the data collected from each
+ * server participating in the operation.
+ *
+ * As the data is "owned" by the host server, provide a secondary
+ * callback function to notify the host server that we are done
+ * with the data so it can be released */
+typedef void (*pmix_modex_cbfunc_t)(pmix_status_t status,
+                                    const char *data, size_t ndata,
+                                    void *cbdata,
+                                    pmix_release_cbfunc_t release_fn,
+                                    void *release_cbdata);
+
+/* define a callback function for calls to PMIx_Spawn_nb - the function
+ * will be called upon completion of the spawn command. The status
+ * will indicate whether or not the spawn succeeded. The nspace
+ * of the spawned processes will be returned, along with any provided
+ * callback data. Note that the returned nspace value will be
+ * released by the library upon return from the callback function, so
+ * the receiver must copy it if it needs to be retained */
+typedef void (*pmix_spawn_cbfunc_t)(pmix_status_t status,
+                                    char nspace[], void *cbdata);
+
+/* define a callback for common operations that simply return
+ * a status. Examples include the non-blocking versions of
+ * Fence, Connect, and Disconnect */
+typedef void (*pmix_op_cbfunc_t)(pmix_status_t status, void *cbdata);
+
+/* define a callback function for calls to PMIx_Lookup_nb - the
+ * function will be called upon completion of the command with the
+ * status indicating the success of failure of the request. Any
+ * retrieved data will be returned in an array of pmix_pdata_t structs.
+ * The nspace/rank of the process that provided each data element is
+ * also returned.
+ *
+ * Note that these structures will be released upon return from
+ * the callback function, so the receiver must copy/protect the
+ * data prior to returning if it needs to be retained */
+
+typedef void (*pmix_lookup_cbfunc_t)(pmix_status_t status,
+                                     pmix_pdata_t data[], size_t ndata,
+                                     void *cbdata);
+
+/* define a callback by which an event handler can notify the PMIx library
+ * that it has completed its response to the notification. The handler
+ * is _required_ to execute this callback so the library can determine
+ * if additional handlers need to be called. The handler shall return
+ * PMIX_SUCCESS if no further action is required. The return status
+ * of each event handler and any returned pmix_info_t structures
+ * will be added to the array of pmix_info_t passed to any subsequent
+ * event handlers to help guide their operation.
+ *
+ * If non-NULL, the provided callback function will be called to allow
+ * the event handler to release the provided info array.
+ */
+typedef void (*pmix_event_notification_cbfunc_fn_t)(pmix_status_t status,
+                                                    pmix_info_t *results, size_t nresults,
+                                                    pmix_op_cbfunc_t cbfunc, void *thiscbdata,
+                                                    void *notification_cbdata);
+
+/* define a callback function for the event handler. Upon receipt of an
+ * event notification, PMIx will execute the specified notification
+ * callback function, providing:
+ *
+ * evhdlr_registration_id - the returned registration number of
+ *                          the event handler being called
+ * status - the event that occurred
+ * source - the nspace and rank of the process that generated
+ *          the event. If the source is the resource manager,
+ *          then the nspace will be empty and the rank will
+ *          be PMIX_RANK_UNDEF
+ * info - any additional info provided regarding the event.
+ * ninfo - the number of info objects in the info array
+ * results - any provided results from event handlers called
+ *           prior to this one.
+ * nresults - number of info objects in the results array
+ * cbfunc - the function to be called upon completion of the handler
+ * cbdata - pointer to be returned in the completion cbfunc
+ *
+ * Note that different resource managers may provide differing levels
+ * of support for event notification to application processes. Thus, the
+ * info array may be NULL or may contain detailed information of the event.
+ * It is the responsibility of the application to parse any provided info array
+ * for defined key-values if it so desires.
+ *
+ * Possible uses of the pmix_info_t object include:
+ *
+ * - for the RM to alert the process as to planned actions, such as
+ *   to abort the session, in response to the reported event
+ *
+ * - provide a timeout for alternative action to occur, such as for
+ *   the application to request an alternate response to the event
+ *
+ * For example, the RM might alert the application to the failure of
+ * a node that resulted in termination of several processes, and indicate
+ * that the overall session will be aborted unless the application
+ * requests an alternative behavior in the next 5 seconds. The application
+ * then has time to respond with a checkpoint request, or a request to
+ * recover from the failure by obtaining replacement nodes and restarting
+ * from some earlier checkpoint.
+ *
+ * Support for these options is left to the discretion of the host RM. Info
+ * keys are included in the common definions above, but also may be augmented
+ * on a per-RM basis.
+ *
+ * On the server side, the notification function is used to inform the host
+ * server of a detected event in the PMIx subsystem and/or client
+ */
+typedef void (*pmix_notification_fn_t)(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);
+
+/* define a callback function for calls to PMIx_Register_evhdlr. The
+ * status indicates if the request was successful or not, evhdlr_ref is
+ * an integer reference assigned to the event handler by PMIx, this reference
+ * must be used to deregister the err handler. A ptr to the original
+ * cbdata is returned. */
+typedef void (*pmix_evhdlr_reg_cbfunc_t)(pmix_status_t status,
+                                         size_t evhdlr_ref,
+                                         void *cbdata);
+
+/* define a callback function for calls to PMIx_Get_nb. The status
+ * indicates if the requested data was found or not - a pointer to the
+ * pmix_value_t structure containing the found data is returned. The
+ * pointer will be NULL if the requested data was not found. */
+typedef void (*pmix_value_cbfunc_t)(pmix_status_t status,
+                                    pmix_value_t *kv, void *cbdata);
+
+/* define a callback function for calls to PMIx_Query. The status
+ * indicates if requested data was found or not - an array of
+ * pmix_info_t will contain the key/value pairs. */
+typedef void (*pmix_info_cbfunc_t)(pmix_status_t status,
+                                   pmix_info_t *info, size_t ninfo,
+                                   void *cbdata,
+                                   pmix_release_cbfunc_t release_fn,
+                                   void *release_cbdata);
+
+
+/****    COMMON SUPPORT FUNCTIONS    ****/
+/* Register an event handler to report events. Three types of events
+ * can be reported:
+ *
+ * (a) those that occur within the client library, but are not
+ *     reportable via the API itself (e.g., loss of connection to
+ *     the server). These events typically occur during behind-the-scenes
+ *     non-blocking operations.
+ *
+ * (b) job-related events such as the failure of another process in
+ *     the job or in any connected job, impending failure of hardware
+ *     within the job's usage footprint, etc.
+ *
+ * (c) system notifications that are made available by the local
+ *     administrators
+ *
+ * By default, only events that directly affect the process and/or
+ * any process to which it is connected (via the PMIx_Connect call)
+ * will be reported. Options to modify that behavior can be provided
+ * in the info array
+ *
+ * Both the client application and the resource manager can register
+ * err handlers for specific events. PMIx client/server calls the registered
+ * err handler upon receiving event notify notification (via PMIx_Notify_event)
+ * from the other end (Resource Manager/Client application).
+ *
+ * Multiple err handlers can be registered for different events. PMIX returns
+ * an integer reference to each register handler in the callback fn. The caller
+ * must retain the reference in order to deregister the evhdlr.
+ * Modification of the notification behavior can be accomplished by
+ * deregistering the current evhdlr, and then registering it
+ * using a new set of info values.
+ *
+ * See pmix_common.h for a description of the notification function */
+PMIX_EXPORT void PMIx_Register_event_handler(pmix_status_t codes[], size_t ncodes,
+                                             pmix_info_t info[], size_t ninfo,
+                                             pmix_notification_fn_t evhdlr,
+                                             pmix_evhdlr_reg_cbfunc_t cbfunc,
+                                             void *cbdata);
+
+/* Deregister an event handler
+ * evhdlr_ref is the reference returned by PMIx from the call to
+ * PMIx_Register_event_handler. If non-NULL, the provided cbfunc
+ * will be called to confirm removal of the designated handler */
+PMIX_EXPORT void PMIx_Deregister_event_handler(size_t evhdlr_ref,
+                                               pmix_op_cbfunc_t cbfunc,
+                                               void *cbdata);
+
+/* Report an event to a process for notification via any
+ * registered evhdlr. The evhdlr registration can be
+ * called by both the server and the client application. On the
+ * server side, the evhdlr is used to report events detected
+ * by PMIx to the host server for handling. On the client side,
+ * the evhdlr is used to notify the process of events
+ * reported by the server - e.g., the failure of another process.
+ *
+ * This function allows the host server to direct the server
+ * convenience library to notify all registered local procs of
+ * an event. The event can be local, or anywhere in the cluster.
+ * The status indicates the event being reported.
+ *
+ * The client application can also call this function to notify the
+ * resource manager of an event it encountered. It can request the host
+ * server to notify the indicated processes about the event.
+ *
+ * The array of procs identifies the processes that will be impacted
+ * by the event. This could consist of a single process, or a number
+ * of processes.
+ *
+ * The info array contains any further info the RM can and/or chooses
+ * to provide.
+ *
+ * The callback function will be called upon completion of the
+ * notify_event function's actions. Note that any messages will
+ * have been queued, but may not have been transmitted by this
+ * time. Note that the caller is required to maintain the input
+ * data until the callback function has been executed!
+*/
+PMIX_EXPORT pmix_status_t PMIx_Notify_event(pmix_status_t status,
+                                            const pmix_proc_t *source,
+                                            pmix_data_range_t range,
+                                            pmix_info_t info[], size_t ninfo,
+                                            pmix_op_cbfunc_t cbfunc, void *cbdata);
+
+/* Provide a string representation for several types of value. Note
+ * that the provided string is statically defined and must NOT be
+ * free'd. Supported value types:
+ *
+ * - pmix_status_t (PMIX_STATUS)
+ * - pmix_scope_t   (PMIX_SCOPE)
+ * - pmix_persistence_t  (PMIX_PERSIST)
+ * - pmix_data_range_t   (PMIX_DATA_RANGE)
+ * - pmix_info_directives_t   (PMIX_INFO_DIRECTIVES)
+ * - pmix_data_type_t   (PMIX_DATA_TYPE)
+ * - pmix_alloc_directive_t  (PMIX_ALLOC_DIRECTIVE)
+ */
+PMIX_EXPORT const char* PMIx_Error_string(pmix_status_t status);
+PMIX_EXPORT const char* PMIx_Proc_state_string(pmix_proc_state_t state);
+PMIX_EXPORT const char* PMIx_Scope_string(pmix_scope_t scope);
+PMIX_EXPORT const char* PMIx_Persistence_string(pmix_persistence_t persist);
+PMIX_EXPORT const char* PMIx_Data_range_string(pmix_data_range_t range);
+PMIX_EXPORT const char* PMIx_Info_directives_string(pmix_info_directives_t directives);
+PMIX_EXPORT const char* PMIx_Data_type_string(pmix_data_type_t type);
+PMIX_EXPORT const char* PMIx_Alloc_directive_string(pmix_alloc_directive_t directive);
+
+/* Get the PMIx version string. Note that the provided string is
+ * statically defined and must NOT be free'd  */
+PMIX_EXPORT const char* PMIx_Get_version(void);
+
+/* Store some data locally for retrieval by other areas of the
+ * proc. This is data that has only internal scope - it will
+ * never be "pushed" externally */
+PMIX_EXPORT pmix_status_t PMIx_Store_internal(const pmix_proc_t *proc,
+                                              const char *key, pmix_value_t *val);
+
+
+/**
+ * Top-level interface function to pack one or more values into a
+ * buffer.
+ *
+ * The pack function packs one or more values of a specified type into
+ * the specified buffer.  The buffer must have already been
+ * initialized via the PMIX_DATA_BUFFER_CREATE or PMIX_DATA_BUFFER_CONSTRUCT
+ * call - otherwise, the pack_value function will return an error.
+ * Providing an unsupported type flag will likewise be reported as an error.
+ *
+ * Note that any data to be packed that is not hard type cast (i.e.,
+ * not type cast to a specific size) may lose precision when unpacked
+ * by a non-homogeneous recipient.  The PACK function will do its best to deal
+ * with heterogeneity issues between the packer and unpacker in such
+ * cases. Sending a number larger than can be handled by the recipient
+ * will return an error code (generated upon unpacking) -
+ * the error cannot be detected during packing.
+ *
+ * @param *buffer A pointer to the buffer into which the value is to
+ * be packed.
+ *
+ * @param *src A void* pointer to the data that is to be packed. Note
+ * that strings are to be passed as (char **) - i.e., the caller must
+ * pass the address of the pointer to the string as the void*. This
+ * allows PMIx to use a single pack function, but still allow
+ * the caller to pass multiple strings in a single call.
+ *
+ * @param num_values An int32_t indicating the number of values that are
+ * to be packed, beginning at the location pointed to by src. A string
+ * value is counted as a single value regardless of length. The values
+ * must be contiguous in memory. Arrays of pointers (e.g., string
+ * arrays) should be contiguous, although (obviously) the data pointed
+ * to need not be contiguous across array entries.
+ *
+ * @param type The type of the data to be packed - must be one of the
+ * PMIX defined data types.
+ *
+ * @retval PMIX_SUCCESS The data was packed as requested.
+ *
+ * @retval PMIX_ERROR(s) An appropriate PMIX error code indicating the
+ * problem encountered. This error code should be handled
+ * appropriately.
+ *
+ * @code
+ * pmix_data_buffer_t *buffer;
+ * int32_t src;
+ *
+ * PMIX_DATA_BUFFER_CREATE(buffer);
+ * status_code = PMIx_Data_pack(buffer, &src, 1, PMIX_INT32);
+ * @endcode
+ */
+PMIX_EXPORT pmix_status_t PMIx_Data_pack(pmix_data_buffer_t *buffer,
+                                         void *src, int32_t num_vals,
+                                         pmix_data_type_t type);
+
+/**
+ * Unpack values from a buffer.
+ *
+ * The unpack function unpacks the next value (or values) of a
+ * specified type from the specified buffer.
+ *
+ * The buffer must have already been initialized via an PMIX_DATA_BUFFER_CREATE or
+ * PMIX_DATA_BUFFER_CONSTRUCT call (and assumedly filled with some data) -
+ * otherwise, the unpack_value function will return an
+ * error. Providing an unsupported type flag will likewise be reported
+ * as an error, as will specifying a data type that DOES NOT match the
+ * type of the next item in the buffer. An attempt to read beyond the
+ * end of the stored data held in the buffer will also return an
+ * error.
+ *
+ * NOTE: it is possible for the buffer to be corrupted and that
+ * PMIx will *think* there is a proper variable type at the
+ * beginning of an unpack region - but that the value is bogus (e.g., just
+ * a byte field in a string array that so happens to have a value that
+ * matches the specified data type flag). Therefore, the data type error check
+ * is NOT completely safe. This is true for ALL unpack functions.
+ *
+ *
+ * Unpacking values is a "nondestructive" process - i.e., the values are
+ * not removed from the buffer. It is therefore possible for the caller
+ * to re-unpack a value from the same buffer by resetting the unpack_ptr.
+ *
+ * Warning: The caller is responsible for providing adequate memory
+ * storage for the requested data. As noted below, the user
+ * must provide a parameter indicating the maximum number of values that
+ * can be unpacked into the allocated memory. If more values exist in the
+ * buffer than can fit into the memory storage, then the function will unpack
+ * what it can fit into that location and return an error code indicating
+ * that the buffer was only partially unpacked.
+ *
+ * Note that any data that was not hard type cast (i.e., not type cast
+ * to a specific size) when packed may lose precision when unpacked by
+ * a non-homogeneous recipient.  PMIx will do its best to deal with
+ * heterogeneity issues between the packer and unpacker in such
+ * cases. Sending a number larger than can be handled by the recipient
+ * will return an error code generated upon unpacking - these errors
+ * cannot be detected during packing.
+ *
+ * @param *buffer A pointer to the buffer from which the value will be
+ * extracted.
+ *
+ * @param *dest A void* pointer to the memory location into which the
+ * data is to be stored. Note that these values will be stored
+ * contiguously in memory. For strings, this pointer must be to (char
+ * **) to provide a means of supporting multiple string
+ * operations. The unpack function will allocate memory for each
+ * string in the array - the caller must only provide adequate memory
+ * for the array of pointers.
+ *
+ * @param type The type of the data to be unpacked - must be one of
+ * the BFROP defined data types.
+ *
+ * @retval *max_num_values The number of values actually unpacked. In
+ * most cases, this should match the maximum number provided in the
+ * parameters - but in no case will it exceed the value of this
+ * parameter.  Note that if you unpack fewer values than are actually
+ * available, the buffer will be in an unpackable state - the function will
+ * return an error code to warn of this condition.
+ *
+ * @note The unpack function will return the actual number of values
+ * unpacked in this location.
+ *
+ * @retval PMIX_SUCCESS The next item in the buffer was successfully
+ * unpacked.
+ *
+ * @retval PMIX_ERROR(s) The unpack function returns an error code
+ * under one of several conditions: (a) the number of values in the
+ * item exceeds the max num provided by the caller; (b) the type of
+ * the next item in the buffer does not match the type specified by
+ * the caller; or (c) the unpack failed due to either an error in the
+ * buffer or an attempt to read past the end of the buffer.
+ *
+ * @code
+ * pmix_data_buffer_t *buffer;
+ * int32_t dest;
+ * char **string_array;
+ * int32_t num_values;
+ *
+ * num_values = 1;
+ * status_code = PMIx_Data_unpack(buffer, (void*)&dest, &num_values, PMIX_INT32);
+ *
+ * num_values = 5;
+ * string_array = malloc(num_values*sizeof(char *));
+ * status_code = PMIx_Data_unpack(buffer, (void*)(string_array), &num_values, PMIX_STRING);
+ *
+ * @endcode
+ */
+PMIX_EXPORT pmix_status_t PMIx_Data_unpack(pmix_data_buffer_t *buffer, void *dest,
+                                           int32_t *max_num_values,
+                                           pmix_data_type_t type);
+
+/**
+ * Copy a data value from one location to another.
+ *
+ * Since registered data types can be complex structures, the system
+ * needs some way to know how to copy the data from one location to
+ * another (e.g., for storage in the registry). This function, which
+ * can call other copy functions to build up complex data types, defines
+ * the method for making a copy of the specified data type.
+ *
+ * @param **dest The address of a pointer into which the
+ * address of the resulting data is to be stored.
+ *
+ * @param *src A pointer to the memory location from which the
+ * data is to be copied.
+ *
+ * @param type The type of the data to be copied - must be one of
+ * the PMIx defined data types.
+ *
+ * @retval PMIX_SUCCESS The value was successfully copied.
+ *
+ * @retval PMIX_ERROR(s) An appropriate error code.
+ *
+ */
+PMIX_EXPORT pmix_status_t PMIx_Data_copy(void **dest, void *src, pmix_data_type_t type);
+
+/**
+ * Print a data value.
+ *
+ * Since registered data types can be complex structures, the system
+ * needs some way to know how to print them (i.e., convert them to a string
+ * representation). Provided for debug purposes.
+ *
+ * @retval PMIX_SUCCESS The value was successfully printed.
+ *
+ * @retval PMIX_ERROR(s) An appropriate error code.
+ */
+PMIX_EXPORT pmix_status_t PMIx_Data_print(char **output, char *prefix,
+                                          void *src, pmix_data_type_t type);
+
+/**
+ * Copy a payload from one buffer to another
+ *
+ * This function will append a copy of the payload in one buffer into
+ * another buffer.
+ * NOTE: This is NOT a destructive procedure - the
+ * source buffer's payload will remain intact, as will any pre-existing
+ * payload in the destination's buffer.
+ */
+PMIX_EXPORT pmix_status_t PMIx_Data_copy_payload(pmix_data_buffer_t *dest,
+                                                 pmix_data_buffer_t *src);
+
+
+/* Key-Value pair management macros */
+// TODO: add all possible types/fields here.
+
+#define PMIX_VAL_FIELD_int(x)       ((x)->data.integer)
+#define PMIX_VAL_FIELD_uint32_t(x)  ((x)->data.uint32)
+#define PMIX_VAL_FIELD_uint16_t(x)  ((x)->data.uint16)
+#define PMIX_VAL_FIELD_string(x)    ((x)->data.string)
+#define PMIX_VAL_FIELD_float(x)     ((x)->data.fval)
+#define PMIX_VAL_FIELD_byte(x)      ((x)->data.byte)
+#define PMIX_VAL_FIELD_flag(x)      ((x)->data.flag)
+
+#define PMIX_VAL_TYPE_int      PMIX_INT
+#define PMIX_VAL_TYPE_uint32_t PMIX_UINT32
+#define PMIX_VAL_TYPE_uint16_t PMIX_UINT16
+#define PMIX_VAL_TYPE_string   PMIX_STRING
+#define PMIX_VAL_TYPE_float    PMIX_FLOAT
+#define PMIX_VAL_TYPE_byte     PMIX_BYTE
+#define PMIX_VAL_TYPE_flag     PMIX_BOOL
+
+#define PMIX_VAL_set_assign(_v, _field, _val )   \
+    do {                                                            \
+        (_v)->type = PMIX_VAL_TYPE_ ## _field;                      \
+        PMIX_VAL_FIELD_ ## _field((_v)) = _val;                     \
+    } while (0)
+
+#define PMIX_VAL_set_strdup(_v, _field, _val )       \
+    do {                                                                \
+        (_v)->type = PMIX_VAL_TYPE_ ## _field;                          \
+        PMIX_VAL_FIELD_ ## _field((_v)) = strdup(_val);                 \
+    } while (0)
+
+#define PMIX_VAL_SET_int        PMIX_VAL_set_assign
+#define PMIX_VAL_SET_uint32_t   PMIX_VAL_set_assign
+#define PMIX_VAL_SET_uint16_t   PMIX_VAL_set_assign
+#define PMIX_VAL_SET_string     PMIX_VAL_set_strdup
+#define PMIX_VAL_SET_float      PMIX_VAL_set_assign
+#define PMIX_VAL_SET_byte       PMIX_VAL_set_assign
+#define PMIX_VAL_SET_flag       PMIX_VAL_set_assign
+
+#define PMIX_VAL_SET(_v, _field, _val )   \
+    PMIX_VAL_SET_ ## _field(_v, _field, _val)
+
+#define PMIX_VAL_cmp_val(_val1, _val2)      ((_val1) != (_val2))
+#define PMIX_VAL_cmp_float(_val1, _val2)    (((_val1)>(_val2))?(((_val1)-(_val2))>0.000001):(((_val2)-(_val1))>0.000001))
+#define PMIX_VAL_cmp_ptr(_val1, _val2)      strncmp(_val1, _val2, strlen(_val1)+1)
+
+#define PMIX_VAL_CMP_int        PMIX_VAL_cmp_val
+#define PMIX_VAL_CMP_uint32_t   PMIX_VAL_cmp_val
+#define PMIX_VAL_CMP_uint16_t   PMIX_VAL_cmp_val
+#define PMIX_VAL_CMP_float      PMIX_VAL_cmp_float
+#define PMIX_VAL_CMP_string     PMIX_VAL_cmp_ptr
+#define PMIX_VAL_CMP_byte       PMIX_VAL_cmp_val
+#define PMIX_VAL_CMP_flag       PMIX_VAL_cmp_val
+
+#define PMIX_VAL_ASSIGN(_v, _field, _val) \
+    PMIX_VAL_set_assign(_v, _field, _val)
+
+#define PMIX_VAL_CMP(_field, _val1, _val2) \
+    PMIX_VAL_CMP_ ## _field(_val1, _val2)
+
+#define PMIX_VAL_FREE(_v) \
+     PMIx_free_value_data(_v)
+
+#if defined(c_plusplus) || defined(__cplusplus)
+}
+#endif
+
+#endif
diff --git a/include/pmix_rename.h.in b/include/pmix_rename.h.in
new file mode 100755
index 0000000..f58edd2
--- /dev/null
+++ b/include/pmix_rename.h.in
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2016      Intel, Inc. All rights reserved
+ * Copyright (c) 2016      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#ifndef PMIX_RENAME_H
+#define PMIX_RENAME_H
+
+#define PMIx_Init                      @PMIX_RENAME at PMIx_Init
+#define PMIx_Initialized               @PMIX_RENAME at PMIx_Initialized
+#define PMIx_Finalize                  @PMIX_RENAME at PMIx_Finalize
+#define PMIx_Abort                     @PMIX_RENAME at PMIx_Abort
+#define PMIx_Put                       @PMIX_RENAME at PMIx_Put
+#define PMIx_Commit                    @PMIX_RENAME at PMIx_Commit
+#define PMIx_Fence                     @PMIX_RENAME at PMIx_Fence
+#define PMIx_Fence_nb                  @PMIX_RENAME at PMIx_Fence_nb
+#define PMIx_Get                       @PMIX_RENAME at PMIx_Get
+#define PMIx_Get_nb                    @PMIX_RENAME at PMIx_Get_nb
+#define PMIx_Publish                   @PMIX_RENAME at PMIx_Publish
+#define PMIx_Publish_nb                @PMIX_RENAME at PMIx_Publish_nb
+#define PMIx_Lookup                    @PMIX_RENAME at PMIx_Lookup
+#define PMIx_Lookup_nb                 @PMIX_RENAME at PMIx_Lookup_nb
+#define PMIx_Unpublish                 @PMIX_RENAME at PMIx_Unpublish
+#define PMIx_Unpublish_nb              @PMIX_RENAME at PMIx_Unpublish_nb
+#define PMIx_Spawn                     @PMIX_RENAME at PMIx_Spawn
+#define PMIx_Spawn_nb                  @PMIX_RENAME at PMIx_Spawn_nb
+#define PMIx_Connect                   @PMIX_RENAME at PMIx_Connect
+#define PMIx_Connect_nb                @PMIX_RENAME at PMIx_Connect_nb
+#define PMIx_Disconnect                @PMIX_RENAME at PMIx_Disconnect
+#define PMIx_Disconnect_nb             @PMIX_RENAME at PMIx_Disconnect_nb
+#define PMIx_Resolve_peers             @PMIX_RENAME at PMIx_Resolve_peers
+#define PMIx_Resolve_nodes             @PMIX_RENAME at PMIx_Resolve_nodes
+#define PMIx_Query_info_nb             @PMIX_RENAME at PMIx_Query_info_nb
+#define PMIx_Log_nb                    @PMIX_RENAME at PMIx_Log_nb
+
+#define PMIx_server_init               @PMIX_RENAME at PMIx_server_init
+#define PMIx_server_finalize           @PMIX_RENAME at PMIx_server_finalize
+#define PMIx_generate_regex            @PMIX_RENAME at PMIx_generate_regex
+#define PMIx_generate_ppn              @PMIX_RENAME at PMIx_generate_ppn
+#define PMIx_server_register_nspace    @PMIX_RENAME at PMIx_server_register_nspace
+#define PMIx_server_deregister_nspace  @PMIX_RENAME at PMIx_server_deregister_nspace
+#define PMIx_server_register_client    @PMIX_RENAME at PMIx_server_register_client
+#define PMIx_server_deregister_client  @PMIX_RENAME at PMIx_server_deregister_client
+#define PMIx_server_setup_fork         @PMIX_RENAME at PMIx_server_setup_fork
+#define PMIx_server_dmodex_request     @PMIX_RENAME at PMIx_server_dmodex_request
+
+#define PMIx_tool_init                 @PMIX_RENAME at PMIx_tool_init
+#define PMIx_tool_finalize             @PMIX_RENAME at PMIx_tool_finalize
+
+#define PMIx_Register_event_handler    @PMIX_RENAME at PMIx_Register_event_handler
+#define PMIx_Deregister_event_handler  @PMIX_RENAME at PMIx_Deregister_event_handler
+#define PMIx_Notify_event              @PMIX_RENAME at PMIx_Notify_event
+#define PMIx_Error_string              @PMIX_RENAME at PMIx_Error_string
+#define PMIx_Proc_state_string         @PMIX_RENAME at PMIx_Proc_state_string
+#define PMIx_Persistence_string        @PMIX_RENAME at PMIx_Persistence_string
+#define PMIx_Data_range_string         @PMIX_RENAME at PMIx_Data_range_string
+#define PMIx_Info_directives_string    @PMIX_RENAME at PMIx_Info_directives_string
+#define PMIx_Data_type_string          @PMIX_RENAME at PMIx_Data_type_string
+#define PMIx_Get_version               @PMIX_RENAME at PMIx_Get_version
+#define PMIx_Store_internal            @PMIX_RENAME at PMIx_Store_internal
+
+#define pmix_value_load                @PMIX_RENAME at pmix_value_load
+#define pmix_value_xfer                @PMIX_RENAME at pmix_value_xfer
+#define pmix_globals                   @PMIX_RENAME at pmix_globals
+#define pmix_output                    @PMIX_RENAME at pmix_output
+#define pmix_output_verbose            @PMIX_RENAME at pmix_output_verbose
+
+#endif
diff --git a/include/pmix_server.h b/include/pmix_server.h
new file mode 100644
index 0000000..ff4a87f
--- /dev/null
+++ b/include/pmix_server.h
@@ -0,0 +1,541 @@
+/*
+ * Copyright (c) 2013-2017 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2015      Artem Y. Polyakov <artpol84 at gmail.com>.
+ *                         All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer listed
+ *   in this license in the documentation and/or other materials
+ *   provided with the distribution.
+ *
+ * - Neither the name of the copyright holders nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * The copyright holders provide no reassurances that the source code
+ * provided does not infringe any patent, copyright, or any other
+ * intellectual property rights of third parties.  The copyright holders
+ * disclaim any liability to any recipient for claims brought against
+ * recipient by any third party for infringement of that parties
+ * intellectual property rights.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $HEADER$
+ *
+ * PMIx provides a "function-shipping" approach to support for
+ * implementing the server-side of the protocol. This method allows
+ * resource managers to implement the server without being burdened
+ * with PMIx internal details. Accordingly, each PMIx API is mirrored
+ * here in a function call to be provided by the server. When a
+ * request is received from the client, the corresponding server function
+ * will be called with the information.
+ *
+ * Any functions not supported by the RM can be indicated by a NULL for
+ * the function pointer. Client calls to such functions will have a
+ * "not supported" error returned.
+ */
+
+#ifndef PMIx_SERVER_API_H
+#define PMIx_SERVER_API_H
+
+/* Structure and constant definitions */
+#include <pmix_common.h>
+
+#if defined(c_plusplus) || defined(__cplusplus)
+extern "C" {
+#endif
+
+/****    SERVER FUNCTION-SHIPPED APIs    ****/
+/* NOTE: for performance purposes, the host server is required to
+ * return as quickly as possible from all functions. Execution of
+ * the function is thus to be done asynchronously so as to allow
+ * the PMIx server support library to handle multiple client requests
+ * as quickly and scalably as possible.
+ *
+ * ALL data passed to the host server functions is "owned" by the
+ * PMIX server support library and MUST NOT be free'd. Data returned
+ * by the host server via callback function is owned by the host
+ * server, which is free to release it upon return from the callback */
+
+/* Notify the host server that a client connected to us - note
+ * that the client will be in a blocked state until the host server
+ * executes the callback function, thus allowing the PMIx server support
+ * library to release the client */
+typedef pmix_status_t (*pmix_server_client_connected_fn_t)(const pmix_proc_t *proc, void* server_object,
+                                                           pmix_op_cbfunc_t cbfunc, void *cbdata);
+
+/* Notify the host server that a client called PMIx_Finalize - note
+ * that the client will be in a blocked state until the host server
+ * executes the callback function, thus allowing the PMIx server support
+ * library to release the client */
+typedef pmix_status_t (*pmix_server_client_finalized_fn_t)(const pmix_proc_t *proc, void* server_object,
+                                                           pmix_op_cbfunc_t cbfunc, void *cbdata);
+
+/* A local client called PMIx_Abort - note that the client will be in a blocked
+ * state until the host server executes the callback function, thus
+ * allowing the PMIx server support library to release the client. The
+ * array of procs indicates which processes are to be terminated. A NULL
+ * indicates that all procs in the client's nspace are to be terminated */
+typedef pmix_status_t (*pmix_server_abort_fn_t)(const pmix_proc_t *proc, void *server_object,
+                                                int status, const char msg[],
+                                                pmix_proc_t procs[], size_t nprocs,
+                                                pmix_op_cbfunc_t cbfunc, void *cbdata);
+
+/* At least one client called either PMIx_Fence or PMIx_Fence_nb. In either case,
+ * the host server will be called via a non-blocking function to execute
+ * the specified operation once all participating local procs have
+ * contributed. All processes in the specified array are required to participate
+ * in the Fence[_nb] operation. The callback is to be executed once each daemon
+ * hosting at least one participant has called the host server's fencenb function.
+ *
+ * The provided data is to be collectively shared with all PMIx
+ * servers involved in the fence operation, and returned in the modex
+ * cbfunc. A _NULL_ data value indicates that the local procs had
+ * no data to contribute.
+ *
+ * The array of info structs is used to pass user-requested options to the server.
+ * This can include directives as to the algorithm to be used to execute the
+ * fence operation. The directives are optional _unless_ the _mandatory_ flag
+ * has been set - in such cases, the host RM is required to return an error
+ * if the directive cannot be met. */
+typedef pmix_status_t (*pmix_server_fencenb_fn_t)(const pmix_proc_t procs[], size_t nprocs,
+                                                  const pmix_info_t info[], size_t ninfo,
+                                                  char *data, size_t ndata,
+                                                  pmix_modex_cbfunc_t cbfunc, void *cbdata);
+
+
+/* Used by the PMIx server to request its local host contact the
+ * PMIx server on the remote node that hosts the specified proc to
+ * obtain and return a direct modex blob for that proc.
+ *
+ * The array of info structs is used to pass user-requested options to the server.
+ * This can include a timeout to preclude an indefinite wait for data that
+ * may never become available. The directives are optional _unless_ the _mandatory_ flag
+ * has been set - in such cases, the host RM is required to return an error
+ * if the directive cannot be met. */
+typedef pmix_status_t (*pmix_server_dmodex_req_fn_t)(const pmix_proc_t *proc,
+                                                     const pmix_info_t info[], size_t ninfo,
+                                                     pmix_modex_cbfunc_t cbfunc, void *cbdata);
+
+
+/* Publish data per the PMIx API specification. The callback is to be executed
+ * upon completion of the operation. The default data range is expected to be
+ * PMIX_SESSION, and the default persistence PMIX_PERSIST_SESSION. These values
+ * can be modified by including the respective pmix_info_t struct in the
+ * provided array.
+ *
+ * Note that the host server is not required to guarantee support for any specific
+ * range - i.e., the server does not need to return an error if the data store
+ * doesn't support range-based isolation. However, the server must return an error
+ * (a) if the key is duplicative within the storage range, and (b) if the server
+ * does not allow overwriting of published info by the original publisher - it is
+ * left to the discretion of the host server to allow info-key-based flags to modify
+ * this behavior.
+ *
+ * The persistence indicates how long the server should retain the data.
+ *
+ * The identifier of the publishing process is also provided and is expected to
+ * be returned on any subsequent lookup request */
+typedef pmix_status_t (*pmix_server_publish_fn_t)(const pmix_proc_t *proc,
+                                                  const pmix_info_t info[], size_t ninfo,
+                                                  pmix_op_cbfunc_t cbfunc, void *cbdata);
+
+/* Lookup published data. The host server will be passed a NULL-terminated array
+ * of string keys.
+ *
+ * The array of info structs is used to pass user-requested options to the server.
+ * This can include a wait flag to indicate that the server should wait for all
+ * data to become available before executing the callback function, or should
+ * immediately callback with whatever data is available. In addition, a timeout
+ * can be specified on the wait to preclude an indefinite wait for data that
+ * may never be published. */
+typedef pmix_status_t (*pmix_server_lookup_fn_t)(const pmix_proc_t *proc, char **keys,
+                                                 const pmix_info_t info[], size_t ninfo,
+                                                 pmix_lookup_cbfunc_t cbfunc, void *cbdata);
+
+/* Delete data from the data store. The host server will be passed a NULL-terminated array
+ * of string keys, plus potential directives such as the data range within which the
+ * keys should be deleted. The callback is to be executed upon completion of the delete
+ * procedure */
+typedef pmix_status_t (*pmix_server_unpublish_fn_t)(const pmix_proc_t *proc, char **keys,
+                                                    const pmix_info_t info[], size_t ninfo,
+                                                    pmix_op_cbfunc_t cbfunc, void *cbdata);
+
+/* Spawn a set of applications/processes as per the PMIx API. Note that
+ * applications are not required to be MPI or any other programming model.
+ * Thus, the host server cannot make any assumptions as to their required
+ * support. The callback function is to be executed once all processes have
+ * been started. An error in starting any application or process in this
+ * request shall cause all applications and processes in the request to
+ * be terminated, and an error returned to the originating caller.
+ *
+ * Note that a timeout can be specified in the job_info array to indicate
+ * that failure to start the requested job within the given time should
+ * result in termination to avoid hangs */
+typedef pmix_status_t (*pmix_server_spawn_fn_t)(const pmix_proc_t *proc,
+                                                const pmix_info_t job_info[], size_t ninfo,
+                                                const pmix_app_t apps[], size_t napps,
+                                                pmix_spawn_cbfunc_t cbfunc, void *cbdata);
+
+/* Record the specified processes as "connected". This means that the resource
+ * manager should treat the failure of any process in the specified group as
+ * a reportable event, and take appropriate action. The callback function is
+ * to be called once all participating processes have called connect. Note that
+ * a process can only engage in *one* connect operation involving the identical
+ * set of procs at a time. However, a process *can* be simultaneously engaged
+ * in multiple connect operations, each involving a different set of procs
+ *
+ * Note also that this is a collective operation within the client library, and
+ * thus the client will be blocked until all procs participate. Thus, the info
+ * array can be used to pass user directives, including a timeout.
+ * The directives are optional _unless_ the _mandatory_ flag
+ * has been set - in such cases, the host RM is required to return an error
+ * if the directive cannot be met. */
+typedef pmix_status_t (*pmix_server_connect_fn_t)(const pmix_proc_t procs[], size_t nprocs,
+                                                  const pmix_info_t info[], size_t ninfo,
+                                                  pmix_op_cbfunc_t cbfunc, void *cbdata);
+
+/* Disconnect a previously connected set of processes. An error should be returned
+ * if the specified set of procs was not previously "connected". As above, a process
+ * may be involved in multiple simultaneous disconnect operations. However, a process
+ * is not allowed to reconnect to a set of ranges that has not fully completed
+ * disconnect - i.e., you have to fully disconnect before you can reconnect to the
+ * same group of processes.
+  *
+ * Note also that this is a collective operation within the client library, and
+ * thus the client will be blocked until all procs participate. Thus, the info
+ * array can be used to pass user directives, including a timeout.
+ * The directives are optional _unless_ the _mandatory_ flag
+ * has been set - in such cases, the host RM is required to return an error
+ * if the directive cannot be met. */
+typedef pmix_status_t (*pmix_server_disconnect_fn_t)(const pmix_proc_t procs[], size_t nprocs,
+                                                     const pmix_info_t info[], size_t ninfo,
+                                                     pmix_op_cbfunc_t cbfunc, void *cbdata);
+
+/* Register to receive notifications for the specified events. The resource
+ * manager is _required_ to pass along to the local PMIx server all events
+ * that directly relate to a registered namespace. However, the RM may have
+ * access to events beyond those - e.g., environmental events. The PMIx server
+ * will register to receive environmental events that match specific PMIx
+ * event codes. If the host RM supports such notifications, it will need to
+ * translate its own internal event codes to fit into a corresponding PMIx event
+ * code - any specific info beyond that can be passed in via the pmix_info_t
+ * upon notification.
+ *
+ * The info array included in this API is reserved for possible future directives
+ * to further steer notification.
+ */
+ typedef pmix_status_t (*pmix_server_register_events_fn_t)(pmix_status_t *codes, size_t ncodes,
+                                                           const pmix_info_t info[], size_t ninfo,
+                                                           pmix_op_cbfunc_t cbfunc, void *cbdata);
+
+/* Deregister to receive notifications for the specified environmental events
+ * for which the PMIx server has previously registered. The host RM remains
+ * required to notify of any job-related events */
+ typedef pmix_status_t (*pmix_server_deregister_events_fn_t)(pmix_status_t *codes, size_t ncodes,
+                                                             pmix_op_cbfunc_t cbfunc, void *cbdata);
+
+/* Notify the specified processes of an event generated either by
+ * the PMIx server itself, or by one of its local clients. The process
+ * generating the event is provided in the source parameter. */
+typedef pmix_status_t (*pmix_server_notify_event_fn_t)(pmix_status_t code,
+                                                       const pmix_proc_t *source,
+                                                       pmix_data_range_t range,
+                                                       pmix_info_t info[], size_t ninfo,
+                                                       pmix_op_cbfunc_t cbfunc, void *cbdata);
+
+/* Callback function for incoming connection requests from
+ * local clients */
+typedef void (*pmix_connection_cbfunc_t)(int incoming_sd, void *cbdata);
+
+/* Register a socket the host server can monitor for connection
+ * requests, harvest them, and then call our internal callback
+ * function for further processing. A listener thread is essential
+ * to efficiently harvesting connection requests from large
+ * numbers of local clients such as occur when running on large
+ * SMPs. The host server listener is required to call accept
+ * on the incoming connection request, and then passing the
+ * resulting soct to the provided cbfunc. A NULL for this function
+ * will cause the internal PMIx server to spawn its own listener
+ * thread */
+typedef pmix_status_t (*pmix_server_listener_fn_t)(int listening_sd,
+                                                   pmix_connection_cbfunc_t cbfunc,
+                                                   void *cbdata);
+
+/* Query information from the resource manager. The query will include
+ * the nspace/rank of the proc that is requesting the info, an
+ * array of pmix_query_t describing the request, and a callback
+ * function/data for the return. */
+typedef pmix_status_t (*pmix_server_query_fn_t)(pmix_proc_t *proct,
+                                                pmix_query_t *queries, size_t nqueries,
+                                                pmix_info_cbfunc_t cbfunc,
+                                                void *cbdata);
+
+/* Callback function for incoming tool connections - the host
+ * RM shall provide an nspace/rank for the connecting tool. We
+ * assume that a rank=0 will be the normal assignment, but allow
+ * for the future possibility of a parallel set of tools
+ * connecting, and thus each proc requiring a rank*/
+typedef void (*pmix_tool_connection_cbfunc_t)(pmix_status_t status,
+                                              pmix_proc_t *proc, void *cbdata);
+
+/* Register that a tool has connected to the server, and request
+ * that the tool be assigned an nspace/rank for further interactions.
+ * The optional pmix_info_t array can be used to pass qualifiers for
+ * the connection request:
+ *
+ * (a) PMIX_USERID - effective userid of the tool
+ * (b) PMIX_GRPID - effective groupid of the tool
+ * (c) PMIX_FWD_STDOUT - forward any stdout to this tool
+ * (d) PMIX_FWD_STDERR - forward any stderr to this tool
+ * (e) PMIX_FWD_STDIN - forward stdin from this tool to any
+ *     processes spawned on its behalf
+ */
+typedef void (*pmix_server_tool_connection_fn_t)(pmix_info_t *info, size_t ninfo,
+                                                 pmix_tool_connection_cbfunc_t cbfunc,
+                                                 void *cbdata);
+
+/* Log data on behalf of a client */
+typedef void (*pmix_server_log_fn_t)(const pmix_proc_t *client,
+                                     const pmix_info_t data[], size_t ndata,
+                                     const pmix_info_t directives[], size_t ndirs,
+                                     pmix_op_cbfunc_t cbfunc, void *cbdata);
+
+/* Request allocation modifications on behalf of a client */
+typedef pmix_status_t (*pmix_server_alloc_fn_t)(const pmix_proc_t *client,
+                                                pmix_alloc_directive_t directive,
+                                                const pmix_info_t data[], size_t ndata,
+                                                pmix_info_cbfunc_t cbfunc, void *cbdata);
+
+/* Execute a job control action on behalf of a client */
+typedef pmix_status_t (*pmix_server_job_control_fn_t)(const pmix_proc_t *requestor,
+                                                      const pmix_proc_t targets[], size_t ntargets,
+                                                      const pmix_info_t directives[], size_t ndirs,
+                                                      pmix_info_cbfunc_t cbfunc, void *cbdata);
+
+/* Request that a client be monitored for activity */
+typedef pmix_status_t (*pmix_server_monitor_fn_t)(const pmix_proc_t *requestor,
+                                                  const pmix_info_t *monitor, pmix_status_t error,
+                                                  const pmix_info_t directives[], size_t ndirs,
+                                                  pmix_info_cbfunc_t cbfunc, void *cbdata);
+
+typedef struct pmix_server_module_2_0_0_t {
+    /* v1x interfaces */
+    pmix_server_client_connected_fn_t   client_connected;
+    pmix_server_client_finalized_fn_t   client_finalized;
+    pmix_server_abort_fn_t              abort;
+    pmix_server_fencenb_fn_t            fence_nb;
+    pmix_server_dmodex_req_fn_t         direct_modex;
+    pmix_server_publish_fn_t            publish;
+    pmix_server_lookup_fn_t             lookup;
+    pmix_server_unpublish_fn_t          unpublish;
+    pmix_server_spawn_fn_t              spawn;
+    pmix_server_connect_fn_t            connect;
+    pmix_server_disconnect_fn_t         disconnect;
+    pmix_server_register_events_fn_t    register_events;
+    pmix_server_deregister_events_fn_t  deregister_events;
+    pmix_server_listener_fn_t           listener;
+    /* v2x interfaces */
+    pmix_server_notify_event_fn_t       notify_event;
+    pmix_server_query_fn_t              query;
+    pmix_server_tool_connection_fn_t    tool_connected;
+    pmix_server_log_fn_t                log;
+    pmix_server_alloc_fn_t              allocate;
+    pmix_server_job_control_fn_t        job_control;
+    pmix_server_monitor_fn_t            monitor;
+} pmix_server_module_t;
+
+/****    SERVER SUPPORT INIT/FINALIZE FUNCTIONS    ****/
+
+/* Initialize the server support library, and provide a
+ * pointer to a pmix_server_module_t structure
+ * containing the caller's callback functions. The
+ * array of pmix_info_t structs is used to pass
+ * additional info that may be required by the server
+ * when initializing - e.g., a user/group ID to set
+ * on the rendezvous file for the Unix Domain Socket. It
+ * also may include the PMIX_SERVER_TOOL_SUPPORT key, thereby
+ * indicating that the daemon is willing to accept connection
+ * requests from tools */
+PMIX_EXPORT pmix_status_t PMIx_server_init(pmix_server_module_t *module,
+                                           pmix_info_t info[], size_t ninfo);
+
+/* Finalize the server support library. If internal comm is
+ * in-use, the server will shut it down at this time. All
+ * memory usage is released */
+PMIX_EXPORT pmix_status_t PMIx_server_finalize(void);
+
+/* given a semicolon-separated list of input values, generate
+ * a regex that can be passed down to the client for parsing.
+ * The caller is responsible for free'ing the resulting
+ * string
+ *
+ * If values have leading zero's, then that is preserved. You
+ * have to add back any prefix/suffix for node names
+ * odin[009-015,017-023,076-086]
+ *
+ *     "pmix:odin[009-015,017-023,076-086]"
+ *
+ * Note that the "pmix" at the beginning of each regex indicates
+ * that the PMIx native parser is to be used by the client for
+ * parsing the provided regex. Other parsers may be supported - see
+ * the pmix_client.h header for a list.
+ */
+PMIX_EXPORT pmix_status_t PMIx_generate_regex(const char *input, char **regex);
+
+/* The input is expected to consist of a comma-separated list
+ * of ranges. Thus, an input of:
+ *     "1-4;2-5;8,10,11,12;6,7,9"
+ * would generate a regex of
+ *     "[pmix:2x(3);8,10-12;6-7,9]"
+ *
+ * Note that the "pmix" at the beginning of each regex indicates
+ * that the PMIx native parser is to be used by the client for
+ * parsing the provided regex. Other parsers may be supported - see
+ * the pmix_client.h header for a list.
+ */
+PMIX_EXPORT pmix_status_t PMIx_generate_ppn(const char *input, char **ppn);
+
+/* Setup the data about a particular nspace so it can
+ * be passed to any child process upon startup. The PMIx
+ * connection procedure provides an opportunity for the
+ * host PMIx server to pass job-related info down to a
+ * child process. This might include the number of
+ * processes in the job, relative local ranks of the
+ * processes within the job, and other information of
+ * use to the process. The server is free to determine
+ * which, if any, of the supported elements it will
+ * provide - defined values are provided in pmix_common.h.
+ *
+ * NOTE: the server must register ALL nspaces that will
+ * participate in collective operations with local processes.
+ * This means that the server must register an nspace even
+ * if it will not host any local procs from within that
+ * nspace IF any local proc might at some point perform
+ * a collective operation involving one or more procs from
+ * that nspace. This is necessary so that the collective
+ * operation can know when it is locally complete.
+ *
+ * The caller must also provide the number of local procs
+ * that will be launched within this nspace. This is required
+ * for the PMIx server library to correctly handle collectives
+ * as a collective operation call can occur before all the
+ * procs have been started */
+PMIX_EXPORT pmix_status_t PMIx_server_register_nspace(const char nspace[], int nlocalprocs,
+                                                      pmix_info_t info[], size_t ninfo,
+                                                      pmix_op_cbfunc_t cbfunc, void *cbdata);
+
+/* Deregister an nspace and purge all objects relating to
+ * it, including any client info from that nspace. This is
+ * intended to support persistent PMIx servers by providing
+ * an opportunity for the host RM to tell the PMIx server
+ * library to release all memory for a completed job */
+PMIX_EXPORT void PMIx_server_deregister_nspace(const char nspace[],
+                                               pmix_op_cbfunc_t cbfunc, void *cbdata);
+
+/* Register a client process with the PMIx server library. The
+ * expected user ID and group ID of the child process helps the
+ * server library to properly authenticate clients as they connect
+ * by requiring the two values to match.
+ *
+ * The host server can also, if it desires, provide an object
+ * it wishes to be returned when a server function is called
+ * that relates to a specific process. For example, the host
+ * server may have an object that tracks the specific client.
+ * Passing the object to the library allows the library to
+ * return that object when the client calls "finalize", thus
+ * allowing the host server to access the object without
+ * performing a lookup. */
+PMIX_EXPORT pmix_status_t PMIx_server_register_client(const pmix_proc_t *proc,
+                                                      uid_t uid, gid_t gid,
+                                                      void *server_object,
+                                                      pmix_op_cbfunc_t cbfunc, void *cbdata);
+
+/* Deregister a client and purge all data relating to it. The
+ * deregister_nspace API will automatically delete all client
+ * info for that nspace - this API is therefore intended solely
+ * for use in exception cases */
+PMIX_EXPORT void PMIx_server_deregister_client(const pmix_proc_t *proc,
+                                               pmix_op_cbfunc_t cbfunc, void *cbdata);
+
+/* Setup the environment of a child process to be forked
+ * by the host so it can correctly interact with the PMIx
+ * server. The PMIx client needs some setup information
+ * so it can properly connect back to the server. This function
+ * will set appropriate environmental variables for this purpose. */
+PMIX_EXPORT pmix_status_t PMIx_server_setup_fork(const pmix_proc_t *proc, char ***env);
+
+/* Define a callback function the PMIx server will use to return
+ * direct modex requests to the host server. The PMIx server
+ * will free the data blob upon return from the response fn */
+typedef void (*pmix_dmodex_response_fn_t)(pmix_status_t status,
+                                          char *data, size_t sz,
+                                          void *cbdata);
+
+/* Define a function by which the host server can request modex data
+ * from the local PMIx server. This is used to support the direct modex
+ * operation - i.e., where data is cached locally on each PMIx
+ * server for its own local clients, and is obtained on-demand
+ * for remote requests. Upon receiving a request from a remote
+ * server, the host server will call this function to pass the
+ * request into the PMIx server. The PMIx server will return a blob
+ * (once it becomes available) via the cbfunc - the host
+ * server shall send the blob back to the original requestor */
+PMIX_EXPORT pmix_status_t PMIx_server_dmodex_request(const pmix_proc_t *proc,
+                                                     pmix_dmodex_response_fn_t cbfunc,
+                                                     void *cbdata);
+
+/* define a callback function for the setup_application API. The returned info
+ * array is owned by the PMIx server library and will be free'd when the
+ * provided cbfunc is called. */
+typedef void (*pmix_setup_application_cbfunc_t)(pmix_status_t status,
+                                                pmix_info_t info[], size_t ninfo,
+                                                void *provided_cbdata,
+                                                pmix_op_cbfunc_t cbfunc, void *cbdata);
+
+/* Provide a function by which the resource manager can request
+ * any application-specific environmental variables prior to
+ * launch of an application. For example, network libraries may
+ * opt to provide security credentials for the application. This
+ * is defined as a non-blocking operation in case network
+ * libraries need to perform some action before responding. The
+ * returned env will be distributed along with the application */
+PMIX_EXPORT pmix_status_t PMIx_server_setup_application(const char nspace[],
+                                                        pmix_info_t info[], size_t ninfo,
+                                                        pmix_setup_application_cbfunc_t cbfunc, void *cbdata);
+
+/* Provide a function by which the local PMIx server can perform
+ * any application-specific operations prior to spawning local
+ * clients of a given application. For example, a network library
+ * might need to setup the local driver for "instant on" addressing.
+ */
+PMIX_EXPORT pmix_status_t PMIx_server_setup_local_support(const char nspace[],
+                                                          pmix_info_t info[], size_t ninfo,
+                                                          pmix_op_cbfunc_t cbfunc, void *cbdata);
+
+#if defined(c_plusplus) || defined(__cplusplus)
+}
+#endif
+
+#endif
diff --git a/include/pmix_tool.h b/include/pmix_tool.h
new file mode 100644
index 0000000..f8f8f9c
--- /dev/null
+++ b/include/pmix_tool.h
@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) 2013-2017 Intel, Inc. All rights reserved.
+ * Copyright (c) 2015      Artem Y. Polyakov <artpol84 at gmail.com>.
+ *                         All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer listed
+ *   in this license in the documentation and/or other materials
+ *   provided with the distribution.
+ *
+ * - Neither the name of the copyright holders nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * The copyright holders provide no reassurances that the source code
+ * provided does not infringe any patent, copyright, or any other
+ * intellectual property rights of third parties.  The copyright holders
+ * disclaim any liability to any recipient for claims brought against
+ * recipient by any third party for infringement of that parties
+ * intellectual property rights.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $HEADER$
+ *
+ * PMIx provides a "function-shipping" approach to support for
+ * implementing the server-side of the protocol. This method allows
+ * resource managers to implement the server without being burdened
+ * with PMIx internal details. Accordingly, each PMIx API is mirrored
+ * here in a function call to be provided by the server. When a
+ * request is received from the client, the corresponding server function
+ * will be called with the information.
+ *
+ * Any functions not supported by the RM can be indicated by a NULL for
+ * the function pointer. Client calls to such functions will have a
+ * "not supported" error returned.
+ */
+
+#ifndef PMIx_TOOL_API_H
+#define PMIx_TOOL_API_H
+
+/* provide access to the rest of the client functions */
+#include <pmix.h>
+
+#if defined(c_plusplus) || defined(__cplusplus)
+extern "C" {
+#endif
+
+/****    TOOL INIT/FINALIZE FUNCTIONS    ****/
+
+/* Initialize the PMIx tool, returning the process identifier assigned
+ * to this tool in the provided pmix_proc_t struct.
+ *
+ * When called the PMIx tool library will check for the required connection
+ * information of the local PMIx server and will establish the connection.
+ * If the information is not found, or the server connection fails, then
+ * an appropriate error constant will be returned.
+ *
+ * If successful, the function will return PMIX_SUCCESS and will fill the
+ * provided structure with the server-assigned namespace and rank of the tool.
+ *
+ * Note that the PMIx tool library is referenced counted, and so multiple
+ * calls to PMIx_tool_init are allowed. Thus, one way to obtain the namespace and
+ * rank of the process is to simply call PMIx_tool_init with a non-NULL parameter.
+ *
+ * The info array is used to pass user requests pertaining to the init
+ * and subsequent operations. Passing a _NULL_ value for the array pointer
+ * is supported if no directives are desired.
+ */
+    PMIX_EXPORT pmix_status_t PMIx_tool_init(pmix_proc_t *proc,
+                                             pmix_info_t info[], size_t ninfo);
+
+/* Finalize the PMIx tool library, closing the connection to the local server.
+ * An error code will be returned if, for some reason, the connection
+ * cannot be closed.
+ *
+ * The info array is used to pass user requests regarding the finalize
+ * operation. */
+    PMIX_EXPORT pmix_status_t PMIx_tool_finalize(void);
+
+#if defined(c_plusplus) || defined(__cplusplus)
+}
+#endif
+
+#endif
diff --git a/include/pmix_version.h.in b/include/pmix_version.h.in
new file mode 100644
index 0000000..096b895
--- /dev/null
+++ b/include/pmix_version.h.in
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2016      Mellanox Technologies, Inc.
+ *                         All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+
+#ifndef PMIx_VERSION_H
+#define PMIx_VERSION_H
+
+/* define PMIx version */
+#define PMIX_VERSION_MAJOR @pmixmajor@
+#define PMIX_VERSION_MINOR @pmixminor@
+
+#endif
diff --git a/man/Makefile.am b/man/Makefile.am
new file mode 100644
index 0000000..7c0f8bf
--- /dev/null
+++ b/man/Makefile.am
@@ -0,0 +1,60 @@
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2006-2016 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2012-2013 Los Alamos National Security, Inc.  All rights reserved.
+# Copyright (c) 2013-2016 Intel, Inc. All rights reserved
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+if !PMIX_EMBEDDED_MODE
+
+man_MANS = \
+	man3/pmix_init.3 \
+	man3/pmix_finalize.3 \
+	man3/pmix_initialized.3 \
+	man3/pmix_abort.3 \
+	man3/pmix_put.3 \
+	man3/pmix_commit.3 \
+	man7/pmix.7 \
+	man7/pmix_constants.7
+
+EXTRA_DIST = $(man_MANS)
+
+man3/pmix_init.3:
+	$(top_srcdir)/contrib/md2nroff.pl --source=pmix_init.3.md;
+
+man3/pmix_finalize.3:
+	$(top_srcdir)/contrib/md2nroff.pl --source=pmix_finalize.3.md;
+
+man3/pmix_initialized.3:
+	$(top_srcdir)/contrib/md2nroff.pl --source=pmix_initialized.3.md;
+
+man3/pmix_abort.3:
+	$(top_srcdir)/contrib/md2nroff.pl --source=pmix_abort.3.md;
+
+man3/pmix_put.3:
+	$(top_srcdir)/contrib/md2nroff.pl --source=pmix_put.3.md;
+
+man3/pmix_commit.3:
+	$(top_srcdir)/contrib/md2nroff.pl --source=pmix_commit.3.md;
+
+man7/pmix.7:
+	$(top_srcdir)/contrib/md2nroff.pl --source=pmix.7.md;
+
+man7/pmix_constants.7:
+	$(top_srcdir)/contrib/md2nroff.pl --source=pmix_constants.7.md;
+
+endif # !PMIX_EMBEDDED_MODE
diff --git a/man/Makefile.in b/man/Makefile.in
new file mode 100644
index 0000000..3351994
--- /dev/null
+++ b/man/Makefile.in
@@ -0,0 +1,780 @@
+# Makefile.in generated by automake 1.15 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2006-2016 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2012-2013 Los Alamos National Security, Inc.  All rights reserved.
+# Copyright (c) 2013-2016 Intel, Inc. All rights reserved
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+subdir = man
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/config/c_get_alignment.m4 \
+	$(top_srcdir)/config/libtool.m4 \
+	$(top_srcdir)/config/ltoptions.m4 \
+	$(top_srcdir)/config/ltsugar.m4 \
+	$(top_srcdir)/config/ltversion.m4 \
+	$(top_srcdir)/config/lt~obsolete.m4 \
+	$(top_srcdir)/config/pmix.m4 \
+	$(top_srcdir)/config/pmix_check_attributes.m4 \
+	$(top_srcdir)/config/pmix_check_broken_qsort.m4 \
+	$(top_srcdir)/config/pmix_check_compiler_version.m4 \
+	$(top_srcdir)/config/pmix_check_icc.m4 \
+	$(top_srcdir)/config/pmix_check_ident.m4 \
+	$(top_srcdir)/config/pmix_check_lock.m4 \
+	$(top_srcdir)/config/pmix_check_os_flavors.m4 \
+	$(top_srcdir)/config/pmix_check_package.m4 \
+	$(top_srcdir)/config/pmix_check_psm2.m4 \
+	$(top_srcdir)/config/pmix_check_pthread_pids.m4 \
+	$(top_srcdir)/config/pmix_check_vendor.m4 \
+	$(top_srcdir)/config/pmix_check_visibility.m4 \
+	$(top_srcdir)/config/pmix_check_withdir.m4 \
+	$(top_srcdir)/config/pmix_config_asm.m4 \
+	$(top_srcdir)/config/pmix_config_pthreads.m4 \
+	$(top_srcdir)/config/pmix_config_subdir.m4 \
+	$(top_srcdir)/config/pmix_config_subdir_args.m4 \
+	$(top_srcdir)/config/pmix_config_threads.m4 \
+	$(top_srcdir)/config/pmix_ensure_contains_optflags.m4 \
+	$(top_srcdir)/config/pmix_functions.m4 \
+	$(top_srcdir)/config/pmix_load_platform.m4 \
+	$(top_srcdir)/config/pmix_mca.m4 \
+	$(top_srcdir)/config/pmix_search_libs.m4 \
+	$(top_srcdir)/config/pmix_setup_cc.m4 \
+	$(top_srcdir)/config/pmix_setup_libevent.m4 \
+	$(top_srcdir)/config/pmix_setup_zlib.m4 \
+	$(top_srcdir)/config/pmix_try_assemble.m4 \
+	$(top_srcdir)/config/autogen_found_items.m4 \
+	$(top_srcdir)/src/mca/pdl/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/configure.m4 \
+	$(top_srcdir)/src/mca/pdl/pdlopen/configure.m4 \
+	$(top_srcdir)/src/mca/pdl/plibltdl/configure.m4 \
+	$(top_srcdir)/src/mca/pif/bsdx_ipv4/configure.m4 \
+	$(top_srcdir)/src/mca/pif/bsdx_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pif/linux_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pif/posix_ipv4/configure.m4 \
+	$(top_srcdir)/src/mca/pif/solaris_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/config/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/env/configure.m4 \
+	$(top_srcdir)/src/mca/pnet/opa/configure.m4 \
+	$(top_srcdir)/src/mca/psec/munge/configure.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/src/include/pmix_config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+SOURCES =
+DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+man3dir = $(mandir)/man3
+am__installdirs = "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(man7dir)"
+man7dir = $(mandir)/man7
+NROFF = nroff
+MANS = $(man_MANS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in README
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CFLAGS = @CFLAGS@
+CLEANFILES = @CLEANFILES@
+CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MCA_PROJECT_SUBDIRS = @MCA_PROJECT_SUBDIRS@
+MCA_pmix_FRAMEWORKS = @MCA_pmix_FRAMEWORKS@
+MCA_pmix_FRAMEWORKS_SUBDIRS = @MCA_pmix_FRAMEWORKS_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS@
+MCA_pmix_FRAMEWORK_LIBS = @MCA_pmix_FRAMEWORK_LIBS@
+MCA_pmix_pdl_ALL_COMPONENTS = @MCA_pmix_pdl_ALL_COMPONENTS@
+MCA_pmix_pdl_ALL_SUBDIRS = @MCA_pmix_pdl_ALL_SUBDIRS@
+MCA_pmix_pdl_DSO_COMPONENTS = @MCA_pmix_pdl_DSO_COMPONENTS@
+MCA_pmix_pdl_DSO_SUBDIRS = @MCA_pmix_pdl_DSO_SUBDIRS@
+MCA_pmix_pdl_STATIC_COMPONENTS = @MCA_pmix_pdl_STATIC_COMPONENTS@
+MCA_pmix_pdl_STATIC_LTLIBS = @MCA_pmix_pdl_STATIC_LTLIBS@
+MCA_pmix_pdl_STATIC_SUBDIRS = @MCA_pmix_pdl_STATIC_SUBDIRS@
+MCA_pmix_pif_ALL_COMPONENTS = @MCA_pmix_pif_ALL_COMPONENTS@
+MCA_pmix_pif_ALL_SUBDIRS = @MCA_pmix_pif_ALL_SUBDIRS@
+MCA_pmix_pif_DSO_COMPONENTS = @MCA_pmix_pif_DSO_COMPONENTS@
+MCA_pmix_pif_DSO_SUBDIRS = @MCA_pmix_pif_DSO_SUBDIRS@
+MCA_pmix_pif_STATIC_COMPONENTS = @MCA_pmix_pif_STATIC_COMPONENTS@
+MCA_pmix_pif_STATIC_LTLIBS = @MCA_pmix_pif_STATIC_LTLIBS@
+MCA_pmix_pif_STATIC_SUBDIRS = @MCA_pmix_pif_STATIC_SUBDIRS@
+MCA_pmix_pinstalldirs_ALL_COMPONENTS = @MCA_pmix_pinstalldirs_ALL_COMPONENTS@
+MCA_pmix_pinstalldirs_ALL_SUBDIRS = @MCA_pmix_pinstalldirs_ALL_SUBDIRS@
+MCA_pmix_pinstalldirs_DSO_COMPONENTS = @MCA_pmix_pinstalldirs_DSO_COMPONENTS@
+MCA_pmix_pinstalldirs_DSO_SUBDIRS = @MCA_pmix_pinstalldirs_DSO_SUBDIRS@
+MCA_pmix_pinstalldirs_STATIC_COMPONENTS = @MCA_pmix_pinstalldirs_STATIC_COMPONENTS@
+MCA_pmix_pinstalldirs_STATIC_LTLIBS = @MCA_pmix_pinstalldirs_STATIC_LTLIBS@
+MCA_pmix_pinstalldirs_STATIC_SUBDIRS = @MCA_pmix_pinstalldirs_STATIC_SUBDIRS@
+MCA_pmix_pnet_ALL_COMPONENTS = @MCA_pmix_pnet_ALL_COMPONENTS@
+MCA_pmix_pnet_ALL_SUBDIRS = @MCA_pmix_pnet_ALL_SUBDIRS@
+MCA_pmix_pnet_DSO_COMPONENTS = @MCA_pmix_pnet_DSO_COMPONENTS@
+MCA_pmix_pnet_DSO_SUBDIRS = @MCA_pmix_pnet_DSO_SUBDIRS@
+MCA_pmix_pnet_STATIC_COMPONENTS = @MCA_pmix_pnet_STATIC_COMPONENTS@
+MCA_pmix_pnet_STATIC_LTLIBS = @MCA_pmix_pnet_STATIC_LTLIBS@
+MCA_pmix_pnet_STATIC_SUBDIRS = @MCA_pmix_pnet_STATIC_SUBDIRS@
+MCA_pmix_psec_ALL_COMPONENTS = @MCA_pmix_psec_ALL_COMPONENTS@
+MCA_pmix_psec_ALL_SUBDIRS = @MCA_pmix_psec_ALL_SUBDIRS@
+MCA_pmix_psec_DSO_COMPONENTS = @MCA_pmix_psec_DSO_COMPONENTS@
+MCA_pmix_psec_DSO_SUBDIRS = @MCA_pmix_psec_DSO_SUBDIRS@
+MCA_pmix_psec_STATIC_COMPONENTS = @MCA_pmix_psec_STATIC_COMPONENTS@
+MCA_pmix_psec_STATIC_LTLIBS = @MCA_pmix_psec_STATIC_LTLIBS@
+MCA_pmix_psec_STATIC_SUBDIRS = @MCA_pmix_psec_STATIC_SUBDIRS@
+MCA_pmix_psensor_ALL_COMPONENTS = @MCA_pmix_psensor_ALL_COMPONENTS@
+MCA_pmix_psensor_ALL_SUBDIRS = @MCA_pmix_psensor_ALL_SUBDIRS@
+MCA_pmix_psensor_DSO_COMPONENTS = @MCA_pmix_psensor_DSO_COMPONENTS@
+MCA_pmix_psensor_DSO_SUBDIRS = @MCA_pmix_psensor_DSO_SUBDIRS@
+MCA_pmix_psensor_STATIC_COMPONENTS = @MCA_pmix_psensor_STATIC_COMPONENTS@
+MCA_pmix_psensor_STATIC_LTLIBS = @MCA_pmix_psensor_STATIC_LTLIBS@
+MCA_pmix_psensor_STATIC_SUBDIRS = @MCA_pmix_psensor_STATIC_SUBDIRS@
+MCA_pmix_ptl_ALL_COMPONENTS = @MCA_pmix_ptl_ALL_COMPONENTS@
+MCA_pmix_ptl_ALL_SUBDIRS = @MCA_pmix_ptl_ALL_SUBDIRS@
+MCA_pmix_ptl_DSO_COMPONENTS = @MCA_pmix_ptl_DSO_COMPONENTS@
+MCA_pmix_ptl_DSO_SUBDIRS = @MCA_pmix_ptl_DSO_SUBDIRS@
+MCA_pmix_ptl_STATIC_COMPONENTS = @MCA_pmix_ptl_STATIC_COMPONENTS@
+MCA_pmix_ptl_STATIC_LTLIBS = @MCA_pmix_ptl_STATIC_LTLIBS@
+MCA_pmix_ptl_STATIC_SUBDIRS = @MCA_pmix_ptl_STATIC_SUBDIRS@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PMIX_ASM_GSYM = @PMIX_ASM_GSYM@
+PMIX_ASM_LSYM = @PMIX_ASM_LSYM@
+PMIX_ASM_SUPPORT_64BIT = @PMIX_ASM_SUPPORT_64BIT@
+PMIX_ASM_TEXT = @PMIX_ASM_TEXT@
+PMIX_ASM_TYPE = @PMIX_ASM_TYPE@
+PMIX_ASSEMBLY_ARCH = @PMIX_ASSEMBLY_ARCH@
+PMIX_ASSEMBLY_BUILTIN = @PMIX_ASSEMBLY_BUILTIN@
+PMIX_ASSEMBLY_FORMAT = @PMIX_ASSEMBLY_FORMAT@
+PMIX_AS_GLOBAL = @PMIX_AS_GLOBAL@
+PMIX_AS_LABEL_SUFFIX = @PMIX_AS_LABEL_SUFFIX@
+PMIX_CC_ABSOLUTE = @PMIX_CC_ABSOLUTE@
+PMIX_CONFIGURE_DATE = @PMIX_CONFIGURE_DATE@
+PMIX_CONFIGURE_HOST = @PMIX_CONFIGURE_HOST@
+PMIX_CONFIGURE_USER = @PMIX_CONFIGURE_USER@
+PMIX_EMBEDDED_CPPFLAGS = @PMIX_EMBEDDED_CPPFLAGS@
+PMIX_EMBEDDED_LDFLAGS = @PMIX_EMBEDDED_LDFLAGS@
+PMIX_EMBEDDED_LIBS = @PMIX_EMBEDDED_LIBS@
+PMIX_MAJOR_VERSION = @PMIX_MAJOR_VERSION@
+PMIX_MINOR_VERSION = @PMIX_MINOR_VERSION@
+PMIX_RELEASE_DATE = @PMIX_RELEASE_DATE@
+PMIX_RELEASE_VERSION = @PMIX_RELEASE_VERSION@
+PMIX_RENAME = @PMIX_RENAME@
+PMIX_VERSION = @PMIX_VERSION@
+PMIX_top_builddir = @PMIX_top_builddir@
+PMIX_top_srcdir = @PMIX_top_srcdir@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_prefix_program = @ac_prefix_program@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+libpmix_so_version = @libpmix_so_version@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pmix_have_pandoc = @pmix_have_pandoc@
+pmix_pdl_pdlopen_LIBS = @pmix_pdl_pdlopen_LIBS@
+pmix_pdl_plibltdl_CPPFLAGS = @pmix_pdl_plibltdl_CPPFLAGS@
+pmix_pdl_plibltdl_LDFLAGS = @pmix_pdl_plibltdl_LDFLAGS@
+pmix_pdl_plibltdl_LIBS = @pmix_pdl_plibltdl_LIBS@
+pmixdatadir = @pmixdatadir@
+pmixincludedir = @pmixincludedir@
+pmixlibdir = @pmixlibdir@
+pmixmajor = @pmixmajor@
+pmixminor = @pmixminor@
+pnet_opa_CFLAGS = @pnet_opa_CFLAGS@
+pnet_opa_CPPFLAGS = @pnet_opa_CPPFLAGS@
+pnet_opa_LDFLAGS = @pnet_opa_LDFLAGS@
+pnet_opa_LIBS = @pnet_opa_LIBS@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+psec_munge_CPPFLAGS = @psec_munge_CPPFLAGS@
+psec_munge_LDFLAGS = @psec_munge_LDFLAGS@
+psec_munge_LIBS = @psec_munge_LIBS@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+ at PMIX_EMBEDDED_MODE_FALSE@man_MANS = \
+ at PMIX_EMBEDDED_MODE_FALSE@	man3/pmix_init.3 \
+ at PMIX_EMBEDDED_MODE_FALSE@	man3/pmix_finalize.3 \
+ at PMIX_EMBEDDED_MODE_FALSE@	man3/pmix_initialized.3 \
+ at PMIX_EMBEDDED_MODE_FALSE@	man3/pmix_abort.3 \
+ at PMIX_EMBEDDED_MODE_FALSE@	man3/pmix_put.3 \
+ at PMIX_EMBEDDED_MODE_FALSE@	man3/pmix_commit.3 \
+ at PMIX_EMBEDDED_MODE_FALSE@	man7/pmix.7 \
+ at PMIX_EMBEDDED_MODE_FALSE@	man7/pmix_constants.7
+
+ at PMIX_EMBEDDED_MODE_FALSE@EXTRA_DIST = $(man_MANS)
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign man/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign man/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-man3: $(man_MANS)
+	@$(NORMAL_INSTALL)
+	@list1=''; \
+	list2='$(man_MANS)'; \
+	test -n "$(man3dir)" \
+	  && test -n "`echo $$list1$$list2`" \
+	  || exit 0; \
+	echo " $(MKDIR_P) '$(DESTDIR)$(man3dir)'"; \
+	$(MKDIR_P) "$(DESTDIR)$(man3dir)" || exit 1; \
+	{ for i in $$list1; do echo "$$i"; done;  \
+	if test -n "$$list2"; then \
+	  for i in $$list2; do echo "$$i"; done \
+	    | sed -n '/\.3[a-z]*$$/p'; \
+	fi; \
+	} | while read p; do \
+	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; echo "$$p"; \
+	done | \
+	sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^3][0-9a-z]*$$,3,;x' \
+	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
+	sed 'N;N;s,\n, ,g' | { \
+	list=; while read file base inst; do \
+	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
+	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man3dir)/$$inst'"; \
+	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man3dir)/$$inst" || exit $$?; \
+	  fi; \
+	done; \
+	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
+	while read files; do \
+	  test -z "$$files" || { \
+	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man3dir)'"; \
+	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man3dir)" || exit $$?; }; \
+	done; }
+
+uninstall-man3:
+	@$(NORMAL_UNINSTALL)
+	@list=''; test -n "$(man3dir)" || exit 0; \
+	files=`{ for i in $$list; do echo "$$i"; done; \
+	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+	  sed -n '/\.3[a-z]*$$/p'; \
+	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^3][0-9a-z]*$$,3,;x' \
+	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+	dir='$(DESTDIR)$(man3dir)'; $(am__uninstall_files_from_dir)
+install-man7: $(man_MANS)
+	@$(NORMAL_INSTALL)
+	@list1=''; \
+	list2='$(man_MANS)'; \
+	test -n "$(man7dir)" \
+	  && test -n "`echo $$list1$$list2`" \
+	  || exit 0; \
+	echo " $(MKDIR_P) '$(DESTDIR)$(man7dir)'"; \
+	$(MKDIR_P) "$(DESTDIR)$(man7dir)" || exit 1; \
+	{ for i in $$list1; do echo "$$i"; done;  \
+	if test -n "$$list2"; then \
+	  for i in $$list2; do echo "$$i"; done \
+	    | sed -n '/\.7[a-z]*$$/p'; \
+	fi; \
+	} | while read p; do \
+	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; echo "$$p"; \
+	done | \
+	sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^7][0-9a-z]*$$,7,;x' \
+	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
+	sed 'N;N;s,\n, ,g' | { \
+	list=; while read file base inst; do \
+	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
+	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man7dir)/$$inst'"; \
+	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man7dir)/$$inst" || exit $$?; \
+	  fi; \
+	done; \
+	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
+	while read files; do \
+	  test -z "$$files" || { \
+	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man7dir)'"; \
+	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man7dir)" || exit $$?; }; \
+	done; }
+
+uninstall-man7:
+	@$(NORMAL_UNINSTALL)
+	@list=''; test -n "$(man7dir)" || exit 0; \
+	files=`{ for i in $$list; do echo "$$i"; done; \
+	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+	  sed -n '/\.7[a-z]*$$/p'; \
+	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^7][0-9a-z]*$$,7,;x' \
+	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+	dir='$(DESTDIR)$(man7dir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
+
+cscope cscopelist:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(MANS)
+installdirs:
+	for dir in "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(man7dir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-man
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man: install-man3 install-man7
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-man
+
+uninstall-man: uninstall-man3 uninstall-man7
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool 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-man3 install-man7 install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
+	uninstall-am uninstall-man uninstall-man3 uninstall-man7
+
+.PRECIOUS: Makefile
+
+
+ at PMIX_EMBEDDED_MODE_FALSE@man3/pmix_init.3:
+ at PMIX_EMBEDDED_MODE_FALSE@	$(top_srcdir)/contrib/md2nroff.pl --source=pmix_init.3.md;
+
+ at PMIX_EMBEDDED_MODE_FALSE@man3/pmix_finalize.3:
+ at PMIX_EMBEDDED_MODE_FALSE@	$(top_srcdir)/contrib/md2nroff.pl --source=pmix_finalize.3.md;
+
+ at PMIX_EMBEDDED_MODE_FALSE@man3/pmix_initialized.3:
+ at PMIX_EMBEDDED_MODE_FALSE@	$(top_srcdir)/contrib/md2nroff.pl --source=pmix_initialized.3.md;
+
+ at PMIX_EMBEDDED_MODE_FALSE@man3/pmix_abort.3:
+ at PMIX_EMBEDDED_MODE_FALSE@	$(top_srcdir)/contrib/md2nroff.pl --source=pmix_abort.3.md;
+
+ at PMIX_EMBEDDED_MODE_FALSE@man3/pmix_put.3:
+ at PMIX_EMBEDDED_MODE_FALSE@	$(top_srcdir)/contrib/md2nroff.pl --source=pmix_put.3.md;
+
+ at PMIX_EMBEDDED_MODE_FALSE@man3/pmix_commit.3:
+ at PMIX_EMBEDDED_MODE_FALSE@	$(top_srcdir)/contrib/md2nroff.pl --source=pmix_commit.3.md;
+
+ at PMIX_EMBEDDED_MODE_FALSE@man7/pmix.7:
+ at PMIX_EMBEDDED_MODE_FALSE@	$(top_srcdir)/contrib/md2nroff.pl --source=pmix.7.md;
+
+ at PMIX_EMBEDDED_MODE_FALSE@man7/pmix_constants.7:
+ at PMIX_EMBEDDED_MODE_FALSE@	$(top_srcdir)/contrib/md2nroff.pl --source=pmix_constants.7.md;
+
+# 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/man/README b/man/README
new file mode 100644
index 0000000..73c605c
--- /dev/null
+++ b/man/README
@@ -0,0 +1,186 @@
+This file describes how the developer side of man pages work in PMIx.
+
+The Definitive Source Of Truth man pages are the Markdown man pages in
+this directory (i.e., the files ending in .<digit>.md.  If you want to
+edit man pages, you need to edit the .<digit>.md pages.  Do NOT edit
+the .<digit> nroff man pages directly; these files are automatically
+generated -- you will lose any manual edits the next time those files
+are generated.
+
+The Markdown web pages are rendered in two different ways:
+
+1. Nroff man pages.  These man pages are put into the `master` branch
+   and later included in PMIx distribution tarballs.
+
+2. HTML.  The http://open-mpi.github.io/pmix/ web site (which is
+   served by the Github web servers) automatically renders the content
+   of the `gh-pages` branch of the PMIx repo.
+
+Markdown syntax
+===============
+
+The definitive man pages are the Markdown man pages.  To edit them,
+you need to understand the syntax used in these files.
+
+The canonical reference for Markdown is here:
+
+    http://daringfireball.net/projects/markdown/syntax
+
+Note, however, that the PMIx Markdown man pages are served via
+the Github Pages web servers, which use a system called Jekyll to
+render the Markdown into HTML (https://github.com/jekyll/jekyll).
+As such, there are a few Jekyll annotations in the PMIx Markdown
+pages (so that they can be served up properly from Github's web
+servers).
+
+If you're familiar with Markdown, you should be ok.  But there are a
+small number differences and quirks with which you should be familiar:
+
+1. The first few lines of each file are a YAML header and include
+   directive for Jekyll.  DO NOT REMOVE THIS HEADER (or the file will
+   not render to HTML properly when served up from Github's web
+   servers).  Here's a sample YAML header from pmix.7.md:
+
+---
+layout: page
+title: PMIx(7)
+tagline: PMIx Programmer's Manual
+---
+{% include JB/setup %}
+
+   The whole block is needed, and it must be the first input in the
+   file.
+
+2. In Github-flavored Markdown, you may be used to using "fenced
+   blocks" for multi-line code blocks, like this:
+
+```c
+void my_c_code(void) {
+  int i;
+  /* Hello, world */
+}
+```
+
+   Such fenced blocks will not work in Jekyll.  Instead, you must
+   delineate your code blocks with Jekyll delimiters:
+
+{% highlight c %}
+void my_c_code(void) {
+  int i;
+  /* Hello, world */
+}
+{% endhighlight %}
+
+   This will result in a pretty code box in the rendered HTML output,
+   and it will be syntax highlighted for the C language.  Leave the
+   "c" out of the first directive if your multi-line block is not C
+   code, and then it won't do C syntax highlighting.
+
+3. The PMIx man pages are full of 2-level lists of things.  E.g.,
+   lists of functions, and then in some of the functions, there is a
+   sub-list of flags that can be used with that function.
+
+   The convention used in the PMIx man pages is to highlight a
+   word/phrase representing each list item.  Then use a ":" to start
+   the next line that describes that item.  For example:
+
+*PMIX_FLOAT*
+: A single-precision floating point value (IEEE 754).
+
+   This will make the token "PMIX_FLOAT" be highlighted in both
+   HTML and nroff output, and then the paragraph that comes after it
+   will be properly delimited and indented.
+
+   To make a sub-list inside an item, use the same format, but prefix
+   the sub-list items with "-", like this:
+
+*scope*
+: Flag that controls the visible scope of the data.
+
+- *PMIX_GLOBAL*
+: Indicates that the data is to be visible to all applications executed
+  by this user.
+
+4. There may be a small number of places in the PMIx man pages where
+   there are unnumbered lists with deliberate line breaks.  For
+   example:
+
+foo / bar
+baz / goo
+: Something really intelligent
+
+   Note the first line is "foo / bar", and then there is
+   a deliberate line break, and then the second line is "baz / goo".
+
+   To effect the deliberate line break, you have to put two blank
+   spaces after "bar".  To show that graphically (showing "_"
+   for " "):
+
+foo / bar__
+baz / goo
+: Something really intelligent
+
+5. The "SEE ALSO" items at the end of each man page are linked to
+   their corresponding man pages.  Note that the links are made to
+   ".html" files -- *not* ".md" files.  If you care, the reason is
+   because the Github web servers statically generate .html files from
+   the .md files when you git push to the gh-pages branch.  Hence, the
+   man pages are actually served from static .html files on the Github
+   web servers.
+
+   Also, since links are meaningless in nroff, they are effectively
+   ignored in the resulting nroff output.
+
+Workflow
+========
+
+The workflow is like this:
+
+1. Developer edits .<digit>.md files for new changes.
+
+2. In a perfect world, the developer makes perfect edits and pushes
+   the changes up to `master`.  An automated cron job will eventually
+   notice the new pages, and do two things:
+
+   2a. Copy the modified Markdown pages to the `gh-master` branch (so
+       that they go live on the web site).
+
+   2b. Re-generate any relevant nroff man pages in `master`.
+
+   The automated cron job actually does exist and does these things,
+   but it should only be relied upon once a developer is sure that
+   their changes to the Markdown man pages are correct.
+
+3. To check that the changes will render properly, developers should
+   do two things:
+
+   3a. Run "make nroff".  This will convert all the Markdown man pages
+       into nroff man pages (in the man/ directory).  Check to ensure
+       that your changes look appropriate in the rendered nroff
+       output.
+
+       *CAUTION* The "pandoc" utility is used to generate the nroff
+       files from the Markdown source.  Different versions of pandoc
+       will generate slightly different nroff output.  Meaning: when
+       you run "make nroff", you might end up changing every nroff man
+       page, simply because your version of pandoc is different than
+       the last person who ran it.  Please only check in your changes,
+       if possible.
+
+   3b. Check out the `gh-pages` branch from PMIx and copy any
+       modified Markdown pages into the "master/man" directory (i.e.,
+       the directory for man pages from the master development
+       branch).
+
+       Then run the "jekyll serve" command from the top-level
+       directory in `gh-pages`.  This runs a local web server on your
+       computer and renders the Markdown files into HTML such that you
+       can point a browser to http://127.0.0.1:4000 and see the web
+       site.
+
+       If you make any changes to files in the tree where "jekyll" is
+       running, Jekyll will notice the changes and automatically
+       re-generate the relevant HTML.  Meaning: you can just refresh
+       the page from http://127.0.0.1:4000 in your browser and you'll
+       see your changes -- there's no need to restart Jekyll to force
+       it to notice new changes.
diff --git a/man/man3/pmix_abort.3 b/man/man3/pmix_abort.3
new file mode 100644
index 0000000..ea0690a
--- /dev/null
+++ b/man/man3/pmix_abort.3
@@ -0,0 +1,62 @@
+.TH "pmix_abort" "3" "2016\-03\-01" "PMIx Programmer\[aq]s Manual" "\@VERSION\@"
+.SH NAME
+.PP
+PMIx_Abort \- Abort the specified processes
+.SH SYNOPSIS
+.IP
+.nf
+\f[C]
+#include\ <pmix.h>
+
+pmix\\_status\\_t\ PMIx\\_Abort(int\ status,\ const\ char\ msg[],
+\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ pmix\\_proc\\_t\ procs[],\ size_t\ nprocs);
+\f[]
+.fi
+.SH ARGUMENTS
+.PP
+\f[I]status\f[] : Status value to be returned.
+A value of zero is permitted by PMIx, but may not be returned by some
+resource managers.
+.PP
+\f[I]msg\f[] : A string message to be displayed
+.PP
+\f[I]procs\f[] : An array of pmix_proc_t structures defining the
+processes to be aborted.
+A \f[I]NULL\f[] for the proc array indicates that all processes in the
+caller\[aq]s nspace are to be aborted.
+A wildcard value for the rank in any structure indicates that all
+processes in that nspace are to be aborted.
+.PP
+\f[I]nprocs\f[] : Number of pmix_proc_t structures in the \f[I]procs\f[]
+array
+.SH DESCRIPTION
+.PP
+Request that the provided array of procs be aborted, returning the
+provided \f[I]status\f[] and printing the provided message.
+A \f[I]NULL\f[] for the proc array indicates that all processes in the
+caller\[aq]s nspace are to be aborted.
+.PP
+The response to this request is somewhat dependent on the specific
+resource manager and its configuration (e.g., some resource managers
+will not abort the application if the provided \f[I]status\f[] is zero
+unless specifically configured to do so), and thus lies outside the
+control of PMIx itself.
+However, the client will inform the RM of the request that the
+application be aborted, regardless of the value of the provided
+\f[I]status\f[].
+.PP
+Passing a \f[I]NULL\f[] msg parameter is allowed.
+Note that race conditions caused by multiple processes calling
+PMIx_Abort are left to the server implementation to resolve with regard
+to which status is returned and what messages (if any) are printed.
+.SH RETURN VALUE
+.PP
+Returns PMIX_SUCCESS on success.
+On error, a negative value corresponding to a PMIx errno is returned.
+.SH ERRORS
+.PP
+PMIx errno values are defined in \f[C]pmix_common.h\f[].
+.SH NOTES
+.SH SEE ALSO
+.SH AUTHORS
+PMIx.
diff --git a/man/man3/pmix_commit.3 b/man/man3/pmix_commit.3
new file mode 100644
index 0000000..31dd4fc
--- /dev/null
+++ b/man/man3/pmix_commit.3
@@ -0,0 +1,35 @@
+.TH "pmix_commit" "3" "2016\-03\-01" "PMIx Programmer\[aq]s Manual" "\@VERSION\@"
+.SH NAME
+.PP
+PMIx_Commit \- Push all previously \f[I]PMIx_Put\f[] values to the local
+PMIx server.
+.SH SYNOPSIS
+.IP
+.nf
+\f[C]
+#include\ <pmix.h>
+
+pmix\\_status\\_t\ PMIx_Commit(void);
+\f[]
+.fi
+.SH ARGUMENTS
+.PP
+\f[I]none\f[]
+.SH DESCRIPTION
+.PP
+This is an asynchronous operation \- the library will immediately return
+to the caller while the data is transmitted to the local server in the
+background
+.SH RETURN VALUE
+.PP
+Returns PMIX_SUCCESS on success.
+On error, a negative value corresponding to a PMIx errno is returned.
+.SH ERRORS
+.PP
+PMIx errno values are defined in \f[C]pmix_common.h\f[].
+.SH NOTES
+.SH SEE ALSO
+.PP
+\f[C]PMIx_Put\f[](3)
+.SH AUTHORS
+PMIx.
diff --git a/man/man3/pmix_finalize.3 b/man/man3/pmix_finalize.3
new file mode 100644
index 0000000..6b15282
--- /dev/null
+++ b/man/man3/pmix_finalize.3
@@ -0,0 +1,45 @@
+.TH "pmix_finalize" "3" "2016\-03\-01" "PMIx Programmer\[aq]s Manual" "\@VERSION\@"
+.SH NAME
+.PP
+PMIx_Finalize \- Finalize the PMIx Client
+.SH SYNOPSIS
+.IP
+.nf
+\f[C]
+#include\ <pmix.h>
+
+pmix\\_status\\_t\ PMIx\\_Finalize(const\ pmix\\_info\\_t\ info[],\ size_t\ ninfo);
+\f[]
+.fi
+.SH ARGUMENTS
+.PP
+\f[I]info\f[] : An optional array of pmix_info_t structures
+.PP
+\f[I]ninfo\f[] : Number of pmix_info_t structures in the pmix_info_t
+array
+.SH DESCRIPTION
+.PP
+Finalize the PMIx client, closing the connection with the local PMIx
+server and releasing all malloc\[aq]d memory.
+.PP
+The info array is used to pass user requests regarding the fence
+operation.
+This can include:
+.IP "(a)" 4
+PMIX_EMBED_BARRIER \- By default, \f[I]PMIx_Finalize\f[] does not
+include an internal barrier operation.
+This attribute directs \f[I]PMIx_Finalize\f[] to execute a barrier as
+part of the finalize operation.
+.SH RETURN VALUE
+.PP
+Returns PMIX_SUCCESS on success.
+On error, a negative value corresponding to a PMIx errno is returned.
+.SH ERRORS
+.PP
+PMIx errno values are defined in \f[C]pmix_common.h\f[].
+.SH NOTES
+.SH SEE ALSO
+.PP
+\f[C]PMIx_Init\f[](3)
+.SH AUTHORS
+PMIx.
diff --git a/man/man3/pmix_init.3 b/man/man3/pmix_init.3
new file mode 100644
index 0000000..b988200
--- /dev/null
+++ b/man/man3/pmix_init.3
@@ -0,0 +1,52 @@
+.TH "pmix_init" "3" "2016\-03\-01" "PMIx Programmer\[aq]s Manual" "\@VERSION\@"
+.SH NAME
+.PP
+PMIx_Init \- Initialize the PMIx Client
+.SH SYNOPSIS
+.IP
+.nf
+\f[C]
+#include\ <pmix.h>
+
+pmix\\_status\\_t\ PMIx_Init(pmix\\_proc\\_t\ *proc);
+\f[]
+.fi
+.SH ARGUMENTS
+.PP
+\f[I]proc\f[] : Pointer to a pmix_proc_t object in which the
+client\[aq]s namespace and rank are to be returned.
+.SH DESCRIPTION
+.PP
+Initialize the PMIx client, returning the process identifier assigned to
+this client\[aq]s application in the provided pmix_proc_t struct.
+Passing a value of \f[I]NULL\f[] for this parameter is allowed if the
+user wishes solely to initialize the PMIx system and does not require
+return of the identifier at that time.
+.PP
+When called, the PMIx client will check for the required connection
+information of the local PMIx server and will establish the connection.
+If the information is not found, or the server connection fails, then an
+appropriate error constant will be returned.
+.PP
+If successful, the function will return PMIX_SUCCESS and will fill the
+provided structure with the server\-assigned namespace and rank of the
+process within the application.
+In addition, all startup information provided by the resource manager
+will be made available to the client process via subsequent calls to
+\f[I]PMIx_Get\f[].
+.PP
+Note that the PMIx client library is referenced counted, and so multiple
+calls to PMIx_Init are allowed.
+Thus, one way to obtain the namespace and rank of the process is to
+simply call PMIx_Init with a non\-NULL parameter.
+.SH RETURN VALUE
+.PP
+Returns PMIX_SUCCESS on success.
+On error, a negative value corresponding to a PMIx errno is returned.
+.SH ERRORS
+.PP
+PMIx errno values are defined in \f[C]pmix_common.h\f[].
+.SH NOTES
+.SH SEE ALSO
+.SH AUTHORS
+PMIx.
diff --git a/man/man3/pmix_initialized.3 b/man/man3/pmix_initialized.3
new file mode 100644
index 0000000..6e2170f
--- /dev/null
+++ b/man/man3/pmix_initialized.3
@@ -0,0 +1,30 @@
+.TH "pmix_initialized" "3" "2016\-03\-01" "PMIx Programmer\[aq]s Manual" "\@VERSION\@"
+.SH NAME
+.PP
+PMIx_Initialized \- Check if \f[I]PMIx_Init\f[] has been called
+.SH SYNOPSIS
+.IP
+.nf
+\f[C]
+#include\ <pmix.h>
+
+int\ PMIx_Initialized(void);
+\f[]
+.fi
+.SH ARGUMENTS
+.PP
+\f[I]none\f[]
+.SH DESCRIPTION
+.PP
+Check to see if the PMIx Client library has been intialized
+.SH RETURN VALUE
+.PP
+Returns \f[I]true\f[] if the PMIx Client has been initialized, and
+\f[I]false\f[] if not.
+.SH ERRORS
+.SH NOTES
+.SH SEE ALSO
+.PP
+\f[C]PMIx_Init\f[](3)
+.SH AUTHORS
+PMIx.
diff --git a/man/man3/pmix_put.3 b/man/man3/pmix_put.3
new file mode 100644
index 0000000..e960583
--- /dev/null
+++ b/man/man3/pmix_put.3
@@ -0,0 +1,60 @@
+.TH "pmix_put" "3" "2016\-03\-01" "PMIx Programmer\[aq]s Manual" "\@VERSION\@"
+.SH NAME
+.PP
+PMIx_Put \- Push a value into the client\[aq]s namespace
+.SH SYNOPSIS
+.IP
+.nf
+\f[C]
+#include\ <pmix.h>
+
+pmix\\_status\\_t\ PMIx\\_Init(pmix\\_scope\\_t\ scope,\ const\ char\ key[],\ pmix\\_value\\_t\ *val);
+\f[]
+.fi
+.SH ARGUMENTS
+.PP
+\f[I]scope\f[] : Defines a scope for data "put" by PMI per the
+following:
+.IP "(a)" 4
+PMI_LOCAL \- the data is intended only for other application processes
+on the same node.
+Data marked in this way will not be included in data packages sent to
+remote requestors
+.IP "(b)" 4
+PMI_REMOTE \- the data is intended solely for application processes on
+remote nodes.
+Data marked in this way will not be shared with other processes on the
+same node
+.IP "(c)" 4
+PMI_GLOBAL \- the data is to be shared with all other requesting
+processes, regardless of location
+.PP
+\f[I]key\f[] : String key identifying the information.
+This can be either one of the PMIx defined attributes, or a
+user\-defined value
+.PP
+\f[I]val\f[] : Pointer to a pmix_value_t structure containing the data
+to be pushed along with the type of the provided data.
+.SH DESCRIPTION
+.PP
+Push a value into the client\[aq]s namespace.
+The client library will cache the information locally until
+\f[I]PMIx_Commit\f[] is called.
+The provided scope value is passed to the local PMIx server, which will
+distribute the data as directed.
+.SH RETURN VALUE
+.PP
+Returns PMIX_SUCCESS on success.
+On error, a negative value corresponding to a PMIx errno is returned.
+.SH ERRORS
+.PP
+PMIx errno values are defined in \f[C]pmix_common.h\f[].
+.SH NOTES
+.PP
+See \[aq]pmix_common.h\[aq] for definition of the pmix_value_t
+structure.
+.SH SEE ALSO
+.PP
+\f[C]PMIx_Constants\f[](7), \f[C]PMIx_Structures\f[](7)
+.SH AUTHORS
+PMIx.
diff --git a/man/man7/pmix.7 b/man/man7/pmix.7
new file mode 100644
index 0000000..d2e545a
--- /dev/null
+++ b/man/man7/pmix.7
@@ -0,0 +1,35 @@
+.TH "pmix" "7" "2015\-10\-29" "PMIx Programmer\[aq]s Manual" "\@VERSION\@"
+.SH NAME
+.PP
+Process Management Interface \- Exascale
+.SH SYNOPSIS
+.IP
+.nf
+\f[C]
+#include\ <pmix.h>
+\f[]
+.fi
+.SH OVERVIEW
+.PP
+The Process Management Interface (PMI) has been used for quite some time
+as a means of exchanging wireup information needed for interprocess
+communication.
+Two versions (PMI\-1 and PMI\-2) have been released as part of the MPICH
+effort.
+While PMI\-2 demonstrates better scaling properties than its PMI\-1
+predecessor, attaining rapid launch and wireup of the roughly 1M
+processes executing across 100k nodes expected for exascale operations
+remains challenging.
+.PP
+PMI Exascale (PMIx) represents an attempt to resolve these questions by
+providing an extended version of the PMI standard specifically designed
+to support clusters up to and including exascale sizes.
+The overall objective of the project is not to branch the existing
+pseudo\-standard definitions \- in fact, PMIx fully supports both of the
+existing PMI\-1 and PMI\-2 APIs \- but rather to (a) augment and extend
+those APIs to eliminate some current restrictions that impact
+scalability, and (b) provide a reference implementation of the
+PMI\-server that demonstrates the desired level of scalability.
+.SH SEE ALSO
+.SH AUTHORS
+PMIx.
diff --git a/man/man7/pmix_constants.7 b/man/man7/pmix_constants.7
new file mode 100644
index 0000000..bd6414c
--- /dev/null
+++ b/man/man7/pmix_constants.7
@@ -0,0 +1,79 @@
+.TH "pmix_constants" "7" "2016\-03\-01" "PMIx Programmer\[aq]s Manual" "\@VERSION\@"
+.SH NAME
+.PP
+PMIx Constants
+.SH SYNOPSIS
+.IP
+.nf
+\f[C]
+#include\ <pmix_common.h>
+\f[]
+.fi
+.SH OVERVIEW
+.PP
+PMIx relies on the following types of constants:
+.PP
+\f[I]Maximum Sizes\f[] : In order to minimize malloc performance
+penalties, PMIx utilizes constant\-sized arrays wherever possible.
+These constants provide the user with the maximum size of the various
+array types.
+.PP
+\f[I]Attributes\f[] : .
+.PP
+\f[I]Errors\f[] : PMIx uses negative error constants, with 0 indicating
+"success".
+.SH MAXIMUM SIZES
+.PP
+The .
+.PP
+\f[I]PMIX_MAX_NSLEN\f[] : The maximum length of a namespace.
+Note that any declaration of an array to hold a key string must include
+one extra space for the terminating \f[I]NULL\f[].
+.PP
+\f[I]PMIX_MAX_KEYLEN\f[] : Maximum length of the key string used in
+structures such as the \f[I]pmix\f[]info_t_.
+Note that any declaration of an array to hold a key string must include
+one extra space for the terminating \f[I]NULL\f[].
+.SH ATTRIBUTES
+.PP
+Define a set of "standard" PMIx attributes that can be queried using the
+PMIx_Get function.
+Implementations (and users) are free to extend as desired \- thus,
+functions calling PMIx_Get must be capable of handling the "not found"
+condition.
+Note that these are attributes of the system and the job as opposed to
+values the application (or underlying programming library) might choose
+to expose \- i.e., they are values provided by the resource manager as
+opposed to the application.
+Thus, these keys are RESERVED for use by PMIx, and users should avoid
+defining any attribute starting with the keyword \f[I]PMIX\f[].
+.PP
+A list of the current PMIx attributes, and the type of their associated
+data value, is provided here.
+.PP
+\f[I]PMIX_ATTR_UNDEF (NULL)\f[] : Used to initialize an attribute field,
+indicating that the attribute has not yet been assigned.
+.PP
+\f[I]PMIX_USERID (uint32_t)\f[] : .
+.PP
+\f[I]PMIX_GRPID (uint32_t)\f[] : An access domain represents a single
+logical connection into a fabric.
+It may map to a single physical or virtual NIC or a port.
+An access domain defines the boundary across which fabric resources may
+be associated.
+Each access domain belongs to a single fabric domain.
+.PP
+\f[I]PMIX_CPUSET (char*)\f[] : .
+.SH ERROR CONSTANTS
+.PP
+\&.
+.PP
+\f[I]PMIX_SUCCESS\f[] : Indicates that the operation was successful.
+.PP
+\f[I]PMIX_ERROR\f[] : A general error code \- an error occurred, but no
+specific reason can be provided.
+.SH SEE ALSO
+.PP
+\f[C]pmix\f[](7)
+.SH AUTHORS
+PMIx.
diff --git a/src/Makefile.am b/src/Makefile.am
new file mode 100644
index 0000000..0810c66
--- /dev/null
+++ b/src/Makefile.am
@@ -0,0 +1,95 @@
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2006-2016 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2012-2013 Los Alamos National Security, Inc.  All rights reserved.
+# Copyright (c) 2013-2017 Intel, Inc. All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# Note that the -I directory must *exactly* match what was specified
+# via AC_CONFIG_MACRO_DIR in configure.ac.
+ACLOCAL_AMFLAGS = -I ./config
+
+SUBDIRS = \
+	util/keyval \
+    mca/base \
+    $(MCA_pmix_FRAMEWORKS_SUBDIRS) \
+    $(MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS) \
+    . \
+    $(MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS)
+
+DIST_SUBDIRS = \
+	util/keyval \
+    mca/base \
+    $(MCA_pmix_FRAMEWORKS_SUBDIRS) \
+    $(MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS)
+
+headers =
+sources =
+nodist_headers =
+EXTRA_DIST =
+dist_pmixdata_DATA =
+
+libpmix_la_LIBADD = \
+	mca/base/libpmix_mca_base.la \
+	$(MCA_pmix_FRAMEWORK_LIBS)
+libpmix_la_DEPENDENCIES = $(libpmix_la_LIBADD)
+
+if PMIX_EMBEDDED_MODE
+
+if WANT_INSTALL_HEADERS
+
+lib_LTLIBRARIES = libpmix.la
+libpmix_la_SOURCES = $(headers) $(sources)
+libpmix_la_LDFLAGS = -version-info $(libpmix_so_version)
+
+else
+
+noinst_LTLIBRARIES = libpmix.la
+libpmix_la_SOURCES = $(headers) $(sources)
+libpmix_la_LDFLAGS =
+
+endif
+
+else
+
+lib_LTLIBRARIES = libpmix.la
+libpmix_la_SOURCES = $(headers) $(sources)
+libpmix_la_LDFLAGS = -version-info $(libpmix_so_version)
+
+endif !PMIX_EMBEDDED_MODE
+
+include atomics/sys/Makefile.include
+include threads/Makefile.include
+include class/Makefile.include
+include event/Makefile.include
+include include/Makefile.include
+include mca/Makefile.include
+include util/Makefile.include
+include client/Makefile.include
+include server/Makefile.include
+include runtime/Makefile.include
+include tool/Makefile.include
+include common/Makefile.include
+include buffer_ops/Makefile.am
+if WANT_DSTORE
+include sm/Makefile.include
+include dstore/Makefile.include
+endif
+
+MAINTAINERCLEANFILES = Makefile.in config.h config.h.in
+DISTCLEANFILES = Makefile
+CLEANFILES = core.* *~
diff --git a/src/Makefile.in b/src/Makefile.in
new file mode 100644
index 0000000..b91d9d3
--- /dev/null
+++ b/src/Makefile.in
@@ -0,0 +1,2088 @@
+# Makefile.in generated by automake 1.15 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2006-2016 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2012-2013 Los Alamos National Security, Inc.  All rights reserved.
+# Copyright (c) 2013-2017 Intel, Inc. All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2010      Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2011      Sandia National Laboratories. All rights reserved.
+# Copyright (c) 2016      Los A.includeos National Security, LLC. All rights
+#                         reserved.
+# Copyright (c) 2017      Research Organization for Information Science
+#                         and Technology (RIST). All rights reserved.
+# Copyright (c) 2017      Intel, Inc. All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# This makefile.include does not stand on its own - it is included from src/Makefile.am
+
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2017      Research Organization for Information Science
+#                         and Technology (RIST). All rights reserved.
+# Copyright (c) 2017      Intel, Inc. All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# This makefile.am does not stand on its own - it is included from pmix/include/Makefile.am
+
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2008 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2017      Intel, Inc. All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# This makefile.am does not stand on its own - it is included from src/atomics/sys/include/Makefile.include
+
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2008 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2017      Intel, Inc. All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# This makefile.am does not stand on its own - it is included from pmix/include/Makefile.am
+
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2017      Intel, Inc. All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# This makefile.am does not stand on its own - it is included from pmix/include/Makefile.am
+
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2017      Intel, Inc. All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# This makefile.am does not stand on its own - it is included from pmix/include/Makefile.am
+
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2008 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2017      Intel, Inc. All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# This makefile.am does not stand on its own - it is included from pmix/include/Makefile.am
+
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2017      Intel, Inc. All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# This makefile.am does not stand on its own - it is included from pmix/include/Makefile.am
+
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2017      Intel, Inc. All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# This makefile.am does not stand on its own - it is included from pmix/include/Makefile.am
+
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2011      Sandia National Laboratories. All rights reserved.
+# Copyright (c) 2017      Intel, Inc. All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# This makefile.am does not stand on its own - it is included from pmix/include/Makefile.am
+
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2011      Sandia National Laboratories. All rights reserved.
+# Copyright (c) 2016      Los Alamos National Security, LLC. All rights
+#                         reserved.
+# Copyright (c) 2017      Intel, Inc. All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# This makefile.am does not stand on its own - it is included from pmix/include/Makefile.am
+
+# -*- makefile -*-
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2016 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2014 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2015      Research Organization for Information Science
+#                         and Technology (RIST). All rights reserved.
+# Copyright (c) 2017      Intel, Inc. All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# This makefile.am does not stand on its own - it is included from pmix/Makefile.am
+
+# -*- makefile -*-
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2007 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2013-2016 Intel, Inc. All rights reserved
+# Copyright (c) 2016      Cisco Systems, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# This makefile.am does not stand on its own - it is included from
+# Makefile.am
+
+# -*- makefile -*-
+#
+# Copyright (c) 2016      Intel, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+
+# -*- makefile -*-
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2013-2016 Intel, Inc. All rights reserved
+# Copyright (c) 2007-2016 Cisco Systems, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# This makefile.am does not stand on its own - it is included from
+# Makefile.am
+
+# -*- makefile -*-
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2016      Intel, Inc. All rights reserved.
+# Copyright (c) 2016 Cisco Systems, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# This makefile.am does not stand on its own - it is included from src/Makefile.am
+
+# -*- makefile -*-
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2007-2016 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2013      NVIDIA Corporation.  All rights reserved.
+# Copyright (c) 2013-2016 Intel, Inc. All rights reserved
+# Copyright (c) 2016      Research Organization for Information Science
+#                         and Technology (RIST). All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# -*- makefile -*-
+#
+# Copyright (c) 2014-2017 Intel, Inc. All rights reserved.
+# Copyright (c) 2014      Artem Y. Polyakov <artpol84 at gmail.com>.
+#                         All rights reserved.
+# Copyright (c) 2016 Cisco Systems, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# -*- makefile -*-
+#
+# Copyright (c) 2014-2016 Intel, Inc.  All rights reserved.
+# Copyright (c) 2014      Artem Y. Polyakov <artpol84 at gmail.com>.
+#                         All rights reserved.
+# Copyright (c) 2016      Cisco Systems, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# -*- makefile -*-
+#
+# Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2012      Los Alamos National Security, LLC.
+#                         All rights reserved.
+# Copyright (c) 2014-2016 Intel, Inc. All rights reserved
+# Copyright (c) 2014      Cisco Systems, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# This makefile.am does not stand on its own - it is included from src/Makefile.am
+
+#
+# Copyright (c) 2014-2016 Intel, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# -*- makefile -*-
+#
+# Copyright (c) 2015-2017 Intel, Inc. All rights reserved.
+# Copyright (c) 2016 Cisco Systems, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# -*- makefile -*-
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2012      Los Alamos National Security, Inc.  All rights reserved.
+# Copyright (c) 2013-2016 Intel, Inc. All rights reserved
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# This makefile.am does not stand on its own - it is included from
+# src/Makefile.am
+
+#
+# Copyright (c) 2016      Mellanox Technologies, Inc.
+#                         All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# Copyright (c) 2015-2016 Mellanox Technologies, Inc.
+#                         All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+ at PMIX_EMBEDDED_MODE_FALSE@am__append_1 = \
+ at PMIX_EMBEDDED_MODE_FALSE@        include/align.h \
+ at PMIX_EMBEDDED_MODE_FALSE@        include/hash_string.h \
+ at PMIX_EMBEDDED_MODE_FALSE@        include/pmix_socket_errno.h \
+ at PMIX_EMBEDDED_MODE_FALSE@        include/pmix_stdint.h \
+ at PMIX_EMBEDDED_MODE_FALSE@        include/prefetch.h \
+ at PMIX_EMBEDDED_MODE_FALSE@        include/types.h \
+ at PMIX_EMBEDDED_MODE_FALSE@        include/pmix_config_top.h \
+ at PMIX_EMBEDDED_MODE_FALSE@        include/pmix_config_bottom.h \
+ at PMIX_EMBEDDED_MODE_FALSE@	include/pmix_jobdata.h
+
+ at WANT_INSTALL_HEADERS_TRUE@am__append_2 = \
+ at WANT_INSTALL_HEADERS_TRUE@    include/pmix_config.h
+
+ at WANT_PMI_BACKWARD_TRUE@am__append_3 = \
+ at WANT_PMI_BACKWARD_TRUE@        client/pmi1.c \
+ at WANT_PMI_BACKWARD_TRUE@        client/pmi2.c
+
+ at WANT_DSTORE_TRUE@am__append_4 = sm/pmix_sm.h sm/pmix_mmap.h \
+ at WANT_DSTORE_TRUE@	dstore/pmix_dstore.h dstore/pmix_esh.h
+ at WANT_DSTORE_TRUE@am__append_5 = sm/pmix_sm.c sm/pmix_mmap.c \
+ at WANT_DSTORE_TRUE@	dstore/pmix_dstore.c dstore/pmix_esh.c
+subdir = src
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/config/c_get_alignment.m4 \
+	$(top_srcdir)/config/libtool.m4 \
+	$(top_srcdir)/config/ltoptions.m4 \
+	$(top_srcdir)/config/ltsugar.m4 \
+	$(top_srcdir)/config/ltversion.m4 \
+	$(top_srcdir)/config/lt~obsolete.m4 \
+	$(top_srcdir)/config/pmix.m4 \
+	$(top_srcdir)/config/pmix_check_attributes.m4 \
+	$(top_srcdir)/config/pmix_check_broken_qsort.m4 \
+	$(top_srcdir)/config/pmix_check_compiler_version.m4 \
+	$(top_srcdir)/config/pmix_check_icc.m4 \
+	$(top_srcdir)/config/pmix_check_ident.m4 \
+	$(top_srcdir)/config/pmix_check_lock.m4 \
+	$(top_srcdir)/config/pmix_check_os_flavors.m4 \
+	$(top_srcdir)/config/pmix_check_package.m4 \
+	$(top_srcdir)/config/pmix_check_psm2.m4 \
+	$(top_srcdir)/config/pmix_check_pthread_pids.m4 \
+	$(top_srcdir)/config/pmix_check_vendor.m4 \
+	$(top_srcdir)/config/pmix_check_visibility.m4 \
+	$(top_srcdir)/config/pmix_check_withdir.m4 \
+	$(top_srcdir)/config/pmix_config_asm.m4 \
+	$(top_srcdir)/config/pmix_config_pthreads.m4 \
+	$(top_srcdir)/config/pmix_config_subdir.m4 \
+	$(top_srcdir)/config/pmix_config_subdir_args.m4 \
+	$(top_srcdir)/config/pmix_config_threads.m4 \
+	$(top_srcdir)/config/pmix_ensure_contains_optflags.m4 \
+	$(top_srcdir)/config/pmix_functions.m4 \
+	$(top_srcdir)/config/pmix_load_platform.m4 \
+	$(top_srcdir)/config/pmix_mca.m4 \
+	$(top_srcdir)/config/pmix_search_libs.m4 \
+	$(top_srcdir)/config/pmix_setup_cc.m4 \
+	$(top_srcdir)/config/pmix_setup_libevent.m4 \
+	$(top_srcdir)/config/pmix_setup_zlib.m4 \
+	$(top_srcdir)/config/pmix_try_assemble.m4 \
+	$(top_srcdir)/config/autogen_found_items.m4 \
+	$(top_srcdir)/src/mca/pdl/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/configure.m4 \
+	$(top_srcdir)/src/mca/pdl/pdlopen/configure.m4 \
+	$(top_srcdir)/src/mca/pdl/plibltdl/configure.m4 \
+	$(top_srcdir)/src/mca/pif/bsdx_ipv4/configure.m4 \
+	$(top_srcdir)/src/mca/pif/bsdx_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pif/linux_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pif/posix_ipv4/configure.m4 \
+	$(top_srcdir)/src/mca/pif/solaris_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/config/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/env/configure.m4 \
+	$(top_srcdir)/src/mca/pnet/opa/configure.m4 \
+	$(top_srcdir)/src/mca/psec/munge/configure.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(dist_pmixdata_DATA) \
+	$(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/src/include/pmix_config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pmixdatadir)"
+LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES)
+am__DEPENDENCIES_1 =
+am__libpmix_la_SOURCES_DIST = atomics/sys/architecture.h \
+	atomics/sys/atomic.h atomics/sys/atomic_impl.h \
+	atomics/sys/timer.h atomics/sys/cma.h \
+	atomics/sys/x86_64/atomic.h atomics/sys/x86_64/timer.h \
+	atomics/sys/arm/atomic.h atomics/sys/arm/timer.h \
+	atomics/sys/arm64/atomic.h atomics/sys/arm64/timer.h \
+	atomics/sys/ia32/atomic.h atomics/sys/ia32/timer.h \
+	atomics/sys/ia64/atomic.h atomics/sys/ia64/timer.h \
+	atomics/sys/mips/atomic.h atomics/sys/mips/timer.h \
+	atomics/sys/powerpc/atomic.h atomics/sys/powerpc/timer.h \
+	atomics/sys/sparcv9/atomic.h atomics/sys/sparcv9/timer.h \
+	atomics/sys/sync_builtin/atomic.h \
+	atomics/sys/gcc_builtin/atomic.h threads/mutex.h \
+	threads/mutex_unix.h threads/threads.h threads/tsd.h \
+	threads/wait_sync.h threads/thread_usage.h class/pmix_object.h \
+	class/pmix_list.h class/pmix_pointer_array.h \
+	class/pmix_hash_table.h class/pmix_hotel.h \
+	class/pmix_ring_buffer.h class/pmix_value_array.h \
+	event/pmix_event.h include/pmix_globals.h include/align.h \
+	include/hash_string.h include/pmix_socket_errno.h \
+	include/pmix_stdint.h include/prefetch.h include/types.h \
+	include/pmix_config_top.h include/pmix_config_bottom.h \
+	include/pmix_jobdata.h include/pmix_config.h mca/mca.h \
+	util/alfg.h util/argv.h util/error.h util/printf.h \
+	util/output.h util/pmix_environ.h util/crc.h util/fd.h \
+	util/timings.h util/os_path.h util/basename.h \
+	util/keyval_parse.h util/show_help.h util/show_help_lex.h \
+	util/path.h util/getid.h util/strnlen.h util/hash.h util/net.h \
+	util/pif.h util/tsd.h util/parse_options.h util/compress.h \
+	client/pmix_client_ops.h server/pmix_server_ops.h \
+	runtime/pmix_rte.h runtime/pmix_progress_threads.h \
+	buffer_ops/buffer_ops.h buffer_ops/types.h \
+	buffer_ops/internal.h sm/pmix_sm.h sm/pmix_mmap.h \
+	dstore/pmix_dstore.h dstore/pmix_esh.h class/pmix_object.c \
+	class/pmix_list.c class/pmix_pointer_array.c \
+	class/pmix_hash_table.c class/pmix_hotel.c \
+	class/pmix_ring_buffer.c class/pmix_value_array.c \
+	event/pmix_event_notification.c \
+	event/pmix_event_registration.c include/pmix_globals.c \
+	util/alfg.c util/argv.c util/error.c util/printf.c \
+	util/output.c util/pmix_environ.c util/crc.c util/fd.c \
+	util/timings.c util/os_path.c util/basename.c \
+	util/keyval_parse.c util/show_help.c util/show_help_lex.l \
+	util/path.c util/getid.c util/hash.c util/net.c util/pif.c \
+	util/parse_options.c util/compress.c client/pmix_client.c \
+	client/pmix_client_fence.c client/pmix_client_get.c \
+	client/pmix_client_pub.c client/pmix_client_spawn.c \
+	client/pmix_client_connect.c client/pmi1.c client/pmi2.c \
+	server/pmix_server.c server/pmix_server_ops.c \
+	server/pmix_server_regex.c server/pmix_server_get.c \
+	tool/pmix_tool.c common/pmix_query.c common/pmix_strings.c \
+	common/pmix_log.c common/pmix_jobdata.c common/pmix_control.c \
+	common/pmix_data.c buffer_ops/copy.c \
+	buffer_ops/internal_functions.c buffer_ops/open_close.c \
+	buffer_ops/pack.c buffer_ops/print.c buffer_ops/unpack.c \
+	sm/pmix_sm.c sm/pmix_mmap.c dstore/pmix_dstore.c \
+	dstore/pmix_esh.c threads/mutex.c threads/thread.c \
+	threads/wait_sync.c runtime/pmix_finalize.c \
+	runtime/pmix_init.c runtime/pmix_params.c \
+	runtime/pmix_progress_threads.c
+am__objects_1 =
+am__objects_2 = $(am__objects_1) $(am__objects_1) $(am__objects_1)
+am__dirstamp = $(am__leading_dot)dirstamp
+ at WANT_PMI_BACKWARD_TRUE@am__objects_3 = client/pmi1.lo client/pmi2.lo
+ at WANT_DSTORE_TRUE@am__objects_4 = sm/pmix_sm.lo sm/pmix_mmap.lo \
+ at WANT_DSTORE_TRUE@	dstore/pmix_dstore.lo dstore/pmix_esh.lo
+am__objects_5 = class/pmix_object.lo class/pmix_list.lo \
+	class/pmix_pointer_array.lo class/pmix_hash_table.lo \
+	class/pmix_hotel.lo class/pmix_ring_buffer.lo \
+	class/pmix_value_array.lo event/pmix_event_notification.lo \
+	event/pmix_event_registration.lo include/pmix_globals.lo \
+	util/alfg.lo util/argv.lo util/error.lo util/printf.lo \
+	util/output.lo util/pmix_environ.lo util/crc.lo util/fd.lo \
+	util/timings.lo util/os_path.lo util/basename.lo \
+	util/keyval_parse.lo util/show_help.lo util/show_help_lex.lo \
+	util/path.lo util/getid.lo util/hash.lo util/net.lo \
+	util/pif.lo util/parse_options.lo util/compress.lo \
+	client/pmix_client.lo client/pmix_client_fence.lo \
+	client/pmix_client_get.lo client/pmix_client_pub.lo \
+	client/pmix_client_spawn.lo client/pmix_client_connect.lo \
+	$(am__objects_3) server/pmix_server.lo \
+	server/pmix_server_ops.lo server/pmix_server_regex.lo \
+	server/pmix_server_get.lo tool/pmix_tool.lo \
+	common/pmix_query.lo common/pmix_strings.lo common/pmix_log.lo \
+	common/pmix_jobdata.lo common/pmix_control.lo \
+	common/pmix_data.lo buffer_ops/copy.lo \
+	buffer_ops/internal_functions.lo buffer_ops/open_close.lo \
+	buffer_ops/pack.lo buffer_ops/print.lo buffer_ops/unpack.lo \
+	$(am__objects_4)
+ at PMIX_EMBEDDED_MODE_FALSE@am_libpmix_la_OBJECTS = $(am__objects_2) \
+ at PMIX_EMBEDDED_MODE_FALSE@	$(am__objects_5) threads/mutex.lo \
+ at PMIX_EMBEDDED_MODE_FALSE@	threads/thread.lo \
+ at PMIX_EMBEDDED_MODE_FALSE@	threads/wait_sync.lo \
+ at PMIX_EMBEDDED_MODE_FALSE@	runtime/pmix_finalize.lo \
+ at PMIX_EMBEDDED_MODE_FALSE@	runtime/pmix_init.lo \
+ at PMIX_EMBEDDED_MODE_FALSE@	runtime/pmix_params.lo \
+ at PMIX_EMBEDDED_MODE_FALSE@	runtime/pmix_progress_threads.lo
+ at PMIX_EMBEDDED_MODE_TRUE@@WANT_INSTALL_HEADERS_FALSE at am_libpmix_la_OBJECTS = $(am__objects_2) \
+ at PMIX_EMBEDDED_MODE_TRUE@@WANT_INSTALL_HEADERS_FALSE@	$(am__objects_5) \
+ at PMIX_EMBEDDED_MODE_TRUE@@WANT_INSTALL_HEADERS_FALSE@	threads/mutex.lo \
+ at PMIX_EMBEDDED_MODE_TRUE@@WANT_INSTALL_HEADERS_FALSE@	threads/thread.lo \
+ at PMIX_EMBEDDED_MODE_TRUE@@WANT_INSTALL_HEADERS_FALSE@	threads/wait_sync.lo \
+ at PMIX_EMBEDDED_MODE_TRUE@@WANT_INSTALL_HEADERS_FALSE@	runtime/pmix_finalize.lo \
+ at PMIX_EMBEDDED_MODE_TRUE@@WANT_INSTALL_HEADERS_FALSE@	runtime/pmix_init.lo \
+ at PMIX_EMBEDDED_MODE_TRUE@@WANT_INSTALL_HEADERS_FALSE@	runtime/pmix_params.lo \
+ at PMIX_EMBEDDED_MODE_TRUE@@WANT_INSTALL_HEADERS_FALSE@	runtime/pmix_progress_threads.lo
+ at PMIX_EMBEDDED_MODE_TRUE@@WANT_INSTALL_HEADERS_TRUE at am_libpmix_la_OBJECTS = $(am__objects_2) \
+ at PMIX_EMBEDDED_MODE_TRUE@@WANT_INSTALL_HEADERS_TRUE@	$(am__objects_5) \
+ at PMIX_EMBEDDED_MODE_TRUE@@WANT_INSTALL_HEADERS_TRUE@	threads/mutex.lo \
+ at PMIX_EMBEDDED_MODE_TRUE@@WANT_INSTALL_HEADERS_TRUE@	threads/thread.lo \
+ at PMIX_EMBEDDED_MODE_TRUE@@WANT_INSTALL_HEADERS_TRUE@	threads/wait_sync.lo \
+ at PMIX_EMBEDDED_MODE_TRUE@@WANT_INSTALL_HEADERS_TRUE@	runtime/pmix_finalize.lo \
+ at PMIX_EMBEDDED_MODE_TRUE@@WANT_INSTALL_HEADERS_TRUE@	runtime/pmix_init.lo \
+ at PMIX_EMBEDDED_MODE_TRUE@@WANT_INSTALL_HEADERS_TRUE@	runtime/pmix_params.lo \
+ at PMIX_EMBEDDED_MODE_TRUE@@WANT_INSTALL_HEADERS_TRUE@	runtime/pmix_progress_threads.lo
+libpmix_la_OBJECTS = $(am_libpmix_la_OBJECTS)
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+libpmix_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(libpmix_la_LDFLAGS) $(LDFLAGS) -o $@
+ at PMIX_EMBEDDED_MODE_FALSE@am_libpmix_la_rpath = -rpath $(libdir)
+ at PMIX_EMBEDDED_MODE_TRUE@@WANT_INSTALL_HEADERS_FALSE at am_libpmix_la_rpath =
+ at PMIX_EMBEDDED_MODE_TRUE@@WANT_INSTALL_HEADERS_TRUE at am_libpmix_la_rpath =  \
+ at PMIX_EMBEDDED_MODE_TRUE@@WANT_INSTALL_HEADERS_TRUE@	-rpath \
+ at PMIX_EMBEDDED_MODE_TRUE@@WANT_INSTALL_HEADERS_TRUE@	$(libdir)
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/src/include
+depcomp = $(SHELL) $(top_srcdir)/./config/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+LEXCOMPILE = $(LEX) $(AM_LFLAGS) $(LFLAGS)
+LTLEXCOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(LEX) $(AM_LFLAGS) $(LFLAGS)
+AM_V_LEX = $(am__v_LEX_ at AM_V@)
+am__v_LEX_ = $(am__v_LEX_ at AM_DEFAULT_V@)
+am__v_LEX_0 = @echo "  LEX     " $@;
+am__v_LEX_1 = 
+YLWRAP = $(top_srcdir)/./config/ylwrap
+SOURCES = $(libpmix_la_SOURCES)
+DIST_SOURCES = $(am__libpmix_la_SOURCES_DIST)
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+DATA = $(dist_pmixdata_DATA)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+	distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+	$(srcdir)/atomics/sys/Makefile.include \
+	$(srcdir)/atomics/sys/arm/Makefile.include \
+	$(srcdir)/atomics/sys/arm64/Makefile.include \
+	$(srcdir)/atomics/sys/gcc_builtin/Makefile.include \
+	$(srcdir)/atomics/sys/ia32/Makefile.include \
+	$(srcdir)/atomics/sys/ia64/Makefile.include \
+	$(srcdir)/atomics/sys/mips/Makefile.include \
+	$(srcdir)/atomics/sys/powerpc/Makefile.include \
+	$(srcdir)/atomics/sys/sparcv9/Makefile.include \
+	$(srcdir)/atomics/sys/sync_builtin/Makefile.include \
+	$(srcdir)/atomics/sys/x86_64/Makefile.include \
+	$(srcdir)/buffer_ops/Makefile.am \
+	$(srcdir)/class/Makefile.include \
+	$(srcdir)/client/Makefile.include \
+	$(srcdir)/common/Makefile.include \
+	$(srcdir)/dstore/Makefile.include \
+	$(srcdir)/event/Makefile.include \
+	$(srcdir)/include/Makefile.include \
+	$(srcdir)/mca/Makefile.include \
+	$(srcdir)/runtime/Makefile.include \
+	$(srcdir)/server/Makefile.include \
+	$(srcdir)/sm/Makefile.include \
+	$(srcdir)/threads/Makefile.include \
+	$(srcdir)/tool/Makefile.include \
+	$(srcdir)/util/Makefile.include $(top_srcdir)/./config/depcomp \
+	$(top_srcdir)/./config/ylwrap util/show_help_lex.c
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CFLAGS = @CFLAGS@
+CLEANFILES = core.* *~
+CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = lex.pmix_show_help_yy
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MCA_PROJECT_SUBDIRS = @MCA_PROJECT_SUBDIRS@
+MCA_pmix_FRAMEWORKS = @MCA_pmix_FRAMEWORKS@
+MCA_pmix_FRAMEWORKS_SUBDIRS = @MCA_pmix_FRAMEWORKS_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS@
+MCA_pmix_FRAMEWORK_LIBS = @MCA_pmix_FRAMEWORK_LIBS@
+MCA_pmix_pdl_ALL_COMPONENTS = @MCA_pmix_pdl_ALL_COMPONENTS@
+MCA_pmix_pdl_ALL_SUBDIRS = @MCA_pmix_pdl_ALL_SUBDIRS@
+MCA_pmix_pdl_DSO_COMPONENTS = @MCA_pmix_pdl_DSO_COMPONENTS@
+MCA_pmix_pdl_DSO_SUBDIRS = @MCA_pmix_pdl_DSO_SUBDIRS@
+MCA_pmix_pdl_STATIC_COMPONENTS = @MCA_pmix_pdl_STATIC_COMPONENTS@
+MCA_pmix_pdl_STATIC_LTLIBS = @MCA_pmix_pdl_STATIC_LTLIBS@
+MCA_pmix_pdl_STATIC_SUBDIRS = @MCA_pmix_pdl_STATIC_SUBDIRS@
+MCA_pmix_pif_ALL_COMPONENTS = @MCA_pmix_pif_ALL_COMPONENTS@
+MCA_pmix_pif_ALL_SUBDIRS = @MCA_pmix_pif_ALL_SUBDIRS@
+MCA_pmix_pif_DSO_COMPONENTS = @MCA_pmix_pif_DSO_COMPONENTS@
+MCA_pmix_pif_DSO_SUBDIRS = @MCA_pmix_pif_DSO_SUBDIRS@
+MCA_pmix_pif_STATIC_COMPONENTS = @MCA_pmix_pif_STATIC_COMPONENTS@
+MCA_pmix_pif_STATIC_LTLIBS = @MCA_pmix_pif_STATIC_LTLIBS@
+MCA_pmix_pif_STATIC_SUBDIRS = @MCA_pmix_pif_STATIC_SUBDIRS@
+MCA_pmix_pinstalldirs_ALL_COMPONENTS = @MCA_pmix_pinstalldirs_ALL_COMPONENTS@
+MCA_pmix_pinstalldirs_ALL_SUBDIRS = @MCA_pmix_pinstalldirs_ALL_SUBDIRS@
+MCA_pmix_pinstalldirs_DSO_COMPONENTS = @MCA_pmix_pinstalldirs_DSO_COMPONENTS@
+MCA_pmix_pinstalldirs_DSO_SUBDIRS = @MCA_pmix_pinstalldirs_DSO_SUBDIRS@
+MCA_pmix_pinstalldirs_STATIC_COMPONENTS = @MCA_pmix_pinstalldirs_STATIC_COMPONENTS@
+MCA_pmix_pinstalldirs_STATIC_LTLIBS = @MCA_pmix_pinstalldirs_STATIC_LTLIBS@
+MCA_pmix_pinstalldirs_STATIC_SUBDIRS = @MCA_pmix_pinstalldirs_STATIC_SUBDIRS@
+MCA_pmix_pnet_ALL_COMPONENTS = @MCA_pmix_pnet_ALL_COMPONENTS@
+MCA_pmix_pnet_ALL_SUBDIRS = @MCA_pmix_pnet_ALL_SUBDIRS@
+MCA_pmix_pnet_DSO_COMPONENTS = @MCA_pmix_pnet_DSO_COMPONENTS@
+MCA_pmix_pnet_DSO_SUBDIRS = @MCA_pmix_pnet_DSO_SUBDIRS@
+MCA_pmix_pnet_STATIC_COMPONENTS = @MCA_pmix_pnet_STATIC_COMPONENTS@
+MCA_pmix_pnet_STATIC_LTLIBS = @MCA_pmix_pnet_STATIC_LTLIBS@
+MCA_pmix_pnet_STATIC_SUBDIRS = @MCA_pmix_pnet_STATIC_SUBDIRS@
+MCA_pmix_psec_ALL_COMPONENTS = @MCA_pmix_psec_ALL_COMPONENTS@
+MCA_pmix_psec_ALL_SUBDIRS = @MCA_pmix_psec_ALL_SUBDIRS@
+MCA_pmix_psec_DSO_COMPONENTS = @MCA_pmix_psec_DSO_COMPONENTS@
+MCA_pmix_psec_DSO_SUBDIRS = @MCA_pmix_psec_DSO_SUBDIRS@
+MCA_pmix_psec_STATIC_COMPONENTS = @MCA_pmix_psec_STATIC_COMPONENTS@
+MCA_pmix_psec_STATIC_LTLIBS = @MCA_pmix_psec_STATIC_LTLIBS@
+MCA_pmix_psec_STATIC_SUBDIRS = @MCA_pmix_psec_STATIC_SUBDIRS@
+MCA_pmix_psensor_ALL_COMPONENTS = @MCA_pmix_psensor_ALL_COMPONENTS@
+MCA_pmix_psensor_ALL_SUBDIRS = @MCA_pmix_psensor_ALL_SUBDIRS@
+MCA_pmix_psensor_DSO_COMPONENTS = @MCA_pmix_psensor_DSO_COMPONENTS@
+MCA_pmix_psensor_DSO_SUBDIRS = @MCA_pmix_psensor_DSO_SUBDIRS@
+MCA_pmix_psensor_STATIC_COMPONENTS = @MCA_pmix_psensor_STATIC_COMPONENTS@
+MCA_pmix_psensor_STATIC_LTLIBS = @MCA_pmix_psensor_STATIC_LTLIBS@
+MCA_pmix_psensor_STATIC_SUBDIRS = @MCA_pmix_psensor_STATIC_SUBDIRS@
+MCA_pmix_ptl_ALL_COMPONENTS = @MCA_pmix_ptl_ALL_COMPONENTS@
+MCA_pmix_ptl_ALL_SUBDIRS = @MCA_pmix_ptl_ALL_SUBDIRS@
+MCA_pmix_ptl_DSO_COMPONENTS = @MCA_pmix_ptl_DSO_COMPONENTS@
+MCA_pmix_ptl_DSO_SUBDIRS = @MCA_pmix_ptl_DSO_SUBDIRS@
+MCA_pmix_ptl_STATIC_COMPONENTS = @MCA_pmix_ptl_STATIC_COMPONENTS@
+MCA_pmix_ptl_STATIC_LTLIBS = @MCA_pmix_ptl_STATIC_LTLIBS@
+MCA_pmix_ptl_STATIC_SUBDIRS = @MCA_pmix_ptl_STATIC_SUBDIRS@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PMIX_ASM_GSYM = @PMIX_ASM_GSYM@
+PMIX_ASM_LSYM = @PMIX_ASM_LSYM@
+PMIX_ASM_SUPPORT_64BIT = @PMIX_ASM_SUPPORT_64BIT@
+PMIX_ASM_TEXT = @PMIX_ASM_TEXT@
+PMIX_ASM_TYPE = @PMIX_ASM_TYPE@
+PMIX_ASSEMBLY_ARCH = @PMIX_ASSEMBLY_ARCH@
+PMIX_ASSEMBLY_BUILTIN = @PMIX_ASSEMBLY_BUILTIN@
+PMIX_ASSEMBLY_FORMAT = @PMIX_ASSEMBLY_FORMAT@
+PMIX_AS_GLOBAL = @PMIX_AS_GLOBAL@
+PMIX_AS_LABEL_SUFFIX = @PMIX_AS_LABEL_SUFFIX@
+PMIX_CC_ABSOLUTE = @PMIX_CC_ABSOLUTE@
+PMIX_CONFIGURE_DATE = @PMIX_CONFIGURE_DATE@
+PMIX_CONFIGURE_HOST = @PMIX_CONFIGURE_HOST@
+PMIX_CONFIGURE_USER = @PMIX_CONFIGURE_USER@
+PMIX_EMBEDDED_CPPFLAGS = @PMIX_EMBEDDED_CPPFLAGS@
+PMIX_EMBEDDED_LDFLAGS = @PMIX_EMBEDDED_LDFLAGS@
+PMIX_EMBEDDED_LIBS = @PMIX_EMBEDDED_LIBS@
+PMIX_MAJOR_VERSION = @PMIX_MAJOR_VERSION@
+PMIX_MINOR_VERSION = @PMIX_MINOR_VERSION@
+PMIX_RELEASE_DATE = @PMIX_RELEASE_DATE@
+PMIX_RELEASE_VERSION = @PMIX_RELEASE_VERSION@
+PMIX_RENAME = @PMIX_RENAME@
+PMIX_VERSION = @PMIX_VERSION@
+PMIX_top_builddir = @PMIX_top_builddir@
+PMIX_top_srcdir = @PMIX_top_srcdir@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_prefix_program = @ac_prefix_program@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+libpmix_so_version = @libpmix_so_version@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pmix_have_pandoc = @pmix_have_pandoc@
+pmix_pdl_pdlopen_LIBS = @pmix_pdl_pdlopen_LIBS@
+pmix_pdl_plibltdl_CPPFLAGS = @pmix_pdl_plibltdl_CPPFLAGS@
+pmix_pdl_plibltdl_LDFLAGS = @pmix_pdl_plibltdl_LDFLAGS@
+pmix_pdl_plibltdl_LIBS = @pmix_pdl_plibltdl_LIBS@
+pmixdatadir = @pmixdatadir@
+pmixincludedir = @pmixincludedir@
+pmixlibdir = @pmixlibdir@
+pmixmajor = @pmixmajor@
+pmixminor = @pmixminor@
+pnet_opa_CFLAGS = @pnet_opa_CFLAGS@
+pnet_opa_CPPFLAGS = @pnet_opa_CPPFLAGS@
+pnet_opa_LDFLAGS = @pnet_opa_LDFLAGS@
+pnet_opa_LIBS = @pnet_opa_LIBS@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+psec_munge_CPPFLAGS = @psec_munge_CPPFLAGS@
+psec_munge_LDFLAGS = @psec_munge_LDFLAGS@
+psec_munge_LIBS = @psec_munge_LIBS@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+
+# Note that the -I directory must *exactly* match what was specified
+# via AC_CONFIG_MACRO_DIR in configure.ac.
+ACLOCAL_AMFLAGS = -I ./config
+SUBDIRS = \
+	util/keyval \
+    mca/base \
+    $(MCA_pmix_FRAMEWORKS_SUBDIRS) \
+    $(MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS) \
+    . \
+    $(MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS)
+
+DIST_SUBDIRS = \
+	util/keyval \
+    mca/base \
+    $(MCA_pmix_FRAMEWORKS_SUBDIRS) \
+    $(MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS)
+
+
+# Source code files
+
+# Source code files
+
+# Source code files
+
+# Source code files
+headers = atomics/sys/architecture.h atomics/sys/atomic.h \
+	atomics/sys/atomic_impl.h atomics/sys/timer.h \
+	atomics/sys/cma.h atomics/sys/x86_64/atomic.h \
+	atomics/sys/x86_64/timer.h atomics/sys/arm/atomic.h \
+	atomics/sys/arm/timer.h atomics/sys/arm64/atomic.h \
+	atomics/sys/arm64/timer.h atomics/sys/ia32/atomic.h \
+	atomics/sys/ia32/timer.h atomics/sys/ia64/atomic.h \
+	atomics/sys/ia64/timer.h atomics/sys/mips/atomic.h \
+	atomics/sys/mips/timer.h atomics/sys/powerpc/atomic.h \
+	atomics/sys/powerpc/timer.h atomics/sys/sparcv9/atomic.h \
+	atomics/sys/sparcv9/timer.h atomics/sys/sync_builtin/atomic.h \
+	atomics/sys/gcc_builtin/atomic.h threads/mutex.h \
+	threads/mutex_unix.h threads/threads.h threads/tsd.h \
+	threads/wait_sync.h threads/thread_usage.h class/pmix_object.h \
+	class/pmix_list.h class/pmix_pointer_array.h \
+	class/pmix_hash_table.h class/pmix_hotel.h \
+	class/pmix_ring_buffer.h class/pmix_value_array.h \
+	event/pmix_event.h include/pmix_globals.h $(am__append_1) \
+	$(am__append_2) mca/mca.h util/alfg.h util/argv.h util/error.h \
+	util/printf.h util/output.h util/pmix_environ.h util/crc.h \
+	util/fd.h util/timings.h util/os_path.h util/basename.h \
+	util/keyval_parse.h util/show_help.h util/show_help_lex.h \
+	util/path.h util/getid.h util/strnlen.h util/hash.h util/net.h \
+	util/pif.h util/tsd.h util/parse_options.h util/compress.h \
+	client/pmix_client_ops.h server/pmix_server_ops.h \
+	runtime/pmix_rte.h runtime/pmix_progress_threads.h \
+	buffer_ops/buffer_ops.h buffer_ops/types.h \
+	buffer_ops/internal.h $(am__append_4)
+sources = class/pmix_object.c class/pmix_list.c \
+	class/pmix_pointer_array.c class/pmix_hash_table.c \
+	class/pmix_hotel.c class/pmix_ring_buffer.c \
+	class/pmix_value_array.c event/pmix_event_notification.c \
+	event/pmix_event_registration.c include/pmix_globals.c \
+	util/alfg.c util/argv.c util/error.c util/printf.c \
+	util/output.c util/pmix_environ.c util/crc.c util/fd.c \
+	util/timings.c util/os_path.c util/basename.c \
+	util/keyval_parse.c util/show_help.c util/show_help_lex.l \
+	util/path.c util/getid.c util/hash.c util/net.c util/pif.c \
+	util/parse_options.c util/compress.c client/pmix_client.c \
+	client/pmix_client_fence.c client/pmix_client_get.c \
+	client/pmix_client_pub.c client/pmix_client_spawn.c \
+	client/pmix_client_connect.c $(am__append_3) \
+	server/pmix_server.c server/pmix_server_ops.c \
+	server/pmix_server_regex.c server/pmix_server_get.c \
+	tool/pmix_tool.c common/pmix_query.c common/pmix_strings.c \
+	common/pmix_log.c common/pmix_jobdata.c common/pmix_control.c \
+	common/pmix_data.c buffer_ops/copy.c \
+	buffer_ops/internal_functions.c buffer_ops/open_close.c \
+	buffer_ops/pack.c buffer_ops/print.c buffer_ops/unpack.c \
+	$(am__append_5)
+nodist_headers = 
+EXTRA_DIST = 
+dist_pmixdata_DATA = server/help-pmix-server.txt \
+	runtime/help-pmix-runtime.txt
+libpmix_la_LIBADD = mca/base/libpmix_mca_base.la \
+	$(MCA_pmix_FRAMEWORK_LIBS) util/keyval/libpmixutilkeyval.la
+libpmix_la_DEPENDENCIES = $(libpmix_la_LIBADD) \
+	util/keyval/libpmixutilkeyval.la
+ at PMIX_EMBEDDED_MODE_FALSE@lib_LTLIBRARIES = libpmix.la
+ at PMIX_EMBEDDED_MODE_TRUE@@WANT_INSTALL_HEADERS_TRUE at lib_LTLIBRARIES = libpmix.la
+ at PMIX_EMBEDDED_MODE_FALSE@libpmix_la_SOURCES = $(headers) $(sources) \
+ at PMIX_EMBEDDED_MODE_FALSE@	threads/mutex.c threads/thread.c \
+ at PMIX_EMBEDDED_MODE_FALSE@	threads/wait_sync.c \
+ at PMIX_EMBEDDED_MODE_FALSE@	runtime/pmix_finalize.c \
+ at PMIX_EMBEDDED_MODE_FALSE@	runtime/pmix_init.c \
+ at PMIX_EMBEDDED_MODE_FALSE@	runtime/pmix_params.c \
+ at PMIX_EMBEDDED_MODE_FALSE@	runtime/pmix_progress_threads.c
+ at PMIX_EMBEDDED_MODE_TRUE@@WANT_INSTALL_HEADERS_FALSE at libpmix_la_SOURCES = $(headers) \
+ at PMIX_EMBEDDED_MODE_TRUE@@WANT_INSTALL_HEADERS_FALSE@	$(sources) \
+ at PMIX_EMBEDDED_MODE_TRUE@@WANT_INSTALL_HEADERS_FALSE@	threads/mutex.c \
+ at PMIX_EMBEDDED_MODE_TRUE@@WANT_INSTALL_HEADERS_FALSE@	threads/thread.c \
+ at PMIX_EMBEDDED_MODE_TRUE@@WANT_INSTALL_HEADERS_FALSE@	threads/wait_sync.c \
+ at PMIX_EMBEDDED_MODE_TRUE@@WANT_INSTALL_HEADERS_FALSE@	runtime/pmix_finalize.c \
+ at PMIX_EMBEDDED_MODE_TRUE@@WANT_INSTALL_HEADERS_FALSE@	runtime/pmix_init.c \
+ at PMIX_EMBEDDED_MODE_TRUE@@WANT_INSTALL_HEADERS_FALSE@	runtime/pmix_params.c \
+ at PMIX_EMBEDDED_MODE_TRUE@@WANT_INSTALL_HEADERS_FALSE@	runtime/pmix_progress_threads.c
+ at PMIX_EMBEDDED_MODE_TRUE@@WANT_INSTALL_HEADERS_TRUE at libpmix_la_SOURCES = $(headers) \
+ at PMIX_EMBEDDED_MODE_TRUE@@WANT_INSTALL_HEADERS_TRUE@	$(sources) \
+ at PMIX_EMBEDDED_MODE_TRUE@@WANT_INSTALL_HEADERS_TRUE@	threads/mutex.c \
+ at PMIX_EMBEDDED_MODE_TRUE@@WANT_INSTALL_HEADERS_TRUE@	threads/thread.c \
+ at PMIX_EMBEDDED_MODE_TRUE@@WANT_INSTALL_HEADERS_TRUE@	threads/wait_sync.c \
+ at PMIX_EMBEDDED_MODE_TRUE@@WANT_INSTALL_HEADERS_TRUE@	runtime/pmix_finalize.c \
+ at PMIX_EMBEDDED_MODE_TRUE@@WANT_INSTALL_HEADERS_TRUE@	runtime/pmix_init.c \
+ at PMIX_EMBEDDED_MODE_TRUE@@WANT_INSTALL_HEADERS_TRUE@	runtime/pmix_params.c \
+ at PMIX_EMBEDDED_MODE_TRUE@@WANT_INSTALL_HEADERS_TRUE@	runtime/pmix_progress_threads.c
+ at PMIX_EMBEDDED_MODE_FALSE@libpmix_la_LDFLAGS = -version-info $(libpmix_so_version)
+ at PMIX_EMBEDDED_MODE_TRUE@@WANT_INSTALL_HEADERS_FALSE at libpmix_la_LDFLAGS = 
+ at PMIX_EMBEDDED_MODE_TRUE@@WANT_INSTALL_HEADERS_TRUE at libpmix_la_LDFLAGS = -version-info $(libpmix_so_version)
+ at PMIX_EMBEDDED_MODE_TRUE@@WANT_INSTALL_HEADERS_FALSE at noinst_LTLIBRARIES = libpmix.la
+AM_LFLAGS = -Ppmix_show_help_yy
+MAINTAINERCLEANFILES = Makefile.in config.h config.h.in
+DISTCLEANFILES = Makefile
+all: all-recursive
+
+.SUFFIXES:
+.SUFFIXES: .c .l .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/atomics/sys/Makefile.include $(srcdir)/atomics/sys/x86_64/Makefile.include $(srcdir)/atomics/sys/arm/Makefile.include $(srcdir)/atomics/sys/arm64/Makefile.include $(srcdir)/atomics/sys/ia32/Makefile.include $(srcdir)/atomics/sys/ia64/Makefile.include $(srcdir)/atomics/sys/mips/Makefile.include $(srcdir)/atomics/sys/powerpc/Makefile.include $(srcdir)/atomics/sys/sparcv9/Makefile.include $(srcdir)/atomics/sys/sync_builtin/Makefile.inc [...]
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+$(srcdir)/atomics/sys/Makefile.include $(srcdir)/atomics/sys/x86_64/Makefile.include $(srcdir)/atomics/sys/arm/Makefile.include $(srcdir)/atomics/sys/arm64/Makefile.include $(srcdir)/atomics/sys/ia32/Makefile.include $(srcdir)/atomics/sys/ia64/Makefile.include $(srcdir)/atomics/sys/mips/Makefile.include $(srcdir)/atomics/sys/powerpc/Makefile.include $(srcdir)/atomics/sys/sparcv9/Makefile.include $(srcdir)/atomics/sys/sync_builtin/Makefile.include $(srcdir)/atomics/sys/gcc_builtin/Makefil [...]
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || 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)$(libdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
+	}
+
+uninstall-libLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	for p in $$list; do \
+	  $(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
+	done
+
+clean-libLTLIBRARIES:
+	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+	@list='$(lib_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}; \
+	}
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_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}; \
+	}
+class/$(am__dirstamp):
+	@$(MKDIR_P) class
+	@: > class/$(am__dirstamp)
+class/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) class/$(DEPDIR)
+	@: > class/$(DEPDIR)/$(am__dirstamp)
+class/pmix_object.lo: class/$(am__dirstamp) \
+	class/$(DEPDIR)/$(am__dirstamp)
+class/pmix_list.lo: class/$(am__dirstamp) \
+	class/$(DEPDIR)/$(am__dirstamp)
+class/pmix_pointer_array.lo: class/$(am__dirstamp) \
+	class/$(DEPDIR)/$(am__dirstamp)
+class/pmix_hash_table.lo: class/$(am__dirstamp) \
+	class/$(DEPDIR)/$(am__dirstamp)
+class/pmix_hotel.lo: class/$(am__dirstamp) \
+	class/$(DEPDIR)/$(am__dirstamp)
+class/pmix_ring_buffer.lo: class/$(am__dirstamp) \
+	class/$(DEPDIR)/$(am__dirstamp)
+class/pmix_value_array.lo: class/$(am__dirstamp) \
+	class/$(DEPDIR)/$(am__dirstamp)
+event/$(am__dirstamp):
+	@$(MKDIR_P) event
+	@: > event/$(am__dirstamp)
+event/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) event/$(DEPDIR)
+	@: > event/$(DEPDIR)/$(am__dirstamp)
+event/pmix_event_notification.lo: event/$(am__dirstamp) \
+	event/$(DEPDIR)/$(am__dirstamp)
+event/pmix_event_registration.lo: event/$(am__dirstamp) \
+	event/$(DEPDIR)/$(am__dirstamp)
+include/$(am__dirstamp):
+	@$(MKDIR_P) include
+	@: > include/$(am__dirstamp)
+include/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) include/$(DEPDIR)
+	@: > include/$(DEPDIR)/$(am__dirstamp)
+include/pmix_globals.lo: include/$(am__dirstamp) \
+	include/$(DEPDIR)/$(am__dirstamp)
+util/$(am__dirstamp):
+	@$(MKDIR_P) util
+	@: > util/$(am__dirstamp)
+util/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) util/$(DEPDIR)
+	@: > util/$(DEPDIR)/$(am__dirstamp)
+util/alfg.lo: util/$(am__dirstamp) util/$(DEPDIR)/$(am__dirstamp)
+util/argv.lo: util/$(am__dirstamp) util/$(DEPDIR)/$(am__dirstamp)
+util/error.lo: util/$(am__dirstamp) util/$(DEPDIR)/$(am__dirstamp)
+util/printf.lo: util/$(am__dirstamp) util/$(DEPDIR)/$(am__dirstamp)
+util/output.lo: util/$(am__dirstamp) util/$(DEPDIR)/$(am__dirstamp)
+util/pmix_environ.lo: util/$(am__dirstamp) \
+	util/$(DEPDIR)/$(am__dirstamp)
+util/crc.lo: util/$(am__dirstamp) util/$(DEPDIR)/$(am__dirstamp)
+util/fd.lo: util/$(am__dirstamp) util/$(DEPDIR)/$(am__dirstamp)
+util/timings.lo: util/$(am__dirstamp) util/$(DEPDIR)/$(am__dirstamp)
+util/os_path.lo: util/$(am__dirstamp) util/$(DEPDIR)/$(am__dirstamp)
+util/basename.lo: util/$(am__dirstamp) util/$(DEPDIR)/$(am__dirstamp)
+util/keyval_parse.lo: util/$(am__dirstamp) \
+	util/$(DEPDIR)/$(am__dirstamp)
+util/show_help.lo: util/$(am__dirstamp) util/$(DEPDIR)/$(am__dirstamp)
+util/show_help_lex.lo: util/$(am__dirstamp) \
+	util/$(DEPDIR)/$(am__dirstamp)
+util/path.lo: util/$(am__dirstamp) util/$(DEPDIR)/$(am__dirstamp)
+util/getid.lo: util/$(am__dirstamp) util/$(DEPDIR)/$(am__dirstamp)
+util/hash.lo: util/$(am__dirstamp) util/$(DEPDIR)/$(am__dirstamp)
+util/net.lo: util/$(am__dirstamp) util/$(DEPDIR)/$(am__dirstamp)
+util/pif.lo: util/$(am__dirstamp) util/$(DEPDIR)/$(am__dirstamp)
+util/parse_options.lo: util/$(am__dirstamp) \
+	util/$(DEPDIR)/$(am__dirstamp)
+util/compress.lo: util/$(am__dirstamp) util/$(DEPDIR)/$(am__dirstamp)
+client/$(am__dirstamp):
+	@$(MKDIR_P) client
+	@: > client/$(am__dirstamp)
+client/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) client/$(DEPDIR)
+	@: > client/$(DEPDIR)/$(am__dirstamp)
+client/pmix_client.lo: client/$(am__dirstamp) \
+	client/$(DEPDIR)/$(am__dirstamp)
+client/pmix_client_fence.lo: client/$(am__dirstamp) \
+	client/$(DEPDIR)/$(am__dirstamp)
+client/pmix_client_get.lo: client/$(am__dirstamp) \
+	client/$(DEPDIR)/$(am__dirstamp)
+client/pmix_client_pub.lo: client/$(am__dirstamp) \
+	client/$(DEPDIR)/$(am__dirstamp)
+client/pmix_client_spawn.lo: client/$(am__dirstamp) \
+	client/$(DEPDIR)/$(am__dirstamp)
+client/pmix_client_connect.lo: client/$(am__dirstamp) \
+	client/$(DEPDIR)/$(am__dirstamp)
+client/pmi1.lo: client/$(am__dirstamp) \
+	client/$(DEPDIR)/$(am__dirstamp)
+client/pmi2.lo: client/$(am__dirstamp) \
+	client/$(DEPDIR)/$(am__dirstamp)
+server/$(am__dirstamp):
+	@$(MKDIR_P) server
+	@: > server/$(am__dirstamp)
+server/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) server/$(DEPDIR)
+	@: > server/$(DEPDIR)/$(am__dirstamp)
+server/pmix_server.lo: server/$(am__dirstamp) \
+	server/$(DEPDIR)/$(am__dirstamp)
+server/pmix_server_ops.lo: server/$(am__dirstamp) \
+	server/$(DEPDIR)/$(am__dirstamp)
+server/pmix_server_regex.lo: server/$(am__dirstamp) \
+	server/$(DEPDIR)/$(am__dirstamp)
+server/pmix_server_get.lo: server/$(am__dirstamp) \
+	server/$(DEPDIR)/$(am__dirstamp)
+tool/$(am__dirstamp):
+	@$(MKDIR_P) tool
+	@: > tool/$(am__dirstamp)
+tool/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) tool/$(DEPDIR)
+	@: > tool/$(DEPDIR)/$(am__dirstamp)
+tool/pmix_tool.lo: tool/$(am__dirstamp) tool/$(DEPDIR)/$(am__dirstamp)
+common/$(am__dirstamp):
+	@$(MKDIR_P) common
+	@: > common/$(am__dirstamp)
+common/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) common/$(DEPDIR)
+	@: > common/$(DEPDIR)/$(am__dirstamp)
+common/pmix_query.lo: common/$(am__dirstamp) \
+	common/$(DEPDIR)/$(am__dirstamp)
+common/pmix_strings.lo: common/$(am__dirstamp) \
+	common/$(DEPDIR)/$(am__dirstamp)
+common/pmix_log.lo: common/$(am__dirstamp) \
+	common/$(DEPDIR)/$(am__dirstamp)
+common/pmix_jobdata.lo: common/$(am__dirstamp) \
+	common/$(DEPDIR)/$(am__dirstamp)
+common/pmix_control.lo: common/$(am__dirstamp) \
+	common/$(DEPDIR)/$(am__dirstamp)
+common/pmix_data.lo: common/$(am__dirstamp) \
+	common/$(DEPDIR)/$(am__dirstamp)
+buffer_ops/$(am__dirstamp):
+	@$(MKDIR_P) buffer_ops
+	@: > buffer_ops/$(am__dirstamp)
+buffer_ops/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) buffer_ops/$(DEPDIR)
+	@: > buffer_ops/$(DEPDIR)/$(am__dirstamp)
+buffer_ops/copy.lo: buffer_ops/$(am__dirstamp) \
+	buffer_ops/$(DEPDIR)/$(am__dirstamp)
+buffer_ops/internal_functions.lo: buffer_ops/$(am__dirstamp) \
+	buffer_ops/$(DEPDIR)/$(am__dirstamp)
+buffer_ops/open_close.lo: buffer_ops/$(am__dirstamp) \
+	buffer_ops/$(DEPDIR)/$(am__dirstamp)
+buffer_ops/pack.lo: buffer_ops/$(am__dirstamp) \
+	buffer_ops/$(DEPDIR)/$(am__dirstamp)
+buffer_ops/print.lo: buffer_ops/$(am__dirstamp) \
+	buffer_ops/$(DEPDIR)/$(am__dirstamp)
+buffer_ops/unpack.lo: buffer_ops/$(am__dirstamp) \
+	buffer_ops/$(DEPDIR)/$(am__dirstamp)
+sm/$(am__dirstamp):
+	@$(MKDIR_P) sm
+	@: > sm/$(am__dirstamp)
+sm/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) sm/$(DEPDIR)
+	@: > sm/$(DEPDIR)/$(am__dirstamp)
+sm/pmix_sm.lo: sm/$(am__dirstamp) sm/$(DEPDIR)/$(am__dirstamp)
+sm/pmix_mmap.lo: sm/$(am__dirstamp) sm/$(DEPDIR)/$(am__dirstamp)
+dstore/$(am__dirstamp):
+	@$(MKDIR_P) dstore
+	@: > dstore/$(am__dirstamp)
+dstore/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) dstore/$(DEPDIR)
+	@: > dstore/$(DEPDIR)/$(am__dirstamp)
+dstore/pmix_dstore.lo: dstore/$(am__dirstamp) \
+	dstore/$(DEPDIR)/$(am__dirstamp)
+dstore/pmix_esh.lo: dstore/$(am__dirstamp) \
+	dstore/$(DEPDIR)/$(am__dirstamp)
+threads/$(am__dirstamp):
+	@$(MKDIR_P) threads
+	@: > threads/$(am__dirstamp)
+threads/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) threads/$(DEPDIR)
+	@: > threads/$(DEPDIR)/$(am__dirstamp)
+threads/mutex.lo: threads/$(am__dirstamp) \
+	threads/$(DEPDIR)/$(am__dirstamp)
+threads/thread.lo: threads/$(am__dirstamp) \
+	threads/$(DEPDIR)/$(am__dirstamp)
+threads/wait_sync.lo: threads/$(am__dirstamp) \
+	threads/$(DEPDIR)/$(am__dirstamp)
+runtime/$(am__dirstamp):
+	@$(MKDIR_P) runtime
+	@: > runtime/$(am__dirstamp)
+runtime/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) runtime/$(DEPDIR)
+	@: > runtime/$(DEPDIR)/$(am__dirstamp)
+runtime/pmix_finalize.lo: runtime/$(am__dirstamp) \
+	runtime/$(DEPDIR)/$(am__dirstamp)
+runtime/pmix_init.lo: runtime/$(am__dirstamp) \
+	runtime/$(DEPDIR)/$(am__dirstamp)
+runtime/pmix_params.lo: runtime/$(am__dirstamp) \
+	runtime/$(DEPDIR)/$(am__dirstamp)
+runtime/pmix_progress_threads.lo: runtime/$(am__dirstamp) \
+	runtime/$(DEPDIR)/$(am__dirstamp)
+
+libpmix.la: $(libpmix_la_OBJECTS) $(libpmix_la_DEPENDENCIES) $(EXTRA_libpmix_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(libpmix_la_LINK) $(am_libpmix_la_rpath) $(libpmix_la_OBJECTS) $(libpmix_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+	-rm -f buffer_ops/*.$(OBJEXT)
+	-rm -f buffer_ops/*.lo
+	-rm -f class/*.$(OBJEXT)
+	-rm -f class/*.lo
+	-rm -f client/*.$(OBJEXT)
+	-rm -f client/*.lo
+	-rm -f common/*.$(OBJEXT)
+	-rm -f common/*.lo
+	-rm -f dstore/*.$(OBJEXT)
+	-rm -f dstore/*.lo
+	-rm -f event/*.$(OBJEXT)
+	-rm -f event/*.lo
+	-rm -f include/*.$(OBJEXT)
+	-rm -f include/*.lo
+	-rm -f runtime/*.$(OBJEXT)
+	-rm -f runtime/*.lo
+	-rm -f server/*.$(OBJEXT)
+	-rm -f server/*.lo
+	-rm -f sm/*.$(OBJEXT)
+	-rm -f sm/*.lo
+	-rm -f threads/*.$(OBJEXT)
+	-rm -f threads/*.lo
+	-rm -f tool/*.$(OBJEXT)
+	-rm -f tool/*.lo
+	-rm -f util/*.$(OBJEXT)
+	-rm -f util/*.lo
+
+distclean-compile:
+	-rm -f *.tab.c
+
+ at AMDEP_TRUE@@am__include@ @am__quote at buffer_ops/$(DEPDIR)/copy.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at buffer_ops/$(DEPDIR)/internal_functions.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at buffer_ops/$(DEPDIR)/open_close.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at buffer_ops/$(DEPDIR)/pack.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at buffer_ops/$(DEPDIR)/print.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at buffer_ops/$(DEPDIR)/unpack.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at class/$(DEPDIR)/pmix_hash_table.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at class/$(DEPDIR)/pmix_hotel.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at class/$(DEPDIR)/pmix_list.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at class/$(DEPDIR)/pmix_object.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at class/$(DEPDIR)/pmix_pointer_array.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at class/$(DEPDIR)/pmix_ring_buffer.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at class/$(DEPDIR)/pmix_value_array.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at client/$(DEPDIR)/pmi1.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at client/$(DEPDIR)/pmi2.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at client/$(DEPDIR)/pmix_client.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at client/$(DEPDIR)/pmix_client_connect.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at client/$(DEPDIR)/pmix_client_fence.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at client/$(DEPDIR)/pmix_client_get.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at client/$(DEPDIR)/pmix_client_pub.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at client/$(DEPDIR)/pmix_client_spawn.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at common/$(DEPDIR)/pmix_control.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at common/$(DEPDIR)/pmix_data.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at common/$(DEPDIR)/pmix_jobdata.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at common/$(DEPDIR)/pmix_log.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at common/$(DEPDIR)/pmix_query.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at common/$(DEPDIR)/pmix_strings.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at dstore/$(DEPDIR)/pmix_dstore.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at dstore/$(DEPDIR)/pmix_esh.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at event/$(DEPDIR)/pmix_event_notification.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at event/$(DEPDIR)/pmix_event_registration.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at include/$(DEPDIR)/pmix_globals.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at runtime/$(DEPDIR)/pmix_finalize.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at runtime/$(DEPDIR)/pmix_init.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at runtime/$(DEPDIR)/pmix_params.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at runtime/$(DEPDIR)/pmix_progress_threads.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at server/$(DEPDIR)/pmix_server.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at server/$(DEPDIR)/pmix_server_get.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at server/$(DEPDIR)/pmix_server_ops.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at server/$(DEPDIR)/pmix_server_regex.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at sm/$(DEPDIR)/pmix_mmap.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at sm/$(DEPDIR)/pmix_sm.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at threads/$(DEPDIR)/mutex.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at threads/$(DEPDIR)/thread.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at threads/$(DEPDIR)/wait_sync.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at tool/$(DEPDIR)/pmix_tool.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at util/$(DEPDIR)/alfg.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at util/$(DEPDIR)/argv.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at util/$(DEPDIR)/basename.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at util/$(DEPDIR)/compress.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at util/$(DEPDIR)/crc.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at util/$(DEPDIR)/error.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at util/$(DEPDIR)/fd.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at util/$(DEPDIR)/getid.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at util/$(DEPDIR)/hash.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at util/$(DEPDIR)/keyval_parse.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at util/$(DEPDIR)/net.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at util/$(DEPDIR)/os_path.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at util/$(DEPDIR)/output.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at util/$(DEPDIR)/parse_options.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at util/$(DEPDIR)/path.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at util/$(DEPDIR)/pif.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at util/$(DEPDIR)/pmix_environ.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at util/$(DEPDIR)/printf.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at util/$(DEPDIR)/show_help.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at util/$(DEPDIR)/show_help_lex.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at util/$(DEPDIR)/timings.Plo at am__quote@
+
+.c.o:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+ at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+.l.c:
+	$(AM_V_LEX)$(am__skiplex) $(SHELL) $(YLWRAP) $< $(LEX_OUTPUT_ROOT).c $@ -- $(LEXCOMPILE)
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+	-rm -rf buffer_ops/.libs buffer_ops/_libs
+	-rm -rf class/.libs class/_libs
+	-rm -rf client/.libs client/_libs
+	-rm -rf common/.libs common/_libs
+	-rm -rf dstore/.libs dstore/_libs
+	-rm -rf event/.libs event/_libs
+	-rm -rf include/.libs include/_libs
+	-rm -rf runtime/.libs runtime/_libs
+	-rm -rf server/.libs server/_libs
+	-rm -rf sm/.libs sm/_libs
+	-rm -rf threads/.libs threads/_libs
+	-rm -rf tool/.libs tool/_libs
+	-rm -rf util/.libs util/_libs
+install-dist_pmixdataDATA: $(dist_pmixdata_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(dist_pmixdata_DATA)'; test -n "$(pmixdatadir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(pmixdatadir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(pmixdatadir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pmixdatadir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pmixdatadir)" || exit $$?; \
+	done
+
+uninstall-dist_pmixdataDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_pmixdata_DATA)'; test -n "$(pmixdatadir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(pmixdatadir)'; $(am__uninstall_files_from_dir)
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+		am__skip_mode_fix=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile $(LTLIBRARIES) $(DATA)
+installdirs: installdirs-recursive
+installdirs-am:
+	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pmixdatadir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+	-rm -f buffer_ops/$(DEPDIR)/$(am__dirstamp)
+	-rm -f buffer_ops/$(am__dirstamp)
+	-rm -f class/$(DEPDIR)/$(am__dirstamp)
+	-rm -f class/$(am__dirstamp)
+	-rm -f client/$(DEPDIR)/$(am__dirstamp)
+	-rm -f client/$(am__dirstamp)
+	-rm -f common/$(DEPDIR)/$(am__dirstamp)
+	-rm -f common/$(am__dirstamp)
+	-rm -f dstore/$(DEPDIR)/$(am__dirstamp)
+	-rm -f dstore/$(am__dirstamp)
+	-rm -f event/$(DEPDIR)/$(am__dirstamp)
+	-rm -f event/$(am__dirstamp)
+	-rm -f include/$(DEPDIR)/$(am__dirstamp)
+	-rm -f include/$(am__dirstamp)
+	-rm -f runtime/$(DEPDIR)/$(am__dirstamp)
+	-rm -f runtime/$(am__dirstamp)
+	-rm -f server/$(DEPDIR)/$(am__dirstamp)
+	-rm -f server/$(am__dirstamp)
+	-rm -f sm/$(DEPDIR)/$(am__dirstamp)
+	-rm -f sm/$(am__dirstamp)
+	-rm -f threads/$(DEPDIR)/$(am__dirstamp)
+	-rm -f threads/$(am__dirstamp)
+	-rm -f tool/$(DEPDIR)/$(am__dirstamp)
+	-rm -f tool/$(am__dirstamp)
+	-rm -f util/$(DEPDIR)/$(am__dirstamp)
+	-rm -f util/$(am__dirstamp)
+	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+	-rm -f util/show_help_lex.c
+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+clean: clean-recursive
+
+clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+	clean-noinstLTLIBRARIES mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -rf buffer_ops/$(DEPDIR) class/$(DEPDIR) client/$(DEPDIR) common/$(DEPDIR) dstore/$(DEPDIR) event/$(DEPDIR) include/$(DEPDIR) runtime/$(DEPDIR) server/$(DEPDIR) sm/$(DEPDIR) threads/$(DEPDIR) tool/$(DEPDIR) util/$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+html-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am: install-dist_pmixdataDATA
+
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
+install-exec-am: install-libLTLIBRARIES
+
+install-html: install-html-recursive
+
+install-html-am:
+
+install-info: install-info-recursive
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -rf buffer_ops/$(DEPDIR) class/$(DEPDIR) client/$(DEPDIR) common/$(DEPDIR) dstore/$(DEPDIR) event/$(DEPDIR) include/$(DEPDIR) runtime/$(DEPDIR) server/$(DEPDIR) sm/$(DEPDIR) threads/$(DEPDIR) tool/$(DEPDIR) util/$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-dist_pmixdataDATA uninstall-libLTLIBRARIES
+
+.MAKE: $(am__recursive_targets) install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+	check-am clean clean-generic clean-libLTLIBRARIES \
+	clean-libtool clean-noinstLTLIBRARIES 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-dist_pmixdataDATA install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am \
+	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs installdirs-am 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-dist_pmixdataDATA uninstall-libLTLIBRARIES
+
+.PRECIOUS: Makefile
+
+
+# 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/atomics/sys/Makefile.include b/src/atomics/sys/Makefile.include
new file mode 100644
index 0000000..9f677e5
--- /dev/null
+++ b/src/atomics/sys/Makefile.include
@@ -0,0 +1,44 @@
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2010      Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2011      Sandia National Laboratories. All rights reserved.
+# Copyright (c) 2016      Los A.includeos National Security, LLC. All rights
+#                         reserved.
+# Copyright (c) 2017      Research Organization for Information Science
+#                         and Technology (RIST). All rights reserved.
+# Copyright (c) 2017      Intel, Inc. All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# This makefile.include does not stand on its own - it is included from src/Makefile.am
+
+headers += \
+	atomics/sys/architecture.h \
+	atomics/sys/atomic.h \
+	atomics/sys/atomic_impl.h \
+	atomics/sys/timer.h \
+        atomics/sys/cma.h
+
+include atomics/sys/x86_64/Makefile.include
+include atomics/sys/arm/Makefile.include
+include atomics/sys/arm64/Makefile.include
+include atomics/sys/ia32/Makefile.include
+include atomics/sys/ia64/Makefile.include
+include atomics/sys/mips/Makefile.include
+include atomics/sys/powerpc/Makefile.include
+include atomics/sys/sparcv9/Makefile.include
+include atomics/sys/sync_builtin/Makefile.include
+include atomics/sys/gcc_builtin/Makefile.include
diff --git a/src/atomics/sys/architecture.h b/src/atomics/sys/architecture.h
new file mode 100644
index 0000000..244c966
--- /dev/null
+++ b/src/atomics/sys/architecture.h
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2005 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2011      Sandia National Laboratories. All rights reserved.
+ * Copyright (c) 2014-2017 Intel, Inc. All rights reserved.
+ * Copyright (c) 2016      Los Alamos National Security, LLC. All rights
+ *                         reserved.
+ * Copyright (c) 2017      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+/*
+ * List of supported architectures
+ */
+
+#ifndef PMIX_SYS_ARCHITECTURE_H
+#define PMIX_SYS_ARCHITECTURE_H
+
+/* Architectures */
+#define PMIX_UNSUPPORTED    0000
+#define PMIX_IA32           0010
+#define PMIX_IA64           0020
+#define PMIX_X86_64         0030
+#define PMIX_POWERPC32      0050
+#define PMIX_POWERPC64      0051
+#define PMIX_SPARC          0060
+#define PMIX_SPARCV9_32     0061
+#define PMIX_SPARCV9_64     0062
+#define PMIX_MIPS           0070
+#define PMIX_ARM            0100
+#define PMIX_ARM64          0101
+#define PMIX_S390           0110
+#define PMIX_S390X          0111
+#define PMIX_BUILTIN_SYNC   0200
+#define PMIX_BUILTIN_GCC    0202
+#define PMIX_BUILTIN_NO     0203
+
+/* Formats */
+#define PMIX_DEFAULT        1000  /* standard for given architecture */
+#define PMIX_DARWIN         1001  /* Darwin / OS X on PowerPC */
+#define PMIX_PPC_LINUX      1002  /* Linux on PowerPC */
+#define PMIX_AIX            1003  /* AIX on Power / PowerPC */
+
+#endif /* #ifndef PMIX_SYS_ARCHITECTURE_H */
diff --git a/src/atomics/sys/arm/Makefile.include b/src/atomics/sys/arm/Makefile.include
new file mode 100644
index 0000000..e25774e
--- /dev/null
+++ b/src/atomics/sys/arm/Makefile.include
@@ -0,0 +1,24 @@
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2008 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2017      Intel, Inc. All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# This makefile.am does not stand on its own - it is included from src/atomics/sys/include/Makefile.include
+
+headers += \
+       atomics/sys/arm/atomic.h \
+       atomics/sys/arm/timer.h
diff --git a/src/atomics/sys/arm/atomic.h b/src/atomics/sys/arm/atomic.h
new file mode 100644
index 0000000..1ee2462
--- /dev/null
+++ b/src/atomics/sys/arm/atomic.h
@@ -0,0 +1,277 @@
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2005 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2010      IBM Corporation.  All rights reserved.
+ * Copyright (c) 2010      ARM ltd.  All rights reserved.
+ * Copyright (c) 2017      Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+/*
+ * ARMv5 and earlier lack robust atomic operations and therefore this file uses
+ * Linux kernel support where needed.  The kernel also provides memory barriers
+ * and this file uses them for ARMv5 and earlier processors, which lack the
+ * memory barrier instruction.  These kernel functions are available on kernel
+ * versions 2.6.15 and greater; using them will result in undefined behavior on
+ * older kernels.
+ * See Documentation/arm/kernel_user_helpers.txt in the kernel tree for details
+ */
+
+#ifndef PMIX_SYS_ARCH_ATOMIC_H
+#define PMIX_SYS_ARCH_ATOMIC_H 1
+
+#if (PMIX_ASM_ARM_VERSION >= 7)
+
+#define PMIX_HAVE_ATOMIC_MEM_BARRIER 1
+/* use the DMB instruction if available... */
+
+#define PMIXMB()  __asm__ __volatile__ ("dmb" : : : "memory")
+#define PMIXRMB() __asm__ __volatile__ ("dmb" : : : "memory")
+#define PMIXWMB() __asm__ __volatile__ ("dmb" : : : "memory")
+
+#elif (PMIX_ASM_ARM_VERSION == 6)
+
+#define PMIX_HAVE_ATOMIC_MEM_BARRIER 1
+/* ...or the v6-specific equivalent... */
+
+#define PMIXMB()  __asm__ __volatile__ ("mcr p15, 0, r0, c7, c10, 5" : : : "memory")
+#define PMIXRMB() MB()
+#define PMIXWMB() MB()
+
+#else
+
+#define PMIX_HAVE_ATOMIC_MEM_BARRIER 1
+/* ...otherwise use the Linux kernel-provided barrier */
+
+#define PMIXMB() (*((void (*)(void))(0xffff0fa0)))()
+#define PMIXRMB() MB()
+#define PMIXWMB() MB()
+
+#endif
+
+/**********************************************************************
+ *
+ * Memory Barriers
+ *
+ *********************************************************************/
+
+#if (PMIX_HAVE_ATOMIC_MEM_BARRIER == 1)
+
+static inline
+void pmix_atomic_mb(void)
+{
+    PMIXMB();
+}
+
+
+static inline
+void pmix_atomic_rmb(void)
+{
+    PMIXRMB();
+}
+
+
+static inline
+void pmix_atomic_wmb(void)
+{
+    PMIXWMB();
+}
+
+static inline
+void pmix_atomic_isync(void)
+{
+}
+
+#endif
+
+
+/**********************************************************************
+ *
+ * Atomic math operations
+ *
+ *********************************************************************/
+
+#if (PMIX_GCC_INLINE_ASSEMBLY && (PMIX_ASM_ARM_VERSION >= 6))
+
+#define PMIX_HAVE_ATOMIC_CMPSET_32 1
+#define PMIX_HAVE_ATOMIC_MATH_32 1
+static inline int pmix_atomic_cmpset_32(volatile int32_t *addr,
+                                        int32_t oldval, int32_t newval)
+{
+  int32_t ret, tmp;
+
+   __asm__ __volatile__ (
+                         "1:  ldrex   %0, [%2]        \n"
+                         "    cmp     %0, %3          \n"
+                         "    bne     2f              \n"
+                         "    strex   %1, %4, [%2]    \n"
+                         "    cmp     %1, #0          \n"
+                         "    bne     1b              \n"
+                         "2:                          \n"
+
+                         : "=&r" (ret), "=&r" (tmp)
+                         : "r" (addr), "r" (oldval), "r" (newval)
+                         : "cc", "memory");
+
+   return (ret == oldval);
+}
+
+/* these two functions aren't inlined in the non-gcc case because then
+   there would be two function calls (since neither cmpset_32 nor
+   atomic_?mb can be inlined).  Instead, we "inline" them by hand in
+   the assembly, meaning there is one function call overhead instead
+   of two */
+static inline int pmix_atomic_cmpset_acq_32(volatile int32_t *addr,
+                                            int32_t oldval, int32_t newval)
+{
+    int rc;
+
+    rc = pmix_atomic_cmpset_32(addr, oldval, newval);
+    pmix_atomic_rmb();
+
+    return rc;
+}
+
+
+static inline int pmix_atomic_cmpset_rel_32(volatile int32_t *addr,
+                                            int32_t oldval, int32_t newval)
+{
+    pmix_atomic_wmb();
+    return pmix_atomic_cmpset_32(addr, oldval, newval);
+}
+
+#if (PMIX_ASM_SUPPORT_64BIT == 1)
+
+#define PMIX_HAVE_ATOMIC_CMPSET_64 1
+static inline int pmix_atomic_cmpset_64(volatile int64_t *addr,
+                                        int64_t oldval, int64_t newval)
+{
+  int64_t ret;
+  int tmp;
+
+
+   __asm__ __volatile__ (
+                         "1:  ldrexd  %0, %H0, [%2]           \n"
+                         "    cmp     %0, %3                  \n"
+                         "    it      eq                      \n"
+                         "    cmpeq   %H0, %H3                \n"
+                         "    bne     2f                      \n"
+                         "    strexd  %1, %4, %H4, [%2]       \n"
+                         "    cmp     %1, #0                  \n"
+                         "    bne     1b                      \n"
+                         "2:                                    \n"
+
+                         : "=&r" (ret), "=&r" (tmp)
+                         : "r" (addr), "r" (oldval), "r" (newval)
+                         : "cc", "memory");
+
+   return (ret == oldval);
+}
+
+/* these two functions aren't inlined in the non-gcc case because then
+   there would be two function calls (since neither cmpset_64 nor
+   atomic_?mb can be inlined).  Instead, we "inline" them by hand in
+   the assembly, meaning there is one function call overhead instead
+   of two */
+static inline int pmix_atomic_cmpset_acq_64(volatile int64_t *addr,
+                                            int64_t oldval, int64_t newval)
+{
+    int rc;
+
+    rc = pmix_atomic_cmpset_64(addr, oldval, newval);
+    pmix_atomic_rmb();
+
+    return rc;
+}
+
+
+static inline int pmix_atomic_cmpset_rel_64(volatile int64_t *addr,
+                                            int64_t oldval, int64_t newval)
+{
+    pmix_atomic_wmb();
+    return pmix_atomic_cmpset_64(addr, oldval, newval);
+}
+
+#endif
+
+
+#define PMIX_HAVE_ATOMIC_ADD_32 1
+static inline int32_t pmix_atomic_add_32(volatile int32_t* v, int inc)
+{
+   int32_t t;
+   int tmp;
+
+   __asm__ __volatile__(
+                         "1:  ldrex   %0, [%2]        \n"
+                         "    add     %0, %0, %3      \n"
+                         "    strex   %1, %0, [%2]    \n"
+                         "    cmp     %1, #0          \n"
+                         "    bne     1b              \n"
+
+                         : "=&r" (t), "=&r" (tmp)
+                         : "r" (v), "r" (inc)
+                         : "cc", "memory");
+
+
+   return t;
+}
+
+#define PMIX_HAVE_ATOMIC_SUB_32 1
+static inline int32_t pmix_atomic_sub_32(volatile int32_t* v, int dec)
+{
+   int32_t t;
+   int tmp;
+
+   __asm__ __volatile__(
+                         "1:  ldrex   %0, [%2]        \n"
+                         "    sub     %0, %0, %3      \n"
+                         "    strex   %1, %0, [%2]    \n"
+                         "    cmp     %1, #0          \n"
+                         "    bne     1b              \n"
+
+                         : "=&r" (t), "=&r" (tmp)
+                         : "r" (v), "r" (dec)
+                         : "cc", "memory");
+
+   return t;
+}
+
+#else /* PMIX_ASM_ARM_VERSION <=5 or no GCC inline assembly */
+
+#define PMIX_HAVE_ATOMIC_CMPSET_32 1
+#define __kuser_cmpxchg (*((int (*)(int, int, volatile int*))(0xffff0fc0)))
+static inline int pmix_atomic_cmpset_32(volatile int32_t *addr,
+                                        int32_t oldval, int32_t newval)
+{
+    return !(__kuser_cmpxchg(oldval, newval, addr));
+}
+
+static inline int pmix_atomic_cmpset_acq_32(volatile int32_t *addr,
+                                            int32_t oldval, int32_t newval)
+{
+    /* kernel function includes all necessary memory barriers */
+    return pmix_atomic_cmpset_32(addr, oldval, newval);
+}
+
+static inline int pmix_atomic_cmpset_rel_32(volatile int32_t *addr,
+                                            int32_t oldval, int32_t newval)
+{
+    /* kernel function includes all necessary memory barriers */
+    return pmix_atomic_cmpset_32(addr, oldval, newval);
+}
+
+#endif
+
+#endif /* ! PMIX_SYS_ARCH_ATOMIC_H */
diff --git a/src/atomics/sys/arm/timer.h b/src/atomics/sys/arm/timer.h
new file mode 100644
index 0000000..fd280cc
--- /dev/null
+++ b/src/atomics/sys/arm/timer.h
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2008      The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#ifndef PMIX_SYS_ARCH_TIMER_H
+#define PMIX_SYS_ARCH_TIMER_H 1
+
+#include <sys/times.h>
+
+typedef uint64_t pmix_timer_t;
+
+static inline pmix_timer_t
+pmix_sys_timer_get_cycles(void)
+{
+    pmix_timer_t ret;
+    struct tms accurate_clock;
+
+    times(&accurate_clock);
+    ret = accurate_clock.tms_utime + accurate_clock.tms_stime;
+
+    return ret;
+}
+
+#define PMIX_HAVE_SYS_TIMER_GET_CYCLES 1
+
+#endif /* ! PMIX_SYS_ARCH_TIMER_H */
diff --git a/src/atomics/sys/arm64/Makefile.include b/src/atomics/sys/arm64/Makefile.include
new file mode 100644
index 0000000..980c5fe
--- /dev/null
+++ b/src/atomics/sys/arm64/Makefile.include
@@ -0,0 +1,24 @@
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2008 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2017      Intel, Inc. All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# This makefile.am does not stand on its own - it is included from pmix/include/Makefile.am
+
+headers += \
+       atomics/sys/arm64/atomic.h \
+       atomics/sys/arm64/timer.h
diff --git a/src/atomics/sys/arm64/atomic.h b/src/atomics/sys/arm64/atomic.h
new file mode 100644
index 0000000..c48c914
--- /dev/null
+++ b/src/atomics/sys/arm64/atomic.h
@@ -0,0 +1,302 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2005 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2010      IBM Corporation.  All rights reserved.
+ * Copyright (c) 2010      ARM ltd.  All rights reserved.
+ * Copyright (c) 2016      Los Alamos National Security, LLC. All rights
+ *                         reserved.
+ * Copyright (c) 2017      Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#if !defined(PMIX_SYS_ARCH_ATOMIC_H)
+
+#define PMIX_SYS_ARCH_ATOMIC_H 1
+
+#if PMIX_GCC_INLINE_ASSEMBLY
+
+#define PMIX_HAVE_ATOMIC_MEM_BARRIER 1
+#define PMIX_HAVE_ATOMIC_LLSC_32 1
+#define PMIX_HAVE_ATOMIC_CMPSET_32 1
+#define PMIX_HAVE_ATOMIC_SWAP_32 1
+#define PMIX_HAVE_ATOMIC_MATH_32 1
+#define PMIX_HAVE_ATOMIC_CMPSET_64 1
+#define PMIX_HAVE_ATOMIC_SWAP_64 1
+#define PMIX_HAVE_ATOMIC_LLSC_64 1
+#define PMIX_HAVE_ATOMIC_ADD_32 1
+#define PMIX_HAVE_ATOMIC_SUB_32 1
+#define PMIX_HAVE_ATOMIC_ADD_64 1
+#define PMIX_HAVE_ATOMIC_SUB_64 1
+
+#define PMIXMB()  __asm__ __volatile__ ("dmb sy" : : : "memory")
+#define PMIXRMB() __asm__ __volatile__ ("dmb ld" : : : "memory")
+#define PMIXWMB() __asm__ __volatile__ ("dmb st" : : : "memory")
+
+/**********************************************************************
+ *
+ * Memory Barriers
+ *
+ *********************************************************************/
+
+static inline void pmix_atomic_mb (void)
+{
+    PMIXMB();
+}
+
+static inline void pmix_atomic_rmb (void)
+{
+    PMIXRMB();
+}
+
+static inline void pmix_atomic_wmb (void)
+{
+    PMIXWMB();
+}
+
+static inline void pmix_atomic_isync (void)
+{
+    __asm__ __volatile__ ("isb");
+}
+
+/**********************************************************************
+ *
+ * Atomic math operations
+ *
+ *********************************************************************/
+
+static inline int pmix_atomic_cmpset_32(volatile int32_t *addr,
+                                        int32_t oldval, int32_t newval)
+{
+    int32_t ret, tmp;
+
+    __asm__ __volatile__ ("1:  ldaxr    %w0, [%2]      \n"
+                          "    cmp     %w0, %w3        \n"
+                          "    bne     2f              \n"
+                          "    stxr    %w1, %w4, [%2]  \n"
+                          "    cbnz    %w1, 1b         \n"
+                          "2:                          \n"
+                          : "=&r" (ret), "=&r" (tmp)
+                          : "r" (addr), "r" (oldval), "r" (newval)
+                          : "cc", "memory");
+
+    return (ret == oldval);
+}
+
+static inline int32_t pmix_atomic_swap_32(volatile int32_t *addr, int32_t newval)
+{
+    int32_t ret, tmp;
+
+    __asm__ __volatile__ ("1:  ldaxr   %w0, [%2]       \n"
+                          "    stlxr   %w1, %w3, [%2]  \n"
+                          "    cbnz    %w1, 1b         \n"
+                          : "=&r" (ret), "=&r" (tmp)
+                          : "r" (addr), "r" (newval)
+                          : "cc", "memory");
+
+    return ret;
+}
+
+/* these two functions aren't inlined in the non-gcc case because then
+   there would be two function calls (since neither cmpset_32 nor
+   atomic_?mb can be inlined).  Instead, we "inline" them by hand in
+   the assembly, meaning there is one function call overhead instead
+   of two */
+static inline int pmix_atomic_cmpset_acq_32(volatile int32_t *addr,
+                                            int32_t oldval, int32_t newval)
+{
+    int32_t ret, tmp;
+
+    __asm__ __volatile__ ("1:  ldaxr   %w0, [%2]       \n"
+                          "    cmp     %w0, %w3        \n"
+                          "    bne     2f              \n"
+                          "    stxr    %w1, %w4, [%2]  \n"
+                          "    cbnz    %w1, 1b         \n"
+                          "2:                          \n"
+                          : "=&r" (ret), "=&r" (tmp)
+                          : "r" (addr), "r" (oldval), "r" (newval)
+                          : "cc", "memory");
+
+    return (ret == oldval);
+}
+
+
+static inline int pmix_atomic_cmpset_rel_32(volatile int32_t *addr,
+                                            int32_t oldval, int32_t newval)
+{
+    int32_t ret, tmp;
+
+    __asm__ __volatile__ ("1:  ldxr    %w0, [%2]       \n"
+                          "    cmp     %w0, %w3        \n"
+                          "    bne     2f              \n"
+                          "    stlxr   %w1, %w4, [%2]  \n"
+                          "    cbnz    %w1, 1b         \n"
+                          "2:                          \n"
+                          : "=&r" (ret), "=&r" (tmp)
+                          : "r" (addr), "r" (oldval), "r" (newval)
+                          : "cc", "memory");
+
+    return (ret == oldval);
+}
+
+static inline int32_t pmix_atomic_ll_32 (volatile int32_t *addr)
+{
+    int32_t ret;
+
+    __asm__ __volatile__ ("ldaxr    %w0, [%1]          \n"
+                          : "=&r" (ret)
+                          : "r" (addr));
+
+    return ret;
+}
+
+static inline int pmix_atomic_sc_32 (volatile int32_t *addr, int32_t newval)
+{
+    int ret;
+
+    __asm__ __volatile__ ("stlxr    %w0, %w2, [%1]     \n"
+                          : "=&r" (ret)
+                          : "r" (addr), "r" (newval)
+                          : "cc", "memory");
+
+    return ret == 0;
+}
+
+static inline int pmix_atomic_cmpset_64(volatile int64_t *addr,
+                                        int64_t oldval, int64_t newval)
+{
+    int64_t ret;
+    int tmp;
+
+    __asm__ __volatile__ ("1:  ldaxr    %0, [%2]       \n"
+                          "    cmp     %0, %3          \n"
+                          "    bne     2f              \n"
+                          "    stxr    %w1, %4, [%2]   \n"
+                          "    cbnz    %w1, 1b         \n"
+                          "2:                          \n"
+                          : "=&r" (ret), "=&r" (tmp)
+                          : "r" (addr), "r" (oldval), "r" (newval)
+                          : "cc", "memory");
+
+    return (ret == oldval);
+}
+
+static inline int64_t pmix_atomic_swap_64 (volatile int64_t *addr, int64_t newval)
+{
+    int64_t ret;
+    int tmp;
+
+    __asm__ __volatile__ ("1:  ldaxr   %0, [%2]        \n"
+                          "    stlxr   %w1, %3, [%2]   \n"
+                          "    cbnz    %w1, 1b         \n"
+                          : "=&r" (ret), "=&r" (tmp)
+                          : "r" (addr), "r" (newval)
+                          : "cc", "memory");
+
+    return ret;
+}
+
+/* these two functions aren't inlined in the non-gcc case because then
+   there would be two function calls (since neither cmpset_64 nor
+   atomic_?mb can be inlined).  Instead, we "inline" them by hand in
+   the assembly, meaning there is one function call overhead instead
+   of two */
+static inline int pmix_atomic_cmpset_acq_64(volatile int64_t *addr,
+                                            int64_t oldval, int64_t newval)
+{
+    int64_t ret;
+    int tmp;
+
+    __asm__ __volatile__ ("1:  ldaxr   %0, [%2]        \n"
+                          "    cmp     %0, %3          \n"
+                          "    bne     2f              \n"
+                          "    stxr    %w1, %4, [%2]   \n"
+                          "    cbnz    %w1, 1b         \n"
+                          "2:                          \n"
+                          : "=&r" (ret), "=&r" (tmp)
+                          : "r" (addr), "r" (oldval), "r" (newval)
+                          : "cc", "memory");
+
+    return (ret == oldval);
+}
+
+
+static inline int pmix_atomic_cmpset_rel_64(volatile int64_t *addr,
+                                            int64_t oldval, int64_t newval)
+{
+    int64_t ret;
+    int tmp;
+
+    __asm__ __volatile__ ("1:  ldxr    %0, [%2]        \n"
+                          "    cmp     %0, %3          \n"
+                          "    bne     2f              \n"
+                          "    stlxr   %w1, %4, [%2]   \n"
+                          "    cbnz    %w1, 1b         \n"
+                          "2:                          \n"
+                          : "=&r" (ret), "=&r" (tmp)
+                          : "r" (addr), "r" (oldval), "r" (newval)
+                          : "cc", "memory");
+
+    return (ret == oldval);
+}
+
+static inline int64_t pmix_atomic_ll_64 (volatile int64_t *addr)
+{
+    int64_t ret;
+
+    __asm__ __volatile__ ("ldaxr    %0, [%1]        \n"
+                          : "=&r" (ret)
+                          : "r" (addr));
+
+    return ret;
+}
+
+static inline int pmix_atomic_sc_64 (volatile int64_t *addr, int64_t newval)
+{
+    int ret;
+
+    __asm__ __volatile__ ("stlxr    %w0, %2, [%1]    \n"
+                          : "=&r" (ret)
+                          : "r" (addr), "r" (newval)
+                          : "cc", "memory");
+
+    return ret == 0;
+}
+
+#define PMIX_ASM_MAKE_ATOMIC(type, bits, name, inst, reg)                   \
+    static inline type pmix_atomic_ ## name ## _ ## bits (volatile type *addr, type value) \
+    {                                                                   \
+        type newval;                                                    \
+        int32_t tmp;                                                    \
+                                                                        \
+        __asm__ __volatile__("1:  ldxr   %" reg "0, [%2]        \n"     \
+                             "    " inst "   %" reg "0, %" reg "0, %" reg "3 \n" \
+                             "    stxr   %w1, %" reg "0, [%2]   \n"     \
+                             "    cbnz   %w1, 1b         \n"            \
+                             : "=&r" (newval), "=&r" (tmp)              \
+                             : "r" (addr), "r" (value)                  \
+                             : "cc", "memory");                         \
+                                                                        \
+        return newval;                                                  \
+    }
+
+PMIX_ASM_MAKE_ATOMIC(int32_t, 32, add, "add", "w")
+PMIX_ASM_MAKE_ATOMIC(int32_t, 32, sub, "sub", "w")
+PMIX_ASM_MAKE_ATOMIC(int64_t, 64, add, "add", "")
+PMIX_ASM_MAKE_ATOMIC(int64_t, 64, sub, "sub", "")
+
+#endif /* PMIX_GCC_INLINE_ASSEMBLY */
+
+#endif /* ! PMIX_SYS_ARCH_ATOMIC_H */
diff --git a/src/atomics/sys/arm64/timer.h b/src/atomics/sys/arm64/timer.h
new file mode 100644
index 0000000..b6bfe2a
--- /dev/null
+++ b/src/atomics/sys/arm64/timer.h
@@ -0,0 +1,45 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2008      The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2016      Broadcom Limited. All rights reserved.
+ * Copyright (c) 2016      Los Alamos National Security, LLC. All rights
+ *                         reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#ifndef PMIX_SYS_ARCH_TIMER_H
+#define PMIX_SYS_ARCH_TIMER_H 1
+
+#include <sys/times.h>
+
+typedef uint64_t pmix_timer_t;
+
+static inline pmix_timer_t
+pmix_sys_timer_get_cycles(void)
+{
+    pmix_timer_t ret;
+
+    __asm__ __volatile__ ("isb" ::: "memory");
+    __asm__ __volatile__ ("mrs %0,  CNTVCT_EL0" : "=r" (ret));
+
+    return ret;
+}
+
+
+static inline pmix_timer_t
+pmix_sys_timer_freq(void)
+{
+    pmix_timer_t freq;
+    __asm__ __volatile__ ("mrs %0,  CNTFRQ_EL0" : "=r" (freq));
+    return (pmix_timer_t)(freq);
+}
+
+#define PMIX_HAVE_SYS_TIMER_GET_CYCLES 1
+
+#endif /* ! PMIX_SYS_ARCH_TIMER_H */
diff --git a/src/atomics/sys/atomic.h b/src/atomics/sys/atomic.h
new file mode 100644
index 0000000..8b66467
--- /dev/null
+++ b/src/atomics/sys/atomic.h
@@ -0,0 +1,615 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2006 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2007      Sun Microsystems, Inc.  All rights reserved.
+ * Copyright (c) 2011      Sandia National Laboratories. All rights reserved.
+ * Copyright (c) 2011-2015 Los Alamos National Security, LLC. All rights
+ *                         reserved.
+ * Copyright (c) 2017      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2017      Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+/** @file
+ *
+ * Atomic operations.
+ *
+ * This API is patterned after the FreeBSD kernel atomic interface
+ * (which is influenced by Intel's ia64 architecture).  The
+ * FreeBSD interface is documented at
+ *
+ * http://www.freebsd.org/cgi/man.cgi?query=atomic&sektion=9
+ *
+ * Only the necessary subset of functions are implemented here.
+ *
+ * The following #defines will be true / false based on
+ * assembly support:
+ *
+ *  - \c PMIX_HAVE_ATOMIC_MEM_BARRIER atomic memory barriers
+ *  - \c PMIX_HAVE_ATOMIC_SPINLOCKS atomic spinlocks
+ *  - \c PMIX_HAVE_ATOMIC_MATH_32 if 32 bit add/sub/cmpset can be done "atomicly"
+ *  - \c PMIX_HAVE_ATOMIC_MATH_64 if 64 bit add/sub/cmpset can be done "atomicly"
+ *
+ * Note that for the Atomic math, atomic add/sub may be implemented as
+ * C code using pmix_atomic_cmpset.  The appearance of atomic
+ * operation will be upheld in these cases.
+ */
+
+#ifndef PMIX_SYS_ATOMIC_H
+#define PMIX_SYS_ATOMIC_H 1
+
+#include "pmix_config.h"
+
+#include "src/atomics/sys/architecture.h"
+#include "src/include/pmix_stdint.h"
+
+/* do some quick #define cleanup in cases where we are doing
+   testing... */
+#ifdef PMIX_DISABLE_INLINE_ASM
+#undef PMIX_C_GCC_INLINE_ASSEMBLY
+#define PMIX_C_GCC_INLINE_ASSEMBLY 0
+#endif
+
+/* define PMIX_{GCC,DEC,XLC}_INLINE_ASSEMBLY based on the
+   PMIX_C_{GCC,DEC,XLC}_INLINE_ASSEMBLY defines and whether we
+   are in C or C++ */
+#if defined(c_plusplus) || defined(__cplusplus)
+/* We no longer support inline assembly for C++ as PMIX is a C-only interface */
+#define PMIX_GCC_INLINE_ASSEMBLY 0
+#else
+#define PMIX_GCC_INLINE_ASSEMBLY PMIX_C_GCC_INLINE_ASSEMBLY
+#endif
+
+
+BEGIN_C_DECLS
+/**********************************************************************
+ *
+ * Data structures for atomic ops
+ *
+ *********************************************************************/
+/**
+ * Volatile lock object (with optional padding).
+ *
+ * \note The internals of the lock are included here, but should be
+ * considered private.  The implementation currently in use may choose
+ * to use an int or unsigned char as the lock value - the user is not
+ * informed either way.
+ */
+struct pmix_atomic_lock_t {
+    union {
+        volatile int32_t lock;     /**< The lock address (an integer) */
+        volatile unsigned char sparc_lock; /**< The lock address on sparc */
+        char padding[sizeof(int)]; /**< Array for optional padding */
+    } u;
+};
+typedef struct pmix_atomic_lock_t pmix_atomic_lock_t;
+
+/**********************************************************************
+ *
+ * Set or unset these macros in the architecture-specific atomic.h
+ * files if we need to specify them as inline or non-inline
+ *
+ *********************************************************************/
+#if !PMIX_GCC_INLINE_ASSEMBLY
+#define PMIX_HAVE_INLINE_ATOMIC_MEM_BARRIER 0
+#define PMIX_HAVE_INLINE_ATOMIC_CMPSET_32 0
+#define PMIX_HAVE_INLINE_ATOMIC_CMPSET_64 0
+#define PMIX_HAVE_INLINE_ATOMIC_ADD_32 0
+#define PMIX_HAVE_INLINE_ATOMIC_SUB_32 0
+#define PMIX_HAVE_INLINE_ATOMIC_ADD_64 0
+#define PMIX_HAVE_INLINE_ATOMIC_SUB_64 0
+#define PMIX_HAVE_INLINE_ATOMIC_SWAP_32 0
+#define PMIX_HAVE_INLINE_ATOMIC_SWAP_64 0
+#else
+#define PMIX_HAVE_INLINE_ATOMIC_MEM_BARRIER 1
+#define PMIX_HAVE_INLINE_ATOMIC_CMPSET_32 1
+#define PMIX_HAVE_INLINE_ATOMIC_CMPSET_64 1
+#define PMIX_HAVE_INLINE_ATOMIC_ADD_32 1
+#define PMIX_HAVE_INLINE_ATOMIC_SUB_32 1
+#define PMIX_HAVE_INLINE_ATOMIC_ADD_64 1
+#define PMIX_HAVE_INLINE_ATOMIC_SUB_64 1
+#define PMIX_HAVE_INLINE_ATOMIC_SWAP_32 1
+#define PMIX_HAVE_INLINE_ATOMIC_SWAP_64 1
+#endif
+
+/**
+ * Enumeration of lock states
+ */
+enum {
+    PMIX_ATOMIC_UNLOCKED = 0,
+    PMIX_ATOMIC_LOCKED = 1
+};
+
+/**********************************************************************
+ *
+ * Load the appropriate architecture files and set some reasonable
+ * default values for our support
+ *
+ *********************************************************************/
+#if defined(DOXYGEN)
+/* don't include system-level gorp when generating doxygen files */
+#elif PMIX_ASSEMBLY_BUILTIN == PMIX_BUILTIN_SYNC
+#include "src/atomics/sys/sync_builtin/atomic.h"
+#elif PMIX_ASSEMBLY_BUILTIN == PMIX_BUILTIN_GCC
+#include "src/atomics/sys/gcc_builtin/atomic.h"
+#elif PMIX_ASSEMBLY_ARCH == PMIX_X86_64
+#include "src/atomics/sys/x86_64/atomic.h"
+#elif PMIX_ASSEMBLY_ARCH == PMIX_ARM
+#include "src/atomics/sys/arm/atomic.h"
+#elif PMIX_ASSEMBLY_ARCH == PMIX_ARM64
+#include "src/atomics/sys/arm64/atomic.h"
+#elif PMIX_ASSEMBLY_ARCH == PMIX_IA32
+#include "src/atomics/sys/ia32/atomic.h"
+#elif PMIX_ASSEMBLY_ARCH == PMIX_IA64
+#include "src/atomics/sys/ia64/atomic.h"
+#elif PMIX_ASSEMBLY_ARCH == PMIX_MIPS
+#include "src/atomics/sys/mips/atomic.h"
+#elif PMIX_ASSEMBLY_ARCH == PMIX_POWERPC32
+#include "src/atomics/sys/powerpc/atomic.h"
+#elif PMIX_ASSEMBLY_ARCH == PMIX_POWERPC64
+#include "src/atomics/sys/powerpc/atomic.h"
+#elif PMIX_ASSEMBLY_ARCH == PMIX_SPARC
+#include "src/atomics/sys/sparc/atomic.h"
+#elif PMIX_ASSEMBLY_ARCH == PMIX_SPARCV9_32
+#include "src/atomics/sys/sparcv9/atomic.h"
+#elif PMIX_ASSEMBLY_ARCH == PMIX_SPARCV9_64
+#include "src/atomics/sys/sparcv9/atomic.h"
+#endif
+
+#ifndef DOXYGEN
+/* compare and set operations can't really be emulated from software,
+   so if these defines aren't already set, they should be set to 0
+   now */
+#ifndef PMIX_HAVE_ATOMIC_CMPSET_32
+#define PMIX_HAVE_ATOMIC_CMPSET_32 0
+#endif
+#ifndef PMIX_HAVE_ATOMIC_CMPSET_64
+#define PMIX_HAVE_ATOMIC_CMPSET_64 0
+#endif
+#ifndef PMIX_HAVE_ATOMIC_CMPSET_128
+#define PMIX_HAVE_ATOMIC_CMPSET_128 0
+#endif
+#ifndef PMIX_HAVE_ATOMIC_LLSC_32
+#define PMIX_HAVE_ATOMIC_LLSC_32 0
+#endif
+#ifndef PMIX_HAVE_ATOMIC_LLSC_64
+#define PMIX_HAVE_ATOMIC_LLSC_64 0
+#endif
+#endif /* DOXYGEN */
+
+/**********************************************************************
+ *
+ * Memory Barriers - defined here if running doxygen or have barriers
+ *                   but can't inline
+ *
+ *********************************************************************/
+#if !defined(PMIX_HAVE_ATOMIC_MEM_BARRIER) && !defined(DOXYGEN)
+/* no way to emulate in C code */
+#define PMIX_HAVE_ATOMIC_MEM_BARRIER 0
+#endif
+
+#if defined(DOXYGEN) || PMIX_HAVE_ATOMIC_MEM_BARRIER
+/**
+ * Memory barrier
+ *
+ * Will use system-specific features to instruct the processor and
+ * memory controller that all writes and reads that have been posted
+ * before the call to \c pmix_atomic_mb() must appear to have
+ * completed before the next read or write.
+ *
+ * \note This can have some expensive side effects, including flushing
+ * the pipeline, preventing the cpu from reordering instructions, and
+ * generally grinding the memory controller's performance.  Use only
+ * if you need *both* read and write barriers.
+ */
+
+#if PMIX_HAVE_INLINE_ATOMIC_MEM_BARRIER
+static inline
+#endif
+void pmix_atomic_mb(void);
+
+/**
+ * Read memory barrier
+ *
+ * Use system-specific features to instruct the processor and memory
+ * conrtoller that all reads that have been posted before the call to
+ * \c pmix_atomic_rmb() must appear to have been completed before the
+ * next read.  Nothing is said about the ordering of writes when using
+ * \c pmix_atomic_rmb().
+ */
+
+#if PMIX_HAVE_INLINE_ATOMIC_MEM_BARRIER
+static inline
+#endif
+void pmix_atomic_rmb(void);
+
+/**
+ * Write memory barrier.
+ *
+ * Use system-specific features to instruct the processor and memory
+ * conrtoller that all writes that have been posted before the call to
+ * \c pmix_atomic_wmb() must appear to have been completed before the
+ * next write.  Nothing is said about the ordering of reads when using
+ * \c pmix_atomic_wmb().
+ */
+
+#if PMIX_HAVE_INLINE_ATOMIC_MEM_BARRIER
+static inline
+#endif
+void pmix_atomic_wmb(void);
+
+#endif /* defined(DOXYGEN) || PMIX_HAVE_ATOMIC_MEM_BARRIER */
+
+
+/**********************************************************************
+ *
+ * Atomic spinlocks - always inlined, if have atomic cmpset
+ *
+ *********************************************************************/
+
+#if !defined(PMIX_HAVE_ATOMIC_SPINLOCKS) && !defined(DOXYGEN)
+/* 0 is more like "pending" - we'll fix up at the end after all
+   the static inline functions are declared */
+#define PMIX_HAVE_ATOMIC_SPINLOCKS 0
+#endif
+
+#if defined(DOXYGEN) || PMIX_HAVE_ATOMIC_SPINLOCKS || (PMIX_HAVE_ATOMIC_CMPSET_32 || PMIX_HAVE_ATOMIC_CMPSET_64)
+
+/**
+ * Initialize a lock to value
+ *
+ * @param lock         Address of the lock
+ * @param value        Initial value to set lock to
+ */
+#if PMIX_HAVE_ATOMIC_SPINLOCKS == 0
+static inline
+#endif
+void pmix_atomic_init(pmix_atomic_lock_t* lock, int32_t value);
+
+
+/**
+ * Try to acquire a lock.
+ *
+ * @param lock          Address of the lock.
+ * @return              0 if the lock was acquired, 1 otherwise.
+ */
+#if PMIX_HAVE_ATOMIC_SPINLOCKS == 0
+static inline
+#endif
+int pmix_atomic_trylock(pmix_atomic_lock_t *lock);
+
+
+/**
+ * Acquire a lock by spinning.
+ *
+ * @param lock          Address of the lock.
+ */
+#if PMIX_HAVE_ATOMIC_SPINLOCKS == 0
+static inline
+#endif
+void pmix_atomic_lock(pmix_atomic_lock_t *lock);
+
+
+/**
+ * Release a lock.
+ *
+ * @param lock          Address of the lock.
+ */
+#if PMIX_HAVE_ATOMIC_SPINLOCKS == 0
+static inline
+#endif
+void pmix_atomic_unlock(pmix_atomic_lock_t *lock);
+
+
+#if PMIX_HAVE_ATOMIC_SPINLOCKS == 0
+#undef PMIX_HAVE_ATOMIC_SPINLOCKS
+#define PMIX_HAVE_ATOMIC_SPINLOCKS (PMIX_HAVE_ATOMIC_CMPSET_32 || PMIX_HAVE_ATOMIC_CMPSET_64)
+#define PMIX_NEED_INLINE_ATOMIC_SPINLOCKS 1
+#endif
+
+#endif /* PMIX_HAVE_ATOMIC_SPINLOCKS */
+
+
+/**********************************************************************
+ *
+ * Atomic math operations
+ *
+ *********************************************************************/
+#if !defined(PMIX_HAVE_ATOMIC_CMPSET_32) && !defined(DOXYGEN)
+#define PMIX_HAVE_ATOMIC_CMPSET_32 0
+#endif
+#if defined(DOXYGEN) || PMIX_HAVE_ATOMIC_CMPSET_32
+
+#if PMIX_HAVE_INLINE_ATOMIC_CMPSET_32
+static inline
+#endif
+int pmix_atomic_cmpset_32(volatile int32_t *addr, int32_t oldval,
+                          int32_t newval);
+
+#if PMIX_HAVE_INLINE_ATOMIC_CMPSET_32
+static inline
+#endif
+int pmix_atomic_cmpset_acq_32(volatile int32_t *addr, int32_t oldval,
+                              int32_t newval);
+
+#if PMIX_HAVE_INLINE_ATOMIC_CMPSET_32
+static inline
+#endif
+int pmix_atomic_cmpset_rel_32(volatile int32_t *addr, int32_t oldval,
+                              int32_t newval);
+#endif
+
+
+#if !defined(PMIX_HAVE_ATOMIC_CMPSET_64) && !defined(DOXYGEN)
+#define PMIX_HAVE_ATOMIC_CMPSET_64 0
+#endif
+#if defined(DOXYGEN) || PMIX_HAVE_ATOMIC_CMPSET_64
+
+#if PMIX_HAVE_INLINE_ATOMIC_CMPSET_64
+static inline
+#endif
+int pmix_atomic_cmpset_64(volatile int64_t *addr, int64_t oldval,
+                          int64_t newval);
+
+#if PMIX_HAVE_INLINE_ATOMIC_CMPSET_64
+static inline
+#endif
+int pmix_atomic_cmpset_acq_64(volatile int64_t *addr, int64_t oldval,
+                              int64_t newval);
+
+#if PMIX_HAVE_INLINE_ATOMIC_CMPSET_64
+static inline
+#endif
+int pmix_atomic_cmpset_rel_64(volatile int64_t *addr, int64_t oldval,
+                              int64_t newval);
+
+#endif
+
+#if !defined(PMIX_HAVE_ATOMIC_MATH_32) && !defined(DOXYGEN)
+  /* define to 0 for these tests.  WIll fix up later. */
+  #define PMIX_HAVE_ATOMIC_MATH_32 0
+#endif
+
+#if defined(DOXYGEN) || PMIX_HAVE_ATOMIC_MATH_32 || PMIX_HAVE_ATOMIC_CMPSET_32
+
+/* PMIX_HAVE_INLINE_ATOMIC_*_32 will be 1 if <arch>/atomic.h provides
+   a static inline version of it (in assembly).  If we have to fall
+   back on cmpset 32, that too will be inline. */
+#if PMIX_HAVE_INLINE_ATOMIC_ADD_32 || (!defined(PMIX_HAVE_ATOMIC_ADD_32) && PMIX_HAVE_ATOMIC_CMPSET_32)
+static inline
+#endif
+int32_t pmix_atomic_add_32(volatile int32_t *addr, int delta);
+
+/* PMIX_HAVE_INLINE_ATOMIC_*_32 will be 1 if <arch>/atomic.h provides
+   a static inline version of it (in assembly).  If we have to fall
+   back to cmpset 32, that too will be inline. */
+#if PMIX_HAVE_INLINE_ATOMIC_SUB_32 || (!defined(PMIX_HAVE_ATOMIC_ADD_32) && PMIX_HAVE_ATOMIC_CMPSET_32)
+static inline
+#endif
+int32_t pmix_atomic_sub_32(volatile int32_t *addr, int delta);
+
+#endif /* PMIX_HAVE_ATOMIC_MATH_32 */
+
+#if ! PMIX_HAVE_ATOMIC_MATH_32
+/* fix up the value of pmix_have_atomic_math_32 to allow for C versions */
+#undef PMIX_HAVE_ATOMIC_MATH_32
+#define PMIX_HAVE_ATOMIC_MATH_32 PMIX_HAVE_ATOMIC_CMPSET_32
+#endif
+
+#ifndef PMIX_HAVE_ATOMIC_MATH_64
+/* define to 0 for these tests.  WIll fix up later. */
+#define PMIX_HAVE_ATOMIC_MATH_64 0
+#endif
+
+#if defined(DOXYGEN) || PMIX_HAVE_ATOMIC_MATH_64 || PMIX_HAVE_ATOMIC_CMPSET_64
+
+/* PMIX_HAVE_INLINE_ATOMIC_*_64 will be 1 if <arch>/atomic.h provides
+   a static inline version of it (in assembly).  If we have to fall
+   back to cmpset 64, that too will be inline */
+#if PMIX_HAVE_INLINE_ATOMIC_ADD_64 || (!defined(PMIX_HAVE_ATOMIC_ADD_64) && PMIX_HAVE_ATOMIC_CMPSET_64)
+static inline
+#endif
+int64_t pmix_atomic_add_64(volatile int64_t *addr, int64_t delta);
+
+/* PMIX_HAVE_INLINE_ATOMIC_*_64 will be 1 if <arch>/atomic.h provides
+   a static inline version of it (in assembly).  If we have to fall
+   back to cmpset 64, that too will be inline */
+#if PMIX_HAVE_INLINE_ATOMIC_SUB_64 || (!defined(PMIX_HAVE_ATOMIC_ADD_64) && PMIX_HAVE_ATOMIC_CMPSET_64)
+static inline
+#endif
+int64_t pmix_atomic_sub_64(volatile int64_t *addr, int64_t delta);
+
+#endif /* PMIX_HAVE_ATOMIC_MATH_32 */
+
+#if ! PMIX_HAVE_ATOMIC_MATH_64
+/* fix up the value of pmix_have_atomic_math_64 to allow for C versions */
+#undef PMIX_HAVE_ATOMIC_MATH_64
+#define PMIX_HAVE_ATOMIC_MATH_64 PMIX_HAVE_ATOMIC_CMPSET_64
+#endif
+
+/* provide a size_t add/subtract.  When in debug mode, make it an
+ * inline function so that we don't have any casts in the
+ *  interface and can catch type errors.  When not in debug mode,
+ * just make it a macro, so that there's no performance penalty
+ */
+#if defined(DOXYGEN) || PMIX_ENABLE_DEBUG
+static inline size_t
+pmix_atomic_add_size_t(volatile size_t *addr, int delta)
+{
+#if SIZEOF_SIZE_T == 4
+    return (size_t) pmix_atomic_add_32((int32_t*) addr, delta);
+#elif SIZEOF_SIZE_T == 8
+    return (size_t) pmix_atomic_add_64((int64_t*) addr, delta);
+#else
+#error "Unknown size_t size"
+#endif
+}
+static inline size_t
+pmix_atomic_sub_size_t(volatile size_t *addr, int delta)
+{
+#if SIZEOF_SIZE_T == 4
+    return (size_t) pmix_atomic_sub_32((int32_t*) addr, delta);
+#elif SIZEOF_SIZE_T == 8
+    return (size_t) pmix_atomic_sub_64((int64_t*) addr, delta);
+#else
+#error "Unknown size_t size"
+#endif
+}
+#else
+#if SIZEOF_SIZE_T == 4
+#define pmix_atomic_add_size_t(addr, delta) ((size_t) pmix_atomic_add_32((int32_t*) addr, delta))
+#define pmix_atomic_sub_size_t(addr, delta) ((size_t) pmix_atomic_sub_32((int32_t*) addr, delta))
+#elif SIZEOF_SIZE_T ==8
+#define pmix_atomic_add_size_t(addr, delta) ((size_t) pmix_atomic_add_64((int64_t*) addr, delta))
+#define pmix_atomic_sub_size_t(addr, delta) ((size_t) pmix_atomic_sub_64((int64_t*) addr, delta))
+#else
+#error "Unknown size_t size"
+#endif
+#endif
+
+#if defined(DOXYGEN) || (PMIX_HAVE_ATOMIC_CMPSET_32 || PMIX_HAVE_ATOMIC_CMPSET_64)
+/* these are always done with inline functions, so always mark as
+   static inline */
+static inline int pmix_atomic_cmpset_xx(volatile void* addr, int64_t oldval,
+                                        int64_t newval, size_t length);
+static inline int pmix_atomic_cmpset_acq_xx(volatile void* addr,
+                                            int64_t oldval,  int64_t newval,
+                                            size_t length);
+static inline int pmix_atomic_cmpset_rel_xx(volatile void* addr,
+                                            int64_t oldval, int64_t newval,
+                                            size_t length);
+
+static inline int pmix_atomic_cmpset_ptr(volatile void* addr,
+                                         void* oldval,
+                                         void* newval);
+static inline int pmix_atomic_cmpset_acq_ptr(volatile void* addr,
+                                             void* oldval,
+                                             void* newval);
+static inline int pmix_atomic_cmpset_rel_ptr(volatile void* addr,
+                                             void* oldval,
+                                             void* newval);
+
+/**
+ * Atomic compare and set of pointer with relaxed semantics. This
+ * macro detect at compile time the type of the first argument and
+ * choose the correct function to be called.
+ *
+ * \note This macro should only be used for integer types.
+ *
+ * @param addr          Address of <TYPE>.
+ * @param oldval        Comparison value <TYPE>.
+ * @param newval        New value to set if comparision is true <TYPE>.
+ *
+ * See pmix_atomic_cmpset_* for pseudo-code.
+ */
+#define pmix_atomic_cmpset( ADDR, OLDVAL, NEWVAL )                  \
+   pmix_atomic_cmpset_xx( (volatile void*)(ADDR), (intptr_t)(OLDVAL), \
+                          (intptr_t)(NEWVAL), sizeof(*(ADDR)) )
+
+/**
+ * Atomic compare and set of pointer with acquire semantics. This
+ * macro detect at compile time the type of the first argument
+ * and choose the correct function to be called.
+ *
+ * \note This macro should only be used for integer types.
+ *
+ * @param addr          Address of <TYPE>.
+ * @param oldval        Comparison value <TYPE>.
+ * @param newval        New value to set if comparision is true <TYPE>.
+ *
+ * See pmix_atomic_cmpset_acq_* for pseudo-code.
+ */
+#define pmix_atomic_cmpset_acq( ADDR, OLDVAL, NEWVAL )           \
+   pmix_atomic_cmpset_acq_xx( (volatile void*)(ADDR), (int64_t)(OLDVAL), \
+                              (int64_t)(NEWVAL), sizeof(*(ADDR)) )
+
+
+/**
+ * Atomic compare and set of pointer with release semantics. This
+ * macro detect at compile time the type of the first argument
+ * and choose the correct function to b
+ *
+ * \note This macro should only be used for integer types.
+ *
+ * @param addr          Address of <TYPE>.
+ * @param oldval        Comparison value <TYPE>.
+ * @param newval        New value to set if comparision is true <TYPE>.
+ *
+ * See pmix_atomic_cmpsetrel_* for pseudo-code.
+ */
+#define pmix_atomic_cmpset_rel( ADDR, OLDVAL, NEWVAL )           \
+   pmix_atomic_cmpset_rel_xx( (volatile void*)(ADDR), (int64_t)(OLDVAL), \
+                              (int64_t)(NEWVAL), sizeof(*(ADDR)) )
+
+#endif /* (PMIX_HAVE_ATOMIC_CMPSET_32 || PMIX_HAVE_ATOMIC_CMPSET_64) */
+
+#if defined(DOXYGEN) || (PMIX_HAVE_ATOMIC_MATH_32 || PMIX_HAVE_ATOMIC_MATH_64)
+
+static inline void pmix_atomic_add_xx(volatile void* addr,
+                                      int32_t value, size_t length);
+static inline void pmix_atomic_sub_xx(volatile void* addr,
+                                      int32_t value, size_t length);
+#if SIZEOF_VOID_P == 4 && PMIX_HAVE_ATOMIC_CMPSET_32
+static inline int32_t pmix_atomic_add_ptr( volatile void* addr, void* delta );
+static inline int32_t pmix_atomic_sub_ptr( volatile void* addr, void* delta );
+#elif SIZEOF_VOID_P == 8 && PMIX_HAVE_ATOMIC_CMPSET_64
+static inline int64_t pmix_atomic_add_ptr( volatile void* addr, void* delta );
+static inline int64_t pmix_atomic_sub_ptr( volatile void* addr, void* delta );
+#else
+#error Atomic arithmetic on pointers not supported
+#endif
+
+/**
+ * Atomically increment the content depending on the type. This
+ * macro detect at compile time the type of the first argument
+ * and choose the correct function to be called.
+ *
+ * \note This macro should only be used for integer types.
+ *
+ * @param addr          Address of <TYPE>
+ * @param delta         Value to add (converted to <TYPE>).
+ */
+#define pmix_atomic_add( ADDR, VALUE )                                  \
+   pmix_atomic_add_xx( (volatile void*)(ADDR), (int32_t)(VALUE), \
+                       sizeof(*(ADDR)) )
+
+/**
+ * Atomically decrement the content depending on the type. This
+ * macro detect at compile time the type of the first argument
+ * and choose the correct function to be called.
+ *
+ * \note This macro should only be used for integer types.
+ *
+ * @param addr          Address of <TYPE>
+ * @param delta         Value to substract (converted to <TYPE>).
+ */
+#define pmix_atomic_sub( ADDR, VALUE )                                  \
+   pmix_atomic_sub_xx( (volatile void*)(ADDR), (int32_t)(VALUE),        \
+                      sizeof(*(ADDR)) )
+
+#endif /* PMIX_HAVE_ATOMIC_MATH_32 || PMIX_HAVE_ATOMIC_MATH_64 */
+
+
+/*
+ * Include inline implementations of everything not defined directly
+ * in assembly
+ */
+#include "src/atomics/sys/atomic_impl.h"
+
+END_C_DECLS
+
+#endif /* PMIX_SYS_ATOMIC_H */
diff --git a/src/atomics/sys/atomic_impl.h b/src/atomics/sys/atomic_impl.h
new file mode 100644
index 0000000..e1fb810
--- /dev/null
+++ b/src/atomics/sys/atomic_impl.h
@@ -0,0 +1,438 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2014 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2010-2014 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2012-2015 Los Alamos National Security, LLC. All rights
+ *                         reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+/* Inline C implementation of the functions defined in atomic.h */
+
+#include <stdlib.h>
+
+/**********************************************************************
+ *
+ * Atomic math operations
+ *
+ * All the architectures provide a compare_and_set atomic operations. If
+ * they dont provide atomic additions and/or substractions then we can
+ * define these operations using the atomic compare_and_set.
+ *
+ * Some architectures do not provide support for the 64 bits
+ * atomic operations. Until we find a better solution let's just
+ * undefine all those functions if there is no 64 bit cmpset
+ *
+ *********************************************************************/
+#if PMIX_HAVE_ATOMIC_CMPSET_32
+
+#if !defined(PMIX_HAVE_ATOMIC_SWAP_32)
+#define PMIX_HAVE_ATOMIC_SWAP_32 1
+static inline int32_t pmix_atomic_swap_32(volatile int32_t *addr,
+                                          int32_t newval)
+{
+    int32_t old;
+    do {
+        old = *addr;
+    } while (0 == pmix_atomic_cmpset_32(addr, old, newval));
+
+    return old;
+}
+#endif /* PMIX_HAVE_ATOMIC_SWAP_32 */
+
+#if !defined(PMIX_HAVE_ATOMIC_ADD_32)
+#define PMIX_HAVE_ATOMIC_ADD_32 1
+static inline int32_t
+pmix_atomic_add_32(volatile int32_t *addr, int delta)
+{
+   int32_t oldval;
+
+   do {
+      oldval = *addr;
+   } while (0 == pmix_atomic_cmpset_32(addr, oldval, oldval + delta));
+   return (oldval + delta);
+}
+#endif  /* PMIX_HAVE_ATOMIC_ADD_32 */
+
+
+#if !defined(PMIX_HAVE_ATOMIC_SUB_32)
+#define PMIX_HAVE_ATOMIC_SUB_32 1
+static inline int32_t
+pmix_atomic_sub_32(volatile int32_t *addr, int delta)
+{
+   int32_t oldval;
+
+   do {
+      oldval = *addr;
+   } while (0 == pmix_atomic_cmpset_32(addr, oldval, oldval - delta));
+   return (oldval - delta);
+}
+#endif  /* PMIX_HAVE_ATOMIC_SUB_32 */
+
+#endif /* PMIX_HAVE_ATOMIC_CMPSET_32 */
+
+
+#if PMIX_HAVE_ATOMIC_CMPSET_64
+
+#if !defined(PMIX_HAVE_ATOMIC_SWAP_64)
+#define PMIX_HAVE_ATOMIC_SWAP_64 1
+static inline int64_t pmix_atomic_swap_64(volatile int64_t *addr,
+                                          int64_t newval)
+{
+    int64_t old;
+    do {
+        old = *addr;
+    } while (0 == pmix_atomic_cmpset_64(addr, old, newval));
+    return old;
+}
+#endif /* PMIX_HAVE_ATOMIC_SWAP_32 */
+
+#if !defined(PMIX_HAVE_ATOMIC_ADD_64)
+#define PMIX_HAVE_ATOMIC_ADD_64 1
+static inline int64_t
+pmix_atomic_add_64(volatile int64_t *addr, int64_t delta)
+{
+   int64_t oldval;
+
+   do {
+      oldval = *addr;
+   } while (0 == pmix_atomic_cmpset_64(addr, oldval, oldval + delta));
+   return (oldval + delta);
+}
+#endif  /* PMIX_HAVE_ATOMIC_ADD_64 */
+
+
+#if !defined(PMIX_HAVE_ATOMIC_SUB_64)
+#define PMIX_HAVE_ATOMIC_SUB_64 1
+static inline int64_t
+pmix_atomic_sub_64(volatile int64_t *addr, int64_t delta)
+{
+    int64_t oldval;
+
+    do {
+        oldval = *addr;
+    } while (0 == pmix_atomic_cmpset_64(addr, oldval, oldval - delta));
+    return (oldval - delta);
+}
+#endif  /* PMIX_HAVE_ATOMIC_SUB_64 */
+
+#else
+
+#if !defined(PMIX_HAVE_ATOMIC_ADD_64)
+#define PMIX_HAVE_ATOMIC_ADD_64 0
+#endif
+
+#if !defined(PMIX_HAVE_ATOMIC_SUB_64)
+#define PMIX_HAVE_ATOMIC_SUB_64 0
+#endif
+
+#endif  /* PMIX_HAVE_ATOMIC_CMPSET_64 */
+
+
+#if (PMIX_HAVE_ATOMIC_CMPSET_32 || PMIX_HAVE_ATOMIC_CMPSET_64)
+
+static inline int
+pmix_atomic_cmpset_xx(volatile void* addr, int64_t oldval,
+                      int64_t newval, size_t length)
+{
+   switch( length ) {
+#if PMIX_HAVE_ATOMIC_CMPSET_32
+   case 4:
+      return pmix_atomic_cmpset_32( (volatile int32_t*)addr,
+                                    (int32_t)oldval, (int32_t)newval );
+#endif  /* PMIX_HAVE_ATOMIC_CMPSET_32 */
+
+#if PMIX_HAVE_ATOMIC_CMPSET_64
+   case 8:
+      return pmix_atomic_cmpset_64( (volatile int64_t*)addr,
+                                    (int64_t)oldval, (int64_t)newval );
+#endif  /* PMIX_HAVE_ATOMIC_CMPSET_64 */
+   }
+   abort();
+   /* This should never happen, so deliberately abort (hopefully
+      leaving a corefile for analysis) */
+}
+
+
+static inline int
+pmix_atomic_cmpset_acq_xx(volatile void* addr, int64_t oldval,
+                          int64_t newval, size_t length)
+{
+   switch( length ) {
+#if PMIX_HAVE_ATOMIC_CMPSET_32
+   case 4:
+      return pmix_atomic_cmpset_acq_32( (volatile int32_t*)addr,
+                                        (int32_t)oldval, (int32_t)newval );
+#endif  /* PMIX_HAVE_ATOMIC_CMPSET_32 */
+
+#if PMIX_HAVE_ATOMIC_CMPSET_64
+   case 8:
+      return pmix_atomic_cmpset_acq_64( (volatile int64_t*)addr,
+                                        (int64_t)oldval, (int64_t)newval );
+#endif  /* PMIX_HAVE_ATOMIC_CMPSET_64 */
+   }
+   /* This should never happen, so deliberately abort (hopefully
+      leaving a corefile for analysis) */
+   abort();
+}
+
+
+static inline int
+pmix_atomic_cmpset_rel_xx(volatile void* addr, int64_t oldval,
+                          int64_t newval, size_t length)
+{
+   switch( length ) {
+#if PMIX_HAVE_ATOMIC_CMPSET_32
+   case 4:
+      return pmix_atomic_cmpset_rel_32( (volatile int32_t*)addr,
+                                        (int32_t)oldval, (int32_t)newval );
+#endif  /* PMIX_HAVE_ATOMIC_CMPSET_32 */
+
+#if PMIX_HAVE_ATOMIC_CMPSET_64
+   case 8:
+      return pmix_atomic_cmpset_rel_64( (volatile int64_t*)addr,
+                                        (int64_t)oldval, (int64_t)newval );
+#endif  /* PMIX_HAVE_ATOMIC_CMPSET_64 */
+   }
+   /* This should never happen, so deliberately abort (hopefully
+      leaving a corefile for analysis) */
+   abort();
+}
+
+
+static inline int
+pmix_atomic_cmpset_ptr(volatile void* addr,
+                       void* oldval,
+                       void* newval)
+{
+#if SIZEOF_VOID_P == 4 && PMIX_HAVE_ATOMIC_CMPSET_32
+    return pmix_atomic_cmpset_32((int32_t*) addr, (unsigned long) oldval,
+                                 (unsigned long) newval);
+#elif SIZEOF_VOID_P == 8 && PMIX_HAVE_ATOMIC_CMPSET_64
+    return pmix_atomic_cmpset_64((int64_t*) addr, (unsigned long) oldval,
+                                 (unsigned long) newval);
+#else
+    abort();
+#endif
+}
+
+
+static inline int
+pmix_atomic_cmpset_acq_ptr(volatile void* addr,
+                           void* oldval,
+                           void* newval)
+{
+#if SIZEOF_VOID_P == 4 && PMIX_HAVE_ATOMIC_CMPSET_32
+    return pmix_atomic_cmpset_acq_32((int32_t*) addr, (unsigned long) oldval,
+                                     (unsigned long) newval);
+#elif SIZEOF_VOID_P == 8 && PMIX_HAVE_ATOMIC_CMPSET_64
+    return pmix_atomic_cmpset_acq_64((int64_t*) addr, (unsigned long) oldval,
+                                     (unsigned long) newval);
+#else
+    abort();
+#endif
+}
+
+
+static inline int pmix_atomic_cmpset_rel_ptr(volatile void* addr,
+                                             void* oldval,
+                                             void* newval)
+{
+#if SIZEOF_VOID_P == 4 && PMIX_HAVE_ATOMIC_CMPSET_32
+    return pmix_atomic_cmpset_rel_32((int32_t*) addr, (unsigned long) oldval,
+                                     (unsigned long) newval);
+#elif SIZEOF_VOID_P == 8 && PMIX_HAVE_ATOMIC_CMPSET_64
+    return pmix_atomic_cmpset_rel_64((int64_t*) addr, (unsigned long) oldval,
+                                     (unsigned long) newval);
+#else
+    abort();
+#endif
+}
+
+#endif /* (PMIX_HAVE_ATOMIC_CMPSET_32 || PMIX_HAVE_ATOMIC_CMPSET_64) */
+
+#if (PMIX_HAVE_ATOMIC_SWAP_32 || PMIX_HAVE_ATOMIC_SWAP_64)
+
+#if SIZEOF_VOID_P == 4 && PMIX_HAVE_ATOMIC_SWAP_32
+#define pmix_atomic_swap_ptr(addr, value) (void *) pmix_atomic_swap_32((int32_t *) addr, (int32_t) value)
+#elif SIZEOF_VOID_P == 8 && PMIX_HAVE_ATOMIC_SWAP_64
+#define pmix_atomic_swap_ptr(addr, value) (void *) pmix_atomic_swap_64((int64_t *) addr, (int64_t) value)
+#endif
+
+#endif /* (PMIX_HAVE_ATOMIC_SWAP_32 || PMIX_HAVE_ATOMIC_SWAP_64) */
+
+#if (PMIX_HAVE_ATOMIC_LLSC_32 || PMIX_HAVE_ATOMIC_LLSC_64)
+
+#if SIZEOF_VOID_P == 4 && PMIX_HAVE_ATOMIC_LLSC_32
+
+#define pmix_atomic_ll_ptr(addr) (void *) pmix_atomic_ll_32((int32_t *) addr)
+#define pmix_atomic_sc_ptr(addr, newval) pmix_atomic_sc_32((int32_t *) addr, (int32_t) newval)
+
+#define PMIX_HAVE_ATOMIC_LLSC_PTR 1
+
+#elif SIZEOF_VOID_P == 8 && PMIX_HAVE_ATOMIC_LLSC_64
+
+#define pmix_atomic_ll_ptr(addr) (void *) pmix_atomic_ll_64((int64_t *) addr)
+#define pmix_atomic_sc_ptr(addr, newval) pmix_atomic_sc_64((int64_t *) addr, (int64_t) newval)
+
+#define PMIX_HAVE_ATOMIC_LLSC_PTR 1
+
+#endif
+
+#endif /* (PMIX_HAVE_ATOMIC_LLSC_32 || PMIX_HAVE_ATOMIC_LLSC_64)*/
+
+#if !defined(PMIX_HAVE_ATOMIC_LLSC_PTR)
+#define PMIX_HAVE_ATOMIC_LLSC_PTR 0
+#endif
+
+#if PMIX_HAVE_ATOMIC_MATH_32 || PMIX_HAVE_ATOMIC_MATH_64
+
+
+static inline void
+pmix_atomic_add_xx(volatile void* addr, int32_t value, size_t length)
+{
+   switch( length ) {
+#if PMIX_HAVE_ATOMIC_ADD_32
+   case 4:
+      pmix_atomic_add_32( (volatile int32_t*)addr, (int32_t)value );
+      break;
+#endif  /* PMIX_HAVE_ATOMIC_CMPSET_32 */
+
+#if PMIX_HAVE_ATOMIC_ADD_64
+   case 8:
+      pmix_atomic_add_64( (volatile int64_t*)addr, (int64_t)value );
+      break;
+#endif  /* PMIX_HAVE_ATOMIC_ADD_64 */
+   default:
+       /* This should never happen, so deliberately abort (hopefully
+          leaving a corefile for analysis) */
+       abort();
+   }
+}
+
+
+static inline void
+pmix_atomic_sub_xx(volatile void* addr, int32_t value, size_t length)
+{
+   switch( length ) {
+#if PMIX_HAVE_ATOMIC_SUB_32
+   case 4:
+      pmix_atomic_sub_32( (volatile int32_t*)addr, (int32_t)value );
+      break;
+#endif  /* PMIX_HAVE_ATOMIC_SUB_32 */
+
+#if PMIX_HAVE_ATOMIC_SUB_64
+   case 8:
+      pmix_atomic_sub_64( (volatile int64_t*)addr, (int64_t)value );
+      break;
+#endif  /* PMIX_HAVE_ATOMIC_SUB_64 */
+   default:
+       /* This should never happen, so deliberately abort (hopefully
+          leaving a corefile for analysis) */
+       abort();
+   }
+}
+
+#if SIZEOF_VOID_P == 4 && PMIX_HAVE_ATOMIC_ADD_32
+static inline int32_t pmix_atomic_add_ptr( volatile void* addr,
+                                           void* delta )
+{
+    return pmix_atomic_add_32((int32_t*) addr, (unsigned long) delta);
+}
+#elif SIZEOF_VOID_P == 8 && PMIX_HAVE_ATOMIC_ADD_64
+static inline int64_t pmix_atomic_add_ptr( volatile void* addr,
+                                           void* delta )
+{
+    return pmix_atomic_add_64((int64_t*) addr, (unsigned long) delta);
+}
+#else
+static inline int32_t pmix_atomic_add_ptr( volatile void* addr,
+                                           void* delta )
+{
+    abort();
+    return 0;
+}
+#endif
+
+#if SIZEOF_VOID_P == 4 && PMIX_HAVE_ATOMIC_SUB_32
+static inline int32_t pmix_atomic_sub_ptr( volatile void* addr,
+                                           void* delta )
+{
+    return pmix_atomic_sub_32((int32_t*) addr, (unsigned long) delta);
+}
+#elif SIZEOF_VOID_P == 8 && PMIX_HAVE_ATOMIC_SUB_32
+static inline int64_t pmix_atomic_sub_ptr( volatile void* addr,
+                                           void* delta )
+{
+    return pmix_atomic_sub_64((int64_t*) addr, (unsigned long) delta);
+}
+#else
+static inline int32_t pmix_atomic_sub_ptr( volatile void* addr,
+                                           void* delta )
+{
+    abort();
+    return 0;
+}
+#endif
+
+#endif /* PMIX_HAVE_ATOMIC_MATH_32 || PMIX_HAVE_ATOMIC_MATH_64 */
+
+/**********************************************************************
+ *
+ * Atomic spinlocks
+ *
+ *********************************************************************/
+#ifdef PMIX_NEED_INLINE_ATOMIC_SPINLOCKS
+
+/*
+ * Lock initialization function. It set the lock to UNLOCKED.
+ */
+static inline void
+pmix_atomic_init( pmix_atomic_lock_t* lock, int32_t value )
+{
+   lock->u.lock = value;
+}
+
+
+static inline int
+pmix_atomic_trylock(pmix_atomic_lock_t *lock)
+{
+    int ret = pmix_atomic_cmpset_acq_32( &(lock->u.lock),
+                                         PMIX_ATOMIC_UNLOCKED, PMIX_ATOMIC_LOCKED);
+    return (ret == 0) ? 1 : 0;
+}
+
+
+static inline void
+pmix_atomic_lock(pmix_atomic_lock_t *lock)
+{
+   while( !pmix_atomic_cmpset_acq_32( &(lock->u.lock),
+                                      PMIX_ATOMIC_UNLOCKED, PMIX_ATOMIC_LOCKED) ) {
+      while (lock->u.lock == PMIX_ATOMIC_LOCKED) {
+         /* spin */ ;
+      }
+   }
+}
+
+
+static inline void
+pmix_atomic_unlock(pmix_atomic_lock_t *lock)
+{
+   pmix_atomic_wmb();
+   lock->u.lock=PMIX_ATOMIC_UNLOCKED;
+}
+
+#endif /* PMIX_HAVE_ATOMIC_SPINLOCKS */
diff --git a/src/atomics/sys/cma.h b/src/atomics/sys/cma.h
new file mode 100644
index 0000000..df5bdb7
--- /dev/null
+++ b/src/atomics/sys/cma.h
@@ -0,0 +1,125 @@
+/*
+ * Copyright (c) 2011-2012 IBM Corporation.  All rights reserved.
+ * Copyright (c) 2016      Los Alamos National Security, LLC. All rights
+ *                         reserved.
+ * Copyright (c) 2017      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2017      Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ */
+
+/** @file
+ *
+ * Cross Memory Attach syscall definitions.
+ *
+ * These are only needed temporarily until these new syscalls
+ * are incorporated into glibc
+ */
+
+#ifndef PMIX_SYS_CMA_H
+#define PMIX_SYS_CMA_H 1
+
+#if !defined(PMIX_ASSEMBLY_ARCH)
+/* need pmix_config.h for the assembly architecture */
+#include "pmix_config.h"
+#endif
+
+#include "src/atomics/sys/architecture.h"
+
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
+#ifdef HAVE_UNISTD_H
+#include <sys/unistd.h>
+#endif
+
+#ifdef __linux__
+
+/* Cross Memory Attach is so far only supported under linux */
+
+#if PMIX_ASSEMBLY_ARCH == PMIX_X86_64
+#define __NR_process_vm_readv 310
+#define __NR_process_vm_writev 311
+#elif PMIX_ASSEMBLY_ARCH == PMIX_IA32
+#define __NR_process_vm_readv 347
+#define __NR_process_vm_writev 348
+#elif PMIX_ASSEMBLY_ARCH == PMIX_IA64
+#define __NR_process_vm_readv 1332
+#define __NR_process_vm_writev 1333
+#elif PMIX_ASSEMBLY_ARCH == PMIX_POWERPC32
+#define __NR_process_vm_readv 351
+#define __NR_process_vm_writev 352
+#elif PMIX_ASSEMBLY_ARCH == PMIX_POWERPC64
+#define __NR_process_vm_readv 351
+#define __NR_process_vm_writev 352
+#elif PMIX_ASSEMBLY_ARCH == PMIX_ARM
+
+#define __NR_process_vm_readv 376
+#define __NR_process_vm_writev 377
+
+#elif PMIX_ASSEMBLY_ARCH == PMIX_ARM64
+
+/* ARM64 uses the asm-generic syscall numbers */
+
+#define __NR_process_vm_readv 270
+#define __NR_process_vm_writev 271
+
+#elif PMIX_ASSEMBLY_ARCH == PMIX_MIPS
+
+#if _MIPS_SIM == _MIPS_SIM_ABI64
+
+#define __NR_process_vm_readv 5304
+#define __NR_process_vm_writev 5305
+
+#elif _MIPS_SIM == _MIPS_SIM_NABI32
+
+#define __NR_process_vm_readv 6309
+#define __NR_process_vm_writev 6310
+
+#else
+
+#error "Unsupported MIPS architecture for process_vm_readv and process_vm_writev syscalls"
+
+#endif
+
+#elif PMIX_ASSEMBLY_ARCH == PMIX_S390
+
+#define __NR_process_vm_readv   340
+#define __NR_process_vm_writev  341
+
+#elif PMIX_ASSEMBLY_ARCH == PMIX_S390X
+
+#define __NR_process_vm_readv   340
+#define __NR_process_vm_writev  341
+
+#else
+#error "Unsupported architecture for process_vm_readv and process_vm_writev syscalls"
+#endif
+
+
+static inline ssize_t
+process_vm_readv(pid_t pid,
+                 const struct iovec  *lvec,
+                 unsigned long liovcnt,
+                 const struct iovec *rvec,
+                 unsigned long riovcnt,
+                 unsigned long flags)
+{
+  return syscall(__NR_process_vm_readv, pid, lvec, liovcnt, rvec, riovcnt, flags);
+}
+
+static inline ssize_t
+process_vm_writev(pid_t pid,
+                  const struct iovec  *lvec,
+                  unsigned long liovcnt,
+                  const struct iovec *rvec,
+                  unsigned long riovcnt,
+                  unsigned long flags)
+{
+  return syscall(__NR_process_vm_writev, pid, lvec, liovcnt, rvec, riovcnt, flags);
+}
+
+#endif /* __linux__ */
+
+#endif /* PMIX_SYS_CMA_H */
diff --git a/src/atomics/sys/gcc_builtin/Makefile.include b/src/atomics/sys/gcc_builtin/Makefile.include
new file mode 100644
index 0000000..a1476e7
--- /dev/null
+++ b/src/atomics/sys/gcc_builtin/Makefile.include
@@ -0,0 +1,26 @@
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2011      Sandia National Laboratories. All rights reserved.
+# Copyright (c) 2016      Los Alamos National Security, LLC. All rights
+#                         reserved.
+# Copyright (c) 2017      Intel, Inc. All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# This makefile.am does not stand on its own - it is included from pmix/include/Makefile.am
+
+headers += \
+	atomics/sys/gcc_builtin/atomic.h
diff --git a/src/atomics/sys/gcc_builtin/atomic.h b/src/atomics/sys/gcc_builtin/atomic.h
new file mode 100644
index 0000000..27c1855
--- /dev/null
+++ b/src/atomics/sys/gcc_builtin/atomic.h
@@ -0,0 +1,231 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2013 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2011      Sandia National Laboratories. All rights reserved.
+ * Copyright (c) 2014-2016 Los Alamos National Security, LLC. All rights
+ *                         reserved.
+ * Copyright (c) 2016      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2017      Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#ifndef PMIX_SYS_ARCH_ATOMIC_H
+#define PMIX_SYS_ARCH_ATOMIC_H 1
+
+#include <stdbool.h>
+
+/**********************************************************************
+ *
+ * Memory Barriers
+ *
+ *********************************************************************/
+#define PMIX_HAVE_ATOMIC_MEM_BARRIER 1
+
+#define PMIX_HAVE_ATOMIC_MATH_32 1
+#define PMIX_HAVE_ATOMIC_CMPSET_32 1
+#define PMIX_HAVE_ATOMIC_ADD_32 1
+#define PMIX_HAVE_ATOMIC_SUB_32 1
+#define PMIX_HAVE_ATOMIC_SWAP_32 1
+#define PMIX_HAVE_ATOMIC_MATH_64 1
+#define PMIX_HAVE_ATOMIC_CMPSET_64 1
+#define PMIX_HAVE_ATOMIC_ADD_64 1
+#define PMIX_HAVE_ATOMIC_SUB_64 1
+#define PMIX_HAVE_ATOMIC_SWAP_64 1
+
+
+static inline void pmix_atomic_mb(void)
+{
+    __atomic_thread_fence (__ATOMIC_SEQ_CST);
+}
+
+static inline void pmix_atomic_rmb(void)
+{
+    __atomic_thread_fence (__ATOMIC_ACQUIRE);
+}
+
+static inline void pmix_atomic_wmb(void)
+{
+    __atomic_thread_fence (__ATOMIC_RELEASE);
+}
+
+#define PMIXMB() pmix_atomic_mb()
+#define PMIXRMB() pmix_atomic_rmb()
+#define PMIXWMB() pmix_atomic_wmb()
+
+/**********************************************************************
+ *
+ * Atomic math operations
+ *
+ *********************************************************************/
+
+/*
+ * Suppress numerous (spurious ?) warnings from Oracle Studio compilers
+ * see https://community.oracle.com/thread/3968347
+ */
+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC)
+#pragma error_messages(off, E_ARG_INCOMPATIBLE_WITH_ARG_L)
+#endif
+
+static inline int pmix_atomic_cmpset_acq_32( volatile int32_t *addr,
+                                             int32_t oldval, int32_t newval)
+{
+    return __atomic_compare_exchange_n (addr, &oldval, newval, false,
+                                        __ATOMIC_ACQUIRE, __ATOMIC_RELAXED);
+}
+
+
+static inline int pmix_atomic_cmpset_rel_32( volatile int32_t *addr,
+                                             int32_t oldval, int32_t newval)
+{
+    return __atomic_compare_exchange_n (addr, &oldval, newval, false,
+                                        __ATOMIC_RELEASE, __ATOMIC_RELAXED);
+}
+
+static inline int pmix_atomic_cmpset_32( volatile int32_t *addr,
+                                         int32_t oldval, int32_t newval)
+{
+    return __atomic_compare_exchange_n (addr, &oldval, newval, false,
+                                        __ATOMIC_ACQUIRE, __ATOMIC_RELAXED);
+}
+
+static inline int32_t pmix_atomic_swap_32 (volatile int32_t *addr, int32_t newval)
+{
+    int32_t oldval;
+    __atomic_exchange (addr, &newval, &oldval, __ATOMIC_RELAXED);
+    return oldval;
+}
+
+static inline int32_t pmix_atomic_add_32(volatile int32_t *addr, int32_t delta)
+{
+    return __atomic_add_fetch (addr, delta, __ATOMIC_RELAXED);
+}
+
+static inline int32_t pmix_atomic_sub_32(volatile int32_t *addr, int32_t delta)
+{
+    return __atomic_sub_fetch (addr, delta, __ATOMIC_RELAXED);
+}
+
+static inline int pmix_atomic_cmpset_acq_64( volatile int64_t *addr,
+                                             int64_t oldval, int64_t newval)
+{
+    return __atomic_compare_exchange_n (addr, &oldval, newval, false,
+                                        __ATOMIC_ACQUIRE, __ATOMIC_RELAXED);
+}
+
+static inline int pmix_atomic_cmpset_rel_64( volatile int64_t *addr,
+                                             int64_t oldval, int64_t newval)
+{
+    return __atomic_compare_exchange_n (addr, &oldval, newval, false,
+                                        __ATOMIC_RELEASE, __ATOMIC_RELAXED);
+}
+
+
+static inline int pmix_atomic_cmpset_64( volatile int64_t *addr,
+                                         int64_t oldval, int64_t newval)
+{
+    return __atomic_compare_exchange_n (addr, &oldval, newval, false,
+                                        __ATOMIC_ACQUIRE, __ATOMIC_RELAXED);
+}
+
+static inline int64_t pmix_atomic_swap_64 (volatile int64_t *addr, int64_t newval)
+{
+    int64_t oldval;
+    __atomic_exchange (addr, &newval, &oldval, __ATOMIC_RELAXED);
+    return oldval;
+}
+
+static inline int64_t pmix_atomic_add_64(volatile int64_t *addr, int64_t delta)
+{
+    return __atomic_add_fetch (addr, delta, __ATOMIC_RELAXED);
+}
+
+static inline int64_t pmix_atomic_sub_64(volatile int64_t *addr, int64_t delta)
+{
+    return __atomic_sub_fetch (addr, delta, __ATOMIC_RELAXED);
+}
+
+#if PMIX_HAVE_GCC_BUILTIN_CSWAP_INT128
+
+#define PMIX_HAVE_ATOMIC_CMPSET_128 1
+
+static inline int pmix_atomic_cmpset_128 (volatile pmix_int128_t *addr,
+                                          pmix_int128_t oldval, pmix_int128_t newval)
+{
+    return __atomic_compare_exchange_n (addr, &oldval, newval, false,
+                                        __ATOMIC_ACQUIRE, __ATOMIC_RELAXED);
+}
+
+#elif defined(PMIX_HAVE_SYNC_BUILTIN_CSWAP_INT128) && PMIX_HAVE_SYNC_BUILTIN_CSWAP_INT128
+
+#define PMIX_HAVE_ATOMIC_CMPSET_128 1
+
+/* __atomic version is not lock-free so use legacy __sync version */
+
+static inline int pmix_atomic_cmpset_128 (volatile pmix_int128_t *addr,
+                                          pmix_int128_t oldval, pmix_int128_t newval)
+{
+    return __sync_bool_compare_and_swap (addr, oldval, newval);
+}
+
+#endif
+
+#if defined(__HLE__)
+
+#include <immintrin.h>
+
+#define PMIX_HAVE_ATOMIC_SPINLOCKS 1
+
+static inline void pmix_atomic_init (pmix_atomic_lock_t* lock, int32_t value)
+{
+   lock->u.lock = value;
+}
+
+static inline int pmix_atomic_trylock(pmix_atomic_lock_t *lock)
+{
+    int ret = __atomic_exchange_n (&lock->u.lock, PMIX_ATOMIC_LOCKED,
+                                   __ATOMIC_ACQUIRE | __ATOMIC_HLE_ACQUIRE);
+    if (PMIX_ATOMIC_LOCKED == ret) {
+        /* abort the transaction */
+        _mm_pause ();
+        return 1;
+    }
+
+    return 0;
+}
+
+static inline void pmix_atomic_lock (pmix_atomic_lock_t *lock)
+{
+    while (PMIX_ATOMIC_LOCKED == __atomic_exchange_n (&lock->u.lock, PMIX_ATOMIC_LOCKED,
+                                                      __ATOMIC_ACQUIRE | __ATOMIC_HLE_ACQUIRE)) {
+        /* abort the transaction */
+        _mm_pause ();
+    }
+}
+
+static inline void pmix_atomic_unlock (pmix_atomic_lock_t *lock)
+{
+    __atomic_store_n (&lock->u.lock, PMIX_ATOMIC_UNLOCKED,
+                       __ATOMIC_RELEASE | __ATOMIC_HLE_RELEASE);
+}
+
+#endif
+
+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC)
+#pragma error_messages(default, E_ARG_INCOMPATIBLE_WITH_ARG_L)
+#endif
+
+#endif /* ! PMIX_SYS_ARCH_ATOMIC_H */
diff --git a/src/atomics/sys/ia32/Makefile.include b/src/atomics/sys/ia32/Makefile.include
new file mode 100644
index 0000000..799a43d
--- /dev/null
+++ b/src/atomics/sys/ia32/Makefile.include
@@ -0,0 +1,24 @@
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2017      Intel, Inc. All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# This makefile.am does not stand on its own - it is included from pmix/include/Makefile.am
+
+headers += \
+	atomics/sys/ia32/atomic.h \
+	atomics/sys/ia32/timer.h
diff --git a/src/atomics/sys/ia32/atomic.h b/src/atomics/sys/ia32/atomic.h
new file mode 100644
index 0000000..85693ad
--- /dev/null
+++ b/src/atomics/sys/ia32/atomic.h
@@ -0,0 +1,223 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2010 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2007-2010 Oracle and/or its affiliates.  All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2015      Los Alamos National Security, LLC. All rights
+ *                         reserved.
+ * Copyright (c) 2017      Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#ifndef PMIX_SYS_ARCH_ATOMIC_H
+#define PMIX_SYS_ARCH_ATOMIC_H 1
+
+/*
+ * On ia32, we use cmpxchg.
+ */
+
+#define PMIXSMPLOCK "lock; "
+#define PMIXMB() __asm__ __volatile__("": : :"memory")
+
+
+/**********************************************************************
+ *
+ * Define constants for IA32
+ *
+ *********************************************************************/
+#define PMIX_HAVE_ATOMIC_MEM_BARRIER 1
+
+#define PMIX_HAVE_ATOMIC_CMPSET_32 1
+
+#define PMIX_HAVE_ATOMIC_MATH_32 1
+#define PMIX_HAVE_ATOMIC_ADD_32 1
+#define PMIX_HAVE_ATOMIC_SUB_32 1
+
+#define PMIX_HAVE_ATOMIC_CMPSET_64 1
+
+#undef PMIX_HAVE_INLINE_ATOMIC_CMPSET_64
+#define PMIX_HAVE_INLINE_ATOMIC_CMPSET_64 0
+
+/**********************************************************************
+ *
+ * Memory Barriers
+ *
+ *********************************************************************/
+#if PMIX_GCC_INLINE_ASSEMBLY
+
+static inline void pmix_atomic_mb(void)
+{
+    PMIXMB();
+}
+
+
+static inline void pmix_atomic_rmb(void)
+{
+    PMIXMB();
+}
+
+
+static inline void pmix_atomic_wmb(void)
+{
+    PMIXMB();
+}
+
+static inline void pmix_atomic_isync(void)
+{
+}
+
+#endif /* PMIX_GCC_INLINE_ASSEMBLY */
+
+
+/**********************************************************************
+ *
+ * Atomic math operations
+ *
+ *********************************************************************/
+#if PMIX_GCC_INLINE_ASSEMBLY
+
+static inline int pmix_atomic_cmpset_32(volatile int32_t *addr,
+                                        int32_t oldval,
+                                        int32_t newval)
+{
+   unsigned char ret;
+   __asm__ __volatile__ (
+                       PMIXSMPLOCK "cmpxchgl %3,%2   \n\t"
+                               "sete     %0      \n\t"
+                       : "=qm" (ret), "+a" (oldval), "+m" (*addr)
+                       : "q"(newval)
+                       : "memory", "cc");
+
+   return (int)ret;
+}
+
+#endif /* PMIX_GCC_INLINE_ASSEMBLY */
+
+#define pmix_atomic_cmpset_acq_32 pmix_atomic_cmpset_32
+#define pmix_atomic_cmpset_rel_32 pmix_atomic_cmpset_32
+
+#if PMIX_GCC_INLINE_ASSEMBLY
+
+#if 0
+
+/* some versions of GCC won't let you use ebx period (even though they
+   should be able to save / restore for the life of the inline
+   assembly).  For the beta, just use the non-inline version */
+
+#ifndef ll_low /* GLIBC provides these somewhere, so protect */
+#define ll_low(x)       *(((unsigned int*)&(x))+0)
+#define ll_high(x)      *(((unsigned int*)&(x))+1)
+#endif
+
+/* On Linux the EBX register is used by the shared libraries
+ * to keep the global offset. In same time this register is
+ * required by the cmpxchg8b instruction (as an input parameter).
+ * This conflict force us to save the EBX before the cmpxchg8b
+ * and to restore it afterward.
+ */
+static inline int pmix_atomic_cmpset_64(volatile int64_t *addr,
+                                        int64_t oldval,
+                                        int64_t newval)
+{
+   /*
+    * Compare EDX:EAX with m64. If equal, set ZF and load ECX:EBX into
+    * m64. Else, clear ZF and load m64 into EDX:EAX.
+    */
+    unsigned char ret;
+
+    __asm__ __volatile__(
+                    "push %%ebx            \n\t"
+                    "movl %4, %%ebx        \n\t"
+                    SMPLOCK "cmpxchg8b (%1)  \n\t"
+                    "sete %0               \n\t"
+                    "pop %%ebx             \n\t"
+                    : "=qm"(ret)
+                    : "D"(addr), "a"(ll_low(oldval)), "d"(ll_high(oldval)),
+                      "r"(ll_low(newval)), "c"(ll_high(newval))
+                    : "cc", "memory", "ebx");
+    return (int) ret;
+}
+#endif /* if 0 */
+
+#endif /* PMIX_GCC_INLINE_ASSEMBLY */
+
+#define pmix_atomic_cmpset_acq_64 pmix_atomic_cmpset_64
+#define pmix_atomic_cmpset_rel_64 pmix_atomic_cmpset_64
+
+#if PMIX_GCC_INLINE_ASSEMBLY
+
+#define PMIX_HAVE_ATOMIC_SWAP_32 1
+
+static inline int32_t pmix_atomic_swap_32( volatile int32_t *addr,
+                                           int32_t newval)
+{
+    int32_t oldval;
+
+    __asm__ __volatile__("xchg %1, %0" :
+                         "=r" (oldval), "=m" (*addr) :
+                         "0" (newval), "m" (*addr) :
+                         "memory");
+    return oldval;
+}
+
+#endif /* PMIX_GCC_INLINE_ASSEMBLY */
+
+
+#if PMIX_GCC_INLINE_ASSEMBLY
+
+/**
+ * atomic_add - add integer to atomic variable
+ * @i: integer value to add
+ * @v: pointer of type int
+ *
+ * Atomically adds @i to @v.
+ */
+static inline int32_t pmix_atomic_add_32(volatile int32_t* v, int i)
+{
+    int ret = i;
+   __asm__ __volatile__(
+                        PMIXSMPLOCK "xaddl %1,%0"
+                        :"+m" (*v), "+r" (ret)
+                        :
+                        :"memory", "cc"
+                        );
+   return (ret+i);
+}
+
+
+/**
+ * atomic_sub - subtract the atomic variable
+ * @i: integer value to subtract
+ * @v: pointer of type int
+ *
+ * Atomically subtracts @i from @v.
+ */
+static inline int32_t pmix_atomic_sub_32(volatile int32_t* v, int i)
+{
+    int ret = -i;
+   __asm__ __volatile__(
+                        PMIXSMPLOCK "xaddl %1,%0"
+                        :"+m" (*v), "+r" (ret)
+                        :
+                        :"memory", "cc"
+                        );
+   return (ret-i);
+}
+
+#endif /* PMIX_GCC_INLINE_ASSEMBLY */
+
+#endif /* ! PMIX_SYS_ARCH_ATOMIC_H */
diff --git a/src/atomics/sys/ia32/timer.h b/src/atomics/sys/ia32/timer.h
new file mode 100644
index 0000000..9f9a80d
--- /dev/null
+++ b/src/atomics/sys/ia32/timer.h
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2014 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#ifndef PMIX_SYS_ARCH_TIMER_H
+#define PMIX_SYS_ARCH_TIMER_H 1
+
+
+typedef uint64_t pmix_timer_t;
+
+/* Using RDTSC(P) results in non-monotonic timers across cores */
+#undef PMIX_TIMER_MONOTONIC
+#define PMIX_TIMER_MONOTONIC 0
+
+#if PMIX_GCC_INLINE_ASSEMBLY
+
+static inline pmix_timer_t
+pmix_sys_timer_get_cycles(void)
+{
+    pmix_timer_t ret;
+    int tmp;
+
+    __asm__ __volatile__(
+                         "xchgl %%ebx, %1\n"
+                         "cpuid\n"
+                         "xchgl %%ebx, %1\n"
+                         "rdtsc\n"
+                         : "=A"(ret), "=r"(tmp)
+                         :: "ecx");
+
+    return ret;
+}
+
+#define PMIX_HAVE_SYS_TIMER_GET_CYCLES 1
+
+#else
+
+pmix_timer_t pmix_sys_timer_get_cycles(void);
+
+#define PMIX_HAVE_SYS_TIMER_GET_CYCLES 1
+
+#endif /* PMIX_GCC_INLINE_ASSEMBLY */
+
+#endif /* ! PMIX_SYS_ARCH_TIMER_H */
diff --git a/src/atomics/sys/ia64/Makefile.include b/src/atomics/sys/ia64/Makefile.include
new file mode 100644
index 0000000..d1f4e5e
--- /dev/null
+++ b/src/atomics/sys/ia64/Makefile.include
@@ -0,0 +1,24 @@
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2017      Intel, Inc. All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# This makefile.am does not stand on its own - it is included from pmix/include/Makefile.am
+
+headers += \
+	atomics/sys/ia64/atomic.h \
+	atomics/sys/ia64/timer.h
diff --git a/src/atomics/sys/ia64/atomic.h b/src/atomics/sys/ia64/atomic.h
new file mode 100644
index 0000000..ca8ce8d
--- /dev/null
+++ b/src/atomics/sys/ia64/atomic.h
@@ -0,0 +1,146 @@
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2005 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2017      Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#ifndef PMIX_SYS_ARCH_ATOMIC_H
+#define PMIX_SYS_ARCH_ATOMIC_H 1
+
+/*
+ * On ia64, we use cmpxchg, which supports acquire/release semantics natively.
+ */
+
+
+#define PMIXMB() __asm__ __volatile__("mf": : :"memory")
+
+
+/**********************************************************************
+ *
+ * Define constants for IA64
+ *
+ *********************************************************************/
+#define PMIX_HAVE_ATOMIC_MEM_BARRIER 1
+
+#define PMIX_HAVE_ATOMIC_CMPSET_32 1
+#define PMIX_HAVE_ATOMIC_CMPSET_64 1
+
+/**********************************************************************
+ *
+ * Memory Barriers
+ *
+ *********************************************************************/
+#if PMIX_GCC_INLINE_ASSEMBLY
+
+static inline void pmix_atomic_mb(void)
+{
+    PMIXMB();
+}
+
+
+static inline void pmix_atomic_rmb(void)
+{
+    PMIXMB();
+}
+
+
+static inline void pmix_atomic_wmb(void)
+{
+    PMIXMB();
+}
+
+static inline void pmix_atomic_isync(void)
+{
+}
+
+#endif /* PMIX_GCC_INLINE_ASSEMBLY */
+
+
+/**********************************************************************
+ *
+ * Atomic math operations
+ *
+ *********************************************************************/
+#if PMIX_GCC_INLINE_ASSEMBLY
+
+#define ia64_cmpxchg4_acq(ptr, new, old)                 \
+({                               \
+   __u64 ia64_intri_res;                        \
+   ia64_intri_res;                           \
+})
+
+static inline int pmix_atomic_cmpset_acq_32( volatile int32_t *addr,
+                                             int32_t oldval, int32_t newval)
+{
+    int64_t ret;
+
+    __asm__ __volatile__ ("mov ar.ccv=%0;;" :: "rO"(oldval));
+    __asm__ __volatile__ ("cmpxchg4.acq %0=[%1],%2,ar.ccv":
+                          "=r"(ret) : "r"(addr), "r"(newval) : "memory");
+
+    return ((int32_t)ret == oldval);
+}
+
+
+static inline int pmix_atomic_cmpset_rel_32( volatile int32_t *addr,
+                                             int32_t oldval, int32_t newval)
+{
+    int64_t ret;
+
+    __asm__ __volatile__ ("mov ar.ccv=%0;;" :: "rO"(oldval));
+    __asm__ __volatile__ ("cmpxchg4.rel %0=[%1],%2,ar.ccv":
+                  "=r"(ret) : "r"(addr), "r"(newval) : "memory");
+
+    return ((int32_t)ret == oldval);
+}
+
+#endif /* PMIX_GCC_INLINE_ASSEMBLY */
+
+
+#define pmix_atomic_cmpset_32 pmix_atomic_cmpset_acq_32
+
+#if PMIX_GCC_INLINE_ASSEMBLY
+
+static inline int pmix_atomic_cmpset_acq_64( volatile int64_t *addr,
+                                             int64_t oldval, int64_t newval)
+{
+    int64_t ret;
+
+    __asm__ __volatile__ ("mov ar.ccv=%0;;" :: "rO"(oldval));
+    __asm__ __volatile__ ("cmpxchg8.acq %0=[%1],%2,ar.ccv":
+                  "=r"(ret) : "r"(addr), "r"(newval) : "memory");
+
+    return (ret == oldval);
+}
+
+
+static inline int pmix_atomic_cmpset_rel_64( volatile int64_t *addr,
+                                             int64_t oldval, int64_t newval)
+{
+    int64_t ret;
+
+    __asm__ __volatile__ ("mov ar.ccv=%0;;" :: "rO"(oldval));
+    __asm__ __volatile__ ("cmpxchg8.rel %0=[%1],%2,ar.ccv":
+                  "=r"(ret) : "r"(addr), "r"(newval) : "memory");
+
+    return (ret == oldval);
+}
+
+#endif /* PMIX_GCC_INLINE_ASSEMBLY */
+
+#define pmix_atomic_cmpset_64 pmix_atomic_cmpset_acq_64
+
+#endif /* ! PMIX_SYS_ARCH_ATOMIC_H */
diff --git a/src/atomics/sys/ia64/timer.h b/src/atomics/sys/ia64/timer.h
new file mode 100644
index 0000000..65a9bef
--- /dev/null
+++ b/src/atomics/sys/ia64/timer.h
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2005 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#ifndef PMIX_SYS_ARCH_TIMER_H
+#define PMIX_SYS_ARCH_TIMER_H 1
+
+
+typedef uint64_t pmix_timer_t;
+
+
+#if PMIX_GCC_INLINE_ASSEMBLY
+
+static inline pmix_timer_t
+pmix_sys_timer_get_cycles(void)
+{
+    pmix_timer_t ret;
+
+    __asm__ __volatile__ ("mov %0=ar.itc" : "=r"(ret));
+
+    return ret;
+}
+
+#define PMIX_HAVE_SYS_TIMER_GET_CYCLES 1
+
+#else
+
+pmix_timer_t pmix_sys_timer_get_cycles(void);
+
+#define PMIX_HAVE_SYS_TIMER_GET_CYCLES 1
+
+#endif /* PMIX_GCC_INLINE_ASSEMBLY */
+
+#endif /* ! PMIX_SYS_ARCH_TIMER_H */
diff --git a/src/atomics/sys/mips/Makefile.include b/src/atomics/sys/mips/Makefile.include
new file mode 100644
index 0000000..f3916e5
--- /dev/null
+++ b/src/atomics/sys/mips/Makefile.include
@@ -0,0 +1,24 @@
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2008 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2017      Intel, Inc. All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# This makefile.am does not stand on its own - it is included from pmix/include/Makefile.am
+
+headers += \
+	atomics/sys/mips/atomic.h \
+	atomics/sys/mips/timer.h
diff --git a/src/atomics/sys/mips/atomic.h b/src/atomics/sys/mips/atomic.h
new file mode 100644
index 0000000..2e0765d
--- /dev/null
+++ b/src/atomics/sys/mips/atomic.h
@@ -0,0 +1,199 @@
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2005 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2017      Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#ifndef PMIX_SYS_ARCH_ATOMIC_H
+#define PMIX_SYS_ARCH_ATOMIC_H 1
+
+
+/* BWB - FIX ME! */
+#ifdef __linux__
+#define PMIXMB() __asm__ __volatile__(".set mips2; sync; .set mips0": : :"memory")
+#define PMIXRMB() __asm__ __volatile__(".set mips2; sync; .set mips0": : :"memory")
+#define PMIXWMB() __asm__ __volatile__(".set mips2; sync; .set mips0": : :"memory")
+#define PMIXSMP_SYNC ".set mips2; sync; .set mips0"
+#else
+#define PMIXMB() __asm__ __volatile__("sync": : :"memory")
+#define PMIXRMB() __asm__ __volatile__("sync": : :"memory")
+#define PMIXWMB() __asm__ __volatile__("sync": : :"memory")
+#define PMIXSMP_SYNC "sync"
+#endif
+
+
+/**********************************************************************
+ *
+ * Define constants for MIPS
+ *
+ *********************************************************************/
+#define PMIX_HAVE_ATOMIC_MEM_BARRIER 1
+
+#define PMIX_HAVE_ATOMIC_CMPSET_32 1
+
+#ifdef __mips64
+#define PMIX_HAVE_ATOMIC_CMPSET_64 1
+#endif
+
+/**********************************************************************
+ *
+ * Memory Barriers
+ *
+ *********************************************************************/
+#if PMIX_GCC_INLINE_ASSEMBLY
+
+static inline
+void pmix_atomic_mb(void)
+{
+    PMIXMB();
+}
+
+
+static inline
+void pmix_atomic_rmb(void)
+{
+    PMIXRMB();
+}
+
+
+static inline
+void pmix_atomic_wmb(void)
+{
+    PMIXWMB();
+}
+
+static inline
+void pmix_atomic_isync(void)
+{
+}
+
+#endif
+
+/**********************************************************************
+ *
+ * Atomic math operations
+ *
+ *********************************************************************/
+#if PMIX_GCC_INLINE_ASSEMBLY
+
+static inline int pmix_atomic_cmpset_32(volatile int32_t *addr,
+                                        int32_t oldval, int32_t newval)
+{
+    int32_t ret;
+
+   __asm__ __volatile__ (".set noreorder        \n"
+                         ".set noat             \n"
+                         "1:                    \n"
+#ifdef __linux__
+                         ".set mips2         \n\t"
+#endif
+                         "ll     %0, %2         \n" /* load *addr into ret */
+                         "bne    %0, %z3, 2f    \n" /* done if oldval != ret */
+                         "or     $1, %z4, 0     \n" /* tmp = newval (delay slot) */
+                         "sc     $1, %2         \n" /* store tmp in *addr */
+#ifdef __linux__
+                         ".set mips0         \n\t"
+#endif
+                         /* note: ret will be 0 if failed, 1 if succeeded */
+                         "beqz   $1, 1b         \n" /* if 0 jump back to 1b */
+                         "nop                   \n" /* fill delay slots */
+                         "2:                    \n"
+                         ".set reorder          \n"
+                         : "=&r"(ret), "=m"(*addr)
+                         : "m"(*addr), "r"(oldval), "r"(newval)
+                         : "cc", "memory");
+   return (ret == oldval);
+}
+
+
+/* these two functions aren't inlined in the non-gcc case because then
+   there would be two function calls (since neither cmpset_32 nor
+   atomic_?mb can be inlined).  Instead, we "inline" them by hand in
+   the assembly, meaning there is one function call overhead instead
+   of two */
+static inline int pmix_atomic_cmpset_acq_32(volatile int32_t *addr,
+                                            int32_t oldval, int32_t newval)
+{
+    int rc;
+
+    rc = pmix_atomic_cmpset_32(addr, oldval, newval);
+    pmix_atomic_rmb();
+
+    return rc;
+}
+
+
+static inline int pmix_atomic_cmpset_rel_32(volatile int32_t *addr,
+                                            int32_t oldval, int32_t newval)
+{
+    pmix_atomic_wmb();
+    return pmix_atomic_cmpset_32(addr, oldval, newval);
+}
+
+#ifdef PMIX_HAVE_ATOMIC_CMPSET_64
+static inline int pmix_atomic_cmpset_64(volatile int64_t *addr,
+                                        int64_t oldval, int64_t newval)
+{
+    int64_t ret;
+
+   __asm__ __volatile__ (".set noreorder        \n"
+                         ".set noat             \n"
+                         "1:                    \n\t"
+                         "lld    %0, %2         \n\t" /* load *addr into ret */
+                         "bne    %0, %z3, 2f    \n\t" /* done if oldval != ret */
+                         "or     $1, %4, 0      \n\t" /* tmp = newval (delay slot) */
+                         "scd    $1, %2         \n\t" /* store tmp in *addr */
+                         /* note: ret will be 0 if failed, 1 if succeeded */
+                         "beqz   $1, 1b         \n\t" /* if 0 jump back to 1b */
+                         "nop                   \n\t" /* fill delay slot */
+                         "2:                    \n\t"
+                         ".set reorder          \n"
+                         : "=&r" (ret), "=m" (*addr)
+                         : "m" (*addr), "r" (oldval), "r" (newval)
+                         : "cc", "memory");
+
+   return (ret == oldval);
+}
+
+
+/* these two functions aren't inlined in the non-gcc case because then
+   there would be two function calls (since neither cmpset_64 nor
+   atomic_?mb can be inlined).  Instead, we "inline" them by hand in
+   the assembly, meaning there is one function call overhead instead
+   of two */
+static inline int pmix_atomic_cmpset_acq_64(volatile int64_t *addr,
+                                            int64_t oldval, int64_t newval)
+{
+    int rc;
+
+    rc = pmix_atomic_cmpset_64(addr, oldval, newval);
+    pmix_atomic_rmb();
+
+    return rc;
+}
+
+
+static inline int pmix_atomic_cmpset_rel_64(volatile int64_t *addr,
+                                            int64_t oldval, int64_t newval)
+{
+    pmix_atomic_wmb();
+    return pmix_atomic_cmpset_64(addr, oldval, newval);
+}
+#endif /* PMIX_HAVE_ATOMIC_CMPSET_64 */
+
+#endif /* PMIX_GCC_INLINE_ASSEMBLY */
+
+#endif /* ! PMIX_SYS_ARCH_ATOMIC_H */
diff --git a/src/atomics/sys/mips/timer.h b/src/atomics/sys/mips/timer.h
new file mode 100644
index 0000000..fd280cc
--- /dev/null
+++ b/src/atomics/sys/mips/timer.h
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2008      The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#ifndef PMIX_SYS_ARCH_TIMER_H
+#define PMIX_SYS_ARCH_TIMER_H 1
+
+#include <sys/times.h>
+
+typedef uint64_t pmix_timer_t;
+
+static inline pmix_timer_t
+pmix_sys_timer_get_cycles(void)
+{
+    pmix_timer_t ret;
+    struct tms accurate_clock;
+
+    times(&accurate_clock);
+    ret = accurate_clock.tms_utime + accurate_clock.tms_stime;
+
+    return ret;
+}
+
+#define PMIX_HAVE_SYS_TIMER_GET_CYCLES 1
+
+#endif /* ! PMIX_SYS_ARCH_TIMER_H */
diff --git a/src/atomics/sys/powerpc/Makefile.include b/src/atomics/sys/powerpc/Makefile.include
new file mode 100644
index 0000000..fee4119
--- /dev/null
+++ b/src/atomics/sys/powerpc/Makefile.include
@@ -0,0 +1,24 @@
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2017      Intel, Inc. All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# This makefile.am does not stand on its own - it is included from pmix/include/Makefile.am
+
+headers += \
+	atomics/sys/powerpc/atomic.h \
+	atomics/sys/powerpc/timer.h
diff --git a/src/atomics/sys/powerpc/atomic.h b/src/atomics/sys/powerpc/atomic.h
new file mode 100644
index 0000000..9682b9e
--- /dev/null
+++ b/src/atomics/sys/powerpc/atomic.h
@@ -0,0 +1,462 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2005 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2010-2017 IBM Corporation.  All rights reserved.
+ * Copyright (c) 2015-2016 Los Alamos National Security, LLC. All rights
+ *                         reserved.
+ * Copyright (c) 2017      Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#ifndef PMIX_SYS_ARCH_ATOMIC_H
+#define PMIX_SYS_ARCH_ATOMIC_H 1
+
+/*
+ * On powerpc ...
+ */
+
+#define PMIXMB()  __asm__ __volatile__ ("sync" : : : "memory")
+#define PMIXRMB() __asm__ __volatile__ ("lwsync" : : : "memory")
+#define PMIXWMB() __asm__ __volatile__ ("lwsync" : : : "memory")
+#define PMIXISYNC() __asm__ __volatile__ ("isync" : : : "memory")
+
+
+/**********************************************************************
+ *
+ * Define constants for PowerPC 32
+ *
+ *********************************************************************/
+#define PMIX_HAVE_ATOMIC_MEM_BARRIER 1
+
+#define PMIX_HAVE_ATOMIC_CMPSET_32 1
+#define PMIX_HAVE_ATOMIC_SWAP_32 1
+#define PMIX_HAVE_ATOMIC_LLSC_32 1
+
+#define PMIX_HAVE_ATOMIC_MATH_32 1
+#define PMIX_HAVE_ATOMIC_ADD_32 1
+#define PMIX_HAVE_ATOMIC_SUB_32 1
+
+
+#if (PMIX_ASSEMBLY_ARCH == PMIX_POWERPC64) || PMIX_ASM_SUPPORT_64BIT
+#define PMIX_HAVE_ATOMIC_CMPSET_64 1
+#define PMIX_HAVE_ATOMIC_SWAP_64 1
+#define PMIX_HAVE_ATOMIC_LLSC_64 1
+#define PMIX_HAVE_ATOMIC_MATH_64 1
+#define PMIX_HAVE_ATOMIC_ADD_64 1
+#define PMIX_HAVE_ATOMIC_SUB_64 1
+#endif
+
+
+/**********************************************************************
+ *
+ * Memory Barriers
+ *
+ *********************************************************************/
+#if PMIX_GCC_INLINE_ASSEMBLY
+
+static inline
+void pmix_atomic_mb(void)
+{
+    PMIXMB();
+}
+
+
+static inline
+void pmix_atomic_rmb(void)
+{
+    PMIXRMB();
+}
+
+
+static inline
+void pmix_atomic_wmb(void)
+{
+    PMIXRMB();
+}
+
+static inline
+void pmix_atomic_isync(void)
+{
+    PMIXISYNC();
+}
+
+#elif PMIX_XLC_INLINE_ASSEMBLY /* end PMIX_GCC_INLINE_ASSEMBLY */
+
+/* Yeah, I don't know who thought this was a reasonable syntax for
+ * inline assembly.  Do these because they are used so often and they
+ * are fairly simple (aka: there is a tech pub on IBM's web site
+ * containing the right hex for the instructions).
+ */
+
+#undef PMIX_HAVE_INLINE_ATOMIC_MEM_BARRIER
+#define PMIX_HAVE_INLINE_ATOMIC_MEM_BARRIER 0
+
+#pragma mc_func pmix_atomic_mb { "7c0004ac" }          /* sync  */
+#pragma reg_killed_by pmix_atomic_mb                   /* none */
+
+#pragma mc_func pmix_atomic_rmb { "7c2004ac" }         /* lwsync  */
+#pragma reg_killed_by pmix_atomic_rmb                  /* none */
+
+#pragma mc_func pmix_atomic_wmb { "7c0006ac" }         /* eieio */
+#pragma reg_killed_by pmix_atomic_wmb                  /* none */
+
+#endif
+
+/**********************************************************************
+ *
+ * Atomic math operations
+ *
+ *********************************************************************/
+#if PMIX_GCC_INLINE_ASSEMBLY
+
+#ifdef __xlC__
+/* work-around bizzare xlc bug in which it sign-extends
+   a pointer to a 32-bit signed integer */
+#define PMIX_ASM_ADDR(a) ((uintptr_t)a)
+#else
+#define PMIX_ASM_ADDR(a) (a)
+#endif
+
+#if defined(__PGI)
+/* work-around for bug in PGI 16.5-16.7 where the compiler fails to
+ * correctly emit load instructions for 64-bit operands. without this
+ * it will emit lwz instead of ld to load the 64-bit operand. */
+#define PMIX_ASM_VALUE64(x) (void *)(intptr_t) (x)
+#else
+#define PMIX_ASM_VALUE64(x) x
+#endif
+
+
+static inline int pmix_atomic_cmpset_32(volatile int32_t *addr,
+                                        int32_t oldval, int32_t newval)
+{
+   int32_t ret;
+
+   __asm__ __volatile__ (
+                         "1: lwarx   %0, 0, %2  \n\t"
+                         "   cmpw    0, %0, %3  \n\t"
+                         "   bne-    2f         \n\t"
+                         "   stwcx.  %4, 0, %2  \n\t"
+                         "   bne-    1b         \n\t"
+                         "2:"
+                         : "=&r" (ret), "=m" (*addr)
+                         : "r" PMIX_ASM_ADDR(addr), "r" (oldval), "r" (newval), "m" (*addr)
+                         : "cc", "memory");
+
+   return (ret == oldval);
+}
+
+static inline int32_t pmix_atomic_ll_32 (volatile int32_t *addr)
+{
+   int32_t ret;
+
+   __asm__ __volatile__ ("lwarx   %0, 0, %1  \n\t"
+                         : "=&r" (ret)
+                         : "r" (addr)
+                         );
+   return ret;
+}
+
+static inline int pmix_atomic_sc_32 (volatile int32_t *addr, int32_t newval)
+{
+    int32_t ret, foo;
+
+    __asm__ __volatile__ ("   stwcx.  %4, 0, %3  \n\t"
+                          "   li      %0,0       \n\t"
+                          "   bne-    1f         \n\t"
+                          "   ori     %0,%0,1    \n\t"
+                          "1:"
+                          : "=r" (ret), "=m" (*addr), "=r" (foo)
+                          : "r" (addr), "r" (newval)
+                          : "cc", "memory");
+    return ret;
+}
+
+/* these two functions aren't inlined in the non-gcc case because then
+   there would be two function calls (since neither cmpset_32 nor
+   atomic_?mb can be inlined).  Instead, we "inline" them by hand in
+   the assembly, meaning there is one function call overhead instead
+   of two */
+static inline int pmix_atomic_cmpset_acq_32(volatile int32_t *addr,
+                                            int32_t oldval, int32_t newval)
+{
+    int rc;
+
+    rc = pmix_atomic_cmpset_32(addr, oldval, newval);
+    pmix_atomic_rmb();
+
+    return rc;
+}
+
+
+static inline int pmix_atomic_cmpset_rel_32(volatile int32_t *addr,
+                                            int32_t oldval, int32_t newval)
+{
+    pmix_atomic_wmb();
+    return pmix_atomic_cmpset_32(addr, oldval, newval);
+}
+
+static inline int32_t pmix_atomic_swap_32(volatile int32_t *addr, int32_t newval)
+{
+    int32_t ret;
+
+    __asm__ __volatile__ ("1: lwarx   %0, 0, %2  \n\t"
+                          "   stwcx.  %3, 0, %2  \n\t"
+                          "   bne-    1b         \n\t"
+                          : "=&r" (ret), "=m" (*addr)
+                          : "r" (addr), "r" (newval)
+                          : "cc", "memory");
+
+   return ret;
+}
+
+#endif /* PMIX_GCC_INLINE_ASSEMBLY */
+
+
+#if (PMIX_ASSEMBLY_ARCH == PMIX_POWERPC64)
+
+#if  PMIX_GCC_INLINE_ASSEMBLY
+
+static inline int64_t pmix_atomic_add_64 (volatile int64_t* v, int64_t inc)
+{
+   int64_t t;
+
+   __asm__ __volatile__("1:   ldarx   %0, 0, %3    \n\t"
+                        "     add     %0, %2, %0   \n\t"
+                        "     stdcx.  %0, 0, %3    \n\t"
+                        "     bne-    1b           \n\t"
+                        : "=&r" (t), "=m" (*v)
+                        : "r" (PMIX_ASM_VALUE64(inc)), "r" PMIX_ASM_ADDR(v), "m" (*v)
+                        : "cc");
+
+   return t;
+}
+
+
+static inline int64_t pmix_atomic_sub_64 (volatile int64_t* v, int64_t dec)
+{
+   int64_t t;
+
+   __asm__ __volatile__(
+                        "1:   ldarx   %0,0,%3      \n\t"
+                        "     subf    %0,%2,%0     \n\t"
+                        "     stdcx.  %0,0,%3      \n\t"
+                        "     bne-    1b           \n\t"
+                        : "=&r" (t), "=m" (*v)
+                        : "r" (PMIX_ASM_VALUE64(dec)), "r" PMIX_ASM_ADDR(v), "m" (*v)
+                        : "cc");
+
+   return t;
+}
+
+static inline int pmix_atomic_cmpset_64(volatile int64_t *addr,
+                                        int64_t oldval, int64_t newval)
+{
+   int64_t ret;
+
+   __asm__ __volatile__ (
+                         "1: ldarx   %0, 0, %2  \n\t"
+                         "   cmpd    0, %0, %3  \n\t"
+                         "   bne-    2f         \n\t"
+                         "   stdcx.  %4, 0, %2  \n\t"
+                         "   bne-    1b         \n\t"
+                         "2:"
+                         : "=&r" (ret), "=m" (*addr)
+                         : "r" (addr), "r" (PMIX_ASM_VALUE64(oldval)), "r" (PMIX_ASM_VALUE64(newval)), "m" (*addr)
+                         : "cc", "memory");
+
+   return (ret == oldval);
+}
+
+static inline int64_t pmix_atomic_ll_64(volatile int64_t *addr)
+{
+   int64_t ret;
+
+   __asm__ __volatile__ ("ldarx   %0, 0, %1  \n\t"
+                         : "=&r" (ret)
+                         : "r" (addr)
+                         );
+   return ret;
+}
+
+static inline int pmix_atomic_sc_64(volatile int64_t *addr, int64_t newval)
+{
+    int32_t ret;
+
+    __asm__ __volatile__ ("   stdcx.  %2, 0, %1  \n\t"
+                          "   li      %0,0       \n\t"
+                          "   bne-    1f         \n\t"
+                          "   ori     %0,%0,1    \n\t"
+                          "1:"
+                          : "=r" (ret)
+                          : "r" (addr), "r" (PMIX_ASM_VALUE64(newval))
+                          : "cc", "memory");
+    return ret;
+}
+
+/* these two functions aren't inlined in the non-gcc case because then
+   there would be two function calls (since neither cmpset_64 nor
+   atomic_?mb can be inlined).  Instead, we "inline" them by hand in
+   the assembly, meaning there is one function call overhead instead
+   of two */
+static inline int pmix_atomic_cmpset_acq_64(volatile int64_t *addr,
+                                            int64_t oldval, int64_t newval)
+{
+    int rc;
+
+    rc = pmix_atomic_cmpset_64(addr, oldval, newval);
+    pmix_atomic_rmb();
+
+    return rc;
+}
+
+
+static inline int pmix_atomic_cmpset_rel_64(volatile int64_t *addr,
+                                            int64_t oldval, int64_t newval)
+{
+    pmix_atomic_wmb();
+    return pmix_atomic_cmpset_64(addr, oldval, newval);
+}
+
+static inline int64_t pmix_atomic_swap_64(volatile int64_t *addr, int64_t newval)
+{
+   int64_t ret;
+
+   __asm__ __volatile__ ("1: ldarx   %0, 0, %2  \n\t"
+                         "   stdcx.  %3, 0, %2  \n\t"
+                         "   bne-    1b         \n\t"
+                         : "=&r" (ret), "=m" (*addr)
+                         : "r" (addr), "r" (PMIX_ASM_VALUE64(newval))
+                         : "cc", "memory");
+
+   return ret;
+}
+
+#endif /* PMIX_GCC_INLINE_ASSEMBLY */
+
+#elif (PMIX_ASSEMBLY_ARCH == PMIX_POWERPC32) && PMIX_ASM_SUPPORT_64BIT
+
+#ifndef ll_low /* GLIBC provides these somewhere, so protect */
+#define ll_low(x)       *(((unsigned int*)&(x))+0)
+#define ll_high(x)      *(((unsigned int*)&(x))+1)
+#endif
+
+#if  PMIX_GCC_INLINE_ASSEMBLY
+
+static inline int pmix_atomic_cmpset_64(volatile int64_t *addr,
+                                        int64_t oldval, int64_t newval)
+{
+    int ret;
+
+    /*
+     * We force oldval and newval into memory because PPC doesn't
+     * appear to have a way to do a move register with offset.  Since
+     * this is 32-bit code, a 64 bit integer will be loaded into two
+     * registers (assuming no inlining, addr will be in r3, oldval
+     * will be in r4 and r5, and newval will be r6 and r7.  We need
+     * to load the whole thing into one register.  So we have the
+     * compiler push the values into memory and load the double word
+     * into registers.  We use r4,r5 so that the main block of code
+     * is very similar to the pure 64 bit version.
+     */
+   __asm__ __volatile__ (
+                         "ld r4,%2         \n\t"
+                         "ld r5,%3        \n\t"
+                         "1: ldarx   r9, 0, %1  \n\t"
+                         "   cmpd    0, r9, r4  \n\t"
+                         "   bne-    2f         \n\t"
+                         "   stdcx.  r5, 0, %1  \n\t"
+                         "   bne-    1b         \n\t"
+                         "2:                    \n\t"
+                         "xor r5,r4,r9          \n\t"
+                         "subfic r9,r5,0        \n\t"
+                         "adde %0,r9,r5         \n\t"
+                         : "=&r" (ret)
+                         : "r"PMIX_ASM_ADDR(addr),
+                           "m"(oldval), "m"(newval)
+                         : "r4", "r5", "r9", "cc", "memory");
+
+     return ret;
+}
+
+/* these two functions aren't inlined in the non-gcc case because then
+   there would be two function calls (since neither cmpset_64 nor
+   atomic_?mb can be inlined).  Instead, we "inline" them by hand in
+   the assembly, meaning there is one function call overhead instead
+   of two */
+static inline int pmix_atomic_cmpset_acq_64(volatile int64_t *addr,
+                                            int64_t oldval, int64_t newval)
+{
+    int rc;
+
+    rc = pmix_atomic_cmpset_64(addr, oldval, newval);
+    pmix_atomic_rmb();
+
+    return rc;
+}
+
+
+static inline int pmix_atomic_cmpset_rel_64(volatile int64_t *addr,
+                                            int64_t oldval, int64_t newval)
+{
+    pmix_atomic_wmb();
+    return pmix_atomic_cmpset_64(addr, oldval, newval);
+}
+
+#endif /* PMIX_GCC_INLINE_ASSEMBLY */
+
+#endif /* PMIX_ASM_SUPPORT_64BIT */
+
+
+#if PMIX_GCC_INLINE_ASSEMBLY
+
+static inline int32_t pmix_atomic_add_32(volatile int32_t* v, int inc)
+{
+   int32_t t;
+
+   __asm__ __volatile__(
+                        "1:   lwarx   %0, 0, %3    \n\t"
+                        "     add     %0, %2, %0   \n\t"
+                        "     stwcx.  %0, 0, %3    \n\t"
+                        "     bne-    1b           \n\t"
+                        : "=&r" (t), "=m" (*v)
+                        : "r" (inc), "r" PMIX_ASM_ADDR(v), "m" (*v)
+                        : "cc");
+
+   return t;
+}
+
+
+static inline int32_t pmix_atomic_sub_32(volatile int32_t* v, int dec)
+{
+   int32_t t;
+
+   __asm__ __volatile__(
+                        "1:   lwarx   %0,0,%3      \n\t"
+                        "     subf    %0,%2,%0     \n\t"
+                        "     stwcx.  %0,0,%3      \n\t"
+                        "     bne-    1b           \n\t"
+                        : "=&r" (t), "=m" (*v)
+                        : "r" (dec), "r" PMIX_ASM_ADDR(v), "m" (*v)
+                        : "cc");
+
+   return t;
+}
+
+
+#endif /* PMIX_GCC_INLINE_ASSEMBLY */
+
+#endif /* ! PMIX_SYS_ARCH_ATOMIC_H */
diff --git a/src/atomics/sys/powerpc/timer.h b/src/atomics/sys/powerpc/timer.h
new file mode 100644
index 0000000..0d557e8
--- /dev/null
+++ b/src/atomics/sys/powerpc/timer.h
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2005 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#ifndef PMIX_SYS_ARCH_TIMER_H
+#define PMIX_SYS_ARCH_TIMER_H 1
+
+
+typedef uint64_t pmix_timer_t;
+
+
+#if PMIX_GCC_INLINE_ASSEMBLY
+
+static inline pmix_timer_t
+pmix_sys_timer_get_cycles(void)
+{
+    unsigned int tbl, tbu0, tbu1;
+
+    do {
+        __asm__ __volatile__ ("mftbu %0" : "=r"(tbu0));
+        __asm__ __volatile__ ("mftb %0" : "=r"(tbl));
+        __asm__ __volatile__ ("mftbu %0" : "=r"(tbu1));
+    } while (tbu0 != tbu1);
+
+    return (((unsigned long long)tbu0) << 32) | tbl;
+}
+
+#define PMIX_HAVE_SYS_TIMER_GET_CYCLES 1
+
+#else
+
+pmix_timer_t pmix_sys_timer_get_cycles(void);
+
+#define PMIX_HAVE_SYS_TIMER_GET_CYCLES 1
+
+#endif /* PMIX_GCC_INLINE_ASSEMBLY */
+
+#endif /* ! PMIX_SYS_ARCH_TIMER_H */
diff --git a/src/atomics/sys/sparcv9/Makefile.include b/src/atomics/sys/sparcv9/Makefile.include
new file mode 100644
index 0000000..f2ad630
--- /dev/null
+++ b/src/atomics/sys/sparcv9/Makefile.include
@@ -0,0 +1,24 @@
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2017      Intel, Inc. All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# This makefile.am does not stand on its own - it is included from pmix/include/Makefile.am
+
+headers += \
+	atomics/sys/sparcv9/atomic.h \
+	atomics/sys/sparcv9/timer.h
diff --git a/src/atomics/sys/sparcv9/atomic.h b/src/atomics/sys/sparcv9/atomic.h
new file mode 100644
index 0000000..9d41bde
--- /dev/null
+++ b/src/atomics/sys/sparcv9/atomic.h
@@ -0,0 +1,198 @@
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2005 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2007      Sun Microsystems, Inc.  All rights reserverd.
+ * Copyright (c) 2016      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2017      Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#ifndef PMIX_SYS_ARCH_ATOMIC_H
+#define PMIX_SYS_ARCH_ATOMIC_H 1
+
+/*
+ * On sparc v9, use casa and casxa (compare and swap) instructions.
+ */
+
+#define PMIXASI_P "0x80"
+
+#define PMIXMEMBAR(type) __asm__  __volatile__ ("membar " type : : : "memory")
+
+
+/**********************************************************************
+ *
+ * Define constants for Sparc v9 (Ultra Sparc)
+ *
+ *********************************************************************/
+#define PMIX_HAVE_ATOMIC_MEM_BARRIER 1
+
+#define PMIX_HAVE_ATOMIC_CMPSET_32 1
+
+#define PMIX_HAVE_ATOMIC_CMPSET_64 1
+
+
+/**********************************************************************
+ *
+ * Memory Barriers
+ *
+ *********************************************************************/
+#if PMIX_GCC_INLINE_ASSEMBLY
+
+static inline void pmix_atomic_mb(void)
+{
+    PMIXMEMBAR("#LoadLoad | #LoadStore | #StoreStore | #StoreLoad");
+}
+
+
+static inline void pmix_atomic_rmb(void)
+{
+    PMIXMEMBAR("#LoadLoad");
+}
+
+
+static inline void pmix_atomic_wmb(void)
+{
+    PMIXMEMBAR("#StoreStore");
+}
+
+static inline void pmix_atomic_isync(void)
+{
+}
+
+
+#endif /* PMIX_GCC_INLINE_ASSEMBLY */
+
+
+/**********************************************************************
+ *
+ * Atomic math operations
+ *
+ *********************************************************************/
+#if PMIX_GCC_INLINE_ASSEMBLY
+
+static inline int pmix_atomic_cmpset_32( volatile int32_t *addr,
+                                         int32_t oldval, int32_t newval)
+{
+   /* casa [reg(rs1)] %asi, reg(rs2), reg(rd)
+    *
+    * if (*(reg(rs1)) == reg(rs2) )
+    *    swap reg(rd), *(reg(rs1))
+    * else
+    *    reg(rd) = *(reg(rs1))
+    */
+
+   int32_t ret = newval;
+
+   __asm__ __volatile__("casa [%1] " PMIXASI_P ", %2, %0"
+                      : "+r" (ret)
+                      : "r" (addr), "r" (oldval));
+   return (ret == oldval);
+}
+
+
+static inline int pmix_atomic_cmpset_acq_32( volatile int32_t *addr,
+                                             int32_t oldval, int32_t newval)
+{
+   int rc;
+
+   rc = pmix_atomic_cmpset_32(addr, oldval, newval);
+   pmix_atomic_rmb();
+
+   return rc;
+}
+
+
+static inline int pmix_atomic_cmpset_rel_32( volatile int32_t *addr,
+                                             int32_t oldval, int32_t newval)
+{
+   pmix_atomic_wmb();
+   return pmix_atomic_cmpset_32(addr, oldval, newval);
+}
+
+
+#if PMIX_ASSEMBLY_ARCH == PMIX_SPARCV9_64
+
+static inline int pmix_atomic_cmpset_64( volatile int64_t *addr,
+                                         int64_t oldval, int64_t newval)
+{
+    /* casa [reg(rs1)] %asi, reg(rs2), reg(rd)
+     *
+     * if (*(reg(rs1)) == reg(rs1) )
+     *    swap reg(rd), *(reg(rs1))
+     * else
+     *    reg(rd) = *(reg(rs1))
+     */
+   int64_t ret = newval;
+
+   __asm__ __volatile__("casxa [%1] " PMIXASI_P ", %2, %0"
+                      : "+r" (ret)
+                      : "r" (addr), "r" (oldval));
+   return (ret == oldval);
+}
+
+#else /* PMIX_ASSEMBLY_ARCH == PMIX_SPARCV9_64 */
+
+static inline int pmix_atomic_cmpset_64( volatile int64_t *addr,
+                                         int64_t oldval, int64_t newval)
+{
+    /* casa [reg(rs1)] %asi, reg(rs2), reg(rd)
+     *
+     * if (*(reg(rs1)) == reg(rs1) )
+     *    swap reg(rd), *(reg(rs1))
+     * else
+     *    reg(rd) = *(reg(rs1))
+     *
+     */
+    long long ret = newval;
+
+    __asm__ __volatile__(
+                       "ldx %0, %%g1               \n\t" /* g1 = ret */
+                       "ldx %2, %%g2               \n\t" /* g2 = oldval */
+                       "casxa [%1] " PMIXASI_P ", %%g2, %%g1 \n\t"
+                       "stx %%g1, %0               \n"
+                       : "+m"(ret)
+                       : "r"(addr), "m"(oldval)
+                       : "%g1", "%g2"
+                       );
+
+   return (ret == oldval);
+}
+
+#endif /* PMIX_ASSEMBLY_ARCH == PMIX_SPARCV9_64 */
+
+static inline int pmix_atomic_cmpset_acq_64( volatile int64_t *addr,
+                                             int64_t oldval, int64_t newval)
+{
+   int rc;
+
+   rc = pmix_atomic_cmpset_64(addr, oldval, newval);
+   pmix_atomic_rmb();
+
+   return rc;
+}
+
+
+static inline int pmix_atomic_cmpset_rel_64( volatile int64_t *addr,
+                                             int64_t oldval, int64_t newval)
+{
+   pmix_atomic_wmb();
+   return pmix_atomic_cmpset_64(addr, oldval, newval);
+}
+
+#endif /* PMIX_GCC_INLINE_ASSEMBLY */
+
+
+#endif /* ! PMIX_SYS_ARCH_ATOMIC_H */
diff --git a/src/atomics/sys/sparcv9/timer.h b/src/atomics/sys/sparcv9/timer.h
new file mode 100644
index 0000000..354baba
--- /dev/null
+++ b/src/atomics/sys/sparcv9/timer.h
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2005 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#ifndef PMIX_SYS_ARCH_TIMER_H
+#define PMIX_SYS_ARCH_TIMER_H 1
+
+typedef uint64_t pmix_timer_t;
+
+#if PMIX_GCC_INLINE_ASSEMBLY
+
+
+#if PMIX_ASSEMBLY_ARCH == PMIX_SPARCV9_64
+
+static inline pmix_timer_t
+pmix_sys_timer_get_cycles(void)
+{
+    pmix_timer_t ret;
+
+    __asm__ __volatile__("rd %%tick, %0" : "=r"(ret));
+
+    return ret;
+}
+
+#else /* PMIX_SPARCV9_32 */
+
+static inline pmix_timer_t
+pmix_sys_timer_get_cycles(void)
+{
+    pmix_timer_t ret;
+    int a, b;
+
+    __asm__ __volatile__("rd %%tick, %0    \n"
+                         "srlx %0, 32, %1 " :
+                         "=r"(a), "=r"(b)
+                         );
+
+    ret = (0x00000000FFFFFFFF & a) | (((pmix_timer_t) b) << 32);
+
+    return ret;
+}
+
+#endif
+
+#define PMIX_HAVE_SYS_TIMER_GET_CYCLES 1
+
+#else
+
+#define PMIX_HAVE_SYS_TIMER_GET_CYCLES 0
+
+#endif /* PMIX_GCC_INLINE_ASSEMBLY */
+
+#endif /* ! PMIX_SYS_ARCH_TIMER_H */
diff --git a/src/atomics/sys/sync_builtin/Makefile.include b/src/atomics/sys/sync_builtin/Makefile.include
new file mode 100644
index 0000000..a57977a
--- /dev/null
+++ b/src/atomics/sys/sync_builtin/Makefile.include
@@ -0,0 +1,24 @@
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2011      Sandia National Laboratories. All rights reserved.
+# Copyright (c) 2017      Intel, Inc. All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# This makefile.am does not stand on its own - it is included from pmix/include/Makefile.am
+
+headers += \
+	atomics/sys/sync_builtin/atomic.h
diff --git a/src/atomics/sys/sync_builtin/atomic.h b/src/atomics/sys/sync_builtin/atomic.h
new file mode 100644
index 0000000..8823a7d
--- /dev/null
+++ b/src/atomics/sys/sync_builtin/atomic.h
@@ -0,0 +1,137 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2013 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2011      Sandia National Laboratories. All rights reserved.
+ * Copyright (c) 2014-2016 Los Alamos National Security, LLC. All rights
+ *                         reserved.
+ * Copyright (c) 2017      Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#ifndef PMIX_SYS_ARCH_ATOMIC_H
+#define PMIX_SYS_ARCH_ATOMIC_H 1
+
+/**********************************************************************
+ *
+ * Memory Barriers
+ *
+ *********************************************************************/
+#define PMIX_HAVE_ATOMIC_MEM_BARRIER 1
+
+static inline void pmix_atomic_mb(void)
+{
+    __sync_synchronize();
+}
+
+static inline void pmix_atomic_rmb(void)
+{
+    __sync_synchronize();
+}
+
+static inline void pmix_atomic_wmb(void)
+{
+    __sync_synchronize();
+}
+
+#define PMIXMB() pmix_atomic_mb()
+
+/**********************************************************************
+ *
+ * Atomic math operations
+ *
+ *********************************************************************/
+
+#define PMIX_HAVE_ATOMIC_CMPSET_32 1
+static inline int pmix_atomic_cmpset_acq_32( volatile int32_t *addr,
+                                             int32_t oldval, int32_t newval)
+{
+    return __sync_bool_compare_and_swap(addr, oldval, newval);
+}
+
+
+static inline int pmix_atomic_cmpset_rel_32( volatile int32_t *addr,
+                                             int32_t oldval, int32_t newval)
+{
+    return __sync_bool_compare_and_swap(addr, oldval, newval);}
+
+static inline int pmix_atomic_cmpset_32( volatile int32_t *addr,
+                                         int32_t oldval, int32_t newval)
+{
+    return __sync_bool_compare_and_swap(addr, oldval, newval);
+}
+
+#define PMIX_HAVE_ATOMIC_MATH_32 1
+
+#define PMIX_HAVE_ATOMIC_ADD_32 1
+static inline int32_t pmix_atomic_add_32(volatile int32_t *addr, int32_t delta)
+{
+    return __sync_add_and_fetch(addr, delta);
+}
+
+#define PMIX_HAVE_ATOMIC_SUB_32 1
+static inline int32_t pmix_atomic_sub_32(volatile int32_t *addr, int32_t delta)
+{
+    return __sync_sub_and_fetch(addr, delta);
+}
+
+#if PMIX_ASM_SYNC_HAVE_64BIT
+
+#define PMIX_HAVE_ATOMIC_CMPSET_64 1
+static inline int pmix_atomic_cmpset_acq_64( volatile int64_t *addr,
+                                             int64_t oldval, int64_t newval)
+{
+    return __sync_bool_compare_and_swap(addr, oldval, newval);
+}
+
+static inline int pmix_atomic_cmpset_rel_64( volatile int64_t *addr,
+                                             int64_t oldval, int64_t newval)
+{
+    return __sync_bool_compare_and_swap(addr, oldval, newval);}
+
+
+static inline int pmix_atomic_cmpset_64( volatile int64_t *addr,
+                                         int64_t oldval, int64_t newval)
+{
+    return __sync_bool_compare_and_swap(addr, oldval, newval);
+}
+
+#define PMIX_HAVE_ATOMIC_MATH_64 1
+#define PMIX_HAVE_ATOMIC_ADD_64 1
+static inline int64_t pmix_atomic_add_64(volatile int64_t *addr, int64_t delta)
+{
+    return __sync_add_and_fetch(addr, delta);
+}
+
+#define PMIX_HAVE_ATOMIC_SUB_64 1
+static inline int64_t pmix_atomic_sub_64(volatile int64_t *addr, int64_t delta)
+{
+    return __sync_sub_and_fetch(addr, delta);
+}
+
+#endif
+
+#if PMIX_HAVE_SYNC_BUILTIN_CSWAP_INT128
+static inline int pmix_atomic_cmpset_128 (volatile pmix_int128_t *addr,
+                                          pmix_int128_t oldval, pmix_int128_t newval)
+{
+    return __sync_bool_compare_and_swap(addr, oldval, newval);
+}
+
+#define PMIX_HAVE_ATOMIC_CMPSET_128 1
+
+#endif
+
+#endif /* ! PMIX_SYS_ARCH_ATOMIC_H */
diff --git a/src/atomics/sys/timer.h b/src/atomics/sys/timer.h
new file mode 100644
index 0000000..1b0eb7a
--- /dev/null
+++ b/src/atomics/sys/timer.h
@@ -0,0 +1,117 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2014 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2016      Broadcom Limited. All rights reserved.
+ * Copyright (c) 2016      Los Alamos National Security, LLC. All rights
+ *                         reserved.
+ * Copyright (c) 2017      Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+/** @file
+ *
+ * Cycle counter reading instructions.  Do not use directly - see the
+ * timer interface instead
+ */
+
+#ifndef PMIX_SYS_TIMER_H
+#define PMIX_SYS_TIMER_H 1
+
+#include "pmix_config.h"
+
+#include "src/atomics/sys/architecture.h"
+
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
+/* do some quick #define cleanup in cases where we are doing
+   testing... */
+#ifdef PMIX_DISABLE_INLINE_ASM
+#undef PMIX_C_GCC_INLINE_ASSEMBLY
+#define PMIX_C_GCC_INLINE_ASSEMBLY 0
+#endif
+
+/* define PMIX_{GCC,DEC,XLC}_INLINE_ASSEMBLY based on the
+   PMIX_{C,CXX}_{GCC,DEC,XLC}_INLINE_ASSEMBLY defines and whether we
+   are in C or C++ */
+#if defined(c_plusplus) || defined(__cplusplus)
+#define PMIX_GCC_INLINE_ASSEMBLY PMIX_CXX_GCC_INLINE_ASSEMBLY
+#else
+#define PMIX_GCC_INLINE_ASSEMBLY PMIX_C_GCC_INLINE_ASSEMBLY
+#endif
+
+/**********************************************************************
+ *
+ * Load the appropriate architecture files and set some reasonable
+ * default values for our support
+ *
+ *********************************************************************/
+
+/* By default we suppose all timers are monotonic per node. */
+#define PMIX_TIMER_MONOTONIC 1
+
+BEGIN_C_DECLS
+
+/* If you update this list, you probably also want to update
+   src/mca/timer/linux/configure.m4.  Or not. */
+
+#if defined(DOXYGEN)
+/* don't include system-level gorp when generating doxygen files */
+#elif PMIX_ASSEMBLY_ARCH == PMIX_X86_64
+#include "src/atomics/sys/x86_64/timer.h"
+#elif PMIX_ASSEMBLY_ARCH == PMIX_ARM
+#include "src/atomics/sys/arm/timer.h"
+#elif PMIX_ASSEMBLY_ARCH == PMIX_ARM64
+#include "src/atomics/sys/arm64/timer.h"
+#elif PMIX_ASSEMBLY_ARCH == PMIX_IA32
+#include "src/atomics/sys/ia32/timer.h"
+#elif PMIX_ASSEMBLY_ARCH == PMIX_IA64
+#include "src/atomics/sys/ia64/timer.h"
+#elif PMIX_ASSEMBLY_ARCH == PMIX_POWERPC32
+#include "src/atomics/sys/powerpc/timer.h"
+#elif PMIX_ASSEMBLY_ARCH == PMIX_POWERPC64
+#include "src/atomics/sys/powerpc/timer.h"
+#elif PMIX_ASSEMBLY_ARCH == PMIX_SPARCV9_32
+#include "src/atomics/sys/sparcv9/timer.h"
+#elif PMIX_ASSEMBLY_ARCH == PMIX_SPARCV9_64
+#include "src/atomics/sys/sparcv9/timer.h"
+#elif PMIX_ASSEMBLY_ARCH == PMIX_MIPS
+#include "src/atomics/sys/mips/timer.h"
+#endif
+
+#ifndef DOXYGEN
+#ifndef PMIX_HAVE_SYS_TIMER_GET_CYCLES
+#define PMIX_HAVE_SYS_TIMER_GET_CYCLES 0
+
+typedef long pmix_timer_t;
+#endif
+#endif
+
+#ifndef PMIX_HAVE_SYS_TIMER_IS_MONOTONIC
+
+#define PMIX_HAVE_SYS_TIMER_IS_MONOTONIC 1
+
+static inline bool pmix_sys_timer_is_monotonic (void)
+{
+    return PMIX_TIMER_MONOTONIC;
+}
+
+#endif
+
+END_C_DECLS
+
+#endif /* PMIX_SYS_TIMER_H */
diff --git a/src/atomics/sys/x86_64/Makefile.include b/src/atomics/sys/x86_64/Makefile.include
new file mode 100644
index 0000000..79a42b8
--- /dev/null
+++ b/src/atomics/sys/x86_64/Makefile.include
@@ -0,0 +1,26 @@
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2017      Research Organization for Information Science
+#                         and Technology (RIST). All rights reserved.
+# Copyright (c) 2017      Intel, Inc. All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# This makefile.am does not stand on its own - it is included from pmix/include/Makefile.am
+
+headers += \
+	atomics/sys/x86_64/atomic.h \
+	atomics/sys/x86_64/timer.h
diff --git a/src/atomics/sys/x86_64/atomic.h b/src/atomics/sys/x86_64/atomic.h
new file mode 100644
index 0000000..aa71aae
--- /dev/null
+++ b/src/atomics/sys/x86_64/atomic.h
@@ -0,0 +1,281 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2010 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2007      Sun Microsystems, Inc.  All rights reserverd.
+ * Copyright (c) 2012-2014 Los Alamos National Security, LLC. All rights
+ *                         reserved.
+ * Copyright (c) 2016-2017 Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2017      Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+#ifndef PMIX_SYS_ARCH_ATOMIC_H
+#define PMIX_SYS_ARCH_ATOMIC_H 1
+
+/*
+ * On x86_64, we use cmpxchg.
+ */
+
+
+#define PMIXSMPLOCK "lock; "
+#define PMIXMB() __asm__ __volatile__("": : :"memory")
+
+
+/**********************************************************************
+ *
+ * Define constants for AMD64 / x86_64 / EM64T / ...
+ *
+ *********************************************************************/
+#define PMIX_HAVE_ATOMIC_MEM_BARRIER 1
+
+#define PMIX_HAVE_ATOMIC_CMPSET_32 1
+
+#define PMIX_HAVE_ATOMIC_CMPSET_64 1
+
+/**********************************************************************
+ *
+ * Memory Barriers
+ *
+ *********************************************************************/
+#if PMIX_GCC_INLINE_ASSEMBLY
+
+static inline void pmix_atomic_mb(void)
+{
+    PMIXMB();
+}
+
+
+static inline void pmix_atomic_rmb(void)
+{
+    PMIXMB();
+}
+
+
+static inline void pmix_atomic_wmb(void)
+{
+    PMIXMB();
+}
+
+static inline void pmix_atomic_isync(void)
+{
+}
+
+#endif /* PMIX_GCC_INLINE_ASSEMBLY */
+
+
+/**********************************************************************
+ *
+ * Atomic math operations
+ *
+ *********************************************************************/
+#if PMIX_GCC_INLINE_ASSEMBLY
+
+static inline int pmix_atomic_cmpset_32( volatile int32_t *addr,
+                                        int32_t oldval, int32_t newval)
+{
+   unsigned char ret;
+   __asm__ __volatile__ (
+                       PMIXSMPLOCK "cmpxchgl %3,%2   \n\t"
+                               "sete     %0      \n\t"
+                       : "=qm" (ret), "+a" (oldval), "+m" (*addr)
+                       : "q"(newval)
+                       : "memory", "cc");
+
+   return (int)ret;
+}
+
+#endif /* PMIX_GCC_INLINE_ASSEMBLY */
+
+#define pmix_atomic_cmpset_acq_32 pmix_atomic_cmpset_32
+#define pmix_atomic_cmpset_rel_32 pmix_atomic_cmpset_32
+
+#if PMIX_GCC_INLINE_ASSEMBLY
+
+static inline int pmix_atomic_cmpset_64( volatile int64_t *addr,
+                                         int64_t oldval, int64_t newval)
+{
+   unsigned char ret;
+   __asm__ __volatile__ (
+                       PMIXSMPLOCK "cmpxchgq %3,%2   \n\t"
+                               "sete     %0      \n\t"
+                       : "=qm" (ret), "+a" (oldval), "+m" (*((volatile long*)addr))
+                       : "q"(newval)
+                       : "memory", "cc"
+                       );
+
+   return (int)ret;
+}
+
+#endif /* PMIX_GCC_INLINE_ASSEMBLY */
+
+#define pmix_atomic_cmpset_acq_64 pmix_atomic_cmpset_64
+#define pmix_atomic_cmpset_rel_64 pmix_atomic_cmpset_64
+
+#if PMIX_GCC_INLINE_ASSEMBLY && PMIX_HAVE_CMPXCHG16B && HAVE_PMIX_INT128_T
+
+static inline int pmix_atomic_cmpset_128 (volatile pmix_int128_t *addr, pmix_int128_t oldval,
+                                          pmix_int128_t newval)
+{
+    unsigned char ret;
+
+    /* cmpxchg16b compares the value at the address with eax:edx (low:high). if the values are
+     * the same the contents of ebx:ecx are stores at the address. in all cases the value stored
+     * at the address is returned in eax:edx. */
+    __asm__ __volatile__ (PMIXSMPLOCK "cmpxchg16b (%%rsi)   \n\t"
+                                  "sete     %0      \n\t"
+                          : "=qm" (ret)
+                          : "S" (addr), "b" (((int64_t *)&newval)[0]), "c" (((int64_t *)&newval)[1]),
+                            "a" (((int64_t *)&oldval)[0]), "d" (((int64_t *)&oldval)[1])
+                          : "memory", "cc");
+
+    return (int) ret;
+}
+
+#define PMIX_HAVE_ATOMIC_CMPSET_128 1
+
+#endif /* PMIX_GCC_INLINE_ASSEMBLY */
+
+
+#if PMIX_GCC_INLINE_ASSEMBLY
+
+#define PMIX_HAVE_ATOMIC_SWAP_32 1
+
+#define PMIX_HAVE_ATOMIC_SWAP_64 1
+
+static inline int32_t pmix_atomic_swap_32( volatile int32_t *addr,
+                                           int32_t newval)
+{
+    int32_t oldval;
+
+    __asm__ __volatile__("xchg %1, %0" :
+                         "=r" (oldval), "+m" (*addr) :
+                         "0" (newval) :
+                         "memory");
+    return oldval;
+}
+
+#endif /* PMIX_GCC_INLINE_ASSEMBLY */
+
+#if PMIX_GCC_INLINE_ASSEMBLY
+
+static inline int64_t pmix_atomic_swap_64( volatile int64_t *addr,
+                                           int64_t newval)
+{
+    int64_t oldval;
+
+    __asm__ __volatile__("xchgq %1, %0" :
+                         "=r" (oldval), "+m" (*addr) :
+                         "0" (newval) :
+                         "memory");
+    return oldval;
+}
+
+#endif /* PMIX_GCC_INLINE_ASSEMBLY */
+
+
+
+#if PMIX_GCC_INLINE_ASSEMBLY
+
+#define PMIX_HAVE_ATOMIC_MATH_32 1
+#define PMIX_HAVE_ATOMIC_MATH_64 1
+
+#define PMIX_HAVE_ATOMIC_ADD_32 1
+
+/**
+ * atomic_add - add integer to atomic variable
+ * @i: integer value to add
+ * @v: pointer of type int
+ *
+ * Atomically adds @i to @v.
+ */
+static inline int32_t pmix_atomic_add_32(volatile int32_t* v, int i)
+{
+    int ret = i;
+   __asm__ __volatile__(
+                        PMIXSMPLOCK "xaddl %1,%0"
+                        :"+m" (*v), "+r" (ret)
+                        :
+                        :"memory", "cc"
+                        );
+   return (ret+i);
+}
+
+#define PMIX_HAVE_ATOMIC_ADD_64 1
+
+/**
+ * atomic_add - add integer to atomic variable
+ * @i: integer value to add
+ * @v: pointer of type int
+ *
+ * Atomically adds @i to @v.
+ */
+static inline int64_t pmix_atomic_add_64(volatile int64_t* v, int64_t i)
+{
+    int64_t ret = i;
+   __asm__ __volatile__(
+                        PMIXSMPLOCK "xaddq %1,%0"
+                        :"+m" (*v), "+r" (ret)
+                        :
+                        :"memory", "cc"
+                        );
+   return (ret+i);
+}
+
+#define PMIX_HAVE_ATOMIC_SUB_32 1
+
+/**
+ * atomic_sub - subtract the atomic variable
+ * @i: integer value to subtract
+ * @v: pointer of type int
+ *
+ * Atomically subtracts @i from @v.
+ */
+static inline int32_t pmix_atomic_sub_32(volatile int32_t* v, int i)
+{
+    int ret = -i;
+   __asm__ __volatile__(
+                        PMIXSMPLOCK "xaddl %1,%0"
+                        :"+m" (*v), "+r" (ret)
+                        :
+                        :"memory", "cc"
+                        );
+   return (ret-i);
+}
+
+#define PMIX_HAVE_ATOMIC_SUB_64 1
+
+/**
+ * atomic_sub - subtract the atomic variable
+ * @i: integer value to subtract
+ * @v: pointer of type int
+ *
+ * Atomically subtracts @i from @v.
+ */
+static inline int64_t pmix_atomic_sub_64(volatile int64_t* v, int64_t i)
+{
+    int64_t ret = -i;
+   __asm__ __volatile__(
+                        PMIXSMPLOCK "xaddq %1,%0"
+                        :"+m" (*v), "+r" (ret)
+                        :
+                        :"memory", "cc"
+                        );
+   return (ret-i);
+}
+
+#endif /* PMIX_GCC_INLINE_ASSEMBLY */
+
+#endif /* ! PMIX_SYS_ARCH_ATOMIC_H */
diff --git a/src/atomics/sys/x86_64/timer.h b/src/atomics/sys/x86_64/timer.h
new file mode 100644
index 0000000..0d6019c
--- /dev/null
+++ b/src/atomics/sys/x86_64/timer.h
@@ -0,0 +1,75 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2014 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2016      Los Alamos National Security, LLC. ALl rights
+ *                         reserved.
+ * Copyright (c) 2017      Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#ifndef PMIX_SYS_ARCH_TIMER_H
+#define PMIX_SYS_ARCH_TIMER_H 1
+
+
+typedef uint64_t pmix_timer_t;
+
+/* Using RDTSC(P) results in non-monotonic timers across cores */
+#undef PMIX_TIMER_MONOTONIC
+#define PMIX_TIMER_MONOTONIC 0
+
+#if PMIX_GCC_INLINE_ASSEMBLY
+
+/* TODO: add AMD mfence version and dispatch at init */
+static inline pmix_timer_t
+pmix_sys_timer_get_cycles(void)
+{
+     uint32_t l, h;
+     __asm__ __volatile__ ("lfence\n\t"
+                           "rdtsc\n\t"
+                           : "=a" (l), "=d" (h));
+     return ((pmix_timer_t)l) | (((pmix_timer_t)h) << 32);
+}
+
+static inline bool pmix_sys_timer_is_monotonic (void)
+{
+    int64_t tmp;
+    int32_t cpuid1, cpuid2;
+    const int32_t level = 0x80000007;
+
+    /* cpuid clobbers ebx but it must be restored for -fPIC so save
+     * then restore ebx */
+    __asm__ volatile ("xchg %%rbx, %2\n"
+                      "cpuid\n"
+                      "xchg %%rbx, %2\n":
+                      "=a" (cpuid1), "=d" (cpuid2), "=r" (tmp) :
+                      "a" (level) :
+                      "ecx", "ebx");
+    /* bit 8 of edx contains the invariant tsc flag */
+    return !!(cpuid2 & (1 << 8));
+}
+
+#define PMIX_HAVE_SYS_TIMER_GET_CYCLES 1
+#define PMIX_HAVE_SYS_TIMER_IS_MONOTONIC 1
+
+#else
+
+pmix_timer_t pmix_sys_timer_get_cycles(void);
+
+#define PMIX_HAVE_SYS_TIMER_GET_CYCLES 1
+
+#endif /* PMIX_GCC_INLINE_ASSEMBLY */
+
+#endif /* ! PMIX_SYS_ARCH_TIMER_H */
diff --git a/src/buffer_ops/Makefile.am b/src/buffer_ops/Makefile.am
new file mode 100644
index 0000000..31a093e
--- /dev/null
+++ b/src/buffer_ops/Makefile.am
@@ -0,0 +1,36 @@
+# -*- makefile -*-
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2012      Los Alamos National Security, Inc.  All rights reserved.
+# Copyright (c) 2013-2016 Intel, Inc. All rights reserved
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# This makefile.am does not stand on its own - it is included from
+# src/Makefile.am
+
+headers += \
+         buffer_ops/buffer_ops.h \
+         buffer_ops/types.h \
+         buffer_ops/internal.h
+
+sources += \
+        buffer_ops/copy.c \
+        buffer_ops/internal_functions.c \
+        buffer_ops/open_close.c \
+        buffer_ops/pack.c \
+        buffer_ops/print.c \
+        buffer_ops/unpack.c
diff --git a/src/buffer_ops/buffer_ops.h b/src/buffer_ops/buffer_ops.h
new file mode 100644
index 0000000..a02bfa7
--- /dev/null
+++ b/src/buffer_ops/buffer_ops.h
@@ -0,0 +1,315 @@
+/* -*- Mode: C; c-basic-offset:4 ; -*- */
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2005 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2012      Los Alamos National Security, Inc. All rights reserved.
+ * Copyright (c) 2013-2016 Intel, Inc. All rights reserved
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2016      Mellanox Technologies, Inc.
+ *                         All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+/**
+ * @file
+ *
+ * Data packing subsystem.
+ */
+
+#ifndef PMIX_BFROP_H_
+#define PMIX_BFROP_H_
+
+#include <src/include/pmix_config.h>
+
+#include <src/include/types.h>
+
+#include "src/include/pmix_globals.h"
+#include "src/buffer_ops/types.h"
+
+BEGIN_C_DECLS
+
+/* A non-API function for something that happens in a number
+ * of places throughout the code base - transferring a value to
+ * another pmix_value_t structure
+ */
+pmix_status_t pmix_value_xfer(pmix_value_t *kv, pmix_value_t *src);
+void pmix_value_load(pmix_value_t *v, const void *data,
+                                   pmix_data_type_t type);
+pmix_status_t pmix_value_unload(pmix_value_t *kv, void **data,
+                                              size_t *sz, pmix_data_type_t type);
+bool pmix_value_cmp(pmix_value_t *p, pmix_value_t *p1);
+
+
+#define PMIX_LOAD_BUFFER(b, d, s)                       \
+    do {                                                \
+        (b)->base_ptr = (char*)(d);                     \
+        (b)->bytes_used = (s);                          \
+        (b)->bytes_allocated = (s);                     \
+        (b)->pack_ptr = ((char*)(b)->base_ptr) + (s);   \
+        (b)->unpack_ptr = (b)->base_ptr;                \
+        (d) = NULL;                                     \
+        (s) = 0;                                        \
+    } while (0)
+
+#define PMIX_UNLOAD_BUFFER(b, d, s)             \
+    do {                                        \
+        (d) = (char*)(b)->unpack_ptr;           \
+        (s) = (b)->bytes_used;                  \
+        (b)->base_ptr = NULL;                   \
+        (b)->bytes_used = 0;                    \
+        (b)->bytes_allocated = 0;               \
+        (b)->pack_ptr = NULL;                   \
+        (b)->unpack_ptr = NULL;                 \
+    } while (0)
+
+
+/**
+ * Top-level interface function to pack one or more values into a
+ * buffer.
+ *
+ * The pack function packs one or more values of a specified type into
+ * the specified buffer.  The buffer must have already been
+ * initialized via an PMIX_NEW or PMIX_CONSTRUCT call - otherwise, the
+ * pack_value function will return an error. Providing an unsupported
+ * type flag will likewise be reported as an error.
+ *
+ * Note that any data to be packed that is not hard type cast (i.e.,
+ * not type cast to a specific size) may lose precision when unpacked
+ * by a non-homogeneous recipient.  The BFROP will do its best to deal
+ * with heterogeneity issues between the packer and unpacker in such
+ * cases. Sending a number larger than can be handled by the recipient
+ * will return an error code (generated by the BFROP upon unpacking) -
+ * the BFROP cannot detect such errors during packing.
+ *
+ * @param *buffer A pointer to the buffer into which the value is to
+ * be packed.
+ *
+ * @param *src A void* pointer to the data that is to be packed. Note
+ * that strings are to be passed as (char **) - i.e., the caller must
+ * pass the address of the pointer to the string as the void*. This
+ * allows the BFROP to use a single interface function, but still allow
+ * the caller to pass multiple strings in a single call.
+ *
+ * @param num_values An int32_t indicating the number of values that are
+ * to be packed, beginning at the location pointed to by src. A string
+ * value is counted as a single value regardless of length. The values
+ * must be contiguous in memory. Arrays of pointers (e.g., string
+ * arrays) should be contiguous, although (obviously) the data pointed
+ * to need not be contiguous across array entries.
+ *
+ * @param type The type of the data to be packed - must be one of the
+ * PMIX defined data types.
+ *
+ * @retval PMIX_SUCCESS The data was packed as requested.
+ *
+ * @retval PMIX_ERROR(s) An appropriate PMIX error code indicating the
+ * problem encountered. This error code should be handled
+ * appropriately.
+ *
+ * @code
+ * pmix_buffer_t *buffer;
+ * int32_t src;
+ *
+ * status_code = pmix_bfrop.pack(buffer, &src, 1, PMIX_INT32);
+ * @endcode
+ */
+typedef pmix_status_t (*pmix_bfrop_pack_fn_t)(pmix_buffer_t *buffer, const void *src,
+                                              int32_t num_values,
+                                              pmix_data_type_t type);
+
+/**
+ * Unpack values from a buffer.
+ *
+ * The unpack function unpacks the next value (or values) of a
+ * specified type from the specified buffer.
+ *
+ * The buffer must have already been initialized via an PMIX_NEW or
+ * PMIX_CONSTRUCT call (and assumedly filled with some data) -
+ * otherwise, the unpack_value function will return an
+ * error. Providing an unsupported type flag will likewise be reported
+ * as an error, as will specifying a data type that DOES NOT match the
+ * type of the next item in the buffer. An attempt to read beyond the
+ * end of the stored data held in the buffer will also return an
+ * error.
+ *
+ * NOTE: it is possible for the buffer to be corrupted and that
+ * the BFROP will *think* there is a proper variable type at the
+ * beginning of an unpack region - but that the value is bogus (e.g., just
+ * a byte field in a string array that so happens to have a value that
+ * matches the specified data type flag). Therefore, the data type error check
+ * is NOT completely safe. This is true for ALL unpack functions.
+ *
+ *
+ * Unpacking values is a "destructive" process - i.e., the values are
+ * removed from the buffer, thus reducing the buffer size. It is
+ * therefore not possible for the caller to re-unpack a value from the
+ * same buffer.
+ *
+ * Warning: The caller is responsible for providing adequate memory
+ * storage for the requested data. As noted below, the user
+ * must provide a parameter indicating the maximum number of values that
+ * can be unpacked into the allocated memory. If more values exist in the
+ * buffer than can fit into the memory storage, then the bfrop will unpack
+ * what it can fit into that location and return an error code indicating
+ * that the buffer was only partially unpacked.
+ *
+ * Note that any data that was not hard type cast (i.e., not type cast
+ * to a specific size) when packed may lose precision when unpacked by
+ * a non-homogeneous recipient.  The BFROP will do its best to deal with
+ * heterogeneity issues between the packer and unpacker in such
+ * cases. Sending a number larger than can be handled by the recipient
+ * will return an error code generated by the BFROP upon unpacking - the
+ * BFROP cannot detect such errors during packing.
+ *
+ * @param *buffer A pointer to the buffer from which the value will be
+ * extracted.
+ *
+ * @param *dest A void* pointer to the memory location into which the
+ * data is to be stored. Note that these values will be stored
+ * contiguously in memory. For strings, this pointer must be to (char
+ * **) to provide a means of supporting multiple string
+ * operations. The BFROP unpack function will allocate memory for each
+ * string in the array - the caller must only provide adequate memory
+ * for the array of pointers.
+ *
+ * @param type The type of the data to be unpacked - must be one of
+ * the BFROP defined data types.
+ *
+ * @retval *max_num_values The number of values actually unpacked. In
+ * most cases, this should match the maximum number provided in the
+ * parameters - but in no case will it exceed the value of this
+ * parameter.  Note that if you unpack fewer values than are actually
+ * available, the buffer will be in an unpackable state - the bfrop will
+ * return an error code to warn of this condition.
+ *
+ * @note The unpack function will return the actual number of values
+ * unpacked in this location.
+ *
+ * @retval PMIX_SUCCESS The next item in the buffer was successfully
+ * unpacked.
+ *
+ * @retval PMIX_ERROR(s) The unpack function returns an error code
+ * under one of several conditions: (a) the number of values in the
+ * item exceeds the max num provided by the caller; (b) the type of
+ * the next item in the buffer does not match the type specified by
+ * the caller; or (c) the unpack failed due to either an error in the
+ * buffer or an attempt to read past the end of the buffer.
+ *
+ * @code
+ * pmix_buffer_t *buffer;
+ * int32_t dest;
+ * char **string_array;
+ * int32_t num_values;
+ *
+ * num_values = 1;
+ * status_code = pmix_bfrop.unpack(buffer, (void*)&dest, &num_values, PMIX_INT32);
+ *
+ * num_values = 5;
+ * string_array = malloc(num_values*sizeof(char *));
+ * status_code = pmix_bfrop.unpack(buffer, (void*)(string_array), &num_values, PMIX_STRING);
+ *
+ * @endcode
+ */
+typedef pmix_status_t (*pmix_bfrop_unpack_fn_t)(pmix_buffer_t *buffer, void *dest,
+                                                int32_t *max_num_values,
+                                                pmix_data_type_t type);
+/**
+ * Copy a payload from one buffer to another
+ * This function will append a copy of the payload in one buffer into
+ * another buffer. If the destination buffer is NOT empty, then the
+ * type of the two buffers MUST match or else an
+ * error will be returned. If the destination buffer IS empty, then
+ * its type will be set to that of the source buffer.
+ * NOTE: This is NOT a destructive procedure - the
+ * source buffer's payload will remain intact, as will any pre-existing
+ * payload in the destination's buffer.
+ */
+typedef pmix_status_t (*pmix_bfrop_copy_payload_fn_t)(pmix_buffer_t *dest,
+                                                      pmix_buffer_t *src);
+
+/**
+ * BFROP initialization function.
+ *
+ * In dynamic libraries, declared objects and functions don't get
+ * loaded until called. We need to ensure that the pmix_bfrop function
+ * structure gets loaded, so we provide an "open" call that is
+ * executed as part of the program startup.
+ */
+pmix_status_t pmix_bfrop_open(void);
+
+/**
+ * BFROP finalize function
+ */
+pmix_status_t pmix_bfrop_close(void);
+
+
+/**
+ * Copy a data value from one location to another.
+ *
+ * Since registered data types can be complex structures, the system
+ * needs some way to know how to copy the data from one location to
+ * another (e.g., for storage in the registry). This function, which
+ * can call other copy functions to build up complex data types, defines
+ * the method for making a copy of the specified data type.
+ *
+ * @param **dest The address of a pointer into which the
+ * address of the resulting data is to be stored.
+ *
+ * @param *src A pointer to the memory location from which the
+ * data is to be copied.
+ *
+ * @param type The type of the data to be copied - must be one of
+ * the BFROP defined data types.
+ *
+ * @retval PMIX_SUCCESS The value was successfully copied.
+ *
+ * @retval PMIX_ERROR(s) An appropriate error code.
+ *
+ */
+typedef pmix_status_t (*pmix_bfrop_copy_fn_t)(void **dest, void *src, pmix_data_type_t type);
+
+/**
+ * Print a data value.
+ *
+ * Since registered data types can be complex structures, the system
+ * needs some way to know how to print them (i.e., convert them to a string
+ * representation). Provided for debug purposes.
+ *
+ * @retval PMIX_SUCCESS The value was successfully printed.
+ *
+ * @retval PMIX_ERROR(s) An appropriate error code.
+ */
+typedef pmix_status_t (*pmix_bfrop_print_fn_t)(char **output, char *prefix, void *src, pmix_data_type_t type);
+
+/**
+ * Base structure for the BFROP
+ *
+ * Base module structure for the BFROP - presents the required function
+ * pointers to the calling interface.
+ */
+struct pmix_bfrop_t {
+    pmix_bfrop_pack_fn_t              pack;
+    pmix_bfrop_unpack_fn_t            unpack;
+    pmix_bfrop_copy_fn_t              copy;
+    pmix_bfrop_print_fn_t             print;
+    pmix_bfrop_copy_payload_fn_t      copy_payload;
+};
+typedef struct pmix_bfrop_t pmix_bfrop_t;
+
+extern pmix_bfrop_t pmix_bfrop;  /* holds bfrop function pointers */
+
+END_C_DECLS
+
+#endif /* PMIX_BFROP_H */
diff --git a/src/buffer_ops/copy.c b/src/buffer_ops/copy.c
new file mode 100644
index 0000000..b65d694
--- /dev/null
+++ b/src/buffer_ops/copy.c
@@ -0,0 +1,1465 @@
+/*
+ * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2006 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2014-2017 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2016      IBM Corporation.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+
+
+#include "src/util/argv.h"
+#include "src/util/error.h"
+#include "src/util/output.h"
+#include "src/buffer_ops/buffer_ops.h"
+#include "src/buffer_ops/internal.h"
+
+ pmix_status_t pmix_bfrop_copy(void **dest, void *src, pmix_data_type_t type)
+{
+    pmix_bfrop_type_info_t *info;
+
+    /* check for error */
+    if (NULL == dest) {
+        PMIX_ERROR_LOG(PMIX_ERR_BAD_PARAM);
+        return PMIX_ERR_BAD_PARAM;
+    }
+    if (NULL == src) {
+        PMIX_ERROR_LOG(PMIX_ERR_BAD_PARAM);
+        return PMIX_ERR_BAD_PARAM;
+    }
+
+   /* Lookup the copy function for this type and call it */
+
+    if (NULL == (info = (pmix_bfrop_type_info_t*)pmix_pointer_array_get_item(&pmix_bfrop_types, type))) {
+        PMIX_ERROR_LOG(PMIX_ERR_UNKNOWN_DATA_TYPE);
+        return PMIX_ERR_UNKNOWN_DATA_TYPE;
+    }
+
+    return info->odti_copy_fn(dest, src, type);
+}
+
+pmix_status_t pmix_bfrop_copy_payload(pmix_buffer_t *dest, pmix_buffer_t *src)
+{
+    size_t to_copy = 0;
+    char *ptr;
+    /* deal with buffer type */
+    if( NULL == dest->base_ptr ){
+        /* destination buffer is empty - derive src buffer type */
+        dest->type = src->type;
+    } else if( dest->type != src->type ){
+        /* buffer types mismatch */
+        PMIX_ERROR_LOG(PMIX_ERR_BAD_PARAM);
+        return PMIX_ERR_BAD_PARAM;
+    }
+
+    to_copy = src->pack_ptr - src->unpack_ptr;
+    if( NULL == (ptr = pmix_bfrop_buffer_extend(dest, to_copy)) ){
+        PMIX_ERROR_LOG(PMIX_ERR_OUT_OF_RESOURCE);
+        return PMIX_ERR_OUT_OF_RESOURCE;
+    }
+    memcpy(ptr,src->unpack_ptr, to_copy);
+    dest->bytes_used += to_copy;
+    dest->pack_ptr += to_copy;
+    return PMIX_SUCCESS;
+}
+
+
+/*
+ * STANDARD COPY FUNCTION - WORKS FOR EVERYTHING NON-STRUCTURED
+ */
+ pmix_status_t pmix_bfrop_std_copy(void **dest, void *src, pmix_data_type_t type)
+{
+    size_t datasize;
+    uint8_t *val = NULL;
+
+    switch(type) {
+    case PMIX_BOOL:
+        datasize = sizeof(bool);
+        break;
+
+    case PMIX_INT:
+    case PMIX_UINT:
+        datasize = sizeof(int);
+        break;
+
+    case PMIX_SIZE:
+        datasize = sizeof(size_t);
+        break;
+
+    case PMIX_PID:
+        datasize = sizeof(pid_t);
+        break;
+
+    case PMIX_BYTE:
+    case PMIX_INT8:
+    case PMIX_UINT8:
+        datasize = 1;
+        break;
+
+    case PMIX_INT16:
+    case PMIX_UINT16:
+        datasize = 2;
+        break;
+
+    case PMIX_INT32:
+    case PMIX_UINT32:
+        datasize = 4;
+        break;
+
+    case PMIX_INT64:
+    case PMIX_UINT64:
+        datasize = 8;
+        break;
+
+    case PMIX_FLOAT:
+        datasize = sizeof(float);
+        break;
+
+    case PMIX_TIMEVAL:
+        datasize = sizeof(struct timeval);
+        break;
+
+    case PMIX_TIME:
+        datasize = sizeof(time_t);
+        break;
+
+    case PMIX_STATUS:
+        datasize = sizeof(pmix_status_t);
+        break;
+
+    case PMIX_PROC_RANK:
+        datasize = sizeof(pmix_rank_t);
+        break;
+
+    case PMIX_PERSIST:
+        datasize = sizeof(pmix_persistence_t);
+        break;
+
+    case PMIX_POINTER:
+        datasize = sizeof(char*);
+        break;
+
+    case PMIX_SCOPE:
+        datasize = sizeof(pmix_scope_t);
+        break;
+
+    case PMIX_DATA_RANGE:
+        datasize = sizeof(pmix_data_range_t);
+        break;
+
+    case PMIX_COMMAND:
+        datasize = sizeof(pmix_cmd_t);
+        break;
+
+    case PMIX_INFO_DIRECTIVES:
+        datasize = sizeof(pmix_info_directives_t);
+        break;
+
+    case PMIX_PROC_STATE:
+        datasize = sizeof(pmix_proc_state_t);
+        break;
+
+    case PMIX_ALLOC_DIRECTIVE:
+        datasize = sizeof(pmix_alloc_directive_t);
+        break;
+
+    default:
+        return PMIX_ERR_UNKNOWN_DATA_TYPE;
+    }
+
+    val = (uint8_t*)malloc(datasize);
+    if (NULL == val) {
+        return PMIX_ERR_OUT_OF_RESOURCE;
+    }
+
+    memcpy(val, src, datasize);
+    *dest = val;
+
+    return PMIX_SUCCESS;
+}
+
+/* COPY FUNCTIONS FOR NON-STANDARD SYSTEM TYPES */
+
+/*
+ * STRING
+ */
+ pmix_status_t pmix_bfrop_copy_string(char **dest, char *src, pmix_data_type_t type)
+{
+    if (NULL == src) {  /* got zero-length string/NULL pointer - store NULL */
+        *dest = NULL;
+    } else {
+        *dest = strdup(src);
+    }
+
+    return PMIX_SUCCESS;
+}
+/* compare function for pmix_value_t */
+bool pmix_value_cmp(pmix_value_t *p, pmix_value_t *p1)
+{
+    bool rc = false;
+
+    if (p->type != p1->type) {
+        return rc;
+    }
+
+    switch (p->type) {
+        case PMIX_UNDEF:
+            rc = true;
+            break;
+        case PMIX_BOOL:
+            rc = (p->data.flag == p1->data.flag);
+            break;
+        case PMIX_BYTE:
+            rc = (p->data.byte == p1->data.byte);
+            break;
+        case PMIX_SIZE:
+            rc = (p->data.size == p1->data.size);
+            break;
+        case PMIX_INT:
+            rc = (p->data.integer == p1->data.integer);
+            break;
+        case PMIX_INT8:
+            rc = (p->data.int8 == p1->data.int8);
+            break;
+        case PMIX_INT16:
+            rc = (p->data.int16 == p1->data.int16);
+            break;
+        case PMIX_INT32:
+            rc = (p->data.int32 == p1->data.int32);
+            break;
+        case PMIX_INT64:
+            rc = (p->data.int64 == p1->data.int64);
+            break;
+        case PMIX_UINT:
+            rc = (p->data.uint == p1->data.uint);
+            break;
+        case PMIX_UINT8:
+            rc = (p->data.uint8 == p1->data.int8);
+            break;
+        case PMIX_UINT16:
+            rc = (p->data.uint16 == p1->data.uint16);
+            break;
+        case PMIX_UINT32:
+            rc = (p->data.uint32 == p1->data.uint32);
+            break;
+        case PMIX_UINT64:
+            rc = (p->data.uint64 == p1->data.uint64);
+            break;
+        case PMIX_STRING:
+            rc = strcmp(p->data.string, p1->data.string);
+            break;
+        case PMIX_COMPRESSED_STRING:
+            if (p->data.bo.size != p1->data.bo.size) {
+                return false;
+            } else {
+                return true;
+            }
+        case PMIX_STATUS:
+            rc = (p->data.status == p1->data.status);
+            break;
+        default:
+            pmix_output(0, "COMPARE-PMIX-VALUE: UNSUPPORTED TYPE %d", (int)p->type);
+    }
+    return rc;
+}
+/* COPY FUNCTIONS FOR GENERIC PMIX TYPES - we
+ * are not allocating memory and so we cannot
+ * use the regular copy functions */
+PMIX_EXPORT pmix_status_t pmix_value_xfer(pmix_value_t *p, pmix_value_t *src)
+{
+    size_t n, m;
+    pmix_status_t rc;
+    char **prarray, **strarray;
+    pmix_value_t *pv, *sv;
+    pmix_info_t *p1, *s1;
+    pmix_app_t *pa, *sa;
+    pmix_pdata_t *pd, *sd;
+    pmix_buffer_t *pb, *sb;
+    pmix_byte_object_t *pbo, *sbo;
+    pmix_kval_t *pk, *sk;
+    pmix_modex_data_t *pm, *sm;
+    pmix_proc_info_t *pi, *si;
+    pmix_query_t *pq, *sq;
+
+    /* copy the right field */
+    p->type = src->type;
+    switch (src->type) {
+    case PMIX_UNDEF:
+    break;
+    case PMIX_BOOL:
+        p->data.flag = src->data.flag;
+        break;
+    case PMIX_BYTE:
+        p->data.byte = src->data.byte;
+        break;
+    case PMIX_STRING:
+        if (NULL != src->data.string) {
+            p->data.string = strdup(src->data.string);
+        } else {
+            p->data.string = NULL;
+        }
+        break;
+    case PMIX_SIZE:
+        p->data.size = src->data.size;
+        break;
+    case PMIX_PID:
+        p->data.pid = src->data.pid;
+        break;
+    case PMIX_INT:
+        /* to avoid alignment issues */
+        memcpy(&p->data.integer, &src->data.integer, sizeof(int));
+        break;
+    case PMIX_INT8:
+        p->data.int8 = src->data.int8;
+        break;
+    case PMIX_INT16:
+        /* to avoid alignment issues */
+        memcpy(&p->data.int16, &src->data.int16, 2);
+        break;
+    case PMIX_INT32:
+        /* to avoid alignment issues */
+        memcpy(&p->data.int32, &src->data.int32, 4);
+        break;
+    case PMIX_INT64:
+        /* to avoid alignment issues */
+        memcpy(&p->data.int64, &src->data.int64, 8);
+        break;
+    case PMIX_UINT:
+        /* to avoid alignment issues */
+        memcpy(&p->data.uint, &src->data.uint, sizeof(unsigned int));
+        break;
+    case PMIX_UINT8:
+        p->data.uint8 = src->data.uint8;
+        break;
+    case PMIX_UINT16:
+        /* to avoid alignment issues */
+        memcpy(&p->data.uint16, &src->data.uint16, 2);
+        break;
+    case PMIX_UINT32:
+        /* to avoid alignment issues */
+        memcpy(&p->data.uint32, &src->data.uint32, 4);
+        break;
+    case PMIX_UINT64:
+        /* to avoid alignment issues */
+        memcpy(&p->data.uint64, &src->data.uint64, 8);
+        break;
+    case PMIX_FLOAT:
+        p->data.fval = src->data.fval;
+        break;
+    case PMIX_DOUBLE:
+        p->data.dval = src->data.dval;
+        break;
+    case PMIX_TIMEVAL:
+        memcpy(&p->data.tv, &src->data.tv, sizeof(struct timeval));
+        break;
+    case PMIX_TIME:
+        memcpy(&p->data.time, &src->data.time, sizeof(time_t));
+        break;
+    case PMIX_STATUS:
+        memcpy(&p->data.status, &src->data.status, sizeof(pmix_status_t));
+        break;
+    case PMIX_PROC:
+        memcpy(&p->data.proc, &src->data.proc, sizeof(pmix_proc_t));
+        break;
+    case PMIX_PROC_RANK:
+        memcpy(&p->data.proc, &src->data.rank, sizeof(pmix_rank_t));
+        break;
+    case PMIX_BYTE_OBJECT:
+    case PMIX_COMPRESSED_STRING:
+        memset(&p->data.bo, 0, sizeof(pmix_byte_object_t));
+        if (NULL != src->data.bo.bytes && 0 < src->data.bo.size) {
+            p->data.bo.bytes = malloc(src->data.bo.size);
+            memcpy(p->data.bo.bytes, src->data.bo.bytes, src->data.bo.size);
+            p->data.bo.size = src->data.bo.size;
+        } else {
+            p->data.bo.bytes = NULL;
+            p->data.bo.size = 0;
+        }
+        break;
+    case PMIX_PERSIST:
+        memcpy(&p->data.persist, &src->data.persist, sizeof(pmix_persistence_t));
+        break;
+    case PMIX_SCOPE:
+        memcpy(&p->data.scope, &src->data.scope, sizeof(pmix_scope_t));
+        break;
+    case PMIX_DATA_RANGE:
+        memcpy(&p->data.range, &src->data.range, sizeof(pmix_data_range_t));
+        break;
+    case PMIX_PROC_STATE:
+        memcpy(&p->data.state, &src->data.state, sizeof(pmix_proc_state_t));
+        break;
+    case PMIX_PROC_INFO:
+        PMIX_PROC_INFO_CREATE(p->data.pinfo, 1);
+        if (NULL != src->data.pinfo->hostname) {
+            p->data.pinfo->hostname = strdup(src->data.pinfo->hostname);
+        }
+        if (NULL != src->data.pinfo->executable_name) {
+            p->data.pinfo->executable_name = strdup(src->data.pinfo->executable_name);
+        }
+        memcpy(&p->data.pinfo->pid, &src->data.pinfo->pid, sizeof(pid_t));
+        memcpy(&p->data.pinfo->exit_code, &src->data.pinfo->exit_code, sizeof(int));
+        memcpy(&p->data.pinfo->state, &src->data.pinfo->state, sizeof(pmix_proc_state_t));
+        break;
+    case PMIX_DATA_ARRAY:
+        p->data.darray = (pmix_data_array_t*)calloc(1, sizeof(pmix_data_array_t));
+        p->data.darray->type = src->data.darray->type;
+        p->data.darray->size = src->data.darray->size;
+        if (0 == p->data.darray->size || NULL == src->data.darray->array) {
+            p->data.darray->array = NULL;
+            p->data.darray->size = 0;
+            break;
+        }
+        /* allocate space and do the copy */
+        switch (src->data.darray->type) {
+            case PMIX_UINT8:
+            case PMIX_INT8:
+            case PMIX_BYTE:
+                p->data.darray->array = (char*)malloc(src->data.darray->size);
+                if (NULL == p->data.darray->array) {
+                    return PMIX_ERR_NOMEM;
+                }
+                memcpy(p->data.darray->array, src->data.darray->array, src->data.darray->size);
+                break;
+            case PMIX_UINT16:
+            case PMIX_INT16:
+                p->data.darray->array = (char*)malloc(src->data.darray->size * sizeof(uint16_t));
+                if (NULL == p->data.darray->array) {
+                    return PMIX_ERR_NOMEM;
+                }
+                memcpy(p->data.darray->array, src->data.darray->array, src->data.darray->size * sizeof(uint16_t));
+                break;
+            case PMIX_UINT32:
+            case PMIX_INT32:
+                p->data.darray->array = (char*)malloc(src->data.darray->size * sizeof(uint32_t));
+                if (NULL == p->data.darray->array) {
+                    return PMIX_ERR_NOMEM;
+                }
+                memcpy(p->data.darray->array, src->data.darray->array, src->data.darray->size * sizeof(uint32_t));
+                break;
+            case PMIX_UINT64:
+            case PMIX_INT64:
+                p->data.darray->array = (char*)malloc(src->data.darray->size * sizeof(uint64_t));
+                if (NULL == p->data.darray->array) {
+                    return PMIX_ERR_NOMEM;
+                }
+                memcpy(p->data.darray->array, src->data.darray->array, src->data.darray->size * sizeof(uint64_t));
+                break;
+            case PMIX_BOOL:
+                p->data.darray->array = (char*)malloc(src->data.darray->size * sizeof(bool));
+                if (NULL == p->data.darray->array) {
+                    return PMIX_ERR_NOMEM;
+                }
+                memcpy(p->data.darray->array, src->data.darray->array, src->data.darray->size * sizeof(bool));
+                break;
+            case PMIX_SIZE:
+                p->data.darray->array = (char*)malloc(src->data.darray->size * sizeof(size_t));
+                if (NULL == p->data.darray->array) {
+                    return PMIX_ERR_NOMEM;
+                }
+                memcpy(p->data.darray->array, src->data.darray->array, src->data.darray->size * sizeof(size_t));
+                break;
+            case PMIX_PID:
+                p->data.darray->array = (char*)malloc(src->data.darray->size * sizeof(pid_t));
+                if (NULL == p->data.darray->array) {
+                    return PMIX_ERR_NOMEM;
+                }
+                memcpy(p->data.darray->array, src->data.darray->array, src->data.darray->size * sizeof(pid_t));
+                break;
+            case PMIX_STRING:
+                p->data.darray->array = (char**)malloc(src->data.darray->size * sizeof(char*));
+                if (NULL == p->data.darray->array) {
+                    return PMIX_ERR_NOMEM;
+                }
+                prarray = (char**)p->data.darray->array;
+                strarray = (char**)src->data.darray->array;
+                for (n=0; n < src->data.darray->size; n++) {
+                    if (NULL != strarray[n]) {
+                        prarray[n] = strdup(strarray[n]);
+                    }
+                }
+                break;
+            case PMIX_INT:
+            case PMIX_UINT:
+                p->data.darray->array = (char*)malloc(src->data.darray->size * sizeof(int));
+                if (NULL == p->data.darray->array) {
+                    return PMIX_ERR_NOMEM;
+                }
+                memcpy(p->data.darray->array, src->data.darray->array, src->data.darray->size * sizeof(int));
+                break;
+            case PMIX_FLOAT:
+                p->data.darray->array = (char*)malloc(src->data.darray->size * sizeof(float));
+                if (NULL == p->data.darray->array) {
+                    return PMIX_ERR_NOMEM;
+                }
+                memcpy(p->data.darray->array, src->data.darray->array, src->data.darray->size * sizeof(float));
+                break;
+            case PMIX_DOUBLE:
+                p->data.darray->array = (char*)malloc(src->data.darray->size * sizeof(double));
+                if (NULL == p->data.darray->array) {
+                    return PMIX_ERR_NOMEM;
+                }
+                memcpy(p->data.darray->array, src->data.darray->array, src->data.darray->size * sizeof(double));
+                break;
+            case PMIX_TIMEVAL:
+                p->data.darray->array = (struct timeval*)malloc(src->data.darray->size * sizeof(struct timeval));
+                if (NULL == p->data.darray->array) {
+                    return PMIX_ERR_NOMEM;
+                }
+                memcpy(p->data.darray->array, src->data.darray->array, src->data.darray->size * sizeof(struct timeval));
+                break;
+            case PMIX_TIME:
+                p->data.darray->array = (time_t*)malloc(src->data.darray->size * sizeof(time_t));
+                if (NULL == p->data.darray->array) {
+                    return PMIX_ERR_NOMEM;
+                }
+                memcpy(p->data.darray->array, src->data.darray->array, src->data.darray->size * sizeof(time_t));
+                break;
+            case PMIX_STATUS:
+                p->data.darray->array = (pmix_status_t*)malloc(src->data.darray->size * sizeof(pmix_status_t));
+                if (NULL == p->data.darray->array) {
+                    return PMIX_ERR_NOMEM;
+                }
+                memcpy(p->data.darray->array, src->data.darray->array, src->data.darray->size * sizeof(pmix_status_t));
+                break;
+            case PMIX_VALUE:
+                PMIX_VALUE_CREATE(p->data.darray->array, src->data.darray->size);
+                if (NULL == p->data.darray->array) {
+                    return PMIX_ERR_NOMEM;
+                }
+                pv = (pmix_value_t*)p->data.darray->array;
+                sv = (pmix_value_t*)src->data.darray->array;
+                for (n=0; n < src->data.darray->size; n++) {
+                    if (PMIX_SUCCESS != (rc = pmix_value_xfer(&pv[n], &sv[n]))) {
+                        PMIX_VALUE_FREE(pv, src->data.darray->size);
+                        return rc;
+                    }
+                }
+                break;
+            case PMIX_PROC:
+                PMIX_PROC_CREATE(p->data.darray->array, src->data.darray->size);
+                if (NULL == p->data.darray->array) {
+                    return PMIX_ERR_NOMEM;
+                }
+                memcpy(p->data.darray->array, src->data.darray->array, src->data.darray->size * sizeof(pmix_proc_t));
+                break;
+            case PMIX_APP:
+                PMIX_APP_CREATE(p->data.darray->array, src->data.darray->size);
+                if (NULL == p->data.darray->array) {
+                    return PMIX_ERR_NOMEM;
+                }
+                pa = (pmix_app_t*)p->data.darray->array;
+                sa = (pmix_app_t*)src->data.darray->array;
+                for (n=0; n < src->data.darray->size; n++) {
+                    if (NULL != sa[n].cmd) {
+                        pa[n].cmd = strdup(sa[n].cmd);
+                    }
+                    if (NULL != sa[n].argv) {
+                        pa[n].argv = pmix_argv_copy(sa[n].argv);
+                    }
+                    if (NULL != sa[n].env) {
+                        pa[n].env = pmix_argv_copy(sa[n].env);
+                    }
+                    if (NULL != sa[n].cwd) {
+                        pa[n].cwd = strdup(sa[n].cwd);
+                    }
+                    pa[n].maxprocs = sa[n].maxprocs;
+                    if (0 < sa[n].ninfo && NULL != sa[n].info) {
+                        PMIX_INFO_CREATE(pa[n].info, sa[n].ninfo);
+                        if (NULL == pa[n].info) {
+                            PMIX_APP_FREE(pa, src->data.darray->size);
+                            return PMIX_ERR_NOMEM;
+                        }
+                        pa[n].ninfo = sa[n].ninfo;
+                        for (m=0; m < pa[n].ninfo; m++) {
+                            PMIX_INFO_XFER(&pa[n].info[m], &sa[n].info[m]);
+                        }
+                    }
+                }
+                break;
+            case PMIX_INFO:
+                PMIX_INFO_CREATE(p->data.darray->array, src->data.darray->size);
+                p1 = (pmix_info_t*)p->data.darray->array;
+                s1 = (pmix_info_t*)src->data.darray->array;
+                for (n=0; n < src->data.darray->size; n++) {
+                    PMIX_INFO_LOAD(&p1[n], s1[n].key, &s1[n].value.data.flag, s1[n].value.type);
+                }
+                break;
+            case PMIX_PDATA:
+                PMIX_PDATA_CREATE(p->data.darray->array, src->data.darray->size);
+                if (NULL == p->data.darray->array) {
+                    return PMIX_ERR_NOMEM;
+                }
+                pd = (pmix_pdata_t*)p->data.darray->array;
+                sd = (pmix_pdata_t*)src->data.darray->array;
+                for (n=0; n < src->data.darray->size; n++) {
+                    PMIX_PDATA_LOAD(&pd[n], &sd[n].proc, sd[n].key, &sd[n].value.data.flag, sd[n].value.type);
+                }
+                break;
+            case PMIX_BUFFER:
+                p->data.darray->array = (pmix_buffer_t*)malloc(src->data.darray->size * sizeof(pmix_buffer_t));
+                if (NULL == p->data.darray->array) {
+                    return PMIX_ERR_NOMEM;
+                }
+                pb = (pmix_buffer_t*)p->data.darray->array;
+                sb = (pmix_buffer_t*)src->data.darray->array;
+                for (n=0; n < src->data.darray->size; n++) {
+                    PMIX_CONSTRUCT(&pb[n], pmix_buffer_t);
+                    pmix_bfrop.copy_payload(&pb[n], &sb[n]);
+                }
+                break;
+            case PMIX_BYTE_OBJECT:
+            case PMIX_COMPRESSED_STRING:
+                p->data.darray->array = (pmix_byte_object_t*)malloc(src->data.darray->size * sizeof(pmix_byte_object_t));
+                if (NULL == p->data.darray->array) {
+                    return PMIX_ERR_NOMEM;
+                }
+                pbo = (pmix_byte_object_t*)p->data.darray->array;
+                sbo = (pmix_byte_object_t*)src->data.darray->array;
+                for (n=0; n < src->data.darray->size; n++) {
+                    if (NULL != sbo[n].bytes && 0 < sbo[n].size) {
+                        pbo[n].size = sbo[n].size;
+                        pbo[n].bytes = (char*)malloc(pbo[n].size);
+                        memcpy(pbo[n].bytes, sbo[n].bytes, pbo[n].size);
+                    } else {
+                        pbo[n].bytes = NULL;
+                        pbo[n].size = 0;
+                    }
+                }
+                break;
+            case PMIX_KVAL:
+                p->data.darray->array = (pmix_kval_t*)calloc(src->data.darray->size , sizeof(pmix_kval_t));
+                if (NULL == p->data.darray->array) {
+                    return PMIX_ERR_NOMEM;
+                }
+                pk = (pmix_kval_t*)p->data.darray->array;
+                sk = (pmix_kval_t*)src->data.darray->array;
+                for (n=0; n < src->data.darray->size; n++) {
+                    if (NULL != sk[n].key) {
+                        pk[n].key = strdup(sk[n].key);
+                    }
+                    if (NULL != sk[n].value) {
+                        PMIX_VALUE_CREATE(pk[n].value, 1);
+                        if (NULL == pk[n].value) {
+                            free(p->data.darray->array);
+                            return PMIX_ERR_NOMEM;
+                        }
+                        if (PMIX_SUCCESS != (rc = pmix_value_xfer(pk[n].value, sk[n].value))) {
+                            return rc;
+                        }
+                    }
+                }
+                break;
+            case PMIX_MODEX:
+                PMIX_MODEX_CREATE(p->data.darray->array, src->data.darray->size);
+                if (NULL == p->data.darray->array) {
+                    return PMIX_ERR_NOMEM;
+                }
+                pm = (pmix_modex_data_t*)p->data.darray->array;
+                sm = (pmix_modex_data_t*)src->data.darray->array;
+                for (n=0; n < src->data.darray->size; n++) {
+                    memcpy(&pm[n], &sm[n], sizeof(pmix_modex_data_t));
+                    if (NULL != sm[n].blob && 0 < sm[n].size) {
+                        pm[n].blob = (uint8_t*)malloc(sm[n].size);
+                        if (NULL == pm[n].blob) {
+                            return PMIX_ERR_NOMEM;
+                        }
+                        memcpy(pm[n].blob, sm[n].blob, sm[n].size);
+                        pm[n].size = sm[n].size;
+                    } else {
+                        pm[n].blob = NULL;
+                        pm[n].size = 0;
+                    }
+                }
+                break;
+            case PMIX_PERSIST:
+                p->data.darray->array = (pmix_persistence_t*)malloc(src->data.darray->size * sizeof(pmix_persistence_t));
+                if (NULL == p->data.darray->array) {
+                    return PMIX_ERR_NOMEM;
+                }
+                memcpy(p->data.darray->array, src->data.darray->array, src->data.darray->size * sizeof(pmix_persistence_t));
+                break;
+            case PMIX_POINTER:
+                p->data.darray->array = (char**)malloc(src->data.darray->size * sizeof(char*));
+                if (NULL == p->data.darray->array) {
+                    return PMIX_ERR_NOMEM;
+                }
+                prarray = (char**)p->data.darray->array;
+                strarray = (char**)src->data.darray->array;
+                for (n=0; n < src->data.darray->size; n++) {
+                    prarray[n] = strarray[n];
+                }
+                break;
+            case PMIX_SCOPE:
+                p->data.darray->array = (pmix_scope_t*)malloc(src->data.darray->size * sizeof(pmix_scope_t));
+                if (NULL == p->data.darray->array) {
+                    return PMIX_ERR_NOMEM;
+                }
+                memcpy(p->data.darray->array, src->data.darray->array, src->data.darray->size * sizeof(pmix_scope_t));
+                break;
+            case PMIX_DATA_RANGE:
+                p->data.darray->array = (pmix_data_range_t*)malloc(src->data.darray->size * sizeof(pmix_data_range_t));
+                if (NULL == p->data.darray->array) {
+                    return PMIX_ERR_NOMEM;
+                }
+                memcpy(p->data.darray->array, src->data.darray->array, src->data.darray->size * sizeof(pmix_data_range_t));
+                break;
+            case PMIX_COMMAND:
+                p->data.darray->array = (pmix_cmd_t*)malloc(src->data.darray->size * sizeof(pmix_cmd_t));
+                if (NULL == p->data.darray->array) {
+                    return PMIX_ERR_NOMEM;
+                }
+                memcpy(p->data.darray->array, src->data.darray->array, src->data.darray->size * sizeof(pmix_cmd_t));
+                break;
+            case PMIX_INFO_DIRECTIVES:
+                p->data.darray->array = (pmix_info_directives_t*)malloc(src->data.darray->size * sizeof(pmix_info_directives_t));
+                if (NULL == p->data.darray->array) {
+                    return PMIX_ERR_NOMEM;
+                }
+                memcpy(p->data.darray->array, src->data.darray->array, src->data.darray->size * sizeof(pmix_info_directives_t));
+                break;
+            case PMIX_PROC_INFO:
+                PMIX_PROC_INFO_CREATE(p->data.darray->array, src->data.darray->size);
+                if (NULL == p->data.darray->array) {
+                    return PMIX_ERR_NOMEM;
+                }
+                pi = (pmix_proc_info_t*)p->data.darray->array;
+                si = (pmix_proc_info_t*)src->data.darray->array;
+                for (n=0; n < src->data.darray->size; n++) {
+                    memcpy(&pi[n].proc, &si[n].proc, sizeof(pmix_proc_t));
+                    if (NULL != si[n].hostname) {
+                        pi[n].hostname = strdup(si[n].hostname);
+                    } else {
+                        pi[n].hostname = NULL;
+                    }
+                    if (NULL != si[n].executable_name) {
+                        pi[n].executable_name = strdup(si[n].executable_name);
+                    } else {
+                        pi[n].executable_name = NULL;
+                    }
+                    pi[n].pid = si[n].pid;
+                    pi[n].exit_code = si[n].exit_code;
+                    pi[n].state = si[n].state;
+                }
+                break;
+            case PMIX_DATA_ARRAY:
+                return PMIX_ERR_NOT_SUPPORTED;  // don't support iterative arrays
+            case PMIX_QUERY:
+                PMIX_QUERY_CREATE(p->data.darray->array, src->data.darray->size);
+                if (NULL == p->data.darray->array) {
+                    return PMIX_ERR_NOMEM;
+                }
+                pq = (pmix_query_t*)p->data.darray->array;
+                sq = (pmix_query_t*)src->data.darray->array;
+                for (n=0; n < src->data.darray->size; n++) {
+                    if (NULL != sq[n].keys) {
+                        pq[n].keys = pmix_argv_copy(sq[n].keys);
+                    }
+                    if (NULL != sq[n].qualifiers && 0 < sq[n].nqual) {
+                        PMIX_INFO_CREATE(pq[n].qualifiers, sq[n].nqual);
+                        if (NULL == pq[n].qualifiers) {
+                            PMIX_QUERY_FREE(pq, src->data.darray->size);
+                            return PMIX_ERR_NOMEM;
+                        }
+                        for (m=0; m < sq[n].nqual; m++) {
+                            PMIX_INFO_XFER(&pq[n].qualifiers[m], &sq[n].qualifiers[m]);
+                        }
+                        pq[n].nqual = sq[n].nqual;
+                    } else {
+                        pq[n].qualifiers = NULL;
+                        pq[n].nqual = 0;
+                    }
+                }
+                break;
+            default:
+                return PMIX_ERR_UNKNOWN_DATA_TYPE;
+        }
+        break;
+    case PMIX_POINTER:
+        memcpy(&p->data.ptr, &src->data.ptr, sizeof(void*));
+        break;
+    /**** DEPRECATED ****/
+    case PMIX_INFO_ARRAY:
+        p->data.array->size = src->data.array->size;
+        if (0 < src->data.array->size) {
+            p->data.array->array = (pmix_info_t*)malloc(src->data.array->size * sizeof(pmix_info_t));
+            if (NULL == p->data.array->array) {
+                return PMIX_ERR_NOMEM;
+            }
+            p1 = (pmix_info_t*)p->data.array->array;
+            s1 = (pmix_info_t*)src->data.array->array;
+            for (n=0; n < src->data.darray->size; n++) {
+                PMIX_INFO_LOAD(&p1[n], s1[n].key, &s1[n].value.data.flag, s1[n].value.type);
+            }
+        }
+        break;
+    /********************/
+    default:
+        pmix_output(0, "COPY-PMIX-VALUE: UNSUPPORTED TYPE %d", (int)src->type);
+        return PMIX_ERROR;
+    }
+    return PMIX_SUCCESS;
+}
+
+/* PMIX_VALUE */
+pmix_status_t pmix_bfrop_copy_value(pmix_value_t **dest, pmix_value_t *src,
+                                    pmix_data_type_t type)
+{
+    pmix_value_t *p;
+
+    /* create the new object */
+    *dest = (pmix_value_t*)malloc(sizeof(pmix_value_t));
+    if (NULL == *dest) {
+        return PMIX_ERR_OUT_OF_RESOURCE;
+    }
+    p = *dest;
+
+    /* copy the type */
+    p->type = src->type;
+    /* copy the data */
+    return pmix_value_xfer(p, src);
+}
+
+pmix_status_t pmix_bfrop_copy_info(pmix_info_t **dest, pmix_info_t *src,
+                                   pmix_data_type_t type)
+{
+    *dest = (pmix_info_t*)malloc(sizeof(pmix_info_t));
+    (void)strncpy((*dest)->key, src->key, PMIX_MAX_KEYLEN);
+    (*dest)->flags = src->flags;
+    return pmix_value_xfer(&(*dest)->value, &src->value);
+}
+
+pmix_status_t pmix_bfrop_copy_buf(pmix_buffer_t **dest, pmix_buffer_t *src,
+                                  pmix_data_type_t type)
+{
+    *dest = PMIX_NEW(pmix_buffer_t);
+    pmix_bfrop.copy_payload(*dest, src);
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_bfrop_copy_app(pmix_app_t **dest, pmix_app_t *src,
+                                  pmix_data_type_t type)
+{
+    size_t j;
+
+    *dest = (pmix_app_t*)malloc(sizeof(pmix_app_t));
+    (*dest)->cmd = strdup(src->cmd);
+    (*dest)->argv = pmix_argv_copy(src->argv);
+    (*dest)->env = pmix_argv_copy(src->env);
+    if (NULL != src->cwd) {
+        (*dest)->cwd = strdup(src->cwd);
+    }
+    (*dest)->maxprocs = src->maxprocs;
+    (*dest)->ninfo = src->ninfo;
+    (*dest)->info = (pmix_info_t*)malloc(src->ninfo * sizeof(pmix_info_t));
+    for (j=0; j < src->ninfo; j++) {
+        (void)strncpy((*dest)->info[j].key, src->info[j].key, PMIX_MAX_KEYLEN);
+        pmix_value_xfer(&(*dest)->info[j].value, &src->info[j].value);
+    }
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_bfrop_copy_kval(pmix_kval_t **dest, pmix_kval_t *src,
+                                   pmix_data_type_t type)
+{
+    pmix_kval_t *p;
+
+    /* create the new object */
+    *dest = PMIX_NEW(pmix_kval_t);
+    if (NULL == *dest) {
+        return PMIX_ERR_OUT_OF_RESOURCE;
+    }
+    p = *dest;
+
+    /* copy the type */
+    p->value->type = src->value->type;
+    /* copy the data */
+    return pmix_value_xfer(p->value, src->value);
+}
+
+pmix_status_t pmix_bfrop_copy_proc(pmix_proc_t **dest, pmix_proc_t *src,
+                                   pmix_data_type_t type)
+{
+    *dest = (pmix_proc_t*)malloc(sizeof(pmix_proc_t));
+    if (NULL == *dest) {
+        return PMIX_ERR_OUT_OF_RESOURCE;
+    }
+    (void)strncpy((*dest)->nspace, src->nspace, PMIX_MAX_NSLEN);
+    (*dest)->rank = src->rank;
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_bfrop_copy_modex(pmix_modex_data_t **dest, pmix_modex_data_t *src,
+                                    pmix_data_type_t type)
+{
+    *dest = (pmix_modex_data_t*)malloc(sizeof(pmix_modex_data_t));
+    if (NULL == *dest) {
+        return PMIX_ERR_OUT_OF_RESOURCE;
+    }
+    (*dest)->blob = NULL;
+    (*dest)->size = 0;
+    if (NULL != src->blob) {
+        (*dest)->blob = (uint8_t*)malloc(src->size * sizeof(uint8_t));
+        if (NULL == (*dest)->blob) {
+            return PMIX_ERR_OUT_OF_RESOURCE;
+        }
+        memcpy((*dest)->blob, src->blob, src->size * sizeof(uint8_t));
+        (*dest)->size = src->size;
+    }
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_bfrop_copy_persist(pmix_persistence_t **dest, pmix_persistence_t *src,
+                                      pmix_data_type_t type)
+{
+    *dest = (pmix_persistence_t*)malloc(sizeof(pmix_persistence_t));
+    if (NULL == *dest) {
+        return PMIX_ERR_OUT_OF_RESOURCE;
+    }
+    memcpy(*dest, src, sizeof(pmix_persistence_t));
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_bfrop_copy_bo(pmix_byte_object_t **dest, pmix_byte_object_t *src,
+                                 pmix_data_type_t type)
+{
+    *dest = (pmix_byte_object_t*)malloc(sizeof(pmix_byte_object_t));
+    if (NULL == *dest) {
+        return PMIX_ERR_OUT_OF_RESOURCE;
+    }
+    (*dest)->bytes = (char*)malloc(src->size);
+    memcpy((*dest)->bytes, src->bytes, src->size);
+    (*dest)->size = src->size;
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_bfrop_copy_pdata(pmix_pdata_t **dest, pmix_pdata_t *src,
+                                    pmix_data_type_t type)
+{
+    *dest = (pmix_pdata_t*)malloc(sizeof(pmix_pdata_t));
+    (void)strncpy((*dest)->proc.nspace, src->proc.nspace, PMIX_MAX_NSLEN);
+    (*dest)->proc.rank = src->proc.rank;
+    (void)strncpy((*dest)->key, src->key, PMIX_MAX_KEYLEN);
+    return pmix_value_xfer(&(*dest)->value, &src->value);
+}
+
+pmix_status_t pmix_bfrop_copy_pinfo(pmix_proc_info_t **dest, pmix_proc_info_t *src,
+                                    pmix_data_type_t type)
+{
+    *dest = (pmix_proc_info_t*)malloc(sizeof(pmix_proc_info_t));
+    (void)strncpy((*dest)->proc.nspace, src->proc.nspace, PMIX_MAX_NSLEN);
+    (*dest)->proc.rank = src->proc.rank;
+    if (NULL != src->hostname) {
+        (*dest)->hostname = strdup(src->hostname);
+    }
+    if (NULL != src->executable_name) {
+        (*dest)->executable_name = strdup(src->executable_name);
+    }
+    (*dest)->pid = src->pid;
+    (*dest)->exit_code = src->exit_code;
+    (*dest)->state = src->state;
+    return PMIX_SUCCESS;
+}
+
+/* the pmix_data_array_t is a little different in that it
+ * is an array of values, and so we cannot just copy one
+ * value at a time. So handle all value types here */
+pmix_status_t pmix_bfrop_copy_darray(pmix_data_array_t **dest,
+                                     pmix_data_array_t *src,
+                                     pmix_data_type_t type)
+{
+    pmix_data_array_t *p;
+    size_t n, m;
+    pmix_status_t rc;
+    char **prarray, **strarray;
+    pmix_value_t *pv, *sv;
+    pmix_app_t *pa, *sa;
+    pmix_info_t *p1, *s1;
+    pmix_pdata_t *pd, *sd;
+    pmix_buffer_t *pb, *sb;
+    pmix_byte_object_t *pbo, *sbo;
+    pmix_kval_t *pk, *sk;
+    pmix_modex_data_t *pm, *sm;
+    pmix_proc_info_t *pi, *si;
+    pmix_query_t *pq, *sq;
+
+    p = (pmix_data_array_t*)calloc(1, sizeof(pmix_data_array_t));
+    if (NULL == p) {
+        return PMIX_ERR_NOMEM;
+    }
+    p->type = src->type;
+    p->size = src->size;
+    /* process based on type of array element */
+    switch (src->type) {
+        p->type = src->type;
+        p->size = src->size;
+        if (0 == p->size || NULL == src->array) {
+            p->array = NULL;
+            p->size = 0;
+            break;
+        }
+        case PMIX_UINT8:
+        case PMIX_INT8:
+        case PMIX_BYTE:
+            p->array = (char*)malloc(src->size);
+            if (NULL == p->array) {
+                free(p);
+                return PMIX_ERR_NOMEM;
+            }
+            memcpy(p->array, src->array, src->size);
+            break;
+        case PMIX_UINT16:
+        case PMIX_INT16:
+            p->array = (char*)malloc(src->size * sizeof(uint16_t));
+            if (NULL == p->array) {
+                free(p);
+                return PMIX_ERR_NOMEM;
+            }
+            memcpy(p->array, src->array, src->size * sizeof(uint16_t));
+            break;
+        case PMIX_UINT32:
+        case PMIX_INT32:
+            p->array = (char*)malloc(src->size * sizeof(uint32_t));
+            if (NULL == p->array) {
+                free(p);
+                return PMIX_ERR_NOMEM;
+            }
+            memcpy(p->array, src->array, src->size * sizeof(uint32_t));
+            break;
+        case PMIX_UINT64:
+        case PMIX_INT64:
+            p->array = (char*)malloc(src->size * sizeof(uint64_t));
+            if (NULL == p->array) {
+                free(p);
+                return PMIX_ERR_NOMEM;
+            }
+            memcpy(p->array, src->array, src->size * sizeof(uint64_t));
+            break;
+        case PMIX_BOOL:
+            p->array = (char*)malloc(src->size * sizeof(bool));
+            if (NULL == p->array) {
+                free(p);
+                return PMIX_ERR_NOMEM;
+            }
+            memcpy(p->array, src->array, src->size * sizeof(bool));
+            break;
+        case PMIX_SIZE:
+            p->array = (char*)malloc(src->size * sizeof(size_t));
+            if (NULL == p->array) {
+                free(p);
+                return PMIX_ERR_NOMEM;
+            }
+            memcpy(p->array, src->array, src->size * sizeof(size_t));
+            break;
+        case PMIX_PID:
+            p->array = (char*)malloc(src->size * sizeof(pid_t));
+            if (NULL == p->array) {
+                free(p);
+                return PMIX_ERR_NOMEM;
+            }
+            memcpy(p->array, src->array, src->size * sizeof(pid_t));
+            break;
+        case PMIX_STRING:
+            p->array = (char**)malloc(src->size * sizeof(char*));
+            if (NULL == p->array) {
+                free(p);
+                return PMIX_ERR_NOMEM;
+            }
+            prarray = (char**)p->array;
+            strarray = (char**)src->array;
+            for (n=0; n < src->size; n++) {
+                if (NULL != strarray[n]) {
+                    prarray[n] = strdup(strarray[n]);
+                }
+            }
+            break;
+        case PMIX_INT:
+        case PMIX_UINT:
+            p->array = (char*)malloc(src->size * sizeof(int));
+            if (NULL == p->array) {
+                free(p);
+                return PMIX_ERR_NOMEM;
+            }
+            memcpy(p->array, src->array, src->size * sizeof(int));
+            break;
+        case PMIX_FLOAT:
+            p->array = (char*)malloc(src->size * sizeof(float));
+            if (NULL == p->array) {
+                free(p);
+                return PMIX_ERR_NOMEM;
+            }
+            memcpy(p->array, src->array, src->size * sizeof(float));
+            break;
+        case PMIX_DOUBLE:
+            p->array = (char*)malloc(src->size * sizeof(double));
+            if (NULL == p->array) {
+                free(p);
+                return PMIX_ERR_NOMEM;
+            }
+            memcpy(p->array, src->array, src->size * sizeof(double));
+            break;
+        case PMIX_TIMEVAL:
+            p->array = (struct timeval*)malloc(src->size * sizeof(struct timeval));
+            if (NULL == p->array) {
+                free(p);
+                return PMIX_ERR_NOMEM;
+            }
+            memcpy(p->array, src->array, src->size * sizeof(struct timeval));
+            break;
+        case PMIX_TIME:
+            p->array = (time_t*)malloc(src->size * sizeof(time_t));
+            if (NULL == p->array) {
+                free(p);
+                return PMIX_ERR_NOMEM;
+            }
+            memcpy(p->array, src->array, src->size * sizeof(time_t));
+            break;
+        case PMIX_STATUS:
+            p->array = (pmix_status_t*)malloc(src->size * sizeof(pmix_status_t));
+            if (NULL == p->array) {
+                free(p);
+                return PMIX_ERR_NOMEM;
+            }
+            memcpy(p->array, src->array, src->size * sizeof(pmix_status_t));
+            break;
+        case PMIX_VALUE:
+            PMIX_VALUE_CREATE(p->array, src->size);
+            if (NULL == p->array) {
+                free(p);
+                return PMIX_ERR_NOMEM;
+            }
+            pv = (pmix_value_t*)p->array;
+            sv = (pmix_value_t*)src->array;
+            for (n=0; n < src->size; n++) {
+                if (PMIX_SUCCESS != (rc = pmix_value_xfer(&pv[n], &sv[n]))) {
+                    PMIX_VALUE_FREE(pv, src->size);
+                    free(p);
+                    return rc;
+                }
+            }
+            break;
+        case PMIX_PROC:
+            PMIX_PROC_CREATE(p->array, src->size);
+            if (NULL == p->array) {
+                free(p);
+                return PMIX_ERR_NOMEM;
+            }
+            memcpy(p->array, src->array, src->size * sizeof(pmix_proc_t));
+            break;
+        case PMIX_PROC_RANK:
+            p->array = (char*)malloc(src->size * sizeof(pmix_rank_t));
+            if (NULL == p->array) {
+                free(p);
+                return PMIX_ERR_NOMEM;
+            }
+            memcpy(p->array, src->array, src->size * sizeof(pmix_proc_t));
+            break;
+        case PMIX_APP:
+            PMIX_APP_CREATE(p->array, src->size);
+            if (NULL == p->array) {
+                free(p);
+                return PMIX_ERR_NOMEM;
+            }
+            pa = (pmix_app_t*)p->array;
+            sa = (pmix_app_t*)src->array;
+            for (n=0; n < src->size; n++) {
+                if (NULL != sa[n].cmd) {
+                    pa[n].cmd = strdup(sa[n].cmd);
+                }
+                if (NULL != sa[n].argv) {
+                    pa[n].argv = pmix_argv_copy(sa[n].argv);
+                }
+                if (NULL != sa[n].env) {
+                    pa[n].env = pmix_argv_copy(sa[n].env);
+                }
+                if (NULL != sa[n].cwd) {
+                    pa[n].cwd = strdup(sa[n].cwd);
+                }
+                pa[n].maxprocs = sa[n].maxprocs;
+                if (0 < sa[n].ninfo && NULL != sa[n].info) {
+                    PMIX_INFO_CREATE(pa[n].info, sa[n].ninfo);
+                    if (NULL == pa[n].info) {
+                        PMIX_APP_FREE(pa, p->size);
+                        free(p);
+                        return PMIX_ERR_NOMEM;
+                    }
+                    pa[n].ninfo = sa[n].ninfo;
+                    for (m=0; m < pa[n].ninfo; m++) {
+                        PMIX_INFO_XFER(&pa[n].info[m], &sa[n].info[m]);
+                    }
+                }
+            }
+            break;
+        case PMIX_INFO:
+            PMIX_INFO_CREATE(p->array, src->size);
+            if (NULL == p->array) {
+                free(p);
+                return PMIX_ERR_NOMEM;
+            }
+            p1 = (pmix_info_t*)p->array;
+            s1 = (pmix_info_t*)src->array;
+            for (n=0; n < src->size; n++) {
+                PMIX_INFO_LOAD(&p1[n], s1[n].key, &s1[n].value.data.flag, s1[n].value.type);
+            }
+            break;
+        case PMIX_PDATA:
+            PMIX_PDATA_CREATE(p->array, src->size);
+            if (NULL == p->array) {
+                free(p);
+                return PMIX_ERR_NOMEM;
+            }
+            pd = (pmix_pdata_t*)p->array;
+            sd = (pmix_pdata_t*)src->array;
+            for (n=0; n < src->size; n++) {
+                PMIX_PDATA_LOAD(&pd[n], &sd[n].proc, sd[n].key, &sd[n].value.data, sd[n].value.type);
+            }
+            break;
+        case PMIX_BUFFER:
+            p->array = (pmix_buffer_t*)malloc(src->size * sizeof(pmix_buffer_t));
+            if (NULL == p->array) {
+                free(p);
+                return PMIX_ERR_NOMEM;
+            }
+            pb = (pmix_buffer_t*)p->array;
+            sb = (pmix_buffer_t*)src->array;
+            for (n=0; n < src->size; n++) {
+                PMIX_CONSTRUCT(&pb[n], pmix_buffer_t);
+                pmix_bfrop.copy_payload(&pb[n], &sb[n]);
+            }
+            break;
+        case PMIX_BYTE_OBJECT:
+        case PMIX_COMPRESSED_STRING:
+            p->array = (pmix_byte_object_t*)malloc(src->size * sizeof(pmix_byte_object_t));
+            if (NULL == p->array) {
+                free(p);
+                return PMIX_ERR_NOMEM;
+            }
+            pbo = (pmix_byte_object_t*)p->array;
+            sbo = (pmix_byte_object_t*)src->array;
+            for (n=0; n < src->size; n++) {
+                if (NULL != sbo[n].bytes && 0 < sbo[n].size) {
+                    pbo[n].size = sbo[n].size;
+                    pbo[n].bytes = (char*)malloc(pbo[n].size);
+                    memcpy(pbo[n].bytes, sbo[n].bytes, pbo[n].size);
+                } else {
+                    pbo[n].bytes = NULL;
+                    pbo[n].size = 0;
+                }
+            }
+            break;
+        case PMIX_KVAL:
+            p->array = (pmix_kval_t*)calloc(src->size , sizeof(pmix_kval_t));
+            if (NULL == p->array) {
+                free(p);
+                return PMIX_ERR_NOMEM;
+            }
+            pk = (pmix_kval_t*)p->array;
+            sk = (pmix_kval_t*)src->array;
+            for (n=0; n < src->size; n++) {
+                if (NULL != sk[n].key) {
+                    pk[n].key = strdup(sk[n].key);
+                }
+                if (NULL != sk[n].value) {
+                    PMIX_VALUE_CREATE(pk[n].value, 1);
+                    if (NULL == pk[n].value) {
+                        PMIX_VALUE_FREE(pk[n].value, 1);
+                        free(p);
+                        return PMIX_ERR_NOMEM;
+                    }
+                    if (PMIX_SUCCESS != (rc = pmix_value_xfer(pk[n].value, sk[n].value))) {
+                        PMIX_VALUE_FREE(pk[n].value, 1);
+                        free(p);
+                        return rc;
+                    }
+                }
+            }
+            break;
+        case PMIX_MODEX:
+            PMIX_MODEX_CREATE(p->array, src->size);
+            if (NULL == p->array) {
+                free(p);
+                return PMIX_ERR_NOMEM;
+            }
+            pm = (pmix_modex_data_t*)p->array;
+            sm = (pmix_modex_data_t*)src->array;
+            for (n=0; n < src->size; n++) {
+                memcpy(&pm[n], &sm[n], sizeof(pmix_modex_data_t));
+                if (NULL != sm[n].blob && 0 < sm[n].size) {
+                    pm[n].blob = (uint8_t*)malloc(sm[n].size);
+                    if (NULL == pm[n].blob) {
+                        PMIX_MODEX_FREE(pm, src->size);
+                        free(p);
+                        return PMIX_ERR_NOMEM;
+                    }
+                    memcpy(pm[n].blob, sm[n].blob, sm[n].size);
+                    pm[n].size = sm[n].size;
+                } else {
+                    pm[n].blob = NULL;
+                    pm[n].size = 0;
+                }
+            }
+            break;
+        case PMIX_PERSIST:
+            p->array = (pmix_persistence_t*)malloc(src->size * sizeof(pmix_persistence_t));
+            if (NULL == p->array) {
+                free(p);
+                return PMIX_ERR_NOMEM;
+            }
+            memcpy(p->array, src->array, src->size * sizeof(pmix_persistence_t));
+            break;
+        case PMIX_POINTER:
+            p->array = (char**)malloc(src->size * sizeof(char*));
+            prarray = (char**)p->array;
+            strarray = (char**)src->array;
+            for (n=0; n < src->size; n++) {
+                prarray[n] = strarray[n];
+            }
+            break;
+        case PMIX_SCOPE:
+            p->array = (pmix_scope_t*)malloc(src->size * sizeof(pmix_scope_t));
+            if (NULL == p->array) {
+                free(p);
+                return PMIX_ERR_NOMEM;
+            }
+            memcpy(p->array, src->array, src->size * sizeof(pmix_scope_t));
+            break;
+        case PMIX_DATA_RANGE:
+            p->array = (pmix_data_range_t*)malloc(src->size * sizeof(pmix_data_range_t));
+            if (NULL == p->array) {
+                free(p);
+                return PMIX_ERR_NOMEM;
+            }
+            memcpy(p->array, src->array, src->size * sizeof(pmix_data_range_t));
+            break;
+        case PMIX_COMMAND:
+            p->array = (pmix_cmd_t*)malloc(src->size * sizeof(pmix_cmd_t));
+            if (NULL == p->array) {
+                free(p);
+                return PMIX_ERR_NOMEM;
+            }
+            memcpy(p->array, src->array, src->size * sizeof(pmix_cmd_t));
+            break;
+        case PMIX_INFO_DIRECTIVES:
+            p->array = (pmix_info_directives_t*)malloc(src->size * sizeof(pmix_info_directives_t));
+            if (NULL == p->array) {
+                free(p);
+                return PMIX_ERR_NOMEM;
+            }
+            memcpy(p->array, src->array, src->size * sizeof(pmix_info_directives_t));
+            break;
+        case PMIX_PROC_INFO:
+            PMIX_PROC_INFO_CREATE(p->array, src->size);
+            if (NULL == p->array) {
+                free(p);
+                return PMIX_ERR_NOMEM;
+            }
+            pi = (pmix_proc_info_t*)p->array;
+            si = (pmix_proc_info_t*)src->array;
+            for (n=0; n < src->size; n++) {
+                memcpy(&pi[n].proc, &si[n].proc, sizeof(pmix_proc_t));
+                if (NULL != si[n].hostname) {
+                    pi[n].hostname = strdup(si[n].hostname);
+                } else {
+                    pi[n].hostname = NULL;
+                }
+                if (NULL != si[n].executable_name) {
+                    pi[n].executable_name = strdup(si[n].executable_name);
+                } else {
+                    pi[n].executable_name = NULL;
+                }
+                pi[n].pid = si[n].pid;
+                pi[n].exit_code = si[n].exit_code;
+                pi[n].state = si[n].state;
+            }
+            break;
+        case PMIX_DATA_ARRAY:
+            free(p);
+            return PMIX_ERR_NOT_SUPPORTED;  // don't support iterative arrays
+        case PMIX_QUERY:
+            PMIX_QUERY_CREATE(p->array, src->size);
+            if (NULL == p->array) {
+                free(p);
+                return PMIX_ERR_NOMEM;
+            }
+            pq = (pmix_query_t*)p->array;
+            sq = (pmix_query_t*)src->array;
+            for (n=0; n < src->size; n++) {
+                if (NULL != sq[n].keys) {
+                    pq[n].keys = pmix_argv_copy(sq[n].keys);
+                }
+                if (NULL != sq[n].qualifiers && 0 < sq[n].nqual) {
+                    PMIX_INFO_CREATE(pq[n].qualifiers, sq[n].nqual);
+                    if (NULL == pq[n].qualifiers) {
+                        PMIX_INFO_FREE(pq[n].qualifiers, sq[n].nqual);
+                        free(p);
+                        return PMIX_ERR_NOMEM;
+                    }
+                    for (m=0; m < sq[n].nqual; m++) {
+                        PMIX_INFO_XFER(&pq[n].qualifiers[m], &sq[n].qualifiers[m]);
+                    }
+                    pq[n].nqual = sq[n].nqual;
+                } else {
+                    pq[n].qualifiers = NULL;
+                    pq[n].nqual = 0;
+                }
+            }
+            break;
+        default:
+            free(p);
+            return PMIX_ERR_UNKNOWN_DATA_TYPE;
+    }
+
+    (*dest) = p;
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_bfrop_copy_query(pmix_query_t **dest,
+                                    pmix_query_t *src,
+                                    pmix_data_type_t type)
+{
+    pmix_status_t rc;
+
+    *dest = (pmix_query_t*)malloc(sizeof(pmix_query_t));
+    if (NULL != src->keys) {
+        (*dest)->keys = pmix_argv_copy(src->keys);
+    }
+    (*dest)->nqual = src->nqual;
+    if (NULL != src->qualifiers) {
+        if (PMIX_SUCCESS != (rc = pmix_bfrop_copy_info(&((*dest)->qualifiers), src->qualifiers, PMIX_INFO))) {
+            free(*dest);
+            return rc;
+        }
+    }
+    return PMIX_SUCCESS;
+}
+
+/**** DEPRECATED ****/
+pmix_status_t pmix_bfrop_copy_array(pmix_info_array_t **dest,
+                                    pmix_info_array_t *src,
+                                    pmix_data_type_t type)
+{
+    pmix_info_t *d1, *s1;
+
+    *dest = (pmix_info_array_t*)malloc(sizeof(pmix_info_array_t));
+    (*dest)->size = src->size;
+    (*dest)->array = (pmix_info_t*)malloc(src->size * sizeof(pmix_info_t));
+    d1 = (pmix_info_t*)(*dest)->array;
+    s1 = (pmix_info_t*)src->array;
+    memcpy(d1, s1, src->size * sizeof(pmix_info_t));
+    return PMIX_SUCCESS;
+}
+/*******************/
diff --git a/src/buffer_ops/internal.h b/src/buffer_ops/internal.h
new file mode 100644
index 0000000..0eaa8b6
--- /dev/null
+++ b/src/buffer_ops/internal.h
@@ -0,0 +1,538 @@
+/* -*- C -*-
+ *
+ * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2006 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2012      Los Alamos National Security, Inc.  All rights reserved.
+ * Copyright (c) 2014-2017 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2016      IBM Corporation.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ *
+ */
+#ifndef PMIX_BFROP_INTERNAL_H_
+#define PMIX_BFROP_INTERNAL_H_
+
+#include <src/include/pmix_config.h>
+
+
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h> /* for struct timeval */
+#endif
+
+#include "src/class/pmix_pointer_array.h"
+
+#include "buffer_ops.h"
+
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+
+ BEGIN_C_DECLS
+
+/*
+ * The default starting chunk size
+ */
+#define PMIX_BFROP_DEFAULT_INITIAL_SIZE  2048
+/*
+ * The default threshold size when we switch from doubling the
+ * buffer size to addatively increasing it
+ */
+#define PMIX_BFROP_DEFAULT_THRESHOLD_SIZE 4096
+
+/*
+ * Internal type corresponding to size_t.  Do not use this in
+ * interface calls - use PMIX_SIZE instead.
+ */
+#if SIZEOF_SIZE_T == 1
+#define BFROP_TYPE_SIZE_T PMIX_UINT8
+#elif SIZEOF_SIZE_T == 2
+#define BFROP_TYPE_SIZE_T PMIX_UINT16
+#elif SIZEOF_SIZE_T == 4
+#define BFROP_TYPE_SIZE_T PMIX_UINT32
+#elif SIZEOF_SIZE_T == 8
+#define BFROP_TYPE_SIZE_T PMIX_UINT64
+#else
+#error Unsupported size_t size!
+#endif
+
+/*
+ * Internal type corresponding to bool.  Do not use this in interface
+ * calls - use PMIX_BOOL instead.
+ */
+#if SIZEOF__BOOL == 1
+#define BFROP_TYPE_BOOL PMIX_UINT8
+#elif SIZEOF__BOOL == 2
+#define BFROP_TYPE_BOOL PMIX_UINT16
+#elif SIZEOF__BOOL == 4
+#define BFROP_TYPE_BOOL PMIX_UINT32
+#elif SIZEOF__BOOL == 8
+#define BFROP_TYPE_BOOL PMIX_UINT64
+#else
+#error Unsupported bool size!
+#endif
+
+/*
+ * Internal type corresponding to int and unsigned int.  Do not use
+ * this in interface calls - use PMIX_INT / PMIX_UINT instead.
+ */
+#if SIZEOF_INT == 1
+#define BFROP_TYPE_INT PMIX_INT8
+#define BFROP_TYPE_UINT PMIX_UINT8
+#elif SIZEOF_INT == 2
+#define BFROP_TYPE_INT PMIX_INT16
+#define BFROP_TYPE_UINT PMIX_UINT16
+#elif SIZEOF_INT == 4
+#define BFROP_TYPE_INT PMIX_INT32
+#define BFROP_TYPE_UINT PMIX_UINT32
+#elif SIZEOF_INT == 8
+#define BFROP_TYPE_INT PMIX_INT64
+#define BFROP_TYPE_UINT PMIX_UINT64
+#else
+#error Unsupported int size!
+#endif
+
+/*
+ * Internal type corresponding to pid_t.  Do not use this in interface
+ * calls - use PMIX_PID instead.
+ */
+#if SIZEOF_PID_T == 1
+#define BFROP_TYPE_PID_T PMIX_UINT8
+#elif SIZEOF_PID_T == 2
+#define BFROP_TYPE_PID_T PMIX_UINT16
+#elif SIZEOF_PID_T == 4
+#define BFROP_TYPE_PID_T PMIX_UINT32
+#elif SIZEOF_PID_T == 8
+#define BFROP_TYPE_PID_T PMIX_UINT64
+#else
+#error Unsupported pid_t size!
+#endif
+
+/* Unpack generic size macros */
+#define UNPACK_SIZE_MISMATCH(unpack_type, remote_type, ret)                 \
+ do {                                                                    \
+    switch(remote_type) {                                               \
+        case PMIX_UINT8:                                                    \
+        UNPACK_SIZE_MISMATCH_FOUND(unpack_type, uint8_t, remote_type);  \
+        break;                                                          \
+        case PMIX_INT8:                                                     \
+        UNPACK_SIZE_MISMATCH_FOUND(unpack_type, int8_t, remote_type);   \
+        break;                                                          \
+        case PMIX_UINT16:                                                   \
+        UNPACK_SIZE_MISMATCH_FOUND(unpack_type, uint16_t, remote_type); \
+        break;                                                          \
+        case PMIX_INT16:                                                    \
+        UNPACK_SIZE_MISMATCH_FOUND(unpack_type, int16_t, remote_type);  \
+        break;                                                          \
+        case PMIX_UINT32:                                                   \
+        UNPACK_SIZE_MISMATCH_FOUND(unpack_type, uint32_t, remote_type); \
+        break;                                                          \
+        case PMIX_INT32:                                                    \
+        UNPACK_SIZE_MISMATCH_FOUND(unpack_type, int32_t, remote_type);  \
+        break;                                                          \
+        case PMIX_UINT64:                                                   \
+        UNPACK_SIZE_MISMATCH_FOUND(unpack_type, uint64_t, remote_type); \
+        break;                                                          \
+        case PMIX_INT64:                                                    \
+        UNPACK_SIZE_MISMATCH_FOUND(unpack_type, int64_t, remote_type);  \
+        break;                                                          \
+        default:                                                            \
+        ret = PMIX_ERR_NOT_FOUND;                                       \
+    }                                                                   \
+} while (0)
+
+/* NOTE: do not need to deal with endianness here, as the unpacking of
+   the underling sender-side type will do that for us.  Repeat: the
+   data in tmpbuf[] is already in host byte order. */
+#define UNPACK_SIZE_MISMATCH_FOUND(unpack_type, tmptype, tmpbfroptype)        \
+   do {                                                                    \
+    int32_t i;                                                          \
+    tmptype *tmpbuf = (tmptype*)malloc(sizeof(tmptype) * (*num_vals));  \
+    ret = pmix_bfrop_unpack_buffer(buffer, tmpbuf, num_vals, tmpbfroptype); \
+    for (i = 0 ; i < *num_vals ; ++i) {                                 \
+        ((unpack_type*) dest)[i] = (unpack_type)(tmpbuf[i]);            \
+    }                                                                   \
+    free(tmpbuf);                                                       \
+} while (0)
+
+
+/**
+ * Internal struct used for holding registered bfrop functions
+ */
+ typedef struct {
+    pmix_object_t super;
+    /* type identifier */
+    pmix_data_type_t odti_type;
+    /** Debugging string name */
+    char *odti_name;
+    /** Pack function */
+    pmix_bfrop_pack_fn_t odti_pack_fn;
+    /** Unpack function */
+    pmix_bfrop_unpack_fn_t odti_unpack_fn;
+    /** copy function */
+    pmix_bfrop_copy_fn_t odti_copy_fn;
+    /** print function */
+    pmix_bfrop_print_fn_t odti_print_fn;
+} pmix_bfrop_type_info_t;
+PMIX_CLASS_DECLARATION(pmix_bfrop_type_info_t);
+
+/*
+ * globals needed within bfrop
+ */
+ extern bool pmix_bfrop_initialized;
+ extern size_t pmix_bfrop_initial_size;
+ extern size_t pmix_bfrop_threshold_size;
+ extern pmix_pointer_array_t pmix_bfrop_types;
+ extern pmix_data_type_t pmix_bfrop_num_reg_types;
+
+/* macro for registering data types */
+#define PMIX_REGISTER_TYPE(n, t, p, u, c, pr)                           \
+ do {                                                                \
+    pmix_bfrop_type_info_t *_info;                                  \
+    _info = PMIX_NEW(pmix_bfrop_type_info_t);                        \
+    _info->odti_name = strdup((n));                                 \
+    _info->odti_type = (t);                                         \
+    _info->odti_pack_fn = (pmix_bfrop_pack_fn_t)(p);                \
+    _info->odti_unpack_fn = (pmix_bfrop_unpack_fn_t)(u);            \
+    _info->odti_copy_fn = (pmix_bfrop_copy_fn_t)(c) ;               \
+    _info->odti_print_fn = (pmix_bfrop_print_fn_t)(pr) ;            \
+    pmix_pointer_array_set_item(&pmix_bfrop_types, (t), _info);     \
+    ++pmix_bfrop_num_reg_types;                                     \
+} while (0)
+
+/*
+ * Implementations of API functions
+ */
+
+pmix_status_t pmix_bfrop_pack(pmix_buffer_t *buffer, const void *src,
+                              int32_t num_vals,
+                              pmix_data_type_t type);
+pmix_status_t pmix_bfrop_unpack(pmix_buffer_t *buffer, void *dest,
+                                int32_t *max_num_vals,
+                                pmix_data_type_t type);
+
+pmix_status_t pmix_bfrop_copy(void **dest, void *src, pmix_data_type_t type);
+
+pmix_status_t pmix_bfrop_print(char **output, char *prefix, void *src, pmix_data_type_t type);
+
+pmix_status_t pmix_bfrop_copy_payload(pmix_buffer_t *dest, pmix_buffer_t *src);
+
+/*
+ * Specialized functions
+ */
+pmix_status_t pmix_bfrop_pack_buffer(pmix_buffer_t *buffer, const void *src,
+                                     int32_t num_vals, pmix_data_type_t type);
+
+pmix_status_t pmix_bfrop_unpack_buffer(pmix_buffer_t *buffer, void *dst,
+                                       int32_t *num_vals, pmix_data_type_t type);
+
+/*
+ * Internal pack functions
+ */
+
+pmix_status_t pmix_bfrop_pack_bool(pmix_buffer_t *buffer, const void *src,
+                                   int32_t num_vals, pmix_data_type_t type);
+pmix_status_t pmix_bfrop_pack_byte(pmix_buffer_t *buffer, const void *src,
+                                   int32_t num_vals, pmix_data_type_t type);
+pmix_status_t pmix_bfrop_pack_string(pmix_buffer_t *buffer, const void *src,
+                                     int32_t num_vals, pmix_data_type_t type);
+pmix_status_t pmix_bfrop_pack_sizet(pmix_buffer_t *buffer, const void *src,
+                                    int32_t num_vals, pmix_data_type_t type);
+pmix_status_t pmix_bfrop_pack_pid(pmix_buffer_t *buffer, const void *src,
+                                  int32_t num_vals, pmix_data_type_t type);
+
+pmix_status_t pmix_bfrop_pack_int(pmix_buffer_t *buffer, const void *src,
+                                  int32_t num_vals, pmix_data_type_t type);
+pmix_status_t pmix_bfrop_pack_int16(pmix_buffer_t *buffer, const void *src,
+                                    int32_t num_vals, pmix_data_type_t type);
+pmix_status_t pmix_bfrop_pack_int32(pmix_buffer_t *buffer, const void *src,
+                                    int32_t num_vals, pmix_data_type_t type);
+pmix_status_t pmix_bfrop_pack_datatype(pmix_buffer_t *buffer, const void *src,
+                                       int32_t num_vals, pmix_data_type_t type);
+pmix_status_t pmix_bfrop_pack_int64(pmix_buffer_t *buffer, const void *src,
+                                    int32_t num_vals, pmix_data_type_t type);
+
+pmix_status_t pmix_bfrop_pack_float(pmix_buffer_t *buffer, const void *src,
+                                    int32_t num_vals, pmix_data_type_t type);
+pmix_status_t pmix_bfrop_pack_double(pmix_buffer_t *buffer, const void *src,
+                                     int32_t num_vals, pmix_data_type_t type);
+pmix_status_t pmix_bfrop_pack_time(pmix_buffer_t *buffer, const void *src,
+                                   int32_t num_vals, pmix_data_type_t type);
+pmix_status_t pmix_bfrop_pack_timeval(pmix_buffer_t *buffer, const void *src,
+                                      int32_t num_vals, pmix_data_type_t type);
+pmix_status_t pmix_bfrop_pack_time(pmix_buffer_t *buffer, const void *src,
+                                   int32_t num_vals, pmix_data_type_t type);
+pmix_status_t pmix_bfrop_pack_status(pmix_buffer_t *buffer, const void *src,
+                                     int32_t num_vals, pmix_data_type_t type);
+pmix_status_t pmix_bfrop_pack_value(pmix_buffer_t *buffer, const void *src,
+                                    int32_t num_vals, pmix_data_type_t type);
+pmix_status_t pmix_bfrop_pack_proc(pmix_buffer_t *buffer, const void *src,
+                                   int32_t num_vals, pmix_data_type_t type);
+pmix_status_t pmix_bfrop_pack_app(pmix_buffer_t *buffer, const void *src,
+                                  int32_t num_vals, pmix_data_type_t type);
+pmix_status_t pmix_bfrop_pack_info(pmix_buffer_t *buffer, const void *src,
+                                   int32_t num_vals, pmix_data_type_t type);
+pmix_status_t pmix_bfrop_pack_buf(pmix_buffer_t *buffer, const void *src,
+                                  int32_t num_vals, pmix_data_type_t type);
+pmix_status_t pmix_bfrop_pack_kval(pmix_buffer_t *buffer, const void *src,
+                                   int32_t num_vals, pmix_data_type_t type);
+pmix_status_t pmix_bfrop_pack_modex(pmix_buffer_t *buffer, const void *src,
+                                    int32_t num_vals, pmix_data_type_t type);
+pmix_status_t pmix_bfrop_pack_persist(pmix_buffer_t *buffer, const void *src,
+                                      int32_t num_vals, pmix_data_type_t type);
+pmix_status_t pmix_bfrop_pack_scope(pmix_buffer_t *buffer, const void *src,
+                                    int32_t num_vals, pmix_data_type_t type);
+pmix_status_t pmix_bfrop_pack_range(pmix_buffer_t *buffer, const void *src,
+                                    int32_t num_vals, pmix_data_type_t type);
+pmix_status_t pmix_bfrop_pack_cmd(pmix_buffer_t *buffer, const void *src,
+                                  int32_t num_vals, pmix_data_type_t type);
+pmix_status_t pmix_bfrop_pack_infodirs(pmix_buffer_t *buffer, const void *src,
+                                       int32_t num_vals, pmix_data_type_t type);
+pmix_status_t pmix_bfrop_pack_bo(pmix_buffer_t *buffer, const void *src,
+                                 int32_t num_vals, pmix_data_type_t type);
+pmix_status_t pmix_bfrop_pack_pdata(pmix_buffer_t *buffer, const void *src,
+                                    int32_t num_vals, pmix_data_type_t type);
+pmix_status_t pmix_bfrop_pack_ptr(pmix_buffer_t *buffer, const void *src,
+                                  int32_t num_vals, pmix_data_type_t type);
+pmix_status_t pmix_bfrop_pack_pstate(pmix_buffer_t *buffer, const void *src,
+                                     int32_t num_vals, pmix_data_type_t type);
+pmix_status_t pmix_bfrop_pack_pinfo(pmix_buffer_t *buffer, const void *src,
+                                    int32_t num_vals, pmix_data_type_t type);
+pmix_status_t pmix_bfrop_pack_darray(pmix_buffer_t *buffer, const void *src,
+                                     int32_t num_vals, pmix_data_type_t type);
+pmix_status_t pmix_bfrop_pack_query(pmix_buffer_t *buffer, const void *src,
+                                    int32_t num_vals, pmix_data_type_t type);
+pmix_status_t pmix_bfrop_pack_rank(pmix_buffer_t *buffer, const void *src,
+                                   int32_t num_vals, pmix_data_type_t type);
+pmix_status_t pmix_bfrop_pack_alloc_directive(pmix_buffer_t *buffer, const void *src,
+                                              int32_t num_vals, pmix_data_type_t type);
+/**** DEPRECATED ****/
+pmix_status_t pmix_bfrop_pack_array(pmix_buffer_t *buffer, const void *src,
+                                    int32_t num_vals, pmix_data_type_t type);
+/********************/
+
+/*
+ * Internal unpack functions
+ */
+ pmix_status_t pmix_bfrop_unpack_bool(pmix_buffer_t *buffer, void *dest,
+                                      int32_t *num_vals, pmix_data_type_t type);
+ pmix_status_t pmix_bfrop_unpack_byte(pmix_buffer_t *buffer, void *dest,
+                                      int32_t *num_vals, pmix_data_type_t type);
+ pmix_status_t pmix_bfrop_unpack_string(pmix_buffer_t *buffer, void *dest,
+                                        int32_t *num_vals, pmix_data_type_t type);
+ pmix_status_t pmix_bfrop_unpack_sizet(pmix_buffer_t *buffer, void *dest,
+                                       int32_t *num_vals, pmix_data_type_t type);
+ pmix_status_t pmix_bfrop_unpack_pid(pmix_buffer_t *buffer, void *dest,
+                                     int32_t *num_vals, pmix_data_type_t type);
+
+ pmix_status_t pmix_bfrop_unpack_int(pmix_buffer_t *buffer, void *dest,
+                                     int32_t *num_vals, pmix_data_type_t type);
+ pmix_status_t pmix_bfrop_unpack_int16(pmix_buffer_t *buffer, void *dest,
+                                       int32_t *num_vals, pmix_data_type_t type);
+ pmix_status_t pmix_bfrop_unpack_int32(pmix_buffer_t *buffer, void *dest,
+                                       int32_t *num_vals, pmix_data_type_t type);
+ pmix_status_t pmix_bfrop_unpack_datatype(pmix_buffer_t *buffer, void *dest,
+                                          int32_t *num_vals, pmix_data_type_t type);
+ pmix_status_t pmix_bfrop_unpack_int64(pmix_buffer_t *buffer, void *dest,
+                                       int32_t *num_vals, pmix_data_type_t type);
+
+ pmix_status_t pmix_bfrop_unpack_float(pmix_buffer_t *buffer, void *dest,
+                                       int32_t *num_vals, pmix_data_type_t type);
+ pmix_status_t pmix_bfrop_unpack_double(pmix_buffer_t *buffer, void *dest,
+                                        int32_t *num_vals, pmix_data_type_t type);
+ pmix_status_t pmix_bfrop_unpack_timeval(pmix_buffer_t *buffer, void *dest,
+                                         int32_t *num_vals, pmix_data_type_t type);
+ pmix_status_t pmix_bfrop_unpack_time(pmix_buffer_t *buffer, void *dest,
+                                      int32_t *num_vals, pmix_data_type_t type);
+ pmix_status_t pmix_bfrop_unpack_status(pmix_buffer_t *buffer, void *dest,
+                                        int32_t *num_vals, pmix_data_type_t type);
+ pmix_status_t pmix_bfrop_unpack_value(pmix_buffer_t *buffer, void *dest,
+                                       int32_t *num_vals, pmix_data_type_t type);
+ pmix_status_t pmix_bfrop_unpack_proc(pmix_buffer_t *buffer, void *dest,
+                                      int32_t *num_vals, pmix_data_type_t type);
+ pmix_status_t pmix_bfrop_unpack_app(pmix_buffer_t *buffer, void *dest,
+                                     int32_t *num_vals, pmix_data_type_t type);
+ pmix_status_t pmix_bfrop_unpack_info(pmix_buffer_t *buffer, void *dest,
+                                      int32_t *num_vals, pmix_data_type_t type);
+ pmix_status_t pmix_bfrop_unpack_buf(pmix_buffer_t *buffer, void *dest,
+                                     int32_t *num_vals, pmix_data_type_t type);
+ pmix_status_t pmix_bfrop_unpack_kval(pmix_buffer_t *buffer, void *dest,
+                                      int32_t *num_vals, pmix_data_type_t type);
+ pmix_status_t pmix_bfrop_unpack_modex(pmix_buffer_t *buffer, void *dest,
+                                       int32_t *num_vals, pmix_data_type_t type);
+ pmix_status_t pmix_bfrop_unpack_persist(pmix_buffer_t *buffer, void *dest,
+                                         int32_t *num_vals, pmix_data_type_t type);
+ pmix_status_t pmix_bfrop_unpack_scope(pmix_buffer_t *buffer, void *dest,
+                                       int32_t *num_vals, pmix_data_type_t type);
+ pmix_status_t pmix_bfrop_unpack_range(pmix_buffer_t *buffer, void *dest,
+                                       int32_t *num_vals, pmix_data_type_t type);
+ pmix_status_t pmix_bfrop_unpack_cmd(pmix_buffer_t *buffer, void *dest,
+                                     int32_t *num_vals, pmix_data_type_t type);
+ pmix_status_t pmix_bfrop_unpack_infodirs(pmix_buffer_t *buffer, void *dest,
+                                          int32_t *num_vals, pmix_data_type_t type);
+ pmix_status_t pmix_bfrop_unpack_bo(pmix_buffer_t *buffer, void *dest,
+                                    int32_t *num_vals, pmix_data_type_t type);
+ pmix_status_t pmix_bfrop_unpack_pdata(pmix_buffer_t *buffer, void *dest,
+                                       int32_t *num_vals, pmix_data_type_t type);
+ pmix_status_t pmix_bfrop_unpack_ptr(pmix_buffer_t *buffer, void *dest,
+                                     int32_t *num_vals, pmix_data_type_t type);
+ pmix_status_t pmix_bfrop_unpack_pstate(pmix_buffer_t *buffer, void *dest,
+                                        int32_t *num_vals, pmix_data_type_t type);
+ pmix_status_t pmix_bfrop_unpack_pinfo(pmix_buffer_t *buffer, void *dest,
+                                       int32_t *num_vals, pmix_data_type_t type);
+ pmix_status_t pmix_bfrop_unpack_darray(pmix_buffer_t *buffer, void *dest,
+                                        int32_t *num_vals, pmix_data_type_t type);
+pmix_status_t pmix_bfrop_unpack_query(pmix_buffer_t *buffer, void *dest,
+                                      int32_t *num_vals, pmix_data_type_t type);
+pmix_status_t pmix_bfrop_unpack_rank(pmix_buffer_t *buffer, void *dest,
+                                     int32_t *num_vals, pmix_data_type_t type);
+pmix_status_t pmix_bfrop_unpack_alloc_directive(pmix_buffer_t *buffer, void *dest,
+                                                int32_t *num_vals, pmix_data_type_t type);
+/**** DEPRECATED ****/
+pmix_status_t pmix_bfrop_unpack_array(pmix_buffer_t *buffer, void *dest,
+                                      int32_t *num_vals, pmix_data_type_t type);
+/********************/
+
+/*
+ * Internal copy functions
+ */
+
+pmix_status_t pmix_bfrop_std_copy(void **dest, void *src, pmix_data_type_t type);
+pmix_status_t pmix_bfrop_copy_string(char **dest, char *src, pmix_data_type_t type);
+pmix_status_t pmix_bfrop_copy_value(pmix_value_t **dest, pmix_value_t *src,
+                                    pmix_data_type_t type);
+pmix_status_t pmix_bfrop_copy_proc(pmix_proc_t **dest, pmix_proc_t *src,
+                                   pmix_data_type_t type);
+pmix_status_t pmix_bfrop_copy_app(pmix_app_t **dest, pmix_app_t *src,
+                                  pmix_data_type_t type);
+pmix_status_t pmix_bfrop_copy_info(pmix_info_t **dest, pmix_info_t *src,
+                                   pmix_data_type_t type);
+pmix_status_t pmix_bfrop_copy_buf(pmix_buffer_t **dest, pmix_buffer_t *src,
+                                  pmix_data_type_t type);
+pmix_status_t pmix_bfrop_copy_kval(pmix_kval_t **dest, pmix_kval_t *src,
+                                   pmix_data_type_t type);
+pmix_status_t pmix_bfrop_copy_modex(pmix_modex_data_t **dest, pmix_modex_data_t *src,
+                                    pmix_data_type_t type);
+pmix_status_t pmix_bfrop_copy_persist(pmix_persistence_t **dest, pmix_persistence_t *src,
+                                      pmix_data_type_t type);
+pmix_status_t pmix_bfrop_copy_bo(pmix_byte_object_t **dest, pmix_byte_object_t *src,
+                                 pmix_data_type_t type);
+pmix_status_t pmix_bfrop_copy_pdata(pmix_pdata_t **dest, pmix_pdata_t *src,
+                                    pmix_data_type_t type);
+pmix_status_t pmix_bfrop_copy_pinfo(pmix_proc_info_t **dest, pmix_proc_info_t *src,
+                                    pmix_data_type_t type);
+pmix_status_t pmix_bfrop_copy_darray(pmix_data_array_t **dest, pmix_data_array_t *src,
+                                     pmix_data_type_t type);
+pmix_status_t pmix_bfrop_copy_query(pmix_query_t **dest, pmix_query_t *src,
+                                    pmix_data_type_t type);
+/**** DEPRECATED ****/
+pmix_status_t pmix_bfrop_copy_array(pmix_info_array_t **dest,
+                                    pmix_info_array_t *src,
+                                    pmix_data_type_t type);
+
+/********************/
+
+/*
+ * Internal print functions
+ */
+pmix_status_t pmix_bfrop_print_bool(char **output, char *prefix, bool *src, pmix_data_type_t type);
+pmix_status_t pmix_bfrop_print_byte(char **output, char *prefix, uint8_t *src, pmix_data_type_t type);
+pmix_status_t pmix_bfrop_print_string(char **output, char *prefix, char *src, pmix_data_type_t type);
+pmix_status_t pmix_bfrop_print_size(char **output, char *prefix, size_t *src, pmix_data_type_t type);
+pmix_status_t pmix_bfrop_print_pid(char **output, char *prefix, pid_t *src, pmix_data_type_t type);
+
+pmix_status_t pmix_bfrop_print_int(char **output, char *prefix, int *src, pmix_data_type_t type);
+pmix_status_t pmix_bfrop_print_int8(char **output, char *prefix, int8_t *src, pmix_data_type_t type);
+pmix_status_t pmix_bfrop_print_int16(char **output, char *prefix, int16_t *src, pmix_data_type_t type);
+pmix_status_t pmix_bfrop_print_int32(char **output, char *prefix, int32_t *src, pmix_data_type_t type);
+pmix_status_t pmix_bfrop_print_int64(char **output, char *prefix, int64_t *src, pmix_data_type_t type);
+
+pmix_status_t pmix_bfrop_print_uint(char **output, char *prefix, uint *src, pmix_data_type_t type);
+pmix_status_t pmix_bfrop_print_uint8(char **output, char *prefix, uint8_t *src, pmix_data_type_t type);
+pmix_status_t pmix_bfrop_print_uint16(char **output, char *prefix, uint16_t *src, pmix_data_type_t type);
+pmix_status_t pmix_bfrop_print_uint32(char **output, char *prefix, uint32_t *src, pmix_data_type_t type);
+pmix_status_t pmix_bfrop_print_uint64(char **output, char *prefix, uint64_t *src, pmix_data_type_t type);
+
+pmix_status_t pmix_bfrop_print_float(char **output, char *prefix, float *src, pmix_data_type_t type);
+pmix_status_t pmix_bfrop_print_double(char **output, char *prefix, double *src, pmix_data_type_t type);
+
+pmix_status_t pmix_bfrop_print_timeval(char **output, char *prefix, struct timeval *src, pmix_data_type_t type);
+pmix_status_t pmix_bfrop_print_time(char **output, char *prefix, time_t *src, pmix_data_type_t type);
+pmix_status_t pmix_bfrop_print_status(char **output, char *prefix, pmix_status_t *src, pmix_data_type_t type);
+pmix_status_t pmix_bfrop_print_value(char **output, char *prefix, pmix_value_t *src, pmix_data_type_t type);
+pmix_status_t pmix_bfrop_print_proc(char **output, char *prefix,
+                                    pmix_proc_t *src, pmix_data_type_t type);
+pmix_status_t pmix_bfrop_print_app(char **output, char *prefix,
+                                   pmix_app_t *src, pmix_data_type_t type);
+pmix_status_t pmix_bfrop_print_info(char **output, char *prefix,
+                                    pmix_info_t *src, pmix_data_type_t type);
+pmix_status_t pmix_bfrop_print_buf(char **output, char *prefix,
+                                   pmix_buffer_t *src, pmix_data_type_t type);
+pmix_status_t pmix_bfrop_print_kval(char **output, char *prefix,
+                                    pmix_kval_t *src, pmix_data_type_t type);
+pmix_status_t pmix_bfrop_print_modex(char **output, char *prefix,
+                                     pmix_modex_data_t *src, pmix_data_type_t type);
+pmix_status_t pmix_bfrop_print_persist(char **output, char *prefix,
+                                       pmix_persistence_t *src, pmix_data_type_t type);
+pmix_status_t pmix_bfrop_print_scope(char **output, char *prefix,
+                                     pmix_scope_t *src, pmix_data_type_t type);
+pmix_status_t pmix_bfrop_print_range(char **output, char *prefix,
+                                     pmix_data_range_t *src, pmix_data_type_t type);
+pmix_status_t pmix_bfrop_print_cmd(char **output, char *prefix,
+                                   pmix_cmd_t *src, pmix_data_type_t type);
+pmix_status_t pmix_bfrop_print_infodirs(char **output, char *prefix,
+                                        pmix_info_directives_t *src, pmix_data_type_t type);
+pmix_status_t pmix_bfrop_print_bo(char **output, char *prefix,
+                                  pmix_byte_object_t *src, pmix_data_type_t type);
+pmix_status_t pmix_bfrop_print_pdata(char **output, char *prefix,
+                                     pmix_pdata_t *src, pmix_data_type_t type);
+pmix_status_t pmix_bfrop_print_ptr(char **output, char *prefix,
+                                   void *src, pmix_data_type_t type);
+pmix_status_t pmix_bfrop_print_pstate(char **output, char *prefix,
+                                      pmix_proc_state_t *src, pmix_data_type_t type);
+pmix_status_t pmix_bfrop_print_pinfo(char **output, char *prefix,
+                                     pmix_proc_info_t *src, pmix_data_type_t type);
+pmix_status_t pmix_bfrop_print_darray(char **output, char *prefix,
+                                      pmix_data_array_t *src, pmix_data_type_t type);
+pmix_status_t pmix_bfrop_print_query(char **output, char *prefix,
+                                     pmix_query_t *src, pmix_data_type_t type);
+pmix_status_t pmix_bfrop_print_rank(char **output, char *prefix,
+                                    pmix_rank_t *src, pmix_data_type_t type);
+pmix_status_t pmix_bfrop_print_alloc_directive(char **output, char *prefix,
+                                               pmix_alloc_directive_t *src,
+                                               pmix_data_type_t type);
+/**** DEPRECATED ****/
+pmix_status_t pmix_bfrop_print_array(char **output, char *prefix,
+                                     pmix_info_array_t *src,
+                                     pmix_data_type_t type);
+/********************/
+
+/*
+ * Internal helper functions
+ */
+
+ char* pmix_bfrop_buffer_extend(pmix_buffer_t *bptr, size_t bytes_to_add);
+
+ bool pmix_bfrop_too_small(pmix_buffer_t *buffer, size_t bytes_reqd);
+
+ pmix_bfrop_type_info_t* pmix_bfrop_find_type(pmix_data_type_t type);
+
+ pmix_status_t pmix_bfrop_store_data_type(pmix_buffer_t *buffer, pmix_data_type_t type);
+
+ pmix_status_t pmix_bfrop_get_data_type(pmix_buffer_t *buffer, pmix_data_type_t *type);
+
+ END_C_DECLS
+
+#endif
diff --git a/src/buffer_ops/internal_functions.c b/src/buffer_ops/internal_functions.c
new file mode 100644
index 0000000..b2e917e
--- /dev/null
+++ b/src/buffer_ops/internal_functions.c
@@ -0,0 +1,117 @@
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2006 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2015-2017 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2016      IBM Corporation.  All rights reserved.
+ * Copyright (c) 2017      Los Alamos National Security, LLC. All rights
+ *                         reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+
+
+#include <stdio.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#include "src/class/pmix_pointer_array.h"
+
+#include "src/buffer_ops/internal.h"
+
+/**
+ * Internal function that resizes (expands) an inuse buffer if
+ * necessary.
+ */
+char* pmix_bfrop_buffer_extend(pmix_buffer_t *buffer, size_t bytes_to_add)
+{
+    size_t required, to_alloc;
+    size_t pack_offset, unpack_offset;
+    char *tmp;
+
+    /* Check to see if we have enough space already */
+
+    if ((buffer->bytes_allocated - buffer->bytes_used) >= bytes_to_add) {
+        return buffer->pack_ptr;
+    }
+
+    required = buffer->bytes_used + bytes_to_add;
+    if (required >= pmix_bfrop_threshold_size) {
+        to_alloc = (required + pmix_bfrop_threshold_size - 1) & ~(pmix_bfrop_threshold_size - 1);
+    } else {
+        to_alloc = buffer->bytes_allocated ? buffer->bytes_allocated : pmix_bfrop_initial_size;
+        while(to_alloc < required) {
+            to_alloc <<= 1;
+        }
+    }
+
+    pack_offset = ((char*) buffer->pack_ptr) - ((char*) buffer->base_ptr);
+    unpack_offset = ((char*) buffer->unpack_ptr) - ((char*) buffer->base_ptr);
+    tmp = (char*)realloc(buffer->base_ptr, to_alloc);
+    if (NULL == tmp) {
+        return NULL;
+    }
+
+    buffer->base_ptr = tmp;
+
+    /* This memset is meant to keep valgrind happy. If possible it should be removed
+     * in the future. */
+    memset(buffer->base_ptr + pack_offset, 0, to_alloc - buffer->bytes_allocated);
+
+    buffer->pack_ptr = ((char*) buffer->base_ptr) + pack_offset;
+    buffer->unpack_ptr = ((char*) buffer->base_ptr) + unpack_offset;
+    buffer->bytes_allocated = to_alloc;
+
+    /* All done */
+
+    return buffer->pack_ptr;
+}
+
+/*
+ * Internal function that checks to see if the specified number of bytes
+ * remain in the buffer for unpacking
+ */
+bool pmix_bfrop_too_small(pmix_buffer_t *buffer, size_t bytes_reqd)
+{
+    size_t bytes_remaining_packed;
+
+    if (buffer->pack_ptr < buffer->unpack_ptr) {
+        return true;
+    }
+
+    bytes_remaining_packed = buffer->pack_ptr - buffer->unpack_ptr;
+
+    if (bytes_remaining_packed < bytes_reqd) {
+        /* don't error log this - it could be that someone is trying to
+         * simply read until the buffer is empty
+         */
+        return true;
+    }
+
+    return false;
+}
+
+pmix_status_t pmix_bfrop_store_data_type(pmix_buffer_t *buffer, pmix_data_type_t type)
+{
+    /* Lookup the pack function for the actual pmix_data_type type and call it */
+    return pmix_bfrop_pack_datatype(buffer, &type, 1, PMIX_DATA_TYPE);
+}
+
+pmix_status_t pmix_bfrop_get_data_type(pmix_buffer_t *buffer, pmix_data_type_t *type)
+{
+    int32_t cnt = 1;
+    return pmix_bfrop_unpack_datatype(buffer, type, &cnt, PMIX_DATA_TYPE);
+}
diff --git a/src/buffer_ops/open_close.c b/src/buffer_ops/open_close.c
new file mode 100644
index 0000000..4745024
--- /dev/null
+++ b/src/buffer_ops/open_close.c
@@ -0,0 +1,755 @@
+/* -*- Mode: C; c-basic-offset:4 ; -*- */
+/*
+ * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2009 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2012-2013 Los Alamos National Security, Inc.  All rights reserved.
+ * Copyright (c) 2014-2017 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2016-2017 IBM Corporation.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+/** @file:
+ *
+ */
+#include <src/include/pmix_config.h>
+
+#include <pmix_common.h>
+
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+
+#include "src/util/argv.h"
+#include "src/util/error.h"
+#include "src/buffer_ops/internal.h"
+
+/**
+ * globals
+ */
+bool pmix_bfrop_initialized = false;
+size_t pmix_bfrop_initial_size = 0;
+size_t pmix_bfrop_threshold_size = 0;
+pmix_pointer_array_t pmix_bfrop_types = {{0}};
+pmix_data_type_t pmix_bfrop_num_reg_types = PMIX_UNDEF;
+static pmix_bfrop_buffer_type_t pmix_default_buf_type = PMIX_BFROP_BUFFER_NON_DESC;
+
+PMIX_EXPORT pmix_bfrop_t pmix_bfrop = {
+    pmix_bfrop_pack,
+    pmix_bfrop_unpack,
+    pmix_bfrop_copy,
+    pmix_bfrop_print,
+    pmix_bfrop_copy_payload,
+};
+
+/**
+ * Object constructors, destructors, and instantiations
+ */
+/** Value **/
+static void pmix_buffer_construct (pmix_buffer_t* buffer)
+{
+    /** set the default buffer type */
+    buffer->type = pmix_default_buf_type;
+
+    /* Make everything NULL to begin with */
+    buffer->base_ptr = buffer->pack_ptr = buffer->unpack_ptr = NULL;
+    buffer->bytes_allocated = buffer->bytes_used = 0;
+}
+
+static void pmix_buffer_destruct (pmix_buffer_t* buffer)
+{
+    if (NULL != buffer->base_ptr) {
+        free (buffer->base_ptr);
+    }
+}
+
+PMIX_EXPORT PMIX_CLASS_INSTANCE(pmix_buffer_t,
+                                pmix_object_t,
+                                pmix_buffer_construct,
+                                pmix_buffer_destruct);
+
+
+static void pmix_bfrop_type_info_construct(pmix_bfrop_type_info_t *obj)
+{
+    obj->odti_name = NULL;
+    obj->odti_pack_fn = NULL;
+    obj->odti_unpack_fn = NULL;
+    obj->odti_copy_fn = NULL;
+    obj->odti_print_fn = NULL;
+}
+
+static void pmix_bfrop_type_info_destruct(pmix_bfrop_type_info_t *obj)
+{
+    if (NULL != obj->odti_name) {
+        free(obj->odti_name);
+    }
+}
+
+PMIX_EXPORT PMIX_CLASS_INSTANCE(pmix_bfrop_type_info_t, pmix_object_t,
+                                pmix_bfrop_type_info_construct,
+                                pmix_bfrop_type_info_destruct);
+
+static void kvcon(pmix_kval_t *k)
+{
+    k->key = NULL;
+    k->value = NULL;
+}
+static void kvdes(pmix_kval_t *k)
+{
+    if (NULL != k->key) {
+        free(k->key);
+    }
+    if (NULL != k->value) {
+        PMIX_VALUE_RELEASE(k->value);
+    }
+}
+PMIX_EXPORT PMIX_CLASS_INSTANCE(pmix_kval_t,
+                                pmix_list_item_t,
+                                kvcon, kvdes);
+
+static void rcon(pmix_regex_range_t *p)
+{
+    p->start = 0;
+    p->cnt = 0;
+}
+PMIX_EXPORT PMIX_CLASS_INSTANCE(pmix_regex_range_t,
+                                pmix_list_item_t,
+                                rcon, NULL);
+
+static void rvcon(pmix_regex_value_t *p)
+{
+    p->prefix = NULL;
+    p->suffix = NULL;
+    p->num_digits = 0;
+    PMIX_CONSTRUCT(&p->ranges, pmix_list_t);
+}
+static void rvdes(pmix_regex_value_t *p)
+{
+    if (NULL != p->prefix) {
+        free(p->prefix);
+    }
+    if (NULL != p->suffix) {
+        free(p->suffix);
+    }
+    PMIX_LIST_DESTRUCT(&p->ranges);
+}
+PMIX_EXPORT PMIX_CLASS_INSTANCE(pmix_regex_value_t,
+                                pmix_list_item_t,
+                                rvcon, rvdes);
+
+PMIX_EXPORT pmix_status_t pmix_bfrop_open(void)
+{
+    pmix_status_t rc;
+
+    if (pmix_bfrop_initialized) {
+        return PMIX_SUCCESS;
+    }
+
+    /** set the default buffer type. If we are in debug mode, then we default
+     * to fully described buffers. Otherwise, we default to non-described for brevity
+     * and performance
+     */
+#if PMIX_ENABLE_DEBUG
+    pmix_default_buf_type = PMIX_BFROP_BUFFER_FULLY_DESC;
+#else
+    pmix_default_buf_type = PMIX_BFROP_BUFFER_NON_DESC;
+#endif
+
+    /* Setup the types array */
+    PMIX_CONSTRUCT(&pmix_bfrop_types, pmix_pointer_array_t);
+    if (PMIX_SUCCESS != (rc = pmix_pointer_array_init(&pmix_bfrop_types, 64, 255, 64))) {
+        return rc;
+    }
+    pmix_bfrop_num_reg_types = PMIX_UNDEF;
+    pmix_bfrop_threshold_size = PMIX_BFROP_DEFAULT_THRESHOLD_SIZE;
+    pmix_bfrop_initial_size = PMIX_BFROP_DEFAULT_INITIAL_SIZE;
+
+    /* Register all the supported types */
+    PMIX_REGISTER_TYPE("PMIX_BOOL", PMIX_BOOL,
+                       pmix_bfrop_pack_bool,
+                       pmix_bfrop_unpack_bool,
+                       pmix_bfrop_std_copy,
+                       pmix_bfrop_print_bool);
+
+    PMIX_REGISTER_TYPE("PMIX_BYTE", PMIX_BYTE,
+                       pmix_bfrop_pack_byte,
+                       pmix_bfrop_unpack_byte,
+                       pmix_bfrop_std_copy,
+                       pmix_bfrop_print_byte);
+
+    PMIX_REGISTER_TYPE("PMIX_STRING", PMIX_STRING,
+                       pmix_bfrop_pack_string,
+                       pmix_bfrop_unpack_string,
+                       pmix_bfrop_copy_string,
+                       pmix_bfrop_print_string);
+
+    PMIX_REGISTER_TYPE("PMIX_SIZE", PMIX_SIZE,
+                       pmix_bfrop_pack_sizet,
+                       pmix_bfrop_unpack_sizet,
+                       pmix_bfrop_std_copy,
+                       pmix_bfrop_print_size);
+
+    PMIX_REGISTER_TYPE("PMIX_PID", PMIX_PID,
+                       pmix_bfrop_pack_pid,
+                       pmix_bfrop_unpack_pid,
+                       pmix_bfrop_std_copy,
+                       pmix_bfrop_print_pid);
+
+    PMIX_REGISTER_TYPE("PMIX_INT", PMIX_INT,
+                       pmix_bfrop_pack_int,
+                       pmix_bfrop_unpack_int,
+                       pmix_bfrop_std_copy,
+                       pmix_bfrop_print_int);
+
+    PMIX_REGISTER_TYPE("PMIX_INT8", PMIX_INT8,
+                       pmix_bfrop_pack_byte,
+                       pmix_bfrop_unpack_byte,
+                       pmix_bfrop_std_copy,
+                       pmix_bfrop_print_int8);
+
+    PMIX_REGISTER_TYPE("PMIX_INT16", PMIX_INT16,
+                       pmix_bfrop_pack_int16,
+                       pmix_bfrop_unpack_int16,
+                       pmix_bfrop_std_copy,
+                       pmix_bfrop_print_int16);
+
+    PMIX_REGISTER_TYPE("PMIX_INT32", PMIX_INT32,
+                       pmix_bfrop_pack_int32,
+                       pmix_bfrop_unpack_int32,
+                       pmix_bfrop_std_copy,
+                       pmix_bfrop_print_int32);
+
+    PMIX_REGISTER_TYPE("PMIX_INT64", PMIX_INT64,
+                       pmix_bfrop_pack_int64,
+                       pmix_bfrop_unpack_int64,
+                       pmix_bfrop_std_copy,
+                       pmix_bfrop_print_int64);
+
+    PMIX_REGISTER_TYPE("PMIX_UINT", PMIX_UINT,
+                       pmix_bfrop_pack_int,
+                       pmix_bfrop_unpack_int,
+                       pmix_bfrop_std_copy,
+                       pmix_bfrop_print_uint);
+
+    PMIX_REGISTER_TYPE("PMIX_UINT8", PMIX_UINT8,
+                       pmix_bfrop_pack_byte,
+                       pmix_bfrop_unpack_byte,
+                       pmix_bfrop_std_copy,
+                       pmix_bfrop_print_uint8);
+
+    PMIX_REGISTER_TYPE("PMIX_UINT16", PMIX_UINT16,
+                       pmix_bfrop_pack_int16,
+                       pmix_bfrop_unpack_int16,
+                       pmix_bfrop_std_copy,
+                       pmix_bfrop_print_uint16);
+
+    PMIX_REGISTER_TYPE("PMIX_UINT32", PMIX_UINT32,
+                       pmix_bfrop_pack_int32,
+                       pmix_bfrop_unpack_int32,
+                       pmix_bfrop_std_copy,
+                       pmix_bfrop_print_uint32);
+
+    PMIX_REGISTER_TYPE("PMIX_UINT64", PMIX_UINT64,
+                       pmix_bfrop_pack_int64,
+                       pmix_bfrop_unpack_int64,
+                       pmix_bfrop_std_copy,
+                       pmix_bfrop_print_uint64);
+
+    PMIX_REGISTER_TYPE("PMIX_FLOAT", PMIX_FLOAT,
+                       pmix_bfrop_pack_float,
+                       pmix_bfrop_unpack_float,
+                       pmix_bfrop_std_copy,
+                       pmix_bfrop_print_float);
+
+    PMIX_REGISTER_TYPE("PMIX_DOUBLE", PMIX_DOUBLE,
+                       pmix_bfrop_pack_double,
+                       pmix_bfrop_unpack_double,
+                       pmix_bfrop_std_copy,
+                       pmix_bfrop_print_double);
+
+    PMIX_REGISTER_TYPE("PMIX_TIMEVAL", PMIX_TIMEVAL,
+                       pmix_bfrop_pack_timeval,
+                       pmix_bfrop_unpack_timeval,
+                       pmix_bfrop_std_copy,
+                       pmix_bfrop_print_timeval);
+
+    PMIX_REGISTER_TYPE("PMIX_TIME", PMIX_TIME,
+                       pmix_bfrop_pack_time,
+                       pmix_bfrop_unpack_time,
+                       pmix_bfrop_std_copy,
+                       pmix_bfrop_print_time);
+
+    PMIX_REGISTER_TYPE("PMIX_STATUS", PMIX_STATUS,
+                       pmix_bfrop_pack_status,
+                       pmix_bfrop_unpack_status,
+                       pmix_bfrop_std_copy,
+                       pmix_bfrop_print_status);
+
+    PMIX_REGISTER_TYPE("PMIX_VALUE", PMIX_VALUE,
+                       pmix_bfrop_pack_value,
+                       pmix_bfrop_unpack_value,
+                       pmix_bfrop_copy_value,
+                       pmix_bfrop_print_value);
+
+    PMIX_REGISTER_TYPE("PMIX_PROC", PMIX_PROC,
+                       pmix_bfrop_pack_proc,
+                       pmix_bfrop_unpack_proc,
+                       pmix_bfrop_copy_proc,
+                       pmix_bfrop_print_proc);
+
+    PMIX_REGISTER_TYPE("PMIX_APP", PMIX_APP,
+                       pmix_bfrop_pack_app,
+                       pmix_bfrop_unpack_app,
+                       pmix_bfrop_copy_app,
+                       pmix_bfrop_print_app);
+
+    PMIX_REGISTER_TYPE("PMIX_INFO", PMIX_INFO,
+                       pmix_bfrop_pack_info,
+                       pmix_bfrop_unpack_info,
+                       pmix_bfrop_copy_info,
+                       pmix_bfrop_print_info);
+
+    PMIX_REGISTER_TYPE("PMIX_PDATA", PMIX_PDATA,
+                       pmix_bfrop_pack_pdata,
+                       pmix_bfrop_unpack_pdata,
+                       pmix_bfrop_copy_pdata,
+                       pmix_bfrop_print_pdata);
+
+    PMIX_REGISTER_TYPE("PMIX_BUFFER", PMIX_BUFFER,
+                       pmix_bfrop_pack_buf,
+                       pmix_bfrop_unpack_buf,
+                       pmix_bfrop_copy_buf,
+                       pmix_bfrop_print_buf);
+
+    PMIX_REGISTER_TYPE("PMIX_BYTE_OBJECT", PMIX_BYTE_OBJECT,
+                       pmix_bfrop_pack_bo,
+                       pmix_bfrop_unpack_bo,
+                       pmix_bfrop_copy_bo,
+                       pmix_bfrop_print_bo);
+
+    PMIX_REGISTER_TYPE("PMIX_KVAL", PMIX_KVAL,
+                       pmix_bfrop_pack_kval,
+                       pmix_bfrop_unpack_kval,
+                       pmix_bfrop_copy_kval,
+                       pmix_bfrop_print_kval);
+
+    PMIX_REGISTER_TYPE("PMIX_MODEX", PMIX_MODEX,
+                       pmix_bfrop_pack_modex,
+                       pmix_bfrop_unpack_modex,
+                       pmix_bfrop_copy_modex,
+                       pmix_bfrop_print_modex);
+
+    PMIX_REGISTER_TYPE("PMIX_PERSIST", PMIX_PERSIST,
+                       pmix_bfrop_pack_persist,
+                       pmix_bfrop_unpack_persist,
+                       pmix_bfrop_std_copy,
+                       pmix_bfrop_print_persist);
+
+    PMIX_REGISTER_TYPE("PMIX_POINTER", PMIX_POINTER,
+                       pmix_bfrop_pack_ptr,
+                       pmix_bfrop_unpack_ptr,
+                       pmix_bfrop_std_copy,
+                       pmix_bfrop_print_ptr);
+
+    PMIX_REGISTER_TYPE("PMIX_SCOPE", PMIX_SCOPE,
+                       pmix_bfrop_pack_scope,
+                       pmix_bfrop_unpack_scope,
+                       pmix_bfrop_std_copy,
+                       pmix_bfrop_print_scope);
+
+    PMIX_REGISTER_TYPE("PMIX_DATA_RANGE", PMIX_DATA_RANGE,
+                       pmix_bfrop_pack_range,
+                       pmix_bfrop_unpack_range,
+                       pmix_bfrop_std_copy,
+                       pmix_bfrop_print_range);
+
+    PMIX_REGISTER_TYPE("PMIX_COMMAND", PMIX_COMMAND,
+                       pmix_bfrop_pack_cmd,
+                       pmix_bfrop_unpack_cmd,
+                       pmix_bfrop_std_copy,
+                       pmix_bfrop_print_cmd);
+
+    PMIX_REGISTER_TYPE("PMIX_INFO_DIRECTIVES", PMIX_INFO_DIRECTIVES,
+                       pmix_bfrop_pack_infodirs,
+                       pmix_bfrop_unpack_infodirs,
+                       pmix_bfrop_std_copy,
+                       pmix_bfrop_print_infodirs);
+
+    PMIX_REGISTER_TYPE("PMIX_PROC_STATE", PMIX_PROC_STATE,
+                       pmix_bfrop_pack_pstate,
+                       pmix_bfrop_unpack_pstate,
+                       pmix_bfrop_std_copy,
+                       pmix_bfrop_print_pstate);
+
+    PMIX_REGISTER_TYPE("PMIX_PROC_INFO", PMIX_PROC_INFO,
+                       pmix_bfrop_pack_pinfo,
+                       pmix_bfrop_unpack_pinfo,
+                       pmix_bfrop_copy_pinfo,
+                       pmix_bfrop_print_pinfo);
+
+    PMIX_REGISTER_TYPE("PMIX_DATA_ARRAY", PMIX_DATA_ARRAY,
+                       pmix_bfrop_pack_darray,
+                       pmix_bfrop_unpack_darray,
+                       pmix_bfrop_copy_darray,
+                       pmix_bfrop_print_darray);
+
+    PMIX_REGISTER_TYPE("PMIX_PROC_RANK", PMIX_PROC_RANK,
+                       pmix_bfrop_pack_rank,
+                       pmix_bfrop_unpack_rank,
+                       pmix_bfrop_std_copy,
+                       pmix_bfrop_print_rank);
+
+    PMIX_REGISTER_TYPE("PMIX_QUERY", PMIX_QUERY,
+                       pmix_bfrop_pack_query,
+                       pmix_bfrop_unpack_query,
+                       pmix_bfrop_copy_query,
+                       pmix_bfrop_print_query);
+
+    PMIX_REGISTER_TYPE("PMIX_COMPRESSED_STRING",
+                       PMIX_COMPRESSED_STRING,
+                       pmix_bfrop_pack_bo,
+                       pmix_bfrop_unpack_bo,
+                       pmix_bfrop_copy_bo,
+                       pmix_bfrop_print_bo);
+
+    PMIX_REGISTER_TYPE("PMIX_ALLOC_DIRECTIVE",
+                       PMIX_ALLOC_DIRECTIVE,
+                       pmix_bfrop_pack_alloc_directive,
+                       pmix_bfrop_unpack_alloc_directive,
+                       pmix_bfrop_std_copy,
+                       pmix_bfrop_print_alloc_directive);
+
+    /**** DEPRECATED ****/
+    PMIX_REGISTER_TYPE("PMIX_INFO_ARRAY", PMIX_INFO_ARRAY,
+                       pmix_bfrop_pack_array,
+                       pmix_bfrop_unpack_array,
+                       pmix_bfrop_copy_array,
+                       pmix_bfrop_print_array);
+    /********************/
+
+    /* All done */
+    pmix_bfrop_initialized = true;
+    return PMIX_SUCCESS;
+}
+
+
+PMIX_EXPORT pmix_status_t pmix_bfrop_close(void)
+{
+    int32_t i;
+
+    if (!pmix_bfrop_initialized) {
+        return PMIX_SUCCESS;
+    }
+    pmix_bfrop_initialized = false;
+
+    for (i = 0 ; i < pmix_pointer_array_get_size(&pmix_bfrop_types) ; ++i) {
+        pmix_bfrop_type_info_t *info = (pmix_bfrop_type_info_t*)pmix_pointer_array_get_item(&pmix_bfrop_types, i);
+        if (NULL != info) {
+            pmix_pointer_array_set_item(&pmix_bfrop_types, i, NULL);
+            PMIX_RELEASE(info);
+        }
+    }
+
+    PMIX_DESTRUCT(&pmix_bfrop_types);
+
+    return PMIX_SUCCESS;
+}
+
+/**** UTILITY SUPPORT ****/
+PMIX_EXPORT void pmix_value_load(pmix_value_t *v,
+                                 const void *data,
+                                 pmix_data_type_t type)
+{
+    pmix_byte_object_t *bo;
+    pmix_proc_info_t *pi;
+
+    v->type = type;
+    if (NULL == data) {
+        /* just set the fields to zero */
+        memset(&v->data, 0, sizeof(v->data));
+        if (PMIX_BOOL == type) {
+          v->data.flag = true; // existence of the attribute indicates true unless specified different
+        }
+    } else {
+        switch(type) {
+        case PMIX_UNDEF:
+            break;
+        case PMIX_BOOL:
+            memcpy(&(v->data.flag), data, 1);
+            break;
+        case PMIX_BYTE:
+            memcpy(&(v->data.byte), data, 1);
+            break;
+        case PMIX_STRING:
+            v->data.string = strdup(data);
+            break;
+        case PMIX_SIZE:
+            memcpy(&(v->data.size), data, sizeof(size_t));
+            break;
+        case PMIX_PID:
+            memcpy(&(v->data.pid), data, sizeof(pid_t));
+            break;
+        case PMIX_INT:
+            memcpy(&(v->data.integer), data, sizeof(int));
+            break;
+        case PMIX_INT8:
+            memcpy(&(v->data.int8), data, 1);
+            break;
+        case PMIX_INT16:
+            memcpy(&(v->data.int16), data, 2);
+            break;
+        case PMIX_INT32:
+            memcpy(&(v->data.int32), data, 4);
+            break;
+        case PMIX_INT64:
+            memcpy(&(v->data.int64), data, 8);
+            break;
+        case PMIX_UINT:
+            memcpy(&(v->data.uint), data, sizeof(int));
+            break;
+        case PMIX_UINT8:
+            memcpy(&(v->data.uint8), data, 1);
+            break;
+        case PMIX_UINT16:
+            memcpy(&(v->data.uint16), data, 2);
+            break;
+        case PMIX_UINT32:
+            memcpy(&(v->data.uint32), data, 4);
+            break;
+        case PMIX_UINT64:
+            memcpy(&(v->data.uint64), data, 8);
+            break;
+        case PMIX_FLOAT:
+            memcpy(&(v->data.fval), data, sizeof(float));
+            break;
+        case PMIX_DOUBLE:
+            memcpy(&(v->data.dval), data, sizeof(double));
+            break;
+        case PMIX_TIMEVAL:
+            memcpy(&(v->data.tv), data, sizeof(struct timeval));
+            break;
+        case PMIX_TIME:
+            memcpy(&(v->data.time), data, sizeof(time_t));
+            break;
+        case PMIX_STATUS:
+            memcpy(&(v->data.status), data, sizeof(pmix_status_t));
+            break;
+        case PMIX_PROC_RANK:
+            memcpy(&(v->data.rank), data, sizeof(pmix_rank_t));
+            break;
+        case PMIX_PROC:
+            PMIX_PROC_CREATE(v->data.proc, 1);
+            if (NULL == v->data.proc) {
+                PMIX_ERROR_LOG(PMIX_ERR_NOMEM);
+                return;
+            }
+            memcpy(v->data.proc, data, sizeof(pmix_proc_t));
+            break;
+        case PMIX_BYTE_OBJECT:
+            bo = (pmix_byte_object_t*)data;
+            v->data.bo.bytes = bo->bytes;
+            memcpy(&(v->data.bo.size), &bo->size, sizeof(size_t));
+            break;
+        case PMIX_PERSIST:
+            memcpy(&(v->data.persist), data, sizeof(pmix_persistence_t));
+            break;
+        case PMIX_SCOPE:
+            memcpy(&(v->data.scope), data, sizeof(pmix_scope_t));
+            break;
+        case PMIX_DATA_RANGE:
+            memcpy(&(v->data.range), data, sizeof(pmix_data_range_t));
+            break;
+        case PMIX_PROC_STATE:
+            memcpy(&(v->data.state), data, sizeof(pmix_proc_state_t));
+            break;
+        case PMIX_PROC_INFO:
+            PMIX_PROC_INFO_CREATE(v->data.pinfo, 1);
+            if (NULL == v->data.pinfo) {
+                PMIX_ERROR_LOG(PMIX_ERR_NOMEM);
+                return;
+            }
+            pi = (pmix_proc_info_t*)data;
+            memcpy(&(v->data.pinfo->proc), &pi->proc, sizeof(pmix_proc_t));
+            if (NULL != pi->hostname) {
+                v->data.pinfo->hostname = strdup(pi->hostname);
+            }
+            if (NULL != pi->executable_name) {
+                v->data.pinfo->executable_name = strdup(pi->executable_name);
+            }
+            memcpy(&(v->data.pinfo->pid), &pi->pid, sizeof(pid_t));
+            memcpy(&(v->data.pinfo->exit_code), &pi->exit_code, sizeof(int));
+            break;
+        case PMIX_POINTER:
+            memcpy(&(v->data.ptr), data, sizeof(void*));
+            break;
+        default:
+            /* silence warnings */
+            PMIX_ERROR_LOG(PMIX_ERR_UNKNOWN_DATA_TYPE);
+            break;
+        }
+    }
+}
+
+pmix_status_t pmix_value_unload(pmix_value_t *kv, void **data,
+                                size_t *sz, pmix_data_type_t type)
+{
+    pmix_status_t rc;
+    pmix_proc_t *pc;
+
+    rc = PMIX_SUCCESS;
+    if (type != kv->type) {
+        rc = PMIX_ERR_TYPE_MISMATCH;
+    } else if (NULL == data ||
+               (NULL == *data && PMIX_STRING != type && PMIX_BYTE_OBJECT != type)) {
+        rc = PMIX_ERR_BAD_PARAM;
+    } else {
+        switch(type) {
+        case PMIX_UNDEF:
+            rc = PMIX_ERR_UNKNOWN_DATA_TYPE;
+            break;
+        case PMIX_BOOL:
+            memcpy(*data, &(kv->data.flag), 1);
+            *sz = 1;
+            break;
+        case PMIX_BYTE:
+            memcpy(*data, &(kv->data.byte), 1);
+            *sz = 1;
+            break;
+        case PMIX_STRING:
+            if (NULL != kv->data.string) {
+                *data = strdup(kv->data.string);
+                *sz = strlen(kv->data.string);
+            }
+            break;
+        case PMIX_SIZE:
+            memcpy(*data, &(kv->data.size), sizeof(size_t));
+            *sz = sizeof(size_t);
+            break;
+        case PMIX_PID:
+            memcpy(*data, &(kv->data.pid), sizeof(pid_t));
+            *sz = sizeof(pid_t);
+            break;
+        case PMIX_INT:
+            memcpy(*data, &(kv->data.integer), sizeof(int));
+            *sz = sizeof(int);
+            break;
+        case PMIX_INT8:
+            memcpy(*data, &(kv->data.int8), 1);
+            *sz = 1;
+            break;
+        case PMIX_INT16:
+            memcpy(*data, &(kv->data.int16), 2);
+            *sz = 2;
+            break;
+        case PMIX_INT32:
+            memcpy(*data, &(kv->data.int32), 4);
+            *sz = 4;
+            break;
+        case PMIX_INT64:
+            memcpy(*data, &(kv->data.int64), 8);
+            *sz = 8;
+            break;
+        case PMIX_UINT:
+            memcpy(*data, &(kv->data.uint), sizeof(int));
+            *sz = sizeof(int);
+            break;
+        case PMIX_UINT8:
+            memcpy(*data, &(kv->data.uint8), 1);
+            *sz = 1;
+            break;
+        case PMIX_UINT16:
+            memcpy(*data, &(kv->data.uint16), 2);
+            *sz = 2;
+            break;
+        case PMIX_UINT32:
+            memcpy(*data, &(kv->data.uint32), 4);
+            *sz = 4;
+            break;
+        case PMIX_UINT64:
+            memcpy(*data, &(kv->data.uint64), 8);
+            *sz = 8;
+            break;
+        case PMIX_FLOAT:
+            memcpy(*data, &(kv->data.fval), sizeof(float));
+            *sz = sizeof(float);
+            break;
+        case PMIX_DOUBLE:
+            memcpy(*data, &(kv->data.dval), sizeof(double));
+            *sz = sizeof(double);
+            break;
+        case PMIX_TIMEVAL:
+            memcpy(*data, &(kv->data.tv), sizeof(struct timeval));
+            *sz = sizeof(struct timeval);
+            break;
+        case PMIX_TIME:
+            memcpy(*data, &(kv->data.time), sizeof(time_t));
+            *sz = sizeof(time_t);
+            break;
+        case PMIX_STATUS:
+            memcpy(*data, &(kv->data.status), sizeof(pmix_status_t));
+            *sz = sizeof(pmix_status_t);
+            break;
+        case PMIX_PROC_RANK:
+            memcpy(*data, &(kv->data.rank), sizeof(pmix_rank_t));
+            *sz = sizeof(pmix_rank_t);
+            break;
+        case PMIX_PROC:
+            PMIX_PROC_CREATE(pc, 1);
+            if (NULL == pc) {
+                PMIX_ERROR_LOG(PMIX_ERR_NOMEM);
+                rc = PMIX_ERR_NOMEM;
+                break;
+            }
+            memcpy(pc, kv->data.proc, sizeof(pmix_proc_t));
+            *sz = sizeof(pmix_proc_t);
+            *data = pc;
+            break;
+        case PMIX_BYTE_OBJECT:
+            if (NULL != kv->data.bo.bytes && 0 < kv->data.bo.size) {
+                *data = kv->data.bo.bytes;
+                *sz = kv->data.bo.size;
+            } else {
+                *data = NULL;
+                *sz = 0;
+            }
+            break;
+        case PMIX_PERSIST:
+            memcpy(*data, &(kv->data.persist), sizeof(pmix_persistence_t));
+            *sz = sizeof(pmix_persistence_t);
+            break;
+        case PMIX_SCOPE:
+            memcpy(*data, &(kv->data.scope), sizeof(pmix_scope_t));
+            *sz = sizeof(pmix_scope_t);
+            break;
+        case PMIX_DATA_RANGE:
+            memcpy(*data, &(kv->data.range), sizeof(pmix_data_range_t));
+            *sz = sizeof(pmix_data_range_t);
+            break;
+        case PMIX_PROC_STATE:
+            memcpy(*data, &(kv->data.state), sizeof(pmix_proc_state_t));
+            *sz = sizeof(pmix_proc_state_t);
+            break;
+        case PMIX_POINTER:
+            memcpy(*data, &(kv->data.ptr), sizeof(void*));
+            *sz = sizeof(void*);
+            break;
+        default:
+            /* silence warnings */
+            rc = PMIX_ERROR;
+            break;
+        }
+    }
+    return rc;
+}
diff --git a/src/buffer_ops/pack.c b/src/buffer_ops/pack.c
new file mode 100644
index 0000000..000be85
--- /dev/null
+++ b/src/buffer_ops/pack.c
@@ -0,0 +1,1046 @@
+/*
+ * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2007 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2011-2013 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2014-2017 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2016      Mellanox Technologies, Inc.
+ *                         All rights reserved.
+ * Copyright (c) 2016      IBM Corporation.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+
+#include <src/include/types.h>
+
+#ifdef HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif
+
+#include "src/util/argv.h"
+#include "src/util/error.h"
+#include "src/util/output.h"
+#include "src/buffer_ops/internal.h"
+
+pmix_status_t pmix_bfrop_pack(pmix_buffer_t *buffer,
+                              const void *src, int32_t num_vals,
+                              pmix_data_type_t type)
+ {
+    pmix_status_t rc;
+
+    /* check for error */
+    if (NULL == buffer) {
+        return PMIX_ERR_BAD_PARAM;
+    }
+
+    /* Pack the number of values */
+    if (PMIX_BFROP_BUFFER_FULLY_DESC == buffer->type) {
+        if (PMIX_SUCCESS != (rc = pmix_bfrop_store_data_type(buffer, PMIX_INT32))) {
+            return rc;
+        }
+    }
+    if (PMIX_SUCCESS != (rc = pmix_bfrop_pack_int32(buffer, &num_vals, 1, PMIX_INT32))) {
+        return rc;
+    }
+
+    /* Pack the value(s) */
+    return pmix_bfrop_pack_buffer(buffer, src, num_vals, type);
+}
+
+pmix_status_t pmix_bfrop_pack_buffer(pmix_buffer_t *buffer,
+                                     const void *src, int32_t num_vals,
+                                     pmix_data_type_t type)
+{
+    pmix_status_t rc;
+    pmix_bfrop_type_info_t *info;
+
+    pmix_output_verbose(20, pmix_globals.debug_output, "pmix_bfrop_pack_buffer( %p, %p, %lu, %d )\n",
+                        (void*)buffer, src, (long unsigned int)num_vals, (int)type);
+
+    /* Pack the declared data type */
+    if (PMIX_BFROP_BUFFER_FULLY_DESC == buffer->type) {
+        if (PMIX_SUCCESS != (rc = pmix_bfrop_store_data_type(buffer, type))) {
+            return rc;
+        }
+    }
+
+    /* Lookup the pack function for this type and call it */
+
+    if (NULL == (info = (pmix_bfrop_type_info_t*)pmix_pointer_array_get_item(&pmix_bfrop_types, type))) {
+        return PMIX_ERR_PACK_FAILURE;
+    }
+
+    return info->odti_pack_fn(buffer, src, num_vals, type);
+}
+
+
+/* PACK FUNCTIONS FOR GENERIC SYSTEM TYPES */
+
+/*
+ * BOOL
+ */
+pmix_status_t pmix_bfrop_pack_bool(pmix_buffer_t *buffer, const void *src,
+                                   int32_t num_vals, pmix_data_type_t type)
+ {
+    uint8_t *dst;
+    int32_t i;
+    bool *s = (bool*)src;
+
+    pmix_output_verbose(20, pmix_globals.debug_output, "pmix_bfrop_pack_bool * %d\n", num_vals);
+    /* check to see if buffer needs extending */
+    if (NULL == (dst = (uint8_t*)pmix_bfrop_buffer_extend(buffer, num_vals))) {
+        return PMIX_ERR_OUT_OF_RESOURCE;
+    }
+
+    /* store the data */
+    for (i=0; i < num_vals; i++) {
+        if (s[i]) {
+            dst[i] = 1;
+        } else {
+            dst[i] = 0;
+        }
+    }
+
+    /* update buffer pointers */
+    buffer->pack_ptr += num_vals;
+    buffer->bytes_used += num_vals;
+
+    return PMIX_SUCCESS;
+}
+
+/*
+ * INT
+ */
+pmix_status_t pmix_bfrop_pack_int(pmix_buffer_t *buffer, const void *src,
+                                  int32_t num_vals, pmix_data_type_t type)
+ {
+    pmix_status_t ret;
+
+    /* System types need to always be described so we can properly
+       unpack them */
+    if (PMIX_SUCCESS != (ret = pmix_bfrop_store_data_type(buffer, BFROP_TYPE_INT))) {
+        return ret;
+    }
+
+    /* Turn around and pack the real type */
+    return pmix_bfrop_pack_buffer(buffer, src, num_vals, BFROP_TYPE_INT);
+}
+
+/*
+ * SIZE_T
+ */
+pmix_status_t pmix_bfrop_pack_sizet(pmix_buffer_t *buffer, const void *src,
+                                    int32_t num_vals, pmix_data_type_t type)
+ {
+    pmix_status_t ret;
+
+    /* System types need to always be described so we can properly
+       unpack them. */
+    if (PMIX_SUCCESS != (ret = pmix_bfrop_store_data_type(buffer, BFROP_TYPE_SIZE_T))) {
+        return ret;
+    }
+
+    return pmix_bfrop_pack_buffer(buffer, src, num_vals, BFROP_TYPE_SIZE_T);
+}
+
+/*
+ * PID_T
+ */
+pmix_status_t pmix_bfrop_pack_pid(pmix_buffer_t *buffer, const void *src,
+                                  int32_t num_vals, pmix_data_type_t type)
+ {
+    pmix_status_t ret;
+
+    /* System types need to always be described so we can properly
+       unpack them. */
+    if (PMIX_SUCCESS != (ret = pmix_bfrop_store_data_type(buffer, BFROP_TYPE_PID_T))) {
+        return ret;
+    }
+
+    /* Turn around and pack the real type */
+    return pmix_bfrop_pack_buffer(buffer, src, num_vals, BFROP_TYPE_PID_T);
+}
+
+
+/* PACK FUNCTIONS FOR NON-GENERIC SYSTEM TYPES */
+
+/*
+ * BYTE, CHAR, INT8
+ */
+pmix_status_t pmix_bfrop_pack_byte(pmix_buffer_t *buffer, const void *src,
+                                   int32_t num_vals, pmix_data_type_t type)
+ {
+    char *dst;
+
+    pmix_output_verbose(20, pmix_globals.debug_output, "pmix_bfrop_pack_byte * %d\n", num_vals);
+    /* check to see if buffer needs extending */
+    if (NULL == (dst = pmix_bfrop_buffer_extend(buffer, num_vals))) {
+        return PMIX_ERR_OUT_OF_RESOURCE;
+    }
+
+    /* store the data */
+    memcpy(dst, src, num_vals);
+
+    /* update buffer pointers */
+    buffer->pack_ptr += num_vals;
+    buffer->bytes_used += num_vals;
+
+    return PMIX_SUCCESS;
+}
+
+/*
+ * INT16
+ */
+pmix_status_t pmix_bfrop_pack_int16(pmix_buffer_t *buffer, const void *src,
+                                    int32_t num_vals, pmix_data_type_t type)
+ {
+    int32_t i;
+    uint16_t tmp, *srctmp = (uint16_t*) src;
+    char *dst;
+
+    pmix_output_verbose(20, pmix_globals.debug_output, "pmix_bfrop_pack_int16 * %d\n", num_vals);
+    /* check to see if buffer needs extending */
+    if (NULL == (dst = pmix_bfrop_buffer_extend(buffer, num_vals*sizeof(tmp)))) {
+        return PMIX_ERR_OUT_OF_RESOURCE;
+    }
+
+    for (i = 0; i < num_vals; ++i) {
+        tmp = pmix_htons(srctmp[i]);
+        memcpy(dst, &tmp, sizeof(tmp));
+        dst += sizeof(tmp);
+    }
+    buffer->pack_ptr += num_vals * sizeof(tmp);
+    buffer->bytes_used += num_vals * sizeof(tmp);
+
+    return PMIX_SUCCESS;
+}
+
+/*
+ * INT32
+ */
+pmix_status_t pmix_bfrop_pack_int32(pmix_buffer_t *buffer, const void *src,
+                                    int32_t num_vals, pmix_data_type_t type)
+ {
+    int32_t i;
+    uint32_t tmp, *srctmp = (uint32_t*) src;
+    char *dst;
+
+    pmix_output_verbose(20, pmix_globals.debug_output, "pmix_bfrop_pack_int32 * %d\n", num_vals);
+    /* check to see if buffer needs extending */
+    if (NULL == (dst = pmix_bfrop_buffer_extend(buffer, num_vals*sizeof(tmp)))) {
+        return PMIX_ERR_OUT_OF_RESOURCE;
+    }
+
+    for (i = 0; i < num_vals; ++i) {
+        tmp = htonl(srctmp[i]);
+        memcpy(dst, &tmp, sizeof(tmp));
+        dst += sizeof(tmp);
+    }
+    buffer->pack_ptr += num_vals * sizeof(tmp);
+    buffer->bytes_used += num_vals * sizeof(tmp);
+
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_bfrop_pack_datatype(pmix_buffer_t *buffer, const void *src,
+                                       int32_t num_vals, pmix_data_type_t type)
+{
+    return pmix_bfrop_pack_int16(buffer, src, num_vals, type);
+}
+
+/*
+ * INT64
+ */
+pmix_status_t pmix_bfrop_pack_int64(pmix_buffer_t *buffer, const void *src,
+                                    int32_t num_vals, pmix_data_type_t type)
+ {
+    int32_t i;
+    uint64_t tmp, tmp2;
+    char *dst;
+    size_t bytes_packed = num_vals * sizeof(tmp);
+
+    pmix_output_verbose(20, pmix_globals.debug_output, "pmix_bfrop_pack_int64 * %d\n", num_vals);
+    /* check to see if buffer needs extending */
+    if (NULL == (dst = pmix_bfrop_buffer_extend(buffer, bytes_packed))) {
+        return PMIX_ERR_OUT_OF_RESOURCE;
+    }
+
+    for (i = 0; i < num_vals; ++i) {
+        memcpy(&tmp2, (char *)src+i*sizeof(uint64_t), sizeof(uint64_t));
+        tmp = pmix_hton64(tmp2);
+        memcpy(dst, &tmp, sizeof(tmp));
+        dst += sizeof(tmp);
+    }
+    buffer->pack_ptr += bytes_packed;
+    buffer->bytes_used += bytes_packed;
+
+    return PMIX_SUCCESS;
+}
+
+/*
+ * STRING
+ */
+pmix_status_t pmix_bfrop_pack_string(pmix_buffer_t *buffer, const void *src,
+                                     int32_t num_vals, pmix_data_type_t type)
+ {
+    pmix_status_t ret = PMIX_SUCCESS;
+    int32_t i, len;
+    char **ssrc = (char**) src;
+
+    for (i = 0; i < num_vals; ++i) {
+        if (NULL == ssrc[i]) {  /* got zero-length string/NULL pointer - store NULL */
+        len = 0;
+        if (PMIX_SUCCESS != (ret = pmix_bfrop_pack_int32(buffer, &len, 1, PMIX_INT32))) {
+            return ret;
+        }
+    } else {
+        len = (int32_t)strlen(ssrc[i]) + 1;
+        if (PMIX_SUCCESS != (ret = pmix_bfrop_pack_int32(buffer, &len, 1, PMIX_INT32))) {
+            return ret;
+        }
+        if (PMIX_SUCCESS != (ret =
+            pmix_bfrop_pack_byte(buffer, ssrc[i], len, PMIX_BYTE))) {
+            return ret;
+    }
+}
+}
+
+return PMIX_SUCCESS;
+}
+
+/* FLOAT */
+pmix_status_t pmix_bfrop_pack_float(pmix_buffer_t *buffer, const void *src,
+                                    int32_t num_vals, pmix_data_type_t type)
+{
+    pmix_status_t ret = PMIX_SUCCESS;
+    int32_t i;
+    float *ssrc = (float*)src;
+    char *convert;
+
+    for (i = 0; i < num_vals; ++i) {
+        if (0 > asprintf(&convert, "%f", ssrc[i])) {
+            return PMIX_ERR_NOMEM;
+        }
+        if (PMIX_SUCCESS != (ret = pmix_bfrop_pack_string(buffer, &convert, 1, PMIX_STRING))) {
+            free(convert);
+            return ret;
+        }
+        free(convert);
+    }
+
+    return PMIX_SUCCESS;
+}
+
+/* DOUBLE */
+pmix_status_t pmix_bfrop_pack_double(pmix_buffer_t *buffer, const void *src,
+                                     int32_t num_vals, pmix_data_type_t type)
+{
+    pmix_status_t ret = PMIX_SUCCESS;
+    int32_t i;
+    double *ssrc = (double*)src;
+    char *convert;
+
+    for (i = 0; i < num_vals; ++i) {
+        if (0 > asprintf(&convert, "%f", ssrc[i])) {
+            return PMIX_ERR_NOMEM;
+        }
+        if (PMIX_SUCCESS != (ret = pmix_bfrop_pack_string(buffer, &convert, 1, PMIX_STRING))) {
+            free(convert);
+            return ret;
+        }
+        free(convert);
+    }
+
+    return PMIX_SUCCESS;
+}
+
+/* TIMEVAL */
+pmix_status_t pmix_bfrop_pack_timeval(pmix_buffer_t *buffer, const void *src,
+                                      int32_t num_vals, pmix_data_type_t type)
+{
+    int64_t tmp[2];
+    pmix_status_t ret = PMIX_SUCCESS;
+    int32_t i;
+    struct timeval *ssrc = (struct timeval *)src;
+
+    for (i = 0; i < num_vals; ++i) {
+        tmp[0] = (int64_t)ssrc[i].tv_sec;
+        tmp[1] = (int64_t)ssrc[i].tv_usec;
+        if (PMIX_SUCCESS != (ret = pmix_bfrop_pack_int64(buffer, tmp, 2, PMIX_INT64))) {
+            return ret;
+        }
+    }
+
+    return PMIX_SUCCESS;
+}
+
+/* TIME */
+pmix_status_t pmix_bfrop_pack_time(pmix_buffer_t *buffer, const void *src,
+                                   int32_t num_vals, pmix_data_type_t type)
+{
+    pmix_status_t ret = PMIX_SUCCESS;
+    int32_t i;
+    time_t *ssrc = (time_t *)src;
+    uint64_t ui64;
+
+    /* time_t is a system-dependent size, so cast it
+     * to uint64_t as a generic safe size
+     */
+     for (i = 0; i < num_vals; ++i) {
+        ui64 = (uint64_t)ssrc[i];
+        if (PMIX_SUCCESS != (ret = pmix_bfrop_pack_int64(buffer, &ui64, 1, PMIX_UINT64))) {
+            return ret;
+        }
+    }
+
+    return PMIX_SUCCESS;
+}
+
+/* STATUS */
+pmix_status_t pmix_bfrop_pack_status(pmix_buffer_t *buffer, const void *src,
+                                     int32_t num_vals, pmix_data_type_t type)
+{
+    pmix_status_t ret = PMIX_SUCCESS;
+    int32_t i;
+    pmix_status_t *ssrc = (pmix_status_t *)src;
+    int32_t status;
+
+    for (i = 0; i < num_vals; ++i) {
+        status = (int32_t)ssrc[i];
+        if (PMIX_SUCCESS != (ret = pmix_bfrop_pack_int32(buffer, &status, 1, PMIX_INT32))) {
+            return ret;
+        }
+    }
+
+    return PMIX_SUCCESS;
+}
+
+
+/* PACK FUNCTIONS FOR GENERIC PMIX TYPES */
+static pmix_status_t pack_val(pmix_buffer_t *buffer,
+                              pmix_value_t *p)
+{
+    pmix_status_t ret;
+
+    switch (p->type) {
+        case PMIX_UNDEF:
+            break;
+        case PMIX_BOOL:
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_pack_buffer(buffer, &p->data.flag, 1, PMIX_BOOL))) {
+                return ret;
+            }
+            break;
+        case PMIX_BYTE:
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_pack_buffer(buffer, &p->data.byte, 1, PMIX_BYTE))) {
+                return ret;
+            }
+            break;
+        case PMIX_STRING:
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_pack_buffer(buffer, &p->data.string, 1, PMIX_STRING))) {
+                return ret;
+            }
+            break;
+        case PMIX_SIZE:
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_pack_buffer(buffer, &p->data.size, 1, PMIX_SIZE))) {
+                return ret;
+            }
+            break;
+        case PMIX_PID:
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_pack_buffer(buffer, &p->data.pid, 1, PMIX_PID))) {
+                return ret;
+            }
+            break;
+        case PMIX_INT:
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_pack_buffer(buffer, &p->data.integer, 1, PMIX_INT))) {
+                return ret;
+            }
+            break;
+        case PMIX_INT8:
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_pack_buffer(buffer, &p->data.int8, 1, PMIX_INT8))) {
+                return ret;
+            }
+            break;
+        case PMIX_INT16:
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_pack_buffer(buffer, &p->data.int16, 1, PMIX_INT16))) {
+                return ret;
+            }
+            break;
+        case PMIX_INT32:
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_pack_buffer(buffer, &p->data.int32, 1, PMIX_INT32))) {
+                return ret;
+            }
+            break;
+        case PMIX_INT64:
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_pack_buffer(buffer, &p->data.int64, 1, PMIX_INT64))) {
+                return ret;
+            }
+            break;
+        case PMIX_UINT:
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_pack_buffer(buffer, &p->data.uint, 1, PMIX_UINT))) {
+                return ret;
+            }
+            break;
+        case PMIX_UINT8:
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_pack_buffer(buffer, &p->data.uint8, 1, PMIX_UINT8))) {
+                return ret;
+            }
+            break;
+        case PMIX_UINT16:
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_pack_buffer(buffer, &p->data.uint16, 1, PMIX_UINT16))) {
+                return ret;
+            }
+            break;
+        case PMIX_UINT32:
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_pack_buffer(buffer, &p->data.uint32, 1, PMIX_UINT32))) {
+                return ret;
+            }
+            break;
+        case PMIX_UINT64:
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_pack_buffer(buffer, &p->data.uint64, 1, PMIX_UINT64))) {
+                return ret;
+            }
+            break;
+        case PMIX_FLOAT:
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_pack_buffer(buffer, &p->data.fval, 1, PMIX_FLOAT))) {
+                return ret;
+            }
+            break;
+        case PMIX_DOUBLE:
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_pack_buffer(buffer, &p->data.dval, 1, PMIX_DOUBLE))) {
+                return ret;
+            }
+            break;
+        case PMIX_TIMEVAL:
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_pack_buffer(buffer, &p->data.tv, 1, PMIX_TIMEVAL))) {
+                return ret;
+            }
+            break;
+        case PMIX_TIME:
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_pack_buffer(buffer, &p->data.time, 1, PMIX_TIME))) {
+                return ret;
+            }
+            break;
+        case PMIX_STATUS:
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_pack_buffer(buffer, &p->data.status, 1, PMIX_STATUS))) {
+                return ret;
+            }
+            break;
+        case PMIX_PROC:
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_pack_buffer(buffer, p->data.proc, 1, PMIX_PROC))) {
+                return ret;
+            }
+            break;
+        case PMIX_PROC_RANK:
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_pack_buffer(buffer, &p->data.rank, 1, PMIX_PROC_RANK))) {
+                return ret;
+            }
+            break;
+        case PMIX_BYTE_OBJECT:
+        case PMIX_COMPRESSED_STRING:
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_pack_buffer(buffer, &p->data.bo, 1, PMIX_BYTE_OBJECT))) {
+                return ret;
+            }
+            break;
+        case PMIX_PERSIST:
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_pack_buffer(buffer, &p->data.persist, 1, PMIX_PERSIST))) {
+                return ret;
+            }
+            break;
+        case PMIX_POINTER:
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_pack_buffer(buffer, &p->data.ptr, 1, PMIX_POINTER))) {
+                return ret;
+            }
+            break;
+        case PMIX_SCOPE:
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_pack_buffer(buffer, &p->data.scope, 1, PMIX_SCOPE))) {
+                return ret;
+            }
+            break;
+        case PMIX_DATA_RANGE:
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_pack_buffer(buffer, &p->data.range, 1, PMIX_DATA_RANGE))) {
+                return ret;
+            }
+            break;
+        case PMIX_PROC_STATE:
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_pack_buffer(buffer, &p->data.state, 1, PMIX_PROC_STATE))) {
+                return ret;
+            }
+            break;
+        case PMIX_PROC_INFO:
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_pack_buffer(buffer, p->data.pinfo, 1, PMIX_PROC_INFO))) {
+                return ret;
+            }
+            break;
+        case PMIX_DATA_ARRAY:
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_pack_buffer(buffer, p->data.darray, 1, PMIX_DATA_ARRAY))) {
+                return ret;
+            }
+            break;
+        case PMIX_QUERY:
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_pack_buffer(buffer, p->data.darray, 1, PMIX_QUERY))) {
+                return ret;
+            }
+            break;
+        /**** DEPRECATED ****/
+        case PMIX_INFO_ARRAY:
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_pack_buffer(buffer, p->data.array, 1, PMIX_INFO_ARRAY))) {
+                return ret;
+            }
+            break;
+        /********************/
+        default:
+        pmix_output(0, "PACK-PMIX-VALUE: UNSUPPORTED TYPE %d", (int)p->type);
+        return PMIX_ERROR;
+    }
+    return PMIX_SUCCESS;
+}
+
+/*
+ * PMIX_VALUE
+ */
+ pmix_status_t pmix_bfrop_pack_value(pmix_buffer_t *buffer, const void *src,
+                                     int32_t num_vals, pmix_data_type_t type)
+ {
+    pmix_value_t *ptr;
+    int32_t i;
+    pmix_status_t ret;
+
+    ptr = (pmix_value_t *) src;
+
+    for (i = 0; i < num_vals; ++i) {
+        /* pack the type */
+        if (PMIX_SUCCESS != (ret = pmix_bfrop_store_data_type(buffer, ptr[i].type))) {
+            return ret;
+        }
+        /* now pack the right field */
+        if (PMIX_SUCCESS != (ret = pack_val(buffer, &ptr[i]))) {
+            return ret;
+        }
+    }
+
+    return PMIX_SUCCESS;
+}
+
+
+pmix_status_t pmix_bfrop_pack_info(pmix_buffer_t *buffer, const void *src,
+                                   int32_t num_vals, pmix_data_type_t type)
+{
+    pmix_info_t *info;
+    int32_t i;
+    pmix_status_t ret;
+    char *foo;
+
+    info = (pmix_info_t *) src;
+
+    for (i = 0; i < num_vals; ++i) {
+        /* pack key */
+        foo = info[i].key;
+        if (PMIX_SUCCESS != (ret = pmix_bfrop_pack_string(buffer, &foo, 1, PMIX_STRING))) {
+            return ret;
+        }
+        /* pack info directives flag */
+        if (PMIX_SUCCESS != (ret = pmix_bfrop_pack_infodirs(buffer, &info[i].flags, 1, PMIX_INFO_DIRECTIVES))) {
+            return ret;
+        }
+        /* pack the type */
+        if (PMIX_SUCCESS != (ret = pmix_bfrop_pack_int(buffer, &info[i].value.type, 1, PMIX_INT))) {
+            return ret;
+        }
+        /* pack value */
+        if (PMIX_SUCCESS != (ret = pack_val(buffer, &info[i].value))) {
+            return ret;
+        }
+    }
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_bfrop_pack_pdata(pmix_buffer_t *buffer, const void *src,
+                                    int32_t num_vals, pmix_data_type_t type)
+{
+    pmix_pdata_t *pdata;
+    int32_t i;
+    pmix_status_t ret;
+    char *foo;
+
+    pdata = (pmix_pdata_t *) src;
+
+    for (i = 0; i < num_vals; ++i) {
+        /* pack the proc */
+        if (PMIX_SUCCESS != (ret = pmix_bfrop_pack_proc(buffer, &pdata[i].proc, 1, PMIX_PROC))) {
+            return ret;
+        }
+        /* pack key */
+        foo = pdata[i].key;
+        if (PMIX_SUCCESS != (ret = pmix_bfrop_pack_string(buffer, &foo, 1, PMIX_STRING))) {
+            return ret;
+        }
+        /* pack the type */
+        if (PMIX_SUCCESS != (ret = pmix_bfrop_pack_int(buffer, &pdata[i].value.type, 1, PMIX_INT))) {
+            return ret;
+        }
+        /* pack value */
+        if (PMIX_SUCCESS != (ret = pack_val(buffer, &pdata[i].value))) {
+            return ret;
+        }
+    }
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_bfrop_pack_buf(pmix_buffer_t *buffer, const void *src,
+                                  int32_t num_vals, pmix_data_type_t type)
+{
+    pmix_buffer_t **ptr;
+    int32_t i;
+    pmix_status_t ret;
+
+    ptr = (pmix_buffer_t **) src;
+
+    for (i = 0; i < num_vals; ++i) {
+        /* pack the number of bytes */
+        if (PMIX_SUCCESS != (ret = pmix_bfrop_pack_sizet(buffer, &ptr[i]->bytes_used, 1, PMIX_SIZE))) {
+            return ret;
+        }
+        /* pack the bytes */
+        if (0 < ptr[i]->bytes_used) {
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_pack_byte(buffer, ptr[i]->base_ptr, ptr[i]->bytes_used, PMIX_BYTE))) {
+                return ret;
+            }
+        }
+    }
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_bfrop_pack_proc(pmix_buffer_t *buffer, const void *src,
+                                   int32_t num_vals, pmix_data_type_t type)
+{
+    pmix_proc_t *proc;
+    int32_t i;
+    pmix_status_t ret;
+
+    proc = (pmix_proc_t *) src;
+
+    for (i = 0; i < num_vals; ++i) {
+        char *ptr = proc[i].nspace;
+        if (PMIX_SUCCESS != (ret = pmix_bfrop_pack_string(buffer, &ptr, 1, PMIX_STRING))) {
+            return ret;
+        }
+        if (PMIX_SUCCESS != (ret = pmix_bfrop_pack_rank(buffer, &proc[i].rank, 1, PMIX_PROC_RANK))) {
+            return ret;
+        }
+    }
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_bfrop_pack_app(pmix_buffer_t *buffer, const void *src,
+                                  int32_t num_vals, pmix_data_type_t type)
+{
+    pmix_app_t *app;
+    int32_t i, j, nvals;
+    pmix_status_t ret;
+
+    app = (pmix_app_t *) src;
+
+    for (i = 0; i < num_vals; ++i) {
+        if (PMIX_SUCCESS != (ret = pmix_bfrop_pack_string(buffer, &app[i].cmd, 1, PMIX_STRING))) {
+            return ret;
+        }
+        /* argv */
+        nvals = pmix_argv_count(app[i].argv);
+        if (PMIX_SUCCESS != (ret = pmix_bfrop_pack_int(buffer, &nvals, 1, PMIX_INT32))) {
+            return ret;
+        }
+        for (j=0; j < nvals; j++) {
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_pack_string(buffer, &app[i].argv[j], 1, PMIX_STRING))) {
+                return ret;
+            }
+        }
+        /* env */
+        nvals = pmix_argv_count(app[i].env);
+        if (PMIX_SUCCESS != (ret = pmix_bfrop_pack_int32(buffer, &nvals, 1, PMIX_INT32))) {
+            return ret;
+        }
+        for (j=0; j < nvals; j++) {
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_pack_string(buffer, &app[i].env[j], 1, PMIX_STRING))) {
+                return ret;
+            }
+        }
+        /* cwd */
+        if (PMIX_SUCCESS != (ret = pmix_bfrop_pack_string(buffer, &app[i].cwd, 1, PMIX_STRING))) {
+            return ret;
+        }
+        /* maxprocs */
+        if (PMIX_SUCCESS != (ret = pmix_bfrop_pack_int(buffer, &app[i].maxprocs, 1, PMIX_INT))) {
+            return ret;
+        }
+        /* info array */
+        if (PMIX_SUCCESS != (ret = pmix_bfrop_pack_sizet(buffer, &app[i].ninfo, 1, PMIX_SIZE))) {
+            return ret;
+        }
+        if (0 < app[i].ninfo) {
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_pack_info(buffer, app[i].info, app[i].ninfo, PMIX_INFO))) {
+                return ret;
+            }
+        }
+    }
+    return PMIX_SUCCESS;
+}
+
+
+pmix_status_t pmix_bfrop_pack_kval(pmix_buffer_t *buffer, const void *src,
+                                   int32_t num_vals, pmix_data_type_t type)
+{
+    pmix_kval_t *ptr;
+    int32_t i;
+    pmix_status_t ret;
+    char *st;
+
+    ptr = (pmix_kval_t *) src;
+
+    for (i = 0; i < num_vals; ++i) {
+        /* pack the key */
+        st = ptr[i].key;
+        if (PMIX_SUCCESS != (ret = pmix_bfrop_pack_string(buffer, &st, 1, PMIX_STRING))) {
+            return ret;
+        }
+        /* pack the value */
+        if (PMIX_SUCCESS != (ret = pmix_bfrop_pack_value(buffer, ptr[i].value, 1, PMIX_VALUE))) {
+            return ret;
+        }
+    }
+
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_bfrop_pack_modex(pmix_buffer_t *buffer, const void *src,
+                                    int32_t num_vals, pmix_data_type_t type)
+{
+    pmix_modex_data_t *ptr;
+    int32_t i;
+    pmix_status_t ret;
+
+    ptr = (pmix_modex_data_t *) src;
+
+    for (i = 0; i < num_vals; ++i) {
+        if (PMIX_SUCCESS != (ret = pmix_bfrop_pack_sizet(buffer, &ptr[i].size, 1, PMIX_SIZE))) {
+            return ret;
+        }
+        if( 0 < ptr[i].size){
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_pack_byte(buffer, ptr[i].blob, ptr[i].size, PMIX_UINT8))) {
+                return ret;
+            }
+        }
+    }
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_bfrop_pack_persist(pmix_buffer_t *buffer, const void *src,
+                                      int32_t num_vals, pmix_data_type_t type)
+{
+    return pmix_bfrop_pack_byte(buffer, src, num_vals, PMIX_UINT8);
+}
+
+pmix_status_t pmix_bfrop_pack_scope(pmix_buffer_t *buffer, const void *src,
+                                    int32_t num_vals, pmix_data_type_t type)
+{
+    return pmix_bfrop_pack_byte(buffer, src, num_vals, PMIX_UINT8);
+}
+
+pmix_status_t pmix_bfrop_pack_range(pmix_buffer_t *buffer, const void *src,
+                                    int32_t num_vals, pmix_data_type_t type)
+{
+    return pmix_bfrop_pack_byte(buffer, src, num_vals, PMIX_UINT8);
+}
+
+pmix_status_t pmix_bfrop_pack_cmd(pmix_buffer_t *buffer, const void *src,
+                                  int32_t num_vals, pmix_data_type_t type)
+{
+    return pmix_bfrop_pack_byte(buffer, src, num_vals, PMIX_UINT8);
+}
+
+pmix_status_t pmix_bfrop_pack_infodirs(pmix_buffer_t *buffer, const void *src,
+                                       int32_t num_vals, pmix_data_type_t type)
+{
+    return pmix_bfrop_pack_int32(buffer, src, num_vals, PMIX_UINT32);
+}
+
+pmix_status_t pmix_bfrop_pack_bo(pmix_buffer_t *buffer, const void *src,
+                                 int32_t num_vals, pmix_data_type_t type)
+{
+    pmix_status_t ret;
+    int i;
+    pmix_byte_object_t *bo;
+
+    bo = (pmix_byte_object_t*)src;
+    for (i=0; i < num_vals; i++) {
+        if (PMIX_SUCCESS != (ret = pmix_bfrop_pack_sizet(buffer, &bo[i].size, 1, PMIX_SIZE))) {
+            return ret;
+        }
+        if (0 < bo[i].size) {
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_pack_byte(buffer, bo[i].bytes, bo[i].size, PMIX_BYTE))) {
+                return ret;
+            }
+        }
+    }
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_bfrop_pack_ptr(pmix_buffer_t *buffer, const void *src,
+                        int32_t num_vals, pmix_data_type_t type)
+{
+    uint8_t foo=1;
+    /* it obviously makes no sense to pack a pointer and
+     * send it somewhere else, so we just pack a sentinel */
+    return pmix_bfrop_pack_byte(buffer, &foo, 1, PMIX_UINT8);
+}
+
+pmix_status_t pmix_bfrop_pack_pstate(pmix_buffer_t *buffer, const void *src,
+                                     int32_t num_vals, pmix_data_type_t type)
+{
+    return pmix_bfrop_pack_byte(buffer, src, num_vals, PMIX_UINT8);
+}
+
+pmix_status_t pmix_bfrop_pack_pinfo(pmix_buffer_t *buffer, const void *src,
+                                    int32_t num_vals, pmix_data_type_t type)
+{
+    pmix_proc_info_t *pinfo = (pmix_proc_info_t*)src;
+    pmix_status_t ret;
+    int32_t i;
+
+    for (i=0; i < num_vals; i++) {
+        /* pack the proc identifier */
+        if (PMIX_SUCCESS != (ret = pmix_bfrop_pack_proc(buffer, &pinfo[i].proc, 1, PMIX_PROC))) {
+            return ret;
+        }
+        /* pack the hostname and exec */
+        if (PMIX_SUCCESS != (ret = pmix_bfrop_pack_string(buffer, &pinfo[i].hostname, 1, PMIX_STRING))) {
+            return ret;
+        }
+        if (PMIX_SUCCESS != (ret = pmix_bfrop_pack_string(buffer, &pinfo[i].executable_name, 1, PMIX_STRING))) {
+            return ret;
+        }
+        /* pack the pid and state */
+        if (PMIX_SUCCESS != (ret = pmix_bfrop_pack_pid(buffer, &pinfo[i].pid, 1, PMIX_PID))) {
+            return ret;
+        }
+        if (PMIX_SUCCESS != (ret = pmix_bfrop_pack_pstate(buffer, &pinfo[i].state, 1, PMIX_PROC_STATE))) {
+            return ret;
+        }
+    }
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_bfrop_pack_darray(pmix_buffer_t *buffer, const void *src,
+                                    int32_t num_vals, pmix_data_type_t type)
+{
+    pmix_data_array_t *p = (pmix_data_array_t*)src;
+    pmix_status_t ret;
+    int32_t i;
+
+    for (i=0; i < num_vals; i++) {
+        /* pack the actual type in the array */
+        if (PMIX_SUCCESS != (ret = pmix_bfrop_pack_datatype(buffer, &p[i].type, 1, PMIX_DATA_TYPE))) {
+            return ret;
+        }
+        /* pack the number of array elements */
+        if (PMIX_SUCCESS != (ret = pmix_bfrop_pack_sizet(buffer, &p[i].size, 1, PMIX_SIZE))) {
+            return ret;
+        }
+        if (0 == p[i].size || PMIX_UNDEF == p[i].type) {
+            /* nothing left to do */
+            continue;
+        }
+        /* pack the actual elements */
+        if (PMIX_SUCCESS != (ret = pmix_bfrop_pack_buffer(buffer, p[i].array, p[i].size, p[i].type))) {
+            return ret;
+        }
+    }
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_bfrop_pack_rank(pmix_buffer_t *buffer, const void *src,
+                                     int32_t num_vals, pmix_data_type_t type)
+{
+    return pmix_bfrop_pack_int32(buffer, src, num_vals, PMIX_UINT32);
+}
+
+pmix_status_t pmix_bfrop_pack_query(pmix_buffer_t *buffer, const void *src,
+                                    int32_t num_vals, pmix_data_type_t type)
+{
+    pmix_query_t *pq = (pmix_query_t*)src;
+    pmix_status_t ret;
+    int32_t i;
+    int32_t nkeys;
+
+    for (i=0; i < num_vals; i++) {
+        /* pack the number of keys */
+        nkeys = pmix_argv_count(pq[i].keys);
+        if (PMIX_SUCCESS != (ret = pmix_bfrop_pack_int32(buffer, &nkeys, 1, PMIX_INT32))) {
+            return ret;
+        }
+        if (0 < nkeys) {
+            /* pack the keys */
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_pack_string(buffer, pq[i].keys, nkeys, PMIX_STRING))) {
+                return ret;
+            }
+        }
+        /* pack the number of qualifiers */
+        if (PMIX_SUCCESS != (ret = pmix_bfrop_pack_sizet(buffer, &pq[i].nqual, 1, PMIX_SIZE))) {
+            return ret;
+        }
+        if (0 < pq[i].nqual) {
+            /* pack any provided qualifiers */
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_pack_info(buffer, pq[i].qualifiers, pq[i].nqual, PMIX_INFO))) {
+                return ret;
+            }
+        }
+    }
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_bfrop_pack_alloc_directive(pmix_buffer_t *buffer, const void *src,
+                                              int32_t num_vals, pmix_data_type_t type)
+{
+    return pmix_bfrop_pack_byte(buffer, src, num_vals, PMIX_UINT8);
+}
+
+
+/**** DEPRECATED ****/
+pmix_status_t pmix_bfrop_pack_array(pmix_buffer_t *buffer, const void *src,
+                          int32_t num_vals, pmix_data_type_t type)
+{
+    pmix_info_array_t *ptr;
+    int32_t i;
+    pmix_status_t ret;
+
+    ptr = (pmix_info_array_t *) src;
+
+    for (i = 0; i < num_vals; ++i) {
+        /* pack the size */
+        if (PMIX_SUCCESS != (ret = pmix_bfrop_pack_sizet(buffer, &ptr[i].size, 1, PMIX_SIZE))) {
+            return ret;
+        }
+        if (0 < ptr[i].size) {
+            /* pack the values */
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_pack_info(buffer, ptr[i].array, ptr[i].size, PMIX_INFO))) {
+                return ret;
+            }
+        }
+    }
+
+    return PMIX_SUCCESS;
+}
+/********************/
diff --git a/src/buffer_ops/print.c b/src/buffer_ops/print.c
new file mode 100644
index 0000000..e126bb1
--- /dev/null
+++ b/src/buffer_ops/print.c
@@ -0,0 +1,1493 @@
+/*
+ * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2006 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2012      Los Alamos National Security, Inc.  All rights reserved.
+ * Copyright (c) 2014-2017 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2016      Mellanox Technologies, Inc.
+ *                         All rights reserved.
+ * Copyright (c) 2016      IBM Corporation.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+
+#include <src/include/pmix_stdint.h>
+
+#include <stdio.h>
+#ifdef HAVE_TIME_H
+#include <time.h>
+#endif
+
+#include "src/util/error.h"
+#include "src/include/pmix_globals.h"
+#include "src/buffer_ops/internal.h"
+
+ pmix_status_t pmix_bfrop_print(char **output, char *prefix, void *src, pmix_data_type_t type)
+ {
+    pmix_bfrop_type_info_t *info;
+
+    /* check for error */
+    if (NULL == output) {
+        return PMIX_ERR_BAD_PARAM;
+    }
+
+    /* Lookup the print function for this type and call it */
+
+    if(NULL == (info = (pmix_bfrop_type_info_t*)pmix_pointer_array_get_item(&pmix_bfrop_types, type))) {
+        return PMIX_ERR_UNKNOWN_DATA_TYPE;
+    }
+
+    return info->odti_print_fn(output, prefix, src, type);
+}
+
+/*
+ * STANDARD PRINT FUNCTIONS FOR SYSTEM TYPES
+ */
+ pmix_status_t pmix_bfrop_print_bool(char **output, char *prefix, bool *src, pmix_data_type_t type)
+ {
+    char *prefx;
+
+    /* deal with NULL prefix */
+    if (NULL == prefix) {
+        if (0 > asprintf(&prefx, " ")) {
+            return PMIX_ERR_NOMEM;
+        }
+    }
+    else {
+        prefx = prefix;
+    }
+
+    /* if src is NULL, just print data type and return */
+    if (NULL == src) {
+        if (0 > asprintf(output, "%sData type: PMIX_BOOL\tValue: NULL pointer", prefx)) {
+            return PMIX_ERR_NOMEM;
+        }
+        if (prefx != prefix) {
+            free(prefx);
+        }
+        return PMIX_SUCCESS;
+    }
+
+    if (0 > asprintf(output, "%sData type: PMIX_BOOL\tValue: %s", prefix,
+                     (*src) ? "TRUE" : "FALSE")) {
+        return PMIX_ERR_NOMEM;
+}
+if (prefx != prefix) {
+    free(prefx);
+}
+
+return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_bfrop_print_byte(char **output, char *prefix, uint8_t *src, pmix_data_type_t type)
+{
+    char *prefx;
+
+    /* deal with NULL prefix */
+    if (NULL == prefix) {
+        if (0 > asprintf(&prefx, " ")) {
+            return PMIX_ERR_NOMEM;
+        }
+    } else {
+        prefx = prefix;
+    }
+
+    /* if src is NULL, just print data type and return */
+    if (NULL == src) {
+        if (0 > asprintf(output, "%sData type: PMIX_BYTE\tValue: NULL pointer", prefx)) {
+            return PMIX_ERR_NOMEM;
+        }
+        if (prefx != prefix) {
+            free(prefx);
+        }
+        return PMIX_SUCCESS;
+    }
+
+    if (0 > asprintf(output, "%sData type: PMIX_BYTE\tValue: %x", prefix, *src)) {
+        return PMIX_ERR_NOMEM;
+    }
+    if (prefx != prefix) {
+        free(prefx);
+    }
+
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_bfrop_print_string(char **output, char *prefix, char *src, pmix_data_type_t type)
+{
+    char *prefx;
+
+    /* deal with NULL prefix */
+    if (NULL == prefix) {
+        if (0 > asprintf(&prefx, " ")) {
+            return PMIX_ERR_NOMEM;
+        }
+    } else {
+        prefx = prefix;
+    }
+
+    /* if src is NULL, just print data type and return */
+    if (NULL == src) {
+        if (0 > asprintf(output, "%sData type: PMIX_STRING\tValue: NULL pointer", prefx)) {
+            return PMIX_ERR_NOMEM;
+        }
+        if (prefx != prefix) {
+            free(prefx);
+        }
+        return PMIX_SUCCESS;
+    }
+
+    if (0 > asprintf(output, "%sData type: PMIX_STRING\tValue: %s", prefx, src)) {
+        return PMIX_ERR_NOMEM;
+    }
+    if (prefx != prefix) {
+        free(prefx);
+    }
+
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_bfrop_print_size(char **output, char *prefix, size_t *src, pmix_data_type_t type)
+{
+    char *prefx;
+
+    /* deal with NULL prefix */
+    if (NULL == prefix) {
+        if (0 > asprintf(&prefx, " ")) {
+            return PMIX_ERR_NOMEM;
+        }
+    } else {
+        prefx = prefix;
+    }
+
+    /* if src is NULL, just print data type and return */
+    if (NULL == src) {
+        if (0 > asprintf(output, "%sData type: PMIX_SIZE\tValue: NULL pointer", prefx)) {
+            return PMIX_ERR_NOMEM;
+        }
+        if (prefx != prefix) {
+            free(prefx);
+        }
+        return PMIX_SUCCESS;
+    }
+
+    if (0 > asprintf(output, "%sData type: PMIX_SIZE\tValue: %lu", prefx, (unsigned long) *src)) {
+        return PMIX_ERR_NOMEM;
+    }
+    if (prefx != prefix) {
+        free(prefx);
+    }
+
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_bfrop_print_pid(char **output, char *prefix, pid_t *src, pmix_data_type_t type)
+{
+    char *prefx;
+
+    /* deal with NULL prefix */
+    if (NULL == prefix) {
+        if (0 > asprintf(&prefx, " ")) {
+            return PMIX_ERR_NOMEM;
+        }
+    } else {
+        prefx = prefix;
+    }
+
+    /* if src is NULL, just print data type and return */
+    if (NULL == src) {
+        if (0 > asprintf(output, "%sData type: PMIX_PID\tValue: NULL pointer", prefx)) {
+            return PMIX_ERR_NOMEM;
+        }
+        if (prefx != prefix) {
+            free(prefx);
+        }
+        return PMIX_SUCCESS;
+    }
+
+    if (0 > asprintf(output, "%sData type: PMIX_PID\tValue: %lu", prefx, (unsigned long) *src)) {
+        return PMIX_ERR_NOMEM;
+    }
+    if (prefx != prefix) {
+        free(prefx);
+    }
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_bfrop_print_int(char **output, char *prefix, int *src, pmix_data_type_t type)
+{
+    char *prefx;
+
+    /* deal with NULL prefix */
+    if (NULL == prefix) {
+        if (0 > asprintf(&prefx, " ")) {
+            return PMIX_ERR_NOMEM;
+        }
+    } else {
+        prefx = prefix;
+    }
+
+    /* if src is NULL, just print data type and return */
+    if (NULL == src) {
+        if (0 > asprintf(output, "%sData type: PMIX_INT\tValue: NULL pointer", prefx)) {
+            return PMIX_ERR_NOMEM;
+        }
+        if (prefx != prefix) {
+            free(prefx);
+        }
+        return PMIX_SUCCESS;
+    }
+
+    if (0 > asprintf(output, "%sData type: PMIX_INT\tValue: %ld", prefx, (long) *src)) {
+        return PMIX_ERR_NOMEM;
+    }
+    if (prefx != prefix) {
+        free(prefx);
+    }
+
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_bfrop_print_uint(char **output, char *prefix, uint *src, pmix_data_type_t type)
+{
+    char *prefx;
+
+    /* deal with NULL prefix */
+    if (NULL == prefix) {
+        if (0 > asprintf(&prefx, " ")) {
+            return PMIX_ERR_NOMEM;
+        }
+    } else {
+        prefx = prefix;
+    }
+
+    /* if src is NULL, just print data type and return */
+    if (NULL == src) {
+        if (0 > asprintf(output, "%sData type: PMIX_UINT\tValue: NULL pointer", prefx)) {
+            return PMIX_ERR_NOMEM;
+        }
+        if (prefx != prefix) {
+            free(prefx);
+        }
+        return PMIX_SUCCESS;
+    }
+
+    if (0 > asprintf(output, "%sData type: PMIX_UINT\tValue: %lu", prefx, (unsigned long) *src)) {
+        return PMIX_ERR_NOMEM;
+    }
+    if (prefx != prefix) {
+        free(prefx);
+    }
+
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_bfrop_print_uint8(char **output, char *prefix, uint8_t *src, pmix_data_type_t type)
+{
+    char *prefx;
+
+    /* deal with NULL prefix */
+    if (NULL == prefix) {
+        if (0 > asprintf(&prefx, " ")) {
+            return PMIX_ERR_NOMEM;
+        }
+    } else {
+        prefx = prefix;
+    }
+
+    /* if src is NULL, just print data type and return */
+    if (NULL == src) {
+        if (0 > asprintf(output, "%sData type: PMIX_UINT8\tValue: NULL pointer", prefx)) {
+            return PMIX_ERR_NOMEM;
+        }
+        if (prefx != prefix) {
+            free(prefx);
+        }
+        return PMIX_SUCCESS;
+    }
+
+    if (0 > asprintf(output, "%sData type: PMIX_UINT8\tValue: %u", prefx, (unsigned int) *src)) {
+        return PMIX_ERR_NOMEM;
+    }
+    if (prefx != prefix) {
+        free(prefx);
+    }
+
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_bfrop_print_uint16(char **output, char *prefix, uint16_t *src, pmix_data_type_t type)
+{
+    char *prefx;
+
+    /* deal with NULL prefix */
+    if (NULL == prefix) {
+        if (0 > asprintf(&prefx, " ")) {
+            return PMIX_ERR_NOMEM;
+        }
+    } else {
+        prefx = prefix;
+    }
+
+    /* if src is NULL, just print data type and return */
+    if (NULL == src) {
+        if (0 > asprintf(output, "%sData type: PMIX_UINT16\tValue: NULL pointer", prefx)) {
+            return PMIX_ERR_NOMEM;
+        }
+        if (prefx != prefix) {
+            free(prefx);
+        }
+        return PMIX_SUCCESS;
+    }
+
+    if (0 > asprintf(output, "%sData type: PMIX_UINT16\tValue: %u", prefx, (unsigned int) *src)) {
+        return PMIX_ERR_NOMEM;
+    }
+    if (prefx != prefix) {
+        free(prefx);
+    }
+
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_bfrop_print_uint32(char **output, char *prefix,
+                                      uint32_t *src, pmix_data_type_t type)
+{
+    char *prefx;
+
+    /* deal with NULL prefix */
+    if (NULL == prefix) {
+        if (0 > asprintf(&prefx, " ")) {
+            return PMIX_ERR_NOMEM;
+        }
+    } else {
+        prefx = prefix;
+    }
+
+    /* if src is NULL, just print data type and return */
+    if (NULL == src) {
+        if (0 > asprintf(output, "%sData type: PMIX_UINT32\tValue: NULL pointer", prefx)) {
+            return PMIX_ERR_NOMEM;
+        }
+        if (prefx != prefix) {
+            free(prefx);
+        }
+        return PMIX_SUCCESS;
+    }
+
+    if (0 > asprintf(output, "%sData type: PMIX_UINT32\tValue: %u", prefx, (unsigned int) *src)) {
+        return PMIX_ERR_NOMEM;
+    }
+    if (prefx != prefix) {
+        free(prefx);
+    }
+
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_bfrop_print_int8(char **output, char *prefix,
+                                    int8_t *src, pmix_data_type_t type)
+{
+    char *prefx;
+
+    /* deal with NULL prefix */
+    if (NULL == prefix) {
+        if (0 > asprintf(&prefx, " ")) {
+            return PMIX_ERR_NOMEM;
+        }
+    } else {
+        prefx = prefix;
+    }
+
+    /* if src is NULL, just print data type and return */
+    if (NULL == src) {
+        if (0 > asprintf(output, "%sData type: PMIX_INT8\tValue: NULL pointer", prefx)) {
+            return PMIX_ERR_NOMEM;
+        }
+        if (prefx != prefix) {
+            free(prefx);
+        }
+        return PMIX_SUCCESS;
+    }
+
+    if (0 > asprintf(output, "%sData type: PMIX_INT8\tValue: %d", prefx, (int) *src)) {
+        return PMIX_ERR_NOMEM;
+    }
+    if (prefx != prefix) {
+        free(prefx);
+    }
+
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_bfrop_print_int16(char **output, char *prefix,
+                                     int16_t *src, pmix_data_type_t type)
+{
+    char *prefx;
+
+    /* deal with NULL prefix */
+    if (NULL == prefix) {
+        if (0 > asprintf(&prefx, " ")) {
+            return PMIX_ERR_NOMEM;
+        }
+    } else {
+        prefx = prefix;
+    }
+
+    /* if src is NULL, just print data type and return */
+    if (NULL == src) {
+        if (0 > asprintf(output, "%sData type: PMIX_INT16\tValue: NULL pointer", prefx)) {
+            return PMIX_ERR_NOMEM;
+        }
+        if (prefx != prefix) {
+            free(prefx);
+        }
+        return PMIX_SUCCESS;
+    }
+
+    if (0 > asprintf(output, "%sData type: PMIX_INT16\tValue: %d", prefx, (int) *src)) {
+        return PMIX_ERR_NOMEM;
+    }
+    if (prefx != prefix) {
+        free(prefx);
+    }
+
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_bfrop_print_int32(char **output, char *prefix, int32_t *src, pmix_data_type_t type)
+{
+    char *prefx;
+
+    /* deal with NULL prefix */
+    if (NULL == prefix) {
+        if (0 > asprintf(&prefx, " ")) {
+            return PMIX_ERR_NOMEM;
+        }
+    } else {
+        prefx = prefix;
+    }
+
+    /* if src is NULL, just print data type and return */
+    if (NULL == src) {
+        if (0 > asprintf(output, "%sData type: PMIX_INT32\tValue: NULL pointer", prefx)) {
+            return PMIX_ERR_NOMEM;
+        }
+        if (prefx != prefix) {
+            free(prefx);
+        }
+        return PMIX_SUCCESS;
+    }
+
+    if (0 > asprintf(output, "%sData type: PMIX_INT32\tValue: %d", prefx, (int) *src)) {
+        return PMIX_ERR_NOMEM;
+    }
+    if (prefx != prefix) {
+        free(prefx);
+    }
+
+    return PMIX_SUCCESS;
+}
+pmix_status_t pmix_bfrop_print_uint64(char **output, char *prefix,
+                                      uint64_t *src,
+                                      pmix_data_type_t type)
+{
+    char *prefx;
+
+    /* deal with NULL prefix */
+    if (NULL == prefix) {
+        if (0 > asprintf(&prefx, " ")) {
+            return PMIX_ERR_NOMEM;
+        }
+    } else {
+        prefx = prefix;
+    }
+
+    /* if src is NULL, just print data type and return */
+    if (NULL == src) {
+        if (0 > asprintf(output, "%sData type: PMIX_UINT64\tValue: NULL pointer", prefx)) {
+            return PMIX_ERR_NOMEM;
+        }
+        if (prefx != prefix) {
+            free(prefx);
+        }
+        return PMIX_SUCCESS;
+    }
+
+    if (0 > asprintf(output, "%sData type: PMIX_UINT64\tValue: %lu", prefx, (unsigned long) *src)) {
+        return PMIX_ERR_NOMEM;
+    }
+    if (prefx != prefix) {
+        free(prefx);
+    }
+
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_bfrop_print_int64(char **output, char *prefix,
+                                     int64_t *src,
+                                     pmix_data_type_t type)
+{
+    char *prefx;
+
+    /* deal with NULL prefix */
+    if (NULL == prefix) {
+        if (0 > asprintf(&prefx, " ")) {
+            return PMIX_ERR_NOMEM;
+        }
+    } else {
+        prefx = prefix;
+    }
+
+    /* if src is NULL, just print data type and return */
+    if (NULL == src) {
+        if (0 > asprintf(output, "%sData type: PMIX_INT64\tValue: NULL pointer", prefx)) {
+            return PMIX_ERR_NOMEM;
+        }
+        if (prefx != prefix) {
+            free(prefx);
+        }
+        return PMIX_SUCCESS;
+    }
+
+    if (0 > asprintf(output, "%sData type: PMIX_INT64\tValue: %ld", prefx, (long) *src)) {
+        return PMIX_ERR_NOMEM;
+    }
+    if (prefx != prefix) {
+        free(prefx);
+    }
+
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_bfrop_print_float(char **output, char *prefix,
+                                     float *src, pmix_data_type_t type)
+{
+    char *prefx;
+
+    /* deal with NULL prefix */
+    if (NULL == prefix) {
+        if (0 > asprintf(&prefx, " ")) {
+            return PMIX_ERR_NOMEM;
+        }
+    } else {
+        prefx = prefix;
+    }
+
+    /* if src is NULL, just print data type and return */
+    if (NULL == src) {
+        if (0 > asprintf(output, "%sData type: PMIX_FLOAT\tValue: NULL pointer", prefx)) {
+            return PMIX_ERR_NOMEM;
+        }
+        if (prefx != prefix) {
+            free(prefx);
+        }
+        return PMIX_SUCCESS;
+    }
+
+    if (0 > asprintf(output, "%sData type: PMIX_FLOAT\tValue: %f", prefx, *src)) {
+        return PMIX_ERR_NOMEM;
+    }
+    if (prefx != prefix) {
+        free(prefx);
+    }
+
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_bfrop_print_double(char **output, char *prefix,
+                                      double *src, pmix_data_type_t type)
+{
+    char *prefx;
+
+    /* deal with NULL prefix */
+    if (NULL == prefix) {
+        if (0 > asprintf(&prefx, " ")) {
+            return PMIX_ERR_NOMEM;
+        }
+    } else {
+        prefx = prefix;
+    }
+
+    /* if src is NULL, just print data type and return */
+    if (NULL == src) {
+        if (0 > asprintf(output, "%sData type: PMIX_DOUBLE\tValue: NULL pointer", prefx)) {
+            return PMIX_ERR_NOMEM;
+        }
+        if (prefx != prefix) {
+            free(prefx);
+        }
+        return PMIX_SUCCESS;
+    }
+
+    if (0 > asprintf(output, "%sData type: PMIX_DOUBLE\tValue: %f", prefx, *src)) {
+        return PMIX_ERR_NOMEM;
+    }
+    if (prefx != prefix) {
+        free(prefx);
+    }
+
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_bfrop_print_time(char **output, char *prefix,
+                                    time_t *src, pmix_data_type_t type)
+{
+    char *prefx;
+    char *t;
+
+    /* deal with NULL prefix */
+    if (NULL == prefix) {
+        if (0 > asprintf(&prefx, " ")) {
+            return PMIX_ERR_NOMEM;
+        }
+    } else {
+        prefx = prefix;
+    }
+
+    /* if src is NULL, just print data type and return */
+    if (NULL == src) {
+        if (0 > asprintf(output, "%sData type: PMIX_TIME\tValue: NULL pointer", prefx)) {
+            return PMIX_ERR_NOMEM;
+        }
+        if (prefx != prefix) {
+            free(prefx);
+        }
+        return PMIX_SUCCESS;
+    }
+
+    t = ctime(src);
+    t[strlen(t)-1] = '\0';  // remove trailing newline
+
+    if (0 > asprintf(output, "%sData type: PMIX_TIME\tValue: %s", prefx, t)) {
+        return PMIX_ERR_NOMEM;
+    }
+    if (prefx != prefix) {
+        free(prefx);
+    }
+
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_bfrop_print_timeval(char **output, char *prefix,
+                                       struct timeval *src, pmix_data_type_t type)
+{
+    char *prefx;
+
+    /* deal with NULL prefix */
+    if (NULL == prefix) {
+        if (0 > asprintf(&prefx, " ")) {
+            return PMIX_ERR_NOMEM;
+        }
+    } else {
+        prefx = prefix;
+    }
+
+    /* if src is NULL, just print data type and return */
+    if (NULL == src) {
+        if (0 > asprintf(output, "%sData type: PMIX_TIMEVAL\tValue: NULL pointer", prefx)) {
+            return PMIX_ERR_NOMEM;
+        }
+        if (prefx != prefix) {
+            free(prefx);
+        }
+        return PMIX_SUCCESS;
+    }
+
+    if (0 > asprintf(output, "%sData type: PMIX_TIMEVAL\tValue: %ld.%06ld", prefx,
+                     (long)src->tv_sec, (long)src->tv_usec)) {
+        return PMIX_ERR_NOMEM;
+}
+if (prefx != prefix) {
+    free(prefx);
+}
+
+return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_bfrop_print_status(char **output, char *prefix,
+                                      pmix_status_t *src, pmix_data_type_t type)
+{
+    char *prefx;
+
+    /* deal with NULL prefix */
+    if (NULL == prefix) {
+        if (0 > asprintf(&prefx, " ")) {
+            return PMIX_ERR_NOMEM;
+        }
+    } else {
+        prefx = prefix;
+    }
+
+    /* if src is NULL, just print data type and return */
+    if (NULL == src) {
+        if (0 > asprintf(output, "%sData type: PMIX_STATUS\tValue: NULL pointer", prefx)) {
+            return PMIX_ERR_NOMEM;
+        }
+        if (prefx != prefix) {
+            free(prefx);
+        }
+        return PMIX_SUCCESS;
+    }
+
+    if (0 > asprintf(output, "%sData type: PMIX_STATUS\tValue: %s", prefx, PMIx_Error_string(*src))) {
+        return PMIX_ERR_NOMEM;
+    }
+    if (prefx != prefix) {
+        free(prefx);
+    }
+
+    return PMIX_SUCCESS;
+}
+
+
+/* PRINT FUNCTIONS FOR GENERIC PMIX TYPES */
+
+/*
+ * PMIX_VALUE
+ */
+ pmix_status_t pmix_bfrop_print_value(char **output, char *prefix,
+                                      pmix_value_t *src, pmix_data_type_t type)
+ {
+    char *prefx;
+    int rc;
+
+    /* deal with NULL prefix */
+    if (NULL == prefix) {
+        if (0 > asprintf(&prefx, " ")) {
+            return PMIX_ERR_NOMEM;
+        }
+    } else {
+        prefx = prefix;
+    }
+
+    /* if src is NULL, just print data type and return */
+    if (NULL == src) {
+        if (0 > asprintf(output, "%sData type: PMIX_VALUE\tValue: NULL pointer", prefx)) {
+            return PMIX_ERR_NOMEM;
+        }
+        if (prefx != prefix) {
+            free(prefx);
+        }
+        return PMIX_SUCCESS;
+    }
+
+    switch (src->type) {
+        case PMIX_UNDEF:
+        rc = asprintf(output, "%sPMIX_VALUE: Data type: PMIX_UNDEF", prefx);
+        break;
+        case PMIX_BYTE:
+        rc = asprintf(output, "%sPMIX_VALUE: Data type: PMIX_BYTE\tValue: %x",
+                      prefx, src->data.byte);
+        break;
+        case PMIX_STRING:
+        rc = asprintf(output, "%sPMIX_VALUE: Data type: PMIX_STRING\tValue: %s",
+                      prefx, src->data.string);
+        break;
+        case PMIX_SIZE:
+        rc = asprintf(output, "%sPMIX_VALUE: Data type: PMIX_SIZE\tValue: %lu",
+                      prefx, (unsigned long)src->data.size);
+        break;
+        case PMIX_PID:
+        rc = asprintf(output, "%sPMIX_VALUE: Data type: PMIX_PID\tValue: %lu",
+                      prefx, (unsigned long)src->data.pid);
+        break;
+        case PMIX_INT:
+        rc = asprintf(output, "%sPMIX_VALUE: Data type: PMIX_INT\tValue: %d",
+                      prefx, src->data.integer);
+        break;
+        case PMIX_INT8:
+        rc = asprintf(output, "%sPMIX_VALUE: Data type: PMIX_INT8\tValue: %d",
+                      prefx, (int)src->data.int8);
+        break;
+        case PMIX_INT16:
+        rc = asprintf(output, "%sPMIX_VALUE: Data type: PMIX_INT16\tValue: %d",
+                      prefx, (int)src->data.int16);
+        break;
+        case PMIX_INT32:
+        rc = asprintf(output, "%sPMIX_VALUE: Data type: PMIX_INT32\tValue: %d",
+                      prefx, src->data.int32);
+        break;
+        case PMIX_INT64:
+        rc = asprintf(output, "%sPMIX_VALUE: Data type: PMIX_INT64\tValue: %ld",
+                      prefx, (long)src->data.int64);
+        break;
+        case PMIX_UINT:
+        rc = asprintf(output, "%sPMIX_VALUE: Data type: PMIX_UINT\tValue: %u",
+                      prefx, src->data.uint);
+        break;
+        case PMIX_UINT8:
+        rc = asprintf(output, "%sPMIX_VALUE: Data type: PMIX_UINT8\tValue: %u",
+                      prefx, (unsigned int)src->data.uint8);
+        break;
+        case PMIX_UINT16:
+        rc = asprintf(output, "%sPMIX_VALUE: Data type: PMIX_UINT16\tValue: %u",
+                      prefx, (unsigned int)src->data.uint16);
+        break;
+        case PMIX_UINT32:
+        rc = asprintf(output, "%sPMIX_VALUE: Data type: PMIX_UINT32\tValue: %u",
+                      prefx, src->data.uint32);
+        break;
+        case PMIX_UINT64:
+        rc = asprintf(output, "%sPMIX_VALUE: Data type: PMIX_UINT64\tValue: %lu",
+                      prefx, (unsigned long)src->data.uint64);
+        break;
+        case PMIX_FLOAT:
+        rc = asprintf(output, "%sPMIX_VALUE: Data type: PMIX_FLOAT\tValue: %f",
+                      prefx, src->data.fval);
+        break;
+        case PMIX_DOUBLE:
+        rc = asprintf(output, "%sPMIX_VALUE: Data type: PMIX_DOUBLE\tValue: %f",
+                      prefx, src->data.dval);
+        break;
+        case PMIX_TIMEVAL:
+        rc = asprintf(output, "%sPMIX_VALUE: Data type: PMIX_TIMEVAL\tValue: %ld.%06ld", prefx,
+                      (long)src->data.tv.tv_sec, (long)src->data.tv.tv_usec);
+        break;
+        case PMIX_TIME:
+        rc = asprintf(output, "%sPMIX_VALUE: Data type: PMIX_TIME\tValue: %s", prefx,
+                      ctime(&src->data.time));
+        break;
+        case PMIX_STATUS:
+        rc = asprintf(output, "%sPMIX_VALUE: Data type: PMIX_STATUS\tValue: %s", prefx,
+                      PMIx_Error_string(src->data.status));
+        break;
+        case PMIX_PROC:
+        if (NULL == src->data.proc) {
+            rc = asprintf(output, "%sPMIX_VALUE: Data type: PMIX_PROC\tNULL", prefx);
+        } else {
+            rc = asprintf(output, "%sPMIX_VALUE: Data type: PMIX_PROC\t%s:%lu",
+                          prefx, src->data.proc->nspace, (unsigned long)src->data.proc->rank);
+        }
+        break;
+        case PMIX_BYTE_OBJECT:
+        rc = asprintf(output, "%sPMIX_VALUE: Data type: BYTE_OBJECT\tSIZE: %ld",
+                      prefx, (long)src->data.bo.size);
+        break;
+        case PMIX_PERSIST:
+        rc = asprintf(output, "%sPMIX_VALUE: Data type: PMIX_PERSIST\tValue: %s",
+                      prefx, PMIx_Persistence_string(src->data.persist));
+        break;
+        case PMIX_SCOPE:
+        rc = asprintf(output, "%sPMIX_VALUE: Data type: PMIX_SCOPE\tValue: %s",
+                      prefx, PMIx_Scope_string(src->data.scope));
+        break;
+        case PMIX_DATA_RANGE:
+        rc = asprintf(output, "%sPMIX_VALUE: Data type: PMIX_DATA_RANGE\tValue: %s",
+                      prefx, PMIx_Data_range_string(src->data.range));
+        break;
+        case PMIX_PROC_STATE:
+        rc = asprintf(output, "%sPMIX_VALUE: Data type: PMIX_STATE\tValue: %s",
+                      prefx, PMIx_Proc_state_string(src->data.state));
+        break;
+        case PMIX_PROC_INFO:
+        rc = asprintf(output, "%sPMIX_VALUE: Data type: PMIX_PROC_INFO\tProc: %s:%lu\n%s\tHost: %s\tExecutable: %s\tPid: %lu",
+                      prefx, src->data.pinfo->proc.nspace, (unsigned long)src->data.pinfo->proc.rank,
+                      prefx, src->data.pinfo->hostname, src->data.pinfo->executable_name,
+                      (unsigned long)src->data.pinfo->pid);
+        break;
+        case PMIX_DATA_ARRAY:
+        rc = asprintf(output, "%sPMIX_VALUE: Data type: DATA_ARRAY\tARRAY SIZE: %ld",
+                      prefx, (long)src->data.darray->size);
+        break;
+        /**** DEPRECATED ****/
+        case PMIX_INFO_ARRAY:
+        rc = asprintf(output, "%sPMIX_VALUE: Data type: INFO_ARRAY\tARRAY SIZE: %ld",
+                      prefx, (long)src->data.array->size);
+        break;
+        /********************/
+        default:
+        rc = asprintf(output, "%sPMIX_VALUE: Data type: UNKNOWN\tValue: UNPRINTABLE", prefx);
+        break;
+    }
+    if (prefx != prefix) {
+        free(prefx);
+    }
+    if (0 > rc) {
+        return PMIX_ERR_NOMEM;
+    }
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_bfrop_print_info(char **output, char *prefix,
+                                    pmix_info_t *src, pmix_data_type_t type)
+{
+    char *tmp;
+    int rc;
+
+    pmix_bfrop_print_value(&tmp, NULL, &src->value, PMIX_VALUE);
+    rc = asprintf(output, "%sKEY: %s DIRECTIVES: %0x %s", prefix, src->key,
+                  src->flags, (NULL == tmp) ? "PMIX_VALUE: NULL" : tmp);
+    if (NULL != tmp) {
+        free(tmp);
+    }
+    if (0 > rc) {
+        return PMIX_ERR_NOMEM;
+    }
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_bfrop_print_pdata(char **output, char *prefix,
+                                     pmix_pdata_t *src, pmix_data_type_t type)
+{
+    char *tmp1, *tmp2;
+    int rc;
+
+    pmix_bfrop_print_proc(&tmp1, NULL, &src->proc, PMIX_PROC);
+    pmix_bfrop_print_value(&tmp2, NULL, &src->value, PMIX_VALUE);
+    rc = asprintf(output, "%s  %s  KEY: %s %s", prefix, tmp1, src->key,
+                  (NULL == tmp2) ? "NULL" : tmp2);
+    if (NULL != tmp1) {
+        free(tmp1);
+    }
+    if (NULL != tmp2) {
+        free(tmp2);
+    }
+    if (0 > rc) {
+        return PMIX_ERR_NOMEM;
+    }
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_bfrop_print_buf(char **output, char *prefix,
+                                   pmix_buffer_t *src, pmix_data_type_t type)
+{
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_bfrop_print_app(char **output, char *prefix,
+                                   pmix_app_t *src, pmix_data_type_t type)
+{
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_bfrop_print_proc(char **output, char *prefix,
+                                    pmix_proc_t *src, pmix_data_type_t type)
+{
+    char *prefx;
+    int rc;
+
+    /* deal with NULL prefix */
+    if (NULL == prefix) {
+        if (0 > asprintf(&prefx, " ")) {
+            return PMIX_ERR_NOMEM;
+        }
+    } else {
+        prefx = prefix;
+    }
+
+    switch(src->rank) {
+        case PMIX_RANK_UNDEF:
+            rc = asprintf(output,
+                          "%sPROC: %s:PMIX_RANK_UNDEF", prefx, src->nspace);
+            break;
+        case PMIX_RANK_WILDCARD:
+            rc = asprintf(output,
+                          "%sPROC: %s:PMIX_RANK_WILDCARD", prefx, src->nspace);
+            break;
+        case PMIX_RANK_LOCAL_NODE:
+            rc = asprintf(output,
+                          "%sPROC: %s:PMIX_RANK_LOCAL_NODE", prefx, src->nspace);
+            break;
+        default:
+            rc = asprintf(output,
+                          "%sPROC: %s:%lu", prefx, src->nspace,
+                          (unsigned long)(src->rank));
+    }
+    if (prefx != prefix) {
+        free(prefx);
+    }
+    if (0 > rc) {
+        return PMIX_ERR_NOMEM;
+    }
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_bfrop_print_kval(char **output, char *prefix,
+                                    pmix_kval_t *src, pmix_data_type_t type)
+{
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_bfrop_print_modex(char **output, char *prefix,
+                                     pmix_modex_data_t *src, pmix_data_type_t type)
+{
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_bfrop_print_persist(char **output, char *prefix, pmix_persistence_t *src, pmix_data_type_t type)
+{
+    char *prefx;
+
+    /* deal with NULL prefix */
+    if (NULL == prefix) {
+        if (0 > asprintf(&prefx, " ")) {
+            return PMIX_ERR_NOMEM;
+        }
+    } else {
+        prefx = prefix;
+    }
+
+    /* if src is NULL, just print data type and return */
+    if (NULL == src) {
+        if (0 > asprintf(output, "%sData type: PMIX_PERSIST\tValue: NULL pointer", prefx)) {
+            return PMIX_ERR_NOMEM;
+        }
+        if (prefx != prefix) {
+            free(prefx);
+        }
+        return PMIX_SUCCESS;
+    }
+
+    if (0 > asprintf(output, "%sData type: PMIX_PERSIST\tValue: %ld", prefx, (long) *src)) {
+        return PMIX_ERR_NOMEM;
+    }
+    if (prefx != prefix) {
+        free(prefx);
+    }
+
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_bfrop_print_scope(char **output, char *prefix,
+                                     pmix_scope_t *src,
+                                     pmix_data_type_t type)
+{
+    char *prefx;
+
+    /* deal with NULL prefix */
+    if (NULL == prefix) {
+        if (0 > asprintf(&prefx, " ")) {
+            return PMIX_ERR_NOMEM;
+        }
+    } else {
+        prefx = prefix;
+    }
+
+    if (0 > asprintf(output, "%sData type: PMIX_SCOPE\tValue: %s",
+                     prefx, PMIx_Scope_string(*src))) {
+        return PMIX_ERR_NOMEM;
+    }
+    if (prefx != prefix) {
+        free(prefx);
+    }
+
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_bfrop_print_range(char **output, char *prefix,
+                                     pmix_data_range_t *src,
+                                     pmix_data_type_t type)
+{
+    char *prefx;
+
+    /* deal with NULL prefix */
+    if (NULL == prefix) {
+        if (0 > asprintf(&prefx, " ")) {
+            return PMIX_ERR_NOMEM;
+        }
+    } else {
+        prefx = prefix;
+    }
+
+    if (0 > asprintf(output, "%sData type: PMIX_DATA_RANGE\tValue: %s",
+                     prefx, PMIx_Data_range_string(*src))) {
+        return PMIX_ERR_NOMEM;
+    }
+    if (prefx != prefix) {
+        free(prefx);
+    }
+
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_bfrop_print_cmd(char **output, char *prefix,
+                                   pmix_cmd_t *src,
+                                   pmix_data_type_t type)
+{
+    char *prefx;
+
+    /* deal with NULL prefix */
+    if (NULL == prefix) {
+        if (0 > asprintf(&prefx, " ")) {
+            return PMIX_ERR_NOMEM;
+        }
+    } else {
+        prefx = prefix;
+    }
+
+    if (0 > asprintf(output, "%sData type: PMIX_CMD\tValue: %s",
+                     prefx, pmix_command_string(*src))) {
+        return PMIX_ERR_NOMEM;
+    }
+    if (prefx != prefix) {
+        free(prefx);
+    }
+
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_bfrop_print_infodirs(char **output, char *prefix,
+                                        pmix_info_directives_t *src,
+                                        pmix_data_type_t type)
+{
+    char *prefx;
+
+    /* deal with NULL prefix */
+    if (NULL == prefix) {
+        if (0 > asprintf(&prefx, " ")) {
+            return PMIX_ERR_NOMEM;
+        }
+    } else {
+        prefx = prefix;
+    }
+
+    if (0 > asprintf(output, "%sData type: PMIX_INFO_DIRECTIVES\tValue: %s",
+                     prefx, PMIx_Info_directives_string(*src))) {
+        return PMIX_ERR_NOMEM;
+    }
+    if (prefx != prefix) {
+        free(prefx);
+    }
+
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_bfrop_print_bo(char **output, char *prefix,
+                                  pmix_byte_object_t *src, pmix_data_type_t type)
+{
+    char *prefx;
+
+    /* deal with NULL prefix */
+    if (NULL == prefix) {
+        if (0 > asprintf(&prefx, " ")) {
+            return PMIX_ERR_NOMEM;
+        }
+    } else {
+        prefx = prefix;
+    }
+
+    /* if src is NULL, just print data type and return */
+    if (NULL == src) {
+        if (0 > asprintf(output, "%sData type: PMIX_BYTE_OBJECT\tValue: NULL pointer", prefx)) {
+            return PMIX_ERR_NOMEM;
+        }
+        if (prefx != prefix) {
+            free(prefx);
+        }
+        return PMIX_SUCCESS;
+    }
+
+    if (0 > asprintf(output, "%sData type: PMIX_BYTE_OBJECT\tSize: %ld", prefx, (long)src->size)) {
+        return PMIX_ERR_NOMEM;
+    }
+    if (prefx != prefix) {
+        free(prefx);
+    }
+
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_bfrop_print_ptr(char **output, char *prefix,
+                                   void *src, pmix_data_type_t type)
+{
+    char *prefx;
+
+    /* deal with NULL prefix */
+    if (NULL == prefix) {
+        if (0 > asprintf(&prefx, " ")) {
+            return PMIX_ERR_NOMEM;
+        }
+    } else {
+        prefx = prefix;
+    }
+
+    if (0 > asprintf(output, "%sData type: PMIX_POINTER\tAddress: %p", prefx, src)) {
+        return PMIX_ERR_NOMEM;
+    }
+    if (prefx != prefix) {
+        free(prefx);
+    }
+
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_bfrop_print_pstate(char **output, char *prefix,
+                                      pmix_proc_state_t *src, pmix_data_type_t type)
+{
+    char *prefx;
+
+    /* deal with NULL prefix */
+    if (NULL == prefix) {
+        if (0 > asprintf(&prefx, " ")) {
+            return PMIX_ERR_NOMEM;
+        }
+    } else {
+        prefx = prefix;
+    }
+
+    if (0 > asprintf(output, "%sData type: PMIX_PROC_STATE\tValue: %s",
+                     prefx, PMIx_Proc_state_string(*src))) {
+        return PMIX_ERR_NOMEM;
+    }
+    if (prefx != prefix) {
+        free(prefx);
+    }
+
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_bfrop_print_pinfo(char **output, char *prefix,
+                                     pmix_proc_info_t *src, pmix_data_type_t type)
+{
+    char *prefx;
+    pmix_status_t rc = PMIX_SUCCESS;
+    char *p2, *tmp;
+
+    /* deal with NULL prefix */
+    if (NULL == prefix) {
+        if (0 > asprintf(&prefx, " ")) {
+            return PMIX_ERR_NOMEM;
+        }
+    } else {
+        prefx = prefix;
+    }
+
+    if (0 > asprintf(&p2, "%s\t", prefx)) {
+        rc = PMIX_ERR_NOMEM;
+        goto done;
+    }
+
+    if (PMIX_SUCCESS != (rc = pmix_bfrop_print_proc(&tmp, p2, &src->proc, PMIX_PROC))) {
+        free(p2);
+        goto done;
+    }
+
+    if (0 > asprintf(output,
+                     "%sData type: PMIX_PROC_INFO\tValue:\n%s\n%sHostname: %s\tExecutable: %s\n%sPid: %lu\tExit code: %d\tState: %s",
+                     prefx, tmp, p2, src->hostname, src->executable_name,
+                     p2, (unsigned long)src->pid, src->exit_code, PMIx_Proc_state_string(src->state))) {
+        free(p2);
+        rc = PMIX_ERR_NOMEM;
+    }
+
+  done:
+    if (prefx != prefix) {
+        free(prefx);
+    }
+
+    return rc;
+}
+
+pmix_status_t pmix_bfrop_print_darray(char **output, char *prefix,
+                                      pmix_data_array_t *src, pmix_data_type_t type)
+{
+    char *prefx;
+
+    /* deal with NULL prefix */
+    if (NULL == prefix) {
+        if (0 > asprintf(&prefx, " ")) {
+            return PMIX_ERR_NOMEM;
+        }
+    } else {
+        prefx = prefix;
+    }
+
+    if (0 > asprintf(output, "%sData type: PMIX_DATA_ARRAY\tSize: %lu",
+                     prefx, (unsigned long)src->size)) {
+        return PMIX_ERR_NOMEM;
+    }
+    if (prefx != prefix) {
+        free(prefx);
+    }
+
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_bfrop_print_query(char **output, char *prefix,
+                                     pmix_query_t *src, pmix_data_type_t type)
+{
+    char *prefx, *p2;
+    pmix_status_t rc = PMIX_SUCCESS;
+    char *tmp, *t2, *t3;
+    size_t n;
+
+    /* deal with NULL prefix */
+    if (NULL == prefix) {
+        if (0 > asprintf(&prefx, " ")) {
+            return PMIX_ERR_NOMEM;
+        }
+    } else {
+        prefx = prefix;
+    }
+
+    if (0 > asprintf(&p2, "%s\t", prefx)) {
+        rc = PMIX_ERR_NOMEM;
+        goto done;
+    }
+
+    if (0 > asprintf(&tmp,
+                   "%sData type: PMIX_QUERY\tValue:", prefx)) {
+        free(p2);
+        rc = PMIX_ERR_NOMEM;
+        goto done;
+    }
+
+    /* print out the keys */
+    if (NULL != src->keys) {
+        for (n=0; NULL != src->keys[n]; n++) {
+            if (0 > asprintf(&t2, "%s\n%sKey: %s", tmp, p2, src->keys[n])) {
+                free(p2);
+                free(tmp);
+                rc = PMIX_ERR_NOMEM;
+                goto done;
+            }
+            free(tmp);
+            tmp = t2;
+        }
+    }
+
+    /* now print the qualifiers */
+    if (0 < src->nqual) {
+        for (n=0; n < src->nqual; n++) {
+            if (PMIX_SUCCESS != (rc = pmix_bfrop_print_info(&t2, p2, &src->qualifiers[n], PMIX_PROC))) {
+                free(p2);
+                goto done;
+            }
+            if (0 > asprintf(&t3, "%s\n%s", tmp, t2)) {
+                free(p2);
+                free(tmp);
+                free(t2);
+                rc = PMIX_ERR_NOMEM;
+                goto done;
+            }
+            free(tmp);
+            free(t2);
+            tmp = t3;
+        }
+    }
+    *output = tmp;
+
+  done:
+    if (prefx != prefix) {
+        free(prefx);
+    }
+
+    return rc;
+}
+
+pmix_status_t pmix_bfrop_print_rank(char **output, char *prefix,
+                                    pmix_rank_t *src, pmix_data_type_t type)
+{
+    char *prefx;
+    int rc;
+
+    /* deal with NULL prefix */
+    if (NULL == prefix) {
+        if (0 > asprintf(&prefx, " ")) {
+            return PMIX_ERR_NOMEM;
+        }
+    } else {
+        prefx = prefix;
+    }
+
+    switch(*src) {
+        case PMIX_RANK_UNDEF:
+            rc = asprintf(output,
+                          "%sData type: PMIX_PROC_RANK\tValue: PMIX_RANK_UNDEF",
+                          prefx);
+            break;
+        case PMIX_RANK_WILDCARD:
+            rc = asprintf(output,
+                          "%sData type: PMIX_PROC_RANK\tValue: PMIX_RANK_WILDCARD",
+                          prefx);
+            break;
+        case PMIX_RANK_LOCAL_NODE:
+            rc = asprintf(output,
+                          "%sData type: PMIX_PROC_RANK\tValue: PMIX_RANK_LOCAL_NODE",
+                          prefx);
+            break;
+        default:
+            rc = asprintf(output, "%sData type: PMIX_PROC_RANK\tValue: %lu",
+                          prefx, (unsigned long)(*src));
+    }
+    if (prefx != prefix) {
+        free(prefx);
+    }
+    if (0 > rc) {
+        return PMIX_ERR_NOMEM;
+    }
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_bfrop_print_alloc_directive(char **output, char *prefix,
+                                               pmix_alloc_directive_t *src,
+                                               pmix_data_type_t type)
+{
+    char *prefx;
+
+    /* deal with NULL prefix */
+    if (NULL == prefix) {
+        if (0 > asprintf(&prefx, " ")) {
+            return PMIX_ERR_NOMEM;
+        }
+    } else {
+        prefx = prefix;
+    }
+
+    if (0 > asprintf(output, "%sData type: PMIX_ALLOC_DIRECTIVE\tValue: %s",
+                     prefx, PMIx_Alloc_directive_string(*src))) {
+        return PMIX_ERR_NOMEM;
+    }
+    if (prefx != prefix) {
+        free(prefx);
+    }
+
+    return PMIX_SUCCESS;
+}
+
+
+/**** DEPRECATED ****/
+pmix_status_t pmix_bfrop_print_array(char **output, char *prefix,
+                                     pmix_info_array_t *src, pmix_data_type_t type)
+{
+    size_t j;
+    char *tmp, *tmp2, *tmp3, *pfx;
+    pmix_info_t *s1;
+
+    if (0 > asprintf(&tmp, "%sARRAY SIZE: %ld", prefix, (long)src->size)) {
+        return PMIX_ERR_NOMEM;
+    }
+    if (0 > asprintf(&pfx, "\n%s\t",  (NULL == prefix) ? "" : prefix)) {
+        free(tmp);
+        return PMIX_ERR_NOMEM;
+    }
+    s1 = (pmix_info_t*)src->array;
+
+    for (j=0; j < src->size; j++) {
+        pmix_bfrop_print_info(&tmp2, pfx, &s1[j], PMIX_INFO);
+        if (0 > asprintf(&tmp3, "%s%s", tmp, tmp2)) {
+            free(tmp);
+            free(tmp2);
+            return PMIX_ERR_NOMEM;
+        }
+        free(tmp);
+        free(tmp2);
+        tmp = tmp3;
+    }
+    *output = tmp;
+    return PMIX_SUCCESS;
+}
+/********************/
diff --git a/src/buffer_ops/types.h b/src/buffer_ops/types.h
new file mode 100644
index 0000000..c48a30b
--- /dev/null
+++ b/src/buffer_ops/types.h
@@ -0,0 +1,105 @@
+/* -*- C -*-
+ *
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2006 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2007-2011 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2012-2013 Los Alamos National Security, Inc. All rights reserved.
+ * Copyright (c) 2014-2015 Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+/**
+ * @file
+ *
+ * Buffer management types.
+ */
+
+#ifndef PMIX_BFROP_TYPES_H_
+#define PMIX_BFROP_TYPES_H_
+
+#include <src/include/pmix_config.h>
+
+
+#include "src/class/pmix_object.h"
+#include "src/class/pmix_pointer_array.h"
+#include "src/class/pmix_list.h"
+#include <pmix_common.h>
+
+BEGIN_C_DECLS
+
+/* define the results values for comparisons so we can change them in only one place */
+#define PMIX_VALUE1_GREATER  +1
+#define PMIX_VALUE2_GREATER  -1
+#define PMIX_EQUAL            0
+
+/**
+ * buffer type
+ */
+enum pmix_bfrop_buffer_type_t {
+    PMIX_BFROP_BUFFER_NON_DESC   = 0x00,
+    PMIX_BFROP_BUFFER_FULLY_DESC = 0x01
+};
+
+typedef enum pmix_bfrop_buffer_type_t pmix_bfrop_buffer_type_t;
+
+#define PMIX_BFROP_BUFFER_TYPE_HTON(h);
+#define PMIX_BFROP_BUFFER_TYPE_NTOH(h);
+
+/**
+ * Structure for holding a buffer */
+typedef struct {
+    /** First member must be the object's parent */
+    pmix_object_t parent;
+    /** type of buffer */
+    pmix_bfrop_buffer_type_t type;
+    /** Start of my memory */
+    char *base_ptr;
+    /** Where the next data will be packed to (within the allocated
+        memory starting at base_ptr) */
+    char *pack_ptr;
+    /** Where the next data will be unpacked from (within the
+        allocated memory starting as base_ptr) */
+    char *unpack_ptr;
+
+    /** Number of bytes allocated (starting at base_ptr) */
+    size_t bytes_allocated;
+    /** Number of bytes used by the buffer (i.e., amount of data --
+        including overhead -- packed in the buffer) */
+    size_t bytes_used;
+} pmix_buffer_t;
+PMIX_CLASS_DECLARATION (pmix_buffer_t);
+
+/* these classes are required by the regex code shared
+ * between the client and server implementations - it
+ * is put here so that both can access these objects */
+typedef struct {
+    pmix_list_item_t super;
+    int start;
+    int cnt;
+} pmix_regex_range_t;
+PMIX_CLASS_DECLARATION(pmix_regex_range_t);
+
+typedef struct {
+    /* list object */
+    pmix_list_item_t super;
+    char *prefix;
+    char *suffix;
+    int num_digits;
+    pmix_list_t ranges;
+} pmix_regex_value_t;
+PMIX_CLASS_DECLARATION(pmix_regex_value_t);
+
+END_C_DECLS
+
+#endif /* PMIX_BFROP_TYPES_H */
diff --git a/src/buffer_ops/unpack.c b/src/buffer_ops/unpack.c
new file mode 100644
index 0000000..8296f8f
--- /dev/null
+++ b/src/buffer_ops/unpack.c
@@ -0,0 +1,1415 @@
+/*
+ * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2006 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2012      Los Alamos National Security, Inc.  All rights reserved.
+ * Copyright (c) 2014-2017 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2016      Mellanox Technologies, Inc.
+ *                         All rights reserved.
+ * Copyright (c) 2016      IBM Corporation.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+
+#include <src/include/types.h>
+
+#include "src/util/argv.h"
+#include "src/util/error.h"
+#include "src/util/output.h"
+#include "src/buffer_ops/types.h"
+#include "src/buffer_ops/internal.h"
+
+pmix_status_t pmix_bfrop_unpack(pmix_buffer_t *buffer,
+                                void *dst, int32_t *num_vals,
+                                pmix_data_type_t type)
+ {
+    pmix_status_t rc, ret;
+    int32_t local_num, n=1;
+    pmix_data_type_t local_type;
+
+    /* check for error */
+    if (NULL == buffer || NULL == dst || NULL == num_vals) {
+        return PMIX_ERR_BAD_PARAM;
+    }
+
+    /* if user provides a zero for num_vals, then there is no storage allocated
+     * so return an appropriate error
+     */
+     if (0 == *num_vals) {
+        pmix_output_verbose(20, pmix_globals.debug_output, "pmix_bfrop_unpack: inadequate space ( %p, %p, %lu, %d )\n",
+                            (void*)buffer, dst, (long unsigned int)*num_vals, (int)type);
+        return PMIX_ERR_UNPACK_INADEQUATE_SPACE;
+    }
+
+    /** Unpack the declared number of values
+     * REMINDER: it is possible that the buffer is corrupted and that
+     * the BFROP will *think* there is a proper int32_t variable at the
+     * beginning of the unpack region - but that the value is bogus (e.g., just
+     * a byte field in a string array that so happens to have a value that
+     * matches the int32_t data type flag). Therefore, this error check is
+     * NOT completely safe. This is true for ALL unpack functions, not just
+     * int32_t as used here.
+     */
+     if (PMIX_BFROP_BUFFER_FULLY_DESC == buffer->type) {
+        if (PMIX_SUCCESS != (rc = pmix_bfrop_get_data_type(buffer, &local_type))) {
+            *num_vals = 0;
+            /* don't error log here as the user may be unpacking past
+             * the end of the buffer, which isn't necessarily an error */
+            return rc;
+        }
+        if (PMIX_INT32 != local_type) { /* if the length wasn't first, then error */
+            *num_vals = 0;
+            return PMIX_ERR_UNPACK_FAILURE;
+        }
+    }
+
+    n=1;
+    if (PMIX_SUCCESS != (rc = pmix_bfrop_unpack_int32(buffer, &local_num, &n, PMIX_INT32))) {
+        *num_vals = 0;
+            /* don't error log here as the user may be unpacking past
+             * the end of the buffer, which isn't necessarily an error */
+        return rc;
+    }
+
+    pmix_output_verbose(20, pmix_globals.debug_output, "pmix_bfrop_unpack: found %d values for %d provided storage",
+                        local_num, *num_vals);
+
+    /** if the storage provided is inadequate, set things up
+     * to unpack as much as we can and to return an error code
+     * indicating that everything was not unpacked - the buffer
+     * is left in a state where it can not be further unpacked.
+     */
+     if (local_num > *num_vals) {
+        local_num = *num_vals;
+        pmix_output_verbose(20, pmix_globals.debug_output, "pmix_bfrop_unpack: inadequate space ( %p, %p, %lu, %d )\n",
+                            (void*)buffer, dst, (long unsigned int)*num_vals, (int)type);
+        ret = PMIX_ERR_UNPACK_INADEQUATE_SPACE;
+    } else {  /** enough or more than enough storage */
+        *num_vals = local_num;  /** let the user know how many we actually unpacked */
+        ret = PMIX_SUCCESS;
+    }
+
+    /** Unpack the value(s) */
+    if (PMIX_SUCCESS != (rc = pmix_bfrop_unpack_buffer(buffer, dst, &local_num, type))) {
+        *num_vals = 0;
+        ret = rc;
+    }
+
+    return ret;
+}
+
+pmix_status_t pmix_bfrop_unpack_buffer(pmix_buffer_t *buffer, void *dst, int32_t *num_vals,
+                                       pmix_data_type_t type)
+{
+    pmix_status_t rc;
+    pmix_data_type_t local_type;
+    pmix_bfrop_type_info_t *info;
+
+    pmix_output_verbose(20, pmix_globals.debug_output, "pmix_bfrop_unpack_buffer( %p, %p, %lu, %d )\n",
+                        (void*)buffer, dst, (long unsigned int)*num_vals, (int)type);
+
+    /** Unpack the declared data type */
+    if (PMIX_BFROP_BUFFER_FULLY_DESC == buffer->type) {
+        if (PMIX_SUCCESS != (rc = pmix_bfrop_get_data_type(buffer, &local_type))) {
+            return rc;
+        }
+        /* if the data types don't match, then return an error */
+        if (type != local_type) {
+            pmix_output(0, "PMIX bfrop:unpack: got type %d when expecting type %d", local_type, type);
+            return PMIX_ERR_PACK_MISMATCH;
+        }
+    }
+
+    /* Lookup the unpack function for this type and call it */
+
+    if (NULL == (info = (pmix_bfrop_type_info_t*)pmix_pointer_array_get_item(&pmix_bfrop_types, type))) {
+        return PMIX_ERR_UNPACK_FAILURE;
+    }
+
+    return info->odti_unpack_fn(buffer, dst, num_vals, type);
+}
+
+
+/* UNPACK GENERIC SYSTEM TYPES */
+
+/*
+ * BOOL
+ */
+pmix_status_t pmix_bfrop_unpack_bool(pmix_buffer_t *buffer, void *dest,
+                                     int32_t *num_vals, pmix_data_type_t type)
+ {
+    int32_t i;
+    uint8_t *src;
+    bool *dst;
+
+    pmix_output_verbose(20, pmix_globals.debug_output, "pmix_bfrop_unpack_bool * %d\n", (int)*num_vals);
+    /* check to see if there's enough data in buffer */
+    if (pmix_bfrop_too_small(buffer, *num_vals)) {
+        return PMIX_ERR_UNPACK_READ_PAST_END_OF_BUFFER;
+    }
+
+    /* unpack the data */
+    src = (uint8_t*)buffer->unpack_ptr;
+    dst = (bool*)dest;
+
+    for (i=0; i < *num_vals; i++) {
+        if (src[i]) {
+            dst[i] = true;
+        } else {
+            dst[i] = false;
+        }
+    }
+
+    /* update buffer pointer */
+    buffer->unpack_ptr += *num_vals;
+
+    return PMIX_SUCCESS;
+}
+
+/*
+ * INT
+ */
+pmix_status_t pmix_bfrop_unpack_int(pmix_buffer_t *buffer, void *dest,
+                                    int32_t *num_vals, pmix_data_type_t type)
+ {
+    pmix_status_t ret;
+    pmix_data_type_t remote_type;
+
+    if (PMIX_SUCCESS != (ret = pmix_bfrop_get_data_type(buffer, &remote_type))) {
+        return ret;
+    }
+
+    if (remote_type == BFROP_TYPE_INT) {
+        /* fast path it if the sizes are the same */
+        /* Turn around and unpack the real type */
+        if (PMIX_SUCCESS != (ret = pmix_bfrop_unpack_buffer(buffer, dest, num_vals, BFROP_TYPE_INT))) {
+        }
+    } else {
+        /* slow path - types are different sizes */
+        UNPACK_SIZE_MISMATCH(int, remote_type, ret);
+    }
+
+    return ret;
+}
+
+/*
+ * SIZE_T
+ */
+pmix_status_t pmix_bfrop_unpack_sizet(pmix_buffer_t *buffer, void *dest,
+                                      int32_t *num_vals, pmix_data_type_t type)
+ {
+    pmix_status_t ret;
+    pmix_data_type_t remote_type;
+
+    if (PMIX_SUCCESS != (ret = pmix_bfrop_get_data_type(buffer, &remote_type))) {
+        return ret;
+    }
+
+    if (remote_type == BFROP_TYPE_SIZE_T) {
+        /* fast path it if the sizes are the same */
+        /* Turn around and unpack the real type */
+        if (PMIX_SUCCESS != (ret = pmix_bfrop_unpack_buffer(buffer, dest, num_vals, BFROP_TYPE_SIZE_T))) {
+        }
+    } else {
+        /* slow path - types are different sizes */
+        UNPACK_SIZE_MISMATCH(size_t, remote_type, ret);
+    }
+
+    return ret;
+}
+
+/*
+ * PID_T
+ */
+pmix_status_t pmix_bfrop_unpack_pid(pmix_buffer_t *buffer, void *dest,
+                                    int32_t *num_vals, pmix_data_type_t type)
+ {
+    pmix_status_t ret;
+    pmix_data_type_t remote_type;
+
+    if (PMIX_SUCCESS != (ret = pmix_bfrop_get_data_type(buffer, &remote_type))) {
+        return ret;
+    }
+
+    if (remote_type == BFROP_TYPE_PID_T) {
+        /* fast path it if the sizes are the same */
+        /* Turn around and unpack the real type */
+        if (PMIX_SUCCESS != (ret = pmix_bfrop_unpack_buffer(buffer, dest, num_vals, BFROP_TYPE_PID_T))) {
+        }
+    } else {
+        /* slow path - types are different sizes */
+        UNPACK_SIZE_MISMATCH(pid_t, remote_type, ret);
+    }
+
+    return ret;
+}
+
+
+/* UNPACK FUNCTIONS FOR NON-GENERIC SYSTEM TYPES */
+
+/*
+ * BYTE, CHAR, INT8
+ */
+pmix_status_t pmix_bfrop_unpack_byte(pmix_buffer_t *buffer, void *dest,
+                                     int32_t *num_vals, pmix_data_type_t type)
+ {
+    pmix_output_verbose(20, pmix_globals.debug_output, "pmix_bfrop_unpack_byte * %d\n", (int)*num_vals);
+    /* check to see if there's enough data in buffer */
+    if (pmix_bfrop_too_small(buffer, *num_vals)) {
+        return PMIX_ERR_UNPACK_READ_PAST_END_OF_BUFFER;
+    }
+
+    /* unpack the data */
+    memcpy(dest, buffer->unpack_ptr, *num_vals);
+
+    /* update buffer pointer */
+    buffer->unpack_ptr += *num_vals;
+
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_bfrop_unpack_int16(pmix_buffer_t *buffer, void *dest,
+                                      int32_t *num_vals, pmix_data_type_t type)
+{
+    int32_t i;
+    uint16_t tmp, *desttmp = (uint16_t*) dest;
+
+    pmix_output_verbose(20, pmix_globals.debug_output, "pmix_bfrop_unpack_int16 * %d\n", (int)*num_vals);
+    /* check to see if there's enough data in buffer */
+    if (pmix_bfrop_too_small(buffer, (*num_vals)*sizeof(tmp))) {
+        return PMIX_ERR_UNPACK_READ_PAST_END_OF_BUFFER;
+    }
+
+    /* unpack the data */
+    for (i = 0; i < (*num_vals); ++i) {
+        memcpy( &(tmp), buffer->unpack_ptr, sizeof(tmp) );
+        tmp = pmix_ntohs(tmp);
+        memcpy(&desttmp[i], &tmp, sizeof(tmp));
+        buffer->unpack_ptr += sizeof(tmp);
+    }
+
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_bfrop_unpack_int32(pmix_buffer_t *buffer, void *dest,
+                                      int32_t *num_vals, pmix_data_type_t type)
+{
+    int32_t i;
+    uint32_t tmp, *desttmp = (uint32_t*) dest;
+
+    pmix_output_verbose(20, pmix_globals.debug_output, "pmix_bfrop_unpack_int32 * %d\n", (int)*num_vals);
+    /* check to see if there's enough data in buffer */
+    if (pmix_bfrop_too_small(buffer, (*num_vals)*sizeof(tmp))) {
+        return PMIX_ERR_UNPACK_READ_PAST_END_OF_BUFFER;
+    }
+
+    /* unpack the data */
+    for (i = 0; i < (*num_vals); ++i) {
+        memcpy( &(tmp), buffer->unpack_ptr, sizeof(tmp) );
+        tmp = ntohl(tmp);
+        memcpy(&desttmp[i], &tmp, sizeof(tmp));
+        buffer->unpack_ptr += sizeof(tmp);
+    }
+
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_bfrop_unpack_datatype(pmix_buffer_t *buffer, void *dest,
+                                         int32_t *num_vals, pmix_data_type_t type)
+{
+    return pmix_bfrop_unpack_int16(buffer, dest, num_vals, type);
+}
+
+pmix_status_t pmix_bfrop_unpack_int64(pmix_buffer_t *buffer, void *dest,
+                                      int32_t *num_vals, pmix_data_type_t type)
+{
+    int32_t i;
+    uint64_t tmp, *desttmp = (uint64_t*) dest;
+
+    pmix_output_verbose(20, pmix_globals.debug_output, "pmix_bfrop_unpack_int64 * %d\n", (int)*num_vals);
+    /* check to see if there's enough data in buffer */
+    if (pmix_bfrop_too_small(buffer, (*num_vals)*sizeof(tmp))) {
+        return PMIX_ERR_UNPACK_READ_PAST_END_OF_BUFFER;
+    }
+
+    /* unpack the data */
+    for (i = 0; i < (*num_vals); ++i) {
+        memcpy( &(tmp), buffer->unpack_ptr, sizeof(tmp) );
+        tmp = pmix_ntoh64(tmp);
+        memcpy(&desttmp[i], &tmp, sizeof(tmp));
+        buffer->unpack_ptr += sizeof(tmp);
+    }
+
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_bfrop_unpack_string(pmix_buffer_t *buffer, void *dest,
+                                       int32_t *num_vals, pmix_data_type_t type)
+{
+    pmix_status_t ret;
+    int32_t i, len, n=1;
+    char **sdest = (char**) dest;
+
+    for (i = 0; i < (*num_vals); ++i) {
+        if (PMIX_SUCCESS != (ret = pmix_bfrop_unpack_int32(buffer, &len, &n, PMIX_INT32))) {
+            return ret;
+        }
+        if (0 ==  len) {   /* zero-length string - unpack the NULL */
+            sdest[i] = NULL;
+        } else {
+            sdest[i] = (char*)malloc(len);
+            if (NULL == sdest[i]) {
+                return PMIX_ERR_OUT_OF_RESOURCE;
+            }
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_unpack_byte(buffer, sdest[i], &len, PMIX_BYTE))) {
+                return ret;
+            }
+        }
+    }
+
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_bfrop_unpack_float(pmix_buffer_t *buffer, void *dest,
+                                      int32_t *num_vals, pmix_data_type_t type)
+{
+    int32_t i, n;
+    float *desttmp = (float*) dest, tmp;
+    pmix_status_t ret;
+    char *convert;
+
+    pmix_output_verbose(20, pmix_globals.debug_output, "pmix_bfrop_unpack_float * %d\n", (int)*num_vals);
+    /* check to see if there's enough data in buffer */
+    if (pmix_bfrop_too_small(buffer, (*num_vals)*sizeof(float))) {
+        return PMIX_ERR_UNPACK_READ_PAST_END_OF_BUFFER;
+    }
+
+    /* unpack the data */
+    for (i = 0; i < (*num_vals); ++i) {
+        n=1;
+        convert = NULL;
+        if (PMIX_SUCCESS != (ret = pmix_bfrop_unpack_string(buffer, &convert, &n, PMIX_STRING))) {
+            return ret;
+        }
+        if (NULL != convert) {
+            tmp = strtof(convert, NULL);
+            memcpy(&desttmp[i], &tmp, sizeof(tmp));
+            free(convert);
+        }
+    }
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_bfrop_unpack_double(pmix_buffer_t *buffer, void *dest,
+                                       int32_t *num_vals, pmix_data_type_t type)
+{
+    int32_t i, n;
+    double *desttmp = (double*) dest, tmp;
+    pmix_status_t ret;
+    char *convert;
+
+    pmix_output_verbose(20, pmix_globals.debug_output, "pmix_bfrop_unpack_double * %d\n", (int)*num_vals);
+    /* check to see if there's enough data in buffer */
+    if (pmix_bfrop_too_small(buffer, (*num_vals)*sizeof(double))) {
+        return PMIX_ERR_UNPACK_READ_PAST_END_OF_BUFFER;
+    }
+
+    /* unpack the data */
+    for (i = 0; i < (*num_vals); ++i) {
+        n=1;
+        convert = NULL;
+        if (PMIX_SUCCESS != (ret = pmix_bfrop_unpack_string(buffer, &convert, &n, PMIX_STRING))) {
+            return ret;
+        }
+        if (NULL != convert) {
+            tmp = strtod(convert, NULL);
+            memcpy(&desttmp[i], &tmp, sizeof(tmp));
+            free(convert);
+        }
+    }
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_bfrop_unpack_timeval(pmix_buffer_t *buffer, void *dest,
+                                        int32_t *num_vals, pmix_data_type_t type)
+{
+    int32_t i, n;
+    int64_t tmp[2];
+    struct timeval *desttmp = (struct timeval *) dest, tt;
+    pmix_status_t ret;
+
+    pmix_output_verbose(20, pmix_globals.debug_output, "pmix_bfrop_unpack_timeval * %d\n", (int)*num_vals);
+    /* check to see if there's enough data in buffer */
+    if (pmix_bfrop_too_small(buffer, (*num_vals)*sizeof(struct timeval))) {
+        return PMIX_ERR_UNPACK_READ_PAST_END_OF_BUFFER;
+    }
+
+    /* unpack the data */
+    for (i = 0; i < (*num_vals); ++i) {
+        n=2;
+        if (PMIX_SUCCESS != (ret = pmix_bfrop_unpack_int64(buffer, tmp, &n, PMIX_INT64))) {
+            return ret;
+        }
+        tt.tv_sec = tmp[0];
+        tt.tv_usec = tmp[1];
+        memcpy(&desttmp[i], &tt, sizeof(tt));
+    }
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_bfrop_unpack_time(pmix_buffer_t *buffer, void *dest,
+                                     int32_t *num_vals, pmix_data_type_t type)
+{
+    int32_t i, n;
+    time_t *desttmp = (time_t *) dest, tmp;
+    pmix_status_t ret;
+    uint64_t ui64;
+
+    /* time_t is a system-dependent size, so cast it
+     * to uint64_t as a generic safe size
+     */
+
+     pmix_output_verbose(20, pmix_globals.debug_output, "pmix_bfrop_unpack_time * %d\n", (int)*num_vals);
+    /* check to see if there's enough data in buffer */
+     if (pmix_bfrop_too_small(buffer, (*num_vals)*(sizeof(uint64_t)))) {
+        return PMIX_ERR_UNPACK_READ_PAST_END_OF_BUFFER;
+    }
+
+    /* unpack the data */
+    for (i = 0; i < (*num_vals); ++i) {
+        n=1;
+        if (PMIX_SUCCESS != (ret = pmix_bfrop_unpack_int64(buffer, &ui64, &n, PMIX_UINT64))) {
+            return ret;
+        }
+        tmp = (time_t)ui64;
+        memcpy(&desttmp[i], &tmp, sizeof(tmp));
+    }
+    return PMIX_SUCCESS;
+}
+
+
+pmix_status_t pmix_bfrop_unpack_status(pmix_buffer_t *buffer, void *dest,
+                                       int32_t *num_vals, pmix_data_type_t type)
+{
+     pmix_output_verbose(20, pmix_globals.debug_output, "pmix_bfrop_unpack_status * %d\n", (int)*num_vals);
+    /* check to see if there's enough data in buffer */
+    if (pmix_bfrop_too_small(buffer, (*num_vals)*(sizeof(pmix_status_t)))) {
+        return PMIX_ERR_UNPACK_READ_PAST_END_OF_BUFFER;
+    }
+
+    /* unpack the data */
+    return pmix_bfrop_unpack_int32(buffer, dest, num_vals, PMIX_INT32);
+}
+
+
+/* UNPACK FUNCTIONS FOR GENERIC PMIX TYPES */
+
+/*
+ * PMIX_VALUE
+ */
+ static pmix_status_t unpack_val(pmix_buffer_t *buffer, pmix_value_t *val)
+ {
+    int32_t m;
+    pmix_status_t ret;
+
+    m = 1;
+    switch (val->type) {
+        case PMIX_UNDEF:
+            break;
+        case PMIX_BOOL:
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_unpack_buffer(buffer, &val->data.flag, &m, PMIX_BOOL))) {
+                return ret;
+            }
+            break;
+        case PMIX_BYTE:
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_unpack_buffer(buffer, &val->data.byte, &m, PMIX_BYTE))) {
+                return ret;
+            }
+            break;
+        case PMIX_STRING:
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_unpack_buffer(buffer, &val->data.string, &m, PMIX_STRING))) {
+                return ret;
+            }
+            break;
+        case PMIX_SIZE:
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_unpack_buffer(buffer, &val->data.size, &m, PMIX_SIZE))) {
+                return ret;
+            }
+            break;
+        case PMIX_PID:
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_unpack_buffer(buffer, &val->data.pid, &m, PMIX_PID))) {
+                return ret;
+            }
+            break;
+        case PMIX_INT:
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_unpack_buffer(buffer, &val->data.integer, &m, PMIX_INT))) {
+                return ret;
+            }
+            break;
+        case PMIX_INT8:
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_unpack_buffer(buffer, &val->data.int8, &m, PMIX_INT8))) {
+                return ret;
+            }
+            break;
+        case PMIX_INT16:
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_unpack_buffer(buffer, &val->data.int16, &m, PMIX_INT16))) {
+                return ret;
+            }
+            break;
+        case PMIX_INT32:
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_unpack_buffer(buffer, &val->data.int32, &m, PMIX_INT32))) {
+                return ret;
+            }
+            break;
+        case PMIX_INT64:
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_unpack_buffer(buffer, &val->data.int64, &m, PMIX_INT64))) {
+                return ret;
+            }
+            break;
+        case PMIX_UINT:
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_unpack_buffer(buffer, &val->data.uint, &m, PMIX_UINT))) {
+                return ret;
+            }
+            break;
+        case PMIX_UINT8:
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_unpack_buffer(buffer, &val->data.uint8, &m, PMIX_UINT8))) {
+                return ret;
+            }
+            break;
+        case PMIX_UINT16:
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_unpack_buffer(buffer, &val->data.uint16, &m, PMIX_UINT16))) {
+                return ret;
+            }
+            break;
+        case PMIX_UINT32:
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_unpack_buffer(buffer, &val->data.uint32, &m, PMIX_UINT32))) {
+                return ret;
+            }
+            break;
+        case PMIX_UINT64:
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_unpack_buffer(buffer, &val->data.uint64, &m, PMIX_UINT64))) {
+                return ret;
+            }
+            break;
+        case PMIX_FLOAT:
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_unpack_buffer(buffer, &val->data.fval, &m, PMIX_FLOAT))) {
+                return ret;
+            }
+            break;
+        case PMIX_DOUBLE:
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_unpack_buffer(buffer, &val->data.dval, &m, PMIX_DOUBLE))) {
+                return ret;
+            }
+            break;
+        case PMIX_TIMEVAL:
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_unpack_buffer(buffer, &val->data.tv, &m, PMIX_TIMEVAL))) {
+                return ret;
+            }
+            break;
+        case PMIX_TIME:
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_unpack_buffer(buffer, &val->data.time, &m, PMIX_TIME))) {
+                return ret;
+            }
+            break;
+        case PMIX_STATUS:
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_unpack_buffer(buffer, &val->data.status, &m, PMIX_STATUS))) {
+                return ret;
+            }
+            break;
+        case PMIX_PROC:
+            /* this field is now a pointer, so we must allocate storage for it */
+            PMIX_PROC_CREATE(val->data.proc, m);
+            if (NULL == val->data.proc) {
+                return PMIX_ERR_NOMEM;
+            }
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_unpack_buffer(buffer, val->data.proc, &m, PMIX_PROC))) {
+                return ret;
+            }
+            break;
+        case PMIX_PROC_RANK:
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_unpack_buffer(buffer, &val->data.rank, &m, PMIX_PROC_RANK))) {
+                return ret;
+            }
+            break;
+        case PMIX_BYTE_OBJECT:
+        case PMIX_COMPRESSED_STRING:
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_unpack_buffer(buffer, &val->data.bo, &m, PMIX_BYTE_OBJECT))) {
+                return ret;
+            }
+            break;
+        case PMIX_PERSIST:
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_unpack_buffer(buffer, &val->data.proc, &m, PMIX_PROC))) {
+                return ret;
+            }
+            break;
+        case PMIX_POINTER:
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_unpack_buffer(buffer, &val->data.ptr, &m, PMIX_POINTER))) {
+                return ret;
+            }
+            break;
+        case PMIX_SCOPE:
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_unpack_buffer(buffer, &val->data.scope, &m, PMIX_SCOPE))) {
+                return ret;
+            }
+            break;
+        case PMIX_DATA_RANGE:
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_unpack_buffer(buffer, &val->data.range, &m, PMIX_DATA_RANGE))) {
+                return ret;
+            }
+            break;
+        case PMIX_PROC_STATE:
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_unpack_buffer(buffer, &val->data.state, &m, PMIX_PROC_STATE))) {
+                return ret;
+            }
+            break;
+        case PMIX_PROC_INFO:
+            /* this is now a pointer, so allocate storage for it */
+            PMIX_PROC_INFO_CREATE(val->data.pinfo, 1);
+            if (NULL == val->data.pinfo) {
+                return PMIX_ERR_NOMEM;
+            }
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_unpack_buffer(buffer, val->data.pinfo, &m, PMIX_PROC_INFO))) {
+                return ret;
+            }
+            break;
+        case PMIX_DATA_ARRAY:
+            /* this is now a pointer, so allocate storage for it */
+            val->data.darray = (pmix_data_array_t*)malloc(sizeof(pmix_data_array_t));
+            if (NULL == val->data.darray) {
+                return PMIX_ERR_NOMEM;
+            }
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_unpack_buffer(buffer, val->data.darray, &m, PMIX_DATA_ARRAY))) {
+                return ret;
+            }
+            break;
+        case PMIX_QUERY:
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_unpack_buffer(buffer, val->data.darray, &m, PMIX_QUERY))) {
+                return ret;
+            }
+            break;
+        /**** DEPRECATED ****/
+        case PMIX_INFO_ARRAY:
+            /* this field is now a pointer, so we must allocate storage for it */
+            val->data.array = (pmix_info_array_t*)malloc(sizeof(pmix_info_array_t));
+            if (NULL == val->data.array) {
+                return PMIX_ERR_NOMEM;
+            }
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_unpack_buffer(buffer, val->data.array, &m, PMIX_INFO_ARRAY))) {
+                return ret;
+            }
+            break;
+        /********************/
+        default:
+            pmix_output(0, "UNPACK-PMIX-VALUE: UNSUPPORTED TYPE %d", (int)val->type);
+            return PMIX_ERROR;
+    }
+
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_bfrop_unpack_value(pmix_buffer_t *buffer, void *dest,
+                                      int32_t *num_vals, pmix_data_type_t type)
+{
+    pmix_value_t *ptr;
+    int32_t i, n;
+    pmix_status_t ret;
+
+    ptr = (pmix_value_t *) dest;
+    n = *num_vals;
+
+    for (i = 0; i < n; ++i) {
+        /* unpack the type */
+        if (PMIX_SUCCESS != (ret = pmix_bfrop_get_data_type(buffer, &ptr[i].type))) {
+            return ret;
+        }
+        /* unpack value */
+        if (PMIX_SUCCESS != (ret = unpack_val(buffer, &ptr[i])) ) {
+            return ret;
+        }
+    }
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_bfrop_unpack_info(pmix_buffer_t *buffer, void *dest,
+                           int32_t *num_vals, pmix_data_type_t type)
+{
+    pmix_info_t *ptr;
+    int32_t i, n, m;
+    pmix_status_t ret;
+    char *tmp;
+
+    pmix_output_verbose(20, pmix_globals.debug_output,
+                        "pmix_bfrop_unpack: %d info", *num_vals);
+
+    ptr = (pmix_info_t *) dest;
+    n = *num_vals;
+
+    for (i = 0; i < n; ++i) {
+        memset(ptr[i].key, 0, sizeof(ptr[i].key));
+        memset(&ptr[i].value, 0, sizeof(pmix_value_t));
+        /* unpack key */
+        m=1;
+        tmp = NULL;
+        if (PMIX_SUCCESS != (ret = pmix_bfrop_unpack_string(buffer, &tmp, &m, PMIX_STRING))) {
+            PMIX_ERROR_LOG(ret);
+            return ret;
+        }
+        if (NULL == tmp) {
+            PMIX_ERROR_LOG(PMIX_ERROR);
+            return PMIX_ERROR;
+        }
+        (void)strncpy(ptr[i].key, tmp, PMIX_MAX_KEYLEN);
+        free(tmp);
+        /* unpack the flags */
+        m=1;
+        if (PMIX_SUCCESS != (ret = pmix_bfrop_unpack_infodirs(buffer, &ptr[i].flags, &m, PMIX_INFO_DIRECTIVES))) {
+            PMIX_ERROR_LOG(ret);
+            return ret;
+        }
+        /* unpack value - since the value structure is statically-defined
+         * instead of a pointer in this struct, we directly unpack it to
+         * avoid the malloc */
+         m=1;
+         if (PMIX_SUCCESS != (ret = pmix_bfrop_unpack_int(buffer, &ptr[i].value.type, &m, PMIX_INT))) {
+            PMIX_ERROR_LOG(ret);
+            return ret;
+        }
+        pmix_output_verbose(20, pmix_globals.debug_output,
+                            "pmix_bfrop_unpack: info type %d", ptr[i].value.type);
+        m=1;
+        if (PMIX_SUCCESS != (ret = unpack_val(buffer, &ptr[i].value))) {
+            PMIX_ERROR_LOG(ret);
+            return ret;
+        }
+    }
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_bfrop_unpack_pdata(pmix_buffer_t *buffer, void *dest,
+                            int32_t *num_vals, pmix_data_type_t type)
+{
+    pmix_pdata_t *ptr;
+    int32_t i, n, m;
+    pmix_status_t ret;
+    char *tmp;
+
+    pmix_output_verbose(20, pmix_globals.debug_output,
+                        "pmix_bfrop_unpack: %d pdata", *num_vals);
+
+    ptr = (pmix_pdata_t *) dest;
+    n = *num_vals;
+
+    for (i = 0; i < n; ++i) {
+        PMIX_PDATA_CONSTRUCT(&ptr[i]);
+        /* unpack the proc */
+        m=1;
+        if (PMIX_SUCCESS != (ret = pmix_bfrop_unpack_proc(buffer, &ptr[i].proc, &m, PMIX_PROC))) {
+            return ret;
+        }
+        /* unpack key */
+        m=1;
+        tmp = NULL;
+        if (PMIX_SUCCESS != (ret = pmix_bfrop_unpack_string(buffer, &tmp, &m, PMIX_STRING))) {
+            return ret;
+        }
+        if (NULL == tmp) {
+            return PMIX_ERROR;
+        }
+        (void)strncpy(ptr[i].key, tmp, PMIX_MAX_KEYLEN);
+        free(tmp);
+        /* unpack value - since the value structure is statically-defined
+         * instead of a pointer in this struct, we directly unpack it to
+         * avoid the malloc */
+         m=1;
+         if (PMIX_SUCCESS != (ret = pmix_bfrop_unpack_int(buffer, &ptr[i].value.type, &m, PMIX_INT))) {
+            return ret;
+        }
+        pmix_output_verbose(20, pmix_globals.debug_output,
+                            "pmix_bfrop_unpack: pdata type %d", ptr[i].value.type);
+        m=1;
+        if (PMIX_SUCCESS != (ret = unpack_val(buffer, &ptr[i].value))) {
+            return ret;
+        }
+    }
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_bfrop_unpack_buf(pmix_buffer_t *buffer, void *dest,
+                          int32_t *num_vals, pmix_data_type_t type)
+{
+    pmix_buffer_t **ptr;
+    int32_t i, n, m;
+    pmix_status_t ret;
+    size_t nbytes;
+
+    ptr = (pmix_buffer_t **) dest;
+    n = *num_vals;
+
+    for (i = 0; i < n; ++i) {
+        /* allocate the new object */
+        ptr[i] = PMIX_NEW(pmix_buffer_t);
+        if (NULL == ptr[i]) {
+            return PMIX_ERR_OUT_OF_RESOURCE;
+        }
+        /* unpack the number of bytes */
+        m=1;
+        if (PMIX_SUCCESS != (ret = pmix_bfrop_unpack_sizet(buffer, &nbytes, &m, PMIX_SIZE))) {
+            return ret;
+        }
+        m = nbytes;
+        /* setup the buffer's data region */
+        if (0 < nbytes) {
+            ptr[i]->base_ptr = (char*)malloc(nbytes);
+            /* unpack the bytes */
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_unpack_byte(buffer, ptr[i]->base_ptr, &m, PMIX_BYTE))) {
+                return ret;
+            }
+        }
+        ptr[i]->pack_ptr = ptr[i]->base_ptr + m;
+        ptr[i]->unpack_ptr = ptr[i]->base_ptr;
+        ptr[i]->bytes_allocated = nbytes;
+        ptr[i]->bytes_used = m;
+    }
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_bfrop_unpack_proc(pmix_buffer_t *buffer, void *dest,
+                           int32_t *num_vals, pmix_data_type_t type)
+{
+    pmix_proc_t *ptr;
+    int32_t i, n, m;
+    pmix_status_t ret;
+    char *tmp;
+
+    pmix_output_verbose(20, pmix_globals.debug_output,
+                        "pmix_bfrop_unpack: %d procs", *num_vals);
+
+    ptr = (pmix_proc_t *) dest;
+    n = *num_vals;
+
+    for (i = 0; i < n; ++i) {
+        pmix_output_verbose(20, pmix_globals.debug_output,
+                            "pmix_bfrop_unpack: init proc[%d]", i);
+        memset(&ptr[i], 0, sizeof(pmix_proc_t));
+        /* unpack nspace */
+        m=1;
+        tmp = NULL;
+        if (PMIX_SUCCESS != (ret = pmix_bfrop_unpack_string(buffer, &tmp, &m, PMIX_STRING))) {
+            return ret;
+        }
+        if (NULL == tmp) {
+            return PMIX_ERROR;
+        }
+        (void)strncpy(ptr[i].nspace, tmp, PMIX_MAX_NSLEN);
+        free(tmp);
+        /* unpack the rank */
+        m=1;
+        if (PMIX_SUCCESS != (ret = pmix_bfrop_unpack_rank(buffer, &ptr[i].rank, &m, PMIX_PROC_RANK))) {
+            return ret;
+        }
+    }
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_bfrop_unpack_app(pmix_buffer_t *buffer, void *dest,
+                          int32_t *num_vals, pmix_data_type_t type)
+{
+    pmix_app_t *ptr;
+    int32_t i, k, n, m;
+    pmix_status_t ret;
+    int32_t nval;
+    char *tmp;
+
+    pmix_output_verbose(20, pmix_globals.debug_output,
+                        "pmix_bfrop_unpack: %d apps", *num_vals);
+
+    ptr = (pmix_app_t *) dest;
+    n = *num_vals;
+
+    for (i = 0; i < n; ++i) {
+        /* initialize the fields */
+        PMIX_APP_CONSTRUCT(&ptr[i]);
+        /* unpack cmd */
+        m=1;
+        if (PMIX_SUCCESS != (ret = pmix_bfrop_unpack_string(buffer, &ptr[i].cmd, &m, PMIX_STRING))) {
+            return ret;
+        }
+        /* unpack argc */
+        m=1;
+        if (PMIX_SUCCESS != (ret = pmix_bfrop_unpack_int(buffer, &nval, &m, PMIX_INT32))) {
+            return ret;
+        }
+        /* unpack argv */
+        for (k=0; k < nval; k++) {
+            m=1;
+            tmp = NULL;
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_unpack_string(buffer, &tmp, &m, PMIX_STRING))) {
+                return ret;
+            }
+            if (NULL == tmp) {
+                return PMIX_ERROR;
+            }
+            pmix_argv_append_nosize(&ptr[i].argv, tmp);
+            free(tmp);
+        }
+        /* unpack env */
+        m=1;
+        if (PMIX_SUCCESS != (ret = pmix_bfrop_unpack_int32(buffer, &nval, &m, PMIX_INT32))) {
+            return ret;
+        }
+        for (k=0; k < nval; k++) {
+            m=1;
+            tmp = NULL;
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_unpack_string(buffer, &tmp, &m, PMIX_STRING))) {
+                return ret;
+            }
+            if (NULL == tmp) {
+                return PMIX_ERROR;
+            }
+            pmix_argv_append_nosize(&ptr[i].env, tmp);
+            free(tmp);
+        }
+        /* unpack cwd */
+        m=1;
+        if (PMIX_SUCCESS != (ret = pmix_bfrop_unpack_string(buffer, &ptr[i].cwd, &m, PMIX_STRING))) {
+            return ret;
+        }
+        /* unpack maxprocs */
+        m=1;
+        if (PMIX_SUCCESS != (ret = pmix_bfrop_unpack_int(buffer, &ptr[i].maxprocs, &m, PMIX_INT))) {
+            return ret;
+        }
+        /* unpack info array */
+        m=1;
+        if (PMIX_SUCCESS != (ret = pmix_bfrop_unpack_sizet(buffer, &ptr[i].ninfo, &m, PMIX_SIZE))) {
+            return ret;
+        }
+        if (0 < ptr[i].ninfo) {
+            PMIX_INFO_CREATE(ptr[i].info, ptr[i].ninfo);
+            m = ptr[i].ninfo;
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_unpack_info(buffer, ptr[i].info, &m, PMIX_INFO))) {
+                return ret;
+            }
+        }
+    }
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_bfrop_unpack_kval(pmix_buffer_t *buffer, void *dest,
+                           int32_t *num_vals, pmix_data_type_t type)
+{
+    pmix_kval_t *ptr;
+    int32_t i, n, m;
+    pmix_status_t ret;
+
+    pmix_output_verbose(20, pmix_globals.debug_output,
+                        "pmix_bfrop_unpack: %d kvals", *num_vals);
+
+    ptr = (pmix_kval_t*) dest;
+    n = *num_vals;
+
+    for (i = 0; i < n; ++i) {
+        PMIX_CONSTRUCT(&ptr[i], pmix_kval_t);
+        /* unpack the key */
+        m = 1;
+        if (PMIX_SUCCESS != (ret = pmix_bfrop_unpack_string(buffer, &ptr[i].key, &m, PMIX_STRING))) {
+            PMIX_ERROR_LOG(ret);
+            return ret;
+        }
+        /* allocate the space */
+        ptr[i].value = (pmix_value_t*)malloc(sizeof(pmix_value_t));
+        /* unpack the value */
+        m = 1;
+        if (PMIX_SUCCESS != (ret = pmix_bfrop_unpack_value(buffer, ptr[i].value, &m, PMIX_VALUE))) {
+            PMIX_ERROR_LOG(ret);
+            return ret;
+        }
+    }
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_bfrop_unpack_modex(pmix_buffer_t *buffer, void *dest,
+                            int32_t *num_vals, pmix_data_type_t type)
+{
+    pmix_modex_data_t *ptr;
+    int32_t i, n, m;
+    pmix_status_t ret;
+
+    pmix_output_verbose(20, pmix_globals.debug_output,
+                        "pmix_bfrop_unpack: %d modex", *num_vals);
+
+    ptr = (pmix_modex_data_t *) dest;
+    n = *num_vals;
+
+    for (i = 0; i < n; ++i) {
+        memset(&ptr[i], 0, sizeof(pmix_modex_data_t));
+        /* unpack the number of bytes */
+        m=1;
+        if (PMIX_SUCCESS != (ret = pmix_bfrop_unpack_sizet(buffer, &ptr[i].size, &m, PMIX_SIZE))) {
+            return ret;
+        }
+        if (0 < ptr[i].size) {
+            ptr[i].blob = (uint8_t*)malloc(ptr[i].size * sizeof(uint8_t));
+            m=ptr[i].size;
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_unpack_byte(buffer, ptr[i].blob, &m, PMIX_UINT8))) {
+                return ret;
+            }
+        }
+    }
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_bfrop_unpack_persist(pmix_buffer_t *buffer, void *dest,
+                                        int32_t *num_vals, pmix_data_type_t type)
+{
+    return pmix_bfrop_unpack_byte(buffer, dest, num_vals, PMIX_UINT8);
+}
+
+pmix_status_t pmix_bfrop_unpack_scope(pmix_buffer_t *buffer, void *dest,
+                                      int32_t *num_vals, pmix_data_type_t type)
+{
+    return pmix_bfrop_unpack_byte(buffer, dest, num_vals, PMIX_UINT8);
+}
+
+pmix_status_t pmix_bfrop_unpack_range(pmix_buffer_t *buffer, void *dest,
+                                      int32_t *num_vals, pmix_data_type_t type)
+{
+    return pmix_bfrop_unpack_byte(buffer, dest, num_vals, PMIX_UINT8);
+}
+
+pmix_status_t pmix_bfrop_unpack_cmd(pmix_buffer_t *buffer, void *dest,
+                                    int32_t *num_vals, pmix_data_type_t type)
+{
+    return pmix_bfrop_unpack_byte(buffer, dest, num_vals, PMIX_UINT8);
+}
+
+pmix_status_t pmix_bfrop_unpack_infodirs(pmix_buffer_t *buffer, void *dest,
+                                         int32_t *num_vals, pmix_data_type_t type)
+{
+    return pmix_bfrop_unpack_int32(buffer, dest, num_vals, PMIX_UINT32);
+}
+
+pmix_status_t pmix_bfrop_unpack_bo(pmix_buffer_t *buffer, void *dest,
+                         int32_t *num_vals, pmix_data_type_t type)
+{
+    pmix_byte_object_t *ptr;
+    int32_t i, n, m;
+    pmix_status_t ret;
+
+    pmix_output_verbose(20, pmix_globals.debug_output,
+                        "pmix_bfrop_unpack: %d byte_object", *num_vals);
+
+    ptr = (pmix_byte_object_t *) dest;
+    n = *num_vals;
+
+    for (i = 0; i < n; ++i) {
+        memset(&ptr[i], 0, sizeof(pmix_byte_object_t));
+        /* unpack the number of bytes */
+        m=1;
+        if (PMIX_SUCCESS != (ret = pmix_bfrop_unpack_sizet(buffer, &ptr[i].size, &m, PMIX_SIZE))) {
+            return ret;
+        }
+        if (0 < ptr[i].size) {
+            ptr[i].bytes = (char*)malloc(ptr[i].size * sizeof(char));
+            m=ptr[i].size;
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_unpack_byte(buffer, ptr[i].bytes, &m, PMIX_BYTE))) {
+                return ret;
+            }
+        }
+    }
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_bfrop_unpack_ptr(pmix_buffer_t *buffer, void *dest,
+                          int32_t *num_vals, pmix_data_type_t type)
+{
+    uint8_t foo=1;
+    int32_t cnt=1;
+
+    /* it obviously makes no sense to pack a pointer and
+     * send it somewhere else, so we just unpack the sentinel */
+    return pmix_bfrop_unpack_byte(buffer, &foo, &cnt, PMIX_UINT8);
+}
+
+pmix_status_t pmix_bfrop_unpack_pstate(pmix_buffer_t *buffer, void *dest,
+                                       int32_t *num_vals, pmix_data_type_t type)
+{
+    return pmix_bfrop_unpack_byte(buffer, dest, num_vals, PMIX_UINT8);
+}
+
+
+pmix_status_t pmix_bfrop_unpack_pinfo(pmix_buffer_t *buffer, void *dest,
+                                      int32_t *num_vals, pmix_data_type_t type)
+{
+    pmix_proc_info_t *ptr;
+    int32_t i, n, m;
+    pmix_status_t ret;
+
+    pmix_output_verbose(20, pmix_globals.debug_output,
+                        "pmix_bfrop_unpack: %d pinfo", *num_vals);
+
+    ptr = (pmix_proc_info_t *) dest;
+    n = *num_vals;
+
+    for (i = 0; i < n; ++i) {
+        PMIX_PROC_INFO_CONSTRUCT(&ptr[i]);
+        /* unpack the proc */
+        m=1;
+        if (PMIX_SUCCESS != (ret = pmix_bfrop_unpack_proc(buffer, &ptr[i].proc, &m, PMIX_PROC))) {
+            return ret;
+        }
+        /* unpack the hostname */
+        m=1;
+        if (PMIX_SUCCESS != (ret = pmix_bfrop_unpack_string(buffer, &ptr[i].hostname, &m, PMIX_STRING))) {
+            return ret;
+        }
+        /* unpack the executable */
+        m=1;
+        if (PMIX_SUCCESS != (ret = pmix_bfrop_unpack_string(buffer, &ptr[i].executable_name, &m, PMIX_STRING))) {
+            return ret;
+        }
+        /* unpack pid */
+         m=1;
+         if (PMIX_SUCCESS != (ret = pmix_bfrop_unpack_pid(buffer, &ptr[i].pid, &m, PMIX_PID))) {
+            return ret;
+        }
+        /* unpack state */
+         m=1;
+         if (PMIX_SUCCESS != (ret = pmix_bfrop_unpack_pstate(buffer, &ptr[i].state, &m, PMIX_PROC_STATE))) {
+            return ret;
+        }
+    }
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_bfrop_unpack_darray(pmix_buffer_t *buffer, void *dest,
+                                       int32_t *num_vals, pmix_data_type_t type)
+{
+    pmix_data_array_t *ptr;
+    int32_t i, n, m;
+    pmix_status_t ret;
+    size_t nbytes;
+
+    pmix_output_verbose(20, pmix_globals.debug_output,
+                        "pmix_bfrop_unpack: %d data arrays", *num_vals);
+
+    ptr = (pmix_data_array_t *) dest;
+    n = *num_vals;
+
+    for (i = 0; i < n; ++i) {
+        memset(&ptr[i], 0, sizeof(pmix_data_array_t));
+        /* unpack the type */
+        m=1;
+        if (PMIX_SUCCESS != (ret = pmix_bfrop_unpack_datatype(buffer, &ptr[i].type, &m, PMIX_DATA_TYPE))) {
+            return ret;
+        }
+        /* unpack the number of array elements */
+        m=1;
+        if (PMIX_SUCCESS != (ret = pmix_bfrop_unpack_sizet(buffer, &ptr[i].size, &m, PMIX_SIZE))) {
+            return ret;
+        }
+        if (0 == ptr[i].size || PMIX_UNDEF == ptr[i].type) {
+            /* nothing else to do */
+            continue;
+        }
+        /* allocate storage for the array and unpack the array elements */
+        m = ptr[i].size;
+        switch(ptr[i].type) {
+            case PMIX_BOOL:
+                nbytes = sizeof(bool);
+                break;
+            case PMIX_BYTE:
+            case PMIX_INT8:
+            case PMIX_UINT8:
+                nbytes = sizeof(int8_t);
+                break;
+            case PMIX_INT16:
+            case PMIX_UINT16:
+                nbytes = sizeof(int16_t);
+                break;
+            case PMIX_INT32:
+            case PMIX_UINT32:
+                nbytes = sizeof(int32_t);
+                break;
+            case PMIX_INT64:
+            case PMIX_UINT64:
+                nbytes = sizeof(int64_t);
+                break;
+            case PMIX_STRING:
+                nbytes = sizeof(char*);
+                break;
+            case PMIX_SIZE:
+                nbytes = sizeof(size_t);
+                break;
+            case PMIX_PID:
+                nbytes = sizeof(pid_t);
+                break;
+            case PMIX_INT:
+            case PMIX_UINT:
+                nbytes = sizeof(int);
+                break;
+            case PMIX_FLOAT:
+                nbytes = sizeof(float);
+                break;
+            case PMIX_DOUBLE:
+                nbytes = sizeof(double);
+                break;
+            case PMIX_TIMEVAL:
+                nbytes = sizeof(struct timeval);
+                break;
+            case PMIX_TIME:
+                nbytes = sizeof(time_t);
+                break;
+            case PMIX_STATUS:
+                nbytes = sizeof(pmix_status_t);
+                break;
+            case PMIX_INFO:
+                nbytes = sizeof(pmix_info_t);
+                break;
+            case PMIX_PROC:
+                nbytes = sizeof(pmix_proc_t);
+                break;
+            case PMIX_BYTE_OBJECT:
+            case PMIX_COMPRESSED_STRING:
+                nbytes = sizeof(pmix_byte_object_t);
+                break;
+            case PMIX_PERSIST:
+                nbytes = sizeof(pmix_persistence_t);
+                break;
+            case PMIX_SCOPE:
+                nbytes = sizeof(pmix_scope_t);
+                break;
+            case PMIX_DATA_RANGE:
+                nbytes = sizeof(pmix_data_range_t);
+                break;
+            case PMIX_PROC_STATE:
+                nbytes = sizeof(pmix_proc_state_t);
+                break;
+            case PMIX_PROC_INFO:
+                nbytes = sizeof(pmix_proc_info_t);
+                break;
+            case PMIX_QUERY:
+                nbytes = sizeof(pmix_query_t);
+            default:
+                return PMIX_ERR_NOT_SUPPORTED;
+        }
+        if (NULL == (ptr[i].array = malloc(m * nbytes))) {
+            return PMIX_ERR_NOMEM;
+        }
+        if (PMIX_SUCCESS != (ret = pmix_bfrop_unpack_buffer(buffer, ptr[i].array, &m, ptr[i].type))) {
+            return ret;
+        }
+    }
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_bfrop_unpack_rank(pmix_buffer_t *buffer, void *dest,
+                                     int32_t *num_vals, pmix_data_type_t type)
+{
+    return pmix_bfrop_unpack_int32(buffer, dest, num_vals, PMIX_UINT32);
+}
+
+pmix_status_t pmix_bfrop_unpack_query(pmix_buffer_t *buffer, void *dest,
+                                      int32_t *num_vals, pmix_data_type_t type)
+{
+    pmix_query_t *ptr;
+    int32_t i, n, m;
+    pmix_status_t ret;
+    int32_t nkeys;
+
+    pmix_output_verbose(20, pmix_globals.debug_output,
+                        "pmix_bfrop_unpack: %d queries", *num_vals);
+
+    ptr = (pmix_query_t *) dest;
+    n = *num_vals;
+
+    for (i = 0; i < n; ++i) {
+        PMIX_QUERY_CONSTRUCT(&ptr[i]);
+        /* unpack the number of keys */
+        m=1;
+        if (PMIX_SUCCESS != (ret = pmix_bfrop_unpack_int32(buffer, &nkeys, &m, PMIX_INT32))) {
+            return ret;
+        }
+        if (0 < nkeys) {
+            /* unpack the keys */
+            if (NULL == (ptr[i].keys = (char**)calloc(nkeys+1, sizeof(char*)))) {
+                return PMIX_ERR_NOMEM;
+            }
+            /* unpack keys */
+            m=nkeys;
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_unpack_string(buffer, ptr[i].keys, &m, PMIX_STRING))) {
+                return ret;
+            }
+        }
+        /* unpack the number of qualifiers */
+        m=1;
+        if (PMIX_SUCCESS != (ret = pmix_bfrop_unpack_sizet(buffer, &ptr[i].nqual, &m, PMIX_SIZE))) {
+            return ret;
+        }
+        if (0 < ptr[i].nqual) {
+            /* unpack the qualifiers */
+            PMIX_INFO_CREATE(ptr[i].qualifiers, ptr[i].nqual);
+            m =  ptr[i].nqual;
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_unpack_info(buffer, ptr[i].qualifiers, &m, PMIX_INFO))) {
+                return ret;
+            }
+        }
+    }
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_bfrop_unpack_alloc_directive(pmix_buffer_t *buffer, void *dest,
+                                                int32_t *num_vals, pmix_data_type_t type)
+{
+    return pmix_bfrop_unpack_byte(buffer, dest, num_vals, PMIX_UINT8);
+}
+
+
+/**** DEPRECATED ****/
+pmix_status_t pmix_bfrop_unpack_array(pmix_buffer_t *buffer, void *dest,
+                                      int32_t *num_vals, pmix_data_type_t type)
+{
+    pmix_info_array_t *ptr;
+    int32_t i, n, m;
+    pmix_status_t ret;
+
+    pmix_output_verbose(20, pmix_globals.debug_output,
+                        "pmix_bfrop_unpack: %d info arrays", *num_vals);
+
+    ptr = (pmix_info_array_t*) dest;
+    n = *num_vals;
+
+    for (i = 0; i < n; ++i) {
+        pmix_output_verbose(20, pmix_globals.debug_output,
+                            "pmix_bfrop_unpack: init array[%d]", i);
+        memset(&ptr[i], 0, sizeof(pmix_info_array_t));
+        /* unpack the size of this array */
+        m=1;
+        if (PMIX_SUCCESS != (ret = pmix_bfrop_unpack_sizet(buffer, &ptr[i].size, &m, PMIX_SIZE))) {
+            return ret;
+        }
+        if (0 < ptr[i].size) {
+            ptr[i].array = (pmix_info_t*)malloc(ptr[i].size * sizeof(pmix_info_t));
+            m=ptr[i].size;
+            if (PMIX_SUCCESS != (ret = pmix_bfrop_unpack_value(buffer, ptr[i].array, &m, PMIX_INFO))) {
+                return ret;
+            }
+        }
+    }
+    return PMIX_SUCCESS;
+}
+/********************/
diff --git a/src/class/Makefile.include b/src/class/Makefile.include
new file mode 100644
index 0000000..9049951
--- /dev/null
+++ b/src/class/Makefile.include
@@ -0,0 +1,42 @@
+# -*- makefile -*-
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2007 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2013-2016 Intel, Inc. All rights reserved
+# Copyright (c) 2016      Cisco Systems, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# This makefile.am does not stand on its own - it is included from
+# Makefile.am
+
+# Source code files
+headers += \
+        class/pmix_object.h \
+        class/pmix_list.h \
+        class/pmix_pointer_array.h \
+        class/pmix_hash_table.h \
+        class/pmix_hotel.h \
+        class/pmix_ring_buffer.h \
+        class/pmix_value_array.h
+
+sources += \
+        class/pmix_object.c \
+        class/pmix_list.c \
+        class/pmix_pointer_array.c \
+        class/pmix_hash_table.c \
+        class/pmix_hotel.c \
+        class/pmix_ring_buffer.c \
+        class/pmix_value_array.c
diff --git a/src/class/pmix_hash_table.c b/src/class/pmix_hash_table.c
new file mode 100644
index 0000000..60809d9
--- /dev/null
+++ b/src/class/pmix_hash_table.c
@@ -0,0 +1,796 @@
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2005 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2014-2015 Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2014-2017 Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+
+#include <string.h>
+#include <stdlib.h>
+
+#include "src/util/output.h"
+#include "src/util/crc.h"
+#include "src/class/pmix_list.h"
+#include "src/class/pmix_hash_table.h"
+
+#include "include/pmix_common.h"
+
+/*
+ * pmix_hash_table_t
+ */
+
+#define HASH_MULTIPLIER 31
+
+/*
+ * Define the structs that are opaque in the .h
+ */
+
+struct pmix_hash_element_t {
+    int         valid;          /* whether this element is valid */
+    union {                     /* the key, in its various forms */
+        uint32_t        u32;
+        uint64_t        u64;
+        struct {
+            const void * key;
+            size_t      key_size;
+        }       ptr;
+    }           key;
+    void *      value;          /* the value */
+};
+typedef struct pmix_hash_element_t pmix_hash_element_t;
+
+struct pmix_hash_type_methods_t {
+    /* Frees any storage associated with the element
+     * The value is not owned by the hash table
+     * The key,key_size of pointer keys is
+     */
+    void        (*elt_destructor)(pmix_hash_element_t * elt);
+    /* Hash the key of the element -- for growing and adjusting-after-removal */
+    uint64_t    (*hash_elt)(pmix_hash_element_t * elt);
+};
+
+/* interact with the class-like mechanism */
+
+static void pmix_hash_table_construct(pmix_hash_table_t* ht);
+static void pmix_hash_table_destruct(pmix_hash_table_t* ht);
+
+PMIX_EXPORT PMIX_CLASS_INSTANCE(
+    pmix_hash_table_t,
+    pmix_object_t,
+    pmix_hash_table_construct,
+    pmix_hash_table_destruct
+);
+
+static void
+pmix_hash_table_construct(pmix_hash_table_t* ht)
+{
+  ht->ht_table = NULL;
+  ht->ht_capacity = ht->ht_size = ht->ht_growth_trigger = 0;
+  ht->ht_density_numer = ht->ht_density_denom = 0;
+  ht->ht_growth_numer = ht->ht_growth_denom = 0;
+  ht->ht_type_methods = NULL;
+}
+
+static void
+pmix_hash_table_destruct(pmix_hash_table_t* ht)
+{
+    pmix_hash_table_remove_all(ht);
+    free(ht->ht_table);
+}
+
+/*
+ * Init, etc
+ */
+
+static size_t
+pmix_hash_round_capacity_up(size_t capacity)
+{
+    /* round up to (1 mod 30) */
+    return ((capacity+29)/30*30 + 1);
+}
+
+/* this could be the new init if people wanted a more general API */
+/* (that's why it isn't static) */
+int                             /* PMIX_ return code */
+pmix_hash_table_init2(pmix_hash_table_t* ht, size_t estimated_max_size,
+                      int density_numer, int density_denom,
+                      int growth_numer, int growth_denom)
+{
+    size_t est_capacity = estimated_max_size * density_denom / density_numer;
+    size_t capacity = pmix_hash_round_capacity_up(est_capacity);
+    ht->ht_table = (pmix_hash_element_t*) calloc(capacity, sizeof(pmix_hash_element_t));
+    if (NULL == ht->ht_table) {
+        return PMIX_ERR_OUT_OF_RESOURCE;
+    }
+    ht->ht_capacity       = capacity;
+    ht->ht_density_numer  = density_numer;
+    ht->ht_density_denom  = density_denom;
+    ht->ht_growth_numer   = growth_numer;
+    ht->ht_growth_denom   = growth_denom;
+    ht->ht_growth_trigger = capacity * density_numer / density_denom;
+    ht->ht_type_methods   = NULL;
+    return PMIX_SUCCESS;
+}
+
+int                             /* PMIX_ return code */
+pmix_hash_table_init(pmix_hash_table_t* ht, size_t table_size)
+{
+    /* default to density of 1/2 and growth of 2/1 */
+    return pmix_hash_table_init2(ht, table_size, 1, 2, 2, 1);
+}
+
+int                             /* PMIX_ return code */
+pmix_hash_table_remove_all(pmix_hash_table_t* ht)
+{
+    size_t ii;
+    for (ii = 0; ii < ht->ht_capacity; ii += 1) {
+        pmix_hash_element_t * elt = &ht->ht_table[ii];
+        if (elt->valid && ht->ht_type_methods && ht->ht_type_methods->elt_destructor) {
+            ht->ht_type_methods->elt_destructor(elt);
+        }
+        elt->valid = 0;
+        elt->value = NULL;
+    }
+    ht->ht_size = 0;
+    /* the tests reuse the hash table for different types after removing all */
+    /* so we should allow that by forgetting what type it used to be */
+    ht->ht_type_methods = NULL;
+    return PMIX_SUCCESS;
+}
+
+static int                      /* PMIX_ return code */
+pmix_hash_grow(pmix_hash_table_t * ht)
+{
+    size_t jj, ii;
+    pmix_hash_element_t* old_table;
+    pmix_hash_element_t* new_table;
+    size_t old_capacity;
+    size_t new_capacity;
+
+    old_table    = ht->ht_table;
+    old_capacity = ht->ht_capacity;
+
+    new_capacity = old_capacity * ht->ht_growth_numer / ht->ht_growth_denom;
+    new_capacity = pmix_hash_round_capacity_up(new_capacity);
+
+    new_table    = (pmix_hash_element_t*) calloc(new_capacity, sizeof(new_table[0]));
+    if (NULL == new_table) {
+        return PMIX_ERR_OUT_OF_RESOURCE;
+    }
+
+    /* for each element of the old table (indexed by jj), insert it
+       into the new table (indexed by ii), using the hash_elt method
+       to generically hash an element, then modulo the new capacity,
+       and using struct-assignment to copy an old element into its
+       place int he new table.  The hash table never owns the value,
+       and in the case of ptr keys the old dlements will be blindly
+       deleted, so we still own the ptr key storage, just in the new
+       table now */
+    for (jj = 0; jj < old_capacity; jj += 1) {
+        pmix_hash_element_t * old_elt;
+        pmix_hash_element_t * new_elt;
+        old_elt =  &old_table[jj];
+        if (old_elt->valid) {
+            for (ii = (ht->ht_type_methods->hash_elt(old_elt)%new_capacity); ; ii += 1) {
+                if (ii == new_capacity) { ii = 0; }
+                new_elt = &new_table[ii];
+                if (! new_elt->valid) {
+                    *new_elt = *old_elt;
+                    break;
+                }
+            }
+        }
+    }
+    /* update with the new, free the old, return */
+    ht->ht_table = new_table;
+    ht->ht_capacity = new_capacity;
+    ht->ht_growth_trigger = new_capacity * ht->ht_density_numer / ht->ht_density_denom;
+    free(old_table);
+    return PMIX_SUCCESS;
+}
+
+/* one of the removal functions has determined which element should be
+   removed.  With the help of the type methods this can be generic.
+   The important thing is to rehash any valid elements immediately
+   following the element-being-removed */
+static int                      /* PMIX_ return code */
+pmix_hash_table_remove_elt_at(pmix_hash_table_t * ht, size_t ii)
+{
+    size_t jj, capacity = ht->ht_capacity;
+    pmix_hash_element_t* elts = ht->ht_table;
+    pmix_hash_element_t * elt;
+
+    elt = &elts[ii];
+
+    if (! elt->valid) {
+        /* huh?  removing a not-valid element? */
+        return PMIX_ERROR;
+    }
+
+    elt->valid = 0;
+    if (ht->ht_type_methods->elt_destructor) {
+        ht->ht_type_methods->elt_destructor(elt);
+    }
+
+    /* need to possibly re-insert followers because of the now-gap */
+    /* E.g., XYyAaCbz.  (where upper is ideal, lower is not)
+     * remove A
+     * leaving XYy.aCbz. and we need to reconsider aCbz
+     * first a gets reinserted where it wants to be: XYya.Cbz.
+     * next  C doesn't move:                         XYya.Cbz.
+     * then  b gets put where it wants to be:        XYyabC.z.
+     * then  z moves down a little:                  XYyabCz..
+     * then  . means we're done
+     */
+    for (ii = ii+1; ; ii += 1) { /* scan immediately following elements */
+        if (ii == capacity) { ii = 0; }
+        elt = &elts[ii];
+        if (! elt->valid) {
+            break;              /* done */
+        }
+        /* rehash it and move it if necessary */
+        for (jj = ht->ht_type_methods->hash_elt(elt)%capacity; ; jj += 1) {
+            if (jj == capacity) { jj = 0; }
+            if (jj == ii) {
+                /* already in place, either ideal or best-for-now */
+                break;
+            } else if (! elts[jj].valid) {
+                /* move it down, and invaildate where it came from */
+                elts[jj] = elts[ii];
+                elts[ii].valid = 0;
+                break;
+            } else {
+                /* still need to find its place */
+            }
+        }
+    }
+    ht->ht_size -= 1;
+    return PMIX_SUCCESS;
+}
+
+
+/***************************************************************************/
+
+static uint64_t
+pmix_hash_hash_elt_uint32(pmix_hash_element_t * elt)
+{
+  return elt->key.u32;
+}
+
+static const struct pmix_hash_type_methods_t
+pmix_hash_type_methods_uint32 = {
+    NULL,
+    pmix_hash_hash_elt_uint32
+};
+
+int                             /* PMIX_ return code */
+pmix_hash_table_get_value_uint32(pmix_hash_table_t* ht, uint32_t key, void * *value)
+{
+    size_t ii, capacity = ht->ht_capacity;
+    pmix_hash_element_t * elt;
+
+#if PMIX_ENABLE_DEBUG
+    if(capacity == 0) {
+        pmix_output(0, "pmix_hash_table_get_value_uint32:"
+                    "pmix_hash_table_init() has not been called");
+        return PMIX_ERROR;
+    }
+    if (NULL != ht->ht_type_methods &&
+        &pmix_hash_type_methods_uint32 != ht->ht_type_methods) {
+        pmix_output(0, "pmix_hash_table_get_value_uint32:"
+                    "hash table is for a different key type");
+            return PMIX_ERROR;
+    }
+#endif
+
+    ht->ht_type_methods = &pmix_hash_type_methods_uint32;
+    for (ii = key%capacity; ; ii += 1) {
+        if (ii == capacity) { ii = 0; }
+        elt = &ht->ht_table[ii];
+        if (! elt->valid) {
+            return PMIX_ERR_NOT_FOUND;
+        } else if (elt->key.u32 == key) {
+            *value = elt->value;
+            return PMIX_SUCCESS;
+        } else {
+            /* keey looking */
+        }
+    }
+
+}
+
+int                             /* PMIX_ return code */
+pmix_hash_table_set_value_uint32(pmix_hash_table_t * ht, uint32_t key, void * value)
+{
+    int rc;
+    size_t ii, capacity = ht->ht_capacity;
+    pmix_hash_element_t * elt;
+
+#if PMIX_ENABLE_DEBUG
+    if(capacity == 0) {
+        pmix_output(0, "pmix_hash_table_set_value_uint32:"
+                   "pmix_hash_table_init() has not been called");
+        return PMIX_ERR_BAD_PARAM;
+    }
+    if (NULL != ht->ht_type_methods &&
+        &pmix_hash_type_methods_uint32 != ht->ht_type_methods) {
+        pmix_output(0, "pmix_hash_table_set_value_uint32:"
+                    "hash table is for a different key type");
+            return PMIX_ERROR;
+    }
+#endif
+
+    ht->ht_type_methods = &pmix_hash_type_methods_uint32;
+    for (ii = key%capacity; ; ii += 1) {
+        if (ii == capacity) { ii = 0; }
+        elt = &ht->ht_table[ii];
+        if (! elt->valid) {
+            /* new entry */
+            elt->key.u32 = key;
+            elt->value = value;
+            elt->valid = 1;
+            ht->ht_size += 1;
+            if (ht->ht_size >= ht->ht_growth_trigger) {
+                if (PMIX_SUCCESS != (rc = pmix_hash_grow(ht))) {
+                    return rc;
+                }
+            }
+            return PMIX_SUCCESS;
+        } else if (elt->key.u32 == key) {
+            /* replace existing element */
+            elt->value = value;
+            return PMIX_SUCCESS;
+        } else {
+            /* keep looking */
+        }
+    }
+}
+
+int
+pmix_hash_table_remove_value_uint32(pmix_hash_table_t * ht, uint32_t key)
+{
+    size_t ii, capacity = ht->ht_capacity;
+
+#if PMIX_ENABLE_DEBUG
+    if(capacity == 0) {
+        pmix_output(0, "pmix_hash_table_get_value_uint32:"
+                    "pmix_hash_table_init() has not been called");
+        return PMIX_ERROR;
+    }
+    if (NULL != ht->ht_type_methods &&
+        &pmix_hash_type_methods_uint32 != ht->ht_type_methods) {
+        pmix_output(0, "pmix_hash_table_remove_value_uint32:"
+                    "hash table is for a different key type");
+            return PMIX_ERROR;
+    }
+#endif
+
+    ht->ht_type_methods = &pmix_hash_type_methods_uint32;
+    for (ii = key%capacity; ; ii += 1) {
+        pmix_hash_element_t * elt;
+        if (ii == capacity) ii = 0;
+        elt = &ht->ht_table[ii];
+        if (! elt->valid) {
+            return PMIX_ERR_NOT_FOUND;
+        } else if (elt->key.u32 == key) {
+            return pmix_hash_table_remove_elt_at(ht, ii);
+        } else {
+            /* keep looking */
+        }
+    }
+}
+
+
+/***************************************************************************/
+
+
+static uint64_t
+pmix_hash_hash_elt_uint64(pmix_hash_element_t * elt)
+{
+  return elt->key.u64;
+}
+
+static const struct pmix_hash_type_methods_t
+pmix_hash_type_methods_uint64 = {
+    NULL,
+    pmix_hash_hash_elt_uint64
+};
+
+int                             /* PMIX_ return code */
+pmix_hash_table_get_value_uint64(pmix_hash_table_t * ht, uint64_t key, void * *value)
+{
+    size_t ii;
+    size_t capacity = ht->ht_capacity;
+    pmix_hash_element_t * elt;
+
+#if PMIX_ENABLE_DEBUG
+    if(capacity == 0) {
+        pmix_output(0, "pmix_hash_table_get_value_uint64:"
+                   "pmix_hash_table_init() has not been called");
+        return PMIX_ERROR;
+    }
+    if (NULL != ht->ht_type_methods &&
+        &pmix_hash_type_methods_uint64 != ht->ht_type_methods) {
+        pmix_output(0, "pmix_hash_table_get_value_uint64:"
+                    "hash table is for a different key type");
+            return PMIX_ERROR;
+    }
+#endif
+
+    ht->ht_type_methods = &pmix_hash_type_methods_uint64;
+    for (ii = key%capacity; ; ii += 1) {
+        if (ii == capacity) { ii = 0; }
+        elt = &ht->ht_table[ii];
+        if (! elt->valid) {
+            return PMIX_ERR_NOT_FOUND;
+        } else if (elt->key.u64 == key) {
+            *value = elt->value;
+            return PMIX_SUCCESS;
+        } else {
+            /* keep looking */
+        }
+    }
+
+}
+
+int                             /* PMIX_ return code */
+pmix_hash_table_set_value_uint64(pmix_hash_table_t * ht, uint64_t key, void * value)
+{
+    int rc;
+    size_t ii, capacity = ht->ht_capacity;
+    pmix_hash_element_t * elt;
+
+#if PMIX_ENABLE_DEBUG
+    if(capacity == 0) {
+        pmix_output(0, "pmix_hash_table_set_value_uint64:"
+                   "pmix_hash_table_init() has not been called");
+        return PMIX_ERR_BAD_PARAM;
+    }
+    if (NULL != ht->ht_type_methods &&
+        &pmix_hash_type_methods_uint64 != ht->ht_type_methods) {
+        pmix_output(0, "pmix_hash_table_set_value_uint64:"
+                    "hash table is for a different key type");
+            return PMIX_ERROR;
+    }
+#endif
+
+    ht->ht_type_methods = &pmix_hash_type_methods_uint64;
+    for (ii = key%capacity; ; ii += 1) {
+        if (ii == capacity) { ii = 0; }
+        elt = &ht->ht_table[ii];
+        if (! elt->valid) {
+            /* new entry */
+            elt->key.u64 = key;
+            elt->value = value;
+            elt->valid = 1;
+            ht->ht_size += 1;
+            if (ht->ht_size >= ht->ht_growth_trigger) {
+                if (PMIX_SUCCESS != (rc = pmix_hash_grow(ht))) {
+                    return rc;
+                }
+            }
+            return PMIX_SUCCESS;
+        } else if (elt->key.u64 == key) {
+            elt->value = value;
+            return PMIX_SUCCESS;
+        } else {
+            /* keep looking */
+        }
+    }
+}
+
+
+int                             /* PMIX_ return code */
+pmix_hash_table_remove_value_uint64(pmix_hash_table_t * ht, uint64_t key)
+{
+    size_t ii, capacity = ht->ht_capacity;
+
+#if PMIX_ENABLE_DEBUG
+    if(capacity == 0) {
+        pmix_output(0, "pmix_hash_table_get_value_uint64:"
+                    "pmix_hash_table_init() has not been called");
+        return PMIX_ERROR;
+    }
+    if (NULL != ht->ht_type_methods &&
+        &pmix_hash_type_methods_uint64 != ht->ht_type_methods) {
+        pmix_output(0, "pmix_hash_table_remove_value_uint64:"
+                    "hash table is for a different key type");
+            return PMIX_ERROR;
+    }
+#endif
+
+    ht->ht_type_methods = &pmix_hash_type_methods_uint64;
+    for (ii = key%capacity; ; ii += 1) {
+        pmix_hash_element_t * elt;
+        if (ii == capacity) { ii = 0; }
+        elt = &ht->ht_table[ii];
+        if (! elt->valid) {
+            return PMIX_ERR_NOT_FOUND;
+        } else if (elt->key.u64 == key) {
+            return pmix_hash_table_remove_elt_at(ht, ii);
+        } else {
+            /* keep looking */
+        }
+    }
+}
+
+
+/***************************************************************************/
+
+/* helper function used in several places */
+static uint64_t
+pmix_hash_hash_key_ptr(const void * key, size_t key_size)
+{
+    uint64_t hash;
+    const unsigned char *scanner;
+    size_t ii;
+
+    hash = 0;
+    scanner = (const unsigned char *)key;
+    for (ii = 0; ii < key_size; ii += 1) {
+        hash = HASH_MULTIPLIER*hash + *scanner++;
+    }
+    return hash;
+}
+
+/* ptr methods */
+
+static void
+pmix_hash_destruct_elt_ptr(pmix_hash_element_t * elt)
+{
+    elt->key.ptr.key_size = 0;
+    void * key = (void *) elt->key.ptr.key; /* cast away const so we can free it */
+    if (NULL != key) {
+        elt->key.ptr.key = NULL;
+        free(key);
+    }
+}
+
+static uint64_t
+pmix_hash_hash_elt_ptr(pmix_hash_element_t * elt)
+{
+    return pmix_hash_hash_key_ptr(elt->key.ptr.key, elt->key.ptr.key_size);
+}
+
+static const struct pmix_hash_type_methods_t
+pmix_hash_type_methods_ptr = {
+    pmix_hash_destruct_elt_ptr,
+    pmix_hash_hash_elt_ptr
+};
+
+int                             /* PMIX_ return code */
+pmix_hash_table_get_value_ptr(pmix_hash_table_t * ht,
+                              const void * key, size_t key_size,
+                              void * *value)
+{
+    size_t ii, capacity = ht->ht_capacity;
+    pmix_hash_element_t * elt;
+
+#if PMIX_ENABLE_DEBUG
+    if(capacity == 0) {
+        pmix_output(0, "pmix_hash_table_get_value_ptr:"
+                   "pmix_hash_table_init() has not been called");
+        return PMIX_ERROR;
+    }
+    if (NULL != ht->ht_type_methods &&
+        &pmix_hash_type_methods_ptr != ht->ht_type_methods) {
+        pmix_output(0, "pmix_hash_table_get_value_ptr:"
+                    "hash table is for a different key type");
+            return PMIX_ERROR;
+    }
+#endif
+
+    ht->ht_type_methods = &pmix_hash_type_methods_ptr;
+    for (ii = pmix_hash_hash_key_ptr(key, key_size)%capacity; ; ii += 1) {
+        if (ii == capacity) { ii = 0; }
+        elt = &ht->ht_table[ii];
+        if (! elt->valid) {
+            return PMIX_ERR_NOT_FOUND;
+        } else if (elt->key.ptr.key_size == key_size &&
+                   0 == memcmp(elt->key.ptr.key, key, key_size)) {
+            *value = elt->value;
+            return PMIX_SUCCESS;
+        } else {
+            /* keep going */
+        }
+    }
+}
+
+int                             /* PMIX_ return code */
+pmix_hash_table_set_value_ptr(pmix_hash_table_t * ht,
+                              const void * key, size_t key_size,
+                              void * value)
+{
+    int rc;
+    size_t ii, capacity = ht->ht_capacity;
+    pmix_hash_element_t * elt;
+
+#if PMIX_ENABLE_DEBUG
+    if(capacity == 0) {
+        pmix_output(0, "pmix_hash_table_set_value_ptr:"
+                   "pmix_hash_table_init() has not been called");
+        return PMIX_ERR_BAD_PARAM;
+    }
+    if (NULL != ht->ht_type_methods &&
+        &pmix_hash_type_methods_ptr != ht->ht_type_methods) {
+        pmix_output(0, "pmix_hash_table_set_value_ptr:"
+                    "hash table is for a different key type");
+            return PMIX_ERROR;
+    }
+#endif
+
+    ht->ht_type_methods = &pmix_hash_type_methods_ptr;
+    for (ii = pmix_hash_hash_key_ptr(key, key_size)%capacity; ; ii += 1) {
+        if (ii == capacity) { ii = 0; }
+        elt = &ht->ht_table[ii];
+        if (! elt->valid) {
+            /* new entry */
+            void * key_local = malloc(key_size);
+            memcpy(key_local, key, key_size);
+            elt->key.ptr.key      = key_local;
+            elt->key.ptr.key_size = key_size;
+            elt->value = value;
+            elt->valid = 1;
+            ht->ht_size += 1;
+            if (ht->ht_size >= ht->ht_growth_trigger) {
+                if (PMIX_SUCCESS != (rc = pmix_hash_grow(ht))) {
+                    return rc;
+                }
+            }
+            return PMIX_SUCCESS;
+        } else if (elt->key.ptr.key_size == key_size &&
+                   0 == memcmp(elt->key.ptr.key, key, key_size)) {
+            /* replace existing value */
+            elt->value = value;
+            return PMIX_SUCCESS;
+        } else {
+            /* keep looking */
+        }
+    }
+}
+
+int                             /* PMIX_ return code */
+pmix_hash_table_remove_value_ptr(pmix_hash_table_t * ht,
+                                 const void * key, size_t key_size)
+{
+    size_t ii, capacity = ht->ht_capacity;
+
+#if PMIX_ENABLE_DEBUG
+    if(capacity == 0) {
+        pmix_output(0, "pmix_hash_table_get_value_ptr:"
+                    "pmix_hash_table_init() has not been called");
+        return PMIX_ERROR;
+    }
+    if (NULL != ht->ht_type_methods &&
+        &pmix_hash_type_methods_ptr != ht->ht_type_methods) {
+        pmix_output(0, "pmix_hash_table_remove_value_ptr:"
+                    "hash table is for a different key type");
+            return PMIX_ERROR;
+    }
+#endif
+
+    ht->ht_type_methods = &pmix_hash_type_methods_ptr;
+    for (ii = pmix_hash_hash_key_ptr(key, key_size)%capacity; ; ii += 1) {
+        pmix_hash_element_t * elt;
+        if (ii == capacity) { ii = 0; }
+        elt = &ht->ht_table[ii];
+        if (! elt->valid) {
+            return PMIX_ERR_NOT_FOUND;
+        } else if (elt->key.ptr.key_size == key_size &&
+                   0 == memcmp(elt->key.ptr.key, key, key_size)) {
+            return pmix_hash_table_remove_elt_at(ht, ii);
+        } else {
+            /* keep looking */
+        }
+    }
+}
+
+/***************************************************************************/
+/* Traversals */
+
+static int                      /* PMIX_ return code */
+pmix_hash_table_get_next_elt(pmix_hash_table_t *ht,
+                             pmix_hash_element_t * prev_elt, /* NULL means find first */
+                             pmix_hash_element_t * *next_elt)
+{
+  pmix_hash_element_t* elts = ht->ht_table;
+  size_t ii, capacity = ht->ht_capacity;
+
+  for (ii = (NULL == prev_elt ? 0 : (prev_elt-elts)+1); ii < capacity; ii += 1) {
+    pmix_hash_element_t * elt = &elts[ii];
+    if (elt->valid) {
+      *next_elt = elt;
+      return PMIX_SUCCESS;
+    }
+  }
+  return PMIX_ERROR;
+}
+
+int                             /* PMIX_ return code */
+pmix_hash_table_get_first_key_uint32(pmix_hash_table_t * ht,
+                                     uint32_t *key, void * *value,
+                                     void * *node)
+{
+  return pmix_hash_table_get_next_key_uint32(ht, key, value, NULL, node);
+}
+
+int                             /* PMIX_ return code */
+pmix_hash_table_get_next_key_uint32(pmix_hash_table_t * ht,
+                                    uint32_t *key, void * *value,
+                                    void * in_node, void * *out_node)
+{
+  pmix_hash_element_t * elt;
+  if (PMIX_SUCCESS == pmix_hash_table_get_next_elt(ht, (pmix_hash_element_t *) in_node, &elt)) {
+    *key       = elt->key.u32;
+    *value     = elt->value;
+    *out_node  = elt;
+    return PMIX_SUCCESS;
+  }
+  return PMIX_ERROR;
+}
+
+int                             /* PMIX_ return code */
+pmix_hash_table_get_first_key_ptr(pmix_hash_table_t * ht,
+                                  void * *key, size_t *key_size, void * *value,
+                                  void * *node)
+{
+  return pmix_hash_table_get_next_key_ptr(ht, key, key_size, value, NULL, node);
+}
+
+int                             /* PMIX_ return code */
+pmix_hash_table_get_next_key_ptr(pmix_hash_table_t * ht,
+                                 void * *key, size_t *key_size, void * *value,
+                                 void * in_node, void * *out_node)
+{
+  pmix_hash_element_t * elt;
+  if (PMIX_SUCCESS == pmix_hash_table_get_next_elt(ht, (pmix_hash_element_t *) in_node, &elt)) {
+    *key       = (void *)elt->key.ptr.key;
+    *key_size  = elt->key.ptr.key_size;
+    *value     = elt->value;
+    *out_node  = elt;
+    return PMIX_SUCCESS;
+  }
+  return PMIX_ERROR;
+}
+
+int                             /* PMIX_ return code */
+pmix_hash_table_get_first_key_uint64(pmix_hash_table_t * ht,
+                                     uint64_t *key, void * *value,
+                                     void * *node)
+{
+  return pmix_hash_table_get_next_key_uint64(ht, key, value, NULL, node);
+}
+
+int                             /* PMIX_ return code */
+pmix_hash_table_get_next_key_uint64(pmix_hash_table_t * ht,
+                                    uint64_t *key, void * *value,
+                                    void * in_node, void * *out_node)
+{
+  pmix_hash_element_t * elt;
+  if (PMIX_SUCCESS == pmix_hash_table_get_next_elt(ht, (pmix_hash_element_t *) in_node, &elt)) {
+    *key       = elt->key.u64;
+    *value     = elt->value;
+    *out_node  = elt;
+    return PMIX_SUCCESS;
+  }
+  return PMIX_ERROR;
+}
+
+/* there was/is no traversal for the ptr case; it would go here */
+/* interact with the class-like mechanism */
diff --git a/src/class/pmix_hash_table.h b/src/class/pmix_hash_table.h
new file mode 100644
index 0000000..c27d987
--- /dev/null
+++ b/src/class/pmix_hash_table.h
@@ -0,0 +1,399 @@
+/*
+ * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2005 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2015-2016 Intel, Inc. All rights reserved.
+ * Copyright (c) 2015-2016 Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2016      Mellanox Technologies, Inc.
+ *                         All rights reserved.
+ *
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ *
+ */
+
+/** @file
+ *
+ *  A hash table that may be indexed with either fixed length
+ *  (e.g. uint32_t/uint64_t) or arbitrary size binary key
+ *  values. However, only one key type may be used in a given table
+ *  concurrently.
+ */
+
+#ifndef PMIX_HASH_TABLE_H
+#define PMIX_HASH_TABLE_H
+
+#include <src/include/pmix_config.h>
+#include <src/include/prefetch.h>
+
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
+
+#include "src/class/pmix_list.h"
+
+#include <pmix_common.h>
+
+BEGIN_C_DECLS
+
+PMIX_CLASS_DECLARATION(pmix_hash_table_t);
+
+struct pmix_hash_table_t
+{
+    pmix_object_t        super;          /**< subclass of pmix_object_t */
+    struct pmix_hash_element_t * ht_table;       /**< table of elements (opaque to users) */
+    size_t               ht_capacity;    /**< allocated size (capacity) of table */
+    size_t               ht_size;        /**< number of extant entries */
+    size_t               ht_growth_trigger; /**< size hits this and table is grown  */
+    int                  ht_density_numer, ht_density_denom; /**< max allowed density of table */
+    int                  ht_growth_numer, ht_growth_denom;   /**< growth factor when grown  */
+    const struct pmix_hash_type_methods_t * ht_type_methods;
+};
+typedef struct pmix_hash_table_t pmix_hash_table_t;
+
+
+
+/**
+ *  Initializes the table size, must be called before using
+ *  the table.
+ *
+ *  @param   table   The input hash table (IN).
+ *  @param   size    The size of the table, which will be rounded up
+ *                   (if required) to the next highest power of two (IN).
+ *  @return  PMIX error code.
+ *
+ */
+
+PMIX_EXPORT int pmix_hash_table_init(pmix_hash_table_t* ht, size_t table_size);
+
+/* this could be the new init if people wanted a more general API */
+PMIX_EXPORT int pmix_hash_table_init2(pmix_hash_table_t* ht, size_t estimated_max_size,
+                                        int density_numer, int density_denom,
+                                        int growth_numer, int growth_denom);
+
+/**
+ *  Returns the number of elements currently stored in the table.
+ *
+ *  @param   table   The input hash table (IN).
+ *  @return  The number of elements in the table.
+ *
+ */
+
+static inline size_t pmix_hash_table_get_size(pmix_hash_table_t *ht)
+{
+    return ht->ht_size;
+}
+
+/**
+ *  Remove all elements from the table.
+ *
+ *  @param   table   The input hash table (IN).
+ *  @return  PMIX return code.
+ *
+ */
+
+PMIX_EXPORT int pmix_hash_table_remove_all(pmix_hash_table_t *ht);
+
+/**
+ *  Retrieve value via uint32_t key.
+ *
+ *  @param   table   The input hash table (IN).
+ *  @param   key     The input key (IN).
+ *  @param   ptr     The value associated with the key
+ *  @return  integer return code:
+ *           - PMIX_SUCCESS       if key was found
+ *           - PMIX_ERR_NOT_FOUND if key was not found
+ *           - PMIX_ERROR         other error
+ *
+ */
+
+PMIX_EXPORT int pmix_hash_table_get_value_uint32(pmix_hash_table_t* table, uint32_t key,
+                                                   void** ptr);
+
+/**
+ *  Set value based on uint32_t key.
+ *
+ *  @param   table   The input hash table (IN).
+ *  @param   key     The input key (IN).
+ *  @param   value   The value to be associated with the key (IN).
+ *  @return  PMIX return code.
+ *
+ */
+
+PMIX_EXPORT int pmix_hash_table_set_value_uint32(pmix_hash_table_t* table, uint32_t key, void* value);
+
+/**
+ *  Remove value based on uint32_t key.
+ *
+ *  @param   table   The input hash table (IN).
+ *  @param   key     The input key (IN).
+ *  @return  PMIX return code.
+ *
+ */
+
+PMIX_EXPORT int pmix_hash_table_remove_value_uint32(pmix_hash_table_t* table, uint32_t key);
+
+/**
+ *  Retrieve value via uint64_t key.
+ *
+ *  @param   table   The input hash table (IN).
+ *  @param   key     The input key (IN).
+ *  @param   ptr     The value associated with the key
+ *  @return  integer return code:
+ *           - PMIX_SUCCESS       if key was found
+ *           - PMIX_ERR_NOT_FOUND if key was not found
+ *           - PMIX_ERROR         other error
+ *
+ */
+
+PMIX_EXPORT int pmix_hash_table_get_value_uint64(pmix_hash_table_t *table, uint64_t key,
+                                                   void **ptr);
+
+/**
+ *  Set value based on uint64_t key.
+ *
+ *  @param   table   The input hash table (IN).
+ *  @param   key     The input key (IN).
+ *  @param   value   The value to be associated with the key (IN).
+ *  @return  PMIX return code.
+ *
+ */
+
+PMIX_EXPORT int pmix_hash_table_set_value_uint64(pmix_hash_table_t *table, uint64_t key, void* value);
+
+/**
+ *  Remove value based on uint64_t key.
+ *
+ *  @param   table   The input hash table (IN).
+ *  @param   key     The input key (IN).
+ *  @return  PMIX return code.
+ *
+ */
+
+PMIX_EXPORT int pmix_hash_table_remove_value_uint64(pmix_hash_table_t *table, uint64_t key);
+
+/**
+ *  Retrieve value via arbitrary length binary key.
+ *
+ *  @param   table   The input hash table (IN).
+ *  @param   key     The input key (IN).
+ *  @param   ptr     The value associated with the key
+ *  @return  integer return code:
+ *           - PMIX_SUCCESS       if key was found
+ *           - PMIX_ERR_NOT_FOUND if key was not found
+ *           - PMIX_ERROR         other error
+ *
+ */
+
+PMIX_EXPORT int pmix_hash_table_get_value_ptr(pmix_hash_table_t *table, const void* key,
+                                                size_t keylen, void **ptr);
+
+/**
+ *  Set value based on arbitrary length binary key.
+ *
+ *  @param   table   The input hash table (IN).
+ *  @param   key     The input key (IN).
+ *  @param   value   The value to be associated with the key (IN).
+ *  @return  PMIX return code.
+ *
+ */
+
+PMIX_EXPORT int pmix_hash_table_set_value_ptr(pmix_hash_table_t *table, const void* key, size_t keylen, void* value);
+
+/**
+ *  Remove value based on arbitrary length binary key.
+ *
+ *  @param   table   The input hash table (IN).
+ *  @param   key     The input key (IN).
+ *  @return  PMIX return code.
+ *
+ */
+
+PMIX_EXPORT int pmix_hash_table_remove_value_ptr(pmix_hash_table_t *table, const void* key, size_t keylen);
+
+
+/** The following functions are only for allowing iterating through
+    the hash table. The calls return along with a key, a pointer to
+    the hash node with the current key, so that subsequent calls do
+    not have to traverse all over again to the key (although it may
+    just be a simple thing - to go to the array element and then
+    traverse through the individual list). But lets take out this
+    inefficiency too. This is similar to having an STL iterator in
+    functionality */
+
+/**
+ *  Get the first 32 bit key from the hash table, which can be used later to
+ *  get the next key
+ *  @param  table   The hash table pointer (IN)
+ *  @param  key     The first key (OUT)
+ *  @param  value   The value corresponding to this key (OUT)
+ *  @param  node    The pointer to the hash table internal node which stores
+ *                  the key-value pair (this is required for subsequent calls
+ *                  to get_next_key) (OUT)
+ *  @return PMIX error code
+ *
+ */
+
+PMIX_EXPORT int pmix_hash_table_get_first_key_uint32(pmix_hash_table_t *table, uint32_t *key,
+                                        void **value, void **node);
+
+
+/**
+ *  Get the next 32 bit key from the hash table, knowing the current key
+ *  @param  table    The hash table pointer (IN)
+ *  @param  key      The key (OUT)
+ *  @param  value    The value corresponding to this key (OUT)
+ *  @param  in_node  The node pointer from previous call to either get_first
+                     or get_next (IN)
+ *  @param  out_node The pointer to the hash table internal node which stores
+ *                   the key-value pair (this is required for subsequent calls
+ *                   to get_next_key) (OUT)
+ *  @return PMIX error code
+ *
+ */
+
+PMIX_EXPORT int pmix_hash_table_get_next_key_uint32(pmix_hash_table_t *table, uint32_t *key,
+                                       void **value, void *in_node,
+                                       void **out_node);
+
+
+/**
+ *  Get the first 64 key from the hash table, which can be used later to
+ *  get the next key
+ *  @param  table   The hash table pointer (IN)
+ *  @param  key     The first key (OUT)
+ *  @param  value   The value corresponding to this key (OUT)
+ *  @param  node    The pointer to the hash table internal node which stores
+ *                  the key-value pair (this is required for subsequent calls
+ *                  to get_next_key) (OUT)
+ *  @return PMIX error code
+ *
+ */
+
+PMIX_EXPORT int pmix_hash_table_get_first_key_uint64(pmix_hash_table_t *table, uint64_t *key,
+                                       void **value, void **node);
+
+
+/**
+ *  Get the next 64 bit key from the hash table, knowing the current key
+ *  @param  table    The hash table pointer (IN)
+ *  @param  key      The key (OUT)
+ *  @param  value    The value corresponding to this key (OUT)
+ *  @param  in_node  The node pointer from previous call to either get_first
+                     or get_next (IN)
+ *  @param  out_node The pointer to the hash table internal node which stores
+ *                   the key-value pair (this is required for subsequent calls
+ *                   to get_next_key) (OUT)
+ *  @return PMIX error code
+ *
+ */
+
+PMIX_EXPORT int pmix_hash_table_get_next_key_uint64(pmix_hash_table_t *table, uint64_t *key,
+                                       void **value, void *in_node,
+                                       void **out_node);
+
+
+/**
+ *  Get the first ptr bit key from the hash table, which can be used later to
+ *  get the next key
+ *  @param  table    The hash table pointer (IN)
+ *  @param  key      The first key (OUT)
+ *  @param  key_size The first key size (OUT)
+ *  @param  value    The value corresponding to this key (OUT)
+ *  @param  node     The pointer to the hash table internal node which stores
+ *                   the key-value pair (this is required for subsequent calls
+ *                   to get_next_key) (OUT)
+ *  @return PMIX error code
+ *
+ */
+
+PMIX_EXPORT int pmix_hash_table_get_first_key_ptr(pmix_hash_table_t *table, void* *key,
+                                        size_t *key_size, void **value, void **node);
+
+
+/**
+ *  Get the next ptr bit key from the hash table, knowing the current key
+ *  @param  table    The hash table pointer (IN)
+ *  @param  key      The key (OUT)
+ *  @param  key_size The key size (OUT)
+ *  @param  value    The value corresponding to this key (OUT)
+ *  @param  in_node  The node pointer from previous call to either get_first
+                     or get_next (IN)
+ *  @param  out_node The pointer to the hash table internal node which stores
+ *                   the key-value pair (this is required for subsequent calls
+ *                   to get_next_key) (OUT)
+ *  @return PMIX error code
+ *
+ */
+
+PMIX_EXPORT int pmix_hash_table_get_next_key_ptr(pmix_hash_table_t *table, void* *key,
+                                       size_t *key_size, void **value,
+                                       void *in_node, void **out_node);
+
+
+/**
+ * @brief Returns next power-of-two of the given value.
+ *
+ * @param value The integer value to return power of 2
+ *
+ * @returns The next power of two
+ *
+ * WARNING: *NO* error checking is performed.  This is meant to be a
+ * fast inline function.
+ * Using __builtin_clz (count-leading-zeros) uses 4 cycles instead of 77
+ * compared to the loop-version (on Intel Nehalem -- with icc-12.1.0 -O2).
+ */
+static inline int pmix_next_poweroftwo(int value)
+{
+    int power2;
+
+#if PMIX_C_HAVE_BUILTIN_CLZ
+    if (PMIX_UNLIKELY (0 == value)) {
+        return 1;
+    }
+    power2 = 1 << (8 * sizeof (int) - __builtin_clz(value));
+#else
+    for (power2 = 1; value > 0; value >>= 1, power2 <<= 1) /* empty */;
+#endif
+
+    return power2;
+}
+
+
+/**
+ * Loop over a hash table.
+ *
+ * @param[in] key Key for each item
+ * @param[in] type Type of key (ui32|ui64|ptr)
+ * @param[in] value Storage for each item
+ * @param[in] ht Hash table to iterate over
+ *
+ * This macro provides a simple way to loop over the items in a pmix_hash_table_t. It
+ * is not safe to call pmix_hash_table_remove* from within the loop.
+ *
+ * Example Usage:
+ *
+ * uint64_t key;
+ * void * value;
+ * PMIX_HASH_TABLE_FOREACH(key, uint64, value, ht) {
+ *    do_something(key, value);
+ * }
+ */
+#define PMIX_HASH_TABLE_FOREACH(key, type, value, ht) \
+  for (void *_nptr=NULL;                                   \
+       PMIX_SUCCESS == pmix_hash_table_get_next_key_##type(ht, &key, (void **)&value, _nptr, &_nptr);)
+
+END_C_DECLS
+
+#endif  /* PMIX_HASH_TABLE_H */
diff --git a/src/class/pmix_hotel.c b/src/class/pmix_hotel.c
new file mode 100644
index 0000000..b5a8085
--- /dev/null
+++ b/src/class/pmix_hotel.c
@@ -0,0 +1,137 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2012-2016 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2012      Los Alamos National Security, LLC. All rights reserved
+ * Copyright (c) 2015-2017 Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+
+#include <stdio.h>
+#include <stddef.h>
+
+#include PMIX_EVENT_HEADER
+#include "src/class/pmix_hotel.h"
+
+
+static void local_eviction_callback(int fd, short flags, void *arg)
+{
+    pmix_hotel_room_eviction_callback_arg_t *eargs =
+        (pmix_hotel_room_eviction_callback_arg_t*) arg;
+    void *occupant = eargs->hotel->rooms[eargs->room_num].occupant;
+
+    /* Remove the occurpant from the room.
+
+       Do not change this logic without also changing the same logic
+       in pmix_hotel_checkout() and
+       pmix_hotel_checkout_and_return_occupant(). */
+    pmix_hotel_t *hotel = eargs->hotel;
+    pmix_hotel_room_t *room = &(hotel->rooms[eargs->room_num]);
+    room->occupant = NULL;
+    hotel->last_unoccupied_room++;
+    assert(hotel->last_unoccupied_room < hotel->num_rooms);
+    hotel->unoccupied_rooms[hotel->last_unoccupied_room] = eargs->room_num;
+
+    /* Invoke the user callback to tell them that they were evicted */
+    hotel->evict_callback_fn(hotel,
+                             eargs->room_num,
+                             occupant);
+}
+
+
+int pmix_hotel_init(pmix_hotel_t *h, int num_rooms,
+                    pmix_event_base_t *evbase,
+                    uint32_t eviction_timeout,
+                    int eviction_event_priority,
+                    pmix_hotel_eviction_callback_fn_t evict_callback_fn)
+{
+    int i;
+
+    /* Bozo check */
+    if (num_rooms <= 0 ||
+        NULL == evict_callback_fn) {
+        return PMIX_ERR_BAD_PARAM;
+    }
+
+    h->num_rooms = num_rooms;
+    h->evbase = evbase;
+    h->eviction_timeout.tv_usec = eviction_timeout % 1000000;
+    h->eviction_timeout.tv_sec = eviction_timeout / 1000000;
+    h->evict_callback_fn = evict_callback_fn;
+    h->rooms = (pmix_hotel_room_t*)malloc(num_rooms * sizeof(pmix_hotel_room_t));
+    if (NULL != evict_callback_fn) {
+        h->eviction_args =
+            (pmix_hotel_room_eviction_callback_arg_t*)malloc(num_rooms * sizeof(pmix_hotel_room_eviction_callback_arg_t));
+    }
+    h->unoccupied_rooms = (int*) malloc(num_rooms * sizeof(int));
+    h->last_unoccupied_room = num_rooms - 1;
+
+    for (i = 0; i < num_rooms; ++i) {
+        /* Mark this room as unoccupied */
+        h->rooms[i].occupant = NULL;
+
+        /* Setup this room in the unoccupied index array */
+        h->unoccupied_rooms[i] = i;
+
+        /* Setup the eviction callback args */
+        h->eviction_args[i].hotel = h;
+        h->eviction_args[i].room_num = i;
+
+        /* Create this room's event (but don't add it) */
+        if (NULL != h->evbase) {
+            pmix_event_assign(&(h->rooms[i].eviction_timer_event),
+                              h->evbase,
+                              -1, 0, local_eviction_callback,
+                              &(h->eviction_args[i]));
+        }
+    }
+
+    return PMIX_SUCCESS;
+}
+
+static void constructor(pmix_hotel_t *h)
+{
+    h->num_rooms = 0;
+    h->evbase = NULL;
+    h->eviction_timeout.tv_sec = 0;
+    h->eviction_timeout.tv_usec = 0;
+    h->evict_callback_fn = NULL;
+    h->rooms = NULL;
+    h->eviction_args = NULL;
+    h->unoccupied_rooms = NULL;
+    h->last_unoccupied_room = -1;
+}
+
+static void destructor(pmix_hotel_t *h)
+{
+    int i;
+
+    /* Go through all occupied rooms and destroy their events */
+    if (NULL != h->evbase) {
+        for (i = 0; i < h->num_rooms; ++i) {
+            if (NULL != h->rooms[i].occupant) {
+                pmix_event_del(&(h->rooms[i].eviction_timer_event));
+            }
+        }
+    }
+
+    if (NULL != h->rooms) {
+        free(h->rooms);
+    }
+    if (NULL != h->eviction_args) {
+        free(h->eviction_args);
+    }
+    if (NULL != h->unoccupied_rooms) {
+        free(h->unoccupied_rooms);
+    }
+}
+
+PMIX_EXPORT PMIX_CLASS_INSTANCE(pmix_hotel_t,
+                                pmix_object_t,
+                                constructor,
+                                destructor);
diff --git a/src/class/pmix_hotel.h b/src/class/pmix_hotel.h
new file mode 100644
index 0000000..8eb4064
--- /dev/null
+++ b/src/class/pmix_hotel.h
@@ -0,0 +1,355 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2012-2016 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2012      Los Alamos National Security, LLC. All rights reserved
+ * Copyright (c) 2015-2017 Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+/** @file
+ *
+ * This file provides a "hotel" class:
+ *
+ * - A hotel has a fixed number of rooms (i.e., storage slots)
+ * - An arbitrary data pointer can check into an empty room at any time
+ * - The occupant of a room can check out at any time
+ * - Optionally, the occupant of a room can be forcibly evicted at a
+ *   given time (i.e., when an pmix timer event expires).
+ * - The hotel has finite occupancy; if you try to checkin a new
+ *   occupant and the hotel is already full, it will gracefully fail
+ *   to checkin.
+ *
+ * One use case for this class is for ACK-based network retransmission
+ * schemes (NACK-based retransmission schemes probably can use
+ * pmix_ring_buffer).
+ *
+ * For ACK-based retransmission schemes, a hotel might be used
+ * something like this:
+ *
+ * - when a message is sent, check it in to a hotel with a timer
+ * - if an ACK is received, check it out of the hotel (which also cancels
+ *   the timer)
+ * - if an ACK isn't received in time, the timer will expire and the
+ *   upper layer will get a callback with the message
+ * - if an ACK is received late (i.e., after its timer has expired),
+ *   then checkout will gracefully fail
+ *
+ * Note that this class intentionally provides pretty minimal
+ * functionality.  It is intended to be used in performance-critical
+ * code paths -- extra functionality would simply add latency.
+ *
+ * There is an pmix_hotel_init() function to create a hotel, but no
+ * corresponding finalize; the destructor will handle all finalization
+ * issues.  Note that when a hotel is destroyed, it will delete all
+ * pending events from the event base (i.e., all pending eviction
+ * callbacks); no further eviction callbacks will be invoked.
+ */
+
+#ifndef PMIX_HOTEL_H
+#define PMIX_HOTEL_H
+
+#include <src/include/pmix_config.h>
+#include "src/include/types.h"
+#include "src/include/prefetch.h"
+#include "pmix_common.h"
+#include "src/class/pmix_object.h"
+#include PMIX_EVENT_HEADER
+
+#include "src/util/output.h"
+
+BEGIN_C_DECLS
+
+struct pmix_hotel_t;
+
+/* User-supplied function to be invoked when an occupant is evicted. */
+typedef void (*pmix_hotel_eviction_callback_fn_t)(struct pmix_hotel_t *hotel,
+                                                  int room_num,
+                                                  void *occupant);
+
+/* Note that this is an internal data structure; it is not part of the
+   public pmix_hotel interface.  Public consumers of pmix_hotel
+   shouldn't need to use this struct at all (we only have it here in
+   this .h file because some functions are inlined for speed, and need
+   to get to the internals of this struct).
+
+   The room struct should be as small as possible to be cache
+   friendly.  Specifically: it would be great if multiple rooms could
+   fit in a single cache line because we'll always allocate a
+   contiguous set of rooms in an array. */
+typedef struct {
+    void *occupant;
+    pmix_event_t eviction_timer_event;
+} pmix_hotel_room_t;
+
+/* Note that this is an internal data structure; it is not part of the
+   public pmix_hotel interface.  Public consumers of pmix_hotel
+   shouldn't need to use this struct at all (we only have it here in
+   this .h file because some functions are inlined for speed, and need
+   to get to the internals of this struct).
+
+   Use a unique struct for holding the arguments for eviction
+   callbacks.  We *could* make the to-be-evicted pmix_hotel_room_t
+   instance as the argument, but we don't, for 2 reasons:
+
+   1. We want as many pmix_hotel_room_t's to fit in a cache line as
+      possible (i.e., to be as cache-friendly as possible).  The
+      common/fast code path only needs to access the data in the
+      pmix_hotel_room_t (and not the callback argument data).
+
+   2. Evictions will be uncommon, so we don't mind penalizing them a
+      bit by making the data be in a separate cache line.
+*/
+typedef struct {
+    struct pmix_hotel_t *hotel;
+    int room_num;
+} pmix_hotel_room_eviction_callback_arg_t;
+
+typedef struct pmix_hotel_t {
+    /* make this an object */
+    pmix_object_t super;
+
+    /* Max number of rooms in the hotel */
+    int num_rooms;
+
+    /* event base to be used for eviction timeout */
+    pmix_event_base_t *evbase;
+    struct timeval eviction_timeout;
+    pmix_hotel_eviction_callback_fn_t evict_callback_fn;
+
+    /* All rooms in this hotel */
+    pmix_hotel_room_t *rooms;
+
+    /* Separate array for all the eviction callback arguments (see
+       rationale above for why this is a separate array) */
+    pmix_hotel_room_eviction_callback_arg_t *eviction_args;
+
+    /* All currently unoccupied rooms in this hotel (not necessarily
+       in any particular order) */
+    int *unoccupied_rooms;
+    int last_unoccupied_room;
+} pmix_hotel_t;
+PMIX_CLASS_DECLARATION(pmix_hotel_t);
+
+/**
+ * Initialize the hotel.
+ *
+ * @param hotel Pointer to a hotel (IN)
+ * @param num_rooms The total number of rooms in the hotel (IN)
+ * @param evbase Pointer to event base used for eviction timeout
+ * @param eviction_timeout Max length of a stay at the hotel before
+ * the eviction callback is invoked (in microseconds)
+ * @param eviction_event_priority Event lib priority for the eviction timeout
+ * @param evict_callback_fn Callback function invoked if an occupant
+ * does not check out before the eviction_timeout.
+ *
+ * NOTE: If the callback function is NULL, then no eviction timer
+ * will be set - occupants will remain checked into the hotel until
+ * explicitly checked out.
+ *
+ * Also note: the eviction_callback_fn should absolutely not call any
+ * of the hotel checkout functions.  Specifically: the occupant has
+ * already been ("forcibly") checked out *before* the
+ * eviction_callback_fn is invoked.
+ *
+ * @return PMIX_SUCCESS if all initializations were succesful. Otherwise,
+ *  the error indicate what went wrong in the function.
+ */
+PMIX_EXPORT int pmix_hotel_init(pmix_hotel_t *hotel, int num_rooms,
+                                  pmix_event_base_t *evbase,
+                                  uint32_t eviction_timeout,
+                                  int eviction_event_priority,
+                                  pmix_hotel_eviction_callback_fn_t evict_callback_fn);
+
+/**
+ * Check in an occupant to the hotel.
+ *
+ * @param hotel Pointer to hotel (IN)
+ * @param occupant Occupant to check in (opaque to the hotel) (IN)
+ * @param room The room number that identifies this occupant in the
+ * hotel (OUT).
+ *
+ * If there is room in the hotel, the occupant is checked in and the
+ * timer for that occupant is started.  The occupant's room is
+ * returned in the "room" param.
+ *
+ * Note that once a room's checkout_expire timer expires, the occupant
+ * is forcibly checked out, and then the eviction callback is invoked.
+ *
+ * @return PMIX_SUCCESS if the occupant is successfully checked in,
+ * and the room parameter will contain a valid value.
+ * @return PMIX_ERR_TEMP_OUT_OF_RESOURCE is the hotel is full.  Try
+ * again later.
+ */
+static inline int pmix_hotel_checkin(pmix_hotel_t *hotel,
+                                     void *occupant,
+                                     int *room_num)
+{
+    pmix_hotel_room_t *room;
+
+    /* Do we have any rooms available? */
+    if (PMIX_UNLIKELY(hotel->last_unoccupied_room < 0)) {
+        return PMIX_ERR_OUT_OF_RESOURCE;
+    }
+
+    /* Put this occupant into the first empty room that we have */
+    *room_num = hotel->unoccupied_rooms[hotel->last_unoccupied_room--];
+    room = &(hotel->rooms[*room_num]);
+    room->occupant = occupant;
+
+    /* Assign the event and make it pending */
+    if (NULL != hotel->evbase) {
+        pmix_event_add(&(room->eviction_timer_event),
+                       &(hotel->eviction_timeout));
+    }
+
+    return PMIX_SUCCESS;
+}
+
+/**
+ * Same as pmix_hotel_checkin(), but slightly optimized for when the
+ * caller *knows* that there is a room available.
+ */
+static inline void pmix_hotel_checkin_with_res(pmix_hotel_t *hotel,
+                                     void *occupant,
+                                     int *room_num)
+{
+    pmix_hotel_room_t *room;
+
+    /* Put this occupant into the first empty room that we have */
+    *room_num = hotel->unoccupied_rooms[hotel->last_unoccupied_room--];
+    room = &(hotel->rooms[*room_num]);
+    assert(room->occupant == NULL);
+    room->occupant = occupant;
+
+    /* Assign the event and make it pending */
+    if (NULL != hotel->evbase) {
+        pmix_event_add(&(room->eviction_timer_event),
+                       &(hotel->eviction_timeout));
+    }
+}
+
+/**
+ * Check the specified occupant out of the hotel.
+ *
+ * @param hotel Pointer to hotel (IN)
+ * @param room Room number to checkout (IN)
+ *
+ * If there is an occupant in the room, their timer is canceled and
+ * they are checked out.
+ *
+ * Nothing is returned (as a minor optimization).
+ */
+static inline void pmix_hotel_checkout(pmix_hotel_t *hotel, int room_num)
+{
+    pmix_hotel_room_t *room;
+
+    /* Bozo check */
+    assert(room_num < hotel->num_rooms);
+
+    /* If there's an occupant in the room, check them out */
+    room = &(hotel->rooms[room_num]);
+    if (PMIX_LIKELY(NULL != room->occupant)) {
+        /* Do not change this logic without also changing the same
+           logic in pmix_hotel_checkout_and_return_occupant() and
+           pmix_hotel.c:local_eviction_callback(). */
+        room->occupant = NULL;
+        if (NULL != hotel->evbase) {
+            pmix_event_del(&(room->eviction_timer_event));
+        }
+        hotel->last_unoccupied_room++;
+        assert(hotel->last_unoccupied_room < hotel->num_rooms);
+        hotel->unoccupied_rooms[hotel->last_unoccupied_room] = room_num;
+    }
+
+    /* Don't bother returning whether we actually checked someone out
+       or not (because this is in the critical performance path) --
+       assume the upper layer knows what it's doing. */
+}
+
+/**
+ * Check the specified occupant out of the hotel and return the occupant.
+ *
+ * @param hotel Pointer to hotel (IN)
+ * @param room Room number to checkout (IN)
+ * @param void * occupant (OUT)
+ * If there is an occupant in the room, their timer is canceled and
+ * they are checked out.
+ *
+ * Use this checkout and when caller needs the occupant
+ */
+static inline void pmix_hotel_checkout_and_return_occupant(pmix_hotel_t *hotel, int room_num, void **occupant)
+{
+    pmix_hotel_room_t *room;
+
+    /* Bozo check */
+    assert(room_num < hotel->num_rooms);
+
+    /* If there's an occupant in the room, check them out */
+    room = &(hotel->rooms[room_num]);
+    if (PMIX_LIKELY(NULL != room->occupant)) {
+        pmix_output (10, "checking out occupant %p from room num %d", room->occupant, room_num);
+        /* Do not change this logic without also changing the same
+           logic in pmix_hotel_checkout() and
+           pmix_hotel.c:local_eviction_callback(). */
+        *occupant = room->occupant;
+        room->occupant = NULL;
+        if (NULL != hotel->evbase) {
+            event_del(&(room->eviction_timer_event));
+        }
+        hotel->last_unoccupied_room++;
+        assert(hotel->last_unoccupied_room < hotel->num_rooms);
+        hotel->unoccupied_rooms[hotel->last_unoccupied_room] = room_num;
+    }
+    else {
+        *occupant = NULL;
+    }
+}
+
+/**
+ * Returns true if the hotel is empty (no occupant)
+ * @param hotel Pointer to hotel (IN)
+ * @return bool true if empty false if there is a occupant(s)
+ *
+ */
+static inline bool pmix_hotel_is_empty (pmix_hotel_t *hotel)
+{
+    if (hotel->last_unoccupied_room == hotel->num_rooms - 1)
+        return true;
+    else
+        return false;
+}
+
+/**
+ * Access the occupant of a room, but leave them checked into their room.
+ *
+ * @param hotel Pointer to hotel (IN)
+ * @param room Room number to checkout (IN)
+ * @param void * occupant (OUT)
+ *
+ * This accessor function is typically used to cycle across the occupants
+ * to check for someone already present that matches a description.
+ */
+static inline void pmix_hotel_knock(pmix_hotel_t *hotel, int room_num, void **occupant)
+{
+    pmix_hotel_room_t *room;
+
+    /* Bozo check */
+    assert(room_num < hotel->num_rooms);
+
+    *occupant = NULL;
+
+    /* If there's an occupant in the room, have them come to the door */
+    room = &(hotel->rooms[room_num]);
+    if (PMIX_LIKELY(NULL != room->occupant)) {
+        pmix_output (10, "occupant %p in room num %d responded to knock", room->occupant, room_num);
+        *occupant = room->occupant;
+    }
+}
+
+END_C_DECLS
+
+#endif /* PMIX_HOTEL_H */
diff --git a/src/class/pmix_list.c b/src/class/pmix_list.c
new file mode 100644
index 0000000..e0786a2
--- /dev/null
+++ b/src/class/pmix_list.c
@@ -0,0 +1,259 @@
+/* -*- Mode: C; c-basic-offset:4 ; -*- */
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2006 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2007 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2007      Voltaire All rights reserved.
+ * Copyright (c) 2013-2017 Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+#include "include/pmix_common.h"
+#include "src/class/pmix_list.h"
+
+/*
+ *  List classes
+ */
+
+static void pmix_list_item_construct(pmix_list_item_t*);
+static void pmix_list_item_destruct(pmix_list_item_t*);
+
+PMIX_EXPORT PMIX_CLASS_INSTANCE(
+    pmix_list_item_t,
+    pmix_object_t,
+    pmix_list_item_construct,
+    pmix_list_item_destruct
+);
+
+static void pmix_list_construct(pmix_list_t*);
+static void pmix_list_destruct(pmix_list_t*);
+
+PMIX_EXPORT PMIX_CLASS_INSTANCE(
+    pmix_list_t,
+    pmix_object_t,
+    pmix_list_construct,
+    pmix_list_destruct
+);
+
+
+/*
+ *
+ *      pmix_list_link_item_t interface
+ *
+ */
+
+static void pmix_list_item_construct(pmix_list_item_t *item)
+{
+    item->pmix_list_next = item->pmix_list_prev = NULL;
+    item->item_free = 1;
+#if PMIX_ENABLE_DEBUG
+    item->pmix_list_item_refcount = 0;
+    item->pmix_list_item_belong_to = NULL;
+#endif
+}
+
+static void pmix_list_item_destruct(pmix_list_item_t *item)
+{
+#if PMIX_ENABLE_DEBUG
+    assert( 0 == item->pmix_list_item_refcount );
+    assert( NULL == item->pmix_list_item_belong_to );
+#endif  /* PMIX_ENABLE_DEBUG */
+}
+
+
+/*
+ *
+ *      pmix_list_list_t interface
+ *
+ */
+
+static void pmix_list_construct(pmix_list_t *list)
+{
+#if PMIX_ENABLE_DEBUG
+    /* These refcounts should never be used in assertions because they
+       should never be removed from this list, added to another list,
+       etc.  So set them to sentinel values. */
+
+    PMIX_CONSTRUCT( &(list->pmix_list_sentinel), pmix_list_item_t );
+    list->pmix_list_sentinel.pmix_list_item_refcount  = 1;
+    list->pmix_list_sentinel.pmix_list_item_belong_to = list;
+#endif
+
+    list->pmix_list_sentinel.pmix_list_next = &list->pmix_list_sentinel;
+    list->pmix_list_sentinel.pmix_list_prev = &list->pmix_list_sentinel;
+    list->pmix_list_length = 0;
+}
+
+
+/*
+ * Reset all the pointers to be NULL -- do not actually destroy
+ * anything.
+ */
+static void pmix_list_destruct(pmix_list_t *list)
+{
+    pmix_list_construct(list);
+}
+
+
+/*
+ * Insert an item at a specific place in a list
+ */
+bool pmix_list_insert(pmix_list_t *list, pmix_list_item_t *item, long long idx)
+{
+    /* Adds item to list at index and retains item. */
+    int     i;
+    volatile pmix_list_item_t *ptr, *next;
+
+    if ( idx >= (long long)list->pmix_list_length ) {
+        return false;
+    }
+
+    if ( 0 == idx )
+    {
+        pmix_list_prepend(list, item);
+    } else {
+#if PMIX_ENABLE_DEBUG
+        /* Spot check: ensure that this item is previously on no
+           lists */
+
+        assert(0 == item->pmix_list_item_refcount);
+#endif
+        /* pointer to element 0 */
+        ptr = list->pmix_list_sentinel.pmix_list_next;
+        for ( i = 0; i < idx-1; i++ )
+            ptr = ptr->pmix_list_next;
+
+        next = ptr->pmix_list_next;
+        item->pmix_list_next = next;
+        item->pmix_list_prev = ptr;
+        next->pmix_list_prev = item;
+        ptr->pmix_list_next = item;
+
+#if PMIX_ENABLE_DEBUG
+        /* Spot check: ensure this item is only on the list that we
+           just insertted it into */
+
+        item->pmix_list_item_refcount += 1;
+        assert(1 == item->pmix_list_item_refcount);
+        item->pmix_list_item_belong_to = list;
+#endif
+    }
+
+    list->pmix_list_length++;
+    return true;
+}
+
+
+static
+void
+pmix_list_transfer(pmix_list_item_t *pos, pmix_list_item_t *begin,
+                   pmix_list_item_t *end)
+{
+    volatile pmix_list_item_t *tmp;
+
+    if (pos != end) {
+        /* remove [begin, end) */
+        end->pmix_list_prev->pmix_list_next = pos;
+        begin->pmix_list_prev->pmix_list_next = end;
+        pos->pmix_list_prev->pmix_list_next = begin;
+
+        /* splice into new position before pos */
+        tmp = pos->pmix_list_prev;
+        pos->pmix_list_prev = end->pmix_list_prev;
+        end->pmix_list_prev = begin->pmix_list_prev;
+        begin->pmix_list_prev = tmp;
+#if PMIX_ENABLE_DEBUG
+        {
+            volatile pmix_list_item_t* item = begin;
+            while( pos != item ) {
+                item->pmix_list_item_belong_to = pos->pmix_list_item_belong_to;
+                item = item->pmix_list_next;
+                assert(NULL != item);
+            }
+        }
+#endif  /* PMIX_ENABLE_DEBUG */
+    }
+}
+
+
+void
+pmix_list_join(pmix_list_t *thislist, pmix_list_item_t *pos,
+               pmix_list_t *xlist)
+{
+    if (0 != pmix_list_get_size(xlist)) {
+        pmix_list_transfer(pos, pmix_list_get_first(xlist),
+                           pmix_list_get_end(xlist));
+
+        /* fix the sizes */
+        thislist->pmix_list_length += xlist->pmix_list_length;
+        xlist->pmix_list_length = 0;
+    }
+}
+
+
+void
+pmix_list_splice(pmix_list_t *thislist, pmix_list_item_t *pos,
+                 pmix_list_t *xlist, pmix_list_item_t *first,
+                 pmix_list_item_t *last)
+{
+    size_t change = 0;
+    pmix_list_item_t *tmp;
+
+    if (first != last) {
+        /* figure out how many things we are going to move (have to do
+         * first, since last might be end and then we wouldn't be able
+         * to run the loop)
+         */
+        for (tmp = first ; tmp != last ; tmp = pmix_list_get_next(tmp)) {
+            change++;
+        }
+
+        pmix_list_transfer(pos, first, last);
+
+        /* fix the sizes */
+        thislist->pmix_list_length += change;
+        xlist->pmix_list_length -= change;
+    }
+}
+
+
+int pmix_list_sort(pmix_list_t* list, pmix_list_item_compare_fn_t compare)
+{
+    pmix_list_item_t* item;
+    pmix_list_item_t** items;
+    size_t i, index=0;
+
+    if (0 == list->pmix_list_length) {
+        return PMIX_SUCCESS;
+    }
+    items = (pmix_list_item_t**)malloc(sizeof(pmix_list_item_t*) *
+                                       list->pmix_list_length);
+
+    if (NULL == items) {
+        return PMIX_ERR_OUT_OF_RESOURCE;
+    }
+
+    while(NULL != (item = pmix_list_remove_first(list))) {
+        items[index++] = item;
+    }
+
+    qsort(items, index, sizeof(pmix_list_item_t*),
+          (int(*)(const void*,const void*))compare);
+    for (i=0; i<index; i++) {
+        pmix_list_append(list,items[i]);
+    }
+    free(items);
+    return PMIX_SUCCESS;
+}
diff --git a/src/class/pmix_list.h b/src/class/pmix_list.h
new file mode 100644
index 0000000..4d8a195
--- /dev/null
+++ b/src/class/pmix_list.h
@@ -0,0 +1,909 @@
+/* -*- Mode: C; c-basic-offset:4 ; -*- */
+ /*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2006 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2007      Voltaire All rights reserved.
+ * Copyright (c) 2013      Los Alamos National Security, LLC. All rights
+ *                         reserved.
+ * Copyright (c) 2013-2015 Intel, Inc. All rights reserved
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+/**
+ * @file
+ *
+ * The pmix_list_t interface is used to provide a generic
+ * doubly-linked list container for PMIx.  It was inspired by (but
+ * is slightly different than) the Standard Template Library (STL)
+ * std::list class.  One notable difference from std::list is that
+ * when an pmix_list_t is destroyed, all of the pmix_list_item_t
+ * objects that it contains are orphaned -- they are \em not
+ * destroyed.
+ *
+ * The general idea is that pmix_list_item_t objects can be put on an
+ * pmix_list_t.  Hence, you create a new type that derives from
+ * pmix_list_item_t; this new type can then be used with pmix_list_t
+ * containers.
+ *
+ * NOTE: pmix_list_item_t instances can only be on \em one list at a
+ * time.  Specifically, if you add an pmix_list_item_t to one list,
+ * and then add it to another list (without first removing it from the
+ * first list), you will effectively be hosing the first list.  You
+ * have been warned.
+ *
+ * If PMIX_ENABLE_DEBUG is true, a bunch of checks occur, including
+ * some spot checks for a debugging reference count in an attempt to
+ * ensure that an pmix_list_item_t is only one *one* list at a time.
+ * Given the highly concurrent nature of this class, these spot checks
+ * cannot guarantee that an item is only one list at a time.
+ * Specifically, since it is a desirable attribute of this class to
+ * not use locks for normal operations, it is possible that two
+ * threads may [erroneously] modify an pmix_list_item_t concurrently.
+ *
+ * The only way to guarantee that a debugging reference count is valid
+ * for the duration of an operation is to lock the item_t during the
+ * operation.  But this fundamentally changes the desirable attribute
+ * of this class (i.e., no locks).  So all we can do is spot-check the
+ * reference count in a bunch of places and check that it is still the
+ * value that we think it should be.  But this doesn't mean that you
+ * can run into "unlucky" cases where two threads are concurrently
+ * modifying an item_t, but all the spot checks still return the
+ * "right" values.  All we can do is hope that we have enough spot
+ * checks to statistically drive down the possibility of the unlucky
+ * cases happening.
+ */
+
+#ifndef PMIX_LIST_H
+#define PMIX_LIST_H
+
+#include <src/include/pmix_config.h>
+#include <stdio.h>
+#include <stdlib.h>
+#if HAVE_STDBOOL_H
+#include <stdbool.h>
+#endif
+
+#include "src/class/pmix_object.h"
+
+BEGIN_C_DECLS
+
+/**
+ * \internal
+ *
+ * The class for the list container.
+ */
+PMIX_CLASS_DECLARATION(pmix_list_t);
+/**
+ * \internal
+ *
+ * Base class for items that are put in list (pmix_list_t) containers.
+ */
+PMIX_CLASS_DECLARATION(pmix_list_item_t);
+
+
+/**
+ * \internal
+ *
+ * Struct of an pmix_list_item_t
+ */
+struct pmix_list_item_t
+{
+    pmix_object_t super;
+    /**< Generic parent class for all PMIx objects */
+    volatile struct pmix_list_item_t *pmix_list_next;
+    /**< Pointer to next list item */
+    volatile struct pmix_list_item_t *pmix_list_prev;
+    /**< Pointer to previous list item */
+    int32_t item_free;
+
+#if PMIX_ENABLE_DEBUG
+    /** Atomic reference count for debugging */
+    volatile int32_t pmix_list_item_refcount;
+    /** The list this item belong to */
+    volatile struct pmix_list_t* pmix_list_item_belong_to;
+#endif
+};
+/**
+ * Base type for items that are put in a list (pmix_list_t) containers.
+ */
+typedef struct pmix_list_item_t pmix_list_item_t;
+
+
+/**
+ * Get the next item in a list.
+ *
+ * @param item A list item.
+ *
+ * @returns The next item in the list
+ */
+#define pmix_list_get_next(item) \
+    ((item) ? ((pmix_list_item_t*) ((pmix_list_item_t*)(item))->pmix_list_next) : NULL)
+
+/**
+ * Get the next item in a list.
+ *
+ * @param item A list item.
+ *
+ * @returns The next item in the list
+ */
+#define pmix_list_get_prev(item) \
+    ((item) ? ((pmix_list_item_t*) ((pmix_list_item_t*)(item))->pmix_list_prev) : NULL)
+
+
+/**
+ * \internal
+ *
+ * Struct of an pmix_list_t
+ */
+struct pmix_list_t
+{
+    pmix_object_t       super;
+    /**< Generic parent class for all PMIx objects */
+    pmix_list_item_t    pmix_list_sentinel;
+    /**< Head and tail item of the list */
+    volatile size_t     pmix_list_length;
+    /**< Quick reference to the number of items in the list */
+};
+/**
+ * List container type.
+ */
+typedef struct pmix_list_t pmix_list_t;
+
+/** Cleanly destruct a list
+ *
+ * The pmix_list_t destructor doesn't release the items on the
+ * list - so provide two convenience macros that do so and then
+ * destruct/release the list object itself
+ *
+ * @param[in] list List to destruct or release
+ */
+#define PMIX_LIST_DESTRUCT(list)                                \
+    do {                                                        \
+        pmix_list_item_t *it;                                   \
+        while (NULL != (it = pmix_list_remove_first(list))) {   \
+            PMIX_RELEASE(it);                                    \
+        }                                                       \
+        PMIX_DESTRUCT(list);                                     \
+    } while (0)
+
+#define PMIX_LIST_RELEASE(list)                                 \
+    do {                                                        \
+        pmix_list_item_t *it;                                   \
+        while (NULL != (it = pmix_list_remove_first(list))) {   \
+            PMIX_RELEASE(it);                                    \
+        }                                                       \
+        PMIX_RELEASE(list);                                      \
+    } while (0)
+
+
+/**
+ * Loop over a list.
+ *
+ * @param[in] item Storage for each item
+ * @param[in] list List to iterate over
+ * @param[in] type Type of each list item
+ *
+ * This macro provides a simple way to loop over the items in an pmix_list_t. It
+ * is not safe to call pmix_list_remove_item from within the loop.
+ *
+ * Example Usage:
+ *
+ * class_foo_t *foo;
+ * pmix_list_foreach(foo, list, class_foo_t) {
+ *    do something;
+ * }
+ */
+#define PMIX_LIST_FOREACH(item, list, type)                             \
+  for (item = (type *) (list)->pmix_list_sentinel.pmix_list_next ;      \
+       item != (type *) &(list)->pmix_list_sentinel ;                   \
+       item = (type *) ((pmix_list_item_t *) (item))->pmix_list_next)
+
+/**
+ * Loop over a list in reverse.
+ *
+ * @param[in] item Storage for each item
+ * @param[in] list List to iterate over
+ * @param[in] type Type of each list item
+ *
+ * This macro provides a simple way to loop over the items in an pmix_list_t. It
+ * is not safe to call pmix_list_remove_item from within the loop.
+ *
+ * Example Usage:
+ *
+ * class_foo_t *foo;
+ * pmix_list_foreach(foo, list, class_foo_t) {
+ *    do something;
+ * }
+ */
+#define PMIX_LIST_FOREACH_REV(item, list, type)                         \
+  for (item = (type *) (list)->pmix_list_sentinel.pmix_list_prev ;      \
+       item != (type *) &(list)->pmix_list_sentinel ;                   \
+       item = (type *) ((pmix_list_item_t *) (item))->pmix_list_prev)
+
+/**
+ * Loop over a list in a *safe* way
+ *
+ * @param[in] item Storage for each item
+ * @param[in] next Storage for next item
+ * @param[in] list List to iterate over
+ * @param[in] type Type of each list item
+ *
+ * This macro provides a simple way to loop over the items in an pmix_list_t. It
+ * is safe to call pmix_list_remove_item(list, item) from within the loop.
+ *
+ * Example Usage:
+ *
+ * class_foo_t *foo, *next;
+ * pmix_list_foreach_safe(foo, next, list, class_foo_t) {
+ *    do something;
+ *    pmix_list_remove_item (list, (pmix_list_item_t *) foo);
+ * }
+ */
+#define PMIX_LIST_FOREACH_SAFE(item, next, list, type)                  \
+  for (item = (type *) (list)->pmix_list_sentinel.pmix_list_next,       \
+         next = (type *) ((pmix_list_item_t *) (item))->pmix_list_next ;\
+       item != (type *) &(list)->pmix_list_sentinel ;                   \
+       item = next, next = (type *) ((pmix_list_item_t *) (item))->pmix_list_next)
+
+/**
+ * Loop over a list in a *safe* way
+ *
+ * @param[in] item Storage for each item
+ * @param[in] next Storage for next item
+ * @param[in] list List to iterate over
+ * @param[in] type Type of each list item
+ *
+ * This macro provides a simple way to loop over the items in an pmix_list_t. If
+ * is safe to call pmix_list_remove_item(list, item) from within the loop.
+ *
+ * Example Usage:
+ *
+ * class_foo_t *foo, *next;
+ * pmix_list_foreach_safe(foo, next, list, class_foo_t) {
+ *    do something;
+ *    pmix_list_remove_item (list, (pmix_list_item_t *) foo);
+ * }
+ */
+#define PMIX_LIST_FOREACH_SAFE_REV(item, prev, list, type)              \
+  for (item = (type *) (list)->pmix_list_sentinel.pmix_list_prev,       \
+         prev = (type *) ((pmix_list_item_t *) (item))->pmix_list_prev ;\
+       item != (type *) &(list)->pmix_list_sentinel ;                   \
+       item = prev, prev = (type *) ((pmix_list_item_t *) (item))->pmix_list_prev)
+
+
+/**
+ * Check for empty list
+ *
+ * @param list The list container
+ *
+ * @returns true if list's size is 0, false otherwise
+ *
+ * This is an O(1) operation.
+ *
+ * This is an inlined function in compilers that support inlining,
+ * so it's usually a cheap operation.
+ */
+static inline bool pmix_list_is_empty(pmix_list_t* list)
+{
+    return (list->pmix_list_sentinel.pmix_list_next ==
+        &(list->pmix_list_sentinel) ? true : false);
+}
+
+
+/**
+ * Return the first item on the list (does not remove it).
+ *
+ * @param list The list container
+ *
+ * @returns A pointer to the first item on the list
+ *
+ * This is an O(1) operation to return the first item on the list.  It
+ * should be compared against the returned value from
+ * pmix_list_get_end() to ensure that the list is not empty.
+ *
+ * This is an inlined function in compilers that support inlining, so
+ * it's usually a cheap operation.
+ */
+static inline pmix_list_item_t* pmix_list_get_first(pmix_list_t* list)
+{
+    pmix_list_item_t* item = (pmix_list_item_t*)list->pmix_list_sentinel.pmix_list_next;
+#if PMIX_ENABLE_DEBUG
+    /* Spot check: ensure that the first item is only on one list */
+
+    assert(1 == item->pmix_list_item_refcount);
+    assert( list == item->pmix_list_item_belong_to );
+#endif
+
+    return item;
+}
+
+/**
+ * Return the last item on the list (does not remove it).
+ *
+ * @param list The list container
+ *
+ * @returns A pointer to the last item on the list
+ *
+ * This is an O(1) operation to return the last item on the list.  It
+ * should be compared against the returned value from
+ * pmix_list_get_begin() to ensure that the list is not empty.
+ *
+ * This is an inlined function in compilers that support inlining, so
+ * it's usually a cheap operation.
+ */
+static inline pmix_list_item_t* pmix_list_get_last(pmix_list_t* list)
+{
+    pmix_list_item_t* item = (pmix_list_item_t *)list->pmix_list_sentinel.pmix_list_prev;
+#if PMIX_ENABLE_DEBUG
+    /* Spot check: ensure that the last item is only on one list */
+
+    assert( 1 == item->pmix_list_item_refcount );
+    assert( list == item->pmix_list_item_belong_to );
+#endif
+
+    return item;
+}
+
+/**
+ * Return the beginning of the list; an invalid list entry suitable
+ * for comparison only.
+ *
+ * @param list The list container
+ *
+ * @returns A pointer to the beginning of the list.
+ *
+ * This is an O(1) operation to return the beginning of the list.
+ * Similar to the STL, this is a special invalid list item -- it
+ * should \em not be used for storage.  It is only suitable for
+ * comparison to other items in the list to see if they are valid or
+ * not; it's ususally used when iterating through the items in a list.
+ *
+ * This is an inlined function in compilers that support inlining, so
+ * it's usually a cheap operation.
+ */
+static inline pmix_list_item_t* pmix_list_get_begin(pmix_list_t* list)
+{
+    return &(list->pmix_list_sentinel);
+}
+
+/**
+ * Return the end of the list; an invalid list entry suitable for
+ * comparison only.
+ *
+ * @param list The list container
+ *
+ * @returns A pointer to the end of the list.
+ *
+ * This is an O(1) operation to return the end of the list.
+ * Similar to the STL, this is a special invalid list item -- it
+ * should \em not be used for storage.  It is only suitable for
+ * comparison to other items in the list to see if they are valid or
+ * not; it's ususally used when iterating through the items in a list.
+ *
+ * This is an inlined function in compilers that support inlining, so
+ * it's usually a cheap operation.
+ */
+static inline pmix_list_item_t* pmix_list_get_end(pmix_list_t* list)
+{
+    return &(list->pmix_list_sentinel);
+}
+
+
+/**
+ * Return the number of items in a list
+ *
+ * @param list The list container
+ *
+ * @returns The size of the list (size_t)
+ *
+ * This is an O(1) lookup to return the size of the list.
+ *
+ * This is an inlined function in compilers that support inlining, so
+ * it's usually a cheap operation.
+ *
+ * \warning The size of the list is cached as part of the list.  In
+ * the future, calling \c pmix_list_splice or \c pmix_list_join may
+ * result in this function recomputing the list size, which would be
+ * an O(N) operation.  If \c pmix_list_splice or \c pmix_list_join is
+ * never called on the specified list, this function will always be
+ * O(1).
+ */
+static inline size_t pmix_list_get_size(pmix_list_t* list)
+{
+#if PMIX_ENABLE_DEBUG && 0
+    /* not sure if we really want this running in devel, as it does
+     * slow things down.  Wanted for development of splice / join to
+     * make sure length was reset properly
+     */
+    size_t check_len = 0;
+    pmix_list_item_t *item;
+
+    for (item = pmix_list_get_first(list) ;
+         item != pmix_list_get_end(list) ;
+         item = pmix_list_get_next(item)) {
+        check_len++;
+    }
+
+    if (check_len != list->pmix_list_length) {
+        fprintf(stderr," Error :: pmix_list_get_size - pmix_list_length does not match actual list length\n");
+        fflush(stderr);
+        abort();
+    }
+#endif
+
+    return list->pmix_list_length;
+}
+
+
+/**
+ * Remove an item from a list.
+ *
+ * @param list The list container
+ * @param item The item to remove
+ *
+ * @returns A pointer to the item on the list previous to the one
+ * that was removed.
+ *
+ * This is an O(1) operation to remove an item from the list.  The
+ * forward / reverse pointers in the list are updated and the item is
+ * removed.  The list item that is returned is now "owned" by the
+ * caller -- they are responsible for PMIX_RELEASE()'ing it.
+ *
+ * If debugging is enabled (specifically, if --enable-debug was used
+ * to configure PMIx), this is an O(N) operation because it checks
+ * to see if the item is actually in the list first.
+ *
+ * This is an inlined function in compilers that support inlining, so
+ * it's usually a cheap operation.
+ */
+static inline pmix_list_item_t *pmix_list_remove_item
+  (pmix_list_t *list, pmix_list_item_t *item)
+{
+#if PMIX_ENABLE_DEBUG
+    pmix_list_item_t *item_ptr;
+    bool found = false;
+
+    /* check to see that the item is in the list */
+    for (item_ptr = pmix_list_get_first(list);
+            item_ptr != pmix_list_get_end(list);
+            item_ptr = (pmix_list_item_t *)(item_ptr->pmix_list_next)) {
+        if (item_ptr == (pmix_list_item_t *) item) {
+            found = true;
+            break;
+        }
+    }
+    if (!found) {
+        fprintf(stderr," Warning :: pmix_list_remove_item - the item %p is not on the list %p \n",(void*) item, (void*) list);
+        fflush(stderr);
+        return (pmix_list_item_t *)NULL;
+    }
+
+    assert( list == item->pmix_list_item_belong_to );
+#endif
+
+    /* reset next pointer of previous element */
+    item->pmix_list_prev->pmix_list_next=item->pmix_list_next;
+
+    /* reset previous pointer of next element */
+    item->pmix_list_next->pmix_list_prev=item->pmix_list_prev;
+
+    list->pmix_list_length--;
+
+#if PMIX_ENABLE_DEBUG
+    /* Spot check: ensure that this item is still only on one list */
+
+    item->pmix_list_item_refcount -= 1;
+    assert(0 == item->pmix_list_item_refcount);
+    item->pmix_list_item_belong_to = NULL;
+#endif
+
+    return (pmix_list_item_t *)item->pmix_list_prev;
+}
+
+
+/**
+ * Append an item to the end of the list.
+ *
+ * @param list The list container
+ * @param item The item to append
+ *
+ * This is an O(1) operation to append an item to the end of a list.
+ * The pmix_list_item_t is not PMIX_RETAIN()'ed; it is assumed that
+ * "ownership" of the item is passed from the caller to the list.
+ *
+ * This is an inlined function in compilers that support inlining, so
+ * it's usually a cheap operation.
+ */
+
+#if PMIX_ENABLE_DEBUG
+#define pmix_list_append(l,i) \
+_pmix_list_append(l,i,__FILE__,__LINE__)
+#else
+#define pmix_list_append(l,i) \
+_pmix_list_append(l,i)
+#endif  /* PMIX_ENABLE_DEBUG */
+
+static inline void _pmix_list_append(pmix_list_t *list, pmix_list_item_t *item
+#if PMIX_ENABLE_DEBUG
+                                     , const char* FILE_NAME, int LINENO
+#endif  /* PMIX_ENABLE_DEBUG */
+                                     )
+{
+    pmix_list_item_t* sentinel = &(list->pmix_list_sentinel);
+#if PMIX_ENABLE_DEBUG
+  /* Spot check: ensure that this item is previously on no lists */
+
+  assert(0 == item->pmix_list_item_refcount);
+  assert( NULL == item->pmix_list_item_belong_to );
+  item->super.cls_init_file_name = FILE_NAME;
+  item->super.cls_init_lineno    = LINENO;
+#endif
+
+  /* set new element's previous pointer */
+  item->pmix_list_prev = sentinel->pmix_list_prev;
+
+  /* reset previous pointer on current last element */
+  sentinel->pmix_list_prev->pmix_list_next = item;
+
+  /* reset new element's next pointer */
+  item->pmix_list_next = sentinel;
+
+  /* reset the list's tail element previous pointer */
+  sentinel->pmix_list_prev = item;
+
+  /* increment list element counter */
+  list->pmix_list_length++;
+
+#if PMIX_ENABLE_DEBUG
+  /* Spot check: ensure this item is only on the list that we just
+     appended it to */
+
+  item->pmix_list_item_refcount += 1;
+  assert(1 == item->pmix_list_item_refcount);
+  item->pmix_list_item_belong_to = list;
+#endif
+}
+
+
+/**
+ * Prepend an item to the beginning of the list.
+ *
+ * @param list The list container
+ * @param item The item to prepend
+ *
+ * This is an O(1) operation to prepend an item to the beginning of a
+ * list.  The pmix_list_item_t is not PMIX_RETAIN()'ed; it is assumed
+ * that "ownership" of the item is passed from the caller to the list.
+ *
+ * This is an inlined function in compilers that support inlining, so
+ * it's usually a cheap operation.
+ */
+static inline void pmix_list_prepend(pmix_list_t *list,
+                                     pmix_list_item_t *item)
+{
+    pmix_list_item_t* sentinel = &(list->pmix_list_sentinel);
+#if PMIX_ENABLE_DEBUG
+  /* Spot check: ensure that this item is previously on no lists */
+
+  assert(0 == item->pmix_list_item_refcount);
+  assert( NULL == item->pmix_list_item_belong_to );
+#endif
+
+  /* reset item's next pointer */
+  item->pmix_list_next = sentinel->pmix_list_next;
+
+  /* reset item's previous pointer */
+  item->pmix_list_prev = sentinel;
+
+  /* reset previous first element's previous poiner */
+  sentinel->pmix_list_next->pmix_list_prev = item;
+
+  /* reset head's next pointer */
+  sentinel->pmix_list_next = item;
+
+  /* increment list element counter */
+  list->pmix_list_length++;
+
+#if PMIX_ENABLE_DEBUG
+  /* Spot check: ensure this item is only on the list that we just
+     prepended it to */
+
+  item->pmix_list_item_refcount += 1;
+  assert(1 == item->pmix_list_item_refcount);
+  item->pmix_list_item_belong_to = list;
+#endif
+}
+
+
+/**
+ * Remove the first item from the list and return it.
+ *
+ * @param list The list container
+ *
+ * @returns The first item on the list.  If the list is empty,
+ * NULL will be returned
+ *
+ * This is an O(1) operation to return the first item on the list.  If
+ * the list is not empty, a pointer to the first item in the list will
+ * be returned.  Ownership of the item is transferred from the list to
+ * the caller; no calls to PMIX_RETAIN() or PMIX_RELEASE() are invoked.
+ *
+ * This is an inlined function in compilers that support inlining, so
+ * it's usually a cheap operation.
+ */
+static inline pmix_list_item_t *pmix_list_remove_first(pmix_list_t *list)
+{
+  /*  Removes and returns first item on list.
+      Caller now owns the item and should release the item
+      when caller is done with it.
+  */
+  volatile pmix_list_item_t *item;
+  if ( 0 == list->pmix_list_length ) {
+    return (pmix_list_item_t *)NULL;
+  }
+
+#if PMIX_ENABLE_DEBUG
+  /* Spot check: ensure that the first item is only on this list */
+
+  assert(1 == list->pmix_list_sentinel.pmix_list_next->pmix_list_item_refcount);
+#endif
+
+  /* reset list length counter */
+  list->pmix_list_length--;
+
+  /* get pointer to first element on the list */
+  item = list->pmix_list_sentinel.pmix_list_next;
+
+  /* reset previous pointer of next item on the list */
+  item->pmix_list_next->pmix_list_prev = item->pmix_list_prev;
+
+  /* reset the head next pointer */
+  list->pmix_list_sentinel.pmix_list_next = item->pmix_list_next;
+
+#if PMIX_ENABLE_DEBUG
+  assert( list == item->pmix_list_item_belong_to );
+  item->pmix_list_item_belong_to = NULL;
+  item->pmix_list_prev=(pmix_list_item_t *)NULL;
+  item->pmix_list_next=(pmix_list_item_t *)NULL;
+
+  /* Spot check: ensure that the item we're returning is now on no
+     lists */
+
+  item->pmix_list_item_refcount -= 1;
+  assert(0 == item->pmix_list_item_refcount);
+#endif
+
+  return (pmix_list_item_t *) item;
+}
+
+
+/**
+ * Remove the last item from the list and return it.
+ *
+ * @param list The list container
+ *
+ * @returns The last item on the list.  If the list is empty,
+ * NULL will be returned
+ *
+ * This is an O(1) operation to return the last item on the list.  If
+ * the list is not empty, a pointer to the last item in the list will
+ * be returned.  Ownership of the item is transferred from the list to
+ * the caller; no calls to PMIX_RETAIN() or PMIX_RELEASE() are invoked.
+ *
+ * This is an inlined function in compilers that support inlining, so
+ * it's usually a cheap operation.
+ */
+static inline pmix_list_item_t *pmix_list_remove_last(pmix_list_t *list)
+{
+  /*  Removes, releases and returns last item on list.
+      Caller now owns the item and should release the item
+      when caller is done with it.
+  */
+  volatile pmix_list_item_t  *item;
+  if ( 0 == list->pmix_list_length ) {
+      return (pmix_list_item_t *)NULL;
+  }
+
+#if PMIX_ENABLE_DEBUG
+  /* Spot check: ensure that the first item is only on this list */
+
+  assert(1 == list->pmix_list_sentinel.pmix_list_prev->pmix_list_item_refcount);
+#endif
+
+  /* reset list length counter */
+  list->pmix_list_length--;
+
+  /* get item */
+  item = list->pmix_list_sentinel.pmix_list_prev;
+
+  /* reset previous pointer on next to last pointer */
+  item->pmix_list_prev->pmix_list_next = item->pmix_list_next;
+
+  /* reset tail's previous pointer */
+  list->pmix_list_sentinel.pmix_list_prev = item->pmix_list_prev;
+
+#if PMIX_ENABLE_DEBUG
+  assert( list == item->pmix_list_item_belong_to );
+  item->pmix_list_next = item->pmix_list_prev = (pmix_list_item_t *)NULL;
+
+  /* Spot check: ensure that the item we're returning is now on no
+     lists */
+
+  item->pmix_list_item_refcount -= 1;
+  assert(0 == item->pmix_list_item_refcount);
+  item->pmix_list_item_belong_to = NULL;
+#endif
+
+  return (pmix_list_item_t *) item;
+}
+
+  /**
+   * Add an item to the list before a given element
+   *
+   * @param list The list container
+   * @param pos List element to insert \c item before
+   * @param item The item to insert
+   *
+   * Inserts \c item before \c pos.  This is an O(1) operation.
+   */
+static inline void pmix_list_insert_pos(pmix_list_t *list, pmix_list_item_t *pos,
+                                        pmix_list_item_t *item)
+{
+#if PMIX_ENABLE_DEBUG
+    /* Spot check: ensure that the item we're insertting is currently
+       not on any list */
+
+    assert(0 == item->pmix_list_item_refcount);
+    assert( NULL == item->pmix_list_item_belong_to );
+#endif
+
+    /* point item at the existing elements */
+    item->pmix_list_next = pos;
+    item->pmix_list_prev = pos->pmix_list_prev;
+
+    /* splice into the list */
+    pos->pmix_list_prev->pmix_list_next = item;
+    pos->pmix_list_prev = item;
+
+    /* reset list length counter */
+    list->pmix_list_length++;
+
+#if PMIX_ENABLE_DEBUG
+    /* Spot check: double check that this item is only on the list
+       that we just added it to */
+
+    item->pmix_list_item_refcount += 1;
+    assert(1 == item->pmix_list_item_refcount);
+    item->pmix_list_item_belong_to = list;
+#endif
+}
+
+  /**
+   * Add an item to the list at a specific index location in the list.
+   *
+   * @param list The list container
+   * @param item The item to insert
+   * @param index Location to add the item
+   *
+   * @returns true if insertion succeeded; otherwise false
+   *
+   * This is potentially an O(N) operation to traverse down to the
+   * correct location in the list and add an item.
+   *
+   * Example: if idx = 2 and list = item1->item2->item3->item4, then
+   * after insert, list = item1->item2->item->item3->item4.
+   *
+   * If index is greater than the length of the list, no action is
+   * performed and false is returned.
+   */
+  bool pmix_list_insert(pmix_list_t *list, pmix_list_item_t *item,
+                                      long long idx);
+
+
+    /**
+     * Join a list into another list
+     *
+     * @param thislist List container for list being operated on
+     * @param pos List item in \c thislist marking the position before
+     *              which items are inserted
+     * @param xlist List container for list being spliced from
+     *
+     * Join a list into another list.  All of the elements of \c xlist
+     * are inserted before \c pos and removed from \c xlist.
+     *
+     * This operation is an O(1) operation.  Both \c thislist and \c
+     * xlist must be valid list containsers.  \c xlist will be empty
+     * but valid after the call.  All pointers to \c pmix_list_item_t
+     * containers remain valid, including those that point to elements
+     * in \c xlist.
+     */
+    void pmix_list_join(pmix_list_t *thislist, pmix_list_item_t *pos,
+                                      pmix_list_t *xlist);
+
+
+    /**
+     * Splice a list into another list
+     *
+     * @param thislist List container for list being operated on
+     * @param pos List item in \c thislist marking the position before
+     *             which items are inserted
+     * @param xlist List container for list being spliced from
+     * @param first List item in \c xlist marking the start of elements
+     *             to be copied into \c thislist
+     * @param last List item in \c xlist marking the end of elements
+     * to be copied into \c thislist
+     *
+     * Splice a subset of a list into another list.  The \c [first,
+     * last) elements of \c xlist are moved into \c thislist,
+     * inserting them before \c pos.  \c pos must be a valid iterator
+     * in \c thislist and \c [first, last) must be a valid range in \c
+     * xlist.  \c postition must not be in the range \c [first, last).
+     * It is, however, valid for \c xlist and \c thislist to be the
+     * same list.
+     *
+     * This is an O(N) operation because the length of both lists must
+     * be recomputed.
+     */
+    void pmix_list_splice(pmix_list_t *thislist, pmix_list_item_t *pos,
+                                        pmix_list_t *xlist, pmix_list_item_t *first,
+                                        pmix_list_item_t *last);
+
+    /**
+     * Comparison function for pmix_list_sort(), below.
+     *
+     * @param a Pointer to a pointer to an pmix_list_item_t.
+     * Explanation below.
+     * @param b Pointer to a pointer to an pmix_list_item_t.
+     * Explanation below.
+     * @retval 1 if \em a is greater than \em b
+     * @retval 0 if \em a is equal to \em b
+     * @retval 11 if \em a is less than \em b
+     *
+     * This function is invoked by qsort(3) from within
+     * pmix_list_sort().  It is important to understand what
+     * pmix_list_sort() does before invoking qsort, so go read that
+     * documentation first.
+     *
+     * The important thing to realize here is that a and b will be \em
+     * double pointers to the items that you need to compare.  Here's
+     * a sample compare function to illustrate this point:
+     */
+    typedef int (*pmix_list_item_compare_fn_t)(pmix_list_item_t **a,
+                                               pmix_list_item_t **b);
+
+    /**
+     * Sort a list with a provided compare function.
+     *
+     * @param list The list to sort
+     * @param compare Compare function
+     *
+     * Put crassly, this function's complexity is O(N) + O(log(N)).
+     * Its algorithm is:
+     *
+     * - remove every item from the list and put the corresponding
+     *    (pmix_list_item_t*)'s in an array
+     * - call qsort(3) with that array and your compare function
+     * - re-add every element of the now-sorted array to the list
+     *
+     * The resulting list is now ordered.  Note, however, that since
+     * an array of pointers is sorted, the comparison function must do
+     * a double de-reference to get to the actual pmix_list_item_t (or
+     * whatever the underlying type is).  See the documentation of
+     * pmix_list_item_compare_fn_t for an example).
+     */
+    int pmix_list_sort(pmix_list_t* list, pmix_list_item_compare_fn_t compare);
+
+END_C_DECLS
+
+#endif /* PMIX_LIST_H */
diff --git a/src/class/pmix_object.c b/src/class/pmix_object.c
new file mode 100644
index 0000000..ad86612
--- /dev/null
+++ b/src/class/pmix_object.c
@@ -0,0 +1,226 @@
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2005 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2007 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2014-2017 Intel, Inc. All rights reserved.
+ * Copyright (c) 2016      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+/**
+ * @file
+ *
+ * Implementation of pmix_object_t, the base pmix foundation class
+ */
+
+#include <src/include/pmix_config.h>
+/* Symbol transforms */
+
+
+#include <stdio.h>
+#include <pthread.h>
+
+#include "src/class/pmix_object.h"
+
+/*
+ * Instantiation of class descriptor for the base class.  This is
+ * special, since be mark it as already initialized, with no parent
+ * and no constructor or destructor.
+ */
+PMIX_EXPORT pmix_class_t pmix_object_t_class = {
+    "pmix_object_t",      /* name */
+    NULL,                 /* parent class */
+    NULL,                 /* constructor */
+    NULL,                 /* destructor */
+    1,                    /* initialized  -- this class is preinitialized */
+    0,                    /* class hierarchy depth */
+    NULL,                 /* array of constructors */
+    NULL,                 /* array of destructors */
+    sizeof(pmix_object_t) /* size of the pmix object */
+};
+
+int pmix_class_init_epoch = 1;
+
+/*
+ * Local variables
+ */
+static pthread_mutex_t class_mutex = PTHREAD_MUTEX_INITIALIZER;
+static void** classes = NULL;
+static int num_classes = 0;
+static int max_classes = 0;
+static const int increment = 10;
+
+
+/*
+ * Local functions
+ */
+static void save_class(pmix_class_t *cls);
+static void expand_array(void);
+
+
+/*
+ * Lazy initialization of class descriptor.
+ */
+void pmix_class_initialize(pmix_class_t *cls)
+{
+    pmix_class_t *c;
+    pmix_construct_t* cls_construct_array;
+    pmix_destruct_t* cls_destruct_array;
+    int cls_construct_array_count;
+    int cls_destruct_array_count;
+    int i;
+
+    assert(cls);
+
+    /* Check to see if anyone initialized
+       this class before we got a chance to */
+
+    if (pmix_class_init_epoch == cls->cls_initialized) {
+        return;
+    }
+    pthread_mutex_lock(&class_mutex);
+
+    /* If another thread initializing this same class came in at
+       roughly the same time, it may have gotten the lock and
+       initialized.  So check again. */
+
+    if (pmix_class_init_epoch == cls->cls_initialized) {
+        pthread_mutex_unlock(&class_mutex);
+        return;
+    }
+
+    /*
+     * First calculate depth of class hierarchy
+     * And the number of constructors and destructors
+     */
+
+    cls->cls_depth = 0;
+    cls_construct_array_count = 0;
+    cls_destruct_array_count  = 0;
+    for (c = cls; c; c = c->cls_parent) {
+        if( NULL != c->cls_construct ) {
+            cls_construct_array_count++;
+        }
+        if( NULL != c->cls_destruct ) {
+            cls_destruct_array_count++;
+        }
+        cls->cls_depth++;
+    }
+
+    /*
+     * Allocate arrays for hierarchy of constructors and destructors
+     * plus for each a NULL-sentinel
+     */
+
+    cls->cls_construct_array =
+        (void (**)(pmix_object_t*))malloc((cls_construct_array_count +
+                                           cls_destruct_array_count + 2) *
+                                          sizeof(pmix_construct_t) );
+    if (NULL == cls->cls_construct_array) {
+        perror("Out of memory");
+        exit(-1);
+    }
+    cls->cls_destruct_array =
+        cls->cls_construct_array + cls_construct_array_count + 1;
+
+    /*
+     * The constructor array is reversed, so start at the end
+     */
+
+    cls_construct_array = cls->cls_construct_array + cls_construct_array_count;
+    cls_destruct_array  = cls->cls_destruct_array;
+
+    c = cls;
+    *cls_construct_array = NULL;  /* end marker for the constructors */
+    for (i = 0; i < cls->cls_depth; i++) {
+        if( NULL != c->cls_construct ) {
+            --cls_construct_array;
+            *cls_construct_array = c->cls_construct;
+        }
+        if( NULL != c->cls_destruct ) {
+            *cls_destruct_array = c->cls_destruct;
+            cls_destruct_array++;
+        }
+        c = c->cls_parent;
+    }
+    *cls_destruct_array = NULL;  /* end marker for the destructors */
+
+    cls->cls_initialized = pmix_class_init_epoch;
+    save_class(cls);
+
+    /* All done */
+
+    pthread_mutex_unlock(&class_mutex);
+}
+
+
+/*
+ * Note that this is finalize for *all* classes.
+ */
+int pmix_class_finalize(void)
+{
+    int i;
+
+    if (INT_MAX == pmix_class_init_epoch) {
+        pmix_class_init_epoch = 1;
+    } else {
+        pmix_class_init_epoch++;
+    }
+
+    if (NULL != classes) {
+        for (i = 0; i < num_classes; ++i) {
+            if (NULL != classes[i]) {
+                free(classes[i]);
+            }
+        }
+        free(classes);
+        classes = NULL;
+        num_classes = 0;
+        max_classes = 0;
+    }
+
+    return 0;
+}
+
+
+static void save_class(pmix_class_t *cls)
+{
+    if (num_classes >= max_classes) {
+        expand_array();
+    }
+
+    classes[num_classes] = cls->cls_construct_array;
+    ++num_classes;
+}
+
+
+static void expand_array(void)
+{
+    int i;
+
+    max_classes += increment;
+    if (NULL == classes) {
+        classes = (void**)calloc(max_classes, sizeof(void*));
+    } else {
+        classes = (void**)realloc(classes, sizeof(void *) * max_classes);
+    }
+    if (NULL == classes) {
+        perror("class malloc failed");
+        exit(-1);
+    }
+    for (i = num_classes; i < max_classes; ++i) {
+        classes[i] = NULL;
+    }
+}
diff --git a/src/class/pmix_object.h b/src/class/pmix_object.h
new file mode 100644
index 0000000..8b85655
--- /dev/null
+++ b/src/class/pmix_object.h
@@ -0,0 +1,506 @@
+/* -*- Mode: C; c-basic-offset:4 ; -*- */
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2007 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2006 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2007      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2013-2017 Intel, Inc. All rights reserved.
+ * Copyright (c) 2016      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+/**
+ * @file:
+ *
+ * A simple C-language object-oriented system with single inheritance
+ * and ownership-based memory management using a retain/release model.
+ *
+ * A class consists of a struct and singly-instantiated class
+ * descriptor.  The first element of the struct must be the parent
+ * class's struct.  The class descriptor must be given a well-known
+ * name based upon the class struct name (if the struct is sally_t,
+ * the class descriptor should be sally_t_class) and must be
+ * statically initialized as discussed below.
+ *
+ * (a) To define a class
+ *
+ * In a interface (.h) file, define the class.  The first element
+ * should always be the parent class, for example
+ * @code
+ *   struct sally_t
+ *   {
+ *     parent_t parent;
+ *     void *first_member;
+ *     ...
+ *   };
+ *   typedef struct sally_t sally_t;
+ *
+ *   PMIX_CLASS_DECLARATION(sally_t);
+ * @endcode
+ * All classes must have a parent which is also class.
+ *
+ * In an implementation (.c) file, instantiate a class descriptor for
+ * the class like this:
+ * @code
+ *   PMIX_CLASS_INSTANCE(sally_t, parent_t, sally_construct, sally_destruct);
+ * @endcode
+ * This macro actually expands to
+ * @code
+ *   pmix_class_t sally_t_class = {
+ *     "sally_t",
+ *     PMIX_CLASS(parent_t),  // pointer to parent_t_class
+ *     sally_construct,
+ *     sally_destruct,
+ *     0, 0, NULL, NULL,
+ *     sizeof ("sally_t")
+ *   };
+ * @endcode
+ * This variable should be declared in the interface (.h) file using
+ * the PMIX_CLASS_DECLARATION macro as shown above.
+ *
+ * sally_construct, and sally_destruct are function pointers to the
+ * constructor and destructor for the class and are best defined as
+ * static functions in the implementation file.  NULL pointers maybe
+ * supplied instead.
+ *
+ * Other class methods may be added to the struct.
+ *
+ * (b) Class instantiation: dynamic
+ *
+ * To create a instance of a class (an object) use PMIX_NEW:
+ * @code
+ *   sally_t *sally = PMIX_NEW(sally_t);
+ * @endcode
+ * which allocates memory of sizeof(sally_t) and runs the class's
+ * constructors.
+ *
+ * Use PMIX_RETAIN, PMIX_RELEASE to do reference-count-based
+ * memory management:
+ * @code
+ *   PMIX_RETAIN(sally);
+ *   PMIX_RELEASE(sally);
+ *   PMIX_RELEASE(sally);
+ * @endcode
+ * When the reference count reaches zero, the class's destructor, and
+ * those of its parents, are run and the memory is freed.
+ *
+ * N.B. There is no explicit free/delete method for dynamic objects in
+ * this model.
+ *
+ * (c) Class instantiation: static
+ *
+ * For an object with static (or stack) allocation, it is only
+ * necessary to initialize the memory, which is done using
+ * PMIX_CONSTRUCT:
+ * @code
+ *   sally_t sally;
+ *
+ *   PMIX_CONSTRUCT(&sally, sally_t);
+ * @endcode
+ * The retain/release model is not necessary here, but before the
+ * object goes out of scope, PMIX_DESTRUCT should be run to release
+ * initialized resources:
+ * @code
+ *   PMIX_DESTRUCT(&sally);
+ * @endcode
+ */
+
+#ifndef PMIX_OBJECT_H
+#define PMIX_OBJECT_H
+
+#include <src/include/pmix_config.h>
+#include <pmix_common.h>
+
+#include <assert.h>
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif  /* HAVE_STDLIB_H */
+
+#include "src/threads/thread_usage.h"
+
+BEGIN_C_DECLS
+
+#if PMIX_ENABLE_DEBUG
+/* Any kind of unique ID should do the job */
+#define PMIX_OBJ_MAGIC_ID ((0xdeafbeedULL << 32) + 0xdeafbeedULL)
+#endif
+
+/* typedefs ***********************************************************/
+
+typedef struct pmix_object_t pmix_object_t;
+typedef struct pmix_class_t pmix_class_t;
+typedef void (*pmix_construct_t) (pmix_object_t *);
+typedef void (*pmix_destruct_t) (pmix_object_t *);
+
+
+/* types **************************************************************/
+
+/**
+ * Class descriptor.
+ *
+ * There should be a single instance of this descriptor for each class
+ * definition.
+ */
+struct pmix_class_t {
+    const char *cls_name;           /**< symbolic name for class */
+    pmix_class_t *cls_parent;       /**< parent class descriptor */
+    pmix_construct_t cls_construct; /**< class constructor */
+    pmix_destruct_t cls_destruct;   /**< class destructor */
+    int cls_initialized;            /**< is class initialized */
+    int cls_depth;                  /**< depth of class hierarchy tree */
+    pmix_construct_t *cls_construct_array;
+                                    /**< array of parent class constructors */
+    pmix_destruct_t *cls_destruct_array;
+                                    /**< array of parent class destructors */
+    size_t cls_sizeof;              /**< size of an object instance */
+};
+
+PMIX_EXPORT extern int pmix_class_init_epoch;
+
+/**
+ * For static initializations of OBJects.
+ *
+ * @param NAME   Name of the class to initialize
+ */
+#if PMIX_ENABLE_DEBUG
+#define PMIX_OBJ_STATIC_INIT(BASE_CLASS) { PMIX_OBJ_MAGIC_ID, PMIX_CLASS(BASE_CLASS), 1, __FILE__, __LINE__ }
+#else
+#define PMIX_OBJ_STATIC_INIT(BASE_CLASS) { PMIX_CLASS(BASE_CLASS), 1 }
+#endif
+
+/**
+ * Base object.
+ *
+ * This is special and does not follow the pattern for other classes.
+ */
+struct pmix_object_t {
+#if PMIX_ENABLE_DEBUG
+    /** Magic ID -- want this to be the very first item in the
+        struct's memory */
+    uint64_t obj_magic_id;
+#endif
+    pmix_class_t *obj_class;            /**< class descriptor */
+    volatile int32_t obj_reference_count;   /**< reference count */
+#if PMIX_ENABLE_DEBUG
+   const char* cls_init_file_name;        /**< In debug mode store the file where the object get contructed */
+   int   cls_init_lineno;           /**< In debug mode store the line number where the object get contructed */
+#endif  /* PMIX_ENABLE_DEBUG */
+};
+
+/* macros ************************************************************/
+
+/**
+ * Return a pointer to the class descriptor associated with a
+ * class type.
+ *
+ * @param NAME          Name of class
+ * @return              Pointer to class descriptor
+ */
+#define PMIX_CLASS(NAME)     (&(NAME ## _class))
+
+
+/**
+ * Static initializer for a class descriptor
+ *
+ * @param NAME          Name of class
+ * @param PARENT        Name of parent class
+ * @param CONSTRUCTOR   Pointer to constructor
+ * @param DESTRUCTOR    Pointer to destructor
+ *
+ * Put this in NAME.c
+ */
+#define PMIX_CLASS_INSTANCE(NAME, PARENT, CONSTRUCTOR, DESTRUCTOR)       \
+    pmix_class_t NAME ## _class = {                                     \
+        # NAME,                                                         \
+        PMIX_CLASS(PARENT),                                              \
+        (pmix_construct_t) CONSTRUCTOR,                                 \
+        (pmix_destruct_t) DESTRUCTOR,                                   \
+        0, 0, NULL, NULL,                                               \
+        sizeof(NAME)                                                    \
+    }
+
+
+/**
+ * Declaration for class descriptor
+ *
+ * @param NAME          Name of class
+ *
+ * Put this in NAME.h
+ */
+#define PMIX_CLASS_DECLARATION(NAME)             \
+    extern pmix_class_t NAME ## _class
+
+
+/**
+ * Create an object: dynamically allocate storage and run the class
+ * constructor.
+ *
+ * @param type          Type (class) of the object
+ * @return              Pointer to the object
+ */
+static inline pmix_object_t *pmix_obj_new(pmix_class_t * cls);
+#if PMIX_ENABLE_DEBUG
+static inline pmix_object_t *pmix_obj_new_debug(pmix_class_t* type, const char* file, int line)
+{
+    pmix_object_t* object = pmix_obj_new(type);
+    object->obj_magic_id = PMIX_OBJ_MAGIC_ID;
+    object->cls_init_file_name = file;
+    object->cls_init_lineno = line;
+    return object;
+}
+#define PMIX_NEW(type)                                   \
+    ((type *)pmix_obj_new_debug(PMIX_CLASS(type), __FILE__, __LINE__))
+#else
+#define PMIX_NEW(type)                                   \
+    ((type *) pmix_obj_new(PMIX_CLASS(type)))
+#endif  /* PMIX_ENABLE_DEBUG */
+
+/**
+ * Retain an object (by incrementing its reference count)
+ *
+ * @param object        Pointer to the object
+ */
+#if PMIX_ENABLE_DEBUG
+#define PMIX_RETAIN(object)                                              \
+    do {                                                                \
+        assert(NULL != ((pmix_object_t *) (object))->obj_class);        \
+        assert(PMIX_OBJ_MAGIC_ID == ((pmix_object_t *) (object))->obj_magic_id); \
+        pmix_obj_update((pmix_object_t *) (object), 1);                 \
+        assert(((pmix_object_t *) (object))->obj_reference_count >= 0); \
+    } while (0)
+#else
+#define PMIX_RETAIN(object)  pmix_obj_update((pmix_object_t *) (object), 1);
+#endif
+
+/**
+ * Helper macro for the debug mode to store the locations where the status of
+ * an object change.
+ */
+#if PMIX_ENABLE_DEBUG
+#define PMIX_REMEMBER_FILE_AND_LINENO( OBJECT, FILE, LINENO )    \
+    do {                                                        \
+        ((pmix_object_t*)(OBJECT))->cls_init_file_name = FILE;  \
+        ((pmix_object_t*)(OBJECT))->cls_init_lineno = LINENO;   \
+    } while (0)
+#define PMIX_SET_MAGIC_ID( OBJECT, VALUE )                       \
+    do {                                                        \
+        ((pmix_object_t*)(OBJECT))->obj_magic_id = (VALUE);     \
+    } while (0)
+#else
+#define PMIX_REMEMBER_FILE_AND_LINENO( OBJECT, FILE, LINENO )
+#define PMIX_SET_MAGIC_ID( OBJECT, VALUE )
+#endif  /* PMIX_ENABLE_DEBUG */
+
+/**
+ * Release an object (by decrementing its reference count).  If the
+ * reference count reaches zero, destruct (finalize) the object and
+ * free its storage.
+ *
+ * Note: If the object is freed, then the value of the pointer is set
+ * to NULL.
+ *
+ * @param object        Pointer to the object
+ */
+#if PMIX_ENABLE_DEBUG
+#define PMIX_RELEASE(object)                                             \
+    do {                                                                \
+        assert(NULL != ((pmix_object_t *) (object))->obj_class);        \
+        assert(PMIX_OBJ_MAGIC_ID == ((pmix_object_t *) (object))->obj_magic_id); \
+        if (0 == pmix_obj_update((pmix_object_t *) (object), -1)) {     \
+            PMIX_SET_MAGIC_ID((object), 0);                              \
+            pmix_obj_run_destructors((pmix_object_t *) (object));       \
+            PMIX_REMEMBER_FILE_AND_LINENO( object, __FILE__, __LINE__ ); \
+            free(object);                                               \
+            object = NULL;                                              \
+        }                                                               \
+    } while (0)
+#else
+#define PMIX_RELEASE(object)                                             \
+    do {                                                                \
+        if (0 == pmix_obj_update((pmix_object_t *) (object), -1)) {     \
+            pmix_obj_run_destructors((pmix_object_t *) (object));       \
+            free(object);                                               \
+            object = NULL;                                              \
+        }                                                               \
+    } while (0)
+#endif
+
+
+/**
+ * Construct (initialize) objects that are not dynamically allocated.
+ *
+ * @param object        Pointer to the object
+ * @param type          The object type
+ */
+
+#define PMIX_CONSTRUCT(object, type)                             \
+do {                                                            \
+    PMIX_CONSTRUCT_INTERNAL((object), PMIX_CLASS(type));          \
+} while (0)
+
+#define PMIX_CONSTRUCT_INTERNAL(object, type)                        \
+do {                                                                \
+    PMIX_SET_MAGIC_ID((object), PMIX_OBJ_MAGIC_ID);              \
+    if (pmix_class_init_epoch != (type)->cls_initialized) {                             \
+        pmix_class_initialize((type));                              \
+    }                                                               \
+    ((pmix_object_t *) (object))->obj_class = (type);               \
+    ((pmix_object_t *) (object))->obj_reference_count = 1;          \
+    pmix_obj_run_constructors((pmix_object_t *) (object));          \
+    PMIX_REMEMBER_FILE_AND_LINENO( object, __FILE__, __LINE__ ); \
+} while (0)
+
+
+/**
+ * Destruct (finalize) an object that is not dynamically allocated.
+ *
+ * @param object        Pointer to the object
+ */
+#if PMIX_ENABLE_DEBUG
+#define PMIX_DESTRUCT(object)                                    \
+do {                                                            \
+    assert(PMIX_OBJ_MAGIC_ID == ((pmix_object_t *) (object))->obj_magic_id); \
+    PMIX_SET_MAGIC_ID((object), 0);                              \
+    pmix_obj_run_destructors((pmix_object_t *) (object));       \
+    PMIX_REMEMBER_FILE_AND_LINENO( object, __FILE__, __LINE__ ); \
+} while (0)
+#else
+#define PMIX_DESTRUCT(object)                                    \
+do {                                                            \
+    pmix_obj_run_destructors((pmix_object_t *) (object));       \
+    PMIX_REMEMBER_FILE_AND_LINENO( object, __FILE__, __LINE__ ); \
+} while (0)
+#endif
+
+PMIX_CLASS_DECLARATION(pmix_object_t);
+
+/* declarations *******************************************************/
+
+/**
+ * Lazy initialization of class descriptor.
+ *
+ * Specifically cache arrays of function pointers for the constructor
+ * and destructor hierarchies for this class.
+ *
+ * @param class    Pointer to class descriptor
+ */
+PMIX_EXPORT void pmix_class_initialize(pmix_class_t *);
+
+/**
+ * Shut down the class system and release all memory
+ *
+ * This function should be invoked as the ABSOLUTE LAST function to
+ * use the class subsystem.  It frees all associated memory with ALL
+ * classes, rendering all of them inoperable.  It is here so that
+ * tools like valgrind and purify don't report still-reachable memory
+ * upon process termination.
+ */
+PMIX_EXPORT int pmix_class_finalize(void);
+
+/**
+ * Run the hierarchy of class constructors for this object, in a
+ * parent-first order.
+ *
+ * Do not use this function directly: use PMIX_CONSTRUCT() instead.
+ *
+ * WARNING: This implementation relies on a hardwired maximum depth of
+ * the inheritance tree!!!
+ *
+ * Hardwired for fairly shallow inheritance trees
+ * @param size          Pointer to the object.
+ */
+static inline void pmix_obj_run_constructors(pmix_object_t * object)
+{
+    pmix_construct_t* cls_construct;
+
+    assert(NULL != object->obj_class);
+
+    cls_construct = object->obj_class->cls_construct_array;
+    while( NULL != *cls_construct ) {
+        (*cls_construct)(object);
+        cls_construct++;
+    }
+}
+
+
+/**
+ * Run the hierarchy of class destructors for this object, in a
+ * parent-last order.
+ *
+ * Do not use this function directly: use PMIX_DESTRUCT() instead.
+ *
+ * @param size          Pointer to the object.
+ */
+static inline void pmix_obj_run_destructors(pmix_object_t * object)
+{
+    pmix_destruct_t* cls_destruct;
+
+    assert(NULL != object->obj_class);
+
+    cls_destruct = object->obj_class->cls_destruct_array;
+    while( NULL != *cls_destruct ) {
+        (*cls_destruct)(object);
+        cls_destruct++;
+    }
+}
+
+
+/**
+ * Create new object: dynamically allocate storage and run the class
+ * constructor.
+ *
+ * Do not use this function directly: use PMIX_NEW() instead.
+ *
+ * @param size          Size of the object
+ * @param cls           Pointer to the class descriptor of this object
+ * @return              Pointer to the object
+ */
+static inline pmix_object_t *pmix_obj_new(pmix_class_t * cls)
+{
+    pmix_object_t *object;
+    assert(cls->cls_sizeof >= sizeof(pmix_object_t));
+
+    object = (pmix_object_t *) malloc(cls->cls_sizeof);
+    if (pmix_class_init_epoch != cls->cls_initialized) {
+        pmix_class_initialize(cls);
+    }
+    if (NULL != object) {
+        object->obj_class = cls;
+        object->obj_reference_count = 1;
+        pmix_obj_run_constructors(object);
+    }
+    return object;
+}
+
+
+/**
+ * Atomically update the object's reference count by some increment.
+ *
+ * This function should not be used directly: it is called via the
+ * macros PMIX_RETAIN and PMIX_RELEASE
+ *
+ * @param object        Pointer to the object
+ * @param inc           Increment by which to update reference count
+ * @return              New value of the reference count
+ */
+static inline int pmix_obj_update(pmix_object_t *object, int inc) __pmix_attribute_always_inline__;
+static inline int pmix_obj_update(pmix_object_t *object, int inc)
+{
+    return PMIX_THREAD_ADD32(&object->obj_reference_count, inc);
+}
+
+END_C_DECLS
+
+#endif
diff --git a/src/class/pmix_pointer_array.c b/src/class/pmix_pointer_array.c
new file mode 100644
index 0000000..83cce24
--- /dev/null
+++ b/src/class/pmix_pointer_array.c
@@ -0,0 +1,439 @@
+/* -*- Mode: C; c-basic-offset:4 ; -*- */
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2017 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2017      Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include "pmix_config.h"
+#include "pmix_common.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <assert.h>
+
+#include "src/class/pmix_pointer_array.h"
+#include "src/util/output.h"
+
+static void pmix_pointer_array_construct(pmix_pointer_array_t *);
+static void pmix_pointer_array_destruct(pmix_pointer_array_t *);
+static bool grow_table(pmix_pointer_array_t *table, int at_least);
+
+PMIX_EXPORT PMIX_CLASS_INSTANCE(pmix_pointer_array_t, pmix_object_t,
+                                pmix_pointer_array_construct,
+                                pmix_pointer_array_destruct);
+
+/*
+ * pmix_pointer_array constructor
+ */
+static void pmix_pointer_array_construct(pmix_pointer_array_t *array)
+{
+    array->lowest_free = 0;
+    array->number_free = 0;
+    array->size = 0;
+    array->max_size = INT_MAX;
+    array->block_size = 8;
+    array->free_bits = NULL;
+    array->addr = NULL;
+}
+
+/*
+ * pmix_pointer_array destructor
+ */
+static void pmix_pointer_array_destruct(pmix_pointer_array_t *array)
+{
+    /* free table */
+    if( NULL != array->free_bits) {
+        free(array->free_bits);
+        array->free_bits = NULL;
+    }
+    if( NULL != array->addr ) {
+        free(array->addr);
+        array->addr = NULL;
+    }
+
+    array->size = 0;
+
+}
+
+#define TYPE_ELEM_COUNT(TYPE, CAP) (((CAP) + 8 * sizeof(TYPE) - 1) / (8 * sizeof(TYPE)))
+
+/**
+ * Translate an index position into the free bits array into 2 values, the
+ * index of the element and the index of the bit position.
+ */
+#define GET_BIT_POS(IDX, BIDX, PIDX)                                    \
+    do {                                                                \
+        uint32_t __idx = (uint32_t)(IDX);                               \
+        (BIDX) = (__idx / (8 * sizeof(uint64_t)));                      \
+        (PIDX) = (__idx % (8 * sizeof(uint64_t)));                      \
+    } while(0)
+
+/**
+ * A classical find first zero bit (ffs) on a large array. It checks starting
+ * from the indicated position until it finds a zero bit. If SET is true,
+ * the bit is set. The position of the bit is returned in store.
+ *
+ * According to Section 6.4.4.1 of the C standard we don't need to prepend a type
+ * indicator to constants (the type is inferred by the compiler according to
+ * the number of bits necessary to represent it).
+ */
+#define FIND_FIRST_ZERO(START_IDX, STORE)                               \
+    do {                                                                \
+        uint32_t __b_idx, __b_pos;                                      \
+        if( 0 == table->number_free ) {                                 \
+            (STORE) = table->size;                                      \
+            break;                                                      \
+        }                                                               \
+        GET_BIT_POS((START_IDX), __b_idx, __b_pos);                     \
+        for (; table->free_bits[__b_idx] == 0xFFFFFFFFFFFFFFFFu; __b_idx++); \
+        assert(__b_idx < (uint32_t)table->size);                        \
+        uint64_t __check_value = table->free_bits[__b_idx];             \
+        __b_pos = 0;                                                    \
+                                                                        \
+        if( 0x00000000FFFFFFFFu == (__check_value & 0x00000000FFFFFFFFu) ) { \
+            __check_value >>= 32; __b_pos += 32;                        \
+        }                                                               \
+        if( 0x000000000000FFFFu == (__check_value & 0x000000000000FFFFu) ) { \
+            __check_value >>= 16; __b_pos += 16;                        \
+        }                                                               \
+        if( 0x00000000000000FFu == (__check_value & 0x00000000000000FFu) ) { \
+            __check_value >>= 8; __b_pos += 8;                          \
+        }                                                               \
+        if( 0x000000000000000Fu == (__check_value & 0x000000000000000Fu) ) { \
+            __check_value >>= 4; __b_pos += 4;                          \
+        }                                                               \
+        if( 0x0000000000000003u == (__check_value & 0x0000000000000003u) ) { \
+            __check_value >>= 2; __b_pos += 2;                          \
+        }                                                               \
+        if( 0x0000000000000001u == (__check_value & 0x0000000000000001u) ) { \
+            __b_pos += 1;                                               \
+        }                                                               \
+        (STORE) = (__b_idx * 8 * sizeof(uint64_t)) + __b_pos;           \
+    } while(0)
+
+/**
+ * Set the IDX bit in the free_bits array. The bit should be previously unset.
+ */
+#define SET_BIT(IDX)                                                    \
+    do {                                                                \
+        uint32_t __b_idx, __b_pos;                                      \
+        GET_BIT_POS((IDX), __b_idx, __b_pos);                           \
+        assert( 0 == (table->free_bits[__b_idx] & (((uint64_t)1) << __b_pos))); \
+        table->free_bits[__b_idx] |= (((uint64_t)1) << __b_pos);        \
+    } while(0)
+
+/**
+ * Unset the IDX bit in the free_bits array. The bit should be previously set.
+ */
+#define UNSET_BIT(IDX)                                                  \
+    do {                                                                \
+        uint32_t __b_idx, __b_pos;                                      \
+        GET_BIT_POS((IDX), __b_idx, __b_pos);                           \
+        assert( (table->free_bits[__b_idx] & (((uint64_t)1) << __b_pos))); \
+        table->free_bits[__b_idx] ^= (((uint64_t)1) << __b_pos);        \
+    } while(0)
+
+#if 0
+/**
+ * Validate the pointer array by making sure that the elements and
+ * the free bits array are in sync. It also check that the number
+ * of remaining free element is consistent.
+ */
+static void pmix_pointer_array_validate(pmix_pointer_array_t *array)
+{
+    int i, cnt = 0;
+    uint32_t b_idx, p_idx;
+
+    for( i = 0; i < array->size; i++ ) {
+        GET_BIT_POS(i, b_idx, p_idx);
+        if( NULL == array->addr[i] ) {
+            cnt++;
+            assert( 0 == (array->free_bits[b_idx] & (((uint64_t)1) << p_idx)) );
+        } else {
+            assert( 0 != (array->free_bits[b_idx] & (((uint64_t)1) << p_idx)) );
+        }
+    }
+    assert(cnt == array->number_free);
+}
+#endif
+
+/**
+ * initialize an array object
+ */
+int pmix_pointer_array_init(pmix_pointer_array_t* array,
+                            int initial_allocation,
+                            int max_size, int block_size)
+{
+    size_t num_bytes;
+
+    /* check for errors */
+    if (NULL == array || max_size < block_size) {
+        return PMIX_ERR_BAD_PARAM;
+    }
+
+    array->max_size = max_size;
+    array->block_size = (0 == block_size ? 8 : block_size);
+    array->lowest_free = 0;
+
+    num_bytes = (0 < initial_allocation ? initial_allocation : block_size);
+
+    /* Allocate and set the array to NULL */
+    array->addr = (void **)calloc(num_bytes, sizeof(void*));
+    if (NULL == array->addr) { /* out of memory */
+        return PMIX_ERR_OUT_OF_RESOURCE;
+    }
+    array->free_bits = (uint64_t*)calloc(TYPE_ELEM_COUNT(uint64_t, num_bytes), sizeof(uint64_t));
+    if (NULL == array->free_bits) {  /* out of memory */
+        free(array->addr);
+        array->addr = NULL;
+        return PMIX_ERR_OUT_OF_RESOURCE;
+    }
+    array->number_free = num_bytes;
+    array->size = num_bytes;
+
+    return PMIX_SUCCESS;
+}
+
+/**
+ * add a pointer to dynamic pointer table
+ *
+ * @param table Pointer to pmix_pointer_array_t object (IN)
+ * @param ptr Pointer to be added to table    (IN)
+ *
+ * @return Array index where ptr is inserted or PMIX_ERROR if it fails
+ */
+int pmix_pointer_array_add(pmix_pointer_array_t *table, void *ptr)
+{
+    int index = table->size + 1;
+
+    if (table->number_free == 0) {
+        /* need to grow table */
+        if (!grow_table(table, index) ) {
+            return PMIX_ERR_OUT_OF_RESOURCE;
+        }
+    }
+
+    assert( (table->addr != NULL) && (table->size > 0) );
+    assert( (table->lowest_free >= 0) && (table->lowest_free < table->size) );
+    assert( (table->number_free > 0) && (table->number_free <= table->size) );
+
+    /*
+     * add pointer to table, and return the index
+     */
+
+    index = table->lowest_free;
+    assert(NULL == table->addr[index]);
+    table->addr[index] = ptr;
+    table->number_free--;
+    SET_BIT(index);
+    if (table->number_free > 0) {
+        FIND_FIRST_ZERO(index, table->lowest_free);
+    } else {
+        table->lowest_free = table->size;
+    }
+
+#if 0
+    pmix_pointer_array_validate(table);
+#endif
+    return index;
+}
+
+/**
+ * Set the value of the dynamic array at a specified location.
+ *
+ *
+ * @param table Pointer to pmix_pointer_array_t object (IN)
+ * @param ptr Pointer to be added to table    (IN)
+ *
+ * @return Error code
+ *
+ * Assumption: NULL element is free element.
+ */
+int pmix_pointer_array_set_item(pmix_pointer_array_t *table, int index,
+                                void * value)
+{
+    assert(table != NULL);
+
+    if (PMIX_UNLIKELY(0 > index)) {
+        return PMIX_ERROR;
+    }
+
+    /* expand table if required to set a specific index */
+
+    if (table->size <= index) {
+        if (!grow_table(table, index)) {
+            return PMIX_ERROR;
+        }
+    }
+    assert(table->size > index);
+    /* mark element as free, if NULL element */
+    if( NULL == value ) {
+        if( NULL != table->addr[index] ) {
+            if (index < table->lowest_free) {
+                table->lowest_free = index;
+            }
+            table->number_free++;
+            UNSET_BIT(index);
+        }
+    } else {
+        if (NULL == table->addr[index]) {
+            table->number_free--;
+            SET_BIT(index);
+            /* Reset lowest_free if required */
+            if ( index == table->lowest_free ) {
+                FIND_FIRST_ZERO(index, table->lowest_free);
+            }
+        } else {
+            assert( index != table->lowest_free );
+        }
+    }
+    table->addr[index] = value;
+
+#if 0
+    pmix_pointer_array_validate(table);
+    pmix_output(0,"pmix_pointer_array_set_item: OUT: "
+                " table %p (size %ld, lowest free %ld, number free %ld)"
+                " addr[%d] = %p\n",
+                table, table->size, table->lowest_free, table->number_free,
+                index, table->addr[index]);
+#endif
+
+    return PMIX_SUCCESS;
+}
+
+/**
+ * Test whether a certain element is already in use. If not yet
+ * in use, reserve it.
+ *
+ * @param array Pointer to array (IN)
+ * @param index Index of element to be tested (IN)
+ * @param value New value to be set at element index (IN)
+ *
+ * @return true/false True if element could be reserved
+ *                    False if element could not be reserved (e.g.in use).
+ *
+ * In contrary to array_set, this function does not allow to overwrite
+ * a value, unless the previous value is NULL ( equiv. to free ).
+ */
+bool pmix_pointer_array_test_and_set_item (pmix_pointer_array_t *table,
+                                           int index, void *value)
+{
+    assert(table != NULL);
+    assert(index >= 0);
+
+#if 0
+    pmix_output(0,"pmix_pointer_array_test_and_set_item: IN:  "
+               " table %p (size %ld, lowest free %ld, number free %ld)"
+               " addr[%d] = %p\n",
+               table, table->size, table->lowest_free, table->number_free,
+               index, table->addr[index]);
+#endif
+
+    /* expand table if required to set a specific index */
+    if ( index < table->size && table->addr[index] != NULL ) {
+        /* This element is already in use */
+        return false;
+    }
+
+    /* Do we need to grow the table? */
+
+    if (table->size <= index) {
+        if (!grow_table(table, index)) {
+            return false;
+        }
+    }
+
+    /*
+     * allow a specific index to be changed.
+     */
+    assert(NULL == table->addr[index]);
+    table->addr[index] = value;
+    table->number_free--;
+    SET_BIT(index);
+    /* Reset lowest_free if required */
+    if( table->number_free > 0 ) {
+        if ( index == table->lowest_free ) {
+            FIND_FIRST_ZERO(index, table->lowest_free);
+        }
+    } else {
+        table->lowest_free = table->size;
+    }
+
+#if 0
+    pmix_pointer_array_validate(table);
+    pmix_output(0,"pmix_pointer_array_test_and_set_item: OUT: "
+               " table %p (size %ld, lowest free %ld, number free %ld)"
+               " addr[%d] = %p\n",
+               table, table->size, table->lowest_free, table->number_free,
+               index, table->addr[index]);
+#endif
+
+    return true;
+}
+
+int pmix_pointer_array_set_size(pmix_pointer_array_t *array, int new_size)
+{
+    if(new_size > array->size) {
+        if (!grow_table(array, new_size)) {
+            return PMIX_ERROR;
+        }
+    }
+    return PMIX_SUCCESS;
+}
+
+static bool grow_table(pmix_pointer_array_t *table, int at_least)
+{
+    int i, new_size, new_size_int;
+    void *p;
+
+    new_size = table->block_size * ((at_least + 1 + table->block_size - 1) / table->block_size);
+    if( new_size >= table->max_size ) {
+        new_size = table->max_size;
+        if( at_least >= table->max_size ) {
+            return false;
+        }
+    }
+
+    p = (void **) realloc(table->addr, new_size * sizeof(void *));
+    if (NULL == p) {
+        return false;
+    }
+
+    table->number_free += (new_size - table->size);
+    table->addr = (void**)p;
+    for (i = table->size; i < new_size; ++i) {
+        table->addr[i] = NULL;
+    }
+    new_size_int = TYPE_ELEM_COUNT(uint64_t, new_size);
+    if( (int)(TYPE_ELEM_COUNT(uint64_t, table->size)) != new_size_int ) {
+        p = (uint64_t*)realloc(table->free_bits, new_size_int * sizeof(uint64_t));
+        if (NULL == p) {
+            return false;
+        }
+        table->free_bits = (uint64_t*)p;
+        for (i = TYPE_ELEM_COUNT(uint64_t, table->size);
+             i < new_size_int; i++ ) {
+            table->free_bits[i] = 0;
+        }
+    }
+    table->size = new_size;
+#if 0
+    pmix_output(0, "grow_table %p to %d (max_size %d, block %d, number_free %d)\n",
+                (void*)table, table->size, table->max_size, table->block_size, table->number_free);
+#endif
+    return true;
+}
diff --git a/src/class/pmix_pointer_array.h b/src/class/pmix_pointer_array.h
new file mode 100644
index 0000000..b369a5a
--- /dev/null
+++ b/src/class/pmix_pointer_array.h
@@ -0,0 +1,205 @@
+/* -*- Mode: C; c-basic-offset:4 ; -*- */
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2017 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2017      Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+/** @file
+ *
+ * Utility functions to manage fortran <-> c opaque object
+ * translation.  Note that since MPI defines fortran handles as
+ * [signed] int's, we use int everywhere in here where you would
+ * normally expect size_t.  There's some code that makes sure indices
+ * don't go above FORTRAN_HANDLE_MAX (which is min(INT_MAX, fortran
+ * INTEGER max)), just to be sure.
+ */
+
+#ifndef PMIX_POINTER_ARRAY_H
+#define PMIX_POINTER_ARRAY_H
+
+#include "pmix_config.h"
+
+#include "src/class/pmix_object.h"
+#include "src/include/prefetch.h"
+
+BEGIN_C_DECLS
+
+/**
+ * dynamic pointer array
+ */
+struct pmix_pointer_array_t {
+    /** base class */
+    pmix_object_t super;
+    /** Index of lowest free element.  NOTE: This is only an
+        optimization to know where to search for the first free slot.
+        It does \em not necessarily imply indices all above this index
+        are not taken! */
+    int lowest_free;
+    /** number of free elements in the list */
+    int number_free;
+    /** size of list, i.e. number of elements in addr */
+    int size;
+    /** maximum size of the array */
+    int max_size;
+    /** block size for each allocation */
+    int block_size;
+    /** pointer to an array of bits to speed up the research for an empty position. */
+    uint64_t* free_bits;
+    /** pointer to array of pointers */
+    void **addr;
+};
+/**
+ * Convenience typedef
+ */
+typedef struct pmix_pointer_array_t pmix_pointer_array_t;
+/**
+ * Class declaration
+ */
+PMIX_EXPORT PMIX_CLASS_DECLARATION(pmix_pointer_array_t);
+
+/**
+ * Initialize the pointer array with an initial size of initial_allocation.
+ * Set the maximum size of the array, as well as the size of the allocation
+ * block for all subsequent growing operations. Remarque: The pointer array
+ * has to be created bfore calling this function.
+ *
+ * @param array Pointer to pointer of an array (IN/OUT)
+ * @param initial_allocation The number of elements in the initial array (IN)
+ * @param max_size The maximum size of the array (IN)
+ * @param block_size The size for all subsequent grows of the array (IN).
+ *
+ * @return PMIX_SUCCESS if all initializations were succesfull. Otherwise,
+ *  the error indicate what went wrong in the function.
+ */
+PMIX_EXPORT int pmix_pointer_array_init(pmix_pointer_array_t* array,
+                                        int initial_allocation,
+                                        int max_size, int block_size);
+
+/**
+ * Add a pointer to the array (Grow the array, if need be)
+ *
+ * @param array Pointer to array (IN)
+ * @param ptr Pointer value (IN)
+ *
+ * @return Index of inserted array element.  Return value of
+ *  (-1) indicates an error.
+ */
+PMIX_EXPORT int pmix_pointer_array_add(pmix_pointer_array_t *array, void *ptr);
+
+/**
+ * Set the value of an element in array
+ *
+ * @param array Pointer to array (IN)
+ * @param index Index of element to be reset (IN)
+ * @param value New value to be set at element index (IN)
+ *
+ * @return Error code.  (-1) indicates an error.
+ */
+PMIX_EXPORT int pmix_pointer_array_set_item(pmix_pointer_array_t *array,
+                                            int index, void *value);
+
+/**
+ * Get the value of an element in array
+ *
+ * @param array          Pointer to array (IN)
+ * @param element_index  Index of element to be returned (IN)
+ *
+ * @return Error code.  NULL indicates an error.
+ */
+
+static inline void *pmix_pointer_array_get_item(pmix_pointer_array_t *table,
+                                                int element_index)
+{
+    void *p;
+
+    if( PMIX_UNLIKELY(0 > element_index || table->size <= element_index) ) {
+        return NULL;
+    }
+    p = table->addr[element_index];
+    return p;
+}
+
+
+/**
+ * Get the size of the pointer array
+ *
+ * @param array Pointer to array (IN)
+ *
+ * @returns size Size of the array
+ *
+ * Simple inline function to return the size of the array in order to
+ * hide the member field from external users.
+ */
+static inline int pmix_pointer_array_get_size(pmix_pointer_array_t *array)
+{
+  return array->size;
+}
+
+/**
+ * Set the size of the pointer array
+ *
+ * @param array Pointer to array (IN)
+ *
+ * @param size Desired size of the array
+ *
+ * Simple function to set the size of the array in order to
+ * hide the member field from external users.
+ */
+PMIX_EXPORT int pmix_pointer_array_set_size(pmix_pointer_array_t *array, int size);
+
+/**
+ * Test whether a certain element is already in use. If not yet
+ * in use, reserve it.
+ *
+ * @param array Pointer to array (IN)
+ * @param index Index of element to be tested (IN)
+ * @param value New value to be set at element index (IN)
+ *
+ * @return true/false True if element could be reserved
+ *                    False if element could not be reserved (e.g., in use).
+ *
+ * In contrary to array_set, this function does not allow to overwrite
+ * a value, unless the previous value is NULL ( equiv. to free ).
+ */
+PMIX_EXPORT bool pmix_pointer_array_test_and_set_item (pmix_pointer_array_t *table,
+                                                       int index,
+                                                       void *value);
+
+/**
+ * Empty the array.
+ *
+ * @param array Pointer to array (IN)
+ *
+ */
+static inline void pmix_pointer_array_remove_all(pmix_pointer_array_t *array)
+{
+    int i;
+    if( array->number_free == array->size )
+        return;  /* nothing to do here this time (the array is already empty) */
+
+    array->lowest_free = 0;
+    array->number_free = array->size;
+    for(i = 0; i < array->size; i++) {
+        array->addr[i] = NULL;
+    }
+    for(i = 0; i < (int)((array->size + 8*sizeof(uint64_t) - 1) / (8*sizeof(uint64_t))); i++) {
+        array->free_bits[i] = 0;
+    }
+}
+
+END_C_DECLS
+
+#endif /* PMIX_POINTER_ARRAY_H */
diff --git a/src/class/pmix_ring_buffer.c b/src/class/pmix_ring_buffer.c
new file mode 100644
index 0000000..f307abe
--- /dev/null
+++ b/src/class/pmix_ring_buffer.c
@@ -0,0 +1,154 @@
+/* -*- Mode: C; c-basic-offset:4 ; -*- */
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2007 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2010      Cisco Systems, Inc. All rights reserved.
+ * Copyright (c) 2016-2017 Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <assert.h>
+
+#include "pmix_common.h"
+#include "src/class/pmix_ring_buffer.h"
+#include "src/util/output.h"
+
+static void pmix_ring_buffer_construct(pmix_ring_buffer_t *);
+static void pmix_ring_buffer_destruct(pmix_ring_buffer_t *);
+
+PMIX_EXPORT PMIX_CLASS_INSTANCE(pmix_ring_buffer_t, pmix_object_t,
+                                pmix_ring_buffer_construct,
+                                pmix_ring_buffer_destruct);
+
+/*
+ * pmix_ring_buffer constructor
+ */
+static void pmix_ring_buffer_construct(pmix_ring_buffer_t *ring)
+{
+    ring->head = 0;
+    ring->tail = -1;
+    ring->size = 0;
+    ring->addr = NULL;
+}
+
+/*
+ * pmix_ring_buffer destructor
+ */
+static void pmix_ring_buffer_destruct(pmix_ring_buffer_t *ring)
+{
+    if( NULL != ring->addr) {
+        free(ring->addr);
+        ring->addr = NULL;
+    }
+
+    ring->size = 0;
+}
+
+/**
+ * initialize a ring object
+ */
+int pmix_ring_buffer_init(pmix_ring_buffer_t* ring, int size)
+{
+    /* check for errors */
+    if (NULL == ring) {
+        return PMIX_ERR_BAD_PARAM;
+    }
+
+    /* Allocate and set the ring to NULL */
+    ring->addr = (char **)calloc(size * sizeof(char*), 1);
+    if (NULL == ring->addr) { /* out of memory */
+        return PMIX_ERR_OUT_OF_RESOURCE;
+    }
+    ring->size = size;
+
+    return PMIX_SUCCESS;
+}
+
+void* pmix_ring_buffer_push(pmix_ring_buffer_t *ring, void *ptr)
+{
+    char *p=NULL;
+
+    if (NULL != ring->addr[ring->head]) {
+        p = (char*)ring->addr[ring->head];
+        if (ring->tail == ring->size - 1) {
+            ring->tail = 0;
+        } else {
+            ring->tail = ring->head + 1;
+        }
+    }
+    ring->addr[ring->head] = (char*)ptr;
+    if (ring->tail < 0) {
+        ring->tail = ring->head;
+    }
+    if (ring->head == ring->size - 1) {
+        ring->head = 0;
+    } else {
+        ring->head++;
+    }
+    return (void*)p;
+}
+
+void* pmix_ring_buffer_pop(pmix_ring_buffer_t *ring)
+{
+    char *p=NULL;
+
+    if (-1 == ring->tail) {
+        /* nothing has been put on the ring yet */
+        p = NULL;
+    } else {
+        p = (char*)ring->addr[ring->tail];
+        ring->addr[ring->tail] = NULL;
+        if (ring->tail == ring->size-1) {
+            ring->tail = 0;
+        } else {
+            ring->tail++;
+        }
+        /* see if the ring is empty */
+        if (ring->tail == ring->head) {
+            ring->tail = -1;
+        }
+    }
+    return (void*)p;
+}
+
+ void* pmix_ring_buffer_poke(pmix_ring_buffer_t *ring, int i)
+ {
+    char *p=NULL;
+    int offset;
+
+    if (ring->size <= i || -1 == ring->tail) {
+        p = NULL;
+    } else if (i < 0) {
+        /* return the value at the head of the ring */
+        if (ring->head == 0) {
+            p = ring->addr[ring->size - 1];
+        } else {
+            p = ring->addr[ring->head - 1];
+        }
+    } else {
+        /* calculate the offset of the tail in the ring */
+        offset = ring->tail + i;
+        /* correct for wrap-around */
+        if (ring->size <= offset) {
+            offset -= ring->size;
+        }
+        p = ring->addr[offset];
+    }
+    return (void*)p;
+}
diff --git a/src/class/pmix_ring_buffer.h b/src/class/pmix_ring_buffer.h
new file mode 100644
index 0000000..8e8d236
--- /dev/null
+++ b/src/class/pmix_ring_buffer.h
@@ -0,0 +1,102 @@
+/* -*- Mode: C; c-basic-offset:4 ; -*- */
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2008 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2010      Cisco Systems, Inc. All rights reserved.
+ * Copyright (c) 2016      Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+/** @file
+ *
+ */
+
+#ifndef PMIX_RING_BUFFER_H
+#define PMIX_RING_BUFFER_H
+
+#include <src/include/pmix_config.h>
+
+#include "src/class/pmix_object.h"
+#include "src/util/output.h"
+
+BEGIN_C_DECLS
+
+/**
+ * dynamic pointer ring
+ */
+struct pmix_ring_buffer_t {
+    /** base class */
+    pmix_object_t super;
+    /* head/tail indices */
+    int head;
+    int tail;
+    /** size of list, i.e. number of elements in addr */
+    int size;
+    /** pointer to ring */
+    char **addr;
+};
+/**
+ * Convenience typedef
+ */
+typedef struct pmix_ring_buffer_t pmix_ring_buffer_t;
+/**
+ * Class declaration
+ */
+PMIX_CLASS_DECLARATION(pmix_ring_buffer_t);
+
+/**
+ * Initialize the ring buffer, defining its size.
+ *
+ * @param ring Pointer to a ring buffer (IN/OUT)
+ * @param size The number of elements in the ring (IN)
+ *
+ * @return PMIX_SUCCESS if all initializations were succesful. Otherwise,
+ *  the error indicate what went wrong in the function.
+ */
+PMIX_EXPORT int pmix_ring_buffer_init(pmix_ring_buffer_t* ring, int size);
+
+/**
+ * Push an item onto the ring buffer, displacing the oldest
+ * item on the ring if the ring is full
+ *
+ * @param ring Pointer to ring (IN)
+ * @param ptr Pointer value (IN)
+ *
+ * @return Pointer to displaced item, NULL if ring
+ *         is not yet full
+ */
+PMIX_EXPORT void* pmix_ring_buffer_push(pmix_ring_buffer_t *ring, void *ptr);
+
+
+/**
+ * Pop an item off of the ring. The oldest entry on the ring will be
+ * returned. If nothing on the ring, NULL is returned.
+ *
+ * @param ring          Pointer to ring (IN)
+ *
+ * @return Error code.  NULL indicates an error.
+ */
+
+PMIX_EXPORT void* pmix_ring_buffer_pop(pmix_ring_buffer_t *ring);
+
+/*
+ * Access an element of the ring, without removing it, indexed
+ * starting at the tail - a value of -1 will return the element
+ * at the head of the ring
+ */
+PMIX_EXPORT void* pmix_ring_buffer_poke(pmix_ring_buffer_t *ring, int i);
+
+END_C_DECLS
+
+#endif /* PMIX_RING_BUFFER_H */
diff --git a/src/class/pmix_value_array.c b/src/class/pmix_value_array.c
new file mode 100644
index 0000000..7f36365
--- /dev/null
+++ b/src/class/pmix_value_array.c
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2005 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2007 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2016-2017 Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+
+#include "src/class/pmix_value_array.h"
+
+
+static void pmix_value_array_construct(pmix_value_array_t* array)
+{
+    array->array_items = NULL;
+    array->array_size = 0;
+    array->array_item_sizeof = 0;
+    array->array_alloc_size = 0;
+}
+
+static void pmix_value_array_destruct(pmix_value_array_t* array)
+{
+    if (NULL != array->array_items)
+        free(array->array_items);
+}
+
+PMIX_EXPORT PMIX_CLASS_INSTANCE(
+    pmix_value_array_t,
+    pmix_object_t,
+    pmix_value_array_construct,
+    pmix_value_array_destruct
+);
+
+
+int pmix_value_array_set_size(pmix_value_array_t* array, size_t size)
+{
+#if PMIX_ENABLE_DEBUG
+    if(array->array_item_sizeof == 0) {
+        pmix_output(0, "pmix_value_array_set_size: item size must be initialized");
+        return PMIX_ERR_BAD_PARAM;
+    }
+#endif
+
+    if(size > array->array_alloc_size) {
+        while(array->array_alloc_size < size)
+            array->array_alloc_size <<= 1;
+        array->array_items = (unsigned char *)realloc(array->array_items,
+            array->array_alloc_size * array->array_item_sizeof);
+        if (NULL == array->array_items)
+            return PMIX_ERR_OUT_OF_RESOURCE;
+    }
+    array->array_size = size;
+    return PMIX_SUCCESS;
+}
diff --git a/src/class/pmix_value_array.h b/src/class/pmix_value_array.h
new file mode 100644
index 0000000..1b10a5e
--- /dev/null
+++ b/src/class/pmix_value_array.h
@@ -0,0 +1,280 @@
+/*
+ * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2006 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2016      Intel, Inc. All rights reserved
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#ifndef PMIX_VALUE_ARRAY_H
+#define PMIX_VALUE_ARRAY_H
+
+#include <src/include/pmix_config.h>
+
+#include <string.h>
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif /* HAVE_STRINGS_H */
+
+#include "src/class/pmix_object.h"
+#if PMIX_ENABLE_DEBUG
+#include "src/util/output.h"
+#endif
+#include "pmix_common.h"
+
+BEGIN_C_DECLS
+
+/*
+ *  @file  Array of elements maintained by value.
+ */
+
+struct pmix_value_array_t
+{
+    pmix_object_t    super;
+    unsigned char*  array_items;
+    size_t          array_item_sizeof;
+    size_t          array_size;
+    size_t          array_alloc_size;
+};
+typedef struct pmix_value_array_t pmix_value_array_t;
+
+PMIX_CLASS_DECLARATION(pmix_value_array_t);
+
+/**
+ *  Initialize the array to hold items by value. This routine must
+ *  be called prior to using the array.
+ *
+ *  @param   array       The array to initialize (IN).
+ *  @param   item_size   The sizeof each array element (IN).
+ *  @return  PMIX error code
+ *
+ * Note that there is no corresponding "finalize" function -- use
+ * OBJ_DESTRUCT (for stack arrays) or OBJ_RELEASE (for heap arrays) to
+ * delete it.
+ */
+
+static inline int pmix_value_array_init(pmix_value_array_t *array, size_t item_sizeof)
+{
+    array->array_item_sizeof = item_sizeof;
+    array->array_alloc_size = 1;
+    array->array_size = 0;
+    array->array_items = (unsigned char*)realloc(array->array_items, item_sizeof * array->array_alloc_size);
+    return (NULL != array->array_items) ? PMIX_SUCCESS : PMIX_ERR_OUT_OF_RESOURCE;
+}
+
+
+/**
+ *  Reserve space in the array for new elements, but do not change the size.
+ *
+ *  @param   array   The input array (IN).
+ *  @param   size    The anticipated size of the array (IN).
+ *  @return  PMIX error code.
+ */
+
+static inline int pmix_value_array_reserve(pmix_value_array_t* array, size_t size)
+{
+     if(size > array->array_alloc_size) {
+         array->array_items = (unsigned char*)realloc(array->array_items, array->array_item_sizeof * size);
+         if(NULL == array->array_items) {
+             array->array_size = 0;
+             array->array_alloc_size = 0;
+             return PMIX_ERR_OUT_OF_RESOURCE;
+         }
+         array->array_alloc_size = size;
+     }
+     return PMIX_SUCCESS;
+}
+
+
+
+/**
+ *  Retreives the number of elements in the array.
+ *
+ *  @param   array   The input array (IN).
+ *  @return  The number of elements currently in use.
+ */
+
+static inline size_t pmix_value_array_get_size(pmix_value_array_t* array)
+{
+    return array->array_size;
+}
+
+
+/**
+ *  Set the number of elements in the array.
+ *
+ *  @param  array   The input array (IN).
+ *  @param  size    The new array size.
+ *
+ *  @return  PMIX error code.
+ *
+ *  Note that resizing the array to a smaller size may not change
+ *  the underlying memory allocated by the array. However, setting
+ *  the size larger than the current allocation will grow it. In either
+ *  case, if the routine is successful, pmix_value_array_get_size() will
+ *  return the new size.
+ */
+
+PMIX_EXPORT int pmix_value_array_set_size(pmix_value_array_t* array, size_t size);
+
+
+/**
+ *  Macro to retrieve an item from the array by value.
+ *
+ *  @param  array       The input array (IN).
+ *  @param  item_type   The C datatype of the array item (IN).
+ *  @param  item_index  The array index (IN).
+ *
+ *  @returns item       The requested item.
+ *
+ *  Note that this does not change the size of the array - this macro is
+ *  strictly for performance - the user assumes the responsibility of
+ *  ensuring the array index is valid (0 <= item index < array size).
+ */
+
+#define PMIX_VALUE_ARRAY_GET_ITEM(array, item_type, item_index) \
+    ((item_type*)((array)->array_items))[item_index]
+
+/**
+ *  Retrieve an item from the array by reference.
+ *
+ *  @param  array          The input array (IN).
+ *  @param  item_index     The array index (IN).
+ *
+ *  @return ptr Pointer to the requested item.
+ *
+ *  Note that if the specified item_index is larger than the current
+ *  array size, the array is grown to satisfy the request.
+ */
+
+static inline void* pmix_value_array_get_item(pmix_value_array_t *array, size_t item_index)
+{
+    if(item_index >= array->array_size && pmix_value_array_set_size(array, item_index+1) != PMIX_SUCCESS)
+        return NULL;
+    return array->array_items + (item_index * array->array_item_sizeof);
+}
+
+/**
+ *  Macro to set an array element by value.
+ *
+ *  @param  array       The input array (IN).
+ *  @param  item_type   The C datatype of the array item (IN).
+ *  @param  item_index  The array index (IN).
+ *  @param  item_value  The new value for the specified index (IN).
+ *
+ *  Note that this does not change the size of the array - this macro is
+ *  strictly for performance - the user assumes the responsibility of
+ *  ensuring the array index is valid (0 <= item index < array size).
+ *
+ * It is safe to free the item after returning from this call; it is
+ * copied into the array by value.
+ */
+
+#define PMIX_VALUE_ARRAY_SET_ITEM(array, item_type, item_index, item_value) \
+    (((item_type*)((array)->array_items))[item_index] = item_value)
+
+/**
+ *  Set an array element by value.
+ *
+ *  @param   array       The input array (IN).
+ *  @param   item_index  The array index (IN).
+ *  @param   item_value  A pointer to the item, which is copied into
+ *                       the array.
+ *
+ *  @return  PMIX error code.
+ *
+ * It is safe to free the item after returning from this call; it is
+ * copied into the array by value.
+ */
+
+static inline int pmix_value_array_set_item(pmix_value_array_t *array, size_t item_index, const void* item)
+{
+    int rc;
+    if(item_index >= array->array_size &&
+       (rc = pmix_value_array_set_size(array, item_index+1)) != PMIX_SUCCESS)
+        return rc;
+    memcpy(array->array_items + (item_index * array->array_item_sizeof), item, array->array_item_sizeof);
+    return PMIX_SUCCESS;
+}
+
+
+/**
+ *  Appends an item to the end of the array.
+ *
+ *  @param   array    The input array (IN).
+ *  @param   item     A pointer to the item to append, which is copied
+ *                    into the array.
+ *
+ *  @return  PMIX error code
+ *
+ * This will grow the array if it is not large enough to contain the
+ * item.  It is safe to free the item after returning from this call;
+ * it is copied by value into the array.
+ */
+
+static inline int pmix_value_array_append_item(pmix_value_array_t *array, const void *item)
+{
+    return pmix_value_array_set_item(array, array->array_size, item);
+}
+
+
+/**
+ *  Remove a specific item from the array.
+ *
+ *  @param   array       The input array (IN).
+ *  @param   item_index  The index to remove, which must be less than
+ *                       the current array size (IN).
+ *
+ *  @return  PMIX error code.
+ *
+ * All elements following this index are shifted down.
+ */
+
+static inline int pmix_value_array_remove_item(pmix_value_array_t *array, size_t item_index)
+{
+#if PMIX_ENABLE_DEBUG
+    if (item_index >= array->array_size) {
+        pmix_output(0, "pmix_value_array_remove_item: invalid index %lu\n", (unsigned long)item_index);
+        return PMIX_ERR_BAD_PARAM;
+    }
+#endif
+    memmove(array->array_items+(array->array_item_sizeof * item_index),
+            array->array_items+(array->array_item_sizeof * (item_index+1)),
+            array->array_item_sizeof * (array->array_size - item_index - 1));
+    array->array_size--;
+    return PMIX_SUCCESS;
+}
+
+/**
+ * Get the base pointer of the underlying array.
+ *
+ * @param array The input array (IN).
+ * @param array_type The C datatype of the array (IN).
+ *
+ * @returns ptr Pointer to the actual array.
+ *
+ * This function is helpful when you need to iterate through an
+ * entire array; simply get the base value of the array and use native
+ * C to iterate through it manually.  This can have better performance
+ * than looping over PMIX_VALUE_ARRAY_GET_ITEM() and
+ * PMIX_VALUE_ARRAY_SET_ITEM() because it will [potentially] reduce the
+ * number of pointer dereferences.
+ */
+
+#define PMIX_VALUE_ARRAY_GET_BASE(array, item_type) \
+  ((item_type*) ((array)->array_items))
+
+END_C_DECLS
+
+#endif
diff --git a/src/client/Makefile.include b/src/client/Makefile.include
new file mode 100644
index 0000000..0bf6efe
--- /dev/null
+++ b/src/client/Makefile.include
@@ -0,0 +1,29 @@
+# -*- makefile -*-
+#
+# Copyright (c) 2014-2017 Intel, Inc. All rights reserved.
+# Copyright (c) 2014      Artem Y. Polyakov <artpol84 at gmail.com>.
+#                         All rights reserved.
+# Copyright (c) 2016 Cisco Systems, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+headers += \
+        client/pmix_client_ops.h
+
+sources += \
+        client/pmix_client.c \
+        client/pmix_client_fence.c \
+        client/pmix_client_get.c \
+        client/pmix_client_pub.c \
+        client/pmix_client_spawn.c \
+        client/pmix_client_connect.c
+
+if WANT_PMI_BACKWARD
+sources += \
+        client/pmi1.c \
+        client/pmi2.c
+endif
diff --git a/src/client/pmi1.c b/src/client/pmi1.c
new file mode 100644
index 0000000..9a4e1ac
--- /dev/null
+++ b/src/client/pmi1.c
@@ -0,0 +1,856 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2014-2016 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2014      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2016      Mellanox Technologies, Inc.
+ *                         All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+
+#include <src/include/types.h>
+
+#include <pmix.h>
+#include <pmi.h>
+
+#include "src/include/pmix_globals.h"
+
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#include PMIX_EVENT_HEADER
+
+#define ANL_MAPPING "PMI_process_mapping"
+
+#include "src/buffer_ops/buffer_ops.h"
+#include "src/util/argv.h"
+#include "src/util/error.h"
+#include "src/util/output.h"
+
+#define PMI_MAX_ID_LEN       PMIX_MAX_NSLEN  /* Maximim size of PMI process group ID */
+#define PMI_MAX_KEY_LEN      PMIX_MAX_KEYLEN /* Maximum size of a PMI key */
+#define PMI_MAX_KVSNAME_LEN  PMIX_MAX_NSLEN  /* Maximum size of KVS name */
+#define PMI_MAX_VAL_LEN      4096            /* Maximum size of a PMI value */
+
+
+#define PMI_CHECK() \
+        do {                     \
+        if (!pmi_init) {     \
+            return PMI_FAIL; \
+        }                    \
+    } while (0)
+
+/* local functions */
+static pmix_status_t convert_int(int *value, pmix_value_t *kv);
+static int convert_err(pmix_status_t rc);
+static pmix_proc_t myproc;
+static int pmi_init = 0;
+
+PMIX_EXPORT int PMI_Init(int *spawned)
+{
+    pmix_status_t rc = PMIX_SUCCESS;
+    pmix_value_t *val;
+    pmix_proc_t proc;
+    pmix_info_t info[1];
+    bool  val_optinal = 1;
+
+    if (PMIX_SUCCESS != PMIx_Init(&myproc, NULL, 0)) {
+        return PMI_ERR_INIT;
+    }
+
+    /* getting internal key requires special rank value */
+    memcpy(&proc, &myproc, sizeof(myproc));
+    proc.rank = PMIX_RANK_UNDEF;
+
+    /* set controlling parameters
+     * PMIX_OPTIONAL - expect that these keys should be available on startup
+     */
+    PMIX_INFO_CONSTRUCT(&info[0]);
+    PMIX_INFO_LOAD(&info[0], PMIX_OPTIONAL, &val_optinal, PMIX_BOOL);
+
+    if (NULL != spawned) {
+        /* get the spawned flag */
+        if (PMIX_SUCCESS == PMIx_Get(&proc, PMIX_SPAWNED, info, 1, &val)) {
+            rc = convert_int(spawned, val);
+            PMIX_VALUE_RELEASE(val);
+            if (PMIX_SUCCESS != rc) {
+                goto error;
+            }
+        } else {
+            /* if not found, default to not spawned */
+            *spawned = 0;
+        }
+    }
+    pmi_init = 1;
+
+    rc = PMIX_SUCCESS;
+
+error:
+    PMIX_INFO_DESTRUCT(&info[0]);
+
+    return convert_err(rc);
+}
+
+PMIX_EXPORT int PMI_Initialized(PMI_BOOL *initialized)
+{
+    if (NULL == initialized) {
+        return PMI_ERR_INVALID_ARG;
+    }
+
+    *initialized = (PMIx_Initialized() ? PMI_TRUE : PMI_FALSE);
+
+    return PMI_SUCCESS;
+}
+
+PMIX_EXPORT int PMI_Finalize(void)
+{
+    pmix_status_t rc = PMIX_SUCCESS;
+
+    PMI_CHECK();
+
+    pmi_init = 0;
+    rc = PMIx_Finalize(NULL, 0);
+    return convert_err(rc);
+}
+
+PMIX_EXPORT int PMI_Abort(int flag, const char msg[])
+{
+    pmix_status_t rc = PMIX_SUCCESS;
+
+    PMI_CHECK();
+
+    rc = PMIx_Abort(flag, msg, NULL, 0);
+    return convert_err(rc);
+}
+
+/* KVS_Put - we default to PMIX_GLOBAL scope and ignore the
+ * provided kvsname as we only put into our own nspace */
+PMIX_EXPORT int PMI_KVS_Put(const char kvsname[], const char key[], const char value[])
+{
+    pmix_status_t rc = PMIX_SUCCESS;
+    pmix_value_t val;
+
+    PMI_CHECK();
+
+    if ((kvsname == NULL) || (strlen(kvsname) > PMI_MAX_KVSNAME_LEN)) {
+        return PMI_ERR_INVALID_KVS;
+    }
+    if ((key == NULL) || (strlen(key) >PMI_MAX_KEY_LEN)) {
+        return PMI_ERR_INVALID_KEY;
+    }
+    if ((value == NULL) || (strlen(value) > PMI_MAX_VAL_LEN)) {
+        return PMI_ERR_INVALID_VAL;
+    }
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+            "PMI_KVS_Put: KVS=%s, key=%s value=%s", kvsname, key, value);
+
+    val.type = PMIX_STRING;
+    val.data.string = (char*)value;
+    rc = PMIx_Put(PMIX_GLOBAL, key, &val);
+    return convert_err(rc);
+}
+
+/* KVS_Commit */
+PMIX_EXPORT int PMI_KVS_Commit(const char kvsname[])
+{
+    pmix_status_t rc = PMIX_SUCCESS;
+
+    PMI_CHECK();
+
+    if ((kvsname == NULL) || (strlen(kvsname) > PMI_MAX_KVSNAME_LEN)) {
+        return PMI_ERR_INVALID_KVS;
+    }
+
+    pmix_output_verbose(2, pmix_globals.debug_output, "PMI_KVS_Commit: KVS=%s",
+            kvsname);
+
+    rc = PMIx_Commit();
+    return convert_err(rc);
+}
+
+PMIX_EXPORT int PMI_KVS_Get( const char kvsname[], const char key[], char value[], int length)
+{
+    pmix_status_t rc = PMIX_SUCCESS;
+    pmix_value_t *val;
+    pmix_proc_t proc;
+
+    PMI_CHECK();
+
+    if ((kvsname == NULL) || (strlen(kvsname) > PMI_MAX_KVSNAME_LEN)) {
+        return PMI_ERR_INVALID_KVS;
+    }
+    if ((key == NULL) || (strlen(key) > PMI_MAX_KEY_LEN)) {
+        return PMI_ERR_INVALID_KEY;
+    }
+    if (value == NULL) {
+        return PMI_ERR_INVALID_VAL;
+    }
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+            "PMI_KVS_Get: KVS=%s, key=%s value=%s", kvsname, key, value);
+
+    /* PMI-1 expects resource manager to set
+     * process mapping in ANL notation. */
+    if (!strcmp(key, ANL_MAPPING)) {
+        /* we are looking in the job-data. If there is nothing there
+         * we don't want to look in rank's data, thus set rank to widcard */
+        proc = myproc;
+        proc.rank = PMIX_RANK_WILDCARD;
+        if (PMIX_SUCCESS == PMIx_Get(&proc, PMIX_ANL_MAP, NULL, 0, &val) &&
+               (NULL != val) && (PMIX_STRING == val->type)) {
+            strncpy(value, val->data.string, length);
+            PMIX_VALUE_FREE(val, 1);
+            return PMI_SUCCESS;
+        } else {
+            /* artpol:
+             * Some RM's (i.e. SLURM) already have ANL precomputed. The export it
+             * through PMIX_ANL_MAP variable.
+             * If we haven't found it we want to have our own packing functionality
+             * since it's common.
+             * Somebody else has to write it since I've already done that for
+             * GPL'ed SLURM :) */
+            return PMI_FAIL;
+        }
+    }
+
+    /* retrieve the data from PMIx - since we don't have a rank,
+     * we indicate that by passing the UNDEF value */
+    (void)strncpy(proc.nspace, kvsname, PMIX_MAX_NSLEN);
+    proc.rank = PMIX_RANK_UNDEF;
+
+    rc = PMIx_Get(&proc, key, NULL, 0, &val);
+    if (PMIX_SUCCESS == rc && NULL != val) {
+        if (PMIX_STRING != val->type) {
+            rc = PMIX_ERROR;
+        } else if (NULL != val->data.string) {
+            (void)strncpy(value, val->data.string, length);
+        }
+        PMIX_VALUE_RELEASE(val);
+    }
+
+    return convert_err(rc);
+}
+
+/* Barrier only applies to our own nspace, and we want all
+ * data to be collected upon completion */
+PMIX_EXPORT int PMI_Barrier(void)
+{
+    pmix_status_t rc = PMIX_SUCCESS;
+    pmix_info_t buf;
+    int ninfo = 0;
+    pmix_info_t *info = NULL;
+    bool val = 1;
+
+    PMI_CHECK();
+
+    info = &buf;
+    PMIX_INFO_CONSTRUCT(info);
+    PMIX_INFO_LOAD(info, PMIX_COLLECT_DATA, &val, PMIX_BOOL);
+    ninfo = 1;
+    rc = PMIx_Fence(NULL, 0, info, ninfo);
+
+    PMIX_INFO_DESTRUCT(info);
+
+    return convert_err(rc);
+}
+
+PMIX_EXPORT int PMI_Get_size(int *size)
+{
+    pmix_status_t rc = PMIX_SUCCESS;
+    pmix_value_t *val;
+    pmix_info_t info[1];
+    bool  val_optinal = 1;
+    pmix_proc_t proc = myproc;
+    proc.rank = PMIX_RANK_WILDCARD;
+
+    PMI_CHECK();
+
+    if (NULL == size) {
+        return PMI_ERR_INVALID_ARG;
+    }
+
+    /* set controlling parameters
+     * PMIX_OPTIONAL - expect that these keys should be available on startup
+     */
+    PMIX_INFO_CONSTRUCT(&info[0]);
+    PMIX_INFO_LOAD(&info[0], PMIX_OPTIONAL, &val_optinal, PMIX_BOOL);
+
+    rc = PMIx_Get(&proc, PMIX_JOB_SIZE, info, 1, &val);
+    if (PMIX_SUCCESS == rc) {
+        rc = convert_int(size, val);
+        PMIX_VALUE_RELEASE(val);
+    }
+
+    PMIX_INFO_DESTRUCT(&info[0]);
+
+    return convert_err(rc);
+}
+
+PMIX_EXPORT int PMI_Get_rank(int *rk)
+{
+    PMI_CHECK();
+
+    if (NULL == rk) {
+        return PMI_ERR_INVALID_ARG;
+    }
+
+    *rk = myproc.rank;
+    return PMI_SUCCESS;
+}
+
+PMIX_EXPORT int PMI_Get_universe_size(int *size)
+{
+    pmix_status_t rc = PMIX_SUCCESS;
+    pmix_value_t *val;
+    pmix_info_t info[1];
+    bool  val_optinal = 1;
+    pmix_proc_t proc = myproc;
+    proc.rank = PMIX_RANK_WILDCARD;
+
+    PMI_CHECK();
+
+    if (NULL == size) {
+        return PMI_ERR_INVALID_ARG;
+    }
+
+    /* set controlling parameters
+     * PMIX_OPTIONAL - expect that these keys should be available on startup
+     */
+    PMIX_INFO_CONSTRUCT(&info[0]);
+    PMIX_INFO_LOAD(&info[0], PMIX_OPTIONAL, &val_optinal, PMIX_BOOL);
+
+    rc = PMIx_Get(&proc, PMIX_UNIV_SIZE, info, 1, &val);
+    if (PMIX_SUCCESS == rc) {
+        rc = convert_int(size, val);
+        PMIX_VALUE_RELEASE(val);
+    }
+
+    PMIX_INFO_DESTRUCT(&info[0]);
+
+    return convert_err(rc);
+}
+
+PMIX_EXPORT int PMI_Get_appnum(int *appnum)
+{
+    pmix_status_t rc = PMIX_SUCCESS;
+    pmix_value_t *val;
+    pmix_info_t info[1];
+    bool  val_optinal = 1;
+    pmix_proc_t proc = myproc;
+    proc.rank = PMIX_RANK_WILDCARD;
+
+    PMI_CHECK();
+
+    if (NULL == appnum) {
+        return PMI_ERR_INVALID_ARG;
+    }
+
+    /* set controlling parameters
+     * PMIX_OPTIONAL - expect that these keys should be available on startup
+     */
+    PMIX_INFO_CONSTRUCT(&info[0]);
+    PMIX_INFO_LOAD(&info[0], PMIX_OPTIONAL, &val_optinal, PMIX_BOOL);
+
+    rc = PMIx_Get(&proc, PMIX_APPNUM, info, 1, &val);
+    if (PMIX_SUCCESS == rc) {
+        rc = convert_int(appnum, val);
+        PMIX_VALUE_RELEASE(val);
+    } else if( PMIX_ERR_NOT_FOUND == rc ){
+        /* this is optional value, set to 0 */
+        *appnum = 0;
+        rc = PMIX_SUCCESS;
+    }
+
+    PMIX_INFO_DESTRUCT(&info[0]);
+
+    return convert_err(rc);
+}
+
+PMIX_EXPORT int PMI_Publish_name(const char service_name[], const char port[])
+{
+    pmix_status_t rc = PMIX_SUCCESS;
+    pmix_info_t info;
+
+    PMI_CHECK();
+
+    if (NULL == service_name || NULL == port) {
+        return PMI_ERR_INVALID_ARG;
+    }
+
+    /* pass the service/port */
+    (void) strncpy(info.key, service_name, PMIX_MAX_KEYLEN);
+    info.value.type = PMIX_STRING;
+    info.value.data.string = (char*) port;
+
+    /* publish the info - PMI-1 doesn't support
+     * any scope other than inside our own nspace */
+    rc = PMIx_Publish(&info, 1);
+
+    return convert_err(rc);
+}
+
+PMIX_EXPORT int PMI_Unpublish_name(const char service_name[])
+{
+    pmix_status_t rc = PMIX_SUCCESS;
+    char *keys[2];
+
+    PMI_CHECK();
+
+    if (NULL == service_name) {
+        return PMI_ERR_INVALID_ARG;
+    }
+
+    /* pass the service */
+    keys[0] = (char*) service_name;
+    keys[1] = NULL;
+
+    rc = PMIx_Unpublish(keys, NULL, 0);
+    return convert_err(rc);
+}
+
+PMIX_EXPORT int PMI_Lookup_name(const char service_name[], char port[])
+{
+    pmix_status_t rc = PMIX_SUCCESS;
+    pmix_pdata_t pdata;
+
+    PMI_CHECK();
+
+    if (NULL == service_name || NULL == port) {
+        return PMI_ERR_INVALID_ARG;
+    }
+
+    PMIX_PDATA_CONSTRUCT(&pdata);
+
+    /* pass the service */
+    (void) strncpy(pdata.key, service_name, PMIX_MAX_KEYLEN);
+
+    /* PMI-1 doesn't want the nspace back */
+    if (PMIX_SUCCESS != (rc = PMIx_Lookup(&pdata, 1, NULL, 0))) {
+        return convert_err(rc);
+    }
+
+    /* should have received a string back */
+    if (PMIX_STRING != pdata.value.type || NULL == pdata.value.data.string) {
+        return convert_err(PMIX_ERR_NOT_FOUND);
+    }
+
+    /* return the port - sadly, this API doesn't tell us
+     * the size of the port array, and so there is a
+     * potential we could overrun it. As this feature
+     * isn't widely supported in PMI-1, try being
+     * conservative */
+    (void) strncpy(port, pdata.value.data.string, PMIX_MAX_KEYLEN);
+    PMIX_PDATA_DESTRUCT(&pdata);
+
+    return PMIX_SUCCESS;
+}
+
+PMIX_EXPORT int PMI_Get_id(char id_str[], int length)
+{
+    /* we already obtained our nspace during PMI_Init,
+     * so all we have to do here is return it */
+
+    PMI_CHECK();
+
+    /* bozo check */
+    if (NULL == id_str) {
+        return PMI_ERR_INVALID_ARGS;
+    }
+    if (length < PMI_MAX_ID_LEN) {
+        return PMI_ERR_INVALID_LENGTH;
+    }
+
+    (void) strncpy(id_str, myproc.nspace, length);
+    return PMI_SUCCESS;
+}
+
+PMIX_EXPORT int PMI_Get_kvs_domain_id(char id_str[], int length)
+{
+    PMI_CHECK();
+
+    /* same as PMI_Get_id */
+    return PMI_Get_id(id_str, length);
+}
+
+PMIX_EXPORT int PMI_Get_id_length_max(int *length)
+{
+    PMI_CHECK();
+
+    if (NULL == length) {
+        return PMI_ERR_INVALID_VAL_LENGTH;
+    }
+
+    *length = PMI_MAX_ID_LEN;
+    return PMI_SUCCESS;
+}
+
+PMIX_EXPORT int PMI_Get_clique_size(int *size)
+{
+    pmix_status_t rc = PMIX_SUCCESS;
+    pmix_value_t *val;
+    pmix_info_t info[1];
+    bool  val_optinal = 1;
+    pmix_proc_t proc = myproc;
+    proc.rank = PMIX_RANK_WILDCARD;
+
+    PMI_CHECK();
+
+    if (NULL == size) {
+        return PMI_ERR_INVALID_ARG;
+    }
+
+    /* set controlling parameters
+     * PMIX_OPTIONAL - expect that these keys should be available on startup
+     */
+    PMIX_INFO_CONSTRUCT(&info[0]);
+    PMIX_INFO_LOAD(&info[0], PMIX_OPTIONAL, &val_optinal, PMIX_BOOL);
+
+    rc = PMIx_Get(&proc, PMIX_LOCAL_SIZE, info, 1, &val);
+    if (PMIX_SUCCESS == rc) {
+        rc = convert_int(size, val);
+        PMIX_VALUE_RELEASE(val);
+    }
+
+    PMIX_INFO_DESTRUCT(&info[0]);
+
+    return convert_err(rc);
+}
+
+PMIX_EXPORT int PMI_Get_clique_ranks(int ranks[], int length)
+{
+    pmix_status_t rc = PMIX_SUCCESS;
+    pmix_value_t *val;
+    char **rks;
+    int i;
+    pmix_proc_t proc = myproc;
+    proc.rank = PMIX_RANK_WILDCARD;
+
+    PMI_CHECK();
+
+    if (NULL == ranks) {
+        return PMI_ERR_INVALID_ARGS;
+    }
+
+    rc = PMIx_Get(&proc, PMIX_LOCAL_PEERS, NULL, 0, &val);
+    if (PMIX_SUCCESS == rc) {
+        /* kv will contain a string of comma-separated
+         * ranks on my node */
+        rks = pmix_argv_split(val->data.string, ',');
+        for (i = 0; NULL != rks[i] && i < length; i++) {
+            ranks[i] = strtol(rks[i], NULL, 10);
+        }
+        pmix_argv_free(rks);
+        PMIX_VALUE_RELEASE(val);
+    }
+
+    return convert_err(rc);
+}
+
+PMIX_EXPORT int PMI_KVS_Get_my_name(char kvsname[], int length)
+{
+    PMI_CHECK();
+
+    /* same as PMI_Get_id */
+    return PMI_Get_id(kvsname, length);
+}
+
+PMIX_EXPORT int PMI_KVS_Get_name_length_max(int *length)
+{
+    PMI_CHECK();
+
+    if (NULL == length) {
+        return PMI_ERR_INVALID_ARG;
+    }
+
+    *length = PMI_MAX_KVSNAME_LEN;
+    return PMI_SUCCESS;
+}
+
+PMIX_EXPORT int PMI_KVS_Get_key_length_max(int *length)
+{
+    PMI_CHECK();
+
+    if (NULL == length) {
+        return PMI_ERR_INVALID_ARG;
+    }
+
+    *length = PMI_MAX_KEY_LEN;
+    return PMI_SUCCESS;
+}
+
+PMIX_EXPORT int PMI_KVS_Get_value_length_max(int *length)
+{
+    PMI_CHECK();
+
+    if (NULL == length) {
+        return PMI_ERR_INVALID_ARG;
+    }
+
+    /* don't give them an enormous size of some implementations
+     * immediately malloc a data block for their use */
+    *length = PMI_MAX_VAL_LEN;
+    return PMI_SUCCESS;
+}
+
+/* nobody supports this call, which is why it was
+ * dropped for PMI-2 */
+PMIX_EXPORT int PMI_KVS_Create(char kvsname[], int length)
+{
+    return PMI_FAIL;
+}
+
+/* nobody supports this call, which is why it was
+ * dropped for PMI-2 */
+PMIX_EXPORT int PMI_KVS_Destroy(const char kvsname[])
+{
+    return PMI_FAIL;
+}
+
+/* nobody supports this call, which is why it was
+ * dropped for PMI-2 */
+PMIX_EXPORT int PMI_KVS_Iter_first(const char kvsname[], char key[], int key_len, char val[], int val_len)
+{
+    return PMI_FAIL;
+}
+
+/* nobody supports this call, which is why it was
+ * dropped for PMI-2 */
+PMIX_EXPORT int PMI_KVS_Iter_next(const char kvsname[], char key[], int key_len, char val[], int val_len)
+{
+    return PMI_FAIL;
+}
+
+PMIX_EXPORT int PMI_Spawn_multiple(int count,
+                       const char * cmds[],
+                       const char ** argvs[],
+                       const int maxprocs[],
+                       const int info_keyval_sizesp[],
+                       const PMI_keyval_t * info_keyval_vectors[],
+                       int preput_keyval_size,
+                       const PMI_keyval_t preput_keyval_vector[],
+                       int errors[])
+{
+    pmix_status_t rc = PMIX_SUCCESS;
+    pmix_app_t *apps;
+    int i, k;
+    size_t j;
+    char *evar;
+
+    PMI_CHECK();
+
+    if (NULL == cmds) {
+        return PMI_ERR_INVALID_ARG;
+    }
+
+    /* setup the apps */
+    PMIX_APP_CREATE(apps, count);
+    for (i = 0; i < count; i++) {
+        apps[i].cmd = strdup(cmds[i]);
+        apps[i].maxprocs = maxprocs[i];
+        apps[i].argv = pmix_argv_copy((char**) argvs[i]);
+        apps[i].ninfo = info_keyval_sizesp[i];
+        if (0 < apps[i].ninfo) {
+            apps[i].info = (pmix_info_t*)malloc(apps[i].ninfo * sizeof(pmix_info_t));
+            /* copy the info objects */
+            for (j = 0; j < apps[i].ninfo; j++) {
+                (void)strncpy(apps[i].info[j].key, info_keyval_vectors[i][j].key, PMIX_MAX_KEYLEN);
+                apps[i].info[j].value.type = PMIX_STRING;
+                apps[i].info[j].value.data.string = strdup(info_keyval_vectors[i][j].val);
+            }
+        }
+        /* push the preput values into the apps environ */
+        for (k = 0; k < preput_keyval_size; k++) {
+            if (0 > asprintf(&evar, "%s=%s", preput_keyval_vector[k].key, preput_keyval_vector[k].val)) {
+                for (i = 0; i < count; i++) {
+                    PMIX_APP_DESTRUCT(&apps[i]);
+                }
+                free(apps);
+                return PMIX_ERR_NOMEM;
+            }
+            pmix_argv_append_nosize(&apps[i].env, evar);
+            free(evar);
+        }
+    }
+
+    rc = PMIx_Spawn(NULL, 0, apps, count, NULL);
+    /* tear down the apps array */
+    for (i = 0; i < count; i++) {
+        PMIX_APP_DESTRUCT(&apps[i]);
+    }
+    free(apps);
+    if (NULL != errors) {
+        for (i = 0; i < count; i++) {
+            errors[i] = convert_err(rc);
+        }
+    }
+    return convert_err(rc);
+}
+
+/* nobody supports this call, which is why it was
+ * dropped for PMI-2 */
+PMIX_EXPORT int PMI_Parse_option(int num_args, char *args[], int *num_parsed, PMI_keyval_t **keyvalp, int *size)
+{
+    return PMI_FAIL;
+}
+
+/* nobody supports this call, which is why it was
+ * dropped for PMI-2 */
+PMIX_EXPORT int PMI_Args_to_keyval(int *argcp, char *((*argvp)[]), PMI_keyval_t **keyvalp, int *size)
+{
+    return PMI_FAIL;
+}
+
+/* nobody supports this call, which is why it was
+ * dropped for PMI-2 */
+PMIX_EXPORT int PMI_Free_keyvals(PMI_keyval_t keyvalp[], int size)
+{
+    return PMI_FAIL;
+}
+
+/* nobody supports this call, which is why it was
+ * dropped for PMI-2 */
+PMIX_EXPORT int PMI_Get_options(char *str, int *length)
+{
+    return PMI_FAIL;
+}
+
+/***   UTILITY FUNCTIONS   ***/
+/* internal function */
+static pmix_status_t convert_int(int *value, pmix_value_t *kv)
+{
+    switch (kv->type) {
+    case PMIX_INT:
+        *value = kv->data.integer;
+        break;
+    case PMIX_INT8:
+        *value = kv->data.int8;
+        break;
+    case PMIX_INT16:
+        *value = kv->data.int16;
+        break;
+    case PMIX_INT32:
+        *value = kv->data.int32;
+        break;
+    case PMIX_INT64:
+        *value = kv->data.int64;
+        break;
+    case PMIX_UINT:
+        *value = kv->data.uint;
+        break;
+    case PMIX_UINT8:
+        *value = kv->data.uint8;
+        break;
+    case PMIX_UINT16:
+        *value = kv->data.uint16;
+        break;
+    case PMIX_UINT32:
+        *value = kv->data.uint32;
+        break;
+    case PMIX_UINT64:
+        *value = kv->data.uint64;
+        break;
+    case PMIX_BYTE:
+        *value = kv->data.byte;
+        break;
+    case PMIX_SIZE:
+        *value = kv->data.size;
+        break;
+    case PMIX_BOOL:
+        *value = kv->data.flag;
+        break;
+    default:
+        /* not an integer type */
+        return PMIX_ERR_BAD_PARAM;
+    }
+    return PMIX_SUCCESS;
+}
+
+static int convert_err(pmix_status_t rc)
+{
+    switch (rc) {
+    case PMIX_ERR_INVALID_SIZE:
+        return PMI_ERR_INVALID_SIZE;
+
+    case PMIX_ERR_INVALID_KEYVALP:
+        return PMI_ERR_INVALID_KEYVALP;
+
+    case PMIX_ERR_INVALID_NUM_PARSED:
+        return PMI_ERR_INVALID_NUM_PARSED;
+
+    case PMIX_ERR_INVALID_ARGS:
+        return PMI_ERR_INVALID_ARGS;
+
+    case PMIX_ERR_INVALID_NUM_ARGS:
+        return PMI_ERR_INVALID_NUM_ARGS;
+
+    case PMIX_ERR_INVALID_LENGTH:
+        return PMI_ERR_INVALID_LENGTH;
+
+    case PMIX_ERR_INVALID_VAL_LENGTH:
+        return PMI_ERR_INVALID_VAL_LENGTH;
+
+    case PMIX_ERR_INVALID_VAL:
+        return PMI_ERR_INVALID_VAL;
+
+    case PMIX_ERR_INVALID_KEY_LENGTH:
+        return PMI_ERR_INVALID_KEY_LENGTH;
+
+    case PMIX_ERR_INVALID_KEY:
+        return PMI_ERR_INVALID_KEY;
+
+    case PMIX_ERR_INVALID_ARG:
+        return PMI_ERR_INVALID_ARG;
+
+    case PMIX_ERR_NOMEM:
+        return PMI_ERR_NOMEM;
+
+    case PMIX_ERR_UNPACK_READ_PAST_END_OF_BUFFER:
+    case PMIX_ERR_LOST_CONNECTION_TO_SERVER:
+    case PMIX_ERR_LOST_PEER_CONNECTION:
+    case PMIX_ERR_LOST_CONNECTION_TO_CLIENT:
+    case PMIX_ERR_NOT_SUPPORTED:
+    case PMIX_ERR_NOT_FOUND:
+    case PMIX_ERR_SERVER_NOT_AVAIL:
+    case PMIX_ERR_INVALID_NAMESPACE:
+    case PMIX_ERR_DATA_VALUE_NOT_FOUND:
+    case PMIX_ERR_OUT_OF_RESOURCE:
+    case PMIX_ERR_RESOURCE_BUSY:
+    case PMIX_ERR_BAD_PARAM:
+    case PMIX_ERR_IN_ERRNO:
+    case PMIX_ERR_UNREACH:
+    case PMIX_ERR_TIMEOUT:
+    case PMIX_ERR_NO_PERMISSIONS:
+    case PMIX_ERR_PACK_MISMATCH:
+    case PMIX_ERR_PACK_FAILURE:
+    case PMIX_ERR_UNPACK_FAILURE:
+    case PMIX_ERR_UNPACK_INADEQUATE_SPACE:
+    case PMIX_ERR_TYPE_MISMATCH:
+    case PMIX_ERR_PROC_ENTRY_NOT_FOUND:
+    case PMIX_ERR_UNKNOWN_DATA_TYPE:
+    case PMIX_ERR_WOULD_BLOCK:
+    case PMIX_EXISTS:
+    case PMIX_ERROR:
+        return PMI_FAIL;
+
+    case PMIX_ERR_INIT:
+        return PMI_ERR_INIT;
+
+    case PMIX_SUCCESS:
+        return PMI_SUCCESS;
+    default:
+        return PMI_FAIL;
+    }
+}
diff --git a/src/client/pmi2.c b/src/client/pmi2.c
new file mode 100644
index 0000000..97d1939
--- /dev/null
+++ b/src/client/pmi2.c
@@ -0,0 +1,801 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2014-2016 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2016      Mellanox Technologies, Inc.
+ *                         All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+
+#include <src/include/types.h>
+
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#include PMIX_EVENT_HEADER
+
+#include <pmi2.h>
+#include <pmix.h>
+
+#include "src/buffer_ops/buffer_ops.h"
+#include "src/util/argv.h"
+#include "src/util/error.h"
+#include "src/util/output.h"
+#include "src/include/pmix_globals.h"
+
+#define ANL_MAPPING "PMI_process_mapping"
+
+#define PMI2_CHECK() \
+    do {                     \
+        if (!pmi2_init) {     \
+            return PMI2_FAIL; \
+        }                    \
+    } while (0)
+
+/* local functions */
+static pmix_status_t convert_int(int *value, pmix_value_t *kv);
+static int convert_err(pmix_status_t rc);
+static pmix_proc_t myproc;
+static int pmi2_init = 0;
+static bool commit_reqd = false;
+
+PMIX_EXPORT int PMI2_Init(int *spawned, int *size, int *rank, int *appnum)
+{
+    pmix_status_t rc = PMIX_SUCCESS;
+    pmix_value_t *val;
+    pmix_info_t info[1];
+    bool  val_optinal = 1;
+    pmix_proc_t proc = myproc;
+    proc.rank = PMIX_RANK_WILDCARD;
+
+    if (PMIX_SUCCESS != PMIx_Init(&myproc, NULL, 0)) {
+        return PMI2_ERR_INIT;
+    }
+
+    /* get the rank */
+    *rank = myproc.rank;
+
+    /* set controlling parameters
+     * PMIX_OPTIONAL - expect that these keys should be available on startup
+     */
+    PMIX_INFO_CONSTRUCT(&info[0]);
+    PMIX_INFO_LOAD(&info[0], PMIX_OPTIONAL, &val_optinal, PMIX_BOOL);
+
+    if (NULL != size) {
+        /* get the universe size - this will likely pull
+         * down all attributes assigned to the job, thus
+         * making all subsequent "get" operations purely
+         * local */
+        if (PMIX_SUCCESS == PMIx_Get(&proc, PMIX_UNIV_SIZE, info, 1, &val)) {
+            rc = convert_int(size, val);
+            PMIX_VALUE_RELEASE(val);
+            if (PMIX_SUCCESS != rc) {
+                goto error;
+            }
+        } else {
+            /* cannot continue without this info */
+            rc = PMIX_ERR_INIT;
+            goto error;
+        }
+    }
+
+    if (NULL != spawned) {
+        /* get the spawned flag */
+        if (PMIX_SUCCESS == PMIx_Get(&proc, PMIX_SPAWNED, info, 1, &val)) {
+            rc = convert_int(spawned, val);
+            PMIX_VALUE_RELEASE(val);
+            if (PMIX_SUCCESS != rc) {
+                goto error;
+            }
+        } else {
+            /* if not found, default to not spawned */
+            *spawned = 0;
+        }
+    }
+
+    if (NULL != appnum) {
+        /* get our appnum */
+        if (PMIX_SUCCESS == PMIx_Get(&proc, PMIX_APPNUM, info, 1, &val)) {
+            rc = convert_int(appnum, val);
+            PMIX_VALUE_RELEASE(val);
+            if (PMIX_SUCCESS != rc) {
+                goto error;
+            }
+        } else {
+            /* if not found, default to 0 */
+            *appnum = 0;
+        }
+    }
+    pmi2_init = 1;
+
+    rc = PMIX_SUCCESS;
+
+error:
+    PMIX_INFO_DESTRUCT(&info[0]);
+
+    return convert_err(rc);
+}
+
+PMIX_EXPORT int PMI2_Initialized(void)
+{
+    int initialized;
+    initialized = (int)PMIx_Initialized();
+    return initialized;
+}
+
+PMIX_EXPORT int PMI2_Finalize(void)
+{
+    pmix_status_t rc = PMIX_SUCCESS;
+
+    PMI2_CHECK();
+
+    pmi2_init = 0;
+    rc = PMIx_Finalize(NULL, 0);
+    return convert_err(rc);
+}
+
+PMIX_EXPORT int PMI2_Abort(int flag, const char msg[])
+{
+    pmix_status_t rc = PMIX_SUCCESS;
+
+    PMI2_CHECK();
+
+    rc = PMIx_Abort(flag, msg, NULL, 0);
+    return convert_err(rc);
+}
+
+PMIX_EXPORT int PMI2_Job_Spawn(int count, const char * cmds[],
+                   int argcs[], const char ** argvs[],
+                   const int maxprocs[],
+                   const int info_keyval_sizes[],
+                   const PMI_keyval_t *info_keyval_vectors[],
+                   int preput_keyval_size,
+                   const PMI_keyval_t *preput_keyval_vector[],
+                   char jobId[], int jobIdSize,
+                   int errors[])
+{
+    pmix_status_t rc = PMIX_SUCCESS;
+    pmix_app_t *apps;
+    int i, k;
+    size_t j;
+    char *evar;
+
+    PMI2_CHECK();
+
+    if (NULL == cmds) {
+        return PMI2_ERR_INVALID_ARGS;
+    }
+
+    /* setup the apps */
+    PMIX_APP_CREATE(apps, count);
+    for (i=0; i < count; i++) {
+        apps[i].cmd = strdup(cmds[i]);
+        apps[i].maxprocs = maxprocs[i];
+        apps[i].argv = pmix_argv_copy((char**)argvs[i]);
+        apps[i].ninfo = info_keyval_sizes[i];
+        apps[i].info = (pmix_info_t*)malloc(apps[i].ninfo * sizeof(pmix_info_t));
+        /* copy the info objects */
+        for (j=0; j < apps[i].ninfo; j++) {
+            (void)strncpy(apps[i].info[j].key, info_keyval_vectors[i][j].key, PMIX_MAX_KEYLEN);
+            apps[i].info[j].value.type = PMIX_STRING;
+            apps[i].info[j].value.data.string = strdup(info_keyval_vectors[i][j].val);
+        }
+        /* push the preput values into the apps environ */
+        for (k=0; k < preput_keyval_size; k++) {
+            if (0 > asprintf(&evar, "%s=%s", preput_keyval_vector[j]->key, preput_keyval_vector[j]->val)) {
+                for (i = 0; i < count; i++) {
+                    PMIX_APP_DESTRUCT(&apps[i]);
+                }
+                free(apps);
+                return PMIX_ERR_NOMEM;
+            }
+            pmix_argv_append_nosize(&apps[i].env, evar);
+            free(evar);
+        }
+    }
+
+    rc = PMIx_Spawn(NULL, 0, apps, count, NULL);
+    /* tear down the apps array */
+    for (i=0; i < count; i++) {
+        PMIX_APP_DESTRUCT(&apps[i]);
+    }
+    free(apps);
+    if (NULL != errors) {
+        for (i=0; i < count; i++) {
+            errors[i] = convert_err(rc);
+        }
+    }
+
+    return convert_err(rc);
+}
+
+PMIX_EXPORT int PMI2_Job_GetId(char jobid[], int jobid_size)
+{
+    /* we already obtained our nspace during pmi2_init,
+     * so all we have to do here is return it */
+
+    PMI2_CHECK();
+
+    /* bozo check */
+    if (NULL == jobid) {
+        return PMI2_ERR_INVALID_ARGS;
+    }
+    (void)strncpy(jobid, myproc.nspace, jobid_size);
+    return PMI2_SUCCESS;
+}
+
+PMIX_EXPORT int PMI2_Job_GetRank(int *rank)
+{
+    PMI2_CHECK();
+
+    if (NULL == rank) {
+        return PMI2_ERR_INVALID_ARGS;
+    }
+    *rank = myproc.rank;
+    return PMI2_SUCCESS;
+}
+
+PMIX_EXPORT int PMI2_Info_GetSize(int *size)
+{
+    pmix_status_t rc = PMIX_ERROR;
+    pmix_value_t *val;
+    pmix_info_t info[1];
+    bool  val_optinal = 1;
+    pmix_proc_t proc = myproc;
+    proc.rank = PMIX_RANK_WILDCARD;
+
+
+    PMI2_CHECK();
+
+    if (NULL == size) {
+        return PMI2_ERR_INVALID_ARGS;
+    }
+
+    /* set controlling parameters
+     * PMIX_OPTIONAL - expect that these keys should be available on startup
+     */
+    PMIX_INFO_CONSTRUCT(&info[0]);
+    PMIX_INFO_LOAD(&info[0], PMIX_OPTIONAL, &val_optinal, PMIX_BOOL);
+
+    if (PMIX_SUCCESS == PMIx_Get(&proc, PMIX_LOCAL_SIZE, info, 1, &val)) {
+        rc = convert_int(size, val);
+        PMIX_VALUE_RELEASE(val);
+    }
+
+    PMIX_INFO_DESTRUCT(&info[0]);
+
+    return convert_err(rc);
+}
+
+PMIX_EXPORT int PMI2_Job_Connect(const char jobid[], PMI2_Connect_comm_t *conn)
+{
+    pmix_status_t rc = PMIX_SUCCESS;
+    pmix_proc_t proc;
+
+    PMI2_CHECK();
+
+    if (NULL == conn) {
+        return PMI2_ERR_INVALID_ARGS;
+    }
+
+    memset(proc.nspace, 0, sizeof(proc.nspace));
+    (void)strncpy(proc.nspace, (jobid ? jobid : proc.nspace), sizeof(proc.nspace)-1);
+    proc.rank = PMIX_RANK_WILDCARD;
+    rc = PMIx_Connect(&proc, 1, NULL, 0);
+    return convert_err(rc);
+}
+
+PMIX_EXPORT int PMI2_Job_Disconnect(const char jobid[])
+{
+    pmix_status_t rc = PMIX_SUCCESS;
+    pmix_proc_t proc;
+
+    PMI2_CHECK();
+
+    memset(proc.nspace, 0, sizeof(proc.nspace));
+    (void)strncpy(proc.nspace, (jobid ? jobid : proc.nspace), sizeof(proc.nspace)-1);
+    proc.rank = PMIX_RANK_WILDCARD;
+    rc = PMIx_Disconnect(&proc, 1, NULL, 0);
+    return convert_err(rc);
+}
+
+/* KVS_Put - we default to PMIX_GLOBAL scope */
+PMIX_EXPORT int PMI2_KVS_Put(const char key[], const char value[])
+{
+    pmix_status_t rc = PMIX_SUCCESS;
+    pmix_value_t val;
+
+    PMI2_CHECK();
+
+    if ((NULL == key) || (NULL == value)) {
+        return PMI2_ERR_INVALID_ARG;
+    }
+
+    pmix_output_verbose(3, pmix_globals.debug_output,
+            "PMI2_KVS_Put: key=%s value=%s", key, value);
+
+    val.type = PMIX_STRING;
+    val.data.string = (char*)value;
+    if (PMIX_SUCCESS == (rc = PMIx_Put(PMIX_GLOBAL, key, &val))) {
+        commit_reqd = true;
+    }
+    return convert_err(rc);
+}
+
+/* KVS_Fence */
+PMIX_EXPORT int PMI2_KVS_Fence(void)
+{
+    pmix_status_t rc = PMIX_SUCCESS;
+
+    PMI2_CHECK();
+
+    pmix_output_verbose(3, pmix_globals.debug_output, "PMI2_KVS_Fence");
+
+    if (PMIX_SUCCESS != (rc = PMIx_Commit())) {
+        return convert_err(rc);
+    }
+    commit_reqd = false;
+
+    /* we want all data to be collected upon completion */
+    {
+        pmix_info_t info[1];
+        bool  val_data = 1;
+
+        /* set controlling parameters
+         * PMIX_COLLECT_DATA - meet legacy PMI2 requirement
+         */
+        PMIX_INFO_CONSTRUCT(&info[0]);
+        PMIX_INFO_LOAD(&info[0], PMIX_COLLECT_DATA, &val_data, PMIX_BOOL);
+
+        rc = PMIx_Fence(NULL, 0, &info[0], 1);
+        PMIX_INFO_DESTRUCT(&info[0]);
+    }
+
+    return convert_err(rc);
+}
+
+/* the jobid is equated to the nspace in PMIx, and the
+ * src_pmi_id equates to the rank. If jobid=NULL, then PMIx
+ * will use the local nspace, which matches the PMI2 spec.
+ * The only type of value supported by PMI2 is a string, so
+ * the return of anything else is an error */
+PMIX_EXPORT int PMI2_KVS_Get(const char *jobid, int src_pmi_id,
+                             const char key[], char value [],
+                             int maxvalue, int *vallen)
+{
+    pmix_status_t rc = PMIX_SUCCESS;
+    pmix_value_t *val;
+    pmix_proc_t proc;
+
+    PMI2_CHECK();
+
+    if (commit_reqd) {
+        /* they didn't commit after a put */
+        return PMI2_FAIL;
+    }
+    /* set default */
+    *vallen = 0;
+
+    if ((NULL == key) || (NULL == value)) {
+        return PMI2_ERR_INVALID_ARG;
+    }
+
+    pmix_output_verbose(3, pmix_globals.debug_output,
+            "PMI2_KVS_Get: key=%s jobid=%s src_pmi_id=%d", key, (jobid ? jobid : "null"), src_pmi_id);
+
+    (void)strncpy(proc.nspace, (jobid ? jobid : myproc.nspace), PMIX_MAX_NSLEN);
+    if (src_pmi_id == PMI2_ID_NULL) {
+        /* the rank is UNDEF */
+        proc.rank = PMIX_RANK_UNDEF;
+    } else {
+        proc.rank = src_pmi_id;
+    }
+
+    rc = PMIx_Get(&proc, key, NULL, 0, &val);
+    if (PMIX_SUCCESS == rc && NULL != val) {
+        if (PMIX_STRING != val->type) {
+            rc = PMIX_ERROR;
+        } else if (NULL != val->data.string) {
+            (void)strncpy(value, val->data.string, maxvalue);
+            *vallen = strlen(val->data.string);
+        }
+        PMIX_VALUE_RELEASE(val);
+    }
+
+    return convert_err(rc);
+}
+
+PMIX_EXPORT int PMI2_Info_GetNodeAttr(const char name[],
+                                      char value[], int valuelen,
+                                      int *found, int waitfor)
+{
+    pmix_status_t rc = PMIX_SUCCESS;
+    pmix_value_t *val;
+    pmix_info_t info[1];
+    bool  val_optinal = 1;
+    pmix_proc_t proc = myproc;
+    proc.rank = PMIX_RANK_UNDEF;
+
+    PMI2_CHECK();
+
+    if ((NULL == name) || (NULL == value) || (NULL == found)) {
+        return PMI2_ERR_INVALID_ARG;
+    }
+
+    /* set controlling parameters
+     * PMIX_OPTIONAL - expect that these keys should be available on startup
+     */
+    PMIX_INFO_CONSTRUCT(&info[0]);
+    PMIX_INFO_LOAD(&info[0], PMIX_OPTIONAL, &val_optinal, PMIX_BOOL);
+
+    *found = 0;
+    /* TODO: does PMI2's "name" makes sense to PMIx? */
+    rc = PMIx_Get(&proc, name, info, 1, &val);
+    if (PMIX_SUCCESS == rc && NULL != val) {
+        if (PMIX_STRING != val->type) {
+            rc = PMIX_ERROR;
+        } else if (NULL != val->data.string) {
+            (void)strncpy(value, val->data.string, valuelen);
+            *found = 1;
+        }
+        PMIX_VALUE_RELEASE(val);
+    } else if (PMIX_ERR_NOT_FOUND == rc) {
+        rc = PMIX_SUCCESS;
+    }
+
+    PMIX_INFO_DESTRUCT(&info[0]);
+
+    return convert_err(rc);
+}
+
+PMIX_EXPORT int PMI2_Info_GetNodeAttrIntArray(const char name[], int array[],
+                                  int arraylen, int *outlen, int *found)
+{
+    return PMI2_FAIL;
+}
+
+/* push info at the PMIX_LOCAL scope */
+PMIX_EXPORT int PMI2_Info_PutNodeAttr(const char name[], const char value[])
+{
+    pmix_status_t rc = PMIX_SUCCESS;
+    pmix_value_t val;
+
+    PMI2_CHECK();
+
+    if ((NULL == name) || (NULL == value)) {
+        return PMI2_ERR_INVALID_ARG;
+    }
+
+    val.type = PMIX_STRING;
+    val.data.string = (char*)value;
+    rc = PMIx_Put(PMIX_LOCAL, name, &val);
+    return convert_err(rc);
+}
+
+PMIX_EXPORT int PMI2_Info_GetJobAttr(const char name[], char value[], int valuelen, int *found)
+{
+    pmix_status_t rc = PMIX_SUCCESS;
+    pmix_value_t *val;
+    pmix_info_t info[1];
+    bool  val_optinal = 1;
+    pmix_proc_t proc = myproc;
+    proc.rank = PMIX_RANK_UNDEF;
+
+    PMI2_CHECK();
+
+    if ((NULL == name) || (NULL == value) || (NULL == found)) {
+        return PMI2_ERR_INVALID_ARG;
+    }
+
+    /* set controlling parameters
+     * PMIX_OPTIONAL - expect that these keys should be available on startup
+     */
+    PMIX_INFO_CONSTRUCT(&info[0]);
+    PMIX_INFO_LOAD(&info[0], PMIX_OPTIONAL, &val_optinal, PMIX_BOOL);
+
+    /* PMI-2 expects resource manager to set
+     * process mapping in ANL notation. */
+    if (!strcmp(name, ANL_MAPPING)) {
+        /* we are looking in the job-data. If there is nothing there
+         * we don't want to look in rank's data, thus set rank to widcard */
+        proc = myproc;
+        proc.rank = PMIX_RANK_WILDCARD;
+        if (PMIX_SUCCESS == PMIx_Get(&proc, PMIX_ANL_MAP, NULL, 0, &val) &&
+               (NULL != val) && (PMIX_STRING == val->type)) {
+            strncpy(value, val->data.string, valuelen);
+            PMIX_VALUE_FREE(val, 1);
+            *found = 1;
+            return PMI2_SUCCESS;
+        } else {
+            /* artpol:
+             * Some RM's (i.e. SLURM) already have ANL precomputed. The export it
+             * through PMIX_ANL_MAP variable.
+             * If we haven't found it we want to have our own packing functionality
+             * since it's common.
+             * Somebody else has to write it since I've already done that for
+             * GPL'ed SLURM :) */
+            *found = 1;
+            return PMI2_FAIL;
+        }
+    }
+
+
+    *found = 0;
+    rc = PMIx_Get(&proc, name, info, 1, &val);
+    if (PMIX_SUCCESS == rc && NULL != val) {
+        if (PMIX_STRING != val->type) {
+            rc = PMIX_ERROR;
+        } else if (NULL != val->data.string) {
+            (void)strncpy(value, val->data.string, valuelen);
+            *found = 1;
+        }
+        PMIX_VALUE_RELEASE(val);
+    } else if (PMIX_ERR_NOT_FOUND == rc) {
+        rc = PMIX_SUCCESS;
+    }
+
+    PMIX_INFO_DESTRUCT(&info[0]);
+
+    return convert_err(rc);
+}
+
+PMIX_EXPORT int PMI2_Info_GetJobAttrIntArray(const char name[],
+                                             int array[], int arraylen,
+                                             int *outlen, int *found)
+{
+    return PMI2_FAIL;
+}
+
+PMIX_EXPORT int PMI2_Nameserv_publish(const char service_name[],
+                                      const PMI_keyval_t *info_ptr, const char port[])
+{
+    pmix_status_t rc = PMIX_SUCCESS;
+    int nvals;
+    pmix_info_t info[2];
+
+    PMI2_CHECK();
+
+    if (NULL == service_name || NULL == port) {
+        return PMI2_ERR_INVALID_ARG;
+    }
+
+    /* pass the service/port */
+    (void)strncpy(info[0].key, service_name, PMIX_MAX_KEYLEN);
+    info[0].value.type = PMIX_STRING;
+    info[0].value.data.string = (char*)port;
+    nvals = 1;
+
+    /* if provided, add any other value */
+    if (NULL != info_ptr) {
+        (void)strncpy(info[1].key, info_ptr->key, PMIX_MAX_KEYLEN);
+        info[1].value.type = PMIX_STRING;
+        info[1].value.data.string = (char*)info_ptr->val;
+        nvals = 2;
+    }
+    /* publish the info - PMI-2 doesn't support
+     * any scope other than inside our own nspace */
+    rc = PMIx_Publish(info, nvals);
+
+    return convert_err(rc);
+}
+
+PMIX_EXPORT int PMI2_Nameserv_lookup(const char service_name[],
+                                     const PMI_keyval_t *info_ptr,
+                                     char port[], int portLen)
+{
+    pmix_status_t rc = PMIX_SUCCESS;
+    int nvals;
+    pmix_pdata_t pdata[2];
+
+    PMI2_CHECK();
+
+    if (NULL == service_name || NULL == info_ptr || NULL == port) {
+        return PMI2_ERR_INVALID_ARG;
+    }
+
+    PMIX_PDATA_CONSTRUCT(&pdata[0]);
+    PMIX_PDATA_CONSTRUCT(&pdata[1]);
+
+    /* pass the service */
+    (void)strncpy(pdata[0].key, service_name, PMIX_MAX_KEYLEN);
+    nvals = 1;
+
+    /* if provided, add any other value */
+    if (NULL != info_ptr) {
+        (void)strncpy(pdata[1].key, info_ptr->key, PMIX_MAX_KEYLEN);
+        pdata[1].value.type = PMIX_STRING;
+        pdata[1].value.data.string = info_ptr->val;
+        nvals = 2;
+    }
+
+    /* lookup the info */
+    if (PMIX_SUCCESS != (rc = PMIx_Lookup(pdata, nvals, NULL, 0))) {
+        PMIX_PDATA_DESTRUCT(&pdata[0]);
+        PMIX_PDATA_DESTRUCT(&pdata[1]);
+        return convert_err(rc);
+    }
+
+    /* should have received a string back */
+    if (PMIX_STRING != pdata[0].value.type ||
+        NULL == pdata[0].value.data.string) {
+        PMIX_PDATA_DESTRUCT(&pdata[0]);
+        PMIX_PDATA_DESTRUCT(&pdata[1]);
+        return PMI2_FAIL;
+    }
+
+    /* return the port */
+    (void)strncpy(port, pdata[0].value.data.string, portLen);
+    PMIX_PDATA_DESTRUCT(&pdata[0]);
+
+    if (NULL != info_ptr) {
+    }
+    PMIX_PDATA_DESTRUCT(&pdata[1]);
+
+    return PMI2_SUCCESS;
+}
+
+PMIX_EXPORT int PMI2_Nameserv_unpublish(const char service_name[],
+                           const PMI_keyval_t *info_ptr)
+{
+    pmix_status_t rc = PMIX_SUCCESS;
+    char *keys[3];
+
+    PMI2_CHECK();
+
+    if (NULL == service_name || NULL == info_ptr) {
+        return PMI2_ERR_INVALID_ARG;
+    }
+
+    /* pass the service */
+    keys[0] = (char*)service_name;
+    keys[1] = NULL;
+    keys[2] = NULL;
+
+    /* if provided, add any other value */
+    if (NULL != info_ptr) {
+        keys[1] = info_ptr->key;
+    }
+
+    rc = PMIx_Unpublish(keys, NULL, 0);
+    return convert_err(rc);
+}
+
+/****    CONVERSION ROUTINES    ****/
+static pmix_status_t convert_int(int *value, pmix_value_t *kv)
+{
+    switch(kv->type) {
+    case PMIX_INT:
+        *value = kv->data.integer;
+        break;
+    case PMIX_INT8:
+        *value = kv->data.int8;
+        break;
+    case PMIX_INT16:
+        *value = kv->data.int16;
+        break;
+    case PMIX_INT32:
+        *value = kv->data.int32;
+        break;
+    case PMIX_INT64:
+        *value = kv->data.int64;
+        break;
+    case PMIX_UINT:
+        *value = kv->data.uint;
+        break;
+    case PMIX_UINT8:
+        *value = kv->data.uint8;
+        break;
+    case PMIX_UINT16:
+        *value = kv->data.uint16;
+        break;
+    case PMIX_UINT32:
+        *value = kv->data.uint32;
+        break;
+    case PMIX_UINT64:
+        *value = kv->data.uint64;
+        break;
+    case PMIX_BYTE:
+        *value = kv->data.byte;
+        break;
+    case PMIX_SIZE:
+        *value = kv->data.size;
+        break;
+    case PMIX_BOOL:
+        *value = kv->data.flag;
+        break;
+    default:
+        /* not an integer type */
+        return PMIX_ERR_BAD_PARAM;
+    }
+    return PMIX_SUCCESS;
+}
+
+static int convert_err(pmix_status_t rc)
+{
+    switch(rc) {
+    case PMIX_ERR_INVALID_SIZE:
+        return PMI2_ERR_INVALID_SIZE;
+
+    case PMIX_ERR_INVALID_KEYVALP:
+        return PMI2_ERR_INVALID_KEYVALP;
+
+    case PMIX_ERR_INVALID_NUM_PARSED:
+        return PMI2_ERR_INVALID_NUM_PARSED;
+
+    case PMIX_ERR_INVALID_ARGS:
+        return PMI2_ERR_INVALID_ARGS;
+
+    case PMIX_ERR_INVALID_NUM_ARGS:
+        return PMI2_ERR_INVALID_NUM_ARGS;
+
+    case PMIX_ERR_INVALID_LENGTH:
+        return PMI2_ERR_INVALID_LENGTH;
+
+    case PMIX_ERR_INVALID_VAL_LENGTH:
+        return PMI2_ERR_INVALID_VAL_LENGTH;
+
+    case PMIX_ERR_INVALID_VAL:
+        return PMI2_ERR_INVALID_VAL;
+
+    case PMIX_ERR_INVALID_KEY_LENGTH:
+        return PMI2_ERR_INVALID_KEY_LENGTH;
+
+    case PMIX_ERR_INVALID_KEY:
+        return PMI2_ERR_INVALID_KEY;
+
+    case PMIX_ERR_INVALID_ARG:
+        return PMI2_ERR_INVALID_ARG;
+
+    case PMIX_ERR_NOMEM:
+        return PMI2_ERR_NOMEM;
+
+    case PMIX_ERR_UNPACK_READ_PAST_END_OF_BUFFER:
+    case PMIX_ERR_LOST_CONNECTION_TO_SERVER:
+    case PMIX_ERR_LOST_PEER_CONNECTION:
+    case PMIX_ERR_LOST_CONNECTION_TO_CLIENT:
+    case PMIX_ERR_NOT_SUPPORTED:
+    case PMIX_ERR_NOT_FOUND:
+    case PMIX_ERR_SERVER_NOT_AVAIL:
+    case PMIX_ERR_INVALID_NAMESPACE:
+    case PMIX_ERR_DATA_VALUE_NOT_FOUND:
+    case PMIX_ERR_OUT_OF_RESOURCE:
+    case PMIX_ERR_RESOURCE_BUSY:
+    case PMIX_ERR_BAD_PARAM:
+    case PMIX_ERR_IN_ERRNO:
+    case PMIX_ERR_UNREACH:
+    case PMIX_ERR_TIMEOUT:
+    case PMIX_ERR_NO_PERMISSIONS:
+    case PMIX_ERR_PACK_MISMATCH:
+    case PMIX_ERR_PACK_FAILURE:
+    case PMIX_ERR_UNPACK_FAILURE:
+    case PMIX_ERR_UNPACK_INADEQUATE_SPACE:
+    case PMIX_ERR_TYPE_MISMATCH:
+    case PMIX_ERR_PROC_ENTRY_NOT_FOUND:
+    case PMIX_ERR_UNKNOWN_DATA_TYPE:
+    case PMIX_ERR_WOULD_BLOCK:
+    case PMIX_EXISTS:
+    case PMIX_ERROR:
+        return PMI2_FAIL;
+
+    case PMIX_ERR_INIT:
+        return PMI2_ERR_INIT;
+
+    case PMIX_SUCCESS:
+        return PMI2_SUCCESS;
+    default:
+        return PMI2_FAIL;
+    }
+}
diff --git a/src/client/pmix_client.c b/src/client/pmix_client.c
new file mode 100644
index 0000000..3bf7184
--- /dev/null
+++ b/src/client/pmix_client.c
@@ -0,0 +1,1119 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2014-2017 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2014-2017 Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2014      Artem Y. Polyakov <artpol84 at gmail.com>.
+ *                         All rights reserved.
+ * Copyright (c) 2016      Mellanox Technologies, Inc.
+ *                         All rights reserved.
+ * Copyright (c) 2016-2017 IBM Corporation.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+
+#include <src/include/types.h>
+#include <src/include/pmix_stdint.h>
+#include <src/include/pmix_socket_errno.h>
+
+#include <pmix.h>
+#include <pmix_rename.h>
+
+#include "src/include/pmix_globals.h"
+
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+#include <fcntl.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_SYS_UN_H
+#include <sys/un.h>
+#endif
+#ifdef HAVE_SYS_UIO_H
+#include <sys/uio.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
+#if PMIX_HAVE_ZLIB
+#include <zlib.h>
+#endif
+#include PMIX_EVENT_HEADER
+#include PMIX_EVENT2_THREAD_HEADER
+
+#if PMIX_CC_USE_PRAGMA_IDENT
+#pragma ident PMIX_VERSION
+#elif PMIX_CC_USE_IDENT
+#ident PMIX_VERSION
+#endif
+static const char pmix_version_string[] = PMIX_VERSION;
+
+
+#include "src/class/pmix_list.h"
+#include "src/buffer_ops/buffer_ops.h"
+#include "src/event/pmix_event.h"
+#include "src/util/argv.h"
+#include "src/util/compress.h"
+#include "src/util/error.h"
+#include "src/util/hash.h"
+#include "src/util/output.h"
+#include "src/runtime/pmix_progress_threads.h"
+#include "src/runtime/pmix_rte.h"
+#include "src/threads/threads.h"
+#include "src/mca/ptl/ptl.h"
+#include "src/include/pmix_globals.h"
+#if defined(PMIX_ENABLE_DSTORE) && (PMIX_ENABLE_DSTORE == 1)
+#include "src/dstore/pmix_dstore.h"
+#endif /* PMIX_ENABLE_DSTORE */
+#ifdef HAVE_ZLIB_H
+#include <zlib.h>
+#endif
+
+#include "pmix_client_ops.h"
+#include "src/include/pmix_jobdata.h"
+
+#define PMIX_MAX_RETRIES 10
+
+static void _notify_complete(pmix_status_t status, void *cbdata)
+{
+    pmix_event_chain_t *chain = (pmix_event_chain_t*)cbdata;
+    PMIX_ACQUIRE_OBJECT(chain);
+    PMIX_RELEASE(chain);
+}
+
+static void pmix_client_notify_recv(struct pmix_peer_t *peer,
+                                    pmix_ptl_hdr_t *hdr,
+                                    pmix_buffer_t *buf, void *cbdata)
+{
+    pmix_status_t rc;
+    int32_t cnt;
+    pmix_cmd_t cmd;
+    pmix_event_chain_t *chain;
+    size_t ninfo;
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "pmix:client_notify_recv - processing event");
+
+    /* start the local notification chain */
+    chain = PMIX_NEW(pmix_event_chain_t);
+    chain->final_cbfunc = _notify_complete;
+    chain->final_cbdata = chain;
+
+    cnt=1;
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, &cmd, &cnt, PMIX_CMD))) {
+        PMIX_ERROR_LOG(rc);
+        goto error;
+    }
+    /* unpack the status */
+    cnt=1;
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, &chain->status, &cnt, PMIX_STATUS))) {
+        PMIX_ERROR_LOG(rc);
+        goto error;
+    }
+
+    /* unpack the source of the event */
+    cnt=1;
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, &chain->source, &cnt, PMIX_PROC))) {
+        PMIX_ERROR_LOG(rc);
+        goto error;
+    }
+
+    /* unpack the info that might have been provided */
+    cnt=1;
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, &ninfo, &cnt, PMIX_SIZE))) {
+        PMIX_ERROR_LOG(rc);
+        goto error;
+    }
+
+    /* we always leave space for a callback object */
+    chain->ninfo = ninfo + 1;
+    PMIX_INFO_CREATE(chain->info, chain->ninfo);
+
+    if (0 < ninfo) {
+        cnt = ninfo;
+        if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, chain->info, &cnt, PMIX_INFO))) {
+            PMIX_ERROR_LOG(rc);
+            goto error;
+        }
+    }
+    /* now put the callback object tag in the last element */
+    PMIX_INFO_LOAD(&chain->info[ninfo], PMIX_EVENT_RETURN_OBJECT, NULL, PMIX_POINTER);
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "[%s:%d] pmix:client_notify_recv - processing event %d, calling errhandler",
+                        pmix_globals.myid.nspace, pmix_globals.myid.rank, chain->status);
+
+    pmix_invoke_local_event_hdlr(chain);
+    return;
+
+  error:
+    /* we always need to return */
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "pmix:client_notify_recv - unpack error status =%d, calling def errhandler", rc);
+    chain = PMIX_NEW(pmix_event_chain_t);
+    chain->status = rc;
+    pmix_invoke_local_event_hdlr(chain);
+}
+
+
+pmix_client_globals_t pmix_client_globals = {0};
+
+/* callback for wait completion */
+static void wait_cbfunc(struct pmix_peer_t *pr,
+                        pmix_ptl_hdr_t *hdr,
+                        pmix_buffer_t *buf, void *cbdata)
+{
+    pmix_lock_t *lock = (pmix_lock_t*)cbdata;
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "pmix:client wait_cbfunc received");
+    PMIX_WAKEUP_THREAD(lock);
+}
+
+/* callback to receive job info */
+static void job_data(struct pmix_peer_t *pr,
+                     pmix_ptl_hdr_t *hdr,
+                     pmix_buffer_t *buf, void *cbdata)
+{
+    pmix_status_t rc;
+    char *nspace;
+    int32_t cnt = 1;
+    pmix_cb_t *cb = (pmix_cb_t*)cbdata;
+
+    /* unpack the nspace - we don't really need it, but have to
+     * unpack it to maintain sequence */
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, &nspace, &cnt, PMIX_STRING))) {
+        PMIX_ERROR_LOG(rc);
+        cb->status = PMIX_ERROR;
+        PMIX_POST_OBJECT(cb);
+        PMIX_WAKEUP_THREAD(&cb->lock);
+        return;
+    }
+    assert(NULL != nspace);
+    free(nspace);
+
+    /* decode it */
+#if !(defined(PMIX_ENABLE_DSTORE) && (PMIX_ENABLE_DSTORE == 1))
+    pmix_job_data_htable_store(pmix_globals.myid.nspace, buf);
+#endif
+    cb->status = PMIX_SUCCESS;
+    PMIX_POST_OBJECT(cb);
+    PMIX_WAKEUP_THREAD(&cb->lock);
+}
+
+PMIX_EXPORT const char* PMIx_Get_version(void)
+{
+    return pmix_version_string;
+}
+
+static void notification_fn(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)
+{
+    pmix_lock_t *reglock = (pmix_lock_t*)cbdata;
+
+    if (NULL != cbfunc) {
+        cbfunc(PMIX_EVENT_ACTION_COMPLETE, NULL, 0, NULL, NULL, cbdata);
+    }
+    PMIX_WAKEUP_THREAD(reglock);
+
+}
+
+typedef struct {
+    pmix_info_t *info;
+    size_t ninfo;
+} mydata_t;
+
+static void release_info(pmix_status_t status, void *cbdata)
+{
+    mydata_t *cd = (mydata_t*)cbdata;
+    PMIX_INFO_FREE(cd->info, cd->ninfo);
+    free(cd);
+}
+
+static void _check_for_notify(pmix_info_t info[], size_t ninfo)
+{
+    mydata_t *cd;
+    size_t n, m=0;
+    pmix_info_t *model=NULL, *library=NULL, *vers=NULL, *tmod=NULL;
+
+    for (n=0; n < ninfo; n++) {
+        if (0 == strncmp(info[n].key, PMIX_PROGRAMMING_MODEL, PMIX_MAX_KEYLEN)) {
+            /* we need to generate an event indicating that
+             * a programming model has been declared */
+            model = &info[n];
+            ++m;
+        } else if (0 == strncmp(info[n].key, PMIX_MODEL_LIBRARY_NAME, PMIX_MAX_KEYLEN)) {
+            library = &info[n];
+            ++m;
+        } else if (0 == strncmp(info[n].key, PMIX_MODEL_LIBRARY_VERSION, PMIX_MAX_KEYLEN)) {
+            vers = &info[n];
+            ++m;
+        } else if (0 == strncmp(info[n].key, PMIX_THREADING_MODEL, PMIX_MAX_KEYLEN)) {
+            tmod = &info[n];
+            ++m;
+        }
+    }
+    if (0 < m) {
+        /* notify anyone listening that a model has been declared */
+        cd = (mydata_t*)malloc(sizeof(mydata_t));
+        if (NULL == cd) {
+            /* nothing we can do */
+            return;
+        }
+        PMIX_INFO_CREATE(cd->info, m+1);
+        if (NULL == cd->info) {
+            free(cd);
+            return;
+        }
+        cd->ninfo = m+1;
+        n = 0;
+        if (NULL != model) {
+            PMIX_INFO_XFER(&cd->info[n], model);
+            ++n;
+        }
+        if (NULL != library) {
+            PMIX_INFO_XFER(&cd->info[n], library);
+            ++n;
+        }
+        if (NULL != vers) {
+            PMIX_INFO_XFER(&cd->info[n], vers);
+            ++n;
+        }
+        if (NULL != tmod) {
+            PMIX_INFO_XFER(&cd->info[n], tmod);
+            ++n;
+        }
+        /* mark that it is not to go to any default handlers */
+        PMIX_INFO_LOAD(&cd->info[n], PMIX_EVENT_NON_DEFAULT, NULL, PMIX_BOOL);
+        PMIx_Notify_event(PMIX_MODEL_DECLARED,
+                          &pmix_globals.myid, PMIX_RANGE_PROC_LOCAL,
+                          cd->info, cd->ninfo, release_info, (void*)cd);
+    }
+}
+
+PMIX_EXPORT pmix_status_t PMIx_Init(pmix_proc_t *proc,
+                                    pmix_info_t info[], size_t ninfo)
+{
+    char *evar;
+    pmix_status_t rc;
+    pmix_nspace_t *nsptr;
+    pmix_cb_t cb;
+    pmix_buffer_t *req;
+    pmix_cmd_t cmd = PMIX_REQ_CMD;
+    pmix_status_t code = PMIX_ERR_DEBUGGER_RELEASE;
+    pmix_proc_t wildcard;
+    pmix_info_t ginfo;
+    pmix_value_t *val = NULL;
+    pmix_lock_t reglock;
+
+    if (NULL == proc) {
+        return PMIX_ERR_BAD_PARAM;
+    }
+
+    PMIX_ACQUIRE_THREAD(&pmix_global_lock);
+
+    if (0 < pmix_globals.init_cntr || PMIX_PROC_IS_SERVER) {
+        /* since we have been called before, the nspace and
+         * rank should be known. So return them here if
+         * requested */
+         if (NULL != proc) {
+            (void)strncpy(proc->nspace, pmix_globals.myid.nspace, PMIX_MAX_NSLEN);
+            proc->rank = pmix_globals.myid.rank;
+        }
+        ++pmix_globals.init_cntr;
+        /* we also need to check the info keys to see if something need
+         * be done with them - e.g., to notify another library that we
+         * also have called init */
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        if (NULL != info) {
+            _check_for_notify(info, ninfo);
+        }
+        return PMIX_SUCCESS;
+    }
+    /* if we don't see the required info, then we cannot init */
+    if (NULL == getenv("PMIX_NAMESPACE")) {
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return PMIX_ERR_INVALID_NAMESPACE;
+    }
+
+    /* setup the runtime - this init's the globals,
+     * opens and initializes the required frameworks */
+    if (PMIX_SUCCESS != (rc = pmix_rte_init(PMIX_PROC_CLIENT, info, ninfo,
+                                            pmix_client_notify_recv))) {
+        PMIX_ERROR_LOG(rc);
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return rc;
+    }
+
+    /* setup the globals */
+    PMIX_CONSTRUCT(&pmix_client_globals.pending_requests, pmix_list_t);
+    pmix_client_globals.myserver = PMIX_NEW(pmix_peer_t);
+    if (NULL == pmix_client_globals.myserver) {
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return PMIX_ERR_NOMEM;
+    }
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "pmix: init called");
+
+    /* we require our nspace */
+    if (NULL == (evar = getenv("PMIX_NAMESPACE"))) {
+        /* let the caller know that the server isn't available yet */
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return PMIX_ERR_INVALID_NAMESPACE;
+    }
+    if (NULL != proc) {
+        (void)strncpy(proc->nspace, evar, PMIX_MAX_NSLEN);
+    }
+    (void)strncpy(pmix_globals.myid.nspace, evar, PMIX_MAX_NSLEN);
+    nsptr = PMIX_NEW(pmix_nspace_t);
+    (void)strncpy(nsptr->nspace, evar, PMIX_MAX_NSLEN);
+    pmix_list_append(&pmix_globals.nspaces, &nsptr->super);
+
+    /* we also require our rank */
+    if (NULL == (evar = getenv("PMIX_RANK"))) {
+        /* let the caller know that the server isn't available yet */
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return PMIX_ERR_DATA_VALUE_NOT_FOUND;
+    }
+    pmix_globals.myid.rank = strtol(evar, NULL, 10);
+    if (NULL != proc) {
+        proc->rank = pmix_globals.myid.rank;
+    }
+    pmix_globals.pindex = -1;
+
+    /* select our psec compat module - the selection will be based
+     * on the corresponding envars that should have been passed
+     * to us at launch */
+    evar = getenv("PMIX_SECURITY_MODE");
+    if (PMIX_SUCCESS != (rc = pmix_psec.assign_module(pmix_globals.mypeer, evar))) {
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return PMIX_ERR_INIT;
+    }
+    /* the server will be using the same */
+    pmix_client_globals.myserver->compat.psec = pmix_globals.mypeer->compat.psec;
+
+    /* setup the shared memory support */
+#if defined(PMIX_ENABLE_DSTORE) && (PMIX_ENABLE_DSTORE == 1)
+    if (PMIX_SUCCESS != (rc = pmix_dstore_init(NULL, 0))) {
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return PMIX_ERR_DATA_VALUE_NOT_FOUND;
+    }
+#endif /* PMIX_ENABLE_DSTORE */
+
+    /* connect to the server */
+    if (PMIX_SUCCESS != (rc = pmix_ptl.connect_to_peer(pmix_client_globals.myserver, info, ninfo))){
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return rc;
+    }
+    /* mark that we are using the same module as used for the server */
+    pmix_globals.mypeer->compat.ptl = pmix_client_globals.myserver->compat.ptl;
+
+    /* send a request for our job info - we do this as a non-blocking
+     * transaction because some systems cannot handle very large
+     * blocking operations and error out if we try them. */
+     req = PMIX_NEW(pmix_buffer_t);
+     if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(req, &cmd, 1, PMIX_CMD))) {
+        PMIX_ERROR_LOG(rc);
+        PMIX_RELEASE(req);
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return rc;
+    }
+    /* send to the server */
+    PMIX_CONSTRUCT(&cb, pmix_cb_t);
+    if (PMIX_SUCCESS != (rc = pmix_ptl.send_recv(pmix_client_globals.myserver, req, job_data, (void*)&cb))){
+        PMIX_DESTRUCT(&cb);
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return rc;
+    }
+    /* wait for the data to return */
+    PMIX_WAIT_THREAD(&cb.lock);
+    rc = cb.status;
+    PMIX_DESTRUCT(&cb);
+
+    if (PMIX_SUCCESS == rc) {
+        pmix_globals.init_cntr++;
+    } else {
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return rc;
+    }
+    PMIX_RELEASE_THREAD(&pmix_global_lock);
+
+    /* lood for a debugger attach key */
+    (void)strncpy(wildcard.nspace, pmix_globals.myid.nspace, PMIX_MAX_NSLEN);
+    wildcard.rank = PMIX_RANK_WILDCARD;
+    PMIX_INFO_LOAD(&ginfo, PMIX_IMMEDIATE, NULL, PMIX_BOOL);
+    if (PMIX_SUCCESS == PMIx_Get(&wildcard, PMIX_DEBUG_STOP_IN_INIT, &ginfo, 1, &val)) {
+        PMIX_VALUE_FREE(val, 1); // cleanup memory
+        /* if the value was found, then we need to wait for debugger attach here */
+        /* register for the debugger release notification */
+        PMIX_CONSTRUCT_LOCK(&reglock);
+        PMIx_Register_event_handler(&code, 1, NULL, 0,
+                                    notification_fn, NULL, (void*)&reglock);
+        /* wait for it to arrive */
+        PMIX_WAIT_THREAD(&reglock);
+        PMIX_DESTRUCT_LOCK(&reglock);
+    }
+    PMIX_INFO_DESTRUCT(&ginfo);
+
+    /* check to see if we need to notify anyone */
+    if (NULL != info) {
+        _check_for_notify(info, ninfo);
+    }
+
+    return PMIX_SUCCESS;
+}
+
+PMIX_EXPORT int PMIx_Initialized(void)
+{
+    PMIX_ACQUIRE_THREAD(&pmix_global_lock);
+
+    if (0 < pmix_globals.init_cntr) {
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return true;
+    }
+    PMIX_RELEASE_THREAD(&pmix_global_lock);
+    return false;
+}
+
+typedef struct {
+    pmix_lock_t lock;
+    pmix_event_t ev;
+    bool active;
+} pmix_client_timeout_t;
+
+/* timer callback */
+static void fin_timeout(int sd, short args, void *cbdata)
+{
+    pmix_client_timeout_t *tev;
+    tev = (pmix_client_timeout_t*)cbdata;
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "pmix:client finwait timeout fired");
+    if (tev->active) {
+        tev->active = false;
+        PMIX_WAKEUP_THREAD(&tev->lock);
+    }
+}
+/* callback for finalize completion */
+static void finwait_cbfunc(struct pmix_peer_t *pr,
+                           pmix_ptl_hdr_t *hdr,
+                           pmix_buffer_t *buf, void *cbdata)
+{
+    pmix_client_timeout_t *tev;
+    tev = (pmix_client_timeout_t*)cbdata;
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "pmix:client finwait_cbfunc received");
+    if (tev->active) {
+        tev->active = false;
+        PMIX_WAKEUP_THREAD(&tev->lock);
+    }
+}
+
+PMIX_EXPORT pmix_status_t PMIx_Finalize(const pmix_info_t info[], size_t ninfo)
+{
+    pmix_buffer_t *msg;
+    pmix_cmd_t cmd = PMIX_FINALIZE_CMD;
+    pmix_status_t rc;
+    size_t n;
+    pmix_client_timeout_t tev;
+    struct timeval tv = {2, 0};
+
+    PMIX_ACQUIRE_THREAD(&pmix_global_lock);
+    if (1 != pmix_globals.init_cntr) {
+        --pmix_globals.init_cntr;
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return PMIX_SUCCESS;
+    }
+    pmix_globals.init_cntr = 0;
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "%s:%d pmix:client finalize called",
+                        pmix_globals.myid.nspace, pmix_globals.myid.rank);
+
+    /* mark that I called finalize */
+    pmix_globals.mypeer->finalized = true;
+
+    if ( 0 <= pmix_client_globals.myserver->sd ) {
+        /* check to see if we are supposed to execute a
+         * blocking fence prior to actually finalizing */
+        if (NULL != info && 0 < ninfo) {
+            for (n=0; n < ninfo; n++) {
+                if (0 == strcmp(PMIX_EMBED_BARRIER, info[n].key)) {
+                    /* did they specify a value? */
+                    if (PMIX_BOOL == info[n].value.type) {
+                        if (info[n].value.data.flag) {
+                            /* they do want the barrier */
+                            PMIx_Fence(NULL, 0, NULL, 0);
+                        }
+                    } else {
+                        /* providing this attribute is considered
+                         * to be "true" by default */
+                        PMIx_Fence(NULL, 0, NULL, 0);
+                    }
+                    break;
+                }
+            }
+        }
+
+        /* setup a cmd message to notify the PMIx
+         * server that we are normally terminating */
+        msg = PMIX_NEW(pmix_buffer_t);
+        /* pack the cmd */
+        if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msg, &cmd, 1, PMIX_CMD))) {
+            PMIX_ERROR_LOG(rc);
+            PMIX_RELEASE(msg);
+            return rc;
+        }
+
+
+        pmix_output_verbose(2, pmix_globals.debug_output,
+                             "%s:%d pmix:client sending finalize sync to server",
+                             pmix_globals.myid.nspace, pmix_globals.myid.rank);
+
+        /* setup a timer to protect ourselves should the server be unable
+         * to answer for some reason */
+        PMIX_CONSTRUCT_LOCK(&tev.lock);
+        pmix_event_assign(&tev.ev, pmix_globals.evbase, -1, 0,
+                          fin_timeout, &tev);
+        tev.active = true;
+        PMIX_POST_OBJECT(&tev);
+        pmix_event_add(&tev.ev, &tv);
+        /* send to the server */
+        if (PMIX_SUCCESS != (rc = pmix_ptl.send_recv(pmix_client_globals.myserver, msg,
+                                                     finwait_cbfunc, (void*)&tev))){
+            return rc;
+        }
+
+        /* wait for the ack to return */
+        PMIX_WAIT_THREAD(&tev.lock);
+        PMIX_DESTRUCT_LOCK(&tev.lock);
+        if (tev.active) {
+            pmix_event_del(&tev.ev);
+        }
+
+        pmix_output_verbose(2, pmix_globals.debug_output,
+                             "%s:%d pmix:client finalize sync received",
+                             pmix_globals.myid.nspace, pmix_globals.myid.rank);
+    }
+
+    if (!pmix_globals.external_evbase) {
+        /* stop the progress thread, but leave the event base
+         * still constructed. This will allow us to safely
+         * tear down the infrastructure, including removal
+         * of any events objects may be holding */
+        (void)pmix_progress_thread_pause(NULL);
+    }
+
+#if defined(PMIX_ENABLE_DSTORE) && (PMIX_ENABLE_DSTORE == 1)
+    if (0 > (rc = pmix_dstore_nspace_del(pmix_globals.myid.nspace))) {
+        PMIX_ERROR_LOG(rc);
+        return rc;
+    }
+#endif
+
+    PMIX_LIST_DESTRUCT(&pmix_client_globals.pending_requests);
+
+    if (0 <= pmix_client_globals.myserver->sd) {
+        CLOSE_THE_SOCKET(pmix_client_globals.myserver->sd);
+    }
+    if (NULL != pmix_client_globals.myserver) {
+        PMIX_RELEASE(pmix_client_globals.myserver);
+    }
+
+
+    pmix_rte_finalize();
+    PMIX_RELEASE_THREAD(&pmix_global_lock);
+
+    return PMIX_SUCCESS;
+}
+
+PMIX_EXPORT pmix_status_t PMIx_Abort(int flag, const char msg[],
+                                     pmix_proc_t procs[], size_t nprocs)
+{
+    pmix_buffer_t *bfr;
+    pmix_cmd_t cmd = PMIX_ABORT_CMD;
+    pmix_status_t rc;
+    pmix_lock_t reglock;
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "pmix:client abort called");
+
+    PMIX_ACQUIRE_THREAD(&pmix_global_lock);
+    if (pmix_globals.init_cntr <= 0) {
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return PMIX_ERR_INIT;
+    }
+
+    /* if we aren't connected, don't attempt to send */
+    if (!pmix_globals.connected) {
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return PMIX_ERR_UNREACH;
+    }
+    PMIX_RELEASE_THREAD(&pmix_global_lock);
+
+    /* create a buffer to hold the message */
+    bfr = PMIX_NEW(pmix_buffer_t);
+    /* pack the cmd */
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(bfr, &cmd, 1, PMIX_CMD))) {
+        PMIX_ERROR_LOG(rc);
+        PMIX_RELEASE(bfr);
+        return rc;
+    }
+    /* pack the status flag */
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(bfr, &flag, 1, PMIX_STATUS))) {
+        PMIX_ERROR_LOG(rc);
+        PMIX_RELEASE(bfr);
+        return rc;
+    }
+    /* pack the string message - a NULL is okay */
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(bfr, &msg, 1, PMIX_STRING))) {
+        PMIX_ERROR_LOG(rc);
+        PMIX_RELEASE(bfr);
+        return rc;
+    }
+    /* pack the number of procs */
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(bfr, &nprocs, 1, PMIX_SIZE))) {
+        PMIX_ERROR_LOG(rc);
+        PMIX_RELEASE(bfr);
+        return rc;
+    }
+    /* pack any provided procs */
+    if (0 < nprocs) {
+        if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(bfr, procs, 1, PMIX_PROC))) {
+            PMIX_ERROR_LOG(rc);
+            PMIX_RELEASE(bfr);
+            return rc;
+        }
+    }
+
+    /* send to the server */
+    PMIX_CONSTRUCT_LOCK(&reglock);
+    if (PMIX_SUCCESS != (rc = pmix_ptl.send_recv(pmix_client_globals.myserver, bfr,
+                                                 wait_cbfunc, (void*)&reglock))){
+        return rc;
+    }
+
+    /* wait for the release */
+     PMIX_WAIT_THREAD(&reglock);
+     PMIX_DESTRUCT_LOCK(&reglock);
+     return PMIX_SUCCESS;
+ }
+
+static void _putfn(int sd, short args, void *cbdata)
+{
+    pmix_cb_t *cb = (pmix_cb_t*)cbdata;
+    pmix_status_t rc;
+    pmix_kval_t *kv = NULL;
+    pmix_nspace_t *ns;
+    uint8_t *tmp;
+    size_t len;
+
+    /* need to acquire the cb object from its originating thread */
+    PMIX_ACQUIRE_OBJECT(cb);
+
+    /* no need to push info that starts with "pmix" as that is
+     * info we would have been provided at startup */
+    if (0 == strncmp(cb->key, "pmix", 4)) {
+        rc = PMIX_SUCCESS;
+        goto done;
+    }
+
+    /* setup to xfer the data */
+    kv = PMIX_NEW(pmix_kval_t);
+    kv->key = strdup(cb->key);  // need to copy as the input belongs to the user
+    kv->value = (pmix_value_t*)malloc(sizeof(pmix_value_t));
+    if (PMIX_STRING_SIZE_CHECK(cb->value)) {
+        /* compress large strings */
+        if (pmix_util_compress_string(cb->value->data.string, &tmp, &len)) {
+            if (NULL == tmp) {
+                PMIX_ERROR_LOG(PMIX_ERR_NOMEM);
+                rc = PMIX_ERR_NOMEM;
+                PMIX_ERROR_LOG(rc);
+                goto done;
+            }
+            kv->value->type = PMIX_COMPRESSED_STRING;
+            kv->value->data.bo.bytes = (char*)tmp;
+            kv->value->data.bo.size = len;
+            rc = PMIX_SUCCESS;
+        } else {
+            rc = pmix_value_xfer(kv->value, cb->value);
+        }
+    } else {
+        rc = pmix_value_xfer(kv->value, cb->value);
+    }
+    if (PMIX_SUCCESS != rc) {
+        PMIX_ERROR_LOG(rc);
+        goto done;
+    }
+    /* put it in our own modex hash table in case something
+     * internal to us wants it - our nsrecord is always
+     * first on the list */
+     if (NULL == (ns = (pmix_nspace_t*)pmix_list_get_first(&pmix_globals.nspaces))) {
+        /* shouldn't be possible */
+        goto done;
+    }
+
+    if (PMIX_SUCCESS != (rc = pmix_hash_store(&ns->modex, pmix_globals.myid.rank, kv))) {
+        PMIX_ERROR_LOG(rc);
+    }
+
+    /* pack the cache that matches the scope - global scope needs
+     * to go into both local and remote caches */
+    if (PMIX_LOCAL == cb->scope || PMIX_GLOBAL == cb->scope) {
+        if (NULL == pmix_globals.cache_local) {
+            pmix_globals.cache_local = PMIX_NEW(pmix_buffer_t);
+        }
+        pmix_output_verbose(2, pmix_globals.debug_output,
+                            "pmix: put %s data for key %s in local cache",
+                            cb->key, (PMIX_GLOBAL == cb->scope) ? "global" : "local");
+        if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(pmix_globals.cache_local, kv, 1, PMIX_KVAL))) {
+            PMIX_ERROR_LOG(rc);
+        }
+    }
+
+    if (PMIX_REMOTE == cb->scope || PMIX_GLOBAL == cb->scope) {
+        if (NULL == pmix_globals.cache_remote) {
+            pmix_globals.cache_remote = PMIX_NEW(pmix_buffer_t);
+        }
+        pmix_output_verbose(2, pmix_globals.debug_output,
+                            "pmix: put %s data for key %s in remote cache",
+                            cb->key, (PMIX_GLOBAL == cb->scope) ? "global" : "remote");
+        if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(pmix_globals.cache_remote, kv, 1, PMIX_KVAL))) {
+            PMIX_ERROR_LOG(rc);
+        }
+    }
+
+  done:
+    if (NULL != kv) {
+        PMIX_RELEASE(kv);  // maintain accounting
+    }
+    cb->pstatus = rc;
+    /* post the data so the receiving thread can acquire it */
+    PMIX_POST_OBJECT(cb);
+    PMIX_WAKEUP_THREAD(&cb->lock);
+}
+
+PMIX_EXPORT pmix_status_t PMIx_Put(pmix_scope_t scope, const char key[], pmix_value_t *val)
+{
+    pmix_cb_t *cb;
+    pmix_status_t rc;
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "pmix: executing put for key %s type %d",
+                        key, val->type);
+
+    PMIX_ACQUIRE_THREAD(&pmix_global_lock);
+    if (pmix_globals.init_cntr <= 0) {
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return PMIX_ERR_INIT;
+    }
+    PMIX_RELEASE_THREAD(&pmix_global_lock);
+
+    /* create a callback object */
+    cb = PMIX_NEW(pmix_cb_t);
+    cb->scope = scope;
+    cb->key = (char*)key;
+    cb->value = val;
+
+    /* pass this into the event library for thread protection */
+    PMIX_THREADSHIFT(cb, _putfn);
+
+    /* wait for the result */
+    PMIX_WAIT_THREAD(&cb->lock);
+    rc = cb->pstatus;
+    PMIX_RELEASE(cb);
+
+    return rc;
+}
+
+static void _commitfn(int sd, short args, void *cbdata)
+{
+    pmix_cb_t *cb = (pmix_cb_t*)cbdata;
+    pmix_status_t rc;
+    pmix_scope_t scope;
+    pmix_buffer_t *msgout;
+    pmix_cmd_t cmd=PMIX_COMMIT_CMD;
+
+    /* need to acquire the cb object from its originating thread */
+    PMIX_ACQUIRE_OBJECT(cb);
+
+    msgout = PMIX_NEW(pmix_buffer_t);
+    /* pack the cmd */
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msgout, &cmd, 1, PMIX_CMD))) {
+        PMIX_ERROR_LOG(rc);
+        PMIX_RELEASE(msgout);
+        goto done;
+    }
+
+    /* if we haven't already done it, ensure we have committed our values */
+    if (NULL != pmix_globals.cache_local) {
+        scope = PMIX_LOCAL;
+        if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msgout, &scope, 1, PMIX_SCOPE))) {
+            PMIX_ERROR_LOG(rc);
+            PMIX_RELEASE(msgout);
+            goto done;
+        }
+        if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msgout, &pmix_globals.cache_local, 1, PMIX_BUFFER))) {
+            PMIX_ERROR_LOG(rc);
+            PMIX_RELEASE(msgout);
+            goto done;
+        }
+        PMIX_RELEASE(pmix_globals.cache_local);
+    }
+    if (NULL != pmix_globals.cache_remote) {
+        scope = PMIX_REMOTE;
+        if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msgout, &scope, 1, PMIX_SCOPE))) {
+            PMIX_ERROR_LOG(rc);
+            PMIX_RELEASE(msgout);
+            goto done;
+        }
+        if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msgout, &pmix_globals.cache_remote, 1, PMIX_BUFFER))) {
+            PMIX_ERROR_LOG(rc);
+            PMIX_RELEASE(msgout);
+            goto done;
+        }
+        PMIX_RELEASE(pmix_globals.cache_remote);
+    }
+
+    /* always send, even if we have nothing to contribute, so the server knows
+     * that we contributed whatever we had */
+    if (PMIX_SUCCESS == (rc = pmix_ptl.send_recv(pmix_client_globals.myserver, msgout,
+                                                 wait_cbfunc, (void*)&cb->lock))){
+        cb->pstatus = PMIX_SUCCESS;
+        return;
+    }
+
+  done:
+    cb->pstatus = rc;
+    /* post the data so the receiving thread can acquire it */
+    PMIX_POST_OBJECT(cb);
+    PMIX_WAKEUP_THREAD(&cb->lock);
+ }
+
+ PMIX_EXPORT pmix_status_t PMIx_Commit(void)
+ {
+    pmix_cb_t *cb;
+    pmix_status_t rc;
+
+    PMIX_ACQUIRE_THREAD(&pmix_global_lock);
+    if (pmix_globals.init_cntr <= 0) {
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return PMIX_ERR_INIT;
+    }
+
+    /* if we are a server, or we aren't connected, don't attempt to send */
+    if (PMIX_PROC_SERVER == pmix_globals.proc_type) {
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return PMIX_SUCCESS;  // not an error
+    }
+    if (!pmix_globals.connected) {
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return PMIX_ERR_UNREACH;
+    }
+    PMIX_RELEASE_THREAD(&pmix_global_lock);
+
+    /* create a callback object */
+    cb = PMIX_NEW(pmix_cb_t);
+    /* pass this into the event library for thread protection */
+    PMIX_THREADSHIFT(cb, _commitfn);
+
+    /* wait for the result */
+    PMIX_WAIT_THREAD(&cb->lock);
+    rc = cb->pstatus;
+    PMIX_RELEASE(cb);
+
+    return rc;
+}
+
+static void _peersfn(int sd, short args, void *cbdata)
+{
+    pmix_cb_t *cb = (pmix_cb_t*)cbdata;
+    pmix_status_t rc;
+    char **nsprocs=NULL, **nsps=NULL, **tmp;
+#if !(defined(PMIX_ENABLE_DSTORE) && (PMIX_ENABLE_DSTORE == 1))
+    pmix_nspace_t *nsptr;
+    pmix_nrec_t *nptr;
+#endif
+    size_t i;
+
+    /* need to acquire the cb object from its originating thread */
+    PMIX_ACQUIRE_OBJECT(cb);
+
+    /* cycle across our known nspaces */
+    tmp = NULL;
+#if defined(PMIX_ENABLE_DSTORE) && (PMIX_ENABLE_DSTORE == 1)
+    if (PMIX_SUCCESS == (rc = pmix_dstore_fetch(cb->nspace, PMIX_RANK_WILDCARD,
+                      cb->key, &cb->value))) {
+
+        tmp = pmix_argv_split(cb->value->data.string, ',');
+        for (i=0; NULL != tmp[i]; i++) {
+            pmix_argv_append_nosize(&nsps, cb->nspace);
+            pmix_argv_append_nosize(&nsprocs, tmp[i]);
+        }
+        pmix_argv_free(tmp);
+        tmp = NULL;
+    }
+#else
+    PMIX_LIST_FOREACH(nsptr, &pmix_globals.nspaces, pmix_nspace_t) {
+        if (0 == strncmp(nsptr->nspace, cb->nspace, PMIX_MAX_NSLEN)) {
+            /* cycle across the nodes in this nspace */
+            PMIX_LIST_FOREACH(nptr, &nsptr->nodes, pmix_nrec_t) {
+                if (0 == strcmp(cb->key, nptr->name)) {
+                    /* add the contribution from this node */
+                    tmp = pmix_argv_split(nptr->procs, ',');
+                    for (i=0; NULL != tmp[i]; i++) {
+                        pmix_argv_append_nosize(&nsps, nsptr->nspace);
+                        pmix_argv_append_nosize(&nsprocs, tmp[i]);
+                    }
+                    pmix_argv_free(tmp);
+                    tmp = NULL;
+                }
+            }
+        }
+    }
+#endif
+    if (0 == (i = pmix_argv_count(nsps))) {
+        /* we don't know this nspace */
+        rc = PMIX_ERR_NOT_FOUND;
+        goto done;
+    }
+
+    /* create the required storage */
+    PMIX_PROC_CREATE(cb->procs, i);
+    cb->nvals = pmix_argv_count(nsps);
+
+    /* transfer the data */
+    for (i=0; NULL != nsps[i]; i++) {
+        (void)strncpy(cb->procs[i].nspace, nsps[i], PMIX_MAX_NSLEN);
+        cb->procs[i].rank = strtol(nsprocs[i], NULL, 10);
+    }
+    pmix_argv_free(nsps);
+    pmix_argv_free(nsprocs);
+    rc = PMIX_SUCCESS;
+
+    done:
+    cb->pstatus = rc;
+    /* post the data so the receiving thread can acquire it */
+    PMIX_POST_OBJECT(cb);
+    PMIX_WAKEUP_THREAD(&cb->lock);
+}
+
+PMIX_EXPORT pmix_status_t PMIx_Resolve_peers(const char *nodename,
+                                             const char *nspace,
+                                             pmix_proc_t **procs, size_t *nprocs)
+{
+    pmix_cb_t *cb;
+    pmix_status_t rc;
+
+    PMIX_ACQUIRE_THREAD(&pmix_global_lock);
+    if (pmix_globals.init_cntr <= 0) {
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return PMIX_ERR_INIT;
+    }
+    PMIX_RELEASE_THREAD(&pmix_global_lock);
+
+    /* create a callback object */
+    cb = PMIX_NEW(pmix_cb_t);
+    cb->key = (char*)nodename;
+    if (NULL != nspace) {
+        (void)strncpy(cb->nspace, nspace, PMIX_MAX_NSLEN);
+    }
+
+    /* pass this into the event library for thread protection */
+    PMIX_THREADSHIFT(cb, _peersfn);
+
+    /* wait for the result */
+    PMIX_WAIT_THREAD(&cb->lock);
+    rc = cb->pstatus;
+    /* transfer the result */
+    *procs = cb->procs;
+    *nprocs = cb->nvals;
+
+    /* cleanup */
+    PMIX_RELEASE(cb);
+
+    return rc;
+}
+
+static void _nodesfn(int sd, short args, void *cbdata)
+{
+    pmix_cb_t *cb = (pmix_cb_t*)cbdata;
+    pmix_status_t rc;
+    char **tmp;
+    pmix_nspace_t *nsptr;
+    pmix_nrec_t *nptr;
+
+    /* need to acquire the cb object from its originating thread */
+    PMIX_ACQUIRE_OBJECT(cb);
+
+    /* cycle across our known nspaces */
+    tmp = NULL;
+    PMIX_LIST_FOREACH(nsptr, &pmix_globals.nspaces, pmix_nspace_t) {
+        if (0 == strncmp(nsptr->nspace, cb->nspace, PMIX_MAX_NSLEN)) {
+            /* cycle across the nodes in this nspace */
+            PMIX_LIST_FOREACH(nptr, &nsptr->nodes, pmix_nrec_t) {
+                pmix_argv_append_unique_nosize(&tmp, nptr->name, false);
+            }
+        }
+    }
+    if (NULL == tmp) {
+        rc = PMIX_ERR_NOT_FOUND;
+    } else {
+        cb->key = pmix_argv_join(tmp, ',');
+        pmix_argv_free(tmp);
+        rc = PMIX_SUCCESS;
+    }
+
+    cb->pstatus = rc;
+    /* post the data so the receiving thread can acquire it */
+    PMIX_POST_OBJECT(cb);
+    PMIX_WAKEUP_THREAD(&cb->lock);
+}
+
+PMIX_EXPORT pmix_status_t PMIx_Resolve_nodes(const char *nspace, char **nodelist)
+{
+    pmix_cb_t *cb;
+    pmix_status_t rc;
+
+    PMIX_ACQUIRE_THREAD(&pmix_global_lock);
+    if (pmix_globals.init_cntr <= 0) {
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return PMIX_ERR_INIT;
+    }
+    PMIX_RELEASE_THREAD(&pmix_global_lock);
+
+    /* create a callback object */
+    cb = PMIX_NEW(pmix_cb_t);
+    if (NULL != nspace) {
+        (void)strncpy(cb->nspace, nspace, PMIX_MAX_NSLEN);
+    }
+
+    /* pass this into the event library for thread protection */
+    PMIX_THREADSHIFT(cb, _nodesfn);
+
+    /* wait for the result */
+    PMIX_WAIT_THREAD(&cb->lock);
+    rc = cb->pstatus;
+    *nodelist = cb->key;
+    PMIX_RELEASE(cb);
+
+    return rc;
+}
diff --git a/src/client/pmix_client_connect.c b/src/client/pmix_client_connect.c
new file mode 100644
index 0000000..50864d7
--- /dev/null
+++ b/src/client/pmix_client_connect.c
@@ -0,0 +1,368 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2014-2017 Intel, Inc. All rights reserved.
+ * Copyright (c) 2014-2017 Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2014      Artem Y. Polyakov <artpol84 at gmail.com>.
+ *                         All rights reserved.
+ * Copyright (c) 2016      Mellanox Technologies, Inc.
+ *                         All rights reserved.
+ * Copyright (c) 2016      IBM Corporation.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+
+#include <src/include/types.h>
+#include <src/include/pmix_stdint.h>
+
+#include <pmix.h>
+#include <pmix_rename.h>
+
+#include "src/include/pmix_globals.h"
+
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+#include <fcntl.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_SYS_UN_H
+#include <sys/un.h>
+#endif
+#ifdef HAVE_SYS_UIO_H
+#include <sys/uio.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#include PMIX_EVENT_HEADER
+
+#include "src/class/pmix_list.h"
+#include "src/buffer_ops/buffer_ops.h"
+#include "src/util/argv.h"
+#include "src/util/error.h"
+#include "src/util/output.h"
+#include "src/threads/threads.h"
+
+#include "src/mca/ptl/ptl.h"
+
+#include "pmix_client_ops.h"
+#include "src/include/pmix_jobdata.h"
+
+/* callback for wait completion */
+static void wait_cbfunc(struct pmix_peer_t *pr,
+                        pmix_ptl_hdr_t *hdr,
+                        pmix_buffer_t *buf, void *cbdata);
+static void op_cbfunc(pmix_status_t status, void *cbdata);
+
+PMIX_EXPORT pmix_status_t PMIx_Connect(const pmix_proc_t procs[], size_t nprocs,
+                             const pmix_info_t info[], size_t ninfo)
+{
+    pmix_status_t rc;
+    pmix_cb_t *cb;
+
+    PMIX_ACQUIRE_THREAD(&pmix_global_lock);
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "pmix: connect called");
+
+    if (pmix_globals.init_cntr <= 0) {
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return PMIX_ERR_INIT;
+    }
+
+    /* if we aren't connected, don't attempt to send */
+    if (!pmix_globals.connected) {
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return PMIX_ERR_UNREACH;
+    }
+    PMIX_RELEASE_THREAD(&pmix_global_lock);
+
+    /* create a callback object as we need to pass it to the
+     * recv routine so we know which callback to use when
+     * the return message is recvd */
+    cb = PMIX_NEW(pmix_cb_t);
+
+    /* push the message into our event base to send to the server */
+    if (PMIX_SUCCESS != (rc = PMIx_Connect_nb(procs, nprocs, info, ninfo, op_cbfunc, cb))) {
+        PMIX_RELEASE(cb);
+        return rc;
+    }
+
+    /* wait for the connect to complete */
+    PMIX_WAIT_THREAD(&cb->lock);
+    rc = cb->status;
+    PMIX_RELEASE(cb);
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "pmix: connect completed");
+
+    return rc;
+}
+
+PMIX_EXPORT pmix_status_t PMIx_Connect_nb(const pmix_proc_t procs[], size_t nprocs,
+                                          const pmix_info_t info[], size_t ninfo,
+                                          pmix_op_cbfunc_t cbfunc, void *cbdata)
+{
+    pmix_buffer_t *msg;
+    pmix_cmd_t cmd = PMIX_CONNECTNB_CMD;
+    pmix_status_t rc;
+    pmix_cb_t *cb;
+
+    PMIX_ACQUIRE_THREAD(&pmix_global_lock);
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "pmix: connect called");
+
+    if (pmix_globals.init_cntr <= 0) {
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return PMIX_ERR_INIT;
+    }
+
+    /* if we aren't connected, don't attempt to send */
+    if (!pmix_globals.connected) {
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return PMIX_ERR_UNREACH;
+    }
+    PMIX_RELEASE_THREAD(&pmix_global_lock);
+
+    /* check for bozo input */
+    if (NULL == procs || 0 >= nprocs) {
+        return PMIX_ERR_BAD_PARAM;
+    }
+
+    msg = PMIX_NEW(pmix_buffer_t);
+    /* pack the cmd */
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msg, &cmd, 1, PMIX_CMD))) {
+        PMIX_ERROR_LOG(rc);
+        return rc;
+    }
+
+    /* pack the number of procs */
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msg, &nprocs, 1, PMIX_SIZE))) {
+        PMIX_ERROR_LOG(rc);
+        return rc;
+    }
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msg, procs, nprocs, PMIX_PROC))) {
+        PMIX_ERROR_LOG(rc);
+        return rc;
+    }
+
+    /* pack the info structs */
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msg, &ninfo, 1, PMIX_SIZE))) {
+        PMIX_ERROR_LOG(rc);
+        PMIX_RELEASE(msg);
+        return rc;
+    }
+    if (0 < ninfo) {
+        if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msg, info, ninfo, PMIX_INFO))) {
+            PMIX_ERROR_LOG(rc);
+            PMIX_RELEASE(msg);
+            return rc;
+        }
+    }
+
+    /* create a callback object as we need to pass it to the
+     * recv routine so we know which callback to use when
+     * the return message is recvd */
+    cb = PMIX_NEW(pmix_cb_t);
+    cb->op_cbfunc = cbfunc;
+    cb->cbdata = cbdata;
+
+    /* push the message into our event base to send to the server */
+    if (PMIX_SUCCESS != (rc = pmix_ptl.send_recv(pmix_client_globals.myserver, msg, wait_cbfunc, (void*)cb))){
+        PMIX_RELEASE(msg);
+        PMIX_RELEASE(cb);
+    }
+
+    return rc;
+}
+
+PMIX_EXPORT pmix_status_t PMIx_Disconnect(const pmix_proc_t procs[], size_t nprocs,
+                                          const pmix_info_t info[], size_t ninfo)
+{
+    pmix_status_t rc;
+    pmix_cb_t *cb;
+
+    PMIX_ACQUIRE_THREAD(&pmix_global_lock);
+    if (pmix_globals.init_cntr <= 0) {
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return PMIX_ERR_INIT;
+    }
+
+    /* if we aren't connected, don't attempt to send */
+    if (!pmix_globals.connected) {
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return PMIX_ERR_UNREACH;
+    }
+    PMIX_RELEASE_THREAD(&pmix_global_lock);
+
+    /* create a callback object as we need to pass it to the
+     * recv routine so we know which callback to use when
+     * the return message is recvd */
+    cb = PMIX_NEW(pmix_cb_t);
+
+    if (PMIX_SUCCESS != (rc = PMIx_Disconnect_nb(procs, nprocs, info, ninfo, op_cbfunc, cb))) {
+        PMIX_RELEASE(cb);
+        return rc;
+    }
+
+    /* wait for the connect to complete */
+    PMIX_WAIT_THREAD(&cb->lock);
+    rc = cb->status;
+    PMIX_RELEASE(cb);
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "pmix: disconnect completed");
+
+    return rc;
+}
+
+PMIX_EXPORT pmix_status_t PMIx_Disconnect_nb(const pmix_proc_t procs[], size_t nprocs,
+                                             const pmix_info_t info[], size_t ninfo,
+                                             pmix_op_cbfunc_t cbfunc, void *cbdata)
+{
+    pmix_buffer_t *msg;
+    pmix_cmd_t cmd = PMIX_DISCONNECTNB_CMD;
+    pmix_status_t rc;
+    pmix_cb_t *cb;
+
+    PMIX_ACQUIRE_THREAD(&pmix_global_lock);
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "pmix: disconnect called");
+
+    if (pmix_globals.init_cntr <= 0) {
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return PMIX_ERR_INIT;
+    }
+
+    /* if we aren't connected, don't attempt to send */
+    if (!pmix_globals.connected) {
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return PMIX_ERR_UNREACH;
+    }
+    PMIX_RELEASE_THREAD(&pmix_global_lock);
+
+    /* check for bozo input */
+    if (NULL == procs || 0 >= nprocs) {
+        return PMIX_ERR_BAD_PARAM;
+    }
+
+    msg = PMIX_NEW(pmix_buffer_t);
+    /* pack the cmd */
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msg, &cmd, 1, PMIX_CMD))) {
+        PMIX_ERROR_LOG(rc);
+        return rc;
+    }
+
+    /* pack the number of procs */
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msg, &nprocs, 1, PMIX_SIZE))) {
+        PMIX_ERROR_LOG(rc);
+        return rc;
+    }
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msg, procs, nprocs, PMIX_PROC))) {
+        PMIX_ERROR_LOG(rc);
+        return rc;
+    }
+
+    /* pack the info structs */
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msg, &ninfo, 1, PMIX_SIZE))) {
+        PMIX_ERROR_LOG(rc);
+        PMIX_RELEASE(msg);
+        return rc;
+    }
+    if (0 < ninfo) {
+        if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msg, info, ninfo, PMIX_INFO))) {
+            PMIX_ERROR_LOG(rc);
+            PMIX_RELEASE(msg);
+            return rc;
+        }
+    }
+
+    /* create a callback object as we need to pass it to the
+     * recv routine so we know which callback to use when
+     * the return message is recvd */
+    cb = PMIX_NEW(pmix_cb_t);
+    cb->op_cbfunc = cbfunc;
+    cb->cbdata = cbdata;
+
+    /* push the message into our event base to send to the server */
+    if (PMIX_SUCCESS != (rc = pmix_ptl.send_recv(pmix_client_globals.myserver, msg, wait_cbfunc, (void*)cb))){
+        PMIX_RELEASE(msg);
+        PMIX_RELEASE(cb);
+    }
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "pmix: disconnect completed");
+
+    return rc;
+}
+
+static void wait_cbfunc(struct pmix_peer_t *pr,
+                        pmix_ptl_hdr_t *hdr,
+                        pmix_buffer_t *buf, void *cbdata)
+{
+    pmix_cb_t *cb = (pmix_cb_t*)cbdata;
+    pmix_status_t rc;
+    pmix_status_t ret;
+    int32_t cnt;
+    char *nspace;
+    pmix_buffer_t *bptr;
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "pmix:client recv callback activated with %d bytes",
+                        (NULL == buf) ? -1 : (int)buf->bytes_used);
+
+    /* unpack the returned status */
+    cnt = 1;
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, &ret, &cnt, PMIX_STATUS))) {
+        PMIX_ERROR_LOG(rc);
+        ret = rc;
+    }
+    /* connect has to also pass back data from all nspace's involved in
+     * the operation, including our own. Each will come as a buffer */
+    cnt = 1;
+    while (PMIX_SUCCESS == (rc = pmix_bfrop.unpack(buf, &bptr, &cnt, PMIX_BUFFER))) {
+        /* unpack the nspace for this blob */
+        cnt = 1;
+        if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(bptr, &nspace, &cnt, PMIX_STRING))) {
+            PMIX_ERROR_LOG(rc);
+            PMIX_RELEASE(bptr);
+            continue;
+        }
+        /* extract and process any proc-related info for this nspace */
+#if !(defined(PMIX_ENABLE_DSTORE) && (PMIX_ENABLE_DSTORE == 1))
+        pmix_job_data_htable_store(nspace, bptr);
+#endif
+        free(nspace);
+        PMIX_RELEASE(bptr);
+    }
+    if (PMIX_ERR_UNPACK_READ_PAST_END_OF_BUFFER != rc) {
+        PMIX_ERROR_LOG(rc);
+        ret = rc;
+    }
+
+    if (NULL != cb->op_cbfunc) {
+        cb->op_cbfunc(ret, cb->cbdata);
+    }
+    PMIX_RELEASE(cb);
+}
+
+static void op_cbfunc(pmix_status_t status, void *cbdata)
+{
+    pmix_cb_t *cb = (pmix_cb_t*)cbdata;
+
+    cb->status = status;
+    PMIX_POST_OBJECT(cb);
+    PMIX_WAKEUP_THREAD(&cb->lock);
+}
diff --git a/src/client/pmix_client_fence.c b/src/client/pmix_client_fence.c
new file mode 100644
index 0000000..acabf34
--- /dev/null
+++ b/src/client/pmix_client_fence.c
@@ -0,0 +1,265 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2014-2017 Intel, Inc. All rights reserved.
+ * Copyright (c) 2014-2015 Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2014      Artem Y. Polyakov <artpol84 at gmail.com>.
+ *                         All rights reserved.
+ * Copyright (c) 2016      Mellanox Technologies, Inc.
+ *                         All rights reserved.
+ * Copyright (c) 2016      IBM Corporation.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+
+#include <src/include/types.h>
+#include <src/include/pmix_stdint.h>
+
+#include <pmix.h>
+#include <pmix_rename.h>
+
+#include "src/include/pmix_globals.h"
+
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+#include <fcntl.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_SYS_UN_H
+#include <sys/un.h>
+#endif
+#ifdef HAVE_SYS_UIO_H
+#include <sys/uio.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#include PMIX_EVENT_HEADER
+
+#include "src/class/pmix_list.h"
+#include "src/buffer_ops/buffer_ops.h"
+#include "src/util/argv.h"
+#include "src/util/error.h"
+#include "src/util/hash.h"
+#include "src/util/output.h"
+#include "src/mca/ptl/ptl.h"
+
+#include "pmix_client_ops.h"
+
+static pmix_status_t unpack_return(pmix_buffer_t *data);
+static pmix_status_t pack_fence(pmix_buffer_t *msg, pmix_cmd_t cmd,
+                                const pmix_proc_t *procs, size_t nprocs,
+                                const pmix_info_t *info, size_t ninfo);
+static void wait_cbfunc(struct pmix_peer_t *pr,
+                        pmix_ptl_hdr_t *hdr,
+                        pmix_buffer_t *buf, void *cbdata);
+static void op_cbfunc(pmix_status_t status, void *cbdata);
+
+PMIX_EXPORT pmix_status_t PMIx_Fence(const pmix_proc_t procs[], size_t nprocs,
+                                     const pmix_info_t info[], size_t ninfo)
+{
+    pmix_cb_t *cb;
+    pmix_status_t rc;
+
+    PMIX_ACQUIRE_THREAD(&pmix_global_lock);
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "pmix: executing fence");
+
+    if (pmix_globals.init_cntr <= 0) {
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return PMIX_ERR_INIT;
+    }
+
+    /* if we aren't connected, don't attempt to send */
+    if (!pmix_globals.connected) {
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return PMIX_ERR_UNREACH;
+    }
+    PMIX_RELEASE_THREAD(&pmix_global_lock);
+
+    /* create a callback object as we need to pass it to the
+     * recv routine so we know which callback to use when
+     * the return message is recvd */
+    cb = PMIX_NEW(pmix_cb_t);
+
+    /* push the message into our event base to send to the server */
+    if (PMIX_SUCCESS != (rc = PMIx_Fence_nb(procs, nprocs, info, ninfo,
+                                            op_cbfunc, cb))) {
+        PMIX_RELEASE(cb);
+        return rc;
+    }
+
+    /* wait for the fence to complete */
+    PMIX_WAIT_THREAD(&cb->lock);
+    rc = cb->status;
+    PMIX_RELEASE(cb);
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "pmix: fence released");
+
+    return rc;
+}
+
+PMIX_EXPORT pmix_status_t PMIx_Fence_nb(const pmix_proc_t procs[], size_t nprocs,
+                                        const pmix_info_t info[], size_t ninfo,
+                                        pmix_op_cbfunc_t cbfunc, void *cbdata)
+{
+    pmix_buffer_t *msg;
+    pmix_cmd_t cmd = PMIX_FENCENB_CMD;
+    pmix_status_t rc;
+    pmix_cb_t *cb;
+    pmix_proc_t rg, *rgs;
+    size_t nrg;
+
+    PMIX_ACQUIRE_THREAD(&pmix_global_lock);
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "pmix: fence_nb called");
+
+    if (pmix_globals.init_cntr <= 0) {
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return PMIX_ERR_INIT;
+    }
+
+    /* if we aren't connected, don't attempt to send */
+    if (!pmix_globals.connected) {
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return PMIX_ERR_UNREACH;
+    }
+    PMIX_RELEASE_THREAD(&pmix_global_lock);
+
+    /* check for bozo input */
+    if (NULL == procs && 0 != nprocs) {
+        return PMIX_ERR_BAD_PARAM;
+    }
+    /* if we are given a NULL proc, then the caller is referencing
+     * all procs within our own nspace */
+    if (NULL == procs) {
+        (void)strncpy(rg.nspace, pmix_globals.myid.nspace, PMIX_MAX_NSLEN);
+        rg.rank = PMIX_RANK_WILDCARD;
+        rgs = &rg;
+        nrg = 1;
+    } else {
+        rgs = (pmix_proc_t*)procs;
+        nrg = nprocs;
+    }
+
+    msg = PMIX_NEW(pmix_buffer_t);
+    if (PMIX_SUCCESS != (rc = pack_fence(msg, cmd, rgs, nrg, info, ninfo))) {
+        PMIX_RELEASE(msg);
+        return rc;
+    }
+
+    /* create a callback object as we need to pass it to the
+     * recv routine so we know which callback to use when
+     * the return message is recvd */
+    cb = PMIX_NEW(pmix_cb_t);
+    cb->op_cbfunc = cbfunc;
+    cb->cbdata = cbdata;
+
+    /* push the message into our event base to send to the server */
+    if (PMIX_SUCCESS != (rc = pmix_ptl.send_recv(pmix_client_globals.myserver, msg, wait_cbfunc, (void*)cb))){
+        PMIX_RELEASE(msg);
+        PMIX_RELEASE(cb);
+    }
+    return rc;
+}
+
+static pmix_status_t unpack_return(pmix_buffer_t *data)
+{
+    pmix_status_t rc;
+    pmix_status_t ret;
+    int32_t cnt;
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "client:unpack fence called");
+
+    /* unpack the status code */
+    cnt = 1;
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(data, &ret, &cnt, PMIX_STATUS))) {
+        PMIX_ERROR_LOG(rc);
+        return rc;
+    }
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "client:unpack fence received status %d", ret);
+    return ret;
+}
+
+static pmix_status_t pack_fence(pmix_buffer_t *msg, pmix_cmd_t cmd,
+                                const pmix_proc_t *procs, size_t nprocs,
+                                const pmix_info_t *info, size_t ninfo)
+{
+    pmix_status_t rc;
+
+    /* pack the cmd */
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msg, &cmd, 1, PMIX_CMD))) {
+        PMIX_ERROR_LOG(rc);
+        return rc;
+    }
+
+    /* pack the number of procs */
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msg, &nprocs, 1, PMIX_SIZE))) {
+        PMIX_ERROR_LOG(rc);
+        return rc;
+    }
+    /* pack any provided procs - must always be at least one (our own) */
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msg, procs, nprocs, PMIX_PROC))) {
+        PMIX_ERROR_LOG(rc);
+        return rc;
+    }
+    /* pack the number of info */
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msg, &ninfo, 1, PMIX_SIZE))) {
+        PMIX_ERROR_LOG(rc);
+        return rc;
+    }
+    /* pack any provided info - may be NULL */
+    if (NULL != info && 0 < ninfo) {
+        if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msg, info, ninfo, PMIX_INFO))) {
+            PMIX_ERROR_LOG(rc);
+            return rc;
+        }
+    }
+
+    return PMIX_SUCCESS;
+}
+
+static void wait_cbfunc(struct pmix_peer_t *pr, pmix_ptl_hdr_t *hdr,
+                        pmix_buffer_t *buf, void *cbdata)
+{
+    pmix_cb_t *cb = (pmix_cb_t*)cbdata;
+    pmix_status_t rc;
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "pmix: fence_nb callback recvd");
+
+    if (NULL == cb) {
+        PMIX_ERROR_LOG(PMIX_ERR_BAD_PARAM);
+        return;
+    }
+    rc = unpack_return(buf);
+
+    /* if a callback was provided, execute it */
+    if (NULL != cb->op_cbfunc) {
+        cb->op_cbfunc(rc, cb->cbdata);
+    }
+    PMIX_RELEASE(cb);
+}
+
+static void op_cbfunc(pmix_status_t status, void *cbdata)
+{
+    pmix_cb_t *cb = (pmix_cb_t*)cbdata;
+
+    cb->status = status;
+    PMIX_WAKEUP_THREAD(&cb->lock);
+}
diff --git a/src/client/pmix_client_get.c b/src/client/pmix_client_get.c
new file mode 100644
index 0000000..928eb72
--- /dev/null
+++ b/src/client/pmix_client_get.c
@@ -0,0 +1,809 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2014-2017 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2014-2016 Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2014      Artem Y. Polyakov <artpol84 at gmail.com>.
+ *                         All rights reserved.
+ * Copyright (c) 2016      Mellanox Technologies, Inc.
+ *                         All rights reserved.
+ * Copyright (c) 2016      IBM Corporation.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+
+#include <src/include/types.h>
+#include <src/include/pmix_stdint.h>
+
+#include <pmix.h>
+#include <pmix_rename.h>
+
+#include "src/include/pmix_globals.h"
+#include "src/include/pmix_jobdata.h"
+
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+#include <fcntl.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_SYS_UN_H
+#include <sys/un.h>
+#endif
+#ifdef HAVE_SYS_UIO_H
+#include <sys/uio.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
+#if PMIX_HAVE_ZLIB
+#include <zlib.h>
+#endif
+#include PMIX_EVENT_HEADER
+
+#include "src/class/pmix_list.h"
+#include "src/buffer_ops/buffer_ops.h"
+#include "src/threads/threads.h"
+#include "src/util/argv.h"
+#include "src/util/compress.h"
+#include "src/util/error.h"
+#include "src/util/hash.h"
+#include "src/util/output.h"
+#include "src/mca/ptl/ptl.h"
+#if defined(PMIX_ENABLE_DSTORE) && (PMIX_ENABLE_DSTORE == 1)
+#include "src/dstore/pmix_dstore.h"
+#endif /* PMIX_ENABLE_DSTORE */
+
+#include "pmix_client_ops.h"
+#include "src/include/pmix_jobdata.h"
+
+static pmix_buffer_t* _pack_get(char *nspace, pmix_rank_t rank,
+                               const pmix_info_t info[], size_t ninfo,
+                               pmix_cmd_t cmd);
+
+static void _getnbfn(int sd, short args, void *cbdata);
+
+static void _getnb_cbfunc(struct pmix_peer_t *pr,
+                          pmix_ptl_hdr_t *hdr,
+                          pmix_buffer_t *buf, void *cbdata);
+
+static void _value_cbfunc(pmix_status_t status, pmix_value_t *kv, void *cbdata);
+
+
+PMIX_EXPORT pmix_status_t PMIx_Get(const pmix_proc_t *proc, const char key[],
+                                   const pmix_info_t info[], size_t ninfo,
+                                   pmix_value_t **val)
+{
+    pmix_cb_t *cb;
+    pmix_status_t rc;
+
+    PMIX_ACQUIRE_THREAD(&pmix_global_lock);
+
+    if (pmix_globals.init_cntr <= 0) {
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return PMIX_ERR_INIT;
+    }
+    PMIX_RELEASE_THREAD(&pmix_global_lock);
+
+    /* create a callback object as we need to pass it to the
+     * recv routine so we know which callback to use when
+     * the return message is recvd */
+    cb = PMIX_NEW(pmix_cb_t);
+    if (PMIX_SUCCESS != (rc = PMIx_Get_nb(proc, key, info, ninfo, _value_cbfunc, cb))) {
+        PMIX_RELEASE(cb);
+        return rc;
+    }
+
+    /* wait for the data to return */
+    PMIX_WAIT_THREAD(&cb->lock);
+    rc = cb->status;
+    *val = cb->value;
+    PMIX_RELEASE(cb);
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "pmix:client get completed %d", rc);
+
+    return rc;
+}
+
+PMIX_EXPORT pmix_status_t PMIx_Get_nb(const pmix_proc_t *proc, const char *key,
+                                      const pmix_info_t info[], size_t ninfo,
+                                      pmix_value_cbfunc_t cbfunc, void *cbdata)
+{
+    pmix_cb_t *cb;
+    int rank;
+    char *nm;
+
+    PMIX_ACQUIRE_THREAD(&pmix_global_lock);
+
+    if (pmix_globals.init_cntr <= 0) {
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return PMIX_ERR_INIT;
+    }
+    PMIX_RELEASE_THREAD(&pmix_global_lock);
+
+    /* if the proc is NULL, then the caller is assuming
+     * that the key is universally unique within the caller's
+     * own nspace. This most likely indicates that the code
+     * was originally written for a legacy version of PMI.
+     *
+     * If the key is NULL, then the caller wants all
+     * data from the specified proc. Again, this likely
+     * indicates use of a legacy version of PMI.
+     *
+     * Either case is supported. However, we don't currently
+     * support the case where -both- values are NULL */
+    if (NULL == proc && NULL == key) {
+        return PMIX_ERR_BAD_PARAM;
+    }
+
+    /* if the key is NULL, the rank cannot be WILDCARD as
+     * we cannot return all info from every rank */
+    if (NULL != proc && PMIX_RANK_WILDCARD == proc->rank && NULL == key) {
+        return PMIX_ERR_BAD_PARAM;
+    }
+
+    /* if the given proc param is NULL, or the nspace is
+     * empty, then the caller is referencing our own nspace */
+    if (NULL == proc || 0 == strlen(proc->nspace)) {
+        nm = pmix_globals.myid.nspace;
+    } else {
+        nm = (char*)proc->nspace;
+    }
+
+    /* if the proc param is NULL, then we are seeking a key that
+     * must be globally unique, so communicate this to the hash
+     * functions with the UNDEF rank */
+    if (NULL == proc) {
+        rank = PMIX_RANK_UNDEF;
+    } else {
+        rank = proc->rank;
+    }
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "pmix: get_nb value for proc %s:%u key %s",
+                        nm, rank, (NULL == key) ? "NULL" : key);
+
+    /* thread-shift so we can check global objects */
+    cb = PMIX_NEW(pmix_cb_t);
+    (void)strncpy(cb->nspace, nm, PMIX_MAX_NSLEN);
+    cb->rank = rank;
+    cb->key = (char*)key;
+    cb->info = (pmix_info_t*)info;
+    cb->ninfo = ninfo;
+    cb->value_cbfunc = cbfunc;
+    cb->cbdata = cbdata;
+    PMIX_THREADSHIFT(cb, _getnbfn);
+
+    return PMIX_SUCCESS;
+}
+
+static void _value_cbfunc(pmix_status_t status, pmix_value_t *kv, void *cbdata)
+{
+    pmix_cb_t *cb = (pmix_cb_t*)cbdata;
+    pmix_status_t rc;
+
+    PMIX_ACQUIRE_OBJECT(cb);
+    cb->status = status;
+    if (PMIX_SUCCESS == status) {
+        if (PMIX_SUCCESS != (rc = pmix_bfrop.copy((void**)&cb->value, kv, PMIX_VALUE))) {
+            PMIX_ERROR_LOG(rc);
+        }
+    }
+    PMIX_POST_OBJECT(cb);
+    PMIX_WAKEUP_THREAD(&cb->lock);
+}
+
+static pmix_buffer_t* _pack_get(char *nspace, pmix_rank_t rank,
+                                const pmix_info_t info[], size_t ninfo,
+                                pmix_cmd_t cmd)
+{
+    pmix_buffer_t *msg;
+    pmix_status_t rc;
+
+    /* nope - see if we can get it */
+    msg = PMIX_NEW(pmix_buffer_t);
+    /* pack the get cmd */
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msg, &cmd, 1, PMIX_CMD))) {
+        PMIX_ERROR_LOG(rc);
+        PMIX_RELEASE(msg);
+        return NULL;
+    }
+    /* pack the request information - we'll get the entire blob
+     * for this proc, so we don't need to pass the key */
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msg, &nspace, 1, PMIX_STRING))) {
+        PMIX_ERROR_LOG(rc);
+        PMIX_RELEASE(msg);
+        return NULL;
+    }
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msg, &rank, 1, PMIX_PROC_RANK))) {
+        PMIX_ERROR_LOG(rc);
+        PMIX_RELEASE(msg);
+        return NULL;
+    }
+    /* pack the number of info structs */
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msg, &ninfo, 1, PMIX_SIZE))) {
+        PMIX_ERROR_LOG(rc);
+        PMIX_RELEASE(msg);
+        return NULL;
+    }
+    if (0 < ninfo) {
+        if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msg, info, ninfo, PMIX_INFO))) {
+            PMIX_ERROR_LOG(rc);
+            PMIX_RELEASE(msg);
+            return NULL;
+        }
+    }
+    return msg;
+}
+
+/* this callback is coming from the ptl recv, and thus
+ * is occurring inside of our progress thread - hence, no
+ * need to thread shift */
+static void _getnb_cbfunc(struct pmix_peer_t *pr,
+                          pmix_ptl_hdr_t *hdr,
+                          pmix_buffer_t *buf, void *cbdata)
+{
+    pmix_cb_t *cb = (pmix_cb_t*)cbdata;
+    pmix_cb_t *cb2;
+    pmix_status_t rc, ret;
+    pmix_value_t *val = NULL;
+    int32_t cnt;
+    pmix_nspace_t *ns, *nptr;
+    pmix_rank_t rank;
+#if (PMIX_ENABLE_DSTORE != 1)
+    pmix_rank_t cur_rank;
+#endif
+    char *tmp;
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "pmix: get_nb callback recvd");
+
+    if (NULL == cb) {
+        /* nothing we can do */
+        PMIX_ERROR_LOG(PMIX_ERR_BAD_PARAM);
+        return;
+    }
+    /* cache the rank */
+    rank = cb->rank;
+
+    /* unpack the status */
+    cnt = 1;
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, &ret, &cnt, PMIX_STATUS))) {
+        PMIX_ERROR_LOG(rc);
+        return;
+    }
+
+    /* look up the nspace object for this proc */
+    nptr = NULL;
+    PMIX_LIST_FOREACH(ns, &pmix_globals.nspaces, pmix_nspace_t) {
+        if (0 == strncmp(cb->nspace, ns->nspace, PMIX_MAX_NSLEN)) {
+            nptr = ns;
+            break;
+        }
+    }
+    if (NULL == nptr) {
+        /* new nspace - setup a record for it */
+        nptr = PMIX_NEW(pmix_nspace_t);
+        (void)strncpy(nptr->nspace, cb->nspace, PMIX_MAX_NSLEN);
+        pmix_list_append(&pmix_globals.nspaces, &nptr->super);
+    }
+
+    if (PMIX_SUCCESS != ret) {
+        goto done;
+    }
+
+#if (defined(PMIX_ENABLE_DSTORE) && (PMIX_ENABLE_DSTORE == 1))
+    if (PMIX_SUCCESS != (rc = pmix_dstore_fetch(nptr->nspace, cb->rank, cb->key, &val))){
+        /* DO NOT error log this status - it is perfectly okay
+         * for a key not to be found */
+        goto done;
+    }
+#else
+    /* we received the entire blob for this process, so
+     * unpack and store it in the modex - this could consist
+     * of buffers from multiple scopes */
+    cur_rank = rank;
+    cnt = 1;
+    while (PMIX_SUCCESS == (rc = pmix_bfrop.unpack(buf, &cur_rank, &cnt, PMIX_PROC_RANK))) {
+        pmix_kval_t *cur_kval;
+        pmix_buffer_t *bptr;
+
+        cnt = 1;
+        if (PMIX_SUCCESS == (rc = pmix_bfrop.unpack(buf, &bptr, &cnt, PMIX_BUFFER))) {
+            /* if the rank is WILDCARD, then this is an nspace blob */
+            if (PMIX_RANK_WILDCARD == cur_rank) {
+                char *nspace;
+                /* unpack the nspace - we don't really need it, but have to
+                 * unpack it to maintain sequence */
+                cnt = 1;
+                if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(bptr, &nspace, &cnt, PMIX_STRING))) {
+                    PMIX_ERROR_LOG(rc);
+                    return;
+                }
+                free(nspace);
+                pmix_job_data_htable_store(cb->nspace, bptr);
+
+                /* Check if the key is in this blob */
+
+                pmix_hash_fetch(&nptr->internal, cb->rank, cb->key, &val);
+
+            } else {
+                cnt = 1;
+                cur_kval = PMIX_NEW(pmix_kval_t);
+                while (PMIX_SUCCESS == (rc = pmix_bfrop.unpack(bptr, cur_kval, &cnt, PMIX_KVAL))) {
+                    pmix_output_verbose(2, pmix_globals.debug_output,
+                                        "pmix: unpacked key %s", cur_kval->key);
+                    if (PMIX_SUCCESS != (rc = pmix_hash_store(&nptr->modex, cur_rank, cur_kval))) {
+                        PMIX_ERROR_LOG(rc);
+                    }
+                    if (NULL != cb->key && 0 == strcmp(cb->key, cur_kval->key)) {
+                        pmix_output_verbose(2, pmix_globals.debug_output,
+                                            "pmix: found requested value");
+                        if (PMIX_SUCCESS != (rc = pmix_bfrop.copy((void**)&val, cur_kval->value, PMIX_VALUE))) {
+                            PMIX_ERROR_LOG(rc);
+                            PMIX_RELEASE(cur_kval);
+                            val = NULL;
+                            goto done;
+                        }
+                    }
+                    PMIX_RELEASE(cur_kval); // maintain acctg - hash_store does a retain
+                    cnt = 1;
+                    cur_kval = PMIX_NEW(pmix_kval_t);
+                }
+                cnt = 1;
+                PMIX_RELEASE(cur_kval);
+            }
+        }
+        PMIX_RELEASE(bptr);  // free's the data region
+        if (PMIX_ERR_UNPACK_READ_PAST_END_OF_BUFFER != rc &&
+            PMIX_SUCCESS != rc) {
+            PMIX_ERROR_LOG(rc);
+            rc = PMIX_ERR_SILENT; // avoid error-logging twice
+            break;
+        }
+    }
+    if (PMIX_ERR_UNPACK_READ_PAST_END_OF_BUFFER != rc &&
+        PMIX_SUCCESS != rc) {
+        PMIX_ERROR_LOG(rc);
+    } else {
+        rc = PMIX_SUCCESS;
+    }
+#endif /* PMIX_ENABLE_DSTORE */
+
+done:
+    /* if a callback was provided, execute it */
+    if (NULL != cb && NULL != cb->value_cbfunc) {
+        if (NULL == val) {
+            rc = PMIX_ERR_NOT_FOUND;
+        } else {
+            /* if this is a compressed string, then uncompress it */
+            if (PMIX_COMPRESSED_STRING == val->type) {
+                pmix_util_uncompress_string(&tmp, (uint8_t*)val->data.bo.bytes, val->data.bo.size);
+                if (NULL == tmp) {
+                    PMIX_ERROR_LOG(PMIX_ERR_NOMEM);
+                    rc = PMIX_ERR_NOMEM;
+                    PMIX_VALUE_RELEASE(val);
+                    val = NULL;
+                } else {
+                    PMIX_VALUE_DESTRUCT(val);
+                    PMIX_VAL_ASSIGN(val, string, tmp);
+                }
+            }
+        }
+        cb->value_cbfunc(rc, val, cb->cbdata);
+    }
+    if (NULL != val) {
+        PMIX_VALUE_RELEASE(val);
+    }
+    /* we obviously processed this one, so remove it from the
+     * list of pending requests */
+    pmix_list_remove_item(&pmix_client_globals.pending_requests, &cb->super);
+    PMIX_RELEASE(cb);
+
+    /* now search any pending requests to see if they can be met */
+    PMIX_LIST_FOREACH_SAFE(cb, cb2, &pmix_client_globals.pending_requests, pmix_cb_t) {
+        if (0 == strncmp(nptr->nspace, cb->nspace, PMIX_MAX_NSLEN) && cb->rank == rank) {
+           /* we have the data - see if we can find the key */
+            val = NULL;
+#if defined(PMIX_ENABLE_DSTORE) && (PMIX_ENABLE_DSTORE == 1)
+            rc = pmix_dstore_fetch(nptr->nspace, rank, cb->key, &val);
+#else
+            rc = pmix_hash_fetch(&nptr->modex, rank, cb->key, &val);
+#endif /* PMIX_ENABLE_DSTORE */
+            cb->value_cbfunc(rc, val, cb->cbdata);
+            if (NULL != val) {
+                PMIX_VALUE_RELEASE(val);
+            }
+            pmix_list_remove_item(&pmix_client_globals.pending_requests, &cb->super);
+            PMIX_RELEASE(cb);
+        }
+    }
+}
+
+static pmix_status_t process_val(pmix_value_t *val,
+                                 size_t *num_vals,
+                                 pmix_pointer_array_t *results)
+{
+    pmix_info_t *info;
+    size_t n, nsize, nvals;
+    pmix_status_t rc;
+
+    if (NULL == val) {
+        /* this is an error */
+        PMIX_ERROR_LOG(PMIX_ERR_BAD_PARAM);
+        return PMIX_ERR_BAD_PARAM;
+    }
+    /* since we didn't provide them with a key, the hash function
+     * must return the results in the pmix_data_array field of the
+     * value */
+    /* must account for the deprecated pmix_info_array_t */
+    if (PMIX_DATA_ARRAY != val->type &&
+        PMIX_INFO_ARRAY != val->type) {
+        /* this is an error */
+        PMIX_ERROR_LOG(PMIX_ERR_BAD_PARAM);
+        return PMIX_ERR_BAD_PARAM;
+    }
+    /* save the results */
+    if (PMIX_DATA_ARRAY == val->type) {
+        info = (pmix_info_t*)val->data.darray->array;
+        nsize = val->data.darray->size;
+    } else {
+        info = (pmix_info_t*)val->data.array->array;
+        nsize = val->data.array->size;
+    }
+    nvals = 0;
+    for (n=0; n < nsize; n++) {
+        if (0 > (rc = pmix_pointer_array_add(results, &info[n]))) {
+            return rc;
+        }
+        ++nvals;
+    }
+    if (PMIX_DATA_ARRAY == val->type) {
+        val->data.darray->array = NULL;  // protect the data
+        val->data.darray->size = 0;
+    } else {
+        val->data.array->array = NULL;
+        val->data.array->size = 0;
+    }
+    /* increment the number of values */
+    (*num_vals) += nvals;
+    return PMIX_SUCCESS;
+}
+
+static void _getnbfn(int fd, short flags, void *cbdata)
+{
+    pmix_cb_t *cb = (pmix_cb_t*)cbdata;
+    pmix_cb_t *cbret;
+    pmix_buffer_t *msg;
+    pmix_value_t *val = NULL;
+    pmix_info_t *info, *iptr;
+    pmix_pointer_array_t results;
+    pmix_status_t rc;
+    pmix_nspace_t *ns, *nptr;
+    size_t n, nvals;
+    char *tmp;
+    bool my_nspace = false, my_rank = false;
+
+    /* cb was passed to us from another thread - acquire it */
+    PMIX_ACQUIRE_OBJECT(cb);
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "pmix: getnbfn value for proc %s:%d key %s",
+                        cb->nspace, cb->rank,
+                        (NULL == cb->key) ? "NULL" : cb->key);
+
+    /* find the nspace object */
+    nptr = NULL;
+    PMIX_LIST_FOREACH(ns, &pmix_globals.nspaces, pmix_nspace_t) {
+        if (0 == strcmp(cb->nspace, ns->nspace)) {
+            nptr = ns;
+            break;
+        }
+    }
+    if (NULL == nptr) {
+        /* we are asking for info about a new nspace - give us
+         * a chance to learn about it from the server. If the
+         * server has never heard of it, the server will return
+         * an error */
+         nptr = PMIX_NEW(pmix_nspace_t);
+         (void)strncpy(nptr->nspace, cb->nspace, PMIX_MAX_NSLEN);
+         pmix_list_append(&pmix_globals.nspaces, &nptr->super);
+         /* there is no point in looking for data in this nspace
+          * object, so let's just go generate the request */
+         goto request;
+    }
+
+    /* The NULL==key scenario only pertains to cases where legacy
+     * PMI methods are being employed. In this case, we have to check
+     * both the job-data  and the modex tables. If we don't yet have
+     * the modex data, then we are going to have to go get it. So let's
+     * check that case first */
+    if (NULL == cb->key) {
+        PMIX_CONSTRUCT(&results, pmix_pointer_array_t);
+        pmix_pointer_array_init(&results, 2, INT_MAX, 1);
+        nvals = 0;
+        /* if the rank is WILDCARD, then they want all the job-level info,
+         * so no need to check the modex */
+        if (PMIX_RANK_WILDCARD != cb->rank) {
+            rc = PMIX_ERR_NOT_FOUND;
+#if defined(PMIX_ENABLE_DSTORE) && (PMIX_ENABLE_DSTORE == 1)
+            /* my own data is in the hash table, so don't bother looking
+             * in the dstore if that is what they want */
+            if (pmix_globals.myid.rank != cb->rank) {
+                if (PMIX_SUCCESS == (rc = pmix_dstore_fetch(nptr->nspace, cb->rank, NULL, &val))) {
+                    pmix_output_verbose(2, pmix_globals.debug_output,
+                                        "pmix_get[%d]: value retrieved from dstore", __LINE__);
+                    if (PMIX_SUCCESS != (rc = process_val(val, &nvals, &results))) {
+                        cb->value_cbfunc(rc, NULL, cb->cbdata);
+                        /* cleanup */
+                        if (NULL != val) {
+                            PMIX_VALUE_RELEASE(val);
+                        }
+                        PMIX_RELEASE(cb);
+                        return;
+                    }
+                }
+            }
+#endif /* PMIX_ENABLE_DSTORE */
+            if (PMIX_SUCCESS != rc) {
+                /* if the user was asking about themselves, or we aren't using the dstore,
+                 * then we need to check the hash table */
+                if (PMIX_SUCCESS == (rc = pmix_hash_fetch(&nptr->modex, cb->rank, NULL, &val))) {
+                    pmix_output_verbose(2, pmix_globals.debug_output,
+                                        "pmix_get[%d]: value retrieved from hash", __LINE__);
+                    if (PMIX_SUCCESS != (rc = process_val(val, &nvals, &results))) {
+                        cb->value_cbfunc(rc, NULL, cb->cbdata);
+                        /* cleanup */
+                        if (NULL != val) {
+                            PMIX_VALUE_RELEASE(val);
+                        }
+                        PMIX_RELEASE(cb);
+                        return;
+                    }
+                    PMIX_VALUE_RELEASE(val);
+                }
+            }
+            if (PMIX_SUCCESS != rc) {
+                /* if we didn't find a modex for this rank, then we need
+                 * to go get it. Thus, the caller wants -all- information for
+                 * the specified rank, not just the job-level info. */
+                 goto request;
+            }
+        }
+        /* now get any data from the job-level info */
+        if (PMIX_SUCCESS == (rc = pmix_hash_fetch(&nptr->internal, PMIX_RANK_WILDCARD, NULL, &val))) {
+            if (PMIX_SUCCESS != (rc = process_val(val, &nvals, &results))) {
+                cb->value_cbfunc(rc, NULL, cb->cbdata);
+                /* cleanup */
+                if (NULL != val) {
+                    PMIX_VALUE_RELEASE(val);
+                }
+                PMIX_RELEASE(cb);
+                return;
+            }
+            PMIX_VALUE_RELEASE(val);
+        }
+        /* now let's package up the results */
+        PMIX_VALUE_CREATE(val, 1);
+        val->type = PMIX_DATA_ARRAY;
+        val->data.darray = (pmix_data_array_t*)malloc(sizeof(pmix_data_array_t));
+        if (NULL == val->data.darray) {
+            PMIX_VALUE_RELEASE(val);
+            cb->value_cbfunc(PMIX_ERR_NOMEM, NULL, cb->cbdata);
+            return;
+        }
+        val->data.darray->type = PMIX_INFO;
+        val->data.darray->size = nvals;
+        PMIX_INFO_CREATE(iptr, nvals);
+        val->data.darray->array = (void*)iptr;
+        for (n=0; n < (size_t)results.size && n < nvals; n++) {
+            if (NULL != (info = (pmix_info_t*)pmix_pointer_array_get_item(&results, n))) {
+                (void)strncpy(iptr[n].key, info->key, PMIX_MAX_KEYLEN);
+                /* if this is a compressed string, then uncompress it */
+                if (PMIX_COMPRESSED_STRING == info->value.type) {
+                    iptr[n].value.type = PMIX_STRING;
+                    pmix_util_uncompress_string(&iptr[n].value.data.string,
+                                                (uint8_t*)info->value.data.bo.bytes,
+                                                info->value.data.bo.size);
+                    if (NULL == iptr[n].value.data.string) {
+                        PMIX_ERROR_LOG(PMIX_ERR_NOMEM);
+                    }
+                } else {
+                    pmix_value_xfer(&iptr[n].value, &info->value);
+                }
+                PMIX_INFO_DESTRUCT(info);
+            }
+        }
+        /* done with results array */
+        PMIX_DESTRUCT(&results);
+        /* return the result to the caller - they are responsible for releasing it */
+        cb->value_cbfunc(PMIX_SUCCESS, val, cb->cbdata);
+        PMIX_RELEASE(cb);
+        return;
+    }
+
+    /* check the internal storage first */
+    rc = pmix_hash_fetch(&nptr->internal, cb->rank, cb->key, &val);
+    if(PMIX_SUCCESS == rc) {
+        goto respond;
+    }
+
+    my_nspace = (0 == strncmp(cb->nspace, pmix_globals.myid.nspace, PMIX_MAX_NSLEN));
+    my_rank = (pmix_globals.myid.rank == cb->rank);
+
+    /* if the key starts from "pmix", then they are looking for data
+     * that was provided at startup */
+    if (0 == strncmp(cb->key, "pmix", 4)) {
+#if defined(PMIX_ENABLE_DSTORE) && (PMIX_ENABLE_DSTORE == 1)
+        /* if this is a dstore - check there */
+        rc = pmix_dstore_fetch(cb->nspace, cb->rank, cb->key, &val);
+#endif
+        if( PMIX_SUCCESS != rc && !my_nspace ){
+            /* we are asking about the job-level info from another
+             * namespace. It seems that we don't have it - go and
+             * ask server
+             */
+            goto request;
+        }
+        /* we supposed to already have all local namespace data */
+        goto respond;
+    }
+
+    /* if we were asked about this rank */
+    if ( my_nspace && my_rank ){
+        /* if we asking the data about this rank - check local hash table.
+         * All the data passed through PMIx_Put settle down there
+         * if there is nothing there - it's nothing else we can do
+         */
+        rc = pmix_hash_fetch(&nptr->modex, pmix_globals.myid.rank, cb->key, &val);
+        if( PMIX_SUCCESS != rc ){
+            rc = PMIX_ERR_NOT_FOUND;
+        }
+        goto respond;
+    }
+
+    /* otherwise, the data must be something they "put" */
+#if defined(PMIX_ENABLE_DSTORE) && (PMIX_ENABLE_DSTORE == 1)
+    rc = PMIX_ERR_PROC_ENTRY_NOT_FOUND;
+    /* if rank is undefined - check local table first */
+    if ( my_nspace && (PMIX_RANK_UNDEF == cb->rank)){
+        /* if we asking about undefined process - check local hash table first
+         * local rank may have submitted this key. */
+        rc = pmix_hash_fetch(&nptr->modex, pmix_globals.myid.rank, cb->key, &val);
+    }
+    /* try to take it from dstore */
+    if( PMIX_ERR_PROC_ENTRY_NOT_FOUND == rc ){
+        /* Two option possible here:
+           - we asking the key from UNDEF process and local proc
+             haven't pushed this data
+           - we askin the key from the particular process which is not us.
+         */
+        rc = pmix_dstore_fetch(nptr->nspace, cb->rank, cb->key, &val);
+    }
+#else
+    rc = pmix_hash_fetch(&nptr->modex, cb->rank, cb->key, &val);
+#endif /* PMIX_ENABLE_DSTORE */
+
+    if ( PMIX_SUCCESS == rc ) {
+        goto respond;
+    } else if ( PMIX_ERR_PROC_ENTRY_NOT_FOUND == rc ){
+        goto request;
+    }else if (PMIX_ERR_NOT_FOUND == rc) {
+        /* we have the modex data from this proc, but didn't find the key
+         * the user requested. It's possible someone pushed something since
+         * we got this data, so let's ask the server for an update. However,
+         * we do have to protect against an infinite loop! */
+        if (cb->checked) {
+            goto respond;
+        }
+        pmix_output_verbose(2, pmix_globals.debug_output,
+                            "Unable to locally satisfy request for key=%s for rank = %d, namespace = %s",
+                            cb->key, cb->rank, cb->nspace);
+        cb->checked = true; // flag that we are going to check this again
+        goto request;
+    } else if (PMIX_ERR_PROC_ENTRY_NOT_FOUND != rc) {
+        /* errors are fatal */
+        goto respond;
+    }
+
+  request:
+    /* if we got here, then we don't have the data for this proc. If we
+     * are a server, or we are a client and not connected, then there is
+     * nothing more we can do */
+    if (PMIX_PROC_IS_SERVER ||
+        (!PMIX_PROC_IS_SERVER && !pmix_globals.connected)) {
+        rc = PMIX_ERR_NOT_FOUND;
+        goto respond;
+    }
+
+    /* we also have to check the user's directives to see if they do not want
+     * us to attempt to retrieve it from the server */
+    for (n=0; n < cb->ninfo; n++) {
+        if ((0 == strcmp(cb->info[n].key, PMIX_OPTIONAL) || (0 == strcmp(cb->info[n].key, PMIX_IMMEDIATE))) &&
+            (PMIX_UNDEF == cb->info[n].value.type || cb->info[n].value.data.flag)) {
+            /* they don't want us to try and retrieve it */
+            pmix_output_verbose(2, pmix_globals.debug_output,
+                                "PMIx_Get key=%s for rank = %d, namespace = %s was not found - request was optional",
+                                cb->key, cb->rank, cb->nspace);
+            rc = PMIX_ERR_NOT_FOUND;
+            val = NULL;
+            goto respond;
+        }
+    }
+
+    /* see if we already have a request in place with the server for data from
+     * this nspace:rank. If we do, then no need to ask again as the
+     * request will return _all_ data from that proc */
+    PMIX_LIST_FOREACH(cbret, &pmix_client_globals.pending_requests, pmix_cb_t) {
+        if (0 == strncmp(cbret->nspace, cb->nspace, PMIX_MAX_NSLEN) &&
+            cbret->rank == cb->rank) {
+            /* we do have a pending request, but we still need to track this
+             * outstanding request so we can satisfy it once the data is returned */
+            pmix_list_append(&pmix_client_globals.pending_requests, &cb->super);
+            return;
+        }
+    }
+
+    /* we don't have a pending request, so let's create one - don't worry
+     * about packing the key as we return everything from that proc */
+    msg = _pack_get(cb->nspace, cb->rank, cb->info, cb->ninfo, PMIX_GETNB_CMD);
+    if (NULL == msg) {
+        rc = PMIX_ERROR;
+        goto respond;
+    }
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "%s:%d REQUESTING DATA FROM SERVER FOR %s:%d KEY %s",
+                        pmix_globals.myid.nspace, pmix_globals.myid.rank,
+                        cb->nspace, cb->rank, cb->key);
+
+    /* track the callback object */
+    pmix_list_append(&pmix_client_globals.pending_requests, &cb->super);
+    /* send to the server */
+    if (PMIX_SUCCESS != (rc = pmix_ptl.send_recv(pmix_client_globals.myserver, msg, _getnb_cbfunc, (void*)cb))){
+        pmix_list_remove_item(&pmix_client_globals.pending_requests, &cb->super);
+        rc = PMIX_ERROR;
+        goto respond;
+    }
+    /* we made a lot of changes to cb, so ensure they get
+     * written out before we return */
+    PMIX_POST_OBJECT(cb);
+    return;
+
+  respond:
+    /* if a callback was provided, execute it */
+    if (NULL != cb->value_cbfunc) {
+        if (NULL != val)  {
+            /* if this is a compressed string, then uncompress it */
+            if (PMIX_COMPRESSED_STRING == val->type) {
+                pmix_util_uncompress_string(&tmp, (uint8_t*)val->data.bo.bytes, val->data.bo.size);
+                if (NULL == tmp) {
+                    PMIX_ERROR_LOG(PMIX_ERR_NOMEM);
+                    rc = PMIX_ERR_NOMEM;
+                    PMIX_VALUE_RELEASE(val);
+                    val = NULL;
+                } else {
+                    PMIX_VALUE_DESTRUCT(val);
+                    PMIX_VAL_ASSIGN(val, string, tmp);
+                }
+            }
+        }
+        cb->value_cbfunc(rc, val, cb->cbdata);
+    }
+    if (NULL != val) {
+        PMIX_VALUE_RELEASE(val);
+    }
+    PMIX_RELEASE(cb);
+    return;
+}
diff --git a/src/client/pmix_client_ops.h b/src/client/pmix_client_ops.h
new file mode 100644
index 0000000..ecf9795
--- /dev/null
+++ b/src/client/pmix_client_ops.h
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2015-2017 Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#ifndef PMIX_CLIENT_OPS_H
+#define PMIX_CLIENT_OPS_H
+
+#include <src/include/pmix_config.h>
+
+
+#include "src/buffer_ops/buffer_ops.h"
+#include "src/class/pmix_hash_table.h"
+#include "src/threads/threads.h"
+
+BEGIN_C_DECLS
+
+typedef struct {
+    pmix_peer_t *myserver;          // messaging support to/from my server
+    pmix_list_t pending_requests;   // list of pmix_cb_t pending data requests
+} pmix_client_globals_t;
+
+PMIX_EXPORT extern pmix_client_globals_t pmix_client_globals;
+
+END_C_DECLS
+
+#endif /* PMIX_CLIENT_OPS_H */
diff --git a/src/client/pmix_client_pub.c b/src/client/pmix_client_pub.c
new file mode 100644
index 0000000..6981c96
--- /dev/null
+++ b/src/client/pmix_client_pub.c
@@ -0,0 +1,596 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2014-2017 Intel, Inc. All rights reserved.
+ * Copyright (c) 2014-2015 Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2014      Artem Y. Polyakov <artpol84 at gmail.com>.
+ *                         All rights reserved.
+ * Copyright (c) 2016      Mellanox Technologies, Inc.
+ *                         All rights reserved.
+ * Copyright (c) 2016      IBM Corporation.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+
+#include <src/include/types.h>
+#include <src/include/pmix_stdint.h>
+
+#include <pmix.h>
+#include <pmix_rename.h>
+
+#include "src/include/pmix_globals.h"
+
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+#include <fcntl.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_SYS_UN_H
+#include <sys/un.h>
+#endif
+#ifdef HAVE_SYS_UIO_H
+#include <sys/uio.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#include PMIX_EVENT_HEADER
+
+#include "src/class/pmix_list.h"
+#include "src/buffer_ops/buffer_ops.h"
+#include "src/threads/threads.h"
+#include "src/util/argv.h"
+#include "src/util/error.h"
+#include "src/util/output.h"
+#include "src/mca/ptl/ptl.h"
+
+#include "pmix_client_ops.h"
+
+static void wait_cbfunc(struct pmix_peer_t *pr,
+                        pmix_ptl_hdr_t *hdr,
+                        pmix_buffer_t *buf, void *cbdata);
+static void op_cbfunc(pmix_status_t status, void *cbdata);
+static void wait_lookup_cbfunc(struct pmix_peer_t *pr,
+                               pmix_ptl_hdr_t *hdr,
+                               pmix_buffer_t *buf, void *cbdata);
+static void lookup_cbfunc(pmix_status_t status, pmix_pdata_t pdata[], size_t ndata,
+                          void *cbdata);
+
+PMIX_EXPORT pmix_status_t PMIx_Publish(const pmix_info_t info[],
+                                       size_t ninfo)
+{
+    pmix_status_t rc;
+    pmix_cb_t *cb;
+
+    PMIX_ACQUIRE_THREAD(&pmix_global_lock);
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "pmix: publish called");
+
+    if (pmix_globals.init_cntr <= 0) {
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return PMIX_ERR_INIT;
+    }
+
+    /* if we aren't connected, don't attempt to send */
+    if (!pmix_globals.connected) {
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return PMIX_ERR_UNREACH;
+    }
+    PMIX_RELEASE_THREAD(&pmix_global_lock);
+
+    /* create a callback object to let us know when it is done */
+    cb = PMIX_NEW(pmix_cb_t);
+
+    if (PMIX_SUCCESS != (rc = PMIx_Publish_nb(info, ninfo, op_cbfunc, cb))) {
+        PMIX_ERROR_LOG(rc);
+        PMIX_RELEASE(cb);
+        return rc;
+    }
+
+    /* wait for the server to ack our request */
+    PMIX_WAIT_THREAD(&cb->lock);
+    rc = (pmix_status_t)cb->status;
+    PMIX_RELEASE(cb);
+
+    return rc;
+}
+
+PMIX_EXPORT pmix_status_t PMIx_Publish_nb(const pmix_info_t info[], size_t ninfo,
+                                          pmix_op_cbfunc_t cbfunc, void *cbdata)
+{
+    pmix_buffer_t *msg;
+    pmix_cmd_t cmd = PMIX_PUBLISHNB_CMD;
+    pmix_status_t rc;
+    pmix_cb_t *cb;
+
+    PMIX_ACQUIRE_THREAD(&pmix_global_lock);
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "pmix: publish called");
+
+    if (pmix_globals.init_cntr <= 0) {
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return PMIX_ERR_INIT;
+    }
+
+    /* if we aren't connected, don't attempt to send */
+    if (!pmix_globals.connected) {
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return PMIX_ERR_UNREACH;
+    }
+    PMIX_RELEASE_THREAD(&pmix_global_lock);
+
+    /* check for bozo cases */
+    if (NULL == info) {
+        /* nothing to publish */
+        PMIX_ERROR_LOG(PMIX_ERR_BAD_PARAM);
+        return PMIX_ERR_BAD_PARAM;
+    }
+
+    /* create the publish cmd */
+    msg = PMIX_NEW(pmix_buffer_t);
+    /* pack the cmd */
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msg, &cmd, 1, PMIX_CMD))) {
+        PMIX_ERROR_LOG(rc);
+        PMIX_RELEASE(msg);
+        return rc;
+    }
+    /* pack our effective userid - will be used to constrain lookup */
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msg, &pmix_globals.uid, 1, PMIX_UINT32))) {
+        PMIX_ERROR_LOG(rc);
+        PMIX_RELEASE(msg);
+        return rc;
+    }
+    /* pass the number of info structs - needed on remote end so
+     * space can be malloc'd for the values */
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msg, &ninfo, 1, PMIX_SIZE))) {
+        PMIX_ERROR_LOG(rc);
+        PMIX_RELEASE(msg);
+        return rc;
+    }
+    /* pack the info structs */
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msg, info, ninfo, PMIX_INFO))) {
+        PMIX_ERROR_LOG(rc);
+        PMIX_RELEASE(msg);
+        return rc;
+    }
+
+    /* create a callback object as we need to pass it to the
+     * recv routine so we know which callback to use when
+     * the return message is recvd */
+    cb = PMIX_NEW(pmix_cb_t);
+    cb->op_cbfunc = cbfunc;
+    cb->cbdata = cbdata;
+
+    /* push the message into our event base to send to the server */
+    if (PMIX_SUCCESS != (rc = pmix_ptl.send_recv(pmix_client_globals.myserver, msg, wait_cbfunc, (void*)cb))){
+        PMIX_RELEASE(msg);
+        PMIX_RELEASE(cb);
+    }
+
+    return rc;
+}
+
+PMIX_EXPORT pmix_status_t PMIx_Lookup(pmix_pdata_t pdata[], size_t ndata,
+                                      const pmix_info_t info[], size_t ninfo)
+{
+    pmix_status_t rc;
+    pmix_cb_t *cb;
+    char **keys = NULL;
+    size_t i;
+
+    PMIX_ACQUIRE_THREAD(&pmix_global_lock);
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "pmix: lookup called");
+
+    if (pmix_globals.init_cntr <= 0) {
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return PMIX_ERR_INIT;
+    }
+
+    /* if we aren't connected, don't attempt to send */
+    if (!pmix_globals.connected) {
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return PMIX_ERR_UNREACH;
+    }
+    PMIX_RELEASE_THREAD(&pmix_global_lock);
+
+    /* bozo protection */
+    if (NULL == pdata) {
+        return PMIX_ERR_BAD_PARAM;
+    }
+
+    /* transfer the pdata keys to the keys argv array */
+    for (i=0; i < ndata; i++) {
+        if ('\0' != pdata[i].key[0]) {
+            pmix_argv_append_nosize(&keys, pdata[i].key);
+        }
+    }
+
+    /* create a callback object as we need to pass it to the
+     * recv routine so we know which callback to use when
+     * the return message is recvd */
+    cb = PMIX_NEW(pmix_cb_t);
+    cb->cbdata = (void*)pdata;
+    cb->nvals = ndata;
+
+    if (PMIX_SUCCESS != (rc = PMIx_Lookup_nb(keys, info, ninfo,
+                                             lookup_cbfunc, cb))) {
+        PMIX_RELEASE(cb);
+        pmix_argv_free(keys);
+        return rc;
+    }
+
+    /* wait for the server to ack our request */
+    PMIX_WAIT_THREAD(&cb->lock);
+
+    /* the data has been stored in the info array by lookup_cbfunc, so
+     * nothing more for us to do */
+    rc = cb->status;
+    PMIX_RELEASE(cb);
+    return rc;
+}
+
+PMIX_EXPORT pmix_status_t PMIx_Lookup_nb(char **keys,
+                                         const pmix_info_t info[], size_t ninfo,
+                                         pmix_lookup_cbfunc_t cbfunc, void *cbdata)
+{
+    pmix_buffer_t *msg;
+    pmix_cmd_t cmd = PMIX_LOOKUPNB_CMD;
+    pmix_status_t rc;
+    pmix_cb_t *cb;
+    size_t nkeys, n;
+
+    PMIX_ACQUIRE_THREAD(&pmix_global_lock);
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "pmix: lookup called");
+
+    if (pmix_globals.init_cntr <= 0) {
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return PMIX_ERR_INIT;
+    }
+
+    /* if we aren't connected, don't attempt to send */
+    if (!pmix_globals.connected) {
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return PMIX_ERR_UNREACH;
+    }
+    PMIX_RELEASE_THREAD(&pmix_global_lock);
+
+    /* check for bozo cases */
+    if (NULL == keys) {
+        return PMIX_ERR_BAD_PARAM;
+    }
+
+    /* create the lookup cmd */
+    msg = PMIX_NEW(pmix_buffer_t);
+    /* pack the cmd */
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msg, &cmd, 1, PMIX_CMD))) {
+        PMIX_ERROR_LOG(rc);
+        PMIX_RELEASE(msg);
+        return rc;
+    }
+    /* pack our effective userid - will be used to constrain lookup */
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msg, &pmix_globals.uid, 1, PMIX_UINT32))) {
+        PMIX_ERROR_LOG(rc);
+        PMIX_RELEASE(msg);
+        return rc;
+    }
+    /* pack the keys */
+    nkeys = pmix_argv_count(keys);
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msg, &nkeys, 1, PMIX_SIZE))) {
+        PMIX_ERROR_LOG(rc);
+        PMIX_RELEASE(msg);
+        return rc;
+    }
+    if (0 < nkeys) {
+        for (n=0; n < nkeys; n++) {
+            if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msg, &keys[n], 1, PMIX_STRING))) {
+                PMIX_ERROR_LOG(rc);
+                PMIX_RELEASE(msg);
+                return rc;
+            }
+        }
+    }
+    /* pass the number of info structs - needed on remote end so
+     * space can be malloc'd for the values */
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msg, &ninfo, 1, PMIX_SIZE))) {
+        PMIX_ERROR_LOG(rc);
+        PMIX_RELEASE(msg);
+        return rc;
+    }
+    /* pack the info structs */
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msg, info, ninfo, PMIX_INFO))) {
+        PMIX_ERROR_LOG(rc);
+        PMIX_RELEASE(msg);
+        return rc;
+    }
+
+    /* create a callback object as we need to pass it to the
+     * recv routine so we know which callback to use when
+     * the return message is recvd */
+    cb = PMIX_NEW(pmix_cb_t);
+    cb->lookup_cbfunc = cbfunc;
+    cb->cbdata = cbdata;
+
+    /* send to the server */
+    if (PMIX_SUCCESS != (rc = pmix_ptl.send_recv(pmix_client_globals.myserver, msg, wait_lookup_cbfunc, (void*)cb))){
+        PMIX_RELEASE(msg);
+        PMIX_RELEASE(cb);
+    }
+
+    return rc;
+}
+
+PMIX_EXPORT pmix_status_t PMIx_Unpublish(char **keys,
+                                         const pmix_info_t info[],
+                                         size_t ninfo)
+{
+    pmix_status_t rc;
+    pmix_cb_t *cb;
+
+    PMIX_ACQUIRE_THREAD(&pmix_global_lock);
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "pmix: unpublish called");
+
+    if (pmix_globals.init_cntr <= 0) {
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return PMIX_ERR_INIT;
+    }
+
+    /* if we aren't connected, don't attempt to send */
+    if (!pmix_globals.connected) {
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return PMIX_ERR_UNREACH;
+    }
+    PMIX_RELEASE_THREAD(&pmix_global_lock);
+
+    /* create a callback object as we need to pass it to the
+     * recv routine so we know which callback to use when
+     * the return message is recvd */
+    cb = PMIX_NEW(pmix_cb_t);
+
+    /* push the message into our event base to send to the server */
+    if (PMIX_SUCCESS != (rc = PMIx_Unpublish_nb(keys, info, ninfo, op_cbfunc, cb))) {
+        PMIX_RELEASE(cb);
+        return rc;
+    }
+
+    /* wait for the server to ack our request */
+    PMIX_WAIT_THREAD(&cb->lock);
+    rc = cb->status;
+    PMIX_RELEASE(cb);
+
+    return rc;
+}
+
+PMIX_EXPORT pmix_status_t PMIx_Unpublish_nb(char **keys,
+                                            const pmix_info_t info[], size_t ninfo,
+                                            pmix_op_cbfunc_t cbfunc, void *cbdata)
+{
+    pmix_buffer_t *msg;
+    pmix_cmd_t cmd = PMIX_UNPUBLISHNB_CMD;
+    pmix_status_t rc;
+    pmix_cb_t *cb;
+    size_t i, j;
+
+    PMIX_ACQUIRE_THREAD(&pmix_global_lock);
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "pmix: unpublish called");
+
+    if (pmix_globals.init_cntr <= 0) {
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return PMIX_ERR_INIT;
+    }
+
+    /* if we aren't connected, don't attempt to send */
+    if (!pmix_globals.connected) {
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return PMIX_ERR_UNREACH;
+    }
+    PMIX_RELEASE_THREAD(&pmix_global_lock);
+
+    /* create the unpublish cmd */
+    msg = PMIX_NEW(pmix_buffer_t);
+    /* pack the cmd */
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msg, &cmd, 1, PMIX_CMD))) {
+        PMIX_ERROR_LOG(rc);
+        PMIX_RELEASE(msg);
+        return rc;
+    }
+    /* pack our effective userid - will be used to constrain lookup */
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msg, &pmix_globals.uid, 1, PMIX_UINT32))) {
+        PMIX_ERROR_LOG(rc);
+        PMIX_RELEASE(msg);
+        return rc;
+    }
+    /* pack the number of keys */
+    i = pmix_argv_count(keys);
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msg, &i, 1, PMIX_SIZE))) {
+        PMIX_ERROR_LOG(rc);
+        PMIX_RELEASE(msg);
+        return rc;
+    }
+    if (0 < i) {
+        for (j=0; j < i; j++) {
+            if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msg, &keys[j], 1, PMIX_STRING))) {
+                PMIX_ERROR_LOG(rc);
+                PMIX_RELEASE(msg);
+                return rc;
+            }
+        }
+    }
+    /* pass the number of info structs - needed on remote end so
+     * space can be malloc'd for the values */
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msg, &ninfo, 1, PMIX_SIZE))) {
+        PMIX_ERROR_LOG(rc);
+        PMIX_RELEASE(msg);
+        return rc;
+    }
+    /* pack the info structs */
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msg, info, ninfo, PMIX_INFO))) {
+        PMIX_ERROR_LOG(rc);
+        PMIX_RELEASE(msg);
+        return rc;
+    }
+
+    /* create a callback object */
+    cb = PMIX_NEW(pmix_cb_t);
+    cb->op_cbfunc = cbfunc;
+    cb->cbdata = cbdata;
+
+    /* send to the server */
+    if (PMIX_SUCCESS != (rc = pmix_ptl.send_recv(pmix_client_globals.myserver, msg, wait_cbfunc, (void*)cb))){
+        PMIX_RELEASE(msg);
+        PMIX_RELEASE(cb);
+    }
+
+    return rc;
+}
+
+static void wait_cbfunc(struct pmix_peer_t *pr,
+                        pmix_ptl_hdr_t *hdr,
+                        pmix_buffer_t *buf, void *cbdata)
+{
+    pmix_cb_t *cb = (pmix_cb_t*)cbdata;
+    pmix_status_t rc;
+    int ret;
+    int32_t cnt;
+
+    PMIX_ACQUIRE_OBJECT(cb);
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "pmix:client recv callback activated with %d bytes",
+                        (NULL == buf) ? -1 : (int)buf->bytes_used);
+
+    /* unpack the returned status */
+    cnt = 1;
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, &ret, &cnt, PMIX_STATUS))) {
+        PMIX_ERROR_LOG(rc);
+    }
+    if (NULL != cb->op_cbfunc) {
+        cb->op_cbfunc(rc, cb->cbdata);
+    }
+    PMIX_RELEASE(cb);
+}
+
+static void op_cbfunc(pmix_status_t status, void *cbdata)
+{
+    pmix_cb_t *cb = (pmix_cb_t*)cbdata;
+
+    cb->status = status;
+    PMIX_POST_OBJECT(cb);
+    PMIX_WAKEUP_THREAD(&cb->lock);
+}
+
+static void wait_lookup_cbfunc(struct pmix_peer_t *pr,
+                               pmix_ptl_hdr_t *hdr,
+                               pmix_buffer_t *buf, void *cbdata)
+{
+    pmix_cb_t *cb = (pmix_cb_t*)cbdata;
+    pmix_status_t rc, ret;
+    int32_t cnt;
+    pmix_pdata_t *pdata;
+    size_t ndata;
+
+    PMIX_ACQUIRE_OBJECT(cb);
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "pmix:client recv callback activated with %d bytes",
+                        (NULL == buf) ? -1 : (int)buf->bytes_used);
+
+    if (NULL == cb->lookup_cbfunc) {
+        /* nothing we can do with this */
+        PMIX_RELEASE(cb);
+        return;
+    }
+
+    /* set the defaults */
+    pdata = NULL;
+    ndata = 0;
+
+    /* unpack the returned status */
+    cnt = 1;
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, &ret, &cnt, PMIX_STATUS))) {
+        PMIX_ERROR_LOG(rc);
+        ret = rc;
+    }
+    if (PMIX_SUCCESS != ret) {
+        if (NULL != cb->lookup_cbfunc) {
+            cb->lookup_cbfunc(ret, NULL, 0, cb->cbdata);
+        }
+        PMIX_RELEASE(cb);
+        return;
+    }
+
+    /* unpack the number of returned values */
+    cnt = 1;
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, &ndata, &cnt, PMIX_SIZE))) {
+        PMIX_ERROR_LOG(rc);
+        PMIX_RELEASE(cb);
+        return;
+    }
+    if (0 < ndata) {
+        /* create the array storage */
+        PMIX_PDATA_CREATE(pdata, ndata);
+        cnt = ndata;
+        /* unpack the returned values into the pdata array */
+        if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, pdata, &cnt, PMIX_PDATA))) {
+            PMIX_ERROR_LOG(rc);
+            goto cleanup;
+        }
+    }
+
+    if (NULL != cb->lookup_cbfunc) {
+        cb->lookup_cbfunc(rc, pdata, ndata, cb->cbdata);
+    }
+
+ cleanup:
+    /* cleanup */
+    PMIX_PDATA_FREE(pdata, ndata);
+
+    PMIX_RELEASE(cb);
+}
+
+static void lookup_cbfunc(pmix_status_t status, pmix_pdata_t pdata[], size_t ndata,
+                          void *cbdata)
+{
+    pmix_cb_t *cb = (pmix_cb_t*)cbdata;
+    pmix_pdata_t *tgt = (pmix_pdata_t*)cb->cbdata;
+    size_t i, j;
+
+    PMIX_ACQUIRE_OBJECT(cb);
+    cb->status = status;
+    if (PMIX_SUCCESS == status) {
+        /* find the matching key in the provided info array - error if not found */
+        for (i=0; i < ndata; i++) {
+            for (j=0; j < cb->nvals; j++) {
+                if (0 == strcmp(pdata[i].key, tgt[j].key)) {
+                    /* transfer the publishing proc id */
+                    (void)strncpy(tgt[j].proc.nspace, pdata[i].proc.nspace, PMIX_MAX_NSLEN);
+                    tgt[j].proc.rank = pdata[i].proc.rank;
+                    /* transfer the value to the pmix_info_t */
+                    pmix_value_xfer(&tgt[j].value, &pdata[i].value);
+                    break;
+                }
+            }
+        }
+    }
+    PMIX_POST_OBJECT(cb);
+    PMIX_WAKEUP_THREAD(&cb->lock);
+}
diff --git a/src/client/pmix_client_spawn.c b/src/client/pmix_client_spawn.c
new file mode 100644
index 0000000..a7842c5
--- /dev/null
+++ b/src/client/pmix_client_spawn.c
@@ -0,0 +1,256 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2014-2017 Intel, Inc. All rights reserved.
+ * Copyright (c) 2014-2017 Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2014      Artem Y. Polyakov <artpol84 at gmail.com>.
+ *                         All rights reserved.
+ * Copyright (c) 2016      Mellanox Technologies, Inc.
+ *                         All rights reserved.
+ * Copyright (c) 2016      IBM Corporation.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+
+#include <src/include/types.h>
+#include <src/include/pmix_stdint.h>
+
+#include <pmix.h>
+#include <pmix_rename.h>
+
+#include "src/include/pmix_globals.h"
+
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+#include <fcntl.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_SYS_UN_H
+#include <sys/un.h>
+#endif
+#ifdef HAVE_SYS_UIO_H
+#include <sys/uio.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#include PMIX_EVENT_HEADER
+
+#include "src/class/pmix_list.h"
+#include "src/buffer_ops/buffer_ops.h"
+#include "src/threads/threads.h"
+#include "src/util/argv.h"
+#include "src/util/error.h"
+#include "src/util/output.h"
+#include "src/mca/ptl/ptl.h"
+
+#include "pmix_client_ops.h"
+#include "src/include/pmix_jobdata.h"
+
+static void wait_cbfunc(struct pmix_peer_t *pr,
+                        pmix_ptl_hdr_t *hdr,
+                        pmix_buffer_t *buf, void *cbdata);
+static void spawn_cbfunc(pmix_status_t status, char nspace[], void *cbdata);
+
+PMIX_EXPORT pmix_status_t PMIx_Spawn(const pmix_info_t job_info[], size_t ninfo,
+                           const pmix_app_t apps[], size_t napps,
+                           char nspace[])
+{
+    pmix_status_t rc;
+    pmix_cb_t *cb;
+
+    PMIX_ACQUIRE_THREAD(&pmix_global_lock);
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "pmix: spawn called");
+
+    if (pmix_globals.init_cntr <= 0) {
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return PMIX_ERR_INIT;
+    }
+
+    /* if we aren't connected, don't attempt to send */
+    if (!pmix_globals.connected) {
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return PMIX_ERR_UNREACH;
+    }
+    PMIX_RELEASE_THREAD(&pmix_global_lock);
+
+
+    /* ensure the nspace (if provided) is initialized */
+    if (NULL != nspace) {
+        memset(nspace, 0, PMIX_MAX_NSLEN+1);
+    }
+
+    /* create a callback object */
+    cb = PMIX_NEW(pmix_cb_t);
+
+    if (PMIX_SUCCESS != (rc = PMIx_Spawn_nb(job_info, ninfo, apps, napps, spawn_cbfunc, cb))) {
+        PMIX_RELEASE(cb);
+        return rc;
+    }
+
+    /* wait for the result */
+    PMIX_WAIT_THREAD(&cb->lock);
+    rc = cb->status;
+    if (NULL != nspace) {
+        (void)strncpy(nspace, cb->nspace, PMIX_MAX_NSLEN);
+    }
+    PMIX_RELEASE(cb);
+
+    return rc;
+}
+
+PMIX_EXPORT pmix_status_t PMIx_Spawn_nb(const pmix_info_t job_info[], size_t ninfo,
+                                        const pmix_app_t apps[], size_t napps,
+                                        pmix_spawn_cbfunc_t cbfunc, void *cbdata)
+{
+    pmix_buffer_t *msg;
+    pmix_cmd_t cmd = PMIX_SPAWNNB_CMD;
+    pmix_status_t rc;
+    pmix_cb_t *cb;
+
+    PMIX_ACQUIRE_THREAD(&pmix_global_lock);
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "pmix: spawn called");
+
+    if (pmix_globals.init_cntr <= 0) {
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return PMIX_ERR_INIT;
+    }
+
+    /* if we aren't connected, don't attempt to send */
+    if (!pmix_globals.connected) {
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return PMIX_ERR_UNREACH;
+    }
+    PMIX_RELEASE_THREAD(&pmix_global_lock);
+
+    msg = PMIX_NEW(pmix_buffer_t);
+    /* pack the cmd */
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msg, &cmd, 1, PMIX_CMD))) {
+        PMIX_ERROR_LOG(rc);
+        PMIX_RELEASE(msg);
+        return rc;
+    }
+
+    /* pack the job-level directives */
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msg, &ninfo, 1, PMIX_SIZE))) {
+        PMIX_ERROR_LOG(rc);
+        PMIX_RELEASE(msg);
+        return rc;
+    }
+    if (0 < ninfo) {
+        if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msg, job_info, ninfo, PMIX_INFO))) {
+            PMIX_ERROR_LOG(rc);
+            PMIX_RELEASE(msg);
+            return rc;
+        }
+    }
+
+    /* pack the apps */
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msg, &napps, 1, PMIX_SIZE))) {
+        PMIX_ERROR_LOG(rc);
+        PMIX_RELEASE(msg);
+        return rc;
+    }
+    if (0 < napps) {
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msg, apps, napps, PMIX_APP))) {
+        PMIX_ERROR_LOG(rc);
+        PMIX_RELEASE(msg);
+        return rc;
+    }
+    }
+
+    /* create a callback object as we need to pass it to the
+     * recv routine so we know which callback to use when
+     * the return message is recvd */
+    cb = PMIX_NEW(pmix_cb_t);
+    cb->spawn_cbfunc = cbfunc;
+    cb->cbdata = cbdata;
+
+    /* push the message into our event base to send to the server */
+    if (PMIX_SUCCESS != (rc = pmix_ptl.send_recv(pmix_client_globals.myserver, msg, wait_cbfunc, (void*)cb))){
+        PMIX_RELEASE(msg);
+        PMIX_RELEASE(cb);
+    }
+
+    return rc;
+}
+
+/* callback for wait completion */
+static void wait_cbfunc(struct pmix_peer_t *pr,
+                        pmix_ptl_hdr_t *hdr,
+                        pmix_buffer_t *buf, void *cbdata)
+{
+    pmix_cb_t *cb = (pmix_cb_t*)cbdata;
+    char nspace[PMIX_MAX_NSLEN+1];
+    char *n2 = NULL;
+    pmix_status_t rc, ret;
+    int32_t cnt;
+
+    PMIX_ACQUIRE_OBJECT(cb);
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "pmix:client recv callback activated with %d bytes",
+                        (NULL == buf) ? -1 : (int)buf->bytes_used);
+
+    /* init */
+    memset(nspace, 0, PMIX_MAX_NSLEN+1);
+
+    /* unpack the returned status */
+    cnt = 1;
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, &ret, &cnt, PMIX_STATUS))) {
+        PMIX_ERROR_LOG(rc);
+        ret = rc;
+    }
+    if (PMIX_SUCCESS == ret) {
+        /* unpack the namespace */
+        cnt = 1;
+        if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, &n2, &cnt, PMIX_STRING))) {
+            PMIX_ERROR_LOG(rc);
+            ret = rc;
+        }
+        pmix_output_verbose(1, pmix_globals.debug_output,
+                        "pmix:client recv '%s'", n2);
+
+        if (NULL != n2) {
+            (void)strncpy(nspace, n2, PMIX_MAX_NSLEN);
+#if !(defined(PMIX_ENABLE_DSTORE) && (PMIX_ENABLE_DSTORE == 1))
+            /* extract and process any proc-related info for this nspace */
+            pmix_job_data_htable_store(nspace, buf);
+#endif
+            free(n2);
+        }
+    }
+
+    if (NULL != cb->spawn_cbfunc) {
+        cb->spawn_cbfunc(ret, nspace, cb->cbdata);
+    }
+    cb->cbdata = NULL;
+    PMIX_RELEASE(cb);
+}
+
+static void spawn_cbfunc(pmix_status_t status, char nspace[], void *cbdata)
+{
+    pmix_cb_t *cb = (pmix_cb_t*)cbdata;
+
+    PMIX_ACQUIRE_OBJECT(cb);
+    cb->status = status;
+    if (NULL != nspace) {
+        (void)strncpy(cb->nspace, nspace, PMIX_MAX_NSLEN);
+    }
+    PMIX_POST_OBJECT(cb);
+    PMIX_WAKEUP_THREAD(&cb->lock);
+}
diff --git a/src/common/Makefile.include b/src/common/Makefile.include
new file mode 100644
index 0000000..e8b9a46
--- /dev/null
+++ b/src/common/Makefile.include
@@ -0,0 +1,18 @@
+# -*- makefile -*-
+#
+# Copyright (c) 2015-2017 Intel, Inc. All rights reserved.
+# Copyright (c) 2016 Cisco Systems, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+sources += \
+        common/pmix_query.c \
+        common/pmix_strings.c \
+        common/pmix_log.c \
+        common/pmix_jobdata.c \
+        common/pmix_control.c \
+        common/pmix_data.c
diff --git a/src/common/pmix_control.c b/src/common/pmix_control.c
new file mode 100644
index 0000000..cf2f546
--- /dev/null
+++ b/src/common/pmix_control.c
@@ -0,0 +1,285 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2014-2017 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2016      Mellanox Technologies, Inc.
+ *                         All rights reserved.
+ * Copyright (c) 2016      IBM Corporation.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+#include <src/include/pmix_config.h>
+
+#include <src/include/types.h>
+#include <src/include/pmix_stdint.h>
+#include <src/include/pmix_socket_errno.h>
+
+#include <pmix.h>
+#include <pmix_common.h>
+#include <pmix_server.h>
+#include <pmix_rename.h>
+
+#include "src/threads/threads.h"
+#include "src/util/argv.h"
+#include "src/util/error.h"
+#include "src/util/output.h"
+#include "src/buffer_ops/buffer_ops.h"
+#include "src/mca/ptl/ptl.h"
+
+#include "src/client/pmix_client_ops.h"
+#include "src/server/pmix_server_ops.h"
+#include "src/include/pmix_globals.h"
+
+static void relcbfunc(void *cbdata)
+{
+    pmix_shift_caddy_t *cd = (pmix_shift_caddy_t*)cbdata;
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "pmix:query release callback");
+
+    if (NULL != cd->info) {
+        PMIX_INFO_FREE(cd->info, cd->ninfo);
+    }
+    PMIX_RELEASE(cd);
+}
+static void query_cbfunc(struct pmix_peer_t *peer,
+                         pmix_ptl_hdr_t *hdr,
+                         pmix_buffer_t *buf, void *cbdata)
+{
+    pmix_query_caddy_t *cd = (pmix_query_caddy_t*)cbdata;
+    pmix_status_t rc;
+    pmix_shift_caddy_t *results;
+    int cnt;
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "pmix:query cback from server");
+
+    results = PMIX_NEW(pmix_shift_caddy_t);
+
+    /* unpack the status */
+    cnt = 1;
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, &results->status, &cnt, PMIX_STATUS))) {
+        PMIX_ERROR_LOG(rc);
+        goto complete;
+    }
+    if (PMIX_SUCCESS != results->status) {
+        goto complete;
+    }
+
+    /* unpack any returned data */
+    cnt = 1;
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, &results->ninfo, &cnt, PMIX_SIZE))) {
+        PMIX_ERROR_LOG(rc);
+        goto complete;
+    }
+    if (0 < results->ninfo) {
+        PMIX_INFO_CREATE(results->info, results->ninfo);
+        cnt = results->ninfo;
+        if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, results->info, &cnt, PMIX_INFO))) {
+            PMIX_ERROR_LOG(rc);
+            goto complete;
+        }
+    }
+
+  complete:
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "pmix:query cback from server releasing");
+    /* release the caller */
+    if (NULL != cd->cbfunc) {
+        cd->cbfunc(results->status, results->info, results->ninfo, cd->cbdata, relcbfunc, results);
+    }
+    PMIX_RELEASE(cd);
+}
+
+PMIX_EXPORT pmix_status_t PMIx_Job_control_nb(const pmix_proc_t targets[], size_t ntargets,
+                                              const pmix_info_t directives[], size_t ndirs,
+                                              pmix_info_cbfunc_t cbfunc, void *cbdata)
+{
+    pmix_buffer_t *msg;
+    pmix_cmd_t cmd = PMIX_JOB_CONTROL_CMD;
+    pmix_status_t rc;
+    pmix_query_caddy_t *cb;
+
+    PMIX_ACQUIRE_THREAD(&pmix_global_lock);
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "pmix: job control called");
+
+    if (pmix_globals.init_cntr <= 0) {
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return PMIX_ERR_INIT;
+    }
+
+    /* if we aren't connected, don't attempt to send */
+    if (!PMIX_PROC_IS_SERVER && !pmix_globals.connected) {
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return PMIX_ERR_UNREACH;
+    }
+    PMIX_RELEASE_THREAD(&pmix_global_lock);
+
+    /* if we are the server, then we just issue the request and
+     * return the response */
+    if (PMIX_PROC_SERVER == pmix_globals.proc_type) {
+        if (NULL == pmix_host_server.job_control) {
+            /* nothing we can do */
+            return PMIX_ERR_NOT_SUPPORTED;
+        }
+        pmix_output_verbose(2, pmix_globals.debug_output,
+                            "pmix:job_control handed to RM");
+        rc = pmix_host_server.job_control(&pmix_globals.myid,
+                                          targets, ntargets,
+                                          directives, ndirs,
+                                          cbfunc, cbdata);
+        return rc;
+    }
+
+    /* if we are a client, then relay this request to the server */
+    msg = PMIX_NEW(pmix_buffer_t);
+    /* pack the cmd */
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msg, &cmd, 1, PMIX_CMD))) {
+        PMIX_ERROR_LOG(rc);
+        PMIX_RELEASE(msg);
+        return rc;
+    }
+
+    /* pack the number of targets */
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msg, &ntargets, 1, PMIX_SIZE))) {
+        PMIX_ERROR_LOG(rc);
+        PMIX_RELEASE(msg);
+        return rc;
+    }
+    /* remember, the targets can be NULL to indicate that the operation
+     * is to be done against all members of our nspace */
+    if (0 < ntargets) {
+        /* pack the targets */
+        if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msg, targets, ntargets, PMIX_PROC))) {
+            PMIX_ERROR_LOG(rc);
+            PMIX_RELEASE(msg);
+            return rc;
+        }
+    }
+
+    /* pack the directives */
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msg, &ndirs, 1, PMIX_SIZE))) {
+        PMIX_ERROR_LOG(rc);
+        PMIX_RELEASE(msg);
+        return rc;
+    }
+    if (0 < ndirs) {
+        if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msg, directives, ndirs, PMIX_INFO))) {
+            PMIX_ERROR_LOG(rc);
+            PMIX_RELEASE(msg);
+            return rc;
+        }
+    }
+
+    /* create a callback object as we need to pass it to the
+     * recv routine so we know which callback to use when
+     * the return message is recvd */
+    cb = PMIX_NEW(pmix_query_caddy_t);
+    cb->cbfunc = cbfunc;
+    cb->cbdata = cbdata;
+
+    /* push the message into our event base to send to the server */
+    if (PMIX_SUCCESS != (rc = pmix_ptl.send_recv(pmix_client_globals.myserver, msg, query_cbfunc, (void*)cb))){
+        PMIX_RELEASE(msg);
+        PMIX_RELEASE(cb);
+    }
+
+    return rc;
+}
+
+PMIX_EXPORT pmix_status_t PMIx_Process_monitor_nb(const pmix_info_t *monitor, pmix_status_t error,
+                                                  const pmix_info_t directives[], size_t ndirs,
+                                                  pmix_info_cbfunc_t cbfunc, void *cbdata)
+{
+    pmix_buffer_t *msg;
+    pmix_cmd_t cmd = PMIX_MONITOR_CMD;
+    pmix_status_t rc;
+    pmix_query_caddy_t *cb;
+
+    PMIX_ACQUIRE_THREAD(&pmix_global_lock);
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "pmix: monitor called");
+
+    if (pmix_globals.init_cntr <= 0) {
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return PMIX_ERR_INIT;
+    }
+
+    /* if we aren't connected, don't attempt to send */
+    if (!PMIX_PROC_IS_SERVER && !pmix_globals.connected) {
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return PMIX_ERR_UNREACH;
+    }
+    PMIX_RELEASE_THREAD(&pmix_global_lock);
+
+    /* if we are the server, then we just issue the request and
+     * return the response */
+    if (PMIX_PROC_SERVER == pmix_globals.proc_type) {
+        if (NULL == pmix_host_server.monitor) {
+            /* nothing we can do */
+            return PMIX_ERR_NOT_SUPPORTED;
+        }
+        pmix_output_verbose(2, pmix_globals.debug_output,
+                            "pmix:monitor handed to RM");
+        rc = pmix_host_server.monitor(&pmix_globals.myid, monitor, error,
+                                      directives, ndirs, cbfunc, cbdata);
+        return rc;
+    }
+
+    /* if we are a client, then relay this request to the server */
+    msg = PMIX_NEW(pmix_buffer_t);
+    /* pack the cmd */
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msg, &cmd, 1, PMIX_CMD))) {
+        PMIX_ERROR_LOG(rc);
+        PMIX_RELEASE(msg);
+        return rc;
+    }
+
+    /* pack the monitor */
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msg, monitor, 1, PMIX_INFO))) {
+        PMIX_ERROR_LOG(rc);
+        PMIX_RELEASE(msg);
+        return rc;
+    }
+
+    /* pack the error */
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msg, &error, 1, PMIX_STATUS))) {
+        PMIX_ERROR_LOG(rc);
+        PMIX_RELEASE(msg);
+        return rc;
+    }
+
+    /* pack the directives */
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msg, &ndirs, 1, PMIX_SIZE))) {
+        PMIX_ERROR_LOG(rc);
+        PMIX_RELEASE(msg);
+        return rc;
+    }
+    if (0 < ndirs) {
+        if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msg, directives, ndirs, PMIX_INFO))) {
+            PMIX_ERROR_LOG(rc);
+            PMIX_RELEASE(msg);
+            return rc;
+        }
+    }
+
+    /* create a callback object as we need to pass it to the
+     * recv routine so we know which callback to use when
+     * the return message is recvd */
+    cb = PMIX_NEW(pmix_query_caddy_t);
+    cb->cbfunc = cbfunc;
+    cb->cbdata = cbdata;
+
+    /* push the message into our event base to send to the server */
+    if (PMIX_SUCCESS != (rc = pmix_ptl.send_recv(pmix_client_globals.myserver, msg, query_cbfunc, (void*)cb))){
+        PMIX_RELEASE(msg);
+        PMIX_RELEASE(cb);
+    }
+
+    return rc;
+}
diff --git a/src/common/pmix_data.c b/src/common/pmix_data.c
new file mode 100644
index 0000000..a10f405
--- /dev/null
+++ b/src/common/pmix_data.c
@@ -0,0 +1,159 @@
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2005 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2007-2012 Los Alamos National Security, LLC.
+ *                         All rights reserved.
+ * Copyright (c) 2014-2017 Intel, Inc.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+
+
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+#include <errno.h>
+#include <stdio.h>
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+
+#include <pmix_common.h>
+#include <pmix_rename.h>
+
+#include "src/buffer_ops/buffer_ops.h"
+
+#define PMIX_EMBED_DATA_BUFFER(b, db)                   \
+    do {                                                \
+        (b)->base_ptr = (db)->base_ptr;                 \
+        (b)->pack_ptr = (db)->pack_ptr;                 \
+        (b)->unpack_ptr = (db)->unpack_ptr;             \
+        (b)->bytes_allocated = (db)->bytes_allocated;   \
+        (b)->bytes_used = (db)->bytes_used;             \
+        (db)->base_ptr = NULL;                          \
+        (db)->pack_ptr = NULL;                          \
+        (db)->unpack_ptr = NULL;                        \
+        (db)->bytes_allocated = 0;                      \
+        (db)->bytes_used = 0;                           \
+    } while (0)
+
+#define PMIX_EXTRACT_DATA_BUFFER(b, db)                 \
+    do {                                                \
+        (db)->base_ptr = (b)->base_ptr;                 \
+        (db)->pack_ptr = (b)->pack_ptr;                 \
+        (db)->unpack_ptr = (b)->unpack_ptr;             \
+        (db)->bytes_allocated = (b)->bytes_allocated;   \
+        (db)->bytes_used = (b)->bytes_used;             \
+        (b)->base_ptr = NULL;                           \
+        (b)->pack_ptr = NULL;                           \
+        (b)->unpack_ptr = NULL;                         \
+        (b)->bytes_allocated = 0;                       \
+        (b)->bytes_used = 0;                            \
+    } while (0)
+
+PMIX_EXPORT pmix_status_t PMIx_Data_pack(pmix_data_buffer_t *buffer,
+                                         void *src, int32_t num_vals,
+                                         pmix_data_type_t type)
+{
+    pmix_status_t rc;
+    pmix_buffer_t buf;
+
+    /* setup the host */
+    PMIX_CONSTRUCT(&buf, pmix_buffer_t);
+
+    /* embed the data buffer into a buffer */
+    PMIX_EMBED_DATA_BUFFER(&buf, buffer);
+
+    /* pack the value */
+    rc = pmix_bfrop.pack(&buf, src, num_vals, type);
+
+    /* extract the data buffer - the pointers may have changed */
+    PMIX_EXTRACT_DATA_BUFFER(&buf, buffer);
+
+    /* no need to cleanup as all storage was xfered */
+    return rc;
+}
+
+
+PMIX_EXPORT pmix_status_t PMIx_Data_unpack(pmix_data_buffer_t *buffer, void *dest,
+                                           int32_t *max_num_values,
+                                           pmix_data_type_t type)
+{
+    pmix_status_t rc;
+    pmix_buffer_t buf;
+
+    /* setup the host */
+    PMIX_CONSTRUCT(&buf, pmix_buffer_t);
+
+    /* embed the data buffer into a buffer */
+    PMIX_EMBED_DATA_BUFFER(&buf, buffer);
+
+    /* unpack the value */
+    rc = pmix_bfrop.unpack(&buf, dest, max_num_values, type);
+
+    /* extract the data buffer - the pointers may have changed */
+    PMIX_EXTRACT_DATA_BUFFER(&buf, buffer);
+
+    /* no need to cleanup as all storage was xfered */
+    return rc;
+}
+
+PMIX_EXPORT pmix_status_t PMIx_Data_copy(void **dest, void *src,
+                                         pmix_data_type_t type)
+{
+    pmix_status_t rc;
+
+    /* copy the value */
+    rc = pmix_bfrop.copy(dest, src, type);
+
+    return rc;
+}
+
+PMIX_EXPORT pmix_status_t PMIx_Data_print(char **output, char *prefix,
+                                          void *src, pmix_data_type_t type)
+{
+    pmix_status_t rc;
+
+    /* print the value */
+    rc = pmix_bfrop.print(output, prefix, src, type);
+
+    return rc;
+}
+
+PMIX_EXPORT pmix_status_t PMIx_Data_copy_payload(pmix_data_buffer_t *dest,
+                                                 pmix_data_buffer_t *src)
+{
+    pmix_status_t rc;
+    pmix_buffer_t buf1, buf2;
+
+    /* setup the hosts */
+    PMIX_CONSTRUCT(&buf1, pmix_buffer_t);
+    PMIX_CONSTRUCT(&buf2, pmix_buffer_t);
+
+    /* embed the data buffer into a buffer */
+    PMIX_EMBED_DATA_BUFFER(&buf1, dest);
+    PMIX_EMBED_DATA_BUFFER(&buf2, src);
+
+    /* copy payload */
+    rc = pmix_bfrop.copy_payload(&buf1, &buf2);
+
+    /* extract the dest data buffer - the pointers may have changed */
+    PMIX_EXTRACT_DATA_BUFFER(&buf1, dest);
+    PMIX_EXTRACT_DATA_BUFFER(&buf2, src);
+
+    /* no need to cleanup as all storage was xfered */
+    return rc;
+}
diff --git a/src/common/pmix_jobdata.c b/src/common/pmix_jobdata.c
new file mode 100644
index 0000000..4ca58d6
--- /dev/null
+++ b/src/common/pmix_jobdata.c
@@ -0,0 +1,415 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2016-2017 Mellanox Technologies, Inc.
+ *                         All rights reserved.
+ * Copyright (c) 2016-2017 Intel, Inc.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+#include <src/include/pmix_config.h>
+#include <pmix_server.h>
+#include <pmix_common.h>
+#include "src/include/pmix_globals.h"
+#include "src/client/pmix_client_ops.h"
+#include "src/class/pmix_value_array.h"
+#include "src/util/error.h"
+#include "src/buffer_ops/internal.h"
+#include "src/util/argv.h"
+#include "src/util/compress.h"
+#include "src/util/hash.h"
+#include "src/util/show_help.h"
+#include "src/runtime/pmix_rte.h"
+#include "src/include/pmix_jobdata.h"
+
+#if defined(PMIX_ENABLE_DSTORE) && (PMIX_ENABLE_DSTORE == 1)
+#include "src/dstore/pmix_dstore.h"
+#endif
+
+static inline int _add_key_for_rank(pmix_rank_t rank, pmix_kval_t *kv, void *cbdata);
+static inline pmix_status_t _job_data_store(const char *nspace, void *cbdata);
+
+
+static inline int _add_key_for_rank(pmix_rank_t rank, pmix_kval_t *kv, void *cbdata)
+{
+    pmix_job_data_caddy_t *cb = (pmix_job_data_caddy_t*)(cbdata);
+    pmix_status_t rc = PMIX_SUCCESS;
+#if defined(PMIX_ENABLE_DSTORE) && (PMIX_ENABLE_DSTORE == 1)
+    uint32_t i, size;
+    pmix_buffer_t *tmp = NULL;
+    pmix_rank_t cur_rank;
+
+    if (NULL != cb->dstore_fn) {
+        /* rank WILDCARD contained in the 0 item */
+        cur_rank = PMIX_RANK_WILDCARD == rank ? 0 : rank + 1;
+        size = (uint32_t)pmix_value_array_get_size(cb->bufs);
+
+        if ((cur_rank + 1) <= size) {
+            tmp = &(PMIX_VALUE_ARRAY_GET_ITEM(cb->bufs, pmix_buffer_t, cur_rank));
+            pmix_bfrop.pack(tmp, kv, 1, PMIX_KVAL);
+            return rc;
+        }
+        if (PMIX_SUCCESS != (rc = pmix_value_array_set_size(cb->bufs, cur_rank + 1))) {
+            PMIX_ERROR_LOG(rc);
+            return rc;
+        }
+        for (i = size; i < (cur_rank + 1); i++) {
+            tmp = &(PMIX_VALUE_ARRAY_GET_ITEM(cb->bufs, pmix_buffer_t, i));
+            PMIX_CONSTRUCT(tmp, pmix_buffer_t);
+        }
+        pmix_bfrop.pack(tmp, kv, 1, PMIX_KVAL);
+    }
+#endif
+    if (cb->hstore_fn) {
+        if (PMIX_SUCCESS != (rc = cb->hstore_fn(&cb->nsptr->internal, rank, kv))) {
+            PMIX_ERROR_LOG(rc);
+        }
+    }
+    return rc;
+}
+
+#if defined(PMIX_ENABLE_DSTORE) && (PMIX_ENABLE_DSTORE == 1)
+static inline int _rank_key_dstore_store(void *cbdata)
+{
+    int rc = PMIX_SUCCESS;
+    uint32_t i, size;
+    pmix_buffer_t *tmp;
+    pmix_job_data_caddy_t *cb = (pmix_job_data_caddy_t*)cbdata;
+    pmix_rank_t rank;
+    pmix_kval_t *kv = NULL;
+    bool flag = true;
+
+    if (NULL == cb->bufs) {
+        rc = PMIX_ERR_BAD_PARAM;
+        PMIX_ERROR_LOG(rc);
+        goto exit;
+    }
+    kv = PMIX_NEW(pmix_kval_t);
+    kv->key = strdup("jobinfo");
+    PMIX_VALUE_CREATE(kv->value, 1);
+    kv->value->type = PMIX_BYTE_OBJECT;
+
+    size = pmix_value_array_get_size(cb->bufs);
+    for (i = 0; i < size; i++) {
+        tmp = &(PMIX_VALUE_ARRAY_GET_ITEM(cb->bufs, pmix_buffer_t, i));
+        rank = 0 == i ? PMIX_RANK_WILDCARD : i - 1;
+        PMIX_UNLOAD_BUFFER(tmp, kv->value->data.bo.bytes, kv->value->data.bo.size);
+        if (NULL == kv->value->data.bo.bytes) {
+            if (flag && !pmix_suppress_missing_data_warning) {
+                /* this occurs if the host RM did _not_ provide us with
+                 * data for every process in the job, in non-compliance
+                 * with the PMIx standard. Warn the user that their job
+                 * may not scale as desired, and give them a way to turn
+                 * that warning off in case the RM just can't do it */
+                pmix_show_help("help-pmix-runtime.txt", "missingdata", true);
+                /* only show this once */
+                flag = false;
+            }
+        } else {
+            if (PMIX_SUCCESS != (rc = cb->dstore_fn(cb->nsptr->nspace, rank, kv))) {
+                PMIX_ERROR_LOG(rc);
+                goto exit;
+            }
+        }
+    }
+
+exit:
+    if (NULL != kv) {
+        PMIX_RELEASE(kv);
+    }
+    return rc;
+}
+#endif
+
+#if defined(PMIX_ENABLE_DSTORE) && (PMIX_ENABLE_DSTORE == 1)
+pmix_status_t pmix_job_data_dstore_store(const char *nspace, pmix_buffer_t *bptr)
+{
+    pmix_job_data_caddy_t *cd = PMIX_NEW(pmix_job_data_caddy_t);
+
+    cd->job_data = bptr;
+    cd->dstore_fn = pmix_dstore_store;
+
+    return _job_data_store(nspace, cd);
+}
+#endif
+
+pmix_status_t pmix_job_data_htable_store(const char *nspace, pmix_buffer_t *bptr)
+{
+    pmix_job_data_caddy_t *cb = PMIX_NEW(pmix_job_data_caddy_t);
+
+    cb->job_data = bptr;
+    cb->hstore_fn = pmix_hash_store;
+
+    return _job_data_store(nspace, cb);
+}
+
+static inline pmix_status_t _job_data_store(const char *nspace, void *cbdata)
+{
+    pmix_buffer_t *job_data = ((pmix_job_data_caddy_t*)(cbdata))->job_data;
+    pmix_job_data_caddy_t *cb = (pmix_job_data_caddy_t*)(cbdata);
+    pmix_status_t rc = PMIX_SUCCESS;
+    pmix_nspace_t *nsptr = NULL, *nsptr2 = NULL;
+    pmix_kval_t *kptr, *kp2, kv;
+    int32_t cnt;
+    size_t nnodes, len;
+    uint32_t i;
+#if !(defined(PMIX_ENABLE_DSTORE) && (PMIX_ENABLE_DSTORE == 1))
+    uint32_t j;
+#endif
+    pmix_nrec_t *nrec, *nr2;
+    char **procs = NULL;
+    uint8_t *tmp;
+    pmix_byte_object_t *bo;
+    pmix_buffer_t buf2;
+    int rank;
+    char *proc_type_str = PMIX_PROC_SERVER == pmix_globals.proc_type ?
+                            "server" : "client";
+
+    pmix_output_verbose(10, pmix_globals.debug_output,
+                    "[%s:%d] pmix:%s pmix_jobdata_store %s",
+                    pmix_globals.myid.nspace, pmix_globals.myid.rank,
+                    proc_type_str, nspace);
+
+    /* check buf data */
+    if ((NULL == job_data) || (0 == job_data->bytes_used)) {
+        rc = PMIX_ERR_BAD_PARAM;
+        PMIX_ERROR_LOG(rc);
+        return rc;
+    }
+
+    PMIX_LIST_FOREACH(nsptr2, &pmix_globals.nspaces, pmix_nspace_t) {
+        if (0 == strcmp(nsptr2->nspace, nspace)) {
+            nsptr = nsptr2;
+            break;
+        }
+    }
+    if (NULL == nsptr) {
+        /* we don't know this nspace - add it */
+        nsptr = PMIX_NEW(pmix_nspace_t);
+        (void)strncpy(nsptr->nspace, nspace, PMIX_MAX_NSLEN);
+        pmix_list_append(&pmix_globals.nspaces, &nsptr->super);
+    }
+    cb->nsptr = nsptr;
+
+#if defined(PMIX_ENABLE_DSTORE) && (PMIX_ENABLE_DSTORE == 1)
+    if (NULL == (cb->bufs = PMIX_NEW(pmix_value_array_t))) {
+        rc = PMIX_ERR_OUT_OF_RESOURCE;
+        PMIX_ERROR_LOG(rc);
+        goto exit;
+    }
+    if (PMIX_SUCCESS != (rc = pmix_value_array_init(cb->bufs, sizeof(pmix_buffer_t)))) {
+        PMIX_ERROR_LOG(rc);
+        goto exit;
+    }
+#endif
+    cnt = 1;
+    kptr = PMIX_NEW(pmix_kval_t);
+    while (PMIX_SUCCESS == (rc = pmix_bfrop.unpack(job_data, kptr, &cnt, PMIX_KVAL)))
+    {
+        if (0 == strcmp(kptr->key, PMIX_PROC_BLOB)) {
+            bo = &(kptr->value->data.bo);
+            PMIX_CONSTRUCT(&buf2, pmix_buffer_t);
+            PMIX_LOAD_BUFFER(&buf2, bo->bytes, bo->size);
+            /* start by unpacking the rank */
+            cnt = 1;
+            if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(&buf2, &rank, &cnt, PMIX_PROC_RANK))) {
+                PMIX_ERROR_LOG(rc);
+                PMIX_DESTRUCT(&buf2);
+                goto exit;
+            }
+            kp2 = PMIX_NEW(pmix_kval_t);
+            kp2->key = strdup(PMIX_RANK);
+            PMIX_VALUE_CREATE(kp2->value, 1);
+            kp2->value->type = PMIX_PROC_RANK;
+            kp2->value->data.rank = rank;
+            if (PMIX_SUCCESS != (rc = _add_key_for_rank(rank, kp2, cb))) {
+                PMIX_ERROR_LOG(rc);
+                PMIX_RELEASE(kp2);
+                PMIX_DESTRUCT(&buf2);
+                goto exit;
+            }
+            PMIX_RELEASE(kp2); // maintain accounting
+            cnt = 1;
+            kp2 = PMIX_NEW(pmix_kval_t);
+            while (PMIX_SUCCESS == (rc = pmix_bfrop.unpack(&buf2, kp2, &cnt, PMIX_KVAL))) {
+                /* if the value contains a string that is longer than the
+                 * limit, then compress it */
+                if (PMIX_STRING_SIZE_CHECK(kp2->value)) {
+                    if (pmix_util_compress_string(kp2->value->data.string, &tmp, &len)) {
+                        if (NULL == tmp) {
+                            PMIX_ERROR_LOG(PMIX_ERR_NOMEM);
+                            rc = PMIX_ERR_NOMEM;
+                            goto exit;
+                        }
+                        kp2->value->type = PMIX_COMPRESSED_STRING;
+                        free(kp2->value->data.string);
+                        kp2->value->data.bo.bytes = (char*)tmp;
+                        kp2->value->data.bo.size = len;
+                    }
+                }
+                /* this is data provided by a job-level exchange, so store it
+                 * in the job-level data hash_table */
+                if (PMIX_SUCCESS != (rc = _add_key_for_rank(rank, kp2, cb))) {
+                    PMIX_ERROR_LOG(rc);
+                    PMIX_RELEASE(kp2);
+                    PMIX_DESTRUCT(&buf2);
+                    goto exit;
+                }
+                PMIX_RELEASE(kp2); // maintain accounting
+                kp2 = PMIX_NEW(pmix_kval_t);
+            }
+            /* cleanup */
+            PMIX_DESTRUCT(&buf2);  // releases the original kptr data
+            PMIX_RELEASE(kp2);
+        } else if (0 == strcmp(kptr->key, PMIX_MAP_BLOB)) {
+            /* transfer the byte object for unpacking */
+            bo = &(kptr->value->data.bo);
+            PMIX_CONSTRUCT(&buf2, pmix_buffer_t);
+            PMIX_LOAD_BUFFER(&buf2, bo->bytes, bo->size);
+            /* start by unpacking the number of nodes */
+            cnt = 1;
+            if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(&buf2, &nnodes, &cnt, PMIX_SIZE))) {
+                PMIX_ERROR_LOG(rc);
+                PMIX_DESTRUCT(&buf2);
+                goto exit;
+            }
+            /* unpack the list of procs on each node */
+            for (i=0; i < nnodes; i++) {
+                cnt = 1;
+                PMIX_CONSTRUCT(&kv, pmix_kval_t);
+                if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(&buf2, &kv, &cnt, PMIX_KVAL))) {
+                    PMIX_ERROR_LOG(rc);
+                    PMIX_DESTRUCT(&buf2);
+                    PMIX_DESTRUCT(&kv);
+                    goto exit;
+                }
+                /* the name of the node is in the key, and the value is
+                 * a comma-delimited list of procs on that node. See if we already
+                 * have this node */
+                nrec = NULL;
+                PMIX_LIST_FOREACH(nr2, &nsptr->nodes, pmix_nrec_t) {
+                    if (0 == strcmp(nr2->name, kv.key)) {
+                        nrec = nr2;
+                        break;
+                    }
+                }
+                if (NULL == nrec) {
+                    /* Create a node record and store that list */
+                    nrec = PMIX_NEW(pmix_nrec_t);
+                    if (NULL == nrec) {
+                        PMIX_ERROR_LOG(PMIX_ERR_NOMEM);
+                        PMIX_DESTRUCT(&buf2);
+                        PMIX_DESTRUCT(&kv);
+                        goto exit;
+                    }
+                    nrec->name = strdup(kv.key);
+                    pmix_list_append(&nsptr->nodes, &nrec->super);
+                } else {
+                    /* refresh the list */
+                    if (NULL != nrec->procs) {
+                        free(nrec->procs);
+                    }
+                }
+                nrec->procs = strdup(kv.value->data.string);
+                /* split the list of procs so we can store their
+                 * individual location data */
+#if defined(PMIX_ENABLE_DSTORE) && (PMIX_ENABLE_DSTORE == 1)
+                if (PMIX_SUCCESS != (rc = _add_key_for_rank(PMIX_RANK_WILDCARD, &kv, cb))) {
+                    PMIX_ERROR_LOG(rc);
+                    PMIX_DESTRUCT(&kv);
+                    PMIX_DESTRUCT(&buf2);
+                    pmix_argv_free(procs);
+                    goto exit;
+                }
+#else
+                procs = pmix_argv_split(nrec->procs, ',');
+                for (j=0; NULL != procs[j]; j++) {
+                    /* store the hostname for each proc - again, this is
+                     * data obtained via a job-level exchange, so store it
+                     * in the job-level data hash_table */
+                    kp2 = PMIX_NEW(pmix_kval_t);
+                    kp2->key = strdup(PMIX_HOSTNAME);
+                    kp2->value = (pmix_value_t*)malloc(sizeof(pmix_value_t));
+                    kp2->value->type = PMIX_STRING;
+                    kp2->value->data.string = strdup(nrec->name);
+                    rank = strtol(procs[j], NULL, 10);
+                    if (PMIX_SUCCESS != (rc = _add_key_for_rank(rank, kp2, cb))) {
+                        PMIX_ERROR_LOG(rc);
+                        PMIX_RELEASE(kp2);
+                        PMIX_DESTRUCT(&kv);
+                        PMIX_DESTRUCT(&buf2);
+                        pmix_argv_free(procs);
+                        goto exit;
+                    }
+                    PMIX_RELEASE(kp2);
+                }
+                pmix_argv_free(procs);
+#endif
+                PMIX_DESTRUCT(&kv);
+            }
+            /* cleanup */
+            PMIX_DESTRUCT(&buf2);
+        } else {
+            /* if the value contains a string that is longer than the
+             * limit, then compress it */
+            if (PMIX_STRING_SIZE_CHECK(kptr->value)) {
+                if (pmix_util_compress_string(kptr->value->data.string, &tmp, &len)) {
+                    if (NULL == tmp) {
+                        PMIX_ERROR_LOG(PMIX_ERR_NOMEM);
+                        rc = PMIX_ERR_NOMEM;
+                        goto exit;
+                    }
+                    kptr->value->type = PMIX_COMPRESSED_STRING;
+                    free(kptr->value->data.string);
+                    kptr->value->data.bo.bytes = (char*)tmp;
+                    kptr->value->data.bo.size = len;
+                }
+            }
+            if (PMIX_SUCCESS != (rc = _add_key_for_rank(PMIX_RANK_WILDCARD, kptr, cb))) {
+                PMIX_ERROR_LOG(rc);
+                PMIX_RELEASE(kptr);
+                goto exit;
+            }
+        }
+        PMIX_RELEASE(kptr);
+        kptr = PMIX_NEW(pmix_kval_t);
+        cnt = 1;
+    }
+    /* need to release the leftover kptr */
+    PMIX_RELEASE(kptr);
+
+    if (PMIX_ERR_UNPACK_READ_PAST_END_OF_BUFFER != rc) {
+        PMIX_ERROR_LOG(rc);
+        goto exit;
+    }
+    rc = PMIX_SUCCESS;
+
+#if defined(PMIX_ENABLE_DSTORE) && (PMIX_ENABLE_DSTORE == 1)
+    if (NULL != cb->dstore_fn) {
+        if (PMIX_SUCCESS != (rc = _rank_key_dstore_store(cbdata))) {
+            PMIX_ERROR_LOG(rc);
+            goto exit;
+        }
+    }
+#endif
+exit:
+#if defined(PMIX_ENABLE_DSTORE) && (PMIX_ENABLE_DSTORE == 1)
+    if (NULL != cb->bufs) {
+        size_t size = pmix_value_array_get_size(cb->bufs);
+        size_t i;
+        for (i = 0; i < size; i++) {
+            pmix_buffer_t *tmp = &(PMIX_VALUE_ARRAY_GET_ITEM(cb->bufs, pmix_buffer_t, i));
+            PMIX_DESTRUCT(tmp);
+        }
+        PMIX_RELEASE(cb->bufs);
+    }
+#endif
+    PMIX_RELEASE(cb);
+
+    /* reset buf unpack ptr */
+    job_data->unpack_ptr = job_data->base_ptr;
+
+    return rc;
+}
diff --git a/src/common/pmix_log.c b/src/common/pmix_log.c
new file mode 100644
index 0000000..92ea301
--- /dev/null
+++ b/src/common/pmix_log.c
@@ -0,0 +1,145 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2014-2017 Intel, Inc. All rights reserved.
+ * Copyright (c) 2016      Mellanox Technologies, Inc.
+ *                         All rights reserved.
+ * Copyright (c) 2016      IBM Corporation.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+#include <src/include/pmix_config.h>
+
+#include <src/include/types.h>
+#include <src/include/pmix_stdint.h>
+#include <src/include/pmix_socket_errno.h>
+
+#include <pmix.h>
+#include <pmix_common.h>
+#include <pmix_server.h>
+#include <pmix_rename.h>
+
+#include "src/threads/threads.h"
+#include "src/util/argv.h"
+#include "src/util/error.h"
+#include "src/util/output.h"
+#include "src/buffer_ops/buffer_ops.h"
+#include "src/mca/ptl/ptl.h"
+
+#include "src/client/pmix_client_ops.h"
+#include "src/server/pmix_server_ops.h"
+#include "src/include/pmix_globals.h"
+
+static void log_cbfunc(struct pmix_peer_t *peer,
+                       pmix_ptl_hdr_t *hdr,
+                       pmix_buffer_t *buf, void *cbdata)
+{
+    pmix_shift_caddy_t *cd = (pmix_shift_caddy_t*)cbdata;
+    int32_t m;
+    pmix_status_t rc, status;
+
+    /* unpack the return status */
+    m=1;
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, &status, &m, PMIX_STATUS))) {
+        status = rc;
+    }
+
+    if (NULL != cd->cbfunc.opcbfn) {
+        cd->cbfunc.opcbfn(status, cd->cbdata);
+    }
+    PMIX_RELEASE(cd);
+}
+
+PMIX_EXPORT pmix_status_t PMIx_Log_nb(const pmix_info_t data[], size_t ndata,
+                                      const pmix_info_t directives[], size_t ndirs,
+                                      pmix_op_cbfunc_t cbfunc, void *cbdata)
+
+{
+    pmix_shift_caddy_t *cd;
+    pmix_cmd_t cmd = PMIX_LOG_CMD;
+    pmix_buffer_t *msg;
+    pmix_status_t rc;
+
+    PMIX_ACQUIRE_THREAD(&pmix_global_lock);
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "pmix:log non-blocking");
+
+    if (pmix_globals.init_cntr <= 0) {
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return PMIX_ERR_INIT;
+    }
+
+    /* if we aren't connected, don't attempt to send */
+    if (!PMIX_PROC_IS_SERVER && !pmix_globals.connected) {
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return PMIX_ERR_UNREACH;
+    }
+    PMIX_RELEASE_THREAD(&pmix_global_lock);
+
+    if (0 == ndata || NULL == data) {
+        return PMIX_ERR_BAD_PARAM;
+    }
+
+    /* if we are the server, then we just log and
+     * return the response */
+    if (PMIX_PROC_SERVER == pmix_globals.proc_type) {
+            if (NULL == pmix_host_server.log) {
+                /* nothing we can do */
+                return PMIX_ERR_NOT_SUPPORTED;
+            }
+            pmix_output_verbose(2, pmix_globals.debug_output,
+                                "pmix:query handed to RM");
+            pmix_host_server.log(&pmix_globals.myid,
+                                 data, ndata, directives, ndirs,
+                                 cbfunc, cbdata);
+            rc = PMIX_SUCCESS;
+    } else {
+        /* if we are a client, then relay this request to the server */
+        cd = PMIX_NEW(pmix_shift_caddy_t);
+        cd->cbfunc.opcbfn = cbfunc;
+        cd->cbdata = cbdata;
+        msg = PMIX_NEW(pmix_buffer_t);
+        if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msg, &cmd, 1, PMIX_CMD))) {
+            PMIX_ERROR_LOG(rc);
+            PMIX_RELEASE(msg);
+            PMIX_RELEASE(cd);
+            return rc;
+        }
+        if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msg, &ndata, 1, PMIX_SIZE))) {
+            PMIX_ERROR_LOG(rc);
+            PMIX_RELEASE(msg);
+            PMIX_RELEASE(cd);
+            return rc;
+        }
+        if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msg, data, ndata, PMIX_INFO))) {
+            PMIX_ERROR_LOG(rc);
+            PMIX_RELEASE(msg);
+            PMIX_RELEASE(cd);
+            return rc;
+        }
+        if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msg, &ndirs, 1, PMIX_SIZE))) {
+            PMIX_ERROR_LOG(rc);
+            PMIX_RELEASE(msg);
+            PMIX_RELEASE(cd);
+            return rc;
+        }
+        if (0 < ndirs) {
+            if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msg, data, ndata, PMIX_INFO))) {
+                PMIX_ERROR_LOG(rc);
+                PMIX_RELEASE(msg);
+                PMIX_RELEASE(cd);
+                return rc;
+            }
+        }
+
+        pmix_output_verbose(2, pmix_globals.debug_output,
+                            "pmix:query sending to server");
+        if (PMIX_SUCCESS != (rc = pmix_ptl.send_recv(pmix_client_globals.myserver, msg, log_cbfunc, (void*)cd))){
+            PMIX_RELEASE(cd);
+        }
+    }
+    return rc;
+}
diff --git a/src/common/pmix_query.c b/src/common/pmix_query.c
new file mode 100644
index 0000000..5eec3f7
--- /dev/null
+++ b/src/common/pmix_query.c
@@ -0,0 +1,254 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2014-2017 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2016      Mellanox Technologies, Inc.
+ *                         All rights reserved.
+ * Copyright (c) 2016      IBM Corporation.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+#include <src/include/pmix_config.h>
+
+#include <src/include/types.h>
+#include <src/include/pmix_stdint.h>
+#include <src/include/pmix_socket_errno.h>
+
+#include <pmix.h>
+#include <pmix_common.h>
+#include <pmix_server.h>
+#include <pmix_rename.h>
+
+#include "src/threads/threads.h"
+#include "src/util/argv.h"
+#include "src/util/error.h"
+#include "src/util/output.h"
+#include "src/buffer_ops/buffer_ops.h"
+#include "src/mca/ptl/ptl.h"
+
+#include "src/client/pmix_client_ops.h"
+#include "src/server/pmix_server_ops.h"
+#include "src/include/pmix_globals.h"
+
+static void relcbfunc(void *cbdata)
+{
+    pmix_shift_caddy_t *cd = (pmix_shift_caddy_t*)cbdata;
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "pmix:query release callback");
+
+    if (NULL != cd->info) {
+        PMIX_INFO_FREE(cd->info, cd->ninfo);
+    }
+    PMIX_RELEASE(cd);
+}
+static void query_cbfunc(struct pmix_peer_t *peer,
+                         pmix_ptl_hdr_t *hdr,
+                         pmix_buffer_t *buf, void *cbdata)
+{
+    pmix_query_caddy_t *cd = (pmix_query_caddy_t*)cbdata;
+    pmix_status_t rc;
+    pmix_shift_caddy_t *results;
+    int cnt;
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "pmix:query cback from server");
+
+    results = PMIX_NEW(pmix_shift_caddy_t);
+
+    /* unpack the status */
+    cnt = 1;
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, &results->status, &cnt, PMIX_STATUS))) {
+        PMIX_ERROR_LOG(rc);
+        goto complete;
+    }
+    if (PMIX_SUCCESS != results->status) {
+        goto complete;
+    }
+
+    /* unpack any returned data */
+    cnt = 1;
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, &results->ninfo, &cnt, PMIX_SIZE))) {
+        PMIX_ERROR_LOG(rc);
+        goto complete;
+    }
+    if (0 < results->ninfo) {
+        PMIX_INFO_CREATE(results->info, results->ninfo);
+        cnt = results->ninfo;
+        if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, results->info, &cnt, PMIX_INFO))) {
+            PMIX_ERROR_LOG(rc);
+            goto complete;
+        }
+    }
+
+  complete:
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "pmix:query cback from server releasing");
+    /* release the caller */
+    if (NULL != cd->cbfunc) {
+        cd->cbfunc(results->status, results->info, results->ninfo, cd->cbdata, relcbfunc, results);
+    }
+    PMIX_RELEASE(cd);
+}
+
+PMIX_EXPORT pmix_status_t PMIx_Query_info_nb(pmix_query_t queries[], size_t nqueries,
+                                             pmix_info_cbfunc_t cbfunc, void *cbdata)
+
+{
+    pmix_query_caddy_t *cd;
+    pmix_cmd_t cmd = PMIX_QUERY_CMD;
+    pmix_buffer_t *msg;
+    pmix_status_t rc;
+
+    PMIX_ACQUIRE_THREAD(&pmix_global_lock);
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "pmix:query non-blocking");
+
+    if (pmix_globals.init_cntr <= 0) {
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return PMIX_ERR_INIT;
+    }
+
+    /* if we aren't connected, don't attempt to send */
+    if (!PMIX_PROC_IS_SERVER && !pmix_globals.connected) {
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return PMIX_ERR_UNREACH;
+    }
+    PMIX_RELEASE_THREAD(&pmix_global_lock);
+
+    if (0 == nqueries || NULL == queries) {
+        return PMIX_ERR_BAD_PARAM;
+    }
+
+    /* if we are the server, then we just issue the query and
+     * return the response */
+    if (PMIX_PROC_SERVER == pmix_globals.proc_type) {
+        if (NULL == pmix_host_server.query) {
+            /* nothing we can do */
+            return PMIX_ERR_NOT_SUPPORTED;
+        }
+        pmix_output_verbose(2, pmix_globals.debug_output,
+                            "pmix:query handed to RM");
+        pmix_host_server.query(&pmix_globals.myid,
+                               queries, nqueries,
+                               cbfunc, cbdata);
+        rc = PMIX_SUCCESS;
+    } else {
+        /* if we are a client, then relay this request to the server */
+        cd = PMIX_NEW(pmix_query_caddy_t);
+        cd->cbfunc = cbfunc;
+        cd->cbdata = cbdata;
+        msg = PMIX_NEW(pmix_buffer_t);
+        if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msg, &cmd, 1, PMIX_CMD))) {
+            PMIX_ERROR_LOG(rc);
+            PMIX_RELEASE(msg);
+            PMIX_RELEASE(cd);
+            return rc;
+        }
+        if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msg, &nqueries, 1, PMIX_SIZE))) {
+            PMIX_ERROR_LOG(rc);
+            PMIX_RELEASE(msg);
+            PMIX_RELEASE(cd);
+            return rc;
+        }
+        if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msg, queries, nqueries, PMIX_QUERY))) {
+            PMIX_ERROR_LOG(rc);
+            PMIX_RELEASE(msg);
+            PMIX_RELEASE(cd);
+            return rc;
+        }
+        pmix_output_verbose(2, pmix_globals.debug_output,
+                            "pmix:query sending to server");
+        if (PMIX_SUCCESS != (rc = pmix_ptl.send_recv(pmix_client_globals.myserver, msg, query_cbfunc, (void*)cd))){
+            PMIX_RELEASE(cd);
+        }
+    }
+    return rc;
+}
+
+PMIX_EXPORT pmix_status_t PMIx_Allocation_request_nb(pmix_alloc_directive_t directive,
+                                                     pmix_info_t *info, size_t ninfo,
+                                                     pmix_info_cbfunc_t cbfunc, void *cbdata)
+{
+    pmix_buffer_t *msg;
+    pmix_cmd_t cmd = PMIX_ALLOC_CMD;
+    pmix_status_t rc;
+    pmix_query_caddy_t *cb;
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "pmix: allocate called");
+
+    if (pmix_globals.init_cntr <= 0) {
+        return PMIX_ERR_INIT;
+    }
+
+    /* if we are the server, then we just issue the request and
+     * return the response */
+    if (PMIX_PROC_SERVER == pmix_globals.proc_type) {
+        if (NULL == pmix_host_server.allocate) {
+            /* nothing we can do */
+            return PMIX_ERR_NOT_SUPPORTED;
+        }
+        pmix_output_verbose(2, pmix_globals.debug_output,
+                            "pmix:allocate handed to RM");
+        rc = pmix_host_server.allocate(&pmix_globals.myid,
+                                       directive,
+                                       info, ninfo,
+                                       cbfunc, cbdata);
+        return rc;
+    }
+
+    /* if we are a client, then relay this request to the server */
+
+    /* if we aren't connected, don't attempt to send */
+    if (!pmix_globals.connected) {
+        return PMIX_ERR_UNREACH;
+    }
+
+    msg = PMIX_NEW(pmix_buffer_t);
+    /* pack the cmd */
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msg, &cmd, 1, PMIX_CMD))) {
+        PMIX_ERROR_LOG(rc);
+        PMIX_RELEASE(msg);
+        return rc;
+    }
+
+    /* pack the directive */
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msg, &directive, 1, PMIX_ALLOC_DIRECTIVE))) {
+        PMIX_ERROR_LOG(rc);
+        PMIX_RELEASE(msg);
+        return rc;
+    }
+
+    /* pack the info */
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msg, &ninfo, 1, PMIX_SIZE))) {
+        PMIX_ERROR_LOG(rc);
+        PMIX_RELEASE(msg);
+        return rc;
+    }
+    if (0 < ninfo) {
+        if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msg, info, ninfo, PMIX_INFO))) {
+            PMIX_ERROR_LOG(rc);
+            PMIX_RELEASE(msg);
+            return rc;
+        }
+    }
+
+    /* create a callback object as we need to pass it to the
+     * recv routine so we know which callback to use when
+     * the return message is recvd */
+    cb = PMIX_NEW(pmix_query_caddy_t);
+    cb->cbfunc = cbfunc;
+    cb->cbdata = cbdata;
+
+    /* push the message into our event base to send to the server */
+    if (PMIX_SUCCESS != (rc = pmix_ptl.send_recv(pmix_client_globals.myserver, msg, query_cbfunc, (void*)cb))){
+        PMIX_RELEASE(msg);
+        PMIX_RELEASE(cb);
+    }
+
+    return rc;
+}
diff --git a/src/common/pmix_strings.c b/src/common/pmix_strings.c
new file mode 100644
index 0000000..301c980
--- /dev/null
+++ b/src/common/pmix_strings.c
@@ -0,0 +1,224 @@
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2005 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2007-2012 Los Alamos National Security, LLC.
+ *                         All rights reserved.
+ * Copyright (c) 2014-2017 Intel, Inc.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+
+
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+#include <errno.h>
+#include <stdio.h>
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+
+#include <pmix_common.h>
+#include <pmix_rename.h>
+
+#include "src/buffer_ops/internal.h"
+#include "src/include/pmix_globals.h"
+
+PMIX_EXPORT const char* PMIx_Proc_state_string(pmix_proc_state_t state)
+{
+    switch(state) {
+        case PMIX_PROC_STATE_UNDEF:
+            return "UNDEFINED";
+        case PMIX_PROC_STATE_PREPPED:
+            return "PREPPED FOR LAUNCH";
+        case PMIX_PROC_STATE_LAUNCH_UNDERWAY:
+            return "LAUNCH UNDERWAY";
+        case PMIX_PROC_STATE_RESTART:
+            return "PROC READY FOR RESTART";
+        case PMIX_PROC_STATE_TERMINATE:
+            return "PROC MARKED FOR TERMINATION";
+        case PMIX_PROC_STATE_RUNNING:
+            return "PROC EXECUTING";
+        case PMIX_PROC_STATE_CONNECTED:
+            return "PROC HAS CONNECTED TO LOCAL PMIX SERVER";
+        case PMIX_PROC_STATE_UNTERMINATED:
+            return "PROC HAS NOT TERMINATED";
+        case PMIX_PROC_STATE_TERMINATED:
+            return "PROC HAS TERMINATED";
+        case PMIX_PROC_STATE_ERROR:
+            return "PROC ERROR";
+        case PMIX_PROC_STATE_KILLED_BY_CMD:
+            return "PROC KILLED BY CMD";
+        case PMIX_PROC_STATE_ABORTED:
+            return "PROC ABNORMALLY ABORTED";
+        case PMIX_PROC_STATE_FAILED_TO_START:
+            return "PROC FAILED TO START";
+        case PMIX_PROC_STATE_ABORTED_BY_SIG:
+            return "PROC ABORTED BY SIGNAL";
+        case PMIX_PROC_STATE_TERM_WO_SYNC:
+            return "PROC TERMINATED WITHOUT CALLING PMIx_Finalize";
+        case PMIX_PROC_STATE_COMM_FAILED:
+            return "PROC LOST COMMUNICATION";
+        case PMIX_PROC_STATE_CALLED_ABORT:
+            return "PROC CALLED PMIx_Abort";
+        case PMIX_PROC_STATE_MIGRATING:
+            return "PROC WAITING TO MIGRATE";
+        case PMIX_PROC_STATE_CANNOT_RESTART:
+            return "PROC CANNOT BE RESTARTED";
+        case PMIX_PROC_STATE_TERM_NON_ZERO:
+            return "PROC TERMINATED WITH NON-ZERO STATUS";
+        case PMIX_PROC_STATE_FAILED_TO_LAUNCH:
+            return "PROC FAILED TO LAUNCH";
+        default:
+            return "UNKNOWN STATE";
+    }
+}
+
+PMIX_EXPORT const char* PMIx_Scope_string(pmix_scope_t scope)
+{
+    switch(scope) {
+        case PMIX_SCOPE_UNDEF:
+            return "UNDEFINED";
+        case PMIX_LOCAL:
+            return "SHARE ON LOCAL NODE ONLY";
+        case PMIX_REMOTE:
+            return "SHARE ON REMOTE NODES ONLY";
+        case PMIX_GLOBAL:
+            return "SHARE ACROSS ALL NODES";
+        default:
+            return "UNKNOWN SCOPE";
+    }
+}
+
+PMIX_EXPORT const char* PMIx_Persistence_string(pmix_persistence_t persist)
+{
+    switch(persist) {
+        case PMIX_PERSIST_INDEF:
+            return "INDEFINITE";
+        case PMIX_PERSIST_FIRST_READ:
+            return "DELETE ON FIRST ACCESS";
+        case PMIX_PERSIST_PROC:
+            return "RETAIN UNTIL PUBLISHING PROCESS TERMINATES";
+        case PMIX_PERSIST_APP:
+            return "RETAIN UNTIL APPLICATION OF PUBLISHING PROCESS TERMINATES";
+        case PMIX_PERSIST_SESSION:
+            return "RETAIN UNTIL ALLOCATION OF PUBLISHING PROCESS TERMINATES";
+        default:
+            return "UNKNOWN PERSISTENCE";
+    }
+}
+
+PMIX_EXPORT const char* PMIx_Data_range_string(pmix_data_range_t range)
+{
+    switch(range) {
+        case PMIX_RANGE_UNDEF:
+            return "UNDEFINED";
+        case PMIX_RANGE_RM:
+            return "INTENDED FOR HOST RESOURCE MANAGER ONLY";
+        case PMIX_RANGE_LOCAL:
+            return "AVAIL ON LOCAL NODE ONLY";
+        case PMIX_RANGE_NAMESPACE:
+            return "AVAIL TO PROCESSES IN SAME JOB ONLY";
+        case PMIX_RANGE_SESSION:
+            return "AVAIL TO PROCESSES IN SAME ALLOCATION ONLY";
+        case PMIX_RANGE_GLOBAL:
+            return "AVAIL TO ANYONE WITH AUTHORIZATION";
+        case PMIX_RANGE_CUSTOM:
+            return "AVAIL AS SPECIFIED IN DIRECTIVES";
+        default:
+            return "UNKNOWN";
+    }
+}
+
+PMIX_EXPORT const char* PMIx_Info_directives_string(pmix_info_directives_t directives)
+{
+    switch(directives) {
+        case PMIX_INFO_REQD:
+            return "REQUIRED";
+        default:
+            return "UNSPECIFIED";
+    }
+}
+
+PMIX_EXPORT const char* PMIx_Alloc_directive_string(pmix_alloc_directive_t directive)
+{
+    switch(directive) {
+        case PMIX_ALLOC_NEW:
+            return "NEW";
+        case PMIX_ALLOC_EXTEND:
+            return "EXTEND";
+        case PMIX_ALLOC_RELEASE:
+            return "RELEASE";
+        case PMIX_ALLOC_REAQUIRE:
+            return "REACQUIRE";
+        default:
+            return "UNSPECIFIED";
+    }
+}
+
+
+PMIX_EXPORT const char* pmix_command_string(pmix_cmd_t cmd)
+{
+    switch(cmd) {
+        case PMIX_REQ_CMD:
+            return "REQUEST INIT INFO";
+        case PMIX_ABORT_CMD:
+            return "ABORT";
+        case PMIX_COMMIT_CMD:
+            return "COMMIT";
+        case PMIX_FENCENB_CMD:
+            return "FENCE";
+        case PMIX_GETNB_CMD:
+            return "GET";
+        case PMIX_FINALIZE_CMD:
+            return "FINALIZE";
+        case PMIX_PUBLISHNB_CMD:
+            return "PUBLISH";
+        case PMIX_LOOKUPNB_CMD:
+            return "LOOKUP";
+        case PMIX_UNPUBLISHNB_CMD:
+            return "UNPUBLISH";
+        case PMIX_SPAWNNB_CMD:
+            return "SPAWN";
+        case PMIX_CONNECTNB_CMD:
+            return "CONNECT";
+        case PMIX_DISCONNECTNB_CMD:
+            return "DISCONNECT";
+        case PMIX_NOTIFY_CMD:
+            return "NOTIFY";
+        case PMIX_REGEVENTS_CMD:
+            return "REGISTER EVENT HANDLER";
+        case PMIX_DEREGEVENTS_CMD:
+            return "DEREGISTER EVENT HANDLER";
+        case PMIX_QUERY_CMD:
+            return "QUERY";
+        default:
+            return "UNKNOWN";
+    }
+}
+
+PMIX_EXPORT const char* PMIx_Data_type_string(pmix_data_type_t type)
+{
+    pmix_bfrop_type_info_t *info;
+
+    if (NULL == (info = (pmix_bfrop_type_info_t*)pmix_pointer_array_get_item(&pmix_bfrop_types, type))) {
+        return "UNKNOWN";
+    }
+    if (NULL == info->odti_name) {
+        return "UNKNOWN";
+    }
+    return info->odti_name;
+}
diff --git a/src/dstore/Makefile.include b/src/dstore/Makefile.include
new file mode 100644
index 0000000..a317230
--- /dev/null
+++ b/src/dstore/Makefile.include
@@ -0,0 +1,16 @@
+# Copyright (c) 2015-2016 Mellanox Technologies, Inc.
+#                         All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+
+
+headers += \
+        dstore/pmix_dstore.h \
+        dstore/pmix_esh.h
+
+sources += \
+        dstore/pmix_dstore.c \
+        dstore/pmix_esh.c
diff --git a/src/dstore/pmix_dstore.c b/src/dstore/pmix_dstore.c
new file mode 100644
index 0000000..1c0af9c
--- /dev/null
+++ b/src/dstore/pmix_dstore.c
@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) 2016      Mellanox Technologies, Inc.
+ *                         All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+#include <pmix_common.h>
+#include "src/include/pmix_globals.h"
+
+#include "pmix_dstore.h"
+#include "pmix_esh.h"
+
+
+/*
+ * Array of all possible DSTOREs
+ */
+
+/****  ENSURE THE FOLLOWING VALUE IS AT LEAST AS
+ ****  LARGE AS THE TOTAL NUMBER OF SUPPORTED SPCs
+ ****  IN THE ARRAY BELOW
+ */
+
+static pmix_dstore_base_module_t *all[] = {
+    &pmix_dstore_esh_module,
+
+    /* Always end the array with a NULL */
+    NULL
+};
+
+pmix_dstore_base_module_t pmix_dstore = {0};
+
+int pmix_dstore_init(pmix_info_t info[], size_t ninfo)
+{
+    pmix_dstore = *all[0];
+
+    if (!pmix_dstore.init) {
+        return PMIX_ERR_NOT_SUPPORTED;
+    }
+
+    return pmix_dstore.init(info, ninfo);
+}
+
+void pmix_dstore_finalize(void)
+{
+    if (!pmix_dstore.finalize) {
+        return ;
+    }
+
+    pmix_dstore.finalize();
+
+    return ;
+}
+
+int pmix_dstore_store(const char *nspace, pmix_rank_t rank, pmix_kval_t *kv)
+{
+    if (!pmix_dstore.store) {
+        return PMIX_ERR_NOT_SUPPORTED;
+    }
+
+    return pmix_dstore.store(nspace, rank, kv);
+}
+
+int pmix_dstore_fetch(const char *nspace, pmix_rank_t rank,
+                      const char *key, pmix_value_t **kvs)
+{
+    if (!pmix_dstore.fetch) {
+        return PMIX_ERR_NOT_SUPPORTED;
+    }
+
+    return pmix_dstore.fetch(nspace, rank, key, kvs);
+}
+
+int pmix_dstore_patch_env(const char *nspace, char ***env)
+{
+    if (!pmix_dstore.patch_env) {
+        return PMIX_ERR_NOT_SUPPORTED;
+    }
+    return pmix_dstore.patch_env(nspace, env);
+}
+
+int pmix_dstore_nspace_add(const char *nspace, pmix_info_t info[], size_t ninfo)
+{
+    if (!pmix_dstore.nspace_add) {
+        return PMIX_ERR_NOT_SUPPORTED;
+    }
+    return pmix_dstore.nspace_add(nspace, info, ninfo);
+}
+
+int pmix_dstore_nspace_del(const char *nspace)
+{
+    if (!pmix_dstore.nspace_del) {
+        return PMIX_ERR_NOT_SUPPORTED;
+    }
+    return pmix_dstore.nspace_del(nspace);
+}
diff --git a/src/dstore/pmix_dstore.h b/src/dstore/pmix_dstore.h
new file mode 100644
index 0000000..5ec75a6
--- /dev/null
+++ b/src/dstore/pmix_dstore.h
@@ -0,0 +1,137 @@
+/*
+ * Copyright (c) 2016      Mellanox Technologies, Inc.
+ *                         All rights reserved.
+ * Copyright (c) 2016      Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#ifndef PMIX_DSTORE_H
+#define PMIX_DSTORE_H
+
+#include <src/include/pmix_config.h>
+
+
+#include <pmix_common.h>
+#include "src/buffer_ops/buffer_ops.h"
+
+
+BEGIN_C_DECLS
+
+
+int pmix_dstore_init(pmix_info_t info[], size_t ninfo);
+void pmix_dstore_finalize(void);
+int pmix_dstore_store(const char *nspace, pmix_rank_t rank, pmix_kval_t *kv);
+
+/*
+ * Return codes:
+ * - PMIX_ERR_BAD_PARAM - bad parameters - can't proceed.
+ * - PMIX_ERR_FATAL - fatal error
+ * - PMIX_ERR_NOT_FOUND - we have the BLOB for the process but the
+ *   requested key wasn't found there
+ * - PMIX_ERR_PROC_ENTRY_NOT_FOUND - the BLOB for the process wasn't
+ *   found - need to request it from the server.
+ */
+int pmix_dstore_fetch(const char *nspace, pmix_rank_t rank,
+                      const char *key, pmix_value_t **kvs);
+int pmix_dstore_patch_env(const char *nspace, char ***env);
+int pmix_dstore_nspace_add(const char *nspace, pmix_info_t info[], size_t ninfo);
+int pmix_dstore_nspace_del(const char *nspace);
+
+/**
+ * Initialize the module. Returns an error if the module cannot
+ * run, success if it can and wants to be used.
+ */
+typedef int (*pmix_dstore_base_module_init_fn_t)(pmix_info_t info[], size_t ninfo);
+
+/**
+ * Finalize the module. Tear down any allocated storage, disconnect
+ * from any system support.
+ */
+typedef int (*pmix_dstore_base_module_fini_fn_t)(void);
+
+/**
+* store key/value pair in datastore.
+*
+* @param nspace   namespace string
+*
+* @param rank     rank.
+*
+* @param kv       key/value pair.
+*
+* @return PMIX_SUCCESS on success.
+*/
+typedef int (*pmix_dstore_base_module_store_fn_t)(const char *nspace,
+                                                  pmix_rank_t rank,
+                                                  pmix_kval_t *kv);
+
+/**
+* fetch value in datastore.
+*
+* @param nspace   namespace string
+*
+* @param rank     rank.
+*
+* @param key      key.
+*
+* @return kvs(key/value pair) and PMIX_SUCCESS on success.
+*/
+typedef int (*pmix_dstore_base_module_fetch_fn_t)(const char *nspace,
+                                                   pmix_rank_t rank,
+                                                   const char *key,
+                                                   pmix_value_t **kvs);
+
+/**
+* get base dstore path.
+*
+* @param nspace   namespace string
+*
+* @param rank     rank.
+*
+* @return PMIX_SUCCESS on success.
+*/
+typedef int (*pmix_dstore_base_module_proc_patch_env_fn_t)(const char *nspace, char ***env);
+
+/**
+* get base dstore path.
+*
+* @param nspace   namespace string
+*
+* @param rank     rank.
+*
+* @return PMIX_SUCCESS on success.
+*/
+typedef int (*pmix_dstore_base_module_add_nspace_fn_t)(const char *nspace,
+                                                        pmix_info_t info[],
+                                                        size_t ninfo);
+
+/**
+* finalize nspace.
+*
+* @param nspace   namespace string
+*
+* @return PMIX_SUCCESS on success.
+*/
+typedef int (*pmix_dstore_base_module_del_nspace_fn_t)(const char *nspace);
+
+/**
+* structure for dstore modules
+*/
+typedef struct {
+    const char *name;
+    pmix_dstore_base_module_init_fn_t        init;
+    pmix_dstore_base_module_fini_fn_t        finalize;
+    pmix_dstore_base_module_store_fn_t       store;
+    pmix_dstore_base_module_fetch_fn_t       fetch;
+    pmix_dstore_base_module_proc_patch_env_fn_t   patch_env;
+    pmix_dstore_base_module_add_nspace_fn_t  nspace_add;
+    pmix_dstore_base_module_del_nspace_fn_t  nspace_del;
+
+} pmix_dstore_base_module_t;
+
+END_C_DECLS
+
+#endif /* PMIX_DSTORE_H */
diff --git a/src/dstore/pmix_esh.c b/src/dstore/pmix_esh.c
new file mode 100644
index 0000000..de23cbd
--- /dev/null
+++ b/src/dstore/pmix_esh.c
@@ -0,0 +1,2539 @@
+/*
+ * Copyright (c) 2015-2017 Mellanox Technologies, Inc.
+ *                         All rights reserved.
+ * Copyright (c) 2016-2017 Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2016-2017 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2017      Los Alamos National Security, LLC. All rights
+ *                         reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#define _GNU_SOURCE
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/file.h>
+#include <dirent.h>
+#include <errno.h>
+
+#include <src/include/pmix_config.h>
+#include <pmix_server.h>
+#include <pmix_common.h>
+#include "src/include/pmix_globals.h"
+
+#include "src/class/pmix_value_array.h"
+#include "src/buffer_ops/buffer_ops.h"
+#include "src/buffer_ops/types.h"
+#include "src/util/pmix_environ.h"
+#include "src/util/hash.h"
+#include "src/util/error.h"
+#include "src/sm/pmix_sm.h"
+#include "src/util/argv.h"
+
+#include "pmix_dstore.h"
+#include "pmix_esh.h"
+
+#ifdef ESH_FCNTL_LOCK
+#include <fcntl.h>
+#endif
+
+#ifdef ESH_PTHREAD_LOCK
+#include <pthread.h>
+#endif
+
+static int _esh_init(pmix_info_t info[], size_t ninfo);
+static int _esh_finalize(void);
+static int _esh_store(const char *nspace, pmix_rank_t rank, pmix_kval_t *kv);
+static int _esh_fetch(const char *nspace, pmix_rank_t rank, const char *key, pmix_value_t **kvs);
+static int _esh_patch_env(const char *nspace, char ***env);
+static int _esh_nspace_add(const char *nspace, pmix_info_t info[], size_t ninfo);
+static int _esh_nspace_del(const char *nspace);
+
+pmix_dstore_base_module_t pmix_dstore_esh_module = {
+    "esh",
+    _esh_init,
+    _esh_finalize,
+    _esh_store,
+    _esh_fetch,
+    _esh_patch_env,
+    _esh_nspace_add,
+    _esh_nspace_del
+};
+
+#define ESH_REGION_EXTENSION        "EXTENSION_SLOT"
+#define ESH_REGION_INVALIDATED      "INVALIDATED"
+#define ESH_ENV_INITIAL_SEG_SIZE    "INITIAL_SEG_SIZE"
+#define ESH_ENV_NS_META_SEG_SIZE    "NS_META_SEG_SIZE"
+#define ESH_ENV_NS_DATA_SEG_SIZE    "NS_DATA_SEG_SIZE"
+#define ESH_ENV_LINEAR              "SM_USE_LINEAR_SEARCH"
+
+#define ESH_MIN_KEY_LEN             (sizeof(ESH_REGION_INVALIDATED))
+
+#define ESH_KV_SIZE(addr)                                   \
+__extension__ ({                                            \
+    size_t sz;                                              \
+    memcpy(&sz, addr, sizeof(size_t));                      \
+    sz;                                                     \
+})
+
+#define ESH_KNAME_PTR(addr)                                 \
+__extension__ ({                                            \
+    char *name_ptr = (char *)addr + sizeof(size_t);         \
+    name_ptr;                                               \
+})
+
+#define ESH_KNAME_LEN(key)                                  \
+__extension__ ({                                            \
+    size_t kname_len = strlen(key) + 1;                     \
+    size_t len = (kname_len < ESH_MIN_KEY_LEN) ?            \
+    ESH_MIN_KEY_LEN : kname_len;                            \
+    len;                                                    \
+})
+
+#define ESH_DATA_PTR(addr)                                  \
+__extension__ ({                                            \
+    size_t kname_len = ESH_KNAME_LEN(ESH_KNAME_PTR(addr));  \
+    uint8_t *data_ptr = addr + sizeof(size_t) + kname_len;  \
+    data_ptr;                                               \
+})
+
+#define ESH_DATA_SIZE(addr, data_ptr)                       \
+__extension__ ({                                            \
+    size_t sz = ESH_KV_SIZE(addr);                          \
+    size_t data_size = sz - (data_ptr - addr);              \
+    data_size;                                              \
+})
+
+#define ESH_KEY_SIZE(key, size)                             \
+__extension__ ({                                            \
+    size_t len = sizeof(size_t) + ESH_KNAME_LEN(key) + size;\
+    len;                                                    \
+})
+
+/* in ext slot new offset will be stored in case if
+ * new data were added for the same process during
+ * next commit
+ */
+#define EXT_SLOT_SIZE()                                     \
+    (ESH_KEY_SIZE(ESH_REGION_EXTENSION, sizeof(size_t)))
+
+
+#define ESH_PUT_KEY(addr, key, buffer, size)                \
+__extension__ ({                                            \
+    size_t sz = ESH_KEY_SIZE(key, size);                    \
+    memcpy(addr, &sz, sizeof(size_t));                      \
+    memset(addr + sizeof(size_t), 0, ESH_KNAME_LEN(key));   \
+    strncpy((char *)addr + sizeof(size_t),                  \
+            key, ESH_KNAME_LEN(key));                       \
+    memcpy(addr + sizeof(size_t) + ESH_KNAME_LEN(key),      \
+            buffer, size);                                  \
+})
+
+#ifdef ESH_PTHREAD_LOCK
+#define _ESH_LOCK(rwlock, func)                             \
+__extension__ ({                                            \
+    pmix_status_t ret = PMIX_SUCCESS;                       \
+    int rc;                                                 \
+    rc = pthread_rwlock_##func(rwlock);                     \
+    if (0 != rc) {                                          \
+        switch (errno) {                                    \
+            case EINVAL:                                    \
+                ret = PMIX_ERR_INIT;                        \
+                break;                                      \
+            case EPERM:                                     \
+                ret = PMIX_ERR_NO_PERMISSIONS;              \
+                break;                                      \
+        }                                                   \
+    }                                                       \
+    if (ret) {                                              \
+        pmix_output(0, "%s %d:%s lock failed: %s",          \
+            __FILE__, __LINE__, __func__, strerror(errno)); \
+    }                                                       \
+    ret;                                                    \
+})
+
+#define _ESH_WRLOCK(rwlock) _ESH_LOCK(rwlock, wrlock)
+#define _ESH_RDLOCK(rwlock) _ESH_LOCK(rwlock, rdlock)
+#define _ESH_UNLOCK(rwlock) _ESH_LOCK(rwlock, unlock)
+#endif
+
+#ifdef ESH_FCNTL_LOCK
+#define _ESH_LOCK(lockfd, operation)                        \
+__extension__ ({                                            \
+    pmix_status_t ret = PMIX_SUCCESS;                       \
+    int i;                                                  \
+    struct flock fl = {0};                                  \
+    fl.l_type = operation;                                  \
+    fl.l_whence = SEEK_SET;                                 \
+    for(i = 0; i < 10; i++) {                               \
+        if( 0 > fcntl(lockfd, F_SETLKW, &fl) ) {            \
+            switch( errno ){                                \
+                case EINTR:                                 \
+                    continue;                               \
+                case ENOENT:                                \
+                case EINVAL:                                \
+                    ret = PMIX_ERR_NOT_FOUND;               \
+                    break;                                  \
+                case EBADF:                                 \
+                    ret = PMIX_ERR_BAD_PARAM;               \
+                    break;                                  \
+                case EDEADLK:                               \
+                case EFAULT:                                \
+                case ENOLCK:                                \
+                    ret = PMIX_ERR_RESOURCE_BUSY;           \
+                    break;                                  \
+                default:                                    \
+                    ret = PMIX_ERROR;                       \
+                    break;                                  \
+            }                                               \
+        }                                                   \
+        break;                                              \
+    }                                                       \
+    if (ret) {                                              \
+        pmix_output(0, "%s %d:%s lock failed: %s",          \
+            __FILE__, __LINE__, __func__, strerror(errno)); \
+    }                                                       \
+    ret;                                                    \
+})
+
+#define _ESH_WRLOCK(lock) _ESH_LOCK(lock, F_WRLCK)
+#define _ESH_RDLOCK(lock) _ESH_LOCK(lock, F_RDLCK)
+#define _ESH_UNLOCK(lock) _ESH_LOCK(lock, F_UNLCK)
+#endif
+
+#define ESH_INIT_SESSION_TBL_SIZE 2
+#define ESH_INIT_NS_MAP_TBL_SIZE  2
+
+static int _store_data_for_rank(ns_track_elem_t *ns_info, pmix_rank_t rank, pmix_buffer_t *buf);
+static seg_desc_t *_create_new_segment(segment_type type, const ns_map_data_t *ns_map, uint32_t id);
+static seg_desc_t *_attach_new_segment(segment_type type, const ns_map_data_t *ns_map, uint32_t id);
+static int _update_ns_elem(ns_track_elem_t *ns_elem, ns_seg_info_t *info);
+static int _put_ns_info_to_initial_segment(const ns_map_data_t *ns_map, pmix_sm_seg_t *metaseg, pmix_sm_seg_t *dataseg);
+static ns_seg_info_t *_get_ns_info_from_initial_segment(const ns_map_data_t *ns_map);
+static ns_track_elem_t *_get_track_elem_for_namespace(ns_map_data_t *ns_map);
+static rank_meta_info *_get_rank_meta_info(pmix_rank_t rank, seg_desc_t *segdesc);
+static uint8_t *_get_data_region_by_offset(seg_desc_t *segdesc, size_t offset);
+static void _update_initial_segment_info(const ns_map_data_t *ns_map);
+static void _set_constants_from_env(void);
+static void _delete_sm_desc(seg_desc_t *desc);
+static int _pmix_getpagesize(void);
+static inline ssize_t _get_univ_size(const char *nspace);
+
+static inline ns_map_data_t * _esh_session_map_search_server(const char *nspace);
+static inline ns_map_data_t * _esh_session_map_search_client(const char *nspace);
+static inline ns_map_data_t * _esh_session_map(const char *nspace, size_t tbl_idx);
+static inline void _esh_session_map_clean(ns_map_t *m);
+static inline int _esh_jobuid_tbl_search(uid_t jobuid, size_t *tbl_idx);
+static inline int _esh_session_tbl_add(size_t *tbl_idx);
+static inline int _esh_session_init(size_t idx, ns_map_data_t *m, size_t jobuid, int setjobuid);
+static inline void _esh_session_release(session_t *s);
+static inline void _esh_ns_track_cleanup(void);
+static inline void _esh_sessions_cleanup(void);
+static inline void _esh_ns_map_cleanup(void);
+static inline int _esh_dir_del(const char *dirname);
+
+static char *_base_path = NULL;
+static size_t _initial_segment_size = 0;
+static size_t _max_ns_num;
+static size_t _meta_segment_size = 0;
+static size_t _max_meta_elems;
+static size_t _data_segment_size = 0;
+static size_t _lock_segment_size = 0;
+static uid_t _jobuid;
+static char _setjobuid = 0;
+
+static pmix_value_array_t *_session_array = NULL;
+static pmix_value_array_t *_ns_map_array = NULL;
+static pmix_value_array_t *_ns_track_array = NULL;
+
+ns_map_data_t * (*_esh_session_map_search)(const char *nspace) = NULL;
+int (*_esh_lock_init)(size_t idx) = NULL;
+
+#define _ESH_SESSION_path(tbl_idx)         (PMIX_VALUE_ARRAY_GET_BASE(_session_array, session_t)[tbl_idx].nspace_path)
+#define _ESH_SESSION_lockfile(tbl_idx)     (PMIX_VALUE_ARRAY_GET_BASE(_session_array, session_t)[tbl_idx].lockfile)
+#define _ESH_SESSION_setjobuid(tbl_idx)    (PMIX_VALUE_ARRAY_GET_BASE(_session_array, session_t)[tbl_idx].setjobuid)
+#define _ESH_SESSION_jobuid(tbl_idx)       (PMIX_VALUE_ARRAY_GET_BASE(_session_array, session_t)[tbl_idx].jobuid)
+#define _ESH_SESSION_sm_seg_first(tbl_idx) (PMIX_VALUE_ARRAY_GET_BASE(_session_array, session_t)[tbl_idx].sm_seg_first)
+#define _ESH_SESSION_sm_seg_last(tbl_idx)  (PMIX_VALUE_ARRAY_GET_BASE(_session_array, session_t)[tbl_idx].sm_seg_last)
+#define _ESH_SESSION_ns_info(tbl_idx)      (PMIX_VALUE_ARRAY_GET_BASE(_session_array, session_t)[tbl_idx].ns_info)
+
+#ifdef ESH_PTHREAD_LOCK
+#define _ESH_SESSION_pthread_rwlock(tbl_idx) (PMIX_VALUE_ARRAY_GET_BASE(_session_array, session_t)[tbl_idx].rwlock)
+#define _ESH_SESSION_pthread_seg(tbl_idx)   (PMIX_VALUE_ARRAY_GET_BASE(_session_array, session_t)[tbl_idx].rwlock_seg)
+#define _ESH_SESSION_lock(tbl_idx)         _ESH_SESSION_pthread_rwlock(tbl_idx)
+#endif
+
+#ifdef ESH_FCNTL_LOCK
+#define _ESH_SESSION_lockfd(tbl_idx)       (PMIX_VALUE_ARRAY_GET_BASE(_session_array, session_t)[tbl_idx].lockfd)
+#define _ESH_SESSION_lock(tbl_idx)         _ESH_SESSION_lockfd(tbl_idx)
+#endif
+
+/* If _direct_mode is set, it means that we use linear search
+ * along the array of rank meta info objects inside a meta segment
+ * to find the requested rank. Otherwise,  we do a fast lookup
+ * based on rank and directly compute offset.
+ * This mode is called direct because it's effectively used in
+ * sparse communication patterns when direct modex is usually used.
+ */
+static int _direct_mode = 0;
+
+static void ncon(ns_track_elem_t *p) {
+    memset(&p->ns_map, 0, sizeof(p->ns_map));
+    p->meta_seg = NULL;
+    p->data_seg = NULL;
+    p->num_meta_seg = 0;
+    p->num_data_seg = 0;
+    p->in_use = true;
+}
+
+static void ndes(ns_track_elem_t *p) {
+    _delete_sm_desc(p->meta_seg);
+    _delete_sm_desc(p->data_seg);
+    memset(&p->ns_map, 0, sizeof(p->ns_map));
+    p->in_use = false;
+}
+
+PMIX_CLASS_INSTANCE(ns_track_elem_t,
+                    pmix_value_array_t,
+                    ncon, ndes);
+
+static inline void _esh_session_map_clean(ns_map_t *m) {
+    memset(m, 0, sizeof(*m));
+    m->data.track_idx = -1;
+}
+
+#ifdef ESH_FCNTL_LOCK
+static inline int _flock_init(size_t idx) {
+    pmix_status_t rc = PMIX_SUCCESS;
+
+    if (PMIX_PROC_SERVER == pmix_globals.proc_type) {
+        _ESH_SESSION_lock(idx) = open(_ESH_SESSION_lockfile(idx), O_CREAT | O_RDWR | O_EXCL, 0600);
+
+        /* if previous launch was crashed, the lockfile might not be deleted and unlocked,
+         * so we delete it and create a new one. */
+        if (_ESH_SESSION_lock(idx) < 0) {
+            unlink(_ESH_SESSION_lockfile(idx));
+            _ESH_SESSION_lock(idx) = open(_ESH_SESSION_lockfile(idx), O_CREAT | O_RDWR, 0600);
+            if (_ESH_SESSION_lock(idx) < 0) {
+                rc = PMIX_ERROR;
+                PMIX_ERROR_LOG(rc);
+                return rc;
+            }
+        }
+        if (_ESH_SESSION_setjobuid(idx) > 0) {
+            if (0 > chown(_ESH_SESSION_lockfile(idx), (uid_t) _ESH_SESSION_jobuid(idx), (gid_t) -1)) {
+                rc = PMIX_ERROR;
+                PMIX_ERROR_LOG(rc);
+                return rc;
+            }
+            if (0 > chmod(_ESH_SESSION_lockfile(idx), S_IRUSR | S_IWGRP | S_IRGRP)) {
+                rc = PMIX_ERROR;
+                PMIX_ERROR_LOG(rc);
+                return rc;
+            }
+        }
+    }
+    else {
+        _ESH_SESSION_lock(idx) = open(_ESH_SESSION_lockfile(idx), O_RDONLY);
+        if (-1 == _ESH_SESSION_lock(idx)) {
+            rc = PMIX_ERROR;
+            PMIX_ERROR_LOG(rc);
+            return rc;
+        }
+    }
+    return rc;
+}
+#endif
+
+#ifdef ESH_PTHREAD_LOCK
+static inline int _rwlock_init(size_t idx) {
+    pmix_status_t rc = PMIX_SUCCESS;
+    size_t size = _lock_segment_size;
+    pthread_rwlockattr_t attr;
+
+    if ((NULL != _ESH_SESSION_pthread_seg(idx)) || (NULL != _ESH_SESSION_pthread_rwlock(idx))) {
+        rc = PMIX_ERR_INIT;
+        return rc;
+    }
+    _ESH_SESSION_pthread_seg(idx) = (pmix_sm_seg_t *)malloc(sizeof(pmix_sm_seg_t));
+    if (NULL == _ESH_SESSION_pthread_seg(idx)) {
+        rc = PMIX_ERR_OUT_OF_RESOURCE;
+        return rc;
+    }
+
+    if (PMIX_PROC_SERVER == pmix_globals.proc_type) {
+        if (PMIX_SUCCESS != (rc = pmix_sm_segment_create(_ESH_SESSION_pthread_seg(idx), _ESH_SESSION_lockfile(idx), size))) {
+            return rc;
+        }
+        memset(_ESH_SESSION_pthread_seg(idx)->seg_base_addr, 0, size);
+        if (_ESH_SESSION_setjobuid(idx) > 0) {
+            if (0 > chown(_ESH_SESSION_lockfile(idx), (uid_t) _ESH_SESSION_jobuid(idx), (gid_t) -1)){
+                rc = PMIX_ERROR;
+                PMIX_ERROR_LOG(rc);
+                return rc;
+            }
+            /* set the mode as required */
+            if (0 > chmod(_ESH_SESSION_lockfile(idx), S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP )) {
+                rc = PMIX_ERROR;
+                PMIX_ERROR_LOG(rc);
+                return rc;
+            }
+        }
+        _ESH_SESSION_pthread_rwlock(idx) = (pthread_rwlock_t *)_ESH_SESSION_pthread_seg(idx)->seg_base_addr;
+
+        if (0 != pthread_rwlockattr_init(&attr)) {
+            rc = PMIX_ERR_INIT;
+            pmix_sm_segment_detach(_ESH_SESSION_pthread_seg(idx));
+            return rc;
+        }
+        if (0 != pthread_rwlockattr_setpshared(&attr, PTHREAD_PROCESS_SHARED)) {
+            rc = PMIX_ERR_INIT;
+            pmix_sm_segment_detach(_ESH_SESSION_pthread_seg(idx));
+            pthread_rwlockattr_destroy(&attr);
+            return rc;
+        }
+#ifdef HAVE_PTHREAD_SETKIND
+        if (0 != pthread_rwlockattr_setkind_np(&attr, PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP)) {
+            rc = PMIX_ERR_INIT;
+            pmix_sm_segment_detach(_ESH_SESSION_pthread_seg(idx));
+            pthread_rwlockattr_destroy(&attr);
+            return rc;
+        }
+#endif
+        if (0 != pthread_rwlock_init(_ESH_SESSION_pthread_rwlock(idx), &attr)) {
+            rc = PMIX_ERR_INIT;
+            pmix_sm_segment_detach(_ESH_SESSION_pthread_seg(idx));
+            pthread_rwlockattr_destroy(&attr);
+            return rc;
+        }
+        if (0 != pthread_rwlockattr_destroy(&attr)) {
+            rc = PMIX_ERR_INIT;
+            return rc;
+        }
+
+    }
+    else {
+        _ESH_SESSION_pthread_seg(idx)->seg_size = size;
+        snprintf(_ESH_SESSION_pthread_seg(idx)->seg_name, PMIX_PATH_MAX, "%s", _ESH_SESSION_lockfile(idx));
+        if (PMIX_SUCCESS != (rc = pmix_sm_segment_attach(_ESH_SESSION_pthread_seg(idx), PMIX_SM_RW))) {
+            return rc;
+        }
+        _ESH_SESSION_pthread_rwlock(idx) = (pthread_rwlock_t *)_ESH_SESSION_pthread_seg(idx)->seg_base_addr;
+    }
+
+    return rc;
+}
+
+static inline void _rwlock_release(session_t *s) {
+    pmix_status_t rc;
+
+    if (0 != pthread_rwlock_destroy(s->rwlock)) {
+        rc = PMIX_ERROR;
+        PMIX_ERROR_LOG(rc);
+        return;
+    }
+
+    /* detach & unlink from current desc */
+    if (s->rwlock_seg->seg_cpid == getpid()) {
+        pmix_sm_segment_unlink(s->rwlock_seg);
+    }
+    pmix_sm_segment_detach(s->rwlock_seg);
+
+    free(s->rwlock_seg);
+    s->rwlock_seg = NULL;
+    s->rwlock = NULL;
+}
+#endif
+
+static inline const char *_unique_id(void)
+{
+    static const char *str = NULL;
+    if (!str) {
+        /* see: pmix_server.c initialize_server_base()
+         * to get format of uri
+         */
+        if (PMIX_PROC_SERVER == pmix_globals.proc_type) {
+            static char buf[100];
+            snprintf(buf, sizeof(buf) - 1, "pmix-%d", getpid());
+            str = buf;
+        } else {
+            str = getenv("PMIX_SERVER_URI");
+            if (str) {
+                str = strrchr(str, '/');
+            }
+            str = (str ? str + 1 : "$$$");
+        }
+    }
+    return str;
+}
+
+static inline int _esh_dir_del(const char *path)
+{
+    DIR *dir;
+    struct dirent *d_ptr;
+    struct stat st;
+    pmix_status_t rc = PMIX_SUCCESS;
+
+    char name[PMIX_PATH_MAX];
+
+    dir = opendir(path);
+    if (NULL == dir) {
+        rc = PMIX_ERR_BAD_PARAM;
+        return rc;
+    }
+
+    while (NULL != (d_ptr = readdir(dir))) {
+        snprintf(name, PMIX_PATH_MAX, "%s/%s", path, d_ptr->d_name);
+        if ( 0 > lstat(name, &st) ){
+            /* No fatal error here - just log this event
+             * we will hit the error later at rmdir. Keep trying ...
+             */
+            PMIX_ERROR_LOG(PMIX_ERR_NOT_FOUND);
+            continue;
+        }
+
+        if(S_ISDIR(st.st_mode)) {
+            if(strcmp(d_ptr->d_name, ".") && strcmp(d_ptr->d_name, "..")) {
+                rc = _esh_dir_del(name);
+                if( PMIX_SUCCESS != rc ){
+                    /* No fatal error here - just log this event
+                     * we will hit the error later at rmdir. Keep trying ...
+                     */
+                    PMIX_ERROR_LOG(rc);
+                }
+            }
+        }
+        else {
+            if( 0 > unlink(name) ){
+                /* No fatal error here - just log this event
+                 * we will hit the error later at rmdir. Keep trying ...
+                 */
+                PMIX_ERROR_LOG(PMIX_ERR_NO_PERMISSIONS);
+            }
+        }
+    }
+    closedir(dir);
+
+    /* remove the top dir */
+    if( 0 > rmdir(path) ){
+        rc = PMIX_ERR_NO_PERMISSIONS;
+        PMIX_ERROR_LOG(rc);
+    }
+    return rc;
+}
+
+static inline int _esh_tbls_init(void)
+{
+    pmix_status_t rc = PMIX_SUCCESS;
+    size_t idx;
+
+    /* initial settings */
+    _ns_track_array = NULL;
+    _session_array = NULL;
+    _ns_map_array = NULL;
+
+    /* Setup namespace tracking array */
+    if (NULL == (_ns_track_array = PMIX_NEW(pmix_value_array_t))) {
+        rc = PMIX_ERR_OUT_OF_RESOURCE;
+        PMIX_ERROR_LOG(rc);
+        goto err_exit;
+    }
+    if (PMIX_SUCCESS != (rc = pmix_value_array_init(_ns_track_array, sizeof(ns_track_elem_t)))){
+        PMIX_ERROR_LOG(rc);
+        goto err_exit;
+    }
+
+    /* Setup sessions table */
+    if (NULL == (_session_array = PMIX_NEW(pmix_value_array_t))){
+        rc = PMIX_ERR_OUT_OF_RESOURCE;
+        PMIX_ERROR_LOG(rc);
+        goto err_exit;
+    }
+    if (PMIX_SUCCESS != (rc = pmix_value_array_init(_session_array, sizeof(session_t)))) {
+        PMIX_ERROR_LOG(rc);
+        goto err_exit;
+    }
+    if (PMIX_SUCCESS != (rc = pmix_value_array_set_size(_session_array, ESH_INIT_SESSION_TBL_SIZE))) {
+        PMIX_ERROR_LOG(rc);
+        goto err_exit;
+    }
+    for (idx = 0; idx < ESH_INIT_SESSION_TBL_SIZE; idx++) {
+        memset(pmix_value_array_get_item(_session_array, idx), 0, sizeof(session_t));
+    }
+
+    /* Setup namespace map array */
+    if (NULL == (_ns_map_array = PMIX_NEW(pmix_value_array_t))) {
+        rc = PMIX_ERR_OUT_OF_RESOURCE;
+        PMIX_ERROR_LOG(rc);
+        goto err_exit;
+    }
+    if (PMIX_SUCCESS != (rc = pmix_value_array_init(_ns_map_array, sizeof(ns_map_t)))) {
+        PMIX_ERROR_LOG(rc);
+        goto err_exit;
+    }
+    if (PMIX_SUCCESS != (rc = pmix_value_array_set_size(_ns_map_array, ESH_INIT_NS_MAP_TBL_SIZE))) {
+        PMIX_ERROR_LOG(rc);
+        goto err_exit;
+    }
+    for (idx = 0; idx < ESH_INIT_NS_MAP_TBL_SIZE; idx++) {
+        _esh_session_map_clean(pmix_value_array_get_item(_ns_map_array, idx));
+    }
+
+    return PMIX_SUCCESS;
+err_exit:
+    if (NULL != _ns_track_array) {
+        PMIX_RELEASE(_ns_track_array);
+    }
+    if (NULL != _session_array) {
+        PMIX_RELEASE(_session_array);
+    }
+    if (NULL != _ns_map_array) {
+        PMIX_RELEASE(_ns_map_array);
+    }
+    return rc;
+}
+
+static inline void _esh_ns_map_cleanup(void)
+{
+    size_t idx;
+    size_t size;
+    ns_map_t *ns_map;
+
+    if (NULL == _ns_map_array) {
+        return;
+    }
+
+    size = pmix_value_array_get_size(_ns_map_array);
+    ns_map = PMIX_VALUE_ARRAY_GET_BASE(_ns_map_array, ns_map_t);
+
+    for (idx = 0; idx < size; idx++) {
+        if(ns_map[idx].in_use)
+            _esh_session_map_clean(&ns_map[idx]);
+    }
+
+    PMIX_RELEASE(_ns_map_array);
+    _ns_map_array = NULL;
+}
+
+static inline void _esh_sessions_cleanup(void)
+{
+    size_t idx;
+    size_t size;
+    session_t *s_tbl;
+
+    if (NULL == _session_array) {
+        return;
+    }
+
+    size = pmix_value_array_get_size(_session_array);
+    s_tbl = PMIX_VALUE_ARRAY_GET_BASE(_session_array, session_t);
+
+    for (idx = 0; idx < size; idx++) {
+        if(s_tbl[idx].in_use)
+            _esh_session_release(&s_tbl[idx]);
+    }
+
+    PMIX_RELEASE(_session_array);
+    _session_array = NULL;
+}
+
+static inline void _esh_ns_track_cleanup(void)
+{
+    int size;
+    ns_track_elem_t *ns_trk;
+
+    if (NULL == _ns_track_array) {
+        return;
+    }
+
+    size = pmix_value_array_get_size(_ns_track_array);
+    ns_trk = PMIX_VALUE_ARRAY_GET_BASE(_ns_track_array, ns_track_elem_t);
+
+    for (int i = 0; i < size; i++) {
+        ns_track_elem_t *trk = ns_trk + i;
+        if (trk->in_use) {
+            PMIX_DESTRUCT(trk);
+        }
+    }
+
+    PMIX_RELEASE(_ns_track_array);
+    _ns_track_array = NULL;
+}
+
+static inline ns_map_data_t * _esh_session_map(const char *nspace, size_t tbl_idx)
+{
+    size_t map_idx;
+    size_t size = pmix_value_array_get_size(_ns_map_array);;
+    ns_map_t *ns_map = PMIX_VALUE_ARRAY_GET_BASE(_ns_map_array, ns_map_t);;
+    ns_map_t *new_map = NULL;
+
+    if (NULL == nspace) {
+        PMIX_ERROR_LOG(PMIX_ERR_BAD_PARAM);
+        return NULL;
+    }
+
+    for(map_idx = 0; map_idx < size; map_idx++) {
+        if (!ns_map[map_idx].in_use) {
+            ns_map[map_idx].in_use = true;
+            strncpy(ns_map[map_idx].data.name, nspace, sizeof(ns_map[map_idx].data.name)-1);
+            ns_map[map_idx].data.tbl_idx = tbl_idx;
+            return  &ns_map[map_idx].data;
+        }
+    }
+
+    if (NULL == (new_map = pmix_value_array_get_item(_ns_map_array, map_idx))) {
+        PMIX_ERROR_LOG(PMIX_ERR_OUT_OF_RESOURCE);
+        return NULL;
+    }
+
+    _esh_session_map_clean(new_map);
+    new_map->in_use = true;
+    new_map->data.tbl_idx = tbl_idx;
+    strncpy(new_map->data.name, nspace, sizeof(new_map->data.name)-1);
+
+    return  &new_map->data;
+}
+
+static inline int _esh_jobuid_tbl_search(uid_t jobuid, size_t *tbl_idx)
+{
+    size_t idx, size;
+    session_t *session_tbl = NULL;
+
+    size = pmix_value_array_get_size(_session_array);
+    session_tbl = PMIX_VALUE_ARRAY_GET_BASE(_session_array, session_t);
+
+    for(idx = 0; idx < size; idx++) {
+        if (session_tbl[idx].in_use && session_tbl[idx].jobuid == jobuid) {
+            *tbl_idx = idx;
+            return PMIX_SUCCESS;
+        }
+    }
+
+    return PMIX_ERR_NOT_FOUND;
+}
+
+static inline int _esh_session_tbl_add(size_t *tbl_idx)
+{
+    size_t idx;
+    size_t size = pmix_value_array_get_size(_session_array);
+    session_t *s_tbl = PMIX_VALUE_ARRAY_GET_BASE(_session_array, session_t);
+    session_t *new_sesion;
+    pmix_status_t rc = PMIX_SUCCESS;
+
+    for(idx = 0; idx < size; idx ++) {
+        if (0 == s_tbl[idx].in_use) {
+            s_tbl[idx].in_use = 1;
+            *tbl_idx = idx;
+            return PMIX_SUCCESS;
+        }
+    }
+
+    if (NULL == (new_sesion = pmix_value_array_get_item(_session_array, idx))) {
+        rc = PMIX_ERR_OUT_OF_RESOURCE;
+        PMIX_ERROR_LOG(rc);
+        return rc;
+    }
+    s_tbl[idx].in_use = 1;
+    *tbl_idx = idx;
+
+    return PMIX_SUCCESS;
+}
+
+static inline ns_map_data_t * _esh_session_map_search_server(const char *nspace)
+{
+    size_t idx, size = pmix_value_array_get_size(_ns_map_array);
+    ns_map_t *ns_map = PMIX_VALUE_ARRAY_GET_BASE(_ns_map_array, ns_map_t);
+    if (NULL == nspace) {
+        return NULL;
+    }
+
+    for (idx = 0; idx < size; idx++) {
+        if (ns_map[idx].in_use &&
+            (0 == strcmp(ns_map[idx].data.name, nspace))) {
+                return &ns_map[idx].data;
+        }
+    }
+    return NULL;
+}
+
+static inline ns_map_data_t * _esh_session_map_search_client(const char *nspace)
+{
+    size_t idx, size = pmix_value_array_get_size(_ns_map_array);
+    ns_map_t *ns_map = PMIX_VALUE_ARRAY_GET_BASE(_ns_map_array, ns_map_t);
+
+    if (NULL == nspace) {
+        return NULL;
+    }
+
+    for (idx = 0; idx < size; idx++) {
+        if (ns_map[idx].in_use &&
+            (0 == strcmp(ns_map[idx].data.name, nspace))) {
+                return &ns_map[idx].data;
+        }
+    }
+    return _esh_session_map(nspace, 0);
+}
+
+static inline int _esh_session_init(size_t idx, ns_map_data_t *m, size_t jobuid, int setjobuid)
+{
+    seg_desc_t *seg = NULL;
+    session_t *s = &(PMIX_VALUE_ARRAY_GET_ITEM(_session_array, session_t, idx));
+    pmix_status_t rc = PMIX_SUCCESS;
+
+    s->setjobuid = setjobuid;
+    s->jobuid = jobuid;
+    s->nspace_path = strdup(_base_path);
+
+    /* create a lock file to prevent clients from reading while server is writing to the shared memory.
+    * This situation is quite often, especially in case of direct modex when clients might ask for data
+    * simultaneously.*/
+    if(0 > asprintf(&s->lockfile, "%s/dstore_sm.lock", s->nspace_path)) {
+        rc = PMIX_ERR_OUT_OF_RESOURCE;
+        PMIX_ERROR_LOG(rc);
+        return rc;
+    }
+    PMIX_OUTPUT_VERBOSE((10, pmix_globals.debug_output,
+        "%s:%d:%s _lockfile_name: %s", __FILE__, __LINE__, __func__, s->lockfile));
+
+    if (PMIX_PROC_SERVER == pmix_globals.proc_type) {
+        if (0 != mkdir(s->nspace_path, 0770)) {
+            if (EEXIST != errno) {
+                pmix_output(0, "session init: can not create session directory \"%s\": %s",
+                    s->nspace_path, strerror(errno));
+                rc = PMIX_ERROR;
+                PMIX_ERROR_LOG(rc);
+                return rc;
+            }
+        }
+        if (s->setjobuid > 0){
+            if (0 > chown(s->nspace_path, (uid_t) s->jobuid, (gid_t) -1)){
+                rc = PMIX_ERROR;
+                PMIX_ERROR_LOG(rc);
+                return rc;
+            }
+        }
+        seg = _create_new_segment(INITIAL_SEGMENT, m, 0);
+        if( NULL == seg ){
+            rc = PMIX_ERR_OUT_OF_RESOURCE;
+            PMIX_ERROR_LOG(rc);
+            return rc;
+        }
+    }
+    else {
+        seg = _attach_new_segment(INITIAL_SEGMENT, m, 0);
+        if( NULL == seg ){
+            rc = PMIX_ERR_OUT_OF_RESOURCE;
+            PMIX_ERROR_LOG(rc);
+            return rc;
+        }
+    }
+
+    if (NULL == _esh_lock_init) {
+        rc = PMIX_ERR_INIT;
+        PMIX_ERROR_LOG(rc);
+        return rc;
+    }
+    if ( PMIX_SUCCESS != (rc = _esh_lock_init(m->tbl_idx))) {
+        PMIX_ERROR_LOG(rc);
+        return rc;
+    }
+
+    s->sm_seg_first = seg;
+    s->sm_seg_last = s->sm_seg_first;
+    return PMIX_SUCCESS;
+}
+
+static inline void _esh_session_release(session_t *s)
+{
+    if (!s->in_use) {
+        return;
+    }
+
+    _delete_sm_desc(s->sm_seg_first);
+    /* the session_t structures are initialized to zero. If
+     * we release the session without having actually assigned
+     * a locking fd, then we don't want to close that fd
+     * as it doesn't belong to us */
+    if (0 != s->lockfd) {
+        close(s->lockfd);
+    }
+
+    if (NULL != s->lockfile) {
+        if(PMIX_PROC_SERVER == pmix_globals.proc_type) {
+            unlink(s->lockfile);
+        }
+        free(s->lockfile);
+    }
+    if (NULL != s->nspace_path) {
+        if(PMIX_PROC_SERVER == pmix_globals.proc_type) {
+            _esh_dir_del(s->nspace_path);
+        }
+        free(s->nspace_path);
+    }
+#ifdef ESH_PTHREAD_LOCK
+    _rwlock_release(s);
+#endif
+    memset ((char *) s, 0, sizeof(*s));
+}
+
+int _esh_init(pmix_info_t info[], size_t ninfo)
+{
+    pmix_status_t rc;
+    size_t n;
+    char *dstor_tmpdir = NULL;
+    size_t tbl_idx;
+    ns_map_data_t *ns_map = NULL;
+
+    PMIX_OUTPUT_VERBOSE((10, pmix_globals.debug_output,
+                         "%s:%d:%s", __FILE__, __LINE__, __func__));
+
+    _jobuid = getuid();
+    _setjobuid = 0;
+
+#ifdef ESH_PTHREAD_LOCK
+    _esh_lock_init = _rwlock_init;
+#endif
+#ifdef ESH_FCNTL_LOCK
+    _esh_lock_init = _flock_init;
+#endif
+
+    if (PMIX_SUCCESS != (rc = _esh_tbls_init())) {
+        PMIX_ERROR_LOG(rc);
+        goto err_exit;
+    }
+
+    rc = pmix_sm_init();
+    if (PMIX_SUCCESS != rc) {
+        PMIX_ERROR_LOG(rc);
+        goto err_exit;
+    }
+
+    _set_constants_from_env();
+
+    if (NULL != _base_path) {
+        free(_base_path);
+        _base_path = NULL;
+    }
+
+    /* find the temp dir */
+    if (PMIX_PROC_SERVER == pmix_globals.proc_type) {
+        _esh_session_map_search = _esh_session_map_search_server;
+
+        /* scan incoming info for directives */
+        if (NULL != info) {
+            for (n=0; n < ninfo; n++) {
+                if (0 == strcmp(PMIX_USERID, info[n].key)) {
+                    _jobuid = info[n].value.data.uint32;
+                    _setjobuid = 1;
+                    continue;
+                }
+                if (0 == strcmp(PMIX_DSTPATH, info[n].key)) {
+                    /* PMIX_DSTPATH is the way for RM to customize the
+                     * place where shared memory files are placed.
+                     * We need this for the following reasons:
+                     * - disk usage: files can be relatively large and the system may
+                     *   have a small common temp directory.
+                     * - performance: system may have a fast IO device (i.e. burst buffer)
+                     *   for the local usage.
+                     *
+                     * PMIX_DSTPATH has higher priority than PMIX_SERVER_TMPDIR
+                     */
+                    if( PMIX_STRING != info[n].value.type ){
+                        rc = PMIX_ERR_BAD_PARAM;
+                        PMIX_ERROR_LOG(rc);
+                        goto err_exit;
+                    }
+                    dstor_tmpdir = (char*)info[n].value.data.string;
+                    continue;
+                }
+                if (0 == strcmp(PMIX_SERVER_TMPDIR, info[n].key)) {
+                    if( PMIX_STRING != info[n].value.type ){
+                        rc = PMIX_ERR_BAD_PARAM;
+                        PMIX_ERROR_LOG(rc);
+                        goto err_exit;
+                    }
+                    if (NULL == dstor_tmpdir) {
+                        dstor_tmpdir = (char*)info[n].value.data.string;
+                    }
+                    continue;
+                }
+            }
+        }
+
+        if (NULL == dstor_tmpdir) {
+            if (NULL == (dstor_tmpdir = getenv("TMPDIR"))) {
+                if (NULL == (dstor_tmpdir = getenv("TEMP"))) {
+                    if (NULL == (dstor_tmpdir = getenv("TMP"))) {
+                        dstor_tmpdir = "/tmp";
+                    }
+                }
+            }
+        }
+
+        rc = asprintf(&_base_path, "%s/pmix_dstor_%d", dstor_tmpdir, getpid());
+        if ((0 > rc) || (NULL == _base_path)) {
+            rc = PMIX_ERR_OUT_OF_RESOURCE;
+            PMIX_ERROR_LOG(rc);
+            goto err_exit;
+        }
+        if (0 != mkdir(_base_path, 0770)) {
+            if (EEXIST != errno) {
+                rc = PMIX_ERROR;
+                PMIX_ERROR_LOG(rc);
+                goto err_exit;
+            }
+        }
+        if (_setjobuid > 0) {
+            if (chown(_base_path, (uid_t) _jobuid, (gid_t) -1) < 0){
+                rc = PMIX_ERR_NO_PERMISSIONS;
+                PMIX_ERROR_LOG(rc);
+                goto err_exit;
+            }
+        }
+        _esh_session_map_search = _esh_session_map_search_server;
+        return PMIX_SUCCESS;
+    }
+    /* for clients */
+    else {
+        if (NULL == (dstor_tmpdir = getenv(PMIX_DSTORE_ESH_BASE_PATH))){
+            rc = PMIX_ERR_BAD_PARAM;
+            PMIX_ERROR_LOG(rc);
+            goto err_exit;
+        }
+        if (NULL == (_base_path = strdup(dstor_tmpdir))) {
+            rc = PMIX_ERR_OUT_OF_RESOURCE;
+            PMIX_ERROR_LOG(rc);
+            goto err_exit;
+        }
+        _esh_session_map_search = _esh_session_map_search_client;
+    }
+
+    rc = _esh_session_tbl_add(&tbl_idx);
+    if (PMIX_SUCCESS != rc) {
+        PMIX_ERROR_LOG(rc);
+        goto err_exit;
+    }
+
+    ns_map = _esh_session_map(pmix_globals.myid.nspace, tbl_idx);
+    if (NULL == ns_map) {
+        rc = PMIX_ERR_OUT_OF_RESOURCE;
+        PMIX_ERROR_LOG(rc);
+        goto err_exit;
+    }
+
+    if (PMIX_SUCCESS != (rc =_esh_session_init(tbl_idx, ns_map, _jobuid, _setjobuid))) {
+        PMIX_ERROR_LOG(rc);
+        goto err_exit;
+    }
+
+    return PMIX_SUCCESS;
+err_exit:
+    return rc;
+}
+
+int _esh_finalize(void)
+{
+    struct stat st = {0};
+    pmix_status_t rc = PMIX_SUCCESS;
+
+    PMIX_OUTPUT_VERBOSE((10, pmix_globals.debug_output,
+                         "%s:%d:%s", __FILE__, __LINE__, __func__));
+
+    _esh_sessions_cleanup();
+    _esh_ns_map_cleanup();
+    _esh_ns_track_cleanup();
+
+    pmix_sm_finalize();
+
+    if (NULL != _base_path){
+        if(PMIX_PROC_SERVER == pmix_globals.proc_type) {
+            if (lstat(_base_path, &st) >= 0){
+                if (PMIX_SUCCESS != (rc = _esh_dir_del(_base_path))) {
+                    PMIX_ERROR_LOG(rc);
+                }
+            }
+        }
+        free(_base_path);
+        _base_path = NULL;
+    }
+
+    return rc;
+}
+
+int _esh_store(const char *nspace, pmix_rank_t rank, pmix_kval_t *kv)
+{
+    pmix_status_t rc = PMIX_SUCCESS, tmp_rc;
+    ns_track_elem_t *elem;
+    pmix_buffer_t xfer;
+    ns_seg_info_t ns_info;
+    ns_map_data_t *ns_map = NULL;
+
+    if (NULL == kv) {
+        return PMIX_ERROR;
+    }
+
+    PMIX_OUTPUT_VERBOSE((10, pmix_globals.debug_output,
+                         "%s:%d:%s: for %s:%u",
+                         __FILE__, __LINE__, __func__, nspace, rank));
+
+    if (NULL == (ns_map = _esh_session_map_search(nspace))) {
+        rc = PMIX_ERROR;
+        PMIX_ERROR_LOG(rc);
+        return rc;
+    }
+
+    /* set exclusive lock */
+    if (PMIX_SUCCESS != (rc = _ESH_WRLOCK(_ESH_SESSION_lock(ns_map->tbl_idx)))) {
+        PMIX_ERROR_LOG(rc);
+        return rc;
+    }
+
+    /* First of all, we go through local track list (list of ns_track_elem_t structures)
+     * and look for an element for the target namespace.
+     * If it is there, then shared memory segments for it are created, so we take it.
+     * Otherwise, create a new element, fill its fields, create corresponding meta
+     * and data segments for this namespace, add it to the local track list,
+     * and put this info (ns_seg_info_t) to the initial segment. If initial segment
+     * if full, then extend it by creating a new one and mark previous one as full.
+     * All this stuff is done inside _get_track_elem_for_namespace function.
+     */
+
+    elem = _get_track_elem_for_namespace(ns_map);
+    if (NULL == elem) {
+        rc = PMIX_ERR_OUT_OF_RESOURCE;
+        PMIX_ERROR_LOG(rc);
+        goto err_exit;
+    }
+
+    /* If a new element was just created, we need to create corresponding meta and
+     * data segments and update corresponding element's fields. */
+    if (NULL == elem->meta_seg || NULL == elem->data_seg) {
+        memset(&ns_info.ns_map, 0, sizeof(ns_info.ns_map));
+        strncpy(ns_info.ns_map.name, ns_map->name, sizeof(ns_info.ns_map.name)-1);
+        ns_info.ns_map.tbl_idx = ns_map->tbl_idx;
+        ns_info.num_meta_seg = 1;
+        ns_info.num_data_seg = 1;
+        rc = _update_ns_elem(elem, &ns_info);
+        if (PMIX_SUCCESS != rc || NULL == elem->meta_seg || NULL == elem->data_seg) {
+            PMIX_ERROR_LOG(rc);
+            goto err_exit;
+        }
+
+        /* zero created shared memory segments for this namespace */
+        memset(elem->meta_seg->seg_info.seg_base_addr, 0, _meta_segment_size);
+        memset(elem->data_seg->seg_info.seg_base_addr, 0, _data_segment_size);
+
+        /* put ns's shared segments info to the global meta segment. */
+        rc = _put_ns_info_to_initial_segment(ns_map, &elem->meta_seg->seg_info, &elem->data_seg->seg_info);
+        if (PMIX_SUCCESS != rc) {
+            PMIX_ERROR_LOG(rc);
+            goto err_exit;
+        }
+    }
+
+    /* Now we know info about meta segment for this namespace. If meta segment
+     * is not empty, then we look for data for the target rank. If they present, replace it. */
+    PMIX_CONSTRUCT(&xfer, pmix_buffer_t);
+    PMIX_LOAD_BUFFER(&xfer, kv->value->data.bo.bytes, kv->value->data.bo.size);
+
+    rc = _store_data_for_rank(elem, rank, &xfer);
+
+    PMIX_DESTRUCT(&xfer);
+
+    if (PMIX_SUCCESS != rc) {
+        PMIX_ERROR_LOG(rc);
+        goto err_exit;
+    }
+
+    /* unset lock */
+    if (PMIX_SUCCESS != (rc = _ESH_UNLOCK(_ESH_SESSION_lock(ns_map->tbl_idx)))) {
+        PMIX_ERROR_LOG(rc);
+    }
+    return rc;
+
+err_exit:
+    /* unset lock */
+    if (PMIX_SUCCESS != (tmp_rc = _ESH_UNLOCK(_ESH_SESSION_lock(ns_map->tbl_idx)))) {
+        PMIX_ERROR_LOG(tmp_rc);
+    }
+    return rc;
+}
+
+/*
+ * See return codes description for the corresponding function
+ * in pmix_dstore.h
+ */
+int _esh_fetch(const char *nspace, pmix_rank_t rank, const char *key, pmix_value_t **kvs)
+{
+    ns_seg_info_t *ns_info = NULL;
+    pmix_status_t rc = PMIX_ERROR, lock_rc;
+    ns_track_elem_t *elem;
+    rank_meta_info *rinfo = NULL;
+    size_t kval_cnt;
+    seg_desc_t *meta_seg, *data_seg;
+    uint8_t *addr;
+    pmix_buffer_t buffer;
+    pmix_value_t val;
+    uint32_t nprocs;
+    pmix_rank_t cur_rank;
+    ns_map_data_t *ns_map = NULL;
+    bool all_ranks_found = true;
+    bool key_found = false;
+
+    if (NULL == key) {
+        PMIX_OUTPUT_VERBOSE((7, pmix_globals.debug_output,
+                             "dstore: Does not support passed parameters"));
+        rc = PMIX_ERR_BAD_PARAM;
+        PMIX_ERROR_LOG(rc);
+        return rc;
+    }
+
+    PMIX_OUTPUT_VERBOSE((10, pmix_globals.debug_output,
+                         "%s:%d:%s: for %s:%u look for key %s",
+                         __FILE__, __LINE__, __func__, nspace, rank, key));
+
+    if (NULL == (ns_map = _esh_session_map_search(nspace))) {
+        /* This call is issued from the the client.
+         * client must have the session, otherwise the error is fatal.
+         */
+        rc = PMIX_ERR_FATAL;
+        PMIX_ERROR_LOG(rc);
+        return rc;
+    }
+
+    if (kvs) {
+        *kvs = NULL;
+    }
+
+    if (PMIX_RANK_UNDEF == rank) {
+        ssize_t _nprocs = _get_univ_size(ns_map->name);
+        if( 0 > _nprocs ){
+            PMIX_ERROR_LOG(rc);
+            return rc;
+        }
+        nprocs = (size_t) _nprocs;
+        cur_rank = 0;
+    } else {
+        nprocs = 1;
+        cur_rank = rank;
+    }
+
+    /* grab shared lock */
+    if (PMIX_SUCCESS != (lock_rc = _ESH_RDLOCK(_ESH_SESSION_lock(ns_map->tbl_idx)))) {
+        /* Something wrong with the lock. The error is fatal */
+        rc = PMIX_ERR_FATAL;
+        PMIX_ERROR_LOG(lock_rc);
+        return lock_rc;
+    }
+
+    /* First of all, we go through all initial segments and look at their field.
+     * If it's 1, then generate name of next initial segment incrementing id by one and attach to it.
+     * We need this step to synchronize initial shared segments with our local track list.
+     * Then we look for the target namespace in all initial segments.
+     * If it is found, we get numbers of meta & data segments and
+     * compare these numbers with the number of trackable meta & data
+     * segments for this namespace in the local track list.
+     * If the first number exceeds the last, or the local track list
+     * doesn't track current namespace yet, then we update it (attach
+     * to additional segments).
+     */
+
+    /* first update local information about initial segments. they can be extended, so then we need to attach to new segments. */
+    _update_initial_segment_info(ns_map);
+
+    ns_info = _get_ns_info_from_initial_segment(ns_map);
+    if (NULL == ns_info) {
+        /* no data for this namespace is found in the shared memory. */
+        PMIX_OUTPUT_VERBOSE((7, pmix_globals.debug_output,
+                    "%s:%d:%s:  no data for ns %s is found in the shared memory.",
+                    __FILE__, __LINE__, __func__, ns_map->name));
+        rc = PMIX_ERR_PROC_ENTRY_NOT_FOUND;
+        goto done;
+    }
+
+    /* get ns_track_elem_t object for the target namespace from the local track list. */
+    elem = _get_track_elem_for_namespace(ns_map);
+    if (NULL == elem) {
+        /* Shouldn't happen! */
+        rc = PMIX_ERR_FATAL;
+        PMIX_ERROR_LOG(rc);
+        goto done;
+    }
+
+    /* need to update tracker:
+     * attach to shared memory regions for this namespace and store its info locally
+     * to operate with address and detach/unlink afterwards. */
+    rc = _update_ns_elem(elem, ns_info);
+    if (PMIX_SUCCESS != rc) {
+        PMIX_ERROR_LOG(rc);
+        goto done;
+    }
+
+    /* Now we have the data from meta segment for this namespace. */
+    meta_seg = elem->meta_seg;
+    data_seg = elem->data_seg;
+
+    while (nprocs--) {
+        /* Get the rank meta info in the shared meta segment. */
+        rinfo = _get_rank_meta_info(cur_rank, meta_seg);
+        if (NULL == rinfo) {
+            PMIX_OUTPUT_VERBOSE((7, pmix_globals.debug_output,
+                        "%s:%d:%s:  no data for this rank is found in the shared memory. rank %u",
+                        __FILE__, __LINE__, __func__, cur_rank));
+            all_ranks_found = false;
+            continue;
+        }
+        addr = _get_data_region_by_offset(data_seg, rinfo->offset);
+        if (NULL == addr) {
+            /* This means that meta-info is broken - error is fatal */
+            rc = PMIX_ERR_FATAL;
+            PMIX_ERROR_LOG(rc);
+            goto done;
+        }
+        kval_cnt = rinfo->count;
+
+        rc = PMIX_SUCCESS;
+        while (0 < kval_cnt) {
+            /* data is stored in the following format:
+             * key_val_pair {
+             *     size_t size;
+             *     char key[KNAME_LEN(addr)];
+             *     byte_t byte[size]; // should be loaded to pmix_buffer_t and unpacked.
+             * };
+             * segment_format {
+             *     key_val_pair kv_array[n];
+             *     EXTENSION slot;
+             * }
+             * EXTENSION slot which has key = EXTENSION_SLOT and a size_t value for offset
+             * to next data address for this process.
+             */
+            if (0 == strncmp(ESH_KNAME_PTR(addr), ESH_REGION_INVALIDATED, ESH_KNAME_LEN(ESH_REGION_INVALIDATED))) {
+                PMIX_OUTPUT_VERBOSE((10, pmix_globals.debug_output,
+                            "%s:%d:%s: for rank %s:%u, skip %s region",
+                            __FILE__, __LINE__, __func__, nspace, cur_rank, ESH_REGION_INVALIDATED));
+                /* skip it
+                 * go to next item, updating address */
+                addr += ESH_KV_SIZE(addr);
+            } else if (0 == strncmp(ESH_KNAME_PTR(addr), ESH_REGION_EXTENSION, ESH_KNAME_LEN(ESH_REGION_EXTENSION))) {
+                size_t offset;
+                memcpy(&offset, ESH_DATA_PTR(addr), sizeof(size_t));
+                PMIX_OUTPUT_VERBOSE((10, pmix_globals.debug_output,
+                            "%s:%d:%s: for rank %s:%u, reached %s with %lu value",
+                            __FILE__, __LINE__, __func__, nspace, cur_rank, ESH_REGION_EXTENSION, offset));
+                if (0 < offset) {
+                    /* go to next item, updating address */
+                    addr = _get_data_region_by_offset(data_seg, offset);
+                    if (NULL == addr) {
+                        /* This shouldn't happen - error is fatal */
+                        rc = PMIX_ERR_FATAL;
+                        PMIX_ERROR_LOG(rc);
+                        goto done;
+                    }
+                } else {
+                    /* no more data for this rank */
+                    PMIX_OUTPUT_VERBOSE((7, pmix_globals.debug_output,
+                                "%s:%d:%s:  no more data for this rank is found in the shared memory. rank %u key %s not found",
+                                __FILE__, __LINE__, __func__, cur_rank, key));
+                    break;
+                }
+            } else if (0 == strncmp(ESH_KNAME_PTR(addr), key, ESH_KNAME_LEN(key))) {
+                PMIX_OUTPUT_VERBOSE((10, pmix_globals.debug_output,
+                            "%s:%d:%s: for rank %s:%u, found target key %s",
+                            __FILE__, __LINE__, __func__, nspace, cur_rank, key));
+                /* target key is found, get value */
+                uint8_t *data_ptr = ESH_DATA_PTR(addr);
+                size_t data_size = ESH_DATA_SIZE(addr, data_ptr);
+                PMIX_CONSTRUCT(&buffer, pmix_buffer_t);
+                PMIX_LOAD_BUFFER(&buffer, data_ptr, data_size);
+                int cnt = 1;
+                /* unpack value for this key from the buffer. */
+                PMIX_VALUE_CONSTRUCT(&val);
+                if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(&buffer, &val, &cnt, PMIX_VALUE))) {
+                    PMIX_ERROR_LOG(rc);
+                    goto done;
+                }
+                if (PMIX_SUCCESS != (rc = pmix_bfrop.copy((void**)kvs, &val, PMIX_VALUE))) {
+                    PMIX_ERROR_LOG(rc);
+                    goto done;
+                }
+                PMIX_VALUE_DESTRUCT(&val);
+                buffer.base_ptr = NULL;
+                buffer.bytes_used = 0;
+                PMIX_DESTRUCT(&buffer);
+                key_found = true;
+                goto done;
+            } else {
+                PMIX_OUTPUT_VERBOSE((10, pmix_globals.debug_output,
+                            "%s:%d:%s: for rank %s:%u, skip key %s look for key %s",
+                            __FILE__, __LINE__, __func__, nspace, cur_rank, ESH_KNAME_PTR(addr), key));
+                /* go to next item, updating address */
+                addr += ESH_KV_SIZE(addr);
+                kval_cnt--;
+            }
+        }
+
+        if (PMIX_RANK_UNDEF == rank) {
+            cur_rank++;
+        }
+    }
+
+done:
+    /* unset lock */
+    if (PMIX_SUCCESS != (lock_rc = _ESH_UNLOCK(_ESH_SESSION_lock(ns_map->tbl_idx)))) {
+        PMIX_ERROR_LOG(lock_rc);
+    }
+
+    if( rc != PMIX_SUCCESS ){
+        return rc;
+    }
+
+    if( key_found ){
+        /* the key is found - nothing to do */
+        return PMIX_SUCCESS;
+    }
+
+    if( !all_ranks_found ){
+        /* Not all ranks was found - need to request
+         * all of them and search again
+         */
+        rc = PMIX_ERR_PROC_ENTRY_NOT_FOUND;
+        return rc;
+    }
+    rc = PMIX_ERR_NOT_FOUND;
+    return rc;
+}
+
+static int _esh_patch_env(const char *nspace, char ***env)
+{
+    pmix_status_t rc = PMIX_SUCCESS;
+    ns_map_data_t *ns_map = NULL;
+
+    if (NULL == _esh_session_map_search) {
+        rc = PMIX_ERR_NOT_AVAILABLE;
+        PMIX_ERROR_LOG(rc);
+        return rc;
+    }
+
+    if (NULL == (ns_map = _esh_session_map_search(nspace))) {
+        rc = PMIX_ERR_NOT_AVAILABLE;
+        PMIX_ERROR_LOG(rc);
+        return rc;
+    }
+
+    if ((NULL == _base_path) || (strlen(_base_path) == 0)){
+        rc = PMIX_ERR_NOT_AVAILABLE;
+        PMIX_ERROR_LOG(rc);
+        return rc;
+    }
+
+    if(PMIX_SUCCESS != (rc = pmix_setenv(PMIX_DSTORE_ESH_BASE_PATH,
+                                        _ESH_SESSION_path(ns_map->tbl_idx), true, env))){
+        PMIX_ERROR_LOG(rc);
+    }
+    return rc;
+}
+
+static int _esh_nspace_add(const char *nspace, pmix_info_t info[], size_t ninfo)
+{
+    pmix_status_t rc;
+    size_t tbl_idx;
+    uid_t jobuid = _jobuid;
+    char setjobuid = _setjobuid;
+    size_t n;
+    ns_map_data_t *ns_map = NULL;
+
+    if (NULL != info) {
+        for (n=0; n < ninfo; n++) {
+            if (0 == strcmp(PMIX_USERID, info[n].key)) {
+                jobuid = info[n].value.data.uint32;
+                setjobuid = 1;
+                continue;
+            }
+        }
+    }
+
+    if (PMIX_SUCCESS != _esh_jobuid_tbl_search(jobuid, &tbl_idx)) {
+
+        rc = _esh_session_tbl_add(&tbl_idx);
+        if (PMIX_SUCCESS != rc) {
+            PMIX_ERROR_LOG(rc);
+            return rc;
+        }
+        ns_map = _esh_session_map(nspace, tbl_idx);
+        if (NULL == ns_map) {
+            rc = PMIX_ERROR;
+            PMIX_ERROR_LOG(rc);
+            return rc;
+        }
+
+        if (PMIX_SUCCESS != (rc =_esh_session_init(tbl_idx, ns_map, jobuid, setjobuid))) {
+            rc = PMIX_ERROR;
+            PMIX_ERROR_LOG(rc);
+            return rc;
+        }
+    }
+    else {
+        ns_map = _esh_session_map(nspace, tbl_idx);
+        if (NULL == ns_map) {
+            rc = PMIX_ERROR;
+            PMIX_ERROR_LOG(rc);
+            return rc;
+        }
+    }
+
+    return PMIX_SUCCESS;
+}
+
+static int _esh_nspace_del(const char *nspace)
+{
+    pmix_status_t rc = PMIX_SUCCESS;
+    size_t map_idx, size;
+    int in_use = 0;
+    ns_map_data_t *ns_map_data = NULL;
+    ns_map_t *ns_map;
+    session_t *session_tbl = NULL;
+    ns_track_elem_t *trk = NULL;
+
+    PMIX_OUTPUT_VERBOSE((10, pmix_globals.debug_output,
+        "%s:%d:%s delete nspace `%s`", __FILE__, __LINE__, __func__, nspace));
+
+    if (NULL == (ns_map_data = _esh_session_map_search(nspace))) {
+        rc = PMIX_ERR_NOT_AVAILABLE;
+        return rc;
+    }
+
+    size = pmix_value_array_get_size(_ns_map_array);
+    ns_map = PMIX_VALUE_ARRAY_GET_BASE(_ns_map_array, ns_map_t);
+
+    for (map_idx = 0; map_idx < size; map_idx++){
+        if (ns_map[map_idx].in_use &&
+                        (ns_map[map_idx].data.tbl_idx == ns_map_data->tbl_idx)) {
+            if (0 == strcmp(ns_map[map_idx].data.name, nspace)) {
+                _esh_session_map_clean(&ns_map[map_idx]);
+                continue;
+            }
+            in_use++;
+            break;
+        }
+    }
+
+    if(ns_map_data->track_idx >= 0) {
+        trk = pmix_value_array_get_item(_ns_track_array, ns_map_data->track_idx);
+        if((ns_map_data->track_idx + 1) > (int)pmix_value_array_get_size(_ns_track_array)) {
+            rc = PMIX_ERR_VALUE_OUT_OF_BOUNDS;
+            PMIX_ERROR_LOG(rc);
+            goto exit;
+        }
+        PMIX_DESTRUCT(trk);
+    }
+
+    /* A lot of nspaces may be using same session info
+     * session record can only be deleted once all references are gone */
+    if (!in_use) {
+        session_tbl = PMIX_VALUE_ARRAY_GET_BASE(_session_array, session_t);
+
+        PMIX_OUTPUT_VERBOSE((10, pmix_globals.debug_output,
+            "%s:%d:%s delete session for jobuid: %d", __FILE__, __LINE__, __func__, session_tbl[ns_map_data->tbl_idx].jobuid));
+        _esh_session_release(&session_tbl[ns_map_data->tbl_idx]);
+     }
+exit:
+    return rc;
+}
+
+static void _set_constants_from_env()
+{
+    char *str;
+    int page_size = _pmix_getpagesize();
+
+    if( NULL != (str = getenv(ESH_ENV_INITIAL_SEG_SIZE)) ) {
+        _initial_segment_size = strtoul(str, NULL, 10);
+        if ((size_t)page_size > _initial_segment_size) {
+            _initial_segment_size = (size_t)page_size;
+        }
+    }
+    if (0 == _initial_segment_size) {
+        _initial_segment_size = INITIAL_SEG_SIZE;
+    }
+    if( NULL != (str = getenv(ESH_ENV_NS_META_SEG_SIZE)) ) {
+        _meta_segment_size = strtoul(str, NULL, 10);
+        if ((size_t)page_size > _meta_segment_size) {
+            _meta_segment_size = (size_t)page_size;
+        }
+    }
+    if (0 == _meta_segment_size) {
+        _meta_segment_size = NS_META_SEG_SIZE;
+    }
+    if( NULL != (str = getenv(ESH_ENV_NS_DATA_SEG_SIZE)) ) {
+        _data_segment_size = strtoul(str, NULL, 10);
+        if ((size_t)page_size > _data_segment_size) {
+            _data_segment_size = (size_t)page_size;
+        }
+    }
+    if (0 == _data_segment_size) {
+        _data_segment_size = NS_DATA_SEG_SIZE;
+    }
+    if (NULL != (str = getenv(ESH_ENV_LINEAR))) {
+        if (1 == strtoul(str, NULL, 10)) {
+            _direct_mode = 1;
+        }
+    }
+
+    _lock_segment_size = page_size;
+    _max_ns_num = (_initial_segment_size - sizeof(size_t) * 2) / sizeof(ns_seg_info_t);
+    _max_meta_elems = (_meta_segment_size - sizeof(size_t)) / sizeof(rank_meta_info);
+
+}
+
+static void _delete_sm_desc(seg_desc_t *desc)
+{
+    seg_desc_t *tmp;
+
+    /* free all global segments */
+    while (NULL != desc) {
+        tmp = desc->next;
+        /* detach & unlink from current desc */
+        if (desc->seg_info.seg_cpid == getpid()) {
+            pmix_sm_segment_unlink(&desc->seg_info);
+        }
+        pmix_sm_segment_detach(&desc->seg_info);
+        free(desc);
+        desc = tmp;
+    }
+}
+
+static int _pmix_getpagesize(void)
+{
+#if defined(_SC_PAGESIZE )
+    return sysconf(_SC_PAGESIZE);
+#elif defined(_SC_PAGE_SIZE)
+    return sysconf(_SC_PAGE_SIZE);
+#else
+    return 65536; /* safer to overestimate than under */
+#endif
+}
+
+static seg_desc_t *_create_new_segment(segment_type type, const ns_map_data_t *ns_map, uint32_t id)
+{
+    pmix_status_t rc;
+    char file_name[PMIX_PATH_MAX];
+    size_t size;
+    seg_desc_t *new_seg = NULL;
+
+    PMIX_OUTPUT_VERBOSE((10, pmix_globals.debug_output,
+                         "%s:%d:%s: segment type %d, nspace %s, id %u",
+                         __FILE__, __LINE__, __func__, type, ns_map->name, id));
+
+    switch (type) {
+        case INITIAL_SEGMENT:
+            size = _initial_segment_size;
+            snprintf(file_name, PMIX_PATH_MAX, "%s/initial-pmix_shared-segment-%u",
+                _ESH_SESSION_path(ns_map->tbl_idx), id);
+            break;
+        case NS_META_SEGMENT:
+            size = _meta_segment_size;
+            snprintf(file_name, PMIX_PATH_MAX, "%s/smseg-%s-%u",
+                _ESH_SESSION_path(ns_map->tbl_idx), ns_map->name, id);
+            break;
+        case NS_DATA_SEGMENT:
+            size = _data_segment_size;
+            snprintf(file_name, PMIX_PATH_MAX, "%s/smdataseg-%s-%d",
+                _ESH_SESSION_path(ns_map->tbl_idx), ns_map->name, id);
+            break;
+        default:
+            PMIX_ERROR_LOG(PMIX_ERROR);
+            return NULL;
+    }
+    new_seg = (seg_desc_t*)malloc(sizeof(seg_desc_t));
+    if (new_seg) {
+        new_seg->id = id;
+        new_seg->next = NULL;
+        new_seg->type = type;
+        rc = pmix_sm_segment_create(&new_seg->seg_info, file_name, size);
+        if (PMIX_SUCCESS != rc) {
+            PMIX_ERROR_LOG(rc);
+            goto err_exit;
+        }
+        memset(new_seg->seg_info.seg_base_addr, 0, size);
+
+
+        if (_ESH_SESSION_setjobuid(ns_map->tbl_idx) > 0){
+            rc = PMIX_ERR_PERM;
+            if (0 > chown(file_name, (uid_t) _ESH_SESSION_jobuid(ns_map->tbl_idx), (gid_t) -1)){
+                PMIX_ERROR_LOG(rc);
+                goto err_exit;
+            }
+            /* set the mode as required */
+            if (0 > chmod(file_name, S_IRUSR | S_IRGRP | S_IWGRP )) {
+                PMIX_ERROR_LOG(rc);
+                goto err_exit;
+            }
+        }
+    }
+    return new_seg;
+
+err_exit:
+    if( NULL != new_seg ){
+        free(new_seg);
+    }
+    return NULL;
+}
+
+static seg_desc_t *_attach_new_segment(segment_type type, const ns_map_data_t *ns_map, uint32_t id)
+{
+    pmix_status_t rc;
+    seg_desc_t *new_seg = NULL;
+    new_seg = (seg_desc_t*)malloc(sizeof(seg_desc_t));
+    new_seg->id = id;
+    new_seg->next = NULL;
+    new_seg->type = type;
+
+    PMIX_OUTPUT_VERBOSE((10, pmix_globals.debug_output,
+                         "%s:%d:%s: segment type %d, nspace %s, id %u",
+                         __FILE__, __LINE__, __func__, type, ns_map->name, id));
+
+    switch (type) {
+        case INITIAL_SEGMENT:
+            new_seg->seg_info.seg_size = _initial_segment_size;
+            snprintf(new_seg->seg_info.seg_name, PMIX_PATH_MAX, "%s/initial-pmix_shared-segment-%u",
+                _ESH_SESSION_path(ns_map->tbl_idx), id);
+            break;
+        case NS_META_SEGMENT:
+            new_seg->seg_info.seg_size = _meta_segment_size;
+            snprintf(new_seg->seg_info.seg_name, PMIX_PATH_MAX, "%s/smseg-%s-%u",
+                _ESH_SESSION_path(ns_map->tbl_idx), ns_map->name, id);
+            break;
+        case NS_DATA_SEGMENT:
+            new_seg->seg_info.seg_size = _data_segment_size;
+            snprintf(new_seg->seg_info.seg_name, PMIX_PATH_MAX, "%s/smdataseg-%s-%d",
+                _ESH_SESSION_path(ns_map->tbl_idx), ns_map->name, id);
+            break;
+        default:
+            PMIX_ERROR_LOG(PMIX_ERROR);
+            return NULL;
+    }
+    rc = pmix_sm_segment_attach(&new_seg->seg_info, PMIX_SM_RONLY);
+    if (PMIX_SUCCESS != rc) {
+        free(new_seg);
+        new_seg = NULL;
+        PMIX_ERROR_LOG(rc);
+    }
+    return new_seg;
+}
+
+/* This function synchronizes the content of initial shared segment and the local track list. */
+static int _update_ns_elem(ns_track_elem_t *ns_elem, ns_seg_info_t *info)
+{
+    seg_desc_t *seg, *tmp = NULL;
+    size_t i, offs;
+    ns_map_data_t *ns_map = NULL;
+    pmix_status_t rc;
+
+    PMIX_OUTPUT_VERBOSE((10, pmix_globals.debug_output,
+                         "%s:%d:%s",
+                         __FILE__, __LINE__, __func__));
+
+    if (NULL == (ns_map = _esh_session_map_search(info->ns_map.name))) {
+        rc = PMIX_ERR_NOT_AVAILABLE;
+        PMIX_ERROR_LOG(rc);
+        return rc;
+    }
+
+    tmp = ns_elem->meta_seg;
+    if (NULL != tmp) {
+        while(NULL != tmp->next) {
+            tmp = tmp->next;
+        }
+    }
+
+    /* synchronize number of meta segments for the target namespace. */
+    for (i = ns_elem->num_meta_seg; i < info->num_meta_seg; i++) {
+        if (PMIX_PROC_SERVER == pmix_globals.proc_type) {
+            seg = _create_new_segment(NS_META_SEGMENT, &info->ns_map, i);
+            if (NULL == seg) {
+                rc = PMIX_ERR_OUT_OF_RESOURCE;
+                PMIX_ERROR_LOG(rc);
+                return rc;
+            }
+        } else {
+            seg = _attach_new_segment(NS_META_SEGMENT, &info->ns_map, i);
+            if (NULL == seg) {
+                rc = PMIX_ERR_NOT_AVAILABLE;
+                PMIX_ERROR_LOG(rc);
+                return rc;
+            }
+        }
+
+        if (NULL == tmp) {
+            ns_elem->meta_seg = seg;
+        } else {
+            tmp->next = seg;
+        }
+        tmp = seg;
+        ns_elem->num_meta_seg++;
+    }
+
+    tmp = ns_elem->data_seg;
+    if (NULL != tmp) {
+        while(NULL != tmp->next) {
+            tmp = tmp->next;
+        }
+    }
+    /* synchronize number of data segments for the target namespace. */
+    for (i = ns_elem->num_data_seg; i < info->num_data_seg; i++) {
+        if (PMIX_PROC_SERVER == pmix_globals.proc_type) {
+            seg = _create_new_segment(NS_DATA_SEGMENT, &info->ns_map, i);
+            if (NULL == seg) {
+                rc = PMIX_ERR_OUT_OF_RESOURCE;
+                PMIX_ERROR_LOG(rc);
+                return rc;
+            }
+            offs = sizeof(size_t);//shift on offset field itself
+            memcpy(seg->seg_info.seg_base_addr, &offs, sizeof(size_t));
+        } else {
+            seg = _attach_new_segment(NS_DATA_SEGMENT, &info->ns_map, i);
+            if (NULL == seg) {
+                rc = PMIX_ERR_NOT_AVAILABLE;
+                PMIX_ERROR_LOG(rc);
+                return rc;
+            }
+        }
+
+        if (NULL == tmp) {
+            ns_elem->data_seg = seg;
+        } else {
+            tmp->next = seg;
+        }
+        tmp = seg;
+        ns_elem->num_data_seg++;
+    }
+
+    return PMIX_SUCCESS;
+}
+
+static seg_desc_t *extend_segment(seg_desc_t *segdesc, const ns_map_data_t *ns_map)
+{
+    seg_desc_t *tmp, *seg;
+
+    PMIX_OUTPUT_VERBOSE((2, pmix_globals.debug_output,
+                         "%s:%d:%s",
+                         __FILE__, __LINE__, __func__));
+    /* find last segment */
+    tmp = segdesc;
+    while (NULL != tmp->next) {
+        tmp = tmp->next;
+    }
+    /* create another segment, the old one is full. */
+    seg = _create_new_segment(segdesc->type, ns_map, tmp->id + 1);
+    tmp->next = seg;
+
+    return seg;
+}
+
+static int _put_ns_info_to_initial_segment(const ns_map_data_t *ns_map, pmix_sm_seg_t *metaseg, pmix_sm_seg_t *dataseg)
+{
+    ns_seg_info_t elem;
+    size_t num_elems;
+    num_elems = *((size_t*)(_ESH_SESSION_sm_seg_last(ns_map->tbl_idx)->seg_info.seg_base_addr));
+    seg_desc_t *last_seg = _ESH_SESSION_sm_seg_last(ns_map->tbl_idx);
+    pmix_status_t rc;
+
+    PMIX_OUTPUT_VERBOSE((10, pmix_globals.debug_output,
+                         "%s:%d:%s", __FILE__, __LINE__, __func__));
+
+    if (_max_ns_num == num_elems) {
+        num_elems = 0;
+        if (NULL == (last_seg = extend_segment(last_seg, ns_map))) {
+            rc = PMIX_ERROR;
+            PMIX_ERROR_LOG(rc);
+            return rc;
+        }
+        /* mark previous segment as full */
+        size_t full = 1;
+        memcpy((uint8_t*)(_ESH_SESSION_sm_seg_last(ns_map->tbl_idx)->seg_info.seg_base_addr + sizeof(size_t)), &full, sizeof(size_t));
+        _ESH_SESSION_sm_seg_last(ns_map->tbl_idx) = last_seg;
+        memset(_ESH_SESSION_sm_seg_last(ns_map->tbl_idx)->seg_info.seg_base_addr, 0, _initial_segment_size);
+    }
+    memset(&elem.ns_map, 0, sizeof(elem.ns_map));
+    strncpy(elem.ns_map.name, ns_map->name, sizeof(elem.ns_map.name)-1);
+    elem.ns_map.tbl_idx = ns_map->tbl_idx;
+    elem.num_meta_seg = 1;
+    elem.num_data_seg = 1;
+    memcpy((uint8_t*)(_ESH_SESSION_sm_seg_last(ns_map->tbl_idx)->seg_info.seg_base_addr) + sizeof(size_t) * 2 + num_elems * sizeof(ns_seg_info_t),
+            &elem, sizeof(ns_seg_info_t));
+    num_elems++;
+    memcpy((uint8_t*)(_ESH_SESSION_sm_seg_last(ns_map->tbl_idx)->seg_info.seg_base_addr), &num_elems, sizeof(size_t));
+    return PMIX_SUCCESS;
+}
+
+/* clients should sync local info with information from initial segment regularly */
+static void _update_initial_segment_info(const ns_map_data_t *ns_map)
+{
+    seg_desc_t *tmp;
+    tmp = _ESH_SESSION_sm_seg_first(ns_map->tbl_idx);
+
+    PMIX_OUTPUT_VERBOSE((2, pmix_globals.debug_output,
+                         "%s:%d:%s", __FILE__, __LINE__, __func__));
+
+    /* go through all global segments */
+    do {
+        /* check if current segment was marked as full but no more next segment is in the chain */
+        if (NULL == tmp->next && 1 == *((size_t*)((uint8_t*)(tmp->seg_info.seg_base_addr) + sizeof(size_t)))) {
+            tmp->next = _attach_new_segment(INITIAL_SEGMENT, ns_map, tmp->id+1);
+        }
+        tmp = tmp->next;
+    }
+    while (NULL != tmp);
+}
+
+/* this function will be used by clients to get ns data from the initial segment and add them to the tracker list */
+static ns_seg_info_t *_get_ns_info_from_initial_segment(const ns_map_data_t *ns_map)
+{
+    pmix_status_t rc;
+    size_t i;
+    seg_desc_t *tmp;
+    ns_seg_info_t *elem, *cur_elem;
+    elem = NULL;
+    size_t num_elems;
+
+    PMIX_OUTPUT_VERBOSE((2, pmix_globals.debug_output,
+                         "%s:%d:%s", __FILE__, __LINE__, __func__));
+
+    tmp = _ESH_SESSION_sm_seg_first(ns_map->tbl_idx);
+
+    rc = 1;
+    /* go through all global segments */
+    do {
+        num_elems = *((size_t*)(tmp->seg_info.seg_base_addr));
+        for (i = 0; i < num_elems; i++) {
+            cur_elem = (ns_seg_info_t*)((uint8_t*)(tmp->seg_info.seg_base_addr) + sizeof(size_t) * 2 + i * sizeof(ns_seg_info_t));
+            if (0 == (rc = strncmp(cur_elem->ns_map.name, ns_map->name, strlen(ns_map->name)+1))) {
+                break;
+            }
+        }
+        if (0 == rc) {
+            elem = cur_elem;
+            break;
+        }
+        tmp = tmp->next;
+    }
+    while (NULL != tmp);
+    return elem;
+}
+
+static ns_track_elem_t *_get_track_elem_for_namespace(ns_map_data_t *ns_map)
+{
+    ns_track_elem_t *new_elem = NULL;
+    size_t size = pmix_value_array_get_size(_ns_track_array);
+
+    PMIX_OUTPUT_VERBOSE((10, pmix_globals.debug_output,
+                         "%s:%d:%s: nspace %s",
+                         __FILE__, __LINE__, __func__, ns_map->name));
+
+    /* check if this namespace is already being tracked to avoid duplicating data. */
+    if (ns_map->track_idx >= 0) {
+        if ((ns_map->track_idx + 1) > (int)size) {
+            return NULL;
+        }
+        /* data for this namespace should be already stored in shared memory region. */
+        /* so go and just put new data. */
+        return pmix_value_array_get_item(_ns_track_array, ns_map->track_idx);
+    }
+
+    /* create shared memory regions for this namespace and store its info locally
+     * to operate with address and detach/unlink afterwards. */
+    if (NULL == (new_elem = pmix_value_array_get_item(_ns_track_array, size))) {
+        return NULL;
+    }
+    PMIX_CONSTRUCT(new_elem, ns_track_elem_t);
+    strncpy(new_elem->ns_map.name, ns_map->name, sizeof(new_elem->ns_map.name)-1);
+    /* save latest track idx to info of nspace */
+    ns_map->track_idx = size;
+
+    return new_elem;
+}
+
+static rank_meta_info *_get_rank_meta_info(pmix_rank_t rank, seg_desc_t *segdesc)
+{
+    size_t i;
+    rank_meta_info *elem = NULL;
+    seg_desc_t *tmp = segdesc;
+    size_t num_elems, rel_offset;
+    int id;
+    rank_meta_info *cur_elem;
+
+    size_t rcount = rank == PMIX_RANK_WILDCARD ? 0 : rank + 1;
+
+    PMIX_OUTPUT_VERBOSE((10, pmix_globals.debug_output,
+                         "%s:%d:%s",
+                         __FILE__, __LINE__, __func__));
+
+    if (1 == _direct_mode) {
+        /* do linear search to find the requested rank inside all meta segments
+         * for this namespace. */
+        /* go through all existing meta segments for this namespace */
+        do {
+            num_elems = *((size_t*)(tmp->seg_info.seg_base_addr));
+            for (i = 0; i < num_elems; i++) {
+                cur_elem = (rank_meta_info*)((uint8_t*)(tmp->seg_info.seg_base_addr) + sizeof(size_t) + i * sizeof(rank_meta_info));
+                if (rcount == cur_elem->rank) {
+                    elem = cur_elem;
+                    break;
+                }
+            }
+            tmp = tmp->next;
+        }
+        while (NULL != tmp && NULL == elem);
+    } else {
+        /* directly compute index of meta segment (id) and relative offset (rel_offset)
+         * inside this segment for fast lookup a rank_meta_info object for the requested rank. */
+        id = rcount/_max_meta_elems;
+        rel_offset = (rcount%_max_meta_elems) * sizeof(rank_meta_info) + sizeof(size_t);
+        /* go through all existing meta segments for this namespace.
+         * Stop at id number if it exists. */
+        while (NULL != tmp->next && 0 != id) {
+            tmp = tmp->next;
+            id--;
+        }
+        if (0 == id) {
+            /* the segment is found, looking for data for the target rank. */
+            elem = (rank_meta_info*)((uint8_t*)(tmp->seg_info.seg_base_addr) + rel_offset);
+            if ( 0 == elem->offset) {
+                /* offset can never be 0, it means that there is no data for this rank yet. */
+                elem = NULL;
+            }
+        }
+    }
+    return elem;
+}
+
+static int set_rank_meta_info(ns_track_elem_t *ns_info, rank_meta_info *rinfo)
+{
+    /* it's claimed that there is still no meta info for this rank stored */
+    seg_desc_t *tmp;
+    size_t num_elems, rel_offset;
+    int id, count;
+    rank_meta_info *cur_elem;
+
+    if (!ns_info || !rinfo) {
+        PMIX_ERROR_LOG(PMIX_ERROR);
+        return PMIX_ERROR;
+    }
+
+    PMIX_OUTPUT_VERBOSE((2, pmix_globals.debug_output,
+                         "%s:%d:%s: nspace %s, add rank %lu offset %lu count %lu meta info",
+                         __FILE__, __LINE__, __func__,
+                         ns_info->ns_map.name, rinfo->rank, rinfo->offset, rinfo->count));
+
+    tmp = ns_info->meta_seg;
+    if (1 == _direct_mode) {
+        /* get the last meta segment to put new rank_meta_info at the end. */
+        while (NULL != tmp->next) {
+            tmp = tmp->next;
+        }
+        num_elems = *((size_t*)(tmp->seg_info.seg_base_addr));
+        if (_max_meta_elems <= num_elems) {
+            PMIX_OUTPUT_VERBOSE((2, pmix_globals.debug_output,
+                        "%s:%d:%s: extend meta segment for nspace %s",
+                        __FILE__, __LINE__, __func__, ns_info->ns_map.name));
+            /* extend meta segment, so create a new one */
+            tmp = extend_segment(tmp, &ns_info->ns_map);
+            if (NULL == tmp) {
+                PMIX_ERROR_LOG(PMIX_ERROR);
+                return PMIX_ERROR;
+            }
+            ns_info->num_meta_seg++;
+            memset(tmp->seg_info.seg_base_addr, 0, sizeof(rank_meta_info));
+            /* update number of meta segments for namespace in initial_segment */
+            ns_seg_info_t *elem = _get_ns_info_from_initial_segment(&ns_info->ns_map);
+            if (NULL == elem) {
+                PMIX_ERROR_LOG(PMIX_ERROR);
+                return PMIX_ERROR;
+            }
+            if (ns_info->num_meta_seg != elem->num_meta_seg) {
+                elem->num_meta_seg = ns_info->num_meta_seg;
+            }
+            num_elems = 0;
+        }
+        cur_elem = (rank_meta_info*)((uint8_t*)(tmp->seg_info.seg_base_addr) + sizeof(size_t) + num_elems * sizeof(rank_meta_info));
+        memcpy(cur_elem, rinfo, sizeof(rank_meta_info));
+        num_elems++;
+        memcpy(tmp->seg_info.seg_base_addr, &num_elems, sizeof(size_t));
+    } else {
+        /* directly compute index of meta segment (id) and relative offset (rel_offset)
+         * inside this segment for fast lookup a rank_meta_info object for the requested rank. */
+        size_t rcount = rinfo->rank == PMIX_RANK_WILDCARD ? 0 : rinfo->rank + 1;
+        id = rcount/_max_meta_elems;
+        rel_offset = (rcount % _max_meta_elems) * sizeof(rank_meta_info) + sizeof(size_t);
+        count = id;
+        /* go through all existing meta segments for this namespace.
+         * Stop at id number if it exists. */
+        while (NULL != tmp->next && 0 != count) {
+            tmp = tmp->next;
+            count--;
+        }
+        /* if there is no segment with this id, then create all missing segments till the id number. */
+        if ((int)ns_info->num_meta_seg < (id+1)) {
+            while ((int)ns_info->num_meta_seg != (id+1)) {
+                /* extend meta segment, so create a new one */
+                tmp = extend_segment(tmp, &ns_info->ns_map);
+                if (NULL == tmp) {
+                    PMIX_ERROR_LOG(PMIX_ERROR);
+                    return PMIX_ERROR;
+                }
+                memset(tmp->seg_info.seg_base_addr, 0, sizeof(rank_meta_info));
+                ns_info->num_meta_seg++;
+            }
+            /* update number of meta segments for namespace in initial_segment */
+            ns_seg_info_t *elem = _get_ns_info_from_initial_segment(&ns_info->ns_map);
+            if (NULL == elem) {
+                PMIX_ERROR_LOG(PMIX_ERROR);
+                return PMIX_ERROR;
+            }
+            if (ns_info->num_meta_seg != elem->num_meta_seg) {
+                elem->num_meta_seg = ns_info->num_meta_seg;
+            }
+        }
+        /* store rank_meta_info object by rel_offset. */
+        cur_elem = (rank_meta_info*)((uint8_t*)(tmp->seg_info.seg_base_addr) + rel_offset);
+        memcpy(cur_elem, rinfo, sizeof(rank_meta_info));
+    }
+    return PMIX_SUCCESS;
+}
+
+static uint8_t *_get_data_region_by_offset(seg_desc_t *segdesc, size_t offset)
+{
+    seg_desc_t *tmp = segdesc;
+    size_t rel_offset = offset;
+    uint8_t *dataaddr = NULL;
+
+    PMIX_OUTPUT_VERBOSE((10, pmix_globals.debug_output,
+                         "%s:%d:%s",
+                         __FILE__, __LINE__, __func__));
+
+    /* go through all existing data segments for this namespace */
+    do {
+        if (rel_offset >= _data_segment_size) {
+            rel_offset -= _data_segment_size;
+        } else {
+            dataaddr = tmp->seg_info.seg_base_addr + rel_offset;
+        }
+        tmp = tmp->next;
+    } while (NULL != tmp && NULL == dataaddr);
+
+    return dataaddr;
+}
+
+static size_t get_free_offset(seg_desc_t *data_seg)
+{
+    size_t offset;
+    seg_desc_t *tmp;
+    int id = 0;
+    tmp = data_seg;
+    /* first find the last data segment */
+    while (NULL != tmp->next) {
+        tmp = tmp->next;
+        id++;
+    }
+    offset = *((size_t*)(tmp->seg_info.seg_base_addr));
+    if (0 == offset) {
+        /* this is the first created data segment, the first 8 bytes are used to place the free offset value itself */
+        offset = sizeof(size_t);
+    }
+    return (id * _data_segment_size + offset);
+}
+
+static int put_empty_ext_slot(seg_desc_t *dataseg)
+{
+    size_t global_offset, rel_offset, data_ended, val = 0;
+    uint8_t *addr;
+    global_offset = get_free_offset(dataseg);
+    rel_offset = global_offset % _data_segment_size;
+    if (rel_offset + EXT_SLOT_SIZE() > _data_segment_size) {
+        PMIX_ERROR_LOG(PMIX_ERROR);
+        return PMIX_ERROR;
+    }
+    addr = _get_data_region_by_offset(dataseg, global_offset);
+    ESH_PUT_KEY(addr, ESH_REGION_EXTENSION, (void*)&val, sizeof(size_t));
+
+    /* update offset at the beginning of current segment */
+    data_ended = rel_offset + EXT_SLOT_SIZE();
+    addr = (uint8_t*)(addr - rel_offset);
+    memcpy(addr, &data_ended, sizeof(size_t));
+    return PMIX_SUCCESS;
+}
+
+static size_t put_data_to_the_end(ns_track_elem_t *ns_info, seg_desc_t *dataseg, char *key, void *buffer, size_t size)
+{
+    size_t offset, id = 0;
+    seg_desc_t *tmp;
+    size_t global_offset, data_ended;
+    uint8_t *addr;
+
+    PMIX_OUTPUT_VERBOSE((2, pmix_globals.debug_output,
+                         "%s:%d:%s: key %s",
+                         __FILE__, __LINE__, __func__, key));
+
+    tmp = dataseg;
+    while (NULL != tmp->next) {
+        tmp = tmp->next;
+        id++;
+    }
+    global_offset = get_free_offset(dataseg);
+    offset = global_offset % _data_segment_size;
+
+    /* We should provide additional space at the end of segment to
+     * place EXTENSION_SLOT to have an ability to enlarge data for this rank.*/
+    if ((sizeof(size_t) + ESH_KEY_SIZE(key, size) + EXT_SLOT_SIZE()) > _data_segment_size) {
+        /* this is an error case: segment is so small that cannot place evem a single key-value pair.
+         * warn a user about it and fail. */
+        offset = 0; /* offset cannot be 0 in normal case, so we use this value to indicate a problem. */
+        pmix_output(0, "PLEASE set NS_DATA_SEG_SIZE to value which is larger when %lu.",
+                    sizeof(size_t) + strlen(key) + 1 + sizeof(size_t) + size + EXT_SLOT_SIZE());
+        return offset;
+    }
+
+    /* check the corner case that was observed at large scales:
+     * https://github.com/pmix/master/pull/282#issuecomment-277454198
+     *
+     * if last time we stopped exactly on the border of the segment
+     * new segment wasn't allocated to us but (global_offset % _data_segment_size) == 0
+     * so if offset is 0 here - we need to allocate the segment as well
+     */
+    if ( (0 == offset) || ( (offset + ESH_KEY_SIZE(key, size) + EXT_SLOT_SIZE()) > _data_segment_size) ) {
+        id++;
+        /* create a new data segment. */
+        tmp = extend_segment(tmp, &ns_info->ns_map);
+        if (NULL == tmp) {
+            PMIX_ERROR_LOG(PMIX_ERR_NOMEM);
+            offset = 0; /* offset cannot be 0 in normal case, so we use this value to indicate a problem. */
+            return offset;
+        }
+        ns_info->num_data_seg++;
+        /* update_ns_info_in_initial_segment */
+        ns_seg_info_t *elem = _get_ns_info_from_initial_segment(&ns_info->ns_map);
+        if (NULL == elem) {
+            PMIX_ERROR_LOG(PMIX_ERR_NOMEM);
+            offset = 0; /* offset cannot be 0 in normal case, so we use this value to indicate a problem. */
+            return offset;
+        }
+        elem->num_data_seg++;
+        offset = sizeof(size_t);
+    }
+    global_offset = offset + id * _data_segment_size;
+    addr = (uint8_t*)(tmp->seg_info.seg_base_addr)+offset;
+    ESH_PUT_KEY(addr, key, buffer, size);
+
+    /* update offset at the beginning of current segment */
+    data_ended = offset + ESH_KEY_SIZE(key, size);
+    addr = (uint8_t*)(tmp->seg_info.seg_base_addr);
+    memcpy(addr, &data_ended, sizeof(size_t));
+    PMIX_OUTPUT_VERBOSE((1, pmix_globals.debug_output,
+                         "%s:%d:%s: key %s, rel start offset %lu, rel end offset %lu, abs shift %lu size %lu",
+                         __FILE__, __LINE__, __func__, key, offset, data_ended, id * _data_segment_size, size));
+    return global_offset;
+}
+
+static int pmix_sm_store(ns_track_elem_t *ns_info, pmix_rank_t rank, pmix_kval_t *kval, rank_meta_info **rinfo, int data_exist)
+{
+    size_t offset, size, kval_cnt;
+    pmix_buffer_t buffer;
+    pmix_status_t rc;
+    seg_desc_t *datadesc;
+    uint8_t *addr;
+
+    PMIX_OUTPUT_VERBOSE((2, pmix_globals.debug_output,
+                         "%s:%d:%s: for rank %u, replace flag %d",
+                         __FILE__, __LINE__, __func__, rank, data_exist));
+
+    datadesc = ns_info->data_seg;
+    /* pack value to the buffer */
+    PMIX_CONSTRUCT(&buffer, pmix_buffer_t);
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(&buffer, kval->value, 1, PMIX_VALUE))) {
+        PMIX_ERROR_LOG(rc);
+        goto exit;
+    }
+    size = buffer.bytes_used;
+
+    if (0 == data_exist) {
+        /* there is no data blob for this rank yet, so add it. */
+        size_t free_offset;
+        free_offset = get_free_offset(datadesc);
+        offset = put_data_to_the_end(ns_info, datadesc, kval->key, buffer.base_ptr, size);
+        if (0 == offset) {
+            /* this is an error */
+            rc = PMIX_ERROR;
+            PMIX_ERROR_LOG(rc);
+            goto exit;
+        }
+        /* if it's the first time when we put data for this rank, then *rinfo == NULL,
+         * and even if segment was extended, and data was put into the next segment,
+         * we don't need to extension slot at the end of previous segment.
+         * If we try, we might overwrite other segments memory,
+         * because previous segment is already full. */
+        if (free_offset != offset && NULL != *rinfo) {
+            /* here we compare previous free offset with the offset where we just put data.
+             * It should be equal in the normal case. It it's not true, then it means that
+             * segment was extended, and we put data to the next segment, so we now need to
+             * put extension slot at the end of previous segment with a "reference" to a new_offset */
+            addr = _get_data_region_by_offset(datadesc, free_offset);
+            ESH_PUT_KEY(addr, ESH_REGION_EXTENSION, (void*)&offset, sizeof(size_t));
+        }
+        if (NULL == *rinfo) {
+            *rinfo = (rank_meta_info*)malloc(sizeof(rank_meta_info));
+            (*rinfo)->rank = rank;
+            (*rinfo)->offset = offset;
+            (*rinfo)->count = 0;
+        }
+        (*rinfo)->count++;
+    } else if (NULL != *rinfo) {
+        /* there is data blob for this rank */
+        addr = _get_data_region_by_offset(datadesc, (*rinfo)->offset);
+        if (NULL == addr) {
+            rc = PMIX_ERROR;
+            PMIX_ERROR_LOG(rc);
+            goto exit;
+        }
+        /* go through previous data region and find key matches.
+         * If one is found, then mark this kval as invalidated.
+         * Then put a new empty offset to the next extension slot,
+         * and add new kval by this offset.
+         * no need to update meta info, it's still the same. */
+        kval_cnt = (*rinfo)->count;
+        int add_to_the_end = 1;
+        while (0 < kval_cnt) {
+            /* data is stored in the following format:
+             * size_t size
+             * key[ESH_KNAME_LEN(addr)]
+             * byte buffer containing pmix_value, should be loaded to pmix_buffer_t and unpacked.
+             * next kval pair
+             * .....
+             * extension slot which has key = EXTENSION_SLOT and a size_t value for offset to next data address for this process.
+             */
+            if (0 == strncmp(ESH_KNAME_PTR(addr), ESH_REGION_EXTENSION, ESH_KNAME_LEN(ESH_REGION_EXTENSION))) {
+                memcpy(&offset, ESH_DATA_PTR(addr), sizeof(size_t));
+                if (0 < offset) {
+                    PMIX_OUTPUT_VERBOSE((10, pmix_globals.debug_output,
+                                "%s:%d:%s: for rank %u, replace flag %d %s is filled with %lu value",
+                                __FILE__, __LINE__, __func__, rank, data_exist, ESH_REGION_EXTENSION, offset));
+                    /* go to next item, updating address */
+                    addr = _get_data_region_by_offset(datadesc, offset);
+                    if (NULL == addr) {
+                        rc = PMIX_ERROR;
+                        PMIX_ERROR_LOG(rc);
+                        goto exit;
+                    }
+                } else {
+                    /* should not be, we should be out of cycle when this happens */
+                }
+            } else if (0 == strncmp(ESH_KNAME_PTR(addr), kval->key, ESH_KNAME_LEN(kval->key))) {
+                PMIX_OUTPUT_VERBOSE((10, pmix_globals.debug_output,
+                            "%s:%d:%s: for rank %u, replace flag %d found target key %s",
+                            __FILE__, __LINE__, __func__, rank, data_exist, kval->key));
+                /* target key is found, compare value sizes */
+                if (ESH_DATA_SIZE(addr, ESH_DATA_PTR(addr)) != size) {
+                //if (1) { /* if we want to test replacing values for existing keys. */
+                    /* invalidate current value and store another one at the end of data region. */
+                    strncpy(ESH_KNAME_PTR(addr), ESH_REGION_INVALIDATED, ESH_KNAME_LEN(ESH_REGION_INVALIDATED));
+                    /* decrementing count, it will be incremented back when we add a new value for this key at the end of region. */
+                    (*rinfo)->count--;
+                    kval_cnt--;
+                    /* go to next item, updating address */
+                    addr += ESH_KV_SIZE(addr);
+                    PMIX_OUTPUT_VERBOSE((10, pmix_globals.debug_output,
+                                "%s:%d:%s: for rank %u, replace flag %d mark key %s regions as invalidated. put new data at the end.",
+                                __FILE__, __LINE__, __func__, rank, data_exist, kval->key));
+                } else {
+                    PMIX_OUTPUT_VERBOSE((10, pmix_globals.debug_output,
+                                "%s:%d:%s: for rank %u, replace flag %d replace data for key %s type %d in place",
+                                __FILE__, __LINE__, __func__, rank, data_exist, kval->key, kval->value->type));
+                    /* replace old data with new one. */
+                    memset(ESH_DATA_PTR(addr), 0, ESH_DATA_SIZE(addr, ESH_DATA_PTR(addr)));
+                    memcpy(ESH_DATA_PTR(addr), buffer.base_ptr, size);
+                    addr += ESH_KV_SIZE(addr);
+                    add_to_the_end = 0;
+                    break;
+                }
+            } else {
+                PMIX_OUTPUT_VERBOSE((10, pmix_globals.debug_output,
+                            "%s:%d:%s: for rank %u, replace flag %d skip %s key, look for %s key",
+                            __FILE__, __LINE__, __func__, rank, data_exist, ESH_KNAME_PTR(addr), kval->key));
+                /* Skip it: key is "INVALIDATED" or key is valid but different from target one. */
+                if (0 != strncmp(ESH_REGION_INVALIDATED, ESH_KNAME_PTR(addr), ESH_KNAME_LEN(ESH_KNAME_PTR(addr)))) {
+                    /* count only valid items */
+                    kval_cnt--;
+                }
+                /* go to next item, updating address */
+                addr += ESH_KV_SIZE(addr);
+            }
+        }
+        if (1 == add_to_the_end) {
+            /* if we get here, it means that we want to add a new item for the target rank, or
+             * we mark existing item with the same key as "invalidated" and want to add new item
+             * for the same key. */
+            size_t free_offset;
+            (*rinfo)->count++;
+            free_offset = get_free_offset(datadesc);
+            /* add to the end */
+            offset = put_data_to_the_end(ns_info, datadesc, kval->key, buffer.base_ptr, size);
+            if (0 == offset) {
+                rc = PMIX_ERROR;
+                PMIX_ERROR_LOG(rc);
+                goto exit;
+            }
+            /* we just reached the end of data for the target rank, and there can be two cases:
+             * (1) - we are in the middle of data segment; data for this rank is separated from
+             * data for different ranks, and that's why next element is EXTENSION_SLOT.
+             * We put new data to the end of data region and just update EXTENSION_SLOT value by new offset.
+             */
+            if (0 == strncmp(ESH_KNAME_PTR(addr), ESH_REGION_EXTENSION, ESH_KNAME_LEN(ESH_REGION_EXTENSION))) {
+                PMIX_OUTPUT_VERBOSE((10, pmix_globals.debug_output,
+                            "%s:%d:%s: for rank %u, replace flag %d %s should be filled with offset %lu value",
+                            __FILE__, __LINE__, __func__, rank, data_exist, ESH_REGION_EXTENSION, offset));
+                memcpy(ESH_DATA_PTR(addr), &offset, sizeof(size_t));
+            } else {
+                /* (2) - we point to the first free offset, no more data is stored further in this segment.
+                 * There is no EXTENSION_SLOT by this addr since we continue pushing data for the same rank,
+                 * and there is no need to split it.
+                 * But it's possible that we reached the end of current data region and just jumped to the new region
+                 * to put new data, in that case free_offset != offset and we must put EXTENSION_SLOT by the current addr
+                 * forcibly and store new offset in its value. */
+                if (free_offset != offset) {
+                    /* segment was extended, need to put extension slot by free_offset indicating new_offset */
+                    ESH_PUT_KEY(addr, ESH_REGION_EXTENSION, (void*)&offset, sizeof(size_t));
+                }
+            }
+            PMIX_OUTPUT_VERBOSE((10, pmix_globals.debug_output,
+                        "%s:%d:%s: for rank %u, replace flag %d item not found ext slot empty, put key %s to the end",
+                        __FILE__, __LINE__, __func__, rank, data_exist, kval->key));
+        }
+    }
+exit:
+    PMIX_DESTRUCT(&buffer);
+    return rc;
+}
+
+static int _store_data_for_rank(ns_track_elem_t *ns_info, pmix_rank_t rank, pmix_buffer_t *buf)
+{
+    pmix_status_t rc;
+
+    pmix_kval_t *kp;
+    seg_desc_t *metadesc, *datadesc;
+
+    rank_meta_info *rinfo = NULL;
+    size_t num_elems, free_offset, new_free_offset;
+    int data_exist;
+    int32_t cnt;
+
+    PMIX_OUTPUT_VERBOSE((10, pmix_globals.debug_output,
+                         "%s:%d:%s: for rank %u", __FILE__, __LINE__, __func__, rank));
+
+    metadesc = ns_info->meta_seg;
+    datadesc = ns_info->data_seg;
+
+    if (NULL == datadesc || NULL == metadesc) {
+        rc = PMIX_ERR_BAD_PARAM;
+        PMIX_ERROR_LOG(rc);
+        return rc;
+    }
+
+    num_elems = *((size_t*)(metadesc->seg_info.seg_base_addr));
+    data_exist = 0;
+    /* when we don't use linear search (_direct_mode ==0 ) we don't use num_elems field,
+     * so anyway try to get rank_meta_info first. */
+    if (0 < num_elems || 0 == _direct_mode) {
+        /* go through all elements in meta segment and look for target rank. */
+        rinfo = _get_rank_meta_info(rank, metadesc);
+        if (NULL != rinfo) {
+            data_exist = 1;
+        }
+    }
+    /* incoming buffer may contain several inner buffers for different scopes,
+     * so unpack these buffers, and then unpack kvals from each modex buffer,
+     * storing them in the shared memory dstore.
+     */
+    free_offset = get_free_offset(datadesc);
+    kp = PMIX_NEW(pmix_kval_t);
+    cnt = 1;
+    while (PMIX_SUCCESS == (rc = pmix_bfrop.unpack(buf, kp, &cnt, PMIX_KVAL))) {
+        pmix_output_verbose(2, pmix_globals.debug_output,
+                            "pmix: unpacked key %s", kp->key);
+        if (PMIX_SUCCESS != (rc = pmix_sm_store(ns_info, rank, kp, &rinfo, data_exist))) {
+            PMIX_ERROR_LOG(rc);
+            if (NULL != rinfo) {
+                free(rinfo);
+            }
+            return rc;
+        }
+        PMIX_RELEASE(kp); // maintain acctg - hash_store does a retain
+        kp = PMIX_NEW(pmix_kval_t);
+        cnt = 1;
+    }
+    PMIX_RELEASE(kp);
+
+    if (PMIX_ERR_UNPACK_READ_PAST_END_OF_BUFFER != rc) {
+        PMIX_ERROR_LOG(rc);
+        /* TODO: should we error-exit here? */
+    } else {
+        rc = PMIX_SUCCESS;
+    }
+
+    /* Check if new data was put at the end of data segment.
+     * It's possible that old data just was replaced with new one,
+     * in that case we don't reserve space for EXTENSION_SLOT, it's
+     * already reserved.
+     * */
+    new_free_offset = get_free_offset(datadesc);
+    if (new_free_offset != free_offset) {
+        /* Reserve space for EXTENSION_SLOT at the end of data blob.
+         * We need it to split data for one rank from data for different
+         * ranks and to allow extending data further.
+         * We also put EXTENSION_SLOT at the end of each data segment, and
+         * its value points to the beginning of next data segment.
+         * */
+        rc = put_empty_ext_slot(ns_info->data_seg);
+        if (PMIX_SUCCESS != rc) {
+            if ((0 == data_exist) && NULL != rinfo) {
+                free(rinfo);
+            }
+            PMIX_ERROR_LOG(rc);
+            return rc;
+        }
+    }
+
+    /* if this is the first data posted for this rank, then
+     * update meta info for it */
+    if (0 == data_exist) {
+        set_rank_meta_info(ns_info, rinfo);
+        if (NULL != rinfo) {
+            free(rinfo);
+        }
+    }
+
+    return rc;
+}
+
+static inline ssize_t _get_univ_size(const char *nspace)
+{
+    ssize_t nprocs = 0;
+    pmix_value_t *val;
+    int rc;
+
+    rc = _esh_fetch(nspace, PMIX_RANK_WILDCARD, PMIX_UNIV_SIZE, &val);
+    if( PMIX_SUCCESS != rc ) {
+        PMIX_ERROR_LOG(rc);
+        return rc;
+    }
+    if( val->type != PMIX_UINT32 ){
+        rc = PMIX_ERR_BAD_PARAM;
+        PMIX_ERROR_LOG(rc);
+        return rc;
+    }
+    nprocs = (ssize_t)val->data.uint32;
+    PMIX_VALUE_RELEASE(val);
+    return nprocs;
+}
diff --git a/src/dstore/pmix_esh.h b/src/dstore/pmix_esh.h
new file mode 100644
index 0000000..85c9f80
--- /dev/null
+++ b/src/dstore/pmix_esh.h
@@ -0,0 +1,126 @@
+/*
+ * Copyright (c) 2015-2016 Mellanox Technologies, Inc.
+ *                         All rights reserved.
+ * Copyright (c) 2017      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#ifndef PMIX_DSTORE_ESH_H
+#define PMIX_DSTORE_ESH_H
+
+#include <src/include/pmix_config.h>
+#include "src/class/pmix_value_array.h"
+
+
+#include "pmix_dstore.h"
+#include "src/sm/pmix_sm.h"
+
+BEGIN_C_DECLS
+
+#define INITIAL_SEG_SIZE 4096
+#define NS_META_SEG_SIZE (1<<22)
+#define NS_DATA_SEG_SIZE (1<<22)
+
+#define PMIX_DSTORE_ESH_BASE_PATH "PMIX_DSTORE_ESH_BASE_PATH"
+
+#ifdef HAVE_PTHREAD_SHARED
+#define ESH_PTHREAD_LOCK
+#elif defined HAVE_FCNTL_FLOCK
+#define ESH_FCNTL_LOCK
+#else
+#error No locking mechanism was found
+#endif
+
+/* this structs are used to store information about
+ * shared segments addresses locally at each process,
+ * so they are common for different types of segments
+ * and don't have a specific content (namespace's info,
+ * rank's meta info, ranks's data). */
+
+typedef enum {
+    INITIAL_SEGMENT,
+    NS_META_SEGMENT,
+    NS_DATA_SEGMENT
+} segment_type;
+
+typedef struct seg_desc_t seg_desc_t;
+struct seg_desc_t {
+    segment_type type;
+    pmix_sm_seg_t seg_info;
+    uint32_t id;
+    seg_desc_t *next;
+};
+
+typedef struct ns_map_data_s ns_map_data_t;
+typedef struct session_s session_t;
+typedef struct ns_map_s ns_map_t;
+
+struct session_s {
+    int in_use;
+    uid_t jobuid;
+    char setjobuid;
+    char *nspace_path;
+    char *lockfile;
+#ifdef ESH_PTHREAD_LOCK
+    pmix_sm_seg_t *rwlock_seg;
+    pthread_rwlock_t *rwlock;
+#endif
+    int lockfd;
+    seg_desc_t *sm_seg_first;
+    seg_desc_t *sm_seg_last;
+};
+
+struct ns_map_data_s {
+    char name[PMIX_MAX_NSLEN+1];
+    size_t tbl_idx;
+    int track_idx;
+};
+
+struct ns_map_s {
+    int in_use;
+    ns_map_data_t data;
+};
+
+/* initial segment format:
+ * size_t num_elems;
+ * size_t full; //indicate to client that it needs to attach to the next segment
+ * ns_seg_info_t ns_seg_info[max_ns_num];
+ */
+
+typedef struct {
+    ns_map_data_t ns_map;
+    size_t num_meta_seg;/* read by clients to attach to this number of segments. */
+    size_t num_data_seg;
+} ns_seg_info_t;
+
+/* meta segment format:
+ * size_t num_elems;
+ * rank_meta_info meta_info[max_meta_elems];
+ */
+
+typedef struct {
+    size_t rank;
+    size_t offset;
+    size_t count;
+} rank_meta_info;
+
+typedef struct {
+    pmix_value_array_t super;
+    ns_map_data_t ns_map;
+    size_t num_meta_seg;
+    size_t num_data_seg;
+    seg_desc_t *meta_seg;
+    seg_desc_t *data_seg;
+    bool in_use;
+} ns_track_elem_t;
+
+extern pmix_dstore_base_module_t pmix_dstore_esh_module;
+
+END_C_DECLS
+
+#endif /* PMIX_DSTORE_ESH_H */
diff --git a/src/event/Makefile.include b/src/event/Makefile.include
new file mode 100644
index 0000000..2f97089
--- /dev/null
+++ b/src/event/Makefile.include
@@ -0,0 +1,16 @@
+# -*- makefile -*-
+#
+# Copyright (c) 2016      Intel, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+
+
+headers += \
+        event/pmix_event.h
+
+sources += \
+        event/pmix_event_notification.c \
+        event/pmix_event_registration.c
diff --git a/src/event/pmix_event.h b/src/event/pmix_event.h
new file mode 100644
index 0000000..715289f
--- /dev/null
+++ b/src/event/pmix_event.h
@@ -0,0 +1,195 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2006 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2015-2017 Intel, Inc.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#ifndef PMIX_EVENT_H
+#define PMIX_EVENT_H
+
+#include <src/include/pmix_config.h>
+#include "src/include/types.h"
+#include PMIX_EVENT_HEADER
+
+#include <pmix_common.h>
+#include "src/class/pmix_list.h"
+#include "src/util/output.h"
+
+ BEGIN_C_DECLS
+
+#define PMIX_EVENT_ORDER_NONE       0x00
+#define PMIX_EVENT_ORDER_FIRST      0x01
+#define PMIX_EVENT_ORDER_LAST       0x02
+#define PMIX_EVENT_ORDER_BEFORE     0x04
+#define PMIX_EVENT_ORDER_AFTER      0x08
+#define PMIX_EVENT_ORDER_PREPEND    0x10
+#define PMIX_EVENT_ORDER_APPEND     0x20
+
+/* define a struct for tracking registration ranges */
+typedef struct {
+    pmix_data_range_t range;
+    pmix_proc_t *procs;
+    size_t nprocs;
+} pmix_range_trkr_t;
+
+/* define a common struct for tracking event handlers */
+typedef struct {
+    pmix_list_item_t super;
+    char *name;
+    size_t index;
+    uint8_t precedence;
+    char *locator;
+    pmix_range_trkr_t rng;
+    pmix_notification_fn_t evhdlr;
+    void *cbobject;
+    pmix_status_t *codes;
+    size_t ncodes;
+} pmix_event_hdlr_t;
+PMIX_CLASS_DECLARATION(pmix_event_hdlr_t);
+
+/* define an object for tracking status codes we are actively
+ * registered to receive */
+typedef struct {
+    pmix_list_item_t super;
+    pmix_status_t code;
+    size_t nregs;
+} pmix_active_code_t;
+PMIX_CLASS_DECLARATION(pmix_active_code_t);
+
+/* define an object for housing the different lists of events
+ * we have registered so we can easily scan them in precedent
+ * order when we get an event */
+typedef struct {
+    pmix_object_t super;
+    size_t nhdlrs;
+    pmix_event_hdlr_t *first;
+    pmix_event_hdlr_t *last;
+    pmix_list_t actives;
+    pmix_list_t single_events;
+    pmix_list_t multi_events;
+    pmix_list_t default_events;
+} pmix_events_t;
+PMIX_CLASS_DECLARATION(pmix_events_t);
+
+/* define an object for chaining event notifications thru
+ * the local state machine. Each registered event handler
+ * that asked to be notified for a given code is given a
+ * chance to "see" the reported event, starting with
+ * single-code handlers, then multi-code handlers, and
+ * finally default handlers. This object provides a
+ * means for us to relay the event across that chain
+ */
+typedef struct pmix_event_chain_t {
+    pmix_list_item_t super;
+    pmix_status_t status;
+    pmix_event_t ev;
+    bool timer_active;
+    bool nondefault;
+    bool endchain;
+    pmix_proc_t source;
+    pmix_data_range_t range;
+    pmix_info_t *info;
+    size_t ninfo;
+    pmix_info_t *results;
+    size_t nresults;
+    pmix_event_hdlr_t *evhdlr;
+    pmix_op_cbfunc_t final_cbfunc;
+    void *final_cbdata;
+} pmix_event_chain_t;
+PMIX_CLASS_DECLARATION(pmix_event_chain_t);
+
+/* invoke the error handler that is registered against the given
+ * status, passing it the provided info on the procs that were
+ * affected, plus any additional info provided by the server */
+void pmix_invoke_local_event_hdlr(pmix_event_chain_t *chain);
+
+/* invoke the server event notification handler */
+pmix_status_t pmix_server_notify_client_of_event(pmix_status_t status,
+                                                 const pmix_proc_t *source,
+                                                 pmix_data_range_t range,
+                                                 pmix_info_t info[], size_t ninfo,
+                                                 pmix_op_cbfunc_t cbfunc, void *cbdata);
+
+void pmix_event_timeout_cb(int fd, short flags, void *arg);
+
+#define PMIX_REPORT_EVENT(e, p, r, f)                                               \
+    do {                                                                            \
+        pmix_event_chain_t *ch, *cp;                                                \
+        size_t n, ninfo;                                                            \
+        pmix_info_t *info;                                                          \
+        pmix_proc_t proc;                                                           \
+                                                                                    \
+        ch = NULL;                                                                  \
+        /* see if we already have this event cached */                              \
+        PMIX_LIST_FOREACH(cp, &pmix_globals.cached_events, pmix_event_chain_t) {    \
+            if (cp->status == (e)) {                                                \
+                ch = cp;                                                            \
+                break;                                                              \
+            }                                                                       \
+        }                                                                           \
+        if (NULL == ch) {                                                           \
+            /* nope - need to add it */                                             \
+            ch = PMIX_NEW(pmix_event_chain_t);                                      \
+            ch->status = (e);                                                       \
+            ch->range = (r);                                                        \
+            (void)strncpy(ch->source.nspace,                                        \
+                          (p)->info->nptr->nspace,                                  \
+                          PMIX_MAX_NSLEN);                                          \
+            ch->source.rank = (p)->info->rank;                                      \
+            ch->ninfo = 2;                                                          \
+            ch->final_cbfunc = (f);                                                 \
+            ch->final_cbdata = ch;                                                  \
+            PMIX_INFO_CREATE(ch->info, ch->ninfo);                                  \
+            PMIX_INFO_LOAD(&ch->info[0],                                            \
+                           PMIX_EVENT_HDLR_NAME,                                    \
+                           NULL, PMIX_STRING);                                      \
+            PMIX_INFO_LOAD(&ch->info[1],                                            \
+                           PMIX_EVENT_RETURN_OBJECT,                                \
+                           NULL, PMIX_POINTER);                                     \
+            /* cache it */                                                          \
+            pmix_list_append(&pmix_globals.cached_events, &ch->super);              \
+            ch->timer_active = true;                                                \
+            pmix_event_assign(&ch->ev, pmix_globals.evbase, -1, 0,                  \
+                              pmix_event_timeout_cb, ch);                           \
+            PMIX_POST_OBJECT(ch);                                                   \
+            pmix_event_add(&ch->ev, &pmix_globals.event_window);                    \
+        } else {                                                                    \
+            /* add this peer to the array of sources */                             \
+            (void)strncpy(proc.nspace, (p)->info->nptr->nspace, PMIX_MAX_NSLEN);    \
+            proc.rank = (p)->info->rank;                                            \
+            ninfo = ch->ninfo + 1;                                                  \
+            PMIX_INFO_CREATE(info, ninfo);                                          \
+            /* must keep the hdlr name and return object at the end, so prepend */  \
+            PMIX_INFO_LOAD(&info[0], PMIX_PROCID,                                   \
+                           &proc, PMIX_PROC);                                       \
+            for (n=0; n < ch->ninfo; n++) {                                         \
+                PMIX_INFO_XFER(&info[n+1], &ch->info[n]);                           \
+            }                                                                       \
+            PMIX_INFO_FREE(ch->info, ch->ninfo);                                    \
+            ch->info = info;                                                        \
+            ch->ninfo = ninfo;                                                      \
+            /* reset the timer */                                                   \
+            pmix_event_del(&ch->ev);                                                \
+            PMIX_POST_OBJECT(ch);                                                   \
+            pmix_event_add(&ch->ev, &pmix_globals.event_window);                    \
+        }                                                                           \
+    } while(0)
+
+
+ END_C_DECLS
+
+#endif /* PMIX_EVENT_H */
diff --git a/src/event/pmix_event_notification.c b/src/event/pmix_event_notification.c
new file mode 100644
index 0000000..27b1ed7
--- /dev/null
+++ b/src/event/pmix_event_notification.c
@@ -0,0 +1,1196 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2014-2017 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2017      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2017      IBM Corporation. All rights reserved.
+ *
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+#include <src/include/pmix_config.h>
+
+#include <pmix.h>
+#include <pmix_common.h>
+#include <pmix_server.h>
+#include <pmix_rename.h>
+
+#include "src/threads/threads.h"
+#include "src/util/error.h"
+#include "src/util/output.h"
+
+#include "src/client/pmix_client_ops.h"
+#include "src/server/pmix_server_ops.h"
+#include "src/include/pmix_globals.h"
+
+static pmix_status_t notify_server_of_event(pmix_status_t status,
+                                            const pmix_proc_t *source,
+                                            pmix_data_range_t range,
+                                            pmix_info_t info[], size_t ninfo,
+                                            pmix_op_cbfunc_t cbfunc, void *cbdata);
+
+static bool check_range(pmix_range_trkr_t *range, const pmix_proc_t *proc);
+
+/* if we are a client, we call this function to notify the server of
+ * an event. If we are a server, our host RM will call this function
+ * to notify us of an event */
+PMIX_EXPORT pmix_status_t PMIx_Notify_event(pmix_status_t status,
+                                            const pmix_proc_t *source,
+                                            pmix_data_range_t range,
+                                            pmix_info_t info[], size_t ninfo,
+                                            pmix_op_cbfunc_t cbfunc, void *cbdata)
+{
+    int rc;
+
+    PMIX_ACQUIRE_THREAD(&pmix_global_lock);
+
+    if (pmix_globals.init_cntr <= 0) {
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return PMIX_ERR_INIT;
+    }
+
+    /* if we aren't connected, don't attempt to send */
+    if (!PMIX_PROC_IS_SERVER && !pmix_globals.connected) {
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return PMIX_ERR_UNREACH;
+    }
+    PMIX_RELEASE_THREAD(&pmix_global_lock);
+
+
+    if (PMIX_PROC_IS_SERVER) {
+        rc = pmix_server_notify_client_of_event(status, source, range,
+                                                info, ninfo,
+                                                cbfunc, cbdata);
+        pmix_output_verbose(2, pmix_globals.debug_output,
+                            "pmix_server_notify_event source = %s:%d event_status = %d, rc= %d",
+                            (NULL == source) ? "UNKNOWN" : source->nspace,
+                            (NULL == source) ? PMIX_RANK_WILDCARD : source->rank, status, rc);
+    } else {
+        rc = notify_server_of_event(status, source, range,
+                                    info, ninfo,
+                                    cbfunc, cbdata);
+        pmix_output_verbose(2, pmix_globals.debug_output,
+                            "pmix_client_notify_event source = %s:%d event_status =%d, rc=%d",
+                            (NULL == source) ? pmix_globals.myid.nspace : source->nspace,
+                            (NULL == source) ? pmix_globals.myid.rank : source->rank, status, rc);
+    }
+    return rc;
+}
+
+static void notify_event_cbfunc(struct pmix_peer_t *pr, pmix_ptl_hdr_t *hdr,
+                                pmix_buffer_t *buf, void *cbdata)
+{
+    pmix_status_t rc, ret;
+    int32_t cnt = 1;
+    pmix_cb_t *cb = (pmix_cb_t*)cbdata;
+
+    /* unpack the status */
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, &ret, &cnt, PMIX_STATUS))) {
+        PMIX_ERROR_LOG(rc);
+        ret = rc;
+    }
+    /* do the cback */
+    if (NULL != cb->op_cbfunc) {
+        cb->op_cbfunc(ret, cb->cbdata);
+    }
+    PMIX_RELEASE(cb);
+}
+
+/* as a client, we pass the notification to our server */
+static pmix_status_t notify_server_of_event(pmix_status_t status,
+                                            const pmix_proc_t *source,
+                                            pmix_data_range_t range,
+                                            pmix_info_t info[], size_t ninfo,
+                                            pmix_op_cbfunc_t cbfunc, void *cbdata)
+{
+    pmix_status_t rc;
+    pmix_buffer_t *msg;
+    pmix_cmd_t cmd = PMIX_NOTIFY_CMD;
+    pmix_cb_t *cb;
+    pmix_event_chain_t *chain;
+    size_t n;
+    pmix_notify_caddy_t *cd, *rbout;
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "client: notifying server %s:%d of status %s",
+                        pmix_globals.myid.nspace, pmix_globals.myid.rank,
+                        PMIx_Error_string(status));
+
+    if (PMIX_RANGE_PROC_LOCAL != range) {
+        /* create the msg object */
+        msg = PMIX_NEW(pmix_buffer_t);
+
+        /* pack the command */
+        if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msg, &cmd, 1, PMIX_CMD))) {
+            PMIX_ERROR_LOG(rc);
+            goto cleanup;
+        }
+        /* pack the status */
+        if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msg, &status, 1, PMIX_STATUS))) {
+            PMIX_ERROR_LOG(rc);
+            goto cleanup;
+        }
+        /* no need to pack the source as it is us */
+
+        /* pack the range */
+        if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msg, &range, 1, PMIX_DATA_RANGE))) {
+            PMIX_ERROR_LOG(rc);
+            goto cleanup;
+        }
+        /* pack the info */
+        if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msg, &ninfo, 1, PMIX_SIZE))) {
+            PMIX_ERROR_LOG(rc);
+            goto cleanup;
+        }
+        if (0 < ninfo) {
+            if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msg, info, ninfo, PMIX_INFO))) {
+                PMIX_ERROR_LOG(rc);
+                goto cleanup;
+            }
+        }
+    }
+
+    /* setup for our own local callbacks */
+    chain = PMIX_NEW(pmix_event_chain_t);
+    chain->status = status;
+    (void)strncpy(chain->source.nspace, pmix_globals.myid.nspace, PMIX_MAX_NSLEN);
+    chain->source.rank = pmix_globals.myid.rank;
+    /* we always leave space for a callback object and
+     * the evhandler name. */
+    chain->ninfo = ninfo + 2;
+    PMIX_INFO_CREATE(chain->info, chain->ninfo);
+
+    if (0 < ninfo) {
+        /* need to copy the info */
+        for (n=0; n < ninfo; n++) {
+            PMIX_INFO_XFER(&chain->info[n], &info[n]);
+        }
+    }
+    /* add the evhandler name tag - we
+     * will fill it in as each handler is called */
+    PMIX_INFO_LOAD(&chain->info[chain->ninfo-2], PMIX_EVENT_HDLR_NAME, NULL, PMIX_STRING);
+    /* now add the callback object tag */
+    PMIX_INFO_LOAD(&chain->info[chain->ninfo-1], PMIX_EVENT_RETURN_OBJECT, NULL, PMIX_POINTER);
+
+    /* we need to cache this event so we can pass it into
+     * ourselves should someone later register for it */
+    cd = PMIX_NEW(pmix_notify_caddy_t);
+    cd->status = status;
+    if (NULL == source) {
+        (void)strncpy(cd->source.nspace, "UNDEF", PMIX_MAX_NSLEN);
+        cd->source.rank = PMIX_RANK_UNDEF;
+    } else {
+        (void)strncpy(cd->source.nspace, source->nspace, PMIX_MAX_NSLEN);
+        cd->source.rank = source->rank;
+    }
+    cd->range = range;
+    if (0 < chain->ninfo) {
+        cd->ninfo = chain->ninfo;
+        PMIX_INFO_CREATE(cd->info, cd->ninfo);
+       /* need to copy the info */
+        for (n=0; n < cd->ninfo; n++) {
+            PMIX_INFO_XFER(&cd->info[n], &chain->info[n]);
+            if (0 == strncmp(cd->info[n].key, PMIX_EVENT_NON_DEFAULT, PMIX_MAX_KEYLEN)) {
+                cd->nondefault = true;
+            } else if (0 == strncmp(cd->info[n].key, PMIX_EVENT_CUSTOM_RANGE, PMIX_MAX_KEYLEN)) {
+                /* provides an array of pmix_proc_t identifying the procs
+                 * that are to receive this notification, or a single pmix_proc_t  */
+                if (PMIX_DATA_ARRAY == cd->info[n].value.type &&
+                    NULL != cd->info[n].value.data.darray &&
+                    NULL != cd->info[n].value.data.darray->array) {
+                    cd->ntargets = cd->info[n].value.data.darray->size;
+                    PMIX_PROC_CREATE(cd->targets, cd->ntargets);
+                    memcpy(cd->targets, cd->info[n].value.data.darray->array, cd->ntargets * sizeof(pmix_proc_t));
+                } else if (PMIX_PROC == cd->info[n].value.type) {
+                    cd->ntargets = 1;
+                    PMIX_PROC_CREATE(cd->targets, cd->ntargets);
+                    memcpy(cd->targets, cd->info[n].value.data.proc, sizeof(pmix_proc_t));
+                } else {
+                    /* this is an error */
+                    PMIX_ERROR_LOG(PMIX_ERR_BAD_PARAM);
+                    return PMIX_ERR_BAD_PARAM;
+                }
+            }
+        }
+    }
+
+    /* add to our cache */
+    rbout = pmix_ring_buffer_push(&pmix_globals.notifications, cd);
+    /* if an older event was bumped, release it */
+    if (NULL != rbout) {
+        PMIX_RELEASE(rbout);
+    }
+
+    if (PMIX_RANGE_PROC_LOCAL != range) {
+        /* create a callback object as we need to pass it to the
+         * recv routine so we know which callback to use when
+         * the server acks/nacks the register events request. The
+         * server will _not_ send this notification back to us,
+         * so we handle it locally */
+        cb = PMIX_NEW(pmix_cb_t);
+        cb->op_cbfunc = cbfunc;
+        cb->cbdata = cbdata;
+        /* send to the server */
+        pmix_output_verbose(2, pmix_globals.debug_output,
+                            "client: notifying server %s:%d - sending",
+                            pmix_globals.myid.nspace, pmix_globals.myid.rank);
+        rc = pmix_ptl.send_recv(pmix_client_globals.myserver, msg, notify_event_cbfunc, cb);
+        if (PMIX_SUCCESS != rc) {
+            PMIX_ERROR_LOG(rc);
+            PMIX_RELEASE(cb);
+            goto cleanup;
+        }
+    } else {
+        cbfunc(PMIX_SUCCESS, cbdata);
+    }
+
+    /* now notify any matching registered callbacks we have */
+    pmix_invoke_local_event_hdlr(chain);
+
+    return PMIX_SUCCESS;
+
+  cleanup:
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "client: notifying server - unable to send");
+    PMIX_RELEASE(msg);
+    /* we were unable to send anything, so we just return the error */
+    return rc;
+}
+
+
+static void progress_local_event_hdlr(pmix_status_t status,
+                                      pmix_info_t *results, size_t nresults,
+                                      pmix_op_cbfunc_t cbfunc, void *thiscbdata,
+                                      void *notification_cbdata)
+{
+    /* this may be in the host's thread, so we need to threadshift it
+     * before accessing our internal data */
+
+    pmix_event_chain_t *chain = (pmix_event_chain_t*)notification_cbdata;
+    size_t n, nsave, cnt;
+    pmix_info_t *newinfo;
+    pmix_list_item_t *item;
+    pmix_event_hdlr_t *nxt;
+
+    /* aggregate the results per RFC0018 - first search the
+     * prior chained results to see if any keys have been NULL'd
+     * as this indicates that info struct should be removed */
+    nsave = 0;
+    for (n=0; n < chain->nresults; n++) {
+        if (0 < strlen(chain->results[n].key)) {
+            ++nsave;
+        }
+    }
+    /* we have to at least record the status returned by each
+     * stage of the event handler chain, so we have to reallocate
+     * the array to make space */
+
+    /* add in any new results plus space for the returned status */
+    nsave += nresults + 1;
+    /* create the new space */
+    PMIX_INFO_CREATE(newinfo, nsave);
+    /* transfer over the prior data */
+    cnt = 0;
+    for (n=0; n < chain->nresults; n++) {
+        if (0 < strlen(chain->results[n].key)) {
+            PMIX_INFO_XFER(&newinfo[cnt], &chain->results[n]);
+            ++cnt;
+        }
+    }
+
+    /* save this handler's returned status */
+    if (NULL != chain->evhdlr->name) {
+        (void)strncpy(newinfo[cnt].key, chain->evhdlr->name, PMIX_MAX_KEYLEN);
+    } else {
+        (void)strncpy(newinfo[cnt].key, "UNKNOWN", PMIX_MAX_KEYLEN);
+    }
+    newinfo[cnt].value.type = PMIX_STATUS;
+    newinfo[cnt].value.data.status = status;
+    ++cnt;
+    /* transfer across the new results */
+    for (n=0; n < nresults; n++) {
+        PMIX_INFO_XFER(&newinfo[cnt], &results[n]);
+        ++cnt;
+    }
+    /* release the prior results */
+    if (0 < chain->nresults) {
+        PMIX_INFO_FREE(chain->results, chain->nresults);
+    }
+    /* pass along the new ones */
+    chain->results = newinfo;
+    chain->nresults = cnt;
+
+    /* if the caller indicates that the chain is completed,
+     * or we completed the "last" event */
+    if (PMIX_EVENT_ACTION_COMPLETE == status || chain->endchain) {
+        goto complete;
+    }
+    item = NULL;
+
+    /* see if we need to continue, starting with the single code events */
+    if (1 == chain->evhdlr->ncodes) {
+        /* the last handler was for a single code - see if there are
+         * any others that match this event */
+        item = &chain->evhdlr->super;
+        while (pmix_list_get_end(&pmix_globals.events.single_events) != (item = pmix_list_get_next(item))) {
+            nxt = (pmix_event_hdlr_t*)item;
+            if (nxt->codes[0] == chain->status &&
+                check_range(&nxt->rng, &chain->source)) {
+                chain->evhdlr = nxt;
+                /* update the handler name in case they want to reference it */
+                for (n=0; n < chain->ninfo; n++) {
+                    if (0 == strncmp(chain->info[n].key, PMIX_EVENT_HDLR_NAME, PMIX_MAX_KEYLEN)) {
+                        if (NULL != chain->info[n].value.data.string) {
+                            free(chain->info[n].value.data.string);
+                        }
+                        if (NULL != chain->evhdlr->name) {
+                            chain->info[n].value.data.string = strdup(chain->evhdlr->name);
+                        }
+                        break;
+                    }
+                }
+                /* update the evhdlr cbobject */
+                for (n=0; n < chain->ninfo; n++) {
+                    if (0 == strncmp(chain->info[n].key, PMIX_EVENT_RETURN_OBJECT, PMIX_MAX_KEYLEN)) {
+                        if (NULL != chain->evhdlr->name) {
+                            chain->info[n].value.data.ptr = chain->evhdlr->cbobject;
+                        }
+                        break;
+                    }
+                }
+                nxt->evhdlr(nxt->index,
+                            chain->status, &chain->source,
+                            chain->info, chain->ninfo,
+                            chain->results, chain->nresults,
+                            progress_local_event_hdlr, (void*)chain);
+                return;
+            }
+        }
+        /* if we get here, then there are no more single code
+         * events that match */
+        item = pmix_list_get_begin(&pmix_globals.events.multi_events);
+    }
+
+    /* see if we need to continue with the multi code events */
+    if (NULL != chain->evhdlr->codes || NULL != item) {
+        /* the last handler was for a multi-code event, or we exhausted
+         * all the single code events */
+        if (NULL == item) {
+            /* if the last handler was multi-code, then start from that point */
+            item = &chain->evhdlr->super;
+        }
+        while (pmix_list_get_end(&pmix_globals.events.multi_events) != (item = pmix_list_get_next(item))) {
+            nxt = (pmix_event_hdlr_t*)item;
+            if (!check_range(&nxt->rng, &chain->source)) {
+                continue;
+            }
+            for (n=0; n < nxt->ncodes; n++) {
+                /* if this event handler provided a range, check to see if
+                 * the source fits within it */
+                if (nxt->codes[n] == chain->status) {
+                    chain->evhdlr = nxt;
+                    /* update the handler name in case they want to reference it */
+                    for (n=0; n < chain->ninfo; n++) {
+                        if (0 == strncmp(chain->info[n].key, PMIX_EVENT_HDLR_NAME, PMIX_MAX_KEYLEN)) {
+                            if (NULL != chain->info[n].value.data.string) {
+                                free(chain->info[n].value.data.string);
+                            }
+                            if (NULL != chain->evhdlr->name) {
+                                chain->info[n].value.data.string = strdup(chain->evhdlr->name);
+                            }
+                            break;
+                        }
+                    }
+                    /* update the evhdlr cbobject */
+                    for (n=0; n < chain->ninfo; n++) {
+                        if (0 == strncmp(chain->info[n].key, PMIX_EVENT_RETURN_OBJECT, PMIX_MAX_KEYLEN)) {
+                            if (NULL != chain->evhdlr->name) {
+                                chain->info[n].value.data.ptr = chain->evhdlr->cbobject;
+                            }
+                            break;
+                        }
+                    }
+                    nxt->evhdlr(nxt->index,
+                                chain->status, &chain->source,
+                                chain->info, chain->ninfo,
+                                chain->results, chain->nresults,
+                                progress_local_event_hdlr, (void*)chain);
+                    return;
+                }
+            }
+        }
+        /* if we get here, then there are no more multi-mode
+         * events that match */
+        item = pmix_list_get_begin(&pmix_globals.events.default_events);
+    }
+
+    /* if they didn't want it to go to a default handler, then ignore them */
+    if (!chain->nondefault) {
+        if (NULL == item) {
+            item = &chain->evhdlr->super;
+        }
+        if (pmix_list_get_end(&pmix_globals.events.default_events) != (item = pmix_list_get_next(item))) {
+            nxt = (pmix_event_hdlr_t*)item;
+            /* if this event handler provided a range, check to see if
+             * the source fits within it */
+            if (check_range(&nxt->rng, &chain->source)) {
+                chain->evhdlr = nxt;
+                /* update the handler name in case they want to reference it */
+                for (n=0; n < chain->ninfo; n++) {
+                    if (0 == strncmp(chain->info[n].key, PMIX_EVENT_HDLR_NAME, PMIX_MAX_KEYLEN)) {
+                        if (NULL != chain->info[n].value.data.string) {
+                            free(chain->info[n].value.data.string);
+                        }
+                        if (NULL != chain->evhdlr->name) {
+                            chain->info[n].value.data.string = strdup(chain->evhdlr->name);
+                        }
+                        break;
+                    }
+                }
+                /* update the evhdlr cbobject */
+                for (n=0; n < chain->ninfo; n++) {
+                    if (0 == strncmp(chain->info[n].key, PMIX_EVENT_RETURN_OBJECT, PMIX_MAX_KEYLEN)) {
+                        if (NULL != chain->evhdlr->name) {
+                            chain->info[n].value.data.ptr = chain->evhdlr->cbobject;
+                        }
+                        break;
+                    }
+                }
+                nxt->evhdlr(nxt->index,
+                            chain->status, &chain->source,
+                            chain->info, chain->ninfo,
+                            chain->results, chain->nresults,
+                            progress_local_event_hdlr, (void*)chain);
+                return;
+            }
+        }
+    }
+
+    /* if we registered a "last" handler, and it fits the given range
+     * and code, then invoke it now */
+    if (NULL != pmix_globals.events.last &&
+        check_range(&pmix_globals.events.last->rng, &chain->source)) {
+        chain->endchain = true;  // ensure we don't do this again
+        if (1 == pmix_globals.events.last->ncodes &&
+            pmix_globals.events.last->codes[0] == chain->status) {
+            chain->evhdlr = pmix_globals.events.last;
+            /* update the handler name in case they want to reference it */
+            for (n=0; n < chain->ninfo; n++) {
+                if (0 == strncmp(chain->info[n].key, PMIX_EVENT_HDLR_NAME, PMIX_MAX_KEYLEN)) {
+                    if (NULL != chain->info[n].value.data.string) {
+                        free(chain->info[n].value.data.string);
+                    }
+                    if (NULL != chain->evhdlr->name) {
+                        chain->info[n].value.data.string = strdup(chain->evhdlr->name);
+                    }
+                    break;
+                }
+            }
+            /* update the evhdlr cbobject */
+            for (n=0; n < chain->ninfo; n++) {
+                if (0 == strncmp(chain->info[n].key, PMIX_EVENT_RETURN_OBJECT, PMIX_MAX_KEYLEN)) {
+                    if (NULL != chain->evhdlr->name) {
+                        chain->info[n].value.data.ptr = chain->evhdlr->cbobject;
+                    }
+                    break;
+                }
+            }
+            chain->evhdlr->evhdlr(chain->evhdlr->index,
+                                  chain->status, &chain->source,
+                                  chain->info, chain->ninfo,
+                                  chain->results, chain->nresults,
+                                  progress_local_event_hdlr, (void*)chain);
+            return;
+        } else if (NULL != pmix_globals.events.last->codes) {
+            /* need to check if this code is included in the array */
+            for (n=0; n < pmix_globals.events.last->ncodes; n++) {
+                if (pmix_globals.events.last->codes[n] == chain->status) {
+                    chain->evhdlr = pmix_globals.events.last;
+                    /* update the handler name in case they want to reference it */
+                    for (n=0; n < chain->ninfo; n++) {
+                        if (0 == strncmp(chain->info[n].key, PMIX_EVENT_HDLR_NAME, PMIX_MAX_KEYLEN)) {
+                            if (NULL != chain->info[n].value.data.string) {
+                                free(chain->info[n].value.data.string);
+                            }
+                            if (NULL != chain->evhdlr->name) {
+                                chain->info[n].value.data.string = strdup(chain->evhdlr->name);
+                            }
+                            break;
+                        }
+                    }
+                    /* update the evhdlr cbobject */
+                    for (n=0; n < chain->ninfo; n++) {
+                        if (0 == strncmp(chain->info[n].key, PMIX_EVENT_RETURN_OBJECT, PMIX_MAX_KEYLEN)) {
+                            if (NULL != chain->evhdlr->name) {
+                                chain->info[n].value.data.ptr = chain->evhdlr->cbobject;
+                            }
+                            break;
+                        }
+                    }
+                    chain->evhdlr->evhdlr(chain->evhdlr->index,
+                                          chain->status, &chain->source,
+                                          chain->info, chain->ninfo,
+                                          chain->results, chain->nresults,
+                                          progress_local_event_hdlr, (void*)chain);
+                    return;
+                }
+            }
+        } else {
+            /* gets run for all codes */
+            chain->evhdlr = pmix_globals.events.last;
+            /* update the handler name in case they want to reference it */
+            for (n=0; n < chain->ninfo; n++) {
+                if (0 == strncmp(chain->info[n].key, PMIX_EVENT_HDLR_NAME, PMIX_MAX_KEYLEN)) {
+                    if (NULL != chain->info[n].value.data.string) {
+                        free(chain->info[n].value.data.string);
+                    }
+                    if (NULL != chain->evhdlr->name) {
+                        chain->info[n].value.data.string = strdup(chain->evhdlr->name);
+                    }
+                    break;
+                }
+            }
+            /* update the evhdlr cbobject */
+            for (n=0; n < chain->ninfo; n++) {
+                if (0 == strncmp(chain->info[n].key, PMIX_EVENT_RETURN_OBJECT, PMIX_MAX_KEYLEN)) {
+                    if (NULL != chain->evhdlr->name) {
+                        chain->info[n].value.data.ptr = chain->evhdlr->cbobject;
+                    }
+                    break;
+                }
+            }
+            chain->evhdlr->evhdlr(chain->evhdlr->index,
+                                  chain->status, &chain->source,
+                                  chain->info, chain->ninfo,
+                                  chain->results, chain->nresults,
+                                  progress_local_event_hdlr, (void*)chain);
+            return;
+        }
+    }
+
+  complete:
+    /* we still have to call their final callback */
+    if (NULL != chain->final_cbfunc) {
+        chain->final_cbfunc(PMIX_SUCCESS, chain->final_cbdata);
+        return;
+    }
+    /* maintain acctng */
+    PMIX_RELEASE(chain);
+    /* let the caller know that we are done with their callback */
+    if (NULL != cbfunc) {
+        cbfunc(PMIX_SUCCESS, thiscbdata);
+    }
+}
+
+/* given notification of an event, cycle thru our list of
+ * registered callbacks and invoke the matching ones. Note
+ * that we will invoke the callbacks in order from single
+ * to multi-event to default, keeping a log of any returned
+ * info and passing it down to the next invoked event handler.
+ * Thus, each handler is given the opportunity to see what
+ * prior handlers did, and decide if anything further needs
+ * to be done.
+ */
+void pmix_invoke_local_event_hdlr(pmix_event_chain_t *chain)
+{
+    /* We need to parse thru each registered handler and determine
+     * which one(s) to call for the specific error */
+    size_t i;
+    pmix_event_hdlr_t *evhdlr;
+    pmix_status_t rc = PMIX_SUCCESS;
+    bool found;
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "%s:%d invoke_local_event_hdlr for status %s",
+                        pmix_globals.myid.nspace, pmix_globals.myid.rank,
+                        PMIx_Error_string(chain->status));
+
+    /* sanity check */
+    if (NULL == chain->info) {
+        /* should never happen as the return object must
+         * at least be there, even if it is NULL */
+        rc = PMIX_ERR_BAD_PARAM;
+        goto complete;
+    }
+
+    /* check for directives */
+    for (i=0; i < chain->ninfo; i++) {
+        if (0 == strncmp(chain->info[i].key, PMIX_EVENT_NON_DEFAULT, PMIX_MAX_KEYLEN)) {
+            chain->nondefault = true;
+        }
+    }
+
+    /* if we registered a "first" handler, and it fits the given range,
+     * then invoke it first */
+    if (NULL != pmix_globals.events.first) {
+        if (1 == pmix_globals.events.first->ncodes &&
+            pmix_globals.events.first->codes[0] == chain->status &&
+            check_range(&pmix_globals.events.first->rng, &chain->source)) {
+            /* invoke the handler */
+            chain->evhdlr = pmix_globals.events.first;
+            goto invk;
+        } else if (NULL != pmix_globals.events.first->codes) {
+            /* need to check if this code is included in the array */
+            found = false;
+            for (i=0; i < pmix_globals.events.first->ncodes; i++) {
+                if (pmix_globals.events.first->codes[i] == chain->status) {
+                    found = true;
+                    break;
+                }
+            }
+            /* if this event handler provided a range, check to see if
+             * the source fits within it */
+            if (found && check_range(&pmix_globals.events.first->rng, &chain->source)) {
+                /* invoke the handler */
+                chain->evhdlr = pmix_globals.events.first;
+                goto invk;
+            }
+        } else {
+            /* take all codes for a default handler */
+            if (check_range(&pmix_globals.events.first->rng, &chain->source)) {
+                /* invoke the handler */
+                chain->evhdlr = pmix_globals.events.first;
+                goto invk;
+            }
+        }
+        /* get here if there is no match, so fall thru */
+    }
+
+    /* cycle thru the single-event registrations first */
+    PMIX_LIST_FOREACH(evhdlr, &pmix_globals.events.single_events, pmix_event_hdlr_t) {
+        if (evhdlr->codes[0] == chain->status) {
+            if (check_range(&evhdlr->rng, &chain->source)) {
+                /* invoke the handler */
+                chain->evhdlr = evhdlr;
+                goto invk;
+            }
+        }
+    }
+
+    /* if we didn't find any match in the single-event registrations,
+     * then cycle thru the multi-event registrations next */
+    PMIX_LIST_FOREACH(evhdlr, &pmix_globals.events.multi_events, pmix_event_hdlr_t) {
+        for (i=0; i < evhdlr->ncodes; i++) {
+            if (evhdlr->codes[i] == chain->status) {
+                if (check_range(&evhdlr->rng, &chain->source)) {
+                    /* invoke the handler */
+                    chain->evhdlr = evhdlr;
+                    goto invk;
+                }
+            }
+        }
+    }
+
+    /* if they didn't want it to go to a default handler, then ignore them */
+    if (!chain->nondefault) {
+        /* pass it to any default handlers */
+        PMIX_LIST_FOREACH(evhdlr, &pmix_globals.events.default_events, pmix_event_hdlr_t) {
+            if (check_range(&evhdlr->rng, &chain->source)) {
+                /* invoke the handler */
+                chain->evhdlr = evhdlr;
+                goto invk;
+            }
+        }
+    }
+
+    /* if we registered a "last" handler, and it fits the given range
+     * and code, then invoke it now */
+    if (NULL != pmix_globals.events.last &&
+        check_range(&pmix_globals.events.last->rng, &chain->source)) {
+        chain->endchain = true;  // ensure we don't do this again
+        if (1 == pmix_globals.events.last->ncodes &&
+            pmix_globals.events.last->codes[0] == chain->status) {
+            chain->evhdlr = pmix_globals.events.last;
+            goto invk;
+        } else if (NULL != pmix_globals.events.last->codes) {
+            /* need to check if this code is included in the array */
+            for (i=0; i < pmix_globals.events.last->ncodes; i++) {
+                if (pmix_globals.events.last->codes[i] == chain->status) {
+                    chain->evhdlr = pmix_globals.events.last;
+                    goto invk;
+                }
+            }
+        } else {
+            /* gets run for all codes */
+            chain->evhdlr = pmix_globals.events.last;
+            goto invk;
+        }
+    }
+
+    /* if we got here, then nothing was found */
+  complete:
+    /* we still have to call their final callback */
+    if (NULL != chain->final_cbfunc) {
+        chain->final_cbfunc(rc, chain->final_cbdata);
+    }
+    return;
+
+
+  invk:
+    /* update the handler name in case they want to reference it */
+    for (i=0; i < chain->ninfo; i++) {
+        if (0 == strncmp(chain->info[i].key, PMIX_EVENT_HDLR_NAME, PMIX_MAX_KEYLEN)) {
+            if (NULL != chain->info[i].value.data.string) {
+                free(chain->info[i].value.data.string);
+            }
+            if (NULL != chain->evhdlr->name) {
+                chain->info[i].value.data.string = strdup(chain->evhdlr->name);
+            }
+            break;
+        }
+    }
+    /* update the evhdlr cbobject */
+    for (i=0; i < chain->ninfo; i++) {
+        if (0 == strncmp(chain->info[i].key, PMIX_EVENT_RETURN_OBJECT, PMIX_MAX_KEYLEN)) {
+            if (NULL != chain->evhdlr->name) {
+                chain->info[i].value.data.ptr = chain->evhdlr->cbobject;
+            }
+            break;
+        }
+    }
+    /* invoke the handler */
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "[%s:%d] INVOKING EVHDLR %s", __FILE__, __LINE__,
+                        (NULL == chain->evhdlr->name) ?
+                        "NULL" : chain->evhdlr->name);
+    chain->evhdlr->evhdlr(chain->evhdlr->index,
+                          chain->status, &chain->source,
+                          chain->info, chain->ninfo,
+                          NULL, 0,
+                          progress_local_event_hdlr, (void*)chain);
+    return;
+}
+
+static void local_cbfunc(pmix_status_t status, void *cbdata)
+{
+    pmix_notify_caddy_t *cd = (pmix_notify_caddy_t*)cbdata;
+
+    if (NULL != cd->cbfunc) {
+        cd->cbfunc(status, cd->cbdata);
+    }
+    PMIX_RELEASE(cd);
+}
+
+static void _notify_client_event(int sd, short args, void *cbdata)
+{
+    pmix_notify_caddy_t *cd = (pmix_notify_caddy_t*)cbdata;
+    pmix_notify_caddy_t *rbout;
+    pmix_regevents_info_t *reginfoptr;
+    pmix_peer_events_info_t *pr;
+    pmix_event_chain_t *chain;
+    size_t n;
+    bool matched, holdcd;
+
+    /* need to acquire the object from its originating thread */
+    PMIX_ACQUIRE_OBJECT(cd);
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "pmix_server: _notify_error notifying clients of error %s",
+                        PMIx_Error_string(cd->status));
+
+    /* we cannot know if everyone who wants this notice has had a chance
+     * to register for it - the notice may be coming too early. So cache
+     * the message until all local procs have received it, or it ages to
+     * the point where it gets pushed out by more recent events */
+    PMIX_RETAIN(cd);
+    rbout = pmix_ring_buffer_push(&pmix_globals.notifications, cd);
+
+   /* if an older event was bumped, release it */
+    if (NULL != rbout) {
+        PMIX_RELEASE(rbout);
+    }
+
+    holdcd = false;
+    if (PMIX_RANGE_PROC_LOCAL != cd->range) {
+        /* cycle across our registered events and send the message to
+         * any client who registered for it */
+        PMIX_LIST_FOREACH(reginfoptr, &pmix_server_globals.events, pmix_regevents_info_t) {
+            if ((PMIX_MAX_ERR_CONSTANT == reginfoptr->code && !cd->nondefault) ||
+                cd->status == reginfoptr->code) {
+                PMIX_LIST_FOREACH(pr, &reginfoptr->peers, pmix_peer_events_info_t) {
+                    /* if this client was the source of the event, then
+                     * don't send it back as they will have processed it
+                     * when they generated it */
+                    if (0 == strncmp(cd->source.nspace, pr->peer->info->nptr->nspace, PMIX_MAX_NSLEN) &&
+                        cd->source.rank == pr->peer->info->rank) {
+                        continue;
+                    }
+                    /* if we were given specific targets, check if this is one */
+                    if (NULL != cd->targets) {
+                        matched = false;
+                        for (n=0; n < cd->ntargets; n++) {
+                            if (0 != strncmp(pr->peer->info->nptr->nspace, cd->targets[n].nspace, PMIX_MAX_NSLEN)) {
+                                continue;
+                            }
+                            if (PMIX_RANK_WILDCARD == cd->targets[n].rank ||
+                                pr->peer->info->rank == cd->targets[n].rank) {
+                                matched = true;
+                                break;
+                            }
+                        }
+                        if (!matched) {
+                            /* do not notify this one */
+                            continue;
+                        }
+                    }
+                    pmix_output_verbose(2, pmix_globals.debug_output,
+                                        "pmix_server: notifying client %s:%d",
+                                        pr->peer->info->nptr->nspace, pr->peer->info->rank);
+                    PMIX_RETAIN(cd->buf);
+                    PMIX_SERVER_QUEUE_REPLY(pr->peer, 0, cd->buf);
+                }
+            }
+        }
+        if (PMIX_RANGE_LOCAL != cd->range &&
+            0 == strncmp(cd->source.nspace, pmix_globals.myid.nspace, PMIX_MAX_NSLEN) &&
+            cd->source.rank == pmix_globals.myid.rank) {
+            /* if we are the source, then we need to post this upwards as
+             * well so the host RM can broadcast it as necessary - we rely
+             * on the host RM to _not_ deliver this back to us! */
+            if (NULL != pmix_host_server.notify_event) {
+                /* mark that we sent it upstairs so we don't release
+                 * the caddy until we return from the host RM */
+                holdcd = true;
+                pmix_host_server.notify_event(cd->status, &cd->source, cd->range,
+                                              cd->info, cd->ninfo, local_cbfunc, cd);
+            }
+
+        }
+    }
+
+    /* we may also have registered for events, so be sure to check this
+     * against our registrations */
+    chain = PMIX_NEW(pmix_event_chain_t);
+    chain->status = cd->status;
+    (void)strncpy(chain->source.nspace, cd->source.nspace, PMIX_MAX_NSLEN);
+    chain->source.rank = cd->source.rank;
+    /* we always leave space for a callback object and
+     * the evhandler name. */
+    chain->ninfo = cd->ninfo + 2;
+    PMIX_INFO_CREATE(chain->info, chain->ninfo);
+    if (0 < cd->ninfo) {
+        /* need to copy the info */
+        for (n=0; n < cd->ninfo; n++) {
+            PMIX_INFO_XFER(&chain->info[n], &cd->info[n]);
+        }
+    }
+    /* put the evhandler name tag in the next-to-last element - we
+     * will fill it in as each handler is called */
+    PMIX_INFO_LOAD(&chain->info[chain->ninfo-2], PMIX_EVENT_HDLR_NAME, NULL, PMIX_STRING);
+    /* now put the callback object tag in the last element */
+    PMIX_INFO_LOAD(&chain->info[chain->ninfo-1], PMIX_EVENT_RETURN_OBJECT, NULL, PMIX_POINTER);
+    /* process it */
+    pmix_invoke_local_event_hdlr(chain);
+
+    if (!holdcd) {
+        /* notify the caller */
+        if (NULL != cd->cbfunc) {
+            cd->cbfunc(PMIX_SUCCESS, cd->cbdata);
+        }
+        PMIX_RELEASE(cd);
+    }
+}
+
+
+/* as a server, we must do two things:
+ *
+ * (a) notify all clients that have registered for this event
+ *
+ * (b) callback any of our own functions that have registered
+ *     for this event
+ */
+pmix_status_t pmix_server_notify_client_of_event(pmix_status_t status,
+                                                 const pmix_proc_t *source,
+                                                 pmix_data_range_t range,
+                                                 pmix_info_t info[], size_t ninfo,
+                                                 pmix_op_cbfunc_t cbfunc, void *cbdata)
+{
+    pmix_notify_caddy_t *cd;
+    pmix_cmd_t cmd = PMIX_NOTIFY_CMD;
+    pmix_status_t rc;
+    size_t n;
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "pmix_server: notify client of event %s",
+                        PMIx_Error_string(status));
+
+    cd = PMIX_NEW(pmix_notify_caddy_t);
+    cd->status = status;
+    if (NULL == source) {
+        (void)strncpy(cd->source.nspace, "UNDEF", PMIX_MAX_NSLEN);
+        cd->source.rank = PMIX_RANK_UNDEF;
+    } else {
+        (void)strncpy(cd->source.nspace, source->nspace, PMIX_MAX_NSLEN);
+        cd->source.rank = source->rank;
+    }
+    cd->range = range;
+
+    /* check for directives */
+    if (NULL != info) {
+        for (n=0; n < ninfo; n++) {
+            if (0 == strncmp(info[n].key, PMIX_EVENT_NON_DEFAULT, PMIX_MAX_KEYLEN)) {
+                cd->nondefault = true;
+            } else if (0 == strncmp(info[n].key, PMIX_EVENT_CUSTOM_RANGE, PMIX_MAX_KEYLEN)) {
+                /* provides an array of pmix_proc_t identifying the procs
+                 * that are to receive this notification, or a single pmix_proc_t  */
+                if (PMIX_DATA_ARRAY == info[n].value.type &&
+                    NULL != info[n].value.data.darray &&
+                    NULL != info[n].value.data.darray->array) {
+                    cd->ntargets = info[n].value.data.darray->size;
+                    PMIX_PROC_CREATE(cd->targets, cd->ntargets);
+                    memcpy(cd->targets, info[n].value.data.darray->array, cd->ntargets * sizeof(pmix_proc_t));
+                } else if (PMIX_PROC == info[n].value.type) {
+                    cd->ntargets = 1;
+                    PMIX_PROC_CREATE(cd->targets, cd->ntargets);
+                    memcpy(cd->targets, info[n].value.data.proc, sizeof(pmix_proc_t));
+                } else {
+                    /* this is an error */
+                    PMIX_ERROR_LOG(PMIX_ERR_BAD_PARAM);
+                    return PMIX_ERR_BAD_PARAM;
+                }
+            }
+        }
+    }
+    /*
+     * If the range is PMIX_RANGE_NAMESPACE, then they should not have set a
+     * PMIX_EVENT_CUSTOM_RANGE info object or at least we should ignore it
+     */
+    if (PMIX_RANGE_NAMESPACE == cd->range) {
+        if (cd->targets) {
+            PMIX_PROC_FREE(cd->targets, cd->ntargets);
+        }
+        PMIX_PROC_CREATE(cd->targets, 1);
+        cd->ntargets = 1;
+        cd->targets[0].rank = PMIX_RANK_WILDCARD;
+        if (NULL == source) {
+            strncpy(cd->targets[0].nspace, "UNDEF", PMIX_MAX_NSLEN);
+        } else {
+            strncpy(cd->targets[0].nspace, source->nspace, PMIX_MAX_NSLEN);
+        }
+    }
+
+    /* pack the command */
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(cd->buf, &cmd, 1, PMIX_CMD))) {
+        PMIX_ERROR_LOG(rc);
+        PMIX_RELEASE(cd);
+        return rc;
+    }
+
+    /* pack the status */
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(cd->buf, &status, 1, PMIX_STATUS))) {
+        PMIX_ERROR_LOG(rc);
+        PMIX_RELEASE(cd);
+        return rc;
+    }
+
+    /* pack the source */
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(cd->buf, source, 1, PMIX_PROC))) {
+        PMIX_ERROR_LOG(rc);
+        PMIX_RELEASE(cd);
+        return rc;
+    }
+
+    /* pack any info */
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(cd->buf, &ninfo, 1, PMIX_SIZE))) {
+        PMIX_ERROR_LOG(rc);
+        PMIX_RELEASE(cd);
+        return rc;
+    }
+
+    if (0 < ninfo) {
+        if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(cd->buf, info, ninfo, PMIX_INFO))) {
+            PMIX_ERROR_LOG(rc);
+            PMIX_RELEASE(cd);
+            return rc;
+        }
+    }
+
+    /* track the eventual callback info */
+    cd->cbfunc = cbfunc;
+    cd->cbdata = cbdata;
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "pmix_server_notify_event status =%d, source = %s:%d, ninfo =%lu",
+                         status, cd->source.nspace, cd->source.rank, ninfo);
+
+    /* we have to push this into our event library to avoid
+     * potential threading issues */
+    PMIX_THREADSHIFT(cd, _notify_client_event);
+    return PMIX_SUCCESS;
+}
+
+static bool check_range(pmix_range_trkr_t *rng,
+                        const pmix_proc_t *proc)
+{
+    size_t n;
+
+    if (PMIX_RANGE_UNDEF == rng->range ||
+        PMIX_RANGE_GLOBAL == rng->range ||
+        PMIX_RANGE_SESSION == rng->range ||
+        PMIX_RANGE_LOCAL == rng->range) { // assume RM took care of session & local for now
+        return true;
+    }
+    if (PMIX_RANGE_NAMESPACE == rng->range) {
+        if (0 == strncmp(pmix_globals.myid.nspace, proc->nspace, PMIX_MAX_NSLEN)) {
+            return true;
+        }
+        return false;
+    }
+    if (PMIX_RANGE_PROC_LOCAL == rng->range) {
+        if (0 == strncmp(pmix_globals.myid.nspace, proc->nspace, PMIX_MAX_NSLEN) &&
+            pmix_globals.myid.rank == proc->rank) {
+            return true;
+        }
+        return false;
+    }
+    if (PMIX_RANGE_CUSTOM == rng->range) {
+        if (NULL != rng->procs) {
+            /* see if this proc was included */
+            for (n=0; n < rng->nprocs; n++) {
+                if (0 != strncmp(rng->procs[n].nspace, proc->nspace, PMIX_MAX_NSLEN)) {
+                    continue;
+                }
+                if (PMIX_RANK_WILDCARD == rng->procs[n].rank ||
+                    rng->procs[n].rank == proc->rank) {
+                    return true;
+                }
+            }
+            /* if we get here, then this proc isn't in range */
+            return false;
+        } else {
+            /* if they didn't give us a list, then assume
+             * everyone included */
+            return true;
+        }
+    }
+
+    /* if it is anything else, then reject it */
+    return false;
+}
+
+void pmix_event_timeout_cb(int fd, short flags, void *arg)
+{
+    pmix_event_chain_t *ch = (pmix_event_chain_t*)arg;
+
+    /* need to acquire the object from its originating thread */
+    PMIX_ACQUIRE_OBJECT(ch);
+
+    ch->timer_active = false;
+
+    /* remove it from the list */
+    pmix_list_remove_item(&pmix_globals.cached_events, &ch->super);
+
+    /* process this event thru the regular channels */
+    if (PMIX_PROC_SERVER == pmix_globals.proc_type) {
+        pmix_server_notify_client_of_event(ch->status, &ch->source,
+                                           ch->range, ch->info, ch->ninfo,
+                                           ch->final_cbfunc, ch->final_cbdata);
+    } else {
+        pmix_invoke_local_event_hdlr(ch);
+    }
+}
+
+/****    CLASS INSTANTIATIONS    ****/
+
+static void sevcon(pmix_event_hdlr_t *p)
+{
+    p->name = NULL;
+    p->index = UINT_MAX;
+    p->precedence = PMIX_EVENT_ORDER_NONE;
+    p->locator = NULL;
+    p->rng.range = PMIX_RANGE_UNDEF;
+    p->rng.procs = NULL;
+    p->rng.nprocs = 0;
+    p->evhdlr = NULL;
+    p->cbobject = NULL;
+    p->codes = NULL;
+    p->ncodes = 0;
+}
+static void sevdes(pmix_event_hdlr_t *p)
+{
+    if (NULL != p->name) {
+        free(p->name);
+    }
+    if (NULL != p->locator) {
+        free(p->locator);
+    }
+    if (NULL != p->rng.procs) {
+        free(p->rng.procs);
+    }
+    if (NULL != p->codes) {
+        free(p->codes);
+    }
+}
+PMIX_CLASS_INSTANCE(pmix_event_hdlr_t,
+                    pmix_list_item_t,
+                    sevcon, sevdes);
+
+static void accon(pmix_active_code_t *p)
+{
+    p->nregs = 0;
+}
+PMIX_CLASS_INSTANCE(pmix_active_code_t,
+                    pmix_list_item_t,
+                    accon, NULL);
+
+static void evcon(pmix_events_t *p)
+{
+    p->nhdlrs = 0;
+    p->first = NULL;
+    p->last = NULL;
+    PMIX_CONSTRUCT(&p->actives, pmix_list_t);
+    PMIX_CONSTRUCT(&p->single_events, pmix_list_t);
+    PMIX_CONSTRUCT(&p->multi_events, pmix_list_t);
+    PMIX_CONSTRUCT(&p->default_events, pmix_list_t);
+}
+static void evdes(pmix_events_t *p)
+{
+    if (NULL != p->first) {
+        PMIX_RELEASE(p->first);
+    }
+    if (NULL != p->last) {
+        PMIX_RELEASE(p->last);
+    }
+    PMIX_LIST_DESTRUCT(&p->actives);
+    PMIX_LIST_DESTRUCT(&p->single_events);
+    PMIX_LIST_DESTRUCT(&p->multi_events);
+    PMIX_LIST_DESTRUCT(&p->default_events);
+}
+PMIX_CLASS_INSTANCE(pmix_events_t,
+                    pmix_object_t,
+                    evcon, evdes);
+
+static void chcon(pmix_event_chain_t *p)
+{
+    p->timer_active = false;
+    memset(p->source.nspace, 0, PMIX_MAX_NSLEN+1);
+    p->source.rank = PMIX_RANK_UNDEF;
+    p->nondefault = false;
+    p->endchain = false;
+    p->range = PMIX_RANGE_UNDEF;
+    p->info = NULL;
+    p->ninfo = 0;
+    p->results = NULL;
+    p->nresults = 0;
+    p->evhdlr = NULL;
+    p->final_cbfunc = NULL;
+    p->final_cbdata = NULL;
+}
+static void chdes(pmix_event_chain_t *p)
+{
+    if (p->timer_active) {
+        pmix_event_del(&p->ev);
+    }
+    if (NULL != p->info) {
+        PMIX_INFO_FREE(p->info, p->ninfo);
+    }
+    if (NULL != p->results) {
+        PMIX_INFO_FREE(p->results, p->nresults);
+    }
+}
+PMIX_CLASS_INSTANCE(pmix_event_chain_t,
+                    pmix_list_item_t,
+                    chcon, chdes);
diff --git a/src/event/pmix_event_registration.c b/src/event/pmix_event_registration.c
new file mode 100644
index 0000000..21fcc38
--- /dev/null
+++ b/src/event/pmix_event_registration.c
@@ -0,0 +1,1000 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2014-2017 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2017      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+#include <src/include/pmix_config.h>
+
+#include <pmix.h>
+#include <pmix_common.h>
+#include <pmix_server.h>
+#include <pmix_rename.h>
+
+#include "src/threads/threads.h"
+#include "src/util/error.h"
+#include "src/util/output.h"
+
+#include "src/client/pmix_client_ops.h"
+#include "src/server/pmix_server_ops.h"
+#include "src/include/pmix_globals.h"
+#include "src/event/pmix_event.h"
+
+ typedef struct {
+    pmix_object_t super;
+    volatile bool active;
+    pmix_event_t ev;
+    size_t index;
+    bool firstoverall;
+    bool enviro;
+    pmix_list_t *list;
+    pmix_event_hdlr_t *hdlr;
+    void *cd;
+    pmix_status_t *codes;
+    size_t ncodes;
+    pmix_info_t *info;
+    size_t ninfo;
+    pmix_notification_fn_t evhdlr;
+    pmix_evhdlr_reg_cbfunc_t evregcbfn;
+    void *cbdata;
+} pmix_rshift_caddy_t;
+static void rscon(pmix_rshift_caddy_t *p)
+{
+    p->firstoverall = false;
+    p->enviro = false;
+    p->list = NULL;
+    p->hdlr = NULL;
+    p->cd = NULL;
+    p->codes = NULL;
+    p->ncodes = 0;
+    p->info = NULL;
+    p->ninfo = 0;
+    p->evhdlr = NULL;
+    p->evregcbfn = NULL;
+    p->cbdata = NULL;
+}
+static void rsdes(pmix_rshift_caddy_t *p)
+{
+    if (NULL != p->cd) {
+        PMIX_RELEASE(p->cd);
+    }
+}
+PMIX_CLASS_INSTANCE(pmix_rshift_caddy_t,
+                    pmix_object_t,
+                    rscon, rsdes);
+
+static void check_cached_events(pmix_rshift_caddy_t *cd);
+
+static void regevents_cbfunc(struct pmix_peer_t *peer, pmix_ptl_hdr_t *hdr,
+                             pmix_buffer_t *buf, void *cbdata)
+{
+    pmix_rshift_caddy_t *rb = (pmix_rshift_caddy_t*)cbdata;
+    pmix_rshift_caddy_t *cd = (pmix_rshift_caddy_t*)rb->cd;
+    pmix_status_t rc, ret;
+    int cnt;
+    size_t index = rb->index;
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "pmix: regevents callback recvd");
+
+    /* unpack the status code */
+    cnt = 1;
+    if ((PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, &ret, &cnt, PMIX_STATUS))) ||
+        (PMIX_SUCCESS != ret)) {
+        PMIX_ERROR_LOG(rc);
+        /* remove the err handler and call the error handler reg completion callback fn.*/
+        if (NULL == rb->list) {
+            if (NULL != rb->hdlr) {
+                PMIX_RELEASE(rb->hdlr);
+            }
+            if (rb->firstoverall) {
+                pmix_globals.events.first = NULL;
+            } else {
+                pmix_globals.events.last = NULL;
+            }
+        } else if (NULL != rb->hdlr) {
+            pmix_list_remove_item(rb->list, &rb->hdlr->super);
+            PMIX_RELEASE(rb->hdlr);
+        }
+        ret = PMIX_ERR_SERVER_FAILED_REQUEST;
+        index = UINT_MAX;
+    }
+
+    /* call the callback */
+    if (NULL != cd && NULL != cd->evregcbfn) {
+        cd->evregcbfn(ret, index, cd->cbdata);
+    }
+    if (NULL != cd) {
+        /* check this event against anything in our cache */
+        check_cached_events(cd);
+    }
+
+    /* release any info we brought along as they are
+     * internally generated and not provided by the caller */
+    if (NULL!= rb->info) {
+        PMIX_INFO_FREE(rb->info, rb->ninfo);
+    }
+    if (NULL != rb->codes) {
+        free(rb->codes);
+    }
+    PMIX_RELEASE(rb);
+}
+
+static void reg_cbfunc(pmix_status_t status, void *cbdata)
+{
+    pmix_rshift_caddy_t *rb = (pmix_rshift_caddy_t*)cbdata;
+    pmix_rshift_caddy_t *cd = (pmix_rshift_caddy_t*)rb->cd;
+    pmix_status_t rc = status;
+    size_t index = rb->index;
+
+    if (PMIX_SUCCESS != status) {
+        /* if we failed to register, then remove this event */
+        if (NULL == rb->list) {
+            if (NULL != rb->hdlr) {
+                PMIX_RELEASE(rb->hdlr);
+            }
+            if (rb->firstoverall) {
+                pmix_globals.events.first = NULL;
+            } else {
+                pmix_globals.events.last = NULL;
+            }
+        } else if (NULL != rb->hdlr) {
+            pmix_list_remove_item(rb->list, &rb->hdlr->super);
+            PMIX_RELEASE(rb->hdlr);
+        }
+        rc = PMIX_ERR_SERVER_FAILED_REQUEST;
+        index = UINT_MAX;
+    }
+
+    if (NULL != cd && NULL != cd->evregcbfn) {
+        /* pass back our local index */
+        cd->evregcbfn(rc, index, cd->cbdata);
+    }
+
+    /* release any info we brought along as they are
+     * internally generated and not provided by the caller */
+    if (NULL!= rb->info) {
+        PMIX_INFO_FREE(rb->info, rb->ninfo);
+    }
+    if (NULL != rb->codes) {
+        free(rb->codes);
+    }
+    PMIX_RELEASE(rb);
+}
+
+static pmix_status_t _send_to_server(pmix_rshift_caddy_t *rcd)
+{
+    pmix_rshift_caddy_t *cd = (pmix_rshift_caddy_t*)rcd->cd;
+    pmix_status_t rc;
+    pmix_buffer_t *msg;
+    pmix_cmd_t cmd=PMIX_REGEVENTS_CMD;
+
+    msg = PMIX_NEW(pmix_buffer_t);
+    /* pack the cmd */
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msg, &cmd, 1, PMIX_CMD))) {
+        PMIX_ERROR_LOG(rc);
+        return rc;
+    }
+    /* pack the number of codes */
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msg, &cd->ncodes, 1, PMIX_SIZE))) {
+        PMIX_ERROR_LOG(rc);
+        return rc;
+    }
+    /* pack any provided codes - may be NULL */
+    if (NULL != cd->codes && 0 < cd->ncodes) {
+        if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msg, cd->codes, cd->ncodes, PMIX_STATUS))) {
+            PMIX_ERROR_LOG(rc);
+            return rc;
+        }
+    }
+
+    /* pack the number of info */
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msg, &rcd->ninfo, 1, PMIX_SIZE))) {
+        PMIX_ERROR_LOG(rc);
+        return rc;
+    }
+    /* pack any provided info - may be NULL */
+    if (NULL != rcd->info && 0 < rcd->ninfo) {
+        if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msg, rcd->info, rcd->ninfo, PMIX_INFO))) {
+            PMIX_ERROR_LOG(rc);
+            return rc;
+        }
+    }
+    rc = pmix_ptl.send_recv(pmix_client_globals.myserver, msg, regevents_cbfunc, rcd);
+    if (PMIX_SUCCESS != rc) {
+        PMIX_ERROR_LOG(rc);
+        PMIX_RELEASE(msg);
+    }
+
+    return rc;
+}
+
+static pmix_status_t _add_hdlr(pmix_rshift_caddy_t *cd, pmix_list_t *xfer)
+{
+    pmix_rshift_caddy_t *cd2;
+    pmix_info_caddy_t *ixfer;
+    size_t n;
+    bool registered, need_register = false;
+    pmix_active_code_t *active;
+    pmix_status_t rc;
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "pmix: _add_hdlr");
+
+    /* check to see if we have an active registration on these codes */
+    if (NULL == cd->codes) {
+        registered = false;
+        PMIX_LIST_FOREACH(active, &pmix_globals.events.actives, pmix_active_code_t) {
+            if (PMIX_MAX_ERR_CONSTANT == active->code) {
+                /* we have registered a default */
+                registered = true;
+                ++active->nregs;
+                break;
+            }
+        }
+        if (!registered) {
+            active = PMIX_NEW(pmix_active_code_t);
+            active->code = PMIX_MAX_ERR_CONSTANT;
+            active->nregs = 1;
+            pmix_list_append(&pmix_globals.events.actives, &active->super);
+            /* ensure we register it */
+            need_register = true;
+        }
+    } else {
+        for (n=0; n < cd->ncodes; n++) {
+            registered = false;
+            PMIX_LIST_FOREACH(active, &pmix_globals.events.actives, pmix_active_code_t) {
+                if (active->code == cd->codes[n]) {
+                    registered = true;
+                    ++active->nregs;
+                    break;
+                }
+            }
+            if (!registered) {
+                active = PMIX_NEW(pmix_active_code_t);
+                active->code = cd->codes[n];
+                active->nregs = 1;
+                pmix_list_append(&pmix_globals.events.actives, &active->super);
+                /* ensure we register it */
+                need_register = true;
+            }
+        }
+    }
+
+    /* prep next step */
+    cd2 = PMIX_NEW(pmix_rshift_caddy_t);
+    cd2->index = cd->index;
+    cd2->firstoverall = cd->firstoverall;
+    cd2->list = cd->list;
+    cd2->hdlr = cd->hdlr;
+    PMIX_RETAIN(cd);
+    cd2->cd = cd;
+    cd2->ninfo = pmix_list_get_size(xfer);
+    if (0 < cd2->ninfo) {
+        PMIX_INFO_CREATE(cd2->info, cd2->ninfo);
+        n=0;
+        PMIX_LIST_FOREACH(ixfer, xfer, pmix_info_caddy_t) {
+            (void)strncpy(cd2->info[n].key, ixfer->info[n].key, PMIX_MAX_KEYLEN);
+            pmix_value_load(&cd2->info[n].value, &ixfer->info[n].value.data, ixfer->info[n].value.type);
+            ++n;
+        }
+    }
+
+    /* if we are a client, and we haven't already registered a handler of this
+     * type with our server, or if we have directives, then we need to notify
+     * the server */
+    if (!PMIX_PROC_IS_SERVER &&
+       (need_register || 0 < pmix_list_get_size(xfer))) {
+        pmix_output_verbose(2, pmix_globals.debug_output,
+                            "pmix: _add_hdlr sending to server");
+        /* send the directives to the server - we will ack this
+         * registration upon return from there */
+        if (PMIX_SUCCESS != (rc = _send_to_server(cd2))) {
+            pmix_output_verbose(2, pmix_globals.debug_output,
+                                "pmix: add_hdlr - pack send_to_server failed status=%d", rc);
+            if (NULL != cd2->info) {
+                PMIX_INFO_FREE(cd2->info, cd2->ninfo);
+            }
+            PMIX_RELEASE(cd2);
+            return rc;
+        }
+        return PMIX_ERR_WOULD_BLOCK;
+    }
+
+    /* if we are a server and are registering for events, then we only contact
+     * our host if we want environmental events */
+
+    if (PMIX_PROC_IS_SERVER && cd->enviro &&
+        NULL != pmix_host_server.register_events) {
+        pmix_output_verbose(2, pmix_globals.debug_output,
+                            "pmix: _add_hdlr registering with server");
+        if (PMIX_SUCCESS != (rc = pmix_host_server.register_events(cd->codes, cd->ncodes,
+                                                                   cd2->info, cd2->ninfo,
+                                                                   reg_cbfunc, cd2))) {
+            if (NULL != cd2->info) {
+                PMIX_INFO_FREE(cd2->info, cd2->ninfo);
+            }
+            PMIX_RELEASE(cd2);
+            return rc;
+        }
+        return PMIX_ERR_WOULD_BLOCK;
+    } else {
+        if (NULL != cd2->info) {
+            PMIX_INFO_FREE(cd2->info, cd2->ninfo);
+        }
+        PMIX_RELEASE(cd2);
+    }
+
+    return PMIX_SUCCESS;
+}
+
+static void check_cached_events(pmix_rshift_caddy_t *cd)
+{
+    size_t i, n;
+    pmix_notify_caddy_t *ncd;
+    bool found, matched;
+    pmix_event_chain_t *chain;
+
+    for (i=0; i < (size_t)pmix_globals.notifications.size; i++) {
+        if (NULL == (ncd = (pmix_notify_caddy_t*)pmix_ring_buffer_poke(&pmix_globals.notifications, i))) {
+            continue;
+        }
+        found = false;
+        if (NULL == cd->codes) {
+            /* they registered a default event handler - always matches */
+            found = true;
+        } else {
+            for (n=0; n < cd->ncodes; n++) {
+                if (cd->codes[n] == ncd->status) {
+                    found = true;
+                    break;
+                }
+            }
+        }
+        if (found) {
+           /* if we were given specific targets, check if we are one */
+            if (NULL != ncd->targets) {
+                matched = false;
+                for (n=0; n < ncd->ntargets; n++) {
+                    if (0 != strncmp(pmix_globals.myid.nspace, ncd->targets[n].nspace, PMIX_MAX_NSLEN)) {
+                        continue;
+                    }
+                    if (PMIX_RANK_WILDCARD == ncd->targets[n].rank ||
+                        pmix_globals.myid.rank == ncd->targets[n].rank) {
+                        matched = true;
+                        break;
+                    }
+                }
+                if (!matched) {
+                    /* do not notify this one */
+                    continue;
+                }
+            }
+           /* all matches - notify */
+            chain = PMIX_NEW(pmix_event_chain_t);
+            chain->status = ncd->status;
+            (void)strncpy(chain->source.nspace, pmix_globals.myid.nspace, PMIX_MAX_NSLEN);
+            chain->source.rank = pmix_globals.myid.rank;
+            /* we already left space for evhandler name plus
+             * a callback object when we cached the notification */
+            chain->ninfo = ncd->ninfo;
+            PMIX_INFO_CREATE(chain->info, chain->ninfo);
+            if (0 < cd->ninfo) {
+                /* need to copy the info */
+                for (n=0; n < ncd->ninfo; n++) {
+                    PMIX_INFO_XFER(&chain->info[n], &ncd->info[n]);
+                    if (0 == strncmp(chain->info[n].key, PMIX_EVENT_NON_DEFAULT, PMIX_MAX_KEYLEN)) {
+                        chain->nondefault = true;
+                    }
+                }
+            }
+            /* we don't want this chain to propagate, so indicate it
+             * should only be run as a single-shot */
+            chain->endchain = true;
+            /* now notify any matching registered callbacks we have */
+            pmix_invoke_local_event_hdlr(chain);
+        }
+    }
+}
+
+static void reg_event_hdlr(int sd, short args, void *cbdata)
+{
+    pmix_rshift_caddy_t *cd = (pmix_rshift_caddy_t*)cbdata;
+    size_t index = 0, n;
+    pmix_status_t rc;
+    pmix_event_hdlr_t *evhdlr, *ev;
+    uint8_t location = PMIX_EVENT_ORDER_NONE;
+    char *name = NULL, *locator = NULL;
+    bool firstoverall=false, lastoverall=false;
+    bool found;
+    pmix_list_t xfer;
+    pmix_info_caddy_t *ixfer;
+    void *cbobject = NULL;
+    pmix_data_range_t range = PMIX_RANGE_UNDEF;
+    pmix_proc_t *parray = NULL;
+    size_t nprocs;
+
+    /* need to acquire the object from its originating thread */
+    PMIX_ACQUIRE_OBJECT(cd);
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "pmix: register event_hdlr with %d infos", (int)cd->ninfo);
+
+    PMIX_CONSTRUCT(&xfer, pmix_list_t);
+
+    /* if directives were included */
+    if (NULL != cd->info) {
+        for (n=0; n < cd->ninfo; n++) {
+            if (0 == strncmp(cd->info[n].key, PMIX_EVENT_HDLR_FIRST, PMIX_MAX_KEYLEN)) {
+                /* flag if they asked to put this one first overall */
+                if (PMIX_UNDEF == cd->info[n].value.type ||
+                    cd->info[n].value.data.flag) {
+                    firstoverall = true;
+                }
+            } else if (0 == strncmp(cd->info[n].key, PMIX_EVENT_HDLR_LAST, PMIX_MAX_KEYLEN)) {
+                /* flag if they asked to put this one last overall */
+                if (PMIX_UNDEF == cd->info[n].value.type ||
+                    cd->info[n].value.data.flag) {
+                    lastoverall = true;
+                }
+            } else if (0 == strncmp(cd->info[n].key, PMIX_EVENT_HDLR_PREPEND, PMIX_MAX_KEYLEN)) {
+                /* flag if they asked to prepend this handler */
+                if (PMIX_UNDEF == cd->info[n].value.type ||
+                    cd->info[n].value.data.flag) {
+                    location = PMIX_EVENT_ORDER_PREPEND;
+                }
+            } else if (0 == strncmp(cd->info[n].key, PMIX_EVENT_HDLR_APPEND, PMIX_MAX_KEYLEN)) {
+                /* flag if they asked to append this handler */
+                if (PMIX_UNDEF == cd->info[n].value.type ||
+                    cd->info[n].value.data.flag) {
+                    location = PMIX_EVENT_ORDER_APPEND;
+                }
+            } else if (0 == strncmp(cd->info[n].key, PMIX_EVENT_HDLR_NAME, PMIX_MAX_KEYLEN)) {
+                name = cd->info[n].value.data.string;
+            } else if (0 == strncmp(cd->info[n].key, PMIX_EVENT_ENVIRO_LEVEL, PMIX_MAX_KEYLEN)) {
+                if (PMIX_UNDEF == cd->info[n].value.type ||
+                    cd->info[n].value.data.flag) {
+                    cd->enviro = true;
+                }
+            } else if (0 == strncmp(cd->info[n].key, PMIX_EVENT_RETURN_OBJECT, PMIX_MAX_KEYLEN)) {
+                cbobject = cd->info[n].value.data.ptr;
+            } else if (0 == strncmp(cd->info[n].key, PMIX_EVENT_HDLR_FIRST_IN_CATEGORY, PMIX_MAX_KEYLEN)) {
+                if (PMIX_UNDEF == cd->info[n].value.type ||
+                    cd->info[n].value.data.flag) {
+                    location = PMIX_EVENT_ORDER_FIRST;
+                }
+            } else if (0 == strncmp(cd->info[n].key, PMIX_EVENT_HDLR_LAST_IN_CATEGORY, PMIX_MAX_KEYLEN)) {
+                if (PMIX_UNDEF == cd->info[n].value.type ||
+                    cd->info[n].value.data.flag) {
+                    location = PMIX_EVENT_ORDER_LAST;
+                }
+            } else if (0 == strncmp(cd->info[n].key, PMIX_EVENT_HDLR_BEFORE, PMIX_MAX_KEYLEN)) {
+                location = PMIX_EVENT_ORDER_BEFORE;
+                locator = cd->info[n].value.data.string;
+            } else if (0 == strncmp(cd->info[n].key, PMIX_EVENT_HDLR_AFTER, PMIX_MAX_KEYLEN)) {
+                location = PMIX_EVENT_ORDER_AFTER;
+                locator = cd->info[n].value.data.string;
+            } else if (0 == strncmp(cd->info[n].key, PMIX_RANGE, PMIX_MAX_KEYLEN)) {
+                range = cd->info[n].value.data.range;
+            } else if (0 == strncmp(cd->info[n].key, PMIX_EVENT_CUSTOM_RANGE, PMIX_MAX_KEYLEN)) {
+                parray = (pmix_proc_t*)cd->info[n].value.data.darray->array;
+                nprocs = cd->info[n].value.data.darray->size;
+            } else {
+                ixfer = PMIX_NEW(pmix_info_caddy_t);
+                ixfer->info = &cd->info[n];
+                pmix_list_append(&xfer, &ixfer->super);
+            }
+        }
+    }
+
+    /* if they indicated this is to be the "first" or "last" event, then
+     * first check to ensure they didn't already direct some
+     * other event into the same cherished position */
+    if (firstoverall || lastoverall) {
+        if ((firstoverall && NULL != pmix_globals.events.first) ||
+            (lastoverall && NULL != pmix_globals.events.last)) {
+            /* oops - someone already took that position */
+            index = UINT_MAX;
+            rc = PMIX_ERR_EVENT_REGISTRATION;
+            goto ack;
+        }
+        evhdlr = PMIX_NEW(pmix_event_hdlr_t);
+        if (NULL == evhdlr) {
+            index = UINT_MAX;
+            rc = PMIX_ERR_EVENT_REGISTRATION;
+            goto ack;
+        }
+        if (NULL != name) {
+            evhdlr->name = strdup(name);
+        }
+        index = pmix_globals.events.nhdlrs;
+        evhdlr->index = index;
+        ++pmix_globals.events.nhdlrs;
+        evhdlr->rng.range = range;
+        if (NULL != parray) {
+            evhdlr->rng.nprocs = nprocs;
+            PMIX_PROC_CREATE(evhdlr->rng.procs, nprocs);
+            if (NULL == evhdlr->rng.procs) {
+                index = UINT_MAX;
+                rc = PMIX_ERR_EVENT_REGISTRATION;
+                PMIX_RELEASE(evhdlr);
+                goto ack;
+            }
+            memcpy(evhdlr->rng.procs, parray, nprocs * sizeof(pmix_proc_t));
+        }
+        evhdlr->evhdlr = cd->evhdlr;
+        evhdlr->cbobject = cbobject;
+        if (NULL != cd->codes) {
+            evhdlr->codes = (pmix_status_t*)malloc(cd->ncodes * sizeof(pmix_status_t));
+            if (NULL == evhdlr->codes) {
+                PMIX_RELEASE(evhdlr);
+                index = UINT_MAX;
+                rc = PMIX_ERR_EVENT_REGISTRATION;
+                goto ack;
+            }
+            memcpy(evhdlr->codes, cd->codes, cd->ncodes * sizeof(pmix_status_t));
+            evhdlr->ncodes = cd->ncodes;
+        }
+        if (firstoverall) {
+            pmix_globals.events.first = evhdlr;
+        } else {
+            pmix_globals.events.last = evhdlr;
+        }
+        cd->index = index;
+        cd->list = NULL;
+        cd->hdlr = evhdlr;
+        cd->firstoverall = firstoverall;
+        rc = _add_hdlr(cd, &xfer);
+        PMIX_LIST_DESTRUCT(&xfer);
+        if (PMIX_SUCCESS != rc &&
+            PMIX_ERR_WOULD_BLOCK != rc) {
+                /* unable to register */
+            --pmix_globals.events.nhdlrs;
+            rc = PMIX_ERR_EVENT_REGISTRATION;
+            index = UINT_MAX;
+            if (firstoverall) {
+                pmix_globals.events.first = NULL;
+            } else {
+                pmix_globals.events.last = NULL;
+            }
+            PMIX_RELEASE(evhdlr);
+            goto ack;
+        }
+        if (PMIX_ERR_WOULD_BLOCK == rc) {
+            /* the callback will provide our response */
+            PMIX_RELEASE(cd);
+            return;
+        }
+        goto ack;
+    }
+
+    /* get here if this isn't an overall first or last event - start
+     * by creating an event */
+    evhdlr = PMIX_NEW(pmix_event_hdlr_t);
+    if (NULL == evhdlr) {
+        index = UINT_MAX;
+        rc = PMIX_ERR_EVENT_REGISTRATION;
+        goto ack;
+    }
+    if (NULL != name) {
+        evhdlr->name = strdup(name);
+    }
+    index = pmix_globals.events.nhdlrs;
+    evhdlr->index = index;
+    ++pmix_globals.events.nhdlrs;
+    evhdlr->precedence = location;
+    evhdlr->locator = locator;
+    evhdlr->rng.range = range;
+    if (NULL != parray) {
+        evhdlr->rng.nprocs = nprocs;
+        PMIX_PROC_CREATE(evhdlr->rng.procs, nprocs);
+        if (NULL == evhdlr->rng.procs) {
+            index = UINT_MAX;
+            rc = PMIX_ERR_EVENT_REGISTRATION;
+            PMIX_RELEASE(evhdlr);
+            goto ack;
+        }
+        memcpy(evhdlr->rng.procs, parray, nprocs * sizeof(pmix_proc_t));
+    }
+    evhdlr->evhdlr = cd->evhdlr;
+    evhdlr->cbobject = cbobject;
+    if (NULL == cd->codes) {
+        /* this is a default handler */
+        cd->list = &pmix_globals.events.default_events;
+    } else {
+        evhdlr->codes = (pmix_status_t*)malloc(cd->ncodes * sizeof(pmix_status_t));
+        if (NULL == evhdlr->codes) {
+            PMIX_RELEASE(evhdlr);
+            index = UINT_MAX;
+            rc = PMIX_ERR_EVENT_REGISTRATION;
+            goto ack;
+        }
+        memcpy(evhdlr->codes, cd->codes, cd->ncodes * sizeof(pmix_status_t));
+        evhdlr->ncodes = cd->ncodes;
+        if (1 == cd->ncodes) {
+            cd->list = &pmix_globals.events.single_events;
+        } else {
+            cd->list = &pmix_globals.events.multi_events;
+        }
+    }
+    /* setup to add the handler */
+    cd->index = index;
+    cd->hdlr = evhdlr;
+    cd->firstoverall = false;
+    /* tell the server about it, if necessary - any actions
+     * will be deferred until after this event completes */
+    if (PMIX_RANGE_PROC_LOCAL == range) {
+        rc = PMIX_SUCCESS;
+    } else {
+        rc = _add_hdlr(cd, &xfer);
+    }
+    PMIX_LIST_DESTRUCT(&xfer);
+    if (PMIX_SUCCESS != rc &&
+        PMIX_ERR_WOULD_BLOCK != rc) {
+        /* unable to register */
+        --pmix_globals.events.nhdlrs;
+        rc = PMIX_ERR_EVENT_REGISTRATION;
+        index = UINT_MAX;
+        PMIX_RELEASE(evhdlr);
+        goto ack;
+    }
+    /* now add this event to the appropriate list - if the registration
+     * subsequently fails, it will be removed */
+
+    /* if the list is empty, or no location was specified, just put this on it */
+    if (0 == pmix_list_get_size(cd->list) ||
+        PMIX_EVENT_ORDER_NONE == location) {
+        pmix_list_prepend(cd->list, &evhdlr->super);
+    } else if (PMIX_EVENT_ORDER_FIRST == location) {
+        /* see if the first handler on the list was also declared as "first" */
+        ev = (pmix_event_hdlr_t*)pmix_list_get_first(cd->list);
+        if (PMIX_EVENT_ORDER_FIRST == ev->precedence) {
+            /* this is an error */
+            --pmix_globals.events.nhdlrs;
+            rc = PMIX_ERR_EVENT_REGISTRATION;
+            index = UINT_MAX;
+            PMIX_RELEASE(evhdlr);
+            goto ack;
+        }
+        /* prepend it to the list */
+        pmix_list_prepend(cd->list, &evhdlr->super);
+    } else if (PMIX_EVENT_ORDER_LAST == location) {
+        /* see if the last handler on the list was also declared as "last" */
+        ev = (pmix_event_hdlr_t*)pmix_list_get_last(cd->list);
+        if (PMIX_EVENT_ORDER_LAST == ev->precedence) {
+            /* this is an error */
+            --pmix_globals.events.nhdlrs;
+            rc = PMIX_ERR_EVENT_REGISTRATION;
+            index = UINT_MAX;
+            PMIX_RELEASE(evhdlr);
+            goto ack;
+        }
+        /* append it to the list */
+        pmix_list_append(cd->list, &evhdlr->super);
+    } else if (PMIX_EVENT_ORDER_PREPEND == location) {
+        /* we know the list isn't empty - check the first element to see if
+         * it is designated to be "first". If so, then we need to put this
+         * right after it */
+        ev = (pmix_event_hdlr_t*)pmix_list_get_first(cd->list);
+        if (PMIX_EVENT_ORDER_FIRST == ev->precedence) {
+            ev = (pmix_event_hdlr_t*)pmix_list_get_next(&ev->super);
+            if (NULL != ev) {
+                pmix_list_insert_pos(cd->list, &ev->super, &evhdlr->super);
+            } else {
+                /* we are at the end of the list */
+                pmix_list_append(cd->list, &evhdlr->super);
+            }
+        } else {
+            pmix_list_prepend(cd->list, &evhdlr->super);
+        }
+    } else if (PMIX_EVENT_ORDER_APPEND == location) {
+        /* we know the list isn't empty - check the last element to see if
+         * it is designated to be "last". If so, then we need to put this
+         * right before it */
+        ev = (pmix_event_hdlr_t*)pmix_list_get_last(cd->list);
+        if (PMIX_EVENT_ORDER_LAST == ev->precedence) {
+            pmix_list_insert_pos(cd->list, &ev->super, &evhdlr->super);
+        } else {
+            pmix_list_append(cd->list, &evhdlr->super);
+        }
+    } else {
+        /* find the named event */
+        found = false;
+        PMIX_LIST_FOREACH(ev, cd->list, pmix_event_hdlr_t) {
+            if (NULL == ev->name) {
+                continue;
+            }
+            if (0 == strcmp(ev->name, name)) {
+               if (PMIX_EVENT_ORDER_BEFORE == location) {
+                    /* put it before this handler */
+                    pmix_list_insert_pos(cd->list, &ev->super, &evhdlr->super);
+               } else {
+                   /* put it after this handler */
+                    ev = (pmix_event_hdlr_t*)pmix_list_get_next(&ev->super);
+                    if (NULL != ev) {
+                        pmix_list_insert_pos(cd->list, &ev->super, &evhdlr->super);
+                    } else {
+                        /* we are at the end of the list */
+                        pmix_list_append(cd->list, &evhdlr->super);
+                    }
+               }
+               found = true;
+               break;
+            }
+        }
+        /* if the handler wasn't found, then we return an error. At some
+         * future time, we may change this behavior and cache this handler
+         * until the reference one has been registered. However, this could
+         * turn out to be a laborious search procedure as the reference
+         * event handler may in turn be dependent on another handler, etc. */
+        if (!found) {
+            /* this is an error */
+            --pmix_globals.events.nhdlrs;
+            rc = PMIX_ERR_EVENT_REGISTRATION;
+            index = UINT_MAX;
+            PMIX_RELEASE(evhdlr);
+            goto ack;
+        }
+    }
+    if (PMIX_ERR_WOULD_BLOCK == rc) {
+        /* the callback will provide our response */
+        PMIX_RELEASE(cd);
+        return;
+    }
+
+  ack:
+    /* acknowledge the registration so the caller can release
+     * their data */
+    if (NULL != cd->evregcbfn) {
+        cd->evregcbfn(rc, index, cd->cbdata);
+    }
+
+    /* check if any matching notifications have been cached */
+    check_cached_events(cd);
+
+    /* all done */
+    PMIX_RELEASE(cd);
+}
+
+PMIX_EXPORT void PMIx_Register_event_handler(pmix_status_t codes[], size_t ncodes,
+                                             pmix_info_t info[], size_t ninfo,
+                                             pmix_notification_fn_t event_hdlr,
+                                             pmix_evhdlr_reg_cbfunc_t cbfunc,
+                                             void *cbdata)
+{
+    pmix_rshift_caddy_t *cd;
+
+    PMIX_ACQUIRE_THREAD(&pmix_global_lock);
+
+    if (pmix_globals.init_cntr <= 0) {
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        if (NULL != cbfunc) {
+            cbfunc(PMIX_ERR_INIT, 0, cbdata);
+        }
+        return;
+    }
+    PMIX_RELEASE_THREAD(&pmix_global_lock);
+
+    /* need to thread shift this request so we can access
+     * our global data to register this *local* event handler */
+    cd = PMIX_NEW(pmix_rshift_caddy_t);
+    cd->codes = codes;
+    cd->ncodes = ncodes;
+    cd->info = info;
+    cd->ninfo = ninfo;
+    cd->evhdlr = event_hdlr;
+    cd->evregcbfn = cbfunc;
+    cd->cbdata = cbdata;
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "pmix_register_event_hdlr shifting to progress thread");
+
+    PMIX_THREADSHIFT(cd, reg_event_hdlr);
+}
+
+static void dereg_event_hdlr(int sd, short args, void *cbdata)
+{
+    pmix_shift_caddy_t *cd = (pmix_shift_caddy_t*)cbdata;
+    pmix_buffer_t *msg = NULL;
+    pmix_event_hdlr_t *evhdlr, *ev;
+    pmix_cmd_t cmd = PMIX_DEREGEVENTS_CMD;
+    pmix_status_t rc = PMIX_SUCCESS;
+    pmix_status_t wildcard = PMIX_MAX_ERR_CONSTANT;
+    size_t n;
+    pmix_active_code_t *active;
+
+    /* need to acquire the object from its originating thread */
+    PMIX_ACQUIRE_OBJECT(cd);
+
+    /* if I am not the server, then I need to notify the server
+     * to remove my registration */
+    if (!PMIX_PROC_IS_SERVER) {
+        msg = PMIX_NEW(pmix_buffer_t);
+        if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msg, &cmd, 1, PMIX_CMD))) {
+            PMIX_RELEASE(msg);
+            goto cleanup;
+        }
+    }
+
+    /* check the first and last locations */
+    if ((NULL != pmix_globals.events.first && pmix_globals.events.first->index == cd->ref) ||
+        (NULL != pmix_globals.events.last && pmix_globals.events.last->index == cd->ref)) {
+        /* found it */
+        if (NULL != pmix_globals.events.first && pmix_globals.events.first->index == cd->ref) {
+            ev = pmix_globals.events.first;
+        } else {
+            ev = pmix_globals.events.last;
+        }
+        if (NULL != msg) {
+            /* if this is a default handler, see if any other default
+             * handlers remain */
+            if (NULL == ev->codes) {
+                if (0 == pmix_list_get_size(&pmix_globals.events.default_events)) {
+                    /* tell the server to dereg our default handler */
+                    if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msg, &wildcard, 1, PMIX_STATUS))) {
+                        PMIX_RELEASE(msg);
+                        goto cleanup;
+                    }
+                }
+            } else {
+                for (n=0; n < ev->ncodes; n++) {
+                    /* see if this is the last registration we have for this code */
+                    PMIX_LIST_FOREACH(active, &pmix_globals.events.actives, pmix_active_code_t) {
+                        if (active->code == ev->codes[n]) {
+                            --active->nregs;
+                            if (0 == active->nregs) {
+                                pmix_list_remove_item(&pmix_globals.events.actives, &active->super);
+                                /* tell the server to dereg this code */
+                                if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msg, &active->code, 1, PMIX_STATUS))) {
+                                    PMIX_RELEASE(active);
+                                    PMIX_RELEASE(msg);
+                                    goto cleanup;
+                                }
+                                PMIX_RELEASE(active);
+                            }
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+        if (ev == pmix_globals.events.first) {
+            pmix_globals.events.first = NULL;
+        } else {
+            pmix_globals.events.last  = NULL;
+        }
+        PMIX_RELEASE(ev);
+        goto cleanup;
+    }
+
+    /* the registration can be in any of three places, so check each of them */
+    PMIX_LIST_FOREACH(evhdlr, &pmix_globals.events.default_events, pmix_event_hdlr_t) {
+        if (evhdlr->index == cd->ref) {
+            /* found it */
+            pmix_list_remove_item(&pmix_globals.events.default_events, &evhdlr->super);
+            if (NULL != msg) {
+                /* if there are no more default handlers registered, tell
+                 * the server to dereg the default handler */
+                if (0 == pmix_list_get_size(&pmix_globals.events.default_events)) {
+                    if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msg, &wildcard, 1, PMIX_STATUS))) {
+                        PMIX_RELEASE(msg);
+                        goto cleanup;
+                    }
+                }
+            }
+            PMIX_RELEASE(evhdlr);
+            goto report;
+        }
+    }
+    PMIX_LIST_FOREACH(evhdlr, &pmix_globals.events.single_events, pmix_event_hdlr_t) {
+        if (evhdlr->index == cd->ref) {
+            /* found it */
+            pmix_list_remove_item(&pmix_globals.events.single_events, &evhdlr->super);
+            if (NULL != msg) {
+                /* see if this is the last registration we have for this code */
+                PMIX_LIST_FOREACH(active, &pmix_globals.events.actives, pmix_active_code_t) {
+                    if (active->code == evhdlr->codes[0]) {
+                        --active->nregs;
+                        if (0 == active->nregs) {
+                            pmix_list_remove_item(&pmix_globals.events.actives, &active->super);
+                            if (NULL != msg) {
+                                /* tell the server to dereg this code */
+                                if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msg, &active->code, 1, PMIX_STATUS))) {
+                                    PMIX_RELEASE(active);
+                                    PMIX_RELEASE(msg);
+                                    goto cleanup;
+                                }
+                            }
+                            PMIX_RELEASE(active);
+                        }
+                        break;
+                    }
+                }
+            }
+            PMIX_RELEASE(evhdlr);
+            goto report;
+        }
+    }
+    PMIX_LIST_FOREACH(evhdlr, &pmix_globals.events.multi_events, pmix_event_hdlr_t) {
+        if (evhdlr->index == cd->ref) {
+            /* found it */
+            pmix_list_remove_item(&pmix_globals.events.multi_events, &evhdlr->super);
+            for (n=0; n < evhdlr->ncodes; n++) {
+                /* see if this is the last registration we have for this code */
+                PMIX_LIST_FOREACH(active, &pmix_globals.events.actives, pmix_active_code_t) {
+                    if (active->code == evhdlr->codes[n]) {
+                        --active->nregs;
+                        if (0 == active->nregs) {
+                            pmix_list_remove_item(&pmix_globals.events.actives, &active->super);
+                            if (NULL != msg) {
+                                /* tell the server to dereg this code */
+                                if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msg, &active->code, 1, PMIX_STATUS))) {
+                                    PMIX_RELEASE(active);
+                                    PMIX_RELEASE(msg);
+                                    goto cleanup;
+                                }
+                            }
+                            PMIX_RELEASE(active);
+                        }
+                        break;
+                    }
+                }
+            }
+            PMIX_RELEASE(evhdlr);
+            goto report;
+        }
+    }
+    /* if we get here, then the registration could not be found */
+    if (NULL != msg) {
+        PMIX_RELEASE(msg);
+    }
+    goto cleanup;
+
+  report:
+    if (NULL != msg) {
+        /* send to the server */
+        rc = pmix_ptl.send_recv(pmix_client_globals.myserver, msg, NULL, NULL);
+        if (PMIX_SUCCESS != rc) {
+            PMIX_ERROR_LOG(rc);
+        }
+    }
+
+  cleanup:
+    /* must release the caller */
+    if (NULL != cd->cbfunc.opcbfn) {
+        cd->cbfunc.opcbfn(rc, cd->cbdata);
+    }
+    PMIX_RELEASE(cd);
+}
+
+PMIX_EXPORT void PMIx_Deregister_event_handler(size_t event_hdlr_ref,
+                                               pmix_op_cbfunc_t cbfunc,
+                                               void *cbdata)
+{
+    pmix_shift_caddy_t *cd;
+
+    PMIX_ACQUIRE_THREAD(&pmix_global_lock);
+    if (pmix_globals.init_cntr <= 0) {
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        if (NULL != cbfunc) {
+            cbfunc(PMIX_ERR_INIT, cbdata);
+        }
+        return;
+    }
+    PMIX_RELEASE_THREAD(&pmix_global_lock);
+
+    /* need to thread shift this request */
+    cd = PMIX_NEW(pmix_shift_caddy_t);
+    cd->cbfunc.opcbfn = cbfunc;
+    cd->cbdata = cbdata;
+    cd->ref = event_hdlr_ref;
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "pmix_deregister_event_hdlr shifting to progress thread");
+    PMIX_THREADSHIFT(cd, dereg_event_hdlr);
+}
diff --git a/src/include/Makefile.include b/src/include/Makefile.include
new file mode 100644
index 0000000..af34f84
--- /dev/null
+++ b/src/include/Makefile.include
@@ -0,0 +1,48 @@
+# -*- makefile -*-
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2013-2016 Intel, Inc. All rights reserved
+# Copyright (c) 2007-2016 Cisco Systems, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# This makefile.am does not stand on its own - it is included from
+# Makefile.am
+
+headers += \
+        include/pmix_globals.h
+
+sources += \
+        include/pmix_globals.c
+
+if ! PMIX_EMBEDDED_MODE
+headers += \
+        include/align.h \
+        include/hash_string.h \
+        include/pmix_socket_errno.h \
+        include/pmix_stdint.h \
+        include/prefetch.h \
+        include/types.h \
+        include/pmix_config_top.h \
+        include/pmix_config_bottom.h \
+	include/pmix_jobdata.h
+
+endif ! PMIX_EMBEDDED_MODE
+
+if WANT_INSTALL_HEADERS
+headers += \
+    include/pmix_config.h
+endif
diff --git a/src/include/align.h b/src/include/align.h
new file mode 100644
index 0000000..e55c303
--- /dev/null
+++ b/src/include/align.h
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2005 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2006      Voltaire All rights reserved.
+ * Copyright (c) 2010      Oracle and/or its affiliates.  All rights reserved.
+ *
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#ifndef PMIX_ALIGN_H
+#define PMIX_ALIGN_H
+
+#define PMIX_ALIGN(x,a,t) (((x)+((t)(a)-1)) & ~(((t)(a)-1)))
+#define PMIX_ALIGN_PTR(x,a,t) ((t)PMIX_ALIGN((uintptr_t)x, a, uintptr_t))
+#define PMIX_ALIGN_PAD_AMOUNT(x,s) ((~((uintptr_t)(x))+1) & ((uintptr_t)(s)-1))
+
+#endif /* PMIX_ALIGN_H */
diff --git a/src/include/hash_string.h b/src/include/hash_string.h
new file mode 100644
index 0000000..a079f79
--- /dev/null
+++ b/src/include/hash_string.h
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2004-2007 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+/** @file
+ *
+ * Simple macros to quickly compute a hash value from a string.
+ *
+ */
+
+#ifndef PMIX_HASH_STRING_H
+#define PMIX_HASH_STRING_H
+
+/**
+ *  Compute the hash value and the string length simultaneously
+ *
+ *  @param str (IN)     The string which will be parsed   (char*)
+ *  @param hash (OUT)   Where the hash value will be stored (uint32_t)
+ *  @param length (OUT) The computed length of the string (uint32_t)
+ */
+#define PMIX_HASH_STRLEN( str, hash, length ) \
+    do {                                      \
+        register const char *_str = (str);    \
+        register uint32_t    _hash = 0;       \
+        register uint32_t    _len = 0;        \
+                                              \
+        while( *_str ) {                      \
+            _len++;                           \
+            _hash += *_str++;                 \
+            _hash += (_hash << 10);           \
+            _hash ^= (_hash >> 6);            \
+        }                                     \
+                                              \
+        _hash += (_hash << 3);                \
+        _hash ^= (_hash >> 11);               \
+        (hash) = (_hash + (_hash << 15));     \
+        (length)  = _len;                     \
+    } while (0)
+
+/**
+ *  Compute the hash value
+ *
+ *  @param str (IN)     The string which will be parsed   (char*)
+ *  @param hash (OUT)   Where the hash value will be stored (uint32_t)
+ */
+#define PMIX_HASH_STR( str, hash )            \
+    do {                                      \
+        register const char *_str = (str);    \
+        register uint32_t    _hash = 0;       \
+                                              \
+        while( *_str ) {                      \
+            _hash += *_str++;                 \
+            _hash += (_hash << 10);           \
+            _hash ^= (_hash >> 6);            \
+        }                                     \
+                                              \
+        _hash += (_hash << 3);                \
+        _hash ^= (_hash >> 11);               \
+        (hash) = (_hash + (_hash << 15));     \
+    } while (0)
+
+#endif  /* PMIX_HASH_STRING_H */
diff --git a/src/include/pmix_config.h b/src/include/pmix_config.h
new file mode 100644
index 0000000..8e114e8
--- /dev/null
+++ b/src/include/pmix_config.h
@@ -0,0 +1,825 @@
+/* src/include/pmix_config.h.  Generated from pmix_config.h.in by configure.  */
+/* src/include/pmix_config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* -*- c -*-
+ *
+ * Copyright (c) 2004-2005 The Trustees of Indiana University.
+ *                         All rights reserved.
+ * Copyright (c) 2004-2005 The Trustees of the University of Tennessee.
+ *                         All rights reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2013-2015 Intel, Inc. All rights reserved
+ * Copyright (c) 2016      IBM Corporation.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ *
+ * This file is automatically generated by configure.  Edits will be lost
+ * the next time you run configure!
+ */
+
+#ifndef PMIX_CONFIG_H
+#define PMIX_CONFIG_H
+
+#include <src/include/pmix_config_top.h>
+
+
+
+/* Define if building universal (internal helper macro) */
+/* #undef AC_APPLE_UNIVERSAL_BUILD */
+
+/* Define to 1 if you have the <arpa/inet.h> header file. */
+#define HAVE_ARPA_INET_H 1
+
+/* Define to 1 if you have the `asprintf' function. */
+#define HAVE_ASPRINTF 1
+
+/* Define to 1 if you have the <crt_externs.h> header file. */
+/* #undef HAVE_CRT_EXTERNS_H */
+
+/* Define to 1 if you have the declaration of `AF_INET6', and to 0 if you
+   don't. */
+#define HAVE_DECL_AF_INET6 1
+
+/* Define to 1 if you have the declaration of `AF_UNSPEC', and to 0 if you
+   don't. */
+#define HAVE_DECL_AF_UNSPEC 1
+
+/* Define to 1 if you have the declaration of `PF_INET6', and to 0 if you
+   don't. */
+#define HAVE_DECL_PF_INET6 1
+
+/* Define to 1 if you have the declaration of `PF_UNSPEC', and to 0 if you
+   don't. */
+#define HAVE_DECL_PF_UNSPEC 1
+
+/* Define to 1 if you have the declaration of `__func__', and to 0 if you
+   don't. */
+#define HAVE_DECL___FUNC__ 1
+
+/* Define to 1 if you have the <dirent.h> header file. */
+#define HAVE_DIRENT_H 1
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#define HAVE_DLFCN_H 1
+
+/* Define to 1 if you have the <event.h> header file. */
+#define HAVE_EVENT_H 1
+
+/* Define to 1 if you have the locking by fcntl. */
+#define HAVE_FCNTL_FLOCK 1
+
+/* Define to 1 if you have the <fcntl.h> header file. */
+#define HAVE_FCNTL_H 1
+
+/* Define to 1 if you have the `getpeereid' function. */
+/* #undef HAVE_GETPEEREID */
+
+/* Define to 1 if you have the `getpeerucred' function. */
+/* #undef HAVE_GETPEERUCRED */
+
+/* Define to 1 if you have the <glob.h> header file. */
+#define HAVE_GLOB_H 1
+
+/* Define to 1 if you have the <hostLib.h> header file. */
+/* #undef HAVE_HOSTLIB_H */
+
+/* Define to 1 if you have the <ifaddrs.h> header file. */
+#define HAVE_IFADDRS_H 1
+
+/* Define to 1 if the system has the type `int16_t'. */
+#define HAVE_INT16_T 1
+
+/* Define to 1 if the system has the type `int32_t'. */
+#define HAVE_INT32_T 1
+
+/* Define to 1 if the system has the type `int64_t'. */
+#define HAVE_INT64_T 1
+
+/* Define to 1 if the system has the type `int8_t'. */
+#define HAVE_INT8_T 1
+
+/* Define to 1 if the system has the type `intptr_t'. */
+#define HAVE_INTPTR_T 1
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the <ioLib.h> header file. */
+/* #undef HAVE_IOLIB_H */
+
+/* Define to 1 if you have the `event' library (-levent). */
+#define HAVE_LIBEVENT 1
+
+/* Define to 1 if you have the `event_pthreads' library (-levent_pthreads). */
+#define HAVE_LIBEVENT_PTHREADS 1
+
+/* Define to 1 if you have the <libgen.h> header file. */
+#define HAVE_LIBGEN_H 1
+
+/* Define to 1 if you have the <limits.h> header file. */
+#define HAVE_LIMITS_H 1
+
+/* Define to 1 if the system has the type `long long'. */
+#define HAVE_LONG_LONG 1
+
+/* Define to 1 if you have the <ltdl.h> header file. */
+#define HAVE_LTDL_H 1
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the <munge.h> header file. */
+/* #undef HAVE_MUNGE_H */
+
+/* Define to 1 if you have the <netdb.h> header file. */
+#define HAVE_NETDB_H 1
+
+/* Define to 1 if you have the <netinet/in.h> header file. */
+#define HAVE_NETINET_IN_H 1
+
+/* Define to 1 if you have the <netinet/tcp.h> header file. */
+#define HAVE_NETINET_TCP_H 1
+
+/* Define to 1 if you have the <net/if.h> header file. */
+#define HAVE_NET_IF_H 1
+
+/* Define to 1 if you have the <net/uio.h> header file. */
+/* #undef HAVE_NET_UIO_H */
+
+/* Define to 1 if you have the `posix_fallocate' function. */
+#define HAVE_POSIX_FALLOCATE 1
+
+/* Define to 1 if you have the <psm2.h> header file. */
+#define HAVE_PSM2_H 1
+
+/* Define to 1 if you have the `pthread_condattr_setpshared' function. */
+#define HAVE_PTHREAD_CONDATTR_SETPSHARED 1
+
+/* Define to 1 if you have the `pthread_mutexattr_setpshared' function. */
+#define HAVE_PTHREAD_MUTEXATTR_SETPSHARED 1
+
+/* Define to 1 if you have the `pthread_rwlockattr_setkind_np` function. */
+#define HAVE_PTHREAD_SETKIND 1
+
+/* Define to 1 if you have the `PTHREAD_PROCESS_SHARED` definition. */
+#define HAVE_PTHREAD_SHARED 1
+
+/* Define to 1 if the system has the type `ptrdiff_t'. */
+#define HAVE_PTRDIFF_T 1
+
+/* Define to 1 if `si_band' is a member of `siginfo_t'. */
+#define HAVE_SIGINFO_T_SI_BAND 1
+
+/* Define to 1 if `si_fd' is a member of `siginfo_t'. */
+#define HAVE_SIGINFO_T_SI_FD 1
+
+/* Define to 1 if you have the <signal.h> header file. */
+#define HAVE_SIGNAL_H 1
+
+/* Define to 1 if you have the `snprintf' function. */
+#define HAVE_SNPRINTF 1
+
+/* Define to 1 if you have the `socketpair' function. */
+#define HAVE_SOCKETPAIR 1
+
+/* Define to 1 if the system has the type `socklen_t'. */
+#define HAVE_SOCKLEN_T 1
+
+/* Define to 1 if you have the <sockLib.h> header file. */
+/* #undef HAVE_SOCKLIB_H */
+
+/* Define to 1 if you have the `statfs' function. */
+#define HAVE_STATFS 1
+
+/* Define to 1 if you have the `statvfs' function. */
+#define HAVE_STATVFS 1
+
+/* Define to 1 if you have the <stdarg.h> header file. */
+#define HAVE_STDARG_H 1
+
+/* Define to 1 if you have the <stdbool.h> header file. */
+#define HAVE_STDBOOL_H 1
+
+/* Define to 1 if you have the <stddef.h> header file. */
+#define HAVE_STDDEF_H 1
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the `strncpy_s' function. */
+/* #undef HAVE_STRNCPY_S */
+
+/* Define to 1 if you have the `strnlen' function. */
+#define HAVE_STRNLEN 1
+
+/* Define to 1 if you have the `strsignal' function. */
+#define HAVE_STRSIGNAL 1
+
+/* Define to 1 if `d_type' is a member of `struct dirent'. */
+#define HAVE_STRUCT_DIRENT_D_TYPE 1
+
+/* Define to 1 if `l_type' is a member of `struct flock'. */
+#define HAVE_STRUCT_FLOCK_L_TYPE 1
+
+/* Define to 1 if `ifr_hwaddr' is a member of `struct ifreq'. */
+#define HAVE_STRUCT_IFREQ_IFR_HWADDR 1
+
+/* Define to 1 if `ifr_mtu' is a member of `struct ifreq'. */
+#define HAVE_STRUCT_IFREQ_IFR_MTU 1
+
+/* Define to 1 if the system has the type `struct sockaddr_in'. */
+#define HAVE_STRUCT_SOCKADDR_IN 1
+
+/* Define to 1 if the system has the type `struct sockaddr_in6'. */
+#define HAVE_STRUCT_SOCKADDR_IN6 1
+
+/* Define to 1 if `sa_len' is a member of `struct sockaddr'. */
+/* #undef HAVE_STRUCT_SOCKADDR_SA_LEN */
+
+/* Define to 1 if the system has the type `struct sockaddr_storage'. */
+#define HAVE_STRUCT_SOCKADDR_STORAGE 1
+
+/* Define to 1 if the system has the type `struct sockaddr_un'. */
+#define HAVE_STRUCT_SOCKADDR_UN 1
+
+/* Define to 1 if `uid' is a member of `struct sockpeercred'. */
+/* #undef HAVE_STRUCT_SOCKPEERCRED_UID */
+
+/* Define to 1 if `f_fstypename' is a member of `struct statfs'. */
+/* #undef HAVE_STRUCT_STATFS_F_FSTYPENAME */
+
+/* Define to 1 if `f_type' is a member of `struct statfs'. */
+#define HAVE_STRUCT_STATFS_F_TYPE 1
+
+/* Define to 1 if `f_basetype' is a member of `struct statvfs'. */
+/* #undef HAVE_STRUCT_STATVFS_F_BASETYPE */
+
+/* Define to 1 if `f_fstypename' is a member of `struct statvfs'. */
+/* #undef HAVE_STRUCT_STATVFS_F_FSTYPENAME */
+
+/* Define to 1 if `cr_uid' is a member of `struct ucred'. */
+/* #undef HAVE_STRUCT_UCRED_CR_UID */
+
+/* Define to 1 if `uid' is a member of `struct ucred'. */
+#define HAVE_STRUCT_UCRED_UID 1
+
+/* Define to 1 if you have the <syslog.h> header file. */
+#define HAVE_SYSLOG_H 1
+
+/* Define to 1 if you have the <sys/ioctl.h> header file. */
+#define HAVE_SYS_IOCTL_H 1
+
+/* Define to 1 if you have the <sys/mount.h> header file. */
+#define HAVE_SYS_MOUNT_H 1
+
+/* Define to 1 if you have the <sys/param.h> header file. */
+#define HAVE_SYS_PARAM_H 1
+
+/* Define to 1 if you have the <sys/select.h> header file. */
+#define HAVE_SYS_SELECT_H 1
+
+/* Define to 1 if you have the <sys/socket.h> header file. */
+#define HAVE_SYS_SOCKET_H 1
+
+/* Define to 1 if you have the <sys/sockio.h> header file. */
+/* #undef HAVE_SYS_SOCKIO_H */
+
+/* Define to 1 if you have the <sys/statfs.h> header file. */
+#define HAVE_SYS_STATFS_H 1
+
+/* Define to 1 if you have the <sys/statvfs.h> header file. */
+#define HAVE_SYS_STATVFS_H 1
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/sysctl.h> header file. */
+#define HAVE_SYS_SYSCTL_H 1
+
+/* Define to 1 if you have the <sys/time.h> header file. */
+#define HAVE_SYS_TIME_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <sys/uio.h> header file. */
+#define HAVE_SYS_UIO_H 1
+
+/* Define to 1 if you have the <sys/un.h> header file. */
+#define HAVE_SYS_UN_H 1
+
+/* Define to 1 if you have the <sys/wait.h> header file. */
+#define HAVE_SYS_WAIT_H 1
+
+/* Define to 1 if you have the <time.h> header file. */
+#define HAVE_TIME_H 1
+
+/* Define to 1 if you have the <ucred.h> header file. */
+/* #undef HAVE_UCRED_H */
+
+/* Define to 1 if the system has the type `uint128_t'. */
+/* #undef HAVE_UINT128_T */
+
+/* Define to 1 if the system has the type `uint16_t'. */
+#define HAVE_UINT16_T 1
+
+/* Define to 1 if the system has the type `uint32_t'. */
+#define HAVE_UINT32_T 1
+
+/* Define to 1 if the system has the type `uint64_t'. */
+#define HAVE_UINT64_T 1
+
+/* Define to 1 if the system has the type `uint8_t'. */
+#define HAVE_UINT8_T 1
+
+/* Define to 1 if the system has the type `uintptr_t'. */
+#define HAVE_UINTPTR_T 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* whether unix byteswap routines -- htonl, htons, nothl, ntohs -- are
+   available */
+#define HAVE_UNIX_BYTESWAP 1
+
+/* Define to 1 if you have the `usleep' function. */
+#define HAVE_USLEEP 1
+
+/* Define to 1 if you have the `vasprintf' function. */
+#define HAVE_VASPRINTF 1
+
+/* Define to 1 if you have the `vsnprintf' function. */
+#define HAVE_VSNPRINTF 1
+
+/* Define to 1 if you have the <zlib.h> header file. */
+#define HAVE_ZLIB_H 1
+
+/* Define to 1 if the system has the type `__int128'. */
+#define HAVE___INT128 1
+
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
+#define LT_OBJDIR ".libs/"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT "http://pmix.github.io/master"
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "pmix"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "pmix 2.0.1"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "pmix"
+
+/* Define to the home page for this package. */
+#define PACKAGE_URL ""
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "2.0.1"
+
+/* Alignment of type bool */
+#define PMIX_ALIGNMENT_BOOL 1
+
+/* Alignment of type char */
+#define PMIX_ALIGNMENT_CHAR 1
+
+/* Alignment of type double */
+#define PMIX_ALIGNMENT_DOUBLE 8
+
+/* Alignment of type float */
+#define PMIX_ALIGNMENT_FLOAT 4
+
+/* Alignment of type int */
+#define PMIX_ALIGNMENT_INT 4
+
+/* Alignment of type int16_t */
+#define PMIX_ALIGNMENT_INT16 2
+
+/* Alignment of type int32_t */
+#define PMIX_ALIGNMENT_INT32 4
+
+/* Alignment of type int64_t */
+#define PMIX_ALIGNMENT_INT64 8
+
+/* Alignment of type int8_t */
+#define PMIX_ALIGNMENT_INT8 1
+
+/* Alignment of type long */
+#define PMIX_ALIGNMENT_LONG 8
+
+/* Alignment of type long double */
+/* #undef PMIX_ALIGNMENT_LONG_DOUBLE */
+
+/* Alignment of type long long */
+#define PMIX_ALIGNMENT_LONG_LONG 8
+
+/* Alignment of type short */
+#define PMIX_ALIGNMENT_SHORT 2
+
+/* Alignment of type size_t */
+#define PMIX_ALIGNMENT_SIZE_T 8
+
+/* Alignment of type void * */
+#define PMIX_ALIGNMENT_VOID_P 8
+
+/* Alignment of type wchar_t */
+#define PMIX_ALIGNMENT_WCHAR 4
+
+/* Assembly align directive expects logarithmic value */
+#define PMIX_ASM_ALIGN_LOG 
+
+/* What ARM assembly version to use */
+/* #undef PMIX_ASM_ARM_VERSION */
+
+/* Assembly directive for exporting symbols */
+#define PMIX_ASM_GLOBAL ".globl"
+
+/* Assembly prefix for gsym labels */
+#define PMIX_ASM_GSYM ""
+
+/* Assembly suffix for labels */
+#define PMIX_ASM_LABEL_SUFFIX ":"
+
+/* Assembly prefix for lsym labels */
+#define PMIX_ASM_LSYM ".L"
+
+/* Do we need to give a .size directive */
+#define PMIX_ASM_SIZE "1"
+
+/* Whether we can do 64bit assembly operations or not. Should not be used
+   outside of the assembly header files */
+/* #undef PMIX_ASM_SUPPORT_64BIT */
+
+/* Whether 64-bit is supported by the __sync builtin atomics */
+/* #undef PMIX_ASM_SYNC_HAVE_64BIT */
+
+/* Assembly directive for setting text section */
+#define PMIX_ASM_TEXT ".text"
+
+/* How to set function type in .type directive */
+#define PMIX_ASM_TYPE "@"
+
+/* Architecture type of assembly to use for atomic operations and CMA */
+#define PMIX_ASSEMBLY_ARCH PMIX_X86_64
+
+/* Whether to use builtin atomics */
+#define PMIX_ASSEMBLY_BUILTIN PMIX_BUILTIN_GCC
+
+/* Format of assembly file */
+/* #undef PMIX_ASSEMBLY_FORMAT */
+
+/* Whether we have support for RDTSCP instruction */
+#define PMIX_ASSEMBLY_SUPPORTS_RDTSCP 0
+
+/* The compiler $lower which PMIx was built with */
+#define PMIX_BUILD_PLATFORM_COMPILER_FAMILYID 0
+
+/* The compiler $lower which PMIX was built with */
+#define PMIX_BUILD_PLATFORM_COMPILER_FAMILYNAME UNKNOWN
+
+/* The compiler $lower which PMIx was built with */
+#define PMIX_BUILD_PLATFORM_COMPILER_VERSION 0
+
+/* The compiler $lower which PMIX was built with */
+#define PMIX_BUILD_PLATFORM_COMPILER_VERSION_STR UNKNOWN
+
+/* PMIx underlying C compiler */
+#define PMIX_CC "gcc"
+
+/* Use static const char[] strings for C files */
+#define PMIX_CC_USE_CONST_CHAR_IDENT 1
+
+/* Use #ident strings for C files */
+#define PMIX_CC_USE_IDENT 0
+
+/* Use #pragma comment for C files */
+#define PMIX_CC_USE_PRAGMA_COMMENT 
+
+/* Use #pragma ident strings for C files */
+#define PMIX_CC_USE_PRAGMA_IDENT 0
+
+/* Whether C compiler supports GCC style inline assembly */
+#define PMIX_C_GCC_INLINE_ASSEMBLY 1
+
+/* Whether C compiler supports __builtin_clz */
+#define PMIX_C_HAVE_BUILTIN_CLZ 1
+
+/* Whether C compiler supports __builtin_expect */
+#define PMIX_C_HAVE_BUILTIN_EXPECT 1
+
+/* Whether C compiler supports __builtin_prefetch */
+#define PMIX_C_HAVE_BUILTIN_PREFETCH 1
+
+/* Whether we are in debugging mode or not */
+#define PMIX_ENABLE_DEBUG 1
+
+/* Whether we want to enable dlopen support */
+#define PMIX_ENABLE_DLOPEN_SUPPORT 1
+
+/* if want shared memory dstore feature */
+#define PMIX_ENABLE_DSTORE 1
+
+/* Whether we should enable thread support within the PMIX code base */
+#define PMIX_ENABLE_MULTI_THREADS 1
+
+/* Whether we want developer-level timing support or not */
+#define PMIX_ENABLE_TIMING 0
+
+/* Location of event2/thread.h */
+#define PMIX_EVENT2_THREAD_HEADER <event2/thread.h>
+
+/* Location of event.h */
+#define PMIX_EVENT_HEADER <event.h>
+
+/* Whether your compiler has __attribute__ or not */
+#define PMIX_HAVE_ATTRIBUTE 1
+
+/* Whether your compiler has __attribute__ aligned or not */
+#define PMIX_HAVE_ATTRIBUTE_ALIGNED 1
+
+/* Whether your compiler has __attribute__ always_inline or not */
+#define PMIX_HAVE_ATTRIBUTE_ALWAYS_INLINE 1
+
+/* Whether your compiler has __attribute__ cold or not */
+#define PMIX_HAVE_ATTRIBUTE_COLD 1
+
+/* Whether your compiler has __attribute__ const or not */
+#define PMIX_HAVE_ATTRIBUTE_CONST 1
+
+/* Whether your compiler has __attribute__ deprecated or not */
+#define PMIX_HAVE_ATTRIBUTE_DEPRECATED 1
+
+/* Whether your compiler has __attribute__ deprecated with optional argument
+   */
+#define PMIX_HAVE_ATTRIBUTE_DEPRECATED_ARGUMENT 1
+
+/* Whether your compiler has __attribute__ destructor or not */
+#define PMIX_HAVE_ATTRIBUTE_DESTRUCTOR 1
+
+/* Whether your compiler has __attribute__ format or not */
+#define PMIX_HAVE_ATTRIBUTE_FORMAT 1
+
+/* Whether your compiler has __attribute__ format and it works on function
+   pointers */
+#define PMIX_HAVE_ATTRIBUTE_FORMAT_FUNCPTR 1
+
+/* Whether your compiler has __attribute__ hot or not */
+#define PMIX_HAVE_ATTRIBUTE_HOT 1
+
+/* Whether your compiler has __attribute__ malloc or not */
+#define PMIX_HAVE_ATTRIBUTE_MALLOC 1
+
+/* Whether your compiler has __attribute__ may_alias or not */
+#define PMIX_HAVE_ATTRIBUTE_MAY_ALIAS 1
+
+/* Whether your compiler has __attribute__ nonnull or not */
+#define PMIX_HAVE_ATTRIBUTE_NONNULL 1
+
+/* Whether your compiler has __attribute__ noreturn or not */
+#define PMIX_HAVE_ATTRIBUTE_NORETURN 1
+
+/* Whether your compiler has __attribute__ noreturn and it works on function
+   pointers */
+#define PMIX_HAVE_ATTRIBUTE_NORETURN_FUNCPTR 1
+
+/* Whether your compiler has __attribute__ no_instrument_function or not */
+#define PMIX_HAVE_ATTRIBUTE_NO_INSTRUMENT_FUNCTION 1
+
+/* Whether your compiler has __attribute__ packed or not */
+#define PMIX_HAVE_ATTRIBUTE_PACKED 1
+
+/* Whether your compiler has __attribute__ pure or not */
+#define PMIX_HAVE_ATTRIBUTE_PURE 1
+
+/* Whether your compiler has __attribute__ sentinel or not */
+#define PMIX_HAVE_ATTRIBUTE_SENTINEL 1
+
+/* Whether your compiler has __attribute__ unused or not */
+#define PMIX_HAVE_ATTRIBUTE_UNUSED 1
+
+/* Whether your compiler has __attribute__ visibility or not */
+#define PMIX_HAVE_ATTRIBUTE_VISIBILITY 1
+
+/* Whether your compiler has __attribute__ warn unused result or not */
+#define PMIX_HAVE_ATTRIBUTE_WARN_UNUSED_RESULT 1
+
+/* Whether your compiler has __attribute__ weak alias or not */
+#define PMIX_HAVE_ATTRIBUTE_WEAK_ALIAS 
+
+/* whether qsort is broken or not */
+#define PMIX_HAVE_BROKEN_QSORT 0
+
+/* whether ceil is found and available */
+#define PMIX_HAVE_CEIL 1
+
+/* Whether the processor supports the cmpxchg16b instruction */
+#define PMIX_HAVE_CMPXCHG16B 1
+
+/* whether dirname is found and available */
+#define PMIX_HAVE_DIRNAME 1
+
+/* Whether the __atomic builtin atomic compare and swap is lock-free on
+   128-bit values */
+#define PMIX_HAVE_GCC_BUILTIN_CSWAP_INT128 1
+
+/* Whether the PMIX PDL framework is functional or not */
+#define PMIX_HAVE_PDL_SUPPORT 1
+
+/* If PTHREADS implementation supports PTHREAD_MUTEX_ERRORCHECK */
+#define PMIX_HAVE_PTHREAD_MUTEX_ERRORCHECK 1
+
+/* If PTHREADS implementation supports PTHREAD_MUTEX_ERRORCHECK_NP */
+#define PMIX_HAVE_PTHREAD_MUTEX_ERRORCHECK_NP 1
+
+/* Whether we have SA_RESTART in <signal.h> or not */
+#define PMIX_HAVE_SA_RESTART 1
+
+/* whether socket is found and available */
+#define PMIX_HAVE_SOCKET 1
+
+/* Whether or not we have solaris */
+#define PMIX_HAVE_SOLARIS 0
+
+/* Whether the __sync builtin atomic compare and swap supports 128-bit values
+   */
+/* #undef PMIX_HAVE_SYNC_BUILTIN_CSWAP_INT128 */
+
+/* Whether we have __va_copy or not */
+#define PMIX_HAVE_UNDERSCORE_VA_COPY 1
+
+/* Whether we have va_copy or not */
+#define PMIX_HAVE_VA_COPY 1
+
+/* Whether C compiler supports symbol visibility or not */
+#define PMIX_HAVE_VISIBILITY 1
+
+/* Whether or not we have zlib support */
+#define PMIX_HAVE_ZLIB 1
+
+/* ident string for PMIX */
+#define PMIX_IDENT_STRING ""
+
+/* The library major version is always available, contrary to VERSION */
+#define PMIX_MAJOR_VERSION 2
+
+/* The library minor version is always available, contrary to VERSION */
+#define PMIX_MINOR_VERSION 0
+
+/* Whether the C compiler supports "bool" without any other help (such as
+   <stdbool.h>) */
+#define PMIX_NEED_C_BOOL 1
+
+/* Whether libraries can be configured with destructor functions */
+#define PMIX_NO_LIB_DESTRUCTOR 0
+
+/* Whether we have lt_dladvise or not */
+#define PMIX_PDL_PLIBLTDL_HAVE_LT_DLADVISE 1
+
+/* Whether r notation is used for ppc registers */
+/* #undef PMIX_POWERPC_R_REGISTERS */
+
+/* type to use for ptrdiff_t */
+#define PMIX_PTRDIFF_TYPE ptrdiff_t
+
+/* The library release version is always available, contrary to VERSION */
+#define PMIX_RELEASE_VERSION 1
+
+/* The pmix symbol rename include directive */
+#define PMIX_SYMBOL_RENAME 
+
+/* Whether to use <stdbool.h> or not */
+#define PMIX_USE_STDBOOL_H 1
+
+/* The library version is always available, contrary to VERSION */
+#define PMIX_VERSION "2.0.1"
+
+/* Enable per-user config files */
+#define PMIX_WANT_HOME_CONFIG_FILES 1
+
+/* if want pretty-print stack trace feature */
+#define PMIX_WANT_PRETTY_PRINT_STACKTRACE 1
+
+/* The size of `char', as computed by sizeof. */
+#define SIZEOF_CHAR 1
+
+/* The size of `double', as computed by sizeof. */
+#define SIZEOF_DOUBLE 8
+
+/* The size of `float', as computed by sizeof. */
+#define SIZEOF_FLOAT 4
+
+/* The size of `int', as computed by sizeof. */
+#define SIZEOF_INT 4
+
+/* The size of `long', as computed by sizeof. */
+#define SIZEOF_LONG 8
+
+/* The size of `long long', as computed by sizeof. */
+#define SIZEOF_LONG_LONG 8
+
+/* The size of `pid_t', as computed by sizeof. */
+#define SIZEOF_PID_T 4
+
+/* The size of `ptrdiff_t', as computed by sizeof. */
+#define SIZEOF_PTRDIFF_T 8
+
+/* The size of `short', as computed by sizeof. */
+#define SIZEOF_SHORT 2
+
+/* The size of `size_t', as computed by sizeof. */
+#define SIZEOF_SIZE_T 8
+
+/* The size of `ssize_t', as computed by sizeof. */
+/* #undef SIZEOF_SSIZE_T */
+
+/* The size of `void *', as computed by sizeof. */
+#define SIZEOF_VOID_P 8
+
+/* The size of `wchar_t', as computed by sizeof. */
+#define SIZEOF_WCHAR_T 4
+
+/* The size of `_Bool', as computed by sizeof. */
+#define SIZEOF__BOOL 1
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Enable extensions on AIX 3, Interix.  */
+#ifndef _ALL_SOURCE
+# define _ALL_SOURCE 1
+#endif
+/* Enable GNU extensions on systems that have them.  */
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE 1
+#endif
+/* Enable threading extensions on Solaris.  */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# define _POSIX_PTHREAD_SEMANTICS 1
+#endif
+/* Enable extensions on HP NonStop.  */
+#ifndef _TANDEM_SOURCE
+# define _TANDEM_SOURCE 1
+#endif
+/* Enable general extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# define __EXTENSIONS__ 1
+#endif
+
+
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+   significant byte first (like Motorola and SPARC, unlike Intel). */
+#if defined AC_APPLE_UNIVERSAL_BUILD
+# if defined __BIG_ENDIAN__
+#  define WORDS_BIGENDIAN 1
+# endif
+#else
+# ifndef WORDS_BIGENDIAN
+/* #  undef WORDS_BIGENDIAN */
+# endif
+#endif
+
+/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
+   `char[]'. */
+/* #undef YYTEXT_POINTER */
+
+/* Enable GNU extensions on systems that have them.  */
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE 1
+#endif
+
+/* Define to 1 if on MINIX. */
+/* #undef _MINIX */
+
+/* Define to 2 if the system does not provide POSIX.1 features except with
+   this defined. */
+/* #undef _POSIX_1_SOURCE */
+
+/* Define to 1 if you need to in order for `stat' and other things to work. */
+/* #undef _POSIX_SOURCE */
+
+/* Define to `__inline__' or `__inline' if that's what the C compiler
+   calls it, or to nothing if 'inline' is not supported under any name.  */
+#ifndef __cplusplus
+#define inline __inline__
+#endif
+
+
+#include <src/include/pmix_config_bottom.h>
+#endif /* PMIX_CONFIG_H */
+
diff --git a/src/include/pmix_config.h.in b/src/include/pmix_config.h.in
new file mode 100644
index 0000000..587bd5a
--- /dev/null
+++ b/src/include/pmix_config.h.in
@@ -0,0 +1,824 @@
+/* src/include/pmix_config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* -*- c -*-
+ *
+ * Copyright (c) 2004-2005 The Trustees of Indiana University.
+ *                         All rights reserved.
+ * Copyright (c) 2004-2005 The Trustees of the University of Tennessee.
+ *                         All rights reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2013-2015 Intel, Inc. All rights reserved
+ * Copyright (c) 2016      IBM Corporation.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ *
+ * This file is automatically generated by configure.  Edits will be lost
+ * the next time you run configure!
+ */
+
+#ifndef PMIX_CONFIG_H
+#define PMIX_CONFIG_H
+
+#include <src/include/pmix_config_top.h>
+
+
+
+/* Define if building universal (internal helper macro) */
+#undef AC_APPLE_UNIVERSAL_BUILD
+
+/* Define to 1 if you have the <arpa/inet.h> header file. */
+#undef HAVE_ARPA_INET_H
+
+/* Define to 1 if you have the `asprintf' function. */
+#undef HAVE_ASPRINTF
+
+/* Define to 1 if you have the <crt_externs.h> header file. */
+#undef HAVE_CRT_EXTERNS_H
+
+/* Define to 1 if you have the declaration of `AF_INET6', and to 0 if you
+   don't. */
+#undef HAVE_DECL_AF_INET6
+
+/* Define to 1 if you have the declaration of `AF_UNSPEC', and to 0 if you
+   don't. */
+#undef HAVE_DECL_AF_UNSPEC
+
+/* Define to 1 if you have the declaration of `PF_INET6', and to 0 if you
+   don't. */
+#undef HAVE_DECL_PF_INET6
+
+/* Define to 1 if you have the declaration of `PF_UNSPEC', and to 0 if you
+   don't. */
+#undef HAVE_DECL_PF_UNSPEC
+
+/* Define to 1 if you have the declaration of `__func__', and to 0 if you
+   don't. */
+#undef HAVE_DECL___FUNC__
+
+/* Define to 1 if you have the <dirent.h> header file. */
+#undef HAVE_DIRENT_H
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
+
+/* Define to 1 if you have the <event.h> header file. */
+#undef HAVE_EVENT_H
+
+/* Define to 1 if you have the locking by fcntl. */
+#undef HAVE_FCNTL_FLOCK
+
+/* Define to 1 if you have the <fcntl.h> header file. */
+#undef HAVE_FCNTL_H
+
+/* Define to 1 if you have the `getpeereid' function. */
+#undef HAVE_GETPEEREID
+
+/* Define to 1 if you have the `getpeerucred' function. */
+#undef HAVE_GETPEERUCRED
+
+/* Define to 1 if you have the <glob.h> header file. */
+#undef HAVE_GLOB_H
+
+/* Define to 1 if you have the <hostLib.h> header file. */
+#undef HAVE_HOSTLIB_H
+
+/* Define to 1 if you have the <ifaddrs.h> header file. */
+#undef HAVE_IFADDRS_H
+
+/* Define to 1 if the system has the type `int16_t'. */
+#undef HAVE_INT16_T
+
+/* Define to 1 if the system has the type `int32_t'. */
+#undef HAVE_INT32_T
+
+/* Define to 1 if the system has the type `int64_t'. */
+#undef HAVE_INT64_T
+
+/* Define to 1 if the system has the type `int8_t'. */
+#undef HAVE_INT8_T
+
+/* Define to 1 if the system has the type `intptr_t'. */
+#undef HAVE_INTPTR_T
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the <ioLib.h> header file. */
+#undef HAVE_IOLIB_H
+
+/* Define to 1 if you have the `event' library (-levent). */
+#undef HAVE_LIBEVENT
+
+/* Define to 1 if you have the `event_pthreads' library (-levent_pthreads). */
+#undef HAVE_LIBEVENT_PTHREADS
+
+/* Define to 1 if you have the <libgen.h> header file. */
+#undef HAVE_LIBGEN_H
+
+/* Define to 1 if you have the <limits.h> header file. */
+#undef HAVE_LIMITS_H
+
+/* Define to 1 if the system has the type `long long'. */
+#undef HAVE_LONG_LONG
+
+/* Define to 1 if you have the <ltdl.h> header file. */
+#undef HAVE_LTDL_H
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the <munge.h> header file. */
+#undef HAVE_MUNGE_H
+
+/* Define to 1 if you have the <netdb.h> header file. */
+#undef HAVE_NETDB_H
+
+/* Define to 1 if you have the <netinet/in.h> header file. */
+#undef HAVE_NETINET_IN_H
+
+/* Define to 1 if you have the <netinet/tcp.h> header file. */
+#undef HAVE_NETINET_TCP_H
+
+/* Define to 1 if you have the <net/if.h> header file. */
+#undef HAVE_NET_IF_H
+
+/* Define to 1 if you have the <net/uio.h> header file. */
+#undef HAVE_NET_UIO_H
+
+/* Define to 1 if you have the `posix_fallocate' function. */
+#undef HAVE_POSIX_FALLOCATE
+
+/* Define to 1 if you have the <psm2.h> header file. */
+#undef HAVE_PSM2_H
+
+/* Define to 1 if you have the `pthread_condattr_setpshared' function. */
+#undef HAVE_PTHREAD_CONDATTR_SETPSHARED
+
+/* Define to 1 if you have the `pthread_mutexattr_setpshared' function. */
+#undef HAVE_PTHREAD_MUTEXATTR_SETPSHARED
+
+/* Define to 1 if you have the `pthread_rwlockattr_setkind_np` function. */
+#undef HAVE_PTHREAD_SETKIND
+
+/* Define to 1 if you have the `PTHREAD_PROCESS_SHARED` definition. */
+#undef HAVE_PTHREAD_SHARED
+
+/* Define to 1 if the system has the type `ptrdiff_t'. */
+#undef HAVE_PTRDIFF_T
+
+/* Define to 1 if `si_band' is a member of `siginfo_t'. */
+#undef HAVE_SIGINFO_T_SI_BAND
+
+/* Define to 1 if `si_fd' is a member of `siginfo_t'. */
+#undef HAVE_SIGINFO_T_SI_FD
+
+/* Define to 1 if you have the <signal.h> header file. */
+#undef HAVE_SIGNAL_H
+
+/* Define to 1 if you have the `snprintf' function. */
+#undef HAVE_SNPRINTF
+
+/* Define to 1 if you have the `socketpair' function. */
+#undef HAVE_SOCKETPAIR
+
+/* Define to 1 if the system has the type `socklen_t'. */
+#undef HAVE_SOCKLEN_T
+
+/* Define to 1 if you have the <sockLib.h> header file. */
+#undef HAVE_SOCKLIB_H
+
+/* Define to 1 if you have the `statfs' function. */
+#undef HAVE_STATFS
+
+/* Define to 1 if you have the `statvfs' function. */
+#undef HAVE_STATVFS
+
+/* Define to 1 if you have the <stdarg.h> header file. */
+#undef HAVE_STDARG_H
+
+/* Define to 1 if you have the <stdbool.h> header file. */
+#undef HAVE_STDBOOL_H
+
+/* Define to 1 if you have the <stddef.h> header file. */
+#undef HAVE_STDDEF_H
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the `strncpy_s' function. */
+#undef HAVE_STRNCPY_S
+
+/* Define to 1 if you have the `strnlen' function. */
+#undef HAVE_STRNLEN
+
+/* Define to 1 if you have the `strsignal' function. */
+#undef HAVE_STRSIGNAL
+
+/* Define to 1 if `d_type' is a member of `struct dirent'. */
+#undef HAVE_STRUCT_DIRENT_D_TYPE
+
+/* Define to 1 if `l_type' is a member of `struct flock'. */
+#undef HAVE_STRUCT_FLOCK_L_TYPE
+
+/* Define to 1 if `ifr_hwaddr' is a member of `struct ifreq'. */
+#undef HAVE_STRUCT_IFREQ_IFR_HWADDR
+
+/* Define to 1 if `ifr_mtu' is a member of `struct ifreq'. */
+#undef HAVE_STRUCT_IFREQ_IFR_MTU
+
+/* Define to 1 if the system has the type `struct sockaddr_in'. */
+#undef HAVE_STRUCT_SOCKADDR_IN
+
+/* Define to 1 if the system has the type `struct sockaddr_in6'. */
+#undef HAVE_STRUCT_SOCKADDR_IN6
+
+/* Define to 1 if `sa_len' is a member of `struct sockaddr'. */
+#undef HAVE_STRUCT_SOCKADDR_SA_LEN
+
+/* Define to 1 if the system has the type `struct sockaddr_storage'. */
+#undef HAVE_STRUCT_SOCKADDR_STORAGE
+
+/* Define to 1 if the system has the type `struct sockaddr_un'. */
+#undef HAVE_STRUCT_SOCKADDR_UN
+
+/* Define to 1 if `uid' is a member of `struct sockpeercred'. */
+#undef HAVE_STRUCT_SOCKPEERCRED_UID
+
+/* Define to 1 if `f_fstypename' is a member of `struct statfs'. */
+#undef HAVE_STRUCT_STATFS_F_FSTYPENAME
+
+/* Define to 1 if `f_type' is a member of `struct statfs'. */
+#undef HAVE_STRUCT_STATFS_F_TYPE
+
+/* Define to 1 if `f_basetype' is a member of `struct statvfs'. */
+#undef HAVE_STRUCT_STATVFS_F_BASETYPE
+
+/* Define to 1 if `f_fstypename' is a member of `struct statvfs'. */
+#undef HAVE_STRUCT_STATVFS_F_FSTYPENAME
+
+/* Define to 1 if `cr_uid' is a member of `struct ucred'. */
+#undef HAVE_STRUCT_UCRED_CR_UID
+
+/* Define to 1 if `uid' is a member of `struct ucred'. */
+#undef HAVE_STRUCT_UCRED_UID
+
+/* Define to 1 if you have the <syslog.h> header file. */
+#undef HAVE_SYSLOG_H
+
+/* Define to 1 if you have the <sys/ioctl.h> header file. */
+#undef HAVE_SYS_IOCTL_H
+
+/* Define to 1 if you have the <sys/mount.h> header file. */
+#undef HAVE_SYS_MOUNT_H
+
+/* Define to 1 if you have the <sys/param.h> header file. */
+#undef HAVE_SYS_PARAM_H
+
+/* Define to 1 if you have the <sys/select.h> header file. */
+#undef HAVE_SYS_SELECT_H
+
+/* Define to 1 if you have the <sys/socket.h> header file. */
+#undef HAVE_SYS_SOCKET_H
+
+/* Define to 1 if you have the <sys/sockio.h> header file. */
+#undef HAVE_SYS_SOCKIO_H
+
+/* Define to 1 if you have the <sys/statfs.h> header file. */
+#undef HAVE_SYS_STATFS_H
+
+/* Define to 1 if you have the <sys/statvfs.h> header file. */
+#undef HAVE_SYS_STATVFS_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/sysctl.h> header file. */
+#undef HAVE_SYS_SYSCTL_H
+
+/* Define to 1 if you have the <sys/time.h> header file. */
+#undef HAVE_SYS_TIME_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <sys/uio.h> header file. */
+#undef HAVE_SYS_UIO_H
+
+/* Define to 1 if you have the <sys/un.h> header file. */
+#undef HAVE_SYS_UN_H
+
+/* Define to 1 if you have the <sys/wait.h> header file. */
+#undef HAVE_SYS_WAIT_H
+
+/* Define to 1 if you have the <time.h> header file. */
+#undef HAVE_TIME_H
+
+/* Define to 1 if you have the <ucred.h> header file. */
+#undef HAVE_UCRED_H
+
+/* Define to 1 if the system has the type `uint128_t'. */
+#undef HAVE_UINT128_T
+
+/* Define to 1 if the system has the type `uint16_t'. */
+#undef HAVE_UINT16_T
+
+/* Define to 1 if the system has the type `uint32_t'. */
+#undef HAVE_UINT32_T
+
+/* Define to 1 if the system has the type `uint64_t'. */
+#undef HAVE_UINT64_T
+
+/* Define to 1 if the system has the type `uint8_t'. */
+#undef HAVE_UINT8_T
+
+/* Define to 1 if the system has the type `uintptr_t'. */
+#undef HAVE_UINTPTR_T
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* whether unix byteswap routines -- htonl, htons, nothl, ntohs -- are
+   available */
+#undef HAVE_UNIX_BYTESWAP
+
+/* Define to 1 if you have the `usleep' function. */
+#undef HAVE_USLEEP
+
+/* Define to 1 if you have the `vasprintf' function. */
+#undef HAVE_VASPRINTF
+
+/* Define to 1 if you have the `vsnprintf' function. */
+#undef HAVE_VSNPRINTF
+
+/* Define to 1 if you have the <zlib.h> header file. */
+#undef HAVE_ZLIB_H
+
+/* Define to 1 if the system has the type `__int128'. */
+#undef HAVE___INT128
+
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
+#undef LT_OBJDIR
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* Alignment of type bool */
+#undef PMIX_ALIGNMENT_BOOL
+
+/* Alignment of type char */
+#undef PMIX_ALIGNMENT_CHAR
+
+/* Alignment of type double */
+#undef PMIX_ALIGNMENT_DOUBLE
+
+/* Alignment of type float */
+#undef PMIX_ALIGNMENT_FLOAT
+
+/* Alignment of type int */
+#undef PMIX_ALIGNMENT_INT
+
+/* Alignment of type int16_t */
+#undef PMIX_ALIGNMENT_INT16
+
+/* Alignment of type int32_t */
+#undef PMIX_ALIGNMENT_INT32
+
+/* Alignment of type int64_t */
+#undef PMIX_ALIGNMENT_INT64
+
+/* Alignment of type int8_t */
+#undef PMIX_ALIGNMENT_INT8
+
+/* Alignment of type long */
+#undef PMIX_ALIGNMENT_LONG
+
+/* Alignment of type long double */
+#undef PMIX_ALIGNMENT_LONG_DOUBLE
+
+/* Alignment of type long long */
+#undef PMIX_ALIGNMENT_LONG_LONG
+
+/* Alignment of type short */
+#undef PMIX_ALIGNMENT_SHORT
+
+/* Alignment of type size_t */
+#undef PMIX_ALIGNMENT_SIZE_T
+
+/* Alignment of type void * */
+#undef PMIX_ALIGNMENT_VOID_P
+
+/* Alignment of type wchar_t */
+#undef PMIX_ALIGNMENT_WCHAR
+
+/* Assembly align directive expects logarithmic value */
+#undef PMIX_ASM_ALIGN_LOG
+
+/* What ARM assembly version to use */
+#undef PMIX_ASM_ARM_VERSION
+
+/* Assembly directive for exporting symbols */
+#undef PMIX_ASM_GLOBAL
+
+/* Assembly prefix for gsym labels */
+#undef PMIX_ASM_GSYM
+
+/* Assembly suffix for labels */
+#undef PMIX_ASM_LABEL_SUFFIX
+
+/* Assembly prefix for lsym labels */
+#undef PMIX_ASM_LSYM
+
+/* Do we need to give a .size directive */
+#undef PMIX_ASM_SIZE
+
+/* Whether we can do 64bit assembly operations or not. Should not be used
+   outside of the assembly header files */
+#undef PMIX_ASM_SUPPORT_64BIT
+
+/* Whether 64-bit is supported by the __sync builtin atomics */
+#undef PMIX_ASM_SYNC_HAVE_64BIT
+
+/* Assembly directive for setting text section */
+#undef PMIX_ASM_TEXT
+
+/* How to set function type in .type directive */
+#undef PMIX_ASM_TYPE
+
+/* Architecture type of assembly to use for atomic operations and CMA */
+#undef PMIX_ASSEMBLY_ARCH
+
+/* Whether to use builtin atomics */
+#undef PMIX_ASSEMBLY_BUILTIN
+
+/* Format of assembly file */
+#undef PMIX_ASSEMBLY_FORMAT
+
+/* Whether we have support for RDTSCP instruction */
+#undef PMIX_ASSEMBLY_SUPPORTS_RDTSCP
+
+/* The compiler $lower which PMIx was built with */
+#undef PMIX_BUILD_PLATFORM_COMPILER_FAMILYID
+
+/* The compiler $lower which PMIX was built with */
+#undef PMIX_BUILD_PLATFORM_COMPILER_FAMILYNAME
+
+/* The compiler $lower which PMIx was built with */
+#undef PMIX_BUILD_PLATFORM_COMPILER_VERSION
+
+/* The compiler $lower which PMIX was built with */
+#undef PMIX_BUILD_PLATFORM_COMPILER_VERSION_STR
+
+/* PMIx underlying C compiler */
+#undef PMIX_CC
+
+/* Use static const char[] strings for C files */
+#undef PMIX_CC_USE_CONST_CHAR_IDENT
+
+/* Use #ident strings for C files */
+#undef PMIX_CC_USE_IDENT
+
+/* Use #pragma comment for C files */
+#undef PMIX_CC_USE_PRAGMA_COMMENT
+
+/* Use #pragma ident strings for C files */
+#undef PMIX_CC_USE_PRAGMA_IDENT
+
+/* Whether C compiler supports GCC style inline assembly */
+#undef PMIX_C_GCC_INLINE_ASSEMBLY
+
+/* Whether C compiler supports __builtin_clz */
+#undef PMIX_C_HAVE_BUILTIN_CLZ
+
+/* Whether C compiler supports __builtin_expect */
+#undef PMIX_C_HAVE_BUILTIN_EXPECT
+
+/* Whether C compiler supports __builtin_prefetch */
+#undef PMIX_C_HAVE_BUILTIN_PREFETCH
+
+/* Whether we are in debugging mode or not */
+#undef PMIX_ENABLE_DEBUG
+
+/* Whether we want to enable dlopen support */
+#undef PMIX_ENABLE_DLOPEN_SUPPORT
+
+/* if want shared memory dstore feature */
+#undef PMIX_ENABLE_DSTORE
+
+/* Whether we should enable thread support within the PMIX code base */
+#undef PMIX_ENABLE_MULTI_THREADS
+
+/* Whether we want developer-level timing support or not */
+#undef PMIX_ENABLE_TIMING
+
+/* Location of event2/thread.h */
+#undef PMIX_EVENT2_THREAD_HEADER
+
+/* Location of event.h */
+#undef PMIX_EVENT_HEADER
+
+/* Whether your compiler has __attribute__ or not */
+#undef PMIX_HAVE_ATTRIBUTE
+
+/* Whether your compiler has __attribute__ aligned or not */
+#undef PMIX_HAVE_ATTRIBUTE_ALIGNED
+
+/* Whether your compiler has __attribute__ always_inline or not */
+#undef PMIX_HAVE_ATTRIBUTE_ALWAYS_INLINE
+
+/* Whether your compiler has __attribute__ cold or not */
+#undef PMIX_HAVE_ATTRIBUTE_COLD
+
+/* Whether your compiler has __attribute__ const or not */
+#undef PMIX_HAVE_ATTRIBUTE_CONST
+
+/* Whether your compiler has __attribute__ deprecated or not */
+#undef PMIX_HAVE_ATTRIBUTE_DEPRECATED
+
+/* Whether your compiler has __attribute__ deprecated with optional argument
+   */
+#undef PMIX_HAVE_ATTRIBUTE_DEPRECATED_ARGUMENT
+
+/* Whether your compiler has __attribute__ destructor or not */
+#undef PMIX_HAVE_ATTRIBUTE_DESTRUCTOR
+
+/* Whether your compiler has __attribute__ format or not */
+#undef PMIX_HAVE_ATTRIBUTE_FORMAT
+
+/* Whether your compiler has __attribute__ format and it works on function
+   pointers */
+#undef PMIX_HAVE_ATTRIBUTE_FORMAT_FUNCPTR
+
+/* Whether your compiler has __attribute__ hot or not */
+#undef PMIX_HAVE_ATTRIBUTE_HOT
+
+/* Whether your compiler has __attribute__ malloc or not */
+#undef PMIX_HAVE_ATTRIBUTE_MALLOC
+
+/* Whether your compiler has __attribute__ may_alias or not */
+#undef PMIX_HAVE_ATTRIBUTE_MAY_ALIAS
+
+/* Whether your compiler has __attribute__ nonnull or not */
+#undef PMIX_HAVE_ATTRIBUTE_NONNULL
+
+/* Whether your compiler has __attribute__ noreturn or not */
+#undef PMIX_HAVE_ATTRIBUTE_NORETURN
+
+/* Whether your compiler has __attribute__ noreturn and it works on function
+   pointers */
+#undef PMIX_HAVE_ATTRIBUTE_NORETURN_FUNCPTR
+
+/* Whether your compiler has __attribute__ no_instrument_function or not */
+#undef PMIX_HAVE_ATTRIBUTE_NO_INSTRUMENT_FUNCTION
+
+/* Whether your compiler has __attribute__ packed or not */
+#undef PMIX_HAVE_ATTRIBUTE_PACKED
+
+/* Whether your compiler has __attribute__ pure or not */
+#undef PMIX_HAVE_ATTRIBUTE_PURE
+
+/* Whether your compiler has __attribute__ sentinel or not */
+#undef PMIX_HAVE_ATTRIBUTE_SENTINEL
+
+/* Whether your compiler has __attribute__ unused or not */
+#undef PMIX_HAVE_ATTRIBUTE_UNUSED
+
+/* Whether your compiler has __attribute__ visibility or not */
+#undef PMIX_HAVE_ATTRIBUTE_VISIBILITY
+
+/* Whether your compiler has __attribute__ warn unused result or not */
+#undef PMIX_HAVE_ATTRIBUTE_WARN_UNUSED_RESULT
+
+/* Whether your compiler has __attribute__ weak alias or not */
+#undef PMIX_HAVE_ATTRIBUTE_WEAK_ALIAS
+
+/* whether qsort is broken or not */
+#undef PMIX_HAVE_BROKEN_QSORT
+
+/* whether ceil is found and available */
+#undef PMIX_HAVE_CEIL
+
+/* Whether the processor supports the cmpxchg16b instruction */
+#undef PMIX_HAVE_CMPXCHG16B
+
+/* whether dirname is found and available */
+#undef PMIX_HAVE_DIRNAME
+
+/* Whether the __atomic builtin atomic compare and swap is lock-free on
+   128-bit values */
+#undef PMIX_HAVE_GCC_BUILTIN_CSWAP_INT128
+
+/* Whether the PMIX PDL framework is functional or not */
+#undef PMIX_HAVE_PDL_SUPPORT
+
+/* If PTHREADS implementation supports PTHREAD_MUTEX_ERRORCHECK */
+#undef PMIX_HAVE_PTHREAD_MUTEX_ERRORCHECK
+
+/* If PTHREADS implementation supports PTHREAD_MUTEX_ERRORCHECK_NP */
+#undef PMIX_HAVE_PTHREAD_MUTEX_ERRORCHECK_NP
+
+/* Whether we have SA_RESTART in <signal.h> or not */
+#undef PMIX_HAVE_SA_RESTART
+
+/* whether socket is found and available */
+#undef PMIX_HAVE_SOCKET
+
+/* Whether or not we have solaris */
+#undef PMIX_HAVE_SOLARIS
+
+/* Whether the __sync builtin atomic compare and swap supports 128-bit values
+   */
+#undef PMIX_HAVE_SYNC_BUILTIN_CSWAP_INT128
+
+/* Whether we have __va_copy or not */
+#undef PMIX_HAVE_UNDERSCORE_VA_COPY
+
+/* Whether we have va_copy or not */
+#undef PMIX_HAVE_VA_COPY
+
+/* Whether C compiler supports symbol visibility or not */
+#undef PMIX_HAVE_VISIBILITY
+
+/* Whether or not we have zlib support */
+#undef PMIX_HAVE_ZLIB
+
+/* ident string for PMIX */
+#undef PMIX_IDENT_STRING
+
+/* The library major version is always available, contrary to VERSION */
+#undef PMIX_MAJOR_VERSION
+
+/* The library minor version is always available, contrary to VERSION */
+#undef PMIX_MINOR_VERSION
+
+/* Whether the C compiler supports "bool" without any other help (such as
+   <stdbool.h>) */
+#undef PMIX_NEED_C_BOOL
+
+/* Whether libraries can be configured with destructor functions */
+#undef PMIX_NO_LIB_DESTRUCTOR
+
+/* Whether we have lt_dladvise or not */
+#undef PMIX_PDL_PLIBLTDL_HAVE_LT_DLADVISE
+
+/* Whether r notation is used for ppc registers */
+#undef PMIX_POWERPC_R_REGISTERS
+
+/* type to use for ptrdiff_t */
+#undef PMIX_PTRDIFF_TYPE
+
+/* The library release version is always available, contrary to VERSION */
+#undef PMIX_RELEASE_VERSION
+
+/* The pmix symbol rename include directive */
+#undef PMIX_SYMBOL_RENAME
+
+/* Whether to use <stdbool.h> or not */
+#undef PMIX_USE_STDBOOL_H
+
+/* The library version is always available, contrary to VERSION */
+#undef PMIX_VERSION
+
+/* Enable per-user config files */
+#undef PMIX_WANT_HOME_CONFIG_FILES
+
+/* if want pretty-print stack trace feature */
+#undef PMIX_WANT_PRETTY_PRINT_STACKTRACE
+
+/* The size of `char', as computed by sizeof. */
+#undef SIZEOF_CHAR
+
+/* The size of `double', as computed by sizeof. */
+#undef SIZEOF_DOUBLE
+
+/* The size of `float', as computed by sizeof. */
+#undef SIZEOF_FLOAT
+
+/* The size of `int', as computed by sizeof. */
+#undef SIZEOF_INT
+
+/* The size of `long', as computed by sizeof. */
+#undef SIZEOF_LONG
+
+/* The size of `long long', as computed by sizeof. */
+#undef SIZEOF_LONG_LONG
+
+/* The size of `pid_t', as computed by sizeof. */
+#undef SIZEOF_PID_T
+
+/* The size of `ptrdiff_t', as computed by sizeof. */
+#undef SIZEOF_PTRDIFF_T
+
+/* The size of `short', as computed by sizeof. */
+#undef SIZEOF_SHORT
+
+/* The size of `size_t', as computed by sizeof. */
+#undef SIZEOF_SIZE_T
+
+/* The size of `ssize_t', as computed by sizeof. */
+#undef SIZEOF_SSIZE_T
+
+/* The size of `void *', as computed by sizeof. */
+#undef SIZEOF_VOID_P
+
+/* The size of `wchar_t', as computed by sizeof. */
+#undef SIZEOF_WCHAR_T
+
+/* The size of `_Bool', as computed by sizeof. */
+#undef SIZEOF__BOOL
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Enable extensions on AIX 3, Interix.  */
+#ifndef _ALL_SOURCE
+# undef _ALL_SOURCE
+#endif
+/* Enable GNU extensions on systems that have them.  */
+#ifndef _GNU_SOURCE
+# undef _GNU_SOURCE
+#endif
+/* Enable threading extensions on Solaris.  */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
+#endif
+/* Enable extensions on HP NonStop.  */
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif
+/* Enable general extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+
+
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+   significant byte first (like Motorola and SPARC, unlike Intel). */
+#if defined AC_APPLE_UNIVERSAL_BUILD
+# if defined __BIG_ENDIAN__
+#  define WORDS_BIGENDIAN 1
+# endif
+#else
+# ifndef WORDS_BIGENDIAN
+#  undef WORDS_BIGENDIAN
+# endif
+#endif
+
+/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
+   `char[]'. */
+#undef YYTEXT_POINTER
+
+/* Enable GNU extensions on systems that have them.  */
+#ifndef _GNU_SOURCE
+# undef _GNU_SOURCE
+#endif
+
+/* Define to 1 if on MINIX. */
+#undef _MINIX
+
+/* Define to 2 if the system does not provide POSIX.1 features except with
+   this defined. */
+#undef _POSIX_1_SOURCE
+
+/* Define to 1 if you need to in order for `stat' and other things to work. */
+#undef _POSIX_SOURCE
+
+/* Define to `__inline__' or `__inline' if that's what the C compiler
+   calls it, or to nothing if 'inline' is not supported under any name.  */
+#ifndef __cplusplus
+#undef inline
+#endif
+
+
+#include <src/include/pmix_config_bottom.h>
+#endif /* PMIX_CONFIG_H */
+
diff --git a/src/include/pmix_config_bottom.h b/src/include/pmix_config_bottom.h
new file mode 100644
index 0000000..328f6a0
--- /dev/null
+++ b/src/include/pmix_config_bottom.h
@@ -0,0 +1,564 @@
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2005 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2010 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2009      Sun Microsystems, Inc.  All rights reserved.
+ * Copyright (c) 2009-2011 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2013      Mellanox Technologies, Inc.
+ *                         All rights reserved.
+ * Copyright (c) 2013-2017 Intel, Inc. All rights reserved.
+ * Copyright (c) 2016      IBM Corporation.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ *
+ */
+
+#ifndef PMIX_CONFIG_BOTTOM_H
+#define PMIX_CONFIG_BOTTOM_H
+
+/*
+ * If we build a static library, Visual C define the _LIB symbol. In the
+ * case of a shared library _USERDLL get defined.
+ *
+ */
+#ifndef PMIX_BUILDING
+#define PMIX_BUILDING 1
+#endif
+
+/*
+ * Flex is trying to include the unistd.h file. As there is no configure
+ * option or this, the flex generated files will try to include the file
+ * even on platforms without unistd.h. Therefore, if we
+ * know this file is not available, we can prevent flex from including it.
+ */
+#ifndef HAVE_UNISTD_H
+#define YY_NO_UNISTD_H
+#endif
+
+/***********************************************************************
+ *
+ * code that should be in ompi_config_bottom.h regardless of build
+ * status
+ *
+ **********************************************************************/
+
+/* Do we have posix or solaris thread lib */
+#define PMIX_HAVE_THREADS (PMIX_HAVE_POSIX_THREADS || PMIX_HAVE_SOLARIS_THREADS)
+
+/*
+ * BEGIN_C_DECLS should be used at the beginning of your declarations,
+ * so that C++ compilers don't mangle their names.  Use END_C_DECLS at
+ * the end of C declarations.
+ */
+#undef BEGIN_C_DECLS
+#undef END_C_DECLS
+#if defined(c_plusplus) || defined(__cplusplus)
+# define BEGIN_C_DECLS extern "C" {
+# define END_C_DECLS }
+#else
+#define BEGIN_C_DECLS          /* empty */
+#define END_C_DECLS            /* empty */
+#endif
+
+/* Defined to 1 on Linux */
+#undef PMIX_LINUX_SYS
+
+/* Defined to 1 if the CPU_SET macro works */
+#undef PMIX_HAVE_CPU_SET
+
+/* Defined to 1 if you have the `windows.h' header. */
+#undef PMIX_HAVE_WINDOWS_H
+#undef pmix_pid_t
+#undef pmix_thread_t
+
+/*
+ * Note: this is public.  We can not assume anything from the compiler used
+ * by the application and thus the PMIX_HAVE_* macros below are not
+ * fetched from the autoconf result here. We only automatically use a few
+ * well-known easy cases.
+ */
+
+/* Some handy constants to make the logic below a little more readable */
+#if defined(__cplusplus) && \
+    (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR >= 4))
+#define GXX_ABOVE_3_4 1
+#else
+#define GXX_ABOVE_3_4 0
+#endif
+
+#if !defined(__cplusplus) && \
+    (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95))
+#define GCC_ABOVE_2_95 1
+#else
+#define GCC_ABOVE_2_95 0
+#endif
+
+#if !defined(__cplusplus) && \
+    (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96))
+#define GCC_ABOVE_2_96 1
+#else
+#define GCC_ABOVE_2_96 0
+#endif
+
+#if !defined(__cplusplus) && \
+    (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3))
+#define GCC_ABOVE_3_3 1
+#else
+#define GCC_ABOVE_3_3 0
+#endif
+
+
+/**
+ * The attribute definition should be included before any potential
+ * usage.
+ */
+#if PMIX_HAVE_ATTRIBUTE_ALIGNED
+#    define __pmix_attribute_aligned__(a)    __attribute__((__aligned__(a)))
+#    define __pmix_attribute_aligned_max__   __attribute__((__aligned__))
+#else
+#    define __pmix_attribute_aligned__(a)
+#    define __pmix_attribute_aligned_max__
+#endif
+
+/* Note that if we're compiling C++, then just use the "inline"
+   keyword, since it's part of C++ */
+#if defined(c_plusplus) || defined(__cplusplus)
+#  define __pmix_inline inline
+#elif defined(_MSC_VER) || defined(__HP_cc)
+#  define __pmix_inline __inline
+#else
+#  define __pmix_inline __inline__
+#endif
+
+#if PMIX_HAVE_ATTRIBUTE_ALWAYS_INLINE
+#    define __pmix_attribute_always_inline__ __attribute__((__always_inline__))
+#else
+#    define __pmix_attribute_always_inline__
+#endif
+
+#if PMIX_HAVE_ATTRIBUTE_COLD
+#    define __pmix_attribute_cold__          __attribute__((__cold__))
+#else
+#    define __pmix_attribute_cold__
+#endif
+
+#ifdef PMIX_HAVE_ATTRIBUTE_CONST
+#define __PMIX_HAVE_ATTRIBUTE_CONST PMIX_HAVE_ATTRIBUTE_CONST
+#elif defined(__GNUC__)
+# define __PMIX_HAVE_ATTRIBUTE_CONST (GXX_ABOVE_3_4 || GCC_ABOVE_2_95)
+#else
+# define __PMIX_HAVE_ATTRIBUTE_CONST 0
+#endif
+#if __PMIX_HAVE_ATTRIBUTE_CONST
+# define __pmix_attribute_const __attribute__((__const__))
+#else
+# define __pmix_attribute_const
+#endif
+
+#if PMIX_HAVE_ATTRIBUTE_CONST
+#    define __pmix_attribute_const__         __attribute__((__const__))
+#else
+#    define __pmix_attribute_const__
+#endif
+
+#ifdef PMIX_HAVE_ATTRIBUTE_DEPRECATED
+#define __PMIX_HAVE_ATTRIBUTE_DEPRECATED PMIX_HAVE_ATTRIBUTE_DEPRECATED
+#elif defined(__GNUC__)
+# define __PMIX_HAVE_ATTRIBUTE_DEPRECATED (GXX_ABOVE_3_4 || GCC_ABOVE_3_3)
+#else
+# define __PMIX_HAVE_ATTRIBUTE_DEPRECATED 0
+#endif
+#if __PMIX_HAVE_ATTRIBUTE_DEPRECATED
+# define __pmix_attribute_deprecated __attribute__((__deprecated__))
+#else
+# define __pmix_attribute_deprecated
+#endif
+
+#if PMIX_HAVE_ATTRIBUTE_DEPRECATED
+#    define __pmix_attribute_deprecated__    __attribute__((__deprecated__))
+#else
+#    define __pmix_attribute_deprecated__
+#endif
+
+#if PMIX_HAVE_ATTRIBUTE_FORMAT
+#    define __pmix_attribute_format__(a,b,c) __attribute__((__format__(a, b, c)))
+#else
+#    define __pmix_attribute_format__(a,b,c)
+#endif
+
+/* Use this __atribute__ on function-ptr declarations, only */
+#if PMIX_HAVE_ATTRIBUTE_FORMAT_FUNCPTR
+#    define __pmix_attribute_format_funcptr__(a,b,c) __attribute__((__format__(a, b, c)))
+#else
+#    define __pmix_attribute_format_funcptr__(a,b,c)
+#endif
+
+#if PMIX_HAVE_ATTRIBUTE_HOT
+#    define __pmix_attribute_hot__           __attribute__((__hot__))
+#else
+#    define __pmix_attribute_hot__
+#endif
+
+#ifdef PMIX_HAVE_ATTRIBUTE_MALLOC
+#define __PMIX_HAVE_ATTRIBUTE_MALLOC PMIX_HAVE_ATTRIBUTE_MALLOC
+#elif defined(__GNUC__)
+# define __PMIX_HAVE_ATTRIBUTE_MALLOC (GXX_ABOVE_3_4 || GCC_ABOVE_2_96)
+#else
+# define __PMIX_HAVE_ATTRIBUTE_MALLOC 0
+#endif
+#if __PMIX_HAVE_ATTRIBUTE_MALLOC
+# define __pmix_attribute_malloc __attribute__((__malloc__))
+#else
+# define __pmix_attribute_malloc
+#endif
+
+#if PMIX_HAVE_ATTRIBUTE_MALLOC
+#    define __pmix_attribute_malloc__        __attribute__((__malloc__))
+#else
+#    define __pmix_attribute_malloc__
+#endif
+
+#ifdef PMIX_HAVE_ATTRIBUTE_MAY_ALIAS
+#define __PMIX_HAVE_ATTRIBUTE_MAY_ALIAS PMIX_HAVE_ATTRIBUTE_MAY_ALIAS
+#elif defined(__GNUC__)
+# define __PMIX_HAVE_ATTRIBUTE_MAY_ALIAS (GXX_ABOVE_3_4 || GCC_ABOVE_3_3)
+#else
+# define __PMIX_HAVE_ATTRIBUTE_MAY_ALIAS 0
+#endif
+#if __PMIX_HAVE_ATTRIBUTE_MAY_ALIAS
+# define __pmix_attribute_may_alias __attribute__((__may_alias__))
+#else
+# define __pmix_attribute_may_alias
+#endif
+
+#if PMIX_HAVE_ATTRIBUTE_MAY_ALIAS
+#    define __pmix_attribute_may_alias__     __attribute__((__may_alias__))
+#else
+#    define __pmix_attribute_may_alias__
+#endif
+
+#if PMIX_HAVE_ATTRIBUTE_NO_INSTRUMENT_FUNCTION
+#    define __pmix_attribute_no_instrument_function__  __attribute__((__no_instrument_function__))
+#else
+#    define __pmix_attribute_no_instrument_function__
+#endif
+
+#if PMIX_HAVE_ATTRIBUTE_NONNULL
+#    define __pmix_attribute_nonnull__(a)    __attribute__((__nonnull__(a)))
+#    define __pmix_attribute_nonnull_all__   __attribute__((__nonnull__))
+#else
+#    define __pmix_attribute_nonnull__(a)
+#    define __pmix_attribute_nonnull_all__
+#endif
+
+#if PMIX_HAVE_ATTRIBUTE_NORETURN
+#    define __pmix_attribute_noreturn__      __attribute__((__noreturn__))
+#else
+#    define __pmix_attribute_noreturn__
+#endif
+
+/* Use this __atribute__ on function-ptr declarations, only */
+#if PMIX_HAVE_ATTRIBUTE_NORETURN_FUNCPTR
+#    define __pmix_attribute_noreturn_funcptr__  __attribute__((__noreturn__))
+#else
+#    define __pmix_attribute_noreturn_funcptr__
+#endif
+
+#if PMIX_HAVE_ATTRIBUTE_PACKED
+#    define __pmix_attribute_packed__        __attribute__((__packed__))
+#else
+#    define __pmix_attribute_packed__
+#endif
+
+#ifdef PMIX_HAVE_ATTRIBUTE_PURE
+#define __PMIX_HAVE_ATTRIBUTE_PURE PMIX_HAVE_ATTRIBUTE_PURE
+#elif defined(__GNUC__)
+# define __PMIX_HAVE_ATTRIBUTE_PURE (GXX_ABOVE_3_4 || GCC_ABOVE_2_96)
+#else
+# define __PMIX_HAVE_ATTRIBUTE_PURE 0
+#endif
+#if __PMIX_HAVE_ATTRIBUTE_PURE
+# define __pmix_attribute_pure __attribute__((__pure__))
+#else
+# define __pmix_attribute_pure
+#endif
+
+#if PMIX_HAVE_ATTRIBUTE_PURE
+#    define __pmix_attribute_pure__          __attribute__((__pure__))
+#else
+#    define __pmix_attribute_pure__
+#endif
+
+#if PMIX_HAVE_ATTRIBUTE_SENTINEL
+#    define __pmix_attribute_sentinel__      __attribute__((__sentinel__))
+#else
+#    define __pmix_attribute_sentinel__
+#endif
+
+/* Maybe before gcc 2.95 too */
+#ifdef PMIX_HAVE_ATTRIBUTE_UNUSED
+#define __PMIX_HAVE_ATTRIBUTE_UNUSED PMIX_HAVE_ATTRIBUTE_UNUSED
+#elif defined(__GNUC__)
+# define __PMIX_HAVE_ATTRIBUTE_UNUSED (GXX_ABOVE_3_4 || GCC_ABOVE_2_95)
+#else
+# define __PMIX_HAVE_ATTRIBUTE_UNUSED 0
+#endif
+#if __PMIX_HAVE_ATTRIBUTE_UNUSED
+# define __pmix_attribute_unused __attribute__((__unused__))
+#else
+# define __pmix_attribute_unused
+#endif
+
+#if PMIX_HAVE_ATTRIBUTE_UNUSED
+#    define __pmix_attribute_unused__        __attribute__((__unused__))
+#else
+#    define __pmix_attribute_unused__
+#endif
+
+#if PMIX_HAVE_ATTRIBUTE_WARN_UNUSED_RESULT
+#    define __pmix_attribute_warn_unused_result__ __attribute__((__warn_unused_result__))
+#else
+#    define __pmix_attribute_warn_unused_result__
+#endif
+
+#if PMIX_HAVE_ATTRIBUTE_DESTRUCTOR
+#    define __pmix_attribute_destructor__    __attribute__((__destructor__))
+#else
+#    define __pmix_attribute_destructor__
+#endif
+
+/*
+ * Do we have <stdint.h>?
+ */
+#ifdef HAVE_STDINT_H
+#if !defined(__STDC_LIMIT_MACROS) && (defined(c_plusplus) || defined (__cplusplus))
+/* When using a C++ compiler, the max / min value #defines for std
+   types are only included if __STDC_LIMIT_MACROS is set before
+   including stdint.h */
+#define __STDC_LIMIT_MACROS
+#endif
+#include <src/include/pmix_config.h>
+#include <stdint.h>
+#else
+#include <src/include/pmix_stdint.h>
+#endif
+
+/***********************************************************************
+ *
+ * Code that is only for when building PMIx or utilities that are
+ * using the internals of PMIx.  It should not be included when
+ * building MPI applications
+ *
+ **********************************************************************/
+#if PMIX_BUILDING
+
+#ifndef HAVE_PTRDIFF_T
+typedef PMIX_PTRDIFF_TYPE ptrdiff_t;
+#endif
+
+/*
+ * Maximum size of a filename path.
+ */
+#include <limits.h>
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#if defined(PATH_MAX)
+#define PMIX_PATH_MAX   (PATH_MAX + 1)
+#elif defined(_POSIX_PATH_MAX)
+#define PMIX_PATH_MAX   (_POSIX_PATH_MAX + 1)
+#else
+#define PMIX_PATH_MAX   256
+#endif
+
+#if defined(MAXHOSTNAMELEN)
+#define PMIX_MAXHOSTNAMELEN (MAXHOSTNAMELEN + 1)
+#elif defined(HOST_NAME_MAX)
+#define PMIX_MAXHOSTNAMELEN (HOST_NAME_MAX + 1)
+#else
+/* SUSv2 guarantees that "Host names are limited to 255 bytes". */
+#define PMIX_MAXHOSTNAMELEN (255 + 1)
+#endif
+
+/*
+ * Set the compile-time path-separator on this system and variable separator
+ */
+#define PMIX_PATH_SEP "/"
+#define PMIX_ENV_SEP  ':'
+
+/*
+ * printf functions for portability (only when building PMIx)
+ */
+#if !defined(HAVE_VASPRINTF) || !defined(HAVE_VSNPRINTF)
+#include <stdarg.h>
+#include <stdlib.h>
+#endif
+
+#if !defined(HAVE_ASPRINTF) || !defined(HAVE_SNPRINTF) || !defined(HAVE_VASPRINTF) || !defined(HAVE_VSNPRINTF)
+#include "util/printf.h"
+#endif
+
+#ifndef HAVE_ASPRINTF
+# define asprintf pmix_asprintf
+#endif
+
+#ifndef HAVE_SNPRINTF
+# define snprintf pmix_snprintf
+#endif
+
+#ifndef HAVE_VASPRINTF
+# define vasprintf pmix_vasprintf
+#endif
+
+#ifndef HAVE_VSNPRINTF
+# define vsnprintf pmix_vsnprintf
+#endif
+
+/*
+ * Some platforms (Solaris) have a broken qsort implementation.  Work
+ * around by using our own.
+ */
+#if PMIX_HAVE_BROKEN_QSORT
+#ifdef qsort
+#undef qsort
+#endif
+
+#include "util/qsort.h"
+#define qsort pmix_qsort
+#endif
+
+/*
+ * Define __func__-preprocessor directive if the compiler does not
+ * already define it.  Define it to __FILE__ so that we at least have
+ * a clue where the developer is trying to indicate where the error is
+ * coming from (assuming that __func__ is typically used for
+ * printf-style debugging).
+ */
+#if defined(HAVE_DECL___FUNC__) && !HAVE_DECL___FUNC__
+#define __func__ __FILE__
+#endif
+
+#define IOVBASE_TYPE  void
+
+#include <stdbool.h>
+/**
+ * If we generate our own bool type, we need a special way to cast the result
+ * in such a way to keep the compilers silent.
+ */
+#  define PMIX_INT_TO_BOOL(VALUE)  (bool)(VALUE)
+
+#if !defined(HAVE_STRUCT_SOCKADDR_STORAGE) && defined(HAVE_STRUCT_SOCKADDR_IN)
+#define sockaddr_storage sockaddr
+#define ss_family sa_family
+#endif
+
+/* Compatibility structure so that we don't have to have as many
+   #if checks in the code base */
+#if !defined(HAVE_STRUCT_SOCKADDR_IN6) && defined(HAVE_STRUCT_SOCKADDR_IN)
+#define sockaddr_in6 sockaddr_in
+#define sin6_len sin_len
+#define sin6_family sin_family
+#define sin6_port sin_port
+#define sin6_addr sin_addr
+#endif
+
+#if !HAVE_DECL_AF_UNSPEC
+#define AF_UNSPEC 0
+#endif
+#if !HAVE_DECL_PF_UNSPEC
+#define PF_UNSPEC 0
+#endif
+#if !HAVE_DECL_AF_INET6
+#define AF_INET6 AF_UNSPEC
+#endif
+#if !HAVE_DECL_PF_INET6
+#define PF_INET6 PF_UNSPEC
+#endif
+
+#if defined(__APPLE__) && defined(HAVE_INTTYPES_H)
+/* Prior to Mac OS X 10.3, the length modifier "ll" wasn't
+   supported, but "q" was for long long.  This isn't ANSI
+   C and causes a warning when using PRI?64 macros.  We
+   don't support versions prior to OS X 10.3, so we dont'
+   need such backward compatibility.  Instead, redefine
+   the macros to be "ll", which is ANSI C and doesn't
+   cause a compiler warning. */
+#include <inttypes.h>
+#if defined(__PRI_64_LENGTH_MODIFIER__)
+#undef __PRI_64_LENGTH_MODIFIER__
+#define __PRI_64_LENGTH_MODIFIER__ "ll"
+#endif
+#if defined(__SCN_64_LENGTH_MODIFIER__)
+#undef __SCN_64_LENGTH_MODIFIER__
+#define __SCN_64_LENGTH_MODIFIER__ "ll"
+#endif
+#endif
+
+#ifdef MCS_VXWORKS
+/* VXWorks puts some common functions in oddly named headers.  Rather
+   than update all the places the functions are used, which would be a
+   maintenance disatster, just update here... */
+#ifdef HAVE_IOLIB_H
+/* pipe(), ioctl() */
+#include <ioLib.h>
+#endif
+#ifdef HAVE_SOCKLIB_H
+/* socket() */
+#include <sockLib.h>
+#endif
+#ifdef HAVE_HOSTLIB_H
+/* gethostname() */
+#include <hostLib.h>
+#endif
+#endif
+
+/* If we're in C++, then just undefine restrict and then define it to
+   nothing.  "restrict" is not part of the C++ language, and we don't
+   have a corresponding AC_CXX_RESTRICT to figure out what the C++
+   compiler supports. */
+#if defined(c_plusplus) || defined(__cplusplus)
+#undef restrict
+#define restrict
+#endif
+
+#if (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95))
+# define __pmix_restrict __restrict
+#else
+# if __STDC_VERSION__ >= 199901L
+#  define __pmix_restrict restrict
+# else
+#  define __pmix_restrict
+# endif
+#endif
+
+#else
+
+/* For a similar reason to what is listed in pmix_config_top.h, we
+   want to protect others from the autoconf/automake-generated
+   PACKAGE_<foo> macros in pmix_config.h.  We can't put these undef's
+   directly in pmix_config.h because they'll be turned into #defines'
+   via autoconf.
+
+   So put them here in case any one else includes PMIX's
+   config.h files. */
+
+#undef PACKAGE_BUGREPORT
+#undef PACKAGE_NAME
+#undef PACKAGE_STRING
+#undef PACKAGE_TARNAME
+#undef PACKAGE_VERSION
+#undef PACKAGE_URL
+#undef HAVE_CONFIG_H
+
+#endif /* PMIX_BUILDING */
+#endif /* PMIX_CONFIG_BOTTOM_H */
diff --git a/src/include/pmix_config_top.h b/src/include/pmix_config_top.h
new file mode 100644
index 0000000..725a6c7
--- /dev/null
+++ b/src/include/pmix_config_top.h
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2011      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2013-2015 Intel, Inc. All rights reserved
+ * Copyright (c) 2016      IBM Corporation.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ *
+ * This file is included at the top of pmix_config.h, and is
+ * therefore a) before all the #define's that were output from
+ * configure, and b) included in most/all files in PMIx.
+ *
+ * Since this file is *only* ever included by pmix_config.h, and
+ * pmix_config.h already has #ifndef/#endif protection, there is no
+ * need to #ifndef/#endif protection here.
+ */
+
+#ifndef PMIX_CONFIG_H
+#error "pmix_config_top.h should only be included from config.h(.in)"
+#endif
+
+/* The only purpose of this file is to undef the PACKAGE_<foo> macros
+   that are put in by autoconf/automake projects.  Specifically, if
+   you include a .h file from another project that defines these
+   macros (e.g., gmp.h) and then include PMIX's config.h,
+   you'll get a preprocessor conflict.  So put these undef's here to
+   protect us from other package's PACKAGE_<foo> macros.
+
+   Note that we can't put them directly in pmix_config.h (e.g., via
+   AH_TOP) because they will be turned into #define's by autoconf. */
+
+#undef PACKAGE_BUGREPORT
+#undef PACKAGE_NAME
+#undef PACKAGE_STRING
+#undef PACKAGE_TARNAME
+#undef PACKAGE_VERSION
+#undef PACKAGE_URL
+#undef HAVE_CONFIG_H
diff --git a/src/include/pmix_globals.c b/src/include/pmix_globals.c
new file mode 100644
index 0000000..85882d3
--- /dev/null
+++ b/src/include/pmix_globals.c
@@ -0,0 +1,300 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2014-2017 Intel, Inc. All rights reserved.
+ * Copyright (c) 2014-2017 Research Organization for Information Science
+ * Copyright (c) 2014-2017 Intel, Inc.  All rights reserved.
+ *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2014-2015 Artem Y. Polyakov <artpol84 at gmail.com>.
+ *                         All rights reserved.
+ * Copyright (c) 2016      IBM Corporation.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+/* THIS FILE IS INCLUDED SOLELY TO INSTANTIATE AND INIT/FINALIZE THE GLOBAL CLASSES */
+
+#include <src/include/pmix_config.h>
+
+#include <src/include/types.h>
+#include <src/include/pmix_stdint.h>
+#include <src/include/pmix_socket_errno.h>
+
+#include "src/include/pmix_globals.h"
+
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+#include <fcntl.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#include <ctype.h>
+#include PMIX_EVENT_HEADER
+
+#include "src/buffer_ops/types.h"
+#include "src/class/pmix_hash_table.h"
+#include "src/class/pmix_list.h"
+#include "src/threads/threads.h"
+
+pmix_lock_t pmix_global_lock = {
+    .mutex = PMIX_MUTEX_STATIC_INIT,
+    .cond = PMIX_CONDITION_STATIC_INIT,
+    .active = false
+};
+
+static void cbcon(pmix_cb_t *p)
+{
+    PMIX_CONSTRUCT_LOCK(&p->lock);
+    p->checked = false;
+    PMIX_CONSTRUCT(&p->data, pmix_buffer_t);
+    p->cbfunc = NULL;
+    p->op_cbfunc = NULL;
+    p->value_cbfunc = NULL;
+    p->lookup_cbfunc = NULL;
+    p->spawn_cbfunc = NULL;
+    p->cbdata = NULL;
+    memset(p->nspace, 0, PMIX_MAX_NSLEN+1);
+    p->rank = -1;
+    p->key = NULL;
+    p->value = NULL;
+    p->procs = NULL;
+    p->info = NULL;
+    p->ninfo = 0;
+    p->nvals = 0;
+}
+static void cbdes(pmix_cb_t *p)
+{
+    PMIX_DESTRUCT_LOCK(&p->lock);
+    PMIX_DESTRUCT(&p->data);
+}
+PMIX_EXPORT PMIX_CLASS_INSTANCE(pmix_cb_t,
+                                pmix_list_item_t,
+                                cbcon, cbdes);
+
+static void pcon(pmix_peer_t *p)
+{
+    p->finalized = false;
+    p->info = NULL;
+    p->proc_cnt = 0;
+    p->server_object = NULL;
+    p->index = 0;
+    p->sd = -1;
+    p->send_ev_active = false;
+    p->recv_ev_active = false;
+    PMIX_CONSTRUCT(&p->send_queue, pmix_list_t);
+    p->send_msg = NULL;
+    p->recv_msg = NULL;
+    memset(&p->compat, 0, sizeof(p->compat));
+}
+static void pdes(pmix_peer_t *p)
+{
+    if (0 <= p->sd) {
+        CLOSE_THE_SOCKET(p->sd);
+    }
+    if (p->send_ev_active) {
+        pmix_event_del(&p->send_event);
+    }
+    if (p->recv_ev_active) {
+        pmix_event_del(&p->recv_event);
+    }
+
+    if (NULL != p->info) {
+        PMIX_RELEASE(p->info);
+    }
+
+    PMIX_LIST_DESTRUCT(&p->send_queue);
+    if (NULL != p->send_msg) {
+        PMIX_RELEASE(p->send_msg);
+    }
+    if (NULL != p->recv_msg) {
+        PMIX_RELEASE(p->recv_msg);
+    }
+}
+PMIX_EXPORT PMIX_CLASS_INSTANCE(pmix_peer_t,
+                                pmix_object_t,
+                                pcon, pdes);
+
+static void nscon(pmix_nspace_t *p)
+{
+    memset(p->nspace, 0, PMIX_MAX_NSLEN);
+    PMIX_CONSTRUCT(&p->nodes, pmix_list_t);
+    PMIX_CONSTRUCT(&p->internal, pmix_hash_table_t);
+    pmix_hash_table_init(&p->internal, 16);
+    PMIX_CONSTRUCT(&p->modex, pmix_hash_table_t);
+    pmix_hash_table_init(&p->modex, 256);
+    p->server = NULL;
+}
+static void nsdes(pmix_nspace_t *p)
+{
+    uint64_t key;
+    pmix_object_t *obj;
+
+    PMIX_LIST_DESTRUCT(&p->nodes);
+    PMIX_HASH_TABLE_FOREACH(key, uint64, obj, &p->internal) {
+        if (NULL != obj) {
+            PMIX_RELEASE(obj);
+        }
+    }
+    PMIX_DESTRUCT(&p->internal);
+    PMIX_HASH_TABLE_FOREACH(key, uint64, obj, &p->modex) {
+        if (NULL != obj) {
+            PMIX_RELEASE(obj);
+        }
+    }
+    PMIX_DESTRUCT(&p->modex);
+    if (NULL != p->server) {
+        PMIX_RELEASE(p->server);
+    }
+}
+PMIX_EXPORT PMIX_CLASS_INSTANCE(pmix_nspace_t,
+                                pmix_list_item_t,
+                                nscon, nsdes);
+
+static void ncon(pmix_nrec_t *p)
+{
+    p->name = NULL;
+    p->procs = NULL;
+}
+static void ndes(pmix_nrec_t *p)
+{
+    if (NULL != p->name) {
+        free(p->name);
+    }
+    if (NULL != p->procs) {
+        free(p->procs);
+    }
+}
+PMIX_EXPORT PMIX_CLASS_INSTANCE(pmix_nrec_t,
+                                pmix_list_item_t,
+                                ncon, ndes);
+
+static void sncon(pmix_server_nspace_t *p)
+{
+    p->nlocalprocs = 0;
+    p->all_registered = false;
+    PMIX_CONSTRUCT(&p->job_info, pmix_buffer_t);
+    PMIX_CONSTRUCT(&p->ranks, pmix_list_t);
+    PMIX_CONSTRUCT(&p->mylocal, pmix_hash_table_t);
+    pmix_hash_table_init(&p->mylocal, 16);
+    PMIX_CONSTRUCT(&p->myremote, pmix_hash_table_t);
+    pmix_hash_table_init(&p->myremote, 16);
+    PMIX_CONSTRUCT(&p->remote, pmix_hash_table_t);
+    pmix_hash_table_init(&p->remote, 256);
+}
+static void sndes(pmix_server_nspace_t *p)
+{
+    uint64_t key;
+    pmix_peer_t * peer;
+    PMIX_DESTRUCT(&p->job_info);
+    PMIX_LIST_DESTRUCT(&p->ranks);
+    PMIX_HASH_TABLE_FOREACH(key, uint64, peer, &p->mylocal) {
+        PMIX_RELEASE(peer);
+    }
+    PMIX_DESTRUCT(&p->mylocal);
+    PMIX_HASH_TABLE_FOREACH(key, uint64, peer, &p->myremote) {
+        PMIX_RELEASE(peer);
+    }
+    PMIX_DESTRUCT(&p->myremote);
+    PMIX_DESTRUCT(&p->remote);
+}
+PMIX_EXPORT PMIX_CLASS_INSTANCE(pmix_server_nspace_t,
+                                pmix_object_t,
+                                sncon, sndes);
+
+static void info_con(pmix_rank_info_t *info)
+{
+    info->gid = info->uid = 0;
+    info->nptr = NULL;
+    info->rank = PMIX_RANK_WILDCARD;
+    info->modex_recvd = false;
+    info->proc_cnt = 0;
+    info->server_object = NULL;
+}
+static void info_des(pmix_rank_info_t *info)
+{
+    if (NULL!= info->nptr) {
+        PMIX_RELEASE(info->nptr);
+    }
+}
+PMIX_EXPORT PMIX_CLASS_INSTANCE(pmix_rank_info_t,
+                                pmix_list_item_t,
+                                info_con, info_des);
+
+static void scon(pmix_shift_caddy_t *p)
+{
+    PMIX_CONSTRUCT_LOCK(&p->lock);
+    p->codes = NULL;
+    p->ncodes = 0;
+    p->nspace = NULL;
+    p->data = NULL;
+    p->ndata = 0;
+    p->info = NULL;
+    p->ninfo = 0;
+    p->directives = NULL;
+    p->ndirs = 0;
+    p->evhdlr = NULL;
+    p->kv = NULL;
+    p->vptr = NULL;
+    p->cd = NULL;
+    p->tracker = NULL;
+    p->enviro = false;
+    p->cbfunc.relfn = NULL;
+    p->cbdata = NULL;
+    p->ref = 0;
+}
+static void scdes(pmix_shift_caddy_t *p)
+{
+    PMIX_DESTRUCT_LOCK(&p->lock);
+    if (NULL != p->kv) {
+        PMIX_RELEASE(p->kv);
+    }
+}
+PMIX_EXPORT PMIX_CLASS_INSTANCE(pmix_shift_caddy_t,
+                                pmix_object_t,
+                                scon, scdes);
+
+PMIX_EXPORT PMIX_CLASS_INSTANCE(pmix_info_caddy_t,
+                                pmix_list_item_t,
+                                NULL, NULL);
+
+static void qcon(pmix_query_caddy_t *p)
+{
+    PMIX_CONSTRUCT_LOCK(&p->lock);
+    p->queries = NULL;
+    p->nqueries = 0;
+    p->targets = NULL;
+    p->ntargets = 0;
+    p->info = NULL;
+    p->ninfo = 0;
+    p->cbfunc = NULL;
+    p->cbdata = NULL;
+    p->relcbfunc = NULL;
+}
+static void qdes(pmix_query_caddy_t *p)
+{
+    PMIX_DESTRUCT_LOCK(&p->lock);
+}
+PMIX_EXPORT PMIX_CLASS_INSTANCE(pmix_query_caddy_t,
+                                pmix_object_t,
+                                qcon, qdes);
+
+static void jdcon(pmix_job_data_caddy_t *p)
+{
+    p->nsptr = NULL;
+    p->job_data = NULL;
+    p->dstore_fn = NULL;
+    p->hstore_fn = NULL;
+#if defined(PMIX_ENABLE_DSTORE) && (PMIX_ENABLE_DSTORE == 1)
+    p->bufs = NULL;
+#endif
+}
+
+PMIX_EXPORT PMIX_CLASS_INSTANCE(pmix_job_data_caddy_t,
+                                pmix_object_t,
+                                jdcon, NULL);
diff --git a/src/include/pmix_globals.h b/src/include/pmix_globals.h
new file mode 100644
index 0000000..5cf9886
--- /dev/null
+++ b/src/include/pmix_globals.h
@@ -0,0 +1,408 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2005 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2014-2017 Intel, Inc.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#ifndef PMIX_GLOBALS_H
+#define PMIX_GLOBALS_H
+
+#include <src/include/pmix_config.h>
+
+#include <src/include/types.h>
+
+#include <unistd.h>
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#include PMIX_EVENT_HEADER
+
+#include <pmix_common.h>
+
+#include "src/buffer_ops/types.h"
+#include "src/class/pmix_hash_table.h"
+#include "src/class/pmix_list.h"
+#include "src/class/pmix_ring_buffer.h"
+#include "src/event/pmix_event.h"
+#include "src/threads/threads.h"
+#include "src/mca/psec/psec.h"
+#include "src/mca/ptl/ptl.h"
+
+BEGIN_C_DECLS
+
+/* some limits */
+#define PMIX_MAX_CRED_SIZE      131072              // set max at 128kbytes
+#define PMIX_MAX_ERR_CONSTANT   INT_MIN
+
+
+/****   ENUM DEFINITIONS    ****/
+/* define a command type for communicating to the
+ * pmix server */
+#define PMIX_CMD PMIX_UINT32
+
+/* define some commands */
+typedef enum {
+    PMIX_REQ_CMD,
+    PMIX_ABORT_CMD,
+    PMIX_COMMIT_CMD,
+    PMIX_FENCENB_CMD,
+    PMIX_GETNB_CMD,
+    PMIX_FINALIZE_CMD,
+    PMIX_PUBLISHNB_CMD,
+    PMIX_LOOKUPNB_CMD,
+    PMIX_UNPUBLISHNB_CMD,
+    PMIX_SPAWNNB_CMD,
+    PMIX_CONNECTNB_CMD,
+    PMIX_DISCONNECTNB_CMD,
+    PMIX_NOTIFY_CMD,
+    PMIX_REGEVENTS_CMD,
+    PMIX_DEREGEVENTS_CMD,
+    PMIX_QUERY_CMD,
+    PMIX_LOG_CMD,
+    PMIX_ALLOC_CMD,
+    PMIX_JOB_CONTROL_CMD,
+    PMIX_MONITOR_CMD
+} pmix_cmd_t;
+
+/* provide a "pretty-print" function for cmds */
+const char* pmix_command_string(pmix_cmd_t cmd);
+
+/* define a set of flags to direct collection
+ * of data during operations */
+typedef enum {
+    PMIX_COLLECT_INVALID = -1,
+    PMIX_COLLECT_NO,
+    PMIX_COLLECT_YES,
+    PMIX_COLLECT_MAX
+} pmix_collect_t;
+
+/* define a process type */
+typedef enum {
+    PMIX_PROC_UNDEF,
+    PMIX_PROC_CLIENT,
+    PMIX_PROC_SERVER,
+    PMIX_PROC_TOOL
+} pmix_proc_type_t;
+
+/* defins some convenience macros for testing proc type */
+#define PMIX_PROC_IS_CLIENT     (PMIX_PROC_CLIENT == pmix_globals.proc_type)
+#define PMIX_PROC_IS_SERVER     (PMIX_PROC_SERVER == pmix_globals.proc_type)
+#define PMIX_PROC_IS_TOOL       (PMIX_PROC_TOOL == pmix_globals.proc_type)
+
+
+/* internally used object for transferring data
+ * to/from the server and for storing in the
+ * hash tables */
+typedef struct {
+    pmix_list_item_t super;
+    char *key;
+    pmix_value_t *value;
+} pmix_kval_t;
+PMIX_CLASS_DECLARATION(pmix_kval_t);
+
+// forward declaration
+struct pmix_peer_t;
+
+/****    PEER STRUCTURES    ****/
+/* objects for tracking active nspaces */
+typedef struct {
+    pmix_object_t super;
+    size_t nlocalprocs;
+    bool all_registered;         // all local ranks have been defined
+    pmix_buffer_t job_info;      // packed copy of the job-level info to be delivered to each proc
+    pmix_list_t ranks;           // list of pmix_rank_info_t for connection support of my clients
+    pmix_hash_table_t mylocal;   // hash_table for storing data PUT with local/global scope by my clients
+    pmix_hash_table_t myremote;  // hash_table for storing data PUT with remote/global scope by my clients
+    pmix_hash_table_t remote;    // hash_table for storing data PUT with remote/global scope recvd from remote clients via modex
+} pmix_server_nspace_t;
+PMIX_CLASS_DECLARATION(pmix_server_nspace_t);
+
+typedef struct {
+    pmix_list_item_t super;
+    char nspace[PMIX_MAX_NSLEN+1];
+    pmix_list_t nodes;               // list of pmix_nrec_t nodes that house procs in this nspace
+    pmix_hash_table_t internal;      // hash_table for storing job-level/internal data related to this nspace
+    pmix_hash_table_t modex;         // hash_table of received modex data
+    pmix_server_nspace_t *server;    // isolate these so the client doesn't instantiate them
+} pmix_nspace_t;
+PMIX_CLASS_DECLARATION(pmix_nspace_t);
+
+typedef struct pmix_rank_info_t {
+    pmix_list_item_t super;
+    pmix_nspace_t *nptr;
+    pmix_rank_t rank;
+    uid_t uid;
+    gid_t gid;
+    bool modex_recvd;
+    int proc_cnt;              // #clones of this rank we know about
+    void *server_object;       // pointer to rank-specific object provided by server
+} pmix_rank_info_t;
+PMIX_CLASS_DECLARATION(pmix_rank_info_t);
+
+/* define a structure for holding personality pointers
+ * to plugins for cross-version support */
+typedef struct pmix_personality_t {
+    pmix_psec_module_t *psec;
+    pmix_ptl_module_t *ptl;
+} pmix_personality_t;
+
+/* object for tracking peers - each peer can have multiple
+ * connections. This can occur if the initial app executes
+ * a fork/exec, and the child initiates its own connection
+ * back to the PMIx server. Thus, the trackers should be "indexed"
+ * by the socket, not the process nspace/rank */
+typedef struct pmix_peer_t {
+    pmix_object_t super;
+    bool finalized;
+    pmix_rank_info_t *info;
+    int proc_cnt;
+    void *server_object;
+    int index;
+    int sd;
+    pmix_event_t send_event;        /**< registration with event thread for send events */
+    bool send_ev_active;
+    pmix_event_t recv_event;        /**< registration with event thread for recv events */
+    bool recv_ev_active;
+    pmix_list_t send_queue;         /**< list of messages to send */
+    pmix_ptl_send_t *send_msg;      /**< current send in progress */
+    pmix_ptl_recv_t *recv_msg;      /**< current recv in progress */
+    pmix_personality_t compat;
+} pmix_peer_t;
+PMIX_CLASS_DECLARATION(pmix_peer_t);
+
+
+typedef struct {
+    pmix_list_item_t super;
+    char *name;              // name of the node
+    char *procs;             // comma-separated list of proc ranks on that node
+} pmix_nrec_t;
+PMIX_CLASS_DECLARATION(pmix_nrec_t);
+
+/* define an object for moving a send
+ * request into the server's event base */
+typedef struct {
+    pmix_object_t super;
+    int sd;
+} pmix_snd_caddy_t;
+PMIX_CLASS_DECLARATION(pmix_snd_caddy_t);
+
+/* define an object for moving a send
+ * request into the server's event base */
+typedef struct {
+    pmix_list_item_t super;
+    pmix_ptl_hdr_t hdr;
+    pmix_peer_t *peer;
+    pmix_snd_caddy_t snd;
+} pmix_server_caddy_t;
+PMIX_CLASS_DECLARATION(pmix_server_caddy_t);
+
+/* caddy for query requests */
+typedef struct {
+    pmix_object_t super;
+    pmix_event_t ev;
+    pmix_lock_t lock;
+    pmix_status_t status;
+    pmix_query_t *queries;
+    size_t nqueries;
+    pmix_proc_t *targets;
+    size_t ntargets;
+    pmix_info_t *info;
+    size_t ninfo;
+    pmix_info_cbfunc_t cbfunc;
+    pmix_release_cbfunc_t relcbfunc;
+    void *cbdata;
+} pmix_query_caddy_t;
+PMIX_CLASS_DECLARATION(pmix_query_caddy_t);
+
+/* define a tracker for collective operations */
+typedef struct {
+    pmix_list_item_t super;
+    pmix_cmd_t type;
+    pmix_proc_t *pcs;               // copy of the original array of participants
+    size_t   npcs;                  // number of procs in the array
+    pmix_lock_t lock;               // flag for waiting for completion
+    bool def_complete;              // all local procs have been registered and the trk definition is complete
+    pmix_list_t ranks;              // list of pmix_rank_info_t of the local participants
+    pmix_list_t local_cbs;          // list of pmix_server_caddy_t for sending result to the local participants
+    uint32_t nlocal;                // number of local participants
+    uint32_t local_cnt;             // number of local participants who have contributed
+    pmix_info_t *info;              // array of info structs
+    size_t ninfo;                   // number of info structs in array
+    pmix_collect_t collect_type;    // whether or not data is to be returned at completion
+    pmix_modex_cbfunc_t modexcbfunc;
+    pmix_op_cbfunc_t op_cbfunc;
+} pmix_server_trkr_t;
+PMIX_CLASS_DECLARATION(pmix_server_trkr_t);
+
+typedef int (*pmix_store_dstor_cbfunc_t)(const char *nsname,
+                                         pmix_rank_t rank, pmix_kval_t *kv);
+typedef int (*pmix_store_hash_cbfunc_t)(pmix_hash_table_t *table,
+                                         pmix_rank_t rank, pmix_kval_t *kv);
+
+typedef struct {
+    pmix_object_t super;
+    pmix_nspace_t *nsptr;
+    pmix_buffer_t *job_data;
+    pmix_store_dstor_cbfunc_t dstore_fn;
+    pmix_store_hash_cbfunc_t hstore_fn;
+#if defined(PMIX_ENABLE_DSTORE) && (PMIX_ENABLE_DSTORE == 1)
+    /* array of buffers per rank */
+    pmix_value_array_t *bufs;
+#endif
+} pmix_job_data_caddy_t;
+PMIX_CLASS_DECLARATION(pmix_job_data_caddy_t);
+
+/****    THREAD-RELATED    ****/
+ /* define a caddy for thread-shifting operations */
+ typedef struct {
+    pmix_object_t super;
+    pmix_event_t ev;
+    pmix_lock_t lock;
+    pmix_status_t status;
+    pmix_status_t *codes;
+    size_t ncodes;
+    const char *nspace;
+    pmix_rank_t rank;
+    const char *data;
+    size_t ndata;
+    const char *key;
+    pmix_info_t *info;
+    size_t ninfo;
+    pmix_info_t *directives;
+    size_t ndirs;
+    pmix_notification_fn_t evhdlr;
+    pmix_kval_t *kv;
+    pmix_value_t *vptr;
+    pmix_server_caddy_t *cd;
+    pmix_server_trkr_t *tracker;
+    bool enviro;
+    union {
+       pmix_release_cbfunc_t relfn;
+       pmix_evhdlr_reg_cbfunc_t evregcbfn;
+       pmix_op_cbfunc_t opcbfn;
+       pmix_evhdlr_reg_cbfunc_t errregcbfn;
+    }cbfunc;
+    void *cbdata;
+    size_t ref;
+ } pmix_shift_caddy_t;
+PMIX_CLASS_DECLARATION(pmix_shift_caddy_t);
+
+/* struct for tracking ops */
+typedef struct {
+    pmix_list_item_t super;
+    pmix_event_t ev;
+    pmix_lock_t lock;
+    bool checked;
+    int status;
+    pmix_status_t pstatus;
+    pmix_scope_t scope;
+    pmix_buffer_t data;
+    pmix_ptl_cbfunc_t cbfunc;
+    pmix_op_cbfunc_t op_cbfunc;
+    pmix_value_cbfunc_t value_cbfunc;
+    pmix_lookup_cbfunc_t lookup_cbfunc;
+    pmix_spawn_cbfunc_t spawn_cbfunc;
+    pmix_evhdlr_reg_cbfunc_t errreg_cbfunc;
+    size_t errhandler_ref;
+    void *cbdata;
+    char nspace[PMIX_MAX_NSLEN+1];
+    pmix_rank_t rank;
+    char *key;
+    pmix_value_t *value;
+    pmix_proc_t *procs;
+    pmix_info_t *info;
+    size_t ninfo;
+    size_t nvals;
+} pmix_cb_t;
+PMIX_CLASS_DECLARATION(pmix_cb_t);
+
+/* define a very simple caddy for dealing with pmix_info_t
+ * objects when transferring portions of arrays */
+typedef struct {
+    pmix_list_item_t super;
+    pmix_info_t *info;
+} pmix_info_caddy_t;
+PMIX_CLASS_DECLARATION(pmix_info_caddy_t);
+
+#define PMIX_THREADSHIFT(r, c)                              \
+ do {                                                       \
+    pmix_event_assign(&((r)->ev), pmix_globals.evbase,      \
+                      -1, EV_WRITE, (c), (r));              \
+    PMIX_POST_OBJECT((r));                                  \
+    pmix_event_active(&((r)->ev), EV_WRITE, 1);             \
+} while (0)
+
+
+#define PMIX_WAIT_FOR_COMPLETION(a)             \
+    do {                                        \
+        while ((a)) {                           \
+            usleep(10);                         \
+        }                                       \
+        PMIX_ACQUIRE_OBJECT((a));               \
+    } while (0)
+
+typedef struct {
+    pmix_object_t super;
+    pmix_event_t ev;
+    pmix_lock_t lock;
+    pmix_status_t status;
+    pmix_proc_t source;
+    pmix_data_range_t range;
+    pmix_proc_t *targets;
+    size_t ntargets;
+    bool nondefault;
+    pmix_info_t *info;
+    size_t ninfo;
+    pmix_buffer_t *buf;
+    pmix_op_cbfunc_t cbfunc;
+    void *cbdata;
+} pmix_notify_caddy_t;
+PMIX_CLASS_DECLARATION(pmix_notify_caddy_t);
+
+
+/****    GLOBAL STORAGE    ****/
+/* define a global construct that includes values that must be shared
+ * between various parts of the code library. Both the client
+ * and server libraries must instance this structure */
+typedef struct {
+    int init_cntr;                      // #times someone called Init - #times called Finalize
+    pmix_proc_t myid;
+    pmix_peer_t *mypeer;                // my own peer object
+    pmix_proc_type_t proc_type;
+    uid_t uid;                          // my effective uid
+    gid_t gid;                          // my effective gid
+    int pindex;
+    pmix_event_base_t *evbase;
+    bool external_evbase;
+    int debug_output;
+    pmix_events_t events;               // my event handler registrations.
+    bool connected;
+    pmix_list_t nspaces;                // list of pmix_nspace_t for the nspaces we know about
+    pmix_buffer_t *cache_local;         // data PUT by me to local scope
+    pmix_buffer_t *cache_remote;        // data PUT by me to remote scope
+    struct timeval event_window;
+    pmix_list_t cached_events;          // events waiting in the window prior to processing
+    pmix_ring_buffer_t notifications;   // ring buffer of pending notifications
+} pmix_globals_t;
+
+
+PMIX_EXPORT extern pmix_globals_t pmix_globals;
+PMIX_EXPORT extern pmix_lock_t pmix_global_lock;
+
+END_C_DECLS
+
+#endif /* PMIX_GLOBALS_H */
diff --git a/src/include/pmix_jobdata.h b/src/include/pmix_jobdata.h
new file mode 100644
index 0000000..f8a61a6
--- /dev/null
+++ b/src/include/pmix_jobdata.h
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2016      Mellanox Technologies, Inc.
+ *                         All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#ifndef PMIX_JOBDATA_H
+#define PMIX_JOBDATA_H
+
+#include <src/include/pmix_config.h>
+
+#include "src/buffer_ops/buffer_ops.h"
+#include "src/class/pmix_hash_table.h"
+
+#if defined(PMIX_ENABLE_DSTORE) && (PMIX_ENABLE_DSTORE == 1)
+pmix_status_t pmix_job_data_dstore_store(const char *nspace, pmix_buffer_t *bptr);
+#endif
+pmix_status_t pmix_job_data_htable_store(const char *nspace, pmix_buffer_t *bptr);
+
+#endif // PMIX_JOBDATA_H
diff --git a/src/include/pmix_socket_errno.h b/src/include/pmix_socket_errno.h
new file mode 100644
index 0000000..2b7ecb5
--- /dev/null
+++ b/src/include/pmix_socket_errno.h
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2005 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2015      Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+#ifndef PMIX_GET_SOCKET_ERROR_H
+#define PMIX_GET_SOCKET_ERROR_H
+
+#include <errno.h>
+
+#define pmix_socket_errno errno
+
+#endif /* PMIX_GET_ERROR_H */
diff --git a/src/include/pmix_stdint.h b/src/include/pmix_stdint.h
new file mode 100644
index 0000000..28c3099
--- /dev/null
+++ b/src/include/pmix_stdint.h
@@ -0,0 +1,127 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2005 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2015      Los Alamos National Security, LLC. All rights
+ *                         reserved.
+ * Copyright (c) 2016      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2017      Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ *
+ * This file includes the C99 stdint.h file if available, and otherwise
+ * defines fixed-width types according to the SIZEOF information
+ * gathered by configure.
+ */
+
+#ifndef PMIX_STDINT_H
+#define PMIX_STDINT_H 1
+
+/*
+ * Include what we can and define what is missing.
+ */
+#include <limits.h>
+#include <stdint.h>
+
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
+/* 128-bit */
+
+#ifdef HAVE_INT128_T
+
+typedef int128_t pmix_int128_t;
+typedef uint128_t pmix_uint128_t;
+
+#define HAVE_PMIX_INT128_T 1
+
+#elif defined(HAVE___INT128)
+
+/* suppress warning about __int128 type */
+#pragma GCC diagnostic push
+/* Clang won't quietly accept "-pedantic", but GCC versions older than ~4.8
+ * won't quietly accept "-Wpedanic".  The whole "#pragma GCC diagnostic ..."
+ * facility only was added to GCC as of version 4.6. */
+#if defined(__clang__) || (defined(__GNUC__) && __GNUC__ >= 6)
+#pragma GCC diagnostic ignored "-Wpedantic"
+#else
+#pragma GCC diagnostic ignored "-pedantic"
+#endif
+typedef __int128 pmix_int128_t;
+typedef unsigned __int128 pmix_uint128_t;
+#pragma GCC diagnostic pop
+
+#define HAVE_PMIX_INT128_T 1
+
+#else
+
+#define HAVE_PMIX_INT128_T 0
+
+#endif
+
+/* Pointers */
+
+#if SIZEOF_VOID_P == SIZEOF_INT
+
+#ifndef HAVE_INTPTR_T
+typedef signed int intptr_t;
+#endif
+
+#ifndef HAVE_UINTPTR_T
+typedef unsigned int uintptr_t;
+#endif
+
+#elif SIZEOF_VOID_P == SIZEOF_LONG
+
+#ifndef HAVE_INTPTR_T
+typedef signed long intptr_t;
+#endif
+
+#ifndef HAVE_UINTPTR_T
+typedef unsigned long uintptr_t;
+#endif
+
+#elif HAVE_LONG_LONG && SIZEOF_VOID_P == SIZEOF_LONG_LONG
+
+#ifndef HAVE_INTPTR_T
+typedef signed long long intptr_t;
+#endif
+#ifndef HAVE_UINTPTR_T
+typedef unsigned long long uintptr_t;
+#endif
+
+#else
+
+#error Failed to define pointer-sized integer types
+
+#endif
+
+/* inttypes.h printf specifiers */
+# include <inttypes.h>
+
+#ifndef PRIsize_t
+# if defined(ACCEPT_C99)
+#   define PRIsize_t "zu"
+# elif SIZEOF_SIZE_T == SIZEOF_LONG
+#   define PRIsize_t "lu"
+# elif SIZEOF_SIZE_T == SIZEOF_LONG_LONG
+#   define PRIsize_t "llu"
+# else
+#   define PRIsize_t "u"
+# endif
+#endif
+
+#endif /* PMIX_STDINT_H */
diff --git a/src/include/prefetch.h b/src/include/prefetch.h
new file mode 100644
index 0000000..09e5810
--- /dev/null
+++ b/src/include/prefetch.h
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2004-2006 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2014-2017 Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+/** @file
+ *
+ * Compiler-specific prefetch functions
+ *
+ * A small set of prefetch / prediction interfaces for using compiler
+ * directives to improve memory prefetching and branch prediction
+ */
+
+#ifndef PMIX_PREFETCH_H
+#define PMIX_PREFETCH_H
+
+#include <src/include/pmix_config.h>
+
+#if PMIX_C_HAVE_BUILTIN_EXPECT
+#define PMIX_LIKELY(expression) __builtin_expect(!!(expression), 1)
+#define PMIX_UNLIKELY(expression) __builtin_expect(!!(expression), 0)
+#else
+#define PMIX_LIKELY(expression) (expression)
+#define PMIX_UNLIKELY(expression) (expression)
+#endif
+
+#if PMIX_C_HAVE_BUILTIN_PREFETCH
+#define PMIX_PREFETCH(address,rw,locality) __builtin_prefetch(address,rw,locality)
+#else
+#define PMIX_PREFETCH(address,rw,locality)
+#endif
+
+#endif
diff --git a/src/include/types.h b/src/include/types.h
new file mode 100644
index 0000000..7c073cc
--- /dev/null
+++ b/src/include/types.h
@@ -0,0 +1,268 @@
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2005 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2014-2017 Intel, Inc. All rights reserved.
+ * Copyright (c) 2015      Mellanox Technologies, Inc.
+ *                         All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#ifndef PMIX_TYPES_H
+#define PMIX_TYPES_H
+
+#include <src/include/pmix_config.h>
+
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_SYS_SELECT_H
+#include <sys/select.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif
+#include PMIX_EVENT_HEADER
+
+#if PMIX_ENABLE_DEBUG
+#include "src/util/output.h"
+#endif
+
+
+/*
+ * portable assignment of pointer to int
+ */
+
+typedef union {
+   uint64_t lval;
+   uint32_t ival;
+   void*    pval;
+   struct {
+       uint32_t uval;
+       uint32_t lval;
+   } sval;
+} pmix_ptr_t;
+
+/*
+ * handle differences in iovec
+ */
+
+#if defined(__APPLE__) || defined(__WINDOWS__)
+typedef char* pmix_iov_base_ptr_t;
+#define PMIX_IOVBASE char
+#else
+#define PMIX_IOVBASE void
+typedef void* pmix_iov_base_ptr_t;
+#endif
+
+/*
+ * handle differences in socklen_t
+ */
+
+#if defined(HAVE_SOCKLEN_T)
+typedef socklen_t pmix_socklen_t;
+#else
+typedef int pmix_socklen_t;
+#endif
+
+
+#define pmix_htons htons
+#define pmix_ntohs ntohs
+
+
+/*
+ * Convert a 64 bit value to network byte order.
+ */
+static inline uint64_t pmix_hton64(uint64_t val) __pmix_attribute_const__;
+static inline uint64_t pmix_hton64(uint64_t val)
+{
+#ifdef HAVE_UNIX_BYTESWAP
+    union { uint64_t ll;
+            uint32_t l[2];
+    } w, r;
+
+    /* platform already in network byte order? */
+    if(htonl(1) == 1L)
+        return val;
+    w.ll = val;
+    r.l[0] = htonl(w.l[1]);
+    r.l[1] = htonl(w.l[0]);
+    return r.ll;
+#else
+    return val;
+#endif
+}
+
+/*
+ * Convert a 64 bit value from network to host byte order.
+ */
+
+static inline uint64_t pmix_ntoh64(uint64_t val) __pmix_attribute_const__;
+static inline uint64_t pmix_ntoh64(uint64_t val)
+{
+#ifdef HAVE_UNIX_BYTESWAP
+    union { uint64_t ll;
+            uint32_t l[2];
+    } w, r;
+
+    /* platform already in network byte order? */
+    if(htonl(1) == 1L)
+        return val;
+    w.ll = val;
+    r.l[0] = ntohl(w.l[1]);
+    r.l[1] = ntohl(w.l[0]);
+    return r.ll;
+#else
+    return val;
+#endif
+}
+
+
+/**
+ * Convert between a local representation of pointer and a 64 bits value.
+ */
+static inline uint64_t pmix_ptr_ptol( void* ptr ) __pmix_attribute_const__;
+static inline uint64_t pmix_ptr_ptol( void* ptr )
+{
+    return (uint64_t)(uintptr_t) ptr;
+}
+
+static inline void* pmix_ptr_ltop( uint64_t value ) __pmix_attribute_const__;
+static inline void* pmix_ptr_ltop( uint64_t value )
+{
+#if SIZEOF_VOID_P == 4 && PMIX_ENABLE_DEBUG
+    if (value > ((1ULL << 32) - 1ULL)) {
+        pmix_output(0, "Warning: truncating value in pmix_ptr_ltop");
+    }
+#endif
+    return (void*)(uintptr_t) value;
+}
+
+#if defined(WORDS_BIGENDIAN) || !defined(HAVE_UNIX_BYTESWAP)
+static inline uint16_t pmix_swap_bytes2(uint16_t val) __pmix_attribute_const__;
+static inline uint16_t pmix_swap_bytes2(uint16_t val)
+{
+    union { uint16_t bigval;
+            uint8_t  arrayval[2];
+    } w, r;
+
+    w.bigval = val;
+    r.arrayval[0] = w.arrayval[1];
+    r.arrayval[1] = w.arrayval[0];
+
+    return r.bigval;
+}
+
+static inline uint32_t pmix_swap_bytes4(uint32_t val) __pmix_attribute_const__;
+static inline uint32_t pmix_swap_bytes4(uint32_t val)
+{
+    union { uint32_t bigval;
+            uint8_t  arrayval[4];
+    } w, r;
+
+    w.bigval = val;
+    r.arrayval[0] = w.arrayval[3];
+    r.arrayval[1] = w.arrayval[2];
+    r.arrayval[2] = w.arrayval[1];
+    r.arrayval[3] = w.arrayval[0];
+
+    return r.bigval;
+}
+
+static inline uint64_t pmix_swap_bytes8(uint64_t val) __pmix_attribute_const__;
+static inline uint64_t pmix_swap_bytes8(uint64_t val)
+{
+    union { uint64_t bigval;
+            uint8_t  arrayval[8];
+    } w, r;
+
+    w.bigval = val;
+    r.arrayval[0] = w.arrayval[7];
+    r.arrayval[1] = w.arrayval[6];
+    r.arrayval[2] = w.arrayval[5];
+    r.arrayval[3] = w.arrayval[4];
+    r.arrayval[4] = w.arrayval[3];
+    r.arrayval[5] = w.arrayval[2];
+    r.arrayval[6] = w.arrayval[1];
+    r.arrayval[7] = w.arrayval[0];
+
+    return r.bigval;
+}
+
+#else
+#define pmix_swap_bytes2 htons
+#define pmix_swap_bytes4 htonl
+#define pmix_swap_bytes8 hton64
+#endif /* WORDS_BIGENDIAN || !HAVE_UNIX_BYTESWAP */
+
+#define PMIX_EV_TIMEOUT EV_TIMEOUT
+#define PMIX_EV_READ    EV_READ
+#define PMIX_EV_WRITE   EV_WRITE
+#define PMIX_EV_SIGNAL  EV_SIGNAL
+/* Persistent event: won't get removed automatically when activated. */
+#define PMIX_EV_PERSIST EV_PERSIST
+
+#define PMIX_EVLOOP_ONCE     EVLOOP_ONCE        /**< Block at most once. */
+#define PMIX_EVLOOP_NONBLOCK EVLOOP_NONBLOCK    /**< Do not block. */
+
+typedef struct event_base pmix_event_base_t;
+typedef struct event pmix_event_t;
+
+#define pmix_event_base_create() event_base_new()
+
+#define pmix_event_base_free(b) event_base_free(b)
+
+#define pmix_event_base_loopbreak(b) event_base_loopbreak(b)
+
+#define pmix_event_base_loopexit(b) event_base_loopexit(b, NULL)
+
+/* thread support APIs */
+#define pmix_event_use_threads() evthread_use_pthreads()
+
+/* Basic event APIs */
+#define pmix_event_enable_debug_mode() event_enable_debug_mode()
+
+#define pmix_event_assign(x, b, fd, fg, cb, arg) event_assign((x), (b), (fd), (fg), (event_callback_fn) (cb), (arg))
+
+#define pmix_event_add(ev, tv) event_add((ev), (tv))
+
+#define pmix_event_del(ev) event_del((ev))
+
+#define pmix_event_active(x, y, z) event_active((x), (y), (z))
+
+#define pmix_event_new(b, fd, fg, cb, arg) event_new((b), (fd), (fg), (event_callback_fn) (cb), (arg))
+
+#define pmix_event_loop(b, fg) event_base_loop((b), (fg))
+
+#define pmix_event_active(x, y, z) event_active((x), (y), (z))
+
+#define pmix_event_evtimer_new(b, cb, arg) pmix_event_new((b), -1, 0, (cb), (arg))
+
+#define pmix_event_evtimer_add(x, tv) pmix_event_add((x), (tv))
+
+#define pmix_event_evtimer_set(b, x, cb, arg) event_assign((x), (b), -1, 0, (event_callback_fn) (cb), (arg))
+
+#define pmix_event_evtimer_del(x) pmix_event_del((x))
+
+
+#endif /* PMIX_TYPES_H */
diff --git a/src/mca/Makefile.include b/src/mca/Makefile.include
new file mode 100644
index 0000000..67f92a9
--- /dev/null
+++ b/src/mca/Makefile.include
@@ -0,0 +1,26 @@
+# -*- makefile -*-
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2016      Intel, Inc. All rights reserved.
+# Copyright (c) 2016 Cisco Systems, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# This makefile.am does not stand on its own - it is included from src/Makefile.am
+
+# Source code files
+headers += \
+	mca/mca.h
diff --git a/src/mca/base/Makefile.am b/src/mca/base/Makefile.am
new file mode 100644
index 0000000..948d687
--- /dev/null
+++ b/src/mca/base/Makefile.am
@@ -0,0 +1,66 @@
+#
+# Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2010-2016 Cisco Systems, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# Need this so that the base knows where to load dynamic components from
+# (by default)
+
+AM_CPPFLAGS = \
+    $(LTDLINCL)
+
+noinst_LTLIBRARIES = libpmix_mca_base.la
+
+dist_pmixdata_DATA = help-mca-base.txt help-mca-var.txt
+
+# Source code files
+
+headers = \
+        base.h \
+        pmix_mca_base_component_repository.h \
+        pmix_mca_base_var.h \
+        pmix_mca_base_var_enum.h \
+        pmix_mca_base_var_group.h \
+        pmix_mca_base_vari.h \
+        pmix_mca_base_framework.h
+
+# Library
+
+libpmix_mca_base_la_SOURCES = \
+        $(headers) \
+        pmix_mca_base_close.c \
+        pmix_mca_base_component_compare.c \
+        pmix_mca_base_component_find.c \
+        pmix_mca_base_component_repository.c \
+        pmix_mca_base_components_open.c \
+        pmix_mca_base_components_close.c \
+        pmix_mca_base_components_select.c \
+        pmix_mca_base_list.c \
+        pmix_mca_base_open.c \
+        pmix_mca_base_var.c \
+        pmix_mca_base_var_enum.c \
+        pmix_mca_base_var_group.c \
+        pmix_mca_base_parse_paramfile.c \
+        pmix_mca_base_components_register.c \
+        pmix_mca_base_framework.c
+
+# Conditionally install the header files
+
+if WANT_INSTALL_HEADERS
+pmixdir = $(pmixincludedir)/$(subdir)
+pmix_HEADERS = $(headers)
+endif
diff --git a/src/mca/base/Makefile.in b/src/mca/base/Makefile.in
new file mode 100644
index 0000000..962bcb3
--- /dev/null
+++ b/src/mca/base/Makefile.in
@@ -0,0 +1,920 @@
+# Makefile.in generated by automake 1.15 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+#
+# Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2010-2016 Cisco Systems, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# Need this so that the base knows where to load dynamic components from
+# (by default)
+
+
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+subdir = src/mca/base
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/config/c_get_alignment.m4 \
+	$(top_srcdir)/config/libtool.m4 \
+	$(top_srcdir)/config/ltoptions.m4 \
+	$(top_srcdir)/config/ltsugar.m4 \
+	$(top_srcdir)/config/ltversion.m4 \
+	$(top_srcdir)/config/lt~obsolete.m4 \
+	$(top_srcdir)/config/pmix.m4 \
+	$(top_srcdir)/config/pmix_check_attributes.m4 \
+	$(top_srcdir)/config/pmix_check_broken_qsort.m4 \
+	$(top_srcdir)/config/pmix_check_compiler_version.m4 \
+	$(top_srcdir)/config/pmix_check_icc.m4 \
+	$(top_srcdir)/config/pmix_check_ident.m4 \
+	$(top_srcdir)/config/pmix_check_lock.m4 \
+	$(top_srcdir)/config/pmix_check_os_flavors.m4 \
+	$(top_srcdir)/config/pmix_check_package.m4 \
+	$(top_srcdir)/config/pmix_check_psm2.m4 \
+	$(top_srcdir)/config/pmix_check_pthread_pids.m4 \
+	$(top_srcdir)/config/pmix_check_vendor.m4 \
+	$(top_srcdir)/config/pmix_check_visibility.m4 \
+	$(top_srcdir)/config/pmix_check_withdir.m4 \
+	$(top_srcdir)/config/pmix_config_asm.m4 \
+	$(top_srcdir)/config/pmix_config_pthreads.m4 \
+	$(top_srcdir)/config/pmix_config_subdir.m4 \
+	$(top_srcdir)/config/pmix_config_subdir_args.m4 \
+	$(top_srcdir)/config/pmix_config_threads.m4 \
+	$(top_srcdir)/config/pmix_ensure_contains_optflags.m4 \
+	$(top_srcdir)/config/pmix_functions.m4 \
+	$(top_srcdir)/config/pmix_load_platform.m4 \
+	$(top_srcdir)/config/pmix_mca.m4 \
+	$(top_srcdir)/config/pmix_search_libs.m4 \
+	$(top_srcdir)/config/pmix_setup_cc.m4 \
+	$(top_srcdir)/config/pmix_setup_libevent.m4 \
+	$(top_srcdir)/config/pmix_setup_zlib.m4 \
+	$(top_srcdir)/config/pmix_try_assemble.m4 \
+	$(top_srcdir)/config/autogen_found_items.m4 \
+	$(top_srcdir)/src/mca/pdl/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/configure.m4 \
+	$(top_srcdir)/src/mca/pdl/pdlopen/configure.m4 \
+	$(top_srcdir)/src/mca/pdl/plibltdl/configure.m4 \
+	$(top_srcdir)/src/mca/pif/bsdx_ipv4/configure.m4 \
+	$(top_srcdir)/src/mca/pif/bsdx_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pif/linux_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pif/posix_ipv4/configure.m4 \
+	$(top_srcdir)/src/mca/pif/solaris_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/config/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/env/configure.m4 \
+	$(top_srcdir)/src/mca/pnet/opa/configure.m4 \
+	$(top_srcdir)/src/mca/psec/munge/configure.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(dist_pmixdata_DATA) \
+	$(am__pmix_HEADERS_DIST) $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/src/include/pmix_config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+libpmix_mca_base_la_LIBADD =
+am__objects_1 =
+am_libpmix_mca_base_la_OBJECTS = $(am__objects_1) \
+	pmix_mca_base_close.lo pmix_mca_base_component_compare.lo \
+	pmix_mca_base_component_find.lo \
+	pmix_mca_base_component_repository.lo \
+	pmix_mca_base_components_open.lo \
+	pmix_mca_base_components_close.lo \
+	pmix_mca_base_components_select.lo pmix_mca_base_list.lo \
+	pmix_mca_base_open.lo pmix_mca_base_var.lo \
+	pmix_mca_base_var_enum.lo pmix_mca_base_var_group.lo \
+	pmix_mca_base_parse_paramfile.lo \
+	pmix_mca_base_components_register.lo \
+	pmix_mca_base_framework.lo
+libpmix_mca_base_la_OBJECTS = $(am_libpmix_mca_base_la_OBJECTS)
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/src/include
+depcomp = $(SHELL) $(top_srcdir)/./config/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libpmix_mca_base_la_SOURCES)
+DIST_SOURCES = $(libpmix_mca_base_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(pmixdatadir)" "$(DESTDIR)$(pmixdir)"
+DATA = $(dist_pmixdata_DATA)
+am__pmix_HEADERS_DIST = base.h pmix_mca_base_component_repository.h \
+	pmix_mca_base_var.h pmix_mca_base_var_enum.h \
+	pmix_mca_base_var_group.h pmix_mca_base_vari.h \
+	pmix_mca_base_framework.h
+HEADERS = $(pmix_HEADERS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/./config/depcomp
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CFLAGS = @CFLAGS@
+CLEANFILES = @CLEANFILES@
+CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MCA_PROJECT_SUBDIRS = @MCA_PROJECT_SUBDIRS@
+MCA_pmix_FRAMEWORKS = @MCA_pmix_FRAMEWORKS@
+MCA_pmix_FRAMEWORKS_SUBDIRS = @MCA_pmix_FRAMEWORKS_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS@
+MCA_pmix_FRAMEWORK_LIBS = @MCA_pmix_FRAMEWORK_LIBS@
+MCA_pmix_pdl_ALL_COMPONENTS = @MCA_pmix_pdl_ALL_COMPONENTS@
+MCA_pmix_pdl_ALL_SUBDIRS = @MCA_pmix_pdl_ALL_SUBDIRS@
+MCA_pmix_pdl_DSO_COMPONENTS = @MCA_pmix_pdl_DSO_COMPONENTS@
+MCA_pmix_pdl_DSO_SUBDIRS = @MCA_pmix_pdl_DSO_SUBDIRS@
+MCA_pmix_pdl_STATIC_COMPONENTS = @MCA_pmix_pdl_STATIC_COMPONENTS@
+MCA_pmix_pdl_STATIC_LTLIBS = @MCA_pmix_pdl_STATIC_LTLIBS@
+MCA_pmix_pdl_STATIC_SUBDIRS = @MCA_pmix_pdl_STATIC_SUBDIRS@
+MCA_pmix_pif_ALL_COMPONENTS = @MCA_pmix_pif_ALL_COMPONENTS@
+MCA_pmix_pif_ALL_SUBDIRS = @MCA_pmix_pif_ALL_SUBDIRS@
+MCA_pmix_pif_DSO_COMPONENTS = @MCA_pmix_pif_DSO_COMPONENTS@
+MCA_pmix_pif_DSO_SUBDIRS = @MCA_pmix_pif_DSO_SUBDIRS@
+MCA_pmix_pif_STATIC_COMPONENTS = @MCA_pmix_pif_STATIC_COMPONENTS@
+MCA_pmix_pif_STATIC_LTLIBS = @MCA_pmix_pif_STATIC_LTLIBS@
+MCA_pmix_pif_STATIC_SUBDIRS = @MCA_pmix_pif_STATIC_SUBDIRS@
+MCA_pmix_pinstalldirs_ALL_COMPONENTS = @MCA_pmix_pinstalldirs_ALL_COMPONENTS@
+MCA_pmix_pinstalldirs_ALL_SUBDIRS = @MCA_pmix_pinstalldirs_ALL_SUBDIRS@
+MCA_pmix_pinstalldirs_DSO_COMPONENTS = @MCA_pmix_pinstalldirs_DSO_COMPONENTS@
+MCA_pmix_pinstalldirs_DSO_SUBDIRS = @MCA_pmix_pinstalldirs_DSO_SUBDIRS@
+MCA_pmix_pinstalldirs_STATIC_COMPONENTS = @MCA_pmix_pinstalldirs_STATIC_COMPONENTS@
+MCA_pmix_pinstalldirs_STATIC_LTLIBS = @MCA_pmix_pinstalldirs_STATIC_LTLIBS@
+MCA_pmix_pinstalldirs_STATIC_SUBDIRS = @MCA_pmix_pinstalldirs_STATIC_SUBDIRS@
+MCA_pmix_pnet_ALL_COMPONENTS = @MCA_pmix_pnet_ALL_COMPONENTS@
+MCA_pmix_pnet_ALL_SUBDIRS = @MCA_pmix_pnet_ALL_SUBDIRS@
+MCA_pmix_pnet_DSO_COMPONENTS = @MCA_pmix_pnet_DSO_COMPONENTS@
+MCA_pmix_pnet_DSO_SUBDIRS = @MCA_pmix_pnet_DSO_SUBDIRS@
+MCA_pmix_pnet_STATIC_COMPONENTS = @MCA_pmix_pnet_STATIC_COMPONENTS@
+MCA_pmix_pnet_STATIC_LTLIBS = @MCA_pmix_pnet_STATIC_LTLIBS@
+MCA_pmix_pnet_STATIC_SUBDIRS = @MCA_pmix_pnet_STATIC_SUBDIRS@
+MCA_pmix_psec_ALL_COMPONENTS = @MCA_pmix_psec_ALL_COMPONENTS@
+MCA_pmix_psec_ALL_SUBDIRS = @MCA_pmix_psec_ALL_SUBDIRS@
+MCA_pmix_psec_DSO_COMPONENTS = @MCA_pmix_psec_DSO_COMPONENTS@
+MCA_pmix_psec_DSO_SUBDIRS = @MCA_pmix_psec_DSO_SUBDIRS@
+MCA_pmix_psec_STATIC_COMPONENTS = @MCA_pmix_psec_STATIC_COMPONENTS@
+MCA_pmix_psec_STATIC_LTLIBS = @MCA_pmix_psec_STATIC_LTLIBS@
+MCA_pmix_psec_STATIC_SUBDIRS = @MCA_pmix_psec_STATIC_SUBDIRS@
+MCA_pmix_psensor_ALL_COMPONENTS = @MCA_pmix_psensor_ALL_COMPONENTS@
+MCA_pmix_psensor_ALL_SUBDIRS = @MCA_pmix_psensor_ALL_SUBDIRS@
+MCA_pmix_psensor_DSO_COMPONENTS = @MCA_pmix_psensor_DSO_COMPONENTS@
+MCA_pmix_psensor_DSO_SUBDIRS = @MCA_pmix_psensor_DSO_SUBDIRS@
+MCA_pmix_psensor_STATIC_COMPONENTS = @MCA_pmix_psensor_STATIC_COMPONENTS@
+MCA_pmix_psensor_STATIC_LTLIBS = @MCA_pmix_psensor_STATIC_LTLIBS@
+MCA_pmix_psensor_STATIC_SUBDIRS = @MCA_pmix_psensor_STATIC_SUBDIRS@
+MCA_pmix_ptl_ALL_COMPONENTS = @MCA_pmix_ptl_ALL_COMPONENTS@
+MCA_pmix_ptl_ALL_SUBDIRS = @MCA_pmix_ptl_ALL_SUBDIRS@
+MCA_pmix_ptl_DSO_COMPONENTS = @MCA_pmix_ptl_DSO_COMPONENTS@
+MCA_pmix_ptl_DSO_SUBDIRS = @MCA_pmix_ptl_DSO_SUBDIRS@
+MCA_pmix_ptl_STATIC_COMPONENTS = @MCA_pmix_ptl_STATIC_COMPONENTS@
+MCA_pmix_ptl_STATIC_LTLIBS = @MCA_pmix_ptl_STATIC_LTLIBS@
+MCA_pmix_ptl_STATIC_SUBDIRS = @MCA_pmix_ptl_STATIC_SUBDIRS@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PMIX_ASM_GSYM = @PMIX_ASM_GSYM@
+PMIX_ASM_LSYM = @PMIX_ASM_LSYM@
+PMIX_ASM_SUPPORT_64BIT = @PMIX_ASM_SUPPORT_64BIT@
+PMIX_ASM_TEXT = @PMIX_ASM_TEXT@
+PMIX_ASM_TYPE = @PMIX_ASM_TYPE@
+PMIX_ASSEMBLY_ARCH = @PMIX_ASSEMBLY_ARCH@
+PMIX_ASSEMBLY_BUILTIN = @PMIX_ASSEMBLY_BUILTIN@
+PMIX_ASSEMBLY_FORMAT = @PMIX_ASSEMBLY_FORMAT@
+PMIX_AS_GLOBAL = @PMIX_AS_GLOBAL@
+PMIX_AS_LABEL_SUFFIX = @PMIX_AS_LABEL_SUFFIX@
+PMIX_CC_ABSOLUTE = @PMIX_CC_ABSOLUTE@
+PMIX_CONFIGURE_DATE = @PMIX_CONFIGURE_DATE@
+PMIX_CONFIGURE_HOST = @PMIX_CONFIGURE_HOST@
+PMIX_CONFIGURE_USER = @PMIX_CONFIGURE_USER@
+PMIX_EMBEDDED_CPPFLAGS = @PMIX_EMBEDDED_CPPFLAGS@
+PMIX_EMBEDDED_LDFLAGS = @PMIX_EMBEDDED_LDFLAGS@
+PMIX_EMBEDDED_LIBS = @PMIX_EMBEDDED_LIBS@
+PMIX_MAJOR_VERSION = @PMIX_MAJOR_VERSION@
+PMIX_MINOR_VERSION = @PMIX_MINOR_VERSION@
+PMIX_RELEASE_DATE = @PMIX_RELEASE_DATE@
+PMIX_RELEASE_VERSION = @PMIX_RELEASE_VERSION@
+PMIX_RENAME = @PMIX_RENAME@
+PMIX_VERSION = @PMIX_VERSION@
+PMIX_top_builddir = @PMIX_top_builddir@
+PMIX_top_srcdir = @PMIX_top_srcdir@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_prefix_program = @ac_prefix_program@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+libpmix_so_version = @libpmix_so_version@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pmix_have_pandoc = @pmix_have_pandoc@
+pmix_pdl_pdlopen_LIBS = @pmix_pdl_pdlopen_LIBS@
+pmix_pdl_plibltdl_CPPFLAGS = @pmix_pdl_plibltdl_CPPFLAGS@
+pmix_pdl_plibltdl_LDFLAGS = @pmix_pdl_plibltdl_LDFLAGS@
+pmix_pdl_plibltdl_LIBS = @pmix_pdl_plibltdl_LIBS@
+pmixdatadir = @pmixdatadir@
+pmixincludedir = @pmixincludedir@
+pmixlibdir = @pmixlibdir@
+pmixmajor = @pmixmajor@
+pmixminor = @pmixminor@
+pnet_opa_CFLAGS = @pnet_opa_CFLAGS@
+pnet_opa_CPPFLAGS = @pnet_opa_CPPFLAGS@
+pnet_opa_LDFLAGS = @pnet_opa_LDFLAGS@
+pnet_opa_LIBS = @pnet_opa_LIBS@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+psec_munge_CPPFLAGS = @psec_munge_CPPFLAGS@
+psec_munge_LDFLAGS = @psec_munge_LDFLAGS@
+psec_munge_LIBS = @psec_munge_LIBS@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+AM_CPPFLAGS = \
+    $(LTDLINCL)
+
+noinst_LTLIBRARIES = libpmix_mca_base.la
+dist_pmixdata_DATA = help-mca-base.txt help-mca-var.txt
+
+# Source code files
+headers = \
+        base.h \
+        pmix_mca_base_component_repository.h \
+        pmix_mca_base_var.h \
+        pmix_mca_base_var_enum.h \
+        pmix_mca_base_var_group.h \
+        pmix_mca_base_vari.h \
+        pmix_mca_base_framework.h
+
+
+# Library
+libpmix_mca_base_la_SOURCES = \
+        $(headers) \
+        pmix_mca_base_close.c \
+        pmix_mca_base_component_compare.c \
+        pmix_mca_base_component_find.c \
+        pmix_mca_base_component_repository.c \
+        pmix_mca_base_components_open.c \
+        pmix_mca_base_components_close.c \
+        pmix_mca_base_components_select.c \
+        pmix_mca_base_list.c \
+        pmix_mca_base_open.c \
+        pmix_mca_base_var.c \
+        pmix_mca_base_var_enum.c \
+        pmix_mca_base_var_group.c \
+        pmix_mca_base_parse_paramfile.c \
+        pmix_mca_base_components_register.c \
+        pmix_mca_base_framework.c
+
+
+# Conditionally install the header files
+ at WANT_INSTALL_HEADERS_TRUE@pmixdir = $(pmixincludedir)/$(subdir)
+ at WANT_INSTALL_HEADERS_TRUE@pmix_HEADERS = $(headers)
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/mca/base/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/mca/base/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_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}; \
+	}
+
+libpmix_mca_base.la: $(libpmix_mca_base_la_OBJECTS) $(libpmix_mca_base_la_DEPENDENCIES) $(EXTRA_libpmix_mca_base_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(LINK)  $(libpmix_mca_base_la_OBJECTS) $(libpmix_mca_base_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pmix_mca_base_close.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pmix_mca_base_component_compare.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pmix_mca_base_component_find.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pmix_mca_base_component_repository.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pmix_mca_base_components_close.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pmix_mca_base_components_open.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pmix_mca_base_components_register.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pmix_mca_base_components_select.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pmix_mca_base_framework.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pmix_mca_base_list.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pmix_mca_base_open.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pmix_mca_base_parse_paramfile.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pmix_mca_base_var.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pmix_mca_base_var_enum.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pmix_mca_base_var_group.Plo at am__quote@
+
+.c.o:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+ at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-dist_pmixdataDATA: $(dist_pmixdata_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(dist_pmixdata_DATA)'; test -n "$(pmixdatadir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(pmixdatadir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(pmixdatadir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pmixdatadir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pmixdatadir)" || exit $$?; \
+	done
+
+uninstall-dist_pmixdataDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_pmixdata_DATA)'; test -n "$(pmixdatadir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(pmixdatadir)'; $(am__uninstall_files_from_dir)
+install-pmixHEADERS: $(pmix_HEADERS)
+	@$(NORMAL_INSTALL)
+	@list='$(pmix_HEADERS)'; test -n "$(pmixdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(pmixdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(pmixdir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(pmixdir)'"; \
+	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(pmixdir)" || exit $$?; \
+	done
+
+uninstall-pmixHEADERS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(pmix_HEADERS)'; test -n "$(pmixdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(pmixdir)'; $(am__uninstall_files_from_dir)
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
+installdirs:
+	for dir in "$(DESTDIR)$(pmixdatadir)" "$(DESTDIR)$(pmixdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-dist_pmixdataDATA install-pmixHEADERS
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-dist_pmixdataDATA uninstall-pmixHEADERS
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstLTLIBRARIES 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-dist_pmixdataDATA 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-pmixHEADERS 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-dist_pmixdataDATA uninstall-pmixHEADERS
+
+.PRECIOUS: Makefile
+
+
+# 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/mca/base/base.h b/src/mca/base/base.h
new file mode 100644
index 0000000..0554431
--- /dev/null
+++ b/src/mca/base/base.h
@@ -0,0 +1,246 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2007 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2009      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2013-2015 Los Alamos National Security, LLC. All rights
+ *                         reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2016      Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#ifndef PMIX_MCA_BASE_H
+#define PMIX_MCA_BASE_H
+
+#include <src/include/pmix_config.h>
+
+#include "src/class/pmix_object.h"
+#include "src/class/pmix_list.h"
+
+/*
+ * These units are large enough to warrant their own .h files
+ */
+#include "src/mca/mca.h"
+#include "src/mca/base/pmix_mca_base_var.h"
+#include "src/mca/base/pmix_mca_base_framework.h"
+#include "src/util/output.h"
+
+BEGIN_C_DECLS
+
+/*
+ * Structure for making plain lists of components
+ */
+struct pmix_mca_base_component_list_item_t {
+    pmix_list_item_t super;
+    const pmix_mca_base_component_t *cli_component;
+};
+typedef struct pmix_mca_base_component_list_item_t pmix_mca_base_component_list_item_t;
+PMIX_CLASS_DECLARATION(pmix_mca_base_component_list_item_t);
+
+/*
+ * Structure for making priority lists of components
+ */
+struct pmix_mca_base_component_priority_list_item_t {
+    pmix_mca_base_component_list_item_t super;
+    int cpli_priority;
+};
+typedef struct pmix_mca_base_component_priority_list_item_t
+    pmix_mca_base_component_priority_list_item_t;
+
+PMIX_CLASS_DECLARATION(pmix_mca_base_component_priority_list_item_t);
+
+/*
+ * Public variables
+ */
+extern char *pmix_mca_base_component_path;
+extern bool pmix_mca_base_component_show_load_errors;
+extern bool pmix_mca_base_component_disable_dlopen;
+extern char *pmix_mca_base_system_default_path;
+extern char *pmix_mca_base_user_default_path;
+
+/*
+ * Standard verbosity levels
+ */
+enum {
+    /** total silence */
+    PMIX_MCA_BASE_VERBOSE_NONE  = -1,
+    /** only errors are printed */
+    PMIX_MCA_BASE_VERBOSE_ERROR = 0,
+    /** emit messages about component selection, open, and unloading */
+    PMIX_MCA_BASE_VERBOSE_COMPONENT = 10,
+    /** also emit warnings */
+    PMIX_MCA_BASE_VERBOSE_WARN  = 20,
+    /** also emit general, user-relevant information, such as rationale as to why certain choices
+     * or code paths were taken, information gleaned from probing the local system, etc. */
+    PMIX_MCA_BASE_VERBOSE_INFO  = 40,
+    /** also emit relevant tracing information (e.g., which functions were invoked /
+     * call stack entry/exit info) */
+    PMIX_MCA_BASE_VERBOSE_TRACE = 60,
+    /** also emit PMIX-developer-level (i.e,. highly detailed) information */
+    PMIX_MCA_BASE_VERBOSE_DEBUG = 80,
+    /** also output anything else that might be useful */
+    PMIX_MCA_BASE_VERBOSE_MAX   = 100,
+};
+
+/*
+ * Public functions
+ */
+
+/**
+ * First function called in the MCA.
+ *
+ * @return PMIX_SUCCESS Upon success
+ * @return PMIX_ERROR Upon failure
+ *
+ * This function starts up the entire MCA.  It initializes a bunch
+ * of built-in MCA parameters, and initialized the MCA component
+ * repository.
+ *
+ * It must be the first MCA function invoked.  It is normally
+ * invoked during the initialization stage and specifically
+ * invoked in the special case of the *_info command.
+ */
+int pmix_mca_base_open(void);
+
+/**
+ * Last function called in the MCA
+ *
+ * @return PMIX_SUCCESS Upon success
+ * @return PMIX_ERROR Upon failure
+ *
+ * This function closes down the entire MCA.  It clears all MCA
+ * parameters and closes down the MCA component respository.
+ *
+ * It must be the last MCA function invoked.  It is normally invoked
+ * during the finalize stage.
+ */
+int pmix_mca_base_close(void);
+
+/**
+ * A generic select function
+ *
+ */
+int pmix_mca_base_select(const char *type_name, int output_id,
+                         pmix_list_t *components_available,
+                         pmix_mca_base_module_t **best_module,
+                         pmix_mca_base_component_t **best_component,
+                         int *priority_out);
+
+/**
+ * A function for component query functions to discover if they have
+ * been explicitly required to or requested to be selected.
+ *
+ * exclusive: If the specified component is the only component that is
+ *            available for selection.
+ *
+ */
+int pmix_mca_base_is_component_required(pmix_list_t *components_available,
+                                        pmix_mca_base_component_t *component,
+                                        bool exclusive,
+                                        bool *is_required);
+
+/* pmix_mca_base_component_compare.c */
+
+int pmix_mca_base_component_compare_priority(pmix_mca_base_component_priority_list_item_t *a,
+                                             pmix_mca_base_component_priority_list_item_t *b);
+int pmix_mca_base_component_compare(const pmix_mca_base_component_t *a,
+                                    const pmix_mca_base_component_t *b);
+int pmix_mca_base_component_compatible(const pmix_mca_base_component_t *a,
+                                       const pmix_mca_base_component_t *b);
+char * pmix_mca_base_component_to_string(const pmix_mca_base_component_t *a);
+
+/* pmix_mca_base_component_find.c */
+
+int pmix_mca_base_component_find (const char *directory, pmix_mca_base_framework_t *framework,
+                                  bool ignore_requested, bool open_dso_components);
+
+/**
+ * Parse the requested component string and return an pmix_argv of the requested
+ * (or not requested) components.
+ */
+int pmix_mca_base_component_parse_requested (const char *requested, bool *include_mode,
+                                             char ***requested_component_names);
+
+/**
+ * Filter a list of components based on a comma-delimted list of names and/or
+ * a set of meta-data flags.
+ *
+ * @param[in,out] components List of components to filter
+ * @param[in] output_id Output id to write to for error/warning/debug messages
+ * @param[in] filter_names Comma delimited list of components to use. Negate with ^.
+ * May be NULL.
+ * @param[in] filter_flags Metadata flags components are required to have set (CR ready)
+ *
+ * @returns PMIX_SUCCESS On success
+ * @returns PMIX_ERR_NOT_FOUND If some component in {filter_names} is not found in
+ * {components}. Does not apply to negated filters.
+ * @returns pmix error code On other error.
+ *
+ * This function closes and releases any components that do not match the filter_name and
+ * filter flags.
+ */
+int pmix_mca_base_components_filter (pmix_mca_base_framework_t *framework, uint32_t filter_flags);
+
+
+
+/* Safely release some memory allocated by pmix_mca_base_component_find()
+   (i.e., is safe to call even if you never called
+   pmix_mca_base_component_find()). */
+int pmix_mca_base_component_find_finalize(void);
+
+/* pmix_mca_base_components_register.c */
+int pmix_mca_base_framework_components_register (struct pmix_mca_base_framework_t *framework,
+                                                 pmix_mca_base_register_flag_t flags);
+
+/* pmix_mca_base_components_open.c */
+int pmix_mca_base_framework_components_open (struct pmix_mca_base_framework_t *framework,
+                                             pmix_mca_base_open_flag_t flags);
+
+int pmix_mca_base_components_open(const char *type_name, int output_id,
+                                  const pmix_mca_base_component_t **static_components,
+                                  pmix_list_t *components_available,
+                                  bool open_dso_components);
+
+/* pmix_mca_base_components_close.c */
+/**
+ * Close and release a component.
+ *
+ * @param[in] component Component to close
+ * @param[in] output_id Output id for debugging output
+ *
+ * After calling this function the component may no longer be used.
+ */
+void pmix_mca_base_component_close (const pmix_mca_base_component_t *component, int output_id);
+
+/**
+ * Release a component without closing it.
+ * @param[in] component Component to close
+ * @param[in] output_id Output id for debugging output
+ *
+ * After calling this function the component may no longer be used.
+ */
+void pmix_mca_base_component_unload (const pmix_mca_base_component_t *component, int output_id);
+
+int pmix_mca_base_components_close(int output_id, pmix_list_t *components_available,
+                                   const pmix_mca_base_component_t *skip);
+
+int pmix_mca_base_framework_components_close (struct pmix_mca_base_framework_t *framework,
+                                              const pmix_mca_base_component_t *skip);
+
+END_C_DECLS
+
+#endif /* MCA_BASE_H */
diff --git a/src/mca/base/help-mca-base.txt b/src/mca/base/help-mca-base.txt
new file mode 100644
index 0000000..c0b8251
--- /dev/null
+++ b/src/mca/base/help-mca-base.txt
@@ -0,0 +1,61 @@
+# -*- text -*-
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2008-2014 Cisco Systems, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+# This is the US/English help file for PMIX MCA error messages.
+#
+[find-available:not-valid]
+A requested component was not found, or was unable to be opened.  This
+means that this component is either not installed or is unable to be
+used on your system (e.g., sometimes this means that shared libraries
+that the component requires are unable to be found/loaded).  Note that
+PMIX stopped checking at the first component that it did not find.
+
+Host:      %s
+Framework: %s
+Component: %s
+#
+[find-available:none found]
+No components were able to be opened in the %s framework.
+
+This typically means that either no components of this type were
+installed, or none of the installed componnets can be loaded.
+Sometimes this means that shared libraries required by these
+components are unable to be found/loaded.
+
+  Host:      %s
+  Framework: %s
+#
+[framework-param:too-many-negates]
+MCA framework parameters can only take a single negation operator
+("^"), and it must be at the beginning of the value.  The following
+value violates this rule:
+
+    %s
+
+When used, the negation operator sets the "exclusive" behavior mode,
+meaning that it will exclude all specified components (and implicitly
+include all others).  If the negation operator is not specified, the
+"inclusive" mode is assumed, meaning that all specified components
+will be included (and implicitly exclude all others).
+
+For example, "^a,b" specifies the exclusive behavior and means "use
+all components *except* a and b", while "c,d" specifies the inclusive
+behavior and means "use *only* components c and d."
+
+You cannot mix inclusive and exclusive behavior.
diff --git a/src/mca/base/help-mca-var.txt b/src/mca/base/help-mca-var.txt
new file mode 100644
index 0000000..b306c31
--- /dev/null
+++ b/src/mca/base/help-mca-var.txt
@@ -0,0 +1,139 @@
+# -*- text -*-
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2008-2011 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2013      Los Alamos National Security, LLC. All rights
+#                         reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+# This is the US/English help file for PMIX MCA error messages.
+#
+[invalid-flag-combination]
+ERROR: An invalid combination of flags was passed to pmix_mca_base_var_register.
+
+  Variable: %s
+  Flags:    %s %s
+#
+[default-only-param-set]
+WARNING: A user-supplied value attempted to override the default-only MCA
+variable named "%s".
+
+The user-supplied value was ignored.
+#
+[missing-param-file]
+Process %d Unable to locate the variable file "%s" in the following search path:
+   %s
+#
+[deprecated-mca-env]
+A deprecated MCA variable value was specified in the environment or
+on the command line.  Deprecated MCA variables should be avoided;
+they may disappear in future releases.
+
+  Deprecated variable: %s
+  New variable:        %s
+#
+[deprecated-mca-cli]
+A deprecated MCA variable value was specified on the command line.  Deprecated
+MCA variables should be avoided; they may disappear in future releases.
+
+  Deprecated variable: %s
+  New variable:        %s
+#
+[deprecated-mca-file]
+A deprecated MCA variable value was specified in an MCA variable
+file.  Deprecated MCA variables should be avoided; they may disappear
+in future releases.
+
+  Deprecated variable: %s
+  Source file:         %s
+  New variable:        %s
+#
+[mutually-exclusive-vars]
+Two mutually-exclusive MCA variables were specified.  This can result
+in undefined behavior, such as ignoring the components that the MCA
+variables are supposed to affect.
+
+  1st MCA variable: %s
+    Source of value: %s
+  2nd MCA variable: %s
+    Source of value: %s
+#
+[re-register-with-different-type]
+An MCA variable was re-registered with a different type (i.e., it was
+either originally registered as an INT and re-registered as a STRING,
+or it was originially registered as a STRING and re-registered as an
+INT).  This a developer error; your job may abort.
+
+  MCA variable name: %s
+#
+[var-name-conflict]
+A name collision was detected on an MCA variable name. This can happen
+if two components try to register the same variable with slightly
+different name components. The conflicting variables are listed below:
+
+  MCA variable name: %s
+  New name: %s %s %s
+  Existing name: %s %s %s
+#
+[overridden-param-set]
+WARNING: A user-supplied value attempted to set a variable that is set
+in the override variable file (pmix-mca-params-override.conf).
+
+  Variable: %s
+
+The user-supplied value was ignored.
+#
+[invalid-value]
+An invalid value was supplied for an MCA variable.
+
+  Variable     : %s
+  Value        : %s
+#
+[invalid-value-enum]
+An invalid value was supplied for an enum variable.
+
+  Variable     : %s
+  Value        : %s
+  Valid values : %s
+#
+[environment-only-param]
+WARNING: The special MCA parameter "%s" was set in
+an unexpected way, and is likely not working the way you want it to.
+
+Specifically, this MCA parameter is "special" in that it can *only* be
+set in the environment.  Setting this value in a file -- and sometimes
+even on the command line -- will not work as intended.  The *only* way
+to set this value is to set "PMIX_MCA_%s" in the environment before
+starting your job.
+
+  Value:      %s
+  Source:     %s
+#
+[incorrect-env-list-param]
+WARNING: The format of "pmix_mca_base_env_list" parameter is a delimited list of VAR=VAL or
+VAR instances. By default, the delimiter is a semicolon: VAR1=VAL1;VAR2;VAR3=VAL3;...
+You can set other via "pmix_mca_base_env_list_delimiter" parameter. If the delimiter is a
+semicolon, the value of "pmix_mca_base_env_list" variable should be quoted to not interfere
+with SHELL command line parsing. In the case where a value is not assigned to variable
+VAR, the value will be taken from the current environment.
+The following environment variable was not found in the environment:
+  Variable:             %s
+  MCA variable value:   %s
+#
+[incorrect-env-list-sep]
+An invalid value was supplied for an MCA variable "pmix_mca_base_env_list_delimiter".
+The "pmix_mca_base_env_list" variable will be ignored.
+  Value:     %s
diff --git a/src/mca/base/pmix_mca_base_close.c b/src/mca/base/pmix_mca_base_close.c
new file mode 100644
index 0000000..f42c2f0
--- /dev/null
+++ b/src/mca/base/pmix_mca_base_close.c
@@ -0,0 +1,68 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2005 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2009      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2015      Los Alamos National Security, LLC. All rights
+ *                         reserved.
+ * Copyright (c) 2016      Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+
+#include "src/util/output.h"
+#include "src/mca/mca.h"
+#include "src/mca/base/base.h"
+#include "src/mca/base/pmix_mca_base_component_repository.h"
+#include "pmix_common.h"
+
+extern int pmix_mca_base_opened;
+
+/*
+ * Main MCA shutdown.
+ */
+int pmix_mca_base_close(void)
+{
+    assert (pmix_mca_base_opened);
+    if (!--pmix_mca_base_opened) {
+        /* deregister all MCA base parameters */
+        int group_id = pmix_mca_base_var_group_find ("pmix", "mca", "base");
+
+        if (-1 < group_id) {
+            pmix_mca_base_var_group_deregister (group_id);
+        }
+
+        /* release the default paths */
+        if (NULL != pmix_mca_base_system_default_path) {
+            free(pmix_mca_base_system_default_path);
+        }
+        if (NULL != pmix_mca_base_user_default_path) {
+            free(pmix_mca_base_user_default_path);
+        }
+
+        /* Close down the component repository */
+        pmix_mca_base_component_repository_finalize();
+
+        /* Shut down the dynamic component finder */
+        pmix_mca_base_component_find_finalize();
+
+        /* Close pmix output stream 0 */
+        pmix_output_close(0);
+    }
+
+    /* All done */
+    return PMIX_SUCCESS;
+}
diff --git a/src/mca/base/pmix_mca_base_component_compare.c b/src/mca/base/pmix_mca_base_component_compare.c
new file mode 100644
index 0000000..e4c9507
--- /dev/null
+++ b/src/mca/base/pmix_mca_base_component_compare.c
@@ -0,0 +1,152 @@
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2005 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2016      Intel, Inc. All rights reserved
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+
+#include <string.h>
+
+#include "src/mca/mca.h"
+#include "src/mca/base/base.h"
+
+
+/*
+ * Function for comparing two pmix_mca_base_component_priority_t structs so
+ * that we can build prioritized listss of them.  This assumed that
+ * the types of the modules are the same.  Sort first by priority,
+ * second by module name, third by module version.
+ *
+ * Note that we acutally want a *reverse* ordering here -- the al_*
+ * functions will put "smaller" items at the head, and "larger" items
+ * at the tail.  Since we want the highest priority at the head, it
+ * may help the gentle reader to consider this an inverse comparison.
+ * :-)
+ */
+int
+pmix_mca_base_component_compare_priority(pmix_mca_base_component_priority_list_item_t *a,
+                                         pmix_mca_base_component_priority_list_item_t *b)
+{
+  /* First, compare the priorties */
+
+  if (a->cpli_priority > b->cpli_priority) {
+    return -1;
+  } else if (a->cpli_priority < b->cpli_priority) {
+    return 1;
+  } else {
+    return pmix_mca_base_component_compare(a->super.cli_component,
+                                      b->super.cli_component);
+  }
+}
+
+
+int pmix_mca_base_component_compare(const pmix_mca_base_component_t* aa,
+                                    const pmix_mca_base_component_t* bb)
+{
+    int val;
+
+    val = strncmp(aa->pmix_mca_type_name, bb->pmix_mca_type_name,
+                  PMIX_MCA_BASE_MAX_TYPE_NAME_LEN);
+    if (val != 0) {
+      return -val;
+    }
+
+    val = strncmp(aa->pmix_mca_component_name, bb->pmix_mca_component_name,
+                      PMIX_MCA_BASE_MAX_COMPONENT_NAME_LEN);
+    if (val != 0) {
+      return -val;
+    }
+
+    /* The names were equal, so compare the versions */
+
+    if (aa->pmix_mca_component_major_version >
+        bb->pmix_mca_component_major_version) {
+      return -1;
+    } else if (aa->pmix_mca_component_major_version <
+               bb->pmix_mca_component_major_version) {
+      return 1;
+    } else if (aa->pmix_mca_component_minor_version >
+               bb->pmix_mca_component_minor_version) {
+      return -1;
+    } else if (aa->pmix_mca_component_minor_version <
+               bb->pmix_mca_component_minor_version) {
+      return 1;
+    } else if (aa->pmix_mca_component_release_version >
+               bb->pmix_mca_component_release_version) {
+      return -1;
+    } else if (aa->pmix_mca_component_release_version <
+               bb->pmix_mca_component_release_version) {
+      return 1;
+    }
+
+    return 0;
+}
+
+
+/**
+ * compare but exclude the release version - declare compatible
+ * if the major/minor version are the same.
+ */
+int pmix_mca_base_component_compatible(const pmix_mca_base_component_t* aa,
+                                       const pmix_mca_base_component_t* bb)
+{
+    int val;
+
+    val = strncmp(aa->pmix_mca_type_name, bb->pmix_mca_type_name,
+                  PMIX_MCA_BASE_MAX_TYPE_NAME_LEN);
+    if (val != 0) {
+      return -val;
+    }
+
+    val = strncmp(aa->pmix_mca_component_name, bb->pmix_mca_component_name,
+                  PMIX_MCA_BASE_MAX_COMPONENT_NAME_LEN);
+    if (val != 0) {
+      return -val;
+    }
+
+    /* The names were equal, so compare the versions */
+
+    if (aa->pmix_mca_component_major_version >
+        bb->pmix_mca_component_major_version) {
+      return -1;
+    } else if (aa->pmix_mca_component_major_version <
+               bb->pmix_mca_component_major_version) {
+      return 1;
+    } else if (aa->pmix_mca_component_minor_version >
+               bb->pmix_mca_component_minor_version) {
+      return -1;
+    } else if (aa->pmix_mca_component_minor_version <
+               bb->pmix_mca_component_minor_version) {
+      return 1;
+    }
+    return 0;
+}
+
+/**
+ * Returns a string which represents the component name and version.
+ * Has the form: comp_type.comp_name.major_version.minor_version
+ */
+char * pmix_mca_base_component_to_string(const pmix_mca_base_component_t *a) {
+    char * str = NULL;
+    if(0 > asprintf(&str, "%s.%s.%d.%d", a->pmix_mca_type_name,
+                    a->pmix_mca_component_name, a->pmix_mca_component_major_version,
+                    a->pmix_mca_component_minor_version)) {
+        return NULL;
+    }
+    return str;
+}
+
diff --git a/src/mca/base/pmix_mca_base_component_find.c b/src/mca/base/pmix_mca_base_component_find.c
new file mode 100644
index 0000000..981511e
--- /dev/null
+++ b/src/mca/base/pmix_mca_base_component_find.c
@@ -0,0 +1,389 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2007 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2008-2015 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2008      Sun Microsystems, Inc.  All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2014-2015 Los Alamos National Security, LLC. All rights
+ *                         reserved.
+ * Copyright (c) 2016      Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+
+#include <stdio.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdlib.h>
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#ifdef HAVE_NETDB_H
+#include <netdb.h>
+#endif
+
+#include "src/mca/pinstalldirs/pinstalldirs.h"
+#include "src/util/pmix_environ.h"
+#include "src/util/output.h"
+#include "src/util/argv.h"
+#include "src/util/show_help.h"
+#include "src/class/pmix_list.h"
+#include "src/mca/mca.h"
+#include "src/mca/base/base.h"
+#include "src/mca/base/pmix_mca_base_component_repository.h"
+#include "pmix_common.h"
+#include "src/mca/pdl/base/base.h"
+
+#if PMIX_HAVE_PDL_SUPPORT
+/*
+ * Private functions
+ */
+static void find_dyn_components(const char *path, pmix_mca_base_framework_t *framework,
+                                const char **names, bool include_mode);
+
+#endif /* PMIX_HAVE_PDL_SUPPORT */
+
+static int component_find_check (pmix_mca_base_framework_t *framework, char **requested_component_names);
+
+/*
+ * Dummy structure for casting for open_only logic
+ */
+struct pmix_mca_base_open_only_dummy_component_t {
+    /** MCA base component */
+    pmix_mca_base_component_t version;
+    /** MCA base data */
+    pmix_mca_base_component_data_t data;
+};
+typedef struct pmix_mca_base_open_only_dummy_component_t pmix_mca_base_open_only_dummy_component_t;
+
+static char negate[] = "^";
+
+static bool use_component(const bool include_mode,
+                          const char **requested_component_names,
+                          const char *component_name);
+
+
+/*
+ * Function to find as many components of a given type as possible.  This
+ * includes statically-linked in components as well as opening up a
+ * directory and looking for shared-library MCA components of the
+ * appropriate type (load them if available).
+ *
+ * Return one consolidated array of (pmix_mca_base_component_t*) pointing to all
+ * available components.
+ */
+int pmix_mca_base_component_find (const char *directory, pmix_mca_base_framework_t *framework,
+                                  bool ignore_requested, bool open_dso_components)
+{
+    const pmix_mca_base_component_t **static_components = framework->framework_static_components;
+    char **requested_component_names = NULL;
+    pmix_mca_base_component_list_item_t *cli;
+    bool include_mode = true;
+    int ret;
+
+    pmix_output_verbose (PMIX_MCA_BASE_VERBOSE_COMPONENT, framework->framework_output,
+                         "mca: base: component_find: searching %s for %s components",
+                         directory, framework->framework_name);
+
+    if (!ignore_requested) {
+        ret = pmix_mca_base_component_parse_requested (framework->framework_selection, &include_mode,
+                                                       &requested_component_names);
+        if (PMIX_SUCCESS != ret) {
+            return ret;
+        }
+    }
+
+    /* Find all the components that were statically linked in */
+    if (static_components) {
+        for (int i = 0 ; NULL != static_components[i]; ++i) {
+            if ( use_component(include_mode,
+                               (const char**)requested_component_names,
+                               static_components[i]->pmix_mca_component_name) ) {
+                cli = PMIX_NEW(pmix_mca_base_component_list_item_t);
+                if (NULL == cli) {
+                    ret = PMIX_ERR_OUT_OF_RESOURCE;
+                    goto component_find_out;
+                }
+                cli->cli_component = static_components[i];
+                pmix_list_append(&framework->framework_components, (pmix_list_item_t *) cli);
+            }
+        }
+    }
+
+#if PMIX_HAVE_PDL_SUPPORT
+    /* Find any available dynamic components in the specified directory */
+    if (open_dso_components && !pmix_mca_base_component_disable_dlopen) {
+        find_dyn_components(directory, framework, (const char**)requested_component_names,
+                            include_mode);
+    } else {
+        pmix_output_verbose (PMIX_MCA_BASE_VERBOSE_INFO, 0,
+                            "pmix:mca: base: component_find: dso loading for %s MCA components disabled",
+                            framework->framework_name);
+    }
+#endif
+
+    if (include_mode) {
+        ret = component_find_check (framework, requested_component_names);
+    } else {
+        ret = PMIX_SUCCESS;
+    }
+
+component_find_out:
+
+    if (NULL != requested_component_names) {
+        pmix_argv_free(requested_component_names);
+    }
+
+    /* All done */
+
+    return ret;
+}
+
+int pmix_mca_base_component_find_finalize(void)
+{
+    return PMIX_SUCCESS;
+}
+
+int pmix_mca_base_components_filter (pmix_mca_base_framework_t *framework, uint32_t filter_flags)
+{
+    pmix_list_t *components = &framework->framework_components;
+    int output_id = framework->framework_output;
+    pmix_mca_base_component_list_item_t *cli, *next;
+    char **requested_component_names = NULL;
+    bool include_mode, can_use;
+    int ret;
+
+    assert (NULL != components);
+
+    if (0 == filter_flags && NULL == framework->framework_selection) {
+        return PMIX_SUCCESS;
+    }
+
+    ret = pmix_mca_base_component_parse_requested (framework->framework_selection, &include_mode,
+                                              &requested_component_names);
+    if (PMIX_SUCCESS != ret) {
+        return ret;
+    }
+
+    PMIX_LIST_FOREACH_SAFE(cli, next, components, pmix_mca_base_component_list_item_t) {
+        const pmix_mca_base_component_t *component = cli->cli_component;
+        pmix_mca_base_open_only_dummy_component_t *dummy =
+            (pmix_mca_base_open_only_dummy_component_t *) cli->cli_component;
+
+        can_use = use_component(include_mode, (const char **) requested_component_names,
+                                cli->cli_component->pmix_mca_component_name);
+
+        if (!can_use || (filter_flags & dummy->data.param_field) != filter_flags) {
+            if (can_use && (filter_flags & PMIX_MCA_BASE_METADATA_PARAM_CHECKPOINT) &&
+                !(PMIX_MCA_BASE_METADATA_PARAM_CHECKPOINT & dummy->data.param_field)) {
+                pmix_output_verbose(PMIX_MCA_BASE_VERBOSE_COMPONENT, output_id,
+                                    "pmix:mca: base: components_filter: "
+                                    "(%s) Component %s is *NOT* Checkpointable - Disabled",
+                                    component->reserved,
+                                    component->pmix_mca_component_name);
+            }
+
+            pmix_list_remove_item(components, &cli->super);
+
+            pmix_mca_base_component_unload(component, output_id);
+
+            PMIX_RELEASE(cli);
+        } else if (filter_flags & PMIX_MCA_BASE_METADATA_PARAM_CHECKPOINT) {
+            pmix_output_verbose(PMIX_MCA_BASE_VERBOSE_COMPONENT, output_id,
+                                "pmix:mca: base: components_filter: "
+                                "(%s) Component %s is Checkpointable",
+                                component->reserved,
+                                component->pmix_mca_component_name);
+        }
+    }
+
+    if (include_mode) {
+        ret = component_find_check(framework, requested_component_names);
+    } else {
+        ret = PMIX_SUCCESS;
+    }
+
+    if (NULL != requested_component_names) {
+        pmix_argv_free(requested_component_names);
+    }
+
+    return ret;
+}
+
+#if PMIX_HAVE_PDL_SUPPORT
+
+/*
+ * Open up all directories in a given path and search for components of
+ * the specified type (and possibly of a given name).
+ *
+ * Note that we use our own path iteration functionality because we
+ * need to look at companion .ompi_info files in the same directory as
+ * the library to generate dependencies, etc.
+ */
+static void find_dyn_components(const char *path, pmix_mca_base_framework_t *framework,
+                                const char **names, bool include_mode)
+{
+    pmix_mca_base_component_repository_item_t *ri;
+    pmix_list_t *dy_components;
+    int ret;
+
+    pmix_output_verbose (PMIX_MCA_BASE_VERBOSE_COMPONENT, framework->framework_output,
+                         "mca: base: find_dyn_components: checking %s for %s components",
+                         path, framework->framework_name);
+
+    if (NULL != path) {
+        ret = pmix_mca_base_component_repository_add(path);
+        if (PMIX_SUCCESS != ret) {
+            return;
+        }
+    }
+
+    ret = pmix_mca_base_component_repository_get_components(framework, &dy_components);
+    if (PMIX_SUCCESS != ret) {
+        return;
+    }
+
+    /* Iterate through the repository and find components that can be included */
+    PMIX_LIST_FOREACH(ri, dy_components, pmix_mca_base_component_repository_item_t) {
+        if (use_component(include_mode, names, ri->ri_name)) {
+            pmix_mca_base_component_repository_open(framework, ri);
+        }
+    }
+}
+
+#endif /* PMIX_HAVE_PDL_SUPPORT */
+
+static bool use_component(const bool include_mode,
+                          const char **requested_component_names,
+                          const char *component_name)
+{
+    bool found = false;
+    const char **req_comp_name = requested_component_names;
+
+    /*
+     * If no selection is specified then we use all components
+     * we can find.
+     */
+    if (NULL == req_comp_name) {
+        return true;
+    }
+
+    while ( *req_comp_name != NULL ) {
+        if ( strcmp(component_name, *req_comp_name) == 0 ) {
+            found = true;
+            break;
+        }
+        req_comp_name++;
+    }
+
+    /*
+     * include_mode  found |   use
+     * --------------------+------
+     *            0      0 |  true
+     *            0      1 | false
+     *            1      0 | false
+     *            1      1 |  true
+     *
+     * -> inverted xor
+     * As xor is a binary operator let's implement it manually before
+     * a compiler screws it up.
+     */
+
+    return (include_mode && found) || !(include_mode || found);
+}
+
+/* Ensure that *all* requested components exist.  Print a warning
+   and abort if they do not. */
+static int component_find_check (pmix_mca_base_framework_t *framework, char **requested_component_names)
+{
+    pmix_list_t *components = &framework->framework_components;
+    pmix_mca_base_component_list_item_t *cli;
+
+    if (NULL == requested_component_names) {
+        return PMIX_SUCCESS;
+    }
+
+    for (int i = 0; NULL != requested_component_names[i]; ++i) {
+        bool found = false;
+
+        PMIX_LIST_FOREACH(cli, components, pmix_mca_base_component_list_item_t) {
+            if (0 == strcmp(requested_component_names[i],
+                            cli->cli_component->pmix_mca_component_name)) {
+                found = true;
+                break;
+            }
+        }
+
+        if (!found) {
+            char h[MAXHOSTNAMELEN];
+            gethostname(h, sizeof(h));
+            pmix_show_help("help-mca-base.txt",
+                           "find-available:not-valid", true,
+                           h, framework->framework_name, requested_component_names[i]);
+            return PMIX_ERR_NOT_FOUND;
+        }
+    }
+
+    return PMIX_SUCCESS;
+}
+
+int pmix_mca_base_component_parse_requested (const char *requested, bool *include_mode,
+                                        char ***requested_component_names)
+{
+    const char *requested_orig = requested;
+
+    *requested_component_names = NULL;
+    *include_mode = true;
+
+    /* See if the user requested anything */
+    if (NULL == requested || 0 == strlen (requested)) {
+        return PMIX_SUCCESS;
+    }
+
+    /* Are we including or excluding?  We only allow the negate
+       character to be the *first* character of the value (but be nice
+       and allow any number of negate characters in the beginning). */
+    *include_mode = requested[0] != negate[0];
+
+    /* skip over all negate symbols at the beginning */
+    requested += strspn (requested, negate);
+
+    /* Double check to ensure that the user did not specify the negate
+       character anywhere else in the value. */
+    if (NULL != strstr (requested, negate)) {
+        pmix_show_help("help-mca-base.txt",
+                       "framework-param:too-many-negates",
+                       true, requested_orig);
+        return PMIX_ERROR;
+    }
+
+    /* Split up the value into individual component names */
+    *requested_component_names = pmix_argv_split(requested, ',');
+
+    /* All done */
+    return PMIX_SUCCESS;
+}
diff --git a/src/mca/base/pmix_mca_base_component_repository.c b/src/mca/base/pmix_mca_base_component_repository.c
new file mode 100644
index 0000000..de1c735
--- /dev/null
+++ b/src/mca/base/pmix_mca_base_component_repository.c
@@ -0,0 +1,572 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2005 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2008-2015 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2015      Los Alamos National Security, LLC. All rights
+ *                         reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2016      Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+
+#include <src/include/pmix_config.h>
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#include "src/class/pmix_list.h"
+#include "src/mca/mca.h"
+#include "src/mca/base/base.h"
+#include "src/mca/base/pmix_mca_base_component_repository.h"
+#include "src/mca/pdl/base/base.h"
+#include "pmix_common.h"
+#include "src/class/pmix_hash_table.h"
+#include "src/util/basename.h"
+
+#if PMIX_HAVE_PDL_SUPPORT
+
+/*
+ * Private types
+ */
+static void ri_constructor(pmix_mca_base_component_repository_item_t *ri);
+static void ri_destructor(pmix_mca_base_component_repository_item_t *ri);
+PMIX_CLASS_INSTANCE(pmix_mca_base_component_repository_item_t, pmix_list_item_t,
+                    ri_constructor, ri_destructor);
+
+#endif /* PMIX_HAVE_PDL_SUPPORT */
+
+
+/*
+ * Private variables
+ */
+static bool initialized = false;
+
+
+#if PMIX_HAVE_PDL_SUPPORT
+
+static pmix_hash_table_t pmix_mca_base_component_repository;
+
+/* two-level macro for stringifying a number */
+#define STRINGIFYX(x) #x
+#define STRINGIFY(x) STRINGIFYX(x)
+
+static int process_repository_item (const char *filename, void *data)
+{
+    char name[PMIX_MCA_BASE_MAX_COMPONENT_NAME_LEN + 1];
+    char type[PMIX_MCA_BASE_MAX_TYPE_NAME_LEN + 1];
+    pmix_mca_base_component_repository_item_t *ri;
+    pmix_list_t *component_list;
+    char *base;
+    int ret;
+
+    base = pmix_basename (filename);
+    if (NULL == base) {
+        return PMIX_ERROR;
+    }
+
+    /* check if the plugin has the appropriate prefix */
+    if (0 != strncmp (base, "mca_", 4)) {
+        free (base);
+        return PMIX_SUCCESS;
+    }
+
+    /* read framework and component names. framework names may not include an _
+     * but component names may */
+    ret = sscanf(base, "mca_%" STRINGIFY(PMIX_MCA_BASE_MAX_TYPE_NAME_LEN) "[^_]_%"
+                 STRINGIFY(PMIX_MCA_BASE_MAX_COMPONENT_NAME_LEN) "s", type, name);
+    if (0 > ret) {
+        /* does not patch the expected template. skip */
+        free(base);
+        return PMIX_SUCCESS;
+    }
+
+    /* lookup the associated framework list and create if it doesn't already exist */
+    ret = pmix_hash_table_get_value_ptr(&pmix_mca_base_component_repository, type,
+                                        strlen (type), (void **) &component_list);
+    if (PMIX_SUCCESS != ret) {
+        component_list = PMIX_NEW(pmix_list_t);
+        if (NULL == component_list) {
+            free (base);
+            /* OOM. nothing to do but fail */
+            return PMIX_ERR_OUT_OF_RESOURCE;
+        }
+
+        ret = pmix_hash_table_set_value_ptr(&pmix_mca_base_component_repository, type,
+                                            strlen (type), (void *) component_list);
+        if (PMIX_SUCCESS != ret) {
+            free (base);
+            PMIX_RELEASE(component_list);
+            return ret;
+        }
+    }
+
+    /* check for duplicate components */
+    PMIX_LIST_FOREACH(ri, component_list, pmix_mca_base_component_repository_item_t) {
+        if (0 == strcmp (ri->ri_name, name)) {
+            /* already scanned this component */
+            free (base);
+            return PMIX_SUCCESS;
+        }
+    }
+
+    ri = PMIX_NEW(pmix_mca_base_component_repository_item_t);
+    if (NULL == ri) {
+        free (base);
+        return PMIX_ERR_OUT_OF_RESOURCE;
+    }
+
+    ri->ri_base = base;
+
+    ri->ri_path = strdup (filename);
+    if (NULL == ri->ri_path) {
+        PMIX_RELEASE(ri);
+        return PMIX_ERR_OUT_OF_RESOURCE;
+    }
+
+    /* strncpy does not guarantee a \0 */
+    ri->ri_type[PMIX_MCA_BASE_MAX_TYPE_NAME_LEN] = '\0';
+    strncpy (ri->ri_type, type, PMIX_MCA_BASE_MAX_TYPE_NAME_LEN);
+
+    ri->ri_name[PMIX_MCA_BASE_MAX_TYPE_NAME_LEN] = '\0';
+    strncpy (ri->ri_name, name, PMIX_MCA_BASE_MAX_COMPONENT_NAME_LEN);
+
+    pmix_list_append (component_list, &ri->super);
+
+    return PMIX_SUCCESS;
+}
+
+static int file_exists(const char *filename, const char *ext)
+{
+    char *final;
+    int ret;
+
+    if (NULL == ext) {
+        return access (filename, F_OK) == 0;
+    }
+
+    ret = asprintf(&final, "%s.%s", filename, ext);
+    if (0 > ret || NULL == final) {
+        return 0;
+    }
+
+    ret = access (final, F_OK);
+    free(final);
+    return (0 == ret);
+}
+
+#endif /* PMIX_HAVE_PDL_SUPPORT */
+
+int pmix_mca_base_component_repository_add (const char *path)
+{
+#if PMIX_HAVE_PDL_SUPPORT
+    char *path_to_use = NULL, *dir, *ctx;
+    const char sep[] = {PMIX_ENV_SEP, '\0'};
+
+    if (NULL == path) {
+        /* nothing to do */
+        return PMIX_SUCCESS;
+    }
+
+    path_to_use = strdup (path);
+
+    dir = strtok_r (path_to_use, sep, &ctx);
+    do {
+        if ((0 == strcmp(dir, "USER_DEFAULT") || 0 == strcmp(dir, "USR_DEFAULT"))
+            && NULL != pmix_mca_base_user_default_path) {
+            dir = pmix_mca_base_user_default_path;
+        } else if (0 == strcmp(dir, "SYS_DEFAULT") ||
+                   0 == strcmp(dir, "SYSTEM_DEFAULT")) {
+            dir = pmix_mca_base_system_default_path;
+        }
+
+        if (0 != pmix_pdl_foreachfile(dir, process_repository_item, NULL)) {
+            break;
+        }
+    } while (NULL != (dir = strtok_r (NULL, sep, &ctx)));
+
+    free (path_to_use);
+
+#endif /* PMIX_HAVE_PDL_SUPPORT */
+
+    return PMIX_SUCCESS;
+}
+
+
+/*
+ * Initialize the repository
+ */
+int pmix_mca_base_component_repository_init(void)
+{
+  /* Setup internal structures */
+
+  if (!initialized) {
+#if PMIX_HAVE_PDL_SUPPORT
+
+    /* Initialize the dl framework */
+    int ret = pmix_mca_base_framework_open(&pmix_pdl_base_framework, 0);
+    if (PMIX_SUCCESS != ret) {
+        pmix_output(0, "%s %d:%s failed -- process will likely abort (open the dl framework returned %d instead of PMIX_SUCCESS)\n",
+                    __FILE__, __LINE__, __func__, ret);
+        return ret;
+    }
+    pmix_pdl_base_select();
+
+    PMIX_CONSTRUCT(&pmix_mca_base_component_repository, pmix_hash_table_t);
+    ret = pmix_hash_table_init (&pmix_mca_base_component_repository, 128);
+    if (PMIX_SUCCESS != ret) {
+        (void) pmix_mca_base_framework_close(&pmix_pdl_base_framework);
+        return ret;
+    }
+
+    ret = pmix_mca_base_component_repository_add(pmix_mca_base_component_path);
+    if (PMIX_SUCCESS != ret) {
+        PMIX_DESTRUCT(&pmix_mca_base_component_repository);
+        (void) pmix_mca_base_framework_close(&pmix_pdl_base_framework);
+        return ret;
+    }
+#endif
+
+    initialized = true;
+  }
+
+  /* All done */
+
+  return PMIX_SUCCESS;
+}
+
+int pmix_mca_base_component_repository_get_components (pmix_mca_base_framework_t *framework,
+                                                       pmix_list_t **framework_components)
+{
+    *framework_components = NULL;
+#if PMIX_HAVE_PDL_SUPPORT
+    return pmix_hash_table_get_value_ptr (&pmix_mca_base_component_repository, framework->framework_name,
+                                          strlen (framework->framework_name), (void **) framework_components);
+#endif
+    return PMIX_ERR_NOT_FOUND;
+}
+
+#if PMIX_HAVE_PDL_SUPPORT
+static void pmix_mca_base_component_repository_release_internal(pmix_mca_base_component_repository_item_t *ri) {
+    int group_id;
+
+    group_id = pmix_mca_base_var_group_find (NULL, ri->ri_type, ri->ri_name);
+    if (0 <= group_id) {
+        /* ensure all variables are deregistered before we dlclose the component */
+        pmix_mca_base_var_group_deregister (group_id);
+    }
+
+    /* Close the component (and potentially unload it from memory */
+    if (ri->ri_dlhandle) {
+        pmix_pdl_close(ri->ri_dlhandle);
+        ri->ri_dlhandle = NULL;
+    }
+}
+#endif
+
+#if PMIX_HAVE_PDL_SUPPORT
+static pmix_mca_base_component_repository_item_t *find_component(const char *type, const char *name)
+{
+    pmix_mca_base_component_repository_item_t *ri;
+    pmix_list_t *component_list;
+    int ret;
+
+    ret = pmix_hash_table_get_value_ptr (&pmix_mca_base_component_repository, type,
+                                         strlen (type), (void **) &component_list);
+    if (PMIX_SUCCESS != ret) {
+        /* component does not exist in the repository */
+        return NULL;
+    }
+
+    PMIX_LIST_FOREACH(ri, component_list, pmix_mca_base_component_repository_item_t) {
+        if (0 == strcmp (ri->ri_name, name)) {
+            return ri;
+        }
+    }
+
+    return NULL;
+}
+#endif
+
+void pmix_mca_base_component_repository_release(const pmix_mca_base_component_t *component)
+{
+#if PMIX_HAVE_PDL_SUPPORT
+    pmix_mca_base_component_repository_item_t *ri;
+
+    ri = find_component (component->pmix_mca_type_name, component->pmix_mca_component_name);
+    if (NULL != ri && !(--ri->ri_refcnt)) {
+        pmix_mca_base_component_repository_release_internal (ri);
+    }
+#endif
+}
+
+int pmix_mca_base_component_repository_retain_component(const char *type, const char *name)
+{
+#if PMIX_HAVE_PDL_SUPPORT
+    pmix_mca_base_component_repository_item_t *ri = find_component(type, name);
+
+    if (NULL != ri) {
+        ++ri->ri_refcnt;
+        return PMIX_SUCCESS;
+    }
+
+    return PMIX_ERR_NOT_FOUND;
+#else
+    return PMIX_ERR_NOT_SUPPORTED;
+#endif
+}
+
+int pmix_mca_base_component_repository_open(pmix_mca_base_framework_t *framework,
+                                            pmix_mca_base_component_repository_item_t *ri)
+{
+#if PMIX_HAVE_PDL_SUPPORT
+    pmix_mca_base_component_t *component_struct;
+    pmix_mca_base_component_list_item_t *mitem = NULL;
+    char *struct_name = NULL;
+    int vl, ret;
+
+    pmix_output_verbose(PMIX_MCA_BASE_VERBOSE_INFO, 0, "pmix_mca_base_component_repository_open: examining dynamic "
+                        "%s MCA component \"%s\" at path %s", ri->ri_type, ri->ri_name, ri->ri_path);
+
+    vl = pmix_mca_base_component_show_load_errors ? PMIX_MCA_BASE_VERBOSE_ERROR : PMIX_MCA_BASE_VERBOSE_INFO;
+
+    /* Ensure that this component is not already loaded (should only happen
+       if it was statically loaded).  It's an error if it's already
+       loaded because we're evaluating this file -- not this component.
+       Hence, returning PMIX_ERR_PARAM indicates that the *file* failed
+       to load, not the component. */
+
+    PMIX_LIST_FOREACH(mitem, &framework->framework_components, pmix_mca_base_component_list_item_t) {
+        if (0 == strcmp(mitem->cli_component->pmix_mca_component_name, ri->ri_name)) {
+            pmix_output_verbose (PMIX_MCA_BASE_VERBOSE_INFO, 0, "pmix_mca_base_component_repository_open: already loaded (ignored)");
+            return PMIX_ERR_BAD_PARAM;
+        }
+    }
+
+    /* silence coverity issue (invalid free) */
+    mitem = NULL;
+
+    if (NULL != ri->ri_dlhandle) {
+        pmix_output_verbose (PMIX_MCA_BASE_VERBOSE_INFO, 0, "pmix_mca_base_component_repository_open: already loaded. returning cached component");
+        mitem = PMIX_NEW(pmix_mca_base_component_list_item_t);
+        if (NULL == mitem) {
+            return PMIX_ERR_OUT_OF_RESOURCE;
+        }
+
+        mitem->cli_component = ri->ri_component_struct;
+        pmix_list_append (&framework->framework_components, &mitem->super);
+
+        return PMIX_SUCCESS;
+    }
+
+    if (0 != strcmp (ri->ri_type, framework->framework_name)) {
+        /* shouldn't happen. attempting to open a component belonging to
+         * another framework. if this happens it is likely a MCA base
+         * bug so assert */
+        assert (0);
+        return PMIX_ERR_NOT_SUPPORTED;
+    }
+
+    /* Now try to load the component */
+
+    char *err_msg = NULL;
+    if (PMIX_SUCCESS != pmix_pdl_open(ri->ri_path, true, false, &ri->ri_dlhandle, &err_msg)) {
+        if (NULL == err_msg) {
+            err_msg = "pmix_dl_open() error message was NULL!";
+        }
+        /* Because libltdl erroneously says "file not found" for any
+           type of error -- which is especially misleading when the file
+           is actually there but cannot be opened for some other reason
+           (e.g., missing symbol) -- do some simple huersitics and if
+           the file [probably] does exist, print a slightly better error
+           message. */
+        if (0 == strcasecmp("file not found", err_msg) &&
+            (file_exists(ri->ri_path, "lo") ||
+             file_exists(ri->ri_path, "so") ||
+             file_exists(ri->ri_path, "dylib") ||
+             file_exists(ri->ri_path, "dll"))) {
+            err_msg = "perhaps a missing symbol, or compiled for a different version of Open MPI?";
+        }
+        pmix_output_verbose(vl, 0, "pmix_mca_base_component_repository_open: unable to open %s: %s (ignored)",
+                            ri->ri_base, err_msg);
+        return PMIX_ERR_BAD_PARAM;
+    }
+
+    /* Successfully opened the component; now find the public struct.
+       Malloc out enough space for it. */
+
+    do {
+        ret = asprintf (&struct_name, "mca_%s_%s_component", ri->ri_type, ri->ri_name);
+        if (0 > ret) {
+            ret = PMIX_ERR_OUT_OF_RESOURCE;
+            break;
+        }
+
+        mitem = PMIX_NEW(pmix_mca_base_component_list_item_t);
+        if (NULL == mitem) {
+            ret = PMIX_ERR_OUT_OF_RESOURCE;
+            break;
+        }
+
+        err_msg = NULL;
+        ret = pmix_pdl_lookup(ri->ri_dlhandle, struct_name, (void**) &component_struct, &err_msg);
+        if (PMIX_SUCCESS != ret || NULL == component_struct) {
+            if (NULL == err_msg) {
+                err_msg = "pmix_dl_loookup() error message was NULL!";
+            }
+            pmix_output_verbose(vl, 0, "pmix_mca_base_component_repository_open: \"%s\" does not appear to be a valid "
+                                "%s MCA dynamic component (ignored): %s. ret %d", ri->ri_base, ri->ri_type, err_msg, ret);
+
+            ret = PMIX_ERR_BAD_PARAM;
+            break;
+        }
+
+        /* done with the structure name */
+        free (struct_name);
+        struct_name = NULL;
+
+        /* We found the public struct.  Make sure its MCA major.minor
+           version is the same as ours. TODO -- add checks for project version (from framework) */
+        if (!(PMIX_MCA_BASE_VERSION_MAJOR == component_struct->pmix_mca_major_version &&
+              PMIX_MCA_BASE_VERSION_MINOR == component_struct->pmix_mca_minor_version)) {
+            pmix_output_verbose(vl, 0, "pmix_mca_base_component_repository_open: %s \"%s\" uses an MCA interface that is "
+                                "not recognized (component MCA v%d.%d.%d != supported MCA v%d.%d.%d) -- ignored",
+                                ri->ri_type, ri->ri_path, component_struct->pmix_mca_major_version,
+                                component_struct->pmix_mca_minor_version, component_struct->pmix_mca_release_version,
+                                PMIX_MCA_BASE_VERSION_MAJOR, PMIX_MCA_BASE_VERSION_MINOR, PMIX_MCA_BASE_VERSION_RELEASE);
+            ret = PMIX_ERR_BAD_PARAM;
+            break;
+        }
+
+        /* Also check that the component struct framework and component
+           names match the expected names from the filename */
+        if (0 != strcmp(component_struct->pmix_mca_type_name, ri->ri_type) ||
+            0 != strcmp(component_struct->pmix_mca_component_name, ri->ri_name)) {
+            pmix_output_verbose(vl, 0, "Component file data does not match filename: %s (%s / %s) != %s %s -- ignored",
+                                ri->ri_path, ri->ri_type, ri->ri_name,
+                                component_struct->pmix_mca_type_name,
+                                component_struct->pmix_mca_component_name);
+            ret = PMIX_ERR_BAD_PARAM;
+            break;
+        }
+
+        /* Alles gut.  Save the component struct, and register this
+           component to be closed later. */
+
+        ri->ri_component_struct = mitem->cli_component = component_struct;
+        ri->ri_refcnt = 1;
+        pmix_list_append(&framework->framework_components, &mitem->super);
+
+        pmix_output_verbose (PMIX_MCA_BASE_VERBOSE_INFO, 0, "pmix_mca_base_component_repository_open: opened dynamic %s MCA "
+                             "component \"%s\"", ri->ri_type, ri->ri_name);
+
+        return PMIX_SUCCESS;
+    } while (0);
+
+    if (mitem) {
+        PMIX_RELEASE(mitem);
+    }
+
+    if (struct_name) {
+        free (struct_name);
+    }
+
+    pmix_pdl_close (ri->ri_dlhandle);
+    ri->ri_dlhandle = NULL;
+
+    return ret;
+#else
+
+    /* no dlopen support */
+    return PMIX_ERR_NOT_SUPPORTED;
+#endif
+}
+
+/*
+ * Finalize the repository -- close everything that's still open.
+ */
+void pmix_mca_base_component_repository_finalize(void)
+{
+    if (!initialized) {
+        return;
+    }
+
+    initialized = false;
+
+#if PMIX_HAVE_PDL_SUPPORT
+    pmix_list_t *component_list;
+    void *node, *key;
+    size_t key_size;
+    int ret;
+
+    ret = pmix_hash_table_get_first_key_ptr (&pmix_mca_base_component_repository, &key, &key_size,
+                                             (void **) &component_list, &node);
+    while (PMIX_SUCCESS == ret) {
+        PMIX_LIST_RELEASE(component_list);
+        ret = pmix_hash_table_get_next_key_ptr (&pmix_mca_base_component_repository, &key,
+                                                &key_size, (void **) &component_list,
+                                                node, &node);
+    }
+
+    (void) pmix_mca_base_framework_close(&pmix_pdl_base_framework);
+    PMIX_DESTRUCT(&pmix_mca_base_component_repository);
+#endif
+}
+
+#if PMIX_HAVE_PDL_SUPPORT
+
+/*
+ * Basic sentinel values, and construct the inner list
+ */
+static void ri_constructor (pmix_mca_base_component_repository_item_t *ri)
+{
+    memset(ri->ri_type, 0, sizeof(ri->ri_type));
+    ri->ri_dlhandle = NULL;
+    ri->ri_component_struct = NULL;
+    ri->ri_path = NULL;
+}
+
+
+/*
+ * Close a component
+ */
+static void ri_destructor (pmix_mca_base_component_repository_item_t *ri)
+{
+    /* dlclose the component if it is still open */
+    pmix_mca_base_component_repository_release_internal (ri);
+
+    /* It should be obvious, but I'll state it anyway because it bit me
+       during debugging: after the dlclose(), the pmix_mca_base_component_t
+       pointer is no longer valid because it has [potentially] been
+       unloaded from memory.  So don't try to use it.  :-) */
+
+    if (ri->ri_path) {
+        free (ri->ri_path);
+    }
+
+    if (ri->ri_base) {
+        free (ri->ri_base);
+    }
+}
+
+#endif /* PMIX_HAVE_PDL_SUPPORT */
diff --git a/src/mca/base/pmix_mca_base_component_repository.h b/src/mca/base/pmix_mca_base_component_repository.h
new file mode 100644
index 0000000..38d6f46
--- /dev/null
+++ b/src/mca/base/pmix_mca_base_component_repository.h
@@ -0,0 +1,133 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2005 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2015      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2015      Los Alamos National Security, LLC. All rights
+ *                         reserved.
+ * Copyright (c) 2016      Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+/**
+ * @file pmix_mca_base_component_repository.h
+ *
+ * This file provide the external interface to our base component
+ * module.  Most of the components that depend on it, will use the
+ * retain_component() function to increase the reference count on a
+ * particular component (as opposed to the retain() function, which is
+ * internal to the pmix/mca/base).  But it's convenient to have all
+ * the functions exported from one header file rather than to separate
+ * retain_component() and retain() into two separate header files
+ * (i.e., have a separate header file just for retain()).
+ */
+
+#ifndef PMIX_MCA_BASE_COMPONENT_REPOSITORY_H
+#define PMIX_MCA_BASE_COMPONENT_REPOSITORY_H
+
+#include <src/include/pmix_config.h>
+
+#include "src/mca/pdl/pdl.h"
+#include "src/mca/pdl/base/base.h"
+
+BEGIN_C_DECLS
+struct pmix_mca_base_component_repository_item_t {
+    pmix_list_item_t super;
+
+    char ri_type[PMIX_MCA_BASE_MAX_TYPE_NAME_LEN + 1];
+    char ri_name[PMIX_MCA_BASE_MAX_COMPONENT_NAME_LEN + 1];
+
+    char *ri_path;
+    char *ri_base;
+
+    pmix_pdl_handle_t *ri_dlhandle;
+    const pmix_mca_base_component_t *ri_component_struct;
+
+    int ri_refcnt;
+};
+typedef struct pmix_mca_base_component_repository_item_t pmix_mca_base_component_repository_item_t;
+
+PMIX_CLASS_DECLARATION(pmix_mca_base_component_repository_item_t);
+
+/**
+ * @brief initialize the component repository
+ *
+ * This function must be called before any frameworks are registered or
+ * opened. It is responsible for setting up the repository of dynamically
+ * loaded components. The initial search path is taken from the
+ * pmix_mca_base_component_path MCA parameter. pmix_mca_base_open () is a
+ * prerequisite call as it registers the pmix_mca_base_component_path parameter.
+ */
+int pmix_mca_base_component_repository_init(void);
+
+/**
+ * @brief add search path for dynamically loaded components
+ *
+ * @param[in] path        delimited list of search paths to add
+ */
+int pmix_mca_base_component_repository_add(const char *path);
+
+
+/**
+ * @brief return the list of components that match a given framework
+ *
+ * @param[in]  framework  framework to match
+ * @param[out] framework_components components that match this framework
+ *
+ * The list returned in {framework_components} is owned by the component
+ * repository and CAN NOT be modified by the caller.
+ */
+int pmix_mca_base_component_repository_get_components(pmix_mca_base_framework_t *framework,
+                                                      pmix_list_t **framework_components);
+
+/**
+ * @brief finalize the mca component repository
+ */
+void pmix_mca_base_component_repository_finalize(void);
+
+/**
+ * @brief open the repository item and add it to the framework's component
+ * list
+ *
+ * @param[in] framework   framework that matches the component
+ * @param[in] ri          dynamic component to open
+ */
+int pmix_mca_base_component_repository_open(pmix_mca_base_framework_t *framework,
+                                            pmix_mca_base_component_repository_item_t *ri);
+
+
+/**
+ * @brief Reduce the reference count of a component and dlclose it if necessary
+ */
+void pmix_mca_base_component_repository_release(const pmix_mca_base_component_t *component);
+
+/**
+ * @brief Increase the reference count of a component
+ *
+ * Each component repository item starts with a reference count of 0. This ensures that
+ * when a framework closes it's components the repository items are all correctly
+ * dlclosed. This function can be used to prevent the dlclose if a component is needed
+ * after its framework has closed the associated component. Users of this function
+ * should call pmix_mca_base_component_repository_release() once they are finished with the
+ * component.
+ *
+ * @note all components are automatically unloaded by the
+ * pmix_mca_base_component_repository_finalize() call.
+ */
+int pmix_mca_base_component_repository_retain_component(const char *type, const char *name);
+
+END_C_DECLS
+
+#endif /* MCA_BASE_COMPONENT_REPOSITORY_H */
diff --git a/src/mca/base/pmix_mca_base_components_close.c b/src/mca/base/pmix_mca_base_components_close.c
new file mode 100644
index 0000000..22d757a
--- /dev/null
+++ b/src/mca/base/pmix_mca_base_components_close.c
@@ -0,0 +1,94 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2006 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2006 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2006 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2013-2015 Los Alamos National Security, LLC. All rights
+ *                         reserved.
+ * Copyright (c) 2016      Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+
+#include "src/class/pmix_list.h"
+#include "src/util/output.h"
+#include "src/mca/mca.h"
+#include "src/mca/base/base.h"
+#include "src/mca/base/pmix_mca_base_component_repository.h"
+#include "pmix_common.h"
+
+void pmix_mca_base_component_unload (const pmix_mca_base_component_t *component, int output_id)
+{
+    int ret;
+
+    /* Unload */
+    pmix_output_verbose (PMIX_MCA_BASE_VERBOSE_COMPONENT, output_id,
+                         "mca: base: close: unloading component %s",
+                         component->pmix_mca_component_name);
+
+    ret = pmix_mca_base_var_group_find (component->pmix_mca_project_name, component->pmix_mca_type_name,
+                                   component->pmix_mca_component_name);
+    if (0 <= ret) {
+        pmix_mca_base_var_group_deregister (ret);
+    }
+
+    pmix_mca_base_component_repository_release (component);
+}
+
+void pmix_mca_base_component_close (const pmix_mca_base_component_t *component, int output_id)
+{
+    /* Close */
+    if (NULL != component->pmix_mca_close_component) {
+        component->pmix_mca_close_component();
+        pmix_output_verbose (PMIX_MCA_BASE_VERBOSE_COMPONENT, output_id,
+                             "mca: base: close: component %s closed",
+                             component->pmix_mca_component_name);
+    }
+
+    pmix_mca_base_component_unload (component, output_id);
+}
+
+int pmix_mca_base_framework_components_close (pmix_mca_base_framework_t *framework,
+                                              const pmix_mca_base_component_t *skip)
+{
+    return pmix_mca_base_components_close (framework->framework_output,
+                                           &framework->framework_components,
+                                           skip);
+}
+
+int pmix_mca_base_components_close(int output_id, pmix_list_t *components,
+                                   const pmix_mca_base_component_t *skip)
+{
+    pmix_mca_base_component_list_item_t *cli, *next;
+
+    /* Close and unload all components in the available list, except the
+       "skip" item.  This is handy to close out all non-selected
+       components.  It's easier to simply remove the entire list and
+       then simply re-add the skip entry when done. */
+
+    PMIX_LIST_FOREACH_SAFE(cli, next, components, pmix_mca_base_component_list_item_t) {
+        if (skip == cli->cli_component) {
+            continue;
+        }
+
+        pmix_mca_base_component_close (cli->cli_component, output_id);
+        pmix_list_remove_item (components, &cli->super);
+
+        PMIX_RELEASE(cli);
+    }
+
+    /* All done */
+    return PMIX_SUCCESS;
+}
diff --git a/src/mca/base/pmix_mca_base_components_open.c b/src/mca/base/pmix_mca_base_components_open.c
new file mode 100644
index 0000000..63aa9f1
--- /dev/null
+++ b/src/mca/base/pmix_mca_base_components_open.c
@@ -0,0 +1,164 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2013 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2008-2012 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2011-2015 Los Alamos National Security, LLC.
+ *                         All rights reserved.
+ * Copyright (c) 2014      Hochschule Esslingen.  All rights reserved.
+ * Copyright (c) 2016      Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include "src/class/pmix_list.h"
+#include "src/util/argv.h"
+#include "src/util/error.h"
+#include "src/util/output.h"
+#include "src/mca/mca.h"
+#include "src/mca/base/base.h"
+#include "pmix_common.h"
+
+/*
+ * Local functions
+ */
+static int open_components(pmix_mca_base_framework_t *framework);
+
+struct pmix_mca_base_dummy_framework_list_item_t {
+    pmix_list_item_t super;
+    pmix_mca_base_framework_t framework;
+};
+
+/**
+ * Function for finding and opening either all MCA components, or the
+ * one that was specifically requested via a MCA parameter.
+ */
+int pmix_mca_base_framework_components_open (pmix_mca_base_framework_t *framework,
+                                        pmix_mca_base_open_flag_t flags)
+{
+    /* Open flags are not used at this time. Suppress compiler warning. */
+    if (flags & PMIX_MCA_BASE_OPEN_FIND_COMPONENTS) {
+        bool open_dso_components = !(flags & PMIX_MCA_BASE_OPEN_STATIC_ONLY);
+        /* Find and load requested components */
+        int ret = pmix_mca_base_component_find(NULL, framework, false, open_dso_components);
+        if (PMIX_SUCCESS != ret) {
+            return ret;
+        }
+    }
+
+    /* Open all registered components */
+    return open_components (framework);
+}
+
+/*
+ * Traverse the entire list of found components (a list of
+ * pmix_mca_base_component_t instances).  If the requested_component_names
+ * array is empty, or the name of each component in the list of found
+ * components is in the requested_components_array, try to open it.
+ * If it opens, add it to the components_available list.
+ */
+static int open_components(pmix_mca_base_framework_t *framework)
+{
+    pmix_list_t *components = &framework->framework_components;
+    uint32_t open_only_flags = PMIX_MCA_BASE_METADATA_PARAM_NONE;
+    int output_id = framework->framework_output;
+    pmix_mca_base_component_list_item_t *cli, *next;
+    int ret;
+
+    /*
+     * Pre-process the list with parameter constraints
+     * e.g., If requested to select only CR enabled components
+     *       then only make available those components.
+     *
+     * JJH Note: Currently checkpoint/restart is the only user of this
+     *           functionality. If other component constraint options are
+     *           added, then this logic can be used for all contraint
+     *           options.
+     *
+     * NTH: Logic moved to pmix_mca_base_components_filter.
+     */
+
+    /* If pmix_mca_base_framework_register_components was called with the MCA_BASE_COMPONENTS_ALL flag
+       we need to trim down and close any extra components we do not want open */
+    ret = pmix_mca_base_components_filter (framework, open_only_flags);
+    if (PMIX_SUCCESS != ret) {
+        return ret;
+    }
+
+    /* Announce */
+    pmix_output_verbose (PMIX_MCA_BASE_VERBOSE_COMPONENT, output_id,
+                         "mca: base: components_open: opening %s components",
+                         framework->framework_name);
+
+    /* Traverse the list of components */
+    PMIX_LIST_FOREACH_SAFE(cli, next, components, pmix_mca_base_component_list_item_t) {
+        const pmix_mca_base_component_t *component = cli->cli_component;
+
+        pmix_output_verbose (PMIX_MCA_BASE_VERBOSE_COMPONENT, output_id,
+                             "mca: base: components_open: found loaded component %s",
+                             component->pmix_mca_component_name);
+
+        if (NULL != component->pmix_mca_open_component) {
+            /* Call open if register didn't call it already */
+            ret = component->pmix_mca_open_component();
+
+            if (PMIX_SUCCESS == ret) {
+                pmix_output_verbose (PMIX_MCA_BASE_VERBOSE_COMPONENT, output_id,
+                                     "mca: base: components_open: "
+                                     "component %s open function successful",
+                                     component->pmix_mca_component_name);
+            } else {
+                if (PMIX_ERR_NOT_AVAILABLE != ret) {
+                    /* If the component returns PMIX_ERR_NOT_AVAILABLE,
+                       it's a cue to "silently ignore me" -- it's not a
+                       failure, it's just a way for the component to say
+                       "nope!".
+
+                       Otherwise, however, display an error.  We may end
+                       up displaying this twice, but it may go to separate
+                       streams.  So better to be redundant than to not
+                       display the error in the stream where it was
+                       expected. */
+
+                    if (pmix_mca_base_component_show_load_errors) {
+                        pmix_output_verbose (PMIX_MCA_BASE_VERBOSE_ERROR, output_id,
+                                             "mca: base: components_open: component %s "
+                                             "/ %s open function failed",
+                                             component->pmix_mca_type_name,
+                                             component->pmix_mca_component_name);
+                    }
+                    pmix_output_verbose (PMIX_MCA_BASE_VERBOSE_COMPONENT, output_id,
+                                         "mca: base: components_open: "
+                                         "component %s open function failed",
+                                         component->pmix_mca_component_name);
+                }
+
+                pmix_mca_base_component_close (component, output_id);
+
+                pmix_list_remove_item (components, &cli->super);
+                PMIX_RELEASE(cli);
+            }
+        }
+    }
+
+    /* All done */
+
+    return PMIX_SUCCESS;
+}
diff --git a/src/mca/base/pmix_mca_base_components_register.c b/src/mca/base/pmix_mca_base_components_register.c
new file mode 100644
index 0000000..fc53b41
--- /dev/null
+++ b/src/mca/base/pmix_mca_base_components_register.c
@@ -0,0 +1,163 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2012 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2008-2012 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2011-2015 Los Alamos National Security, LLC.
+ *                         All rights reserved.
+ * Copyright (c) 2016      Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include "src/class/pmix_list.h"
+#include "src/util/argv.h"
+#include "src/util/error.h"
+#include "src/util/output.h"
+#include "src/util/show_help.h"
+#include "src/mca/mca.h"
+#include "src/mca/base/base.h"
+#include "src/mca/base/pmix_mca_base_framework.h"
+#include "src/mca/base/pmix_mca_base_component_repository.h"
+#include "pmix_common.h"
+
+/*
+ * Local functions
+ */
+static int register_components(pmix_mca_base_framework_t *framework);
+/**
+ * Function for finding and opening either all MCA components, or the
+ * one that was specifically requested via a MCA parameter.
+ */
+int pmix_mca_base_framework_components_register (pmix_mca_base_framework_t *framework,
+                                            pmix_mca_base_register_flag_t flags)
+{
+    bool open_dso_components = !(flags & PMIX_MCA_BASE_REGISTER_STATIC_ONLY);
+    bool ignore_requested = !!(flags & PMIX_MCA_BASE_REGISTER_ALL);
+    int ret;
+
+    /* Find and load requested components */
+    ret = pmix_mca_base_component_find(NULL, framework, ignore_requested, open_dso_components);
+    if (PMIX_SUCCESS != ret) {
+        return ret;
+    }
+
+    /* Register all remaining components */
+    return register_components(framework);
+}
+
+/*
+ * Traverse the entire list of found components (a list of
+ * pmix_mca_base_component_t instances).  If the requested_component_names
+ * array is empty, or the name of each component in the list of found
+ * components is in the requested_components_array, try to open it.
+ * If it opens, add it to the components_available list.
+ */
+static int register_components(pmix_mca_base_framework_t *framework)
+{
+    int ret;
+    pmix_mca_base_component_t *component;
+    pmix_mca_base_component_list_item_t *cli, *next;
+    int output_id = framework->framework_output;
+
+    /* Announce */
+    pmix_output_verbose (PMIX_MCA_BASE_VERBOSE_COMPONENT, output_id,
+                         "pmix:mca: base: components_register: registering framework %s components",
+                         framework->framework_name);
+
+    /* Traverse the list of found components */
+
+    PMIX_LIST_FOREACH_SAFE(cli, next, &framework->framework_components, pmix_mca_base_component_list_item_t) {
+        component = (pmix_mca_base_component_t *)cli->cli_component;
+
+        pmix_output_verbose(PMIX_MCA_BASE_VERBOSE_COMPONENT, output_id,
+                            "pmix:mca: base: components_register: found loaded component %s",
+                            component->pmix_mca_component_name);
+
+        /* Call the component's MCA parameter registration function (or open if register doesn't exist) */
+        if (NULL == component->pmix_mca_register_component_params) {
+            pmix_output_verbose (PMIX_MCA_BASE_VERBOSE_COMPONENT, output_id,
+                                 "pmix:mca: base: components_register: "
+                                 "component %s has no register or open function",
+                                 component->pmix_mca_component_name);
+            ret = PMIX_SUCCESS;
+        } else {
+            ret = component->pmix_mca_register_component_params();
+        }
+
+        if (PMIX_SUCCESS != ret) {
+            if (PMIX_ERR_NOT_AVAILABLE != ret) {
+                /* If the component returns PMIX_ERR_NOT_AVAILABLE,
+                   it's a cue to "silently ignore me" -- it's not a
+                   failure, it's just a way for the component to say
+                   "nope!".
+
+                   Otherwise, however, display an error.  We may end
+                   up displaying this twice, but it may go to separate
+                   streams.  So better to be redundant than to not
+                   display the error in the stream where it was
+                   expected. */
+
+                if (pmix_mca_base_component_show_load_errors) {
+                    pmix_output_verbose (PMIX_MCA_BASE_VERBOSE_ERROR, output_id,
+                                         "pmix:mca: base: components_register: component %s "
+                                         "/ %s register function failed",
+                                         component->pmix_mca_type_name,
+                                         component->pmix_mca_component_name);
+                }
+
+                pmix_output_verbose (PMIX_MCA_BASE_VERBOSE_COMPONENT, output_id,
+                                     "pmix:mca: base: components_register: "
+                                     "component %s register function failed",
+                                     component->pmix_mca_component_name);
+            }
+
+            pmix_list_remove_item (&framework->framework_components, &cli->super);
+
+            /* Release this list item */
+            PMIX_RELEASE(cli);
+            continue;
+        }
+
+        if (NULL != component->pmix_mca_register_component_params) {
+            pmix_output_verbose (PMIX_MCA_BASE_VERBOSE_COMPONENT, output_id, "pmix:mca: base: components_register: "
+                                 "component %s register function successful",
+                                 component->pmix_mca_component_name);
+        }
+
+        /* Register this component's version */
+        pmix_mca_base_component_var_register (component, "major_version", NULL, PMIX_MCA_BASE_VAR_TYPE_INT, NULL,
+                                         0, PMIX_MCA_BASE_VAR_FLAG_DEFAULT_ONLY | PMIX_MCA_BASE_VAR_FLAG_INTERNAL,
+                                         PMIX_INFO_LVL_9, PMIX_MCA_BASE_VAR_SCOPE_CONSTANT,
+                                         &component->pmix_mca_component_major_version);
+        pmix_mca_base_component_var_register (component, "minor_version", NULL, PMIX_MCA_BASE_VAR_TYPE_INT, NULL,
+                                         0, PMIX_MCA_BASE_VAR_FLAG_DEFAULT_ONLY | PMIX_MCA_BASE_VAR_FLAG_INTERNAL,
+                                         PMIX_INFO_LVL_9, PMIX_MCA_BASE_VAR_SCOPE_CONSTANT,
+                                         &component->pmix_mca_component_minor_version);
+        pmix_mca_base_component_var_register (component, "release_version", NULL, PMIX_MCA_BASE_VAR_TYPE_INT, NULL,
+                                         0, PMIX_MCA_BASE_VAR_FLAG_DEFAULT_ONLY | PMIX_MCA_BASE_VAR_FLAG_INTERNAL,
+                                         PMIX_INFO_LVL_9, PMIX_MCA_BASE_VAR_SCOPE_CONSTANT,
+                                         &component->pmix_mca_component_release_version);
+    }
+
+    /* All done */
+
+    return PMIX_SUCCESS;
+}
diff --git a/src/mca/base/pmix_mca_base_components_select.c b/src/mca/base/pmix_mca_base_components_select.c
new file mode 100644
index 0000000..b039bf6
--- /dev/null
+++ b/src/mca/base/pmix_mca_base_components_select.c
@@ -0,0 +1,147 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2015      Los Alamos National Security, LLC. All rights
+ *                         reserved.
+ * Copyright (c) 2015-2016 Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
+#include "src/class/pmix_list.h"
+#include "src/util/error.h"
+#include "src/util/output.h"
+#include "src/mca/mca.h"
+#include "src/mca/base/base.h"
+#include "src/mca/base/pmix_mca_base_component_repository.h"
+#include "pmix_common.h"
+
+
+int pmix_mca_base_select(const char *type_name, int output_id,
+                         pmix_list_t *components_available,
+                         pmix_mca_base_module_t **best_module,
+                         pmix_mca_base_component_t **best_component,
+                         int *priority_out)
+{
+    pmix_mca_base_component_list_item_t *cli = NULL;
+    pmix_mca_base_component_t *component = NULL;
+    pmix_mca_base_module_t *module = NULL;
+    int priority = 0, best_priority = INT32_MIN;
+    int rc;
+
+    *best_module = NULL;
+    *best_component = NULL;
+
+    pmix_output_verbose (PMIX_MCA_BASE_VERBOSE_COMPONENT, output_id,
+                         "mca:base:select: Auto-selecting %s components",
+                         type_name);
+
+    /*
+     * Traverse the list of available components.
+     * For each call their 'query' functions to determine relative priority.
+     */
+    PMIX_LIST_FOREACH(cli, components_available, pmix_mca_base_component_list_item_t) {
+        component = (pmix_mca_base_component_t *) cli->cli_component;
+
+        /*
+         * If there is a query function then use it.
+         */
+        if (NULL == component->pmix_mca_query_component) {
+            pmix_output_verbose (PMIX_MCA_BASE_VERBOSE_COMPONENT, output_id,
+                                 "mca:base:select:(%5s) Skipping component [%s]. It does not implement a query function",
+                                 type_name, component->pmix_mca_component_name );
+            continue;
+        }
+
+        /*
+         * Query this component for the module and priority
+         */
+        pmix_output_verbose (PMIX_MCA_BASE_VERBOSE_COMPONENT, output_id,
+                             "mca:base:select:(%5s) Querying component [%s]",
+                             type_name, component->pmix_mca_component_name);
+
+        rc = component->pmix_mca_query_component(&module, &priority);
+        if (PMIX_ERR_FATAL == rc) {
+            /* a fatal error was detected by this component - e.g., the
+             * user specified a required element and the component could
+             * not find it. In this case, we must not continue as we might
+             * find some other component that could run, causing us to do
+             * something the user didn't want */
+             return rc;
+        } else if (PMIX_SUCCESS != rc) {
+            /* silently skip this component */
+            continue;
+        }
+
+        /*
+         * If no module was returned, then skip component
+         */
+        if (NULL == module) {
+            pmix_output_verbose (PMIX_MCA_BASE_VERBOSE_COMPONENT, output_id,
+                                 "mca:base:select:(%5s) Skipping component [%s]. Query failed to return a module",
+                                 type_name, component->pmix_mca_component_name );
+            continue;
+        }
+
+        /*
+         * Determine if this is the best module we have seen by looking the priority
+         */
+        pmix_output_verbose (PMIX_MCA_BASE_VERBOSE_COMPONENT, output_id,
+                             "mca:base:select:(%5s) Query of component [%s] set priority to %d",
+                             type_name, component->pmix_mca_component_name, priority);
+        if (priority > best_priority) {
+            best_priority  = priority;
+            *best_component = component;
+            *best_module    = module;
+        }
+    }
+
+    if (priority_out) {
+        *priority_out = best_priority;
+    }
+
+    /*
+     * Finished querying all components.
+     * Make sure we found something in the process.
+     */
+    if (NULL == *best_component) {
+        pmix_output_verbose (PMIX_MCA_BASE_VERBOSE_COMPONENT, output_id,
+                            "mca:base:select:(%5s) No component selected!",
+                            type_name);
+        /*
+         * Still close the non-selected components
+         */
+        pmix_mca_base_components_close(0, /* Pass 0 to keep this from closing the output handle */
+                                  components_available,
+                                  NULL);
+        return PMIX_ERR_NOT_FOUND;
+    }
+
+    pmix_output_verbose (PMIX_MCA_BASE_VERBOSE_COMPONENT, output_id,
+                         "mca:base:select:(%5s) Selected component [%s]",
+                         type_name, (*best_component)->pmix_mca_component_name);
+
+    /*
+     * Close the non-selected components
+     */
+    pmix_mca_base_components_close(output_id,
+                                   components_available,
+                                   (pmix_mca_base_component_t *) (*best_component));
+
+
+    return PMIX_SUCCESS;
+}
diff --git a/src/mca/base/pmix_mca_base_framework.c b/src/mca/base/pmix_mca_base_framework.c
new file mode 100644
index 0000000..3e0ddfa
--- /dev/null
+++ b/src/mca/base/pmix_mca_base_framework.c
@@ -0,0 +1,242 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2012-2015 Los Alamos National Security, LLC. All rights
+ *                         reserved.
+ * Copyright (c) 2015      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2016      Intel, Inc. All rights reserved
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+
+#include "pmix_common.h"
+#include "src/util/output.h"
+
+#include "pmix_mca_base_framework.h"
+#include "pmix_mca_base_var.h"
+#include "src/mca/base/base.h"
+
+bool pmix_mca_base_framework_is_registered (struct pmix_mca_base_framework_t *framework)
+{
+    return !!(framework->framework_flags & PMIX_MCA_BASE_FRAMEWORK_FLAG_REGISTERED);
+}
+
+bool pmix_mca_base_framework_is_open (struct pmix_mca_base_framework_t *framework)
+{
+    return !!(framework->framework_flags & PMIX_MCA_BASE_FRAMEWORK_FLAG_OPEN);
+}
+
+static void framework_open_output (struct pmix_mca_base_framework_t *framework)
+{
+    if (0 < framework->framework_verbose) {
+        if (-1 == framework->framework_output) {
+            framework->framework_output = pmix_output_open (NULL);
+        }
+        pmix_output_set_verbosity(framework->framework_output,
+                                  framework->framework_verbose);
+    } else if (-1 != framework->framework_output) {
+        pmix_output_close (framework->framework_output);
+        framework->framework_output = -1;
+    }
+}
+
+static void framework_close_output (struct pmix_mca_base_framework_t *framework)
+{
+    if (-1 != framework->framework_output) {
+        pmix_output_close (framework->framework_output);
+        framework->framework_output = -1;
+    }
+}
+
+int pmix_mca_base_framework_register (struct pmix_mca_base_framework_t *framework,
+                                 pmix_mca_base_register_flag_t flags)
+{
+    char *desc;
+    int ret;
+
+    assert (NULL != framework);
+
+    framework->framework_refcnt++;
+
+    if (pmix_mca_base_framework_is_registered (framework)) {
+        return PMIX_SUCCESS;
+    }
+
+    PMIX_CONSTRUCT(&framework->framework_components, pmix_list_t);
+
+    if (framework->framework_flags & PMIX_MCA_BASE_FRAMEWORK_FLAG_NO_DSO) {
+        flags |= PMIX_MCA_BASE_REGISTER_STATIC_ONLY;
+    }
+
+    if (!(PMIX_MCA_BASE_FRAMEWORK_FLAG_NOREGISTER & framework->framework_flags)) {
+        /* register this framework with the MCA variable system */
+        ret = pmix_mca_base_var_group_register (framework->framework_project,
+                                           framework->framework_name,
+                                           NULL, framework->framework_description);
+        if (0 > ret) {
+            return ret;
+        }
+
+        asprintf (&desc, "Default selection set of components for the %s framework (<none>"
+                  " means use all components that can be found)", framework->framework_name);
+        ret = pmix_mca_base_var_register (framework->framework_project, framework->framework_name,
+                                     NULL, NULL, desc, PMIX_MCA_BASE_VAR_TYPE_STRING, NULL, 0,
+                                     PMIX_MCA_BASE_VAR_FLAG_SETTABLE, PMIX_INFO_LVL_2,
+                                     PMIX_MCA_BASE_VAR_SCOPE_ALL_EQ, &framework->framework_selection);
+        free (desc);
+        if (0 > ret) {
+            return ret;
+        }
+
+        /* register a verbosity variable for this framework */
+        ret = asprintf (&desc, "Verbosity level for the %s framework (default: 0)",
+                        framework->framework_name);
+        if (0 > ret) {
+            return PMIX_ERR_OUT_OF_RESOURCE;
+        }
+
+        framework->framework_verbose = PMIX_MCA_BASE_VERBOSE_ERROR;
+        ret = pmix_mca_base_framework_var_register (framework, "verbose", desc,
+                                               PMIX_MCA_BASE_VAR_TYPE_INT,
+                                               &pmix_mca_base_var_enum_verbose, 0,
+                                               PMIX_MCA_BASE_VAR_FLAG_SETTABLE,
+                                               PMIX_INFO_LVL_8,
+                                               PMIX_MCA_BASE_VAR_SCOPE_LOCAL,
+                                               &framework->framework_verbose);
+        free(desc);
+        if (0 > ret) {
+            return ret;
+        }
+
+        /* check the initial verbosity and open the output if necessary. we
+           will recheck this on open */
+        framework_open_output (framework);
+
+        /* register framework variables */
+        if (NULL != framework->framework_register) {
+            ret = framework->framework_register (flags);
+            if (PMIX_SUCCESS != ret) {
+                return ret;
+            }
+        }
+
+        /* register components variables */
+        ret = pmix_mca_base_framework_components_register (framework, flags);
+        if (PMIX_SUCCESS != ret) {
+            return ret;
+        }
+    }
+
+    framework->framework_flags |= PMIX_MCA_BASE_FRAMEWORK_FLAG_REGISTERED;
+
+    /* framework did not provide a register function */
+    return PMIX_SUCCESS;
+}
+
+int pmix_mca_base_framework_open (struct pmix_mca_base_framework_t *framework,
+                             pmix_mca_base_open_flag_t flags) {
+    int ret;
+
+    assert (NULL != framework);
+
+    /* register this framework before opening it */
+    ret = pmix_mca_base_framework_register (framework, PMIX_MCA_BASE_REGISTER_DEFAULT);
+    if (PMIX_SUCCESS != ret) {
+        return ret;
+    }
+
+    /* check if this framework is already open */
+    if (pmix_mca_base_framework_is_open (framework)) {
+        return PMIX_SUCCESS;
+    }
+
+    if (PMIX_MCA_BASE_FRAMEWORK_FLAG_NOREGISTER & framework->framework_flags) {
+        flags |= PMIX_MCA_BASE_OPEN_FIND_COMPONENTS;
+
+        if (PMIX_MCA_BASE_FRAMEWORK_FLAG_NO_DSO & framework->framework_flags) {
+            flags |= PMIX_MCA_BASE_OPEN_STATIC_ONLY;
+        }
+    }
+
+    /* lock all of this frameworks's variables */
+    ret = pmix_mca_base_var_group_find (framework->framework_project,
+                                   framework->framework_name,
+                                   NULL);
+    pmix_mca_base_var_group_set_var_flag (ret, PMIX_MCA_BASE_VAR_FLAG_SETTABLE, false);
+
+    /* check the verbosity level and open (or close) the output */
+    framework_open_output (framework);
+
+    if (NULL != framework->framework_open) {
+        ret = framework->framework_open (flags);
+    } else {
+        ret = pmix_mca_base_framework_components_open (framework, flags);
+    }
+
+    if (PMIX_SUCCESS != ret) {
+        framework->framework_refcnt--;
+    } else {
+        framework->framework_flags |= PMIX_MCA_BASE_FRAMEWORK_FLAG_OPEN;
+    }
+
+    return ret;
+}
+
+int pmix_mca_base_framework_close (struct pmix_mca_base_framework_t *framework) {
+    bool is_open = pmix_mca_base_framework_is_open (framework);
+    bool is_registered = pmix_mca_base_framework_is_registered (framework);
+    int ret, group_id;
+
+    assert (NULL != framework);
+
+    if (!(is_open || is_registered)) {
+        return PMIX_SUCCESS;
+    }
+
+    assert (framework->framework_refcnt);
+    if (--framework->framework_refcnt) {
+        return PMIX_SUCCESS;
+    }
+
+    /* find and deregister all component groups and variables */
+    group_id = pmix_mca_base_var_group_find (framework->framework_project,
+                                        framework->framework_name, NULL);
+    if (0 <= group_id) {
+        (void) pmix_mca_base_var_group_deregister (group_id);
+    }
+
+    /* close the framework and all of its components */
+    if (is_open) {
+        if (NULL != framework->framework_close) {
+            ret = framework->framework_close ();
+        } else {
+            ret = pmix_mca_base_framework_components_close (framework, NULL);
+        }
+
+        if (PMIX_SUCCESS != ret) {
+            return ret;
+        }
+    } else {
+        pmix_list_item_t *item;
+        while (NULL != (item = pmix_list_remove_first (&framework->framework_components))) {
+            pmix_mca_base_component_list_item_t *cli;
+            cli = (pmix_mca_base_component_list_item_t*) item;
+            pmix_mca_base_component_unload(cli->cli_component,
+                                           framework->framework_output);
+            PMIX_RELEASE(item);
+        }
+        ret = PMIX_SUCCESS;
+    }
+
+    framework->framework_flags &= ~(PMIX_MCA_BASE_FRAMEWORK_FLAG_REGISTERED | PMIX_MCA_BASE_FRAMEWORK_FLAG_OPEN);
+
+    PMIX_DESTRUCT(&framework->framework_components);
+
+    framework_close_output (framework);
+
+    return ret;
+}
diff --git a/src/mca/base/pmix_mca_base_framework.h b/src/mca/base/pmix_mca_base_framework.h
new file mode 100644
index 0000000..d62c589
--- /dev/null
+++ b/src/mca/base/pmix_mca_base_framework.h
@@ -0,0 +1,244 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2012-2015 Los Alamos National Security, LLC. All rights
+ *                         reserved.
+ * Copyright (c) 2016      Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#if !defined(PMIX_MCA_BASE_FRAMEWORK_H)
+#define PMIX_MCA_BASE_FRAMEWORK_H
+#include <src/include/pmix_config.h>
+
+#include "src/mca/mca.h"
+#include "src/class/pmix_list.h"
+
+/*
+ * Register and open flags
+ */
+enum pmix_mca_base_register_flag_t {
+    PMIX_MCA_BASE_REGISTER_DEFAULT     = 0,
+    /** Register all components (ignore selection MCA variables) */
+    PMIX_MCA_BASE_REGISTER_ALL         = 1,
+    /** Do not register DSO components */
+    PMIX_MCA_BASE_REGISTER_STATIC_ONLY = 2
+};
+
+typedef enum pmix_mca_base_register_flag_t pmix_mca_base_register_flag_t;
+
+enum pmix_mca_base_open_flag_t {
+    PMIX_MCA_BASE_OPEN_DEFAULT         = 0,
+    /** Find components in pmix_mca_base_components_find. Used by
+     pmix_mca_base_framework_open() when NOREGISTER is specified
+     by the framework */
+    PMIX_MCA_BASE_OPEN_FIND_COMPONENTS = 1,
+    /** Do not open DSO components */
+    PMIX_MCA_BASE_OPEN_STATIC_ONLY     = 2,
+};
+
+typedef enum pmix_mca_base_open_flag_t pmix_mca_base_open_flag_t;
+
+
+/**
+ * Register the MCA framework parameters
+ *
+ * @param[in] flags Registration flags (see mca/base/base.h)
+ *
+ * @retval PMIX_SUCCESS on success
+ * @retval pmix error code on failure
+ *
+ * This function registers all framework MCA parameters. This
+ * function should not call pmix_mca_base_framework_components_register().
+ *
+ * Frameworks are NOT required to provide this function. It
+ * may be NULL.
+ */
+typedef int (*pmix_mca_base_framework_register_params_fn_t) (pmix_mca_base_register_flag_t flags);
+
+/**
+ * Initialize the MCA framework
+ *
+ * @retval PMIX_SUCCESS Upon success
+ * @retval PMIX_ERROR Upon failure
+ *
+ * This must be the first function invoked in the MCA framework.
+ * It initializes the MCA framework, finds and opens components,
+ * populates the components list, etc.
+ *
+ * This function is invoked during pmix_init() and during the
+ * initialization of the special case of the ompi_info command.
+ *
+ * This function fills in the components framework value, which
+ * is a list of all components that were successfully opened.
+ * This variable should \em only be used by other framework base
+ * functions or by ompi_info -- it is not considered a public
+ * interface member -- and is only mentioned here for completeness.
+ *
+ * Any resources allocated by this function must be freed
+ * in the framework close function.
+ *
+ * Frameworks are NOT required to provide this function. It may
+ * be NULL. If a framework does not provide an open function the
+ * default behavior of pmix_mca_base_framework_open() is to call
+ * pmix_mca_base_framework_components_open(). If a framework provides
+ * an open function it will need to call pmix_mca_base_framework_components_open()
+ * if it needs to open any components.
+ */
+typedef int (*pmix_mca_base_framework_open_fn_t) (pmix_mca_base_open_flag_t flags);
+
+/**
+ * Shut down the MCA framework.
+ *
+ * @retval PMIX_SUCCESS Always
+ *
+ * This function should shut downs everything in the MCA
+ * framework, and is called during pmix_finalize() and the
+ * special case of the ompi_info command.
+ *
+ * It must be the last function invoked on the MCA framework.
+ *
+ * Frameworks are NOT required to provide this function. It may
+ * be NULL. If a framework does not provide a close function the
+ * default behavior of pmix_mca_base_framework_close() is to call
+ * pmix_mca_base_framework_components_close(). If a framework provide
+ * a close function it will need to call pmix_mca_base_framework_components_close()
+ * if any components were opened.
+ */
+typedef int (*pmix_mca_base_framework_close_fn_t) (void);
+
+typedef enum {
+    PMIX_MCA_BASE_FRAMEWORK_FLAG_DEFAULT    = 0,
+    /** Don't register any variables for this framework */
+    PMIX_MCA_BASE_FRAMEWORK_FLAG_NOREGISTER = 1,
+    /** Internal. Don't set outside pmix_mca_base_framework.h */
+    PMIX_MCA_BASE_FRAMEWORK_FLAG_REGISTERED = 2,
+    /** Framework does not have any DSO components */
+    PMIX_MCA_BASE_FRAMEWORK_FLAG_NO_DSO     = 4,
+    /** Internal. Don't set outside pmix_mca_base_framework.h */
+    PMIX_MCA_BASE_FRAMEWORK_FLAG_OPEN       = 8,
+    /**
+     * The upper 16 bits are reserved for project specific flags.
+     */
+} pmix_mca_base_framework_flags_t;
+
+typedef struct pmix_mca_base_framework_t {
+    /** Project name for this component (ex "pmix") */
+    char                                    *framework_project;
+    /** Framework name */
+    char                                    *framework_name;
+    /** Description of this framework or NULL */
+    const char                              *framework_description;
+    /** Framework register function or NULL if the framework
+        and all its components have nothing to register */
+    pmix_mca_base_framework_register_params_fn_t  framework_register;
+    /** Framework open function or NULL */
+    pmix_mca_base_framework_open_fn_t             framework_open;
+    /** Framework close function or NULL */
+    pmix_mca_base_framework_close_fn_t            framework_close;
+    /** Framework flags (future use) set to 0 */
+    pmix_mca_base_framework_flags_t               framework_flags;
+    /** Framework open count */
+    int                                      framework_refcnt;
+    /** List of static components */
+    const pmix_mca_base_component_t             **framework_static_components;
+    /** Component selection. This will be registered with the MCA
+        variable system and should be either NULL (all components) or
+        a heap allocated, comma-delimited list of components. */
+    char                                    *framework_selection;
+    /** Verbosity level (0-100) */
+    int                                      framework_verbose;
+    /** Pmix output for this framework (or -1) */
+    int                                      framework_output;
+    /** List of selected components (filled in by pmix_mca_base_framework_register()
+        or pmix_mca_base_framework_open() */
+    pmix_list_t                              framework_components;
+} pmix_mca_base_framework_t;
+
+
+/**
+ * Register a framework with MCA.
+ *
+ * @param[in] framework framework to register
+ *
+ * @retval PMIX_SUCCESS Upon success
+ * @retval PMIX_ERROR Upon failure
+ *
+ * Call a framework's register function.
+ */
+int pmix_mca_base_framework_register (pmix_mca_base_framework_t *framework,
+                                      pmix_mca_base_register_flag_t flags);
+
+/**
+ * Open a framework
+ *
+ * @param[in] framework framework to open
+ *
+ * @retval PMIX_SUCCESS Upon success
+ * @retval PMIX_ERROR Upon failure
+ *
+ * Call a framework's open function.
+ */
+int pmix_mca_base_framework_open (pmix_mca_base_framework_t *framework,
+                                  pmix_mca_base_open_flag_t flags);
+
+/**
+ * Close a framework
+ *
+ * @param[in] framework framework to close
+ *
+ * @retval PMIX_SUCCESS Upon success
+ * @retval PMIX_ERROR Upon failure
+ *
+ * Call a framework's close function.
+ */
+int pmix_mca_base_framework_close (pmix_mca_base_framework_t *framework);
+
+
+/**
+ * Check if a framework is already registered
+ *
+ * @param[in] framework framework to query
+ *
+ * @retval true if the framework's mca variables are registered
+ * @retval false if not
+ */
+bool pmix_mca_base_framework_is_registered (struct pmix_mca_base_framework_t *framework);
+
+
+/**
+ * Check if a framework is already open
+ *
+ * @param[in] framework framework to query
+ *
+ * @retval true if the framework is open
+ * @retval false if not
+ */
+bool pmix_mca_base_framework_is_open (struct pmix_mca_base_framework_t *framework);
+
+
+/**
+ * Macro to declare an MCA framework
+ *
+ * Example:
+ *  PMIX_MCA_BASE_FRAMEWORK_DECLARE(pmix, foo, NULL, pmix_foo_open, pmix_foo_close, MCA_BASE_FRAMEWORK_FLAG_LAZY)
+ */
+#define PMIX_MCA_BASE_FRAMEWORK_DECLARE(project, name, description, registerfn, openfn, closefn, static_components, flags) \
+    pmix_mca_base_framework_t project##_##name##_base_framework = {   \
+        .framework_project           = #project,                        \
+        .framework_name              = #name,                           \
+        .framework_description       = description,                     \
+        .framework_register          = registerfn,                      \
+        .framework_open              = openfn,                          \
+        .framework_close             = closefn,                         \
+        .framework_flags             = flags,                           \
+        .framework_refcnt            = 0,                               \
+        .framework_static_components = static_components,               \
+        .framework_selection         = NULL,                            \
+        .framework_verbose           = 0,                               \
+        .framework_output            = -1}
+
+#endif /* PMIX_MCA_BASE_FRAMEWORK_H */
diff --git a/src/mca/base/pmix_mca_base_list.c b/src/mca/base/pmix_mca_base_list.c
new file mode 100644
index 0000000..1d5f8b6
--- /dev/null
+++ b/src/mca/base/pmix_mca_base_list.c
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2005 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2016      Intel, Inc. All rights reserved
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+
+#include "src/class/pmix_list.h"
+#include "src/mca/base/base.h"
+
+
+/*
+ * Local functions
+ */
+static void cl_constructor(pmix_object_t *obj);
+static void cpl_constructor(pmix_object_t *obj);
+
+
+/*
+ * Class instance of the pmix_mca_base_component_list_item_t class
+ */
+PMIX_CLASS_INSTANCE(pmix_mca_base_component_list_item_t,
+                   pmix_list_item_t, cl_constructor, NULL);
+
+
+/*
+ * Class instance of the pmix_mca_base_component_priority_list_item_t class
+ */
+PMIX_CLASS_INSTANCE(pmix_mca_base_component_priority_list_item_t,
+                   pmix_mca_base_component_list_item_t, cpl_constructor, NULL);
+
+
+/*
+ * Just do basic sentinel intialization
+ */
+static void cl_constructor(pmix_object_t *obj)
+{
+  pmix_mca_base_component_list_item_t *cli = (pmix_mca_base_component_list_item_t *) obj;
+  cli->cli_component = NULL;
+}
+
+
+/*
+ * Just do basic sentinel intialization
+ */
+static void cpl_constructor(pmix_object_t *obj)
+{
+  pmix_mca_base_component_priority_list_item_t *cpli =
+    (pmix_mca_base_component_priority_list_item_t *) obj;
+  cpli->cpli_priority = -1;
+}
diff --git a/src/mca/base/pmix_mca_base_open.c b/src/mca/base/pmix_mca_base_open.c
new file mode 100644
index 0000000..6536c4d
--- /dev/null
+++ b/src/mca/base/pmix_mca_base_open.c
@@ -0,0 +1,253 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2008 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2011      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2015      Los Alamos National Security, LLC. All rights
+ *                         reserved.
+ * Copyright (c) 2016-2017 Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+
+#include <stdio.h>
+#include <string.h>
+#ifdef HAVE_SYSLOG_H
+#include <syslog.h>
+#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#include "src/mca/pinstalldirs/pinstalldirs.h"
+#include "src/util/output.h"
+#include "src/util/printf.h"
+#include "src/mca/mca.h"
+#include "src/mca/base/base.h"
+#include "src/mca/base/pmix_mca_base_component_repository.h"
+#include "pmix_common.h"
+#include "src/util/pmix_environ.h"
+
+/*
+ * Public variables
+ */
+char *pmix_mca_base_component_path = NULL;
+int pmix_mca_base_opened = 0;
+char *pmix_mca_base_system_default_path = NULL;
+char *pmix_mca_base_user_default_path = NULL;
+bool pmix_mca_base_component_show_load_errors = true;
+bool pmix_mca_base_component_disable_dlopen = false;
+
+static char *pmix_mca_base_verbose = NULL;
+
+/*
+ * Private functions
+ */
+static void set_defaults(pmix_output_stream_t *lds);
+static void parse_verbose(char *e, pmix_output_stream_t *lds);
+
+
+/*
+ * Main MCA initialization.
+ */
+int pmix_mca_base_open(void)
+{
+    char *value;
+    pmix_output_stream_t lds;
+    char hostname[64];
+    int var_id;
+
+    if (pmix_mca_base_opened++) {
+        return PMIX_SUCCESS;
+    }
+
+    /* define the system and user default paths */
+#if PMIX_WANT_HOME_CONFIG_FILES
+    pmix_mca_base_system_default_path = strdup(pmix_pinstall_dirs.pmixlibdir);
+    asprintf(&pmix_mca_base_user_default_path, "%s"PMIX_PATH_SEP".pmix"PMIX_PATH_SEP"components", pmix_home_directory());
+#else
+    asprintf(&pmix_mca_base_system_default_path, "%s", pmix_pinstall_dirs.pmixlibdir);
+#endif
+
+    /* see if the user wants to override the defaults */
+    if (NULL == pmix_mca_base_user_default_path) {
+        value = strdup(pmix_mca_base_system_default_path);
+    } else {
+        asprintf(&value, "%s%c%s", pmix_mca_base_system_default_path,
+                 PMIX_ENV_SEP, pmix_mca_base_user_default_path);
+    }
+
+    pmix_mca_base_component_path = value;
+    var_id = pmix_mca_base_var_register("pmix", "mca", "base", "component_path",
+                                   "Path where to look for additional components",
+                                   PMIX_MCA_BASE_VAR_TYPE_STRING, NULL, 0, 0,
+                                   PMIX_INFO_LVL_9,
+                                   PMIX_MCA_BASE_VAR_SCOPE_READONLY,
+                                   &pmix_mca_base_component_path);
+    (void) pmix_mca_base_var_register_synonym(var_id, "pmix", "mca", NULL, "component_path",
+                                              PMIX_MCA_BASE_VAR_SYN_FLAG_DEPRECATED);
+    free(value);
+
+    pmix_mca_base_component_show_load_errors = true;
+    var_id = pmix_mca_base_var_register("pmix", "mca", "base", "component_show_load_errors",
+                                   "Whether to show errors for components that failed to load or not",
+                                   PMIX_MCA_BASE_VAR_TYPE_BOOL, NULL, 0, 0,
+                                   PMIX_INFO_LVL_9,
+                                   PMIX_MCA_BASE_VAR_SCOPE_READONLY,
+                                   &pmix_mca_base_component_show_load_errors);
+    (void) pmix_mca_base_var_register_synonym(var_id, "pmix", "mca", NULL, "component_show_load_errors",
+                                              PMIX_MCA_BASE_VAR_SYN_FLAG_DEPRECATED);
+
+    pmix_mca_base_component_disable_dlopen = false;
+    var_id = pmix_mca_base_var_register("pmix", "mca", "base", "component_disable_dlopen",
+                                   "Whether to attempt to disable opening dynamic components or not",
+                                   PMIX_MCA_BASE_VAR_TYPE_BOOL, NULL, 0, 0,
+                                   PMIX_INFO_LVL_9,
+                                   PMIX_MCA_BASE_VAR_SCOPE_READONLY,
+                                   &pmix_mca_base_component_disable_dlopen);
+    (void) pmix_mca_base_var_register_synonym(var_id, "pmix", "mca", NULL, "component_disable_dlopen",
+                                              PMIX_MCA_BASE_VAR_SYN_FLAG_DEPRECATED);
+
+    /* What verbosity level do we want for the default 0 stream? */
+    pmix_mca_base_verbose = "stderr";
+    var_id = pmix_mca_base_var_register("pmix", "mca", "base", "verbose",
+                                   "Specifies where the default error output stream goes (this is separate from distinct help messages).  Accepts a comma-delimited list of: stderr, stdout, syslog, syslogpri:<notice|info|debug>, syslogid:<str> (where str is the prefix string for all syslog notices), file[:filename] (if filename is not specified, a default filename is used), fileappend (if not specified, the file is opened for truncation), level[:N] (if specified, integer verbose level; ot [...]
+                                   PMIX_MCA_BASE_VAR_TYPE_STRING, NULL, 0, 0,
+                                   PMIX_INFO_LVL_9,
+                                   PMIX_MCA_BASE_VAR_SCOPE_READONLY,
+                                   &pmix_mca_base_verbose);
+    (void) pmix_mca_base_var_register_synonym(var_id, "pmix", "mca", NULL, "verbose",
+                                              PMIX_MCA_BASE_VAR_SYN_FLAG_DEPRECATED);
+
+    memset(&lds, 0, sizeof(lds));
+    if (NULL != pmix_mca_base_verbose) {
+        parse_verbose(pmix_mca_base_verbose, &lds);
+    } else {
+        set_defaults(&lds);
+    }
+    gethostname(hostname, 64);
+    asprintf(&lds.lds_prefix, "[%s:%05d] ", hostname, getpid());
+    pmix_output_reopen(0, &lds);
+    pmix_output_verbose (PMIX_MCA_BASE_VERBOSE_COMPONENT, 0,
+                         "mca: base: opening components at %s", pmix_mca_base_component_path);
+    free(lds.lds_prefix);
+
+    /* Open up the component repository */
+
+    return pmix_mca_base_component_repository_init();
+}
+
+
+/*
+ * Set sane default values for the lds
+ */
+static void set_defaults(pmix_output_stream_t *lds)
+{
+
+    /* Load up defaults */
+
+    PMIX_CONSTRUCT(lds, pmix_output_stream_t);
+    lds->lds_syslog_priority = LOG_INFO;
+    lds->lds_syslog_ident = "ompi";
+    lds->lds_want_stderr = true;
+}
+
+
+/*
+ * Parse the value of an environment variable describing verbosity
+ */
+static void parse_verbose(char *e, pmix_output_stream_t *lds)
+{
+    char *edup;
+    char *ptr, *next;
+    bool have_output = false;
+
+    if (NULL == e) {
+        return;
+    }
+
+    edup = strdup(e);
+    ptr = edup;
+
+    /* Now parse the environment variable */
+
+    while (NULL != ptr && strlen(ptr) > 0) {
+        next = strchr(ptr, ',');
+        if (NULL != next) {
+            *next = '\0';
+        }
+
+        if (0 == strcasecmp(ptr, "syslog")) {
+            lds->lds_want_syslog = true;
+            have_output = true;
+        }
+        else if (strncasecmp(ptr, "syslogpri:", 10) == 0) {
+            lds->lds_want_syslog = true;
+            have_output = true;
+            if (strcasecmp(ptr + 10, "notice") == 0)
+                lds->lds_syslog_priority = LOG_NOTICE;
+            else if (strcasecmp(ptr + 10, "INFO") == 0)
+                lds->lds_syslog_priority = LOG_INFO;
+            else if (strcasecmp(ptr + 10, "DEBUG") == 0)
+                lds->lds_syslog_priority = LOG_DEBUG;
+        } else if (strncasecmp(ptr, "syslogid:", 9) == 0) {
+            lds->lds_want_syslog = true;
+            lds->lds_syslog_ident = ptr + 9;
+        }
+
+        else if (strcasecmp(ptr, "stdout") == 0) {
+            lds->lds_want_stdout = true;
+            have_output = true;
+        } else if (strcasecmp(ptr, "stderr") == 0) {
+            lds->lds_want_stderr = true;
+            have_output = true;
+        }
+
+        else if (strcasecmp(ptr, "file") == 0 || strcasecmp(ptr, "file:") == 0) {
+            lds->lds_want_file = true;
+            have_output = true;
+        } else if (strncasecmp(ptr, "file:", 5) == 0) {
+            lds->lds_want_file = true;
+            lds->lds_file_suffix = strdup(ptr + 5);
+            have_output = true;
+        } else if (strcasecmp(ptr, "fileappend") == 0) {
+            lds->lds_want_file = true;
+            lds->lds_want_file_append = 1;
+            have_output = true;
+        }
+
+        else if (strncasecmp(ptr, "level", 5) == 0) {
+            lds->lds_verbose_level = 0;
+            if (ptr[5] == PMIX_ENV_SEP)
+                lds->lds_verbose_level = atoi(ptr + 6);
+        }
+
+        if (NULL == next) {
+            break;
+        }
+        ptr = next + 1;
+    }
+
+    /* If we didn't get an output, default to stderr */
+
+    if (!have_output) {
+        lds->lds_want_stderr = true;
+    }
+
+    /* All done */
+
+    free(edup);
+}
diff --git a/src/mca/base/pmix_mca_base_parse_paramfile.c b/src/mca/base/pmix_mca_base_parse_paramfile.c
new file mode 100644
index 0000000..12785f2
--- /dev/null
+++ b/src/mca/base/pmix_mca_base_parse_paramfile.c
@@ -0,0 +1,85 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2005 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2013      Los Alamos National Security, LLC. All rights
+ *                         reserved.
+ * Copyright (c) 2016      Intel, Inc. All rights reserved
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+
+#include <stdio.h>
+#include <string.h>
+
+#include "src/class/pmix_list.h"
+#include "src/mca/mca.h"
+#include "src/mca/base/base.h"
+#include "src/mca/base/pmix_mca_base_vari.h"
+#include "src/util/keyval_parse.h"
+
+static void save_value(const char *name, const char *value);
+
+static char * file_being_read;
+static pmix_list_t * _param_list;
+
+int pmix_mca_base_parse_paramfile(const char *paramfile, pmix_list_t *list)
+{
+    file_being_read = (char*)paramfile;
+    _param_list = list;
+
+    return pmix_util_keyval_parse(paramfile, save_value);
+}
+
+int pmix_mca_base_internal_env_store(void)
+{
+    return pmix_util_keyval_save_internal_envars(save_value);
+}
+
+static void save_value(const char *name, const char *value)
+{
+    pmix_mca_base_var_file_value_t *fv;
+    bool found = false;
+
+    /* First traverse through the list and ensure that we don't
+       already have a param of this name.  If we do, just replace the
+       value. */
+
+    PMIX_LIST_FOREACH(fv, _param_list, pmix_mca_base_var_file_value_t) {
+        if (0 == strcmp(name, fv->mbvfv_var)) {
+            if (NULL != fv->mbvfv_value) {
+                free (fv->mbvfv_value);
+            }
+            found = true;
+            break;
+        }
+    }
+
+    if (!found) {
+        /* We didn't already have the param, so append it to the list */
+        fv = PMIX_NEW(pmix_mca_base_var_file_value_t);
+        if (NULL == fv) {
+            return;
+        }
+
+        fv->mbvfv_var = strdup(name);
+        pmix_list_append(_param_list, &fv->super);
+    }
+
+    fv->mbvfv_value = value ? strdup(value) : NULL;
+    fv->mbvfv_file  = file_being_read;
+    fv->mbvfv_lineno = pmix_util_keyval_parse_lineno;
+}
diff --git a/src/mca/base/pmix_mca_base_var.c b/src/mca/base/pmix_mca_base_var.c
new file mode 100644
index 0000000..858ca1a
--- /dev/null
+++ b/src/mca/base/pmix_mca_base_var.c
@@ -0,0 +1,2255 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2012 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2008-2015 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2012-2015 Los Alamos National Security, LLC. All rights
+ *                         reserved.
+ * Copyright (c) 2014-2017 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#include <errno.h>
+
+#include "src/include/pmix_stdint.h"
+#include "src/mca/pinstalldirs/pinstalldirs.h"
+#include "src/util/os_path.h"
+#include "src/util/path.h"
+#include "src/util/show_help.h"
+#include "src/util/printf.h"
+#include "src/util/argv.h"
+#include "src/util/error.h"
+#include "src/mca/mca.h"
+#include "src/mca/base/pmix_mca_base_vari.h"
+#include "pmix_common.h"
+#include "src/util/output.h"
+#include "src/util/pmix_environ.h"
+
+/*
+ * local variables
+ */
+static pmix_pointer_array_t pmix_mca_base_vars;
+static const char *mca_prefix = "PMIX_MCA_";
+static char *home = NULL;
+static char *cwd  = NULL;
+bool pmix_mca_base_var_initialized = false;
+static char * force_agg_path = NULL;
+static char *pmix_mca_base_var_files = NULL;
+static char *pmix_mca_base_envar_files = NULL;
+static char **pmix_mca_base_var_file_list = NULL;
+static char *pmix_mca_base_var_override_file = NULL;
+static char *pmix_mca_base_var_file_prefix = NULL;
+static char *pmix_mca_base_envar_file_prefix = NULL;
+static char *pmix_mca_base_param_file_path = NULL;
+static char *pmix_mca_base_env_list = NULL;
+#define PMIX_MCA_BASE_ENV_LIST_SEP_DEFAULT ";"
+static char *pmix_mca_base_env_list_sep = PMIX_MCA_BASE_ENV_LIST_SEP_DEFAULT;
+static char *pmix_mca_base_env_list_internal = NULL;
+static bool pmix_mca_base_var_suppress_override_warning = false;
+static pmix_list_t pmix_mca_base_var_file_values;
+static pmix_list_t pmix_mca_base_envar_file_values;
+static pmix_list_t pmix_mca_base_var_override_values;
+
+static int pmix_mca_base_var_count = 0;
+
+static pmix_hash_table_t pmix_mca_base_var_index_hash;
+
+const char *pmix_var_type_names[] = {
+    "int",
+    "unsigned_int",
+    "unsigned_long",
+    "unsigned_long_long",
+    "size_t",
+    "string",
+    "version_string",
+    "bool",
+    "double"
+};
+
+const size_t pmix_var_type_sizes[] = {
+    sizeof (int),
+    sizeof (unsigned),
+    sizeof (unsigned long),
+    sizeof (unsigned long long),
+    sizeof (size_t),
+    sizeof (char),
+    sizeof (char),
+    sizeof (bool),
+    sizeof (double)
+};
+
+const char *pmix_var_source_names[] = {
+    "default",
+    "command line",
+    "environment",
+    "file",
+    "set",
+    "override"
+};
+
+
+static const char *info_lvl_strings[] = {
+    "user/basic",
+    "user/detail",
+    "user/all",
+    "tuner/basic",
+    "tuner/detail",
+    "tuner/all",
+    "dev/basic",
+    "dev/detail",
+    "dev/all"
+};
+
+/*
+ * local functions
+ */
+static int fixup_files(char **file_list, char * path, bool rel_path_search, char sep);
+static int read_files (char *file_list, pmix_list_t *file_values, char sep);
+static int var_set_initial (pmix_mca_base_var_t *var, pmix_mca_base_var_t *original);
+static int var_get (int vari, pmix_mca_base_var_t **var_out, bool original);
+static int var_value_string (pmix_mca_base_var_t *var, char **value_string);
+
+/*
+ * classes
+ */
+static void var_constructor (pmix_mca_base_var_t *p);
+static void var_destructor (pmix_mca_base_var_t *p);
+PMIX_CLASS_INSTANCE(pmix_mca_base_var_t, pmix_object_t,
+                   var_constructor, var_destructor);
+
+static void fv_constructor (pmix_mca_base_var_file_value_t *p);
+static void fv_destructor (pmix_mca_base_var_file_value_t *p);
+PMIX_CLASS_INSTANCE(pmix_mca_base_var_file_value_t, pmix_list_item_t,
+                   fv_constructor, fv_destructor);
+
+static const char *pmix_mca_base_var_source_file (const pmix_mca_base_var_t *var)
+{
+    pmix_mca_base_var_file_value_t *fv = (pmix_mca_base_var_file_value_t *) var->mbv_file_value;
+
+    if (NULL != var->mbv_source_file) {
+        return var->mbv_source_file;
+    }
+
+    if (fv) {
+        return fv->mbvfv_file;
+    }
+
+    return NULL;
+}
+
+/*
+ * Generate a full name from three names
+ */
+int pmix_mca_base_var_generate_full_name4 (const char *project, const char *framework, const char *component,
+                                      const char *variable, char **full_name)
+{
+    const char * const names[] = {project, framework, component, variable};
+    char *name, *tmp;
+    size_t i, len;
+
+    *full_name = NULL;
+
+    for (i = 0, len = 0 ; i < 4 ; ++i) {
+        if (NULL != names[i]) {
+            /* Add space for the string + _ or \0 */
+            len += strlen (names[i]) + 1;
+        }
+    }
+
+    name = calloc (1, len);
+    if (NULL == name) {
+        return PMIX_ERR_OUT_OF_RESOURCE;
+    }
+
+    for (i = 0, tmp = name ; i < 4 ; ++i) {
+        if (NULL != names[i]) {
+            if (name != tmp) {
+                *tmp++ = '_';
+            }
+            strncat (name, names[i], len - (size_t)(uintptr_t)(tmp - name));
+            tmp += strlen (names[i]);
+        }
+    }
+
+    *full_name = name;
+    return PMIX_SUCCESS;
+}
+
+static int compare_strings (const char *str1, const char *str2) {
+    if ((NULL != str1 && 0 == strcmp (str1, "*")) ||
+        (NULL == str1 && NULL == str2)) {
+        return 0;
+    }
+
+    if (NULL != str1 && NULL != str2) {
+        return strcmp (str1, str2);
+    }
+
+    return 1;
+}
+
+/*
+ * Append a filename to the file list if it does not exist and return a
+ * pointer to the filename in the list.
+ */
+static char *append_filename_to_list(const char *filename)
+{
+    int i, count;
+
+    (void) pmix_argv_append_unique_nosize(&pmix_mca_base_var_file_list, filename, false);
+
+    count = pmix_argv_count(pmix_mca_base_var_file_list);
+
+    for (i = count - 1; i >= 0; --i) {
+        if (0 == strcmp (pmix_mca_base_var_file_list[i], filename)) {
+            return pmix_mca_base_var_file_list[i];
+        }
+    }
+
+    /* *#@*? */
+    return NULL;
+}
+
+/*
+ * Set it up
+ */
+int pmix_mca_base_var_init(void)
+{
+    int ret;
+    char *name = NULL;
+
+    if (!pmix_mca_base_var_initialized) {
+        /* Init the value array for the param storage */
+
+        PMIX_CONSTRUCT(&pmix_mca_base_vars, pmix_pointer_array_t);
+        /* These values are arbitrary */
+        ret = pmix_pointer_array_init (&pmix_mca_base_vars, 128, 16384, 128);
+        if (PMIX_SUCCESS != ret) {
+            return ret;
+        }
+
+        pmix_mca_base_var_count = 0;
+
+        /* Init the file param value list */
+
+        PMIX_CONSTRUCT(&pmix_mca_base_var_file_values, pmix_list_t);
+        PMIX_CONSTRUCT(&pmix_mca_base_envar_file_values, pmix_list_t);
+        PMIX_CONSTRUCT(&pmix_mca_base_var_override_values, pmix_list_t);
+        PMIX_CONSTRUCT(&pmix_mca_base_var_index_hash, pmix_hash_table_t);
+
+        ret = pmix_hash_table_init (&pmix_mca_base_var_index_hash, 1024);
+        if (PMIX_SUCCESS != ret) {
+            return ret;
+        }
+
+        ret = pmix_mca_base_var_group_init ();
+        if  (PMIX_SUCCESS != ret) {
+            return ret;
+        }
+
+        /* Set this before we register the parameter, below */
+
+        pmix_mca_base_var_initialized = true;
+
+        pmix_mca_base_var_cache_files(false);
+
+        /* register the envar-forwarding params */
+        (void)pmix_mca_base_var_register ("pmix", "mca", "base", "env_list",
+                                     "Set SHELL env variables",
+                                     PMIX_MCA_BASE_VAR_TYPE_STRING, NULL, 0, 0, PMIX_INFO_LVL_3,
+                                     PMIX_MCA_BASE_VAR_SCOPE_READONLY, &pmix_mca_base_env_list);
+
+        pmix_mca_base_env_list_sep = PMIX_MCA_BASE_ENV_LIST_SEP_DEFAULT;
+        (void)pmix_mca_base_var_register ("pmix", "mca", "base", "env_list_delimiter",
+                                     "Set SHELL env variables delimiter. Default: semicolon ';'",
+                                     PMIX_MCA_BASE_VAR_TYPE_STRING, NULL, 0, 0, PMIX_INFO_LVL_3,
+                                     PMIX_MCA_BASE_VAR_SCOPE_READONLY, &pmix_mca_base_env_list_sep);
+
+        /* Set OMPI_MCA_pmix_mca_base_env_list variable, it might not be set before
+         * if mca variable was taken from amca conf file. Need to set it
+         * here because pmix_mca_base_var_process_env_list is called from schizo_ompi.c
+         * only when this env variable was set.
+         */
+        if (NULL != pmix_mca_base_env_list) {
+            (void) pmix_mca_base_var_env_name ("pmix_mca_base_env_list", &name);
+            if (NULL != name) {
+                pmix_setenv(name, pmix_mca_base_env_list, false, &environ);
+                free(name);
+            }
+        }
+
+        /* Register internal MCA variable pmix_mca_base_env_list_internal. It can be set only during
+         * parsing of amca conf file and contains SHELL env variables specified via -x there.
+         * Its format is the same as for pmix_mca_base_env_list.
+         */
+        (void)pmix_mca_base_var_register ("pmix", "mca", "base", "env_list_internal",
+                "Store SHELL env variables from amca conf file",
+                PMIX_MCA_BASE_VAR_TYPE_STRING, NULL, 0, PMIX_MCA_BASE_VAR_FLAG_INTERNAL, PMIX_INFO_LVL_3,
+                PMIX_MCA_BASE_VAR_SCOPE_READONLY, &pmix_mca_base_env_list_internal);
+    }
+
+    return PMIX_SUCCESS;
+}
+
+static void process_env_list(char *env_list, char ***argv, char sep)
+{
+    char** tokens;
+    char *ptr, *value;
+
+    tokens = pmix_argv_split(env_list, (int)sep);
+    if (NULL == tokens) {
+        return;
+    }
+
+    for (int i = 0 ; NULL != tokens[i] ; ++i) {
+        if (NULL == (ptr = strchr(tokens[i], '='))) {
+            value = getenv(tokens[i]);
+            if (NULL == value) {
+                pmix_show_help("help-mca-var.txt", "incorrect-env-list-param",
+                               true, tokens[i], env_list);
+                break;
+            }
+
+            /* duplicate the value to silence tainted string coverity issue */
+            value = strdup (value);
+            if (NULL == value) {
+                /* out of memory */
+                break;
+            }
+
+            if (NULL != (ptr = strchr(value, '='))) {
+                *ptr = '\0';
+                pmix_setenv(value, ptr + 1, true, argv);
+            } else {
+                pmix_setenv(tokens[i], value, true, argv);
+            }
+
+            free (value);
+        } else {
+            *ptr = '\0';
+            pmix_setenv(tokens[i], ptr + 1, true, argv);
+            /* NTH: don't bother resetting ptr to = since the string will not be used again */
+        }
+    }
+
+    pmix_argv_free(tokens);
+}
+
+int pmix_mca_base_var_process_env_list(char ***argv)
+{
+    char sep;
+    sep = ';';
+    if (NULL != pmix_mca_base_env_list_sep) {
+        if (1 == strlen(pmix_mca_base_env_list_sep)) {
+            sep = pmix_mca_base_env_list_sep[0];
+        } else {
+            pmix_show_help("help-mca-var.txt", "incorrect-env-list-sep",
+                    true, pmix_mca_base_env_list_sep);
+            return PMIX_SUCCESS;
+        }
+    }
+    if (NULL != pmix_mca_base_env_list) {
+        process_env_list(pmix_mca_base_env_list, argv, sep);
+    }
+
+    return PMIX_SUCCESS;
+}
+
+int pmix_mca_base_var_process_env_list_from_file(char ***argv)
+{
+    if (NULL != pmix_mca_base_env_list_internal) {
+        process_env_list(pmix_mca_base_env_list_internal, argv, ';');
+    }
+    return PMIX_SUCCESS;
+}
+
+static void resolve_relative_paths(char **file_prefix, char *file_path, bool rel_path_search, char **files, char sep)
+{
+    char *tmp_str;
+    /*
+     * Resolve all relative paths.
+     * the file list returned will contain only absolute paths
+     */
+    if( PMIX_SUCCESS != fixup_files(file_prefix, file_path, rel_path_search, sep) ) {
+#if 0
+        /* JJH We need to die! */
+        abort();
+#else
+        ;
+#endif
+    }
+    else {
+        /* Prepend the files to the search list */
+        asprintf(&tmp_str, "%s%c%s", *file_prefix, sep, *files);
+        free (*files);
+        *files = tmp_str;
+    }
+}
+
+int pmix_mca_base_var_cache_files(bool rel_path_search)
+{
+    char *tmp;
+    int ret;
+
+    /* We may need this later */
+    home = (char*)pmix_home_directory();
+
+    if(NULL == cwd) {
+        cwd = (char *) malloc(sizeof(char) * MAXPATHLEN);
+        if( NULL == (cwd = getcwd(cwd, MAXPATHLEN) )) {
+            pmix_output(0, "Error: Unable to get the current working directory\n");
+            cwd = strdup(".");
+        }
+    }
+
+#if PMIX_WANT_HOME_CONFIG_FILES
+    asprintf(&pmix_mca_base_var_files, "%s"PMIX_PATH_SEP".pmix" PMIX_PATH_SEP
+             "mca-params.conf%c%s" PMIX_PATH_SEP "pmix-mca-params.conf",
+             home, PMIX_ENV_SEP, pmix_pinstall_dirs.sysconfdir);
+#else
+    asprintf(&pmix_mca_base_var_files, "%s" PMIX_PATH_SEP "pmix-mca-params.conf",
+             pmix_pinstall_dirs.sysconfdir);
+#endif
+
+    /* Initialize a parameter that says where MCA param files can be found.
+       We may change this value so set the scope to PMIX_MCA_BASE_VAR_SCOPE_READONLY */
+    tmp = pmix_mca_base_var_files;
+    ret = pmix_mca_base_var_register ("pmix", "mca", "base", "param_files", "Path for MCA "
+                                 "configuration files containing variable values",
+                                 PMIX_MCA_BASE_VAR_TYPE_STRING, NULL, 0, 0, PMIX_INFO_LVL_2,
+                                 PMIX_MCA_BASE_VAR_SCOPE_READONLY, &pmix_mca_base_var_files);
+    free (tmp);
+    if (PMIX_SUCCESS != ret) {
+        return ret;
+    }
+
+    pmix_mca_base_envar_files = strdup(pmix_mca_base_var_files);
+
+    (void) pmix_mca_base_var_register_synonym (ret, "pmix", "mca", NULL, "param_files",
+                                          PMIX_MCA_BASE_VAR_SYN_FLAG_DEPRECATED);
+
+    ret = asprintf(&pmix_mca_base_var_override_file, "%s" PMIX_PATH_SEP "pmix-mca-params-override.conf",
+                   pmix_pinstall_dirs.sysconfdir);
+    if (0 > ret) {
+        return PMIX_ERR_OUT_OF_RESOURCE;
+    }
+
+    tmp = pmix_mca_base_var_override_file;
+    ret = pmix_mca_base_var_register ("pmix", "mca", "base", "override_param_file",
+                                 "Variables set in this file will override any value set in"
+                                 "the environment or another configuration file",
+                                 PMIX_MCA_BASE_VAR_TYPE_STRING, NULL, 0, PMIX_MCA_BASE_VAR_FLAG_DEFAULT_ONLY,
+                                 PMIX_INFO_LVL_2, PMIX_MCA_BASE_VAR_SCOPE_CONSTANT,
+                                 &pmix_mca_base_var_override_file);
+    free (tmp);
+    if (0 > ret) {
+        return ret;
+    }
+
+    /* Disable reading MCA parameter files. */
+    if (0 == strcmp (pmix_mca_base_var_files, "none")) {
+        return PMIX_SUCCESS;
+    }
+
+    pmix_mca_base_var_suppress_override_warning = false;
+    ret = pmix_mca_base_var_register ("pmix", "mca", "base", "suppress_override_warning",
+                                 "Suppress warnings when attempting to set an overridden value (default: false)",
+                                 PMIX_MCA_BASE_VAR_TYPE_BOOL, NULL, 0, 0, PMIX_INFO_LVL_2,
+                                 PMIX_MCA_BASE_VAR_SCOPE_LOCAL, &pmix_mca_base_var_suppress_override_warning);
+    if (0 > ret) {
+        return ret;
+    }
+
+    /* Aggregate MCA parameter files
+     * A prefix search path to look up aggregate MCA parameter file
+     * requests that do not specify an absolute path
+     */
+    pmix_mca_base_var_file_prefix = NULL;
+    ret = pmix_mca_base_var_register ("pmix", "mca", "base", "param_file_prefix",
+                                 "Aggregate MCA parameter file sets",
+                                 PMIX_MCA_BASE_VAR_TYPE_STRING, NULL, 0, 0, PMIX_INFO_LVL_3,
+                                 PMIX_MCA_BASE_VAR_SCOPE_READONLY, &pmix_mca_base_var_file_prefix);
+    if (0 > ret) {
+        return ret;
+    }
+
+    pmix_mca_base_envar_file_prefix = NULL;
+    ret = pmix_mca_base_var_register ("pmix", "mca", "base", "envar_file_prefix",
+                                 "Aggregate MCA parameter file set for env variables",
+                                 PMIX_MCA_BASE_VAR_TYPE_STRING, NULL, 0, 0, PMIX_INFO_LVL_3,
+                                 PMIX_MCA_BASE_VAR_SCOPE_READONLY, &pmix_mca_base_envar_file_prefix);
+    if (0 > ret) {
+        return ret;
+    }
+
+    ret = asprintf(&pmix_mca_base_param_file_path, "%s" PMIX_PATH_SEP "amca-param-sets%c%s",
+                   pmix_pinstall_dirs.pmixdatadir, PMIX_ENV_SEP, cwd);
+    if (0 > ret) {
+        return PMIX_ERR_OUT_OF_RESOURCE;
+    }
+
+    tmp = pmix_mca_base_param_file_path;
+    ret = pmix_mca_base_var_register ("pmix", "mca", "base", "param_file_path",
+                                 "Aggregate MCA parameter Search path",
+                                 PMIX_MCA_BASE_VAR_TYPE_STRING, NULL, 0, 0, PMIX_INFO_LVL_3,
+                                 PMIX_MCA_BASE_VAR_SCOPE_READONLY, &pmix_mca_base_param_file_path);
+    free (tmp);
+    if (0 > ret) {
+        return ret;
+    }
+
+    force_agg_path = NULL;
+    ret = pmix_mca_base_var_register ("pmix", "mca", "base", "param_file_path_force",
+                                 "Forced Aggregate MCA parameter Search path",
+                                 PMIX_MCA_BASE_VAR_TYPE_STRING, NULL, 0, 0, PMIX_INFO_LVL_3,
+                                 PMIX_MCA_BASE_VAR_SCOPE_READONLY, &force_agg_path);
+    if (0 > ret) {
+        return ret;
+    }
+
+    if (NULL != force_agg_path) {
+        if (NULL != pmix_mca_base_param_file_path) {
+            char *tmp_str = pmix_mca_base_param_file_path;
+
+            asprintf(&pmix_mca_base_param_file_path, "%s%c%s", force_agg_path, PMIX_ENV_SEP, tmp_str);
+            free(tmp_str);
+        } else {
+            pmix_mca_base_param_file_path = strdup(force_agg_path);
+        }
+    }
+
+    if (NULL != pmix_mca_base_var_file_prefix) {
+       resolve_relative_paths(&pmix_mca_base_var_file_prefix, pmix_mca_base_param_file_path, rel_path_search, &pmix_mca_base_var_files, PMIX_ENV_SEP);
+    }
+    read_files (pmix_mca_base_var_files, &pmix_mca_base_var_file_values, PMIX_ENV_SEP);
+
+    if (NULL != pmix_mca_base_envar_file_prefix) {
+       resolve_relative_paths(&pmix_mca_base_envar_file_prefix, pmix_mca_base_param_file_path, rel_path_search, &pmix_mca_base_envar_files, ',');
+    }
+    read_files (pmix_mca_base_envar_files, &pmix_mca_base_envar_file_values, ',');
+
+    if (0 == access(pmix_mca_base_var_override_file, F_OK)) {
+        read_files (pmix_mca_base_var_override_file, &pmix_mca_base_var_override_values, PMIX_ENV_SEP);
+    }
+
+    return PMIX_SUCCESS;
+}
+
+/*
+ * Look up an integer MCA parameter.
+ */
+int pmix_mca_base_var_get_value (int vari, void *value,
+                            pmix_mca_base_var_source_t *source,
+                            const char **source_file)
+{
+    pmix_mca_base_var_t *var;
+    void **tmp = (void **) value;
+    int ret;
+
+    ret = var_get (vari, &var, true);
+    if (PMIX_SUCCESS != ret) {
+        return ret;
+    }
+
+    if (!PMIX_VAR_IS_VALID(var[0])) {
+        return PMIX_ERR_NOT_FOUND;
+    }
+
+    if (NULL != value) {
+        /* Return a poiner to our backing store (either a char **, int *,
+           or bool *) */
+        *tmp = var->mbv_storage;
+    }
+
+    if (NULL != source) {
+        *source = var->mbv_source;
+    }
+
+    if (NULL != source_file) {
+        *source_file = pmix_mca_base_var_source_file (var);
+    }
+
+    return PMIX_SUCCESS;
+}
+
+static int var_set_string (pmix_mca_base_var_t *var, char *value)
+{
+    char *tmp;
+    int ret;
+
+    if (NULL != var->mbv_storage->stringval) {
+        free (var->mbv_storage->stringval);
+    }
+
+    var->mbv_storage->stringval = NULL;
+
+    if (NULL == value || 0 == strlen (value)) {
+        return PMIX_SUCCESS;
+    }
+
+    /* Replace all instances of ~/ in a path-style string with the
+       user's home directory. This may be handled by the enumerator
+       in the future. */
+    if (0 == strncmp (value, "~/", 2)) {
+        if (NULL != home) {
+            ret = asprintf (&value, "%s/%s", home, value + 2);
+            if (0 > ret) {
+                return PMIX_ERROR;
+            }
+        } else {
+            value = strdup (value + 2);
+        }
+    } else {
+        value = strdup (value);
+    }
+
+    if (NULL == value) {
+        return PMIX_ERR_OUT_OF_RESOURCE;
+    }
+
+    while (NULL != (tmp = strstr (value, ":~/"))) {
+        tmp[0] = '\0';
+        tmp += 3;
+
+        ret = asprintf (&tmp, "%s:%s%s%s", value,
+                        home ? home : "", home ? "/" : "", tmp);
+
+        free (value);
+
+        if (0 > ret) {
+            return PMIX_ERR_OUT_OF_RESOURCE;
+        }
+
+        value = tmp;
+    }
+
+    var->mbv_storage->stringval = value;
+
+    return PMIX_SUCCESS;
+}
+
+static int int_from_string(const char *src, pmix_mca_base_var_enum_t *enumerator, uint64_t *value_out)
+{
+    uint64_t value;
+    bool is_int;
+    char *tmp;
+
+    if (NULL == src || 0 == strlen (src)) {
+        if (NULL == enumerator) {
+            *value_out = 0;
+        }
+
+        return PMIX_SUCCESS;
+    }
+
+    if (enumerator) {
+        int int_val, ret;
+        ret = enumerator->value_from_string(enumerator, src, &int_val);
+        if (PMIX_SUCCESS != ret) {
+            return ret;
+        }
+        *value_out = (uint64_t) int_val;
+
+        return PMIX_SUCCESS;
+    }
+
+    /* Check for an integer value */
+    value = strtoull (src, &tmp, 0);
+    if (tmp[0] == '\0') {
+        is_int = true;
+    } else {
+        is_int = false;
+    }
+
+    if (!is_int && tmp != src) {
+        switch (tmp[0]) {
+        case 'G':
+        case 'g':
+            value <<= 30;
+            break;
+        case 'M':
+        case 'm':
+            value <<= 20;
+            break;
+        case 'K':
+        case 'k':
+            value <<= 10;
+            break;
+        default:
+            break;
+        }
+    }
+
+    *value_out = value;
+
+    return PMIX_SUCCESS;
+}
+
+static int var_set_from_string (pmix_mca_base_var_t *var, char *src)
+{
+    pmix_mca_base_var_storage_t *dst = var->mbv_storage;
+    uint64_t int_value = 0;
+    int ret;
+
+    switch (var->mbv_type) {
+    case PMIX_MCA_BASE_VAR_TYPE_INT:
+    case PMIX_MCA_BASE_VAR_TYPE_UNSIGNED_INT:
+    case PMIX_MCA_BASE_VAR_TYPE_UNSIGNED_LONG:
+    case PMIX_MCA_BASE_VAR_TYPE_UNSIGNED_LONG_LONG:
+    case PMIX_MCA_BASE_VAR_TYPE_BOOL:
+    case PMIX_MCA_BASE_VAR_TYPE_SIZE_T:
+        ret = int_from_string(src, var->mbv_enumerator, &int_value);
+        if (PMIX_ERR_VALUE_OUT_OF_BOUNDS == ret ||
+            (PMIX_MCA_BASE_VAR_TYPE_INT == var->mbv_type && ((int) int_value != (int64_t) int_value)) ||
+            (PMIX_MCA_BASE_VAR_TYPE_UNSIGNED_INT == var->mbv_type && ((unsigned int) int_value != int_value))) {
+            if (var->mbv_enumerator) {
+                char *valid_values;
+                (void) var->mbv_enumerator->dump(var->mbv_enumerator, &valid_values);
+                pmix_show_help("help-mca-var.txt", "invalid-value-enum",
+                               true, var->mbv_full_name, src, valid_values);
+                free(valid_values);
+            } else {
+                pmix_show_help("help-mca-var.txt", "invalid-value",
+                               true, var->mbv_full_name, src);
+            }
+
+            return PMIX_ERR_VALUE_OUT_OF_BOUNDS;
+        }
+
+        if (PMIX_MCA_BASE_VAR_TYPE_INT == var->mbv_type ||
+            PMIX_MCA_BASE_VAR_TYPE_UNSIGNED_INT == var->mbv_type) {
+            int *castme = (int*) var->mbv_storage;
+            *castme = int_value;
+        } else if (PMIX_MCA_BASE_VAR_TYPE_UNSIGNED_LONG == var->mbv_type) {
+            unsigned long *castme = (unsigned long*) var->mbv_storage;
+            *castme = (unsigned long) int_value;
+        } else if (PMIX_MCA_BASE_VAR_TYPE_UNSIGNED_LONG_LONG == var->mbv_type) {
+            unsigned long long *castme = (unsigned long long*) var->mbv_storage;
+            *castme = (unsigned long long) int_value;
+        } else if (PMIX_MCA_BASE_VAR_TYPE_SIZE_T == var->mbv_type) {
+            size_t *castme = (size_t*) var->mbv_storage;
+            *castme = (size_t) int_value;
+        } else if (PMIX_MCA_BASE_VAR_TYPE_BOOL == var->mbv_type) {
+            bool *castme = (bool*) var->mbv_storage;
+            *castme = !!int_value;
+        }
+
+        return ret;
+    case PMIX_MCA_BASE_VAR_TYPE_DOUBLE:
+        dst->lfval = strtod (src, NULL);
+        break;
+    case PMIX_MCA_BASE_VAR_TYPE_STRING:
+    case PMIX_MCA_BASE_VAR_TYPE_VERSION_STRING:
+        var_set_string (var, src);
+        break;
+    case PMIX_MCA_BASE_VAR_TYPE_MAX:
+        return PMIX_ERROR;
+    }
+
+    return PMIX_SUCCESS;
+}
+
+/*
+ * Set a variable
+ */
+int pmix_mca_base_var_set_value (int vari, const void *value, size_t size, pmix_mca_base_var_source_t source,
+                            const char *source_file)
+{
+    pmix_mca_base_var_t *var;
+    int ret;
+
+    ret = var_get (vari, &var, true);
+    if (PMIX_SUCCESS != ret) {
+        return ret;
+    }
+
+    if (!PMIX_VAR_IS_VALID(var[0])) {
+        return PMIX_ERR_BAD_PARAM;
+    }
+
+    if (!PMIX_VAR_IS_SETTABLE(var[0])) {
+        return PMIX_ERR_PERM;
+    }
+
+    if (NULL != var->mbv_enumerator) {
+        /* Validate */
+        ret = var->mbv_enumerator->string_from_value(var->mbv_enumerator,
+                                                     ((int *) value)[0], NULL);
+        if (PMIX_SUCCESS != ret) {
+            return ret;
+        }
+    }
+
+    if (PMIX_MCA_BASE_VAR_TYPE_STRING != var->mbv_type && PMIX_MCA_BASE_VAR_TYPE_VERSION_STRING != var->mbv_type) {
+        memmove (var->mbv_storage, value, pmix_var_type_sizes[var->mbv_type]);
+    } else {
+        var_set_string (var, (char *) value);
+    }
+
+    var->mbv_source = source;
+
+    if (PMIX_MCA_BASE_VAR_SOURCE_FILE == source && NULL != source_file) {
+        var->mbv_file_value = NULL;
+        var->mbv_source_file = append_filename_to_list(source_file);
+    }
+
+    return PMIX_SUCCESS;
+}
+
+/*
+ * Deregister a parameter
+ */
+int pmix_mca_base_var_deregister(int vari)
+{
+    pmix_mca_base_var_t *var;
+    int ret;
+
+    ret = var_get (vari, &var, false);
+    if (PMIX_SUCCESS != ret) {
+        return ret;
+    }
+
+    if (!PMIX_VAR_IS_VALID(var[0])) {
+        return PMIX_ERR_BAD_PARAM;
+    }
+
+    /* Mark this parameter as invalid but keep its info in case this
+       parameter is reregistered later */
+    var->mbv_flags &= ~PMIX_MCA_BASE_VAR_FLAG_VALID;
+
+    /* Done deregistering synonym */
+    if (PMIX_MCA_BASE_VAR_FLAG_SYNONYM & var->mbv_flags) {
+        return PMIX_SUCCESS;
+    }
+
+    /* Release the current value if it is a string. */
+    if ((PMIX_MCA_BASE_VAR_TYPE_STRING == var->mbv_type || PMIX_MCA_BASE_VAR_TYPE_VERSION_STRING == var->mbv_type) &&
+        var->mbv_storage->stringval) {
+        free (var->mbv_storage->stringval);
+        var->mbv_storage->stringval = NULL;
+    } else if (var->mbv_enumerator && !var->mbv_enumerator->enum_is_static) {
+        PMIX_RELEASE(var->mbv_enumerator);
+    }
+
+    var->mbv_enumerator = NULL;
+
+    var->mbv_storage = NULL;
+
+    return PMIX_SUCCESS;
+}
+
+static int var_get (int vari, pmix_mca_base_var_t **var_out, bool original)
+{
+    pmix_mca_base_var_t *var;
+
+    if (var_out) {
+        *var_out = NULL;
+    }
+
+    /* Check for bozo cases */
+    if (!pmix_mca_base_var_initialized) {
+        return PMIX_ERROR;
+    }
+
+    if (vari < 0) {
+        return PMIX_ERR_BAD_PARAM;
+    }
+
+    var = pmix_pointer_array_get_item (&pmix_mca_base_vars, vari);
+    if (NULL == var) {
+        return PMIX_ERR_BAD_PARAM;
+    }
+
+    if (PMIX_VAR_IS_SYNONYM(var[0]) && original) {
+        return var_get(var->mbv_synonym_for, var_out, false);
+    }
+
+    if (var_out) {
+        *var_out = var;
+    }
+
+    return PMIX_SUCCESS;
+}
+
+int pmix_mca_base_var_env_name(const char *param_name,
+                          char **env_name)
+{
+    int ret;
+
+    assert (NULL != env_name);
+
+    ret = asprintf(env_name, "%s%s", mca_prefix, param_name);
+    if (0 > ret) {
+        return PMIX_ERR_OUT_OF_RESOURCE;
+    }
+
+    return PMIX_SUCCESS;
+}
+
+/*
+ * Find the index for an MCA parameter based on its names.
+ */
+static int var_find_by_name (const char *full_name, int *vari, bool invalidok)
+{
+    pmix_mca_base_var_t *var = NULL;
+    void *tmp;
+    int rc;
+
+    rc = pmix_hash_table_get_value_ptr (&pmix_mca_base_var_index_hash, full_name, strlen (full_name),
+                                        &tmp);
+    if (PMIX_SUCCESS != rc) {
+        return rc;
+    }
+
+    (void) var_get ((int)(uintptr_t) tmp, &var, false);
+
+    if (invalidok || (var && PMIX_VAR_IS_VALID(var[0]))) {
+        *vari = (int)(uintptr_t) tmp;
+        return PMIX_SUCCESS;
+    }
+
+    return PMIX_ERR_NOT_FOUND;
+}
+
+static int var_find (const char *project_name, const char *framework_name,
+                     const char *component_name, const char *variable_name,
+                     bool invalidok)
+{
+    char *full_name;
+    int ret, vari;
+
+    ret = pmix_mca_base_var_generate_full_name4 (NULL, framework_name, component_name,
+                                            variable_name, &full_name);
+    if (PMIX_SUCCESS != ret) {
+        return PMIX_ERROR;
+    }
+
+    ret = var_find_by_name(full_name, &vari, invalidok);
+
+    /* NTH: should we verify the name components match? */
+
+    free (full_name);
+
+    if (PMIX_SUCCESS != ret) {
+        return ret;
+    }
+
+    return vari;
+}
+
+/*
+ * Find the index for an MCA parameter based on its name components.
+ */
+int pmix_mca_base_var_find (const char *project_name, const char *framework_name,
+                       const char *component_name, const char *variable_name)
+{
+    return var_find (project_name, framework_name, component_name, variable_name, false);
+}
+
+/*
+ * Find the index for an MCA parameter based on full name.
+ */
+int pmix_mca_base_var_find_by_name (const char *full_name, int *vari)
+{
+    return var_find_by_name (full_name, vari, false);
+}
+
+int pmix_mca_base_var_set_flag (int vari, pmix_mca_base_var_flag_t flag, bool set)
+{
+    pmix_mca_base_var_t *var;
+    int ret;
+
+    ret = var_get (vari, &var, true);
+    if (PMIX_SUCCESS != ret || PMIX_VAR_IS_SYNONYM(var[0])) {
+        return PMIX_ERR_BAD_PARAM;
+    }
+
+    var->mbv_flags = (var->mbv_flags & ~flag) | (set ? flag : 0);
+
+    /* All done */
+    return PMIX_SUCCESS;
+}
+
+/*
+ * Return info on a parameter at an index
+ */
+int pmix_mca_base_var_get (int vari, const pmix_mca_base_var_t **var)
+{
+    int ret;
+    ret = var_get (vari, (pmix_mca_base_var_t **) var, false);
+
+    if (PMIX_SUCCESS != ret) {
+        return ret;
+    }
+
+    if (!PMIX_VAR_IS_VALID(*(var[0]))) {
+        return PMIX_ERR_NOT_FOUND;
+    }
+
+    return PMIX_SUCCESS;
+}
+
+/*
+ * Make an argv-style list of strings suitable for an environment
+ */
+int pmix_mca_base_var_build_env(char ***env, int *num_env, bool internal)
+{
+    pmix_mca_base_var_t *var;
+    size_t i, len;
+    int ret;
+
+    /* Check for bozo cases */
+
+    if (!pmix_mca_base_var_initialized) {
+        return PMIX_ERROR;
+    }
+
+    /* Iterate through all the registered parameters */
+
+    len = pmix_pointer_array_get_size(&pmix_mca_base_vars);
+    for (i = 0; i < len; ++i) {
+        char *value_string;
+        char *str = NULL;
+
+        var = pmix_pointer_array_get_item (&pmix_mca_base_vars, i);
+        if (NULL == var) {
+            continue;
+        }
+
+        /* Don't output default values or internal variables (unless
+           requested) */
+        if (PMIX_MCA_BASE_VAR_SOURCE_DEFAULT == var->mbv_source ||
+            (!internal && PMIX_VAR_IS_INTERNAL(var[0]))) {
+            continue;
+        }
+
+        if ((PMIX_MCA_BASE_VAR_TYPE_STRING == var->mbv_type || PMIX_MCA_BASE_VAR_TYPE_VERSION_STRING == var->mbv_type) &&
+            NULL == var->mbv_storage->stringval) {
+            continue;
+        }
+
+        ret = var_value_string (var, &value_string);
+        if (PMIX_SUCCESS != ret) {
+            goto cleanup;
+        }
+
+        ret = asprintf (&str, "%s%s=%s", mca_prefix, var->mbv_full_name,
+                        value_string);
+        free (value_string);
+        if (0 > ret) {
+            goto cleanup;
+        }
+
+        pmix_argv_append(num_env, env, str);
+        free(str);
+
+        switch (var->mbv_source) {
+        case PMIX_MCA_BASE_VAR_SOURCE_FILE:
+        case PMIX_MCA_BASE_VAR_SOURCE_OVERRIDE:
+            asprintf (&str, "%sSOURCE_%s=FILE:%s", mca_prefix, var->mbv_full_name,
+                      pmix_mca_base_var_source_file (var));
+            break;
+        case PMIX_MCA_BASE_VAR_SOURCE_COMMAND_LINE:
+            asprintf (&str, "%sSOURCE_%s=COMMAND_LINE", mca_prefix, var->mbv_full_name);
+            break;
+        case PMIX_MCA_BASE_VAR_SOURCE_ENV:
+        case PMIX_MCA_BASE_VAR_SOURCE_SET:
+        case PMIX_MCA_BASE_VAR_SOURCE_DEFAULT:
+            str = NULL;
+            break;
+        case PMIX_MCA_BASE_VAR_SOURCE_MAX:
+            goto cleanup;
+        }
+
+        if (NULL != str) {
+            pmix_argv_append(num_env, env, str);
+            free(str);
+        }
+    }
+
+    /* All done */
+
+    return PMIX_SUCCESS;
+
+    /* Error condition */
+
+ cleanup:
+    if (*num_env > 0) {
+        pmix_argv_free(*env);
+        *num_env = 0;
+        *env = NULL;
+    }
+    return PMIX_ERR_NOT_FOUND;
+}
+
+/*
+ * Shut down the MCA parameter system (normally only invoked by the
+ * MCA framework itself).
+ */
+int pmix_mca_base_var_finalize(void)
+{
+    pmix_object_t *pmixect;
+    pmix_list_item_t *item;
+    int size, i;
+
+    if (pmix_mca_base_var_initialized) {
+        size = pmix_pointer_array_get_size(&pmix_mca_base_vars);
+        for (i = 0 ; i < size ; ++i) {
+            pmixect = pmix_pointer_array_get_item (&pmix_mca_base_vars, i);
+            if (NULL != pmixect) {
+                PMIX_RELEASE(pmixect);
+            }
+        }
+        PMIX_DESTRUCT(&pmix_mca_base_vars);
+
+        while (NULL !=
+               (item = pmix_list_remove_first(&pmix_mca_base_var_file_values))) {
+            PMIX_RELEASE(item);
+        }
+        PMIX_DESTRUCT(&pmix_mca_base_var_file_values);
+
+        while (NULL !=
+               (item = pmix_list_remove_first(&pmix_mca_base_envar_file_values))) {
+            PMIX_RELEASE(item);
+        }
+        PMIX_DESTRUCT(&pmix_mca_base_envar_file_values);
+
+        while (NULL !=
+               (item = pmix_list_remove_first(&pmix_mca_base_var_override_values))) {
+            PMIX_RELEASE(item);
+        }
+        PMIX_DESTRUCT(&pmix_mca_base_var_override_values);
+
+        if( NULL != cwd ) {
+            free(cwd);
+            cwd = NULL;
+        }
+
+        pmix_mca_base_var_initialized = false;
+        pmix_mca_base_var_count = 0;
+
+        if (NULL != pmix_mca_base_var_file_list) {
+            pmix_argv_free(pmix_mca_base_var_file_list);
+        }
+        pmix_mca_base_var_file_list = NULL;
+
+        (void) pmix_mca_base_var_group_finalize ();
+
+        PMIX_DESTRUCT(&pmix_mca_base_var_index_hash);
+
+        free (pmix_mca_base_envar_files);
+        pmix_mca_base_envar_files = NULL;
+    }
+
+    /* All done */
+
+    return PMIX_SUCCESS;
+}
+
+
+/*************************************************************************/
+static int fixup_files(char **file_list, char * path, bool rel_path_search, char sep) {
+    int exit_status = PMIX_SUCCESS;
+    char **files = NULL;
+    char **search_path = NULL;
+    char * tmp_file = NULL;
+    char **argv = NULL;
+    char *rel_path;
+    int mode = R_OK; /* The file exists, and we can read it */
+    int count, i, argc = 0;
+
+    search_path = pmix_argv_split(path, PMIX_ENV_SEP);
+    files = pmix_argv_split(*file_list, sep);
+    count = pmix_argv_count(files);
+
+    rel_path = force_agg_path ? force_agg_path : cwd;
+
+    /* Read in reverse order, so we can preserve the original ordering */
+    for (i = 0 ; i < count; ++i) {
+        char *msg_path = path;
+        if (pmix_path_is_absolute(files[i])) {
+            /* Absolute paths preserved */
+            tmp_file = pmix_path_access(files[i], NULL, mode);
+        } else if (!rel_path_search && NULL != strchr(files[i], PMIX_PATH_SEP[0])) {
+            /* Resolve all relative paths:
+             *  - If filename contains a "/" (e.g., "./foo" or "foo/bar")
+             *    - look for it relative to cwd
+             *    - if exists, use it
+             *    - ow warn/error
+             */
+            msg_path = rel_path;
+            tmp_file = pmix_path_access(files[i], rel_path, mode);
+        } else {
+            /* Resolve all relative paths:
+             * - Use path resolution
+             *    - if found and readable, use it
+             *    - otherwise, warn/error
+             */
+            tmp_file = pmix_path_find (files[i], search_path, mode, NULL);
+        }
+
+        if (NULL == tmp_file) {
+            pmix_show_help("help-mca-var.txt", "missing-param-file",
+                           true, getpid(), files[i], msg_path);
+            exit_status = PMIX_ERROR;
+            break;
+        }
+
+        pmix_argv_append(&argc, &argv, tmp_file);
+
+        free(tmp_file);
+        tmp_file = NULL;
+    }
+
+    if (PMIX_SUCCESS == exit_status) {
+        free(*file_list);
+        *file_list = pmix_argv_join(argv, sep);
+    }
+
+    if( NULL != files ) {
+        pmix_argv_free(files);
+        files = NULL;
+    }
+
+    if( NULL != argv ) {
+        pmix_argv_free(argv);
+        argv = NULL;
+    }
+
+    if( NULL != search_path ) {
+        pmix_argv_free(search_path);
+        search_path = NULL;
+    }
+
+    return exit_status;
+}
+
+static int read_files(char *file_list, pmix_list_t *file_values, char sep)
+{
+    char **tmp = pmix_argv_split(file_list, sep);
+    int i, count;
+
+    if (!tmp) {
+        return PMIX_ERR_OUT_OF_RESOURCE;
+    }
+
+    count = pmix_argv_count(tmp);
+
+    /* Iterate through all the files passed in -- read them in reverse
+       order so that we preserve unix/shell path-like semantics (i.e.,
+       the entries farthest to the left get precedence) */
+
+    for (i = count - 1; i >= 0; --i) {
+        char *file_name = append_filename_to_list (tmp[i]);
+        pmix_mca_base_parse_paramfile(file_name, file_values);
+    }
+
+    pmix_argv_free (tmp);
+
+    pmix_mca_base_internal_env_store();
+
+    return PMIX_SUCCESS;
+}
+
+/******************************************************************************/
+static int register_variable (const char *project_name, const char *framework_name,
+                              const char *component_name, const char *variable_name,
+                              const char *description, pmix_mca_base_var_type_t type,
+                              pmix_mca_base_var_enum_t *enumerator, int bind,
+                              pmix_mca_base_var_flag_t flags, pmix_mca_base_var_info_lvl_t info_lvl,
+                              pmix_mca_base_var_scope_t scope, int synonym_for,
+                              void *storage)
+{
+    int ret, var_index, group_index, tmp;
+    pmix_mca_base_var_group_t *group;
+    pmix_mca_base_var_t *var, *original = NULL;
+
+    /* Developer error. Storage can not be NULL and type must exist */
+    assert (((flags & PMIX_MCA_BASE_VAR_FLAG_SYNONYM) || NULL != storage) && type >= 0 && type < PMIX_MCA_BASE_VAR_TYPE_MAX);
+
+#if PMIX_ENABLE_DEBUG
+    /* Developer error: check for alignments */
+    uintptr_t align = 0;
+    switch (type) {
+    case PMIX_MCA_BASE_VAR_TYPE_INT:
+        align = PMIX_ALIGNMENT_INT;
+        break;
+    case PMIX_MCA_BASE_VAR_TYPE_UNSIGNED_INT:
+        align = PMIX_ALIGNMENT_INT;
+        break;
+    case PMIX_MCA_BASE_VAR_TYPE_UNSIGNED_LONG:
+        align = PMIX_ALIGNMENT_LONG;
+        break;
+    case PMIX_MCA_BASE_VAR_TYPE_UNSIGNED_LONG_LONG:
+        align = PMIX_ALIGNMENT_LONG_LONG;
+        break;
+    case PMIX_MCA_BASE_VAR_TYPE_SIZE_T:
+        align = PMIX_ALIGNMENT_SIZE_T;
+        break;
+    case PMIX_MCA_BASE_VAR_TYPE_BOOL:
+        align = PMIX_ALIGNMENT_BOOL;
+        break;
+    case PMIX_MCA_BASE_VAR_TYPE_DOUBLE:
+        align = PMIX_ALIGNMENT_DOUBLE;
+        break;
+    case PMIX_MCA_BASE_VAR_TYPE_VERSION_STRING:
+    case PMIX_MCA_BASE_VAR_TYPE_STRING:
+    default:
+        align = 0;
+        break;
+    }
+
+    if (0 != align) {
+        assert(((uintptr_t) storage) % align == 0);
+    }
+
+    /* Also check to ensure that synonym_for>=0 when
+       MCA_BCASE_VAR_FLAG_SYNONYM is specified */
+    if (flags & PMIX_MCA_BASE_VAR_FLAG_SYNONYM && synonym_for < 0) {
+        assert((flags & PMIX_MCA_BASE_VAR_FLAG_SYNONYM) && synonym_for >= 0);
+    }
+#endif
+
+    if (flags & PMIX_MCA_BASE_VAR_FLAG_SYNONYM) {
+        if (synonym_for < 0) {
+            return PMIX_ERR_BAD_PARAM;
+        }
+        original = pmix_pointer_array_get_item (&pmix_mca_base_vars, synonym_for);
+        if (NULL == original) {
+            /* Attempting to create a synonym for a non-existent variable. probably a
+             * developer error. */
+            assert (NULL != original);
+            return PMIX_ERR_NOT_FOUND;
+        }
+    }
+
+    /* Initialize the array if it has never been initialized */
+    if (!pmix_mca_base_var_initialized) {
+        pmix_mca_base_var_init();
+    }
+
+    /* See if this entry is already in the array */
+    var_index = var_find (project_name, framework_name, component_name, variable_name,
+                          true);
+
+    if (0 > var_index) {
+        /* Create a new parameter entry */
+        group_index = pmix_mca_base_var_group_register (project_name, framework_name, component_name,
+                                                   NULL);
+        if (-1 > group_index) {
+            return group_index;
+        }
+
+        /* Read-only and constant variables can't be settable */
+        if (scope < PMIX_MCA_BASE_VAR_SCOPE_LOCAL || (flags & PMIX_MCA_BASE_VAR_FLAG_DEFAULT_ONLY)) {
+            if ((flags & PMIX_MCA_BASE_VAR_FLAG_DEFAULT_ONLY) && (flags & PMIX_MCA_BASE_VAR_FLAG_SETTABLE)) {
+                pmix_show_help("help-mca-var.txt", "invalid-flag-combination",
+                               true, "PMIX_MCA_BASE_VAR_FLAG_DEFAULT_ONLY", "PMIX_MCA_BASE_VAR_FLAG_SETTABLE");
+                return PMIX_ERROR;
+            }
+
+            /* Should we print a warning for other cases? */
+            flags &= ~PMIX_MCA_BASE_VAR_FLAG_SETTABLE;
+        }
+
+        var = PMIX_NEW(pmix_mca_base_var_t);
+
+        var->mbv_type        = type;
+        var->mbv_flags       = flags;
+        var->mbv_group_index = group_index;
+        var->mbv_info_lvl  = info_lvl;
+        var->mbv_scope       = scope;
+        var->mbv_synonym_for = synonym_for;
+        var->mbv_bind        = bind;
+
+        if (NULL != description) {
+            var->mbv_description = strdup(description);
+        }
+
+        if (NULL != variable_name) {
+            var->mbv_variable_name = strdup(variable_name);
+            if (NULL == var->mbv_variable_name) {
+                PMIX_RELEASE(var);
+                return PMIX_ERR_OUT_OF_RESOURCE;
+            }
+        }
+
+        ret = pmix_mca_base_var_generate_full_name4 (NULL, framework_name, component_name,
+                                                variable_name, &var->mbv_full_name);
+        if (PMIX_SUCCESS != ret) {
+            PMIX_RELEASE(var);
+            return PMIX_ERROR;
+        }
+
+        ret = pmix_mca_base_var_generate_full_name4 (project_name, framework_name, component_name,
+                                                variable_name, &var->mbv_long_name);
+        if (PMIX_SUCCESS != ret) {
+            PMIX_RELEASE(var);
+            return PMIX_ERROR;
+        }
+
+        /* Add it to the array.  Note that we copy the mca_var_t by value,
+           so the entire contents of the struct is copied.  The synonym list
+           will always be empty at this point, so there's no need for an
+           extra RETAIN or RELEASE. */
+        var_index = pmix_pointer_array_add (&pmix_mca_base_vars, var);
+        if (0 > var_index) {
+            PMIX_RELEASE(var);
+            return PMIX_ERROR;
+        }
+
+        var->mbv_index = var_index;
+
+        if (0 <= group_index) {
+            pmix_mca_base_var_group_add_var (group_index, var_index);
+        }
+
+        pmix_mca_base_var_count++;
+        if (0 <= var_find_by_name (var->mbv_full_name, &tmp, 0)) {
+            /* XXX --- FIXME: variable overshadows an existing variable. this is difficult to support */
+            assert (0);
+        }
+
+        pmix_hash_table_set_value_ptr (&pmix_mca_base_var_index_hash, var->mbv_full_name, strlen (var->mbv_full_name),
+                                       (void *)(uintptr_t) var_index);
+    } else {
+        ret = var_get (var_index, &var, false);
+        if (PMIX_SUCCESS != ret) {
+            /* Shouldn't ever happen */
+            return PMIX_ERROR;
+        }
+
+        ret = pmix_mca_base_var_group_get_internal (var->mbv_group_index, &group, true);
+        if (PMIX_SUCCESS != ret) {
+            /* Shouldn't ever happen */
+            return PMIX_ERROR;
+        }
+
+        if (!group->group_isvalid) {
+            group->group_isvalid = true;
+        }
+
+        /* Verify the name components match */
+        if (0 != compare_strings(framework_name, group->group_framework) ||
+            0 != compare_strings(component_name, group->group_component) ||
+            0 != compare_strings(variable_name, var->mbv_variable_name)) {
+            pmix_show_help("help-mca-var.txt", "var-name-conflict",
+                           true, var->mbv_full_name, framework_name,
+                           component_name, variable_name,
+                           group->group_framework, group->group_component,
+                           var->mbv_variable_name);
+            /* This is developer error. abort! */
+            assert (0);
+            return PMIX_ERROR;
+        }
+
+        if (var->mbv_type != type) {
+#if PMIX_ENABLE_DEBUG
+            pmix_show_help("help-mca-var.txt",
+                           "re-register-with-different-type",
+                           true, var->mbv_full_name);
+#endif
+            return PMIX_ERR_VALUE_OUT_OF_BOUNDS;
+        }
+    }
+
+    if (PMIX_MCA_BASE_VAR_TYPE_BOOL == var->mbv_type) {
+        enumerator = &pmix_mca_base_var_enum_bool;
+    } else if (NULL != enumerator) {
+        if (var->mbv_enumerator) {
+            PMIX_RELEASE (var->mbv_enumerator);
+        }
+
+        if (!enumerator->enum_is_static) {
+            PMIX_RETAIN(enumerator);
+        }
+    }
+
+    var->mbv_enumerator = enumerator;
+
+    if (!original) {
+        var->mbv_storage = storage;
+
+        /* make a copy of the default string value */
+        if ((PMIX_MCA_BASE_VAR_TYPE_STRING == type || PMIX_MCA_BASE_VAR_TYPE_VERSION_STRING == type) && NULL != ((char **)storage)[0]) {
+            ((char **)storage)[0] = strdup (((char **)storage)[0]);
+        }
+    } else {
+        /* synonym variable */
+        pmix_value_array_append_item(&original->mbv_synonyms, &var_index);
+    }
+
+    /* go ahead and mark this variable as valid */
+    var->mbv_flags |= PMIX_MCA_BASE_VAR_FLAG_VALID;
+
+    ret = var_set_initial (var, original);
+    if (PMIX_SUCCESS != ret) {
+        return ret;
+    }
+
+    /* All done */
+    return var_index;
+}
+
+int pmix_mca_base_var_register (const char *project_name, const char *framework_name,
+                           const char *component_name, const char *variable_name,
+                           const char *description, pmix_mca_base_var_type_t type,
+                           pmix_mca_base_var_enum_t *enumerator, int bind,
+                           pmix_mca_base_var_flag_t flags,
+                           pmix_mca_base_var_info_lvl_t info_lvl,
+                           pmix_mca_base_var_scope_t scope, void *storage)
+{
+    /* Only integer variables can have enumerator */
+    assert (NULL == enumerator || (PMIX_MCA_BASE_VAR_TYPE_INT == type || PMIX_MCA_BASE_VAR_TYPE_UNSIGNED_INT == type));
+
+    return register_variable (project_name, framework_name, component_name,
+                              variable_name, description, type, enumerator,
+                              bind, flags, info_lvl, scope, -1, storage);
+}
+
+int pmix_mca_base_component_var_register (const pmix_mca_base_component_t *component,
+                                          const char *variable_name, const char *description,
+                                          pmix_mca_base_var_type_t type, pmix_mca_base_var_enum_t *enumerator,
+                                          int bind, pmix_mca_base_var_flag_t flags,
+                                          pmix_mca_base_var_info_lvl_t info_lvl,
+                                          pmix_mca_base_var_scope_t scope, void *storage)
+{
+    return pmix_mca_base_var_register (component->pmix_mca_project_name,
+                                       component->pmix_mca_type_name,
+                                       component->pmix_mca_component_name,
+                                       variable_name, description, type, enumerator,
+                                       bind, flags | PMIX_MCA_BASE_VAR_FLAG_DWG,
+                                       info_lvl, scope, storage);
+}
+
+int pmix_mca_base_framework_var_register (const pmix_mca_base_framework_t *framework,
+                                          const char *variable_name,
+                                          const char *help_msg, pmix_mca_base_var_type_t type,
+                                          pmix_mca_base_var_enum_t *enumerator, int bind,
+                                          pmix_mca_base_var_flag_t flags,
+                                          pmix_mca_base_var_info_lvl_t info_level,
+                                          pmix_mca_base_var_scope_t scope, void *storage)
+{
+    return pmix_mca_base_var_register (framework->framework_project, framework->framework_name,
+                                       "base", variable_name, help_msg, type, enumerator, bind,
+                                       flags | PMIX_MCA_BASE_VAR_FLAG_DWG, info_level, scope, storage);
+}
+
+int pmix_mca_base_var_register_synonym (int synonym_for, const char *project_name,
+                                        const char *framework_name,
+                                        const char *component_name,
+                                        const char *synonym_name,
+                                        pmix_mca_base_var_syn_flag_t flags)
+{
+    pmix_mca_base_var_flag_t var_flags = (pmix_mca_base_var_flag_t) PMIX_MCA_BASE_VAR_FLAG_SYNONYM;
+    pmix_mca_base_var_t *var;
+    int ret;
+
+    ret = var_get (synonym_for, &var, false);
+    if (PMIX_SUCCESS != ret || PMIX_VAR_IS_SYNONYM(var[0])) {
+        return PMIX_ERR_BAD_PARAM;
+    }
+
+    if (flags & PMIX_MCA_BASE_VAR_SYN_FLAG_DEPRECATED) {
+        var_flags |= PMIX_MCA_BASE_VAR_FLAG_DEPRECATED;
+    }
+    if (flags & PMIX_MCA_BASE_VAR_SYN_FLAG_INTERNAL) {
+        var_flags |= PMIX_MCA_BASE_VAR_FLAG_INTERNAL;
+    }
+
+    return register_variable (project_name, framework_name, component_name,
+                              synonym_name, var->mbv_description, var->mbv_type, var->mbv_enumerator,
+                              var->mbv_bind, var_flags, var->mbv_info_lvl, var->mbv_scope,
+                              synonym_for, NULL);
+}
+
+static int var_get_env (pmix_mca_base_var_t *var, const char *name, char **source, char **value)
+{
+    char *source_env, *value_env;
+    int ret;
+
+    ret = asprintf (&source_env, "%sSOURCE_%s", mca_prefix, name);
+    if (0 > ret) {
+        return PMIX_ERROR;
+    }
+
+    ret = asprintf (&value_env, "%s%s", mca_prefix, name);
+    if (0 > ret) {
+        free (source_env);
+        return PMIX_ERROR;
+    }
+
+    *source = getenv (source_env);
+    *value = getenv (value_env);
+
+    free (source_env);
+    free (value_env);
+
+    if (NULL == *value) {
+        *source = NULL;
+        return PMIX_ERR_NOT_FOUND;
+    }
+
+    return PMIX_SUCCESS;
+}
+
+/*
+ * Lookup a param in the environment
+ */
+static int var_set_from_env (pmix_mca_base_var_t *var, pmix_mca_base_var_t *original)
+{
+    const char *var_full_name = var->mbv_full_name;
+    const char *var_long_name = var->mbv_long_name;
+    bool deprecated = PMIX_VAR_IS_DEPRECATED(var[0]);
+    bool is_synonym = PMIX_VAR_IS_SYNONYM(var[0]);
+    char *source_env, *value_env;
+    int ret;
+
+    ret = var_get_env (var, var_long_name, &source_env, &value_env);
+    if (PMIX_SUCCESS != ret) {
+        ret = var_get_env (var, var_full_name, &source_env, &value_env);
+    }
+
+    if (PMIX_SUCCESS != ret) {
+        return ret;
+    }
+
+    /* we found an environment variable but this variable is default-only. print
+       a warning. */
+    if (PMIX_VAR_IS_DEFAULT_ONLY(original[0])) {
+        pmix_show_help("help-mca-var.txt", "default-only-param-set",
+                       true, var_full_name);
+
+        return PMIX_ERR_NOT_FOUND;
+    }
+
+    if (PMIX_MCA_BASE_VAR_SOURCE_OVERRIDE == original->mbv_source) {
+        if (!pmix_mca_base_var_suppress_override_warning) {
+            pmix_show_help("help-mca-var.txt", "overridden-param-set",
+                           true, var_full_name);
+        }
+
+        return PMIX_ERR_NOT_FOUND;
+    }
+
+    original->mbv_source = PMIX_MCA_BASE_VAR_SOURCE_ENV;
+
+    if (NULL != source_env) {
+        if (0 == strncasecmp (source_env, "file:", 5)) {
+            original->mbv_source_file = append_filename_to_list(source_env + 5);
+            if (0 == strcmp (var->mbv_source_file, pmix_mca_base_var_override_file)) {
+                original->mbv_source = PMIX_MCA_BASE_VAR_SOURCE_OVERRIDE;
+            } else {
+                original->mbv_source = PMIX_MCA_BASE_VAR_SOURCE_FILE;
+            }
+        } else if (0 == strcasecmp (source_env, "command")) {
+            var->mbv_source = PMIX_MCA_BASE_VAR_SOURCE_COMMAND_LINE;
+        }
+    }
+
+    if (deprecated) {
+        const char *new_variable = "None (going away)";
+
+        if (is_synonym) {
+            new_variable = var->mbv_full_name;
+        }
+
+        switch (var->mbv_source) {
+        case PMIX_MCA_BASE_VAR_SOURCE_ENV:
+            pmix_show_help("help-mca-var.txt", "deprecated-mca-env",
+                           true, var_full_name, new_variable);
+            break;
+        case PMIX_MCA_BASE_VAR_SOURCE_COMMAND_LINE:
+            pmix_show_help("help-mca-var.txt", "deprecated-mca-cli",
+                           true, var_full_name, new_variable);
+            break;
+        case PMIX_MCA_BASE_VAR_SOURCE_FILE:
+        case PMIX_MCA_BASE_VAR_SOURCE_OVERRIDE:
+            pmix_show_help("help-mca-var.txt", "deprecated-mca-file",
+                           true, var_full_name, pmix_mca_base_var_source_file (var),
+                           new_variable);
+            break;
+
+        case PMIX_MCA_BASE_VAR_SOURCE_DEFAULT:
+        case PMIX_MCA_BASE_VAR_SOURCE_MAX:
+        case PMIX_MCA_BASE_VAR_SOURCE_SET:
+            /* silence compiler warnings about unhandled enumerations */
+            break;
+        }
+    }
+
+    return var_set_from_string (original, value_env);
+}
+
+/*
+ * Lookup a param in the files
+ */
+static int var_set_from_file (pmix_mca_base_var_t *var, pmix_mca_base_var_t *original, pmix_list_t *file_values)
+{
+    const char *var_full_name = var->mbv_full_name;
+    const char *var_long_name = var->mbv_long_name;
+    bool deprecated = PMIX_VAR_IS_DEPRECATED(var[0]);
+    bool is_synonym = PMIX_VAR_IS_SYNONYM(var[0]);
+    pmix_mca_base_var_file_value_t *fv;
+
+    /* Scan through the list of values read in from files and try to
+       find a match.  If we do, cache it on the param (for future
+       lookups) and save it in the storage. */
+
+    PMIX_LIST_FOREACH(fv, file_values, pmix_mca_base_var_file_value_t) {
+        if (0 != strcmp(fv->mbvfv_var, var_full_name) &&
+            0 != strcmp(fv->mbvfv_var, var_long_name)) {
+            continue;
+        }
+
+        /* found it */
+        if (PMIX_VAR_IS_DEFAULT_ONLY(var[0])) {
+            pmix_show_help("help-mca-var.txt", "default-only-param-set",
+                           true, var_full_name);
+
+            return PMIX_ERR_NOT_FOUND;
+        }
+
+        if (PMIX_MCA_BASE_VAR_FLAG_ENVIRONMENT_ONLY & original->mbv_flags) {
+            pmix_show_help("help-mca-var.txt", "environment-only-param",
+                           true, var_full_name, fv->mbvfv_value,
+                           fv->mbvfv_file);
+
+            return PMIX_ERR_NOT_FOUND;
+        }
+
+        if (PMIX_MCA_BASE_VAR_SOURCE_OVERRIDE == original->mbv_source) {
+            if (!pmix_mca_base_var_suppress_override_warning) {
+                pmix_show_help("help-mca-var.txt", "overridden-param-set",
+                               true, var_full_name);
+            }
+
+            return PMIX_ERR_NOT_FOUND;
+        }
+
+        if (deprecated) {
+            const char *new_variable = "None (going away)";
+
+            if (is_synonym) {
+                new_variable = original->mbv_full_name;
+            }
+
+            pmix_show_help("help-mca-var.txt", "deprecated-mca-file",
+                           true, var_full_name, fv->mbvfv_file,
+                           new_variable);
+        }
+
+        original->mbv_file_value = (void *) fv;
+        original->mbv_source = PMIX_MCA_BASE_VAR_SOURCE_FILE;
+        if (is_synonym) {
+            var->mbv_file_value = (void *) fv;
+            var->mbv_source = PMIX_MCA_BASE_VAR_SOURCE_FILE;
+        }
+
+        return var_set_from_string (original, fv->mbvfv_value);
+    }
+
+    return PMIX_ERR_NOT_FOUND;
+}
+
+/*
+ * Lookup the initial value for a parameter
+ */
+static int var_set_initial (pmix_mca_base_var_t *var, pmix_mca_base_var_t *original)
+{
+    int ret;
+
+    if (original) {
+        /* synonym */
+        var->mbv_source = original->mbv_source;
+        var->mbv_file_value = original->mbv_file_value;
+        var->mbv_source_file = original->mbv_source_file;
+    } else {
+        var->mbv_source = PMIX_MCA_BASE_VAR_SOURCE_DEFAULT;
+        original = var;
+    }
+
+    /* Check all the places that the param may be hiding, in priority
+       order. If the default only flag is set the user will get a
+       warning if they try to set a value from the environment or a
+       file. */
+    ret = var_set_from_file (var, original, &pmix_mca_base_var_override_values);
+    if (PMIX_SUCCESS == ret) {
+        var->mbv_flags = ~PMIX_MCA_BASE_VAR_FLAG_SETTABLE & (var->mbv_flags | PMIX_MCA_BASE_VAR_FLAG_OVERRIDE);
+        var->mbv_source = PMIX_MCA_BASE_VAR_SOURCE_OVERRIDE;
+    }
+
+    ret = var_set_from_env (var, original);
+    if (PMIX_ERR_NOT_FOUND != ret) {
+        return ret;
+    }
+
+    ret = var_set_from_file (var, original, &pmix_mca_base_envar_file_values);
+    if (PMIX_ERR_NOT_FOUND != ret) {
+        return ret;
+    }
+
+    ret = var_set_from_file (var, original, &pmix_mca_base_var_file_values);
+    if (PMIX_ERR_NOT_FOUND != ret) {
+        return ret;
+    }
+
+    return PMIX_SUCCESS;
+}
+
+/*
+ * Create an empty param container
+ */
+static void var_constructor(pmix_mca_base_var_t *var)
+{
+    memset ((char *) var + sizeof (var->super), 0, sizeof (*var) - sizeof (var->super));
+
+    var->mbv_type = PMIX_MCA_BASE_VAR_TYPE_MAX;
+    PMIX_CONSTRUCT(&var->mbv_synonyms, pmix_value_array_t);
+    pmix_value_array_init (&var->mbv_synonyms, sizeof (int));
+}
+
+
+/*
+ * Free all the contents of a param container
+ */
+static void var_destructor(pmix_mca_base_var_t *var)
+{
+    if ((PMIX_MCA_BASE_VAR_TYPE_STRING == var->mbv_type ||
+                PMIX_MCA_BASE_VAR_TYPE_VERSION_STRING == var->mbv_type) &&
+        NULL != var->mbv_storage &&
+        NULL != var->mbv_storage->stringval) {
+        free (var->mbv_storage->stringval);
+        var->mbv_storage->stringval = NULL;
+    }
+
+    /* don't release the boolean enumerator */
+    if (var->mbv_enumerator && !var->mbv_enumerator->enum_is_static) {
+        PMIX_RELEASE(var->mbv_enumerator);
+    }
+
+    if (NULL != var->mbv_variable_name) {
+        free(var->mbv_variable_name);
+    }
+    if (NULL != var->mbv_full_name) {
+        free(var->mbv_full_name);
+    }
+    if (NULL != var->mbv_long_name) {
+        free(var->mbv_long_name);
+    }
+
+    if (NULL != var->mbv_description) {
+        free(var->mbv_description);
+    }
+
+    /* Destroy the synonym array */
+    PMIX_DESTRUCT(&var->mbv_synonyms);
+
+    /* mark this parameter as invalid */
+    var->mbv_type = PMIX_MCA_BASE_VAR_TYPE_MAX;
+
+#if PMIX_ENABLE_DEBUG
+    /* Cheap trick to reset everything to NULL */
+    memset ((char *) var + sizeof (var->super), 0, sizeof (*var) - sizeof (var->super));
+#endif
+}
+
+
+static void fv_constructor(pmix_mca_base_var_file_value_t *f)
+{
+    memset ((char *) f + sizeof (f->super), 0, sizeof (*f) - sizeof (f->super));
+}
+
+
+static void fv_destructor(pmix_mca_base_var_file_value_t *f)
+{
+    if (NULL != f->mbvfv_var) {
+        free(f->mbvfv_var);
+    }
+    if (NULL != f->mbvfv_value) {
+        free(f->mbvfv_value);
+    }
+    /* the file name is stored in mca_*/
+    fv_constructor(f);
+}
+
+static char *source_name(pmix_mca_base_var_t *var)
+{
+    char *ret;
+
+    if (PMIX_MCA_BASE_VAR_SOURCE_FILE == var->mbv_source || PMIX_MCA_BASE_VAR_SOURCE_OVERRIDE == var->mbv_source) {
+        struct pmix_mca_base_var_file_value_t *fv = var->mbv_file_value;
+        int rc;
+
+        if (fv) {
+            rc = asprintf(&ret, "file (%s:%d)", fv->mbvfv_file, fv->mbvfv_lineno);
+        } else {
+            rc = asprintf(&ret, "file (%s)", var->mbv_source_file);
+        }
+
+        /* some compilers will warn if the return code of asprintf is not checked (even if it is cast to void) */
+        if (0 > rc) {
+            return NULL;
+        }
+        return ret;
+    } else if (PMIX_MCA_BASE_VAR_SOURCE_MAX <= var->mbv_source) {
+        return strdup ("unknown(!!)");
+    }
+
+    return strdup (pmix_var_source_names[var->mbv_source]);
+}
+
+static int var_value_string (pmix_mca_base_var_t *var, char **value_string)
+{
+    pmix_mca_base_var_storage_t *value=NULL;
+    int ret;
+
+    assert (PMIX_MCA_BASE_VAR_TYPE_MAX > var->mbv_type);
+
+    ret = pmix_mca_base_var_get_value(var->mbv_index, &value, NULL, NULL);
+    if (PMIX_SUCCESS != ret || NULL == value) {
+        return ret;
+    }
+
+    if (NULL == var->mbv_enumerator) {
+        switch (var->mbv_type) {
+        case PMIX_MCA_BASE_VAR_TYPE_INT:
+            ret = asprintf (value_string, "%d", value->intval);
+            break;
+        case PMIX_MCA_BASE_VAR_TYPE_UNSIGNED_INT:
+            ret = asprintf (value_string, "%u", value->uintval);
+            break;
+        case PMIX_MCA_BASE_VAR_TYPE_UNSIGNED_LONG:
+            ret = asprintf (value_string, "%lu", value->ulval);
+            break;
+        case PMIX_MCA_BASE_VAR_TYPE_UNSIGNED_LONG_LONG:
+            ret = asprintf (value_string, "%llu", value->ullval);
+            break;
+        case PMIX_MCA_BASE_VAR_TYPE_SIZE_T:
+            ret = asprintf (value_string, "%" PRIsize_t, value->sizetval);
+            break;
+        case PMIX_MCA_BASE_VAR_TYPE_STRING:
+        case PMIX_MCA_BASE_VAR_TYPE_VERSION_STRING:
+            ret = asprintf (value_string, "%s",
+                            value->stringval ? value->stringval : "");
+            break;
+        case PMIX_MCA_BASE_VAR_TYPE_BOOL:
+            ret = asprintf (value_string, "%d", value->boolval);
+            break;
+        case PMIX_MCA_BASE_VAR_TYPE_DOUBLE:
+            ret = asprintf (value_string, "%lf", value->lfval);
+            break;
+        default:
+            ret = -1;
+            break;
+        }
+
+        ret = (0 > ret) ? PMIX_ERR_OUT_OF_RESOURCE : PMIX_SUCCESS;
+    } else {
+        /* we use an enumerator to handle string->bool and bool->string conversion */
+        if (PMIX_MCA_BASE_VAR_TYPE_BOOL == var->mbv_type) {
+            ret = var->mbv_enumerator->string_from_value(var->mbv_enumerator, value->boolval, value_string);
+        } else {
+            ret = var->mbv_enumerator->string_from_value(var->mbv_enumerator, value->intval, value_string);
+        }
+
+        if (PMIX_SUCCESS != ret) {
+            return ret;
+        }
+    }
+
+    return ret;
+}
+
+int pmix_mca_base_var_check_exclusive (const char *project,
+                                  const char *type_a,
+                                  const char *component_a,
+                                  const char *param_a,
+                                  const char *type_b,
+                                  const char *component_b,
+                                  const char *param_b)
+{
+    pmix_mca_base_var_t *var_a = NULL, *var_b = NULL;
+    int var_ai, var_bi;
+
+    /* XXX -- Remove me once the project name is in the componennt */
+    project = NULL;
+
+    var_ai = pmix_mca_base_var_find (project, type_a, component_a, param_a);
+    var_bi = pmix_mca_base_var_find (project, type_b, component_b, param_b);
+    if (var_bi < 0 || var_ai < 0) {
+        return PMIX_ERR_NOT_FOUND;
+    }
+
+    (void) var_get (var_ai, &var_a, true);
+    (void) var_get (var_bi, &var_b, true);
+    if (NULL == var_a || NULL == var_b) {
+        return PMIX_ERR_NOT_FOUND;
+    }
+
+    if (PMIX_MCA_BASE_VAR_SOURCE_DEFAULT != var_a->mbv_source &&
+        PMIX_MCA_BASE_VAR_SOURCE_DEFAULT != var_b->mbv_source) {
+        char *str_a, *str_b;
+
+        /* Form cosmetic string names for A */
+        str_a = source_name(var_a);
+
+        /* Form cosmetic string names for B */
+        str_b = source_name(var_b);
+
+        /* Print it all out */
+        pmix_show_help("help-mca-var.txt",
+                       "mutually-exclusive-vars",
+                       true, var_a->mbv_full_name,
+                       str_a, var_b->mbv_full_name,
+                       str_b);
+
+        /* Free the temp strings */
+        free(str_a);
+        free(str_b);
+
+        return PMIX_ERR_BAD_PARAM;
+    }
+
+    return PMIX_SUCCESS;
+}
+
+int pmix_mca_base_var_get_count (void)
+{
+    return pmix_mca_base_var_count;
+}
+
+int pmix_mca_base_var_dump(int vari, char ***out, pmix_mca_base_var_dump_type_t output_type)
+{
+    const char *framework, *component, *full_name;
+    int i, line_count, line = 0, enum_count = 0;
+    char *value_string, *source_string, *tmp;
+    int synonym_count, ret, *synonyms = NULL;
+    pmix_mca_base_var_t *var, *original=NULL;
+    pmix_mca_base_var_group_t *group;
+
+    ret = var_get(vari, &var, false);
+    if (PMIX_SUCCESS != ret) {
+        return ret;
+    }
+
+    ret = pmix_mca_base_var_group_get_internal(var->mbv_group_index, &group, false);
+    if (PMIX_SUCCESS != ret) {
+        return ret;
+    }
+
+    if (PMIX_VAR_IS_SYNONYM(var[0])) {
+        ret = var_get(var->mbv_synonym_for, &original, false);
+        if (PMIX_SUCCESS != ret) {
+            return ret;
+        }
+        /* just for protection... */
+        if (NULL == original) {
+            return PMIX_ERR_NOT_FOUND;
+        }
+    }
+
+    framework = group->group_framework;
+    component = group->group_component ? group->group_component : "base";
+    full_name = var->mbv_full_name;
+
+    synonym_count = pmix_value_array_get_size(&var->mbv_synonyms);
+    if (synonym_count) {
+        synonyms = PMIX_VALUE_ARRAY_GET_BASE(&var->mbv_synonyms, int);
+    }
+
+    ret = var_value_string (var, &value_string);
+    if (PMIX_SUCCESS != ret) {
+        return ret;
+    }
+
+    source_string = source_name(var);
+    if (NULL == source_string) {
+        free (value_string);
+        return PMIX_ERR_OUT_OF_RESOURCE;
+    }
+
+    if (PMIX_MCA_BASE_VAR_DUMP_PARSABLE == output_type) {
+        if (NULL != var->mbv_enumerator) {
+            (void) var->mbv_enumerator->get_count(var->mbv_enumerator, &enum_count);
+        }
+
+        line_count = 8 + (var->mbv_description ? 1 : 0) + (PMIX_VAR_IS_SYNONYM(var[0]) ? 1 : synonym_count) +
+            enum_count;
+
+        *out = (char **) calloc (line_count + 1, sizeof (char *));
+        if (NULL == *out) {
+            free (value_string);
+            free (source_string);
+            return PMIX_ERR_OUT_OF_RESOURCE;
+        }
+
+        /* build the message*/
+        asprintf(&tmp, "mca:%s:%s:param:%s:", framework, component,
+                 full_name);
+
+        /* Output the value */
+        char *colon = strchr(value_string, ':');
+        if (NULL != colon) {
+            asprintf(out[0] + line++, "%svalue:\"%s\"", tmp, value_string);
+        } else {
+            asprintf(out[0] + line++, "%svalue:%s", tmp, value_string);
+        }
+
+        /* Output the source */
+        asprintf(out[0] + line++, "%ssource:%s", tmp, source_string);
+
+        /* Output whether it's read only or writable */
+        asprintf(out[0] + line++, "%sstatus:%s", tmp, PMIX_VAR_IS_DEFAULT_ONLY(var[0]) ? "read-only" : "writeable");
+
+        /* Output the info level of this parametere */
+        asprintf(out[0] + line++, "%slevel:%d", tmp, var->mbv_info_lvl + 1);
+
+        /* If it has a help message, output the help message */
+        if (var->mbv_description) {
+            asprintf(out[0] + line++, "%shelp:%s", tmp, var->mbv_description);
+        }
+
+        if (NULL != var->mbv_enumerator) {
+            for (i = 0 ; i < enum_count ; ++i) {
+                const char *enum_string = NULL;
+                int enum_value;
+
+                ret = var->mbv_enumerator->get_value(var->mbv_enumerator, i, &enum_value,
+                                                     &enum_string);
+                if (PMIX_SUCCESS != ret) {
+                    continue;
+                }
+
+                asprintf(out[0] + line++, "%senumerator:value:%d:%s", tmp, enum_value, enum_string);
+            }
+        }
+
+        /* Is this variable deprecated? */
+        asprintf(out[0] + line++, "%sdeprecated:%s", tmp, PMIX_VAR_IS_DEPRECATED(var[0]) ? "yes" : "no");
+
+        asprintf(out[0] + line++, "%stype:%s", tmp, pmix_var_type_names[var->mbv_type]);
+
+        /* Does this parameter have any synonyms or is it a synonym? */
+        if (PMIX_VAR_IS_SYNONYM(var[0])) {
+            asprintf(out[0] + line++, "%ssynonym_of:name:%s", tmp, original->mbv_full_name);
+        } else if (pmix_value_array_get_size(&var->mbv_synonyms)) {
+            for (i = 0 ; i < synonym_count ; ++i) {
+                pmix_mca_base_var_t *synonym;
+
+                ret = var_get(synonyms[i], &synonym, false);
+                if (PMIX_SUCCESS != ret) {
+                    continue;
+                }
+
+                asprintf(out[0] + line++, "%ssynonym:name:%s", tmp, synonym->mbv_full_name);
+            }
+        }
+
+        free (tmp);
+    } else if (PMIX_MCA_BASE_VAR_DUMP_READABLE == output_type) {
+        /* There will be at most three lines in the pretty print case */
+        *out = (char **) calloc (4, sizeof (char *));
+        if (NULL == *out) {
+            free (value_string);
+            free (source_string);
+            return PMIX_ERR_OUT_OF_RESOURCE;
+        }
+
+        asprintf (out[0], "%s \"%s\" (current value: \"%s\", data source: %s, level: %d %s, type: %s",
+                  PMIX_VAR_IS_DEFAULT_ONLY(var[0]) ? "informational" : "parameter",
+                  full_name, value_string, source_string, var->mbv_info_lvl + 1,
+                  info_lvl_strings[var->mbv_info_lvl], pmix_var_type_names[var->mbv_type]);
+
+        tmp = out[0][0];
+        if (PMIX_VAR_IS_DEPRECATED(var[0])) {
+            asprintf (out[0], "%s, deprecated", tmp);
+            free (tmp);
+            tmp = out[0][0];
+        }
+
+        /* Does this parameter have any synonyms or is it a synonym? */
+        if (PMIX_VAR_IS_SYNONYM(var[0])) {
+            asprintf(out[0], "%s, synonym of: %s)", tmp, original->mbv_full_name);
+            free (tmp);
+        } else if (synonym_count) {
+            asprintf(out[0], "%s, synonyms: ", tmp);
+            free (tmp);
+
+            for (i = 0 ; i < synonym_count ; ++i) {
+                pmix_mca_base_var_t *synonym;
+
+                ret = var_get(synonyms[i], &synonym, false);
+                if (PMIX_SUCCESS != ret) {
+                    continue;
+                }
+
+                tmp = out[0][0];
+                if (synonym_count == i+1) {
+                    asprintf(out[0], "%s%s)", tmp, synonym->mbv_full_name);
+                } else {
+                    asprintf(out[0], "%s%s, ", tmp, synonym->mbv_full_name);
+                }
+                free(tmp);
+            }
+        } else {
+            asprintf(out[0], "%s)", tmp);
+            free(tmp);
+        }
+
+        line++;
+
+        if (var->mbv_description) {
+            asprintf(out[0] + line++, "%s", var->mbv_description);
+        }
+
+        if (NULL != var->mbv_enumerator) {
+            char *values;
+
+            ret = var->mbv_enumerator->dump(var->mbv_enumerator, &values);
+            if (PMIX_SUCCESS == ret) {
+                asprintf (out[0] + line++, "Valid values: %s", values);
+                free (values);
+            }
+        }
+    } else if (PMIX_MCA_BASE_VAR_DUMP_SIMPLE == output_type) {
+        *out = (char **) calloc (2, sizeof (char *));
+        if (NULL == *out) {
+            free (value_string);
+            free (source_string);
+            return PMIX_ERR_OUT_OF_RESOURCE;
+        }
+
+        asprintf(out[0], "%s=%s (%s)", var->mbv_full_name, value_string, source_string);
+    }
+
+    free (value_string);
+    free (source_string);
+
+    return PMIX_SUCCESS;
+}
diff --git a/src/mca/base/pmix_mca_base_var.h b/src/mca/base/pmix_mca_base_var.h
new file mode 100644
index 0000000..328cdb1
--- /dev/null
+++ b/src/mca/base/pmix_mca_base_var.h
@@ -0,0 +1,740 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2006 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2008-2011 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2012-2015 Los Alamos National Security, LLC. All rights
+ *                         reserved.
+ * Copyright (c) 2016-2017 Intel, Inc.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+/** @file
+ * This file presents the MCA variable interface.
+ *
+ * Note that there are two scopes for MCA variables: "normal" and
+ * attributes.  Specifically, all MCA variables are "normal" -- some
+ * are special and may also be found on attributes on communicators,
+ * datatypes, or windows.
+ *
+ * In general, these functions are intended to be used as follows:
+ *
+ * - Creating MCA variables
+ * -# Register a variable, get an index back
+ * - Using MCA variables
+ * -# Lookup a "normal" variable value on a specific index, or
+ * -# Lookup an attribute variable on a specific index and
+ *    communicator / datatype / window.
+ *
+ * MCA variables can be defined in multiple different places.  As
+ * such, variables are \em resolved to find their value.  The order
+ * of resolution is as follows:
+ *
+ * - An "override" location that is only available to be set via the
+ *   pmix_mca_base_param API.
+ * - Look for an environment variable corresponding to the MCA
+ *   variable.
+ * - See if a file contains the MCA variable (MCA variable files are
+ *   read only once -- when the first time any mca_param_t function is
+ *   invoked).
+ * - If nothing else was found, use the variable's default value.
+ *
+ * Note that there is a second header file (pmix_mca_base_vari.h)
+ * that contains several internal type delcarations for the variable
+ * system.  The internal file is only used within the variable system
+ * itself; it should not be required by any other PMIX entities.
+ */
+
+#ifndef PMIX_MCA_BASE_VAR_H
+#define PMIX_MCA_BASE_VAR_H
+
+#include <src/include/pmix_config.h>
+
+#include "src/class/pmix_list.h"
+#include "src/class/pmix_value_array.h"
+#include "src/mca/base/pmix_mca_base_var_enum.h"
+#include "src/mca/base/pmix_mca_base_var_group.h"
+#include "src/mca/base/pmix_mca_base_framework.h"
+#include "src/mca/mca.h"
+
+/**
+ * The types of MCA variables.
+ */
+typedef enum {
+    /** The variable is of type int. */
+    PMIX_MCA_BASE_VAR_TYPE_INT,
+    /** The variable is of type unsigned int */
+    PMIX_MCA_BASE_VAR_TYPE_UNSIGNED_INT,
+    /** The variable is of type unsigned long */
+    PMIX_MCA_BASE_VAR_TYPE_UNSIGNED_LONG,
+    /** The variable is of type unsigned long long */
+    PMIX_MCA_BASE_VAR_TYPE_UNSIGNED_LONG_LONG,
+    /** The variable is of type size_t */
+    PMIX_MCA_BASE_VAR_TYPE_SIZE_T,
+    /** The variable is of type string. */
+    PMIX_MCA_BASE_VAR_TYPE_STRING,
+    /** The variable is of type string and contains version. */
+    PMIX_MCA_BASE_VAR_TYPE_VERSION_STRING,
+    /** The variable is of type bool */
+    PMIX_MCA_BASE_VAR_TYPE_BOOL,
+    /** The variable is of type double */
+    PMIX_MCA_BASE_VAR_TYPE_DOUBLE,
+    /** Maximum variable type. */
+    PMIX_MCA_BASE_VAR_TYPE_MAX
+} pmix_mca_base_var_type_t;
+
+extern const char *pmix_var_type_names[];
+
+/**
+ * Source of an MCA variable's value
+ */
+typedef enum {
+    /** The default value */
+    PMIX_MCA_BASE_VAR_SOURCE_DEFAULT,
+    /** The value came from the command line */
+    PMIX_MCA_BASE_VAR_SOURCE_COMMAND_LINE,
+    /** The value came from the environment */
+    PMIX_MCA_BASE_VAR_SOURCE_ENV,
+    /** The value came from a file */
+    PMIX_MCA_BASE_VAR_SOURCE_FILE,
+    /** The value came a "set" API call */
+    PMIX_MCA_BASE_VAR_SOURCE_SET,
+    /** The value came from the override file */
+    PMIX_MCA_BASE_VAR_SOURCE_OVERRIDE,
+
+    /** Maximum source type */
+    PMIX_MCA_BASE_VAR_SOURCE_MAX
+} pmix_mca_base_var_source_t;
+
+/**
+ * MCA variable scopes
+ *
+ * Equivalent to MPI_T scopes with the same base name (e.g.,
+ * MCA_BASE_VAR_SCOPE_CONSTANT corresponts to MPI_T_SCOPE_CONSTANT).
+ */
+typedef enum {
+    /** The value of this variable will not change after it is
+        registered.  This flag is incompatible with
+        MCA_BASE_VAR_FLAG_SETTABLE, and also implies
+        MCA_BASE_VAR_SCOPE_READONLY. */
+    PMIX_MCA_BASE_VAR_SCOPE_CONSTANT,
+    /** Setting the READONLY flag means that the pmix_mca_base_var_set()
+        function cannot be used to set the value of this variable
+        (e.g., the MPI_T_cvar_write() MPI_T function). */
+    PMIX_MCA_BASE_VAR_SCOPE_READONLY,
+    /** The value of this variable may be changed locally. */
+    PMIX_MCA_BASE_VAR_SCOPE_LOCAL,
+    /** The value of this variable must be set to a consistent value
+        within a group */
+    PMIX_MCA_BASE_VAR_SCOPE_GROUP,
+    /** The value of this variable must be set to the same value
+        within a group */
+    PMIX_MCA_BASE_VAR_SCOPE_GROUP_EQ,
+    /** The value of this variable must be set to a consistent value
+        for all processes */
+    PMIX_MCA_BASE_VAR_SCOPE_ALL,
+    /** The value of this variable must be set to the same value
+        for all processes */
+    PMIX_MCA_BASE_VAR_SCOPE_ALL_EQ,
+    PMIX_MCA_BASE_VAR_SCOPE_MAX
+} pmix_mca_base_var_scope_t;
+
+typedef enum {
+    PMIX_INFO_LVL_1,
+    PMIX_INFO_LVL_2,
+    PMIX_INFO_LVL_3,
+    PMIX_INFO_LVL_4,
+    PMIX_INFO_LVL_5,
+    PMIX_INFO_LVL_6,
+    PMIX_INFO_LVL_7,
+    PMIX_INFO_LVL_8,
+    PMIX_INFO_LVL_9,
+    PMIX_INFO_LVL_MAX
+} pmix_mca_base_var_info_lvl_t;
+
+typedef enum {
+    PMIX_MCA_BASE_VAR_SYN_FLAG_DEPRECATED = 0x0001,
+    PMIX_MCA_BASE_VAR_SYN_FLAG_INTERNAL   = 0x0002
+} pmix_mca_base_var_syn_flag_t;
+
+typedef enum {
+    /** Variable is internal (hidden from *_info/MPIT) */
+    PMIX_MCA_BASE_VAR_FLAG_INTERNAL     = 0x0001,
+    /** Variable will always be the default value. Implies
+        !MCA_BASE_VAR_FLAG_SETTABLE */
+    PMIX_MCA_BASE_VAR_FLAG_DEFAULT_ONLY = 0x0002,
+    /** Variable can be set with pmix_mca_base_var_set() */
+    PMIX_MCA_BASE_VAR_FLAG_SETTABLE     = 0x0004,
+    /** Variable is deprecated */
+    PMIX_MCA_BASE_VAR_FLAG_DEPRECATED   = 0x0008,
+    /** Variable has been overridden */
+    PMIX_MCA_BASE_VAR_FLAG_OVERRIDE     = 0x0010,
+    /** Variable may not be set from a file */
+    PMIX_MCA_BASE_VAR_FLAG_ENVIRONMENT_ONLY = 0x0020,
+    /** Variable should be deregistered when the group is deregistered
+        (DWG = "deregister with group").  This flag is set
+        automatically when you register a variable with
+        pmix_mca_base_component_var_register(), but can also be set
+        manually when you register a variable with
+        pmix_mca_base_var_register().  Analogous to the
+        MCA_BASE_PVAR_FLAG_IWG. */
+    PMIX_MCA_BASE_VAR_FLAG_DWG          = 0x0040
+} pmix_mca_base_var_flag_t;
+
+
+/**
+ * Types for MCA parameters.
+ */
+typedef union {
+    /** integer value */
+    int intval;
+    /** unsigned int value */
+    unsigned int uintval;
+    /** string value */
+    char *stringval;
+    /** boolean value */
+    bool boolval;
+    /** unsigned long value */
+    unsigned long ulval;
+    /** unsigned long long value */
+    unsigned long long ullval;
+    /** size_t value */
+    size_t sizetval;
+    /** double value */
+    double lfval;
+} pmix_mca_base_var_storage_t;
+
+
+/**
+ * Entry for holding information about an MCA variable.
+ */
+struct pmix_mca_base_var_t {
+    /** Allow this to be an PMIX OBJ */
+    pmix_object_t super;
+
+    /** Variable index. This will remain constant until pmix_mca_base_var_finalize()
+        is called. */
+    int mbv_index;
+    /** Group index. This will remain constant until pmix_mca_base_var_finalize()
+        is called. This variable will be deregistered if the associated group
+        is deregistered with pmix_mca_base_var_group_deregister() */
+    int mbv_group_index;
+
+    /** Info level of this variable */
+    pmix_mca_base_var_info_lvl_t mbv_info_lvl;
+
+    /** Enum indicating the type of the variable (integer, string, boolean) */
+     pmix_mca_base_var_type_t mbv_type;
+
+    /** String of the variable name */
+    char *mbv_variable_name;
+    /** Full variable name, in case it is not <framework>_<component>_<param> */
+    char *mbv_full_name;
+    /** Long variable name <project>_<framework>_<component>_<name> */
+    char *mbv_long_name;
+
+    /** List of synonym names for this variable.  This *must* be a
+        pointer (vs. a plain pmix_list_t) because we copy this whole
+        struct into a new var for permanent storage
+        (pmix_vale_array_append_item()), and the internal pointers in
+        the pmix_list_t will be invalid when that happens.  Hence, we
+        simply keep a pointer to an external pmix_list_t.  Synonyms
+        are uncommon enough that this is not a big performance hit. */
+    pmix_value_array_t mbv_synonyms;
+
+    /** Variable flags */
+    pmix_mca_base_var_flag_t  mbv_flags;
+
+    /** Variable scope */
+    pmix_mca_base_var_scope_t  mbv_scope;
+
+    /** Source of the current value */
+    pmix_mca_base_var_source_t mbv_source;
+
+    /** Synonym for */
+    int mbv_synonym_for;
+
+    /** Variable description */
+    char *mbv_description;
+
+    /** File the value came from */
+    char *mbv_source_file;
+
+    /** Value enumerator (only valid for integer variables) */
+    pmix_mca_base_var_enum_t *mbv_enumerator;
+
+    /** Bind value for this variable (0 - none) */
+    int mbv_bind;
+
+    /** Storage for this variable */
+    pmix_mca_base_var_storage_t *mbv_storage;
+
+    /** File value structure */
+    void *mbv_file_value;
+};
+/**
+ * Convenience typedef.
+ */
+typedef struct pmix_mca_base_var_t pmix_mca_base_var_t;
+
+/*
+ * Global functions for MCA
+ */
+
+BEGIN_C_DECLS
+
+/**
+ * Object declarayion for pmix_mca_base_var_t
+ */
+PMIX_CLASS_DECLARATION(pmix_mca_base_var_t);
+
+/**
+ * Initialize the MCA variable system.
+ *
+ * @retval PMIX_SUCCESS
+ *
+ * This function initalizes the MCA variable system.  It is
+ * invoked internally (by pmix_mca_base_open()) and is only documented
+ * here for completeness.
+ */
+int pmix_mca_base_var_init(void);
+
+/**
+ * Register an MCA variable
+ *
+ * @param[in] project_name The name of the project associated with
+ * this variable
+ * @param[in] framework_name The name of the framework associated with
+ * this variable
+ * @param[in] component_name The name of the component associated with
+ * this variable
+ * @param[in] variable_name The name of this variable
+ * @param[in] description A string describing the use and valid
+ * values of the variable (string).
+ * @param[in] type The type of this variable (string, int, bool).
+ * @param[in] enumerator Enumerator describing valid values.
+ * @param[in] bind Hint for MPIT to specify type of binding (0 = none)
+ * @param[in] flags Flags for this variable.
+ * @param[in] info_lvl Info level of this variable
+ * @param[in] scope Indicates the scope of this variable
+ * @param[in,out] storage Pointer to the value's location.
+ *
+ * @retval index Index value representing this variable.
+ * @retval PMIX_ERR_OUT_OF_RESOURCE Upon failure to allocate memory.
+ * @retval PMIX_ERROR Upon failure to register the variable.
+ *
+ * This function registers an MCA variable and associates it
+ * with a specific group.
+ *
+ * {description} is a string of arbitrary length (verbose is good!)
+ * for explaining what the variable is for and what its valid values
+ * are.  This message is used in help messages, such as the output
+ * from the ompi_info executable.  The {description} string is copied
+ * internally; the caller can free {description} upon successful
+ * return.
+ *
+ * {enumerator} is either NULL or a handle that was created via
+ * pmix_mca_base_var_enum_create(), and describes the valid values of an
+ * integer variable (i.e., one with type MCA_BASE_VAR_TYPE_INT).  When
+ * a non-NULL {enumerator} is used, the value set for this variable by
+ * the user will be compared against the values in the enumerator.
+ * The MCA variable system will allow the parameter to be set to
+ * either one of the enumerator values (0, 1, 2, etc) or a string
+ * representing one of those values.  {enumerator} is retained until
+ * either the variable is deregistered using
+ * pmix_mca_base_var_deregister(), pmix_mca_base_var_group_deregister(), or
+ * pmix_mca_base_var_finalize().  {enumerator} should be NULL for
+ * parameters that do not support enumerated values.
+ *
+ * {flags} indicate attributes of this variable (internal, settable,
+ * default only, etc.), as listed below.
+ *
+ * If MCA_BASE_VAR_FLAG_SETTABLE is set in {flags}, this variable may
+ * be set using pmix_mca_base_var_set_value() (i.e., the MPI_T interface).
+ *
+ * If MCA_BASE_VAR_FLAG_INTERNAL is set in {flags}, this variable
+ * is not shown by default in the output of ompi_info.  That is,
+ * this variable is considered internal to the PMIX implementation
+ * and is not supposed to be viewed / changed by the user.
+ *
+ * If MCA_BASE_VAR_FLAG_DEFAULT_ONLY is set in {flags}, then the value
+ * provided in storage will not be modified by the MCA variable system
+ * (i.e., users cannot set the value of this variable via CLI
+ * parameter, environment variable, file, etc.). It is up to the
+ * caller to specify (using the scope) if this value may change
+ * (MCA_BASE_VAR_SCOPE_READONLY) or remain constant
+ * (MCA_BASE_VAR_SCOPE_CONSTANT).  MCA_BASE_VAR_FLAG_DEFAULT_ONLY must
+ * not be specified with MCA_BASE_VAR_FLAG_SETTABLE.
+ *
+ * Set MCA_BASE_VAR_FLAG_DEPRECATED in {flags} to indicate that
+ * this variable name is deprecated. The user will get a warning
+ * if they set this variable.
+ *
+ * {scope} is for informational purposes to indicate how this variable
+ * can be set, or if it is considered constant or readonly (which, by
+ * MPI_T's definitions, are different things).  See the comments in
+ * the description of pmix_mca_base_var_scope_t for information about the
+ * different scope meanings.
+ *
+ * {storage} points to a (char *), (int), or (bool) where the value of
+ * this variable is stored ({type} indicates the type of this
+ * pointer).  The location pointed to by {storage} must exist until
+ * the variable is deregistered.  Note that the initial value in
+ * {storage} may be overwritten if the MCA_BASE_VAR_FLAG_DEFAULT_ONLY
+ * flag is not set (e.g., if the user sets this variable via CLI
+ * option, environment variable, or file value).  If input value of
+ * {storage} points to a (char *), the pointed-to string will be
+ * duplicated and maintained internally by the MCA variable system;
+ * the caller may free the original string after this function returns
+ * successfully.
+ */
+PMIX_EXPORT int pmix_mca_base_var_register (const char *project_name, const char *framework_name,
+                                const char *component_name, const char *variable_name,
+                                const char *description, pmix_mca_base_var_type_t type,
+                                pmix_mca_base_var_enum_t *enumerator, int bind, pmix_mca_base_var_flag_t flags,
+                                pmix_mca_base_var_info_lvl_t info_lvl,
+                                pmix_mca_base_var_scope_t scope, void *storage);
+
+/**
+ * Convenience function for registering a variable associated with a
+ * component.
+ *
+ * While quite similar to pmix_mca_base_var_register(), there is one key
+ * difference: vars registered this this function will automatically
+ * be unregistered / made unavailable when that component is closed by
+ * its framework.
+ */
+PMIX_EXPORT int pmix_mca_base_component_var_register (const pmix_mca_base_component_t *component,
+                                          const char *variable_name, const char *description,
+                                          pmix_mca_base_var_type_t type, pmix_mca_base_var_enum_t *enumerator,
+                                          int bind, pmix_mca_base_var_flag_t flags,
+                                          pmix_mca_base_var_info_lvl_t info_lvl,
+                                          pmix_mca_base_var_scope_t scope, void *storage);
+
+/**
+ * Convenience function for registering a variable associated with a framework. This
+ * function is equivalent to pmix_mca_base_var_register with component_name = "base" and
+ * with the MCA_BASE_VAR_FLAG_DWG set. See pmix_mca_base_var_register().
+ */
+PMIX_EXPORT int pmix_mca_base_framework_var_register (const pmix_mca_base_framework_t *framework,
+                                          const char *variable_name,
+                                          const char *help_msg, pmix_mca_base_var_type_t type,
+                                          pmix_mca_base_var_enum_t *enumerator, int bind,
+                                          pmix_mca_base_var_flag_t flags,
+                                          pmix_mca_base_var_info_lvl_t info_level,
+                                          pmix_mca_base_var_scope_t scope, void *storage);
+
+/**
+ * Register a synonym name for an MCA variable.
+ *
+ * @param[in] synonym_for The index of the original variable. This index
+ * must not refer to a synonym.
+ * @param[in] project_name The project this synonym belongs to. Should
+ * not be NULL (except for legacy reasons).
+ * @param[in] framework_name The framework this synonym belongs to.
+ * @param[in] component_name The component this synonym belongs to.
+ * @param[in] synonym_name The synonym name.
+ * @param[in] flags Flags for this synonym.
+ *
+ * @returns index Variable index for new synonym on success.
+ * @returns PMIX_ERR_BAD_VAR If synonym_for does not reference a valid
+ * variable.
+ * @returns PMIX_ERR_OUT_OF_RESOURCE If memory could not be allocated.
+ * @returns PMIX_ERROR For all other errors.
+ *
+ * Upon success, this function creates a synonym MCA variable
+ * that will be treated almost exactly like the original.  The
+ * type (int or string) is irrelevant; this function simply
+ * creates a new name that by which the same variable value is
+ * accessible.
+ *
+ * Note that the original variable name has precendence over all
+ * synonyms.  For example, consider the case if variable is
+ * originally registered under the name "A" and is later
+ * registered with synonyms "B" and "C".  If the user sets values
+ * for both MCA variable names "A" and "B", the value associated
+ * with the "A" name will be used and the value associated with
+ * the "B" will be ignored (and will not even be visible by the
+ * pmix_mca_base_var_*() API).  If the user sets values for both MCA
+ * variable names "B" and "C" (and does *not* set a value for
+ * "A"), it is undefined as to which value will be used.
+ */
+PMIX_EXPORT int pmix_mca_base_var_register_synonym (int synonym_for, const char *project_name,
+                                        const char *framework_name,
+                                        const char *component_name,
+                                        const char *synonym_name,
+                                        pmix_mca_base_var_syn_flag_t flags);
+
+/**
+ * Deregister a MCA variable or synonym
+ *
+ * @param vari Index returned from pmix_mca_base_var_register() or
+ * pmix_mca_base_var_register_synonym().
+ *
+ * Deregistering a variable does not free the variable or any memory assoicated
+ * with it. All memory will be freed and the variable index released when
+ * pmix_mca_base_var_finalize() is called.
+ *
+ * If an enumerator is associated with this variable it will be dereferenced.
+ */
+int pmix_mca_base_var_deregister(int vari);
+
+
+/**
+ * Get the current value of an MCA variable.
+ *
+ * @param[in] vari Index of variable
+ * @param[in,out] value Pointer to copy the value to. Can be NULL.
+ * @param[in,out] value_size Size of memory pointed to by value.
+ * copied size will be returned in value_size.
+ * @param[out] source Source of current value. Can be NULL.
+ * @param[out] source_file Source file for the current value if
+ * it was set from a file.
+ *
+ * @return PMIX_ERROR Upon failure.  The contents of value are
+ * undefined.
+ * @return PMIX_SUCCESS Upon success. value (if not NULL) will be filled
+ * with the variable's current value. value_size will contain the size
+ * copied. source (if not NULL) will contain the source of the variable.
+ *
+ * Note: The value can be changed by the registering code without using
+ * the pmix_mca_base_var_* interface so the source may be incorrect.
+ */
+int pmix_mca_base_var_get_value (int vari, void *value,
+                                 pmix_mca_base_var_source_t *source,
+                                 const char **source_file);
+
+/**
+ * Sets an "override" value for an integer MCA variable.
+ *
+ * @param[in] vari Index of MCA variable to set
+ * @param[in] value Pointer to the value to set. Should point to
+ * a char * for string variables or a int * for integer variables.
+ * @param[in] size Size of value.
+ * @param[in] source Source of this value.
+ * @param[in] source_file Source file if source is MCA_BASE_VAR_SOURCE_FILE.
+ *
+ * @retval PMIX_SUCCESS  Upon success.
+ * @retval PMIX_ERR_PERM If the variable is not settable.
+ * @retval PMIX_ERR_BAD_PARAM If the variable does not exist or has
+ * been deregistered.
+ * @retval PMIX_ERROR On other error.
+ *
+ * This function sets the value of an MCA variable. This value will
+ * overwrite the current value of the variable (or if index represents
+ * a synonym the variable the synonym represents) if the value is
+ * settable.
+ */
+int pmix_mca_base_var_set_value (int vari, const void *value, size_t size,
+                                 pmix_mca_base_var_source_t source,
+                                 const char *source_file);
+
+/**
+ * Get the string name corresponding to the MCA variable
+ * value in the environment.
+ *
+ * @param param_name Name of the type containing the variable.
+ *
+ * @retval string A string suitable for setenv() or appending to
+ * an environ-style string array.
+ * @retval NULL Upon failure.
+ *
+ * The string that is returned is owned by the caller; if
+ * appropriate, it must be eventually freed by the caller.
+ */
+int pmix_mca_base_var_env_name(const char *param_name,
+                               char **env_name);
+
+/**
+ * Find the index for an MCA variable based on its names.
+ *
+ * @param project_name   Name of the project
+ * @param type_name      Name of the type containing the variable.
+ * @param component_name Name of the component containing the variable.
+ * @param param_name     Name of the variable.
+ *
+ * @retval PMIX_ERROR If the variable was not found.
+ * @retval vari If the variable was found.
+ *
+ * It is not always convenient to widely propagate a variable's index
+ * value, or it may be necessary to look up the variable from a
+ * different component. This function can be used to look up the index
+ * of any registered variable.  The returned index can be used with
+ * pmix_mca_base_var_get() and pmix_mca_base_var_get_value().
+ */
+int pmix_mca_base_var_find (const char *project_name,
+                            const char *type_name,
+                            const char *component_name,
+                            const char *param_name);
+
+/**
+ * Find the index for a variable based on its full name
+ *
+ * @param full_name [in] Full name of the variable
+ * @param vari [out]    Index of the variable
+ *
+ * See pmix_mca_base_var_find().
+ */
+int pmix_mca_base_var_find_by_name (const char *full_name, int *vari);
+
+/**
+ * Check that two MCA variables were not both set to non-default
+ * values.
+ *
+ * @param type_a [in] Framework name of variable A (string).
+ * @param component_a [in] Component name of variable A (string).
+ * @param param_a [in] Variable name of variable A (string.
+ * @param type_b [in] Framework name of variable A (string).
+ * @param component_b [in] Component name of variable A (string).
+ * @param param_b [in] Variable name of variable A (string.
+ *
+ * This function is useful for checking that the user did not set both
+ * of 2 mutually-exclusive MCA variables.
+ *
+ * This function will print an pmix_show_help() message and return
+ * PMIX_ERR_BAD_VAR if it finds that the two variables both have
+ * value sources that are not MCA_BASE_VAR_SOURCE_DEFAULT.  This
+ * means that both variables have been set by the user (i.e., they're
+ * not default values).
+ *
+ * Note that pmix_show_help() allows itself to be hooked, so if this
+ * happens after the aggregated pmix_show_help() system is
+ * initialized, the messages will be aggregated (w00t).
+ *
+ * @returns PMIX_ERR_BAD_VAR if the two variables have sources that
+ * are not MCA_BASE_VAR_SOURCE_DEFAULT.
+ * @returns PMIX_SUCCESS otherwise.
+ */
+int pmix_mca_base_var_check_exclusive (const char *project,
+                                       const char *type_a,
+                                       const char *component_a,
+                                       const char *param_a,
+                                       const char *type_b,
+                                       const char *component_b,
+                                       const char *param_b);
+
+/**
+ * Set or unset a flag on a variable.
+ *
+ * @param[in] vari Index of variable
+ * @param[in] flag Flag(s) to set or unset.
+ * @param[in] set Boolean indicating whether to set flag(s).
+ *
+ * @returns PMIX_SUCCESS If the flags are set successfully.
+ * @returns PMIX_ERR_BAD_PARAM If the variable is not registered.
+ * @returns PMIX_ERROR Otherwise
+ */
+int pmix_mca_base_var_set_flag(int vari, pmix_mca_base_var_flag_t flag,
+                               bool set);
+
+/**
+ * Obtain basic info on a single variable (name, help message, etc)
+ *
+ * @param[in] vari Valid variable index.
+ * @param[out] var Storage for the variable pointer.
+ *
+ * @retval PMIX_SUCCESS Upon success.
+ * @retval pmix error code Upon failure.
+ *
+ * The returned pointer belongs to the MCA variable system. Do not
+ * modify/free/retain the pointer.
+ */
+int pmix_mca_base_var_get (int vari, const pmix_mca_base_var_t **var);
+
+/**
+ * Obtain the number of variables that have been registered.
+ *
+ * @retval count on success
+ * @return pmix error code on error
+ *
+ * Note: This function does not return the number of valid MCA variables as
+ * pmix_mca_base_var_deregister() has no impact on the variable count. The count
+ * returned is equal to the number of calls to pmix_mca_base_var_register with
+ * unique names. ie. two calls with the same name will not affect the count.
+ */
+int pmix_mca_base_var_get_count (void);
+
+/**
+ * Obtain a list of enironment variables describing the all
+ * valid (non-default) MCA variables and their sources.
+ *
+ * @param[out] env A pointer to an argv-style array of key=value
+ * strings, suitable for use in an environment
+ * @param[out] num_env A pointer to an int, containing the length
+ * of the env array (not including the final NULL entry).
+ * @param[in] internal Whether to include internal variables.
+ *
+ * @retval PMIX_SUCCESS Upon success.
+ * @retval PMIX_ERROR Upon failure.
+ *
+ * This function is similar to pmix_mca_base_var_dump() except that
+ * its output is in terms of an argv-style array of key=value
+ * strings, suitable for using in an environment.
+ */
+int pmix_mca_base_var_build_env(char ***env, int *num_env,
+                                bool internal);
+
+/**
+ * Shut down the MCA variable system (normally only invoked by the
+ * MCA framework itself).
+ *
+ * @returns PMIX_SUCCESS This function never fails.
+ *
+ * This function shuts down the MCA variable repository and frees all
+ * associated memory.  No other pmix_mca_base_var*() functions can be
+ * invoked after this function.
+ *
+ * This function is normally only invoked by the MCA framework itself
+ * when the process is shutting down (e.g., during MPI_FINALIZE).  It
+ * is only documented here for completeness.
+ */
+int pmix_mca_base_var_finalize(void);
+
+typedef enum {
+    /* Dump human-readable strings */
+    PMIX_MCA_BASE_VAR_DUMP_READABLE = 0,
+    /* Dump easily parsable strings */
+    PMIX_MCA_BASE_VAR_DUMP_PARSABLE = 1,
+    /* Dump simple name=value string */
+    PMIX_MCA_BASE_VAR_DUMP_SIMPLE   = 2
+} pmix_mca_base_var_dump_type_t;
+
+/**
+ * Dump strings describing the MCA variable at an index.
+ *
+ * @param[in]  vari        Variable index
+ * @param[out] out         Array of strings describing this variable
+ * @param[in]  output_type Type of output desired
+ *
+ * This function returns an array of strings describing the variable. All strings
+ * and the array must be freed by the caller.
+ */
+int pmix_mca_base_var_dump(int vari, char ***out, pmix_mca_base_var_dump_type_t output_type);
+
+#define MCA_COMPILETIME_VER "print_compiletime_version"
+#define MCA_RUNTIME_VER "print_runtime_version"
+
+int pmix_mca_base_var_cache_files (bool rel_path_search);
+
+/*
+ * Parse a provided list of envars and add their local value, or
+ * their assigned value, to the provided argv
+ */
+int pmix_mca_base_var_process_env_list(char ***argv);
+int pmix_mca_base_var_process_env_list_from_file(char ***argv);
+
+END_C_DECLS
+
+#endif /* PMIX_MCA_BASE_VAR_H */
diff --git a/src/mca/base/pmix_mca_base_var_enum.c b/src/mca/base/pmix_mca_base_var_enum.c
new file mode 100644
index 0000000..b5bb281
--- /dev/null
+++ b/src/mca/base/pmix_mca_base_var_enum.c
@@ -0,0 +1,623 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2012 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2008-2013 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2012-2015 Los Alamos National Security, LLC. All rights
+ *                         reserved.
+ * Copyright (c) 2016      Intel, Inc. All rights reserved
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+
+#include "src/mca/base/pmix_mca_base_var_enum.h"
+#include "src/mca/base/base.h"
+#include "src/util/argv.h"
+#include "src/util/error.h"
+
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+
+static void pmix_mca_base_var_enum_constructor (pmix_mca_base_var_enum_t *enumerator);
+static void pmix_mca_base_var_enum_destructor (pmix_mca_base_var_enum_t *enumerator);
+PMIX_CLASS_INSTANCE(pmix_mca_base_var_enum_t, pmix_object_t, pmix_mca_base_var_enum_constructor,
+                    pmix_mca_base_var_enum_destructor);
+
+static void pmix_mca_base_var_enum_flag_constructor (pmix_mca_base_var_enum_flag_t *enumerator);
+static void pmix_mca_base_var_enum_flag_destructor (pmix_mca_base_var_enum_flag_t *enumerator);
+PMIX_CLASS_INSTANCE(pmix_mca_base_var_enum_flag_t, pmix_object_t, pmix_mca_base_var_enum_flag_constructor,
+                    pmix_mca_base_var_enum_flag_destructor);
+
+static int enum_dump (pmix_mca_base_var_enum_t *self, char **out);
+static int enum_get_count (pmix_mca_base_var_enum_t *self, int *count);
+static int enum_get_value (pmix_mca_base_var_enum_t *self, int index, int *value, const char **string_value);
+
+static int pmix_mca_base_var_enum_bool_get_count (pmix_mca_base_var_enum_t *enumerator, int *count)
+{
+    *count = 2;
+    return PMIX_SUCCESS;
+}
+
+static int pmix_mca_base_var_enum_bool_get_value (pmix_mca_base_var_enum_t *self, int index,
+                                             int *value, const char **string_value)
+{
+    if (1 < index) {
+        return PMIX_ERR_VALUE_OUT_OF_BOUNDS;
+    }
+
+    *value = index ? 1 : 0;
+    *string_value = index ? "true" : "false";
+
+    return PMIX_SUCCESS;
+}
+
+static int pmix_mca_base_var_enum_bool_vfs (pmix_mca_base_var_enum_t *self, const char *string_value,
+                                       int *value)
+{
+    char *tmp;
+    int v;
+
+    /* skip whitespace */
+    string_value += strspn (string_value, " \t\n\v\f\r");
+
+    v = strtol (string_value, &tmp, 10);
+    if (*tmp != '\0') {
+        if (0 == strcmp (string_value, "true") || 0 == strcmp (string_value, "t") ||
+            0 == strcmp (string_value, "enabled") || 0 == strcmp (string_value, "yes")) {
+            v = 1;
+        } else if (0 == strcmp (string_value, "false") || 0 == strcmp (string_value, "f") ||
+                   0 == strcmp (string_value, "disabled") || 0 == strcmp (string_value, "no")) {
+            v = 0;
+        } else {
+            return PMIX_ERR_VALUE_OUT_OF_BOUNDS;
+        }
+    }
+
+    *value = !!v;
+
+    return PMIX_SUCCESS;
+}
+
+static int pmix_mca_base_var_enum_bool_sfv (pmix_mca_base_var_enum_t *self, const int value,
+                                       char **string_value)
+{
+    if (string_value) {
+        *string_value = strdup (value ? "true" : "false");
+    }
+
+    return PMIX_SUCCESS;
+}
+
+static int pmix_mca_base_var_enum_bool_dump (pmix_mca_base_var_enum_t *self, char **out)
+{
+    *out = strdup ("0: f|false|disabled|no, 1: t|true|enabled|yes");
+    return *out ? PMIX_SUCCESS : PMIX_ERR_OUT_OF_RESOURCE;
+}
+
+pmix_mca_base_var_enum_t pmix_mca_base_var_enum_bool = {
+    .super     = PMIX_OBJ_STATIC_INIT(pmix_object_t),
+    .enum_is_static = true,
+    .enum_name = "boolean",
+    .get_count = pmix_mca_base_var_enum_bool_get_count,
+    .get_value = pmix_mca_base_var_enum_bool_get_value,
+    .value_from_string = pmix_mca_base_var_enum_bool_vfs,
+    .string_from_value = pmix_mca_base_var_enum_bool_sfv,
+    .dump      = pmix_mca_base_var_enum_bool_dump
+};
+
+/* verbosity enumerator */
+static pmix_mca_base_var_enum_value_t verbose_values[] = {
+    {PMIX_MCA_BASE_VERBOSE_NONE,      "none"},
+    {PMIX_MCA_BASE_VERBOSE_ERROR,     "error"},
+    {PMIX_MCA_BASE_VERBOSE_COMPONENT, "component"},
+    {PMIX_MCA_BASE_VERBOSE_WARN,      "warn"},
+    {PMIX_MCA_BASE_VERBOSE_INFO,      "info"},
+    {PMIX_MCA_BASE_VERBOSE_TRACE,     "trace"},
+    {PMIX_MCA_BASE_VERBOSE_DEBUG,     "debug"},
+    {PMIX_MCA_BASE_VERBOSE_MAX,       "max"},
+    {-1, NULL}
+};
+
+static int pmix_mca_base_var_enum_verbose_vfs (pmix_mca_base_var_enum_t *self, const char *string_value,
+                                          int *value)
+{
+    char *tmp;
+    int v;
+
+    /* skip whitespace */
+    string_value += strspn (string_value, " \t\n\v\f\r");
+
+    v = strtol (string_value, &tmp, 10);
+    if (*tmp != '\0') {
+        for (int i = 0 ; verbose_values[i].string ; ++i) {
+            if (0 == strcmp (verbose_values[i].string, string_value)) {
+                *value = verbose_values[i].value;
+                return PMIX_SUCCESS;
+            }
+        }
+
+        return PMIX_ERR_NOT_FOUND;
+    } else if (v < PMIX_MCA_BASE_VERBOSE_NONE) {
+        v = PMIX_MCA_BASE_VERBOSE_NONE;
+    } else if (v > PMIX_MCA_BASE_VERBOSE_MAX) {
+        v = PMIX_MCA_BASE_VERBOSE_MAX;
+    }
+
+    *value = v;
+
+    return PMIX_SUCCESS;
+}
+
+static int pmix_mca_base_var_enum_verbose_sfv (pmix_mca_base_var_enum_t *self, const int value,
+                                          char **string_value)
+{
+    int ret;
+
+    if (value < 0 || value > 100) {
+        return PMIX_ERR_VALUE_OUT_OF_BOUNDS;
+    }
+
+    for (int i = 0 ; verbose_values[i].string ; ++i) {
+        if (verbose_values[i].value == value) {
+            *string_value = strdup (verbose_values[i].string);
+            return PMIX_SUCCESS;
+        }
+    }
+
+    if (string_value) {
+        ret = asprintf (string_value, "%d", value);
+        if (0 > ret) {
+            return PMIX_ERR_OUT_OF_RESOURCE;
+        }
+    }
+
+    return PMIX_SUCCESS;
+}
+
+static int pmix_mca_base_var_enum_verbose_dump (pmix_mca_base_var_enum_t *self, char **out)
+{
+    char *tmp;
+    int ret;
+
+    ret = enum_dump (self, out);
+    if (PMIX_SUCCESS != ret) {
+        return ret;
+    }
+
+    ret = asprintf (&tmp, "%s, 0 - 100", *out);
+    free (*out);
+    if (0 > ret) {
+        *out = NULL;
+        return PMIX_ERR_OUT_OF_RESOURCE;
+    }
+
+    *out = tmp;
+
+    return PMIX_SUCCESS;
+}
+
+pmix_mca_base_var_enum_t pmix_mca_base_var_enum_verbose = {
+    .super     = PMIX_OBJ_STATIC_INIT(pmix_object_t),
+    .enum_is_static = true,
+    .enum_name = "verbosity",
+    .get_count = enum_get_count,
+    .get_value = enum_get_value,
+    .value_from_string = pmix_mca_base_var_enum_verbose_vfs,
+    .string_from_value = pmix_mca_base_var_enum_verbose_sfv,
+    .dump      = pmix_mca_base_var_enum_verbose_dump,
+    .enum_value_count = 8,
+    .enum_values = verbose_values,
+};
+
+
+int pmix_mca_base_var_enum_create (const char *name, const pmix_mca_base_var_enum_value_t *values, pmix_mca_base_var_enum_t **enumerator)
+{
+    pmix_mca_base_var_enum_t *new_enum;
+    int i;
+
+    *enumerator = NULL;
+
+    new_enum = PMIX_NEW(pmix_mca_base_var_enum_t);
+    if (NULL == new_enum) {
+        return PMIX_ERR_OUT_OF_RESOURCE;
+    }
+
+    new_enum->enum_name = strdup (name);
+    if (NULL == new_enum->enum_name) {
+        return PMIX_ERR_OUT_OF_RESOURCE;
+    }
+
+    for (i = 0 ; values[i].string ; ++i);
+    new_enum->enum_value_count = i;
+
+    /* make a copy of the values */
+    new_enum->enum_values = calloc (new_enum->enum_value_count + 1, sizeof (*new_enum->enum_values));
+    if (NULL == new_enum->enum_values) {
+        PMIX_RELEASE(new_enum);
+        return PMIX_ERR_OUT_OF_RESOURCE;
+    }
+
+    for (i = 0 ; i < new_enum->enum_value_count ; ++i) {
+        new_enum->enum_values[i].value = values[i].value;
+        new_enum->enum_values[i].string = strdup (values[i].string);
+    }
+
+    *enumerator = new_enum;
+
+    return PMIX_SUCCESS;
+}
+
+int pmix_mca_base_var_enum_create_flag (const char *name, const pmix_mca_base_var_enum_value_flag_t *flags, pmix_mca_base_var_enum_flag_t **enumerator)
+{
+    pmix_mca_base_var_enum_flag_t *new_enum;
+    int i;
+
+    *enumerator = NULL;
+
+    new_enum = PMIX_NEW(pmix_mca_base_var_enum_flag_t);
+    if (NULL == new_enum) {
+        return PMIX_ERR_OUT_OF_RESOURCE;
+    }
+
+    new_enum->super.enum_name = strdup (name);
+    if (NULL == new_enum->super.enum_name) {
+        return PMIX_ERR_OUT_OF_RESOURCE;
+    }
+
+    for (i = 0 ; flags[i].string ; ++i);
+    new_enum->super.enum_value_count = i;
+
+    /* make a copy of the values */
+    new_enum->enum_flags = calloc (new_enum->super.enum_value_count + 1, sizeof (*new_enum->enum_flags));
+    if (NULL == new_enum->enum_flags) {
+        PMIX_RELEASE(new_enum);
+        return PMIX_ERR_OUT_OF_RESOURCE;
+    }
+
+    int all_flags = 0;
+    for (i = 0 ; i < new_enum->super.enum_value_count ; ++i) {
+        new_enum->enum_flags[i].flag = flags[i].flag;
+        new_enum->enum_flags[i].string = strdup (flags[i].string);
+        new_enum->enum_flags[i].conflicting_flag = flags[i].conflicting_flag;
+        /* ensure flags are only set a single bit, doesn't conflict with itself, and
+         * hasn't already been specified. */
+        assert (!(flags[i].flag & (flags[i].flag - 1)));
+        assert (!(flags[i].flag & flags[i].conflicting_flag));
+        assert (!(all_flags & flags[i].flag));
+        assert (flags[i].flag);
+        all_flags |= flags[i].flag;
+    }
+
+    *enumerator = new_enum;
+
+    return PMIX_SUCCESS;
+}
+
+static int enum_dump (pmix_mca_base_var_enum_t *self, char **out)
+{
+    int i;
+    char *tmp;
+    int ret;
+
+    *out = NULL;
+
+    if (NULL == self) {
+        return PMIX_ERROR;
+    }
+
+    tmp = NULL;
+    for (i = 0; i < self->enum_value_count && self->enum_values[i].string ; ++i) {
+        ret = asprintf (out, "%s%s%d:\"%s\"", tmp ? tmp : "", tmp ? ", " : "", self->enum_values[i].value,
+                        self->enum_values[i].string);
+        if (tmp) free (tmp);
+        if (0 > ret) {
+            return PMIX_ERR_OUT_OF_RESOURCE;
+        }
+        tmp = *out;
+    }
+
+    return PMIX_SUCCESS;
+}
+
+static int enum_get_count (pmix_mca_base_var_enum_t *self, int *count)
+{
+    *count = self->enum_value_count;
+    return PMIX_SUCCESS;
+}
+
+static int enum_get_value (pmix_mca_base_var_enum_t *self, int index, int *value, const char **string_value)
+{
+    int count, ret;
+
+    ret = self->get_count(self, &count);
+    if (PMIX_SUCCESS != ret) {
+        return ret;
+    }
+
+    if (index >= count) {
+        return PMIX_ERR_VALUE_OUT_OF_BOUNDS;
+    }
+
+    if (value) {
+        *value = self->enum_values[index].value;
+    }
+
+    if (string_value) {
+        *string_value = strdup (self->enum_values[index].string);
+    }
+
+    return PMIX_SUCCESS;
+}
+
+static int enum_value_from_string(pmix_mca_base_var_enum_t *self, const char *string_value, int *value_out) {
+    int value, count, ret, i;
+    bool is_int;
+    char *tmp;
+
+    ret = self->get_count(self, &count);
+    if (PMIX_SUCCESS != ret) {
+        return ret;
+    }
+
+    value = strtol(string_value, &tmp, 0);
+
+    /* Check if the string is an integer */
+    is_int = tmp[0] == '\0';
+
+    for (i = 0 ; i < count ; ++i) {
+        if ((is_int && value == self->enum_values[i].value) ||
+            0 == strcasecmp (string_value, self->enum_values[i].string)) {
+            break;
+        }
+    }
+
+    if (i == count) {
+        return PMIX_ERR_VALUE_OUT_OF_BOUNDS;
+    }
+
+    *value_out = self->enum_values[i].value;
+
+    return PMIX_SUCCESS;
+}
+
+static int enum_string_from_value(pmix_mca_base_var_enum_t *self, const int value, char **string_value) {
+    int count, ret, i;
+
+    ret = self->get_count(self, &count);
+    if (PMIX_SUCCESS != ret) {
+        return ret;
+    }
+
+    for (i = 0 ; i < count ; ++i) {
+        if (value == self->enum_values[i].value) {
+            break;
+        }
+    }
+
+    if (i == count) {
+        return PMIX_ERR_VALUE_OUT_OF_BOUNDS;
+    }
+
+    if (string_value) {
+        *string_value = strdup (self->enum_values[i].string);
+    }
+
+    return PMIX_SUCCESS;
+}
+
+static void pmix_mca_base_var_enum_constructor (pmix_mca_base_var_enum_t *enumerator)
+{
+    memset ((char *) enumerator + sizeof (enumerator->super), 0 , sizeof(*enumerator) - sizeof(enumerator->super));
+
+    enumerator->get_value = enum_get_value;
+    enumerator->get_count = enum_get_count;
+    enumerator->value_from_string = enum_value_from_string;
+    enumerator->string_from_value = enum_string_from_value;
+    enumerator->dump      = enum_dump;
+    enumerator->enum_is_static = false;
+}
+
+static void pmix_mca_base_var_enum_destructor (pmix_mca_base_var_enum_t *enumerator)
+{
+    if (enumerator->enum_name) {
+        free (enumerator->enum_name);
+    }
+
+    /* release the copy of the values */
+    if (enumerator->enum_values) {
+        for (int i = 0 ; i < enumerator->enum_value_count ; ++i) {
+            free ((void *) enumerator->enum_values[i].string);
+        }
+        free (enumerator->enum_values);
+    }
+}
+
+static int enum_get_value_flag (pmix_mca_base_var_enum_t *self, int index, int *value, const char **string_value)
+{
+    pmix_mca_base_var_enum_flag_t *flag_enum = (pmix_mca_base_var_enum_flag_t *) self;
+    int count, ret;
+
+    ret = self->get_count(self, &count);
+    if (PMIX_SUCCESS != ret) {
+        return ret;
+    }
+
+    if (index >= count) {
+        return PMIX_ERR_VALUE_OUT_OF_BOUNDS;
+    }
+
+    if (value) {
+        *value = flag_enum->enum_flags[index].flag;
+    }
+
+    if (string_value) {
+        *string_value = strdup (flag_enum->enum_flags[index].string);
+    }
+
+    return PMIX_SUCCESS;
+}
+
+static int enum_value_from_string_flag (pmix_mca_base_var_enum_t *self, const char *string_value, int *value_out) {
+    pmix_mca_base_var_enum_flag_t *flag_enum = (pmix_mca_base_var_enum_flag_t *) self;
+    int value, count, ret, flag;
+    char **flags;
+    bool is_int;
+    char *tmp;
+
+    ret = self->get_count(self, &count);
+    if (PMIX_SUCCESS != ret) {
+        return ret;
+    }
+
+    flags = pmix_argv_split (string_value, ',');
+    if (NULL == flags) {
+        return PMIX_ERR_BAD_PARAM;
+    }
+
+    flag = 0;
+
+    for (int i = 0 ; flags[i] ; ++i) {
+        value = strtol (flags[i], &tmp, 0);
+        is_int = tmp[0] == '\0';
+
+        bool found = false, conflict = false;
+        for (int j = 0 ; j < count ; ++j) {
+            if ((is_int && (value == flag_enum->enum_flags[i].flag)) ||
+                0 == strcasecmp (flags[i], flag_enum->enum_flags[i].string)) {
+                found = true;
+
+                if (flag & flag_enum->enum_flags[i].conflicting_flag) {
+                    conflict = true;
+                } else {
+                    flag |= flag_enum->enum_flags[i].flag;
+                }
+
+                break;
+            }
+        }
+
+        if (!found || conflict) {
+            pmix_argv_free (flags);
+            return !found ? PMIX_ERR_VALUE_OUT_OF_BOUNDS : PMIX_ERR_BAD_PARAM;
+        }
+    }
+
+    pmix_argv_free (flags);
+    *value_out = flag;
+
+    return PMIX_SUCCESS;
+}
+
+static int enum_string_from_value_flag (pmix_mca_base_var_enum_t *self, const int value, char **string_value) {
+    pmix_mca_base_var_enum_flag_t *flag_enum = (pmix_mca_base_var_enum_flag_t *) self;
+    int count, ret, current;
+    char *out = NULL, *tmp;
+
+    ret = self->get_count(self, &count);
+    if (PMIX_SUCCESS != ret) {
+        return ret;
+    }
+
+    current = value;
+    for (int i = 0 ; i < count ; ++i) {
+        if (!(flag_enum->enum_flags[i].flag & current)) {
+            continue;
+        }
+
+        tmp = out;
+
+        ret = asprintf (&out, "%s%s%s", tmp ? tmp : "", tmp ? "," : "", flag_enum->enum_flags[i].string);
+        free (tmp);
+
+        if (0 > ret) {
+            return PMIX_ERR_OUT_OF_RESOURCE;
+        }
+
+        if (value & flag_enum->enum_flags[i].conflicting_flag) {
+            free (out);
+            return PMIX_ERR_BAD_PARAM;
+        }
+
+        current &= ~flag_enum->enum_flags[i].flag;
+    }
+
+    if (current) {
+        free (out);
+        return PMIX_ERR_VALUE_OUT_OF_BOUNDS;
+    }
+
+    if (string_value) {
+        *string_value = out ? out : strdup ("");
+    } else {
+        free (out);
+    }
+
+    return PMIX_SUCCESS;
+}
+
+static int enum_dump_flag (pmix_mca_base_var_enum_t *self, char **out)
+{
+    pmix_mca_base_var_enum_flag_t *flag_enum = (pmix_mca_base_var_enum_flag_t *) self;
+    char *tmp;
+    int ret;
+
+    *out = NULL;
+
+    if (NULL == self) {
+        return PMIX_ERROR;
+    }
+
+    *out = strdup ("Comma-delimited list of: ");
+    if (NULL == *out) {
+        return PMIX_ERR_OUT_OF_RESOURCE;
+    }
+
+    for (int i = 0; i < self->enum_value_count ; ++i) {
+        tmp = *out;
+
+        ret = asprintf (out, "%s%s0x%x:\"%s\"", tmp, i ? ", " : " ", flag_enum->enum_flags[i].flag,
+                        flag_enum->enum_flags[i].string);
+        free (tmp);
+        if (0 > ret) {
+            return PMIX_ERR_OUT_OF_RESOURCE;
+        }
+    }
+
+    return PMIX_SUCCESS;
+}
+
+static void pmix_mca_base_var_enum_flag_constructor (pmix_mca_base_var_enum_flag_t *enumerator)
+{
+    enumerator->enum_flags = NULL;
+    enumerator->super.get_value = enum_get_value_flag;
+    enumerator->super.get_count = enum_get_count;
+    enumerator->super.value_from_string = enum_value_from_string_flag;
+    enumerator->super.string_from_value = enum_string_from_value_flag;
+    enumerator->super.dump = enum_dump_flag;
+    enumerator->super.enum_is_static = false;
+}
+
+static void pmix_mca_base_var_enum_flag_destructor (pmix_mca_base_var_enum_flag_t *enumerator)
+{
+    /* release the copy of the values */
+    if (enumerator->enum_flags) {
+        for (int i = 0 ; i < enumerator->super.enum_value_count ; ++i) {
+            free ((void *) enumerator->enum_flags[i].string);
+        }
+        free (enumerator->enum_flags);
+    }
+}
diff --git a/src/mca/base/pmix_mca_base_var_enum.h b/src/mca/base/pmix_mca_base_var_enum.h
new file mode 100644
index 0000000..fbe0bca
--- /dev/null
+++ b/src/mca/base/pmix_mca_base_var_enum.h
@@ -0,0 +1,246 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2006 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2008-2011 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2012-2016 Los Alamos National Security, LLC. All rights
+ *                         reserved.
+ * Copyright (c) 2016      Intel, Inc. All rights reserved
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#if !defined(PMIX_MCA_BASE_VAR_ENUM_H)
+#define PMIX_MCA_BASE_VAR_ENUM_H
+
+#include <src/include/pmix_config.h>
+
+#include "src/class/pmix_object.h"
+#include "pmix_common.h"
+
+typedef struct pmix_mca_base_var_enum_t pmix_mca_base_var_enum_t;
+
+/**
+ * Get the number of values in the enumerator
+ *
+ * @param[in] self the enumerator
+ * @param[out] count the number of values in the enumerator
+ */
+typedef int (*pmix_mca_base_var_enum_get_count_fn_t)(pmix_mca_base_var_enum_t *self, int *count);
+
+/**
+ * Get the value and its string representation for an index 0..get_count()
+ *
+ * @param[in] self the enumerator
+ * @param[in] index the index to get the value of
+ * @param[out] value integer value
+ * @param[out] string_value string value
+ */
+typedef int (*pmix_mca_base_var_enum_get_value_fn_t)(pmix_mca_base_var_enum_t *self, int index,
+                                                     int *value, const char **string_value);
+
+/**
+ * Look up the integer value of a string
+ *
+ * @param[in] self the enumerator
+ * @param[in] string_value string to lookup
+ * @param[out] value integer value for the string
+ *
+ * @retval PMIX_SUCCESS if found
+ * @retval PMIX_ERR_VALUE_OUT_OF_BOUNDS if not
+ */
+typedef int (*pmix_mca_base_var_enum_vfs_fn_t)(pmix_mca_base_var_enum_t *self, const char *string_value,
+                                               int *value);
+
+/**
+ * Dump a textual representation of all the values in an enumerator
+ *
+ * @param[in] self the enumerator
+ * @param[out] out the string representation
+ *
+ * @retval PMIX_SUCCESS on success
+ * @retval pmix error on error
+ */
+typedef int (*pmix_mca_base_var_enum_dump_fn_t)(pmix_mca_base_var_enum_t *self, char **out);
+
+/**
+ * Get the string representation for an enumerator value
+ *
+ * @param[in] self the enumerator
+ * @param[in] value integer value
+ * @param[out] string_value string value for value
+ *
+ * @retval PMIX_SUCCESS on success
+ * @retval PMIX_ERR_VALUE_OUT_OF_BOUNDS if not found
+ *
+ * @long This function returns the string value for a given interger value in the
+ * {string_value} parameter. The {string_value} parameter may be NULL in which case
+ * no string is returned. If a string is returned in {string_value} the caller
+ * must free the string with free().
+ */
+typedef int (*pmix_mca_base_var_enum_sfv_fn_t)(pmix_mca_base_var_enum_t *self, const int value,
+                                               char **string_value);
+
+/**
+ * The default enumerator class takes in a list of integer-string pairs. If a
+ * string is read from an environment variable or a file value the matching
+ * integer value is used for the MCA variable.
+ */
+struct pmix_mca_base_var_enum_value_t {
+    int value;
+    const char *string;
+};
+
+typedef struct pmix_mca_base_var_enum_value_t pmix_mca_base_var_enum_value_t;
+
+/**
+ * enumerator base class
+ */
+struct pmix_mca_base_var_enum_t {
+    pmix_object_t super;
+
+    /** Is the enumerator statically allocated */
+    bool enum_is_static;
+
+    /** Name of this enumerator. This value is duplicated from the argument provided to
+        pmix_mca_base_var_enum_create() */
+    char *enum_name;
+
+    /** Get the number of values this enumerator represents. Subclasses should override
+        the default function. */
+    pmix_mca_base_var_enum_get_count_fn_t get_count;
+    /** Get the value and string representation for a particular index. Subclasses should
+        override the default function */
+    pmix_mca_base_var_enum_get_value_fn_t get_value;
+    /** Given a string return corresponding integer value. If the string does not match a
+     valid value return PMIX_ERR_VALUE_OUT_OF_BOUNDS */
+    pmix_mca_base_var_enum_vfs_fn_t value_from_string;
+    /** Given an integer return the corresponding string value. If the integer does not
+        match a valid value return PMIX_ERR_VALUE_OUT_OF_BOUNDS */
+    pmix_mca_base_var_enum_sfv_fn_t string_from_value;
+    /** Dump a textual representation of the enumerator. The caller is responsible for
+        freeing the string */
+    pmix_mca_base_var_enum_dump_fn_t dump;
+
+    int enum_value_count;
+    /** Copy of the enumerators values (used by the default functions). This array and
+        and the strings it contains are freed by the destructor if not NULL. */
+    pmix_mca_base_var_enum_value_t *enum_values;
+};
+
+
+/**
+ * The default flag enumerator class takes in a list of integer-string pairs. If a
+ * string is read from an environment variable or a file value the matching
+ * flag value is used for the MCA variable. The conflicting_flag is used to
+ * indicate any flags that should conflict.
+ */
+struct pmix_mca_base_var_enum_value_flag_t {
+    /** flag value (must be power-of-two) */
+    int flag;
+    /** corresponding string name */
+    const char *string;
+    /** conflicting flag(s) if any */
+    int conflicting_flag;
+};
+
+typedef struct pmix_mca_base_var_enum_value_flag_t pmix_mca_base_var_enum_value_flag_t;
+
+/**
+ * flag enumerator base class
+ */
+struct pmix_mca_base_var_enum_flag_t {
+    /** use the existing enumerator interface */
+    pmix_mca_base_var_enum_t super;
+    /** flag value(s) */
+    pmix_mca_base_var_enum_value_flag_t *enum_flags;
+};
+
+typedef struct pmix_mca_base_var_enum_flag_t pmix_mca_base_var_enum_flag_t;
+
+/**
+ * Object declaration for pmix_mca_base_var_enum_t
+ */
+PMIX_CLASS_DECLARATION(pmix_mca_base_var_enum_t);
+
+/**
+ * Create a new default enumerator
+ *
+ * @param[in] name Name for this enumerator
+ * @param[in] values List of values terminated with a NULL .string
+ * member.
+ * @param[out] enumerator Newly created enumerator.
+ *
+ * @retval PMIX_SUCCESS On success
+ * @retval pmix error code On error
+ *
+ * This function creates a value enumerator for integer variables. The
+ * OUT enumerator value will be a newly OBJ_NEW'ed object that should
+ * be released by the caller via OBJ_RELEASE.
+ *
+ * Note that the output enumerator can be OBJ_RELEASE'd after it has
+ * been used in a cvar or pvar registration, because the variable
+ * registration functions will OBJ_RETAIN the enumberator.
+ *
+ * Note that all the strings in the values[] array are strdup'ed into
+ * internal storage, meaning that the caller can free all of the
+ * strings passed in values[] after pmix_mca_base_var_enum_create()
+ * returns.
+ */
+int pmix_mca_base_var_enum_create (const char *name, const pmix_mca_base_var_enum_value_t values[],
+                                   pmix_mca_base_var_enum_t **enumerator);
+
+/**
+ * Create a new default flag enumerator
+ *
+ * @param[in] name Name for this enumerator
+ * @param[in] flags List of flags terminated with a NULL .string
+ * member.
+ * @param[out] enumerator Newly created enumerator.
+ *
+ * @retval PMIX_SUCCESS On success
+ * @retval pmix error code On error
+ *
+ * This function creates a flag enumerator for integer variables. The
+ * OUT enumerator value will be a newly OBJ_NEW'ed object that should
+ * be released by the caller via OBJ_RELEASE.
+ *
+ * Note that the output enumerator can be OBJ_RELEASE'd after it has
+ * been used in a cvar or pvar registration, because the variable
+ * registration functions will OBJ_RETAIN the enumberator.
+ *
+ * Note that all the strings in the values[] array are strdup'ed into
+ * internal storage, meaning that the caller can free all of the
+ * strings passed in values[] after pmix_mca_base_var_enum_create()
+ * returns.
+ */
+int pmix_mca_base_var_enum_create_flag (const char *name, const pmix_mca_base_var_enum_value_flag_t flags[],
+                                        pmix_mca_base_var_enum_flag_t **enumerator);
+
+/* standard enumerators. it is invalid to call OBJ_RELEASE on any of these enumerators */
+/**
+ * Boolean enumerator
+ *
+ * This enumerator maps:
+ *   positive integer, true, yes, enabled, t -> 1
+ *   0, false, no, disabled, f -> 0
+ */
+extern pmix_mca_base_var_enum_t pmix_mca_base_var_enum_bool;
+
+/**
+ * Verbosity level enumerator
+ */
+extern pmix_mca_base_var_enum_t pmix_mca_base_var_enum_verbose;
+
+#endif /* !defined(MCA_BASE_VAR_ENUM_H) */
diff --git a/src/mca/base/pmix_mca_base_var_group.c b/src/mca/base/pmix_mca_base_var_group.c
new file mode 100644
index 0000000..8cef65e
--- /dev/null
+++ b/src/mca/base/pmix_mca_base_var_group.c
@@ -0,0 +1,477 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2012 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2008-2013 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2012-2015 Los Alamos National Security, LLC. All rights
+ *                         reserved.
+ * Copyright (c) 2016      Intel, Inc. All rights reserved
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#include <errno.h>
+
+#include "src/include/pmix_stdint.h"
+#include "src/util/show_help.h"
+#include "src/mca/mca.h"
+#include "src/mca/base/pmix_mca_base_vari.h"
+#include "pmix_common.h"
+#include "src/util/output.h"
+#include "src/util/pmix_environ.h"
+
+static pmix_pointer_array_t pmix_mca_base_var_groups;
+static pmix_hash_table_t pmix_mca_base_var_group_index_hash;
+static int pmix_mca_base_var_group_count = 0;
+static int pmix_mca_base_var_groups_timestamp = 0;
+static bool pmix_mca_base_var_group_initialized = false;
+
+static void pmix_mca_base_var_group_constructor (pmix_mca_base_var_group_t *group);
+static void pmix_mca_base_var_group_destructor (pmix_mca_base_var_group_t *group);
+PMIX_CLASS_INSTANCE(pmix_mca_base_var_group_t, pmix_object_t,
+                    pmix_mca_base_var_group_constructor,
+                    pmix_mca_base_var_group_destructor);
+
+int pmix_mca_base_var_group_init (void)
+{
+    int ret;
+
+    if (!pmix_mca_base_var_group_initialized) {
+        PMIX_CONSTRUCT(&pmix_mca_base_var_groups, pmix_pointer_array_t);
+
+        /* These values are arbitrary */
+        ret = pmix_pointer_array_init (&pmix_mca_base_var_groups, 128, 16384, 128);
+        if (PMIX_SUCCESS != ret) {
+            return ret;
+        }
+
+        PMIX_CONSTRUCT(&pmix_mca_base_var_group_index_hash, pmix_hash_table_t);
+        ret = pmix_hash_table_init (&pmix_mca_base_var_group_index_hash, 256);
+        if (PMIX_SUCCESS != ret) {
+            return ret;
+        }
+
+        pmix_mca_base_var_group_initialized = true;
+        pmix_mca_base_var_group_count = 0;
+    }
+
+    return PMIX_SUCCESS;
+}
+
+int pmix_mca_base_var_group_finalize (void)
+{
+    pmix_object_t *object;
+    int size, i;
+
+    if (pmix_mca_base_var_group_initialized) {
+        size = pmix_pointer_array_get_size(&pmix_mca_base_var_groups);
+        for (i = 0 ; i < size ; ++i) {
+            object = pmix_pointer_array_get_item (&pmix_mca_base_var_groups, i);
+            if (NULL != object) {
+                PMIX_RELEASE(object);
+            }
+        }
+        PMIX_DESTRUCT(&pmix_mca_base_var_groups);
+        PMIX_DESTRUCT(&pmix_mca_base_var_group_index_hash);
+        pmix_mca_base_var_group_count = 0;
+        pmix_mca_base_var_group_initialized = false;
+    }
+
+    return PMIX_SUCCESS;
+}
+
+int pmix_mca_base_var_group_get_internal (const int group_index, pmix_mca_base_var_group_t **group, bool invalidok)
+{
+    if (group_index < 0) {
+        return PMIX_ERR_NOT_FOUND;
+    }
+
+    *group = (pmix_mca_base_var_group_t *) pmix_pointer_array_get_item (&pmix_mca_base_var_groups,
+                                                                   group_index);
+    if (NULL == *group || (!invalidok && !(*group)->group_isvalid)) {
+        *group = NULL;
+        return PMIX_ERR_NOT_FOUND;
+    }
+
+    return PMIX_SUCCESS;
+}
+
+static int group_find_by_name (const char *full_name, int *index, bool invalidok)
+{
+    pmix_mca_base_var_group_t *group;
+    void *tmp;
+    int rc;
+
+    rc = pmix_hash_table_get_value_ptr (&pmix_mca_base_var_group_index_hash, full_name,
+                                        strlen (full_name), &tmp);
+    if (PMIX_SUCCESS != rc) {
+        return rc;
+    }
+
+    rc = pmix_mca_base_var_group_get_internal ((int)(uintptr_t) tmp, &group, invalidok);
+    if (PMIX_SUCCESS != rc) {
+        return rc;
+    }
+
+    if (invalidok || group->group_isvalid) {
+        *index = (int)(uintptr_t) tmp;
+        return PMIX_SUCCESS;
+    }
+
+    return PMIX_ERR_NOT_FOUND;
+}
+
+static bool compare_strings (const char *str1, const char *str2) {
+    if ((NULL != str1 && 0 == strcmp (str1, "*")) ||
+        (NULL == str1 && NULL == str2)) {
+        return true;
+    }
+
+    if (NULL != str1 && NULL != str2) {
+        return 0 == strcmp (str1, str2);
+    }
+
+    return false;
+}
+
+static int group_find_linear (const char *project_name, const char *framework_name,
+                              const char *component_name, bool invalidok)
+{
+    for (int i = 0 ; i < pmix_mca_base_var_group_count ; ++i) {
+        pmix_mca_base_var_group_t *group;
+
+        int rc = pmix_mca_base_var_group_get_internal (i, &group, invalidok);
+        if (PMIX_SUCCESS != rc) {
+            continue;
+        }
+
+        if (compare_strings (project_name, group->group_project) &&
+            compare_strings (framework_name, group->group_framework) &&
+            compare_strings (component_name, group->group_component)) {
+            return i;
+        }
+    }
+
+    return PMIX_ERR_NOT_FOUND;
+}
+
+static int group_find (const char *project_name, const char *framework_name,
+                       const char *component_name, bool invalidok)
+{
+    char *full_name;
+    int ret, index=0;
+
+    if (!pmix_mca_base_var_initialized) {
+        return PMIX_ERR_NOT_FOUND;
+    }
+
+    /* check for wildcards */
+    if ((project_name && '*' == project_name[0]) || (framework_name && '*' == framework_name[0]) ||
+        (component_name && '*' == component_name[0])) {
+        return group_find_linear (project_name, framework_name, component_name, invalidok);
+    }
+
+    ret = pmix_mca_base_var_generate_full_name4(project_name, framework_name, component_name,
+                                           NULL, &full_name);
+    if (PMIX_SUCCESS != ret) {
+        return PMIX_ERROR;
+    }
+
+    ret = group_find_by_name(full_name, &index, invalidok);
+    free (full_name);
+
+    return (0 > ret) ? ret : index;
+}
+
+static int group_register (const char *project_name, const char *framework_name,
+                           const char *component_name, const char *description)
+{
+    pmix_mca_base_var_group_t *group;
+    int group_id, parent_id = -1;
+    int ret;
+
+    if (NULL == project_name && NULL == framework_name && NULL == component_name) {
+        /* don't create a group with no name (maybe we should create a generic group?) */
+        return -1;
+    }
+
+    /* avoid groups of the form pmix_pmix, etc */
+    if (NULL != project_name && NULL != framework_name &&
+        (0 == strcmp (project_name, framework_name))) {
+        project_name = NULL;
+    }
+
+    group_id = group_find (project_name, framework_name, component_name, true);
+    if (0 <= group_id) {
+        ret = pmix_mca_base_var_group_get_internal (group_id, &group, true);
+        if (PMIX_SUCCESS != ret) {
+            /* something went horribly wrong */
+            assert (NULL != group);
+            return ret;
+        }
+        group->group_isvalid = true;
+        pmix_mca_base_var_groups_timestamp++;
+
+        /* group already exists. return it's index */
+        return group_id;
+    }
+
+    group = PMIX_NEW(pmix_mca_base_var_group_t);
+
+    group->group_isvalid = true;
+
+    if (NULL != project_name) {
+        group->group_project = strdup (project_name);
+        if (NULL == group->group_project) {
+            PMIX_RELEASE(group);
+            return PMIX_ERR_OUT_OF_RESOURCE;
+        }
+    }
+    if (NULL != framework_name) {
+        group->group_framework = strdup (framework_name);
+        if (NULL == group->group_framework) {
+            PMIX_RELEASE(group);
+            return PMIX_ERR_OUT_OF_RESOURCE;
+        }
+    }
+    if (NULL != component_name) {
+        group->group_component = strdup (component_name);
+        if (NULL == group->group_component) {
+            PMIX_RELEASE(group);
+            return PMIX_ERR_OUT_OF_RESOURCE;
+        }
+    }
+    if (NULL != description) {
+        group->group_description = strdup (description);
+        if (NULL == group->group_description) {
+            PMIX_RELEASE(group);
+            return PMIX_ERR_OUT_OF_RESOURCE;
+        }
+    }
+
+    if (NULL != framework_name && NULL != component_name) {
+        parent_id = group_register (project_name, framework_name, NULL, NULL);
+    }
+
+    /* build the group name */
+    ret = pmix_mca_base_var_generate_full_name4 (NULL, project_name, framework_name, component_name,
+                                            &group->group_full_name);
+    if (PMIX_SUCCESS != ret) {
+        PMIX_RELEASE(group);
+        return ret;
+    }
+
+    group_id = pmix_pointer_array_add (&pmix_mca_base_var_groups, group);
+    if (0 > group_id) {
+        PMIX_RELEASE(group);
+        return PMIX_ERROR;
+    }
+
+    pmix_hash_table_set_value_ptr (&pmix_mca_base_var_group_index_hash, group->group_full_name,
+                                   strlen (group->group_full_name), (void *)(uintptr_t) group_id);
+
+    pmix_mca_base_var_group_count++;
+    pmix_mca_base_var_groups_timestamp++;
+
+    if (0 <= parent_id) {
+        pmix_mca_base_var_group_t *parent_group;
+
+        (void) pmix_mca_base_var_group_get_internal(parent_id, &parent_group, false);
+        pmix_value_array_append_item (&parent_group->group_subgroups, &group_id);
+    }
+
+    return group_id;
+}
+
+int pmix_mca_base_var_group_register (const char *project_name, const char *framework_name,
+                                      const char *component_name, const char *description)
+{
+    return group_register (project_name, framework_name, component_name, description);
+}
+
+int pmix_mca_base_var_group_component_register (const pmix_mca_base_component_t *component,
+                                                const char *description)
+{
+    /* 1.7 components do not store the project */
+    return group_register (NULL, component->pmix_mca_type_name,
+                           component->pmix_mca_component_name, description);
+}
+
+
+int pmix_mca_base_var_group_deregister (int group_index)
+{
+    pmix_mca_base_var_group_t *group;
+    int size, ret;
+    int *params, *subgroups;
+
+    ret = pmix_mca_base_var_group_get_internal (group_index, &group, false);
+    if (PMIX_SUCCESS != ret) {
+        return ret;
+    }
+
+    group->group_isvalid = false;
+
+    /* deregister all associated mca parameters */
+    size = pmix_value_array_get_size(&group->group_vars);
+    params = PMIX_VALUE_ARRAY_GET_BASE(&group->group_vars, int);
+
+    for (int i = 0 ; i < size ; ++i) {
+        const pmix_mca_base_var_t *var;
+
+        ret = pmix_mca_base_var_get (params[i], &var);
+        if (PMIX_SUCCESS != ret || !(var->mbv_flags & PMIX_MCA_BASE_VAR_FLAG_DWG)) {
+            continue;
+        }
+
+        (void) pmix_mca_base_var_deregister (params[i]);
+    }
+
+    size = pmix_value_array_get_size(&group->group_subgroups);
+    subgroups = PMIX_VALUE_ARRAY_GET_BASE(&group->group_subgroups, int);
+    for (int i = 0 ; i < size ; ++i) {
+        (void) pmix_mca_base_var_group_deregister (subgroups[i]);
+    }
+    /* ordering of variables and subgroups must be the same if the
+     * group is re-registered */
+
+    pmix_mca_base_var_groups_timestamp++;
+
+    return PMIX_SUCCESS;
+}
+
+int pmix_mca_base_var_group_find (const char *project_name,
+                             const char *framework_name,
+                             const char *component_name)
+{
+    return group_find (project_name, framework_name, component_name, false);
+}
+
+int pmix_mca_base_var_group_find_by_name (const char *full_name, int *index)
+{
+    return group_find_by_name (full_name, index, false);
+}
+
+int pmix_mca_base_var_group_add_var (const int group_index, const int param_index)
+{
+    pmix_mca_base_var_group_t *group;
+    int size, i, ret;
+    int *params;
+
+    ret = pmix_mca_base_var_group_get_internal (group_index, &group, false);
+    if (PMIX_SUCCESS != ret) {
+        return ret;
+    }
+
+    size = pmix_value_array_get_size(&group->group_vars);
+    params = PMIX_VALUE_ARRAY_GET_BASE(&group->group_vars, int);
+    for (i = 0 ; i < size ; ++i) {
+        if (params[i] == param_index) {
+            return i;
+        }
+    }
+
+    if (PMIX_SUCCESS !=
+        (ret = pmix_value_array_append_item (&group->group_vars, &param_index))) {
+        return ret;
+    }
+
+    pmix_mca_base_var_groups_timestamp++;
+
+    /* return the group index */
+    return (int) pmix_value_array_get_size (&group->group_vars) - 1;
+}
+
+int pmix_mca_base_var_group_get (const int group_index, const pmix_mca_base_var_group_t **group)
+{
+    return pmix_mca_base_var_group_get_internal (group_index, (pmix_mca_base_var_group_t **) group, false);
+}
+
+int pmix_mca_base_var_group_set_var_flag (const int group_index, int flags, bool set)
+{
+    pmix_mca_base_var_group_t *group;
+    int size, i, ret;
+    int *vars;
+
+    ret = pmix_mca_base_var_group_get_internal (group_index, &group, false);
+    if (PMIX_SUCCESS != ret) {
+        return ret;
+    }
+
+    /* set the flag on each valid variable */
+    size = pmix_value_array_get_size(&group->group_vars);
+    vars = PMIX_VALUE_ARRAY_GET_BASE(&group->group_vars, int);
+
+    for (i = 0 ; i < size ; ++i) {
+        if (0 <= vars[i]) {
+            (void) pmix_mca_base_var_set_flag (vars[i], flags, set);
+        }
+    }
+
+    return PMIX_SUCCESS;
+}
+
+
+static void pmix_mca_base_var_group_constructor (pmix_mca_base_var_group_t *group)
+{
+    memset ((char *) group + sizeof (group->super), 0, sizeof (*group) - sizeof (group->super));
+
+    PMIX_CONSTRUCT(&group->group_subgroups, pmix_value_array_t);
+    pmix_value_array_init (&group->group_subgroups, sizeof (int));
+
+    PMIX_CONSTRUCT(&group->group_vars, pmix_value_array_t);
+    pmix_value_array_init (&group->group_vars, sizeof (int));
+
+}
+
+static void pmix_mca_base_var_group_destructor (pmix_mca_base_var_group_t *group)
+{
+    free (group->group_full_name);
+    group->group_full_name = NULL;
+
+    free (group->group_description);
+    group->group_description = NULL;
+
+    free (group->group_project);
+    group->group_project = NULL;
+
+    free (group->group_framework);
+    group->group_framework = NULL;
+
+    free (group->group_component);
+    group->group_component = NULL;
+
+    PMIX_DESTRUCT(&group->group_subgroups);
+    PMIX_DESTRUCT(&group->group_vars);
+}
+
+int pmix_mca_base_var_group_get_count (void)
+{
+    return pmix_mca_base_var_group_count;
+}
+
+int pmix_mca_base_var_group_get_stamp (void)
+{
+    return pmix_mca_base_var_groups_timestamp;
+}
diff --git a/src/mca/base/pmix_mca_base_var_group.h b/src/mca/base/pmix_mca_base_var_group.h
new file mode 100644
index 0000000..bd43c78
--- /dev/null
+++ b/src/mca/base/pmix_mca_base_var_group.h
@@ -0,0 +1,173 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2006 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2008-2011 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2012-2013 Los Alamos National Security, LLC. All rights
+ *                         reserved.
+ * Copyright (c) 2016      Intel, Inc. All rights reserved
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#ifndef PMIX_MCA_BASE_VAR_GROUP_H
+#define PMIX_MCA_BASE_VAR_GROUP_H
+
+#include "src/mca/mca.h"
+
+struct pmix_mca_base_var_group_t {
+    pmix_list_item_t super;
+
+    /** Index of group */
+    int group_index;
+
+    /** Group is valid (registered) */
+    bool group_isvalid;
+
+    /** Group name */
+    char *group_full_name;
+
+    char *group_project;
+    char *group_framework;
+    char *group_component;
+
+    /** Group help message (description) */
+    char *group_description;
+
+    /** Integer value array of subgroup indices */
+    pmix_value_array_t group_subgroups;
+
+    /** Integer array of group variables */
+    pmix_value_array_t group_vars;
+
+};
+
+typedef struct pmix_mca_base_var_group_t pmix_mca_base_var_group_t;
+
+/**
+ * Object declaration for pmix_mca_base_var_group_t
+ */
+PMIX_CLASS_DECLARATION(pmix_mca_base_var_group_t);
+
+/**
+ * Register an MCA variable group
+ *
+ * @param[in] project_name Project name for this group.
+ * @param[in] framework_name Framework name for this group.
+ * @param[in] component_name Component name for this group.
+ * @param[in] descrition Description of this group.
+ *
+ * @retval index Unique group index
+ * @return pmix error code on Error
+ *
+ * Create an MCA variable group. If the group already exists
+ * this call is equivalent to pmix_mca_base_ver_find_group().
+ */
+int pmix_mca_base_var_group_register(const char *project_name,
+                                              const char *framework_name,
+                                              const char *component_name,
+                                              const char *description);
+
+/**
+ * Register an MCA variable group for a component
+ *
+ * @param[in] component [in] Pointer to the component for which the
+ * group is being registered.
+ * @param[in] description Description of this group.
+ *
+ * @retval index Unique group index
+ * @return pmix error code on Error
+ */
+int pmix_mca_base_var_group_component_register (const pmix_mca_base_component_t *component,
+                                                         const char *description);
+
+/**
+ * Deregister an MCA param group
+ *
+ * @param group_index [in] Group index from pmix_mca_base_var_group_register (),
+ * pmix_mca_base_var_group_find().
+ *
+ * This call deregisters all associated variables and subgroups.
+ */
+int pmix_mca_base_var_group_deregister (int group_index);
+
+/**
+ * Find an MCA group
+ *
+ * @param[in] project_name   Project name
+ * @param[in] framework_name Framework name
+ * @param[in] component_name Component name
+ *
+ * @returns PMIX_SUCCESS if found
+ * @returns PMIX_ERR_NOT_FOUND if not found
+ */
+int pmix_mca_base_var_group_find (const char *project_name,
+                                           const char *framework_name,
+                                           const char *component_name);
+
+/**
+ * Find an MCA group by its full name
+ *
+ * @param[in]  full_name Full name of MCA variable group. Ex: shmem_mmap
+ * @param[out] index     Index of group if found
+ *
+ * @returns PMIX_SUCCESS if found
+ * @returns PMIX_ERR_NOT_FOUND if not found
+ */
+int pmix_mca_base_var_group_find_by_name (const char *full_name, int *index);
+
+/**
+ * Get the group at a specified index
+ *
+ * @param[in] group_index Group index
+ * @param[out] group Storage for the group object pointer.
+ *
+ * @retval PMIX_ERR_NOT_FOUND If the group specified by group_index does not exist.
+ * @retval PMIX_SUCCESS If the group is found
+ *
+ * The returned pointer belongs to the MCA variable system. Do not modify/release/retain
+ * the pointer.
+ */
+int pmix_mca_base_var_group_get (const int group_index,
+                                          const pmix_mca_base_var_group_t **group);
+
+/**
+ * Set/unset a flags for all variables in a group.
+ *
+ * @param[in] group_index Index of group
+ * @param[in] flag Flag(s) to set or unset.
+ * @param[in] set Boolean indicating whether to set flag(s).
+ *
+ * Set a flag for every variable in a group. See pmix_mca_base_var_set_flag() for more info.
+ */
+int pmix_mca_base_var_group_set_var_flag (const int group_index, int flags,
+                                                   bool set);
+
+/**
+ * Get the number of registered MCA groups
+ *
+ * @retval count Number of registered MCA groups
+ */
+int pmix_mca_base_var_group_get_count (void);
+
+/**
+ * Get a relative timestamp for the MCA group system
+ *
+ * @retval stamp
+ *
+ * This value will change if groups or variables are either added or removed.
+ */
+int pmix_mca_base_var_group_get_stamp (void);
+
+#endif /* PMIX_MCA_BASE_VAR_GROUP_H */
diff --git a/src/mca/base/pmix_mca_base_vari.h b/src/mca/base/pmix_mca_base_vari.h
new file mode 100644
index 0000000..e2bd97b
--- /dev/null
+++ b/src/mca/base/pmix_mca_base_vari.h
@@ -0,0 +1,165 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2006 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2008      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2012-2013 Los Alamos National Security, LLC. All rights
+ *                         reserved.
+ * Copyright (c) 2016      Intel, Inc. All rights reserved
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+/**
+ * @file
+ *
+ * This is the private declarations for the MCA variable system.
+ * This file is internal to the MCA variable system and should not
+ * need to be used by any other elements in PMIX except the
+ * special case of the ompi_info command.
+ *
+ * All the rest of the doxygen documentation in this file is marked as
+ * "internal" and won't show up unless you specifically tell doxygen
+ * to generate internal documentation (by default, it is skipped).
+ */
+
+#ifndef PMIX_MCA_BASE_VAR_INTERNAL_H
+#define PMIX_MCA_BASE_VAR_INTERNAL_H
+
+#include <src/include/pmix_config.h>
+
+#include "src/class/pmix_object.h"
+#include "src/class/pmix_list.h"
+#include "src/class/pmix_value_array.h"
+#include "src/class/pmix_pointer_array.h"
+#include "src/class/pmix_hash_table.h"
+#include "src/mca/base/pmix_mca_base_var.h"
+
+BEGIN_C_DECLS
+
+/* Internal flags start at bit 16 */
+#define PMIX_MCA_BASE_VAR_FLAG_EXTERNAL_MASK 0x0000ffff
+
+typedef enum {
+    /** Variable is valid */
+    PMIX_MCA_BASE_VAR_FLAG_VALID   = 0x00010000,
+    /** Variable is a synonym */
+    PMIX_MCA_BASE_VAR_FLAG_SYNONYM = 0x00020000,
+    /** mbv_source_file needs to be freed */
+    PMIX_MCA_BASE_VAR_FLAG_SOURCE_FILE_NEEDS_FREE = 0x00040000
+} pmix_mca_base_var_flag_internal_t;
+
+#define PMIX_VAR_FLAG_ISSET(var, flag) (!!((var).mbp_flags & (flag)))
+
+#define PMIX_VAR_IS_VALID(var) (!!((var).mbv_flags & PMIX_MCA_BASE_VAR_FLAG_VALID))
+#define PMIX_VAR_IS_SYNONYM(var) (!!((var).mbv_flags & PMIX_MCA_BASE_VAR_FLAG_SYNONYM))
+#define PMIX_VAR_IS_INTERNAL(var) (!!((var).mbv_flags & PMIX_MCA_BASE_VAR_FLAG_INTERNAL))
+#define PMIX_VAR_IS_DEFAULT_ONLY(var) (!!((var).mbv_flags & PMIX_MCA_BASE_VAR_FLAG_DEFAULT_ONLY))
+#define PMIX_VAR_IS_SETTABLE(var) (!!((var).mbv_flags & PMIX_MCA_BASE_VAR_FLAG_SETTABLE))
+#define PMIX_VAR_IS_DEPRECATED(var) (!!((var).mbv_flags & PMIX_MCA_BASE_VAR_FLAG_DEPRECATED))
+
+extern const char *pmix_var_type_names[];
+extern const size_t pmix_var_type_sizes[];
+extern bool pmix_mca_base_var_initialized;
+
+/**
+ * \internal
+ *
+ * Structure for holding param names and values read in from files.
+ */
+struct pmix_mca_base_var_file_value_t {
+    /** Allow this to be an PMIX OBJ */
+    pmix_list_item_t super;
+
+    /** Parameter name */
+    char *mbvfv_var;
+    /** Parameter value */
+    char *mbvfv_value;
+    /** File it came from */
+    char *mbvfv_file;
+    /** Line it came from */
+    int mbvfv_lineno;
+};
+
+/**
+ * \internal
+ *
+ * Convenience typedef
+ */
+typedef struct pmix_mca_base_var_file_value_t pmix_mca_base_var_file_value_t;
+
+/**
+ * Object declaration for pmix_mca_base_var_file_value_t
+ */
+PMIX_CLASS_DECLARATION(pmix_mca_base_var_file_value_t);
+
+/**
+ * \internal
+ *
+ * Get a group
+ *
+ * @param[in]  group_index Group index
+ * @param[out] group       Returned group if it exists
+ * @param[in]  invalidok   Return group even if it has been deregistered
+ */
+int pmix_mca_base_var_group_get_internal (const int group_index, pmix_mca_base_var_group_t **group, bool invalidok);
+
+/**
+ * \internal
+ *
+ * Parse a parameter file.
+ */
+int pmix_mca_base_parse_paramfile(const char *paramfile, pmix_list_t *list);
+
+/**
+ * \internal
+ *
+ * Add a variable to a group
+ */
+int pmix_mca_base_var_group_add_var (const int group_index, const int param_index);
+
+/**
+ * \internal
+ *
+ * Add a performance variable to a group
+ */
+int pmix_mca_base_var_group_add_pvar (const int group_index, const int param_index);
+
+/**
+ * \internal
+ *
+ * Generate a full name with _ between all of the non-NULL arguments
+ */
+int pmix_mca_base_var_generate_full_name4 (const char *project, const char *framework,
+                                           const char *component, const char *variable,
+                                           char **full_name);
+
+/**
+ * \internal
+ *
+ * Call save_value callback for generated internal mca parameter storing env variables
+ */
+int pmix_mca_base_internal_env_store(void);
+
+/**
+ * \internal
+ *
+ * Initialize/finalize MCA variable groups
+ */
+int pmix_mca_base_var_group_init (void);
+int pmix_mca_base_var_group_finalize (void);
+
+END_C_DECLS
+
+#endif /* PMIX_MCA_BASE_VAR_INTERNAL_H */
diff --git a/src/mca/mca.h b/src/mca/mca.h
new file mode 100644
index 0000000..5970a10
--- /dev/null
+++ b/src/mca/mca.h
@@ -0,0 +1,324 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2005 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2008-2012 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2015      Los Alamos National Security, LLC. All rights
+ *                         reserved.
+ * Copyright (c) 2016      Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+/**
+ * @file
+ *
+ * Top-level interface for all pmix MCA components.
+ */
+
+#ifndef PMIX_MCA_H
+#define PMIX_MCA_H
+
+#include <src/include/pmix_config.h>
+
+/**
+ * Common type for all MCA modules.
+ *
+ * An instance of this type is always the first element in MCA
+ * modules, allowing the module to be associated with a
+ * particular version of a specific framework, and to publish its own
+ * name and version.
+ */
+struct pmix_mca_base_module_2_0_0_t {
+    int dummy_value;
+};
+/** Unversioned convenience typedef; use this name in
+    frameworks/components to stay forward source-compatible */
+typedef struct pmix_mca_base_module_2_0_0_t pmix_mca_base_module_t;
+/** Versioned convenience typedef */
+typedef struct pmix_mca_base_module_2_0_0_t pmix_mca_base_module_2_0_0_t;
+
+
+/**
+ * MCA component open function.
+ *
+ * @retval PMIX_SUCCESS This component can be used in the process.
+ *
+ * @retval PMIX_ERR_NOT_AVAILABLE Silently ignore this component for
+ * the duration of the process (it may even be unloaded from the
+ * process).
+ *
+ * @retval anything_else The MCA base will print an error message
+ * ignore this component for the duration of the process (it may even
+ * be unloaded from the process).
+ *
+ * All MCA components can have an "open" function that is invoked once
+ * per process, when the component is located and loaded.
+ *
+ * This function should avoid registering MCA parameters (use the
+ * component "register" function for that; i.e.,
+ * mca_base_register_component_params_2_0_0_fn_t for that).  Legacy
+ * components still register MCA params in their component "open"
+ * function, but their authors should update them to use the component
+ * "register" function.
+ *
+ * This function can also be used to allocate any resources necessary
+ * for the component (e.g., heap memory).
+ *
+ * This function should return PMIX_SUCCESS if it wishes to remain
+ * loaded in the process.  Any other return value will cause the MCA
+ * base to unload the component.  Although most components do not use
+ * this mechanism to force themselves to be unloaded (because if they
+ * are immediately unloaded, ompi_info will not display them), the
+ * mechanism is available should the need arise.
+ *
+ * If the component a) has no MCA parameters to register, b) no
+ * resources to allocate, and c) can always be used in a process
+ * (albiet perhaps not selected), it may provide NULL for this
+ * function.  In this cause, the MCA will act as if it called the open
+ * function and it returned PMIX_SUCCESS.
+ */
+typedef int (*pmix_mca_base_open_component_1_0_0_fn_t)(void);
+
+/**
+ * MCA component close function.
+ *
+ * @retval PMIX_SUCCESS The component successfully shut down.
+ *
+ * @retval any_other_value Some error occurred, but is likely to be
+ * ignored.
+ *
+ * This function is invoked on a component after all of its modules
+ * have been finalized (according to the rules of its framework) and
+ * the component will never be used in the process again; the
+ * component may be unloaded from the process memory after the close
+ * function has been invoked.
+ *
+ * This function is typically used to release any resources still in
+ * use by the component.
+ *
+ * If the component has no resources to free, it may provide NULL for
+ * this function.  In this case, the MCA will act as if it called the
+ * close function and it returned PMIX_SUCCESS.
+ */
+typedef int (*pmix_mca_base_close_component_1_0_0_fn_t)(void);
+
+/**
+ * MCA component query function.
+ *
+ * @retval PMIX_SUCCESS The component successfully queried.
+ *
+ * @retval any_other_value Some error occurred, but is likely to be
+ * ignored.
+ *
+ * @param module The module to be used if this component is selected.
+ *
+ * @param priority The priority of this component.
+ *
+ * This function is used by the mca_base_select function to find the
+ * highest priority component to select. Frameworks are free to
+ * implement their own query function, but must also implment their
+ * own select function as a result.
+ */
+typedef int (*pmix_mca_base_query_component_2_0_0_fn_t)(pmix_mca_base_module_2_0_0_t **module, int *priority);
+
+/**
+ * MCA component parameter registration function.
+ *
+ * @retval PMIX_SUCCESS This component successfully registered its
+ * parameters and can be used in this process.
+ * @retval PMIX_ERR_BAD_PARAM Indicates that the register function
+ * failed because an MCA parameter got an invalid/incorrect value.
+ *
+ * @retval anything_else The MCA will ignore this component for the
+ * duration of the process.
+ *
+ * If a component has a non-NULL parameter registration function, it
+ * will be invoked to register all MCA parameters associated with the
+ * component.  This function is invoked *before* the component "open"
+ * function is invoked.
+ *
+ * The registration function should not allocate any resources that
+ * need to be freed (aside from registering MCA parameters).
+ * Specifically, strings that are passed to the MCA parameter
+ * registration functions are all internally copied; there's no need
+ * for the caller to keep them after registering a parameter.  Hence,
+ * it is possible that the registration function will be the *only*
+ * function invoked on a component; component authors should take care
+ * that no resources are leaked in this case.
+ *
+ * This function should return PMIX_SUCCESS if it wishes to remain
+ * loaded in the process.  Any other return value will cause the MCA
+ * base to unload the component.  Although most components do not use
+ * this mechanism to force themselves to be unloaded (because if they
+ * are immediately unloaded, ompi_info will not display them), the
+ * mechanism is available should the need arise.
+ *
+ * Note that if the function returns PMIX_ERR_BAD_PARAM, it is
+ * possible (likely?) that the component didn't register all of its
+ * parameters.  When this happens, ompi_info (and friends) will stop
+ * execution and print out all existing registered parameters from the
+ * entire framework (since ompi_info doesn't track individual
+ * component register failures).  This allows a user to know exactly
+ * what value is incorrect, and from where it was set (e.g., via an
+ * MCA params file).
+ *
+ * If the component a) has no MCA parameters to register, b) no
+ * resources to allocate, and c) can always be used in a process
+ * (albiet perhaps not selected), it may provide NULL for this
+ * function.  In this cause, the MCA will act as if it called the
+ * registration function and it returned PMIX_SUCCESS.
+ */
+typedef int (*pmix_mca_base_register_component_params_2_0_0_fn_t)(void);
+
+
+/**
+ * Maximum length of MCA project string names.
+ */
+#define PMIX_MCA_BASE_MAX_PROJECT_NAME_LEN 15
+/**
+ * Maximum length of MCA framework string names.
+ */
+#define PMIX_MCA_BASE_MAX_TYPE_NAME_LEN 31
+/**
+ * Maximum length of MCA component string names.
+ */
+#define PMIX_MCA_BASE_MAX_COMPONENT_NAME_LEN 63
+
+/**
+ * Common type for all MCA components.
+ *
+ * An instance of this type is always the first element in MCA
+ * components, allowing the component to be associated with a
+ * particular version of a specific framework, and to publish its own
+ * name and version.
+ */
+struct pmix_mca_base_component_2_1_0_t {
+
+  int pmix_mca_major_version;
+  /**< Major number of the MCA. */
+  int pmix_mca_minor_version;
+  /**< Minor number of the MCA. */
+  int pmix_mca_release_version;
+  /**< Release number of the MCA. */
+
+  char pmix_mca_project_name[PMIX_MCA_BASE_MAX_PROJECT_NAME_LEN + 1];
+  /**< String name of the project that this component belongs to. */
+  int pmix_mca_project_major_version;
+  /**< Major version number of the project that this component
+     belongs to. */
+  int pmix_mca_project_minor_version;
+  /**< Minor version number of the project that this component
+     belongs to. */
+  int pmix_mca_project_release_version;
+  /**< Release version number of the project that this component
+     belongs to. */
+
+  char pmix_mca_type_name[PMIX_MCA_BASE_MAX_TYPE_NAME_LEN + 1];
+  /**< String name of the framework that this component belongs to. */
+  int pmix_mca_type_major_version;
+  /**< Major version number of the framework that this component
+     belongs to. */
+  int pmix_mca_type_minor_version;
+  /**< Minor version number of the framework that this component
+     belongs to. */
+  int pmix_mca_type_release_version;
+  /**< Release version number of the framework that this component
+     belongs to. */
+
+  char pmix_mca_component_name[PMIX_MCA_BASE_MAX_COMPONENT_NAME_LEN + 1];
+  /**< This comopnent's string name. */
+  int pmix_mca_component_major_version;
+  /**< This component's major version number. */
+  int pmix_mca_component_minor_version;
+  /**< This component's minor version number. */
+  int pmix_mca_component_release_version;
+  /**< This component's release version number. */
+
+  pmix_mca_base_open_component_1_0_0_fn_t pmix_mca_open_component;
+  /**< Method for opening this component. */
+  pmix_mca_base_close_component_1_0_0_fn_t pmix_mca_close_component;
+  /**< Method for closing this component. */
+  pmix_mca_base_query_component_2_0_0_fn_t pmix_mca_query_component;
+  /**< Method for querying this component. */
+  pmix_mca_base_register_component_params_2_0_0_fn_t pmix_mca_register_component_params;
+  /**< Method for registering the component's MCA parameters */
+
+  /** Extra space to allow for expansion in the future without
+      breaking older components. */
+  char reserved[32];
+};
+/** Unversioned convenience typedef; use this name in
+    frameworks/components to stay forward source-compatible */
+typedef struct pmix_mca_base_component_2_1_0_t pmix_mca_base_component_t;
+/** Versioned convenience typedef */
+typedef struct pmix_mca_base_component_2_1_0_t pmix_mca_base_component_2_1_0_t;
+
+/*
+ * Metadata Bit field parameters
+ */
+#define PMIX_MCA_BASE_METADATA_PARAM_NONE        (uint32_t)0x00 /**< No Metadata flags */
+#define PMIX_MCA_BASE_METADATA_PARAM_CHECKPOINT  (uint32_t)0x02 /**< Checkpoint enabled Component */
+#define PMIX_MCA_BASE_METADATA_PARAM_DEBUG       (uint32_t)0x04 /**< Debug enabled/only Component */
+
+/**
+ * Meta data for MCA v2.0.0 components.
+ */
+struct pmix_mca_base_component_data_2_0_0_t {
+    uint32_t param_field;
+    /**< Metadata parameter bit field filled in by the parameters
+         defined above */
+
+    /** Extra space to allow for expansion in the future without
+        breaking older components. */
+    char reserved[32];
+};
+/** Unversioned convenience typedef; use this name in
+    frameworks/components to stay forward source-compatible */
+typedef struct pmix_mca_base_component_data_2_0_0_t pmix_mca_base_component_data_t;
+/** Versioned convenience typedef */
+typedef struct pmix_mca_base_component_data_2_0_0_t pmix_mca_base_component_data_2_0_0_t;
+
+/**
+ * Macro for framework author convenience.
+ *
+ * This macro is used by frameworks defining their component types,
+ * indicating that they subscribe to the MCA version 2.0.0.  See
+ * component header files (e.g., coll.h) for examples of its usage.
+ */
+#define PMIX_MCA_BASE_VERSION_MAJOR 2
+#define PMIX_MCA_BASE_VERSION_MINOR 1
+#define PMIX_MCA_BASE_VERSION_RELEASE 0
+
+#define PMIX_MCA_BASE_MAKE_VERSION(level, MAJOR, MINOR, RELEASE) \
+    .pmix_mca_## level ##_major_version = MAJOR,                 \
+    .pmix_mca_## level ##_minor_version = MINOR,                 \
+    .pmix_mca_## level ##_release_version = RELEASE
+
+
+#define PMIX_MCA_BASE_VERSION_2_1_0(PROJECT, project_major, project_minor, project_release, TYPE, type_major, type_minor, type_release) \
+    .pmix_mca_major_version = PMIX_MCA_BASE_VERSION_MAJOR,                        \
+    .pmix_mca_minor_version = PMIX_MCA_BASE_VERSION_MINOR,                        \
+    .pmix_mca_release_version = PMIX_MCA_BASE_VERSION_RELEASE,                    \
+    .pmix_mca_project_name = PROJECT,                                        \
+    PMIX_MCA_BASE_MAKE_VERSION(project, project_major, project_minor, project_release), \
+    .pmix_mca_type_name = TYPE,                                              \
+    PMIX_MCA_BASE_MAKE_VERSION(type, type_major, type_minor, type_release)
+
+
+#define PMIX_MCA_BASE_VERSION_1_0_0(type, type_major, type_minor, type_release) \
+    PMIX_MCA_BASE_VERSION_2_1_0("pmix", PMIX_MAJOR_VERSION, PMIX_MINOR_VERSION,      \
+                                PMIX_RELEASE_VERSION, type, type_major, type_minor, \
+                                type_release)
+
+#endif /* PMIX_MCA_H */
diff --git a/src/mca/pdl/Makefile.am b/src/mca/pdl/Makefile.am
new file mode 100644
index 0000000..fdd56a8
--- /dev/null
+++ b/src/mca/pdl/Makefile.am
@@ -0,0 +1,36 @@
+#
+# Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2010-2015 Cisco Systems, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# main library setup
+noinst_LTLIBRARIES = libmca_pdl.la
+libmca_pdl_la_SOURCES =
+
+# local files
+headers = pdl.h
+libmca_pdl_la_SOURCES += $(headers)
+
+# Ensure that the man pages are rebuilt if the pmix_config.h file
+# changes; a "good enough" way to know if configure was run again (and
+# therefore the release date or version may have changed)
+$(nodist_man_MANS): $(top_builddir)/pmix/include/pmix_config.h
+
+# Conditionally install the header files
+if WANT_INSTALL_HEADERS
+pmixdir = $(pmixincludedir)/$(subdir)
+nobase_pmix_HEADERS = $(headers)
+endif
+
+include base/Makefile.am
+
+distclean-local:
+	rm -f base/static-components.h
+	rm -f $(nodist_man_MANS)
diff --git a/src/mca/pdl/Makefile.in b/src/mca/pdl/Makefile.in
new file mode 100644
index 0000000..67495ae
--- /dev/null
+++ b/src/mca/pdl/Makefile.in
@@ -0,0 +1,881 @@
+# Makefile.in generated by automake 1.15 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+#
+# Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2010-2015 Cisco Systems, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+#
+# Copyright (c) 2015 Cisco Systems, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+subdir = src/mca/pdl
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/config/c_get_alignment.m4 \
+	$(top_srcdir)/config/libtool.m4 \
+	$(top_srcdir)/config/ltoptions.m4 \
+	$(top_srcdir)/config/ltsugar.m4 \
+	$(top_srcdir)/config/ltversion.m4 \
+	$(top_srcdir)/config/lt~obsolete.m4 \
+	$(top_srcdir)/config/pmix.m4 \
+	$(top_srcdir)/config/pmix_check_attributes.m4 \
+	$(top_srcdir)/config/pmix_check_broken_qsort.m4 \
+	$(top_srcdir)/config/pmix_check_compiler_version.m4 \
+	$(top_srcdir)/config/pmix_check_icc.m4 \
+	$(top_srcdir)/config/pmix_check_ident.m4 \
+	$(top_srcdir)/config/pmix_check_lock.m4 \
+	$(top_srcdir)/config/pmix_check_os_flavors.m4 \
+	$(top_srcdir)/config/pmix_check_package.m4 \
+	$(top_srcdir)/config/pmix_check_psm2.m4 \
+	$(top_srcdir)/config/pmix_check_pthread_pids.m4 \
+	$(top_srcdir)/config/pmix_check_vendor.m4 \
+	$(top_srcdir)/config/pmix_check_visibility.m4 \
+	$(top_srcdir)/config/pmix_check_withdir.m4 \
+	$(top_srcdir)/config/pmix_config_asm.m4 \
+	$(top_srcdir)/config/pmix_config_pthreads.m4 \
+	$(top_srcdir)/config/pmix_config_subdir.m4 \
+	$(top_srcdir)/config/pmix_config_subdir_args.m4 \
+	$(top_srcdir)/config/pmix_config_threads.m4 \
+	$(top_srcdir)/config/pmix_ensure_contains_optflags.m4 \
+	$(top_srcdir)/config/pmix_functions.m4 \
+	$(top_srcdir)/config/pmix_load_platform.m4 \
+	$(top_srcdir)/config/pmix_mca.m4 \
+	$(top_srcdir)/config/pmix_search_libs.m4 \
+	$(top_srcdir)/config/pmix_setup_cc.m4 \
+	$(top_srcdir)/config/pmix_setup_libevent.m4 \
+	$(top_srcdir)/config/pmix_setup_zlib.m4 \
+	$(top_srcdir)/config/pmix_try_assemble.m4 \
+	$(top_srcdir)/config/autogen_found_items.m4 \
+	$(top_srcdir)/src/mca/pdl/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/configure.m4 \
+	$(top_srcdir)/src/mca/pdl/pdlopen/configure.m4 \
+	$(top_srcdir)/src/mca/pdl/plibltdl/configure.m4 \
+	$(top_srcdir)/src/mca/pif/bsdx_ipv4/configure.m4 \
+	$(top_srcdir)/src/mca/pif/bsdx_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pif/linux_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pif/posix_ipv4/configure.m4 \
+	$(top_srcdir)/src/mca/pif/solaris_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/config/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/env/configure.m4 \
+	$(top_srcdir)/src/mca/pnet/opa/configure.m4 \
+	$(top_srcdir)/src/mca/psec/munge/configure.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__nobase_pmix_HEADERS_DIST) \
+	$(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/src/include/pmix_config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+libmca_pdl_la_LIBADD =
+am__objects_1 =
+am__dirstamp = $(am__leading_dot)dirstamp
+am_libmca_pdl_la_OBJECTS = $(am__objects_1) base/pdl_base_open.lo \
+	base/pdl_base_close.lo base/pdl_base_select.lo \
+	base/pdl_base_fns.lo
+libmca_pdl_la_OBJECTS = $(am_libmca_pdl_la_OBJECTS)
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/src/include
+depcomp = $(SHELL) $(top_srcdir)/./config/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libmca_pdl_la_SOURCES)
+DIST_SOURCES = $(libmca_pdl_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__nobase_pmix_HEADERS_DIST = pdl.h base/base.h
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(pmixdir)"
+HEADERS = $(nobase_pmix_HEADERS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/base/Makefile.am \
+	$(top_srcdir)/./config/depcomp
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CFLAGS = @CFLAGS@
+CLEANFILES = @CLEANFILES@
+CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MCA_PROJECT_SUBDIRS = @MCA_PROJECT_SUBDIRS@
+MCA_pmix_FRAMEWORKS = @MCA_pmix_FRAMEWORKS@
+MCA_pmix_FRAMEWORKS_SUBDIRS = @MCA_pmix_FRAMEWORKS_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS@
+MCA_pmix_FRAMEWORK_LIBS = @MCA_pmix_FRAMEWORK_LIBS@
+MCA_pmix_pdl_ALL_COMPONENTS = @MCA_pmix_pdl_ALL_COMPONENTS@
+MCA_pmix_pdl_ALL_SUBDIRS = @MCA_pmix_pdl_ALL_SUBDIRS@
+MCA_pmix_pdl_DSO_COMPONENTS = @MCA_pmix_pdl_DSO_COMPONENTS@
+MCA_pmix_pdl_DSO_SUBDIRS = @MCA_pmix_pdl_DSO_SUBDIRS@
+MCA_pmix_pdl_STATIC_COMPONENTS = @MCA_pmix_pdl_STATIC_COMPONENTS@
+MCA_pmix_pdl_STATIC_LTLIBS = @MCA_pmix_pdl_STATIC_LTLIBS@
+MCA_pmix_pdl_STATIC_SUBDIRS = @MCA_pmix_pdl_STATIC_SUBDIRS@
+MCA_pmix_pif_ALL_COMPONENTS = @MCA_pmix_pif_ALL_COMPONENTS@
+MCA_pmix_pif_ALL_SUBDIRS = @MCA_pmix_pif_ALL_SUBDIRS@
+MCA_pmix_pif_DSO_COMPONENTS = @MCA_pmix_pif_DSO_COMPONENTS@
+MCA_pmix_pif_DSO_SUBDIRS = @MCA_pmix_pif_DSO_SUBDIRS@
+MCA_pmix_pif_STATIC_COMPONENTS = @MCA_pmix_pif_STATIC_COMPONENTS@
+MCA_pmix_pif_STATIC_LTLIBS = @MCA_pmix_pif_STATIC_LTLIBS@
+MCA_pmix_pif_STATIC_SUBDIRS = @MCA_pmix_pif_STATIC_SUBDIRS@
+MCA_pmix_pinstalldirs_ALL_COMPONENTS = @MCA_pmix_pinstalldirs_ALL_COMPONENTS@
+MCA_pmix_pinstalldirs_ALL_SUBDIRS = @MCA_pmix_pinstalldirs_ALL_SUBDIRS@
+MCA_pmix_pinstalldirs_DSO_COMPONENTS = @MCA_pmix_pinstalldirs_DSO_COMPONENTS@
+MCA_pmix_pinstalldirs_DSO_SUBDIRS = @MCA_pmix_pinstalldirs_DSO_SUBDIRS@
+MCA_pmix_pinstalldirs_STATIC_COMPONENTS = @MCA_pmix_pinstalldirs_STATIC_COMPONENTS@
+MCA_pmix_pinstalldirs_STATIC_LTLIBS = @MCA_pmix_pinstalldirs_STATIC_LTLIBS@
+MCA_pmix_pinstalldirs_STATIC_SUBDIRS = @MCA_pmix_pinstalldirs_STATIC_SUBDIRS@
+MCA_pmix_pnet_ALL_COMPONENTS = @MCA_pmix_pnet_ALL_COMPONENTS@
+MCA_pmix_pnet_ALL_SUBDIRS = @MCA_pmix_pnet_ALL_SUBDIRS@
+MCA_pmix_pnet_DSO_COMPONENTS = @MCA_pmix_pnet_DSO_COMPONENTS@
+MCA_pmix_pnet_DSO_SUBDIRS = @MCA_pmix_pnet_DSO_SUBDIRS@
+MCA_pmix_pnet_STATIC_COMPONENTS = @MCA_pmix_pnet_STATIC_COMPONENTS@
+MCA_pmix_pnet_STATIC_LTLIBS = @MCA_pmix_pnet_STATIC_LTLIBS@
+MCA_pmix_pnet_STATIC_SUBDIRS = @MCA_pmix_pnet_STATIC_SUBDIRS@
+MCA_pmix_psec_ALL_COMPONENTS = @MCA_pmix_psec_ALL_COMPONENTS@
+MCA_pmix_psec_ALL_SUBDIRS = @MCA_pmix_psec_ALL_SUBDIRS@
+MCA_pmix_psec_DSO_COMPONENTS = @MCA_pmix_psec_DSO_COMPONENTS@
+MCA_pmix_psec_DSO_SUBDIRS = @MCA_pmix_psec_DSO_SUBDIRS@
+MCA_pmix_psec_STATIC_COMPONENTS = @MCA_pmix_psec_STATIC_COMPONENTS@
+MCA_pmix_psec_STATIC_LTLIBS = @MCA_pmix_psec_STATIC_LTLIBS@
+MCA_pmix_psec_STATIC_SUBDIRS = @MCA_pmix_psec_STATIC_SUBDIRS@
+MCA_pmix_psensor_ALL_COMPONENTS = @MCA_pmix_psensor_ALL_COMPONENTS@
+MCA_pmix_psensor_ALL_SUBDIRS = @MCA_pmix_psensor_ALL_SUBDIRS@
+MCA_pmix_psensor_DSO_COMPONENTS = @MCA_pmix_psensor_DSO_COMPONENTS@
+MCA_pmix_psensor_DSO_SUBDIRS = @MCA_pmix_psensor_DSO_SUBDIRS@
+MCA_pmix_psensor_STATIC_COMPONENTS = @MCA_pmix_psensor_STATIC_COMPONENTS@
+MCA_pmix_psensor_STATIC_LTLIBS = @MCA_pmix_psensor_STATIC_LTLIBS@
+MCA_pmix_psensor_STATIC_SUBDIRS = @MCA_pmix_psensor_STATIC_SUBDIRS@
+MCA_pmix_ptl_ALL_COMPONENTS = @MCA_pmix_ptl_ALL_COMPONENTS@
+MCA_pmix_ptl_ALL_SUBDIRS = @MCA_pmix_ptl_ALL_SUBDIRS@
+MCA_pmix_ptl_DSO_COMPONENTS = @MCA_pmix_ptl_DSO_COMPONENTS@
+MCA_pmix_ptl_DSO_SUBDIRS = @MCA_pmix_ptl_DSO_SUBDIRS@
+MCA_pmix_ptl_STATIC_COMPONENTS = @MCA_pmix_ptl_STATIC_COMPONENTS@
+MCA_pmix_ptl_STATIC_LTLIBS = @MCA_pmix_ptl_STATIC_LTLIBS@
+MCA_pmix_ptl_STATIC_SUBDIRS = @MCA_pmix_ptl_STATIC_SUBDIRS@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PMIX_ASM_GSYM = @PMIX_ASM_GSYM@
+PMIX_ASM_LSYM = @PMIX_ASM_LSYM@
+PMIX_ASM_SUPPORT_64BIT = @PMIX_ASM_SUPPORT_64BIT@
+PMIX_ASM_TEXT = @PMIX_ASM_TEXT@
+PMIX_ASM_TYPE = @PMIX_ASM_TYPE@
+PMIX_ASSEMBLY_ARCH = @PMIX_ASSEMBLY_ARCH@
+PMIX_ASSEMBLY_BUILTIN = @PMIX_ASSEMBLY_BUILTIN@
+PMIX_ASSEMBLY_FORMAT = @PMIX_ASSEMBLY_FORMAT@
+PMIX_AS_GLOBAL = @PMIX_AS_GLOBAL@
+PMIX_AS_LABEL_SUFFIX = @PMIX_AS_LABEL_SUFFIX@
+PMIX_CC_ABSOLUTE = @PMIX_CC_ABSOLUTE@
+PMIX_CONFIGURE_DATE = @PMIX_CONFIGURE_DATE@
+PMIX_CONFIGURE_HOST = @PMIX_CONFIGURE_HOST@
+PMIX_CONFIGURE_USER = @PMIX_CONFIGURE_USER@
+PMIX_EMBEDDED_CPPFLAGS = @PMIX_EMBEDDED_CPPFLAGS@
+PMIX_EMBEDDED_LDFLAGS = @PMIX_EMBEDDED_LDFLAGS@
+PMIX_EMBEDDED_LIBS = @PMIX_EMBEDDED_LIBS@
+PMIX_MAJOR_VERSION = @PMIX_MAJOR_VERSION@
+PMIX_MINOR_VERSION = @PMIX_MINOR_VERSION@
+PMIX_RELEASE_DATE = @PMIX_RELEASE_DATE@
+PMIX_RELEASE_VERSION = @PMIX_RELEASE_VERSION@
+PMIX_RENAME = @PMIX_RENAME@
+PMIX_VERSION = @PMIX_VERSION@
+PMIX_top_builddir = @PMIX_top_builddir@
+PMIX_top_srcdir = @PMIX_top_srcdir@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_prefix_program = @ac_prefix_program@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+libpmix_so_version = @libpmix_so_version@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pmix_have_pandoc = @pmix_have_pandoc@
+pmix_pdl_pdlopen_LIBS = @pmix_pdl_pdlopen_LIBS@
+pmix_pdl_plibltdl_CPPFLAGS = @pmix_pdl_plibltdl_CPPFLAGS@
+pmix_pdl_plibltdl_LDFLAGS = @pmix_pdl_plibltdl_LDFLAGS@
+pmix_pdl_plibltdl_LIBS = @pmix_pdl_plibltdl_LIBS@
+pmixdatadir = @pmixdatadir@
+pmixincludedir = @pmixincludedir@
+pmixlibdir = @pmixlibdir@
+pmixmajor = @pmixmajor@
+pmixminor = @pmixminor@
+pnet_opa_CFLAGS = @pnet_opa_CFLAGS@
+pnet_opa_CPPFLAGS = @pnet_opa_CPPFLAGS@
+pnet_opa_LDFLAGS = @pnet_opa_LDFLAGS@
+pnet_opa_LIBS = @pnet_opa_LIBS@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+psec_munge_CPPFLAGS = @psec_munge_CPPFLAGS@
+psec_munge_LDFLAGS = @psec_munge_LDFLAGS@
+psec_munge_LIBS = @psec_munge_LIBS@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+
+# main library setup
+noinst_LTLIBRARIES = libmca_pdl.la
+libmca_pdl_la_SOURCES = $(headers) base/pdl_base_open.c \
+	base/pdl_base_close.c base/pdl_base_select.c \
+	base/pdl_base_fns.c
+
+# local files
+headers = pdl.h base/base.h
+
+# Conditionally install the header files
+ at WANT_INSTALL_HEADERS_TRUE@pmixdir = $(pmixincludedir)/$(subdir)
+ at WANT_INSTALL_HEADERS_TRUE@nobase_pmix_HEADERS = $(headers)
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/base/Makefile.am $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/mca/pdl/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/mca/pdl/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+$(srcdir)/base/Makefile.am $(am__empty):
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_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}; \
+	}
+base/$(am__dirstamp):
+	@$(MKDIR_P) base
+	@: > base/$(am__dirstamp)
+base/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) base/$(DEPDIR)
+	@: > base/$(DEPDIR)/$(am__dirstamp)
+base/pdl_base_open.lo: base/$(am__dirstamp) \
+	base/$(DEPDIR)/$(am__dirstamp)
+base/pdl_base_close.lo: base/$(am__dirstamp) \
+	base/$(DEPDIR)/$(am__dirstamp)
+base/pdl_base_select.lo: base/$(am__dirstamp) \
+	base/$(DEPDIR)/$(am__dirstamp)
+base/pdl_base_fns.lo: base/$(am__dirstamp) \
+	base/$(DEPDIR)/$(am__dirstamp)
+
+libmca_pdl.la: $(libmca_pdl_la_OBJECTS) $(libmca_pdl_la_DEPENDENCIES) $(EXTRA_libmca_pdl_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(LINK)  $(libmca_pdl_la_OBJECTS) $(libmca_pdl_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+	-rm -f base/*.$(OBJEXT)
+	-rm -f base/*.lo
+
+distclean-compile:
+	-rm -f *.tab.c
+
+ at AMDEP_TRUE@@am__include@ @am__quote at base/$(DEPDIR)/pdl_base_close.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at base/$(DEPDIR)/pdl_base_fns.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at base/$(DEPDIR)/pdl_base_open.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at base/$(DEPDIR)/pdl_base_select.Plo at am__quote@
+
+.c.o:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+ at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+	-rm -rf base/.libs base/_libs
+install-nobase_pmixHEADERS: $(nobase_pmix_HEADERS)
+	@$(NORMAL_INSTALL)
+	@list='$(nobase_pmix_HEADERS)'; test -n "$(pmixdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(pmixdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(pmixdir)" || exit 1; \
+	fi; \
+	$(am__nobase_list) | while read dir files; do \
+	  xfiles=; for file in $$files; do \
+	    if test -f "$$file"; then xfiles="$$xfiles $$file"; \
+	    else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \
+	  test -z "$$xfiles" || { \
+	    test "x$$dir" = x. || { \
+	      echo " $(MKDIR_P) '$(DESTDIR)$(pmixdir)/$$dir'"; \
+	      $(MKDIR_P) "$(DESTDIR)$(pmixdir)/$$dir"; }; \
+	    echo " $(INSTALL_HEADER) $$xfiles '$(DESTDIR)$(pmixdir)/$$dir'"; \
+	    $(INSTALL_HEADER) $$xfiles "$(DESTDIR)$(pmixdir)/$$dir" || exit $$?; }; \
+	done
+
+uninstall-nobase_pmixHEADERS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(nobase_pmix_HEADERS)'; test -n "$(pmixdir)" || list=; \
+	$(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \
+	dir='$(DESTDIR)$(pmixdir)'; $(am__uninstall_files_from_dir)
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES) $(HEADERS)
+installdirs:
+	for dir in "$(DESTDIR)$(pmixdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+	-rm -f base/$(DEPDIR)/$(am__dirstamp)
+	-rm -f base/$(am__dirstamp)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf base/$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-local distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-nobase_pmixHEADERS
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf base/$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-nobase_pmixHEADERS
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-local 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-nobase_pmixHEADERS install-pdf install-pdf-am \
+	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-nobase_pmixHEADERS
+
+.PRECIOUS: Makefile
+
+
+# Ensure that the man pages are rebuilt if the pmix_config.h file
+# changes; a "good enough" way to know if configure was run again (and
+# therefore the release date or version may have changed)
+$(nodist_man_MANS): $(top_builddir)/pmix/include/pmix_config.h
+
+distclean-local:
+	rm -f base/static-components.h
+	rm -f $(nodist_man_MANS)
+
+# 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/mca/pdl/base/Makefile.am b/src/mca/pdl/base/Makefile.am
new file mode 100644
index 0000000..efc770a
--- /dev/null
+++ b/src/mca/pdl/base/Makefile.am
@@ -0,0 +1,17 @@
+#
+# Copyright (c) 2015 Cisco Systems, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+headers += \
+        base/base.h
+
+libmca_pdl_la_SOURCES += \
+        base/pdl_base_open.c \
+        base/pdl_base_close.c \
+        base/pdl_base_select.c \
+        base/pdl_base_fns.c
diff --git a/src/mca/pdl/base/base.h b/src/mca/pdl/base/base.h
new file mode 100644
index 0000000..2cb3725
--- /dev/null
+++ b/src/mca/pdl/base/base.h
@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2015      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2016      Intel, Inc. All rights reserved
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#ifndef PMIX_PDL_BASE_H
+#define PMIX_PDL_BASE_H
+
+#include <src/include/pmix_config.h>
+#include "src/mca/pdl/pdl.h"
+#include "src/util/pmix_environ.h"
+
+#include "src/mca/base/base.h"
+
+
+BEGIN_C_DECLS
+
+/**
+ * Globals
+ */
+extern pmix_mca_base_framework_t pmix_pdl_base_framework;
+extern pmix_pdl_base_component_t
+*pmix_pdl_base_selected_component;
+extern pmix_pdl_base_module_t *pmix_pdl;
+
+
+/**
+ * Initialize the PDL MCA framework
+ *
+ * @retval PMIX_SUCCESS Upon success
+ * @retval PMIX_ERROR   Upon failures
+ *
+ * This function is invoked during pmix_init();
+ */
+int pmix_pdl_base_open(pmix_mca_base_open_flag_t flags);
+
+/**
+ * Select an available component.
+ *
+ * @retval PMIX_SUCCESS Upon Success
+ * @retval PMIX_NOT_FOUND If no component can be selected
+ * @retval PMIX_ERROR Upon other failure
+ *
+ */
+int pmix_pdl_base_select(void);
+
+/**
+ * Finalize the PDL MCA framework
+ *
+ * @retval PMIX_SUCCESS Upon success
+ * @retval PMIX_ERROR   Upon failures
+ *
+ * This function is invoked during pmix_finalize();
+ */
+int pmix_pdl_base_close(void);
+
+/**
+ * Open a DSO
+ *
+ * (see pmix_pdl_base_module_open_ft_t in pmix/mca/pdl/pdl.h for
+ * documentation of this function)
+ */
+int pmix_pdl_open(const char *fname,
+                 bool use_ext, bool private_namespace,
+                 pmix_pdl_handle_t **handle, char **err_msg);
+
+/**
+ * Lookup a symbol in a DSO
+ *
+ * (see pmix_pdl_base_module_lookup_ft_t in pmix/mca/pdl/pdl.h for
+ * documentation of this function)
+ */
+int pmix_pdl_lookup(pmix_pdl_handle_t *handle,
+                   const char *symbol,
+                   void **ptr, char **err_msg);
+
+/**
+ * Close a DSO
+ *
+ * (see pmix_pdl_base_module_close_ft_t in pmix/mca/pdl/pdl.h for
+ * documentation of this function)
+ */
+int pmix_pdl_close(pmix_pdl_handle_t *handle);
+
+/**
+ * Iterate over files in a path
+ *
+ * (see pmix_pdl_base_module_foreachfile_ft_t in pmix/mca/pdl/pdl.h for
+ * documentation of this function)
+ */
+int pmix_pdl_foreachfile(const char *search_path,
+                        int (*cb_func)(const char *filename, void *context),
+                        void *context);
+
+END_C_DECLS
+
+#endif /* PMIX_PDL_BASE_H */
diff --git a/src/mca/pdl/base/pdl_base_close.c b/src/mca/pdl/base/pdl_base_close.c
new file mode 100644
index 0000000..7c6f545
--- /dev/null
+++ b/src/mca/pdl/base/pdl_base_close.c
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2004-2010 The Trustees of Indiana University.
+ *                         All rights reserved.
+ * Copyright (c) 2015      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2016      Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+
+#include "src/mca/mca.h"
+#include "src/mca/base/base.h"
+
+#include "src/mca/pdl/pdl.h"
+#include "src/mca/pdl/base/base.h"
+
+
+int pmix_pdl_base_close(void)
+{
+    /* Close all available modules that are open */
+    return pmix_mca_base_framework_components_close(&pmix_pdl_base_framework, NULL);
+}
diff --git a/src/mca/pdl/base/pdl_base_fns.c b/src/mca/pdl/base/pdl_base_fns.c
new file mode 100644
index 0000000..091715d
--- /dev/null
+++ b/src/mca/pdl/base/pdl_base_fns.c
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2004-2010 The Trustees of Indiana University.
+ *                         All rights reserved.
+ * Copyright (c) 2015      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2016      Intel, Inc. All rights reserved
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+/**
+ * This file is a simple set of wrappers around the selected PMIX PDL
+ * component (it's a compile-time framework with, at most, a single
+ * component; see pdl.h for details).
+ */
+
+#include <src/include/pmix_config.h>
+
+#include "pmix_common.h"
+
+#include "src/util/output.h"
+#include "src/mca/pdl/base/base.h"
+
+
+int pmix_pdl_open(const char *fname,
+                 bool use_ext, bool private_namespace,
+                 pmix_pdl_handle_t **handle, char **err_msg)
+{
+    *handle = NULL;
+
+    if (NULL != pmix_pdl && NULL != pmix_pdl->open) {
+        return pmix_pdl->open(fname, use_ext, private_namespace,
+                             handle, err_msg);
+    }
+
+    return PMIX_ERR_NOT_SUPPORTED;
+}
+
+int pmix_pdl_lookup(pmix_pdl_handle_t *handle,
+                   const char *symbol,
+                   void **ptr, char **err_msg)
+{
+    if (NULL != pmix_pdl && NULL != pmix_pdl->lookup) {
+        return pmix_pdl->lookup(handle, symbol, ptr, err_msg);
+    }
+
+    return PMIX_ERR_NOT_SUPPORTED;
+}
+
+int pmix_pdl_close(pmix_pdl_handle_t *handle)
+{
+    if (NULL != pmix_pdl && NULL != pmix_pdl->close) {
+        return pmix_pdl->close(handle);
+    }
+
+    return PMIX_ERR_NOT_SUPPORTED;
+}
+
+int pmix_pdl_foreachfile(const char *search_path,
+                        int (*cb_func)(const char *filename, void *context),
+                        void *context)
+{
+    if (NULL != pmix_pdl && NULL != pmix_pdl->foreachfile) {
+       return pmix_pdl->foreachfile(search_path, cb_func, context);
+    }
+
+    return PMIX_ERR_NOT_SUPPORTED;
+}
diff --git a/src/mca/pdl/base/pdl_base_open.c b/src/mca/pdl/base/pdl_base_open.c
new file mode 100644
index 0000000..22b6cd4
--- /dev/null
+++ b/src/mca/pdl/base/pdl_base_open.c
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2004-2010 The Trustees of Indiana University.
+ *                         All rights reserved.
+ * Copyright (c) 2011-2013 Los Alamos National Security, LLC.
+ *                         All rights reserved.
+ * Copyright (c) 2015      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2016      Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+
+#include "src/mca/pdl/base/base.h"
+
+#include "src/mca/pdl/base/static-components.h"
+
+
+/*
+ * Globals
+ */
+pmix_pdl_base_module_t *pmix_pdl = NULL;
+pmix_pdl_base_component_t *pmix_pdl_base_selected_component = NULL;
+
+
+/*
+ * Function for finding and opening either all MCA components,
+ * or the one that was specifically requested via a MCA parameter.
+ *
+ * Note that we really don't need this function -- we could specify a
+ * NULL pointer in the framework declare and the base would do this
+ * exact same thing.  However, we need to have at least some
+ * executable code in this file, or some linkers (cough cough OS X
+ * cough cough) may not actually link in this .o file.
+ */
+int pmix_pdl_base_open(pmix_mca_base_open_flag_t flags)
+{
+    /* Open up all available components */
+    return pmix_mca_base_framework_components_open(&pmix_pdl_base_framework, flags);
+}
+
+/* VERY IMPORTANT: This framework is static, and is opened before any
+   other dyanmic frameworks are opened (which makes sense, of course).
+   But we must mark this framework is NO_DSO so that the MCA framework
+   base doesn't try to open any dynamic components in this
+   framework. */
+PMIX_MCA_BASE_FRAMEWORK_DECLARE(pmix, pdl, "Dynamic loader framework",
+                                NULL /* register */,
+                                pmix_pdl_base_open /* open */,
+                                NULL /* close */,
+                                mca_pdl_base_static_components,
+                                PMIX_MCA_BASE_FRAMEWORK_FLAG_NO_DSO);
diff --git a/src/mca/pdl/base/pdl_base_select.c b/src/mca/pdl/base/pdl_base_select.c
new file mode 100644
index 0000000..e42db67
--- /dev/null
+++ b/src/mca/pdl/base/pdl_base_select.c
@@ -0,0 +1,55 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2004-2010 The Trustees of Indiana University.
+ *                         All rights reserved.
+ *
+ * Copyright (c) 2015 Cisco Systems, Inc.  All rights reserved.
+ * $COPYRIGHT$
+ * Copyright (c) 2015      Los Alamos National Security, LLC. All rights
+ *                         reserved.
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+
+#ifdef HAVE_UNISTD_H
+#include "unistd.h"
+#endif
+
+#include "pmix_common.h"
+#include "src/util/output.h"
+#include "src/mca/mca.h"
+#include "src/mca/base/base.h"
+#include "src/mca/pdl/pdl.h"
+#include "src/mca/pdl/base/base.h"
+
+
+int pmix_pdl_base_select(void)
+{
+    int exit_status = PMIX_SUCCESS;
+    pmix_pdl_base_component_t *best_component = NULL;
+    pmix_pdl_base_module_t *best_module = NULL;
+
+    /*
+     * Select the best component
+     */
+    if (PMIX_SUCCESS != pmix_mca_base_select("pdl",
+                                             pmix_pdl_base_framework.framework_output,
+                                             &pmix_pdl_base_framework.framework_components,
+                                             (pmix_mca_base_module_t **) &best_module,
+                                             (pmix_mca_base_component_t **) &best_component, NULL) ) {
+        /* This will only happen if no component was selected */
+        exit_status = PMIX_ERROR;
+        goto cleanup;
+    }
+
+    /* Save the winner */
+    pmix_pdl_base_selected_component = best_component;
+    pmix_pdl = best_module;
+
+ cleanup:
+    return exit_status;
+}
diff --git a/src/mca/pdl/configure.m4 b/src/mca/pdl/configure.m4
new file mode 100644
index 0000000..c508206
--- /dev/null
+++ b/src/mca/pdl/configure.m4
@@ -0,0 +1,80 @@
+dnl -*- shell-script -*-
+dnl
+dnl Copyright (c) 2010-2015 Cisco Systems, Inc.  All rights reserved.
+dnl Copyright (c) 2016-2017 Intel, Inc. All rights reserved.
+dnl Copyright (c) 2016      Research Organization for Information Science
+dnl                         and Technology (RIST). All rights reserved.
+dnl $COPYRIGHT$
+dnl
+dnl Additional copyrights may follow
+dnl
+dnl $HEADER$
+dnl
+
+dnl There will only be one component used in this framework, and it will
+dnl be selected at configure time by priority.  Components must set
+dnl their priorities in their configure.m4 file.
+
+dnl We only want one winning component (vs. STOP_AT_FIRST_PRIORITY,
+dnl which will allow all components of the same priority who succeed to
+dnl win)
+m4_define(MCA_pmix_pdl_CONFIGURE_MODE, STOP_AT_FIRST)
+
+AC_DEFUN([MCA_pmix_pdl_CONFIG],[
+    PMIX_HAVE_PDL_SUPPORT=0
+
+    # If --disable-dlopen was used, then have all the components fail
+    # (we still need to configure them all so that things like "make
+    # dist" work", but we just want the MCA system to (artificially)
+    # conclude that it can't build any of the components.
+    AS_IF([test "$enable_dlopen" = "no"],
+          [want_pdl=0], [want_pdl=1])
+
+    MCA_CONFIGURE_FRAMEWORK([pdl], [$want_pdl])
+
+    # If we found no suitable static pdl component and dlopen support
+    # was not specifically disabled, this is an error.
+    AS_IF([test "$MCA_pmix_pdl_STATIC_COMPONENTS" = "" && \
+           test "$enable_dlopen" != "no"],
+          [AC_MSG_WARN([Did not find a suitable static pmix pdl component])
+           AC_MSG_WARN([You might need to install libltld (and its headers) or])
+           AC_MSG_WARN([specify --disable-dlopen to configure.])
+           AC_MSG_ERROR([Cannot continue])])
+
+    # If we have a winning component (which, per above, will only
+    # happen if --disable-dlopen was *not* specified), do some more
+    # logic.
+    AS_IF([test "$MCA_pmix_pdl_STATIC_COMPONENTS" != ""],
+       [ # We had a winner -- w00t!
+
+        PMIX_HAVE_PDL_SUPPORT=1
+        # If we added any -L flags to ADD_LDFLAGS, then we (might)
+        # need to add those directories to LD_LIBRARY_PATH.
+        # Otherwise, if we try to AC RUN_IFELSE anything here in
+        # configure, it might die because it can't find the libraries
+        # we just linked against.
+        PMIX_VAR_SCOPE_PUSH([pmix_pdl_base_found_l pmix_pdl_base_token pmix_pdl_base_tmp pmix_pdl_base_dir])
+        pmix_pdl_base_found_l=0
+        eval "pmix_pdl_base_tmp=\$pmix_pdl_${pmix_pdl_winner}_ADD_LIBS"
+        for pmix_pdl_base_token in $pmix_pdl_base_tmp; do
+            case $pmix_pdl_base_token in
+            -l*) pmix_pdl_base_found_l=1 ;;
+            esac
+        done
+        AS_IF([test $pmix_pdl_base_found_l -eq 1],
+              [eval "pmix_pdl_base_tmp=\$pmix_pdl_${pmix_pdl_winner}_ADD_LDFLAGS"
+               for pmix_pdl_base_token in $pmix_pdl_base_tmp; do
+                   case $pmix_pdl_base_token in
+                   -L*)
+                       pmix_pdl_base_dir=`echo $pmix_pdl_base_token | cut -c3-`
+                       export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$pmix_pdl_base_dir
+                       AC_MSG_WARN([Adding to LD_LIBRARY_PATH: $pmix_pdl_base_dir])
+                       ;;
+                   esac
+               done])
+        PMIX_VAR_SCOPE_POP
+    ])
+
+    AC_DEFINE_UNQUOTED([PMIX_HAVE_PDL_SUPPORT], [$PMIX_HAVE_PDL_SUPPORT],
+                       [Whether the PMIX PDL framework is functional or not])
+])
diff --git a/src/mca/pdl/pdl.h b/src/mca/pdl/pdl.h
new file mode 100644
index 0000000..e34ac5b
--- /dev/null
+++ b/src/mca/pdl/pdl.h
@@ -0,0 +1,186 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2015 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2015      Los Alamos National Security, LLC. All rights
+ *                         reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+/**
+ * @file
+ *
+ * Dynamic library framework
+ *
+ * General Description:
+ *
+ * This framework provides portable access to dlopen- and dlsym-like
+ * functionality, very similar to Libtool's libltdl.  Indeed, one of
+ * the components in this framework will use libltdl, if it is
+ * present/available.  However, on some common types systems where
+ * libltdl headers and libraries are *not* available, we can support
+ * plugins via this simple framework.
+ *
+ * This is a compile-time framework: a single component will be
+ * selected by the priority that its configure.m4 provides.  All other
+ * components will be ignored (i.e., not built/not part of the
+ * installation).  Meaning: the static_components of the pdl framework
+ * will always contain 0 or 1 components.
+ *
+ * SIDENOTE: PMIX used to embed libltdl.  However, as of early
+ * 2015, this became problematic, for a variety of complex and
+ * uninteresting reasons (see the following if you care about the
+ * details: https://github.com/open-mpi/ompi/issues/311,
+ * http://debbugs.gnu.org/cgi/bugreport.cgi?bug=19370,
+ * https://github.com/open-mpi/ompi/pull/366,
+ * https://github.com/open-mpi/ompi/pull/390).  That being said, we,
+ * as a developer community, still wanted to be able to natively use
+ * DSOs by default.  A small/simple framework for PDL functionality,
+ * along with a simple component that supports dlopen/dlsym on POSIX
+ * platforms and another component that natively uses libltdl seemed
+ * like a good solution.
+ */
+
+#ifndef PMIX_MCA_PDL_PDL_H
+#define PMIX_MCA_PDL_PDL_H
+
+#include <src/include/pmix_config.h>
+
+#include "src/mca/mca.h"
+#include "src/mca/base/base.h"
+
+BEGIN_C_DECLS
+
+/**
+ * Handle for an opened file
+ */
+struct pmix_pdl_handle_t;
+typedef struct pmix_pdl_handle_t pmix_pdl_handle_t;
+
+/**
+ * Dynamically open the file specified.
+ *
+ * Arguments:
+ *   fname   = Base filename to open.  If NULL, open this process.
+ *   use_ext = If true, try various filename suffixes that are
+ *       relevant on this platform (e.g., .so, .dll, .dylib).  If
+ *       false, just use exactly whatever was passed as fname.
+ *   private = If true, open the file in a private namespace.
+ *       Otherwise, open the file in a global namespace.
+ *   handle = Upon successful open, a handle to the opened file will
+ *       be returned.
+ *   err_msg= if non-NULL and !=PMIX_SUCCESS is returned, will point to a
+ *       string error message
+ *
+ * Returns:
+ *   PMIX_SUCCESS on success, or PMIX_ERROR
+ *
+ * Space for the handle must be allocated by the module (it can be
+ * freed during the call to pmix_pdl_base_module_dlclose_fn_t).
+ *
+ * The err_msg points to an internal string and should not be altered
+ * or freed by the caller.  The contents of the err_msg string may
+ * change after successive calls to pmix_pdl API calls.
+ */
+typedef int (*pmix_pdl_base_module_open_fn_t)
+    (const char *fname, bool use_ext, bool private_namespace,
+     pmix_pdl_handle_t **handle, char **err_msg);
+
+/**
+ * Lookup a symbol in an opened file.
+ *
+ * Arguments:
+ *   handle = handle of a previously dynamically opened file
+ *   symbol = name of the symbol to lookup
+ *   ptr    = if found, a pointer to the symbol.  Otherwise, NULL.
+ *   err_msg= if non-NULL and !=PMIX_SUCCESS is returned, will point to a
+ *            string error message
+ * Returns:
+ *   PMIX_SUCCESS on success, or PMIX_ERROR
+ *
+ *
+ * The err_msg points to an internal string and should not be altered
+ * or freed by the caller.  The contents of the err_msg string may
+ * change after successive calls to pmix_pdl API calls.
+ */
+typedef int (*pmix_pdl_base_module_lookup_fn_t)
+    (pmix_pdl_handle_t *handle, const char *symbol, void **ptr, char **err_msg);
+
+/**
+ * Dynamically close a previously dynamically-opened file.
+ *
+ * Arguments:
+ *   handle = handle of a previously dynamically opened file.
+ * Returns:
+ *   PMIX_SUCCESS on success, or PMIX_ERROR
+ *
+ * This function should close the file and free and resources
+ * associated with it (e.g., whatever is cached on the handle).
+ */
+typedef int (*pmix_pdl_base_module_close_fn_t)
+    (pmix_pdl_handle_t *handle);
+
+/**
+ * Search through a path of directories, invoking a callback on each
+ * unique regular (non-Libtool) file basename found (e.g., will only
+ * be invoked once for the files "foo.la" and "foo.so", with the
+ * parameter "foo").
+ *
+ * Arguments:
+ *   path   = PMIX_ENV_SEP-delimited list of directories
+ *   cb_func= function to invoke on each filename found
+ *   data   = context for callback function
+ * Returns:
+ *   PMIX_SUCESS on success, PMIX_ERR* otherwise
+ */
+typedef int (*pmix_pdl_base_module_foreachfile_fn_t)
+    (const char *search_path,
+     int (*cb_func)(const char *filename, void *context),
+     void *context);
+
+/**
+ * Structure for PDL components.
+ */
+struct pmix_pdl_base_component_1_0_0_t {
+    /** MCA base component */
+    pmix_mca_base_component_t base_version;
+    /** MCA base data */
+    pmix_mca_base_component_data_t base_data;
+
+    /** Default priority */
+    int priority;
+};
+typedef struct pmix_pdl_base_component_1_0_0_t pmix_pdl_base_component_1_0_0_t;
+typedef struct pmix_pdl_base_component_1_0_0_t pmix_pdl_base_component_t;
+
+/**
+ * Structure for PDL modules
+ */
+struct pmix_pdl_base_module_1_0_0_t {
+    pmix_mca_base_module_2_0_0_t            super;
+
+    /** Open / close */
+    pmix_pdl_base_module_open_fn_t           open;
+    pmix_pdl_base_module_close_fn_t          close;
+
+    /** Lookup a symbol */
+    pmix_pdl_base_module_lookup_fn_t         lookup;
+
+    /** Iterate looking for files */
+    pmix_pdl_base_module_foreachfile_fn_t    foreachfile;
+};
+typedef struct pmix_pdl_base_module_1_0_0_t pmix_pdl_base_module_1_0_0_t;
+typedef struct pmix_pdl_base_module_1_0_0_t pmix_pdl_base_module_t;
+
+/**
+ * Macro for use in components that are of type PDL
+ */
+#define PMIX_PDL_BASE_VERSION_1_0_0              \
+    PMIX_MCA_BASE_VERSION_1_0_0("pdl", 1, 0, 0)
+
+END_C_DECLS
+
+#endif /* PMIX_MCA_PDL_PDL_H */
diff --git a/src/mca/pdl/pdlopen/Makefile.am b/src/mca/pdl/pdlopen/Makefile.am
new file mode 100644
index 0000000..c2811ee
--- /dev/null
+++ b/src/mca/pdl/pdlopen/Makefile.am
@@ -0,0 +1,23 @@
+#
+# Copyright (c) 2004-2010 The Trustees of Indiana University.
+#                         All rights reserved.
+# Copyright (c) 2014-2015 Cisco Systems, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+sources = \
+        pdl_pdlopen.h \
+        pdl_pdlopen_component.c \
+        pdl_pdlopen_module.c
+
+# This component will only ever be built statically -- never as a DSO.
+
+noinst_LTLIBRARIES = libmca_pdl_pdlopen.la
+
+libmca_pdl_pdlopen_la_SOURCES = $(sources)
+libmca_pdl_pdlopen_la_LDFLAGS = -module -avoid-version
+libmca_pdl_pdlopen_la_LIBADD = $(pmix_pdl_pdlopen_LIBS)
diff --git a/src/mca/pdl/pdlopen/Makefile.in b/src/mca/pdl/pdlopen/Makefile.in
new file mode 100644
index 0000000..3323e31
--- /dev/null
+++ b/src/mca/pdl/pdlopen/Makefile.in
@@ -0,0 +1,778 @@
+# Makefile.in generated by automake 1.15 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+#
+# Copyright (c) 2004-2010 The Trustees of Indiana University.
+#                         All rights reserved.
+# Copyright (c) 2014-2015 Cisco Systems, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+subdir = src/mca/pdl/pdlopen
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/config/c_get_alignment.m4 \
+	$(top_srcdir)/config/libtool.m4 \
+	$(top_srcdir)/config/ltoptions.m4 \
+	$(top_srcdir)/config/ltsugar.m4 \
+	$(top_srcdir)/config/ltversion.m4 \
+	$(top_srcdir)/config/lt~obsolete.m4 \
+	$(top_srcdir)/config/pmix.m4 \
+	$(top_srcdir)/config/pmix_check_attributes.m4 \
+	$(top_srcdir)/config/pmix_check_broken_qsort.m4 \
+	$(top_srcdir)/config/pmix_check_compiler_version.m4 \
+	$(top_srcdir)/config/pmix_check_icc.m4 \
+	$(top_srcdir)/config/pmix_check_ident.m4 \
+	$(top_srcdir)/config/pmix_check_lock.m4 \
+	$(top_srcdir)/config/pmix_check_os_flavors.m4 \
+	$(top_srcdir)/config/pmix_check_package.m4 \
+	$(top_srcdir)/config/pmix_check_psm2.m4 \
+	$(top_srcdir)/config/pmix_check_pthread_pids.m4 \
+	$(top_srcdir)/config/pmix_check_vendor.m4 \
+	$(top_srcdir)/config/pmix_check_visibility.m4 \
+	$(top_srcdir)/config/pmix_check_withdir.m4 \
+	$(top_srcdir)/config/pmix_config_asm.m4 \
+	$(top_srcdir)/config/pmix_config_pthreads.m4 \
+	$(top_srcdir)/config/pmix_config_subdir.m4 \
+	$(top_srcdir)/config/pmix_config_subdir_args.m4 \
+	$(top_srcdir)/config/pmix_config_threads.m4 \
+	$(top_srcdir)/config/pmix_ensure_contains_optflags.m4 \
+	$(top_srcdir)/config/pmix_functions.m4 \
+	$(top_srcdir)/config/pmix_load_platform.m4 \
+	$(top_srcdir)/config/pmix_mca.m4 \
+	$(top_srcdir)/config/pmix_search_libs.m4 \
+	$(top_srcdir)/config/pmix_setup_cc.m4 \
+	$(top_srcdir)/config/pmix_setup_libevent.m4 \
+	$(top_srcdir)/config/pmix_setup_zlib.m4 \
+	$(top_srcdir)/config/pmix_try_assemble.m4 \
+	$(top_srcdir)/config/autogen_found_items.m4 \
+	$(top_srcdir)/src/mca/pdl/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/configure.m4 \
+	$(top_srcdir)/src/mca/pdl/pdlopen/configure.m4 \
+	$(top_srcdir)/src/mca/pdl/plibltdl/configure.m4 \
+	$(top_srcdir)/src/mca/pif/bsdx_ipv4/configure.m4 \
+	$(top_srcdir)/src/mca/pif/bsdx_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pif/linux_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pif/posix_ipv4/configure.m4 \
+	$(top_srcdir)/src/mca/pif/solaris_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/config/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/env/configure.m4 \
+	$(top_srcdir)/src/mca/pnet/opa/configure.m4 \
+	$(top_srcdir)/src/mca/psec/munge/configure.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/src/include/pmix_config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+am__DEPENDENCIES_1 =
+libmca_pdl_pdlopen_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am__objects_1 = pdl_pdlopen_component.lo pdl_pdlopen_module.lo
+am_libmca_pdl_pdlopen_la_OBJECTS = $(am__objects_1)
+libmca_pdl_pdlopen_la_OBJECTS = $(am_libmca_pdl_pdlopen_la_OBJECTS)
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+libmca_pdl_pdlopen_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(AM_CFLAGS) $(CFLAGS) $(libmca_pdl_pdlopen_la_LDFLAGS) \
+	$(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/src/include
+depcomp = $(SHELL) $(top_srcdir)/./config/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libmca_pdl_pdlopen_la_SOURCES)
+DIST_SOURCES = $(libmca_pdl_pdlopen_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/./config/depcomp
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CFLAGS = @CFLAGS@
+CLEANFILES = @CLEANFILES@
+CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MCA_PROJECT_SUBDIRS = @MCA_PROJECT_SUBDIRS@
+MCA_pmix_FRAMEWORKS = @MCA_pmix_FRAMEWORKS@
+MCA_pmix_FRAMEWORKS_SUBDIRS = @MCA_pmix_FRAMEWORKS_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS@
+MCA_pmix_FRAMEWORK_LIBS = @MCA_pmix_FRAMEWORK_LIBS@
+MCA_pmix_pdl_ALL_COMPONENTS = @MCA_pmix_pdl_ALL_COMPONENTS@
+MCA_pmix_pdl_ALL_SUBDIRS = @MCA_pmix_pdl_ALL_SUBDIRS@
+MCA_pmix_pdl_DSO_COMPONENTS = @MCA_pmix_pdl_DSO_COMPONENTS@
+MCA_pmix_pdl_DSO_SUBDIRS = @MCA_pmix_pdl_DSO_SUBDIRS@
+MCA_pmix_pdl_STATIC_COMPONENTS = @MCA_pmix_pdl_STATIC_COMPONENTS@
+MCA_pmix_pdl_STATIC_LTLIBS = @MCA_pmix_pdl_STATIC_LTLIBS@
+MCA_pmix_pdl_STATIC_SUBDIRS = @MCA_pmix_pdl_STATIC_SUBDIRS@
+MCA_pmix_pif_ALL_COMPONENTS = @MCA_pmix_pif_ALL_COMPONENTS@
+MCA_pmix_pif_ALL_SUBDIRS = @MCA_pmix_pif_ALL_SUBDIRS@
+MCA_pmix_pif_DSO_COMPONENTS = @MCA_pmix_pif_DSO_COMPONENTS@
+MCA_pmix_pif_DSO_SUBDIRS = @MCA_pmix_pif_DSO_SUBDIRS@
+MCA_pmix_pif_STATIC_COMPONENTS = @MCA_pmix_pif_STATIC_COMPONENTS@
+MCA_pmix_pif_STATIC_LTLIBS = @MCA_pmix_pif_STATIC_LTLIBS@
+MCA_pmix_pif_STATIC_SUBDIRS = @MCA_pmix_pif_STATIC_SUBDIRS@
+MCA_pmix_pinstalldirs_ALL_COMPONENTS = @MCA_pmix_pinstalldirs_ALL_COMPONENTS@
+MCA_pmix_pinstalldirs_ALL_SUBDIRS = @MCA_pmix_pinstalldirs_ALL_SUBDIRS@
+MCA_pmix_pinstalldirs_DSO_COMPONENTS = @MCA_pmix_pinstalldirs_DSO_COMPONENTS@
+MCA_pmix_pinstalldirs_DSO_SUBDIRS = @MCA_pmix_pinstalldirs_DSO_SUBDIRS@
+MCA_pmix_pinstalldirs_STATIC_COMPONENTS = @MCA_pmix_pinstalldirs_STATIC_COMPONENTS@
+MCA_pmix_pinstalldirs_STATIC_LTLIBS = @MCA_pmix_pinstalldirs_STATIC_LTLIBS@
+MCA_pmix_pinstalldirs_STATIC_SUBDIRS = @MCA_pmix_pinstalldirs_STATIC_SUBDIRS@
+MCA_pmix_pnet_ALL_COMPONENTS = @MCA_pmix_pnet_ALL_COMPONENTS@
+MCA_pmix_pnet_ALL_SUBDIRS = @MCA_pmix_pnet_ALL_SUBDIRS@
+MCA_pmix_pnet_DSO_COMPONENTS = @MCA_pmix_pnet_DSO_COMPONENTS@
+MCA_pmix_pnet_DSO_SUBDIRS = @MCA_pmix_pnet_DSO_SUBDIRS@
+MCA_pmix_pnet_STATIC_COMPONENTS = @MCA_pmix_pnet_STATIC_COMPONENTS@
+MCA_pmix_pnet_STATIC_LTLIBS = @MCA_pmix_pnet_STATIC_LTLIBS@
+MCA_pmix_pnet_STATIC_SUBDIRS = @MCA_pmix_pnet_STATIC_SUBDIRS@
+MCA_pmix_psec_ALL_COMPONENTS = @MCA_pmix_psec_ALL_COMPONENTS@
+MCA_pmix_psec_ALL_SUBDIRS = @MCA_pmix_psec_ALL_SUBDIRS@
+MCA_pmix_psec_DSO_COMPONENTS = @MCA_pmix_psec_DSO_COMPONENTS@
+MCA_pmix_psec_DSO_SUBDIRS = @MCA_pmix_psec_DSO_SUBDIRS@
+MCA_pmix_psec_STATIC_COMPONENTS = @MCA_pmix_psec_STATIC_COMPONENTS@
+MCA_pmix_psec_STATIC_LTLIBS = @MCA_pmix_psec_STATIC_LTLIBS@
+MCA_pmix_psec_STATIC_SUBDIRS = @MCA_pmix_psec_STATIC_SUBDIRS@
+MCA_pmix_psensor_ALL_COMPONENTS = @MCA_pmix_psensor_ALL_COMPONENTS@
+MCA_pmix_psensor_ALL_SUBDIRS = @MCA_pmix_psensor_ALL_SUBDIRS@
+MCA_pmix_psensor_DSO_COMPONENTS = @MCA_pmix_psensor_DSO_COMPONENTS@
+MCA_pmix_psensor_DSO_SUBDIRS = @MCA_pmix_psensor_DSO_SUBDIRS@
+MCA_pmix_psensor_STATIC_COMPONENTS = @MCA_pmix_psensor_STATIC_COMPONENTS@
+MCA_pmix_psensor_STATIC_LTLIBS = @MCA_pmix_psensor_STATIC_LTLIBS@
+MCA_pmix_psensor_STATIC_SUBDIRS = @MCA_pmix_psensor_STATIC_SUBDIRS@
+MCA_pmix_ptl_ALL_COMPONENTS = @MCA_pmix_ptl_ALL_COMPONENTS@
+MCA_pmix_ptl_ALL_SUBDIRS = @MCA_pmix_ptl_ALL_SUBDIRS@
+MCA_pmix_ptl_DSO_COMPONENTS = @MCA_pmix_ptl_DSO_COMPONENTS@
+MCA_pmix_ptl_DSO_SUBDIRS = @MCA_pmix_ptl_DSO_SUBDIRS@
+MCA_pmix_ptl_STATIC_COMPONENTS = @MCA_pmix_ptl_STATIC_COMPONENTS@
+MCA_pmix_ptl_STATIC_LTLIBS = @MCA_pmix_ptl_STATIC_LTLIBS@
+MCA_pmix_ptl_STATIC_SUBDIRS = @MCA_pmix_ptl_STATIC_SUBDIRS@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PMIX_ASM_GSYM = @PMIX_ASM_GSYM@
+PMIX_ASM_LSYM = @PMIX_ASM_LSYM@
+PMIX_ASM_SUPPORT_64BIT = @PMIX_ASM_SUPPORT_64BIT@
+PMIX_ASM_TEXT = @PMIX_ASM_TEXT@
+PMIX_ASM_TYPE = @PMIX_ASM_TYPE@
+PMIX_ASSEMBLY_ARCH = @PMIX_ASSEMBLY_ARCH@
+PMIX_ASSEMBLY_BUILTIN = @PMIX_ASSEMBLY_BUILTIN@
+PMIX_ASSEMBLY_FORMAT = @PMIX_ASSEMBLY_FORMAT@
+PMIX_AS_GLOBAL = @PMIX_AS_GLOBAL@
+PMIX_AS_LABEL_SUFFIX = @PMIX_AS_LABEL_SUFFIX@
+PMIX_CC_ABSOLUTE = @PMIX_CC_ABSOLUTE@
+PMIX_CONFIGURE_DATE = @PMIX_CONFIGURE_DATE@
+PMIX_CONFIGURE_HOST = @PMIX_CONFIGURE_HOST@
+PMIX_CONFIGURE_USER = @PMIX_CONFIGURE_USER@
+PMIX_EMBEDDED_CPPFLAGS = @PMIX_EMBEDDED_CPPFLAGS@
+PMIX_EMBEDDED_LDFLAGS = @PMIX_EMBEDDED_LDFLAGS@
+PMIX_EMBEDDED_LIBS = @PMIX_EMBEDDED_LIBS@
+PMIX_MAJOR_VERSION = @PMIX_MAJOR_VERSION@
+PMIX_MINOR_VERSION = @PMIX_MINOR_VERSION@
+PMIX_RELEASE_DATE = @PMIX_RELEASE_DATE@
+PMIX_RELEASE_VERSION = @PMIX_RELEASE_VERSION@
+PMIX_RENAME = @PMIX_RENAME@
+PMIX_VERSION = @PMIX_VERSION@
+PMIX_top_builddir = @PMIX_top_builddir@
+PMIX_top_srcdir = @PMIX_top_srcdir@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_prefix_program = @ac_prefix_program@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+libpmix_so_version = @libpmix_so_version@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pmix_have_pandoc = @pmix_have_pandoc@
+pmix_pdl_pdlopen_LIBS = @pmix_pdl_pdlopen_LIBS@
+pmix_pdl_plibltdl_CPPFLAGS = @pmix_pdl_plibltdl_CPPFLAGS@
+pmix_pdl_plibltdl_LDFLAGS = @pmix_pdl_plibltdl_LDFLAGS@
+pmix_pdl_plibltdl_LIBS = @pmix_pdl_plibltdl_LIBS@
+pmixdatadir = @pmixdatadir@
+pmixincludedir = @pmixincludedir@
+pmixlibdir = @pmixlibdir@
+pmixmajor = @pmixmajor@
+pmixminor = @pmixminor@
+pnet_opa_CFLAGS = @pnet_opa_CFLAGS@
+pnet_opa_CPPFLAGS = @pnet_opa_CPPFLAGS@
+pnet_opa_LDFLAGS = @pnet_opa_LDFLAGS@
+pnet_opa_LIBS = @pnet_opa_LIBS@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+psec_munge_CPPFLAGS = @psec_munge_CPPFLAGS@
+psec_munge_LDFLAGS = @psec_munge_LDFLAGS@
+psec_munge_LIBS = @psec_munge_LIBS@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+sources = \
+        pdl_pdlopen.h \
+        pdl_pdlopen_component.c \
+        pdl_pdlopen_module.c
+
+
+# This component will only ever be built statically -- never as a DSO.
+noinst_LTLIBRARIES = libmca_pdl_pdlopen.la
+libmca_pdl_pdlopen_la_SOURCES = $(sources)
+libmca_pdl_pdlopen_la_LDFLAGS = -module -avoid-version
+libmca_pdl_pdlopen_la_LIBADD = $(pmix_pdl_pdlopen_LIBS)
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/mca/pdl/pdlopen/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/mca/pdl/pdlopen/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_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}; \
+	}
+
+libmca_pdl_pdlopen.la: $(libmca_pdl_pdlopen_la_OBJECTS) $(libmca_pdl_pdlopen_la_DEPENDENCIES) $(EXTRA_libmca_pdl_pdlopen_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(libmca_pdl_pdlopen_la_LINK)  $(libmca_pdl_pdlopen_la_OBJECTS) $(libmca_pdl_pdlopen_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pdl_pdlopen_component.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pdl_pdlopen_module.Plo at am__quote@
+
+.c.o:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+ at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstLTLIBRARIES 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-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
+
+.PRECIOUS: Makefile
+
+
+# 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/mca/pdl/pdlopen/configure.m4 b/src/mca/pdl/pdlopen/configure.m4
new file mode 100644
index 0000000..975e0da
--- /dev/null
+++ b/src/mca/pdl/pdlopen/configure.m4
@@ -0,0 +1,71 @@
+# -*- shell-script -*-
+#
+# Copyright (c) 2009-2015 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2016      Research Organization for Information Science
+#                         and Technology (RIST). All rights reserved.
+#
+# Copyright (c) 2017      Intel, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+AC_DEFUN([MCA_pmix_pdl_pdlopen_PRIORITY], [80])
+
+#
+# Force this component to compile in static-only mode
+#
+AC_DEFUN([MCA_pmix_pdl_pdlopen_COMPILE_MODE], [
+    AC_MSG_CHECKING([for MCA component $1:$2 compile mode])
+    $3="static"
+    AC_MSG_RESULT([$$3])
+])
+
+# MCA_pmix_pdl_pdlopen_POST_CONFIG()
+# ---------------------------------
+AC_DEFUN([MCA_pmix_pdl_pdlopen_POST_CONFIG],[
+    # If we won, then do all the rest of the setup
+    AS_IF([test "$1" = "1"],
+          [
+           # Add some stuff to CPPFLAGS so that the rest of the source
+           # tree can be built
+           LDFLAGS="$LDFLAGS $pmix_pdl_pdlopen_ADD_LDFLAGS"
+           LIBS="$LIBS $pmix_pdl_pdlopen_ADD_LIBS"
+          ])
+])dnl
+
+# MCA_pdl_pdlopen_CONFIG([action-if-can-compile],
+#                      [action-if-cant-compile])
+# ------------------------------------------------
+AC_DEFUN([MCA_pmix_pdl_pdlopen_CONFIG],[
+    AC_CONFIG_FILES([src/mca/pdl/pdlopen/Makefile])
+
+    dnl This is effectively a back-door for PMIX developers to
+    dnl force the use of the libltdl pdl component.
+    AC_ARG_ENABLE([dl-dlopen],
+        [AS_HELP_STRING([--disable-dl-dlopen],
+                        [Disable the "dlopen" PDL component (and probably force the use of the "libltdl" PDL component).])
+        ])
+
+    pmix_pdl_pdlopen_happy=no
+    AS_IF([test "$enable_dl_dlopen" != "no"],
+          [PMIX_CHECK_PACKAGE([pmix_pdl_pdlopen],
+              [dlfcn.h],
+              [dl],
+              [dlopen],
+              [],
+              [],
+              [],
+              [pmix_pdl_pdlopen_happy=yes],
+              [pmix_pdl_pdlopen_happy=no])
+          ])
+
+    AS_IF([test "$pmix_pdl_pdlopen_happy" = "yes"],
+          [pmix_pdl_pdlopen_ADD_LIBS=$pmix_pdl_pdlopen_LIBS
+           $1],
+          [$2])
+
+    AC_SUBST(pmix_pdl_pdlopen_LIBS)
+])
diff --git a/src/mca/pdl/pdlopen/pdl_pdlopen.h b/src/mca/pdl/pdlopen/pdl_pdlopen.h
new file mode 100644
index 0000000..7ba3e24
--- /dev/null
+++ b/src/mca/pdl/pdlopen/pdl_pdlopen.h
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2015     Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2016     Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#ifndef PMIX_PDL_PDLOPEN
+#define PMIX_PDL_PDLOPEN
+
+#include <src/include/pmix_config.h>
+
+#include "src/mca/pdl/pdl.h"
+
+extern pmix_pdl_base_module_t pmix_pdl_pdlopen_module;
+
+/*
+ * Dynamic library handles generated by this component.
+ *
+ * If we're debugging, keep a copy of the name of the file we've opened.
+ */
+struct pmix_pdl_handle_t {
+    void *dlopen_handle;
+#if PMIX_ENABLE_DEBUG
+    void *filename;
+#endif
+};
+
+typedef struct {
+    pmix_pdl_base_component_t base;
+
+    char *filename_suffixes_mca_storage;
+    char **filename_suffixes;
+} pmix_pdl_pdlopen_component_t;
+
+extern pmix_pdl_pdlopen_component_t mca_pdl_pdlopen_component;
+
+#endif /* PMIX_PDL_PDLOPEN */
diff --git a/src/mca/pdl/pdlopen/pdl_pdlopen_component.c b/src/mca/pdl/pdlopen/pdl_pdlopen_component.c
new file mode 100644
index 0000000..8e061d5
--- /dev/null
+++ b/src/mca/pdl/pdlopen/pdl_pdlopen_component.c
@@ -0,0 +1,127 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2015 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2015      Los Alamos National Security, LLC. All rights
+ *                         reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+
+#include "pmix_common.h"
+#include "src/mca/pdl/pdl.h"
+#include "src/util/argv.h"
+
+#include "pdl_pdlopen.h"
+
+
+/*
+ * Public string showing the sysinfo ompi_linux component version number
+ */
+const char *pmix_pdl_pdlopen_component_version_string =
+    "PMIX pdl pdlopen MCA component version " PMIX_VERSION;
+
+
+/*
+ * Local functions
+ */
+static int pdlopen_component_register(void);
+static int pdlopen_component_open(void);
+static int pdlopen_component_close(void);
+static int pdlopen_component_query(pmix_mca_base_module_t **module, int *priority);
+
+/*
+ * Instantiate the public struct with all of our public information
+ * and pointers to our public functions in it
+ */
+
+pmix_pdl_pdlopen_component_t mca_pdl_pdlopen_component = {
+
+    /* Fill in the mca_pdl_base_component_t */
+    .base = {
+
+        /* First, the mca_component_t struct containing meta information
+           about the component itself */
+        .base_version = {
+            PMIX_PDL_BASE_VERSION_1_0_0,
+
+            /* Component name and version */
+            .pmix_mca_component_name = "pdlopen",
+            PMIX_MCA_BASE_MAKE_VERSION(component, PMIX_MAJOR_VERSION, PMIX_MINOR_VERSION,
+                                       PMIX_RELEASE_VERSION),
+
+            /* Component functions */
+            .pmix_mca_register_component_params = pdlopen_component_register,
+            .pmix_mca_open_component = pdlopen_component_open,
+            .pmix_mca_close_component = pdlopen_component_close,
+            .pmix_mca_query_component = pdlopen_component_query,
+        },
+
+        .base_data = {
+            /* The component is checkpoint ready */
+            PMIX_MCA_BASE_METADATA_PARAM_CHECKPOINT
+        },
+
+        /* The pdl framework members */
+        .priority = 80
+    },
+};
+
+
+static int pdlopen_component_register(void)
+{
+    int ret;
+
+    mca_pdl_pdlopen_component.filename_suffixes_mca_storage = ".so,.dylib,.dll,.sl";
+    ret =
+        pmix_mca_base_component_var_register(&mca_pdl_pdlopen_component.base.base_version,
+                                             "filename_suffixes",
+                                             "Comma-delimited list of filename suffixes that the pdlopen component will try",
+                                             PMIX_MCA_BASE_VAR_TYPE_STRING,
+                                             NULL,
+                                             0,
+                                             PMIX_MCA_BASE_VAR_FLAG_SETTABLE,
+                                             PMIX_INFO_LVL_5,
+                                             PMIX_MCA_BASE_VAR_SCOPE_LOCAL,
+                                             &mca_pdl_pdlopen_component.filename_suffixes_mca_storage);
+    if (ret < 0) {
+        return ret;
+    }
+    mca_pdl_pdlopen_component.filename_suffixes =
+        pmix_argv_split(mca_pdl_pdlopen_component.filename_suffixes_mca_storage,
+                        ',');
+
+    return PMIX_SUCCESS;
+}
+
+static int pdlopen_component_open(void)
+{
+    return PMIX_SUCCESS;
+}
+
+
+static int pdlopen_component_close(void)
+{
+    if (NULL != mca_pdl_pdlopen_component.filename_suffixes) {
+        pmix_argv_free(mca_pdl_pdlopen_component.filename_suffixes);
+        mca_pdl_pdlopen_component.filename_suffixes = NULL;
+    }
+
+    return PMIX_SUCCESS;
+}
+
+
+static int pdlopen_component_query(pmix_mca_base_module_t **module, int *priority)
+{
+    /* The priority value is somewhat meaningless here; by
+       pmix/mca/pdl/configure.m4, there's at most one component
+       available. */
+    *priority = mca_pdl_pdlopen_component.base.priority;
+    *module = &pmix_pdl_pdlopen_module.super;
+
+    return PMIX_SUCCESS;
+}
diff --git a/src/mca/pdl/pdlopen/pdl_pdlopen_module.c b/src/mca/pdl/pdlopen/pdl_pdlopen_module.c
new file mode 100644
index 0000000..85e8854
--- /dev/null
+++ b/src/mca/pdl/pdlopen/pdl_pdlopen_module.c
@@ -0,0 +1,276 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2015 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2015      Los Alamos National Security, LLC. All rights
+ *                         reserved.
+ * Copyright (c) 2016      IBM Corporation.  All rights reserved.
+ * Copyright (c) 2016      Intel, Inc. All rights reserved
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+
+#include <stdlib.h>
+#include <dlfcn.h>
+#include <sys/types.h>
+#include <dirent.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
+#include "pmix_common.h"
+#include "src/mca/pdl/pdl.h"
+#include "src/util/argv.h"
+#include "src/util/error.h"
+
+#include "pdl_pdlopen.h"
+
+
+/*
+ * Trivial helper function to avoid replicating code
+ */
+static void do_pdlopen(const char *fname, int flags,
+                      void **handle, char **err_msg)
+{
+    assert(handle);
+
+    *handle = dlopen(fname, flags);
+
+    if (NULL != err_msg) {
+        if (NULL != *handle) {
+            *err_msg = NULL;
+        } else {
+            *err_msg = dlerror();
+        }
+    }
+}
+
+
+static int pdlopen_open(const char *fname, bool use_ext, bool private_namespace,
+                       pmix_pdl_handle_t **handle, char **err_msg)
+{
+    assert(handle);
+
+    *handle = NULL;
+
+    /* Setup the dlopen flags */
+    int flags = RTLD_LAZY;
+    if (private_namespace) {
+        flags |= RTLD_LOCAL;
+    } else {
+        flags |= RTLD_GLOBAL;
+    }
+
+    /* If the caller wants to use filename extensions, loop through
+       them */
+    void *local_handle = NULL;
+    if (use_ext && NULL != fname) {
+        int i;
+        char *ext;
+
+        for (i = 0, ext = mca_pdl_pdlopen_component.filename_suffixes[i];
+             NULL != ext;
+             ext = mca_pdl_pdlopen_component.filename_suffixes[++i]) {
+            char *name;
+
+            asprintf(&name, "%s%s", fname, ext);
+            if (NULL == name) {
+                return PMIX_ERR_IN_ERRNO;
+            }
+
+            /* Does the file exist? */
+            struct stat buf;
+            if (stat(name, &buf) < 0) {
+                free(name);
+                if (NULL != err_msg) {
+                    *err_msg = "File not found";
+                }
+                continue;
+            }
+
+            /* Yes, the file exists -- try to dlopen it.  If we can't
+               dlopen it, bail. */
+            do_pdlopen(name, flags, &local_handle, err_msg);
+            free(name);
+            break;
+        }
+    }
+
+    /* Otherwise, the caller does not want to use filename extensions,
+       so just use the single filename that the caller provided */
+    else {
+        do_pdlopen(fname, flags, &local_handle, err_msg);
+    }
+
+    if (NULL != local_handle) {
+        *handle = calloc(1, sizeof(pmix_pdl_handle_t));
+        (*handle)->dlopen_handle = local_handle;
+
+#if PMIX_ENABLE_DEBUG
+        if( NULL != fname ) {
+            (*handle)->filename = strdup(fname);
+        }
+        else {
+            (*handle)->filename = strdup("(null)");
+        }
+#endif
+    }
+    return (NULL != local_handle) ? PMIX_SUCCESS : PMIX_ERROR;
+}
+
+
+static int pdlopen_lookup(pmix_pdl_handle_t *handle, const char *symbol,
+                         void **ptr, char **err_msg)
+{
+    assert(handle);
+    assert(handle->dlopen_handle);
+    assert(symbol);
+    assert(ptr);
+
+    *ptr = dlsym(handle->dlopen_handle, symbol);
+    if (NULL != *ptr) {
+        return PMIX_SUCCESS;
+    }
+
+    if (NULL != err_msg) {
+        *err_msg = dlerror();
+    }
+    return PMIX_ERROR;
+}
+
+
+static int pdlopen_close(pmix_pdl_handle_t *handle)
+{
+    assert(handle);
+
+    int ret;
+    ret = dlclose(handle->dlopen_handle);
+
+#if PMIX_ENABLE_DEBUG
+    free(handle->filename);
+#endif
+    free(handle);
+
+    return ret;
+}
+
+/*
+ * Scan all the files in a directory (or path) and invoke a callback
+ * on each one.
+ */
+static int pdlopen_foreachfile(const char *search_path,
+                              int (*func)(const char *filename, void *data),
+                              void *data)
+{
+    int ret;
+    DIR *dp = NULL;
+    char **dirs = NULL;
+    char **good_files = NULL;
+
+    dirs = pmix_argv_split(search_path, PMIX_ENV_SEP);
+    for (int i = 0; NULL != dirs && NULL != dirs[i]; ++i) {
+
+        dp = opendir(dirs[i]);
+        if (NULL == dp) {
+            ret = PMIX_ERR_IN_ERRNO;
+            goto error;
+        }
+
+        struct dirent *de;
+        while (NULL != (de = readdir(dp))) {
+
+            /* Make the absolute path name */
+            char *abs_name = NULL;
+            asprintf(&abs_name, "%s/%s", dirs[i], de->d_name);
+            if (NULL == abs_name) {
+                ret = PMIX_ERR_IN_ERRNO;
+                goto error;
+            }
+
+            /* Stat the file */
+            struct stat buf;
+            if (stat(abs_name, &buf) < 0) {
+                free(abs_name);
+                ret = PMIX_ERR_IN_ERRNO;
+                goto error;
+            }
+
+            /* Skip if not a file */
+            if (!S_ISREG(buf.st_mode)) {
+                free(abs_name);
+                continue;
+            }
+
+            /* Find the suffix */
+            char *ptr = strrchr(abs_name, '.');
+            if (NULL != ptr) {
+
+                /* Skip libtool files */
+                if (strcmp(ptr, ".la") == 0 ||
+                    strcmp(ptr, ".lo") == 0) {
+                    free (abs_name);
+                    continue;
+                }
+
+                *ptr = '\0';
+            }
+
+            /* Have we already found this file?  Or already found a
+               file with the same basename (but different suffix)? */
+            bool found = false;
+            for (int j = 0; NULL != good_files &&
+                     NULL != good_files[j]; ++j) {
+                if (strcmp(good_files[j], abs_name) == 0) {
+                    found = true;
+                    break;
+                }
+            }
+
+            if (!found) {
+                pmix_argv_append_nosize(&good_files, abs_name);
+            }
+            free(abs_name);
+        }
+        closedir(dp);
+    }
+    dp = NULL;
+
+    /* Invoke the callback on all the found files */
+    if (NULL != good_files) {
+        for (int i = 0; NULL != good_files[i]; ++i) {
+            ret = func(good_files[i], data);
+            if (PMIX_SUCCESS != ret) {
+                goto error;
+            }
+        }
+    }
+
+    ret = PMIX_SUCCESS;
+
+ error:
+    if (NULL != dp) {
+        closedir(dp);
+    }
+    if (NULL != dirs) {
+        pmix_argv_free(dirs);
+    }
+    if (NULL != good_files) {
+        pmix_argv_free(good_files);
+    }
+
+    return ret;
+}
+
+
+/*
+ * Module definition
+ */
+pmix_pdl_base_module_t pmix_pdl_pdlopen_module = {
+    .open = pdlopen_open,
+    .lookup = pdlopen_lookup,
+    .close = pdlopen_close,
+    .foreachfile = pdlopen_foreachfile
+};
diff --git a/src/mca/pdl/plibltdl/Makefile.am b/src/mca/pdl/plibltdl/Makefile.am
new file mode 100644
index 0000000..2d6866c
--- /dev/null
+++ b/src/mca/pdl/plibltdl/Makefile.am
@@ -0,0 +1,27 @@
+#
+# Copyright (c) 2004-2010 The Trustees of Indiana University.
+#                         All rights reserved.
+# Copyright (c) 2014-2015 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2017      Intel, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+sources = \
+        pdl_libltdl.h \
+        pdl_libltdl_component.c \
+        pdl_libltdl_module.c
+
+# This component will only ever be built statically -- never as a DSO.
+
+noinst_LTLIBRARIES = libmca_pdl_plibltdl.la
+
+libmca_pdl_plibltdl_la_SOURCES = $(sources)
+libmca_pdl_plibltdl_la_CPPFLAGS = $(pmix_pdl_plibltdl_CPPFLAGS)
+libmca_pdl_plibltdl_la_LDFLAGS = \
+        $(pmix_pdl_plibltdl_LDFLAGS) \
+        -module -avoid-version
+libmca_pdl_plibltdl_la_LIBADD = $(pmix_pdl_plibltdl_LIBS)
diff --git a/src/mca/pdl/plibltdl/Makefile.in b/src/mca/pdl/plibltdl/Makefile.in
new file mode 100644
index 0000000..dc48ae9
--- /dev/null
+++ b/src/mca/pdl/plibltdl/Makefile.in
@@ -0,0 +1,798 @@
+# Makefile.in generated by automake 1.15 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+#
+# Copyright (c) 2004-2010 The Trustees of Indiana University.
+#                         All rights reserved.
+# Copyright (c) 2014-2015 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2017      Intel, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+subdir = src/mca/pdl/plibltdl
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/config/c_get_alignment.m4 \
+	$(top_srcdir)/config/libtool.m4 \
+	$(top_srcdir)/config/ltoptions.m4 \
+	$(top_srcdir)/config/ltsugar.m4 \
+	$(top_srcdir)/config/ltversion.m4 \
+	$(top_srcdir)/config/lt~obsolete.m4 \
+	$(top_srcdir)/config/pmix.m4 \
+	$(top_srcdir)/config/pmix_check_attributes.m4 \
+	$(top_srcdir)/config/pmix_check_broken_qsort.m4 \
+	$(top_srcdir)/config/pmix_check_compiler_version.m4 \
+	$(top_srcdir)/config/pmix_check_icc.m4 \
+	$(top_srcdir)/config/pmix_check_ident.m4 \
+	$(top_srcdir)/config/pmix_check_lock.m4 \
+	$(top_srcdir)/config/pmix_check_os_flavors.m4 \
+	$(top_srcdir)/config/pmix_check_package.m4 \
+	$(top_srcdir)/config/pmix_check_psm2.m4 \
+	$(top_srcdir)/config/pmix_check_pthread_pids.m4 \
+	$(top_srcdir)/config/pmix_check_vendor.m4 \
+	$(top_srcdir)/config/pmix_check_visibility.m4 \
+	$(top_srcdir)/config/pmix_check_withdir.m4 \
+	$(top_srcdir)/config/pmix_config_asm.m4 \
+	$(top_srcdir)/config/pmix_config_pthreads.m4 \
+	$(top_srcdir)/config/pmix_config_subdir.m4 \
+	$(top_srcdir)/config/pmix_config_subdir_args.m4 \
+	$(top_srcdir)/config/pmix_config_threads.m4 \
+	$(top_srcdir)/config/pmix_ensure_contains_optflags.m4 \
+	$(top_srcdir)/config/pmix_functions.m4 \
+	$(top_srcdir)/config/pmix_load_platform.m4 \
+	$(top_srcdir)/config/pmix_mca.m4 \
+	$(top_srcdir)/config/pmix_search_libs.m4 \
+	$(top_srcdir)/config/pmix_setup_cc.m4 \
+	$(top_srcdir)/config/pmix_setup_libevent.m4 \
+	$(top_srcdir)/config/pmix_setup_zlib.m4 \
+	$(top_srcdir)/config/pmix_try_assemble.m4 \
+	$(top_srcdir)/config/autogen_found_items.m4 \
+	$(top_srcdir)/src/mca/pdl/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/configure.m4 \
+	$(top_srcdir)/src/mca/pdl/pdlopen/configure.m4 \
+	$(top_srcdir)/src/mca/pdl/plibltdl/configure.m4 \
+	$(top_srcdir)/src/mca/pif/bsdx_ipv4/configure.m4 \
+	$(top_srcdir)/src/mca/pif/bsdx_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pif/linux_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pif/posix_ipv4/configure.m4 \
+	$(top_srcdir)/src/mca/pif/solaris_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/config/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/env/configure.m4 \
+	$(top_srcdir)/src/mca/pnet/opa/configure.m4 \
+	$(top_srcdir)/src/mca/psec/munge/configure.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/src/include/pmix_config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+am__DEPENDENCIES_1 =
+libmca_pdl_plibltdl_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am__objects_1 = libmca_pdl_plibltdl_la-pdl_libltdl_component.lo \
+	libmca_pdl_plibltdl_la-pdl_libltdl_module.lo
+am_libmca_pdl_plibltdl_la_OBJECTS = $(am__objects_1)
+libmca_pdl_plibltdl_la_OBJECTS = $(am_libmca_pdl_plibltdl_la_OBJECTS)
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+libmca_pdl_plibltdl_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(AM_CFLAGS) $(CFLAGS) $(libmca_pdl_plibltdl_la_LDFLAGS) \
+	$(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/src/include
+depcomp = $(SHELL) $(top_srcdir)/./config/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libmca_pdl_plibltdl_la_SOURCES)
+DIST_SOURCES = $(libmca_pdl_plibltdl_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/./config/depcomp
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CFLAGS = @CFLAGS@
+CLEANFILES = @CLEANFILES@
+CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MCA_PROJECT_SUBDIRS = @MCA_PROJECT_SUBDIRS@
+MCA_pmix_FRAMEWORKS = @MCA_pmix_FRAMEWORKS@
+MCA_pmix_FRAMEWORKS_SUBDIRS = @MCA_pmix_FRAMEWORKS_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS@
+MCA_pmix_FRAMEWORK_LIBS = @MCA_pmix_FRAMEWORK_LIBS@
+MCA_pmix_pdl_ALL_COMPONENTS = @MCA_pmix_pdl_ALL_COMPONENTS@
+MCA_pmix_pdl_ALL_SUBDIRS = @MCA_pmix_pdl_ALL_SUBDIRS@
+MCA_pmix_pdl_DSO_COMPONENTS = @MCA_pmix_pdl_DSO_COMPONENTS@
+MCA_pmix_pdl_DSO_SUBDIRS = @MCA_pmix_pdl_DSO_SUBDIRS@
+MCA_pmix_pdl_STATIC_COMPONENTS = @MCA_pmix_pdl_STATIC_COMPONENTS@
+MCA_pmix_pdl_STATIC_LTLIBS = @MCA_pmix_pdl_STATIC_LTLIBS@
+MCA_pmix_pdl_STATIC_SUBDIRS = @MCA_pmix_pdl_STATIC_SUBDIRS@
+MCA_pmix_pif_ALL_COMPONENTS = @MCA_pmix_pif_ALL_COMPONENTS@
+MCA_pmix_pif_ALL_SUBDIRS = @MCA_pmix_pif_ALL_SUBDIRS@
+MCA_pmix_pif_DSO_COMPONENTS = @MCA_pmix_pif_DSO_COMPONENTS@
+MCA_pmix_pif_DSO_SUBDIRS = @MCA_pmix_pif_DSO_SUBDIRS@
+MCA_pmix_pif_STATIC_COMPONENTS = @MCA_pmix_pif_STATIC_COMPONENTS@
+MCA_pmix_pif_STATIC_LTLIBS = @MCA_pmix_pif_STATIC_LTLIBS@
+MCA_pmix_pif_STATIC_SUBDIRS = @MCA_pmix_pif_STATIC_SUBDIRS@
+MCA_pmix_pinstalldirs_ALL_COMPONENTS = @MCA_pmix_pinstalldirs_ALL_COMPONENTS@
+MCA_pmix_pinstalldirs_ALL_SUBDIRS = @MCA_pmix_pinstalldirs_ALL_SUBDIRS@
+MCA_pmix_pinstalldirs_DSO_COMPONENTS = @MCA_pmix_pinstalldirs_DSO_COMPONENTS@
+MCA_pmix_pinstalldirs_DSO_SUBDIRS = @MCA_pmix_pinstalldirs_DSO_SUBDIRS@
+MCA_pmix_pinstalldirs_STATIC_COMPONENTS = @MCA_pmix_pinstalldirs_STATIC_COMPONENTS@
+MCA_pmix_pinstalldirs_STATIC_LTLIBS = @MCA_pmix_pinstalldirs_STATIC_LTLIBS@
+MCA_pmix_pinstalldirs_STATIC_SUBDIRS = @MCA_pmix_pinstalldirs_STATIC_SUBDIRS@
+MCA_pmix_pnet_ALL_COMPONENTS = @MCA_pmix_pnet_ALL_COMPONENTS@
+MCA_pmix_pnet_ALL_SUBDIRS = @MCA_pmix_pnet_ALL_SUBDIRS@
+MCA_pmix_pnet_DSO_COMPONENTS = @MCA_pmix_pnet_DSO_COMPONENTS@
+MCA_pmix_pnet_DSO_SUBDIRS = @MCA_pmix_pnet_DSO_SUBDIRS@
+MCA_pmix_pnet_STATIC_COMPONENTS = @MCA_pmix_pnet_STATIC_COMPONENTS@
+MCA_pmix_pnet_STATIC_LTLIBS = @MCA_pmix_pnet_STATIC_LTLIBS@
+MCA_pmix_pnet_STATIC_SUBDIRS = @MCA_pmix_pnet_STATIC_SUBDIRS@
+MCA_pmix_psec_ALL_COMPONENTS = @MCA_pmix_psec_ALL_COMPONENTS@
+MCA_pmix_psec_ALL_SUBDIRS = @MCA_pmix_psec_ALL_SUBDIRS@
+MCA_pmix_psec_DSO_COMPONENTS = @MCA_pmix_psec_DSO_COMPONENTS@
+MCA_pmix_psec_DSO_SUBDIRS = @MCA_pmix_psec_DSO_SUBDIRS@
+MCA_pmix_psec_STATIC_COMPONENTS = @MCA_pmix_psec_STATIC_COMPONENTS@
+MCA_pmix_psec_STATIC_LTLIBS = @MCA_pmix_psec_STATIC_LTLIBS@
+MCA_pmix_psec_STATIC_SUBDIRS = @MCA_pmix_psec_STATIC_SUBDIRS@
+MCA_pmix_psensor_ALL_COMPONENTS = @MCA_pmix_psensor_ALL_COMPONENTS@
+MCA_pmix_psensor_ALL_SUBDIRS = @MCA_pmix_psensor_ALL_SUBDIRS@
+MCA_pmix_psensor_DSO_COMPONENTS = @MCA_pmix_psensor_DSO_COMPONENTS@
+MCA_pmix_psensor_DSO_SUBDIRS = @MCA_pmix_psensor_DSO_SUBDIRS@
+MCA_pmix_psensor_STATIC_COMPONENTS = @MCA_pmix_psensor_STATIC_COMPONENTS@
+MCA_pmix_psensor_STATIC_LTLIBS = @MCA_pmix_psensor_STATIC_LTLIBS@
+MCA_pmix_psensor_STATIC_SUBDIRS = @MCA_pmix_psensor_STATIC_SUBDIRS@
+MCA_pmix_ptl_ALL_COMPONENTS = @MCA_pmix_ptl_ALL_COMPONENTS@
+MCA_pmix_ptl_ALL_SUBDIRS = @MCA_pmix_ptl_ALL_SUBDIRS@
+MCA_pmix_ptl_DSO_COMPONENTS = @MCA_pmix_ptl_DSO_COMPONENTS@
+MCA_pmix_ptl_DSO_SUBDIRS = @MCA_pmix_ptl_DSO_SUBDIRS@
+MCA_pmix_ptl_STATIC_COMPONENTS = @MCA_pmix_ptl_STATIC_COMPONENTS@
+MCA_pmix_ptl_STATIC_LTLIBS = @MCA_pmix_ptl_STATIC_LTLIBS@
+MCA_pmix_ptl_STATIC_SUBDIRS = @MCA_pmix_ptl_STATIC_SUBDIRS@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PMIX_ASM_GSYM = @PMIX_ASM_GSYM@
+PMIX_ASM_LSYM = @PMIX_ASM_LSYM@
+PMIX_ASM_SUPPORT_64BIT = @PMIX_ASM_SUPPORT_64BIT@
+PMIX_ASM_TEXT = @PMIX_ASM_TEXT@
+PMIX_ASM_TYPE = @PMIX_ASM_TYPE@
+PMIX_ASSEMBLY_ARCH = @PMIX_ASSEMBLY_ARCH@
+PMIX_ASSEMBLY_BUILTIN = @PMIX_ASSEMBLY_BUILTIN@
+PMIX_ASSEMBLY_FORMAT = @PMIX_ASSEMBLY_FORMAT@
+PMIX_AS_GLOBAL = @PMIX_AS_GLOBAL@
+PMIX_AS_LABEL_SUFFIX = @PMIX_AS_LABEL_SUFFIX@
+PMIX_CC_ABSOLUTE = @PMIX_CC_ABSOLUTE@
+PMIX_CONFIGURE_DATE = @PMIX_CONFIGURE_DATE@
+PMIX_CONFIGURE_HOST = @PMIX_CONFIGURE_HOST@
+PMIX_CONFIGURE_USER = @PMIX_CONFIGURE_USER@
+PMIX_EMBEDDED_CPPFLAGS = @PMIX_EMBEDDED_CPPFLAGS@
+PMIX_EMBEDDED_LDFLAGS = @PMIX_EMBEDDED_LDFLAGS@
+PMIX_EMBEDDED_LIBS = @PMIX_EMBEDDED_LIBS@
+PMIX_MAJOR_VERSION = @PMIX_MAJOR_VERSION@
+PMIX_MINOR_VERSION = @PMIX_MINOR_VERSION@
+PMIX_RELEASE_DATE = @PMIX_RELEASE_DATE@
+PMIX_RELEASE_VERSION = @PMIX_RELEASE_VERSION@
+PMIX_RENAME = @PMIX_RENAME@
+PMIX_VERSION = @PMIX_VERSION@
+PMIX_top_builddir = @PMIX_top_builddir@
+PMIX_top_srcdir = @PMIX_top_srcdir@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_prefix_program = @ac_prefix_program@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+libpmix_so_version = @libpmix_so_version@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pmix_have_pandoc = @pmix_have_pandoc@
+pmix_pdl_pdlopen_LIBS = @pmix_pdl_pdlopen_LIBS@
+pmix_pdl_plibltdl_CPPFLAGS = @pmix_pdl_plibltdl_CPPFLAGS@
+pmix_pdl_plibltdl_LDFLAGS = @pmix_pdl_plibltdl_LDFLAGS@
+pmix_pdl_plibltdl_LIBS = @pmix_pdl_plibltdl_LIBS@
+pmixdatadir = @pmixdatadir@
+pmixincludedir = @pmixincludedir@
+pmixlibdir = @pmixlibdir@
+pmixmajor = @pmixmajor@
+pmixminor = @pmixminor@
+pnet_opa_CFLAGS = @pnet_opa_CFLAGS@
+pnet_opa_CPPFLAGS = @pnet_opa_CPPFLAGS@
+pnet_opa_LDFLAGS = @pnet_opa_LDFLAGS@
+pnet_opa_LIBS = @pnet_opa_LIBS@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+psec_munge_CPPFLAGS = @psec_munge_CPPFLAGS@
+psec_munge_LDFLAGS = @psec_munge_LDFLAGS@
+psec_munge_LIBS = @psec_munge_LIBS@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+sources = \
+        pdl_libltdl.h \
+        pdl_libltdl_component.c \
+        pdl_libltdl_module.c
+
+
+# This component will only ever be built statically -- never as a DSO.
+noinst_LTLIBRARIES = libmca_pdl_plibltdl.la
+libmca_pdl_plibltdl_la_SOURCES = $(sources)
+libmca_pdl_plibltdl_la_CPPFLAGS = $(pmix_pdl_plibltdl_CPPFLAGS)
+libmca_pdl_plibltdl_la_LDFLAGS = \
+        $(pmix_pdl_plibltdl_LDFLAGS) \
+        -module -avoid-version
+
+libmca_pdl_plibltdl_la_LIBADD = $(pmix_pdl_plibltdl_LIBS)
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/mca/pdl/plibltdl/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/mca/pdl/plibltdl/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_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}; \
+	}
+
+libmca_pdl_plibltdl.la: $(libmca_pdl_plibltdl_la_OBJECTS) $(libmca_pdl_plibltdl_la_DEPENDENCIES) $(EXTRA_libmca_pdl_plibltdl_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(libmca_pdl_plibltdl_la_LINK)  $(libmca_pdl_plibltdl_la_OBJECTS) $(libmca_pdl_plibltdl_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmca_pdl_plibltdl_la-pdl_libltdl_component.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmca_pdl_plibltdl_la-pdl_libltdl_module.Plo at am__quote@
+
+.c.o:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+ at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+libmca_pdl_plibltdl_la-pdl_libltdl_component.lo: pdl_libltdl_component.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmca_pdl_plibltdl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmca_pdl_plibltdl_la-pdl_libltdl_component.lo -MD -MP -MF $(DEPDIR)/libmca_pdl_plibltdl_la-pdl_libltdl_component.Tpo -c -o libmca_pdl_plibltdl_la-pdl_libltdl_component.lo `test -f 'pdl_libltdl_component.c' || echo '$(srcdir)/'`pdl_libltdl_component.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmca_pdl_plibltdl_la-pdl_libltdl_component.Tpo $(DEPDIR)/libmca_pdl_plibltdl_la-pdl_libltdl_component.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='pdl_libltdl_component.c' object='libmca_pdl_plibltdl_la-pdl_libltdl_component.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmca_pdl_plibltdl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmca_pdl_plibltdl_la-pdl_libltdl_component.lo `test -f 'pdl_libltdl_component.c' || echo '$(srcdir)/'`pdl_libltdl_component.c
+
+libmca_pdl_plibltdl_la-pdl_libltdl_module.lo: pdl_libltdl_module.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmca_pdl_plibltdl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmca_pdl_plibltdl_la-pdl_libltdl_module.lo -MD -MP -MF $(DEPDIR)/libmca_pdl_plibltdl_la-pdl_libltdl_module.Tpo -c -o libmca_pdl_plibltdl_la-pdl_libltdl_module.lo `test -f 'pdl_libltdl_module.c' || echo '$(srcdir)/'`pdl_libltdl_module.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmca_pdl_plibltdl_la-pdl_libltdl_module.Tpo $(DEPDIR)/libmca_pdl_plibltdl_la-pdl_libltdl_module.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='pdl_libltdl_module.c' object='libmca_pdl_plibltdl_la-pdl_libltdl_module.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmca_pdl_plibltdl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmca_pdl_plibltdl_la-pdl_libltdl_module.lo `test -f 'pdl_libltdl_module.c' || echo '$(srcdir)/'`pdl_libltdl_module.c
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstLTLIBRARIES 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-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
+
+.PRECIOUS: Makefile
+
+
+# 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/mca/pdl/plibltdl/configure.m4 b/src/mca/pdl/plibltdl/configure.m4
new file mode 100644
index 0000000..eb31835
--- /dev/null
+++ b/src/mca/pdl/plibltdl/configure.m4
@@ -0,0 +1,124 @@
+# -*- shell-script -*-
+#
+# Copyright (c) 2009-2015 Cisco Systems, Inc.  All rights reserved.
+#
+# Copyright (c) 2017      Intel, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+AC_DEFUN([MCA_pmix_pdl_plibltdl_PRIORITY], [50])
+
+#
+# Force this component to compile in static-only mode
+#
+AC_DEFUN([MCA_pmix_pdl_plibltdl_COMPILE_MODE], [
+    AC_MSG_CHECKING([for MCA component $1:$2 compile mode])
+    $3="static"
+    AC_MSG_RESULT([$$3])
+])
+
+# MCA_pmix_pdl_plibltdl_POST_CONFIG()
+# ---------------------------------
+AC_DEFUN([MCA_pmix_pdl_plibltdl_POST_CONFIG],[
+    # If we won, then do all the rest of the setup
+    AS_IF([test "$1" = "1"],
+          [
+           # Add some stuff to CPPFLAGS so that the rest of the source
+           # tree can be built
+           LDFLAGS="$LDFLAGS $pmix_pdl_plibltdl_ADD_LDFLAGS"
+           LIBS="$LIBS $pmix_pdl_plibltdl_ADD_LIBS"
+          ])
+])dnl
+
+# MCA_dl_plibltdl_CONFIG([action-if-can-compile],
+#                       [action-if-cant-compile])
+# ------------------------------------------------
+AC_DEFUN([MCA_pmix_pdl_plibltdl_CONFIG],[
+    PMIX_VAR_SCOPE_PUSH([CPPFLAGS_save LDFLAGS_save LIBS_save])
+    AC_CONFIG_FILES([src/mca/pdl/plibltdl/Makefile])
+
+    # Add --with options
+    AC_ARG_WITH([plibltdl],
+        [AC_HELP_STRING([--with-libltdl(=DIR)],
+             [Build libltdl support, optionally adding DIR/include, DIR/lib, and DIR/lib64 to the search path for headers and libraries])])
+    AC_ARG_WITH([libltdl-libdir],
+       [AC_HELP_STRING([--with-libltdl-libdir=DIR],
+             [Search for libltdl libraries in DIR])])
+
+    # Sanity check the --with values
+    PMIX_CHECK_WITHDIR([plibltdl], [$with_libltdl],
+                       [include/ltdl.h])
+    PMIX_CHECK_WITHDIR([plibltdl-libdir], [$with_libltdl_libdir],
+                       [libltdl.*])
+
+    # Defaults
+    pmix_check_plibltdl_dir_msg="compiler default"
+    pmix_check_plibltdl_libdir_msg="linker default"
+
+    # Save directory names if supplied
+    AS_IF([test ! -z "$with_libltdl" && test "$with_libltdl" != "yes"],
+          [pmix_check_plibltdl_dir=$with_libltdl
+           pmix_check_plibltdl_dir_msg="$pmix_check_plibltdl_dir (from --with-libltdl)"])
+    AS_IF([test ! -z "$with_libltdl_libdir" && test "$with_libltdl_libdir" != "yes"],
+          [pmix_check_plibltdl_libdir=$with_libltdl_libdir
+           pmix_check_plibltdl_libdir_msg="$pmix_check_plibltdl_libdir (from --with-libltdl-libdir)"])
+
+    pmix_pdl_plibltdl_happy=no
+    AS_IF([test "$with_plibltdl" != "no"],
+          [AC_MSG_CHECKING([for libltdl dir])
+           AC_MSG_RESULT([$pmix_check_plibltdl_dir_msg])
+           AC_MSG_CHECKING([for libltdl library dir])
+           AC_MSG_RESULT([$pmix_check_plibltdl_libdir_msg])
+
+           PMIX_CHECK_PACKAGE([pmix_pdl_plibltdl],
+                  [ltdl.h],
+                  [ltdl],
+                  [lt_dlopen],
+                  [],
+                  [$pmix_check_plibltdl_dir],
+                  [$pmix_check_plibltdl_libdir],
+                  [pmix_pdl_plibltdl_happy=yes],
+                  [pmix_pdl_plibltdl_happy=no])
+              ])
+
+    # If we have plibltdl, do we have lt_dladvise?
+    pmix_pdl_plibltdl_have_lt_dladvise=0
+    AS_IF([test "$pmix_pdl_plibltdl_happy" = "yes"],
+          [CPPFLAGS_save=$CPPFLAGS
+           LDFLAGS_save=$LDFLAGS
+           LIBS_save=$LIBS
+
+           CPPFLAGS="$pmix_pdl_plibltdl_CPPFLAGS $CPPFLAGS"
+           LDFLAGS="$pmix_pdl_plibltdl_LDFLAGS $LDFLAGS"
+           LIBS="$pmix_pdl_plibltdl_LIBS $LIBS"
+           AC_CHECK_FUNC([lt_dladvise_init],
+                         [pmix_pdl_plibltdl_have_lt_dladvise=1])
+           CPPFLAGS=$CPPFLAGS_save
+           LDFLAGS=$LDFLAGS_save
+           LIBS=$LIBS_save
+          ])
+    AC_DEFINE_UNQUOTED(PMIX_PDL_PLIBLTDL_HAVE_LT_DLADVISE,
+        [$pmix_pdl_plibltdl_have_lt_dladvise],
+        [Whether we have lt_dladvise or not])
+
+    AS_IF([test "$pmix_pdl_plibltdl_happy" = "yes"],
+          [pmix_pdl_plibltdl_ADD_CPPFLAGS=$pmix_pdl_plibltdl_CPPFLAGS
+           pmix_pdl_plibltdl_ADD_LDFLAGS=$pmix_pdl_plibltdl_LDFLAGS
+           pmix_pdl_plibltdl_ADD_LIBS=$pmix_pdl_plibltdl_LIBS
+           $1],
+          [AS_IF([test ! -z "$with_libltdl" && \
+                  test "$with_libltdl" != "no"],
+                 [AC_MSG_WARN([libltdl support requested (via --with-libltdl) but not found.])
+                  AC_MSG_ERROR([Cannot continue.])])
+           $2])
+
+    AC_SUBST(pmix_pdl_plibltdl_CPPFLAGS)
+    AC_SUBST(pmix_pdl_plibltdl_LDFLAGS)
+    AC_SUBST(pmix_pdl_plibltdl_LIBS)
+
+    PMIX_VAR_SCOPE_POP
+])
diff --git a/src/mca/pdl/plibltdl/pdl_libltdl.h b/src/mca/pdl/plibltdl/pdl_libltdl.h
new file mode 100644
index 0000000..65281f0
--- /dev/null
+++ b/src/mca/pdl/plibltdl/pdl_libltdl.h
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2015 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2017      Intel, Inc.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#ifndef PMIX_DL_LIBLTDL
+#define PMIX_DL_LIBLTDL
+
+#include "pmix_config.h"
+
+#include "pmix/mca/dl/dl.h"
+
+#include <ltdl.h>
+
+
+PMIX_DECLSPEC extern pmix_pdl_base_module_t pmix_pdl_plibltpdl_module;
+
+/*
+ * Dynamic library handles generated by this component.
+ *
+ * If we're debugging, keep a copy of the name of the file we've opened.
+ */
+struct pmix_pdl_handle_t {
+    lt_dlhandle ltpdl_handle;
+#if PMIX_ENABLE_DEBUG
+    char *filename;
+#endif
+};
+
+typedef struct {
+    pmix_pdl_base_component_t base;
+
+#if PMIX_DL_LIBLTDL_HAVE_LT_DLADVISE
+    /* If the version of plibltdl that we are compiling against has
+       lt_dladvise, use it to support opening DSOs in a variety of
+       modes. */
+    lt_dladvise advise_private_noext;
+    lt_dladvise advise_private_ext;
+    lt_dladvise advise_public_noext;
+    lt_dladvise advise_public_ext;
+#endif
+} pmix_pdl_plibltpdl_component_t;
+
+PMIX_DECLSPEC extern pmix_pdl_plibltpdl_component_t mca_pdl_plibltpdl_component;
+
+#endif /* PMIX_DL_LIBLTDL */
diff --git a/src/mca/pdl/plibltdl/pdl_libltdl_component.c b/src/mca/pdl/plibltdl/pdl_libltdl_component.c
new file mode 100644
index 0000000..6b1fd02
--- /dev/null
+++ b/src/mca/pdl/plibltdl/pdl_libltdl_component.c
@@ -0,0 +1,158 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2015       Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2015       Los Alamos National Security, Inc.  All rights
+ *                          reserved.
+ * Copyright (c) 2017      Intel, Inc.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include "pmix_config.h"
+
+#include "pmix_common.h"
+#include "pmix/mca/pdl/pdl.h"
+#include "pmix/mca/base/pmix_mca_base_var.h"
+#include "pmix/util/argv.h"
+
+#include "pdl_libltdl.h"
+
+
+/*
+ * Public string showing the sysinfo ompi_linux component version number
+ */
+const char *pmix_pdl_plibltpdl_component_version_string =
+    "PMIX pdl plibltdl MCA component version " PMIX_VERSION;
+
+
+/*
+ * Local functions
+ */
+static int plibltpdl_component_register(void);
+static int plibltpdl_component_open(void);
+static int plibltpdl_component_close(void);
+static int plibltpdl_component_query(mca_base_module_t **module, int *priority);
+
+/*
+ * Instantiate the public struct with all of our public information
+ * and pointers to our public functions in it
+ */
+
+pmix_pdl_plibltpdl_component_t mca_pdl_plibltpdl_component = {
+
+    /* Fill in the mca_pdl_base_component_t */
+    .base = {
+
+        /* First, the mca_component_t struct containing meta information
+           about the component itself */
+        .base_version = {
+            PMIX_DL_BASE_VERSION_1_0_0,
+
+            /* Component name and version */
+            .mca_component_name = "plibltdl",
+            MCA_BASE_MAKE_VERSION(component, PMIX_MAJOR_VERSION, PMIX_MINOR_VERSION,
+                                  PMIX_RELEASE_VERSION),
+
+            /* Component functions */
+            .mca_register_component_params = plibltpdl_component_register,
+            .mca_open_component = plibltpdl_component_open,
+            .mca_close_component = plibltpdl_component_close,
+            .mca_query_component = plibltpdl_component_query,
+        },
+
+        .base_data = {
+            /* The component is checkpoint ready */
+            MCA_BASE_METADATA_PARAM_CHECKPOINT
+        },
+
+        /* The dl framework members */
+        .priority = 50
+    }
+
+    /* Now fill in the plibltdl component-specific members */
+};
+
+
+static int plibltpdl_component_register(void)
+{
+    /* Register an info param indicating whether we have lt_dladvise
+       support or not */
+    bool supported = PMIX_INT_TO_BOOL(PMIX_DL_LIBLTDL_HAVE_LT_DLADVISE);
+    mca_base_component_var_register(&mca_pdl_plibltpdl_component.base.base_version,
+                                    "have_lt_dladvise",
+                                    "Whether the version of plibltdl that this component is built against supports lt_dladvise functionality or not",
+                                    MCA_BASE_VAR_TYPE_BOOL,
+                                    NULL,
+                                    0,
+                                    MCA_BASE_VAR_FLAG_DEFAULT_ONLY,
+                                    PMIX_INFO_LVL_7,
+                                    MCA_BASE_VAR_SCOPE_CONSTANT,
+                                    &supported);
+
+    return PMIX_SUCCESS;
+}
+
+static int plibltpdl_component_open(void)
+{
+    if (lt_dlinit()) {
+        return PMIX_ERROR;
+    }
+
+#if PMIX_DL_LIBLTDL_HAVE_LT_DLADVISE
+    pmix_pdl_plibltpdl_component_t *c = &mca_pdl_plibltpdl_component;
+
+    if (lt_dladvise_init(&c->advise_private_noext)) {
+        return PMIX_ERR_OUT_OF_RESOURCE;
+    }
+
+    if (lt_dladvise_init(&c->advise_private_ext) ||
+        lt_dladvise_ext(&c->advise_private_ext)) {
+        return PMIX_ERR_OUT_OF_RESOURCE;
+    }
+
+    if (lt_dladvise_init(&c->advise_public_noext) ||
+        lt_dladvise_global(&c->advise_public_noext)) {
+        return PMIX_ERR_OUT_OF_RESOURCE;
+    }
+
+    if (lt_dladvise_init(&c->advise_public_ext) ||
+        lt_dladvise_global(&c->advise_public_ext) ||
+        lt_dladvise_ext(&c->advise_public_ext)) {
+        return PMIX_ERR_OUT_OF_RESOURCE;
+    }
+#endif
+
+    return PMIX_SUCCESS;
+}
+
+
+static int plibltpdl_component_close(void)
+{
+#if PMIX_DL_LIBLTDL_HAVE_LT_DLADVISE
+    pmix_pdl_plibltpdl_component_t *c = &mca_pdl_plibltpdl_component;
+
+    lt_dladvise_destroy(&c->advise_private_noext);
+    lt_dladvise_destroy(&c->advise_private_ext);
+    lt_dladvise_destroy(&c->advise_public_noext);
+    lt_dladvise_destroy(&c->advise_public_ext);
+#endif
+
+    lt_dlexit();
+
+    return PMIX_SUCCESS;
+}
+
+
+static int plibltpdl_component_query(mca_base_module_t **module, int *priority)
+{
+    /* The priority value is somewhat meaningless here; by
+       pmix/mca/dl/configure.m4, there's at most one component
+       available. */
+    *priority = mca_pdl_plibltpdl_component.base.priority;
+    *module = &pmix_pdl_plibltpdl_module.super;
+
+    return PMIX_SUCCESS;
+}
diff --git a/src/mca/pdl/plibltdl/pdl_libltdl_module.c b/src/mca/pdl/plibltdl/pdl_libltdl_module.c
new file mode 100644
index 0000000..4a0f2d1
--- /dev/null
+++ b/src/mca/pdl/plibltdl/pdl_libltdl_module.c
@@ -0,0 +1,134 @@
+/*
+ * Copyright (c) 2015      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2016      IBM Corporation.  All rights reserved.
+ * Copyright (c) 2017      Intel, Inc.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include "pmix_config.h"
+
+#include "pmix/constants.h"
+#include "pmix/mca/pdl/pdl.h"
+
+#include "pdl_libltdl.h"
+
+
+static int plibltpdl_open(const char *fname, bool use_ext, bool private_namespace,
+                          pmix_pdl_handle_t **handle, char **err_msg)
+{
+    assert(handle);
+
+    *handle = NULL;
+    if (NULL != err_msg) {
+        *err_msg = NULL;
+    }
+
+    lt_dlhandle local_handle;
+
+#if PMIX_DL_LIBLTDL_HAVE_LT_DLADVISE
+    pmix_pdl_plibltpdl_component_t *c = &mca_pdl_plibltpdl_component;
+
+    if (use_ext && private_namespace) {
+        local_handle = lt_dlopenadvise(fname, c->advise_private_ext);
+    } else if (use_ext && !private_namespace) {
+        local_handle = lt_dlopenadvise(fname, c->advise_public_ext);
+    } else if (!use_ext && private_namespace) {
+        local_handle = lt_dlopenadvise(fname, c->advise_private_noext);
+    } else if (!use_ext && !private_namespace) {
+        local_handle = lt_dlopenadvise(fname, c->advise_public_noext);
+    }
+#else
+    if (use_ext) {
+        local_handle = lt_dlopenext(fname);
+    } else {
+        local_handle = lt_dlopen(fname);
+    }
+#endif
+
+    if (NULL != local_handle) {
+        *handle = calloc(1, sizeof(pmix_pdl_handle_t));
+        (*handle)->ltpdl_handle = local_handle;
+
+#if PMIX_ENABLE_DEBUG
+        if( NULL != fname ) {
+            (*handle)->filename = strdup(fname);
+        }
+        else {
+            (*handle)->filename = strdup("(null)");
+        }
+#endif
+
+        return PMIX_SUCCESS;
+    }
+
+    if (NULL != err_msg) {
+        *err_msg = (char*) lt_dlerror();
+    }
+    return PMIX_ERROR;
+}
+
+
+static int plibltpdl_lookup(pmix_pdl_handle_t *handle, const char *symbol,
+                            void **ptr, char **err_msg)
+{
+    assert(handle);
+    assert(handle->ltpdl_handle);
+    assert(symbol);
+    assert(ptr);
+
+    if (NULL != err_msg) {
+        *err_msg = NULL;
+    }
+
+    *ptr = lt_dlsym(handle->ltpdl_handle, symbol);
+    if (NULL != *ptr) {
+        return PMIX_SUCCESS;
+    }
+
+    if (NULL != err_msg) {
+        *err_msg = (char*) lt_dlerror();
+    }
+    return PMIX_ERROR;
+}
+
+
+static int plibltpdl_close(pmix_pdl_handle_t *handle)
+{
+    assert(handle);
+
+    int ret;
+    ret = lt_dlclose(handle->ltpdl_handle);
+
+#if PMIX_ENABLE_DEBUG
+    free(handle->filename);
+#endif
+    free(handle);
+
+    return ret;
+}
+
+static int plibltpdl_foreachfile(const char *search_path,
+                                 int (*func)(const char *filename, void *data),
+                                 void *data)
+{
+    assert(search_path);
+    assert(func);
+
+    int ret = lt_dlforeachfile(search_path, func, data);
+    return (0 == ret) ? PMIX_SUCCESS : PMIX_ERROR;
+}
+
+
+/*
+ * Module definition
+ */
+pmix_pdl_base_module_t pmix_pdl_plibltpdl_module = {
+    .open = plibltpdl_open,
+    .lookup = plibltpdl_lookup,
+    .close = plibltpdl_close,
+    .foreachfile = plibltpdl_foreachfile
+};
diff --git a/src/mca/pif/Makefile.am b/src/mca/pif/Makefile.am
new file mode 100644
index 0000000..f444a5c
--- /dev/null
+++ b/src/mca/pif/Makefile.am
@@ -0,0 +1,27 @@
+#
+# Copyright (c) 2010      Cisco Systems, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# main library setup
+noinst_LTLIBRARIES = libmca_pif.la
+libmca_pif_la_SOURCES =
+
+# local files
+headers = pif.h
+libmca_pif_la_SOURCES += $(headers)
+
+# Conditionally install the header files
+if WANT_INSTALL_HEADERS
+pmixdir = $(pmixincludedir)/pmix/mca/pif
+nobase_pmix_HEADERS = $(headers)
+endif
+
+include base/Makefile.am
+
+distclean-local:
+	rm -f base/static-components.h
diff --git a/src/mca/pif/Makefile.in b/src/mca/pif/Makefile.in
new file mode 100644
index 0000000..5cf0a47
--- /dev/null
+++ b/src/mca/pif/Makefile.in
@@ -0,0 +1,861 @@
+# Makefile.in generated by automake 1.15 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+#
+# Copyright (c) 2010      Cisco Systems, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+#
+# Copyright (c) 2010      Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2016      Intel, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+subdir = src/mca/pif
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/config/c_get_alignment.m4 \
+	$(top_srcdir)/config/libtool.m4 \
+	$(top_srcdir)/config/ltoptions.m4 \
+	$(top_srcdir)/config/ltsugar.m4 \
+	$(top_srcdir)/config/ltversion.m4 \
+	$(top_srcdir)/config/lt~obsolete.m4 \
+	$(top_srcdir)/config/pmix.m4 \
+	$(top_srcdir)/config/pmix_check_attributes.m4 \
+	$(top_srcdir)/config/pmix_check_broken_qsort.m4 \
+	$(top_srcdir)/config/pmix_check_compiler_version.m4 \
+	$(top_srcdir)/config/pmix_check_icc.m4 \
+	$(top_srcdir)/config/pmix_check_ident.m4 \
+	$(top_srcdir)/config/pmix_check_lock.m4 \
+	$(top_srcdir)/config/pmix_check_os_flavors.m4 \
+	$(top_srcdir)/config/pmix_check_package.m4 \
+	$(top_srcdir)/config/pmix_check_psm2.m4 \
+	$(top_srcdir)/config/pmix_check_pthread_pids.m4 \
+	$(top_srcdir)/config/pmix_check_vendor.m4 \
+	$(top_srcdir)/config/pmix_check_visibility.m4 \
+	$(top_srcdir)/config/pmix_check_withdir.m4 \
+	$(top_srcdir)/config/pmix_config_asm.m4 \
+	$(top_srcdir)/config/pmix_config_pthreads.m4 \
+	$(top_srcdir)/config/pmix_config_subdir.m4 \
+	$(top_srcdir)/config/pmix_config_subdir_args.m4 \
+	$(top_srcdir)/config/pmix_config_threads.m4 \
+	$(top_srcdir)/config/pmix_ensure_contains_optflags.m4 \
+	$(top_srcdir)/config/pmix_functions.m4 \
+	$(top_srcdir)/config/pmix_load_platform.m4 \
+	$(top_srcdir)/config/pmix_mca.m4 \
+	$(top_srcdir)/config/pmix_search_libs.m4 \
+	$(top_srcdir)/config/pmix_setup_cc.m4 \
+	$(top_srcdir)/config/pmix_setup_libevent.m4 \
+	$(top_srcdir)/config/pmix_setup_zlib.m4 \
+	$(top_srcdir)/config/pmix_try_assemble.m4 \
+	$(top_srcdir)/config/autogen_found_items.m4 \
+	$(top_srcdir)/src/mca/pdl/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/configure.m4 \
+	$(top_srcdir)/src/mca/pdl/pdlopen/configure.m4 \
+	$(top_srcdir)/src/mca/pdl/plibltdl/configure.m4 \
+	$(top_srcdir)/src/mca/pif/bsdx_ipv4/configure.m4 \
+	$(top_srcdir)/src/mca/pif/bsdx_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pif/linux_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pif/posix_ipv4/configure.m4 \
+	$(top_srcdir)/src/mca/pif/solaris_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/config/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/env/configure.m4 \
+	$(top_srcdir)/src/mca/pnet/opa/configure.m4 \
+	$(top_srcdir)/src/mca/psec/munge/configure.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__nobase_pmix_HEADERS_DIST) \
+	$(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/src/include/pmix_config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+libmca_pif_la_LIBADD =
+am__objects_1 =
+am__dirstamp = $(am__leading_dot)dirstamp
+am_libmca_pif_la_OBJECTS = $(am__objects_1) \
+	base/pif_base_components.lo
+libmca_pif_la_OBJECTS = $(am_libmca_pif_la_OBJECTS)
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/src/include
+depcomp = $(SHELL) $(top_srcdir)/./config/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libmca_pif_la_SOURCES)
+DIST_SOURCES = $(libmca_pif_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__nobase_pmix_HEADERS_DIST = pif.h base/base.h
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(pmixdir)"
+HEADERS = $(nobase_pmix_HEADERS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/base/Makefile.am \
+	$(top_srcdir)/./config/depcomp
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CFLAGS = @CFLAGS@
+CLEANFILES = @CLEANFILES@
+CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MCA_PROJECT_SUBDIRS = @MCA_PROJECT_SUBDIRS@
+MCA_pmix_FRAMEWORKS = @MCA_pmix_FRAMEWORKS@
+MCA_pmix_FRAMEWORKS_SUBDIRS = @MCA_pmix_FRAMEWORKS_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS@
+MCA_pmix_FRAMEWORK_LIBS = @MCA_pmix_FRAMEWORK_LIBS@
+MCA_pmix_pdl_ALL_COMPONENTS = @MCA_pmix_pdl_ALL_COMPONENTS@
+MCA_pmix_pdl_ALL_SUBDIRS = @MCA_pmix_pdl_ALL_SUBDIRS@
+MCA_pmix_pdl_DSO_COMPONENTS = @MCA_pmix_pdl_DSO_COMPONENTS@
+MCA_pmix_pdl_DSO_SUBDIRS = @MCA_pmix_pdl_DSO_SUBDIRS@
+MCA_pmix_pdl_STATIC_COMPONENTS = @MCA_pmix_pdl_STATIC_COMPONENTS@
+MCA_pmix_pdl_STATIC_LTLIBS = @MCA_pmix_pdl_STATIC_LTLIBS@
+MCA_pmix_pdl_STATIC_SUBDIRS = @MCA_pmix_pdl_STATIC_SUBDIRS@
+MCA_pmix_pif_ALL_COMPONENTS = @MCA_pmix_pif_ALL_COMPONENTS@
+MCA_pmix_pif_ALL_SUBDIRS = @MCA_pmix_pif_ALL_SUBDIRS@
+MCA_pmix_pif_DSO_COMPONENTS = @MCA_pmix_pif_DSO_COMPONENTS@
+MCA_pmix_pif_DSO_SUBDIRS = @MCA_pmix_pif_DSO_SUBDIRS@
+MCA_pmix_pif_STATIC_COMPONENTS = @MCA_pmix_pif_STATIC_COMPONENTS@
+MCA_pmix_pif_STATIC_LTLIBS = @MCA_pmix_pif_STATIC_LTLIBS@
+MCA_pmix_pif_STATIC_SUBDIRS = @MCA_pmix_pif_STATIC_SUBDIRS@
+MCA_pmix_pinstalldirs_ALL_COMPONENTS = @MCA_pmix_pinstalldirs_ALL_COMPONENTS@
+MCA_pmix_pinstalldirs_ALL_SUBDIRS = @MCA_pmix_pinstalldirs_ALL_SUBDIRS@
+MCA_pmix_pinstalldirs_DSO_COMPONENTS = @MCA_pmix_pinstalldirs_DSO_COMPONENTS@
+MCA_pmix_pinstalldirs_DSO_SUBDIRS = @MCA_pmix_pinstalldirs_DSO_SUBDIRS@
+MCA_pmix_pinstalldirs_STATIC_COMPONENTS = @MCA_pmix_pinstalldirs_STATIC_COMPONENTS@
+MCA_pmix_pinstalldirs_STATIC_LTLIBS = @MCA_pmix_pinstalldirs_STATIC_LTLIBS@
+MCA_pmix_pinstalldirs_STATIC_SUBDIRS = @MCA_pmix_pinstalldirs_STATIC_SUBDIRS@
+MCA_pmix_pnet_ALL_COMPONENTS = @MCA_pmix_pnet_ALL_COMPONENTS@
+MCA_pmix_pnet_ALL_SUBDIRS = @MCA_pmix_pnet_ALL_SUBDIRS@
+MCA_pmix_pnet_DSO_COMPONENTS = @MCA_pmix_pnet_DSO_COMPONENTS@
+MCA_pmix_pnet_DSO_SUBDIRS = @MCA_pmix_pnet_DSO_SUBDIRS@
+MCA_pmix_pnet_STATIC_COMPONENTS = @MCA_pmix_pnet_STATIC_COMPONENTS@
+MCA_pmix_pnet_STATIC_LTLIBS = @MCA_pmix_pnet_STATIC_LTLIBS@
+MCA_pmix_pnet_STATIC_SUBDIRS = @MCA_pmix_pnet_STATIC_SUBDIRS@
+MCA_pmix_psec_ALL_COMPONENTS = @MCA_pmix_psec_ALL_COMPONENTS@
+MCA_pmix_psec_ALL_SUBDIRS = @MCA_pmix_psec_ALL_SUBDIRS@
+MCA_pmix_psec_DSO_COMPONENTS = @MCA_pmix_psec_DSO_COMPONENTS@
+MCA_pmix_psec_DSO_SUBDIRS = @MCA_pmix_psec_DSO_SUBDIRS@
+MCA_pmix_psec_STATIC_COMPONENTS = @MCA_pmix_psec_STATIC_COMPONENTS@
+MCA_pmix_psec_STATIC_LTLIBS = @MCA_pmix_psec_STATIC_LTLIBS@
+MCA_pmix_psec_STATIC_SUBDIRS = @MCA_pmix_psec_STATIC_SUBDIRS@
+MCA_pmix_psensor_ALL_COMPONENTS = @MCA_pmix_psensor_ALL_COMPONENTS@
+MCA_pmix_psensor_ALL_SUBDIRS = @MCA_pmix_psensor_ALL_SUBDIRS@
+MCA_pmix_psensor_DSO_COMPONENTS = @MCA_pmix_psensor_DSO_COMPONENTS@
+MCA_pmix_psensor_DSO_SUBDIRS = @MCA_pmix_psensor_DSO_SUBDIRS@
+MCA_pmix_psensor_STATIC_COMPONENTS = @MCA_pmix_psensor_STATIC_COMPONENTS@
+MCA_pmix_psensor_STATIC_LTLIBS = @MCA_pmix_psensor_STATIC_LTLIBS@
+MCA_pmix_psensor_STATIC_SUBDIRS = @MCA_pmix_psensor_STATIC_SUBDIRS@
+MCA_pmix_ptl_ALL_COMPONENTS = @MCA_pmix_ptl_ALL_COMPONENTS@
+MCA_pmix_ptl_ALL_SUBDIRS = @MCA_pmix_ptl_ALL_SUBDIRS@
+MCA_pmix_ptl_DSO_COMPONENTS = @MCA_pmix_ptl_DSO_COMPONENTS@
+MCA_pmix_ptl_DSO_SUBDIRS = @MCA_pmix_ptl_DSO_SUBDIRS@
+MCA_pmix_ptl_STATIC_COMPONENTS = @MCA_pmix_ptl_STATIC_COMPONENTS@
+MCA_pmix_ptl_STATIC_LTLIBS = @MCA_pmix_ptl_STATIC_LTLIBS@
+MCA_pmix_ptl_STATIC_SUBDIRS = @MCA_pmix_ptl_STATIC_SUBDIRS@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PMIX_ASM_GSYM = @PMIX_ASM_GSYM@
+PMIX_ASM_LSYM = @PMIX_ASM_LSYM@
+PMIX_ASM_SUPPORT_64BIT = @PMIX_ASM_SUPPORT_64BIT@
+PMIX_ASM_TEXT = @PMIX_ASM_TEXT@
+PMIX_ASM_TYPE = @PMIX_ASM_TYPE@
+PMIX_ASSEMBLY_ARCH = @PMIX_ASSEMBLY_ARCH@
+PMIX_ASSEMBLY_BUILTIN = @PMIX_ASSEMBLY_BUILTIN@
+PMIX_ASSEMBLY_FORMAT = @PMIX_ASSEMBLY_FORMAT@
+PMIX_AS_GLOBAL = @PMIX_AS_GLOBAL@
+PMIX_AS_LABEL_SUFFIX = @PMIX_AS_LABEL_SUFFIX@
+PMIX_CC_ABSOLUTE = @PMIX_CC_ABSOLUTE@
+PMIX_CONFIGURE_DATE = @PMIX_CONFIGURE_DATE@
+PMIX_CONFIGURE_HOST = @PMIX_CONFIGURE_HOST@
+PMIX_CONFIGURE_USER = @PMIX_CONFIGURE_USER@
+PMIX_EMBEDDED_CPPFLAGS = @PMIX_EMBEDDED_CPPFLAGS@
+PMIX_EMBEDDED_LDFLAGS = @PMIX_EMBEDDED_LDFLAGS@
+PMIX_EMBEDDED_LIBS = @PMIX_EMBEDDED_LIBS@
+PMIX_MAJOR_VERSION = @PMIX_MAJOR_VERSION@
+PMIX_MINOR_VERSION = @PMIX_MINOR_VERSION@
+PMIX_RELEASE_DATE = @PMIX_RELEASE_DATE@
+PMIX_RELEASE_VERSION = @PMIX_RELEASE_VERSION@
+PMIX_RENAME = @PMIX_RENAME@
+PMIX_VERSION = @PMIX_VERSION@
+PMIX_top_builddir = @PMIX_top_builddir@
+PMIX_top_srcdir = @PMIX_top_srcdir@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_prefix_program = @ac_prefix_program@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+libpmix_so_version = @libpmix_so_version@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pmix_have_pandoc = @pmix_have_pandoc@
+pmix_pdl_pdlopen_LIBS = @pmix_pdl_pdlopen_LIBS@
+pmix_pdl_plibltdl_CPPFLAGS = @pmix_pdl_plibltdl_CPPFLAGS@
+pmix_pdl_plibltdl_LDFLAGS = @pmix_pdl_plibltdl_LDFLAGS@
+pmix_pdl_plibltdl_LIBS = @pmix_pdl_plibltdl_LIBS@
+pmixdatadir = @pmixdatadir@
+pmixincludedir = @pmixincludedir@
+pmixlibdir = @pmixlibdir@
+pmixmajor = @pmixmajor@
+pmixminor = @pmixminor@
+pnet_opa_CFLAGS = @pnet_opa_CFLAGS@
+pnet_opa_CPPFLAGS = @pnet_opa_CPPFLAGS@
+pnet_opa_LDFLAGS = @pnet_opa_LDFLAGS@
+pnet_opa_LIBS = @pnet_opa_LIBS@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+psec_munge_CPPFLAGS = @psec_munge_CPPFLAGS@
+psec_munge_LDFLAGS = @psec_munge_LDFLAGS@
+psec_munge_LIBS = @psec_munge_LIBS@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+
+# main library setup
+noinst_LTLIBRARIES = libmca_pif.la
+libmca_pif_la_SOURCES = $(headers) base/pif_base_components.c
+
+# local files
+headers = pif.h base/base.h
+
+# Conditionally install the header files
+ at WANT_INSTALL_HEADERS_TRUE@pmixdir = $(pmixincludedir)/pmix/mca/pif
+ at WANT_INSTALL_HEADERS_TRUE@nobase_pmix_HEADERS = $(headers)
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/base/Makefile.am $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/mca/pif/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/mca/pif/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+$(srcdir)/base/Makefile.am $(am__empty):
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_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}; \
+	}
+base/$(am__dirstamp):
+	@$(MKDIR_P) base
+	@: > base/$(am__dirstamp)
+base/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) base/$(DEPDIR)
+	@: > base/$(DEPDIR)/$(am__dirstamp)
+base/pif_base_components.lo: base/$(am__dirstamp) \
+	base/$(DEPDIR)/$(am__dirstamp)
+
+libmca_pif.la: $(libmca_pif_la_OBJECTS) $(libmca_pif_la_DEPENDENCIES) $(EXTRA_libmca_pif_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(LINK)  $(libmca_pif_la_OBJECTS) $(libmca_pif_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+	-rm -f base/*.$(OBJEXT)
+	-rm -f base/*.lo
+
+distclean-compile:
+	-rm -f *.tab.c
+
+ at AMDEP_TRUE@@am__include@ @am__quote at base/$(DEPDIR)/pif_base_components.Plo at am__quote@
+
+.c.o:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+ at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+	-rm -rf base/.libs base/_libs
+install-nobase_pmixHEADERS: $(nobase_pmix_HEADERS)
+	@$(NORMAL_INSTALL)
+	@list='$(nobase_pmix_HEADERS)'; test -n "$(pmixdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(pmixdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(pmixdir)" || exit 1; \
+	fi; \
+	$(am__nobase_list) | while read dir files; do \
+	  xfiles=; for file in $$files; do \
+	    if test -f "$$file"; then xfiles="$$xfiles $$file"; \
+	    else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \
+	  test -z "$$xfiles" || { \
+	    test "x$$dir" = x. || { \
+	      echo " $(MKDIR_P) '$(DESTDIR)$(pmixdir)/$$dir'"; \
+	      $(MKDIR_P) "$(DESTDIR)$(pmixdir)/$$dir"; }; \
+	    echo " $(INSTALL_HEADER) $$xfiles '$(DESTDIR)$(pmixdir)/$$dir'"; \
+	    $(INSTALL_HEADER) $$xfiles "$(DESTDIR)$(pmixdir)/$$dir" || exit $$?; }; \
+	done
+
+uninstall-nobase_pmixHEADERS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(nobase_pmix_HEADERS)'; test -n "$(pmixdir)" || list=; \
+	$(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \
+	dir='$(DESTDIR)$(pmixdir)'; $(am__uninstall_files_from_dir)
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES) $(HEADERS)
+installdirs:
+	for dir in "$(DESTDIR)$(pmixdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+	-rm -f base/$(DEPDIR)/$(am__dirstamp)
+	-rm -f base/$(am__dirstamp)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf base/$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-local distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-nobase_pmixHEADERS
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf base/$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-nobase_pmixHEADERS
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-local 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-nobase_pmixHEADERS install-pdf install-pdf-am \
+	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-nobase_pmixHEADERS
+
+.PRECIOUS: Makefile
+
+
+distclean-local:
+	rm -f base/static-components.h
+
+# 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/mca/pif/base/Makefile.am b/src/mca/pif/base/Makefile.am
new file mode 100644
index 0000000..7bd00a4
--- /dev/null
+++ b/src/mca/pif/base/Makefile.am
@@ -0,0 +1,15 @@
+#
+# Copyright (c) 2010      Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2016      Intel, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+headers += \
+        base/base.h
+
+libmca_pif_la_SOURCES += \
+        base/pif_base_components.c
diff --git a/src/mca/pif/base/base.h b/src/mca/pif/base/base.h
new file mode 100644
index 0000000..e219a06
--- /dev/null
+++ b/src/mca/pif/base/base.h
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2010      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2016      Intel, Inc.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ *
+ */
+
+#ifndef PMIX_PIF_BASE_H
+#define PMIX_PIF_BASE_H
+
+#include "pmix_config.h"
+
+#include "src/mca/base/pmix_mca_base_framework.h"
+
+#include "src/mca/pif/pif.h"
+
+BEGIN_C_DECLS
+
+/*
+ * Framework declaration
+ */
+PMIX_EXPORT extern pmix_mca_base_framework_t pmix_pif_base_framework;
+
+END_C_DECLS
+
+#endif /* PMIX_BASE_PIF_H */
diff --git a/src/mca/pif/base/pif_base_components.c b/src/mca/pif/base/pif_base_components.c
new file mode 100644
index 0000000..803e45c
--- /dev/null
+++ b/src/mca/pif/base/pif_base_components.c
@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) 2010-2013 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2015-2016 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2015-2016 Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ *
+ */
+
+#include "pmix_config.h"
+
+#include "pmix_common.h"
+#include "src/util/output.h"
+#include "src/mca/mca.h"
+#include "src/mca/pif/pif.h"
+#include "src/mca/pif/base/base.h"
+#include "src/mca/pif/base/static-components.h"
+
+/* instantiate the global list of interfaces */
+pmix_list_t pmix_if_list = {{0}};
+bool pmix_if_do_not_resolve = false;
+bool pmix_if_retain_loopback = false;
+
+static int pmix_pif_base_register (pmix_mca_base_register_flag_t flags);
+static int pmix_pif_base_open (pmix_mca_base_open_flag_t flags);
+static int pmix_pif_base_close(void);
+static void pmix_pif_construct(pmix_pif_t *obj);
+
+static bool frameopen = false;
+
+/* instance the pmix_pif_t object */
+PMIX_CLASS_INSTANCE(pmix_pif_t, pmix_list_item_t, pmix_pif_construct, NULL);
+
+PMIX_MCA_BASE_FRAMEWORK_DECLARE(pmix, pif, NULL, pmix_pif_base_register, pmix_pif_base_open, pmix_pif_base_close,
+                                mca_pif_base_static_components, 0);
+
+static int pmix_pif_base_register (pmix_mca_base_register_flag_t flags)
+{
+    pmix_if_do_not_resolve = false;
+    (void) pmix_mca_base_framework_var_register (&pmix_pif_base_framework, "do_not_resolve",
+                                                 "If nonzero, do not attempt to resolve interfaces",
+                                                 PMIX_MCA_BASE_VAR_TYPE_BOOL, NULL, 0, PMIX_MCA_BASE_VAR_FLAG_SETTABLE,
+                                                 PMIX_INFO_LVL_9, PMIX_MCA_BASE_VAR_SCOPE_ALL_EQ,
+                                                 &pmix_if_do_not_resolve);
+
+    pmix_if_retain_loopback = false;
+    (void) pmix_mca_base_framework_var_register (&pmix_pif_base_framework, "retain_loopback",
+                                                 "If nonzero, retain loopback interfaces",
+                                                 PMIX_MCA_BASE_VAR_TYPE_BOOL, NULL, 0, PMIX_MCA_BASE_VAR_FLAG_SETTABLE,
+                                                 PMIX_INFO_LVL_9, PMIX_MCA_BASE_VAR_SCOPE_ALL_EQ,
+                                                 &pmix_if_retain_loopback);
+
+    return PMIX_SUCCESS;
+}
+
+
+static int pmix_pif_base_open (pmix_mca_base_open_flag_t flags)
+{
+    if (frameopen) {
+        return PMIX_SUCCESS;
+    }
+    frameopen = true;
+
+    /* setup the global list */
+    PMIX_CONSTRUCT(&pmix_if_list, pmix_list_t);
+
+    return pmix_mca_base_framework_components_open(&pmix_pif_base_framework, flags);
+}
+
+
+static int pmix_pif_base_close(void)
+{
+    pmix_list_item_t *item;
+
+    if (!frameopen) {
+        return PMIX_SUCCESS;
+    }
+    frameopen = false;
+
+    while (NULL != (item = pmix_list_remove_first(&pmix_if_list))) {
+        PMIX_RELEASE(item);
+    }
+    PMIX_DESTRUCT(&pmix_if_list);
+
+    return pmix_mca_base_framework_components_close(&pmix_pif_base_framework, NULL);
+}
+
+static void pmix_pif_construct(pmix_pif_t *obj)
+{
+    memset(obj->if_name, 0, sizeof(obj->if_name));
+    obj->if_index = -1;
+    obj->if_kernel_index = (uint16_t) -1;
+    obj->af_family = PF_UNSPEC;
+    obj->if_flags = 0;
+    obj->if_speed = 0;
+    memset(&obj->if_addr, 0, sizeof(obj->if_addr));
+    obj->if_mask = 0;
+    obj->if_bandwidth = 0;
+    memset(obj->if_mac, 0, sizeof(obj->if_mac));
+    obj->ifmtu = 0;
+}
diff --git a/src/mca/pif/bsdx_ipv4/Makefile.am b/src/mca/pif/bsdx_ipv4/Makefile.am
new file mode 100644
index 0000000..fcc8f2b
--- /dev/null
+++ b/src/mca/pif/bsdx_ipv4/Makefile.am
@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2010      Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2016      Intel, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+noinst_LTLIBRARIES = libmca_pif_bsdx_ipv4.la
+
+libmca_pif_bsdx_ipv4_la_SOURCES = pif_bsdx.c
diff --git a/src/mca/pif/bsdx_ipv4/Makefile.in b/src/mca/pif/bsdx_ipv4/Makefile.in
new file mode 100644
index 0000000..5470057
--- /dev/null
+++ b/src/mca/pif/bsdx_ipv4/Makefile.in
@@ -0,0 +1,762 @@
+# Makefile.in generated by automake 1.15 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+#
+# Copyright (c) 2010      Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2016      Intel, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+subdir = src/mca/pif/bsdx_ipv4
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/config/c_get_alignment.m4 \
+	$(top_srcdir)/config/libtool.m4 \
+	$(top_srcdir)/config/ltoptions.m4 \
+	$(top_srcdir)/config/ltsugar.m4 \
+	$(top_srcdir)/config/ltversion.m4 \
+	$(top_srcdir)/config/lt~obsolete.m4 \
+	$(top_srcdir)/config/pmix.m4 \
+	$(top_srcdir)/config/pmix_check_attributes.m4 \
+	$(top_srcdir)/config/pmix_check_broken_qsort.m4 \
+	$(top_srcdir)/config/pmix_check_compiler_version.m4 \
+	$(top_srcdir)/config/pmix_check_icc.m4 \
+	$(top_srcdir)/config/pmix_check_ident.m4 \
+	$(top_srcdir)/config/pmix_check_lock.m4 \
+	$(top_srcdir)/config/pmix_check_os_flavors.m4 \
+	$(top_srcdir)/config/pmix_check_package.m4 \
+	$(top_srcdir)/config/pmix_check_psm2.m4 \
+	$(top_srcdir)/config/pmix_check_pthread_pids.m4 \
+	$(top_srcdir)/config/pmix_check_vendor.m4 \
+	$(top_srcdir)/config/pmix_check_visibility.m4 \
+	$(top_srcdir)/config/pmix_check_withdir.m4 \
+	$(top_srcdir)/config/pmix_config_asm.m4 \
+	$(top_srcdir)/config/pmix_config_pthreads.m4 \
+	$(top_srcdir)/config/pmix_config_subdir.m4 \
+	$(top_srcdir)/config/pmix_config_subdir_args.m4 \
+	$(top_srcdir)/config/pmix_config_threads.m4 \
+	$(top_srcdir)/config/pmix_ensure_contains_optflags.m4 \
+	$(top_srcdir)/config/pmix_functions.m4 \
+	$(top_srcdir)/config/pmix_load_platform.m4 \
+	$(top_srcdir)/config/pmix_mca.m4 \
+	$(top_srcdir)/config/pmix_search_libs.m4 \
+	$(top_srcdir)/config/pmix_setup_cc.m4 \
+	$(top_srcdir)/config/pmix_setup_libevent.m4 \
+	$(top_srcdir)/config/pmix_setup_zlib.m4 \
+	$(top_srcdir)/config/pmix_try_assemble.m4 \
+	$(top_srcdir)/config/autogen_found_items.m4 \
+	$(top_srcdir)/src/mca/pdl/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/configure.m4 \
+	$(top_srcdir)/src/mca/pdl/pdlopen/configure.m4 \
+	$(top_srcdir)/src/mca/pdl/plibltdl/configure.m4 \
+	$(top_srcdir)/src/mca/pif/bsdx_ipv4/configure.m4 \
+	$(top_srcdir)/src/mca/pif/bsdx_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pif/linux_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pif/posix_ipv4/configure.m4 \
+	$(top_srcdir)/src/mca/pif/solaris_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/config/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/env/configure.m4 \
+	$(top_srcdir)/src/mca/pnet/opa/configure.m4 \
+	$(top_srcdir)/src/mca/psec/munge/configure.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/src/include/pmix_config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+libmca_pif_bsdx_ipv4_la_LIBADD =
+am_libmca_pif_bsdx_ipv4_la_OBJECTS = pif_bsdx.lo
+libmca_pif_bsdx_ipv4_la_OBJECTS =  \
+	$(am_libmca_pif_bsdx_ipv4_la_OBJECTS)
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/src/include
+depcomp = $(SHELL) $(top_srcdir)/./config/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libmca_pif_bsdx_ipv4_la_SOURCES)
+DIST_SOURCES = $(libmca_pif_bsdx_ipv4_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/./config/depcomp
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CFLAGS = @CFLAGS@
+CLEANFILES = @CLEANFILES@
+CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MCA_PROJECT_SUBDIRS = @MCA_PROJECT_SUBDIRS@
+MCA_pmix_FRAMEWORKS = @MCA_pmix_FRAMEWORKS@
+MCA_pmix_FRAMEWORKS_SUBDIRS = @MCA_pmix_FRAMEWORKS_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS@
+MCA_pmix_FRAMEWORK_LIBS = @MCA_pmix_FRAMEWORK_LIBS@
+MCA_pmix_pdl_ALL_COMPONENTS = @MCA_pmix_pdl_ALL_COMPONENTS@
+MCA_pmix_pdl_ALL_SUBDIRS = @MCA_pmix_pdl_ALL_SUBDIRS@
+MCA_pmix_pdl_DSO_COMPONENTS = @MCA_pmix_pdl_DSO_COMPONENTS@
+MCA_pmix_pdl_DSO_SUBDIRS = @MCA_pmix_pdl_DSO_SUBDIRS@
+MCA_pmix_pdl_STATIC_COMPONENTS = @MCA_pmix_pdl_STATIC_COMPONENTS@
+MCA_pmix_pdl_STATIC_LTLIBS = @MCA_pmix_pdl_STATIC_LTLIBS@
+MCA_pmix_pdl_STATIC_SUBDIRS = @MCA_pmix_pdl_STATIC_SUBDIRS@
+MCA_pmix_pif_ALL_COMPONENTS = @MCA_pmix_pif_ALL_COMPONENTS@
+MCA_pmix_pif_ALL_SUBDIRS = @MCA_pmix_pif_ALL_SUBDIRS@
+MCA_pmix_pif_DSO_COMPONENTS = @MCA_pmix_pif_DSO_COMPONENTS@
+MCA_pmix_pif_DSO_SUBDIRS = @MCA_pmix_pif_DSO_SUBDIRS@
+MCA_pmix_pif_STATIC_COMPONENTS = @MCA_pmix_pif_STATIC_COMPONENTS@
+MCA_pmix_pif_STATIC_LTLIBS = @MCA_pmix_pif_STATIC_LTLIBS@
+MCA_pmix_pif_STATIC_SUBDIRS = @MCA_pmix_pif_STATIC_SUBDIRS@
+MCA_pmix_pinstalldirs_ALL_COMPONENTS = @MCA_pmix_pinstalldirs_ALL_COMPONENTS@
+MCA_pmix_pinstalldirs_ALL_SUBDIRS = @MCA_pmix_pinstalldirs_ALL_SUBDIRS@
+MCA_pmix_pinstalldirs_DSO_COMPONENTS = @MCA_pmix_pinstalldirs_DSO_COMPONENTS@
+MCA_pmix_pinstalldirs_DSO_SUBDIRS = @MCA_pmix_pinstalldirs_DSO_SUBDIRS@
+MCA_pmix_pinstalldirs_STATIC_COMPONENTS = @MCA_pmix_pinstalldirs_STATIC_COMPONENTS@
+MCA_pmix_pinstalldirs_STATIC_LTLIBS = @MCA_pmix_pinstalldirs_STATIC_LTLIBS@
+MCA_pmix_pinstalldirs_STATIC_SUBDIRS = @MCA_pmix_pinstalldirs_STATIC_SUBDIRS@
+MCA_pmix_pnet_ALL_COMPONENTS = @MCA_pmix_pnet_ALL_COMPONENTS@
+MCA_pmix_pnet_ALL_SUBDIRS = @MCA_pmix_pnet_ALL_SUBDIRS@
+MCA_pmix_pnet_DSO_COMPONENTS = @MCA_pmix_pnet_DSO_COMPONENTS@
+MCA_pmix_pnet_DSO_SUBDIRS = @MCA_pmix_pnet_DSO_SUBDIRS@
+MCA_pmix_pnet_STATIC_COMPONENTS = @MCA_pmix_pnet_STATIC_COMPONENTS@
+MCA_pmix_pnet_STATIC_LTLIBS = @MCA_pmix_pnet_STATIC_LTLIBS@
+MCA_pmix_pnet_STATIC_SUBDIRS = @MCA_pmix_pnet_STATIC_SUBDIRS@
+MCA_pmix_psec_ALL_COMPONENTS = @MCA_pmix_psec_ALL_COMPONENTS@
+MCA_pmix_psec_ALL_SUBDIRS = @MCA_pmix_psec_ALL_SUBDIRS@
+MCA_pmix_psec_DSO_COMPONENTS = @MCA_pmix_psec_DSO_COMPONENTS@
+MCA_pmix_psec_DSO_SUBDIRS = @MCA_pmix_psec_DSO_SUBDIRS@
+MCA_pmix_psec_STATIC_COMPONENTS = @MCA_pmix_psec_STATIC_COMPONENTS@
+MCA_pmix_psec_STATIC_LTLIBS = @MCA_pmix_psec_STATIC_LTLIBS@
+MCA_pmix_psec_STATIC_SUBDIRS = @MCA_pmix_psec_STATIC_SUBDIRS@
+MCA_pmix_psensor_ALL_COMPONENTS = @MCA_pmix_psensor_ALL_COMPONENTS@
+MCA_pmix_psensor_ALL_SUBDIRS = @MCA_pmix_psensor_ALL_SUBDIRS@
+MCA_pmix_psensor_DSO_COMPONENTS = @MCA_pmix_psensor_DSO_COMPONENTS@
+MCA_pmix_psensor_DSO_SUBDIRS = @MCA_pmix_psensor_DSO_SUBDIRS@
+MCA_pmix_psensor_STATIC_COMPONENTS = @MCA_pmix_psensor_STATIC_COMPONENTS@
+MCA_pmix_psensor_STATIC_LTLIBS = @MCA_pmix_psensor_STATIC_LTLIBS@
+MCA_pmix_psensor_STATIC_SUBDIRS = @MCA_pmix_psensor_STATIC_SUBDIRS@
+MCA_pmix_ptl_ALL_COMPONENTS = @MCA_pmix_ptl_ALL_COMPONENTS@
+MCA_pmix_ptl_ALL_SUBDIRS = @MCA_pmix_ptl_ALL_SUBDIRS@
+MCA_pmix_ptl_DSO_COMPONENTS = @MCA_pmix_ptl_DSO_COMPONENTS@
+MCA_pmix_ptl_DSO_SUBDIRS = @MCA_pmix_ptl_DSO_SUBDIRS@
+MCA_pmix_ptl_STATIC_COMPONENTS = @MCA_pmix_ptl_STATIC_COMPONENTS@
+MCA_pmix_ptl_STATIC_LTLIBS = @MCA_pmix_ptl_STATIC_LTLIBS@
+MCA_pmix_ptl_STATIC_SUBDIRS = @MCA_pmix_ptl_STATIC_SUBDIRS@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PMIX_ASM_GSYM = @PMIX_ASM_GSYM@
+PMIX_ASM_LSYM = @PMIX_ASM_LSYM@
+PMIX_ASM_SUPPORT_64BIT = @PMIX_ASM_SUPPORT_64BIT@
+PMIX_ASM_TEXT = @PMIX_ASM_TEXT@
+PMIX_ASM_TYPE = @PMIX_ASM_TYPE@
+PMIX_ASSEMBLY_ARCH = @PMIX_ASSEMBLY_ARCH@
+PMIX_ASSEMBLY_BUILTIN = @PMIX_ASSEMBLY_BUILTIN@
+PMIX_ASSEMBLY_FORMAT = @PMIX_ASSEMBLY_FORMAT@
+PMIX_AS_GLOBAL = @PMIX_AS_GLOBAL@
+PMIX_AS_LABEL_SUFFIX = @PMIX_AS_LABEL_SUFFIX@
+PMIX_CC_ABSOLUTE = @PMIX_CC_ABSOLUTE@
+PMIX_CONFIGURE_DATE = @PMIX_CONFIGURE_DATE@
+PMIX_CONFIGURE_HOST = @PMIX_CONFIGURE_HOST@
+PMIX_CONFIGURE_USER = @PMIX_CONFIGURE_USER@
+PMIX_EMBEDDED_CPPFLAGS = @PMIX_EMBEDDED_CPPFLAGS@
+PMIX_EMBEDDED_LDFLAGS = @PMIX_EMBEDDED_LDFLAGS@
+PMIX_EMBEDDED_LIBS = @PMIX_EMBEDDED_LIBS@
+PMIX_MAJOR_VERSION = @PMIX_MAJOR_VERSION@
+PMIX_MINOR_VERSION = @PMIX_MINOR_VERSION@
+PMIX_RELEASE_DATE = @PMIX_RELEASE_DATE@
+PMIX_RELEASE_VERSION = @PMIX_RELEASE_VERSION@
+PMIX_RENAME = @PMIX_RENAME@
+PMIX_VERSION = @PMIX_VERSION@
+PMIX_top_builddir = @PMIX_top_builddir@
+PMIX_top_srcdir = @PMIX_top_srcdir@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_prefix_program = @ac_prefix_program@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+libpmix_so_version = @libpmix_so_version@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pmix_have_pandoc = @pmix_have_pandoc@
+pmix_pdl_pdlopen_LIBS = @pmix_pdl_pdlopen_LIBS@
+pmix_pdl_plibltdl_CPPFLAGS = @pmix_pdl_plibltdl_CPPFLAGS@
+pmix_pdl_plibltdl_LDFLAGS = @pmix_pdl_plibltdl_LDFLAGS@
+pmix_pdl_plibltdl_LIBS = @pmix_pdl_plibltdl_LIBS@
+pmixdatadir = @pmixdatadir@
+pmixincludedir = @pmixincludedir@
+pmixlibdir = @pmixlibdir@
+pmixmajor = @pmixmajor@
+pmixminor = @pmixminor@
+pnet_opa_CFLAGS = @pnet_opa_CFLAGS@
+pnet_opa_CPPFLAGS = @pnet_opa_CPPFLAGS@
+pnet_opa_LDFLAGS = @pnet_opa_LDFLAGS@
+pnet_opa_LIBS = @pnet_opa_LIBS@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+psec_munge_CPPFLAGS = @psec_munge_CPPFLAGS@
+psec_munge_LDFLAGS = @psec_munge_LDFLAGS@
+psec_munge_LIBS = @psec_munge_LIBS@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+noinst_LTLIBRARIES = libmca_pif_bsdx_ipv4.la
+libmca_pif_bsdx_ipv4_la_SOURCES = pif_bsdx.c
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/mca/pif/bsdx_ipv4/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/mca/pif/bsdx_ipv4/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_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}; \
+	}
+
+libmca_pif_bsdx_ipv4.la: $(libmca_pif_bsdx_ipv4_la_OBJECTS) $(libmca_pif_bsdx_ipv4_la_DEPENDENCIES) $(EXTRA_libmca_pif_bsdx_ipv4_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(LINK)  $(libmca_pif_bsdx_ipv4_la_OBJECTS) $(libmca_pif_bsdx_ipv4_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pif_bsdx.Plo at am__quote@
+
+.c.o:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+ at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstLTLIBRARIES 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-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
+
+.PRECIOUS: Makefile
+
+
+# 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/mca/pif/bsdx_ipv4/configure.m4 b/src/mca/pif/bsdx_ipv4/configure.m4
new file mode 100644
index 0000000..6142c80
--- /dev/null
+++ b/src/mca/pif/bsdx_ipv4/configure.m4
@@ -0,0 +1,46 @@
+# -*- shell-script -*-
+#
+# Copyright (c) 2010      Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2015      Research Organization for Information Science
+#                         and Technology (RIST). All rights reserved.
+# Copyright (c) 2016      Intel, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+AC_DEFUN([MCA_pmix_pif_bsdx_ipv4_COMPILE_MODE], [
+    AC_MSG_CHECKING([for MCA component $1:$2 compile mode])
+    $3="static"
+    AC_MSG_RESULT([$$3])
+])
+
+# MCA_pif_config_CONFIG(action-if-can-compile,
+#                      [action-if-cant-compile])
+# ------------------------------------------------
+AC_DEFUN([MCA_pmix_pif_bsdx_ipv4_CONFIG], [
+    AC_CONFIG_FILES([src/mca/pif/bsdx_ipv4/Makefile])
+
+    AC_REQUIRE([PMIX_CHECK_OS_FLAVORS])
+
+    # If we found struct sockaddr and we're on any of the BSDs, we're
+    # happy.  I.e., this:
+    #if defined(__NetBSD__) || defined(__FreeBSD__) || \
+    #    defined(__OpenBSD__) || defined(__DragonFly__)
+    AC_MSG_CHECKING([struct sockaddr])
+    AS_IF([test "$pmix_found_sockaddr" = "yes"],
+          [AC_MSG_RESULT([yes (cached)])
+           AC_MSG_CHECKING([NetBSD, FreeBSD, OpenBSD, or DragonFly])
+           AS_IF([test "$pmix_found_netbsd" = "yes" || \
+                  test "$pmix_found_freebsd" = "yes" || \
+                  test "$pmix_found_openbsd" = "yes" || \
+                  test "$pmix_found_dragonfly" = "yes"],
+                 [AC_MSG_RESULT([yes])
+                  $1],
+                 [AC_MSG_RESULT([no])
+                  $2])],
+          [AC_MSG_RESULT([no (cached)])
+           $2])
+])
diff --git a/src/mca/pif/bsdx_ipv4/pif_bsdx.c b/src/mca/pif/bsdx_ipv4/pif_bsdx.c
new file mode 100644
index 0000000..9157d54
--- /dev/null
+++ b/src/mca/pif/bsdx_ipv4/pif_bsdx.c
@@ -0,0 +1,192 @@
+/*
+ * Copyright (c) 2010      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2010      Oracle and/or its affiliates.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include "pmix_config.h"
+#include "pmix_common.h"
+
+#include <string.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#include <errno.h>
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_SYS_SOCKIO_H
+#include <sys/sockio.h>
+#endif
+#ifdef HAVE_SYS_IOCTL_H
+#include <sys/ioctl.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif
+#ifdef HAVE_NET_IF_H
+#if defined(__APPLE__) && defined(_LP64)
+/* Apple engineering suggested using options align=power as a
+   workaround for a bug in OS X 10.4 (Tiger) that prevented ioctl(...,
+   SIOCGIFCONF, ...) from working properly in 64 bit mode on Power PC.
+   It turns out that the underlying issue is the size of struct
+   ifconf, which the kernel expects to be 12 and natural 64 bit
+   alignment would make 16.  The same bug appears in 64 bit mode on
+   Intel macs, but align=power is a no-op there, so instead, use the
+   pack pragma to instruct the compiler to pack on 4 byte words, which
+   has the same effect as align=power for our needs and works on both
+   Intel and Power PC Macs. */
+#pragma pack(push,4)
+#endif
+#include <net/if.h>
+#if defined(__APPLE__) && defined(_LP64)
+#pragma pack(pop)
+#endif
+#endif
+#ifdef HAVE_NETDB_H
+#include <netdb.h>
+#endif
+#ifdef HAVE_IFADDRS_H
+#include <ifaddrs.h>
+#endif
+
+#include "src/util/output.h"
+#include "src/util/pif.h"
+#include "src/mca/pif/pif.h"
+#include "src/mca/pif/base/base.h"
+
+static int if_bsdx_open(void);
+
+/* Supports specific flavors of BSD:
+ * NetBSD
+ * FreeBSD
+ * OpenBSD
+ * DragonFly
+ */
+pmix_pif_base_component_t mca_pif_bsdx_ipv4_component = {
+    /* First, the mca_component_t struct containing meta information
+       about the component itself */
+    .base = {
+        PMIX_PIF_BASE_VERSION_2_0_0,
+
+        /* Component name and version */
+        "bsdx_ipv4",
+        PMIX_MAJOR_VERSION,
+        PMIX_MINOR_VERSION,
+        PMIX_RELEASE_VERSION,
+
+        /* Component open and close functions */
+        if_bsdx_open,
+        NULL
+    },
+    .data = {
+        /* This component is checkpointable */
+        PMIX_MCA_BASE_METADATA_PARAM_CHECKPOINT
+    },
+};
+
+/* convert a netmask (in network byte order) to CIDR notation */
+static int prefix (uint32_t netmask)
+{
+    uint32_t mask = ntohl(netmask);
+    int plen = 0;
+
+    if (0 == mask) {
+        plen = 32;
+    } else {
+        while ((mask % 2) == 0) {
+            plen += 1;
+            mask /= 2;
+        }
+    }
+
+    return (32 - plen);
+}
+
+/* configure using getifaddrs(3) */
+static int if_bsdx_open(void)
+{
+    struct ifaddrs **ifadd_list;
+    struct ifaddrs *cur_ifaddrs;
+    struct sockaddr_in* sin_addr;
+
+    /*
+     * the manpage claims that getifaddrs() allocates the memory,
+     * and freeifaddrs() is later used to release the allocated memory.
+     * however, without this malloc the call to getifaddrs() segfaults
+     */
+    ifadd_list = (struct ifaddrs **) malloc(sizeof(struct ifaddrs*));
+
+    /* create the linked list of ifaddrs structs */
+    if (getifaddrs(ifadd_list) < 0) {
+        pmix_output(0, "pmix_ifinit: getifaddrs() failed with error=%d\n",
+                    errno);
+        return PMIX_ERROR;
+    }
+
+    for (cur_ifaddrs = *ifadd_list; NULL != cur_ifaddrs;
+         cur_ifaddrs = cur_ifaddrs->ifa_next) {
+        pmix_pif_t *intf;
+        struct in_addr a4;
+
+        /* skip non- af_inet interface addresses */
+        if (AF_INET != cur_ifaddrs->ifa_addr->sa_family) {
+            continue;
+        }
+
+        /* skip interface if it is down (IFF_UP not set) */
+        if (0 == (cur_ifaddrs->ifa_flags & IFF_UP)) {
+            continue;
+        }
+
+        /* skip interface if it is a loopback device (IFF_LOOPBACK set) */
+        if (!pmix_if_retain_loopback && 0 != (cur_ifaddrs->ifa_flags & IFF_LOOPBACK)) {
+            continue;
+        }
+
+        /* or if it is a point-to-point interface */
+        /* TODO: do we really skip p2p? */
+        if (0 != (cur_ifaddrs->ifa_flags & IFF_POINTOPOINT)) {
+            continue;
+        }
+
+        sin_addr = (struct sockaddr_in *) cur_ifaddrs->ifa_addr;
+
+        intf = PMIX_NEW(pmix_pif_t);
+        if (NULL == intf) {
+            pmix_output(0, "pmix_ifinit: unable to allocate %d bytes\n",
+                        (int) sizeof(pmix_pif_t));
+            return PMIX_ERR_OUT_OF_RESOURCE;
+        }
+        intf->af_family = AF_INET;
+
+        /* fill values into the pmix_pif_t */
+        memcpy(&a4, &(sin_addr->sin_addr), sizeof(struct in_addr));
+
+        strncpy(intf->if_name, cur_ifaddrs->ifa_name, IF_NAMESIZE);
+        intf->if_index = pmix_list_get_size(&pmix_if_list) + 1;
+        ((struct sockaddr_in*) &intf->if_addr)->sin_addr = a4;
+        ((struct sockaddr_in*) &intf->if_addr)->sin_family = AF_INET;
+        ((struct sockaddr_in*) &intf->if_addr)->sin_len =  cur_ifaddrs->ifa_addr->sa_len;
+
+        intf->if_mask = prefix( sin_addr->sin_addr.s_addr);
+        intf->if_flags = cur_ifaddrs->ifa_flags;
+
+        intf->if_kernel_index =
+            (uint16_t) if_nametoindex(cur_ifaddrs->ifa_name);
+
+        pmix_list_append(&pmix_if_list, &(intf->super));
+    }   /*  of for loop over ifaddrs list */
+
+    return PMIX_SUCCESS;
+}
diff --git a/src/mca/pif/bsdx_ipv6/Makefile.am b/src/mca/pif/bsdx_ipv6/Makefile.am
new file mode 100644
index 0000000..8772eb3
--- /dev/null
+++ b/src/mca/pif/bsdx_ipv6/Makefile.am
@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2010     Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2016      Intel, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+noinst_LTLIBRARIES = libmca_pif_bsdx_ipv6.la
+
+libmca_pif_bsdx_ipv6_la_SOURCES = pif_bsdx_ipv6.c
diff --git a/src/mca/pif/bsdx_ipv6/Makefile.in b/src/mca/pif/bsdx_ipv6/Makefile.in
new file mode 100644
index 0000000..b96dc59
--- /dev/null
+++ b/src/mca/pif/bsdx_ipv6/Makefile.in
@@ -0,0 +1,762 @@
+# Makefile.in generated by automake 1.15 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+#
+# Copyright (c) 2010     Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2016      Intel, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+subdir = src/mca/pif/bsdx_ipv6
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/config/c_get_alignment.m4 \
+	$(top_srcdir)/config/libtool.m4 \
+	$(top_srcdir)/config/ltoptions.m4 \
+	$(top_srcdir)/config/ltsugar.m4 \
+	$(top_srcdir)/config/ltversion.m4 \
+	$(top_srcdir)/config/lt~obsolete.m4 \
+	$(top_srcdir)/config/pmix.m4 \
+	$(top_srcdir)/config/pmix_check_attributes.m4 \
+	$(top_srcdir)/config/pmix_check_broken_qsort.m4 \
+	$(top_srcdir)/config/pmix_check_compiler_version.m4 \
+	$(top_srcdir)/config/pmix_check_icc.m4 \
+	$(top_srcdir)/config/pmix_check_ident.m4 \
+	$(top_srcdir)/config/pmix_check_lock.m4 \
+	$(top_srcdir)/config/pmix_check_os_flavors.m4 \
+	$(top_srcdir)/config/pmix_check_package.m4 \
+	$(top_srcdir)/config/pmix_check_psm2.m4 \
+	$(top_srcdir)/config/pmix_check_pthread_pids.m4 \
+	$(top_srcdir)/config/pmix_check_vendor.m4 \
+	$(top_srcdir)/config/pmix_check_visibility.m4 \
+	$(top_srcdir)/config/pmix_check_withdir.m4 \
+	$(top_srcdir)/config/pmix_config_asm.m4 \
+	$(top_srcdir)/config/pmix_config_pthreads.m4 \
+	$(top_srcdir)/config/pmix_config_subdir.m4 \
+	$(top_srcdir)/config/pmix_config_subdir_args.m4 \
+	$(top_srcdir)/config/pmix_config_threads.m4 \
+	$(top_srcdir)/config/pmix_ensure_contains_optflags.m4 \
+	$(top_srcdir)/config/pmix_functions.m4 \
+	$(top_srcdir)/config/pmix_load_platform.m4 \
+	$(top_srcdir)/config/pmix_mca.m4 \
+	$(top_srcdir)/config/pmix_search_libs.m4 \
+	$(top_srcdir)/config/pmix_setup_cc.m4 \
+	$(top_srcdir)/config/pmix_setup_libevent.m4 \
+	$(top_srcdir)/config/pmix_setup_zlib.m4 \
+	$(top_srcdir)/config/pmix_try_assemble.m4 \
+	$(top_srcdir)/config/autogen_found_items.m4 \
+	$(top_srcdir)/src/mca/pdl/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/configure.m4 \
+	$(top_srcdir)/src/mca/pdl/pdlopen/configure.m4 \
+	$(top_srcdir)/src/mca/pdl/plibltdl/configure.m4 \
+	$(top_srcdir)/src/mca/pif/bsdx_ipv4/configure.m4 \
+	$(top_srcdir)/src/mca/pif/bsdx_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pif/linux_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pif/posix_ipv4/configure.m4 \
+	$(top_srcdir)/src/mca/pif/solaris_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/config/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/env/configure.m4 \
+	$(top_srcdir)/src/mca/pnet/opa/configure.m4 \
+	$(top_srcdir)/src/mca/psec/munge/configure.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/src/include/pmix_config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+libmca_pif_bsdx_ipv6_la_LIBADD =
+am_libmca_pif_bsdx_ipv6_la_OBJECTS = pif_bsdx_ipv6.lo
+libmca_pif_bsdx_ipv6_la_OBJECTS =  \
+	$(am_libmca_pif_bsdx_ipv6_la_OBJECTS)
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/src/include
+depcomp = $(SHELL) $(top_srcdir)/./config/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libmca_pif_bsdx_ipv6_la_SOURCES)
+DIST_SOURCES = $(libmca_pif_bsdx_ipv6_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/./config/depcomp
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CFLAGS = @CFLAGS@
+CLEANFILES = @CLEANFILES@
+CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MCA_PROJECT_SUBDIRS = @MCA_PROJECT_SUBDIRS@
+MCA_pmix_FRAMEWORKS = @MCA_pmix_FRAMEWORKS@
+MCA_pmix_FRAMEWORKS_SUBDIRS = @MCA_pmix_FRAMEWORKS_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS@
+MCA_pmix_FRAMEWORK_LIBS = @MCA_pmix_FRAMEWORK_LIBS@
+MCA_pmix_pdl_ALL_COMPONENTS = @MCA_pmix_pdl_ALL_COMPONENTS@
+MCA_pmix_pdl_ALL_SUBDIRS = @MCA_pmix_pdl_ALL_SUBDIRS@
+MCA_pmix_pdl_DSO_COMPONENTS = @MCA_pmix_pdl_DSO_COMPONENTS@
+MCA_pmix_pdl_DSO_SUBDIRS = @MCA_pmix_pdl_DSO_SUBDIRS@
+MCA_pmix_pdl_STATIC_COMPONENTS = @MCA_pmix_pdl_STATIC_COMPONENTS@
+MCA_pmix_pdl_STATIC_LTLIBS = @MCA_pmix_pdl_STATIC_LTLIBS@
+MCA_pmix_pdl_STATIC_SUBDIRS = @MCA_pmix_pdl_STATIC_SUBDIRS@
+MCA_pmix_pif_ALL_COMPONENTS = @MCA_pmix_pif_ALL_COMPONENTS@
+MCA_pmix_pif_ALL_SUBDIRS = @MCA_pmix_pif_ALL_SUBDIRS@
+MCA_pmix_pif_DSO_COMPONENTS = @MCA_pmix_pif_DSO_COMPONENTS@
+MCA_pmix_pif_DSO_SUBDIRS = @MCA_pmix_pif_DSO_SUBDIRS@
+MCA_pmix_pif_STATIC_COMPONENTS = @MCA_pmix_pif_STATIC_COMPONENTS@
+MCA_pmix_pif_STATIC_LTLIBS = @MCA_pmix_pif_STATIC_LTLIBS@
+MCA_pmix_pif_STATIC_SUBDIRS = @MCA_pmix_pif_STATIC_SUBDIRS@
+MCA_pmix_pinstalldirs_ALL_COMPONENTS = @MCA_pmix_pinstalldirs_ALL_COMPONENTS@
+MCA_pmix_pinstalldirs_ALL_SUBDIRS = @MCA_pmix_pinstalldirs_ALL_SUBDIRS@
+MCA_pmix_pinstalldirs_DSO_COMPONENTS = @MCA_pmix_pinstalldirs_DSO_COMPONENTS@
+MCA_pmix_pinstalldirs_DSO_SUBDIRS = @MCA_pmix_pinstalldirs_DSO_SUBDIRS@
+MCA_pmix_pinstalldirs_STATIC_COMPONENTS = @MCA_pmix_pinstalldirs_STATIC_COMPONENTS@
+MCA_pmix_pinstalldirs_STATIC_LTLIBS = @MCA_pmix_pinstalldirs_STATIC_LTLIBS@
+MCA_pmix_pinstalldirs_STATIC_SUBDIRS = @MCA_pmix_pinstalldirs_STATIC_SUBDIRS@
+MCA_pmix_pnet_ALL_COMPONENTS = @MCA_pmix_pnet_ALL_COMPONENTS@
+MCA_pmix_pnet_ALL_SUBDIRS = @MCA_pmix_pnet_ALL_SUBDIRS@
+MCA_pmix_pnet_DSO_COMPONENTS = @MCA_pmix_pnet_DSO_COMPONENTS@
+MCA_pmix_pnet_DSO_SUBDIRS = @MCA_pmix_pnet_DSO_SUBDIRS@
+MCA_pmix_pnet_STATIC_COMPONENTS = @MCA_pmix_pnet_STATIC_COMPONENTS@
+MCA_pmix_pnet_STATIC_LTLIBS = @MCA_pmix_pnet_STATIC_LTLIBS@
+MCA_pmix_pnet_STATIC_SUBDIRS = @MCA_pmix_pnet_STATIC_SUBDIRS@
+MCA_pmix_psec_ALL_COMPONENTS = @MCA_pmix_psec_ALL_COMPONENTS@
+MCA_pmix_psec_ALL_SUBDIRS = @MCA_pmix_psec_ALL_SUBDIRS@
+MCA_pmix_psec_DSO_COMPONENTS = @MCA_pmix_psec_DSO_COMPONENTS@
+MCA_pmix_psec_DSO_SUBDIRS = @MCA_pmix_psec_DSO_SUBDIRS@
+MCA_pmix_psec_STATIC_COMPONENTS = @MCA_pmix_psec_STATIC_COMPONENTS@
+MCA_pmix_psec_STATIC_LTLIBS = @MCA_pmix_psec_STATIC_LTLIBS@
+MCA_pmix_psec_STATIC_SUBDIRS = @MCA_pmix_psec_STATIC_SUBDIRS@
+MCA_pmix_psensor_ALL_COMPONENTS = @MCA_pmix_psensor_ALL_COMPONENTS@
+MCA_pmix_psensor_ALL_SUBDIRS = @MCA_pmix_psensor_ALL_SUBDIRS@
+MCA_pmix_psensor_DSO_COMPONENTS = @MCA_pmix_psensor_DSO_COMPONENTS@
+MCA_pmix_psensor_DSO_SUBDIRS = @MCA_pmix_psensor_DSO_SUBDIRS@
+MCA_pmix_psensor_STATIC_COMPONENTS = @MCA_pmix_psensor_STATIC_COMPONENTS@
+MCA_pmix_psensor_STATIC_LTLIBS = @MCA_pmix_psensor_STATIC_LTLIBS@
+MCA_pmix_psensor_STATIC_SUBDIRS = @MCA_pmix_psensor_STATIC_SUBDIRS@
+MCA_pmix_ptl_ALL_COMPONENTS = @MCA_pmix_ptl_ALL_COMPONENTS@
+MCA_pmix_ptl_ALL_SUBDIRS = @MCA_pmix_ptl_ALL_SUBDIRS@
+MCA_pmix_ptl_DSO_COMPONENTS = @MCA_pmix_ptl_DSO_COMPONENTS@
+MCA_pmix_ptl_DSO_SUBDIRS = @MCA_pmix_ptl_DSO_SUBDIRS@
+MCA_pmix_ptl_STATIC_COMPONENTS = @MCA_pmix_ptl_STATIC_COMPONENTS@
+MCA_pmix_ptl_STATIC_LTLIBS = @MCA_pmix_ptl_STATIC_LTLIBS@
+MCA_pmix_ptl_STATIC_SUBDIRS = @MCA_pmix_ptl_STATIC_SUBDIRS@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PMIX_ASM_GSYM = @PMIX_ASM_GSYM@
+PMIX_ASM_LSYM = @PMIX_ASM_LSYM@
+PMIX_ASM_SUPPORT_64BIT = @PMIX_ASM_SUPPORT_64BIT@
+PMIX_ASM_TEXT = @PMIX_ASM_TEXT@
+PMIX_ASM_TYPE = @PMIX_ASM_TYPE@
+PMIX_ASSEMBLY_ARCH = @PMIX_ASSEMBLY_ARCH@
+PMIX_ASSEMBLY_BUILTIN = @PMIX_ASSEMBLY_BUILTIN@
+PMIX_ASSEMBLY_FORMAT = @PMIX_ASSEMBLY_FORMAT@
+PMIX_AS_GLOBAL = @PMIX_AS_GLOBAL@
+PMIX_AS_LABEL_SUFFIX = @PMIX_AS_LABEL_SUFFIX@
+PMIX_CC_ABSOLUTE = @PMIX_CC_ABSOLUTE@
+PMIX_CONFIGURE_DATE = @PMIX_CONFIGURE_DATE@
+PMIX_CONFIGURE_HOST = @PMIX_CONFIGURE_HOST@
+PMIX_CONFIGURE_USER = @PMIX_CONFIGURE_USER@
+PMIX_EMBEDDED_CPPFLAGS = @PMIX_EMBEDDED_CPPFLAGS@
+PMIX_EMBEDDED_LDFLAGS = @PMIX_EMBEDDED_LDFLAGS@
+PMIX_EMBEDDED_LIBS = @PMIX_EMBEDDED_LIBS@
+PMIX_MAJOR_VERSION = @PMIX_MAJOR_VERSION@
+PMIX_MINOR_VERSION = @PMIX_MINOR_VERSION@
+PMIX_RELEASE_DATE = @PMIX_RELEASE_DATE@
+PMIX_RELEASE_VERSION = @PMIX_RELEASE_VERSION@
+PMIX_RENAME = @PMIX_RENAME@
+PMIX_VERSION = @PMIX_VERSION@
+PMIX_top_builddir = @PMIX_top_builddir@
+PMIX_top_srcdir = @PMIX_top_srcdir@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_prefix_program = @ac_prefix_program@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+libpmix_so_version = @libpmix_so_version@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pmix_have_pandoc = @pmix_have_pandoc@
+pmix_pdl_pdlopen_LIBS = @pmix_pdl_pdlopen_LIBS@
+pmix_pdl_plibltdl_CPPFLAGS = @pmix_pdl_plibltdl_CPPFLAGS@
+pmix_pdl_plibltdl_LDFLAGS = @pmix_pdl_plibltdl_LDFLAGS@
+pmix_pdl_plibltdl_LIBS = @pmix_pdl_plibltdl_LIBS@
+pmixdatadir = @pmixdatadir@
+pmixincludedir = @pmixincludedir@
+pmixlibdir = @pmixlibdir@
+pmixmajor = @pmixmajor@
+pmixminor = @pmixminor@
+pnet_opa_CFLAGS = @pnet_opa_CFLAGS@
+pnet_opa_CPPFLAGS = @pnet_opa_CPPFLAGS@
+pnet_opa_LDFLAGS = @pnet_opa_LDFLAGS@
+pnet_opa_LIBS = @pnet_opa_LIBS@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+psec_munge_CPPFLAGS = @psec_munge_CPPFLAGS@
+psec_munge_LDFLAGS = @psec_munge_LDFLAGS@
+psec_munge_LIBS = @psec_munge_LIBS@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+noinst_LTLIBRARIES = libmca_pif_bsdx_ipv6.la
+libmca_pif_bsdx_ipv6_la_SOURCES = pif_bsdx_ipv6.c
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/mca/pif/bsdx_ipv6/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/mca/pif/bsdx_ipv6/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_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}; \
+	}
+
+libmca_pif_bsdx_ipv6.la: $(libmca_pif_bsdx_ipv6_la_OBJECTS) $(libmca_pif_bsdx_ipv6_la_DEPENDENCIES) $(EXTRA_libmca_pif_bsdx_ipv6_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(LINK)  $(libmca_pif_bsdx_ipv6_la_OBJECTS) $(libmca_pif_bsdx_ipv6_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pif_bsdx_ipv6.Plo at am__quote@
+
+.c.o:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+ at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstLTLIBRARIES 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-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
+
+.PRECIOUS: Makefile
+
+
+# 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/mca/pif/bsdx_ipv6/configure.m4 b/src/mca/pif/bsdx_ipv6/configure.m4
new file mode 100644
index 0000000..22333fc
--- /dev/null
+++ b/src/mca/pif/bsdx_ipv6/configure.m4
@@ -0,0 +1,48 @@
+# -*- shell-script -*-
+#
+# Copyright (c) 2010      Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2015      Research Organization for Information Science
+#                         and Technology (RIST). All rights reserved.
+# Copyright (c) 2016      Intel, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+AC_DEFUN([MCA_pmix_pif_bsdx_ipv6_COMPILE_MODE], [
+    AC_MSG_CHECKING([for MCA component $1:$2 compile mode])
+    $3="static"
+    AC_MSG_RESULT([$$3])
+])
+
+# MCA_pif_config_CONFIG(action-if-can-compile,
+#                        [action-if-cant-compile])
+# ------------------------------------------------
+AC_DEFUN([MCA_pmix_pif_bsdx_ipv6_CONFIG], [
+    AC_CONFIG_FILES([src/mca/pif/bsdx_ipv6/Makefile])
+
+    AC_REQUIRE([PMIX_CHECK_OS_FLAVORS])
+
+    # If we found struct sockaddr and we're on any of the BSDs, we're
+    # happy.  I.e., this:
+    #if defined( __NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) || \
+    #             defined(__386BSD__) || defined(__bsdi__) || defined(__APPLE__)
+    AC_MSG_CHECKING([struct sockaddr])
+    AS_IF([test "$pmix_found_sockaddr" = "yes"],
+          [AC_MSG_RESULT([yes (cached)])
+           AC_MSG_CHECKING([some flavor of BSD])
+           AS_IF([test "$pmix_found_netbsd" = "yes" || \
+                  test "$pmix_found_freebsd" = "yes" || \
+                  test "$pmix_found_openbsd" = "yes" || \
+                  test "$pmix_found_386bsd" = "yes" || \
+                  test "$pmix_found_bsdi" = "yes" ||
+                  test "$pmix_found_apple" = "yes"],
+                 [AC_MSG_RESULT([yes])
+                  $1],
+                 [AC_MSG_RESULT([no])
+                  $2])],
+          [AC_MSG_RESULT([no (cached)])
+           $2])
+])dnl
diff --git a/src/mca/pif/bsdx_ipv6/pif_bsdx_ipv6.c b/src/mca/pif/bsdx_ipv6/pif_bsdx_ipv6.c
new file mode 100644
index 0000000..2dac255
--- /dev/null
+++ b/src/mca/pif/bsdx_ipv6/pif_bsdx_ipv6.c
@@ -0,0 +1,228 @@
+/*
+ * Copyright (c) 2010      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2010      Oracle and/or its affiliates.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include "pmix_config.h"
+#include "pmix_common.h"
+
+#include <string.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#include <errno.h>
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_SYS_SOCKIO_H
+#include <sys/sockio.h>
+#endif
+#ifdef HAVE_SYS_IOCTL_H
+#include <sys/ioctl.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif
+#ifdef HAVE_NET_IF_H
+#if defined(__APPLE__) && defined(_LP64)
+/* Apple engineering suggested using options align=power as a
+   workaround for a bug in OS X 10.4 (Tiger) that prevented ioctl(...,
+   SIOCGIFCONF, ...) from working properly in 64 bit mode on Power PC.
+   It turns out that the underlying issue is the size of struct
+   ifconf, which the kernel expects to be 12 and natural 64 bit
+   alignment would make 16.  The same bug appears in 64 bit mode on
+   Intel macs, but align=power is a no-op there, so instead, use the
+   pack pragma to instruct the compiler to pack on 4 byte words, which
+   has the same effect as align=power for our needs and works on both
+   Intel and Power PC Macs. */
+#pragma pack(push,4)
+#endif
+#include <net/if.h>
+#if defined(__APPLE__) && defined(_LP64)
+#pragma pack(pop)
+#endif
+#endif
+#ifdef HAVE_NETDB_H
+#include <netdb.h>
+#endif
+#ifdef HAVE_IFADDRS_H
+#include <ifaddrs.h>
+#endif
+
+#include "src/util/output.h"
+#include "src/util/pif.h"
+#include "src/mca/pif/pif.h"
+#include "src/mca/pif/base/base.h"
+
+static int if_bsdx_ipv6_open(void);
+
+/* Discovers IPv6 interfaces for:
+ *
+ * NetBSD
+ * OpenBSD
+ * FreeBSD
+ * 386BSD
+ * bsdi
+ * Apple
+ */
+pmix_pif_base_component_t mca_pif_bsdx_ipv6_component = {
+    /* First, the mca_component_t struct containing meta information
+       about the component itself */
+    .base = {
+        PMIX_PIF_BASE_VERSION_2_0_0,
+
+        /* Component name and version */
+        "bsdx_ipv6",
+        PMIX_MAJOR_VERSION,
+        PMIX_MINOR_VERSION,
+        PMIX_RELEASE_VERSION,
+
+        /* Component open and close functions */
+        if_bsdx_ipv6_open,
+        NULL
+    },
+    .data = {
+        /* This component is checkpointable */
+        PMIX_MCA_BASE_METADATA_PARAM_CHECKPOINT
+    },
+};
+
+/* configure using getifaddrs(3) */
+static int if_bsdx_ipv6_open(void)
+{
+    struct ifaddrs **ifadd_list;
+    struct ifaddrs *cur_ifaddrs;
+    struct sockaddr_in6* sin_addr;
+
+    pmix_output_verbose(1, pmix_pif_base_framework.framework_output,
+                        "searching for IPv6 interfaces");
+
+    /*
+     * the manpage claims that getifaddrs() allocates the memory,
+     * and freeifaddrs() is later used to release the allocated memory.
+     * however, without this malloc the call to getifaddrs() segfaults
+     */
+    ifadd_list = (struct ifaddrs **) malloc(sizeof(struct ifaddrs*));
+
+    /* create the linked list of ifaddrs structs */
+    if (getifaddrs(ifadd_list) < 0) {
+        pmix_output(0, "pmix_ifinit: getifaddrs() failed with error=%d\n",
+                    errno);
+        free(ifadd_list);
+        return PMIX_ERROR;
+    }
+
+    for (cur_ifaddrs = *ifadd_list; NULL != cur_ifaddrs;
+         cur_ifaddrs = cur_ifaddrs->ifa_next) {
+        pmix_pif_t *intf;
+        struct in6_addr a6;
+
+        /* skip non-ipv6 interface addresses */
+        if (AF_INET6 != cur_ifaddrs->ifa_addr->sa_family) {
+            pmix_output_verbose(1, pmix_pif_base_framework.framework_output,
+                                "skipping non-ipv6 interface %s[%d].\n",
+                                cur_ifaddrs->ifa_name, (int)cur_ifaddrs->ifa_addr->sa_family);
+            continue;
+        }
+
+        /* skip interface if it is down (IFF_UP not set) */
+        if (0 == (cur_ifaddrs->ifa_flags & IFF_UP)) {
+            pmix_output_verbose(1, pmix_pif_base_framework.framework_output,
+                                "skipping non-up interface %s.\n", cur_ifaddrs->ifa_name);
+            continue;
+        }
+
+        /* skip interface if it is a loopback device (IFF_LOOPBACK set) */
+        if (!pmix_if_retain_loopback && 0 != (cur_ifaddrs->ifa_flags & IFF_LOOPBACK)) {
+            pmix_output_verbose(1, pmix_pif_base_framework.framework_output,
+                                "skipping loopback interface %s.\n", cur_ifaddrs->ifa_name);
+            continue;
+        }
+
+        /* or if it is a point-to-point interface */
+        /* TODO: do we really skip p2p? */
+        if (0!= (cur_ifaddrs->ifa_flags & IFF_POINTOPOINT)) {
+            pmix_output_verbose(1, pmix_pif_base_framework.framework_output,
+                                "skipping p2p interface %s.\n", cur_ifaddrs->ifa_name);
+            continue;
+        }
+
+        sin_addr = (struct sockaddr_in6 *) cur_ifaddrs->ifa_addr;
+
+        /*
+         * skip IPv6 address starting with fe80:, as this is supposed to be
+         * link-local scope. sockaddr_in6->sin6_scope_id doesn't always work
+         * TODO: test whether scope id is set to a sensible value on
+         * linux and/or bsd (including osx)
+         *
+         * MacOSX: fe80::... has a scope of 0, but ifconfig -a shows
+         * a scope of 4 on that particular machine,
+         * so the scope returned by getifaddrs() isn't working properly
+         */
+
+        if ((IN6_IS_ADDR_LINKLOCAL (&sin_addr->sin6_addr))) {
+            pmix_output_verbose(1, pmix_pif_base_framework.framework_output,
+                                "skipping link-local ipv6 address on interface "
+                                "%s with scope %d.\n",
+                                cur_ifaddrs->ifa_name, sin_addr->sin6_scope_id);
+            continue;
+        }
+
+        if (0 < pmix_output_get_verbosity(pmix_pif_base_framework.framework_output)) {
+            char *addr_name = (char *) malloc(48*sizeof(char));
+            inet_ntop(AF_INET6, &sin_addr->sin6_addr, addr_name, 48*sizeof(char));
+            pmix_output(0, "ipv6 capable interface %s discovered, address %s.\n",
+                        cur_ifaddrs->ifa_name, addr_name);
+            free(addr_name);
+        }
+
+        /* fill values into the pmix_pif_t */
+        memcpy(&a6, &(sin_addr->sin6_addr), sizeof(struct in6_addr));
+
+        intf = PMIX_NEW(pmix_pif_t);
+        if (NULL == intf) {
+            pmix_output(0, "pmix_ifinit: unable to allocate %lu bytes\n",
+                        sizeof(pmix_pif_t));
+            free(ifadd_list);
+            return PMIX_ERR_OUT_OF_RESOURCE;
+        }
+        intf->af_family = AF_INET6;
+        strncpy(intf->if_name, cur_ifaddrs->ifa_name, IF_NAMESIZE);
+        intf->if_index = pmix_list_get_size(&pmix_if_list) + 1;
+        ((struct sockaddr_in6*) &intf->if_addr)->sin6_addr = a6;
+        ((struct sockaddr_in6*) &intf->if_addr)->sin6_family = AF_INET6;
+
+        /* since every scope != 0 is ignored, we just set the scope to 0 */
+        ((struct sockaddr_in6*) &intf->if_addr)->sin6_scope_id = 0;
+
+        /*
+         * hardcoded netmask, adrian says that's ok
+         */
+        intf->if_mask = 64;
+        intf->if_flags = cur_ifaddrs->ifa_flags;
+
+        /*
+         * FIXME: figure out how to gain access to the kernel index
+         * (or create our own), getifaddrs() does not contain such
+         * data
+         */
+        intf->if_kernel_index =
+            (uint16_t) if_nametoindex(cur_ifaddrs->ifa_name);
+        pmix_list_append(&pmix_if_list, &(intf->super));
+    }   /*  of for loop over ifaddrs list */
+
+    free(ifadd_list);
+
+    return PMIX_SUCCESS;
+}
diff --git a/src/mca/pif/linux_ipv6/Makefile.am b/src/mca/pif/linux_ipv6/Makefile.am
new file mode 100644
index 0000000..9bba51b
--- /dev/null
+++ b/src/mca/pif/linux_ipv6/Makefile.am
@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2010     Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2016      Intel, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+noinst_LTLIBRARIES = libmca_pif_linux_ipv6.la
+
+libmca_pif_linux_ipv6_la_SOURCES = pif_linux_ipv6.c
diff --git a/src/mca/pif/linux_ipv6/Makefile.in b/src/mca/pif/linux_ipv6/Makefile.in
new file mode 100644
index 0000000..2be687a
--- /dev/null
+++ b/src/mca/pif/linux_ipv6/Makefile.in
@@ -0,0 +1,762 @@
+# Makefile.in generated by automake 1.15 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+#
+# Copyright (c) 2010     Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2016      Intel, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+subdir = src/mca/pif/linux_ipv6
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/config/c_get_alignment.m4 \
+	$(top_srcdir)/config/libtool.m4 \
+	$(top_srcdir)/config/ltoptions.m4 \
+	$(top_srcdir)/config/ltsugar.m4 \
+	$(top_srcdir)/config/ltversion.m4 \
+	$(top_srcdir)/config/lt~obsolete.m4 \
+	$(top_srcdir)/config/pmix.m4 \
+	$(top_srcdir)/config/pmix_check_attributes.m4 \
+	$(top_srcdir)/config/pmix_check_broken_qsort.m4 \
+	$(top_srcdir)/config/pmix_check_compiler_version.m4 \
+	$(top_srcdir)/config/pmix_check_icc.m4 \
+	$(top_srcdir)/config/pmix_check_ident.m4 \
+	$(top_srcdir)/config/pmix_check_lock.m4 \
+	$(top_srcdir)/config/pmix_check_os_flavors.m4 \
+	$(top_srcdir)/config/pmix_check_package.m4 \
+	$(top_srcdir)/config/pmix_check_psm2.m4 \
+	$(top_srcdir)/config/pmix_check_pthread_pids.m4 \
+	$(top_srcdir)/config/pmix_check_vendor.m4 \
+	$(top_srcdir)/config/pmix_check_visibility.m4 \
+	$(top_srcdir)/config/pmix_check_withdir.m4 \
+	$(top_srcdir)/config/pmix_config_asm.m4 \
+	$(top_srcdir)/config/pmix_config_pthreads.m4 \
+	$(top_srcdir)/config/pmix_config_subdir.m4 \
+	$(top_srcdir)/config/pmix_config_subdir_args.m4 \
+	$(top_srcdir)/config/pmix_config_threads.m4 \
+	$(top_srcdir)/config/pmix_ensure_contains_optflags.m4 \
+	$(top_srcdir)/config/pmix_functions.m4 \
+	$(top_srcdir)/config/pmix_load_platform.m4 \
+	$(top_srcdir)/config/pmix_mca.m4 \
+	$(top_srcdir)/config/pmix_search_libs.m4 \
+	$(top_srcdir)/config/pmix_setup_cc.m4 \
+	$(top_srcdir)/config/pmix_setup_libevent.m4 \
+	$(top_srcdir)/config/pmix_setup_zlib.m4 \
+	$(top_srcdir)/config/pmix_try_assemble.m4 \
+	$(top_srcdir)/config/autogen_found_items.m4 \
+	$(top_srcdir)/src/mca/pdl/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/configure.m4 \
+	$(top_srcdir)/src/mca/pdl/pdlopen/configure.m4 \
+	$(top_srcdir)/src/mca/pdl/plibltdl/configure.m4 \
+	$(top_srcdir)/src/mca/pif/bsdx_ipv4/configure.m4 \
+	$(top_srcdir)/src/mca/pif/bsdx_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pif/linux_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pif/posix_ipv4/configure.m4 \
+	$(top_srcdir)/src/mca/pif/solaris_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/config/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/env/configure.m4 \
+	$(top_srcdir)/src/mca/pnet/opa/configure.m4 \
+	$(top_srcdir)/src/mca/psec/munge/configure.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/src/include/pmix_config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+libmca_pif_linux_ipv6_la_LIBADD =
+am_libmca_pif_linux_ipv6_la_OBJECTS = pif_linux_ipv6.lo
+libmca_pif_linux_ipv6_la_OBJECTS =  \
+	$(am_libmca_pif_linux_ipv6_la_OBJECTS)
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/src/include
+depcomp = $(SHELL) $(top_srcdir)/./config/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libmca_pif_linux_ipv6_la_SOURCES)
+DIST_SOURCES = $(libmca_pif_linux_ipv6_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/./config/depcomp
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CFLAGS = @CFLAGS@
+CLEANFILES = @CLEANFILES@
+CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MCA_PROJECT_SUBDIRS = @MCA_PROJECT_SUBDIRS@
+MCA_pmix_FRAMEWORKS = @MCA_pmix_FRAMEWORKS@
+MCA_pmix_FRAMEWORKS_SUBDIRS = @MCA_pmix_FRAMEWORKS_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS@
+MCA_pmix_FRAMEWORK_LIBS = @MCA_pmix_FRAMEWORK_LIBS@
+MCA_pmix_pdl_ALL_COMPONENTS = @MCA_pmix_pdl_ALL_COMPONENTS@
+MCA_pmix_pdl_ALL_SUBDIRS = @MCA_pmix_pdl_ALL_SUBDIRS@
+MCA_pmix_pdl_DSO_COMPONENTS = @MCA_pmix_pdl_DSO_COMPONENTS@
+MCA_pmix_pdl_DSO_SUBDIRS = @MCA_pmix_pdl_DSO_SUBDIRS@
+MCA_pmix_pdl_STATIC_COMPONENTS = @MCA_pmix_pdl_STATIC_COMPONENTS@
+MCA_pmix_pdl_STATIC_LTLIBS = @MCA_pmix_pdl_STATIC_LTLIBS@
+MCA_pmix_pdl_STATIC_SUBDIRS = @MCA_pmix_pdl_STATIC_SUBDIRS@
+MCA_pmix_pif_ALL_COMPONENTS = @MCA_pmix_pif_ALL_COMPONENTS@
+MCA_pmix_pif_ALL_SUBDIRS = @MCA_pmix_pif_ALL_SUBDIRS@
+MCA_pmix_pif_DSO_COMPONENTS = @MCA_pmix_pif_DSO_COMPONENTS@
+MCA_pmix_pif_DSO_SUBDIRS = @MCA_pmix_pif_DSO_SUBDIRS@
+MCA_pmix_pif_STATIC_COMPONENTS = @MCA_pmix_pif_STATIC_COMPONENTS@
+MCA_pmix_pif_STATIC_LTLIBS = @MCA_pmix_pif_STATIC_LTLIBS@
+MCA_pmix_pif_STATIC_SUBDIRS = @MCA_pmix_pif_STATIC_SUBDIRS@
+MCA_pmix_pinstalldirs_ALL_COMPONENTS = @MCA_pmix_pinstalldirs_ALL_COMPONENTS@
+MCA_pmix_pinstalldirs_ALL_SUBDIRS = @MCA_pmix_pinstalldirs_ALL_SUBDIRS@
+MCA_pmix_pinstalldirs_DSO_COMPONENTS = @MCA_pmix_pinstalldirs_DSO_COMPONENTS@
+MCA_pmix_pinstalldirs_DSO_SUBDIRS = @MCA_pmix_pinstalldirs_DSO_SUBDIRS@
+MCA_pmix_pinstalldirs_STATIC_COMPONENTS = @MCA_pmix_pinstalldirs_STATIC_COMPONENTS@
+MCA_pmix_pinstalldirs_STATIC_LTLIBS = @MCA_pmix_pinstalldirs_STATIC_LTLIBS@
+MCA_pmix_pinstalldirs_STATIC_SUBDIRS = @MCA_pmix_pinstalldirs_STATIC_SUBDIRS@
+MCA_pmix_pnet_ALL_COMPONENTS = @MCA_pmix_pnet_ALL_COMPONENTS@
+MCA_pmix_pnet_ALL_SUBDIRS = @MCA_pmix_pnet_ALL_SUBDIRS@
+MCA_pmix_pnet_DSO_COMPONENTS = @MCA_pmix_pnet_DSO_COMPONENTS@
+MCA_pmix_pnet_DSO_SUBDIRS = @MCA_pmix_pnet_DSO_SUBDIRS@
+MCA_pmix_pnet_STATIC_COMPONENTS = @MCA_pmix_pnet_STATIC_COMPONENTS@
+MCA_pmix_pnet_STATIC_LTLIBS = @MCA_pmix_pnet_STATIC_LTLIBS@
+MCA_pmix_pnet_STATIC_SUBDIRS = @MCA_pmix_pnet_STATIC_SUBDIRS@
+MCA_pmix_psec_ALL_COMPONENTS = @MCA_pmix_psec_ALL_COMPONENTS@
+MCA_pmix_psec_ALL_SUBDIRS = @MCA_pmix_psec_ALL_SUBDIRS@
+MCA_pmix_psec_DSO_COMPONENTS = @MCA_pmix_psec_DSO_COMPONENTS@
+MCA_pmix_psec_DSO_SUBDIRS = @MCA_pmix_psec_DSO_SUBDIRS@
+MCA_pmix_psec_STATIC_COMPONENTS = @MCA_pmix_psec_STATIC_COMPONENTS@
+MCA_pmix_psec_STATIC_LTLIBS = @MCA_pmix_psec_STATIC_LTLIBS@
+MCA_pmix_psec_STATIC_SUBDIRS = @MCA_pmix_psec_STATIC_SUBDIRS@
+MCA_pmix_psensor_ALL_COMPONENTS = @MCA_pmix_psensor_ALL_COMPONENTS@
+MCA_pmix_psensor_ALL_SUBDIRS = @MCA_pmix_psensor_ALL_SUBDIRS@
+MCA_pmix_psensor_DSO_COMPONENTS = @MCA_pmix_psensor_DSO_COMPONENTS@
+MCA_pmix_psensor_DSO_SUBDIRS = @MCA_pmix_psensor_DSO_SUBDIRS@
+MCA_pmix_psensor_STATIC_COMPONENTS = @MCA_pmix_psensor_STATIC_COMPONENTS@
+MCA_pmix_psensor_STATIC_LTLIBS = @MCA_pmix_psensor_STATIC_LTLIBS@
+MCA_pmix_psensor_STATIC_SUBDIRS = @MCA_pmix_psensor_STATIC_SUBDIRS@
+MCA_pmix_ptl_ALL_COMPONENTS = @MCA_pmix_ptl_ALL_COMPONENTS@
+MCA_pmix_ptl_ALL_SUBDIRS = @MCA_pmix_ptl_ALL_SUBDIRS@
+MCA_pmix_ptl_DSO_COMPONENTS = @MCA_pmix_ptl_DSO_COMPONENTS@
+MCA_pmix_ptl_DSO_SUBDIRS = @MCA_pmix_ptl_DSO_SUBDIRS@
+MCA_pmix_ptl_STATIC_COMPONENTS = @MCA_pmix_ptl_STATIC_COMPONENTS@
+MCA_pmix_ptl_STATIC_LTLIBS = @MCA_pmix_ptl_STATIC_LTLIBS@
+MCA_pmix_ptl_STATIC_SUBDIRS = @MCA_pmix_ptl_STATIC_SUBDIRS@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PMIX_ASM_GSYM = @PMIX_ASM_GSYM@
+PMIX_ASM_LSYM = @PMIX_ASM_LSYM@
+PMIX_ASM_SUPPORT_64BIT = @PMIX_ASM_SUPPORT_64BIT@
+PMIX_ASM_TEXT = @PMIX_ASM_TEXT@
+PMIX_ASM_TYPE = @PMIX_ASM_TYPE@
+PMIX_ASSEMBLY_ARCH = @PMIX_ASSEMBLY_ARCH@
+PMIX_ASSEMBLY_BUILTIN = @PMIX_ASSEMBLY_BUILTIN@
+PMIX_ASSEMBLY_FORMAT = @PMIX_ASSEMBLY_FORMAT@
+PMIX_AS_GLOBAL = @PMIX_AS_GLOBAL@
+PMIX_AS_LABEL_SUFFIX = @PMIX_AS_LABEL_SUFFIX@
+PMIX_CC_ABSOLUTE = @PMIX_CC_ABSOLUTE@
+PMIX_CONFIGURE_DATE = @PMIX_CONFIGURE_DATE@
+PMIX_CONFIGURE_HOST = @PMIX_CONFIGURE_HOST@
+PMIX_CONFIGURE_USER = @PMIX_CONFIGURE_USER@
+PMIX_EMBEDDED_CPPFLAGS = @PMIX_EMBEDDED_CPPFLAGS@
+PMIX_EMBEDDED_LDFLAGS = @PMIX_EMBEDDED_LDFLAGS@
+PMIX_EMBEDDED_LIBS = @PMIX_EMBEDDED_LIBS@
+PMIX_MAJOR_VERSION = @PMIX_MAJOR_VERSION@
+PMIX_MINOR_VERSION = @PMIX_MINOR_VERSION@
+PMIX_RELEASE_DATE = @PMIX_RELEASE_DATE@
+PMIX_RELEASE_VERSION = @PMIX_RELEASE_VERSION@
+PMIX_RENAME = @PMIX_RENAME@
+PMIX_VERSION = @PMIX_VERSION@
+PMIX_top_builddir = @PMIX_top_builddir@
+PMIX_top_srcdir = @PMIX_top_srcdir@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_prefix_program = @ac_prefix_program@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+libpmix_so_version = @libpmix_so_version@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pmix_have_pandoc = @pmix_have_pandoc@
+pmix_pdl_pdlopen_LIBS = @pmix_pdl_pdlopen_LIBS@
+pmix_pdl_plibltdl_CPPFLAGS = @pmix_pdl_plibltdl_CPPFLAGS@
+pmix_pdl_plibltdl_LDFLAGS = @pmix_pdl_plibltdl_LDFLAGS@
+pmix_pdl_plibltdl_LIBS = @pmix_pdl_plibltdl_LIBS@
+pmixdatadir = @pmixdatadir@
+pmixincludedir = @pmixincludedir@
+pmixlibdir = @pmixlibdir@
+pmixmajor = @pmixmajor@
+pmixminor = @pmixminor@
+pnet_opa_CFLAGS = @pnet_opa_CFLAGS@
+pnet_opa_CPPFLAGS = @pnet_opa_CPPFLAGS@
+pnet_opa_LDFLAGS = @pnet_opa_LDFLAGS@
+pnet_opa_LIBS = @pnet_opa_LIBS@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+psec_munge_CPPFLAGS = @psec_munge_CPPFLAGS@
+psec_munge_LDFLAGS = @psec_munge_LDFLAGS@
+psec_munge_LIBS = @psec_munge_LIBS@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+noinst_LTLIBRARIES = libmca_pif_linux_ipv6.la
+libmca_pif_linux_ipv6_la_SOURCES = pif_linux_ipv6.c
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/mca/pif/linux_ipv6/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/mca/pif/linux_ipv6/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_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}; \
+	}
+
+libmca_pif_linux_ipv6.la: $(libmca_pif_linux_ipv6_la_OBJECTS) $(libmca_pif_linux_ipv6_la_DEPENDENCIES) $(EXTRA_libmca_pif_linux_ipv6_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(LINK)  $(libmca_pif_linux_ipv6_la_OBJECTS) $(libmca_pif_linux_ipv6_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pif_linux_ipv6.Plo at am__quote@
+
+.c.o:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+ at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstLTLIBRARIES 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-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
+
+.PRECIOUS: Makefile
+
+
+# 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/mca/pif/linux_ipv6/configure.m4 b/src/mca/pif/linux_ipv6/configure.m4
new file mode 100644
index 0000000..e09ba89
--- /dev/null
+++ b/src/mca/pif/linux_ipv6/configure.m4
@@ -0,0 +1,36 @@
+# -*- shell-script -*-
+#
+# Copyright (c) 2010      Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2015      Research Organization for Information Science
+#                         and Technology (RIST). All rights reserved.
+# Copyright (c) 2016      Intel, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+AC_DEFUN([MCA_pmix_pif_linux_ipv6_COMPILE_MODE], [
+    AC_MSG_CHECKING([for MCA component $1:$2 compile mode])
+    $3="static"
+    AC_MSG_RESULT([$$3])
+])
+
+# MCA_pif_config_CONFIG(action-if-can-compile,
+#                        [action-if-cant-compile])
+# ------------------------------------------------
+AC_DEFUN([MCA_pmix_pif_linux_ipv6_CONFIG], [
+    AC_CONFIG_FILES([src/mca/pif/linux_ipv6/Makefile])
+
+    AC_REQUIRE([PMIX_CHECK_OS_FLAVORS])
+
+    AC_MSG_CHECKING([if we are on Linux with TCP])
+    # If we have struct sockaddr and we're on Linux, then we're
+    # happy.
+    AS_IF([test "$pmix_found_sockaddr" = "yes" && test "$pmix_found_linux" = "yes"],
+          [AC_MSG_RESULT([yes])
+           $1],
+          [AC_MSG_RESULT([no])
+           $2])
+])dnl
diff --git a/src/mca/pif/linux_ipv6/pif_linux_ipv6.c b/src/mca/pif/linux_ipv6/pif_linux_ipv6.c
new file mode 100644
index 0000000..2f240f9
--- /dev/null
+++ b/src/mca/pif/linux_ipv6/pif_linux_ipv6.c
@@ -0,0 +1,172 @@
+/*
+ * Copyright (c) 2010      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2010      Oracle and/or its affiliates.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include "pmix_config.h"
+#include "pmix_common.h"
+
+#include <string.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#include <errno.h>
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_SYS_SOCKIO_H
+#include <sys/sockio.h>
+#endif
+#ifdef HAVE_SYS_IOCTL_H
+#include <sys/ioctl.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif
+#ifdef HAVE_NET_IF_H
+#if defined(__APPLE__) && defined(_LP64)
+/* Apple engineering suggested using options align=power as a
+   workaround for a bug in OS X 10.4 (Tiger) that prevented ioctl(...,
+   SIOCGIFCONF, ...) from working properly in 64 bit mode on Power PC.
+   It turns out that the underlying issue is the size of struct
+   ifconf, which the kernel expects to be 12 and natural 64 bit
+   alignment would make 16.  The same bug appears in 64 bit mode on
+   Intel macs, but align=power is a no-op there, so instead, use the
+   pack pragma to instruct the compiler to pack on 4 byte words, which
+   has the same effect as align=power for our needs and works on both
+   Intel and Power PC Macs. */
+#pragma pack(push,4)
+#endif
+#include <net/if.h>
+#if defined(__APPLE__) && defined(_LP64)
+#pragma pack(pop)
+#endif
+#endif
+#ifdef HAVE_NETDB_H
+#include <netdb.h>
+#endif
+#ifdef HAVE_IFADDRS_H
+#include <ifaddrs.h>
+#endif
+
+#include "src/util/output.h"
+#include "src/util/pif.h"
+#include "src/mca/pif/pif.h"
+#include "src/mca/pif/base/base.h"
+
+static int if_linux_ipv6_open(void);
+
+/* Discovers Linux IPv6 interfaces */
+pmix_pif_base_component_t mca_pif_linux_ipv6_component = {
+    /* First, the mca_component_t struct containing meta information
+       about the component itself */
+    .base = {
+        PMIX_PIF_BASE_VERSION_2_0_0,
+
+        /* Component name and version */
+        "linux_ipv6",
+        PMIX_MAJOR_VERSION,
+        PMIX_MINOR_VERSION,
+        PMIX_RELEASE_VERSION,
+
+        /* Component open and close functions */
+        if_linux_ipv6_open,
+        NULL
+    },
+    .data = {
+        /* This component is checkpointable */
+        PMIX_MCA_BASE_METADATA_PARAM_CHECKPOINT
+    },
+};
+
+/* configure using getifaddrs(3) */
+static int if_linux_ipv6_open(void)
+{
+    FILE *f;
+    if ((f = fopen("/proc/net/if_inet6", "r"))) {
+        char ifname[IF_NAMESIZE];
+        unsigned int idx, pfxlen, scope, dadstat;
+        struct in6_addr a6;
+        int iter;
+        uint32_t flag;
+        unsigned int addrbyte[16];
+
+        while (fscanf(f, "%2x%2x%2x%2x%2x%2x%2x%2x%2x%2x%2x%2x%2x%2x%2x%2x %x %x %x %x %20s\n",
+                      &addrbyte[0], &addrbyte[1], &addrbyte[2], &addrbyte[3],
+                      &addrbyte[4], &addrbyte[5], &addrbyte[6], &addrbyte[7],
+                      &addrbyte[8], &addrbyte[9], &addrbyte[10], &addrbyte[11],
+                      &addrbyte[12], &addrbyte[13], &addrbyte[14], &addrbyte[15],
+                      &idx, &pfxlen, &scope, &dadstat, ifname) != EOF) {
+            pmix_pif_t *intf;
+
+            pmix_output_verbose(1, pmix_pif_base_framework.framework_output,
+                                "found interface %2x%2x:%2x%2x:%2x%2x:%2x%2x:%2x%2x:%2x%2x:%2x%2x:%2x%2x scope %x\n",
+                                addrbyte[0], addrbyte[1], addrbyte[2], addrbyte[3],
+                                addrbyte[4], addrbyte[5], addrbyte[6], addrbyte[7],
+                                addrbyte[8], addrbyte[9], addrbyte[10], addrbyte[11],
+                                addrbyte[12], addrbyte[13], addrbyte[14], addrbyte[15], scope);
+
+            /* we don't want any other scope less than link-local */
+            if (scope < 0x20) {
+                pmix_output_verbose(1, pmix_pif_base_framework.framework_output,
+                                    "skipping interface %2x%2x:%2x%2x:%2x%2x:%2x%2x:%2x%2x:%2x%2x:%2x%2x:%2x%2x scope %x\n",
+                                    addrbyte[0], addrbyte[1], addrbyte[2], addrbyte[3],
+                                    addrbyte[4], addrbyte[5], addrbyte[6], addrbyte[7],
+                                    addrbyte[8], addrbyte[9], addrbyte[10], addrbyte[11],
+                                    addrbyte[12], addrbyte[13], addrbyte[14], addrbyte[15], scope);
+                continue;
+            }
+
+            intf = PMIX_NEW(pmix_pif_t);
+            if (NULL == intf) {
+                pmix_output(0, "pmix_ifinit: unable to allocate %lu bytes\n",
+                            (unsigned long)sizeof(pmix_pif_t));
+                fclose(f);
+                return PMIX_ERR_OUT_OF_RESOURCE;
+            }
+            intf->af_family = AF_INET6;
+
+            for (iter = 0; iter < 16; iter++) {
+                a6.s6_addr[iter] = addrbyte[iter];
+            }
+
+            /* now construct the pmix_pif_t */
+            strncpy(intf->if_name, ifname, IF_NAMESIZE);
+            intf->if_index = pmix_list_get_size(&pmix_if_list)+1;
+            intf->if_kernel_index = (uint16_t) idx;
+            ((struct sockaddr_in6*) &intf->if_addr)->sin6_addr = a6;
+            ((struct sockaddr_in6*) &intf->if_addr)->sin6_family = AF_INET6;
+            ((struct sockaddr_in6*) &intf->if_addr)->sin6_scope_id = scope;
+            intf->if_mask = pfxlen;
+            if (PMIX_SUCCESS == pmix_ifindextoflags(pmix_ifnametoindex (ifname), &flag)) {
+                intf->if_flags = flag;
+            } else {
+                intf->if_flags = IFF_UP;
+            }
+
+            /* copy new interface information to heap and append
+               to list */
+            pmix_list_append(&pmix_if_list, &(intf->super));
+            pmix_output_verbose(1, pmix_pif_base_framework.framework_output,
+                                "added interface %2x%2x:%2x%2x:%2x%2x:%2x%2x:%2x%2x:%2x%2x:%2x%2x:%2x%2x\n",
+                                addrbyte[0], addrbyte[1], addrbyte[2], addrbyte[3],
+                                addrbyte[4], addrbyte[5], addrbyte[6], addrbyte[7],
+                                addrbyte[8], addrbyte[9], addrbyte[10], addrbyte[11],
+                                addrbyte[12], addrbyte[13], addrbyte[14], addrbyte[15]);
+        } /* of while */
+        fclose(f);
+    }
+
+    return PMIX_SUCCESS;
+}
diff --git a/src/mca/pif/pif.h b/src/mca/pif/pif.h
new file mode 100644
index 0000000..29c75b8
--- /dev/null
+++ b/src/mca/pif/pif.h
@@ -0,0 +1,137 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2010-2013 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2015      Los Alamos National Security, LLC. All rights
+ *                         reserved.
+ * Copyright (c) 2016      Intel, Inc.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#ifndef PMIX_MCA_PIF_PIF_H
+#define PMIX_MCA_PIF_PIF_H
+
+#include "pmix_config.h"
+
+#include <string.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#include <errno.h>
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_SYS_SOCKIO_H
+#include <sys/sockio.h>
+#endif
+#ifdef HAVE_SYS_IOCTL_H
+#include <sys/ioctl.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif
+#ifdef HAVE_NET_IF_H
+#if defined(__APPLE__) && defined(_LP64)
+/* Apple engineering suggested using options align=power as a
+   workaround for a bug in OS X 10.4 (Tiger) that prevented ioctl(...,
+   SIOCGIFCONF, ...) from working properly in 64 bit mode on Power PC.
+   It turns out that the underlying issue is the size of struct
+   ifconf, which the kernel expects to be 12 and natural 64 bit
+   alignment would make 16.  The same bug appears in 64 bit mode on
+   Intel macs, but align=power is a no-op there, so instead, use the
+   pack pragma to instruct the compiler to pack on 4 byte words, which
+   has the same effect as align=power for our needs and works on both
+   Intel and Power PC Macs. */
+#pragma pack(push,4)
+#endif
+#include <net/if.h>
+#if defined(__APPLE__) && defined(_LP64)
+#pragma pack(pop)
+#endif
+#endif
+#ifdef HAVE_NETDB_H
+#include <netdb.h>
+#endif
+#ifdef HAVE_IFADDRS_H
+#include <ifaddrs.h>
+#endif
+
+#include "src/util/pif.h"
+#include "src/mca/mca.h"
+#include "src/mca/base/base.h"
+
+BEGIN_C_DECLS
+
+/*
+ * Define INADDR_NONE if we don't have it.  Solaris is the only system
+ * where I have found that it does not exist, and the man page for
+ * inet_addr() says that it returns -1 upon failure.  On Linux and
+ * other systems with INADDR_NONE, it's just a #define to -1 anyway.
+ * So just #define it to -1 here if it doesn't already exist.
+ */
+
+#if !defined(INADDR_NONE)
+#define INADDR_NONE -1
+#endif
+
+#define DEFAULT_NUMBER_INTERFACES 10
+#define MAX_PIFCONF_SIZE 10 * 1024 * 1024
+
+
+typedef struct pmix_pif_t {
+    pmix_list_item_t     super;
+    char                if_name[IF_NAMESIZE+1];
+    int                 if_index;
+    uint16_t            if_kernel_index;
+    uint16_t            af_family;
+    int                 if_flags;
+    int                 if_speed;
+    struct sockaddr_storage  if_addr;
+    uint32_t            if_mask;
+    uint32_t            if_bandwidth;
+    uint8_t             if_mac[6];
+    int                 ifmtu; /* Can't use if_mtu because of a
+                                  #define collision on some BSDs */
+} pmix_pif_t;
+PMIX_CLASS_DECLARATION(pmix_pif_t);
+
+
+/* "global" list of available interfaces */
+extern pmix_list_t pmix_if_list;
+
+/* global flags */
+extern bool pmix_if_do_not_resolve;
+extern bool pmix_if_retain_loopback;
+
+/**
+ * Structure for if components.
+ */
+struct pmix_pif_base_component_2_0_0_t {
+    /** MCA base component */
+    pmix_mca_base_component_t base;
+    /** MCA base data */
+    pmix_mca_base_component_data_t data;
+};
+/**
+ * Convenience typedef
+ */
+typedef struct pmix_pif_base_component_2_0_0_t pmix_pif_base_component_t;
+
+/*
+ * Macro for use in components that are of type pif
+ */
+#define PMIX_PIF_BASE_VERSION_2_0_0 \
+    PMIX_MCA_BASE_VERSION_1_0_0("pif", 2, 0, 0)
+
+END_C_DECLS
+
+#endif /* PMIX_MCA_PIF_PIF_H */
diff --git a/src/mca/pif/posix_ipv4/Makefile.am b/src/mca/pif/posix_ipv4/Makefile.am
new file mode 100644
index 0000000..e8f8fd5
--- /dev/null
+++ b/src/mca/pif/posix_ipv4/Makefile.am
@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2010     Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2016      Intel, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+noinst_LTLIBRARIES = libmca_pif_posix_ipv4.la
+
+libmca_pif_posix_ipv4_la_SOURCES = pif_posix.c
diff --git a/src/mca/pif/posix_ipv4/Makefile.in b/src/mca/pif/posix_ipv4/Makefile.in
new file mode 100644
index 0000000..7b3928a
--- /dev/null
+++ b/src/mca/pif/posix_ipv4/Makefile.in
@@ -0,0 +1,762 @@
+# Makefile.in generated by automake 1.15 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+#
+# Copyright (c) 2010     Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2016      Intel, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+subdir = src/mca/pif/posix_ipv4
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/config/c_get_alignment.m4 \
+	$(top_srcdir)/config/libtool.m4 \
+	$(top_srcdir)/config/ltoptions.m4 \
+	$(top_srcdir)/config/ltsugar.m4 \
+	$(top_srcdir)/config/ltversion.m4 \
+	$(top_srcdir)/config/lt~obsolete.m4 \
+	$(top_srcdir)/config/pmix.m4 \
+	$(top_srcdir)/config/pmix_check_attributes.m4 \
+	$(top_srcdir)/config/pmix_check_broken_qsort.m4 \
+	$(top_srcdir)/config/pmix_check_compiler_version.m4 \
+	$(top_srcdir)/config/pmix_check_icc.m4 \
+	$(top_srcdir)/config/pmix_check_ident.m4 \
+	$(top_srcdir)/config/pmix_check_lock.m4 \
+	$(top_srcdir)/config/pmix_check_os_flavors.m4 \
+	$(top_srcdir)/config/pmix_check_package.m4 \
+	$(top_srcdir)/config/pmix_check_psm2.m4 \
+	$(top_srcdir)/config/pmix_check_pthread_pids.m4 \
+	$(top_srcdir)/config/pmix_check_vendor.m4 \
+	$(top_srcdir)/config/pmix_check_visibility.m4 \
+	$(top_srcdir)/config/pmix_check_withdir.m4 \
+	$(top_srcdir)/config/pmix_config_asm.m4 \
+	$(top_srcdir)/config/pmix_config_pthreads.m4 \
+	$(top_srcdir)/config/pmix_config_subdir.m4 \
+	$(top_srcdir)/config/pmix_config_subdir_args.m4 \
+	$(top_srcdir)/config/pmix_config_threads.m4 \
+	$(top_srcdir)/config/pmix_ensure_contains_optflags.m4 \
+	$(top_srcdir)/config/pmix_functions.m4 \
+	$(top_srcdir)/config/pmix_load_platform.m4 \
+	$(top_srcdir)/config/pmix_mca.m4 \
+	$(top_srcdir)/config/pmix_search_libs.m4 \
+	$(top_srcdir)/config/pmix_setup_cc.m4 \
+	$(top_srcdir)/config/pmix_setup_libevent.m4 \
+	$(top_srcdir)/config/pmix_setup_zlib.m4 \
+	$(top_srcdir)/config/pmix_try_assemble.m4 \
+	$(top_srcdir)/config/autogen_found_items.m4 \
+	$(top_srcdir)/src/mca/pdl/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/configure.m4 \
+	$(top_srcdir)/src/mca/pdl/pdlopen/configure.m4 \
+	$(top_srcdir)/src/mca/pdl/plibltdl/configure.m4 \
+	$(top_srcdir)/src/mca/pif/bsdx_ipv4/configure.m4 \
+	$(top_srcdir)/src/mca/pif/bsdx_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pif/linux_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pif/posix_ipv4/configure.m4 \
+	$(top_srcdir)/src/mca/pif/solaris_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/config/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/env/configure.m4 \
+	$(top_srcdir)/src/mca/pnet/opa/configure.m4 \
+	$(top_srcdir)/src/mca/psec/munge/configure.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/src/include/pmix_config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+libmca_pif_posix_ipv4_la_LIBADD =
+am_libmca_pif_posix_ipv4_la_OBJECTS = pif_posix.lo
+libmca_pif_posix_ipv4_la_OBJECTS =  \
+	$(am_libmca_pif_posix_ipv4_la_OBJECTS)
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/src/include
+depcomp = $(SHELL) $(top_srcdir)/./config/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libmca_pif_posix_ipv4_la_SOURCES)
+DIST_SOURCES = $(libmca_pif_posix_ipv4_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/./config/depcomp
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CFLAGS = @CFLAGS@
+CLEANFILES = @CLEANFILES@
+CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MCA_PROJECT_SUBDIRS = @MCA_PROJECT_SUBDIRS@
+MCA_pmix_FRAMEWORKS = @MCA_pmix_FRAMEWORKS@
+MCA_pmix_FRAMEWORKS_SUBDIRS = @MCA_pmix_FRAMEWORKS_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS@
+MCA_pmix_FRAMEWORK_LIBS = @MCA_pmix_FRAMEWORK_LIBS@
+MCA_pmix_pdl_ALL_COMPONENTS = @MCA_pmix_pdl_ALL_COMPONENTS@
+MCA_pmix_pdl_ALL_SUBDIRS = @MCA_pmix_pdl_ALL_SUBDIRS@
+MCA_pmix_pdl_DSO_COMPONENTS = @MCA_pmix_pdl_DSO_COMPONENTS@
+MCA_pmix_pdl_DSO_SUBDIRS = @MCA_pmix_pdl_DSO_SUBDIRS@
+MCA_pmix_pdl_STATIC_COMPONENTS = @MCA_pmix_pdl_STATIC_COMPONENTS@
+MCA_pmix_pdl_STATIC_LTLIBS = @MCA_pmix_pdl_STATIC_LTLIBS@
+MCA_pmix_pdl_STATIC_SUBDIRS = @MCA_pmix_pdl_STATIC_SUBDIRS@
+MCA_pmix_pif_ALL_COMPONENTS = @MCA_pmix_pif_ALL_COMPONENTS@
+MCA_pmix_pif_ALL_SUBDIRS = @MCA_pmix_pif_ALL_SUBDIRS@
+MCA_pmix_pif_DSO_COMPONENTS = @MCA_pmix_pif_DSO_COMPONENTS@
+MCA_pmix_pif_DSO_SUBDIRS = @MCA_pmix_pif_DSO_SUBDIRS@
+MCA_pmix_pif_STATIC_COMPONENTS = @MCA_pmix_pif_STATIC_COMPONENTS@
+MCA_pmix_pif_STATIC_LTLIBS = @MCA_pmix_pif_STATIC_LTLIBS@
+MCA_pmix_pif_STATIC_SUBDIRS = @MCA_pmix_pif_STATIC_SUBDIRS@
+MCA_pmix_pinstalldirs_ALL_COMPONENTS = @MCA_pmix_pinstalldirs_ALL_COMPONENTS@
+MCA_pmix_pinstalldirs_ALL_SUBDIRS = @MCA_pmix_pinstalldirs_ALL_SUBDIRS@
+MCA_pmix_pinstalldirs_DSO_COMPONENTS = @MCA_pmix_pinstalldirs_DSO_COMPONENTS@
+MCA_pmix_pinstalldirs_DSO_SUBDIRS = @MCA_pmix_pinstalldirs_DSO_SUBDIRS@
+MCA_pmix_pinstalldirs_STATIC_COMPONENTS = @MCA_pmix_pinstalldirs_STATIC_COMPONENTS@
+MCA_pmix_pinstalldirs_STATIC_LTLIBS = @MCA_pmix_pinstalldirs_STATIC_LTLIBS@
+MCA_pmix_pinstalldirs_STATIC_SUBDIRS = @MCA_pmix_pinstalldirs_STATIC_SUBDIRS@
+MCA_pmix_pnet_ALL_COMPONENTS = @MCA_pmix_pnet_ALL_COMPONENTS@
+MCA_pmix_pnet_ALL_SUBDIRS = @MCA_pmix_pnet_ALL_SUBDIRS@
+MCA_pmix_pnet_DSO_COMPONENTS = @MCA_pmix_pnet_DSO_COMPONENTS@
+MCA_pmix_pnet_DSO_SUBDIRS = @MCA_pmix_pnet_DSO_SUBDIRS@
+MCA_pmix_pnet_STATIC_COMPONENTS = @MCA_pmix_pnet_STATIC_COMPONENTS@
+MCA_pmix_pnet_STATIC_LTLIBS = @MCA_pmix_pnet_STATIC_LTLIBS@
+MCA_pmix_pnet_STATIC_SUBDIRS = @MCA_pmix_pnet_STATIC_SUBDIRS@
+MCA_pmix_psec_ALL_COMPONENTS = @MCA_pmix_psec_ALL_COMPONENTS@
+MCA_pmix_psec_ALL_SUBDIRS = @MCA_pmix_psec_ALL_SUBDIRS@
+MCA_pmix_psec_DSO_COMPONENTS = @MCA_pmix_psec_DSO_COMPONENTS@
+MCA_pmix_psec_DSO_SUBDIRS = @MCA_pmix_psec_DSO_SUBDIRS@
+MCA_pmix_psec_STATIC_COMPONENTS = @MCA_pmix_psec_STATIC_COMPONENTS@
+MCA_pmix_psec_STATIC_LTLIBS = @MCA_pmix_psec_STATIC_LTLIBS@
+MCA_pmix_psec_STATIC_SUBDIRS = @MCA_pmix_psec_STATIC_SUBDIRS@
+MCA_pmix_psensor_ALL_COMPONENTS = @MCA_pmix_psensor_ALL_COMPONENTS@
+MCA_pmix_psensor_ALL_SUBDIRS = @MCA_pmix_psensor_ALL_SUBDIRS@
+MCA_pmix_psensor_DSO_COMPONENTS = @MCA_pmix_psensor_DSO_COMPONENTS@
+MCA_pmix_psensor_DSO_SUBDIRS = @MCA_pmix_psensor_DSO_SUBDIRS@
+MCA_pmix_psensor_STATIC_COMPONENTS = @MCA_pmix_psensor_STATIC_COMPONENTS@
+MCA_pmix_psensor_STATIC_LTLIBS = @MCA_pmix_psensor_STATIC_LTLIBS@
+MCA_pmix_psensor_STATIC_SUBDIRS = @MCA_pmix_psensor_STATIC_SUBDIRS@
+MCA_pmix_ptl_ALL_COMPONENTS = @MCA_pmix_ptl_ALL_COMPONENTS@
+MCA_pmix_ptl_ALL_SUBDIRS = @MCA_pmix_ptl_ALL_SUBDIRS@
+MCA_pmix_ptl_DSO_COMPONENTS = @MCA_pmix_ptl_DSO_COMPONENTS@
+MCA_pmix_ptl_DSO_SUBDIRS = @MCA_pmix_ptl_DSO_SUBDIRS@
+MCA_pmix_ptl_STATIC_COMPONENTS = @MCA_pmix_ptl_STATIC_COMPONENTS@
+MCA_pmix_ptl_STATIC_LTLIBS = @MCA_pmix_ptl_STATIC_LTLIBS@
+MCA_pmix_ptl_STATIC_SUBDIRS = @MCA_pmix_ptl_STATIC_SUBDIRS@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PMIX_ASM_GSYM = @PMIX_ASM_GSYM@
+PMIX_ASM_LSYM = @PMIX_ASM_LSYM@
+PMIX_ASM_SUPPORT_64BIT = @PMIX_ASM_SUPPORT_64BIT@
+PMIX_ASM_TEXT = @PMIX_ASM_TEXT@
+PMIX_ASM_TYPE = @PMIX_ASM_TYPE@
+PMIX_ASSEMBLY_ARCH = @PMIX_ASSEMBLY_ARCH@
+PMIX_ASSEMBLY_BUILTIN = @PMIX_ASSEMBLY_BUILTIN@
+PMIX_ASSEMBLY_FORMAT = @PMIX_ASSEMBLY_FORMAT@
+PMIX_AS_GLOBAL = @PMIX_AS_GLOBAL@
+PMIX_AS_LABEL_SUFFIX = @PMIX_AS_LABEL_SUFFIX@
+PMIX_CC_ABSOLUTE = @PMIX_CC_ABSOLUTE@
+PMIX_CONFIGURE_DATE = @PMIX_CONFIGURE_DATE@
+PMIX_CONFIGURE_HOST = @PMIX_CONFIGURE_HOST@
+PMIX_CONFIGURE_USER = @PMIX_CONFIGURE_USER@
+PMIX_EMBEDDED_CPPFLAGS = @PMIX_EMBEDDED_CPPFLAGS@
+PMIX_EMBEDDED_LDFLAGS = @PMIX_EMBEDDED_LDFLAGS@
+PMIX_EMBEDDED_LIBS = @PMIX_EMBEDDED_LIBS@
+PMIX_MAJOR_VERSION = @PMIX_MAJOR_VERSION@
+PMIX_MINOR_VERSION = @PMIX_MINOR_VERSION@
+PMIX_RELEASE_DATE = @PMIX_RELEASE_DATE@
+PMIX_RELEASE_VERSION = @PMIX_RELEASE_VERSION@
+PMIX_RENAME = @PMIX_RENAME@
+PMIX_VERSION = @PMIX_VERSION@
+PMIX_top_builddir = @PMIX_top_builddir@
+PMIX_top_srcdir = @PMIX_top_srcdir@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_prefix_program = @ac_prefix_program@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+libpmix_so_version = @libpmix_so_version@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pmix_have_pandoc = @pmix_have_pandoc@
+pmix_pdl_pdlopen_LIBS = @pmix_pdl_pdlopen_LIBS@
+pmix_pdl_plibltdl_CPPFLAGS = @pmix_pdl_plibltdl_CPPFLAGS@
+pmix_pdl_plibltdl_LDFLAGS = @pmix_pdl_plibltdl_LDFLAGS@
+pmix_pdl_plibltdl_LIBS = @pmix_pdl_plibltdl_LIBS@
+pmixdatadir = @pmixdatadir@
+pmixincludedir = @pmixincludedir@
+pmixlibdir = @pmixlibdir@
+pmixmajor = @pmixmajor@
+pmixminor = @pmixminor@
+pnet_opa_CFLAGS = @pnet_opa_CFLAGS@
+pnet_opa_CPPFLAGS = @pnet_opa_CPPFLAGS@
+pnet_opa_LDFLAGS = @pnet_opa_LDFLAGS@
+pnet_opa_LIBS = @pnet_opa_LIBS@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+psec_munge_CPPFLAGS = @psec_munge_CPPFLAGS@
+psec_munge_LDFLAGS = @psec_munge_LDFLAGS@
+psec_munge_LIBS = @psec_munge_LIBS@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+noinst_LTLIBRARIES = libmca_pif_posix_ipv4.la
+libmca_pif_posix_ipv4_la_SOURCES = pif_posix.c
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/mca/pif/posix_ipv4/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/mca/pif/posix_ipv4/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_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}; \
+	}
+
+libmca_pif_posix_ipv4.la: $(libmca_pif_posix_ipv4_la_OBJECTS) $(libmca_pif_posix_ipv4_la_DEPENDENCIES) $(EXTRA_libmca_pif_posix_ipv4_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(LINK)  $(libmca_pif_posix_ipv4_la_OBJECTS) $(libmca_pif_posix_ipv4_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pif_posix.Plo at am__quote@
+
+.c.o:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+ at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstLTLIBRARIES 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-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
+
+.PRECIOUS: Makefile
+
+
+# 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/mca/pif/posix_ipv4/configure.m4 b/src/mca/pif/posix_ipv4/configure.m4
new file mode 100644
index 0000000..729c97d
--- /dev/null
+++ b/src/mca/pif/posix_ipv4/configure.m4
@@ -0,0 +1,55 @@
+# -*- shell-script -*-
+#
+# Copyright (c) 2010      Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2015      Research Organization for Information Science
+#                         and Technology (RIST). All rights reserved.
+# Copyright (c) 2016      Intel, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+AC_DEFUN([MCA_pmix_pif_posix_ipv4_COMPILE_MODE], [
+    AC_MSG_CHECKING([for MCA component $1:$2 compile mode])
+    $3="static"
+    AC_MSG_RESULT([$$3])
+])
+
+# MCA_pif_config_CONFIG(action-if-can-compile,
+#                        [action-if-cant-compile])
+# ------------------------------------------------
+AC_DEFUN([MCA_pmix_pif_posix_ipv4_CONFIG], [
+    AC_CONFIG_FILES([src/mca/pif/posix_ipv4/Makefile])
+
+    PMIX_VAR_SCOPE_PUSH([pmix_pif_posix_ipv4_happy])
+    pmix_pif_posix_ipv4_happy=no
+
+    AC_REQUIRE([PMIX_CHECK_OS_FLAVORS])
+
+    # If we found struct sockaddr and we're NOT on most of the BSDs,
+    # we're happy.  I.e., if posix but not:
+    #if defined(__NetBSD__) || defined(__FreeBSD__) || \
+    #    defined(__OpenBSD__) || defined(__DragonFly__)
+    AC_MSG_CHECKING([struct sockaddr])
+    AS_IF([test "$pmix_found_sockaddr" = "yes"],
+          [AC_MSG_RESULT([yes (cached)])
+           AC_MSG_CHECKING([not NetBSD, FreeBSD, OpenBSD, or DragonFly])
+           AS_IF([test "$pmix_found_netbsd" = "no" && test "$pmix_found_freebsd" = "no" && test "$pmix_found_openbsd" = "no" && test "$pmix_found_dragonfly" = "no"],
+                 [AC_MSG_RESULT([yes])
+                  pmix_pif_posix_ipv4_happy=yes],
+                 [AC_MSG_RESULT([no])]
+                )],
+          [AC_MSG_RESULT([no (cached)])]
+         )
+
+    AS_IF([test "$pmix_pif_posix_ipv4_happy" = "yes"],
+          [AC_CHECK_MEMBERS([struct ifreq.ifr_hwaddr], [], [],
+                           [[#include <net/if.h>]])
+           AC_CHECK_MEMBERS([struct ifreq.ifr_mtu], [], [],
+                           [[#include <net/if.h>]])
+          ])
+
+    AS_IF([test "$pmix_pif_posix_ipv4_happy" = "yes"], [$1], [$2]);
+])dnl
diff --git a/src/mca/pif/posix_ipv4/pif_posix.c b/src/mca/pif/posix_ipv4/pif_posix.c
new file mode 100644
index 0000000..3c2e460
--- /dev/null
+++ b/src/mca/pif/posix_ipv4/pif_posix.c
@@ -0,0 +1,343 @@
+/*
+ * Copyright (c) 2010-2013 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2010      Oracle and/or its affiliates.  All rights reserved.
+ * Copyright (c) 2013      The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2015      Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include "pmix_config.h"
+#include "pmix_common.h"
+
+#include <string.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#include <errno.h>
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_SYS_SOCKIO_H
+#include <sys/sockio.h>
+#endif
+#ifdef HAVE_SYS_IOCTL_H
+#include <sys/ioctl.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif
+#ifdef HAVE_NET_IF_H
+#if defined(__APPLE__) && defined(_LP64)
+/* Apple engineering suggested using options align=power as a
+   workaround for a bug in OS X 10.4 (Tiger) that prevented ioctl(...,
+   SIOCGIFCONF, ...) from working properly in 64 bit mode on Power PC.
+   It turns out that the underlying issue is the size of struct
+   ifconf, which the kernel expects to be 12 and natural 64 bit
+   alignment would make 16.  The same bug appears in 64 bit mode on
+   Intel macs, but align=power is a no-op there, so instead, use the
+   pack pragma to instruct the compiler to pack on 4 byte words, which
+   has the same effect as align=power for our needs and works on both
+   Intel and Power PC Macs. */
+#pragma pack(push,4)
+#endif
+#include <net/if.h>
+#if defined(__APPLE__) && defined(_LP64)
+#pragma pack(pop)
+#endif
+#endif
+#ifdef HAVE_NETDB_H
+#include <netdb.h>
+#endif
+#ifdef HAVE_IFADDRS_H
+#include <ifaddrs.h>
+#endif
+
+#include "src/util/output.h"
+#include "src/util/pif.h"
+#include "src/mca/pif/pif.h"
+#include "src/mca/pif/base/base.h"
+
+static int if_posix_open(void);
+
+/* Supports all flavors of posix except those
+ * BSD-flavors supported elsewhere
+ */
+pmix_pif_base_component_t mca_pif_posix_ipv4_component = {
+    /* First, the mca_component_t struct containing meta information
+       about the component itself */
+    .base = {
+        PMIX_PIF_BASE_VERSION_2_0_0,
+
+        /* Component name and version */
+        "posix_ipv4",
+        PMIX_MAJOR_VERSION,
+        PMIX_MINOR_VERSION,
+        PMIX_RELEASE_VERSION,
+
+        /* Component open and close functions */
+        if_posix_open,
+        NULL
+    },
+    .data = {
+        /* This component is checkpointable */
+        PMIX_MCA_BASE_METADATA_PARAM_CHECKPOINT
+    },
+};
+
+/* convert a netmask (in network byte order) to CIDR notation */
+static int prefix (uint32_t netmask)
+{
+    uint32_t mask = ntohl(netmask);
+    int plen = 0;
+
+    if (0 == mask) {
+        plen = 32;
+    } else {
+        while ((mask % 2) == 0) {
+            plen += 1;
+            mask /= 2;
+        }
+    }
+
+    return (32 - plen);
+}
+
+/* configure using getifaddrs(3) */
+static int if_posix_open(void)
+{
+    int sd;
+    int lastlen, rem;
+    char *ptr;
+    struct ifconf ifconf;
+    int ifc_len;
+    bool successful_locate = false;
+
+    /* Create the internet socket to test with.  Must use AF_INET;
+       using AF_UNSPEC or AF_INET6 will cause everything to
+       fail. */
+    if ((sd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
+        pmix_output(0, "pmix_ifinit: socket() failed with errno=%d\n",
+                    errno);
+        return PMIX_ERROR;
+    }
+
+    /*
+     * Get Network Interface configuration
+     *
+     * Some notes on the behavior of ioctl(..., SIOCGIFCONF,...)
+     * when not enough space is allocated for all the entries.
+     *
+     * - Solaris returns -1, errno EINVAL if there is not enough
+     *   space
+     * - OS X returns 0, sets .ifc_len to the space used by the
+     *   by the entries that did fit.
+     * - Linux returns 0, sets .ifc_len to the space required to
+     *   hold all the entries (although it only writes what will
+     *   fit in the buffer of .ifc_len passed to the function).
+     * - FreeBSD returns 0, sets .ifc_len to 0.
+     *
+     * Everyone else seems to do one of the four.
+     */
+    lastlen = 0;
+    ifc_len = sizeof(struct ifreq) * DEFAULT_NUMBER_INTERFACES;
+    do {
+        ifconf.ifc_len = ifc_len;
+        ifconf.ifc_req = malloc(ifc_len);
+        if (NULL == ifconf.ifc_req) {
+            close(sd);
+            return PMIX_ERROR;
+        }
+
+        /* initialize the memory so valgrind and purify won't
+         * complain.  Since this isn't performance critical, just
+         * always memset.
+         */
+        memset(ifconf.ifc_req, 0, ifconf.ifc_len);
+
+        if (ioctl(sd, SIOCGIFCONF, &ifconf) < 0) {
+            /* if we got an einval, we probably don't have enough
+               space.  so we'll fall down and try to expand our
+               space */
+            if (errno != EINVAL && lastlen != 0) {
+                pmix_output(0, "pmix_ifinit: ioctl(SIOCGIFCONF) \
+                            failed with errno=%d",
+                            errno);
+                free(ifconf.ifc_req);
+                close(sd);
+                return PMIX_ERROR;
+            }
+        } else {
+            /* if ifc_len is 0 or different than what we set it to
+               at call to ioctl, try again with a bigger buffer.
+               else stop */
+            if (ifconf.ifc_len == lastlen && ifconf.ifc_len > 0) {
+                /* we didn't expand.  we're done */
+                successful_locate = true;
+                break;
+            }
+            lastlen = ifconf.ifc_len;
+        }
+
+        /* Yes, we overflowed (or had an EINVAL on the ioctl).
+           Loop back around and try again with a bigger buffer */
+        free(ifconf.ifc_req);
+        ifc_len = (ifc_len == 0) ? 1 : ifc_len * 2;
+    } while (ifc_len < MAX_PIFCONF_SIZE);
+    if (!successful_locate) {
+        pmix_output(0, "pmix_ifinit: unable to find network interfaces.");
+        close(sd);
+        return PMIX_ERROR;
+    }
+
+    /*
+     * Setup indexes
+     */
+    ptr = (char*) ifconf.ifc_req;
+    rem = ifconf.ifc_len;
+
+    /* loop through all interfaces */
+    while (rem > 0) {
+        struct ifreq* ifr = (struct ifreq*) ptr;
+        pmix_pif_t *intf;
+        int length;
+
+        /* compute offset for entries */
+#ifdef HAVE_STRUCT_SOCKADDR_SA_LEN
+        length = sizeof(struct sockaddr);
+
+        if (ifr->ifr_addr.sa_len > length) {
+            length = ifr->ifr_addr.sa_len;
+        }
+
+        length += sizeof(ifr->ifr_name);
+#else
+        length = sizeof(struct ifreq);
+#endif
+
+        rem -= length;
+        ptr += length;
+
+        /* see if we like this entry */
+        if (AF_INET != ifr->ifr_addr.sa_family) {
+            continue;
+        }
+
+        if (ioctl(sd, SIOCGIFFLAGS, ifr) < 0) {
+            pmix_output(0, "pmix_ifinit: ioctl(SIOCGIFFLAGS) failed with errno=%d", errno);
+            continue;
+        }
+        if ((ifr->ifr_flags & IFF_UP) == 0) {
+            continue;
+        }
+#ifdef IFF_SLAVE
+        /* Is this a slave to a load balancer or bonded channel?
+           If so, don't use it -- pick up the master instead */
+        if ((ifr->ifr_flags & IFF_SLAVE) != 0) {
+            continue;
+        }
+#endif
+#if 0
+        if (!pmix_if_retain_loopback && (ifr->ifr_flags & IFF_LOOPBACK) != 0) {
+            continue;
+        }
+#endif
+
+        intf = PMIX_NEW(pmix_pif_t);
+        if (NULL == intf) {
+            pmix_output(0, "pmix_ifinit: unable to allocated %lu bytes\n", (unsigned long)sizeof(pmix_pif_t));
+            free(ifconf.ifc_req);
+            close(sd);
+            return PMIX_ERR_OUT_OF_RESOURCE;
+        }
+        intf->af_family = AF_INET;
+
+        /* copy entry over into our data structure */
+        memset(intf->if_name, 0, sizeof(intf->if_name));
+        strncpy(intf->if_name, ifr->ifr_name, sizeof(intf->if_name) - 1);
+        intf->if_flags = ifr->ifr_flags;
+
+        /* every new address gets its own internal if_index */
+        intf->if_index = pmix_list_get_size(&pmix_if_list)+1;
+
+        pmix_output_verbose(1, pmix_pif_base_framework.framework_output,
+                            "found interface %s", intf->if_name);
+
+        /* assign the kernel index to distinguish different NICs */
+#ifndef SIOCGIFINDEX
+        intf->if_kernel_index = intf->if_index;
+#else
+        if (ioctl(sd, SIOCGIFINDEX, ifr) < 0) {
+            pmix_output(0,"pmix_ifinit: ioctl(SIOCGIFINDEX) failed with errno=%d", errno);
+            PMIX_RELEASE(intf);
+            continue;
+        }
+#if defined(ifr_ifindex)
+        intf->if_kernel_index = ifr->ifr_ifindex;
+#elif defined(ifr_index)
+        intf->if_kernel_index = ifr->ifr_index;
+#else
+        intf->if_kernel_index = -1;
+#endif
+#endif /* SIOCGIFINDEX */
+
+        /* This call returns IPv4 addresses only. Use SIOCGLIFADDR
+           instead */
+        if (ioctl(sd, SIOCGIFADDR, ifr) < 0) {
+            pmix_output(0, "pmix_ifinit: ioctl(SIOCGIFADDR) failed with errno=%d", errno);
+            PMIX_RELEASE(intf);
+            break;
+        }
+        if (AF_INET != ifr->ifr_addr.sa_family) {
+            PMIX_RELEASE(intf);
+            continue;
+        }
+
+        /* based on above, we know this is an IPv4 address... */
+        memcpy(&intf->if_addr, &ifr->ifr_addr, sizeof(struct sockaddr_in));
+
+        if (ioctl(sd, SIOCGIFNETMASK, ifr) < 0) {
+            pmix_output(0, "pmix_ifinit: ioctl(SIOCGIFNETMASK) failed with errno=%d", errno);
+            PMIX_RELEASE(intf);
+            continue;
+        }
+
+        /* generate CIDR and assign to netmask */
+        intf->if_mask = prefix(((struct sockaddr_in*) &ifr->ifr_addr)->sin_addr.s_addr);
+
+#if defined(SIOCGIFHWADDR) && defined(HAVE_STRUCT_IFREQ_IFR_HWADDR)
+        /* get the MAC address */
+        if (ioctl(sd, SIOCGIFHWADDR, ifr) < 0) {
+            pmix_output(0, "pmix_ifinit: ioctl(SIOCGIFHWADDR) failed with errno=%d", errno);
+            break;
+        }
+        memcpy(intf->if_mac, ifr->ifr_hwaddr.sa_data, 6);
+#endif
+
+#if defined(SIOCGIFMTU) && defined(HAVE_STRUCT_IFREQ_IFR_MTU)
+        /* get the MTU */
+        if (ioctl(sd, SIOCGIFMTU, ifr) < 0) {
+            pmix_output(0, "pmix_ifinit: ioctl(SIOCGIFMTU) failed with errno=%d", errno);
+            break;
+        }
+        intf->ifmtu = ifr->ifr_mtu;
+#endif
+
+        pmix_list_append(&pmix_if_list, &(intf->super));
+    }
+    free(ifconf.ifc_req);
+    close(sd);
+
+    return PMIX_SUCCESS;
+}
diff --git a/src/mca/pif/solaris_ipv6/Makefile.am b/src/mca/pif/solaris_ipv6/Makefile.am
new file mode 100644
index 0000000..9d62d2d
--- /dev/null
+++ b/src/mca/pif/solaris_ipv6/Makefile.am
@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2010     Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2016      Intel, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+noinst_LTLIBRARIES = libmca_pif_solaris_ipv6.la
+
+libmca_pif_solaris_ipv6_la_SOURCES = pif_solaris_ipv6.c
diff --git a/src/mca/pif/solaris_ipv6/Makefile.in b/src/mca/pif/solaris_ipv6/Makefile.in
new file mode 100644
index 0000000..e5a4b54
--- /dev/null
+++ b/src/mca/pif/solaris_ipv6/Makefile.in
@@ -0,0 +1,762 @@
+# Makefile.in generated by automake 1.15 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+#
+# Copyright (c) 2010     Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2016      Intel, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+subdir = src/mca/pif/solaris_ipv6
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/config/c_get_alignment.m4 \
+	$(top_srcdir)/config/libtool.m4 \
+	$(top_srcdir)/config/ltoptions.m4 \
+	$(top_srcdir)/config/ltsugar.m4 \
+	$(top_srcdir)/config/ltversion.m4 \
+	$(top_srcdir)/config/lt~obsolete.m4 \
+	$(top_srcdir)/config/pmix.m4 \
+	$(top_srcdir)/config/pmix_check_attributes.m4 \
+	$(top_srcdir)/config/pmix_check_broken_qsort.m4 \
+	$(top_srcdir)/config/pmix_check_compiler_version.m4 \
+	$(top_srcdir)/config/pmix_check_icc.m4 \
+	$(top_srcdir)/config/pmix_check_ident.m4 \
+	$(top_srcdir)/config/pmix_check_lock.m4 \
+	$(top_srcdir)/config/pmix_check_os_flavors.m4 \
+	$(top_srcdir)/config/pmix_check_package.m4 \
+	$(top_srcdir)/config/pmix_check_psm2.m4 \
+	$(top_srcdir)/config/pmix_check_pthread_pids.m4 \
+	$(top_srcdir)/config/pmix_check_vendor.m4 \
+	$(top_srcdir)/config/pmix_check_visibility.m4 \
+	$(top_srcdir)/config/pmix_check_withdir.m4 \
+	$(top_srcdir)/config/pmix_config_asm.m4 \
+	$(top_srcdir)/config/pmix_config_pthreads.m4 \
+	$(top_srcdir)/config/pmix_config_subdir.m4 \
+	$(top_srcdir)/config/pmix_config_subdir_args.m4 \
+	$(top_srcdir)/config/pmix_config_threads.m4 \
+	$(top_srcdir)/config/pmix_ensure_contains_optflags.m4 \
+	$(top_srcdir)/config/pmix_functions.m4 \
+	$(top_srcdir)/config/pmix_load_platform.m4 \
+	$(top_srcdir)/config/pmix_mca.m4 \
+	$(top_srcdir)/config/pmix_search_libs.m4 \
+	$(top_srcdir)/config/pmix_setup_cc.m4 \
+	$(top_srcdir)/config/pmix_setup_libevent.m4 \
+	$(top_srcdir)/config/pmix_setup_zlib.m4 \
+	$(top_srcdir)/config/pmix_try_assemble.m4 \
+	$(top_srcdir)/config/autogen_found_items.m4 \
+	$(top_srcdir)/src/mca/pdl/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/configure.m4 \
+	$(top_srcdir)/src/mca/pdl/pdlopen/configure.m4 \
+	$(top_srcdir)/src/mca/pdl/plibltdl/configure.m4 \
+	$(top_srcdir)/src/mca/pif/bsdx_ipv4/configure.m4 \
+	$(top_srcdir)/src/mca/pif/bsdx_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pif/linux_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pif/posix_ipv4/configure.m4 \
+	$(top_srcdir)/src/mca/pif/solaris_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/config/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/env/configure.m4 \
+	$(top_srcdir)/src/mca/pnet/opa/configure.m4 \
+	$(top_srcdir)/src/mca/psec/munge/configure.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/src/include/pmix_config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+libmca_pif_solaris_ipv6_la_LIBADD =
+am_libmca_pif_solaris_ipv6_la_OBJECTS = pif_solaris_ipv6.lo
+libmca_pif_solaris_ipv6_la_OBJECTS =  \
+	$(am_libmca_pif_solaris_ipv6_la_OBJECTS)
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/src/include
+depcomp = $(SHELL) $(top_srcdir)/./config/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libmca_pif_solaris_ipv6_la_SOURCES)
+DIST_SOURCES = $(libmca_pif_solaris_ipv6_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/./config/depcomp
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CFLAGS = @CFLAGS@
+CLEANFILES = @CLEANFILES@
+CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MCA_PROJECT_SUBDIRS = @MCA_PROJECT_SUBDIRS@
+MCA_pmix_FRAMEWORKS = @MCA_pmix_FRAMEWORKS@
+MCA_pmix_FRAMEWORKS_SUBDIRS = @MCA_pmix_FRAMEWORKS_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS@
+MCA_pmix_FRAMEWORK_LIBS = @MCA_pmix_FRAMEWORK_LIBS@
+MCA_pmix_pdl_ALL_COMPONENTS = @MCA_pmix_pdl_ALL_COMPONENTS@
+MCA_pmix_pdl_ALL_SUBDIRS = @MCA_pmix_pdl_ALL_SUBDIRS@
+MCA_pmix_pdl_DSO_COMPONENTS = @MCA_pmix_pdl_DSO_COMPONENTS@
+MCA_pmix_pdl_DSO_SUBDIRS = @MCA_pmix_pdl_DSO_SUBDIRS@
+MCA_pmix_pdl_STATIC_COMPONENTS = @MCA_pmix_pdl_STATIC_COMPONENTS@
+MCA_pmix_pdl_STATIC_LTLIBS = @MCA_pmix_pdl_STATIC_LTLIBS@
+MCA_pmix_pdl_STATIC_SUBDIRS = @MCA_pmix_pdl_STATIC_SUBDIRS@
+MCA_pmix_pif_ALL_COMPONENTS = @MCA_pmix_pif_ALL_COMPONENTS@
+MCA_pmix_pif_ALL_SUBDIRS = @MCA_pmix_pif_ALL_SUBDIRS@
+MCA_pmix_pif_DSO_COMPONENTS = @MCA_pmix_pif_DSO_COMPONENTS@
+MCA_pmix_pif_DSO_SUBDIRS = @MCA_pmix_pif_DSO_SUBDIRS@
+MCA_pmix_pif_STATIC_COMPONENTS = @MCA_pmix_pif_STATIC_COMPONENTS@
+MCA_pmix_pif_STATIC_LTLIBS = @MCA_pmix_pif_STATIC_LTLIBS@
+MCA_pmix_pif_STATIC_SUBDIRS = @MCA_pmix_pif_STATIC_SUBDIRS@
+MCA_pmix_pinstalldirs_ALL_COMPONENTS = @MCA_pmix_pinstalldirs_ALL_COMPONENTS@
+MCA_pmix_pinstalldirs_ALL_SUBDIRS = @MCA_pmix_pinstalldirs_ALL_SUBDIRS@
+MCA_pmix_pinstalldirs_DSO_COMPONENTS = @MCA_pmix_pinstalldirs_DSO_COMPONENTS@
+MCA_pmix_pinstalldirs_DSO_SUBDIRS = @MCA_pmix_pinstalldirs_DSO_SUBDIRS@
+MCA_pmix_pinstalldirs_STATIC_COMPONENTS = @MCA_pmix_pinstalldirs_STATIC_COMPONENTS@
+MCA_pmix_pinstalldirs_STATIC_LTLIBS = @MCA_pmix_pinstalldirs_STATIC_LTLIBS@
+MCA_pmix_pinstalldirs_STATIC_SUBDIRS = @MCA_pmix_pinstalldirs_STATIC_SUBDIRS@
+MCA_pmix_pnet_ALL_COMPONENTS = @MCA_pmix_pnet_ALL_COMPONENTS@
+MCA_pmix_pnet_ALL_SUBDIRS = @MCA_pmix_pnet_ALL_SUBDIRS@
+MCA_pmix_pnet_DSO_COMPONENTS = @MCA_pmix_pnet_DSO_COMPONENTS@
+MCA_pmix_pnet_DSO_SUBDIRS = @MCA_pmix_pnet_DSO_SUBDIRS@
+MCA_pmix_pnet_STATIC_COMPONENTS = @MCA_pmix_pnet_STATIC_COMPONENTS@
+MCA_pmix_pnet_STATIC_LTLIBS = @MCA_pmix_pnet_STATIC_LTLIBS@
+MCA_pmix_pnet_STATIC_SUBDIRS = @MCA_pmix_pnet_STATIC_SUBDIRS@
+MCA_pmix_psec_ALL_COMPONENTS = @MCA_pmix_psec_ALL_COMPONENTS@
+MCA_pmix_psec_ALL_SUBDIRS = @MCA_pmix_psec_ALL_SUBDIRS@
+MCA_pmix_psec_DSO_COMPONENTS = @MCA_pmix_psec_DSO_COMPONENTS@
+MCA_pmix_psec_DSO_SUBDIRS = @MCA_pmix_psec_DSO_SUBDIRS@
+MCA_pmix_psec_STATIC_COMPONENTS = @MCA_pmix_psec_STATIC_COMPONENTS@
+MCA_pmix_psec_STATIC_LTLIBS = @MCA_pmix_psec_STATIC_LTLIBS@
+MCA_pmix_psec_STATIC_SUBDIRS = @MCA_pmix_psec_STATIC_SUBDIRS@
+MCA_pmix_psensor_ALL_COMPONENTS = @MCA_pmix_psensor_ALL_COMPONENTS@
+MCA_pmix_psensor_ALL_SUBDIRS = @MCA_pmix_psensor_ALL_SUBDIRS@
+MCA_pmix_psensor_DSO_COMPONENTS = @MCA_pmix_psensor_DSO_COMPONENTS@
+MCA_pmix_psensor_DSO_SUBDIRS = @MCA_pmix_psensor_DSO_SUBDIRS@
+MCA_pmix_psensor_STATIC_COMPONENTS = @MCA_pmix_psensor_STATIC_COMPONENTS@
+MCA_pmix_psensor_STATIC_LTLIBS = @MCA_pmix_psensor_STATIC_LTLIBS@
+MCA_pmix_psensor_STATIC_SUBDIRS = @MCA_pmix_psensor_STATIC_SUBDIRS@
+MCA_pmix_ptl_ALL_COMPONENTS = @MCA_pmix_ptl_ALL_COMPONENTS@
+MCA_pmix_ptl_ALL_SUBDIRS = @MCA_pmix_ptl_ALL_SUBDIRS@
+MCA_pmix_ptl_DSO_COMPONENTS = @MCA_pmix_ptl_DSO_COMPONENTS@
+MCA_pmix_ptl_DSO_SUBDIRS = @MCA_pmix_ptl_DSO_SUBDIRS@
+MCA_pmix_ptl_STATIC_COMPONENTS = @MCA_pmix_ptl_STATIC_COMPONENTS@
+MCA_pmix_ptl_STATIC_LTLIBS = @MCA_pmix_ptl_STATIC_LTLIBS@
+MCA_pmix_ptl_STATIC_SUBDIRS = @MCA_pmix_ptl_STATIC_SUBDIRS@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PMIX_ASM_GSYM = @PMIX_ASM_GSYM@
+PMIX_ASM_LSYM = @PMIX_ASM_LSYM@
+PMIX_ASM_SUPPORT_64BIT = @PMIX_ASM_SUPPORT_64BIT@
+PMIX_ASM_TEXT = @PMIX_ASM_TEXT@
+PMIX_ASM_TYPE = @PMIX_ASM_TYPE@
+PMIX_ASSEMBLY_ARCH = @PMIX_ASSEMBLY_ARCH@
+PMIX_ASSEMBLY_BUILTIN = @PMIX_ASSEMBLY_BUILTIN@
+PMIX_ASSEMBLY_FORMAT = @PMIX_ASSEMBLY_FORMAT@
+PMIX_AS_GLOBAL = @PMIX_AS_GLOBAL@
+PMIX_AS_LABEL_SUFFIX = @PMIX_AS_LABEL_SUFFIX@
+PMIX_CC_ABSOLUTE = @PMIX_CC_ABSOLUTE@
+PMIX_CONFIGURE_DATE = @PMIX_CONFIGURE_DATE@
+PMIX_CONFIGURE_HOST = @PMIX_CONFIGURE_HOST@
+PMIX_CONFIGURE_USER = @PMIX_CONFIGURE_USER@
+PMIX_EMBEDDED_CPPFLAGS = @PMIX_EMBEDDED_CPPFLAGS@
+PMIX_EMBEDDED_LDFLAGS = @PMIX_EMBEDDED_LDFLAGS@
+PMIX_EMBEDDED_LIBS = @PMIX_EMBEDDED_LIBS@
+PMIX_MAJOR_VERSION = @PMIX_MAJOR_VERSION@
+PMIX_MINOR_VERSION = @PMIX_MINOR_VERSION@
+PMIX_RELEASE_DATE = @PMIX_RELEASE_DATE@
+PMIX_RELEASE_VERSION = @PMIX_RELEASE_VERSION@
+PMIX_RENAME = @PMIX_RENAME@
+PMIX_VERSION = @PMIX_VERSION@
+PMIX_top_builddir = @PMIX_top_builddir@
+PMIX_top_srcdir = @PMIX_top_srcdir@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_prefix_program = @ac_prefix_program@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+libpmix_so_version = @libpmix_so_version@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pmix_have_pandoc = @pmix_have_pandoc@
+pmix_pdl_pdlopen_LIBS = @pmix_pdl_pdlopen_LIBS@
+pmix_pdl_plibltdl_CPPFLAGS = @pmix_pdl_plibltdl_CPPFLAGS@
+pmix_pdl_plibltdl_LDFLAGS = @pmix_pdl_plibltdl_LDFLAGS@
+pmix_pdl_plibltdl_LIBS = @pmix_pdl_plibltdl_LIBS@
+pmixdatadir = @pmixdatadir@
+pmixincludedir = @pmixincludedir@
+pmixlibdir = @pmixlibdir@
+pmixmajor = @pmixmajor@
+pmixminor = @pmixminor@
+pnet_opa_CFLAGS = @pnet_opa_CFLAGS@
+pnet_opa_CPPFLAGS = @pnet_opa_CPPFLAGS@
+pnet_opa_LDFLAGS = @pnet_opa_LDFLAGS@
+pnet_opa_LIBS = @pnet_opa_LIBS@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+psec_munge_CPPFLAGS = @psec_munge_CPPFLAGS@
+psec_munge_LDFLAGS = @psec_munge_LDFLAGS@
+psec_munge_LIBS = @psec_munge_LIBS@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+noinst_LTLIBRARIES = libmca_pif_solaris_ipv6.la
+libmca_pif_solaris_ipv6_la_SOURCES = pif_solaris_ipv6.c
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/mca/pif/solaris_ipv6/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/mca/pif/solaris_ipv6/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_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}; \
+	}
+
+libmca_pif_solaris_ipv6.la: $(libmca_pif_solaris_ipv6_la_OBJECTS) $(libmca_pif_solaris_ipv6_la_DEPENDENCIES) $(EXTRA_libmca_pif_solaris_ipv6_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(LINK)  $(libmca_pif_solaris_ipv6_la_OBJECTS) $(libmca_pif_solaris_ipv6_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pif_solaris_ipv6.Plo at am__quote@
+
+.c.o:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+ at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstLTLIBRARIES 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-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
+
+.PRECIOUS: Makefile
+
+
+# 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/mca/pif/solaris_ipv6/configure.m4 b/src/mca/pif/solaris_ipv6/configure.m4
new file mode 100644
index 0000000..df109d5
--- /dev/null
+++ b/src/mca/pif/solaris_ipv6/configure.m4
@@ -0,0 +1,32 @@
+# -*- shell-script -*-
+#
+# Copyright (c) 2010      Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2016      Intel, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+AC_DEFUN([MCA_pmix_pif_solaris_ipv6_COMPILE_MODE], [
+    AC_MSG_CHECKING([for MCA component $1:$2 compile mode])
+    $3="static"
+    AC_MSG_RESULT([$$3])
+])
+
+# MCA_pif_config_CONFIG(action-if-can-compile,
+#                        [action-if-cant-compile])
+# ------------------------------------------------
+AC_DEFUN([MCA_pmix_pif_solaris_ipv6_CONFIG], [
+    AC_CONFIG_FILES([src/mca/pif/solaris_ipv6/Makefile])
+
+    AC_REQUIRE([PMIX_CHECK_OS_FLAVORS])
+
+    # check to see if we are on a solaris machine
+    AS_IF([test "$pmix_found_sun" = "yes"], [$1], [$2])
+])dnl
+
+#
+# ifdef __sun__
+#
diff --git a/src/mca/pif/solaris_ipv6/pif_solaris_ipv6.c b/src/mca/pif/solaris_ipv6/pif_solaris_ipv6.c
new file mode 100644
index 0000000..7403ceb
--- /dev/null
+++ b/src/mca/pif/solaris_ipv6/pif_solaris_ipv6.c
@@ -0,0 +1,212 @@
+/*
+ * Copyright (c) 2010      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2010      Oracle and/or its affiliates.  All rights reserved.
+ * Copyright (c) 2016      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2016      Intel, Inc.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include "pmix_config.h"
+#include "pmix_common.h"
+
+#include <string.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#include <errno.h>
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_SYS_SOCKIO_H
+#include <sys/sockio.h>
+#endif
+#ifdef HAVE_SYS_IOCTL_H
+#include <sys/ioctl.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif
+#ifdef HAVE_NET_IF_H
+#if defined(__APPLE__) && defined(_LP64)
+/* Apple engineering suggested using options align=power as a
+   workaround for a bug in OS X 10.4 (Tiger) that prevented ioctl(...,
+   SIOCGIFCONF, ...) from working properly in 64 bit mode on Power PC.
+   It turns out that the underlying issue is the size of struct
+   ifconf, which the kernel expects to be 12 and natural 64 bit
+   alignment would make 16.  The same bug appears in 64 bit mode on
+   Intel macs, but align=power is a no-op there, so instead, use the
+   pack pragma to instruct the compiler to pack on 4 byte words, which
+   has the same effect as align=power for our needs and works on both
+   Intel and Power PC Macs. */
+#pragma pack(push,4)
+#endif
+#include <net/if.h>
+#if defined(__APPLE__) && defined(_LP64)
+#pragma pack(pop)
+#endif
+#endif
+#ifdef HAVE_NETDB_H
+#include <netdb.h>
+#endif
+#ifdef HAVE_IFADDRS_H
+#include <ifaddrs.h>
+#endif
+
+#include "src/util/output.h"
+#include "src/util/pif.h"
+#include "src/mca/pif/pif.h"
+#include "src/mca/pif/base/base.h"
+
+static int if_solaris_ipv6_open(void);
+
+/* Discovers Solaris IPv6 interfaces */
+pmix_pif_base_component_t mca_pif_solaris_ipv6_component = {
+    /* First, the mca_component_t struct containing meta information
+       about the component itself */
+    .base = {
+        PMIX_PIF_BASE_VERSION_2_0_0,
+
+        /* Component name and version */
+        "solaris_ipv6",
+        PMIX_MAJOR_VERSION,
+        PMIX_MINOR_VERSION,
+        PMIX_RELEASE_VERSION,
+
+        /* Component open and close functions */
+        if_solaris_ipv6_open,
+        NULL
+    },
+    .data = {
+        /* This component is checkpointable */
+        PMIX_MCA_BASE_METADATA_PARAM_CHECKPOINT
+    },
+};
+
+/* configure using getifaddrs(3) */
+static int if_solaris_ipv6_open(void)
+{
+    int i;
+    int sd;
+    int error;
+    uint16_t kindex;
+    struct lifnum lifnum;
+    struct lifconf lifconf;
+    struct lifreq *lifreq, lifquery;
+
+    sd = socket (AF_INET6, SOCK_DGRAM, 0);
+    if (sd < 0) {
+        pmix_output (0, "pmix_ifinit: unable to open IPv6 socket\n");
+        return PMIX_ERROR;
+    }
+
+    /* we only ask for IPv6; IPv4 discovery has already been done */
+    lifnum.lifn_family = AF_INET6;
+    lifnum.lifn_flags = 0;
+    lifnum.lifn_count = 0;
+
+    /* get the number of interfaces in the system */
+    error = ioctl (sd, SIOCGLIFNUM, &lifnum);
+    if (error < 0) {
+        pmix_output (0,
+                     "pmix_ifinit: ioctl SIOCGLIFNUM failed with errno=%d\n", errno);
+        return PMIX_ERROR;
+    }
+
+    memset (&lifconf, 0, sizeof (struct lifconf));
+    memset (&lifquery, 0, sizeof (struct lifreq));
+    lifconf.lifc_family = AF_INET6;
+    lifconf.lifc_flags = 0;
+    lifconf.lifc_len = lifnum.lifn_count * sizeof (struct lifreq) * 2;
+    lifconf.lifc_buf = malloc (lifconf.lifc_len);
+    if (NULL == lifconf.lifc_buf) {
+        pmix_output (0, "pmix_ifinit: IPv6 discovery: malloc() failed\n");
+        return PMIX_ERR_OUT_OF_RESOURCE;
+    }
+
+    memset (lifconf.lifc_buf, 0, lifconf.lifc_len);
+
+    error = ioctl (sd, SIOCGLIFCONF, &lifconf);
+    if (error < 0) {
+        pmix_output (0,
+                     "pmix_ifinit: IPv6 SIOCGLIFCONF failed with errno=%d\n", errno);
+    }
+
+    for (i = 0; i + sizeof (struct lifreq) <= lifconf.lifc_len;
+         i += sizeof (*lifreq)) {
+
+        lifreq = (struct lifreq *)((caddr_t)lifconf.lifc_buf + i);
+        strncpy (lifquery.lifr_name, lifreq->lifr_name,
+                 sizeof (lifquery.lifr_name));
+
+        /* lookup kernel index */
+        error = ioctl (sd, SIOCGLIFINDEX, &lifquery);
+        if (error < 0) {
+            pmix_output (0,
+                         "pmix_ifinit: SIOCGLIFINDEX failed with errno=%d\n", errno);
+            return PMIX_ERROR;
+        }
+        kindex = lifquery.lifr_index;
+
+        /* lookup interface flags */
+        error = ioctl (sd, SIOCGLIFFLAGS, &lifquery);
+        if (error < 0) {
+            pmix_output (0,
+                         "pmix_ifinit: SIOCGLIFFLAGS failed with errno=%d\n", errno);
+            return PMIX_ERROR;
+        }
+
+        if (AF_INET6 == lifreq->lifr_addr.ss_family) {
+            struct sockaddr_in6* my_addr = (struct sockaddr_in6*) &lifreq->lifr_addr;
+            /* we surely want to check for sin6_scope_id, but Solaris
+               does not set it correctly, so we have to look for
+               global scope. For now, global is anything which is
+               neither loopback nor link local.
+
+               Bug, FIXME: site-local, multicast, ... missing
+               Check for 2000::/3?
+            */
+            if ( (!pmix_if_retain_loopback && !IN6_IS_ADDR_LOOPBACK (&my_addr->sin6_addr)) &&
+                 (! IN6_IS_ADDR_LINKLOCAL (&my_addr->sin6_addr))) {
+                /* create interface for newly found address */
+                pmix_pif_t *intf;
+
+                intf = PMIX_NEW(pmix_pif_t);
+                if (NULL == intf) {
+                    pmix_output (0,
+                                 "pmix_ifinit: unable to allocate %d bytes\n",
+                                 sizeof (pmix_pif_t));
+                    return PMIX_ERR_OUT_OF_RESOURCE;
+                }
+                intf->af_family = AF_INET6;
+
+                strncpy (intf->if_name, lifreq->lifr_name, IF_NAMESIZE);
+                intf->if_index = pmix_list_get_size(&pmix_if_list)+1;
+                memcpy(&intf->if_addr, my_addr, sizeof (*my_addr));
+                intf->if_mask = 64;
+                /* lifrq flags are uint64_t */
+                intf->if_flags =
+                    (uint32_t)(0x00000000ffffffff) & lifquery.lifr_flags;
+
+                /* append to list */
+                pmix_list_append (&pmix_if_list, &(intf->super));
+            }
+        }
+    } /* for */
+
+    if (NULL != lifconf.lifc_buf) {
+        free (lifconf.lifc_buf);
+    }
+
+    return PMIX_SUCCESS;
+}
diff --git a/src/mca/pinstalldirs/Makefile.am b/src/mca/pinstalldirs/Makefile.am
new file mode 100644
index 0000000..deaa8fe
--- /dev/null
+++ b/src/mca/pinstalldirs/Makefile.am
@@ -0,0 +1,30 @@
+#
+# Copyright (c) 2006      Los Alamos National Security, LLC.  All rights
+#                         reserved.
+# Copyright (c) 2010      Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2016      Intel, Inc. All rights reserved
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# main library setup
+noinst_LTLIBRARIES = libmca_pinstalldirs.la
+libmca_pinstalldirs_la_SOURCES =
+
+# local files
+headers = pinstalldirs.h
+libmca_pinstalldirs_la_SOURCES += $(headers)
+
+# Conditionally install the header files
+if WANT_INSTALL_HEADERS
+pmixdir = $(pmixincludedir)/$(subdir)
+nobase_pmix_HEADERS = $(headers)
+endif
+
+include base/Makefile.am
+
+distclean-local:
+	rm -f base/static-components.h
diff --git a/src/mca/pinstalldirs/Makefile.in b/src/mca/pinstalldirs/Makefile.in
new file mode 100644
index 0000000..3462060
--- /dev/null
+++ b/src/mca/pinstalldirs/Makefile.in
@@ -0,0 +1,870 @@
+# Makefile.in generated by automake 1.15 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+#
+# Copyright (c) 2006      Los Alamos National Security, LLC.  All rights
+#                         reserved.
+# Copyright (c) 2010      Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2016      Intel, Inc. All rights reserved
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+#
+# Copyright (c) 2006      Los Alamos National Security, LLC.  All rights
+#                         reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+subdir = src/mca/pinstalldirs
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/config/c_get_alignment.m4 \
+	$(top_srcdir)/config/libtool.m4 \
+	$(top_srcdir)/config/ltoptions.m4 \
+	$(top_srcdir)/config/ltsugar.m4 \
+	$(top_srcdir)/config/ltversion.m4 \
+	$(top_srcdir)/config/lt~obsolete.m4 \
+	$(top_srcdir)/config/pmix.m4 \
+	$(top_srcdir)/config/pmix_check_attributes.m4 \
+	$(top_srcdir)/config/pmix_check_broken_qsort.m4 \
+	$(top_srcdir)/config/pmix_check_compiler_version.m4 \
+	$(top_srcdir)/config/pmix_check_icc.m4 \
+	$(top_srcdir)/config/pmix_check_ident.m4 \
+	$(top_srcdir)/config/pmix_check_lock.m4 \
+	$(top_srcdir)/config/pmix_check_os_flavors.m4 \
+	$(top_srcdir)/config/pmix_check_package.m4 \
+	$(top_srcdir)/config/pmix_check_psm2.m4 \
+	$(top_srcdir)/config/pmix_check_pthread_pids.m4 \
+	$(top_srcdir)/config/pmix_check_vendor.m4 \
+	$(top_srcdir)/config/pmix_check_visibility.m4 \
+	$(top_srcdir)/config/pmix_check_withdir.m4 \
+	$(top_srcdir)/config/pmix_config_asm.m4 \
+	$(top_srcdir)/config/pmix_config_pthreads.m4 \
+	$(top_srcdir)/config/pmix_config_subdir.m4 \
+	$(top_srcdir)/config/pmix_config_subdir_args.m4 \
+	$(top_srcdir)/config/pmix_config_threads.m4 \
+	$(top_srcdir)/config/pmix_ensure_contains_optflags.m4 \
+	$(top_srcdir)/config/pmix_functions.m4 \
+	$(top_srcdir)/config/pmix_load_platform.m4 \
+	$(top_srcdir)/config/pmix_mca.m4 \
+	$(top_srcdir)/config/pmix_search_libs.m4 \
+	$(top_srcdir)/config/pmix_setup_cc.m4 \
+	$(top_srcdir)/config/pmix_setup_libevent.m4 \
+	$(top_srcdir)/config/pmix_setup_zlib.m4 \
+	$(top_srcdir)/config/pmix_try_assemble.m4 \
+	$(top_srcdir)/config/autogen_found_items.m4 \
+	$(top_srcdir)/src/mca/pdl/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/configure.m4 \
+	$(top_srcdir)/src/mca/pdl/pdlopen/configure.m4 \
+	$(top_srcdir)/src/mca/pdl/plibltdl/configure.m4 \
+	$(top_srcdir)/src/mca/pif/bsdx_ipv4/configure.m4 \
+	$(top_srcdir)/src/mca/pif/bsdx_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pif/linux_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pif/posix_ipv4/configure.m4 \
+	$(top_srcdir)/src/mca/pif/solaris_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/config/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/env/configure.m4 \
+	$(top_srcdir)/src/mca/pnet/opa/configure.m4 \
+	$(top_srcdir)/src/mca/psec/munge/configure.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__nobase_pmix_HEADERS_DIST) \
+	$(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/src/include/pmix_config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+libmca_pinstalldirs_la_LIBADD =
+am__objects_1 =
+am__dirstamp = $(am__leading_dot)dirstamp
+am_libmca_pinstalldirs_la_OBJECTS = $(am__objects_1) \
+	base/pinstalldirs_base_components.lo \
+	base/pinstalldirs_base_expand.lo
+libmca_pinstalldirs_la_OBJECTS = $(am_libmca_pinstalldirs_la_OBJECTS)
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/src/include
+depcomp = $(SHELL) $(top_srcdir)/./config/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libmca_pinstalldirs_la_SOURCES)
+DIST_SOURCES = $(libmca_pinstalldirs_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__nobase_pmix_HEADERS_DIST = pinstalldirs.h base/base.h
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(pmixdir)"
+HEADERS = $(nobase_pmix_HEADERS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/base/Makefile.am \
+	$(top_srcdir)/./config/depcomp
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CFLAGS = @CFLAGS@
+CLEANFILES = @CLEANFILES@
+CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MCA_PROJECT_SUBDIRS = @MCA_PROJECT_SUBDIRS@
+MCA_pmix_FRAMEWORKS = @MCA_pmix_FRAMEWORKS@
+MCA_pmix_FRAMEWORKS_SUBDIRS = @MCA_pmix_FRAMEWORKS_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS@
+MCA_pmix_FRAMEWORK_LIBS = @MCA_pmix_FRAMEWORK_LIBS@
+MCA_pmix_pdl_ALL_COMPONENTS = @MCA_pmix_pdl_ALL_COMPONENTS@
+MCA_pmix_pdl_ALL_SUBDIRS = @MCA_pmix_pdl_ALL_SUBDIRS@
+MCA_pmix_pdl_DSO_COMPONENTS = @MCA_pmix_pdl_DSO_COMPONENTS@
+MCA_pmix_pdl_DSO_SUBDIRS = @MCA_pmix_pdl_DSO_SUBDIRS@
+MCA_pmix_pdl_STATIC_COMPONENTS = @MCA_pmix_pdl_STATIC_COMPONENTS@
+MCA_pmix_pdl_STATIC_LTLIBS = @MCA_pmix_pdl_STATIC_LTLIBS@
+MCA_pmix_pdl_STATIC_SUBDIRS = @MCA_pmix_pdl_STATIC_SUBDIRS@
+MCA_pmix_pif_ALL_COMPONENTS = @MCA_pmix_pif_ALL_COMPONENTS@
+MCA_pmix_pif_ALL_SUBDIRS = @MCA_pmix_pif_ALL_SUBDIRS@
+MCA_pmix_pif_DSO_COMPONENTS = @MCA_pmix_pif_DSO_COMPONENTS@
+MCA_pmix_pif_DSO_SUBDIRS = @MCA_pmix_pif_DSO_SUBDIRS@
+MCA_pmix_pif_STATIC_COMPONENTS = @MCA_pmix_pif_STATIC_COMPONENTS@
+MCA_pmix_pif_STATIC_LTLIBS = @MCA_pmix_pif_STATIC_LTLIBS@
+MCA_pmix_pif_STATIC_SUBDIRS = @MCA_pmix_pif_STATIC_SUBDIRS@
+MCA_pmix_pinstalldirs_ALL_COMPONENTS = @MCA_pmix_pinstalldirs_ALL_COMPONENTS@
+MCA_pmix_pinstalldirs_ALL_SUBDIRS = @MCA_pmix_pinstalldirs_ALL_SUBDIRS@
+MCA_pmix_pinstalldirs_DSO_COMPONENTS = @MCA_pmix_pinstalldirs_DSO_COMPONENTS@
+MCA_pmix_pinstalldirs_DSO_SUBDIRS = @MCA_pmix_pinstalldirs_DSO_SUBDIRS@
+MCA_pmix_pinstalldirs_STATIC_COMPONENTS = @MCA_pmix_pinstalldirs_STATIC_COMPONENTS@
+MCA_pmix_pinstalldirs_STATIC_LTLIBS = @MCA_pmix_pinstalldirs_STATIC_LTLIBS@
+MCA_pmix_pinstalldirs_STATIC_SUBDIRS = @MCA_pmix_pinstalldirs_STATIC_SUBDIRS@
+MCA_pmix_pnet_ALL_COMPONENTS = @MCA_pmix_pnet_ALL_COMPONENTS@
+MCA_pmix_pnet_ALL_SUBDIRS = @MCA_pmix_pnet_ALL_SUBDIRS@
+MCA_pmix_pnet_DSO_COMPONENTS = @MCA_pmix_pnet_DSO_COMPONENTS@
+MCA_pmix_pnet_DSO_SUBDIRS = @MCA_pmix_pnet_DSO_SUBDIRS@
+MCA_pmix_pnet_STATIC_COMPONENTS = @MCA_pmix_pnet_STATIC_COMPONENTS@
+MCA_pmix_pnet_STATIC_LTLIBS = @MCA_pmix_pnet_STATIC_LTLIBS@
+MCA_pmix_pnet_STATIC_SUBDIRS = @MCA_pmix_pnet_STATIC_SUBDIRS@
+MCA_pmix_psec_ALL_COMPONENTS = @MCA_pmix_psec_ALL_COMPONENTS@
+MCA_pmix_psec_ALL_SUBDIRS = @MCA_pmix_psec_ALL_SUBDIRS@
+MCA_pmix_psec_DSO_COMPONENTS = @MCA_pmix_psec_DSO_COMPONENTS@
+MCA_pmix_psec_DSO_SUBDIRS = @MCA_pmix_psec_DSO_SUBDIRS@
+MCA_pmix_psec_STATIC_COMPONENTS = @MCA_pmix_psec_STATIC_COMPONENTS@
+MCA_pmix_psec_STATIC_LTLIBS = @MCA_pmix_psec_STATIC_LTLIBS@
+MCA_pmix_psec_STATIC_SUBDIRS = @MCA_pmix_psec_STATIC_SUBDIRS@
+MCA_pmix_psensor_ALL_COMPONENTS = @MCA_pmix_psensor_ALL_COMPONENTS@
+MCA_pmix_psensor_ALL_SUBDIRS = @MCA_pmix_psensor_ALL_SUBDIRS@
+MCA_pmix_psensor_DSO_COMPONENTS = @MCA_pmix_psensor_DSO_COMPONENTS@
+MCA_pmix_psensor_DSO_SUBDIRS = @MCA_pmix_psensor_DSO_SUBDIRS@
+MCA_pmix_psensor_STATIC_COMPONENTS = @MCA_pmix_psensor_STATIC_COMPONENTS@
+MCA_pmix_psensor_STATIC_LTLIBS = @MCA_pmix_psensor_STATIC_LTLIBS@
+MCA_pmix_psensor_STATIC_SUBDIRS = @MCA_pmix_psensor_STATIC_SUBDIRS@
+MCA_pmix_ptl_ALL_COMPONENTS = @MCA_pmix_ptl_ALL_COMPONENTS@
+MCA_pmix_ptl_ALL_SUBDIRS = @MCA_pmix_ptl_ALL_SUBDIRS@
+MCA_pmix_ptl_DSO_COMPONENTS = @MCA_pmix_ptl_DSO_COMPONENTS@
+MCA_pmix_ptl_DSO_SUBDIRS = @MCA_pmix_ptl_DSO_SUBDIRS@
+MCA_pmix_ptl_STATIC_COMPONENTS = @MCA_pmix_ptl_STATIC_COMPONENTS@
+MCA_pmix_ptl_STATIC_LTLIBS = @MCA_pmix_ptl_STATIC_LTLIBS@
+MCA_pmix_ptl_STATIC_SUBDIRS = @MCA_pmix_ptl_STATIC_SUBDIRS@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PMIX_ASM_GSYM = @PMIX_ASM_GSYM@
+PMIX_ASM_LSYM = @PMIX_ASM_LSYM@
+PMIX_ASM_SUPPORT_64BIT = @PMIX_ASM_SUPPORT_64BIT@
+PMIX_ASM_TEXT = @PMIX_ASM_TEXT@
+PMIX_ASM_TYPE = @PMIX_ASM_TYPE@
+PMIX_ASSEMBLY_ARCH = @PMIX_ASSEMBLY_ARCH@
+PMIX_ASSEMBLY_BUILTIN = @PMIX_ASSEMBLY_BUILTIN@
+PMIX_ASSEMBLY_FORMAT = @PMIX_ASSEMBLY_FORMAT@
+PMIX_AS_GLOBAL = @PMIX_AS_GLOBAL@
+PMIX_AS_LABEL_SUFFIX = @PMIX_AS_LABEL_SUFFIX@
+PMIX_CC_ABSOLUTE = @PMIX_CC_ABSOLUTE@
+PMIX_CONFIGURE_DATE = @PMIX_CONFIGURE_DATE@
+PMIX_CONFIGURE_HOST = @PMIX_CONFIGURE_HOST@
+PMIX_CONFIGURE_USER = @PMIX_CONFIGURE_USER@
+PMIX_EMBEDDED_CPPFLAGS = @PMIX_EMBEDDED_CPPFLAGS@
+PMIX_EMBEDDED_LDFLAGS = @PMIX_EMBEDDED_LDFLAGS@
+PMIX_EMBEDDED_LIBS = @PMIX_EMBEDDED_LIBS@
+PMIX_MAJOR_VERSION = @PMIX_MAJOR_VERSION@
+PMIX_MINOR_VERSION = @PMIX_MINOR_VERSION@
+PMIX_RELEASE_DATE = @PMIX_RELEASE_DATE@
+PMIX_RELEASE_VERSION = @PMIX_RELEASE_VERSION@
+PMIX_RENAME = @PMIX_RENAME@
+PMIX_VERSION = @PMIX_VERSION@
+PMIX_top_builddir = @PMIX_top_builddir@
+PMIX_top_srcdir = @PMIX_top_srcdir@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_prefix_program = @ac_prefix_program@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+libpmix_so_version = @libpmix_so_version@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pmix_have_pandoc = @pmix_have_pandoc@
+pmix_pdl_pdlopen_LIBS = @pmix_pdl_pdlopen_LIBS@
+pmix_pdl_plibltdl_CPPFLAGS = @pmix_pdl_plibltdl_CPPFLAGS@
+pmix_pdl_plibltdl_LDFLAGS = @pmix_pdl_plibltdl_LDFLAGS@
+pmix_pdl_plibltdl_LIBS = @pmix_pdl_plibltdl_LIBS@
+pmixdatadir = @pmixdatadir@
+pmixincludedir = @pmixincludedir@
+pmixlibdir = @pmixlibdir@
+pmixmajor = @pmixmajor@
+pmixminor = @pmixminor@
+pnet_opa_CFLAGS = @pnet_opa_CFLAGS@
+pnet_opa_CPPFLAGS = @pnet_opa_CPPFLAGS@
+pnet_opa_LDFLAGS = @pnet_opa_LDFLAGS@
+pnet_opa_LIBS = @pnet_opa_LIBS@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+psec_munge_CPPFLAGS = @psec_munge_CPPFLAGS@
+psec_munge_LDFLAGS = @psec_munge_LDFLAGS@
+psec_munge_LIBS = @psec_munge_LIBS@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+
+# main library setup
+noinst_LTLIBRARIES = libmca_pinstalldirs.la
+libmca_pinstalldirs_la_SOURCES = $(headers) \
+	base/pinstalldirs_base_components.c \
+	base/pinstalldirs_base_expand.c
+
+# local files
+headers = pinstalldirs.h base/base.h
+
+# Conditionally install the header files
+ at WANT_INSTALL_HEADERS_TRUE@pmixdir = $(pmixincludedir)/$(subdir)
+ at WANT_INSTALL_HEADERS_TRUE@nobase_pmix_HEADERS = $(headers)
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/base/Makefile.am $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/mca/pinstalldirs/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/mca/pinstalldirs/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+$(srcdir)/base/Makefile.am $(am__empty):
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_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}; \
+	}
+base/$(am__dirstamp):
+	@$(MKDIR_P) base
+	@: > base/$(am__dirstamp)
+base/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) base/$(DEPDIR)
+	@: > base/$(DEPDIR)/$(am__dirstamp)
+base/pinstalldirs_base_components.lo: base/$(am__dirstamp) \
+	base/$(DEPDIR)/$(am__dirstamp)
+base/pinstalldirs_base_expand.lo: base/$(am__dirstamp) \
+	base/$(DEPDIR)/$(am__dirstamp)
+
+libmca_pinstalldirs.la: $(libmca_pinstalldirs_la_OBJECTS) $(libmca_pinstalldirs_la_DEPENDENCIES) $(EXTRA_libmca_pinstalldirs_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(LINK)  $(libmca_pinstalldirs_la_OBJECTS) $(libmca_pinstalldirs_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+	-rm -f base/*.$(OBJEXT)
+	-rm -f base/*.lo
+
+distclean-compile:
+	-rm -f *.tab.c
+
+ at AMDEP_TRUE@@am__include@ @am__quote at base/$(DEPDIR)/pinstalldirs_base_components.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at base/$(DEPDIR)/pinstalldirs_base_expand.Plo at am__quote@
+
+.c.o:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+ at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+	-rm -rf base/.libs base/_libs
+install-nobase_pmixHEADERS: $(nobase_pmix_HEADERS)
+	@$(NORMAL_INSTALL)
+	@list='$(nobase_pmix_HEADERS)'; test -n "$(pmixdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(pmixdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(pmixdir)" || exit 1; \
+	fi; \
+	$(am__nobase_list) | while read dir files; do \
+	  xfiles=; for file in $$files; do \
+	    if test -f "$$file"; then xfiles="$$xfiles $$file"; \
+	    else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \
+	  test -z "$$xfiles" || { \
+	    test "x$$dir" = x. || { \
+	      echo " $(MKDIR_P) '$(DESTDIR)$(pmixdir)/$$dir'"; \
+	      $(MKDIR_P) "$(DESTDIR)$(pmixdir)/$$dir"; }; \
+	    echo " $(INSTALL_HEADER) $$xfiles '$(DESTDIR)$(pmixdir)/$$dir'"; \
+	    $(INSTALL_HEADER) $$xfiles "$(DESTDIR)$(pmixdir)/$$dir" || exit $$?; }; \
+	done
+
+uninstall-nobase_pmixHEADERS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(nobase_pmix_HEADERS)'; test -n "$(pmixdir)" || list=; \
+	$(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \
+	dir='$(DESTDIR)$(pmixdir)'; $(am__uninstall_files_from_dir)
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES) $(HEADERS)
+installdirs:
+	for dir in "$(DESTDIR)$(pmixdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+	-rm -f base/$(DEPDIR)/$(am__dirstamp)
+	-rm -f base/$(am__dirstamp)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf base/$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-local distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-nobase_pmixHEADERS
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf base/$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-nobase_pmixHEADERS
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-local 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-nobase_pmixHEADERS install-pdf install-pdf-am \
+	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-nobase_pmixHEADERS
+
+.PRECIOUS: Makefile
+
+
+distclean-local:
+	rm -f base/static-components.h
+
+# 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/mca/pinstalldirs/base/Makefile.am b/src/mca/pinstalldirs/base/Makefile.am
new file mode 100644
index 0000000..1617f56
--- /dev/null
+++ b/src/mca/pinstalldirs/base/Makefile.am
@@ -0,0 +1,16 @@
+#
+# Copyright (c) 2006      Los Alamos National Security, LLC.  All rights
+#                         reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+headers += \
+        base/base.h
+
+libmca_pinstalldirs_la_SOURCES += \
+        base/pinstalldirs_base_components.c \
+        base/pinstalldirs_base_expand.c
diff --git a/src/mca/pinstalldirs/base/base.h b/src/mca/pinstalldirs/base/base.h
new file mode 100644
index 0000000..a7592f0
--- /dev/null
+++ b/src/mca/pinstalldirs/base/base.h
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2006-2013 Los Alamos National Security, LLC.  All rights
+ *                         reserved.
+ * Copyright (c) 2007-2010 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2010      Sandia National Laboratories. All rights reserved.
+ * Copyright (c) 2016      Intel, Inc. All rights reserved
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ *
+ */
+
+#ifndef PMIX_PINSTALLDIRS_BASE_H
+#define PMIX_PINSTALLDIRS_BASE_H
+
+#include <src/include/pmix_config.h>
+#include "src/mca/base/pmix_mca_base_framework.h"
+#include "src/mca/pinstalldirs/pinstalldirs.h"
+
+/*
+ * Global functions for MCA overall pinstalldirs open and close
+ */
+BEGIN_C_DECLS
+
+/**
+ * Framework structure declaration
+ */
+extern pmix_mca_base_framework_t pmix_pinstalldirs_base_framework;
+
+/* Just like pmix_pinstall_dirs_expand() (see pinstalldirs.h), but will
+   also insert the value of the environment variable $PMIX_DESTDIR, if
+   it exists/is set.  This function should *only* be used during the
+   setup routines of pinstalldirs. */
+char * pmix_pinstall_dirs_expand_setup(const char* input);
+
+END_C_DECLS
+
+#endif /* PMIX_BASE_PINSTALLDIRS_H */
diff --git a/src/mca/pinstalldirs/base/pinstalldirs_base_components.c b/src/mca/pinstalldirs/base/pinstalldirs_base_components.c
new file mode 100644
index 0000000..5a89028
--- /dev/null
+++ b/src/mca/pinstalldirs/base/pinstalldirs_base_components.c
@@ -0,0 +1,177 @@
+/*
+ * Copyright (c) 2006-2012 Los Alamos National Security, LLC.  All rights
+ *                         reserved.
+ * Copyright (c) 2007      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2010      Sandia National Laboratories. All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2016      Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ *
+ */
+
+#include <src/include/pmix_config.h>
+
+#include "pmix_common.h"
+#include "src/mca/mca.h"
+#include "src/mca/pinstalldirs/pinstalldirs.h"
+#include "src/mca/pinstalldirs/base/base.h"
+#include "src/mca/pinstalldirs/base/static-components.h"
+
+pmix_pinstall_dirs_t pmix_pinstall_dirs = {0};
+
+#define CONDITIONAL_COPY(target, origin, field)                 \
+    do {                                                        \
+        if (origin.field != NULL && target.field == NULL) {     \
+            target.field = origin.field;                        \
+        }                                                       \
+    } while (0)
+
+static int
+pmix_pinstalldirs_base_open(pmix_mca_base_open_flag_t flags)
+{
+    pmix_mca_base_component_list_item_t *component_item;
+    int ret;
+
+    ret = pmix_mca_base_framework_components_open(&pmix_pinstalldirs_base_framework, flags);
+    if (PMIX_SUCCESS != ret) {
+        return ret;
+    }
+
+    PMIX_LIST_FOREACH(component_item, &pmix_pinstalldirs_base_framework.framework_components, pmix_mca_base_component_list_item_t) {
+        const pmix_pinstalldirs_base_component_t *component =
+            (const pmix_pinstalldirs_base_component_t *) component_item->cli_component;
+
+        /* copy over the data, if something isn't already there */
+        CONDITIONAL_COPY(pmix_pinstall_dirs, component->install_dirs_data,
+                         prefix);
+        CONDITIONAL_COPY(pmix_pinstall_dirs, component->install_dirs_data,
+                         exec_prefix);
+        CONDITIONAL_COPY(pmix_pinstall_dirs, component->install_dirs_data,
+                         bindir);
+        CONDITIONAL_COPY(pmix_pinstall_dirs, component->install_dirs_data,
+                         sbindir);
+        CONDITIONAL_COPY(pmix_pinstall_dirs, component->install_dirs_data,
+                         libexecdir);
+        CONDITIONAL_COPY(pmix_pinstall_dirs, component->install_dirs_data,
+                         datarootdir);
+        CONDITIONAL_COPY(pmix_pinstall_dirs, component->install_dirs_data,
+                         datadir);
+        CONDITIONAL_COPY(pmix_pinstall_dirs, component->install_dirs_data,
+                         sysconfdir);
+        CONDITIONAL_COPY(pmix_pinstall_dirs, component->install_dirs_data,
+                         sharedstatedir);
+        CONDITIONAL_COPY(pmix_pinstall_dirs, component->install_dirs_data,
+                         localstatedir);
+        CONDITIONAL_COPY(pmix_pinstall_dirs, component->install_dirs_data,
+                         libdir);
+        CONDITIONAL_COPY(pmix_pinstall_dirs, component->install_dirs_data,
+                         includedir);
+        CONDITIONAL_COPY(pmix_pinstall_dirs, component->install_dirs_data,
+                         infodir);
+        CONDITIONAL_COPY(pmix_pinstall_dirs, component->install_dirs_data,
+                         mandir);
+        CONDITIONAL_COPY(pmix_pinstall_dirs, component->install_dirs_data,
+                         pmixdatadir);
+        CONDITIONAL_COPY(pmix_pinstall_dirs, component->install_dirs_data,
+                         pmixlibdir);
+        CONDITIONAL_COPY(pmix_pinstall_dirs, component->install_dirs_data,
+                         pmixincludedir);
+    }
+
+    /* expand out all the fields */
+    pmix_pinstall_dirs.prefix =
+        pmix_pinstall_dirs_expand_setup(pmix_pinstall_dirs.prefix);
+    pmix_pinstall_dirs.exec_prefix =
+        pmix_pinstall_dirs_expand_setup(pmix_pinstall_dirs.exec_prefix);
+    pmix_pinstall_dirs.bindir =
+        pmix_pinstall_dirs_expand_setup(pmix_pinstall_dirs.bindir);
+    pmix_pinstall_dirs.sbindir =
+        pmix_pinstall_dirs_expand_setup(pmix_pinstall_dirs.sbindir);
+    pmix_pinstall_dirs.libexecdir =
+        pmix_pinstall_dirs_expand_setup(pmix_pinstall_dirs.libexecdir);
+    pmix_pinstall_dirs.datarootdir =
+        pmix_pinstall_dirs_expand_setup(pmix_pinstall_dirs.datarootdir);
+    pmix_pinstall_dirs.datadir =
+        pmix_pinstall_dirs_expand_setup(pmix_pinstall_dirs.datadir);
+    pmix_pinstall_dirs.sysconfdir =
+        pmix_pinstall_dirs_expand_setup(pmix_pinstall_dirs.sysconfdir);
+    pmix_pinstall_dirs.sharedstatedir =
+        pmix_pinstall_dirs_expand_setup(pmix_pinstall_dirs.sharedstatedir);
+    pmix_pinstall_dirs.localstatedir =
+        pmix_pinstall_dirs_expand_setup(pmix_pinstall_dirs.localstatedir);
+    pmix_pinstall_dirs.libdir =
+        pmix_pinstall_dirs_expand_setup(pmix_pinstall_dirs.libdir);
+    pmix_pinstall_dirs.includedir =
+        pmix_pinstall_dirs_expand_setup(pmix_pinstall_dirs.includedir);
+    pmix_pinstall_dirs.infodir =
+        pmix_pinstall_dirs_expand_setup(pmix_pinstall_dirs.infodir);
+    pmix_pinstall_dirs.mandir =
+        pmix_pinstall_dirs_expand_setup(pmix_pinstall_dirs.mandir);
+    pmix_pinstall_dirs.pmixdatadir =
+        pmix_pinstall_dirs_expand_setup(pmix_pinstall_dirs.pmixdatadir);
+    pmix_pinstall_dirs.pmixlibdir =
+        pmix_pinstall_dirs_expand_setup(pmix_pinstall_dirs.pmixlibdir);
+    pmix_pinstall_dirs.pmixincludedir =
+        pmix_pinstall_dirs_expand_setup(pmix_pinstall_dirs.pmixincludedir);
+
+#if 0
+    fprintf(stderr, "prefix:         %s\n", pmix_pinstall_dirs.prefix);
+    fprintf(stderr, "exec_prefix:    %s\n", pmix_pinstall_dirs.exec_prefix);
+    fprintf(stderr, "bindir:         %s\n", pmix_pinstall_dirs.bindir);
+    fprintf(stderr, "sbindir:        %s\n", pmix_pinstall_dirs.sbindir);
+    fprintf(stderr, "libexecdir:     %s\n", pmix_pinstall_dirs.libexecdir);
+    fprintf(stderr, "datarootdir:    %s\n", pmix_pinstall_dirs.datarootdir);
+    fprintf(stderr, "datadir:        %s\n", pmix_pinstall_dirs.datadir);
+    fprintf(stderr, "sysconfdir:     %s\n", pmix_pinstall_dirs.sysconfdir);
+    fprintf(stderr, "sharedstatedir: %s\n", pmix_pinstall_dirs.sharedstatedir);
+    fprintf(stderr, "localstatedir:  %s\n", pmix_pinstall_dirs.localstatedir);
+    fprintf(stderr, "libdir:         %s\n", pmix_pinstall_dirs.libdir);
+    fprintf(stderr, "includedir:     %s\n", pmix_pinstall_dirs.includedir);
+    fprintf(stderr, "infodir:        %s\n", pmix_pinstall_dirs.infodir);
+    fprintf(stderr, "mandir:         %s\n", pmix_pinstall_dirs.mandir);
+    fprintf(stderr, "pkgdatadir:     %s\n", pmix_pinstall_dirs.pkgdatadir);
+    fprintf(stderr, "pkglibdir:      %s\n", pmix_pinstall_dirs.pkglibdir);
+    fprintf(stderr, "pkgincludedir:  %s\n", pmix_pinstall_dirs.pkgincludedir);
+#endif
+
+    /* NTH: Is it ok not to close the components? If not we can add a flag
+       to mca_base_framework_components_close to indicate not to deregister
+       variable groups */
+    return PMIX_SUCCESS;
+}
+
+
+static int
+pmix_pinstalldirs_base_close(void)
+{
+    free(pmix_pinstall_dirs.prefix);
+    free(pmix_pinstall_dirs.exec_prefix);
+    free(pmix_pinstall_dirs.bindir);
+    free(pmix_pinstall_dirs.sbindir);
+    free(pmix_pinstall_dirs.libexecdir);
+    free(pmix_pinstall_dirs.datarootdir);
+    free(pmix_pinstall_dirs.datadir);
+    free(pmix_pinstall_dirs.sysconfdir);
+    free(pmix_pinstall_dirs.sharedstatedir);
+    free(pmix_pinstall_dirs.localstatedir);
+    free(pmix_pinstall_dirs.libdir);
+    free(pmix_pinstall_dirs.includedir);
+    free(pmix_pinstall_dirs.infodir);
+    free(pmix_pinstall_dirs.mandir);
+    free(pmix_pinstall_dirs.pmixdatadir);
+    free(pmix_pinstall_dirs.pmixlibdir);
+    free(pmix_pinstall_dirs.pmixincludedir);
+    memset (&pmix_pinstall_dirs, 0, sizeof (pmix_pinstall_dirs));
+
+    return pmix_mca_base_framework_components_close (&pmix_pinstalldirs_base_framework, NULL);
+}
+
+/* Declare the pinstalldirs framework */
+PMIX_MCA_BASE_FRAMEWORK_DECLARE(pmix, pinstalldirs, NULL, NULL, pmix_pinstalldirs_base_open,
+                                pmix_pinstalldirs_base_close, mca_pinstalldirs_base_static_components,
+                                PMIX_MCA_BASE_FRAMEWORK_FLAG_NOREGISTER | PMIX_MCA_BASE_FRAMEWORK_FLAG_NO_DSO);
diff --git a/src/mca/pinstalldirs/base/pinstalldirs_base_expand.c b/src/mca/pinstalldirs/base/pinstalldirs_base_expand.c
new file mode 100644
index 0000000..d52822d
--- /dev/null
+++ b/src/mca/pinstalldirs/base/pinstalldirs_base_expand.c
@@ -0,0 +1,174 @@
+/*
+ * Copyright (c) 2006-2007 Los Alamos National Security, LLC.  All rights
+ *                         reserved.
+ * Copyright (c) 2007-2010 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2007      Sun Microsystem, Inc.  All rights reserved.
+ * Copyright (c) 2010      Sandia National Laboratories. All rights reserved.
+ * Copyright (c) 2016      Intel, Inc. All rights reserved
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ *
+ */
+
+#include <src/include/pmix_config.h>
+
+#include <string.h>
+
+#include "src/util/os_path.h"
+#include "src/mca/pinstalldirs/base/base.h"
+#include "src/mca/pinstalldirs/pinstalldirs.h"
+
+/* Support both ${name} and @{name} forms.  The latter allows us to
+   pass values through AC_SUBST without being munged by m4 (e.g., if
+   we want to pass "@{libdir}" and not have it replaced by m4 to be
+   whatever the actual value of the shell variable is. */
+#define EXPAND_STRING(name) EXPAND_STRING2(name, name)
+
+#define EXPAND_STRING2(ompiname, fieldname)                             \
+    do {                                                                \
+        if (NULL != (start_pos = strstr(retval, "${" #fieldname "}"))) { \
+            tmp = retval;                                               \
+            *start_pos = '\0';                                          \
+            end_pos = start_pos + strlen("${" #fieldname "}");          \
+            asprintf(&retval, "%s%s%s", tmp,                            \
+                     pmix_pinstall_dirs.ompiname + destdir_offset,       \
+                     end_pos);                                          \
+            free(tmp);                                                  \
+            changed = true;                                             \
+        } else if (NULL != (start_pos = strstr(retval, "@{" #fieldname "}"))) { \
+            tmp = retval;                                               \
+            *start_pos = '\0';                                          \
+            end_pos = start_pos + strlen("@{" #fieldname "}");          \
+            asprintf(&retval, "%s%s%s", tmp,                            \
+                     pmix_pinstall_dirs.ompiname + destdir_offset,       \
+                     end_pos);                                          \
+            free(tmp);                                                  \
+            changed = true;                                             \
+        }                                                               \
+    } while (0)
+
+
+/*
+ * Read the lengthy comment below to understand the value of the
+ * is_setup parameter.
+ */
+static char *
+pmix_pinstall_dirs_expand_internal(const char* input, bool is_setup)
+{
+    size_t len, i;
+    bool needs_expand = false;
+    char *retval = NULL;
+    char *destdir = NULL;
+    size_t destdir_offset = 0;
+
+    /* This is subtle, and worth explaining.
+
+       If we substitute in any ${FIELD} values, we need to prepend it
+       with the value of the $PMIX_DESTDIR environment variable -- if
+       it is set.
+
+       We need to handle at least three cases properly (assume that
+       configure was invoked with --prefix=/opt/pmix and no other
+       directory specifications, and PMIX_DESTDIR is set to
+       /tmp/buildroot):
+
+       1. Individual directories, such as libdir.  These need to be
+          prepended with DESTDIR.  I.e., return
+          /tmp/buildroot/opt/pmix/lib.
+
+       2. Compiler flags that have ${FIELD} values embedded in them.
+          For example, consider if a wrapper compiler data file
+          contains the line:
+
+          preprocessor_flags=-DMYFLAG="${prefix}/share/randomthingy/"
+
+          The value we should return is:
+
+          -DMYFLAG="/tmp/buildroot/opt/pmix/share/randomthingy/"
+
+       3. Compiler flags that do not have any ${FIELD} values.
+          For example, consider if a wrapper compiler data file
+          contains the line:
+
+          preprocessor_flags=-pthread
+
+          The value we should return is:
+
+          -pthread
+
+       Note, too, that this PMIX_DESTDIR futzing only needs to occur
+       during pmix_init().  By the time pmix_init() has completed, all
+       values should be substituted in that need substituting.  Hence,
+       we take an extra parameter (is_setup) to know whether we should
+       do this futzing or not. */
+    if (is_setup) {
+        destdir = getenv("PMIX_DESTDIR");
+        if (NULL != destdir && strlen(destdir) > 0) {
+            destdir_offset = strlen(destdir);
+        }
+    }
+
+    len = strlen(input);
+    for (i = 0 ; i < len ; ++i) {
+        if ('$' == input[i] || '@' == input[i]) {
+            needs_expand = true;
+            break;
+        }
+    }
+
+    retval = strdup(input);
+    if (NULL == retval) return NULL;
+
+    if (needs_expand) {
+        bool changed = false;
+        char *start_pos, *end_pos, *tmp;
+
+        do {
+            changed = false;
+            EXPAND_STRING(prefix);
+            EXPAND_STRING(exec_prefix);
+            EXPAND_STRING(bindir);
+            EXPAND_STRING(sbindir);
+            EXPAND_STRING(libexecdir);
+            EXPAND_STRING(datarootdir);
+            EXPAND_STRING(datadir);
+            EXPAND_STRING(sysconfdir);
+            EXPAND_STRING(sharedstatedir);
+            EXPAND_STRING(localstatedir);
+            EXPAND_STRING(libdir);
+            EXPAND_STRING(includedir);
+            EXPAND_STRING(infodir);
+            EXPAND_STRING(mandir);
+            EXPAND_STRING2(pmixdatadir, pkgdatadir);
+            EXPAND_STRING2(pmixlibdir, pkglibdir);
+            EXPAND_STRING2(pmixincludedir, pkgincludedir);
+        } while (changed);
+    }
+
+    if (NULL != destdir) {
+        char *tmp = retval;
+        retval = pmix_os_path(false, destdir, tmp, NULL);
+        free(tmp);
+    }
+
+    return retval;
+}
+
+
+char *
+pmix_pinstall_dirs_expand(const char* input)
+{
+    /* We do NOT want PMIX_DESTDIR expansion in this case. */
+    return pmix_pinstall_dirs_expand_internal(input, false);
+}
+
+
+char *
+pmix_pinstall_dirs_expand_setup(const char* input)
+{
+    /* We DO want PMIX_DESTDIR expansion in this case. */
+    return pmix_pinstall_dirs_expand_internal(input, true);
+}
diff --git a/src/mca/pinstalldirs/config/Makefile.am b/src/mca/pinstalldirs/config/Makefile.am
new file mode 100644
index 0000000..d05743f
--- /dev/null
+++ b/src/mca/pinstalldirs/config/Makefile.am
@@ -0,0 +1,22 @@
+#
+# Copyright (c) 2006      Los Alamos National Security, LLC.  All rights
+#                         reserved.
+# Copyright (c) 2007      Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2009      High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2016      Intel, Inc. All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+noinst_LTLIBRARIES = libmca_pinstalldirs_config.la
+
+libmca_pinstalldirs_config_la_SOURCES = \
+        pmix_pinstalldirs_config.c
+
+# This file is generated; we do not want to include it in the tarball
+nodist_libmca_pinstalldirs_config_la_SOURCES = \
+        install_dirs.h
diff --git a/src/mca/pinstalldirs/config/Makefile.in b/src/mca/pinstalldirs/config/Makefile.in
new file mode 100644
index 0000000..7b4c876
--- /dev/null
+++ b/src/mca/pinstalldirs/config/Makefile.in
@@ -0,0 +1,780 @@
+# Makefile.in generated by automake 1.15 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+#
+# Copyright (c) 2006      Los Alamos National Security, LLC.  All rights
+#                         reserved.
+# Copyright (c) 2007      Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2009      High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2016      Intel, Inc. All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+subdir = src/mca/pinstalldirs/config
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/config/c_get_alignment.m4 \
+	$(top_srcdir)/config/libtool.m4 \
+	$(top_srcdir)/config/ltoptions.m4 \
+	$(top_srcdir)/config/ltsugar.m4 \
+	$(top_srcdir)/config/ltversion.m4 \
+	$(top_srcdir)/config/lt~obsolete.m4 \
+	$(top_srcdir)/config/pmix.m4 \
+	$(top_srcdir)/config/pmix_check_attributes.m4 \
+	$(top_srcdir)/config/pmix_check_broken_qsort.m4 \
+	$(top_srcdir)/config/pmix_check_compiler_version.m4 \
+	$(top_srcdir)/config/pmix_check_icc.m4 \
+	$(top_srcdir)/config/pmix_check_ident.m4 \
+	$(top_srcdir)/config/pmix_check_lock.m4 \
+	$(top_srcdir)/config/pmix_check_os_flavors.m4 \
+	$(top_srcdir)/config/pmix_check_package.m4 \
+	$(top_srcdir)/config/pmix_check_psm2.m4 \
+	$(top_srcdir)/config/pmix_check_pthread_pids.m4 \
+	$(top_srcdir)/config/pmix_check_vendor.m4 \
+	$(top_srcdir)/config/pmix_check_visibility.m4 \
+	$(top_srcdir)/config/pmix_check_withdir.m4 \
+	$(top_srcdir)/config/pmix_config_asm.m4 \
+	$(top_srcdir)/config/pmix_config_pthreads.m4 \
+	$(top_srcdir)/config/pmix_config_subdir.m4 \
+	$(top_srcdir)/config/pmix_config_subdir_args.m4 \
+	$(top_srcdir)/config/pmix_config_threads.m4 \
+	$(top_srcdir)/config/pmix_ensure_contains_optflags.m4 \
+	$(top_srcdir)/config/pmix_functions.m4 \
+	$(top_srcdir)/config/pmix_load_platform.m4 \
+	$(top_srcdir)/config/pmix_mca.m4 \
+	$(top_srcdir)/config/pmix_search_libs.m4 \
+	$(top_srcdir)/config/pmix_setup_cc.m4 \
+	$(top_srcdir)/config/pmix_setup_libevent.m4 \
+	$(top_srcdir)/config/pmix_setup_zlib.m4 \
+	$(top_srcdir)/config/pmix_try_assemble.m4 \
+	$(top_srcdir)/config/autogen_found_items.m4 \
+	$(top_srcdir)/src/mca/pdl/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/configure.m4 \
+	$(top_srcdir)/src/mca/pdl/pdlopen/configure.m4 \
+	$(top_srcdir)/src/mca/pdl/plibltdl/configure.m4 \
+	$(top_srcdir)/src/mca/pif/bsdx_ipv4/configure.m4 \
+	$(top_srcdir)/src/mca/pif/bsdx_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pif/linux_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pif/posix_ipv4/configure.m4 \
+	$(top_srcdir)/src/mca/pif/solaris_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/config/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/env/configure.m4 \
+	$(top_srcdir)/src/mca/pnet/opa/configure.m4 \
+	$(top_srcdir)/src/mca/psec/munge/configure.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/src/include/pmix_config.h
+CONFIG_CLEAN_FILES = pinstall_dirs.h
+CONFIG_CLEAN_VPATH_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+libmca_pinstalldirs_config_la_LIBADD =
+am_libmca_pinstalldirs_config_la_OBJECTS =  \
+	pmix_pinstalldirs_config.lo
+nodist_libmca_pinstalldirs_config_la_OBJECTS =
+libmca_pinstalldirs_config_la_OBJECTS =  \
+	$(am_libmca_pinstalldirs_config_la_OBJECTS) \
+	$(nodist_libmca_pinstalldirs_config_la_OBJECTS)
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/src/include
+depcomp = $(SHELL) $(top_srcdir)/./config/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libmca_pinstalldirs_config_la_SOURCES) \
+	$(nodist_libmca_pinstalldirs_config_la_SOURCES)
+DIST_SOURCES = $(libmca_pinstalldirs_config_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/pinstall_dirs.h.in \
+	$(top_srcdir)/./config/depcomp
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CFLAGS = @CFLAGS@
+CLEANFILES = @CLEANFILES@
+CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MCA_PROJECT_SUBDIRS = @MCA_PROJECT_SUBDIRS@
+MCA_pmix_FRAMEWORKS = @MCA_pmix_FRAMEWORKS@
+MCA_pmix_FRAMEWORKS_SUBDIRS = @MCA_pmix_FRAMEWORKS_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS@
+MCA_pmix_FRAMEWORK_LIBS = @MCA_pmix_FRAMEWORK_LIBS@
+MCA_pmix_pdl_ALL_COMPONENTS = @MCA_pmix_pdl_ALL_COMPONENTS@
+MCA_pmix_pdl_ALL_SUBDIRS = @MCA_pmix_pdl_ALL_SUBDIRS@
+MCA_pmix_pdl_DSO_COMPONENTS = @MCA_pmix_pdl_DSO_COMPONENTS@
+MCA_pmix_pdl_DSO_SUBDIRS = @MCA_pmix_pdl_DSO_SUBDIRS@
+MCA_pmix_pdl_STATIC_COMPONENTS = @MCA_pmix_pdl_STATIC_COMPONENTS@
+MCA_pmix_pdl_STATIC_LTLIBS = @MCA_pmix_pdl_STATIC_LTLIBS@
+MCA_pmix_pdl_STATIC_SUBDIRS = @MCA_pmix_pdl_STATIC_SUBDIRS@
+MCA_pmix_pif_ALL_COMPONENTS = @MCA_pmix_pif_ALL_COMPONENTS@
+MCA_pmix_pif_ALL_SUBDIRS = @MCA_pmix_pif_ALL_SUBDIRS@
+MCA_pmix_pif_DSO_COMPONENTS = @MCA_pmix_pif_DSO_COMPONENTS@
+MCA_pmix_pif_DSO_SUBDIRS = @MCA_pmix_pif_DSO_SUBDIRS@
+MCA_pmix_pif_STATIC_COMPONENTS = @MCA_pmix_pif_STATIC_COMPONENTS@
+MCA_pmix_pif_STATIC_LTLIBS = @MCA_pmix_pif_STATIC_LTLIBS@
+MCA_pmix_pif_STATIC_SUBDIRS = @MCA_pmix_pif_STATIC_SUBDIRS@
+MCA_pmix_pinstalldirs_ALL_COMPONENTS = @MCA_pmix_pinstalldirs_ALL_COMPONENTS@
+MCA_pmix_pinstalldirs_ALL_SUBDIRS = @MCA_pmix_pinstalldirs_ALL_SUBDIRS@
+MCA_pmix_pinstalldirs_DSO_COMPONENTS = @MCA_pmix_pinstalldirs_DSO_COMPONENTS@
+MCA_pmix_pinstalldirs_DSO_SUBDIRS = @MCA_pmix_pinstalldirs_DSO_SUBDIRS@
+MCA_pmix_pinstalldirs_STATIC_COMPONENTS = @MCA_pmix_pinstalldirs_STATIC_COMPONENTS@
+MCA_pmix_pinstalldirs_STATIC_LTLIBS = @MCA_pmix_pinstalldirs_STATIC_LTLIBS@
+MCA_pmix_pinstalldirs_STATIC_SUBDIRS = @MCA_pmix_pinstalldirs_STATIC_SUBDIRS@
+MCA_pmix_pnet_ALL_COMPONENTS = @MCA_pmix_pnet_ALL_COMPONENTS@
+MCA_pmix_pnet_ALL_SUBDIRS = @MCA_pmix_pnet_ALL_SUBDIRS@
+MCA_pmix_pnet_DSO_COMPONENTS = @MCA_pmix_pnet_DSO_COMPONENTS@
+MCA_pmix_pnet_DSO_SUBDIRS = @MCA_pmix_pnet_DSO_SUBDIRS@
+MCA_pmix_pnet_STATIC_COMPONENTS = @MCA_pmix_pnet_STATIC_COMPONENTS@
+MCA_pmix_pnet_STATIC_LTLIBS = @MCA_pmix_pnet_STATIC_LTLIBS@
+MCA_pmix_pnet_STATIC_SUBDIRS = @MCA_pmix_pnet_STATIC_SUBDIRS@
+MCA_pmix_psec_ALL_COMPONENTS = @MCA_pmix_psec_ALL_COMPONENTS@
+MCA_pmix_psec_ALL_SUBDIRS = @MCA_pmix_psec_ALL_SUBDIRS@
+MCA_pmix_psec_DSO_COMPONENTS = @MCA_pmix_psec_DSO_COMPONENTS@
+MCA_pmix_psec_DSO_SUBDIRS = @MCA_pmix_psec_DSO_SUBDIRS@
+MCA_pmix_psec_STATIC_COMPONENTS = @MCA_pmix_psec_STATIC_COMPONENTS@
+MCA_pmix_psec_STATIC_LTLIBS = @MCA_pmix_psec_STATIC_LTLIBS@
+MCA_pmix_psec_STATIC_SUBDIRS = @MCA_pmix_psec_STATIC_SUBDIRS@
+MCA_pmix_psensor_ALL_COMPONENTS = @MCA_pmix_psensor_ALL_COMPONENTS@
+MCA_pmix_psensor_ALL_SUBDIRS = @MCA_pmix_psensor_ALL_SUBDIRS@
+MCA_pmix_psensor_DSO_COMPONENTS = @MCA_pmix_psensor_DSO_COMPONENTS@
+MCA_pmix_psensor_DSO_SUBDIRS = @MCA_pmix_psensor_DSO_SUBDIRS@
+MCA_pmix_psensor_STATIC_COMPONENTS = @MCA_pmix_psensor_STATIC_COMPONENTS@
+MCA_pmix_psensor_STATIC_LTLIBS = @MCA_pmix_psensor_STATIC_LTLIBS@
+MCA_pmix_psensor_STATIC_SUBDIRS = @MCA_pmix_psensor_STATIC_SUBDIRS@
+MCA_pmix_ptl_ALL_COMPONENTS = @MCA_pmix_ptl_ALL_COMPONENTS@
+MCA_pmix_ptl_ALL_SUBDIRS = @MCA_pmix_ptl_ALL_SUBDIRS@
+MCA_pmix_ptl_DSO_COMPONENTS = @MCA_pmix_ptl_DSO_COMPONENTS@
+MCA_pmix_ptl_DSO_SUBDIRS = @MCA_pmix_ptl_DSO_SUBDIRS@
+MCA_pmix_ptl_STATIC_COMPONENTS = @MCA_pmix_ptl_STATIC_COMPONENTS@
+MCA_pmix_ptl_STATIC_LTLIBS = @MCA_pmix_ptl_STATIC_LTLIBS@
+MCA_pmix_ptl_STATIC_SUBDIRS = @MCA_pmix_ptl_STATIC_SUBDIRS@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PMIX_ASM_GSYM = @PMIX_ASM_GSYM@
+PMIX_ASM_LSYM = @PMIX_ASM_LSYM@
+PMIX_ASM_SUPPORT_64BIT = @PMIX_ASM_SUPPORT_64BIT@
+PMIX_ASM_TEXT = @PMIX_ASM_TEXT@
+PMIX_ASM_TYPE = @PMIX_ASM_TYPE@
+PMIX_ASSEMBLY_ARCH = @PMIX_ASSEMBLY_ARCH@
+PMIX_ASSEMBLY_BUILTIN = @PMIX_ASSEMBLY_BUILTIN@
+PMIX_ASSEMBLY_FORMAT = @PMIX_ASSEMBLY_FORMAT@
+PMIX_AS_GLOBAL = @PMIX_AS_GLOBAL@
+PMIX_AS_LABEL_SUFFIX = @PMIX_AS_LABEL_SUFFIX@
+PMIX_CC_ABSOLUTE = @PMIX_CC_ABSOLUTE@
+PMIX_CONFIGURE_DATE = @PMIX_CONFIGURE_DATE@
+PMIX_CONFIGURE_HOST = @PMIX_CONFIGURE_HOST@
+PMIX_CONFIGURE_USER = @PMIX_CONFIGURE_USER@
+PMIX_EMBEDDED_CPPFLAGS = @PMIX_EMBEDDED_CPPFLAGS@
+PMIX_EMBEDDED_LDFLAGS = @PMIX_EMBEDDED_LDFLAGS@
+PMIX_EMBEDDED_LIBS = @PMIX_EMBEDDED_LIBS@
+PMIX_MAJOR_VERSION = @PMIX_MAJOR_VERSION@
+PMIX_MINOR_VERSION = @PMIX_MINOR_VERSION@
+PMIX_RELEASE_DATE = @PMIX_RELEASE_DATE@
+PMIX_RELEASE_VERSION = @PMIX_RELEASE_VERSION@
+PMIX_RENAME = @PMIX_RENAME@
+PMIX_VERSION = @PMIX_VERSION@
+PMIX_top_builddir = @PMIX_top_builddir@
+PMIX_top_srcdir = @PMIX_top_srcdir@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_prefix_program = @ac_prefix_program@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+libpmix_so_version = @libpmix_so_version@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pmix_have_pandoc = @pmix_have_pandoc@
+pmix_pdl_pdlopen_LIBS = @pmix_pdl_pdlopen_LIBS@
+pmix_pdl_plibltdl_CPPFLAGS = @pmix_pdl_plibltdl_CPPFLAGS@
+pmix_pdl_plibltdl_LDFLAGS = @pmix_pdl_plibltdl_LDFLAGS@
+pmix_pdl_plibltdl_LIBS = @pmix_pdl_plibltdl_LIBS@
+pmixdatadir = @pmixdatadir@
+pmixincludedir = @pmixincludedir@
+pmixlibdir = @pmixlibdir@
+pmixmajor = @pmixmajor@
+pmixminor = @pmixminor@
+pnet_opa_CFLAGS = @pnet_opa_CFLAGS@
+pnet_opa_CPPFLAGS = @pnet_opa_CPPFLAGS@
+pnet_opa_LDFLAGS = @pnet_opa_LDFLAGS@
+pnet_opa_LIBS = @pnet_opa_LIBS@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+psec_munge_CPPFLAGS = @psec_munge_CPPFLAGS@
+psec_munge_LDFLAGS = @psec_munge_LDFLAGS@
+psec_munge_LIBS = @psec_munge_LIBS@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+noinst_LTLIBRARIES = libmca_pinstalldirs_config.la
+libmca_pinstalldirs_config_la_SOURCES = \
+        pmix_pinstalldirs_config.c
+
+
+# This file is generated; we do not want to include it in the tarball
+nodist_libmca_pinstalldirs_config_la_SOURCES = \
+        install_dirs.h
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/mca/pinstalldirs/config/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/mca/pinstalldirs/config/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+pinstall_dirs.h: $(top_builddir)/config.status $(srcdir)/pinstall_dirs.h.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_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}; \
+	}
+
+libmca_pinstalldirs_config.la: $(libmca_pinstalldirs_config_la_OBJECTS) $(libmca_pinstalldirs_config_la_DEPENDENCIES) $(EXTRA_libmca_pinstalldirs_config_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(LINK)  $(libmca_pinstalldirs_config_la_OBJECTS) $(libmca_pinstalldirs_config_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pmix_pinstalldirs_config.Plo at am__quote@
+
+.c.o:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+ at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstLTLIBRARIES 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-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
+
+.PRECIOUS: Makefile
+
+
+# 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/mca/pinstalldirs/config/configure.m4 b/src/mca/pinstalldirs/config/configure.m4
new file mode 100644
index 0000000..2f652e9
--- /dev/null
+++ b/src/mca/pinstalldirs/config/configure.m4
@@ -0,0 +1,32 @@
+# -*- shell-script -*-
+#
+# Copyright (c) 2006      Los Alamos National Security, LLC.  All rights
+#                         reserved.
+# Copyright (c) 2010      Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2016      Intel, Inc. All rights reserved
+# Copyright (c) 2016      Research Organization for Information Science
+#                         and Technology (RIST). All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+AC_DEFUN([MCA_pmix_pinstalldirs_config_PRIORITY], [0])
+
+AC_DEFUN([MCA_pmix_pinstalldirs_config_COMPILE_MODE], [
+    AC_MSG_CHECKING([for MCA component $1:$2 compile mode])
+    $3="static"
+    AC_MSG_RESULT([$$3])
+])
+
+
+# MCA_pinstalldirs_config_CONFIG(action-if-can-compile,
+#                        [action-if-cant-compile])
+# ------------------------------------------------
+AC_DEFUN([MCA_pmix_pinstalldirs_config_CONFIG],[
+    AC_CONFIG_FILES([src/mca/pinstalldirs/config/Makefile
+                     src/mca/pinstalldirs/config/pinstall_dirs.h])
+])
+
diff --git a/src/mca/pinstalldirs/config/pinstall_dirs.h.in b/src/mca/pinstalldirs/config/pinstall_dirs.h.in
new file mode 100644
index 0000000..e1569ae
--- /dev/null
+++ b/src/mca/pinstalldirs/config/pinstall_dirs.h.in
@@ -0,0 +1,129 @@
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2005 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2007      Los Alamos National Security, LLC.
+ *                         All rights reserved.
+ * Copyright (c) 2016      Intel, Inc. All rights reserved
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ *
+ * This file should be included by any file that needs the
+ * installation directories hard-coded into the object file.  This
+ * should be avoided if at all possible, but there are some places
+ * (like the wrapper compilers) where it is infinitely easier to have
+ * the paths stored.
+ *
+ * If you have questions about which directory to use, we try as best
+ * we can to follow the GNU coding standards on this issue.  The
+ * description of each directory can be found at the following URL:
+ *
+ * http://www.gnu.org/prep/standards/html_node/Directory-Variables.html
+ *
+ * The line below is to shut AC 2.60 up about datarootdir.  Don't remove.
+ * datarootdir=foo
+ */
+
+#ifndef PMIX_INST_DIRS_H
+#define PMIX_INST_DIRS_H
+
+#define PMIX_INSTALL_PREFIX "@prefix@"
+#define PMIX_EXEC_PREFIX "@exec_prefix@"
+
+/* The directory for installing executable programs that users can
+   run. */
+#define PMIX_BINDIR "@bindir@"
+
+/* The directory for installing executable programs that can be run
+   from the shell, but are only generally useful to system
+   administrators. */
+#define PMIX_SBINDIR "@sbindir@"
+
+/* The directory for installing executable programs to be run by other
+   programs rather than by users.
+
+   The definition of ‘libexecdir’ is the same for all packages, so
+   you should install your data in a subdirectory thereof. Most
+   packages install their data under $(libexecdir)/package-name/,
+   possibly within additional subdirectories thereof, such as
+   $(libexecdir)/package-name/machine/version. */
+#define PMIX_LIBEXECDIR "@libexecdir@"
+
+/* The root of the directory tree for read-only
+   architecture-independent data files.
+
+   See not about PMIX_DATADIR.  And you probably want that one, not
+   this one.  This is one of those "building block" paths, that is
+   really only used for defining other paths. */
+#define PMIX_DATAROOTDIR "@datarootdir@"
+
+/* The directory for installing idiosyncratic read-only
+  architecture-independent data files for this program.
+
+  The definition of ‘datadir’ is the same for all packages, so you
+  should install your data in a subdirectory thereof. Most packages
+  install their data under $(datadir)/package-name/. */
+#define PMIX_DATADIR "@datadir@"
+
+/* $(datadir)/package-name/.  You probably want to use this instead of
+   PMIX_DATADIR */
+#define PMIX_PKGDATADIR "@pmixdatadir@"
+
+/* The directory for installing read-only data files that pertain to a
+   single machine–that is to say, files for configuring a host. Mailer
+   and network configuration files, /etc/passwd, and so forth belong
+   here. All the files in this directory should be ordinary ASCII text
+   files.
+
+   Do not install executables here in this directory (they probably
+   belong in $(libexecdir) or $(sbindir)). Also do not install files
+   that are modified in the normal course of their use (programs whose
+   purpose is to change the configuration of the system
+   excluded). Those probably belong in $(localstatedir).  */
+#define PMIX_SYSCONFDIR "@sysconfdir@"
+
+/* The directory for installing architecture-independent data files
+   which the programs modify while they run. */
+#define PMIX_SHAREDSTATEDIR "@sharedstatedir@"
+
+/* The directory for installing data files which the programs modify
+   while they run, and that pertain to one specific machine. Users
+   should never need to modify files in this directory to configure
+   the package's operation; put such configuration information in
+   separate files that go in $(datadir) or
+   $(sysconfdir). */
+#define PMIX_LOCALSTATEDIR "@localstatedir@"
+
+/* The directory for object files and libraries of object code. Do not
+   install executables here, they probably ought to go in
+   $(libexecdir) instead. */
+#define PMIX_LIBDIR "@libdir@"
+
+/* $(libdir)/package-name/.  This is where components should go */
+#define PMIX_PKGLIBDIR "@pmixlibdir@"
+
+/* The directory for installing header files to be included by user
+   programs with the C ‘#include’ preprocessor directive. */
+#define PMIX_INCLUDEDIR "@includedir@"
+
+/* $(includedir)/package-name/.  The devel headers go in here */
+#define PMIX_PKGINCLUDEDIR "@pmixincludedir@"
+
+/* The directory for installing the Info files for this package. */
+#define PMIX_INFODIR "@infodir@"
+
+/* The top-level directory for installing the man pages (if any) for
+   this package. */
+#define PMIX_MANDIR "@mandir@"
+
+#endif
diff --git a/src/mca/pinstalldirs/config/pmix_pinstalldirs_config.c b/src/mca/pinstalldirs/config/pmix_pinstalldirs_config.c
new file mode 100644
index 0000000..f48de36
--- /dev/null
+++ b/src/mca/pinstalldirs/config/pmix_pinstalldirs_config.c
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2006-2007 Los Alamos National Security, LLC.  All rights
+ *                         reserved.
+ * Copyright (c) 2016      Intel, Inc. All rights reserved
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+
+#include "src/mca/pinstalldirs/pinstalldirs.h"
+#include "src/mca/pinstalldirs/config/pinstall_dirs.h"
+
+const pmix_pinstalldirs_base_component_t mca_pinstalldirs_config_component = {
+    /* First, the mca_component_t struct containing meta information
+       about the component itself */
+    {
+        PMIX_PINSTALLDIRS_BASE_VERSION_1_0_0,
+
+        /* Component name and version */
+        "config",
+        PMIX_MAJOR_VERSION,
+        PMIX_MINOR_VERSION,
+        PMIX_RELEASE_VERSION,
+
+        /* Component open and close functions */
+        NULL,
+        NULL
+    },
+    {
+        /* This component is Checkpointable */
+        PMIX_MCA_BASE_METADATA_PARAM_CHECKPOINT
+    },
+
+    {
+        PMIX_INSTALL_PREFIX,
+        PMIX_EXEC_PREFIX,
+        PMIX_BINDIR,
+        PMIX_SBINDIR,
+        PMIX_LIBEXECDIR,
+        PMIX_DATAROOTDIR,
+        PMIX_DATADIR,
+        PMIX_SYSCONFDIR,
+        PMIX_SHAREDSTATEDIR,
+        PMIX_LOCALSTATEDIR,
+        PMIX_LIBDIR,
+        PMIX_INCLUDEDIR,
+        PMIX_INFODIR,
+        PMIX_MANDIR,
+        PMIX_PKGDATADIR,
+        PMIX_PKGLIBDIR,
+        PMIX_PKGINCLUDEDIR
+    }
+};
diff --git a/src/mca/pinstalldirs/configure.m4 b/src/mca/pinstalldirs/configure.m4
new file mode 100644
index 0000000..08217bd
--- /dev/null
+++ b/src/mca/pinstalldirs/configure.m4
@@ -0,0 +1,12 @@
+dnl -*- shell-script -*-
+dnl
+dnl Copyright (c) 2006-2010 Sandia National Laboratories. All rights reserved.
+dnl Copyright (c) 2016      Intel, Inc. All rights reserved.
+dnl $COPYRIGHT$
+dnl
+dnl Additional copyrights may follow
+dnl
+dnl $HEADER$
+dnl
+
+AC_DEFUN([MCA_pmix_pinstalldirs_CONFIGURE_MODE], [PRIORITY])
diff --git a/src/mca/pinstalldirs/env/Makefile.am b/src/mca/pinstalldirs/env/Makefile.am
new file mode 100644
index 0000000..61471d1
--- /dev/null
+++ b/src/mca/pinstalldirs/env/Makefile.am
@@ -0,0 +1,16 @@
+#
+# Copyright (c) 2006      Los Alamos National Security, LLC.  All rights
+#                         reserved.
+# Copyright (c) 2009      High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+noinst_LTLIBRARIES = libmca_pinstalldirs_env.la
+
+libmca_pinstalldirs_env_la_SOURCES = \
+	pmix_pinstalldirs_env.c
diff --git a/src/mca/pinstalldirs/env/Makefile.in b/src/mca/pinstalldirs/env/Makefile.in
new file mode 100644
index 0000000..93a75a2
--- /dev/null
+++ b/src/mca/pinstalldirs/env/Makefile.in
@@ -0,0 +1,766 @@
+# Makefile.in generated by automake 1.15 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+#
+# Copyright (c) 2006      Los Alamos National Security, LLC.  All rights
+#                         reserved.
+# Copyright (c) 2009      High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+subdir = src/mca/pinstalldirs/env
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/config/c_get_alignment.m4 \
+	$(top_srcdir)/config/libtool.m4 \
+	$(top_srcdir)/config/ltoptions.m4 \
+	$(top_srcdir)/config/ltsugar.m4 \
+	$(top_srcdir)/config/ltversion.m4 \
+	$(top_srcdir)/config/lt~obsolete.m4 \
+	$(top_srcdir)/config/pmix.m4 \
+	$(top_srcdir)/config/pmix_check_attributes.m4 \
+	$(top_srcdir)/config/pmix_check_broken_qsort.m4 \
+	$(top_srcdir)/config/pmix_check_compiler_version.m4 \
+	$(top_srcdir)/config/pmix_check_icc.m4 \
+	$(top_srcdir)/config/pmix_check_ident.m4 \
+	$(top_srcdir)/config/pmix_check_lock.m4 \
+	$(top_srcdir)/config/pmix_check_os_flavors.m4 \
+	$(top_srcdir)/config/pmix_check_package.m4 \
+	$(top_srcdir)/config/pmix_check_psm2.m4 \
+	$(top_srcdir)/config/pmix_check_pthread_pids.m4 \
+	$(top_srcdir)/config/pmix_check_vendor.m4 \
+	$(top_srcdir)/config/pmix_check_visibility.m4 \
+	$(top_srcdir)/config/pmix_check_withdir.m4 \
+	$(top_srcdir)/config/pmix_config_asm.m4 \
+	$(top_srcdir)/config/pmix_config_pthreads.m4 \
+	$(top_srcdir)/config/pmix_config_subdir.m4 \
+	$(top_srcdir)/config/pmix_config_subdir_args.m4 \
+	$(top_srcdir)/config/pmix_config_threads.m4 \
+	$(top_srcdir)/config/pmix_ensure_contains_optflags.m4 \
+	$(top_srcdir)/config/pmix_functions.m4 \
+	$(top_srcdir)/config/pmix_load_platform.m4 \
+	$(top_srcdir)/config/pmix_mca.m4 \
+	$(top_srcdir)/config/pmix_search_libs.m4 \
+	$(top_srcdir)/config/pmix_setup_cc.m4 \
+	$(top_srcdir)/config/pmix_setup_libevent.m4 \
+	$(top_srcdir)/config/pmix_setup_zlib.m4 \
+	$(top_srcdir)/config/pmix_try_assemble.m4 \
+	$(top_srcdir)/config/autogen_found_items.m4 \
+	$(top_srcdir)/src/mca/pdl/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/configure.m4 \
+	$(top_srcdir)/src/mca/pdl/pdlopen/configure.m4 \
+	$(top_srcdir)/src/mca/pdl/plibltdl/configure.m4 \
+	$(top_srcdir)/src/mca/pif/bsdx_ipv4/configure.m4 \
+	$(top_srcdir)/src/mca/pif/bsdx_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pif/linux_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pif/posix_ipv4/configure.m4 \
+	$(top_srcdir)/src/mca/pif/solaris_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/config/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/env/configure.m4 \
+	$(top_srcdir)/src/mca/pnet/opa/configure.m4 \
+	$(top_srcdir)/src/mca/psec/munge/configure.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/src/include/pmix_config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+libmca_pinstalldirs_env_la_LIBADD =
+am_libmca_pinstalldirs_env_la_OBJECTS = pmix_pinstalldirs_env.lo
+libmca_pinstalldirs_env_la_OBJECTS =  \
+	$(am_libmca_pinstalldirs_env_la_OBJECTS)
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/src/include
+depcomp = $(SHELL) $(top_srcdir)/./config/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libmca_pinstalldirs_env_la_SOURCES)
+DIST_SOURCES = $(libmca_pinstalldirs_env_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/./config/depcomp
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CFLAGS = @CFLAGS@
+CLEANFILES = @CLEANFILES@
+CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MCA_PROJECT_SUBDIRS = @MCA_PROJECT_SUBDIRS@
+MCA_pmix_FRAMEWORKS = @MCA_pmix_FRAMEWORKS@
+MCA_pmix_FRAMEWORKS_SUBDIRS = @MCA_pmix_FRAMEWORKS_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS@
+MCA_pmix_FRAMEWORK_LIBS = @MCA_pmix_FRAMEWORK_LIBS@
+MCA_pmix_pdl_ALL_COMPONENTS = @MCA_pmix_pdl_ALL_COMPONENTS@
+MCA_pmix_pdl_ALL_SUBDIRS = @MCA_pmix_pdl_ALL_SUBDIRS@
+MCA_pmix_pdl_DSO_COMPONENTS = @MCA_pmix_pdl_DSO_COMPONENTS@
+MCA_pmix_pdl_DSO_SUBDIRS = @MCA_pmix_pdl_DSO_SUBDIRS@
+MCA_pmix_pdl_STATIC_COMPONENTS = @MCA_pmix_pdl_STATIC_COMPONENTS@
+MCA_pmix_pdl_STATIC_LTLIBS = @MCA_pmix_pdl_STATIC_LTLIBS@
+MCA_pmix_pdl_STATIC_SUBDIRS = @MCA_pmix_pdl_STATIC_SUBDIRS@
+MCA_pmix_pif_ALL_COMPONENTS = @MCA_pmix_pif_ALL_COMPONENTS@
+MCA_pmix_pif_ALL_SUBDIRS = @MCA_pmix_pif_ALL_SUBDIRS@
+MCA_pmix_pif_DSO_COMPONENTS = @MCA_pmix_pif_DSO_COMPONENTS@
+MCA_pmix_pif_DSO_SUBDIRS = @MCA_pmix_pif_DSO_SUBDIRS@
+MCA_pmix_pif_STATIC_COMPONENTS = @MCA_pmix_pif_STATIC_COMPONENTS@
+MCA_pmix_pif_STATIC_LTLIBS = @MCA_pmix_pif_STATIC_LTLIBS@
+MCA_pmix_pif_STATIC_SUBDIRS = @MCA_pmix_pif_STATIC_SUBDIRS@
+MCA_pmix_pinstalldirs_ALL_COMPONENTS = @MCA_pmix_pinstalldirs_ALL_COMPONENTS@
+MCA_pmix_pinstalldirs_ALL_SUBDIRS = @MCA_pmix_pinstalldirs_ALL_SUBDIRS@
+MCA_pmix_pinstalldirs_DSO_COMPONENTS = @MCA_pmix_pinstalldirs_DSO_COMPONENTS@
+MCA_pmix_pinstalldirs_DSO_SUBDIRS = @MCA_pmix_pinstalldirs_DSO_SUBDIRS@
+MCA_pmix_pinstalldirs_STATIC_COMPONENTS = @MCA_pmix_pinstalldirs_STATIC_COMPONENTS@
+MCA_pmix_pinstalldirs_STATIC_LTLIBS = @MCA_pmix_pinstalldirs_STATIC_LTLIBS@
+MCA_pmix_pinstalldirs_STATIC_SUBDIRS = @MCA_pmix_pinstalldirs_STATIC_SUBDIRS@
+MCA_pmix_pnet_ALL_COMPONENTS = @MCA_pmix_pnet_ALL_COMPONENTS@
+MCA_pmix_pnet_ALL_SUBDIRS = @MCA_pmix_pnet_ALL_SUBDIRS@
+MCA_pmix_pnet_DSO_COMPONENTS = @MCA_pmix_pnet_DSO_COMPONENTS@
+MCA_pmix_pnet_DSO_SUBDIRS = @MCA_pmix_pnet_DSO_SUBDIRS@
+MCA_pmix_pnet_STATIC_COMPONENTS = @MCA_pmix_pnet_STATIC_COMPONENTS@
+MCA_pmix_pnet_STATIC_LTLIBS = @MCA_pmix_pnet_STATIC_LTLIBS@
+MCA_pmix_pnet_STATIC_SUBDIRS = @MCA_pmix_pnet_STATIC_SUBDIRS@
+MCA_pmix_psec_ALL_COMPONENTS = @MCA_pmix_psec_ALL_COMPONENTS@
+MCA_pmix_psec_ALL_SUBDIRS = @MCA_pmix_psec_ALL_SUBDIRS@
+MCA_pmix_psec_DSO_COMPONENTS = @MCA_pmix_psec_DSO_COMPONENTS@
+MCA_pmix_psec_DSO_SUBDIRS = @MCA_pmix_psec_DSO_SUBDIRS@
+MCA_pmix_psec_STATIC_COMPONENTS = @MCA_pmix_psec_STATIC_COMPONENTS@
+MCA_pmix_psec_STATIC_LTLIBS = @MCA_pmix_psec_STATIC_LTLIBS@
+MCA_pmix_psec_STATIC_SUBDIRS = @MCA_pmix_psec_STATIC_SUBDIRS@
+MCA_pmix_psensor_ALL_COMPONENTS = @MCA_pmix_psensor_ALL_COMPONENTS@
+MCA_pmix_psensor_ALL_SUBDIRS = @MCA_pmix_psensor_ALL_SUBDIRS@
+MCA_pmix_psensor_DSO_COMPONENTS = @MCA_pmix_psensor_DSO_COMPONENTS@
+MCA_pmix_psensor_DSO_SUBDIRS = @MCA_pmix_psensor_DSO_SUBDIRS@
+MCA_pmix_psensor_STATIC_COMPONENTS = @MCA_pmix_psensor_STATIC_COMPONENTS@
+MCA_pmix_psensor_STATIC_LTLIBS = @MCA_pmix_psensor_STATIC_LTLIBS@
+MCA_pmix_psensor_STATIC_SUBDIRS = @MCA_pmix_psensor_STATIC_SUBDIRS@
+MCA_pmix_ptl_ALL_COMPONENTS = @MCA_pmix_ptl_ALL_COMPONENTS@
+MCA_pmix_ptl_ALL_SUBDIRS = @MCA_pmix_ptl_ALL_SUBDIRS@
+MCA_pmix_ptl_DSO_COMPONENTS = @MCA_pmix_ptl_DSO_COMPONENTS@
+MCA_pmix_ptl_DSO_SUBDIRS = @MCA_pmix_ptl_DSO_SUBDIRS@
+MCA_pmix_ptl_STATIC_COMPONENTS = @MCA_pmix_ptl_STATIC_COMPONENTS@
+MCA_pmix_ptl_STATIC_LTLIBS = @MCA_pmix_ptl_STATIC_LTLIBS@
+MCA_pmix_ptl_STATIC_SUBDIRS = @MCA_pmix_ptl_STATIC_SUBDIRS@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PMIX_ASM_GSYM = @PMIX_ASM_GSYM@
+PMIX_ASM_LSYM = @PMIX_ASM_LSYM@
+PMIX_ASM_SUPPORT_64BIT = @PMIX_ASM_SUPPORT_64BIT@
+PMIX_ASM_TEXT = @PMIX_ASM_TEXT@
+PMIX_ASM_TYPE = @PMIX_ASM_TYPE@
+PMIX_ASSEMBLY_ARCH = @PMIX_ASSEMBLY_ARCH@
+PMIX_ASSEMBLY_BUILTIN = @PMIX_ASSEMBLY_BUILTIN@
+PMIX_ASSEMBLY_FORMAT = @PMIX_ASSEMBLY_FORMAT@
+PMIX_AS_GLOBAL = @PMIX_AS_GLOBAL@
+PMIX_AS_LABEL_SUFFIX = @PMIX_AS_LABEL_SUFFIX@
+PMIX_CC_ABSOLUTE = @PMIX_CC_ABSOLUTE@
+PMIX_CONFIGURE_DATE = @PMIX_CONFIGURE_DATE@
+PMIX_CONFIGURE_HOST = @PMIX_CONFIGURE_HOST@
+PMIX_CONFIGURE_USER = @PMIX_CONFIGURE_USER@
+PMIX_EMBEDDED_CPPFLAGS = @PMIX_EMBEDDED_CPPFLAGS@
+PMIX_EMBEDDED_LDFLAGS = @PMIX_EMBEDDED_LDFLAGS@
+PMIX_EMBEDDED_LIBS = @PMIX_EMBEDDED_LIBS@
+PMIX_MAJOR_VERSION = @PMIX_MAJOR_VERSION@
+PMIX_MINOR_VERSION = @PMIX_MINOR_VERSION@
+PMIX_RELEASE_DATE = @PMIX_RELEASE_DATE@
+PMIX_RELEASE_VERSION = @PMIX_RELEASE_VERSION@
+PMIX_RENAME = @PMIX_RENAME@
+PMIX_VERSION = @PMIX_VERSION@
+PMIX_top_builddir = @PMIX_top_builddir@
+PMIX_top_srcdir = @PMIX_top_srcdir@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_prefix_program = @ac_prefix_program@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+libpmix_so_version = @libpmix_so_version@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pmix_have_pandoc = @pmix_have_pandoc@
+pmix_pdl_pdlopen_LIBS = @pmix_pdl_pdlopen_LIBS@
+pmix_pdl_plibltdl_CPPFLAGS = @pmix_pdl_plibltdl_CPPFLAGS@
+pmix_pdl_plibltdl_LDFLAGS = @pmix_pdl_plibltdl_LDFLAGS@
+pmix_pdl_plibltdl_LIBS = @pmix_pdl_plibltdl_LIBS@
+pmixdatadir = @pmixdatadir@
+pmixincludedir = @pmixincludedir@
+pmixlibdir = @pmixlibdir@
+pmixmajor = @pmixmajor@
+pmixminor = @pmixminor@
+pnet_opa_CFLAGS = @pnet_opa_CFLAGS@
+pnet_opa_CPPFLAGS = @pnet_opa_CPPFLAGS@
+pnet_opa_LDFLAGS = @pnet_opa_LDFLAGS@
+pnet_opa_LIBS = @pnet_opa_LIBS@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+psec_munge_CPPFLAGS = @psec_munge_CPPFLAGS@
+psec_munge_LDFLAGS = @psec_munge_LDFLAGS@
+psec_munge_LIBS = @psec_munge_LIBS@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+noinst_LTLIBRARIES = libmca_pinstalldirs_env.la
+libmca_pinstalldirs_env_la_SOURCES = \
+	pmix_pinstalldirs_env.c
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/mca/pinstalldirs/env/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/mca/pinstalldirs/env/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_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}; \
+	}
+
+libmca_pinstalldirs_env.la: $(libmca_pinstalldirs_env_la_OBJECTS) $(libmca_pinstalldirs_env_la_DEPENDENCIES) $(EXTRA_libmca_pinstalldirs_env_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(LINK)  $(libmca_pinstalldirs_env_la_OBJECTS) $(libmca_pinstalldirs_env_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pmix_pinstalldirs_env.Plo at am__quote@
+
+.c.o:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+ at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstLTLIBRARIES 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-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
+
+.PRECIOUS: Makefile
+
+
+# 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/mca/pinstalldirs/env/configure.m4 b/src/mca/pinstalldirs/env/configure.m4
new file mode 100644
index 0000000..3fa7fa7
--- /dev/null
+++ b/src/mca/pinstalldirs/env/configure.m4
@@ -0,0 +1,30 @@
+# -*- shell-script -*-
+#
+# Copyright (c) 2006      Los Alamos National Security, LLC.  All rights
+#                         reserved.
+# Copyright (c) 2010      Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2016      Intel, Inc. All rights reserved
+# Copyright (c) 2016      Research Organization for Information Science
+#                         and Technology (RIST). All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+AC_DEFUN([MCA_pmix_pinstalldirs_env_PRIORITY], [10])
+
+AC_DEFUN([MCA_pmix_pinstalldirs_env_COMPILE_MODE], [
+    AC_MSG_CHECKING([for MCA component $1:$2 compile mode])
+    $3="static"
+    AC_MSG_RESULT([$$3])
+])
+
+# MCA_pinstalldirs_config_CONFIG(action-if-can-compile,
+#                        [action-if-cant-compile])
+# ------------------------------------------------
+AC_DEFUN([MCA_pmix_pinstalldirs_env_CONFIG], [
+    AC_CONFIG_FILES([src/mca/pinstalldirs/env/Makefile])
+])
+
diff --git a/src/mca/pinstalldirs/env/pmix_pinstalldirs_env.c b/src/mca/pinstalldirs/env/pmix_pinstalldirs_env.c
new file mode 100644
index 0000000..9ee499b
--- /dev/null
+++ b/src/mca/pinstalldirs/env/pmix_pinstalldirs_env.c
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2006-2007 Los Alamos National Security, LLC.  All rights
+ *                         reserved.
+ * Copyright (c) 2007      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2016      Intel, Inc. All rights reserved
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "pmix_common.h"
+#include "src/mca/pinstalldirs/pinstalldirs.h"
+
+static int pinstalldirs_env_open(void);
+
+
+pmix_pinstalldirs_base_component_t mca_pinstalldirs_env_component = {
+    /* First, the mca_component_t struct containing meta information
+       about the component itself */
+    {
+        PMIX_PINSTALLDIRS_BASE_VERSION_1_0_0,
+
+        /* Component name and version */
+        "env",
+        PMIX_MAJOR_VERSION,
+        PMIX_MINOR_VERSION,
+        PMIX_RELEASE_VERSION,
+
+        /* Component open and close functions */
+        pinstalldirs_env_open,
+        NULL
+    },
+    {
+        /* This component is checkpointable */
+        PMIX_MCA_BASE_METADATA_PARAM_CHECKPOINT
+    },
+
+    /* Next the pmix_pinstall_dirs_t install_dirs_data information */
+    {
+        NULL,
+    },
+};
+
+
+#define SET_FIELD(field, envname)                                         \
+    do {                                                                  \
+        char *tmp = getenv(envname);                                      \
+         if (NULL != tmp && 0 == strlen(tmp)) {                           \
+             tmp = NULL;                                                  \
+         }                                                                \
+         mca_pinstalldirs_env_component.install_dirs_data.field = tmp;     \
+    } while (0)
+
+
+static int
+pinstalldirs_env_open(void)
+{
+    SET_FIELD(prefix, "PMIX_INSTALL_PREFIX");
+    SET_FIELD(exec_prefix, "PMIX_EXEC_PREFIX");
+    SET_FIELD(bindir, "PMIX_BINDIR");
+    SET_FIELD(sbindir, "PMIX_SBINDIR");
+    SET_FIELD(libexecdir, "PMIX_LIBEXECDIR");
+    SET_FIELD(datarootdir, "PMIX_DATAROOTDIR");
+    SET_FIELD(datadir, "PMIX_DATADIR");
+    SET_FIELD(sysconfdir, "PMIX_SYSCONFDIR");
+    SET_FIELD(sharedstatedir, "PMIX_SHAREDSTATEDIR");
+    SET_FIELD(localstatedir, "PMIX_LOCALSTATEDIR");
+    SET_FIELD(libdir, "PMIX_LIBDIR");
+    SET_FIELD(includedir, "PMIX_INCLUDEDIR");
+    SET_FIELD(infodir, "PMIX_INFODIR");
+    SET_FIELD(mandir, "PMIX_MANDIR");
+    SET_FIELD(pmixdatadir, "PMIX_PKGDATADIR");
+    SET_FIELD(pmixlibdir, "PMIX_PKGLIBDIR");
+    SET_FIELD(pmixincludedir, "PMIX_PKGINCLUDEDIR");
+
+    return PMIX_SUCCESS;
+}
diff --git a/src/mca/pinstalldirs/pinstalldirs.h b/src/mca/pinstalldirs/pinstalldirs.h
new file mode 100644
index 0000000..22930ab
--- /dev/null
+++ b/src/mca/pinstalldirs/pinstalldirs.h
@@ -0,0 +1,98 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2006-2015 Los Alamos National Security, LLC.  All rights
+ *                         reserved.
+ * Copyright (c) 2016      Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#ifndef PMIX_MCA_PINSTALLDIRS_PINSTALLDIRS_H
+#define PMIX_MCA_PINSTALLDIRS_PINSTALLDIRS_H
+
+#include <src/include/pmix_config.h>
+
+#include "src/mca/mca.h"
+#include "src/mca/base/base.h"
+
+BEGIN_C_DECLS
+
+/*
+ * Most of this file is just for ompi_info.  The only public interface
+ * once pmix_init has been called is the pmix_pinstall_dirs structure
+ * and the pmix_pinstall_dirs_expand() call */
+struct pmix_pinstall_dirs_t {
+    char* prefix;
+    char* exec_prefix;
+    char* bindir;
+    char* sbindir;
+    char* libexecdir;
+    char* datarootdir;
+    char* datadir;
+    char* sysconfdir;
+    char* sharedstatedir;
+    char* localstatedir;
+    char* libdir;
+    char* includedir;
+    char* infodir;
+    char* mandir;
+
+    /* Note that the following fields intentionally have an "ompi"
+       prefix, even though they're down in the PMIX layer.  This is
+       not abstraction break because the "ompi" they're referring to
+       is for the build system of the overall software tree -- not an
+       individual project within that overall tree.
+
+       Rather than using pkg{data,lib,includedir}, use our own
+       ompi{data,lib,includedir}, which is always set to
+       {datadir,libdir,includedir}/pmix. This will keep us from
+       having help files in prefix/share/open-rte when building
+       without PMIX, but in prefix/share/pmix when building
+       with PMIX.
+
+       Note that these field names match macros set by configure that
+       are used in Makefile.am files.  E.g., project help files are
+       installed into $(pmixdatadir). */
+    char* pmixdatadir;
+    char* pmixlibdir;
+    char* pmixincludedir;
+};
+typedef struct pmix_pinstall_dirs_t pmix_pinstall_dirs_t;
+
+/* Install directories.  Only available after pmix_init() */
+extern pmix_pinstall_dirs_t pmix_pinstall_dirs;
+
+/**
+ * Expand out path variables (such as ${prefix}) in the input string
+ * using the current pmix_pinstall_dirs structure */
+char * pmix_pinstall_dirs_expand(const char* input);
+
+
+/**
+ * Structure for pinstalldirs components.
+ */
+struct pmix_pinstalldirs_base_component_2_0_0_t {
+    /** MCA base component */
+    pmix_mca_base_component_t component;
+    /** MCA base data */
+    pmix_mca_base_component_data_t component_data;
+    /** install directories provided by the given component */
+    pmix_pinstall_dirs_t install_dirs_data;
+};
+/**
+ * Convenience typedef
+ */
+typedef struct pmix_pinstalldirs_base_component_2_0_0_t pmix_pinstalldirs_base_component_t;
+
+/*
+ * Macro for use in components that are of type pinstalldirs
+ */
+#define PMIX_PINSTALLDIRS_BASE_VERSION_1_0_0 \
+    PMIX_MCA_BASE_VERSION_1_0_0("pinstalldirs", 1, 0, 0)
+
+END_C_DECLS
+
+#endif /* PMIX_MCA_PINSTALLDIRS_PINSTALLDIRS_H */
diff --git a/src/mca/pnet/Makefile.am b/src/mca/pnet/Makefile.am
new file mode 100644
index 0000000..9a078f0
--- /dev/null
+++ b/src/mca/pnet/Makefile.am
@@ -0,0 +1,44 @@
+# -*- makefile -*-
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2012      Los Alamos National Security, Inc.  All rights reserved.
+# Copyright (c) 2013-2016 Intel, Inc. All rights reserved
+# Copyright (c) 2016      Cisco Systems, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+AM_CPPFLAGS = $(LTDLINCL)
+
+# main library setup
+noinst_LTLIBRARIES = libmca_pnet.la
+libmca_pnet_la_SOURCES =
+
+# local files
+headers = pnet.h
+sources =
+
+# Conditionally install the header files
+if WANT_INSTALL_HEADERS
+pmixdir = $(pmixincludedir)/$(subdir)
+nobase_pmix_HEADERS = $(headers)
+endif
+
+include base/Makefile.include
+
+libmca_pnet_la_SOURCES += $(headers) $(sources)
+
+distclean-local:
+	rm -f base/static-components.h
diff --git a/src/mca/pnet/Makefile.in b/src/mca/pnet/Makefile.in
new file mode 100644
index 0000000..07466dd
--- /dev/null
+++ b/src/mca/pnet/Makefile.in
@@ -0,0 +1,899 @@
+# Makefile.in generated by automake 1.15 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+# -*- makefile -*-
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2012      Los Alamos National Security, Inc.  All rights reserved.
+# Copyright (c) 2013-2016 Intel, Inc. All rights reserved
+# Copyright (c) 2016      Cisco Systems, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# -*- makefile -*-
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2012      Los Alamos National Security, Inc.  All rights reserved.
+# Copyright (c) 2013-2016 Intel, Inc. All rights reserved
+# Copyright (c) 2016      Cisco Systems, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# This makefile.am does not stand on its own - it is included from
+# src/Makefile.am
+
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+subdir = src/mca/pnet
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/config/c_get_alignment.m4 \
+	$(top_srcdir)/config/libtool.m4 \
+	$(top_srcdir)/config/ltoptions.m4 \
+	$(top_srcdir)/config/ltsugar.m4 \
+	$(top_srcdir)/config/ltversion.m4 \
+	$(top_srcdir)/config/lt~obsolete.m4 \
+	$(top_srcdir)/config/pmix.m4 \
+	$(top_srcdir)/config/pmix_check_attributes.m4 \
+	$(top_srcdir)/config/pmix_check_broken_qsort.m4 \
+	$(top_srcdir)/config/pmix_check_compiler_version.m4 \
+	$(top_srcdir)/config/pmix_check_icc.m4 \
+	$(top_srcdir)/config/pmix_check_ident.m4 \
+	$(top_srcdir)/config/pmix_check_lock.m4 \
+	$(top_srcdir)/config/pmix_check_os_flavors.m4 \
+	$(top_srcdir)/config/pmix_check_package.m4 \
+	$(top_srcdir)/config/pmix_check_psm2.m4 \
+	$(top_srcdir)/config/pmix_check_pthread_pids.m4 \
+	$(top_srcdir)/config/pmix_check_vendor.m4 \
+	$(top_srcdir)/config/pmix_check_visibility.m4 \
+	$(top_srcdir)/config/pmix_check_withdir.m4 \
+	$(top_srcdir)/config/pmix_config_asm.m4 \
+	$(top_srcdir)/config/pmix_config_pthreads.m4 \
+	$(top_srcdir)/config/pmix_config_subdir.m4 \
+	$(top_srcdir)/config/pmix_config_subdir_args.m4 \
+	$(top_srcdir)/config/pmix_config_threads.m4 \
+	$(top_srcdir)/config/pmix_ensure_contains_optflags.m4 \
+	$(top_srcdir)/config/pmix_functions.m4 \
+	$(top_srcdir)/config/pmix_load_platform.m4 \
+	$(top_srcdir)/config/pmix_mca.m4 \
+	$(top_srcdir)/config/pmix_search_libs.m4 \
+	$(top_srcdir)/config/pmix_setup_cc.m4 \
+	$(top_srcdir)/config/pmix_setup_libevent.m4 \
+	$(top_srcdir)/config/pmix_setup_zlib.m4 \
+	$(top_srcdir)/config/pmix_try_assemble.m4 \
+	$(top_srcdir)/config/autogen_found_items.m4 \
+	$(top_srcdir)/src/mca/pdl/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/configure.m4 \
+	$(top_srcdir)/src/mca/pdl/pdlopen/configure.m4 \
+	$(top_srcdir)/src/mca/pdl/plibltdl/configure.m4 \
+	$(top_srcdir)/src/mca/pif/bsdx_ipv4/configure.m4 \
+	$(top_srcdir)/src/mca/pif/bsdx_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pif/linux_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pif/posix_ipv4/configure.m4 \
+	$(top_srcdir)/src/mca/pif/solaris_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/config/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/env/configure.m4 \
+	$(top_srcdir)/src/mca/pnet/opa/configure.m4 \
+	$(top_srcdir)/src/mca/psec/munge/configure.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__nobase_pmix_HEADERS_DIST) \
+	$(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/src/include/pmix_config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+libmca_pnet_la_LIBADD =
+am__objects_1 =
+am__dirstamp = $(am__leading_dot)dirstamp
+am__objects_2 = base/pnet_base_frame.lo base/pnet_base_select.lo \
+	base/pnet_base_fns.lo
+am_libmca_pnet_la_OBJECTS = $(am__objects_1) $(am__objects_2)
+libmca_pnet_la_OBJECTS = $(am_libmca_pnet_la_OBJECTS)
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/src/include
+depcomp = $(SHELL) $(top_srcdir)/./config/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libmca_pnet_la_SOURCES)
+DIST_SOURCES = $(libmca_pnet_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__nobase_pmix_HEADERS_DIST = pnet.h base/base.h
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(pmixdir)"
+HEADERS = $(nobase_pmix_HEADERS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+	$(srcdir)/base/Makefile.include $(top_srcdir)/./config/depcomp
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CFLAGS = @CFLAGS@
+CLEANFILES = @CLEANFILES@
+CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MCA_PROJECT_SUBDIRS = @MCA_PROJECT_SUBDIRS@
+MCA_pmix_FRAMEWORKS = @MCA_pmix_FRAMEWORKS@
+MCA_pmix_FRAMEWORKS_SUBDIRS = @MCA_pmix_FRAMEWORKS_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS@
+MCA_pmix_FRAMEWORK_LIBS = @MCA_pmix_FRAMEWORK_LIBS@
+MCA_pmix_pdl_ALL_COMPONENTS = @MCA_pmix_pdl_ALL_COMPONENTS@
+MCA_pmix_pdl_ALL_SUBDIRS = @MCA_pmix_pdl_ALL_SUBDIRS@
+MCA_pmix_pdl_DSO_COMPONENTS = @MCA_pmix_pdl_DSO_COMPONENTS@
+MCA_pmix_pdl_DSO_SUBDIRS = @MCA_pmix_pdl_DSO_SUBDIRS@
+MCA_pmix_pdl_STATIC_COMPONENTS = @MCA_pmix_pdl_STATIC_COMPONENTS@
+MCA_pmix_pdl_STATIC_LTLIBS = @MCA_pmix_pdl_STATIC_LTLIBS@
+MCA_pmix_pdl_STATIC_SUBDIRS = @MCA_pmix_pdl_STATIC_SUBDIRS@
+MCA_pmix_pif_ALL_COMPONENTS = @MCA_pmix_pif_ALL_COMPONENTS@
+MCA_pmix_pif_ALL_SUBDIRS = @MCA_pmix_pif_ALL_SUBDIRS@
+MCA_pmix_pif_DSO_COMPONENTS = @MCA_pmix_pif_DSO_COMPONENTS@
+MCA_pmix_pif_DSO_SUBDIRS = @MCA_pmix_pif_DSO_SUBDIRS@
+MCA_pmix_pif_STATIC_COMPONENTS = @MCA_pmix_pif_STATIC_COMPONENTS@
+MCA_pmix_pif_STATIC_LTLIBS = @MCA_pmix_pif_STATIC_LTLIBS@
+MCA_pmix_pif_STATIC_SUBDIRS = @MCA_pmix_pif_STATIC_SUBDIRS@
+MCA_pmix_pinstalldirs_ALL_COMPONENTS = @MCA_pmix_pinstalldirs_ALL_COMPONENTS@
+MCA_pmix_pinstalldirs_ALL_SUBDIRS = @MCA_pmix_pinstalldirs_ALL_SUBDIRS@
+MCA_pmix_pinstalldirs_DSO_COMPONENTS = @MCA_pmix_pinstalldirs_DSO_COMPONENTS@
+MCA_pmix_pinstalldirs_DSO_SUBDIRS = @MCA_pmix_pinstalldirs_DSO_SUBDIRS@
+MCA_pmix_pinstalldirs_STATIC_COMPONENTS = @MCA_pmix_pinstalldirs_STATIC_COMPONENTS@
+MCA_pmix_pinstalldirs_STATIC_LTLIBS = @MCA_pmix_pinstalldirs_STATIC_LTLIBS@
+MCA_pmix_pinstalldirs_STATIC_SUBDIRS = @MCA_pmix_pinstalldirs_STATIC_SUBDIRS@
+MCA_pmix_pnet_ALL_COMPONENTS = @MCA_pmix_pnet_ALL_COMPONENTS@
+MCA_pmix_pnet_ALL_SUBDIRS = @MCA_pmix_pnet_ALL_SUBDIRS@
+MCA_pmix_pnet_DSO_COMPONENTS = @MCA_pmix_pnet_DSO_COMPONENTS@
+MCA_pmix_pnet_DSO_SUBDIRS = @MCA_pmix_pnet_DSO_SUBDIRS@
+MCA_pmix_pnet_STATIC_COMPONENTS = @MCA_pmix_pnet_STATIC_COMPONENTS@
+MCA_pmix_pnet_STATIC_LTLIBS = @MCA_pmix_pnet_STATIC_LTLIBS@
+MCA_pmix_pnet_STATIC_SUBDIRS = @MCA_pmix_pnet_STATIC_SUBDIRS@
+MCA_pmix_psec_ALL_COMPONENTS = @MCA_pmix_psec_ALL_COMPONENTS@
+MCA_pmix_psec_ALL_SUBDIRS = @MCA_pmix_psec_ALL_SUBDIRS@
+MCA_pmix_psec_DSO_COMPONENTS = @MCA_pmix_psec_DSO_COMPONENTS@
+MCA_pmix_psec_DSO_SUBDIRS = @MCA_pmix_psec_DSO_SUBDIRS@
+MCA_pmix_psec_STATIC_COMPONENTS = @MCA_pmix_psec_STATIC_COMPONENTS@
+MCA_pmix_psec_STATIC_LTLIBS = @MCA_pmix_psec_STATIC_LTLIBS@
+MCA_pmix_psec_STATIC_SUBDIRS = @MCA_pmix_psec_STATIC_SUBDIRS@
+MCA_pmix_psensor_ALL_COMPONENTS = @MCA_pmix_psensor_ALL_COMPONENTS@
+MCA_pmix_psensor_ALL_SUBDIRS = @MCA_pmix_psensor_ALL_SUBDIRS@
+MCA_pmix_psensor_DSO_COMPONENTS = @MCA_pmix_psensor_DSO_COMPONENTS@
+MCA_pmix_psensor_DSO_SUBDIRS = @MCA_pmix_psensor_DSO_SUBDIRS@
+MCA_pmix_psensor_STATIC_COMPONENTS = @MCA_pmix_psensor_STATIC_COMPONENTS@
+MCA_pmix_psensor_STATIC_LTLIBS = @MCA_pmix_psensor_STATIC_LTLIBS@
+MCA_pmix_psensor_STATIC_SUBDIRS = @MCA_pmix_psensor_STATIC_SUBDIRS@
+MCA_pmix_ptl_ALL_COMPONENTS = @MCA_pmix_ptl_ALL_COMPONENTS@
+MCA_pmix_ptl_ALL_SUBDIRS = @MCA_pmix_ptl_ALL_SUBDIRS@
+MCA_pmix_ptl_DSO_COMPONENTS = @MCA_pmix_ptl_DSO_COMPONENTS@
+MCA_pmix_ptl_DSO_SUBDIRS = @MCA_pmix_ptl_DSO_SUBDIRS@
+MCA_pmix_ptl_STATIC_COMPONENTS = @MCA_pmix_ptl_STATIC_COMPONENTS@
+MCA_pmix_ptl_STATIC_LTLIBS = @MCA_pmix_ptl_STATIC_LTLIBS@
+MCA_pmix_ptl_STATIC_SUBDIRS = @MCA_pmix_ptl_STATIC_SUBDIRS@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PMIX_ASM_GSYM = @PMIX_ASM_GSYM@
+PMIX_ASM_LSYM = @PMIX_ASM_LSYM@
+PMIX_ASM_SUPPORT_64BIT = @PMIX_ASM_SUPPORT_64BIT@
+PMIX_ASM_TEXT = @PMIX_ASM_TEXT@
+PMIX_ASM_TYPE = @PMIX_ASM_TYPE@
+PMIX_ASSEMBLY_ARCH = @PMIX_ASSEMBLY_ARCH@
+PMIX_ASSEMBLY_BUILTIN = @PMIX_ASSEMBLY_BUILTIN@
+PMIX_ASSEMBLY_FORMAT = @PMIX_ASSEMBLY_FORMAT@
+PMIX_AS_GLOBAL = @PMIX_AS_GLOBAL@
+PMIX_AS_LABEL_SUFFIX = @PMIX_AS_LABEL_SUFFIX@
+PMIX_CC_ABSOLUTE = @PMIX_CC_ABSOLUTE@
+PMIX_CONFIGURE_DATE = @PMIX_CONFIGURE_DATE@
+PMIX_CONFIGURE_HOST = @PMIX_CONFIGURE_HOST@
+PMIX_CONFIGURE_USER = @PMIX_CONFIGURE_USER@
+PMIX_EMBEDDED_CPPFLAGS = @PMIX_EMBEDDED_CPPFLAGS@
+PMIX_EMBEDDED_LDFLAGS = @PMIX_EMBEDDED_LDFLAGS@
+PMIX_EMBEDDED_LIBS = @PMIX_EMBEDDED_LIBS@
+PMIX_MAJOR_VERSION = @PMIX_MAJOR_VERSION@
+PMIX_MINOR_VERSION = @PMIX_MINOR_VERSION@
+PMIX_RELEASE_DATE = @PMIX_RELEASE_DATE@
+PMIX_RELEASE_VERSION = @PMIX_RELEASE_VERSION@
+PMIX_RENAME = @PMIX_RENAME@
+PMIX_VERSION = @PMIX_VERSION@
+PMIX_top_builddir = @PMIX_top_builddir@
+PMIX_top_srcdir = @PMIX_top_srcdir@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_prefix_program = @ac_prefix_program@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+libpmix_so_version = @libpmix_so_version@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pmix_have_pandoc = @pmix_have_pandoc@
+pmix_pdl_pdlopen_LIBS = @pmix_pdl_pdlopen_LIBS@
+pmix_pdl_plibltdl_CPPFLAGS = @pmix_pdl_plibltdl_CPPFLAGS@
+pmix_pdl_plibltdl_LDFLAGS = @pmix_pdl_plibltdl_LDFLAGS@
+pmix_pdl_plibltdl_LIBS = @pmix_pdl_plibltdl_LIBS@
+pmixdatadir = @pmixdatadir@
+pmixincludedir = @pmixincludedir@
+pmixlibdir = @pmixlibdir@
+pmixmajor = @pmixmajor@
+pmixminor = @pmixminor@
+pnet_opa_CFLAGS = @pnet_opa_CFLAGS@
+pnet_opa_CPPFLAGS = @pnet_opa_CPPFLAGS@
+pnet_opa_LDFLAGS = @pnet_opa_LDFLAGS@
+pnet_opa_LIBS = @pnet_opa_LIBS@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+psec_munge_CPPFLAGS = @psec_munge_CPPFLAGS@
+psec_munge_LDFLAGS = @psec_munge_LDFLAGS@
+psec_munge_LIBS = @psec_munge_LIBS@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+AM_CPPFLAGS = $(LTDLINCL)
+
+# main library setup
+noinst_LTLIBRARIES = libmca_pnet.la
+libmca_pnet_la_SOURCES = $(headers) $(sources)
+
+# local files
+headers = pnet.h base/base.h
+sources = base/pnet_base_frame.c base/pnet_base_select.c \
+	base/pnet_base_fns.c
+
+# Conditionally install the header files
+ at WANT_INSTALL_HEADERS_TRUE@pmixdir = $(pmixincludedir)/$(subdir)
+ at WANT_INSTALL_HEADERS_TRUE@nobase_pmix_HEADERS = $(headers)
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/base/Makefile.include $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/mca/pnet/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/mca/pnet/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+$(srcdir)/base/Makefile.include $(am__empty):
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_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}; \
+	}
+base/$(am__dirstamp):
+	@$(MKDIR_P) base
+	@: > base/$(am__dirstamp)
+base/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) base/$(DEPDIR)
+	@: > base/$(DEPDIR)/$(am__dirstamp)
+base/pnet_base_frame.lo: base/$(am__dirstamp) \
+	base/$(DEPDIR)/$(am__dirstamp)
+base/pnet_base_select.lo: base/$(am__dirstamp) \
+	base/$(DEPDIR)/$(am__dirstamp)
+base/pnet_base_fns.lo: base/$(am__dirstamp) \
+	base/$(DEPDIR)/$(am__dirstamp)
+
+libmca_pnet.la: $(libmca_pnet_la_OBJECTS) $(libmca_pnet_la_DEPENDENCIES) $(EXTRA_libmca_pnet_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(LINK)  $(libmca_pnet_la_OBJECTS) $(libmca_pnet_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+	-rm -f base/*.$(OBJEXT)
+	-rm -f base/*.lo
+
+distclean-compile:
+	-rm -f *.tab.c
+
+ at AMDEP_TRUE@@am__include@ @am__quote at base/$(DEPDIR)/pnet_base_fns.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at base/$(DEPDIR)/pnet_base_frame.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at base/$(DEPDIR)/pnet_base_select.Plo at am__quote@
+
+.c.o:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+ at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+	-rm -rf base/.libs base/_libs
+install-nobase_pmixHEADERS: $(nobase_pmix_HEADERS)
+	@$(NORMAL_INSTALL)
+	@list='$(nobase_pmix_HEADERS)'; test -n "$(pmixdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(pmixdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(pmixdir)" || exit 1; \
+	fi; \
+	$(am__nobase_list) | while read dir files; do \
+	  xfiles=; for file in $$files; do \
+	    if test -f "$$file"; then xfiles="$$xfiles $$file"; \
+	    else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \
+	  test -z "$$xfiles" || { \
+	    test "x$$dir" = x. || { \
+	      echo " $(MKDIR_P) '$(DESTDIR)$(pmixdir)/$$dir'"; \
+	      $(MKDIR_P) "$(DESTDIR)$(pmixdir)/$$dir"; }; \
+	    echo " $(INSTALL_HEADER) $$xfiles '$(DESTDIR)$(pmixdir)/$$dir'"; \
+	    $(INSTALL_HEADER) $$xfiles "$(DESTDIR)$(pmixdir)/$$dir" || exit $$?; }; \
+	done
+
+uninstall-nobase_pmixHEADERS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(nobase_pmix_HEADERS)'; test -n "$(pmixdir)" || list=; \
+	$(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \
+	dir='$(DESTDIR)$(pmixdir)'; $(am__uninstall_files_from_dir)
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES) $(HEADERS)
+installdirs:
+	for dir in "$(DESTDIR)$(pmixdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+	-rm -f base/$(DEPDIR)/$(am__dirstamp)
+	-rm -f base/$(am__dirstamp)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf base/$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-local distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-nobase_pmixHEADERS
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf base/$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-nobase_pmixHEADERS
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-local 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-nobase_pmixHEADERS install-pdf install-pdf-am \
+	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-nobase_pmixHEADERS
+
+.PRECIOUS: Makefile
+
+
+distclean-local:
+	rm -f base/static-components.h
+
+# 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/mca/pnet/base/Makefile.include b/src/mca/pnet/base/Makefile.include
new file mode 100644
index 0000000..a45c86f
--- /dev/null
+++ b/src/mca/pnet/base/Makefile.include
@@ -0,0 +1,32 @@
+# -*- makefile -*-
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2012      Los Alamos National Security, Inc.  All rights reserved.
+# Copyright (c) 2013-2016 Intel, Inc. All rights reserved
+# Copyright (c) 2016      Cisco Systems, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# This makefile.am does not stand on its own - it is included from
+# src/Makefile.am
+
+headers += \
+         base/base.h
+
+sources += \
+        base/pnet_base_frame.c \
+        base/pnet_base_select.c \
+        base/pnet_base_fns.c
diff --git a/src/mca/pnet/base/base.h b/src/mca/pnet/base/base.h
new file mode 100644
index 0000000..7ed16e4
--- /dev/null
+++ b/src/mca/pnet/base/base.h
@@ -0,0 +1,91 @@
+/* -*- C -*-
+ *
+ * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2006 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2012      Los Alamos National Security, Inc.  All rights reserved.
+ * Copyright (c) 2014-2016 Intel, Inc. All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ *
+ */
+#ifndef PMIX_PNET_BASE_H_
+#define PMIX_PNET_BASE_H_
+
+#include <src/include/pmix_config.h>
+
+
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h> /* for struct timeval */
+#endif
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+
+#include "src/class/pmix_list.h"
+#include "src/class/pmix_pointer_array.h"
+#include "src/mca/mca.h"
+#include "src/mca/base/pmix_mca_base_framework.h"
+
+#include "src/mca/pnet/pnet.h"
+
+
+BEGIN_C_DECLS
+
+/*
+ * MCA Framework
+ */
+extern pmix_mca_base_framework_t pmix_pnet_base_framework;
+/**
+ * PNET select function
+ *
+ * Cycle across available components and construct the list
+ * of active modules
+ */
+pmix_status_t pmix_pnet_base_select(void);
+
+/**
+ * Track an active component / module
+ */
+struct pmix_pnet_base_active_module_t {
+    pmix_list_item_t super;
+    int pri;
+    pmix_pnet_module_t *module;
+    pmix_pnet_base_component_t *component;
+};
+typedef struct pmix_pnet_base_active_module_t pmix_pnet_base_active_module_t;
+PMIX_CLASS_DECLARATION(pmix_pnet_base_active_module_t);
+
+
+/* framework globals */
+struct pmix_pnet_globals_t {
+  pmix_list_t actives;
+  bool initialized;
+};
+typedef struct pmix_pnet_globals_t pmix_pnet_globals_t;
+
+extern pmix_pnet_globals_t pmix_pnet_globals;
+
+pmix_status_t pmix_pnet_base_setup_app(char *nspace, pmix_list_t *ilist);
+pmix_status_t pmix_pnet_base_setup_local_network(char *nspace,
+                                                 pmix_info_t info[],
+                                                 size_t ninfo);
+pmix_status_t pmix_pnet_base_setup_fork(const pmix_proc_t *peer, char ***env);
+void pmix_pnet_base_child_finalized(pmix_peer_t *peer);
+void pmix_pnet_base_local_app_finalized(char *nspace);
+
+END_C_DECLS
+
+#endif
diff --git a/src/mca/pnet/base/pnet_base_fns.c b/src/mca/pnet/base/pnet_base_fns.c
new file mode 100644
index 0000000..3572fdf
--- /dev/null
+++ b/src/mca/pnet/base/pnet_base_fns.c
@@ -0,0 +1,146 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2015-2016 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2016      Mellanox Technologies, Inc.
+ *                         All rights reserved.
+ *
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+
+#include <pmix_common.h>
+#include "src/include/pmix_globals.h"
+
+#include "src/class/pmix_list.h"
+#include "src/util/error.h"
+
+#include "src/mca/pnet/base/base.h"
+
+
+pmix_status_t pmix_pnet_base_setup_app(char *nspace, pmix_list_t *ilist)
+{
+    pmix_pnet_base_active_module_t *active;
+    pmix_status_t rc;
+
+    if (!pmix_pnet_globals.initialized) {
+        return PMIX_ERR_INIT;
+    }
+
+    /* protect against bozo inputs */
+    if (NULL == nspace || NULL == ilist) {
+        return PMIX_ERR_BAD_PARAM;
+    }
+
+    PMIX_LIST_FOREACH(active, &pmix_pnet_globals.actives, pmix_pnet_base_active_module_t) {
+        if (NULL != active->module->setup_app) {
+            if (PMIX_SUCCESS != (rc = active->module->setup_app(nspace, ilist))) {
+                return rc;
+            }
+        }
+    }
+
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_pnet_base_setup_local_network(char *nspace,
+                                                 pmix_info_t info[],
+                                                 size_t ninfo)
+{
+    pmix_pnet_base_active_module_t *active;
+    pmix_status_t rc;
+
+    if (!pmix_pnet_globals.initialized) {
+        return PMIX_ERR_INIT;
+    }
+
+    /* protect against bozo inputs */
+    if (NULL == nspace) {
+        return PMIX_ERR_BAD_PARAM;
+    }
+
+    PMIX_LIST_FOREACH(active, &pmix_pnet_globals.actives, pmix_pnet_base_active_module_t) {
+        if (NULL != active->module->setup_local_network) {
+            if (PMIX_SUCCESS != (rc = active->module->setup_local_network(nspace, info, ninfo))) {
+                return rc;
+            }
+        }
+    }
+
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_pnet_base_setup_fork(const pmix_proc_t *peer, char ***env)
+{
+    pmix_pnet_base_active_module_t *active;
+    pmix_status_t rc;
+
+    if (!pmix_pnet_globals.initialized) {
+        return PMIX_ERR_INIT;
+    }
+
+    /* protect against bozo inputs */
+    if (NULL == peer || NULL == env) {
+        return PMIX_ERR_BAD_PARAM;
+    }
+
+    PMIX_LIST_FOREACH(active, &pmix_pnet_globals.actives, pmix_pnet_base_active_module_t) {
+        if (NULL != active->module->setup_fork) {
+            if (PMIX_SUCCESS != (rc = active->module->setup_fork(peer, env))) {
+                return rc;
+            }
+        }
+    }
+
+    return PMIX_SUCCESS;
+}
+
+void pmix_pnet_base_child_finalized(pmix_peer_t *peer)
+{
+    pmix_pnet_base_active_module_t *active;
+
+    if (!pmix_pnet_globals.initialized) {
+        return;
+    }
+
+    /* protect against bozo inputs */
+    if (NULL == peer) {
+        PMIX_ERROR_LOG(PMIX_ERR_BAD_PARAM);
+        return;
+    }
+
+    PMIX_LIST_FOREACH(active, &pmix_pnet_globals.actives, pmix_pnet_base_active_module_t) {
+        if (NULL != active->module->child_finalized) {
+            active->module->child_finalized(peer);
+        }
+    }
+
+    return;
+}
+
+void pmix_pnet_base_local_app_finalized(char *nspace)
+{
+    pmix_pnet_base_active_module_t *active;
+
+    if (!pmix_pnet_globals.initialized) {
+        return;
+    }
+
+    /* protect against bozo inputs */
+    if (NULL == nspace) {
+        PMIX_ERROR_LOG(PMIX_ERR_BAD_PARAM);
+        return;
+    }
+
+    PMIX_LIST_FOREACH(active, &pmix_pnet_globals.actives, pmix_pnet_base_active_module_t) {
+        if (NULL != active->module->local_app_finalized) {
+            active->module->local_app_finalized(nspace);
+        }
+    }
+
+    return;
+}
diff --git a/src/mca/pnet/base/pnet_base_frame.c b/src/mca/pnet/base/pnet_base_frame.c
new file mode 100644
index 0000000..0dd5410
--- /dev/null
+++ b/src/mca/pnet/base/pnet_base_frame.c
@@ -0,0 +1,93 @@
+/* -*- Mode: C; c-basic-offset:4 ; -*- */
+/*
+ * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2009 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2012-2013 Los Alamos National Security, Inc.  All rights reserved.
+ * Copyright (c) 2014-2016 Intel, Inc. All rights reserved.
+ * Copyright (c) 2015-2016 Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+/** @file:
+ *
+ */
+#include <src/include/pmix_config.h>
+
+#include <pmix_common.h>
+
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+
+#include "src/class/pmix_list.h"
+#include "src/mca/base/base.h"
+#include "src/mca/pnet/base/base.h"
+
+/*
+ * The following file was created by configure.  It contains extern
+ * statements and the definition of an array of pointers to each
+ * component's public mca_base_component_t struct.
+ */
+
+#include "src/mca/pnet/base/static-components.h"
+
+/* Instantiate the global vars */
+pmix_pnet_globals_t pmix_pnet_globals = {{{0}}};
+pmix_pnet_module_t pmix_pnet = {
+    .setup_app = pmix_pnet_base_setup_app,
+    .setup_local_network = pmix_pnet_base_setup_local_network,
+    .setup_fork = pmix_pnet_base_setup_fork,
+    .child_finalized = pmix_pnet_base_child_finalized,
+    .local_app_finalized = pmix_pnet_base_local_app_finalized
+};
+
+static pmix_status_t pmix_pnet_close(void)
+{
+  pmix_pnet_base_active_module_t *active, *prev;
+
+    if (!pmix_pnet_globals.initialized) {
+        return PMIX_SUCCESS;
+    }
+    pmix_pnet_globals.initialized = false;
+
+    PMIX_LIST_FOREACH_SAFE(active, prev, &pmix_pnet_globals.actives, pmix_pnet_base_active_module_t) {
+      pmix_list_remove_item(&pmix_pnet_globals.actives, &active->super);
+      if (NULL != active->module->finalize) {
+        active->module->finalize();
+      }
+      PMIX_RELEASE(active);
+    }
+    PMIX_DESTRUCT(&pmix_pnet_globals.actives);
+
+    return pmix_mca_base_framework_components_close(&pmix_pnet_base_framework, NULL);
+}
+
+static pmix_status_t pmix_pnet_open(pmix_mca_base_open_flag_t flags)
+{
+    /* initialize globals */
+    pmix_pnet_globals.initialized = true;
+    PMIX_CONSTRUCT(&pmix_pnet_globals.actives, pmix_list_t);
+
+    /* Open up all available components */
+    return pmix_mca_base_framework_components_open(&pmix_pnet_base_framework, flags);
+}
+
+PMIX_MCA_BASE_FRAMEWORK_DECLARE(pmix, pnet, "PMIx Network Operations",
+                                NULL, pmix_pnet_open, pmix_pnet_close,
+                                mca_pnet_base_static_components, 0);
+
+PMIX_CLASS_INSTANCE(pmix_pnet_base_active_module_t,
+                    pmix_list_item_t,
+                    NULL, NULL);
diff --git a/src/mca/pnet/base/pnet_base_select.c b/src/mca/pnet/base/pnet_base_select.c
new file mode 100644
index 0000000..f751146
--- /dev/null
+++ b/src/mca/pnet/base/pnet_base_select.c
@@ -0,0 +1,116 @@
+/*
+ * Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2005 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2016      Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+#include <pmix_common.h>
+
+#include <string.h>
+
+#include "src/mca/mca.h"
+#include "src/mca/base/base.h"
+
+#include "src/mca/pnet/base/base.h"
+
+static bool selected = false;
+
+/* Function for selecting a prioritized list of components
+ * from all those that are available. */
+int pmix_pnet_base_select(void)
+{
+    pmix_mca_base_component_list_item_t *cli = NULL;
+    pmix_mca_base_component_t *component = NULL;
+    pmix_mca_base_module_t *module = NULL;
+    pmix_pnet_module_t *nmodule;
+    pmix_pnet_base_active_module_t *newmodule, *mod;
+    int rc, priority;
+    bool inserted;
+
+    if (selected) {
+        /* ensure we don't do this twice */
+        return PMIX_SUCCESS;
+    }
+    selected = true;
+
+    /* Query all available components and ask if they have a module */
+    PMIX_LIST_FOREACH(cli, &pmix_pnet_base_framework.framework_components, pmix_mca_base_component_list_item_t) {
+        component = (pmix_mca_base_component_t *) cli->cli_component;
+
+        pmix_output_verbose(5, pmix_pnet_base_framework.framework_output,
+                            "mca:pnet:select: checking available component %s", component->pmix_mca_component_name);
+
+        /* If there's no query function, skip it */
+        if (NULL == component->pmix_mca_query_component) {
+            pmix_output_verbose(5, pmix_pnet_base_framework.framework_output,
+                                "mca:pnet:select: Skipping component [%s]. It does not implement a query function",
+                                component->pmix_mca_component_name );
+            continue;
+        }
+
+        /* Query the component */
+        pmix_output_verbose(5, pmix_pnet_base_framework.framework_output,
+                            "mca:pnet:select: Querying component [%s]",
+                            component->pmix_mca_component_name);
+        rc = component->pmix_mca_query_component(&module, &priority);
+
+        /* If no module was returned, then skip component */
+        if (PMIX_SUCCESS != rc || NULL == module) {
+            pmix_output_verbose(5, pmix_pnet_base_framework.framework_output,
+                                "mca:pnet:select: Skipping component [%s]. Query failed to return a module",
+                                component->pmix_mca_component_name );
+            continue;
+        }
+
+        /* If we got a module, keep it */
+        nmodule = (pmix_pnet_module_t*) module;
+        /* let it initialize */
+        if (NULL != nmodule->init && PMIX_SUCCESS != nmodule->init()) {
+            continue;
+        }
+        /* add to the list of selected modules */
+        newmodule = PMIX_NEW(pmix_pnet_base_active_module_t);
+        newmodule->pri = priority;
+        newmodule->module = nmodule;
+        newmodule->component = (pmix_pnet_base_component_t*)cli->cli_component;
+
+        /* maintain priority order */
+        inserted = false;
+        PMIX_LIST_FOREACH(mod, &pmix_pnet_globals.actives, pmix_pnet_base_active_module_t) {
+            if (priority > mod->pri) {
+                pmix_list_insert_pos(&pmix_pnet_globals.actives,
+                                     (pmix_list_item_t*)mod, &newmodule->super);
+                inserted = true;
+                break;
+            }
+        }
+        if (!inserted) {
+            /* must be lowest priority - add to end */
+            pmix_list_append(&pmix_pnet_globals.actives, &newmodule->super);
+        }
+    }
+
+    if (4 < pmix_output_get_verbosity(pmix_pnet_base_framework.framework_output)) {
+        pmix_output(0, "Final pnet priorities");
+        /* show the prioritized list */
+        PMIX_LIST_FOREACH(mod, &pmix_pnet_globals.actives, pmix_pnet_base_active_module_t) {
+            pmix_output(0, "\tpnet: %s Priority: %d", mod->component->base.pmix_mca_component_name, mod->pri);
+        }
+    }
+
+    return PMIX_SUCCESS;;
+}
diff --git a/src/mca/pnet/opa/Makefile.am b/src/mca/pnet/opa/Makefile.am
new file mode 100644
index 0000000..1223b43
--- /dev/null
+++ b/src/mca/pnet/opa/Makefile.am
@@ -0,0 +1,56 @@
+# -*- makefile -*-
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2012      Los Alamos National Security, Inc.  All rights reserved.
+# Copyright (c) 2013-2016 Intel, Inc. All rights reserved
+# Copyright (c) 2017      Research Organization for Information Science
+#                         and Technology (RIST). All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+AM_CPPFLAGS = $(pnet_opa_CPPFLAGS)
+
+headers = pnet_opa.h
+sources = \
+        pnet_opa_component.c \
+        pnet_opa.c
+
+# Make the output library in this directory, and name it either
+# mca_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la
+# (for static builds).
+
+if MCA_BUILD_pmix_pnet_opa_DSO
+lib =
+lib_sources =
+component = mca_pnet_opa.la
+component_sources = $(headers) $(sources)
+else
+lib = libmca_pnet_opa.la
+lib_sources = $(headers) $(sources)
+component =
+component_sources =
+endif
+
+mcacomponentdir = $(pmixlibdir)
+mcacomponent_LTLIBRARIES = $(component)
+mca_pnet_opa_la_SOURCES = $(component_sources)
+mca_pnet_opa_la_LIBADD = $(pnet_opa_LIBS)
+mca_pnet_opa_la_LDFLAGS = -module -avoid-version $(pnet_opa_LDFLAGS)
+
+noinst_LTLIBRARIES = $(lib)
+libmca_pnet_opa_la_SOURCES = $(lib_sources)
+libmca_pnet_opa_la_LIBADD = $(pnet_opa_LIBS)
+libmca_pnet_opa_la_LDFLAGS = -module -avoid-version $(pnet_opa_LDFLAGS)
diff --git a/src/mca/pnet/opa/Makefile.in b/src/mca/pnet/opa/Makefile.in
new file mode 100644
index 0000000..a6b7b2b
--- /dev/null
+++ b/src/mca/pnet/opa/Makefile.in
@@ -0,0 +1,897 @@
+# Makefile.in generated by automake 1.15 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+# -*- makefile -*-
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2012      Los Alamos National Security, Inc.  All rights reserved.
+# Copyright (c) 2013-2016 Intel, Inc. All rights reserved
+# Copyright (c) 2017      Research Organization for Information Science
+#                         and Technology (RIST). All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+subdir = src/mca/pnet/opa
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/config/c_get_alignment.m4 \
+	$(top_srcdir)/config/libtool.m4 \
+	$(top_srcdir)/config/ltoptions.m4 \
+	$(top_srcdir)/config/ltsugar.m4 \
+	$(top_srcdir)/config/ltversion.m4 \
+	$(top_srcdir)/config/lt~obsolete.m4 \
+	$(top_srcdir)/config/pmix.m4 \
+	$(top_srcdir)/config/pmix_check_attributes.m4 \
+	$(top_srcdir)/config/pmix_check_broken_qsort.m4 \
+	$(top_srcdir)/config/pmix_check_compiler_version.m4 \
+	$(top_srcdir)/config/pmix_check_icc.m4 \
+	$(top_srcdir)/config/pmix_check_ident.m4 \
+	$(top_srcdir)/config/pmix_check_lock.m4 \
+	$(top_srcdir)/config/pmix_check_os_flavors.m4 \
+	$(top_srcdir)/config/pmix_check_package.m4 \
+	$(top_srcdir)/config/pmix_check_psm2.m4 \
+	$(top_srcdir)/config/pmix_check_pthread_pids.m4 \
+	$(top_srcdir)/config/pmix_check_vendor.m4 \
+	$(top_srcdir)/config/pmix_check_visibility.m4 \
+	$(top_srcdir)/config/pmix_check_withdir.m4 \
+	$(top_srcdir)/config/pmix_config_asm.m4 \
+	$(top_srcdir)/config/pmix_config_pthreads.m4 \
+	$(top_srcdir)/config/pmix_config_subdir.m4 \
+	$(top_srcdir)/config/pmix_config_subdir_args.m4 \
+	$(top_srcdir)/config/pmix_config_threads.m4 \
+	$(top_srcdir)/config/pmix_ensure_contains_optflags.m4 \
+	$(top_srcdir)/config/pmix_functions.m4 \
+	$(top_srcdir)/config/pmix_load_platform.m4 \
+	$(top_srcdir)/config/pmix_mca.m4 \
+	$(top_srcdir)/config/pmix_search_libs.m4 \
+	$(top_srcdir)/config/pmix_setup_cc.m4 \
+	$(top_srcdir)/config/pmix_setup_libevent.m4 \
+	$(top_srcdir)/config/pmix_setup_zlib.m4 \
+	$(top_srcdir)/config/pmix_try_assemble.m4 \
+	$(top_srcdir)/config/autogen_found_items.m4 \
+	$(top_srcdir)/src/mca/pdl/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/configure.m4 \
+	$(top_srcdir)/src/mca/pdl/pdlopen/configure.m4 \
+	$(top_srcdir)/src/mca/pdl/plibltdl/configure.m4 \
+	$(top_srcdir)/src/mca/pif/bsdx_ipv4/configure.m4 \
+	$(top_srcdir)/src/mca/pif/bsdx_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pif/linux_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pif/posix_ipv4/configure.m4 \
+	$(top_srcdir)/src/mca/pif/solaris_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/config/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/env/configure.m4 \
+	$(top_srcdir)/src/mca/pnet/opa/configure.m4 \
+	$(top_srcdir)/src/mca/psec/munge/configure.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/src/include/pmix_config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(mcacomponentdir)"
+LTLIBRARIES = $(mcacomponent_LTLIBRARIES) $(noinst_LTLIBRARIES)
+am__DEPENDENCIES_1 =
+libmca_pnet_opa_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am__libmca_pnet_opa_la_SOURCES_DIST = pnet_opa.h pnet_opa_component.c \
+	pnet_opa.c
+am__objects_1 =
+am__objects_2 = pnet_opa_component.lo pnet_opa.lo
+ at MCA_BUILD_pmix_pnet_opa_DSO_FALSE@am__objects_3 = $(am__objects_1) \
+ at MCA_BUILD_pmix_pnet_opa_DSO_FALSE@	$(am__objects_2)
+am_libmca_pnet_opa_la_OBJECTS = $(am__objects_3)
+libmca_pnet_opa_la_OBJECTS = $(am_libmca_pnet_opa_la_OBJECTS)
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+libmca_pnet_opa_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(AM_CFLAGS) $(CFLAGS) $(libmca_pnet_opa_la_LDFLAGS) \
+	$(LDFLAGS) -o $@
+ at MCA_BUILD_pmix_pnet_opa_DSO_FALSE@am_libmca_pnet_opa_la_rpath =
+mca_pnet_opa_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am__mca_pnet_opa_la_SOURCES_DIST = pnet_opa.h pnet_opa_component.c \
+	pnet_opa.c
+ at MCA_BUILD_pmix_pnet_opa_DSO_TRUE@am__objects_4 = $(am__objects_1) \
+ at MCA_BUILD_pmix_pnet_opa_DSO_TRUE@	$(am__objects_2)
+am_mca_pnet_opa_la_OBJECTS = $(am__objects_4)
+mca_pnet_opa_la_OBJECTS = $(am_mca_pnet_opa_la_OBJECTS)
+mca_pnet_opa_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(AM_CFLAGS) $(CFLAGS) $(mca_pnet_opa_la_LDFLAGS) $(LDFLAGS) \
+	-o $@
+ at MCA_BUILD_pmix_pnet_opa_DSO_TRUE@am_mca_pnet_opa_la_rpath = -rpath \
+ at MCA_BUILD_pmix_pnet_opa_DSO_TRUE@	$(mcacomponentdir)
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/src/include
+depcomp = $(SHELL) $(top_srcdir)/./config/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libmca_pnet_opa_la_SOURCES) $(mca_pnet_opa_la_SOURCES)
+DIST_SOURCES = $(am__libmca_pnet_opa_la_SOURCES_DIST) \
+	$(am__mca_pnet_opa_la_SOURCES_DIST)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/./config/depcomp
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CFLAGS = @CFLAGS@
+CLEANFILES = @CLEANFILES@
+CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MCA_PROJECT_SUBDIRS = @MCA_PROJECT_SUBDIRS@
+MCA_pmix_FRAMEWORKS = @MCA_pmix_FRAMEWORKS@
+MCA_pmix_FRAMEWORKS_SUBDIRS = @MCA_pmix_FRAMEWORKS_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS@
+MCA_pmix_FRAMEWORK_LIBS = @MCA_pmix_FRAMEWORK_LIBS@
+MCA_pmix_pdl_ALL_COMPONENTS = @MCA_pmix_pdl_ALL_COMPONENTS@
+MCA_pmix_pdl_ALL_SUBDIRS = @MCA_pmix_pdl_ALL_SUBDIRS@
+MCA_pmix_pdl_DSO_COMPONENTS = @MCA_pmix_pdl_DSO_COMPONENTS@
+MCA_pmix_pdl_DSO_SUBDIRS = @MCA_pmix_pdl_DSO_SUBDIRS@
+MCA_pmix_pdl_STATIC_COMPONENTS = @MCA_pmix_pdl_STATIC_COMPONENTS@
+MCA_pmix_pdl_STATIC_LTLIBS = @MCA_pmix_pdl_STATIC_LTLIBS@
+MCA_pmix_pdl_STATIC_SUBDIRS = @MCA_pmix_pdl_STATIC_SUBDIRS@
+MCA_pmix_pif_ALL_COMPONENTS = @MCA_pmix_pif_ALL_COMPONENTS@
+MCA_pmix_pif_ALL_SUBDIRS = @MCA_pmix_pif_ALL_SUBDIRS@
+MCA_pmix_pif_DSO_COMPONENTS = @MCA_pmix_pif_DSO_COMPONENTS@
+MCA_pmix_pif_DSO_SUBDIRS = @MCA_pmix_pif_DSO_SUBDIRS@
+MCA_pmix_pif_STATIC_COMPONENTS = @MCA_pmix_pif_STATIC_COMPONENTS@
+MCA_pmix_pif_STATIC_LTLIBS = @MCA_pmix_pif_STATIC_LTLIBS@
+MCA_pmix_pif_STATIC_SUBDIRS = @MCA_pmix_pif_STATIC_SUBDIRS@
+MCA_pmix_pinstalldirs_ALL_COMPONENTS = @MCA_pmix_pinstalldirs_ALL_COMPONENTS@
+MCA_pmix_pinstalldirs_ALL_SUBDIRS = @MCA_pmix_pinstalldirs_ALL_SUBDIRS@
+MCA_pmix_pinstalldirs_DSO_COMPONENTS = @MCA_pmix_pinstalldirs_DSO_COMPONENTS@
+MCA_pmix_pinstalldirs_DSO_SUBDIRS = @MCA_pmix_pinstalldirs_DSO_SUBDIRS@
+MCA_pmix_pinstalldirs_STATIC_COMPONENTS = @MCA_pmix_pinstalldirs_STATIC_COMPONENTS@
+MCA_pmix_pinstalldirs_STATIC_LTLIBS = @MCA_pmix_pinstalldirs_STATIC_LTLIBS@
+MCA_pmix_pinstalldirs_STATIC_SUBDIRS = @MCA_pmix_pinstalldirs_STATIC_SUBDIRS@
+MCA_pmix_pnet_ALL_COMPONENTS = @MCA_pmix_pnet_ALL_COMPONENTS@
+MCA_pmix_pnet_ALL_SUBDIRS = @MCA_pmix_pnet_ALL_SUBDIRS@
+MCA_pmix_pnet_DSO_COMPONENTS = @MCA_pmix_pnet_DSO_COMPONENTS@
+MCA_pmix_pnet_DSO_SUBDIRS = @MCA_pmix_pnet_DSO_SUBDIRS@
+MCA_pmix_pnet_STATIC_COMPONENTS = @MCA_pmix_pnet_STATIC_COMPONENTS@
+MCA_pmix_pnet_STATIC_LTLIBS = @MCA_pmix_pnet_STATIC_LTLIBS@
+MCA_pmix_pnet_STATIC_SUBDIRS = @MCA_pmix_pnet_STATIC_SUBDIRS@
+MCA_pmix_psec_ALL_COMPONENTS = @MCA_pmix_psec_ALL_COMPONENTS@
+MCA_pmix_psec_ALL_SUBDIRS = @MCA_pmix_psec_ALL_SUBDIRS@
+MCA_pmix_psec_DSO_COMPONENTS = @MCA_pmix_psec_DSO_COMPONENTS@
+MCA_pmix_psec_DSO_SUBDIRS = @MCA_pmix_psec_DSO_SUBDIRS@
+MCA_pmix_psec_STATIC_COMPONENTS = @MCA_pmix_psec_STATIC_COMPONENTS@
+MCA_pmix_psec_STATIC_LTLIBS = @MCA_pmix_psec_STATIC_LTLIBS@
+MCA_pmix_psec_STATIC_SUBDIRS = @MCA_pmix_psec_STATIC_SUBDIRS@
+MCA_pmix_psensor_ALL_COMPONENTS = @MCA_pmix_psensor_ALL_COMPONENTS@
+MCA_pmix_psensor_ALL_SUBDIRS = @MCA_pmix_psensor_ALL_SUBDIRS@
+MCA_pmix_psensor_DSO_COMPONENTS = @MCA_pmix_psensor_DSO_COMPONENTS@
+MCA_pmix_psensor_DSO_SUBDIRS = @MCA_pmix_psensor_DSO_SUBDIRS@
+MCA_pmix_psensor_STATIC_COMPONENTS = @MCA_pmix_psensor_STATIC_COMPONENTS@
+MCA_pmix_psensor_STATIC_LTLIBS = @MCA_pmix_psensor_STATIC_LTLIBS@
+MCA_pmix_psensor_STATIC_SUBDIRS = @MCA_pmix_psensor_STATIC_SUBDIRS@
+MCA_pmix_ptl_ALL_COMPONENTS = @MCA_pmix_ptl_ALL_COMPONENTS@
+MCA_pmix_ptl_ALL_SUBDIRS = @MCA_pmix_ptl_ALL_SUBDIRS@
+MCA_pmix_ptl_DSO_COMPONENTS = @MCA_pmix_ptl_DSO_COMPONENTS@
+MCA_pmix_ptl_DSO_SUBDIRS = @MCA_pmix_ptl_DSO_SUBDIRS@
+MCA_pmix_ptl_STATIC_COMPONENTS = @MCA_pmix_ptl_STATIC_COMPONENTS@
+MCA_pmix_ptl_STATIC_LTLIBS = @MCA_pmix_ptl_STATIC_LTLIBS@
+MCA_pmix_ptl_STATIC_SUBDIRS = @MCA_pmix_ptl_STATIC_SUBDIRS@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PMIX_ASM_GSYM = @PMIX_ASM_GSYM@
+PMIX_ASM_LSYM = @PMIX_ASM_LSYM@
+PMIX_ASM_SUPPORT_64BIT = @PMIX_ASM_SUPPORT_64BIT@
+PMIX_ASM_TEXT = @PMIX_ASM_TEXT@
+PMIX_ASM_TYPE = @PMIX_ASM_TYPE@
+PMIX_ASSEMBLY_ARCH = @PMIX_ASSEMBLY_ARCH@
+PMIX_ASSEMBLY_BUILTIN = @PMIX_ASSEMBLY_BUILTIN@
+PMIX_ASSEMBLY_FORMAT = @PMIX_ASSEMBLY_FORMAT@
+PMIX_AS_GLOBAL = @PMIX_AS_GLOBAL@
+PMIX_AS_LABEL_SUFFIX = @PMIX_AS_LABEL_SUFFIX@
+PMIX_CC_ABSOLUTE = @PMIX_CC_ABSOLUTE@
+PMIX_CONFIGURE_DATE = @PMIX_CONFIGURE_DATE@
+PMIX_CONFIGURE_HOST = @PMIX_CONFIGURE_HOST@
+PMIX_CONFIGURE_USER = @PMIX_CONFIGURE_USER@
+PMIX_EMBEDDED_CPPFLAGS = @PMIX_EMBEDDED_CPPFLAGS@
+PMIX_EMBEDDED_LDFLAGS = @PMIX_EMBEDDED_LDFLAGS@
+PMIX_EMBEDDED_LIBS = @PMIX_EMBEDDED_LIBS@
+PMIX_MAJOR_VERSION = @PMIX_MAJOR_VERSION@
+PMIX_MINOR_VERSION = @PMIX_MINOR_VERSION@
+PMIX_RELEASE_DATE = @PMIX_RELEASE_DATE@
+PMIX_RELEASE_VERSION = @PMIX_RELEASE_VERSION@
+PMIX_RENAME = @PMIX_RENAME@
+PMIX_VERSION = @PMIX_VERSION@
+PMIX_top_builddir = @PMIX_top_builddir@
+PMIX_top_srcdir = @PMIX_top_srcdir@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_prefix_program = @ac_prefix_program@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+libpmix_so_version = @libpmix_so_version@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pmix_have_pandoc = @pmix_have_pandoc@
+pmix_pdl_pdlopen_LIBS = @pmix_pdl_pdlopen_LIBS@
+pmix_pdl_plibltdl_CPPFLAGS = @pmix_pdl_plibltdl_CPPFLAGS@
+pmix_pdl_plibltdl_LDFLAGS = @pmix_pdl_plibltdl_LDFLAGS@
+pmix_pdl_plibltdl_LIBS = @pmix_pdl_plibltdl_LIBS@
+pmixdatadir = @pmixdatadir@
+pmixincludedir = @pmixincludedir@
+pmixlibdir = @pmixlibdir@
+pmixmajor = @pmixmajor@
+pmixminor = @pmixminor@
+pnet_opa_CFLAGS = @pnet_opa_CFLAGS@
+pnet_opa_CPPFLAGS = @pnet_opa_CPPFLAGS@
+pnet_opa_LDFLAGS = @pnet_opa_LDFLAGS@
+pnet_opa_LIBS = @pnet_opa_LIBS@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+psec_munge_CPPFLAGS = @psec_munge_CPPFLAGS@
+psec_munge_LDFLAGS = @psec_munge_LDFLAGS@
+psec_munge_LIBS = @psec_munge_LIBS@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+AM_CPPFLAGS = $(pnet_opa_CPPFLAGS)
+headers = pnet_opa.h
+sources = \
+        pnet_opa_component.c \
+        pnet_opa.c
+
+ at MCA_BUILD_pmix_pnet_opa_DSO_FALSE@lib = libmca_pnet_opa.la
+
+# Make the output library in this directory, and name it either
+# mca_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la
+# (for static builds).
+ at MCA_BUILD_pmix_pnet_opa_DSO_TRUE@lib = 
+ at MCA_BUILD_pmix_pnet_opa_DSO_FALSE@lib_sources = $(headers) $(sources)
+ at MCA_BUILD_pmix_pnet_opa_DSO_TRUE@lib_sources = 
+ at MCA_BUILD_pmix_pnet_opa_DSO_FALSE@component = 
+ at MCA_BUILD_pmix_pnet_opa_DSO_TRUE@component = mca_pnet_opa.la
+ at MCA_BUILD_pmix_pnet_opa_DSO_FALSE@component_sources = 
+ at MCA_BUILD_pmix_pnet_opa_DSO_TRUE@component_sources = $(headers) $(sources)
+mcacomponentdir = $(pmixlibdir)
+mcacomponent_LTLIBRARIES = $(component)
+mca_pnet_opa_la_SOURCES = $(component_sources)
+mca_pnet_opa_la_LIBADD = $(pnet_opa_LIBS)
+mca_pnet_opa_la_LDFLAGS = -module -avoid-version $(pnet_opa_LDFLAGS)
+noinst_LTLIBRARIES = $(lib)
+libmca_pnet_opa_la_SOURCES = $(lib_sources)
+libmca_pnet_opa_la_LIBADD = $(pnet_opa_LIBS)
+libmca_pnet_opa_la_LDFLAGS = -module -avoid-version $(pnet_opa_LDFLAGS)
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/mca/pnet/opa/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/mca/pnet/opa/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+install-mcacomponentLTLIBRARIES: $(mcacomponent_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	@list='$(mcacomponent_LTLIBRARIES)'; test -n "$(mcacomponentdir)" || 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)$(mcacomponentdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(mcacomponentdir)" || exit 1; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(mcacomponentdir)'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(mcacomponentdir)"; \
+	}
+
+uninstall-mcacomponentLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(mcacomponent_LTLIBRARIES)'; test -n "$(mcacomponentdir)" || list=; \
+	for p in $$list; do \
+	  $(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(mcacomponentdir)/$$f'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(mcacomponentdir)/$$f"; \
+	done
+
+clean-mcacomponentLTLIBRARIES:
+	-test -z "$(mcacomponent_LTLIBRARIES)" || rm -f $(mcacomponent_LTLIBRARIES)
+	@list='$(mcacomponent_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}; \
+	}
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_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}; \
+	}
+
+libmca_pnet_opa.la: $(libmca_pnet_opa_la_OBJECTS) $(libmca_pnet_opa_la_DEPENDENCIES) $(EXTRA_libmca_pnet_opa_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(libmca_pnet_opa_la_LINK) $(am_libmca_pnet_opa_la_rpath) $(libmca_pnet_opa_la_OBJECTS) $(libmca_pnet_opa_la_LIBADD) $(LIBS)
+
+mca_pnet_opa.la: $(mca_pnet_opa_la_OBJECTS) $(mca_pnet_opa_la_DEPENDENCIES) $(EXTRA_mca_pnet_opa_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(mca_pnet_opa_la_LINK) $(am_mca_pnet_opa_la_rpath) $(mca_pnet_opa_la_OBJECTS) $(mca_pnet_opa_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pnet_opa.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pnet_opa_component.Plo at am__quote@
+
+.c.o:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+ at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+	for dir in "$(DESTDIR)$(mcacomponentdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-mcacomponentLTLIBRARIES \
+	clean-noinstLTLIBRARIES mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-mcacomponentLTLIBRARIES
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-mcacomponentLTLIBRARIES
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-mcacomponentLTLIBRARIES \
+	clean-noinstLTLIBRARIES 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-mcacomponentLTLIBRARIES install-pdf install-pdf-am \
+	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-mcacomponentLTLIBRARIES
+
+.PRECIOUS: Makefile
+
+
+# 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/mca/pnet/opa/configure.m4 b/src/mca/pnet/opa/configure.m4
new file mode 100644
index 0000000..4d6d109
--- /dev/null
+++ b/src/mca/pnet/opa/configure.m4
@@ -0,0 +1,42 @@
+# -*- shell-script -*-
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2010      Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2013      Sandia National Laboratories.  All rights reserved.
+# Copyright (c) 2014-2016 Intel, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# MCA_pnet_opa_CONFIG([action-if-can-compile],
+#                     [action-if-cant-compile])
+# ------------------------------------------------
+AC_DEFUN([MCA_pmix_pnet_opa_CONFIG],[
+    AC_CONFIG_FILES([src/mca/pnet/opa/Makefile])
+
+    PMIX_CHECK_PSM2([pnet_opa],
+                    [pnet_opa_happy="yes"],
+                    [pnet_opa_happy="no"])
+
+    AS_IF([test "$pnet_opa_happy" = "yes"],
+          [$1],
+          [$2])
+
+    # substitute in the things needed to build psm2
+    AC_SUBST([pnet_opa_CFLAGS])
+    AC_SUBST([pnet_opa_CPPFLAGS])
+    AC_SUBST([pnet_opa_LDFLAGS])
+    AC_SUBST([pnet_opa_LIBS])
+])dnl
diff --git a/src/mca/pnet/opa/pnet_opa.c b/src/mca/pnet/opa/pnet_opa.c
new file mode 100644
index 0000000..598930e
--- /dev/null
+++ b/src/mca/pnet/opa/pnet_opa.c
@@ -0,0 +1,238 @@
+/*
+ * Copyright (c) 2015-2017 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2016      IBM Corporation.  All rights reserved.
+ *
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+
+#include <string.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
+#ifdef HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
+#include <time.h>
+
+#include <pmix_common.h>
+
+#include "src/mca/base/pmix_mca_base_var.h"
+#include "src/include/pmix_socket_errno.h"
+#include "src/include/pmix_globals.h"
+#include "src/class/pmix_list.h"
+#include "src/util/alfg.h"
+#include "src/util/argv.h"
+#include "src/util/error.h"
+#include "src/util/output.h"
+#include "src/util/pmix_environ.h"
+
+#include "src/mca/pnet/pnet.h"
+#include "pnet_opa.h"
+
+static pmix_status_t opa_init(void);
+static void opa_finalize(void);
+static pmix_status_t setup_app(char *nspace, pmix_list_t *ilist);
+static pmix_status_t setup_local_network(char *nspace,
+                                         pmix_info_t info[],
+                                         size_t ninfo);
+static pmix_status_t setup_fork(const pmix_proc_t *peer, char ***env);
+static void child_finalized(pmix_peer_t *peer);
+static void local_app_finalized(char *nspace);
+
+pmix_pnet_module_t pmix_opa_module = {
+    .init = opa_init,
+    .finalize = opa_finalize,
+    .setup_app = setup_app,
+    .setup_local_network = setup_local_network,
+    .setup_fork = setup_fork,
+    .child_finalized = child_finalized,
+    .local_app_finalized = local_app_finalized
+};
+
+static pmix_status_t opa_init(void)
+{
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "pnet: opa init");
+    return PMIX_SUCCESS;
+}
+
+static void opa_finalize(void)
+{
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "pnet: opa finalize");
+}
+
+/* some network transports require a little bit of information to
+ * "pre-condition" them - i.e., to setup their individual transport
+ * connections so they can generate their endpoint addresses. This
+ * function provides a means for doing so. The resulting info is placed
+ * into the app_context's env array so it will automatically be pushed
+ * into the environment of every MPI process when launched.
+ */
+
+static inline void transports_use_rand(uint64_t* unique_key) {
+    pmix_rng_buff_t rng;
+    pmix_srand(&rng,(unsigned int)time(NULL));
+    unique_key[0] = pmix_rand(&rng);
+    unique_key[1] = pmix_rand(&rng);
+}
+
+static char* transports_print(uint64_t *unique_key)
+{
+    unsigned int *int_ptr;
+    size_t i, j, string_key_len, written_len;
+    char *string_key = NULL, *format = NULL;
+
+    /* string is two 64 bit numbers printed in hex with a dash between
+     * and zero padding.
+     */
+    string_key_len = (sizeof(uint64_t) * 2) * 2 + strlen("-") + 1;
+    string_key = (char*) malloc(string_key_len);
+    if (NULL == string_key) {
+        return NULL;
+    }
+
+    string_key[0] = '\0';
+    written_len = 0;
+
+    /* get a format string based on the length of an unsigned int.  We
+     * want to have zero padding for sizeof(unsigned int) * 2
+     * characters -- when printing as a hex number, each byte is
+     * represented by 2 hex characters.  Format will contain something
+     * that looks like %08lx, where the number 8 might be a different
+     * number if the system has a different sized long (8 would be for
+     * sizeof(int) == 4)).
+     */
+    asprintf(&format, "%%0%dx", (int)(sizeof(unsigned int)) * 2);
+
+    /* print the first number */
+    int_ptr = (unsigned int*) &unique_key[0];
+    for (i = 0 ; i < sizeof(uint64_t) / sizeof(unsigned int) ; ++i) {
+        if (0 == int_ptr[i]) {
+            /* inject some energy */
+            for (j=0; j < sizeof(unsigned int); j++) {
+                int_ptr[i] |= j << j;
+            }
+        }
+        snprintf(string_key + written_len,
+                 string_key_len - written_len,
+                 format, int_ptr[i]);
+        written_len = strlen(string_key);
+    }
+
+    /* print the middle dash */
+    snprintf(string_key + written_len, string_key_len - written_len, "-");
+    written_len = strlen(string_key);
+
+    /* print the second number */
+    int_ptr = (unsigned int*) &unique_key[1];
+    for (i = 0 ; i < sizeof(uint64_t) / sizeof(unsigned int) ; ++i) {
+        if (0 == int_ptr[i]) {
+            /* inject some energy */
+            for (j=0; j < sizeof(unsigned int); j++) {
+                int_ptr[i] |= j << j;
+            }
+        }
+        snprintf(string_key + written_len,
+                 string_key_len - written_len,
+                 format, int_ptr[i]);
+        written_len = strlen(string_key);
+    }
+    free(format);
+
+    return string_key;
+}
+
+static pmix_status_t setup_app(char *nspace, pmix_list_t *ilist)
+{
+    uint64_t unique_key[2];
+    char *string_key, *cs_env;
+    int fd_rand;
+    size_t bytes_read;
+    pmix_kval_t *kv;
+
+    /* put the number here - or else create an appropriate string. this just needs to
+     * eventually be a string variable
+     */
+    if(-1 == (fd_rand = open("/dev/urandom", O_RDONLY))) {
+        transports_use_rand(unique_key);
+    } else {
+        bytes_read = read(fd_rand, (char *) unique_key, 16);
+        if(bytes_read != 16) {
+            transports_use_rand(unique_key);
+        }
+        close(fd_rand);
+    }
+
+    if (NULL == (string_key = transports_print(unique_key))) {
+        PMIX_ERROR_LOG(PMIX_ERR_OUT_OF_RESOURCE);
+        return PMIX_ERR_OUT_OF_RESOURCE;
+    }
+
+    if (PMIX_SUCCESS != pmix_mca_base_var_env_name("pmix_precondition_transports", &cs_env)) {
+        PMIX_ERROR_LOG(PMIX_ERR_OUT_OF_RESOURCE);
+        free(string_key);
+        return PMIX_ERR_OUT_OF_RESOURCE;
+    }
+
+    kv = PMIX_NEW(pmix_kval_t);
+    if (NULL == kv) {
+        free(string_key);
+        free(cs_env);
+        return PMIX_ERR_OUT_OF_RESOURCE;
+    }
+    kv->key = strdup(PMIX_SET_ENVAR);
+    kv->value = (pmix_value_t*)malloc(sizeof(pmix_value_t));
+    if (NULL == kv->value) {
+        free(string_key);
+        free(cs_env);
+        PMIX_RELEASE(kv);
+        return PMIX_ERR_OUT_OF_RESOURCE;
+    }
+    kv->value->type = PMIX_STRING;
+    if (0 > asprintf(&kv->value->data.string, "%s=%s", cs_env, string_key)) {
+        free(string_key);
+        free(cs_env);
+        PMIX_RELEASE(kv);
+        return PMIX_ERR_OUT_OF_RESOURCE;
+    }
+    pmix_list_append(ilist, &kv->super);
+    free(cs_env);
+    free(string_key);
+
+    return PMIX_SUCCESS;
+}
+
+static pmix_status_t setup_local_network(char *nspace,
+                                         pmix_info_t info[],
+                                         size_t ninfo)
+{
+    return PMIX_SUCCESS;
+}
+
+static pmix_status_t setup_fork(const pmix_proc_t *peer, char ***env)
+{
+    return PMIX_SUCCESS;
+}
+
+static void child_finalized(pmix_peer_t *peer)
+{
+
+}
+
+static void local_app_finalized(char *nspace)
+{
+
+}
diff --git a/src/mca/pnet/opa/pnet_opa.h b/src/mca/pnet/opa/pnet_opa.h
new file mode 100644
index 0000000..278c894
--- /dev/null
+++ b/src/mca/pnet/opa/pnet_opa.h
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2015-2016 Intel, Inc.  All rights reserved.
+ *
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#ifndef PMIX_PNET_OPA_H
+#define PMIX_PNET_OPA_H
+
+#include <src/include/pmix_config.h>
+
+
+#include "src/mca/pnet/pnet.h"
+
+BEGIN_C_DECLS
+
+/* the component must be visible data for the linker to find it */
+PMIX_EXPORT extern pmix_pnet_base_component_t mca_pnet_opa_component;
+extern pmix_pnet_module_t pmix_opa_module;
+
+END_C_DECLS
+
+#endif
diff --git a/src/mca/pnet/opa/pnet_opa_component.c b/src/mca/pnet/opa/pnet_opa_component.c
new file mode 100644
index 0000000..7d07c40
--- /dev/null
+++ b/src/mca/pnet/opa/pnet_opa_component.c
@@ -0,0 +1,84 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2005 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2015      Los Alamos National Security, LLC. All rights
+ *                         reserved.
+ * Copyright (c) 2016      Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ *
+ * These symbols are in a file by themselves to provide nice linker
+ * semantics.  Since linkers generally pull in symbols by object
+ * files, keeping these symbols as the only symbols in this file
+ * prevents utility programs such as "ompi_info" from having to import
+ * entire components just to query their version and parameters.
+ */
+
+#include <src/include/pmix_config.h>
+#include "pmix_common.h"
+
+
+#include "src/mca/pnet/pnet.h"
+#include "pnet_opa.h"
+
+static pmix_status_t component_open(void);
+static pmix_status_t component_close(void);
+static pmix_status_t component_query(pmix_mca_base_module_t **module, int *priority);
+
+/*
+ * Instantiate the public struct with all of our public information
+ * and pointers to our public functions in it
+ */
+pmix_pnet_base_component_t mca_pnet_opa_component = {
+    .base = {
+        PMIX_PNET_BASE_VERSION_1_0_0,
+
+        /* Component name and version */
+        .pmix_mca_component_name = "opa",
+        PMIX_MCA_BASE_MAKE_VERSION(component,
+                                   PMIX_MAJOR_VERSION,
+                                   PMIX_MINOR_VERSION,
+                                   PMIX_RELEASE_VERSION),
+
+        /* Component open and close functions */
+        .pmix_mca_open_component = component_open,
+        .pmix_mca_close_component = component_close,
+        .pmix_mca_query_component = component_query,
+    },
+    .data = {
+        /* The component is checkpoint ready */
+        PMIX_MCA_BASE_METADATA_PARAM_CHECKPOINT
+    }
+};
+
+
+static int component_open(void)
+{
+    return PMIX_SUCCESS;
+}
+
+
+static int component_query(pmix_mca_base_module_t **module, int *priority)
+{
+    *priority = 10;
+    *module = (pmix_mca_base_module_t *)&pmix_opa_module;
+    return PMIX_SUCCESS;
+}
+
+
+static int component_close(void)
+{
+    return PMIX_SUCCESS;
+}
diff --git a/src/mca/pnet/pnet.h b/src/mca/pnet/pnet.h
new file mode 100644
index 0000000..dedb1eb
--- /dev/null
+++ b/src/mca/pnet/pnet.h
@@ -0,0 +1,122 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2007-2008 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2015-2016 Intel, Inc.  All rights reserved.
+ *
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+/**
+ * @file
+ *
+ * This interface is for use by PMIx servers to obtain network-related info
+ * such as security keys that need to be shared across applications, and to
+ * setup network support for applications prior to launch
+ *
+ * Available plugins may be defined at runtime via the typical MCA parameter
+ * syntax.
+ */
+
+#ifndef PMIX_PNET_H
+#define PMIX_PNET_H
+
+#include <src/include/pmix_config.h>
+
+#include "src/class/pmix_list.h"
+#include "src/mca/mca.h"
+#include "src/mca/base/pmix_mca_base_var.h"
+#include "src/mca/base/pmix_mca_base_framework.h"
+#include "src/include/pmix_globals.h"
+
+BEGIN_C_DECLS
+
+/******    MODULE DEFINITION    ******/
+
+/**
+ * Initialize the module. Returns an error if the module cannot
+ * run, success if it can and wants to be used.
+ */
+typedef pmix_status_t (*pmix_pnet_base_module_init_fn_t)(void);
+
+/**
+ * Finalize the module. Tear down any allocated storage, disconnect
+ * from any system support (e.g., LDAP server)
+ */
+typedef void (*pmix_pnet_base_module_fini_fn_t)(void);
+
+/**
+ * Provide an opportunity for the network to define values that
+ * are to be passed to an application. This can include security
+ * tokens required for application processes to communicate with
+ * each other
+ */
+typedef pmix_status_t (*pmix_pnet_base_module_setup_app_fn_t)(char *nspace, pmix_list_t *ilist);
+
+/**
+ * Give the local network library an opportunity to setup address information
+ * for the application by passing in the layout type and a regex describing
+ * the layout */
+typedef pmix_status_t (*pmix_pnet_base_module_setup_local_net_fn_t)(char *nspace,
+                                                                    pmix_info_t info[],
+                                                                    size_t ninfo);
+
+/**
+ * Give the local network library an opportunity to add any envars to the
+ * environment of a local application process prior to fork/exec
+ */
+typedef pmix_status_t (*pmix_pnet_base_module_setup_fork_fn_t)(const pmix_proc_t *peer, char ***env);
+
+/**
+ * Provide an opportunity for the local network library to cleanup when a
+ * local application process terminates
+ */
+typedef void (*pmix_pnet_base_module_child_finalized_fn_t)(pmix_peer_t *peer);
+
+/**
+ * Provide  an opportunity for the local network library to cleanup after
+ * all local clients for a given application have terminated
+ */
+typedef void (*pmix_pnet_base_module_local_app_finalized_fn_t)(char *nspace);
+
+/**
+ * Base structure for a PNET module
+ */
+typedef struct {
+    char *name;
+    /* init/finalize */
+    pmix_pnet_base_module_init_fn_t                 init;
+    pmix_pnet_base_module_fini_fn_t                 finalize;
+    pmix_pnet_base_module_setup_app_fn_t            setup_app;
+    pmix_pnet_base_module_setup_local_net_fn_t      setup_local_network;
+    pmix_pnet_base_module_setup_fork_fn_t           setup_fork;
+    pmix_pnet_base_module_child_finalized_fn_t      child_finalized;
+    pmix_pnet_base_module_local_app_finalized_fn_t  local_app_finalized;
+} pmix_pnet_module_t;
+
+/* declare the global APIs */
+PMIX_EXPORT extern pmix_pnet_module_t pmix_pnet;
+
+/*
+ * the standard component data structure
+ */
+struct pmix_pnet_base_component_t {
+    pmix_mca_base_component_t                        base;
+    pmix_mca_base_component_data_t                   data;
+};
+typedef struct pmix_pnet_base_component_t pmix_pnet_base_component_t;
+
+/*
+ * Macro for use in components that are of type pnet
+ */
+#define PMIX_PNET_BASE_VERSION_1_0_0 \
+    PMIX_MCA_BASE_VERSION_1_0_0("pnet", 1, 0, 0)
+
+END_C_DECLS
+
+#endif
diff --git a/src/mca/psec/Makefile.am b/src/mca/psec/Makefile.am
new file mode 100644
index 0000000..ce2cdab
--- /dev/null
+++ b/src/mca/psec/Makefile.am
@@ -0,0 +1,44 @@
+# -*- makefile -*-
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2012      Los Alamos National Security, Inc.  All rights reserved.
+# Copyright (c) 2013-2016 Intel, Inc. All rights reserved
+# Copyright (c) 2016 Cisco Systems, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+AM_CPPFLAGS = $(LTDLINCL)
+
+# main library setup
+noinst_LTLIBRARIES = libmca_psec.la
+libmca_psec_la_SOURCES =
+
+# local files
+headers = psec.h
+sources =
+
+# Conditionally install the header files
+if WANT_INSTALL_HEADERS
+pmixdir = $(pmixincludedir)/$(subdir)
+nobase_pmix_HEADERS = $(headers)
+endif
+
+include base/Makefile.include
+
+libmca_psec_la_SOURCES += $(headers) $(sources)
+
+distclean-local:
+	rm -f base/static-components.h
diff --git a/src/mca/psec/Makefile.in b/src/mca/psec/Makefile.in
new file mode 100644
index 0000000..a2f856f
--- /dev/null
+++ b/src/mca/psec/Makefile.in
@@ -0,0 +1,899 @@
+# Makefile.in generated by automake 1.15 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+# -*- makefile -*-
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2012      Los Alamos National Security, Inc.  All rights reserved.
+# Copyright (c) 2013-2016 Intel, Inc. All rights reserved
+# Copyright (c) 2016 Cisco Systems, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# -*- makefile -*-
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2012      Los Alamos National Security, Inc.  All rights reserved.
+# Copyright (c) 2013-2016 Intel, Inc. All rights reserved
+# Copyright (c) 2016      Cisco Systems, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# This makefile.am does not stand on its own - it is included from
+# src/Makefile.am
+
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+subdir = src/mca/psec
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/config/c_get_alignment.m4 \
+	$(top_srcdir)/config/libtool.m4 \
+	$(top_srcdir)/config/ltoptions.m4 \
+	$(top_srcdir)/config/ltsugar.m4 \
+	$(top_srcdir)/config/ltversion.m4 \
+	$(top_srcdir)/config/lt~obsolete.m4 \
+	$(top_srcdir)/config/pmix.m4 \
+	$(top_srcdir)/config/pmix_check_attributes.m4 \
+	$(top_srcdir)/config/pmix_check_broken_qsort.m4 \
+	$(top_srcdir)/config/pmix_check_compiler_version.m4 \
+	$(top_srcdir)/config/pmix_check_icc.m4 \
+	$(top_srcdir)/config/pmix_check_ident.m4 \
+	$(top_srcdir)/config/pmix_check_lock.m4 \
+	$(top_srcdir)/config/pmix_check_os_flavors.m4 \
+	$(top_srcdir)/config/pmix_check_package.m4 \
+	$(top_srcdir)/config/pmix_check_psm2.m4 \
+	$(top_srcdir)/config/pmix_check_pthread_pids.m4 \
+	$(top_srcdir)/config/pmix_check_vendor.m4 \
+	$(top_srcdir)/config/pmix_check_visibility.m4 \
+	$(top_srcdir)/config/pmix_check_withdir.m4 \
+	$(top_srcdir)/config/pmix_config_asm.m4 \
+	$(top_srcdir)/config/pmix_config_pthreads.m4 \
+	$(top_srcdir)/config/pmix_config_subdir.m4 \
+	$(top_srcdir)/config/pmix_config_subdir_args.m4 \
+	$(top_srcdir)/config/pmix_config_threads.m4 \
+	$(top_srcdir)/config/pmix_ensure_contains_optflags.m4 \
+	$(top_srcdir)/config/pmix_functions.m4 \
+	$(top_srcdir)/config/pmix_load_platform.m4 \
+	$(top_srcdir)/config/pmix_mca.m4 \
+	$(top_srcdir)/config/pmix_search_libs.m4 \
+	$(top_srcdir)/config/pmix_setup_cc.m4 \
+	$(top_srcdir)/config/pmix_setup_libevent.m4 \
+	$(top_srcdir)/config/pmix_setup_zlib.m4 \
+	$(top_srcdir)/config/pmix_try_assemble.m4 \
+	$(top_srcdir)/config/autogen_found_items.m4 \
+	$(top_srcdir)/src/mca/pdl/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/configure.m4 \
+	$(top_srcdir)/src/mca/pdl/pdlopen/configure.m4 \
+	$(top_srcdir)/src/mca/pdl/plibltdl/configure.m4 \
+	$(top_srcdir)/src/mca/pif/bsdx_ipv4/configure.m4 \
+	$(top_srcdir)/src/mca/pif/bsdx_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pif/linux_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pif/posix_ipv4/configure.m4 \
+	$(top_srcdir)/src/mca/pif/solaris_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/config/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/env/configure.m4 \
+	$(top_srcdir)/src/mca/pnet/opa/configure.m4 \
+	$(top_srcdir)/src/mca/psec/munge/configure.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__nobase_pmix_HEADERS_DIST) \
+	$(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/src/include/pmix_config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+libmca_psec_la_LIBADD =
+am__objects_1 =
+am__dirstamp = $(am__leading_dot)dirstamp
+am__objects_2 = base/psec_base_frame.lo base/psec_base_select.lo \
+	base/psec_base_fns.lo
+am_libmca_psec_la_OBJECTS = $(am__objects_1) $(am__objects_2)
+libmca_psec_la_OBJECTS = $(am_libmca_psec_la_OBJECTS)
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/src/include
+depcomp = $(SHELL) $(top_srcdir)/./config/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libmca_psec_la_SOURCES)
+DIST_SOURCES = $(libmca_psec_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__nobase_pmix_HEADERS_DIST = psec.h base/base.h
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(pmixdir)"
+HEADERS = $(nobase_pmix_HEADERS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+	$(srcdir)/base/Makefile.include $(top_srcdir)/./config/depcomp
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CFLAGS = @CFLAGS@
+CLEANFILES = @CLEANFILES@
+CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MCA_PROJECT_SUBDIRS = @MCA_PROJECT_SUBDIRS@
+MCA_pmix_FRAMEWORKS = @MCA_pmix_FRAMEWORKS@
+MCA_pmix_FRAMEWORKS_SUBDIRS = @MCA_pmix_FRAMEWORKS_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS@
+MCA_pmix_FRAMEWORK_LIBS = @MCA_pmix_FRAMEWORK_LIBS@
+MCA_pmix_pdl_ALL_COMPONENTS = @MCA_pmix_pdl_ALL_COMPONENTS@
+MCA_pmix_pdl_ALL_SUBDIRS = @MCA_pmix_pdl_ALL_SUBDIRS@
+MCA_pmix_pdl_DSO_COMPONENTS = @MCA_pmix_pdl_DSO_COMPONENTS@
+MCA_pmix_pdl_DSO_SUBDIRS = @MCA_pmix_pdl_DSO_SUBDIRS@
+MCA_pmix_pdl_STATIC_COMPONENTS = @MCA_pmix_pdl_STATIC_COMPONENTS@
+MCA_pmix_pdl_STATIC_LTLIBS = @MCA_pmix_pdl_STATIC_LTLIBS@
+MCA_pmix_pdl_STATIC_SUBDIRS = @MCA_pmix_pdl_STATIC_SUBDIRS@
+MCA_pmix_pif_ALL_COMPONENTS = @MCA_pmix_pif_ALL_COMPONENTS@
+MCA_pmix_pif_ALL_SUBDIRS = @MCA_pmix_pif_ALL_SUBDIRS@
+MCA_pmix_pif_DSO_COMPONENTS = @MCA_pmix_pif_DSO_COMPONENTS@
+MCA_pmix_pif_DSO_SUBDIRS = @MCA_pmix_pif_DSO_SUBDIRS@
+MCA_pmix_pif_STATIC_COMPONENTS = @MCA_pmix_pif_STATIC_COMPONENTS@
+MCA_pmix_pif_STATIC_LTLIBS = @MCA_pmix_pif_STATIC_LTLIBS@
+MCA_pmix_pif_STATIC_SUBDIRS = @MCA_pmix_pif_STATIC_SUBDIRS@
+MCA_pmix_pinstalldirs_ALL_COMPONENTS = @MCA_pmix_pinstalldirs_ALL_COMPONENTS@
+MCA_pmix_pinstalldirs_ALL_SUBDIRS = @MCA_pmix_pinstalldirs_ALL_SUBDIRS@
+MCA_pmix_pinstalldirs_DSO_COMPONENTS = @MCA_pmix_pinstalldirs_DSO_COMPONENTS@
+MCA_pmix_pinstalldirs_DSO_SUBDIRS = @MCA_pmix_pinstalldirs_DSO_SUBDIRS@
+MCA_pmix_pinstalldirs_STATIC_COMPONENTS = @MCA_pmix_pinstalldirs_STATIC_COMPONENTS@
+MCA_pmix_pinstalldirs_STATIC_LTLIBS = @MCA_pmix_pinstalldirs_STATIC_LTLIBS@
+MCA_pmix_pinstalldirs_STATIC_SUBDIRS = @MCA_pmix_pinstalldirs_STATIC_SUBDIRS@
+MCA_pmix_pnet_ALL_COMPONENTS = @MCA_pmix_pnet_ALL_COMPONENTS@
+MCA_pmix_pnet_ALL_SUBDIRS = @MCA_pmix_pnet_ALL_SUBDIRS@
+MCA_pmix_pnet_DSO_COMPONENTS = @MCA_pmix_pnet_DSO_COMPONENTS@
+MCA_pmix_pnet_DSO_SUBDIRS = @MCA_pmix_pnet_DSO_SUBDIRS@
+MCA_pmix_pnet_STATIC_COMPONENTS = @MCA_pmix_pnet_STATIC_COMPONENTS@
+MCA_pmix_pnet_STATIC_LTLIBS = @MCA_pmix_pnet_STATIC_LTLIBS@
+MCA_pmix_pnet_STATIC_SUBDIRS = @MCA_pmix_pnet_STATIC_SUBDIRS@
+MCA_pmix_psec_ALL_COMPONENTS = @MCA_pmix_psec_ALL_COMPONENTS@
+MCA_pmix_psec_ALL_SUBDIRS = @MCA_pmix_psec_ALL_SUBDIRS@
+MCA_pmix_psec_DSO_COMPONENTS = @MCA_pmix_psec_DSO_COMPONENTS@
+MCA_pmix_psec_DSO_SUBDIRS = @MCA_pmix_psec_DSO_SUBDIRS@
+MCA_pmix_psec_STATIC_COMPONENTS = @MCA_pmix_psec_STATIC_COMPONENTS@
+MCA_pmix_psec_STATIC_LTLIBS = @MCA_pmix_psec_STATIC_LTLIBS@
+MCA_pmix_psec_STATIC_SUBDIRS = @MCA_pmix_psec_STATIC_SUBDIRS@
+MCA_pmix_psensor_ALL_COMPONENTS = @MCA_pmix_psensor_ALL_COMPONENTS@
+MCA_pmix_psensor_ALL_SUBDIRS = @MCA_pmix_psensor_ALL_SUBDIRS@
+MCA_pmix_psensor_DSO_COMPONENTS = @MCA_pmix_psensor_DSO_COMPONENTS@
+MCA_pmix_psensor_DSO_SUBDIRS = @MCA_pmix_psensor_DSO_SUBDIRS@
+MCA_pmix_psensor_STATIC_COMPONENTS = @MCA_pmix_psensor_STATIC_COMPONENTS@
+MCA_pmix_psensor_STATIC_LTLIBS = @MCA_pmix_psensor_STATIC_LTLIBS@
+MCA_pmix_psensor_STATIC_SUBDIRS = @MCA_pmix_psensor_STATIC_SUBDIRS@
+MCA_pmix_ptl_ALL_COMPONENTS = @MCA_pmix_ptl_ALL_COMPONENTS@
+MCA_pmix_ptl_ALL_SUBDIRS = @MCA_pmix_ptl_ALL_SUBDIRS@
+MCA_pmix_ptl_DSO_COMPONENTS = @MCA_pmix_ptl_DSO_COMPONENTS@
+MCA_pmix_ptl_DSO_SUBDIRS = @MCA_pmix_ptl_DSO_SUBDIRS@
+MCA_pmix_ptl_STATIC_COMPONENTS = @MCA_pmix_ptl_STATIC_COMPONENTS@
+MCA_pmix_ptl_STATIC_LTLIBS = @MCA_pmix_ptl_STATIC_LTLIBS@
+MCA_pmix_ptl_STATIC_SUBDIRS = @MCA_pmix_ptl_STATIC_SUBDIRS@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PMIX_ASM_GSYM = @PMIX_ASM_GSYM@
+PMIX_ASM_LSYM = @PMIX_ASM_LSYM@
+PMIX_ASM_SUPPORT_64BIT = @PMIX_ASM_SUPPORT_64BIT@
+PMIX_ASM_TEXT = @PMIX_ASM_TEXT@
+PMIX_ASM_TYPE = @PMIX_ASM_TYPE@
+PMIX_ASSEMBLY_ARCH = @PMIX_ASSEMBLY_ARCH@
+PMIX_ASSEMBLY_BUILTIN = @PMIX_ASSEMBLY_BUILTIN@
+PMIX_ASSEMBLY_FORMAT = @PMIX_ASSEMBLY_FORMAT@
+PMIX_AS_GLOBAL = @PMIX_AS_GLOBAL@
+PMIX_AS_LABEL_SUFFIX = @PMIX_AS_LABEL_SUFFIX@
+PMIX_CC_ABSOLUTE = @PMIX_CC_ABSOLUTE@
+PMIX_CONFIGURE_DATE = @PMIX_CONFIGURE_DATE@
+PMIX_CONFIGURE_HOST = @PMIX_CONFIGURE_HOST@
+PMIX_CONFIGURE_USER = @PMIX_CONFIGURE_USER@
+PMIX_EMBEDDED_CPPFLAGS = @PMIX_EMBEDDED_CPPFLAGS@
+PMIX_EMBEDDED_LDFLAGS = @PMIX_EMBEDDED_LDFLAGS@
+PMIX_EMBEDDED_LIBS = @PMIX_EMBEDDED_LIBS@
+PMIX_MAJOR_VERSION = @PMIX_MAJOR_VERSION@
+PMIX_MINOR_VERSION = @PMIX_MINOR_VERSION@
+PMIX_RELEASE_DATE = @PMIX_RELEASE_DATE@
+PMIX_RELEASE_VERSION = @PMIX_RELEASE_VERSION@
+PMIX_RENAME = @PMIX_RENAME@
+PMIX_VERSION = @PMIX_VERSION@
+PMIX_top_builddir = @PMIX_top_builddir@
+PMIX_top_srcdir = @PMIX_top_srcdir@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_prefix_program = @ac_prefix_program@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+libpmix_so_version = @libpmix_so_version@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pmix_have_pandoc = @pmix_have_pandoc@
+pmix_pdl_pdlopen_LIBS = @pmix_pdl_pdlopen_LIBS@
+pmix_pdl_plibltdl_CPPFLAGS = @pmix_pdl_plibltdl_CPPFLAGS@
+pmix_pdl_plibltdl_LDFLAGS = @pmix_pdl_plibltdl_LDFLAGS@
+pmix_pdl_plibltdl_LIBS = @pmix_pdl_plibltdl_LIBS@
+pmixdatadir = @pmixdatadir@
+pmixincludedir = @pmixincludedir@
+pmixlibdir = @pmixlibdir@
+pmixmajor = @pmixmajor@
+pmixminor = @pmixminor@
+pnet_opa_CFLAGS = @pnet_opa_CFLAGS@
+pnet_opa_CPPFLAGS = @pnet_opa_CPPFLAGS@
+pnet_opa_LDFLAGS = @pnet_opa_LDFLAGS@
+pnet_opa_LIBS = @pnet_opa_LIBS@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+psec_munge_CPPFLAGS = @psec_munge_CPPFLAGS@
+psec_munge_LDFLAGS = @psec_munge_LDFLAGS@
+psec_munge_LIBS = @psec_munge_LIBS@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+AM_CPPFLAGS = $(LTDLINCL)
+
+# main library setup
+noinst_LTLIBRARIES = libmca_psec.la
+libmca_psec_la_SOURCES = $(headers) $(sources)
+
+# local files
+headers = psec.h base/base.h
+sources = base/psec_base_frame.c base/psec_base_select.c \
+	base/psec_base_fns.c
+
+# Conditionally install the header files
+ at WANT_INSTALL_HEADERS_TRUE@pmixdir = $(pmixincludedir)/$(subdir)
+ at WANT_INSTALL_HEADERS_TRUE@nobase_pmix_HEADERS = $(headers)
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/base/Makefile.include $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/mca/psec/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/mca/psec/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+$(srcdir)/base/Makefile.include $(am__empty):
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_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}; \
+	}
+base/$(am__dirstamp):
+	@$(MKDIR_P) base
+	@: > base/$(am__dirstamp)
+base/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) base/$(DEPDIR)
+	@: > base/$(DEPDIR)/$(am__dirstamp)
+base/psec_base_frame.lo: base/$(am__dirstamp) \
+	base/$(DEPDIR)/$(am__dirstamp)
+base/psec_base_select.lo: base/$(am__dirstamp) \
+	base/$(DEPDIR)/$(am__dirstamp)
+base/psec_base_fns.lo: base/$(am__dirstamp) \
+	base/$(DEPDIR)/$(am__dirstamp)
+
+libmca_psec.la: $(libmca_psec_la_OBJECTS) $(libmca_psec_la_DEPENDENCIES) $(EXTRA_libmca_psec_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(LINK)  $(libmca_psec_la_OBJECTS) $(libmca_psec_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+	-rm -f base/*.$(OBJEXT)
+	-rm -f base/*.lo
+
+distclean-compile:
+	-rm -f *.tab.c
+
+ at AMDEP_TRUE@@am__include@ @am__quote at base/$(DEPDIR)/psec_base_fns.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at base/$(DEPDIR)/psec_base_frame.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at base/$(DEPDIR)/psec_base_select.Plo at am__quote@
+
+.c.o:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+ at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+	-rm -rf base/.libs base/_libs
+install-nobase_pmixHEADERS: $(nobase_pmix_HEADERS)
+	@$(NORMAL_INSTALL)
+	@list='$(nobase_pmix_HEADERS)'; test -n "$(pmixdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(pmixdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(pmixdir)" || exit 1; \
+	fi; \
+	$(am__nobase_list) | while read dir files; do \
+	  xfiles=; for file in $$files; do \
+	    if test -f "$$file"; then xfiles="$$xfiles $$file"; \
+	    else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \
+	  test -z "$$xfiles" || { \
+	    test "x$$dir" = x. || { \
+	      echo " $(MKDIR_P) '$(DESTDIR)$(pmixdir)/$$dir'"; \
+	      $(MKDIR_P) "$(DESTDIR)$(pmixdir)/$$dir"; }; \
+	    echo " $(INSTALL_HEADER) $$xfiles '$(DESTDIR)$(pmixdir)/$$dir'"; \
+	    $(INSTALL_HEADER) $$xfiles "$(DESTDIR)$(pmixdir)/$$dir" || exit $$?; }; \
+	done
+
+uninstall-nobase_pmixHEADERS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(nobase_pmix_HEADERS)'; test -n "$(pmixdir)" || list=; \
+	$(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \
+	dir='$(DESTDIR)$(pmixdir)'; $(am__uninstall_files_from_dir)
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES) $(HEADERS)
+installdirs:
+	for dir in "$(DESTDIR)$(pmixdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+	-rm -f base/$(DEPDIR)/$(am__dirstamp)
+	-rm -f base/$(am__dirstamp)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf base/$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-local distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-nobase_pmixHEADERS
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf base/$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-nobase_pmixHEADERS
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-local 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-nobase_pmixHEADERS install-pdf install-pdf-am \
+	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-nobase_pmixHEADERS
+
+.PRECIOUS: Makefile
+
+
+distclean-local:
+	rm -f base/static-components.h
+
+# 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/mca/psec/base/Makefile.include b/src/mca/psec/base/Makefile.include
new file mode 100644
index 0000000..ac0e600
--- /dev/null
+++ b/src/mca/psec/base/Makefile.include
@@ -0,0 +1,32 @@
+# -*- makefile -*-
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2012      Los Alamos National Security, Inc.  All rights reserved.
+# Copyright (c) 2013-2016 Intel, Inc. All rights reserved
+# Copyright (c) 2016      Cisco Systems, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# This makefile.am does not stand on its own - it is included from
+# src/Makefile.am
+
+headers += \
+         base/base.h
+
+sources += \
+        base/psec_base_frame.c \
+        base/psec_base_select.c \
+        base/psec_base_fns.c
diff --git a/src/mca/psec/base/base.h b/src/mca/psec/base/base.h
new file mode 100644
index 0000000..fde87ba
--- /dev/null
+++ b/src/mca/psec/base/base.h
@@ -0,0 +1,94 @@
+/* -*- C -*-
+ *
+ * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2006 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2012      Los Alamos National Security, Inc.  All rights reserved.
+ * Copyright (c) 2014-2016 Intel, Inc. All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ *
+ */
+#ifndef PMIX_PSEC_BASE_H_
+#define PMIX_PSEC_BASE_H_
+
+#include <src/include/pmix_config.h>
+
+
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h> /* for struct timeval */
+#endif
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+
+#include "src/class/pmix_pointer_array.h"
+#include "src/mca/mca.h"
+#include "src/mca/base/pmix_mca_base_framework.h"
+
+#include "src/mca/psec/psec.h"
+
+
+BEGIN_C_DECLS
+
+/*
+ * MCA Framework
+ */
+extern pmix_mca_base_framework_t pmix_psec_base_framework;
+/**
+ * PSEC select function
+ *
+ * Cycle across available components and construct the list
+ * of active modules
+ */
+pmix_status_t pmix_psec_base_select(void);
+
+/**
+ * Track an active component / module
+ */
+struct pmix_psec_base_active_module_t {
+    pmix_list_item_t super;
+    int pri;
+    pmix_psec_module_t *module;
+    pmix_psec_base_component_t *component;
+};
+typedef struct pmix_psec_base_active_module_t pmix_psec_base_active_module_t;
+PMIX_CLASS_DECLARATION(pmix_psec_base_active_module_t);
+
+
+/* framework globals */
+struct pmix_psec_globals_t {
+  pmix_list_t actives;
+  bool initialized;
+};
+typedef struct pmix_psec_globals_t pmix_psec_globals_t;
+
+extern pmix_psec_globals_t pmix_psec_globals;
+
+PMIX_EXPORT char* pmix_psec_base_get_available_modules(void);
+PMIX_EXPORT pmix_status_t pmix_psec_base_assign_module(struct pmix_peer_t *peer,
+                                                       const char *options);
+PMIX_EXPORT pmix_status_t pmix_psec_base_create_cred(struct pmix_peer_t *peer,
+                                                     pmix_listener_protocol_t protocol,
+                                                     char **cred, size_t *len);
+PMIX_EXPORT pmix_status_t pmix_psec_base_client_handshake(struct pmix_peer_t *peer, int sd);
+PMIX_EXPORT pmix_status_t pmix_psec_base_validate_connection(struct pmix_peer_t *peer,
+                                                             pmix_listener_protocol_t protocol,
+                                                             char *cred, size_t len);
+
+
+END_C_DECLS
+
+#endif
diff --git a/src/mca/psec/base/psec_base_fns.c b/src/mca/psec/base/psec_base_fns.c
new file mode 100644
index 0000000..93ad018
--- /dev/null
+++ b/src/mca/psec/base/psec_base_fns.c
@@ -0,0 +1,152 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2015-2016 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2016      Mellanox Technologies, Inc.
+ *                         All rights reserved.
+ *
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+
+#include <pmix_common.h>
+#include "src/include/pmix_globals.h"
+
+#include "src/class/pmix_list.h"
+#include "src/util/argv.h"
+#include "src/util/error.h"
+#include "src/util/output.h"
+#include "src/mca/ptl/base/base.h"
+
+#include "src/mca/psec/base/base.h"
+
+
+char* pmix_psec_base_get_available_modules(void)
+{
+    pmix_psec_base_active_module_t *active;
+    char **tmp=NULL, *reply=NULL;
+
+    if (!pmix_psec_globals.initialized) {
+        return NULL;
+    }
+
+    PMIX_LIST_FOREACH(active, &pmix_psec_globals.actives, pmix_psec_base_active_module_t) {
+        pmix_argv_append_nosize(&tmp, active->component->base.pmix_mca_component_name);
+    }
+    if (NULL != tmp) {
+        reply = pmix_argv_join(tmp, ',');
+        pmix_argv_free(tmp);
+    }
+    return reply;
+}
+
+pmix_status_t pmix_psec_base_assign_module(struct pmix_peer_t *peer,
+                                           const char *options)
+{
+    pmix_peer_t *pr = (pmix_peer_t*)peer;
+    pmix_psec_base_active_module_t *active;
+    pmix_psec_module_t *mod;
+    char **tmp=NULL;
+    int i;
+
+    if (!pmix_psec_globals.initialized) {
+        return PMIX_ERR_INIT;
+    }
+
+    if (NULL != options) {
+        tmp = pmix_argv_split(options, ',');
+    }
+
+    PMIX_LIST_FOREACH(active, &pmix_psec_globals.actives, pmix_psec_base_active_module_t) {
+        if (NULL == tmp) {
+            if (NULL != (mod = active->component->assign_module())) {
+                pr->compat.psec = mod;
+                return PMIX_SUCCESS;
+            }
+        } else {
+            for (i=0; NULL != tmp[i]; i++) {
+                if (0 == strcmp(tmp[i], active->component->base.pmix_mca_component_name)) {
+                    if (NULL != (mod = active->component->assign_module())) {
+                        pmix_argv_free(tmp);
+                        pr->compat.psec = mod;
+                        return PMIX_SUCCESS;
+                    }
+                }
+            }
+        }
+    }
+
+    /* we only get here if nothing was found */
+    if (NULL != tmp) {
+        pmix_argv_free(tmp);
+    }
+    return PMIX_ERR_NOT_AVAILABLE;
+}
+
+pmix_status_t pmix_psec_base_create_cred(struct pmix_peer_t *peer,
+                                         pmix_listener_protocol_t protocol,
+                                         char **cred, size_t *len)
+{
+    pmix_peer_t *pr = (pmix_peer_t*)peer;
+
+    if (NULL == pr->compat.psec->create_cred) {
+        return PMIX_ERR_NOT_SUPPORTED;
+    }
+    return pr->compat.psec->create_cred(protocol, cred, len);
+}
+
+pmix_status_t pmix_psec_base_client_handshake(struct pmix_peer_t *peer, int sd)
+{
+    pmix_peer_t *pr = (pmix_peer_t*)peer;
+
+    if (NULL == pr->compat.psec->client_handshake) {
+        return PMIX_ERR_NOT_SUPPORTED;
+    }
+    return pr->compat.psec->client_handshake(sd);
+}
+
+pmix_status_t pmix_psec_base_validate_connection(struct pmix_peer_t *peer,
+                                                 pmix_listener_protocol_t protocol,
+                                                 char *cred, size_t len)
+{
+    pmix_peer_t *pr = (pmix_peer_t*)peer;
+    pmix_status_t rc;
+
+    /* if a credential is available, then check it */
+    if (NULL != pr->compat.psec->validate_cred) {
+        if (PMIX_SUCCESS != (rc = pr->compat.psec->validate_cred(peer, protocol, cred, len))) {
+            pmix_output_verbose(2, pmix_globals.debug_output,
+                                "validation of credential failed: %s",
+                                PMIx_Error_string(rc));
+            return rc;
+        }
+        pmix_output_verbose(2, pmix_globals.debug_output,
+                            "credential validated");
+        /* send them success */
+        rc = PMIX_SUCCESS;
+        if (PMIX_SUCCESS != (rc = pmix_ptl_base_send_blocking(pr->sd, (char*)&rc, sizeof(int)))) {
+            PMIX_ERROR_LOG(rc);
+        }
+        return rc;
+    } else if (NULL != pr->compat.psec->server_handshake) {
+        /* execute the handshake if the security mode calls for it */
+        pmix_output_verbose(2, pmix_globals.debug_output,
+                            "executing handshake");
+        rc = PMIX_ERR_READY_FOR_HANDSHAKE;
+        if (PMIX_SUCCESS != (rc = pmix_ptl_base_send_blocking(pr->sd, (char*)&rc, sizeof(int)))) {
+            PMIX_ERROR_LOG(rc);
+            return rc;
+        }
+        if (PMIX_SUCCESS != (rc = pr->compat.psec->server_handshake(peer))) {
+            PMIX_ERROR_LOG(rc);
+        }
+        return rc;
+    } else {
+        /* this is not allowed */
+        return PMIX_ERR_NOT_SUPPORTED;
+    }
+}
diff --git a/src/mca/psec/base/psec_base_frame.c b/src/mca/psec/base/psec_base_frame.c
new file mode 100644
index 0000000..a0ae2e0
--- /dev/null
+++ b/src/mca/psec/base/psec_base_frame.c
@@ -0,0 +1,93 @@
+/* -*- Mode: C; c-basic-offset:4 ; -*- */
+/*
+ * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2009 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2012-2013 Los Alamos National Security, Inc.  All rights reserved.
+ * Copyright (c) 2014-2016 Intel, Inc. All rights reserved.
+ * Copyright (c) 2015-2016 Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+/** @file:
+ *
+ */
+#include <src/include/pmix_config.h>
+
+#include <pmix_common.h>
+
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+
+#include "src/class/pmix_list.h"
+#include "src/mca/base/base.h"
+#include "src/mca/psec/base/base.h"
+
+/*
+ * The following file was created by configure.  It contains extern
+ * statements and the definition of an array of pointers to each
+ * component's public mca_base_component_t struct.
+ */
+
+#include "src/mca/psec/base/static-components.h"
+
+/* Instantiate the global vars */
+pmix_psec_globals_t pmix_psec_globals = {{{0}}};
+pmix_psec_API_t pmix_psec = {
+    .get_available_modules = pmix_psec_base_get_available_modules,
+    .assign_module = pmix_psec_base_assign_module,
+    .create_cred = pmix_psec_base_create_cred,
+    .client_handshake = pmix_psec_base_client_handshake,
+    .validate_connection = pmix_psec_base_validate_connection
+};
+
+static pmix_status_t pmix_psec_close(void)
+{
+  pmix_psec_base_active_module_t *active, *prev;
+
+    if (!pmix_psec_globals.initialized) {
+        return PMIX_SUCCESS;
+    }
+    pmix_psec_globals.initialized = false;
+
+    PMIX_LIST_FOREACH_SAFE(active, prev, &pmix_psec_globals.actives, pmix_psec_base_active_module_t) {
+      pmix_list_remove_item(&pmix_psec_globals.actives, &active->super);
+      if (NULL != active->component->finalize) {
+        active->component->finalize();
+      }
+      PMIX_RELEASE(active);
+    }
+    PMIX_DESTRUCT(&pmix_psec_globals.actives);
+
+    return pmix_mca_base_framework_components_close(&pmix_psec_base_framework, NULL);
+}
+
+static pmix_status_t pmix_psec_open(pmix_mca_base_open_flag_t flags)
+{
+    /* initialize globals */
+    pmix_psec_globals.initialized = true;
+    PMIX_CONSTRUCT(&pmix_psec_globals.actives, pmix_list_t);
+
+    /* Open up all available components */
+    return pmix_mca_base_framework_components_open(&pmix_psec_base_framework, flags);
+}
+
+PMIX_MCA_BASE_FRAMEWORK_DECLARE(pmix, psec, "PMIx Security Operations",
+                                NULL, pmix_psec_open, pmix_psec_close,
+                                mca_psec_base_static_components, 0);
+
+PMIX_CLASS_INSTANCE(pmix_psec_base_active_module_t,
+                    pmix_list_item_t,
+                    NULL, NULL);
diff --git a/src/mca/psec/base/psec_base_select.c b/src/mca/psec/base/psec_base_select.c
new file mode 100644
index 0000000..73dbeb9
--- /dev/null
+++ b/src/mca/psec/base/psec_base_select.c
@@ -0,0 +1,112 @@
+/*
+ * Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2005 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2016      Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+#include <pmix_common.h>
+
+#include <string.h>
+
+#include "src/mca/mca.h"
+#include "src/mca/base/base.h"
+
+#include "src/mca/psec/base/base.h"
+
+static bool selected = false;
+
+/* Function for selecting a prioritized list of components
+ * from all those that are available. */
+int pmix_psec_base_select(void)
+{
+    pmix_mca_base_component_list_item_t *cli = NULL;
+    pmix_mca_base_component_t *component = NULL;
+    pmix_mca_base_module_t *module = NULL;
+    pmix_psec_module_t *nmodule;
+    pmix_psec_base_active_module_t *newmodule, *mod;
+    int rc, priority;
+    bool inserted;
+
+    if (selected) {
+        /* ensure we don't do this twice */
+        return PMIX_SUCCESS;
+    }
+    selected = true;
+
+    /* Query all available components and ask if they have a module */
+    PMIX_LIST_FOREACH(cli, &pmix_psec_base_framework.framework_components, pmix_mca_base_component_list_item_t) {
+        component = (pmix_mca_base_component_t *) cli->cli_component;
+
+        pmix_output_verbose(5, pmix_psec_base_framework.framework_output,
+                            "mca:psec:select: checking available component %s", component->pmix_mca_component_name);
+
+        /* If there's no query function, skip it */
+        if (NULL == component->pmix_mca_query_component) {
+            pmix_output_verbose(5, pmix_psec_base_framework.framework_output,
+                                "mca:psec:select: Skipping component [%s]. It does not implement a query function",
+                                component->pmix_mca_component_name );
+            continue;
+        }
+
+        /* Query the component */
+        pmix_output_verbose(5, pmix_psec_base_framework.framework_output,
+                            "mca:psec:select: Querying component [%s]",
+                            component->pmix_mca_component_name);
+        rc = component->pmix_mca_query_component(&module, &priority);
+
+        /* If no module was returned, then skip component */
+        if (PMIX_SUCCESS != rc || NULL == module) {
+            pmix_output_verbose(5, pmix_psec_base_framework.framework_output,
+                                "mca:psec:select: Skipping component [%s]. Query failed to return a module",
+                                component->pmix_mca_component_name );
+            continue;
+        }
+
+        /* If we got a module, keep it */
+        nmodule = (pmix_psec_module_t*) module;
+        /* add to the list of selected modules */
+        newmodule = PMIX_NEW(pmix_psec_base_active_module_t);
+        newmodule->pri = priority;
+        newmodule->module = nmodule;
+        newmodule->component = (pmix_psec_base_component_t*)cli->cli_component;
+
+        /* maintain priority order */
+        inserted = false;
+        PMIX_LIST_FOREACH(mod, &pmix_psec_globals.actives, pmix_psec_base_active_module_t) {
+            if (priority > mod->pri) {
+                pmix_list_insert_pos(&pmix_psec_globals.actives,
+                                     (pmix_list_item_t*)mod, &newmodule->super);
+                inserted = true;
+                break;
+            }
+        }
+        if (!inserted) {
+            /* must be lowest priority - add to end */
+            pmix_list_append(&pmix_psec_globals.actives, &newmodule->super);
+        }
+    }
+
+    if (4 < pmix_output_get_verbosity(pmix_psec_base_framework.framework_output)) {
+        pmix_output(0, "Final psec priorities");
+        /* show the prioritized list */
+        PMIX_LIST_FOREACH(mod, &pmix_psec_globals.actives, pmix_psec_base_active_module_t) {
+            pmix_output(0, "\tpsec: %s Priority: %d", mod->component->base.pmix_mca_component_name, mod->pri);
+        }
+    }
+
+    return PMIX_SUCCESS;;
+}
diff --git a/src/mca/psec/munge/Makefile.am b/src/mca/psec/munge/Makefile.am
new file mode 100644
index 0000000..a756c8b
--- /dev/null
+++ b/src/mca/psec/munge/Makefile.am
@@ -0,0 +1,50 @@
+# -*- makefile -*-
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2012      Los Alamos National Security, Inc.  All rights reserved.
+# Copyright (c) 2013-2016 Intel, Inc. All rights reserved
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+headers = psec_munge.h
+sources = \
+        psec_munge_component.c \
+        psec_munge.c
+
+# Make the output library in this directory, and name it either
+# mca_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la
+# (for static builds).
+
+if MCA_BUILD_pmix_psec_munge_DSO
+lib =
+lib_sources =
+component = mca_psec_munge.la
+component_sources = $(headers) $(sources)
+else
+lib = libmca_psec_munge.la
+lib_sources = $(headers) $(sources)
+component =
+component_sources =
+endif
+
+mcacomponentdir = $(pmixlibdir)
+mcacomponent_LTLIBRARIES = $(component)
+mca_psec_munge_la_SOURCES = $(component_sources)
+mca_psec_munge_la_LDFLAGS = -module -avoid-version
+
+noinst_LTLIBRARIES = $(lib)
+libmca_psec_munge_la_SOURCES = $(lib_sources)
+libmca_psec_munge_la_LDFLAGS = -module -avoid-version
diff --git a/src/mca/psec/munge/Makefile.in b/src/mca/psec/munge/Makefile.in
new file mode 100644
index 0000000..cb79960
--- /dev/null
+++ b/src/mca/psec/munge/Makefile.in
@@ -0,0 +1,891 @@
+# Makefile.in generated by automake 1.15 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+# -*- makefile -*-
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2012      Los Alamos National Security, Inc.  All rights reserved.
+# Copyright (c) 2013-2016 Intel, Inc. All rights reserved
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+subdir = src/mca/psec/munge
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/config/c_get_alignment.m4 \
+	$(top_srcdir)/config/libtool.m4 \
+	$(top_srcdir)/config/ltoptions.m4 \
+	$(top_srcdir)/config/ltsugar.m4 \
+	$(top_srcdir)/config/ltversion.m4 \
+	$(top_srcdir)/config/lt~obsolete.m4 \
+	$(top_srcdir)/config/pmix.m4 \
+	$(top_srcdir)/config/pmix_check_attributes.m4 \
+	$(top_srcdir)/config/pmix_check_broken_qsort.m4 \
+	$(top_srcdir)/config/pmix_check_compiler_version.m4 \
+	$(top_srcdir)/config/pmix_check_icc.m4 \
+	$(top_srcdir)/config/pmix_check_ident.m4 \
+	$(top_srcdir)/config/pmix_check_lock.m4 \
+	$(top_srcdir)/config/pmix_check_os_flavors.m4 \
+	$(top_srcdir)/config/pmix_check_package.m4 \
+	$(top_srcdir)/config/pmix_check_psm2.m4 \
+	$(top_srcdir)/config/pmix_check_pthread_pids.m4 \
+	$(top_srcdir)/config/pmix_check_vendor.m4 \
+	$(top_srcdir)/config/pmix_check_visibility.m4 \
+	$(top_srcdir)/config/pmix_check_withdir.m4 \
+	$(top_srcdir)/config/pmix_config_asm.m4 \
+	$(top_srcdir)/config/pmix_config_pthreads.m4 \
+	$(top_srcdir)/config/pmix_config_subdir.m4 \
+	$(top_srcdir)/config/pmix_config_subdir_args.m4 \
+	$(top_srcdir)/config/pmix_config_threads.m4 \
+	$(top_srcdir)/config/pmix_ensure_contains_optflags.m4 \
+	$(top_srcdir)/config/pmix_functions.m4 \
+	$(top_srcdir)/config/pmix_load_platform.m4 \
+	$(top_srcdir)/config/pmix_mca.m4 \
+	$(top_srcdir)/config/pmix_search_libs.m4 \
+	$(top_srcdir)/config/pmix_setup_cc.m4 \
+	$(top_srcdir)/config/pmix_setup_libevent.m4 \
+	$(top_srcdir)/config/pmix_setup_zlib.m4 \
+	$(top_srcdir)/config/pmix_try_assemble.m4 \
+	$(top_srcdir)/config/autogen_found_items.m4 \
+	$(top_srcdir)/src/mca/pdl/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/configure.m4 \
+	$(top_srcdir)/src/mca/pdl/pdlopen/configure.m4 \
+	$(top_srcdir)/src/mca/pdl/plibltdl/configure.m4 \
+	$(top_srcdir)/src/mca/pif/bsdx_ipv4/configure.m4 \
+	$(top_srcdir)/src/mca/pif/bsdx_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pif/linux_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pif/posix_ipv4/configure.m4 \
+	$(top_srcdir)/src/mca/pif/solaris_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/config/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/env/configure.m4 \
+	$(top_srcdir)/src/mca/pnet/opa/configure.m4 \
+	$(top_srcdir)/src/mca/psec/munge/configure.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/src/include/pmix_config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(mcacomponentdir)"
+LTLIBRARIES = $(mcacomponent_LTLIBRARIES) $(noinst_LTLIBRARIES)
+libmca_psec_munge_la_LIBADD =
+am__libmca_psec_munge_la_SOURCES_DIST = psec_munge.h \
+	psec_munge_component.c psec_munge.c
+am__objects_1 =
+am__objects_2 = psec_munge_component.lo psec_munge.lo
+ at MCA_BUILD_pmix_psec_munge_DSO_FALSE@am__objects_3 = $(am__objects_1) \
+ at MCA_BUILD_pmix_psec_munge_DSO_FALSE@	$(am__objects_2)
+am_libmca_psec_munge_la_OBJECTS = $(am__objects_3)
+libmca_psec_munge_la_OBJECTS = $(am_libmca_psec_munge_la_OBJECTS)
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+libmca_psec_munge_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(AM_CFLAGS) $(CFLAGS) $(libmca_psec_munge_la_LDFLAGS) \
+	$(LDFLAGS) -o $@
+ at MCA_BUILD_pmix_psec_munge_DSO_FALSE@am_libmca_psec_munge_la_rpath =
+mca_psec_munge_la_LIBADD =
+am__mca_psec_munge_la_SOURCES_DIST = psec_munge.h \
+	psec_munge_component.c psec_munge.c
+ at MCA_BUILD_pmix_psec_munge_DSO_TRUE@am__objects_4 = $(am__objects_1) \
+ at MCA_BUILD_pmix_psec_munge_DSO_TRUE@	$(am__objects_2)
+am_mca_psec_munge_la_OBJECTS = $(am__objects_4)
+mca_psec_munge_la_OBJECTS = $(am_mca_psec_munge_la_OBJECTS)
+mca_psec_munge_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(AM_CFLAGS) $(CFLAGS) $(mca_psec_munge_la_LDFLAGS) $(LDFLAGS) \
+	-o $@
+ at MCA_BUILD_pmix_psec_munge_DSO_TRUE@am_mca_psec_munge_la_rpath =  \
+ at MCA_BUILD_pmix_psec_munge_DSO_TRUE@	-rpath $(mcacomponentdir)
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/src/include
+depcomp = $(SHELL) $(top_srcdir)/./config/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libmca_psec_munge_la_SOURCES) $(mca_psec_munge_la_SOURCES)
+DIST_SOURCES = $(am__libmca_psec_munge_la_SOURCES_DIST) \
+	$(am__mca_psec_munge_la_SOURCES_DIST)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/./config/depcomp
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CFLAGS = @CFLAGS@
+CLEANFILES = @CLEANFILES@
+CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MCA_PROJECT_SUBDIRS = @MCA_PROJECT_SUBDIRS@
+MCA_pmix_FRAMEWORKS = @MCA_pmix_FRAMEWORKS@
+MCA_pmix_FRAMEWORKS_SUBDIRS = @MCA_pmix_FRAMEWORKS_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS@
+MCA_pmix_FRAMEWORK_LIBS = @MCA_pmix_FRAMEWORK_LIBS@
+MCA_pmix_pdl_ALL_COMPONENTS = @MCA_pmix_pdl_ALL_COMPONENTS@
+MCA_pmix_pdl_ALL_SUBDIRS = @MCA_pmix_pdl_ALL_SUBDIRS@
+MCA_pmix_pdl_DSO_COMPONENTS = @MCA_pmix_pdl_DSO_COMPONENTS@
+MCA_pmix_pdl_DSO_SUBDIRS = @MCA_pmix_pdl_DSO_SUBDIRS@
+MCA_pmix_pdl_STATIC_COMPONENTS = @MCA_pmix_pdl_STATIC_COMPONENTS@
+MCA_pmix_pdl_STATIC_LTLIBS = @MCA_pmix_pdl_STATIC_LTLIBS@
+MCA_pmix_pdl_STATIC_SUBDIRS = @MCA_pmix_pdl_STATIC_SUBDIRS@
+MCA_pmix_pif_ALL_COMPONENTS = @MCA_pmix_pif_ALL_COMPONENTS@
+MCA_pmix_pif_ALL_SUBDIRS = @MCA_pmix_pif_ALL_SUBDIRS@
+MCA_pmix_pif_DSO_COMPONENTS = @MCA_pmix_pif_DSO_COMPONENTS@
+MCA_pmix_pif_DSO_SUBDIRS = @MCA_pmix_pif_DSO_SUBDIRS@
+MCA_pmix_pif_STATIC_COMPONENTS = @MCA_pmix_pif_STATIC_COMPONENTS@
+MCA_pmix_pif_STATIC_LTLIBS = @MCA_pmix_pif_STATIC_LTLIBS@
+MCA_pmix_pif_STATIC_SUBDIRS = @MCA_pmix_pif_STATIC_SUBDIRS@
+MCA_pmix_pinstalldirs_ALL_COMPONENTS = @MCA_pmix_pinstalldirs_ALL_COMPONENTS@
+MCA_pmix_pinstalldirs_ALL_SUBDIRS = @MCA_pmix_pinstalldirs_ALL_SUBDIRS@
+MCA_pmix_pinstalldirs_DSO_COMPONENTS = @MCA_pmix_pinstalldirs_DSO_COMPONENTS@
+MCA_pmix_pinstalldirs_DSO_SUBDIRS = @MCA_pmix_pinstalldirs_DSO_SUBDIRS@
+MCA_pmix_pinstalldirs_STATIC_COMPONENTS = @MCA_pmix_pinstalldirs_STATIC_COMPONENTS@
+MCA_pmix_pinstalldirs_STATIC_LTLIBS = @MCA_pmix_pinstalldirs_STATIC_LTLIBS@
+MCA_pmix_pinstalldirs_STATIC_SUBDIRS = @MCA_pmix_pinstalldirs_STATIC_SUBDIRS@
+MCA_pmix_pnet_ALL_COMPONENTS = @MCA_pmix_pnet_ALL_COMPONENTS@
+MCA_pmix_pnet_ALL_SUBDIRS = @MCA_pmix_pnet_ALL_SUBDIRS@
+MCA_pmix_pnet_DSO_COMPONENTS = @MCA_pmix_pnet_DSO_COMPONENTS@
+MCA_pmix_pnet_DSO_SUBDIRS = @MCA_pmix_pnet_DSO_SUBDIRS@
+MCA_pmix_pnet_STATIC_COMPONENTS = @MCA_pmix_pnet_STATIC_COMPONENTS@
+MCA_pmix_pnet_STATIC_LTLIBS = @MCA_pmix_pnet_STATIC_LTLIBS@
+MCA_pmix_pnet_STATIC_SUBDIRS = @MCA_pmix_pnet_STATIC_SUBDIRS@
+MCA_pmix_psec_ALL_COMPONENTS = @MCA_pmix_psec_ALL_COMPONENTS@
+MCA_pmix_psec_ALL_SUBDIRS = @MCA_pmix_psec_ALL_SUBDIRS@
+MCA_pmix_psec_DSO_COMPONENTS = @MCA_pmix_psec_DSO_COMPONENTS@
+MCA_pmix_psec_DSO_SUBDIRS = @MCA_pmix_psec_DSO_SUBDIRS@
+MCA_pmix_psec_STATIC_COMPONENTS = @MCA_pmix_psec_STATIC_COMPONENTS@
+MCA_pmix_psec_STATIC_LTLIBS = @MCA_pmix_psec_STATIC_LTLIBS@
+MCA_pmix_psec_STATIC_SUBDIRS = @MCA_pmix_psec_STATIC_SUBDIRS@
+MCA_pmix_psensor_ALL_COMPONENTS = @MCA_pmix_psensor_ALL_COMPONENTS@
+MCA_pmix_psensor_ALL_SUBDIRS = @MCA_pmix_psensor_ALL_SUBDIRS@
+MCA_pmix_psensor_DSO_COMPONENTS = @MCA_pmix_psensor_DSO_COMPONENTS@
+MCA_pmix_psensor_DSO_SUBDIRS = @MCA_pmix_psensor_DSO_SUBDIRS@
+MCA_pmix_psensor_STATIC_COMPONENTS = @MCA_pmix_psensor_STATIC_COMPONENTS@
+MCA_pmix_psensor_STATIC_LTLIBS = @MCA_pmix_psensor_STATIC_LTLIBS@
+MCA_pmix_psensor_STATIC_SUBDIRS = @MCA_pmix_psensor_STATIC_SUBDIRS@
+MCA_pmix_ptl_ALL_COMPONENTS = @MCA_pmix_ptl_ALL_COMPONENTS@
+MCA_pmix_ptl_ALL_SUBDIRS = @MCA_pmix_ptl_ALL_SUBDIRS@
+MCA_pmix_ptl_DSO_COMPONENTS = @MCA_pmix_ptl_DSO_COMPONENTS@
+MCA_pmix_ptl_DSO_SUBDIRS = @MCA_pmix_ptl_DSO_SUBDIRS@
+MCA_pmix_ptl_STATIC_COMPONENTS = @MCA_pmix_ptl_STATIC_COMPONENTS@
+MCA_pmix_ptl_STATIC_LTLIBS = @MCA_pmix_ptl_STATIC_LTLIBS@
+MCA_pmix_ptl_STATIC_SUBDIRS = @MCA_pmix_ptl_STATIC_SUBDIRS@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PMIX_ASM_GSYM = @PMIX_ASM_GSYM@
+PMIX_ASM_LSYM = @PMIX_ASM_LSYM@
+PMIX_ASM_SUPPORT_64BIT = @PMIX_ASM_SUPPORT_64BIT@
+PMIX_ASM_TEXT = @PMIX_ASM_TEXT@
+PMIX_ASM_TYPE = @PMIX_ASM_TYPE@
+PMIX_ASSEMBLY_ARCH = @PMIX_ASSEMBLY_ARCH@
+PMIX_ASSEMBLY_BUILTIN = @PMIX_ASSEMBLY_BUILTIN@
+PMIX_ASSEMBLY_FORMAT = @PMIX_ASSEMBLY_FORMAT@
+PMIX_AS_GLOBAL = @PMIX_AS_GLOBAL@
+PMIX_AS_LABEL_SUFFIX = @PMIX_AS_LABEL_SUFFIX@
+PMIX_CC_ABSOLUTE = @PMIX_CC_ABSOLUTE@
+PMIX_CONFIGURE_DATE = @PMIX_CONFIGURE_DATE@
+PMIX_CONFIGURE_HOST = @PMIX_CONFIGURE_HOST@
+PMIX_CONFIGURE_USER = @PMIX_CONFIGURE_USER@
+PMIX_EMBEDDED_CPPFLAGS = @PMIX_EMBEDDED_CPPFLAGS@
+PMIX_EMBEDDED_LDFLAGS = @PMIX_EMBEDDED_LDFLAGS@
+PMIX_EMBEDDED_LIBS = @PMIX_EMBEDDED_LIBS@
+PMIX_MAJOR_VERSION = @PMIX_MAJOR_VERSION@
+PMIX_MINOR_VERSION = @PMIX_MINOR_VERSION@
+PMIX_RELEASE_DATE = @PMIX_RELEASE_DATE@
+PMIX_RELEASE_VERSION = @PMIX_RELEASE_VERSION@
+PMIX_RENAME = @PMIX_RENAME@
+PMIX_VERSION = @PMIX_VERSION@
+PMIX_top_builddir = @PMIX_top_builddir@
+PMIX_top_srcdir = @PMIX_top_srcdir@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_prefix_program = @ac_prefix_program@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+libpmix_so_version = @libpmix_so_version@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pmix_have_pandoc = @pmix_have_pandoc@
+pmix_pdl_pdlopen_LIBS = @pmix_pdl_pdlopen_LIBS@
+pmix_pdl_plibltdl_CPPFLAGS = @pmix_pdl_plibltdl_CPPFLAGS@
+pmix_pdl_plibltdl_LDFLAGS = @pmix_pdl_plibltdl_LDFLAGS@
+pmix_pdl_plibltdl_LIBS = @pmix_pdl_plibltdl_LIBS@
+pmixdatadir = @pmixdatadir@
+pmixincludedir = @pmixincludedir@
+pmixlibdir = @pmixlibdir@
+pmixmajor = @pmixmajor@
+pmixminor = @pmixminor@
+pnet_opa_CFLAGS = @pnet_opa_CFLAGS@
+pnet_opa_CPPFLAGS = @pnet_opa_CPPFLAGS@
+pnet_opa_LDFLAGS = @pnet_opa_LDFLAGS@
+pnet_opa_LIBS = @pnet_opa_LIBS@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+psec_munge_CPPFLAGS = @psec_munge_CPPFLAGS@
+psec_munge_LDFLAGS = @psec_munge_LDFLAGS@
+psec_munge_LIBS = @psec_munge_LIBS@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+headers = psec_munge.h
+sources = \
+        psec_munge_component.c \
+        psec_munge.c
+
+ at MCA_BUILD_pmix_psec_munge_DSO_FALSE@lib = libmca_psec_munge.la
+
+# Make the output library in this directory, and name it either
+# mca_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la
+# (for static builds).
+ at MCA_BUILD_pmix_psec_munge_DSO_TRUE@lib = 
+ at MCA_BUILD_pmix_psec_munge_DSO_FALSE@lib_sources = $(headers) $(sources)
+ at MCA_BUILD_pmix_psec_munge_DSO_TRUE@lib_sources = 
+ at MCA_BUILD_pmix_psec_munge_DSO_FALSE@component = 
+ at MCA_BUILD_pmix_psec_munge_DSO_TRUE@component = mca_psec_munge.la
+ at MCA_BUILD_pmix_psec_munge_DSO_FALSE@component_sources = 
+ at MCA_BUILD_pmix_psec_munge_DSO_TRUE@component_sources = $(headers) $(sources)
+mcacomponentdir = $(pmixlibdir)
+mcacomponent_LTLIBRARIES = $(component)
+mca_psec_munge_la_SOURCES = $(component_sources)
+mca_psec_munge_la_LDFLAGS = -module -avoid-version
+noinst_LTLIBRARIES = $(lib)
+libmca_psec_munge_la_SOURCES = $(lib_sources)
+libmca_psec_munge_la_LDFLAGS = -module -avoid-version
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/mca/psec/munge/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/mca/psec/munge/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+install-mcacomponentLTLIBRARIES: $(mcacomponent_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	@list='$(mcacomponent_LTLIBRARIES)'; test -n "$(mcacomponentdir)" || 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)$(mcacomponentdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(mcacomponentdir)" || exit 1; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(mcacomponentdir)'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(mcacomponentdir)"; \
+	}
+
+uninstall-mcacomponentLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(mcacomponent_LTLIBRARIES)'; test -n "$(mcacomponentdir)" || list=; \
+	for p in $$list; do \
+	  $(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(mcacomponentdir)/$$f'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(mcacomponentdir)/$$f"; \
+	done
+
+clean-mcacomponentLTLIBRARIES:
+	-test -z "$(mcacomponent_LTLIBRARIES)" || rm -f $(mcacomponent_LTLIBRARIES)
+	@list='$(mcacomponent_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}; \
+	}
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_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}; \
+	}
+
+libmca_psec_munge.la: $(libmca_psec_munge_la_OBJECTS) $(libmca_psec_munge_la_DEPENDENCIES) $(EXTRA_libmca_psec_munge_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(libmca_psec_munge_la_LINK) $(am_libmca_psec_munge_la_rpath) $(libmca_psec_munge_la_OBJECTS) $(libmca_psec_munge_la_LIBADD) $(LIBS)
+
+mca_psec_munge.la: $(mca_psec_munge_la_OBJECTS) $(mca_psec_munge_la_DEPENDENCIES) $(EXTRA_mca_psec_munge_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(mca_psec_munge_la_LINK) $(am_mca_psec_munge_la_rpath) $(mca_psec_munge_la_OBJECTS) $(mca_psec_munge_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/psec_munge.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/psec_munge_component.Plo at am__quote@
+
+.c.o:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+ at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+	for dir in "$(DESTDIR)$(mcacomponentdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-mcacomponentLTLIBRARIES \
+	clean-noinstLTLIBRARIES mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-mcacomponentLTLIBRARIES
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-mcacomponentLTLIBRARIES
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-mcacomponentLTLIBRARIES \
+	clean-noinstLTLIBRARIES 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-mcacomponentLTLIBRARIES install-pdf install-pdf-am \
+	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-mcacomponentLTLIBRARIES
+
+.PRECIOUS: Makefile
+
+
+# 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/mca/psec/munge/configure.m4 b/src/mca/psec/munge/configure.m4
new file mode 100644
index 0000000..503bc34
--- /dev/null
+++ b/src/mca/psec/munge/configure.m4
@@ -0,0 +1,88 @@
+# -*- shell-script -*-
+#
+# Copyright (c) 2015-2016 Intel, Inc. All rights reserved
+# Copyright (c) 2015      Research Organization for Information Science
+#                         and Technology (RIST). All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# MCA_psec_munge_CONFIG([action-if-found], [action-if-not-found])
+# --------------------------------------------------------------------
+AC_DEFUN([MCA_pmix_psec_munge_CONFIG],[
+    AC_CONFIG_FILES([src/mca/psec/munge/Makefile])
+
+    PMIX_VAR_SCOPE_PUSH([psec_munge_support psec_munge_dir psec_munge_libdir save_cpp save_ld])
+
+    AC_ARG_WITH([munge],
+                [AC_HELP_STRING([--with-munge=DIR],
+                                [Search for munge headers and libraries in DIR ])])
+
+    AC_ARG_WITH([munge-libdir],
+                [AC_HELP_STRING([--with-munge-libdir=DIR],
+                                [Search for munge libraries in DIR ])])
+
+    psec_munge_support=0
+    if test ! -z "$with_munge" && test "$with_munge" != "no"; then
+        AC_MSG_CHECKING([for munge in])
+        if test -n "$with_munge" && test "$with_munge" != "yes"; then
+            if test -d $with_munge/include/munge; then
+                psec_munge_dir=$with_munge/include/munge
+            else
+                psec_munge_dir=$with_munge
+            fi
+            if test -d $with_munge/lib; then
+                psec_munge_libdir=$with_munge/lib
+            elif -d $with_munge/lib64; then
+                psec_munge_libdir=$with_munge/lib64
+            else
+                AC_MSG_RESULT([Could not find $with_munge/lib or $with_munge/lib64])
+                AC_MSG_ERROR([Can not continue])
+            fi
+            AC_MSG_RESULT([$psec_munge_dir and $psec_munge_libdir])
+        else
+            AC_MSG_RESULT([(default search paths)])
+            psec_munge_dir=
+        fi
+        AS_IF([test -n "$with_munge_libdir" && test "$with_munge_libdir" != "yes"],
+              [psec_munge_libdir="$with_munge_libdir"])
+
+        save_cpp=$CPPFLAGS
+        save_ld=$LDFLAGS
+
+        PMIX_CHECK_PACKAGE([psec_munge],
+                           [munge.h],
+                           [munge],
+                           [munge_encode],
+                           [-lmunge],
+                           [$psec_munge_dir],
+                           [$psec_munge_libdir],
+                           [psec_munge_support=1],
+                           [psec_munge_support=0])
+
+        CPPFLAGS=$save_cpp
+        LDFLAGS=$save_ld
+    fi
+
+    if test -n "$with_munge" && test "$with_munge" != "no" && test "$psec_munge_support" != "1"; then
+        AC_MSG_WARN([MUNGE SUPPORT REQUESTED AND NOT FOUND.])
+        AC_MSG_ERROR([CANNOT CONTINUE])
+    fi
+
+    AC_MSG_CHECKING([will munge support be built])
+    AS_IF([test "$psec_munge_support" != "1"],
+          [AC_MSG_RESULT([no])
+           $2],
+          [AC_MSG_RESULT([yes])
+           $1])
+
+    # set build flags to use in makefile
+    AC_SUBST([psec_munge_CPPFLAGS])
+    AC_SUBST([psec_munge_LDFLAGS])
+    AC_SUBST([psec_munge_LIBS])
+
+    PMIX_VAR_SCOPE_POP
+])dnl
diff --git a/src/mca/psec/munge/psec_munge.c b/src/mca/psec/munge/psec_munge.c
new file mode 100644
index 0000000..fcf7834
--- /dev/null
+++ b/src/mca/psec/munge/psec_munge.c
@@ -0,0 +1,149 @@
+/*
+ * Copyright (c) 2015-2016 Intel, Inc.  All rights reserved.
+ *
+ * NOTE: THE MUNGE CLIENT LIBRARY (libmunge) IS LICENSED AS LGPL
+ *
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+
+#include <pmix_common.h>
+
+#include "src/include/pmix_globals.h"
+#include "src/util/argv.h"
+#include "src/util/error.h"
+#include "src/util/output.h"
+
+#include <unistd.h>
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#include <munge.h>
+
+#include "src/mca/psec/psec.h"
+#include "psec_munge.h"
+
+static pmix_status_t munge_init(void);
+static void munge_finalize(void);
+static pmix_status_t create_cred(pmix_listener_protocol_t protocol,
+                                 char **cred, size_t *len);
+static pmix_status_t validate_cred(pmix_listener_protocol_t protocol,
+                                   pmix_peer_t *peer, char *cred, size_t len);
+
+pmix_psec_module_t pmix_munge_module = {
+    "munge",
+    munge_init,
+    munge_finalize,
+    create_cred,
+    NULL,
+    validate_cred,
+    NULL
+};
+
+static char *mycred = NULL;
+static bool initialized = false;
+static bool refresh = false;
+
+static pmix_status_t munge_init(void)
+{
+    int rc;
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "psec: munge init");
+
+    /* attempt to get a credential as a way of checking that
+     * the munge server is available - cache the credential
+     * for later use */
+
+    if (EMUNGE_SUCCESS != (rc = munge_encode(&mycred, NULL, NULL, 0))) {
+        pmix_output_verbose(2, pmix_globals.debug_output,
+                            "psec: munge failed to create credential: %s",
+                            munge_strerror(rc));
+        return PMIX_ERR_SERVER_NOT_AVAIL;
+    }
+    initialized = true;
+
+    return PMIX_SUCCESS;
+}
+
+static void munge_finalize(void)
+{
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "psec: munge finalize");
+    if (initialized) {
+        if (NULL != mycred) {
+            free(mycred);
+            mycred = NULL;
+        }
+    }
+}
+
+static pmix_status_t create_cred(pmix_listener_protocol_t protocol,
+                                 char **cred, size_t *len)
+{
+    int rc;
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "psec: munge create_cred");
+
+    if (initialized) {
+        if (!refresh) {
+            refresh = true;
+            *cred = strdup(mycred);
+            *len = strlen(mycred) + 1;
+        } else {
+            /* munge does not allow reuse of a credential, so we have to
+             * refresh it for every use */
+            if (NULL != mycred) {
+                free(mycred);
+            }
+            if (EMUNGE_SUCCESS != (rc = munge_encode(&mycred, NULL, NULL, 0))) {
+                pmix_output_verbose(2, pmix_globals.debug_output,
+                                    "psec: munge failed to create credential: %s",
+                                    munge_strerror(rc));
+                return NULL;
+            }
+            *cred = strdup(mycred);
+            *len = strlen(mycred) + 1;
+        }
+    }
+    return PMIX_SUCCESS;
+}
+
+static pmix_status_t validate_cred(pmix_listener_protocol_t protocol,
+                                   pmix_peer_t *peer, char *cred, size_t len)
+{
+    uid_t uid;
+    gid_t gid;
+    munge_err_t rc;
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "psec: munge validate_cred %s", cred ? cred : "NULL");
+
+    /* parse the inbound string */
+    if (EMUNGE_SUCCESS != (rc = munge_decode(cred, NULL, NULL, NULL, &uid, &gid))) {
+        pmix_output_verbose(2, pmix_globals.debug_output,
+                            "psec: munge failed to decode credential: %s",
+                            munge_strerror(rc));
+        return PMIX_ERR_INVALID_CRED;
+    }
+
+    /* check uid */
+    if (uid != peer->info->uid) {
+        return PMIX_ERR_INVALID_CRED;
+    }
+
+    /* check guid */
+    if (gid != peer->info->gid) {
+        return PMIX_ERR_INVALID_CRED;
+    }
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "psec: munge credential valid");
+    return PMIX_SUCCESS;
+}
diff --git a/src/mca/psec/munge/psec_munge.h b/src/mca/psec/munge/psec_munge.h
new file mode 100644
index 0000000..ff50bd4
--- /dev/null
+++ b/src/mca/psec/munge/psec_munge.h
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2015-2016 Intel, Inc.  All rights reserved.
+ *
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#ifndef PMIX_MUNGE_H
+#define PMIX_MUNGE_H
+
+BEGIN_C_DECLS
+
+#include <src/include/pmix_config.h>
+
+
+/* the component must be visible data for the linker to find it */
+PMIX_EXPORT extern pmix_psec_base_component_t mca_psec_munge_component;
+extern pmix_psec_module_t pmix_munge_module;
+
+END_C_DECLS
+
+#endif
diff --git a/src/mca/psec/munge/psec_munge_component.c b/src/mca/psec/munge/psec_munge_component.c
new file mode 100644
index 0000000..c44a523
--- /dev/null
+++ b/src/mca/psec/munge/psec_munge_component.c
@@ -0,0 +1,91 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2005 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2015      Los Alamos National Security, LLC. All rights
+ *                         reserved.
+ * Copyright (c) 2016      Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ *
+ * These symbols are in a file by themselves to provide nice linker
+ * semantics.  Since linkers generally pull in symbols by object
+ * files, keeping these symbols as the only symbols in this file
+ * prevents utility programs such as "ompi_info" from having to import
+ * entire components just to query their version and parameters.
+ */
+
+#include <src/include/pmix_config.h>
+#include "pmix_common.h"
+
+
+#include "src/mca/psec/psec.h"
+#include "psec_munge.h"
+
+static pmix_status_t component_open(void);
+static pmix_status_t component_close(void);
+static pmix_status_t component_query(pmix_mca_base_module_t **module, int *priority);
+static pmix_psec_module_t* assign_module(void);
+
+/*
+ * Instantiate the public struct with all of our public information
+ * and pointers to our public functions in it
+ */
+pmix_psec_base_component_t mca_psec_munge_component = {
+    .base = {
+        PMIX_PSEC_BASE_VERSION_1_0_0,
+
+        /* Component name and version */
+        .pmix_mca_component_name = "munge",
+        PMIX_MCA_BASE_MAKE_VERSION(component,
+                                   PMIX_MAJOR_VERSION,
+                                   PMIX_MINOR_VERSION,
+                                   PMIX_RELEASE_VERSION),
+
+        /* Component open and close functions */
+        .pmix_mca_open_component = component_open,
+        .pmix_mca_close_component = component_close,
+        .pmix_mca_query_component = component_query,
+    },
+    .data = {
+        /* The component is checkpoint ready */
+        PMIX_MCA_BASE_METADATA_PARAM_CHECKPOINT
+    },
+    .assign_module = assign_module
+};
+
+
+static int component_open(void)
+{
+    return PMIX_SUCCESS;
+}
+
+
+static int component_query(pmix_mca_base_module_t **module, int *priority)
+{
+    *priority = 80;
+    *module = (pmix_mca_base_module_t *)&pmix_munge_module;
+    return PMIX_SUCCESS;
+}
+
+
+static int component_close(void)
+{
+    return PMIX_SUCCESS;
+}
+
+static pmix_psec_module_t* assign_module(void)
+{
+    return &pmix_munge_module;
+}
diff --git a/src/mca/psec/native/Makefile.am b/src/mca/psec/native/Makefile.am
new file mode 100644
index 0000000..9381d8a
--- /dev/null
+++ b/src/mca/psec/native/Makefile.am
@@ -0,0 +1,50 @@
+# -*- makefile -*-
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2012      Los Alamos National Security, Inc.  All rights reserved.
+# Copyright (c) 2013-2016 Intel, Inc. All rights reserved
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+headers = psec_native.h
+sources = \
+        psec_native_component.c \
+        psec_native.c
+
+# Make the output library in this directory, and name it either
+# mca_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la
+# (for static builds).
+
+if MCA_BUILD_pmix_psec_native_DSO
+lib =
+lib_sources =
+component = mca_psec_native.la
+component_sources = $(headers) $(sources)
+else
+lib = libmca_psec_native.la
+lib_sources = $(headers) $(sources)
+component =
+component_sources =
+endif
+
+mcacomponentdir = $(pmixlibdir)
+mcacomponent_LTLIBRARIES = $(component)
+mca_psec_native_la_SOURCES = $(component_sources)
+mca_psec_native_la_LDFLAGS = -module -avoid-version
+
+noinst_LTLIBRARIES = $(lib)
+libmca_psec_native_la_SOURCES = $(lib_sources)
+libmca_psec_native_la_LDFLAGS = -module -avoid-version
diff --git a/src/mca/psec/native/Makefile.in b/src/mca/psec/native/Makefile.in
new file mode 100644
index 0000000..ab0605c
--- /dev/null
+++ b/src/mca/psec/native/Makefile.in
@@ -0,0 +1,893 @@
+# Makefile.in generated by automake 1.15 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+# -*- makefile -*-
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2012      Los Alamos National Security, Inc.  All rights reserved.
+# Copyright (c) 2013-2016 Intel, Inc. All rights reserved
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+subdir = src/mca/psec/native
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/config/c_get_alignment.m4 \
+	$(top_srcdir)/config/libtool.m4 \
+	$(top_srcdir)/config/ltoptions.m4 \
+	$(top_srcdir)/config/ltsugar.m4 \
+	$(top_srcdir)/config/ltversion.m4 \
+	$(top_srcdir)/config/lt~obsolete.m4 \
+	$(top_srcdir)/config/pmix.m4 \
+	$(top_srcdir)/config/pmix_check_attributes.m4 \
+	$(top_srcdir)/config/pmix_check_broken_qsort.m4 \
+	$(top_srcdir)/config/pmix_check_compiler_version.m4 \
+	$(top_srcdir)/config/pmix_check_icc.m4 \
+	$(top_srcdir)/config/pmix_check_ident.m4 \
+	$(top_srcdir)/config/pmix_check_lock.m4 \
+	$(top_srcdir)/config/pmix_check_os_flavors.m4 \
+	$(top_srcdir)/config/pmix_check_package.m4 \
+	$(top_srcdir)/config/pmix_check_psm2.m4 \
+	$(top_srcdir)/config/pmix_check_pthread_pids.m4 \
+	$(top_srcdir)/config/pmix_check_vendor.m4 \
+	$(top_srcdir)/config/pmix_check_visibility.m4 \
+	$(top_srcdir)/config/pmix_check_withdir.m4 \
+	$(top_srcdir)/config/pmix_config_asm.m4 \
+	$(top_srcdir)/config/pmix_config_pthreads.m4 \
+	$(top_srcdir)/config/pmix_config_subdir.m4 \
+	$(top_srcdir)/config/pmix_config_subdir_args.m4 \
+	$(top_srcdir)/config/pmix_config_threads.m4 \
+	$(top_srcdir)/config/pmix_ensure_contains_optflags.m4 \
+	$(top_srcdir)/config/pmix_functions.m4 \
+	$(top_srcdir)/config/pmix_load_platform.m4 \
+	$(top_srcdir)/config/pmix_mca.m4 \
+	$(top_srcdir)/config/pmix_search_libs.m4 \
+	$(top_srcdir)/config/pmix_setup_cc.m4 \
+	$(top_srcdir)/config/pmix_setup_libevent.m4 \
+	$(top_srcdir)/config/pmix_setup_zlib.m4 \
+	$(top_srcdir)/config/pmix_try_assemble.m4 \
+	$(top_srcdir)/config/autogen_found_items.m4 \
+	$(top_srcdir)/src/mca/pdl/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/configure.m4 \
+	$(top_srcdir)/src/mca/pdl/pdlopen/configure.m4 \
+	$(top_srcdir)/src/mca/pdl/plibltdl/configure.m4 \
+	$(top_srcdir)/src/mca/pif/bsdx_ipv4/configure.m4 \
+	$(top_srcdir)/src/mca/pif/bsdx_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pif/linux_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pif/posix_ipv4/configure.m4 \
+	$(top_srcdir)/src/mca/pif/solaris_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/config/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/env/configure.m4 \
+	$(top_srcdir)/src/mca/pnet/opa/configure.m4 \
+	$(top_srcdir)/src/mca/psec/munge/configure.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/src/include/pmix_config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(mcacomponentdir)"
+LTLIBRARIES = $(mcacomponent_LTLIBRARIES) $(noinst_LTLIBRARIES)
+libmca_psec_native_la_LIBADD =
+am__libmca_psec_native_la_SOURCES_DIST = psec_native.h \
+	psec_native_component.c psec_native.c
+am__objects_1 =
+am__objects_2 = psec_native_component.lo psec_native.lo
+ at MCA_BUILD_pmix_psec_native_DSO_FALSE@am__objects_3 =  \
+ at MCA_BUILD_pmix_psec_native_DSO_FALSE@	$(am__objects_1) \
+ at MCA_BUILD_pmix_psec_native_DSO_FALSE@	$(am__objects_2)
+am_libmca_psec_native_la_OBJECTS = $(am__objects_3)
+libmca_psec_native_la_OBJECTS = $(am_libmca_psec_native_la_OBJECTS)
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+libmca_psec_native_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(AM_CFLAGS) $(CFLAGS) $(libmca_psec_native_la_LDFLAGS) \
+	$(LDFLAGS) -o $@
+ at MCA_BUILD_pmix_psec_native_DSO_FALSE@am_libmca_psec_native_la_rpath =
+mca_psec_native_la_LIBADD =
+am__mca_psec_native_la_SOURCES_DIST = psec_native.h \
+	psec_native_component.c psec_native.c
+ at MCA_BUILD_pmix_psec_native_DSO_TRUE@am__objects_4 = $(am__objects_1) \
+ at MCA_BUILD_pmix_psec_native_DSO_TRUE@	$(am__objects_2)
+am_mca_psec_native_la_OBJECTS = $(am__objects_4)
+mca_psec_native_la_OBJECTS = $(am_mca_psec_native_la_OBJECTS)
+mca_psec_native_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(AM_CFLAGS) $(CFLAGS) $(mca_psec_native_la_LDFLAGS) \
+	$(LDFLAGS) -o $@
+ at MCA_BUILD_pmix_psec_native_DSO_TRUE@am_mca_psec_native_la_rpath =  \
+ at MCA_BUILD_pmix_psec_native_DSO_TRUE@	-rpath $(mcacomponentdir)
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/src/include
+depcomp = $(SHELL) $(top_srcdir)/./config/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libmca_psec_native_la_SOURCES) \
+	$(mca_psec_native_la_SOURCES)
+DIST_SOURCES = $(am__libmca_psec_native_la_SOURCES_DIST) \
+	$(am__mca_psec_native_la_SOURCES_DIST)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/./config/depcomp
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CFLAGS = @CFLAGS@
+CLEANFILES = @CLEANFILES@
+CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MCA_PROJECT_SUBDIRS = @MCA_PROJECT_SUBDIRS@
+MCA_pmix_FRAMEWORKS = @MCA_pmix_FRAMEWORKS@
+MCA_pmix_FRAMEWORKS_SUBDIRS = @MCA_pmix_FRAMEWORKS_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS@
+MCA_pmix_FRAMEWORK_LIBS = @MCA_pmix_FRAMEWORK_LIBS@
+MCA_pmix_pdl_ALL_COMPONENTS = @MCA_pmix_pdl_ALL_COMPONENTS@
+MCA_pmix_pdl_ALL_SUBDIRS = @MCA_pmix_pdl_ALL_SUBDIRS@
+MCA_pmix_pdl_DSO_COMPONENTS = @MCA_pmix_pdl_DSO_COMPONENTS@
+MCA_pmix_pdl_DSO_SUBDIRS = @MCA_pmix_pdl_DSO_SUBDIRS@
+MCA_pmix_pdl_STATIC_COMPONENTS = @MCA_pmix_pdl_STATIC_COMPONENTS@
+MCA_pmix_pdl_STATIC_LTLIBS = @MCA_pmix_pdl_STATIC_LTLIBS@
+MCA_pmix_pdl_STATIC_SUBDIRS = @MCA_pmix_pdl_STATIC_SUBDIRS@
+MCA_pmix_pif_ALL_COMPONENTS = @MCA_pmix_pif_ALL_COMPONENTS@
+MCA_pmix_pif_ALL_SUBDIRS = @MCA_pmix_pif_ALL_SUBDIRS@
+MCA_pmix_pif_DSO_COMPONENTS = @MCA_pmix_pif_DSO_COMPONENTS@
+MCA_pmix_pif_DSO_SUBDIRS = @MCA_pmix_pif_DSO_SUBDIRS@
+MCA_pmix_pif_STATIC_COMPONENTS = @MCA_pmix_pif_STATIC_COMPONENTS@
+MCA_pmix_pif_STATIC_LTLIBS = @MCA_pmix_pif_STATIC_LTLIBS@
+MCA_pmix_pif_STATIC_SUBDIRS = @MCA_pmix_pif_STATIC_SUBDIRS@
+MCA_pmix_pinstalldirs_ALL_COMPONENTS = @MCA_pmix_pinstalldirs_ALL_COMPONENTS@
+MCA_pmix_pinstalldirs_ALL_SUBDIRS = @MCA_pmix_pinstalldirs_ALL_SUBDIRS@
+MCA_pmix_pinstalldirs_DSO_COMPONENTS = @MCA_pmix_pinstalldirs_DSO_COMPONENTS@
+MCA_pmix_pinstalldirs_DSO_SUBDIRS = @MCA_pmix_pinstalldirs_DSO_SUBDIRS@
+MCA_pmix_pinstalldirs_STATIC_COMPONENTS = @MCA_pmix_pinstalldirs_STATIC_COMPONENTS@
+MCA_pmix_pinstalldirs_STATIC_LTLIBS = @MCA_pmix_pinstalldirs_STATIC_LTLIBS@
+MCA_pmix_pinstalldirs_STATIC_SUBDIRS = @MCA_pmix_pinstalldirs_STATIC_SUBDIRS@
+MCA_pmix_pnet_ALL_COMPONENTS = @MCA_pmix_pnet_ALL_COMPONENTS@
+MCA_pmix_pnet_ALL_SUBDIRS = @MCA_pmix_pnet_ALL_SUBDIRS@
+MCA_pmix_pnet_DSO_COMPONENTS = @MCA_pmix_pnet_DSO_COMPONENTS@
+MCA_pmix_pnet_DSO_SUBDIRS = @MCA_pmix_pnet_DSO_SUBDIRS@
+MCA_pmix_pnet_STATIC_COMPONENTS = @MCA_pmix_pnet_STATIC_COMPONENTS@
+MCA_pmix_pnet_STATIC_LTLIBS = @MCA_pmix_pnet_STATIC_LTLIBS@
+MCA_pmix_pnet_STATIC_SUBDIRS = @MCA_pmix_pnet_STATIC_SUBDIRS@
+MCA_pmix_psec_ALL_COMPONENTS = @MCA_pmix_psec_ALL_COMPONENTS@
+MCA_pmix_psec_ALL_SUBDIRS = @MCA_pmix_psec_ALL_SUBDIRS@
+MCA_pmix_psec_DSO_COMPONENTS = @MCA_pmix_psec_DSO_COMPONENTS@
+MCA_pmix_psec_DSO_SUBDIRS = @MCA_pmix_psec_DSO_SUBDIRS@
+MCA_pmix_psec_STATIC_COMPONENTS = @MCA_pmix_psec_STATIC_COMPONENTS@
+MCA_pmix_psec_STATIC_LTLIBS = @MCA_pmix_psec_STATIC_LTLIBS@
+MCA_pmix_psec_STATIC_SUBDIRS = @MCA_pmix_psec_STATIC_SUBDIRS@
+MCA_pmix_psensor_ALL_COMPONENTS = @MCA_pmix_psensor_ALL_COMPONENTS@
+MCA_pmix_psensor_ALL_SUBDIRS = @MCA_pmix_psensor_ALL_SUBDIRS@
+MCA_pmix_psensor_DSO_COMPONENTS = @MCA_pmix_psensor_DSO_COMPONENTS@
+MCA_pmix_psensor_DSO_SUBDIRS = @MCA_pmix_psensor_DSO_SUBDIRS@
+MCA_pmix_psensor_STATIC_COMPONENTS = @MCA_pmix_psensor_STATIC_COMPONENTS@
+MCA_pmix_psensor_STATIC_LTLIBS = @MCA_pmix_psensor_STATIC_LTLIBS@
+MCA_pmix_psensor_STATIC_SUBDIRS = @MCA_pmix_psensor_STATIC_SUBDIRS@
+MCA_pmix_ptl_ALL_COMPONENTS = @MCA_pmix_ptl_ALL_COMPONENTS@
+MCA_pmix_ptl_ALL_SUBDIRS = @MCA_pmix_ptl_ALL_SUBDIRS@
+MCA_pmix_ptl_DSO_COMPONENTS = @MCA_pmix_ptl_DSO_COMPONENTS@
+MCA_pmix_ptl_DSO_SUBDIRS = @MCA_pmix_ptl_DSO_SUBDIRS@
+MCA_pmix_ptl_STATIC_COMPONENTS = @MCA_pmix_ptl_STATIC_COMPONENTS@
+MCA_pmix_ptl_STATIC_LTLIBS = @MCA_pmix_ptl_STATIC_LTLIBS@
+MCA_pmix_ptl_STATIC_SUBDIRS = @MCA_pmix_ptl_STATIC_SUBDIRS@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PMIX_ASM_GSYM = @PMIX_ASM_GSYM@
+PMIX_ASM_LSYM = @PMIX_ASM_LSYM@
+PMIX_ASM_SUPPORT_64BIT = @PMIX_ASM_SUPPORT_64BIT@
+PMIX_ASM_TEXT = @PMIX_ASM_TEXT@
+PMIX_ASM_TYPE = @PMIX_ASM_TYPE@
+PMIX_ASSEMBLY_ARCH = @PMIX_ASSEMBLY_ARCH@
+PMIX_ASSEMBLY_BUILTIN = @PMIX_ASSEMBLY_BUILTIN@
+PMIX_ASSEMBLY_FORMAT = @PMIX_ASSEMBLY_FORMAT@
+PMIX_AS_GLOBAL = @PMIX_AS_GLOBAL@
+PMIX_AS_LABEL_SUFFIX = @PMIX_AS_LABEL_SUFFIX@
+PMIX_CC_ABSOLUTE = @PMIX_CC_ABSOLUTE@
+PMIX_CONFIGURE_DATE = @PMIX_CONFIGURE_DATE@
+PMIX_CONFIGURE_HOST = @PMIX_CONFIGURE_HOST@
+PMIX_CONFIGURE_USER = @PMIX_CONFIGURE_USER@
+PMIX_EMBEDDED_CPPFLAGS = @PMIX_EMBEDDED_CPPFLAGS@
+PMIX_EMBEDDED_LDFLAGS = @PMIX_EMBEDDED_LDFLAGS@
+PMIX_EMBEDDED_LIBS = @PMIX_EMBEDDED_LIBS@
+PMIX_MAJOR_VERSION = @PMIX_MAJOR_VERSION@
+PMIX_MINOR_VERSION = @PMIX_MINOR_VERSION@
+PMIX_RELEASE_DATE = @PMIX_RELEASE_DATE@
+PMIX_RELEASE_VERSION = @PMIX_RELEASE_VERSION@
+PMIX_RENAME = @PMIX_RENAME@
+PMIX_VERSION = @PMIX_VERSION@
+PMIX_top_builddir = @PMIX_top_builddir@
+PMIX_top_srcdir = @PMIX_top_srcdir@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_prefix_program = @ac_prefix_program@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+libpmix_so_version = @libpmix_so_version@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pmix_have_pandoc = @pmix_have_pandoc@
+pmix_pdl_pdlopen_LIBS = @pmix_pdl_pdlopen_LIBS@
+pmix_pdl_plibltdl_CPPFLAGS = @pmix_pdl_plibltdl_CPPFLAGS@
+pmix_pdl_plibltdl_LDFLAGS = @pmix_pdl_plibltdl_LDFLAGS@
+pmix_pdl_plibltdl_LIBS = @pmix_pdl_plibltdl_LIBS@
+pmixdatadir = @pmixdatadir@
+pmixincludedir = @pmixincludedir@
+pmixlibdir = @pmixlibdir@
+pmixmajor = @pmixmajor@
+pmixminor = @pmixminor@
+pnet_opa_CFLAGS = @pnet_opa_CFLAGS@
+pnet_opa_CPPFLAGS = @pnet_opa_CPPFLAGS@
+pnet_opa_LDFLAGS = @pnet_opa_LDFLAGS@
+pnet_opa_LIBS = @pnet_opa_LIBS@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+psec_munge_CPPFLAGS = @psec_munge_CPPFLAGS@
+psec_munge_LDFLAGS = @psec_munge_LDFLAGS@
+psec_munge_LIBS = @psec_munge_LIBS@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+headers = psec_native.h
+sources = \
+        psec_native_component.c \
+        psec_native.c
+
+ at MCA_BUILD_pmix_psec_native_DSO_FALSE@lib = libmca_psec_native.la
+
+# Make the output library in this directory, and name it either
+# mca_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la
+# (for static builds).
+ at MCA_BUILD_pmix_psec_native_DSO_TRUE@lib = 
+ at MCA_BUILD_pmix_psec_native_DSO_FALSE@lib_sources = $(headers) $(sources)
+ at MCA_BUILD_pmix_psec_native_DSO_TRUE@lib_sources = 
+ at MCA_BUILD_pmix_psec_native_DSO_FALSE@component = 
+ at MCA_BUILD_pmix_psec_native_DSO_TRUE@component = mca_psec_native.la
+ at MCA_BUILD_pmix_psec_native_DSO_FALSE@component_sources = 
+ at MCA_BUILD_pmix_psec_native_DSO_TRUE@component_sources = $(headers) $(sources)
+mcacomponentdir = $(pmixlibdir)
+mcacomponent_LTLIBRARIES = $(component)
+mca_psec_native_la_SOURCES = $(component_sources)
+mca_psec_native_la_LDFLAGS = -module -avoid-version
+noinst_LTLIBRARIES = $(lib)
+libmca_psec_native_la_SOURCES = $(lib_sources)
+libmca_psec_native_la_LDFLAGS = -module -avoid-version
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/mca/psec/native/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/mca/psec/native/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+install-mcacomponentLTLIBRARIES: $(mcacomponent_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	@list='$(mcacomponent_LTLIBRARIES)'; test -n "$(mcacomponentdir)" || 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)$(mcacomponentdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(mcacomponentdir)" || exit 1; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(mcacomponentdir)'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(mcacomponentdir)"; \
+	}
+
+uninstall-mcacomponentLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(mcacomponent_LTLIBRARIES)'; test -n "$(mcacomponentdir)" || list=; \
+	for p in $$list; do \
+	  $(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(mcacomponentdir)/$$f'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(mcacomponentdir)/$$f"; \
+	done
+
+clean-mcacomponentLTLIBRARIES:
+	-test -z "$(mcacomponent_LTLIBRARIES)" || rm -f $(mcacomponent_LTLIBRARIES)
+	@list='$(mcacomponent_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}; \
+	}
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_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}; \
+	}
+
+libmca_psec_native.la: $(libmca_psec_native_la_OBJECTS) $(libmca_psec_native_la_DEPENDENCIES) $(EXTRA_libmca_psec_native_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(libmca_psec_native_la_LINK) $(am_libmca_psec_native_la_rpath) $(libmca_psec_native_la_OBJECTS) $(libmca_psec_native_la_LIBADD) $(LIBS)
+
+mca_psec_native.la: $(mca_psec_native_la_OBJECTS) $(mca_psec_native_la_DEPENDENCIES) $(EXTRA_mca_psec_native_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(mca_psec_native_la_LINK) $(am_mca_psec_native_la_rpath) $(mca_psec_native_la_OBJECTS) $(mca_psec_native_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/psec_native.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/psec_native_component.Plo at am__quote@
+
+.c.o:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+ at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+	for dir in "$(DESTDIR)$(mcacomponentdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-mcacomponentLTLIBRARIES \
+	clean-noinstLTLIBRARIES mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-mcacomponentLTLIBRARIES
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-mcacomponentLTLIBRARIES
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-mcacomponentLTLIBRARIES \
+	clean-noinstLTLIBRARIES 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-mcacomponentLTLIBRARIES install-pdf install-pdf-am \
+	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-mcacomponentLTLIBRARIES
+
+.PRECIOUS: Makefile
+
+
+# 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/mca/psec/native/psec_native.c b/src/mca/psec/native/psec_native.c
new file mode 100644
index 0000000..ebfcb63
--- /dev/null
+++ b/src/mca/psec/native/psec_native.c
@@ -0,0 +1,213 @@
+/*
+ * Copyright (c) 2015-2017 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2016      IBM Corporation.  All rights reserved.
+ *
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+
+#include <unistd.h>
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
+#include <pmix_common.h>
+
+#include "src/include/pmix_socket_errno.h"
+#include "src/include/pmix_globals.h"
+#include "src/util/argv.h"
+#include "src/util/error.h"
+#include "src/util/output.h"
+
+#include "src/mca/psec/psec.h"
+#include "psec_native.h"
+
+static pmix_status_t native_init(void);
+static void native_finalize(void);
+static pmix_status_t create_cred(pmix_listener_protocol_t protocol,
+                                 char **cred, size_t *len);
+static pmix_status_t validate_cred(pmix_peer_t *peer,
+                                   pmix_listener_protocol_t protocol,
+                                   char *cred, size_t len);
+
+pmix_psec_module_t pmix_native_module = {
+    .name = "native",
+    .init = native_init,
+    .finalize = native_finalize,
+    .create_cred = create_cred,
+    .validate_cred = validate_cred
+};
+
+static pmix_status_t native_init(void)
+{
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "psec: native init");
+    return PMIX_SUCCESS;
+}
+
+static void native_finalize(void)
+{
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "psec: native finalize");
+}
+
+static pmix_status_t create_cred(pmix_listener_protocol_t protocol,
+                                 char **cred, size_t *len)
+{
+    uid_t euid;
+    gid_t egid;
+    char *tmp, *ptr;
+
+    if (PMIX_PROTOCOL_V1 == protocol ||
+        PMIX_PROTOCOL_V3 == protocol) {
+        /* these are usock protocols - nothing to do */
+        *cred = NULL;
+        *len = 0;
+        return PMIX_SUCCESS;
+    }
+    if (PMIX_PROTOCOL_V2 == protocol) {
+        /* tcp protocol - need to provide our effective
+         * uid and gid for validation on remote end */
+        tmp = (char*)malloc(sizeof(uid_t) + sizeof(gid_t));
+        if (NULL == tmp) {
+            return PMIX_ERR_NOMEM;
+        }
+        euid = geteuid();
+        memcpy(tmp, &euid, sizeof(uid_t));
+        ptr = tmp + sizeof(uid_t);
+        egid = getegid();
+        memcpy(ptr, &egid, sizeof(gid_t));
+        *cred = tmp;
+        *len = sizeof(uid_t) + sizeof(gid_t);
+        return PMIX_SUCCESS;
+    }
+
+    /* unrecognized protocol */
+    return PMIX_ERR_NOT_SUPPORTED;
+}
+
+static pmix_status_t validate_cred(pmix_peer_t *peer,
+                                   pmix_listener_protocol_t protocol,
+                                   char *cred, size_t len)
+{
+#if defined(SO_PEERCRED)
+#ifdef HAVE_STRUCT_SOCKPEERCRED_UID
+#define HAVE_STRUCT_UCRED_UID
+    struct sockpeercred ucred;
+#else
+    struct ucred ucred;
+#endif
+    socklen_t crlen = sizeof (ucred);
+#endif
+    uid_t euid;
+    gid_t gid;
+    char *ptr;
+    size_t ln;
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "psec: native validate_cred %s", cred ? cred : "NULL");
+
+    if (PMIX_PROTOCOL_V1 == protocol ||
+        PMIX_PROTOCOL_V3 == protocol) {
+        /* these are usock protocols - get the remote side's uid/gid */
+#if defined(SO_PEERCRED) && (defined(HAVE_STRUCT_UCRED_UID) || defined(HAVE_STRUCT_UCRED_CR_UID))
+        /* Ignore received 'cred' and validate ucred for socket instead. */
+        pmix_output_verbose(2, pmix_globals.debug_output,
+                            "psec:native checking getsockopt on socket %d for peer credentials", peer->sd);
+        if (getsockopt (peer->sd, SOL_SOCKET, SO_PEERCRED, &ucred, &crlen) < 0) {
+            pmix_output_verbose(2, pmix_globals.debug_output,
+                                "psec: getsockopt SO_PEERCRED failed: %s",
+                                strerror (pmix_socket_errno));
+            return PMIX_ERR_INVALID_CRED;
+        }
+#if defined(HAVE_STRUCT_UCRED_UID)
+        euid = ucred.uid;
+        gid = ucred.gid;
+#else
+        euid = ucred.cr_uid;
+        gid = ucred.cr_gid;
+#endif
+
+#elif defined(HAVE_GETPEEREID)
+        pmix_output_verbose(2, pmix_globals.debug_output,
+                            "psec:native checking getpeereid on socket %d for peer credentials", peer->sd);
+        if (0 != getpeereid(peer->sd, &euid, &gid)) {
+            pmix_output_verbose(2, pmix_globals.debug_output,
+                                "psec: getsockopt getpeereid failed: %s",
+                                strerror (pmix_socket_errno));
+            return PMIX_ERR_INVALID_CRED;
+    }
+#else
+        return PMIX_ERR_NOT_SUPPORTED;
+#endif
+
+        /* check uid */
+        if (euid != peer->info->uid) {
+            pmix_output_verbose(2, pmix_globals.debug_output,
+                                "psec: socket cred contains invalid uid %u", euid);
+            return PMIX_ERR_INVALID_CRED;
+        }
+
+        /* check gid */
+        if (gid != peer->info->gid) {
+            pmix_output_verbose(2, pmix_globals.debug_output,
+                                "psec: socket cred contains invalid gid %u", gid);
+            return PMIX_ERR_INVALID_CRED;
+        }
+
+        pmix_output_verbose(2, pmix_globals.debug_output,
+                            "psec: native credential %u:%u valid",
+                            euid, gid);
+        return PMIX_SUCCESS;
+    }
+
+    if (PMIX_PROTOCOL_V2 == protocol) {
+        /* this is a tcp protocol, so the cred is actually the uid/gid
+         * passed upwards from the client */
+        if (NULL == cred) {
+            /* not allowed */
+            return PMIX_ERR_INVALID_CRED;
+        }
+        ln = len;
+        euid = 0;
+        gid = 0;
+        if (sizeof(uid_t) <= ln) {
+            memcpy(&euid, cred, sizeof(uid_t));
+            ln -= sizeof(uid_t);
+            ptr = cred + sizeof(uid_t);
+        } else {
+            return PMIX_ERR_INVALID_CRED;
+        }
+        if (sizeof(gid_t) <= ln) {
+            memcpy(&gid, ptr, sizeof(gid_t));
+        } else {
+            return PMIX_ERR_INVALID_CRED;
+        }
+        /* check uid */
+        if (euid != peer->info->uid) {
+            pmix_output_verbose(2, pmix_globals.debug_output,
+                                "psec: socket cred contains invalid uid %u", euid);
+            return PMIX_ERR_INVALID_CRED;
+        }
+
+        /* check gid */
+        if (gid != peer->info->gid) {
+            pmix_output_verbose(2, pmix_globals.debug_output,
+                                "psec: socket cred contains invalid gid %u", gid);
+            return PMIX_ERR_INVALID_CRED;
+        }
+
+        pmix_output_verbose(2, pmix_globals.debug_output,
+                            "psec: native credential %u:%u valid",
+                            euid, gid);
+        return PMIX_SUCCESS;
+    }
+
+    /* don't recognize the protocol */
+    return PMIX_ERR_NOT_SUPPORTED;
+}
diff --git a/src/mca/psec/native/psec_native.h b/src/mca/psec/native/psec_native.h
new file mode 100644
index 0000000..8adf0f8
--- /dev/null
+++ b/src/mca/psec/native/psec_native.h
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2015-2016 Intel, Inc.  All rights reserved.
+ *
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#ifndef PMIX_NATIVE_H
+#define PMIX_NATIVE_H
+
+#include <src/include/pmix_config.h>
+
+
+#include "src/mca/psec/psec.h"
+
+BEGIN_C_DECLS
+
+/* the component must be visible data for the linker to find it */
+PMIX_EXPORT extern pmix_psec_base_component_t mca_psec_native_component;
+extern pmix_psec_module_t pmix_native_module;
+
+END_C_DECLS
+
+#endif
diff --git a/src/mca/psec/native/psec_native_component.c b/src/mca/psec/native/psec_native_component.c
new file mode 100644
index 0000000..b392fe2
--- /dev/null
+++ b/src/mca/psec/native/psec_native_component.c
@@ -0,0 +1,91 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2005 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2015      Los Alamos National Security, LLC. All rights
+ *                         reserved.
+ * Copyright (c) 2016      Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ *
+ * These symbols are in a file by themselves to provide nice linker
+ * semantics.  Since linkers generally pull in symbols by object
+ * files, keeping these symbols as the only symbols in this file
+ * prevents utility programs such as "ompi_info" from having to import
+ * entire components just to query their version and parameters.
+ */
+
+#include <src/include/pmix_config.h>
+#include "pmix_common.h"
+
+
+#include "src/mca/psec/psec.h"
+#include "psec_native.h"
+
+static pmix_status_t component_open(void);
+static pmix_status_t component_close(void);
+static pmix_status_t component_query(pmix_mca_base_module_t **module, int *priority);
+static pmix_psec_module_t* assign_module(void);
+
+/*
+ * Instantiate the public struct with all of our public information
+ * and pointers to our public functions in it
+ */
+pmix_psec_base_component_t mca_psec_native_component = {
+    .base = {
+        PMIX_PSEC_BASE_VERSION_1_0_0,
+
+        /* Component name and version */
+        .pmix_mca_component_name = "native",
+        PMIX_MCA_BASE_MAKE_VERSION(component,
+                                   PMIX_MAJOR_VERSION,
+                                   PMIX_MINOR_VERSION,
+                                   PMIX_RELEASE_VERSION),
+
+        /* Component open and close functions */
+        .pmix_mca_open_component = component_open,
+        .pmix_mca_close_component = component_close,
+        .pmix_mca_query_component = component_query,
+    },
+    .data = {
+        /* The component is checkpoint ready */
+        PMIX_MCA_BASE_METADATA_PARAM_CHECKPOINT
+    },
+    .assign_module = assign_module
+};
+
+
+static int component_open(void)
+{
+    return PMIX_SUCCESS;
+}
+
+
+static int component_query(pmix_mca_base_module_t **module, int *priority)
+{
+    *priority = 10;
+    *module = (pmix_mca_base_module_t *)&pmix_native_module;
+    return PMIX_SUCCESS;
+}
+
+
+static int component_close(void)
+{
+    return PMIX_SUCCESS;
+}
+
+static pmix_psec_module_t* assign_module(void)
+{
+    return &pmix_native_module;
+}
diff --git a/src/mca/psec/none/Makefile.am b/src/mca/psec/none/Makefile.am
new file mode 100644
index 0000000..7423699
--- /dev/null
+++ b/src/mca/psec/none/Makefile.am
@@ -0,0 +1,50 @@
+# -*- makefile -*-
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2012      Los Alamos National Security, Inc.  All rights reserved.
+# Copyright (c) 2013-2016 Intel, Inc. All rights reserved
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+headers = psec_none.h
+sources = \
+        psec_none_component.c \
+        psec_none.c
+
+# Make the output library in this directory, and name it either
+# mca_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la
+# (for static builds).
+
+if MCA_BUILD_pmix_psec_none_DSO
+lib =
+lib_sources =
+component = mca_psec_none.la
+component_sources = $(headers) $(sources)
+else
+lib = libmca_psec_none.la
+lib_sources = $(headers) $(sources)
+component =
+component_sources =
+endif
+
+mcacomponentdir = $(pmixlibdir)
+mcacomponent_LTLIBRARIES = $(component)
+mca_psec_none_la_SOURCES = $(component_sources)
+mca_psec_none_la_LDFLAGS = -module -avoid-version
+
+noinst_LTLIBRARIES = $(lib)
+libmca_psec_none_la_SOURCES = $(lib_sources)
+libmca_psec_none_la_LDFLAGS = -module -avoid-version
diff --git a/src/mca/psec/none/Makefile.in b/src/mca/psec/none/Makefile.in
new file mode 100644
index 0000000..6ca5455
--- /dev/null
+++ b/src/mca/psec/none/Makefile.in
@@ -0,0 +1,891 @@
+# Makefile.in generated by automake 1.15 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+# -*- makefile -*-
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2012      Los Alamos National Security, Inc.  All rights reserved.
+# Copyright (c) 2013-2016 Intel, Inc. All rights reserved
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+subdir = src/mca/psec/none
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/config/c_get_alignment.m4 \
+	$(top_srcdir)/config/libtool.m4 \
+	$(top_srcdir)/config/ltoptions.m4 \
+	$(top_srcdir)/config/ltsugar.m4 \
+	$(top_srcdir)/config/ltversion.m4 \
+	$(top_srcdir)/config/lt~obsolete.m4 \
+	$(top_srcdir)/config/pmix.m4 \
+	$(top_srcdir)/config/pmix_check_attributes.m4 \
+	$(top_srcdir)/config/pmix_check_broken_qsort.m4 \
+	$(top_srcdir)/config/pmix_check_compiler_version.m4 \
+	$(top_srcdir)/config/pmix_check_icc.m4 \
+	$(top_srcdir)/config/pmix_check_ident.m4 \
+	$(top_srcdir)/config/pmix_check_lock.m4 \
+	$(top_srcdir)/config/pmix_check_os_flavors.m4 \
+	$(top_srcdir)/config/pmix_check_package.m4 \
+	$(top_srcdir)/config/pmix_check_psm2.m4 \
+	$(top_srcdir)/config/pmix_check_pthread_pids.m4 \
+	$(top_srcdir)/config/pmix_check_vendor.m4 \
+	$(top_srcdir)/config/pmix_check_visibility.m4 \
+	$(top_srcdir)/config/pmix_check_withdir.m4 \
+	$(top_srcdir)/config/pmix_config_asm.m4 \
+	$(top_srcdir)/config/pmix_config_pthreads.m4 \
+	$(top_srcdir)/config/pmix_config_subdir.m4 \
+	$(top_srcdir)/config/pmix_config_subdir_args.m4 \
+	$(top_srcdir)/config/pmix_config_threads.m4 \
+	$(top_srcdir)/config/pmix_ensure_contains_optflags.m4 \
+	$(top_srcdir)/config/pmix_functions.m4 \
+	$(top_srcdir)/config/pmix_load_platform.m4 \
+	$(top_srcdir)/config/pmix_mca.m4 \
+	$(top_srcdir)/config/pmix_search_libs.m4 \
+	$(top_srcdir)/config/pmix_setup_cc.m4 \
+	$(top_srcdir)/config/pmix_setup_libevent.m4 \
+	$(top_srcdir)/config/pmix_setup_zlib.m4 \
+	$(top_srcdir)/config/pmix_try_assemble.m4 \
+	$(top_srcdir)/config/autogen_found_items.m4 \
+	$(top_srcdir)/src/mca/pdl/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/configure.m4 \
+	$(top_srcdir)/src/mca/pdl/pdlopen/configure.m4 \
+	$(top_srcdir)/src/mca/pdl/plibltdl/configure.m4 \
+	$(top_srcdir)/src/mca/pif/bsdx_ipv4/configure.m4 \
+	$(top_srcdir)/src/mca/pif/bsdx_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pif/linux_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pif/posix_ipv4/configure.m4 \
+	$(top_srcdir)/src/mca/pif/solaris_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/config/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/env/configure.m4 \
+	$(top_srcdir)/src/mca/pnet/opa/configure.m4 \
+	$(top_srcdir)/src/mca/psec/munge/configure.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/src/include/pmix_config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(mcacomponentdir)"
+LTLIBRARIES = $(mcacomponent_LTLIBRARIES) $(noinst_LTLIBRARIES)
+libmca_psec_none_la_LIBADD =
+am__libmca_psec_none_la_SOURCES_DIST = psec_none.h \
+	psec_none_component.c psec_none.c
+am__objects_1 =
+am__objects_2 = psec_none_component.lo psec_none.lo
+ at MCA_BUILD_pmix_psec_none_DSO_FALSE@am__objects_3 = $(am__objects_1) \
+ at MCA_BUILD_pmix_psec_none_DSO_FALSE@	$(am__objects_2)
+am_libmca_psec_none_la_OBJECTS = $(am__objects_3)
+libmca_psec_none_la_OBJECTS = $(am_libmca_psec_none_la_OBJECTS)
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+libmca_psec_none_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(AM_CFLAGS) $(CFLAGS) $(libmca_psec_none_la_LDFLAGS) \
+	$(LDFLAGS) -o $@
+ at MCA_BUILD_pmix_psec_none_DSO_FALSE@am_libmca_psec_none_la_rpath =
+mca_psec_none_la_LIBADD =
+am__mca_psec_none_la_SOURCES_DIST = psec_none.h psec_none_component.c \
+	psec_none.c
+ at MCA_BUILD_pmix_psec_none_DSO_TRUE@am__objects_4 = $(am__objects_1) \
+ at MCA_BUILD_pmix_psec_none_DSO_TRUE@	$(am__objects_2)
+am_mca_psec_none_la_OBJECTS = $(am__objects_4)
+mca_psec_none_la_OBJECTS = $(am_mca_psec_none_la_OBJECTS)
+mca_psec_none_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(AM_CFLAGS) $(CFLAGS) $(mca_psec_none_la_LDFLAGS) $(LDFLAGS) \
+	-o $@
+ at MCA_BUILD_pmix_psec_none_DSO_TRUE@am_mca_psec_none_la_rpath = -rpath \
+ at MCA_BUILD_pmix_psec_none_DSO_TRUE@	$(mcacomponentdir)
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/src/include
+depcomp = $(SHELL) $(top_srcdir)/./config/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libmca_psec_none_la_SOURCES) $(mca_psec_none_la_SOURCES)
+DIST_SOURCES = $(am__libmca_psec_none_la_SOURCES_DIST) \
+	$(am__mca_psec_none_la_SOURCES_DIST)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/./config/depcomp
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CFLAGS = @CFLAGS@
+CLEANFILES = @CLEANFILES@
+CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MCA_PROJECT_SUBDIRS = @MCA_PROJECT_SUBDIRS@
+MCA_pmix_FRAMEWORKS = @MCA_pmix_FRAMEWORKS@
+MCA_pmix_FRAMEWORKS_SUBDIRS = @MCA_pmix_FRAMEWORKS_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS@
+MCA_pmix_FRAMEWORK_LIBS = @MCA_pmix_FRAMEWORK_LIBS@
+MCA_pmix_pdl_ALL_COMPONENTS = @MCA_pmix_pdl_ALL_COMPONENTS@
+MCA_pmix_pdl_ALL_SUBDIRS = @MCA_pmix_pdl_ALL_SUBDIRS@
+MCA_pmix_pdl_DSO_COMPONENTS = @MCA_pmix_pdl_DSO_COMPONENTS@
+MCA_pmix_pdl_DSO_SUBDIRS = @MCA_pmix_pdl_DSO_SUBDIRS@
+MCA_pmix_pdl_STATIC_COMPONENTS = @MCA_pmix_pdl_STATIC_COMPONENTS@
+MCA_pmix_pdl_STATIC_LTLIBS = @MCA_pmix_pdl_STATIC_LTLIBS@
+MCA_pmix_pdl_STATIC_SUBDIRS = @MCA_pmix_pdl_STATIC_SUBDIRS@
+MCA_pmix_pif_ALL_COMPONENTS = @MCA_pmix_pif_ALL_COMPONENTS@
+MCA_pmix_pif_ALL_SUBDIRS = @MCA_pmix_pif_ALL_SUBDIRS@
+MCA_pmix_pif_DSO_COMPONENTS = @MCA_pmix_pif_DSO_COMPONENTS@
+MCA_pmix_pif_DSO_SUBDIRS = @MCA_pmix_pif_DSO_SUBDIRS@
+MCA_pmix_pif_STATIC_COMPONENTS = @MCA_pmix_pif_STATIC_COMPONENTS@
+MCA_pmix_pif_STATIC_LTLIBS = @MCA_pmix_pif_STATIC_LTLIBS@
+MCA_pmix_pif_STATIC_SUBDIRS = @MCA_pmix_pif_STATIC_SUBDIRS@
+MCA_pmix_pinstalldirs_ALL_COMPONENTS = @MCA_pmix_pinstalldirs_ALL_COMPONENTS@
+MCA_pmix_pinstalldirs_ALL_SUBDIRS = @MCA_pmix_pinstalldirs_ALL_SUBDIRS@
+MCA_pmix_pinstalldirs_DSO_COMPONENTS = @MCA_pmix_pinstalldirs_DSO_COMPONENTS@
+MCA_pmix_pinstalldirs_DSO_SUBDIRS = @MCA_pmix_pinstalldirs_DSO_SUBDIRS@
+MCA_pmix_pinstalldirs_STATIC_COMPONENTS = @MCA_pmix_pinstalldirs_STATIC_COMPONENTS@
+MCA_pmix_pinstalldirs_STATIC_LTLIBS = @MCA_pmix_pinstalldirs_STATIC_LTLIBS@
+MCA_pmix_pinstalldirs_STATIC_SUBDIRS = @MCA_pmix_pinstalldirs_STATIC_SUBDIRS@
+MCA_pmix_pnet_ALL_COMPONENTS = @MCA_pmix_pnet_ALL_COMPONENTS@
+MCA_pmix_pnet_ALL_SUBDIRS = @MCA_pmix_pnet_ALL_SUBDIRS@
+MCA_pmix_pnet_DSO_COMPONENTS = @MCA_pmix_pnet_DSO_COMPONENTS@
+MCA_pmix_pnet_DSO_SUBDIRS = @MCA_pmix_pnet_DSO_SUBDIRS@
+MCA_pmix_pnet_STATIC_COMPONENTS = @MCA_pmix_pnet_STATIC_COMPONENTS@
+MCA_pmix_pnet_STATIC_LTLIBS = @MCA_pmix_pnet_STATIC_LTLIBS@
+MCA_pmix_pnet_STATIC_SUBDIRS = @MCA_pmix_pnet_STATIC_SUBDIRS@
+MCA_pmix_psec_ALL_COMPONENTS = @MCA_pmix_psec_ALL_COMPONENTS@
+MCA_pmix_psec_ALL_SUBDIRS = @MCA_pmix_psec_ALL_SUBDIRS@
+MCA_pmix_psec_DSO_COMPONENTS = @MCA_pmix_psec_DSO_COMPONENTS@
+MCA_pmix_psec_DSO_SUBDIRS = @MCA_pmix_psec_DSO_SUBDIRS@
+MCA_pmix_psec_STATIC_COMPONENTS = @MCA_pmix_psec_STATIC_COMPONENTS@
+MCA_pmix_psec_STATIC_LTLIBS = @MCA_pmix_psec_STATIC_LTLIBS@
+MCA_pmix_psec_STATIC_SUBDIRS = @MCA_pmix_psec_STATIC_SUBDIRS@
+MCA_pmix_psensor_ALL_COMPONENTS = @MCA_pmix_psensor_ALL_COMPONENTS@
+MCA_pmix_psensor_ALL_SUBDIRS = @MCA_pmix_psensor_ALL_SUBDIRS@
+MCA_pmix_psensor_DSO_COMPONENTS = @MCA_pmix_psensor_DSO_COMPONENTS@
+MCA_pmix_psensor_DSO_SUBDIRS = @MCA_pmix_psensor_DSO_SUBDIRS@
+MCA_pmix_psensor_STATIC_COMPONENTS = @MCA_pmix_psensor_STATIC_COMPONENTS@
+MCA_pmix_psensor_STATIC_LTLIBS = @MCA_pmix_psensor_STATIC_LTLIBS@
+MCA_pmix_psensor_STATIC_SUBDIRS = @MCA_pmix_psensor_STATIC_SUBDIRS@
+MCA_pmix_ptl_ALL_COMPONENTS = @MCA_pmix_ptl_ALL_COMPONENTS@
+MCA_pmix_ptl_ALL_SUBDIRS = @MCA_pmix_ptl_ALL_SUBDIRS@
+MCA_pmix_ptl_DSO_COMPONENTS = @MCA_pmix_ptl_DSO_COMPONENTS@
+MCA_pmix_ptl_DSO_SUBDIRS = @MCA_pmix_ptl_DSO_SUBDIRS@
+MCA_pmix_ptl_STATIC_COMPONENTS = @MCA_pmix_ptl_STATIC_COMPONENTS@
+MCA_pmix_ptl_STATIC_LTLIBS = @MCA_pmix_ptl_STATIC_LTLIBS@
+MCA_pmix_ptl_STATIC_SUBDIRS = @MCA_pmix_ptl_STATIC_SUBDIRS@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PMIX_ASM_GSYM = @PMIX_ASM_GSYM@
+PMIX_ASM_LSYM = @PMIX_ASM_LSYM@
+PMIX_ASM_SUPPORT_64BIT = @PMIX_ASM_SUPPORT_64BIT@
+PMIX_ASM_TEXT = @PMIX_ASM_TEXT@
+PMIX_ASM_TYPE = @PMIX_ASM_TYPE@
+PMIX_ASSEMBLY_ARCH = @PMIX_ASSEMBLY_ARCH@
+PMIX_ASSEMBLY_BUILTIN = @PMIX_ASSEMBLY_BUILTIN@
+PMIX_ASSEMBLY_FORMAT = @PMIX_ASSEMBLY_FORMAT@
+PMIX_AS_GLOBAL = @PMIX_AS_GLOBAL@
+PMIX_AS_LABEL_SUFFIX = @PMIX_AS_LABEL_SUFFIX@
+PMIX_CC_ABSOLUTE = @PMIX_CC_ABSOLUTE@
+PMIX_CONFIGURE_DATE = @PMIX_CONFIGURE_DATE@
+PMIX_CONFIGURE_HOST = @PMIX_CONFIGURE_HOST@
+PMIX_CONFIGURE_USER = @PMIX_CONFIGURE_USER@
+PMIX_EMBEDDED_CPPFLAGS = @PMIX_EMBEDDED_CPPFLAGS@
+PMIX_EMBEDDED_LDFLAGS = @PMIX_EMBEDDED_LDFLAGS@
+PMIX_EMBEDDED_LIBS = @PMIX_EMBEDDED_LIBS@
+PMIX_MAJOR_VERSION = @PMIX_MAJOR_VERSION@
+PMIX_MINOR_VERSION = @PMIX_MINOR_VERSION@
+PMIX_RELEASE_DATE = @PMIX_RELEASE_DATE@
+PMIX_RELEASE_VERSION = @PMIX_RELEASE_VERSION@
+PMIX_RENAME = @PMIX_RENAME@
+PMIX_VERSION = @PMIX_VERSION@
+PMIX_top_builddir = @PMIX_top_builddir@
+PMIX_top_srcdir = @PMIX_top_srcdir@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_prefix_program = @ac_prefix_program@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+libpmix_so_version = @libpmix_so_version@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pmix_have_pandoc = @pmix_have_pandoc@
+pmix_pdl_pdlopen_LIBS = @pmix_pdl_pdlopen_LIBS@
+pmix_pdl_plibltdl_CPPFLAGS = @pmix_pdl_plibltdl_CPPFLAGS@
+pmix_pdl_plibltdl_LDFLAGS = @pmix_pdl_plibltdl_LDFLAGS@
+pmix_pdl_plibltdl_LIBS = @pmix_pdl_plibltdl_LIBS@
+pmixdatadir = @pmixdatadir@
+pmixincludedir = @pmixincludedir@
+pmixlibdir = @pmixlibdir@
+pmixmajor = @pmixmajor@
+pmixminor = @pmixminor@
+pnet_opa_CFLAGS = @pnet_opa_CFLAGS@
+pnet_opa_CPPFLAGS = @pnet_opa_CPPFLAGS@
+pnet_opa_LDFLAGS = @pnet_opa_LDFLAGS@
+pnet_opa_LIBS = @pnet_opa_LIBS@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+psec_munge_CPPFLAGS = @psec_munge_CPPFLAGS@
+psec_munge_LDFLAGS = @psec_munge_LDFLAGS@
+psec_munge_LIBS = @psec_munge_LIBS@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+headers = psec_none.h
+sources = \
+        psec_none_component.c \
+        psec_none.c
+
+ at MCA_BUILD_pmix_psec_none_DSO_FALSE@lib = libmca_psec_none.la
+
+# Make the output library in this directory, and name it either
+# mca_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la
+# (for static builds).
+ at MCA_BUILD_pmix_psec_none_DSO_TRUE@lib = 
+ at MCA_BUILD_pmix_psec_none_DSO_FALSE@lib_sources = $(headers) $(sources)
+ at MCA_BUILD_pmix_psec_none_DSO_TRUE@lib_sources = 
+ at MCA_BUILD_pmix_psec_none_DSO_FALSE@component = 
+ at MCA_BUILD_pmix_psec_none_DSO_TRUE@component = mca_psec_none.la
+ at MCA_BUILD_pmix_psec_none_DSO_FALSE@component_sources = 
+ at MCA_BUILD_pmix_psec_none_DSO_TRUE@component_sources = $(headers) $(sources)
+mcacomponentdir = $(pmixlibdir)
+mcacomponent_LTLIBRARIES = $(component)
+mca_psec_none_la_SOURCES = $(component_sources)
+mca_psec_none_la_LDFLAGS = -module -avoid-version
+noinst_LTLIBRARIES = $(lib)
+libmca_psec_none_la_SOURCES = $(lib_sources)
+libmca_psec_none_la_LDFLAGS = -module -avoid-version
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/mca/psec/none/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/mca/psec/none/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+install-mcacomponentLTLIBRARIES: $(mcacomponent_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	@list='$(mcacomponent_LTLIBRARIES)'; test -n "$(mcacomponentdir)" || 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)$(mcacomponentdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(mcacomponentdir)" || exit 1; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(mcacomponentdir)'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(mcacomponentdir)"; \
+	}
+
+uninstall-mcacomponentLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(mcacomponent_LTLIBRARIES)'; test -n "$(mcacomponentdir)" || list=; \
+	for p in $$list; do \
+	  $(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(mcacomponentdir)/$$f'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(mcacomponentdir)/$$f"; \
+	done
+
+clean-mcacomponentLTLIBRARIES:
+	-test -z "$(mcacomponent_LTLIBRARIES)" || rm -f $(mcacomponent_LTLIBRARIES)
+	@list='$(mcacomponent_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}; \
+	}
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_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}; \
+	}
+
+libmca_psec_none.la: $(libmca_psec_none_la_OBJECTS) $(libmca_psec_none_la_DEPENDENCIES) $(EXTRA_libmca_psec_none_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(libmca_psec_none_la_LINK) $(am_libmca_psec_none_la_rpath) $(libmca_psec_none_la_OBJECTS) $(libmca_psec_none_la_LIBADD) $(LIBS)
+
+mca_psec_none.la: $(mca_psec_none_la_OBJECTS) $(mca_psec_none_la_DEPENDENCIES) $(EXTRA_mca_psec_none_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(mca_psec_none_la_LINK) $(am_mca_psec_none_la_rpath) $(mca_psec_none_la_OBJECTS) $(mca_psec_none_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/psec_none.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/psec_none_component.Plo at am__quote@
+
+.c.o:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+ at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+	for dir in "$(DESTDIR)$(mcacomponentdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-mcacomponentLTLIBRARIES \
+	clean-noinstLTLIBRARIES mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-mcacomponentLTLIBRARIES
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-mcacomponentLTLIBRARIES
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-mcacomponentLTLIBRARIES \
+	clean-noinstLTLIBRARIES 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-mcacomponentLTLIBRARIES install-pdf install-pdf-am \
+	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-mcacomponentLTLIBRARIES
+
+.PRECIOUS: Makefile
+
+
+# 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/mca/psec/none/psec_none.c b/src/mca/psec/none/psec_none.c
new file mode 100644
index 0000000..5fc22ce
--- /dev/null
+++ b/src/mca/psec/none/psec_none.c
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2015-2016 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2016      IBM Corporation.  All rights reserved.
+ *
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+
+#include <pmix_common.h>
+
+#include "src/include/pmix_socket_errno.h"
+#include "src/include/pmix_globals.h"
+#include "src/util/argv.h"
+#include "src/util/error.h"
+#include "src/util/output.h"
+
+#include <unistd.h>
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
+#include "src/mca/psec/psec.h"
+#include "psec_none.h"
+
+static pmix_status_t none_init(void);
+static void none_finalize(void);
+static pmix_status_t validate_cred(pmix_peer_t *peer,
+                                   pmix_listener_protocol_t protocol,
+                                   char *cred, size_t len);
+
+pmix_psec_module_t pmix_none_module = {
+    .name = "none",
+    .init = none_init,
+    .finalize = none_finalize,
+    .validate_cred = validate_cred
+};
+
+static pmix_status_t none_init(void)
+{
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "psec: none init");
+    return PMIX_SUCCESS;
+}
+
+static void none_finalize(void)
+{
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "psec: none finalize");
+}
+
+static pmix_status_t validate_cred(pmix_peer_t *peer,
+                                   pmix_listener_protocol_t protocol,
+                                   char *cred, size_t len)
+{
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "psec: none always reports valid");
+    return PMIX_SUCCESS;
+}
diff --git a/src/mca/psec/none/psec_none.h b/src/mca/psec/none/psec_none.h
new file mode 100644
index 0000000..d443c97
--- /dev/null
+++ b/src/mca/psec/none/psec_none.h
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2015-2016 Intel, Inc.  All rights reserved.
+ *
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#ifndef PMIX_NATIVE_H
+#define PMIX_NATIVE_H
+
+#include <src/include/pmix_config.h>
+
+
+#include "src/mca/psec/psec.h"
+
+BEGIN_C_DECLS
+
+/* the component must be visible data for the linker to find it */
+PMIX_EXPORT extern pmix_psec_base_component_t mca_psec_none_component;
+extern pmix_psec_module_t pmix_none_module;
+
+END_C_DECLS
+
+#endif
diff --git a/src/mca/psec/none/psec_none_component.c b/src/mca/psec/none/psec_none_component.c
new file mode 100644
index 0000000..17e9035
--- /dev/null
+++ b/src/mca/psec/none/psec_none_component.c
@@ -0,0 +1,91 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2005 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2015      Los Alamos National Security, LLC. All rights
+ *                         reserved.
+ * Copyright (c) 2016      Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ *
+ * These symbols are in a file by themselves to provide nice linker
+ * semantics.  Since linkers generally pull in symbols by object
+ * files, keeping these symbols as the only symbols in this file
+ * prevents utility programs such as "ompi_info" from having to import
+ * entire components just to query their version and parameters.
+ */
+
+#include <src/include/pmix_config.h>
+#include "pmix_common.h"
+
+
+#include "src/mca/psec/psec.h"
+#include "psec_none.h"
+
+static pmix_status_t component_open(void);
+static pmix_status_t component_close(void);
+static pmix_status_t component_query(pmix_mca_base_module_t **module, int *priority);
+static pmix_psec_module_t* assign_module(void);
+
+/*
+ * Instantiate the public struct with all of our public information
+ * and pointers to our public functions in it
+ */
+pmix_psec_base_component_t mca_psec_none_component = {
+    .base = {
+        PMIX_PSEC_BASE_VERSION_1_0_0,
+
+        /* Component name and version */
+        .pmix_mca_component_name = "none",
+        PMIX_MCA_BASE_MAKE_VERSION(component,
+                                   PMIX_MAJOR_VERSION,
+                                   PMIX_MINOR_VERSION,
+                                   PMIX_RELEASE_VERSION),
+
+        /* Component open and close functions */
+        .pmix_mca_open_component = component_open,
+        .pmix_mca_close_component = component_close,
+        .pmix_mca_query_component = component_query,
+    },
+    .data = {
+        /* The component is checkpoint ready */
+        PMIX_MCA_BASE_METADATA_PARAM_CHECKPOINT
+    },
+    .assign_module = assign_module
+};
+
+
+static int component_open(void)
+{
+    return PMIX_SUCCESS;
+}
+
+
+static int component_query(pmix_mca_base_module_t **module, int *priority)
+{
+    *priority = 0;
+    *module = (pmix_mca_base_module_t *)&pmix_none_module;
+    return PMIX_SUCCESS;
+}
+
+
+static int component_close(void)
+{
+    return PMIX_SUCCESS;
+}
+
+static pmix_psec_module_t* assign_module(void)
+{
+    return &pmix_none_module;
+}
diff --git a/src/mca/psec/psec.h b/src/mca/psec/psec.h
new file mode 100644
index 0000000..c0cff0b
--- /dev/null
+++ b/src/mca/psec/psec.h
@@ -0,0 +1,183 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2007-2008 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2015-2016 Intel, Inc.  All rights reserved.
+ *
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+/**
+ * @file
+ *
+ * This interface is for psecurity support. PMIx doesn't need much in
+ * this regard, but we do need a mechanism for authenticating connections.
+ *
+ * Only *one* plugin will be active in a client, but multiple plugins may
+ * be active in a server. Thus, this is a multi-select framework.
+ *
+ * Available plugins may be defined at runtime via the typical MCA parameter
+ * syntax.
+ */
+
+#ifndef PMIX_PSEC_H
+#define PMIX_PSEC_H
+
+#include <src/include/pmix_config.h>
+
+#include "src/mca/mca.h"
+#include "src/mca/base/pmix_mca_base_var.h"
+#include "src/mca/base/pmix_mca_base_framework.h"
+#include "src/mca/ptl/ptl_types.h"
+
+BEGIN_C_DECLS
+
+/*** forward declaration ***/
+struct pmix_peer_t;
+
+/******    MODULE DEFINITION    ******/
+
+/**
+ * Initialize the module. Returns an error if the module cannot
+ * run, success if it can and wants to be used.
+ */
+typedef pmix_status_t (*pmix_psec_base_module_init_fn_t)(void);
+
+/**
+ * Finalize the module. Tear down any allocated storage, disconnect
+ * from any system support (e.g., LDAP server)
+ */
+typedef void (*pmix_psec_base_module_fini_fn_t)(void);
+
+/****    CLIENT-SIDE FUNCTIONS    ****/
+/**
+ * Create and return a credential for this client - this
+ * could be a string or a byte array, which is why we must
+ * also return the length
+ */
+typedef pmix_status_t (*pmix_psec_base_module_create_cred_fn_t)(pmix_listener_protocol_t protocol,
+                                                                char **cred, size_t *len);
+
+/**
+ * Perform the client-side handshake. Note that it is not required
+ * (and indeed, would be rare) for a protocol to use both the
+ * credential and handshake interfaces. It is acceptable, therefore,
+ * for one of them to be NULL */
+typedef pmix_status_t (*pmix_psec_base_module_client_hndshk_fn_t)(int sd);
+
+
+/****    SERVER-SIDE FUNCTIONS    ****/
+/**
+ * Validate a client's credential - the credential could be a string
+ * or an array of bytes, which is why we include the length
+ */
+typedef pmix_status_t (*pmix_psec_base_module_validate_cred_fn_t)(struct pmix_peer_t *peer,
+                                                                  pmix_listener_protocol_t protocol,
+                                                                  char *cred, size_t len);
+
+/**
+ * Perform the server-side handshake. Note that it is not required
+ * (and indeed, would be rare) for a protocol to use both the
+ * credential and handshake interfaces. It is acceptable, therefore,
+ * for one of them to be NULL */
+typedef pmix_status_t (*pmix_psec_base_module_server_hndshk_fn_t)(struct pmix_peer_t *peer);
+
+/**
+ * Base structure for a PSEC module
+ */
+typedef struct {
+    char *name;
+    /* init/finalize */
+    pmix_psec_base_module_init_fn_t           init;
+    pmix_psec_base_module_fini_fn_t           finalize;
+    /** Client-side */
+    pmix_psec_base_module_create_cred_fn_t    create_cred;
+    pmix_psec_base_module_client_hndshk_fn_t  client_handshake;
+    /** Server-side */
+    pmix_psec_base_module_validate_cred_fn_t  validate_cred;
+    pmix_psec_base_module_server_hndshk_fn_t  server_handshake;
+} pmix_psec_module_t;
+
+
+/* define an API module */
+
+/* get a list of available options - caller must free results
+ * when done */
+typedef char* (*pmix_psec_API_get_available_modules_fn_t)(void);
+
+/* Select a psec module for a given peer */
+typedef pmix_status_t (*pmix_psec_API_assign_module_fn_t)(struct pmix_peer_t *peer,
+                                                          const char *options);
+
+/**
+ * Create and return a string representation of a credential for this
+ * client
+ */
+typedef pmix_status_t (*pmix_psec_API_create_cred_fn_t)(struct pmix_peer_t *peer,
+                                                        pmix_listener_protocol_t protocol,
+                                                        char **cred, size_t *len);
+
+/**
+ * Perform the client-side handshake. Note that it is not required
+ * (and indeed, would be rare) for a protocol to use both the
+ * credential and handshake interfaces. It is acceptable, therefore,
+ * for one of them to be NULL */
+typedef pmix_status_t (*pmix_psec_API_client_hndshk_fn_t)(struct pmix_peer_t *peer, int sd);
+
+
+/****    SERVER-SIDE FUNCTIONS    ****/
+/**
+ * Validate a client's connection request
+ */
+typedef pmix_status_t (*pmix_psec_API_validate_connection_fn_t)(struct pmix_peer_t *peer,
+                                                                pmix_listener_protocol_t protocol,
+                                                                char *cred, size_t len);
+
+typedef struct {
+    pmix_psec_API_get_available_modules_fn_t    get_available_modules;
+    pmix_psec_API_assign_module_fn_t            assign_module;
+    pmix_psec_API_create_cred_fn_t              create_cred;
+    pmix_psec_API_client_hndshk_fn_t            client_handshake;
+    pmix_psec_API_validate_connection_fn_t      validate_connection;
+} pmix_psec_API_t;
+
+PMIX_EXPORT extern pmix_psec_API_t pmix_psec;
+
+/****    COMPONENT STRUCTURE DEFINITION    ****/
+
+/* define a component-level API for initializing the component */
+typedef pmix_status_t (*pmix_psec_base_component_init_fn_t)(void);
+
+/* define a component-level API for finalizing the component */
+typedef void (*pmix_psec_base_component_finalize_fn_t)(void);
+
+/* define a component-level API for getting a module */
+typedef pmix_psec_module_t* (*pmix_psec_base_component_assign_module_fn_t)(void);
+
+/*
+ * the standard component data structure
+ */
+struct pmix_psec_base_component_t {
+    pmix_mca_base_component_t                        base;
+    pmix_mca_base_component_data_t                   data;
+    int                                              priority;
+    pmix_psec_base_component_init_fn_t               init;
+    pmix_psec_base_component_finalize_fn_t           finalize;
+    pmix_psec_base_component_assign_module_fn_t      assign_module;
+};
+typedef struct pmix_psec_base_component_t pmix_psec_base_component_t;
+
+/*
+ * Macro for use in components that are of type psec
+ */
+#define PMIX_PSEC_BASE_VERSION_1_0_0 \
+    PMIX_MCA_BASE_VERSION_1_0_0("psec", 1, 0, 0)
+
+END_C_DECLS
+
+#endif
diff --git a/src/mca/psensor/Makefile.am b/src/mca/psensor/Makefile.am
new file mode 100644
index 0000000..8107242
--- /dev/null
+++ b/src/mca/psensor/Makefile.am
@@ -0,0 +1,32 @@
+#
+# Copyright (c) 2009-2010 Cisco Systems, Inc.  All rights reserved.
+#
+# Copyright (c) 2017      Intel, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+AM_CPPFLAGS = $(LTDLINCL)
+
+# main library setup
+noinst_LTLIBRARIES = libmca_psensor.la
+libmca_psensor_la_SOURCES =
+
+# local files
+headers = psensor.h
+
+libmca_psensor_la_SOURCES += $(headers)
+
+# Conditionally install the header files
+if WANT_INSTALL_HEADERS
+pmixdir = $(pmixincludedir)/$(subdir)
+nobase_pmix_HEADERS = $(headers)
+endif
+
+include base/Makefile.am
+
+distclean-local:
+	rm -f base/static-components.h
diff --git a/src/mca/psensor/Makefile.in b/src/mca/psensor/Makefile.in
new file mode 100644
index 0000000..9be34b3
--- /dev/null
+++ b/src/mca/psensor/Makefile.in
@@ -0,0 +1,874 @@
+# Makefile.in generated by automake 1.15 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+#
+# Copyright (c) 2009-2010 Cisco Systems, Inc.  All rights reserved.
+#
+# Copyright (c) 2017      Intel, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+#
+# Copyright (c) 2010      Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2012-2013 Los Alamos National Security, Inc. All rights reserved.
+#
+# Copyright (c) 2017      Intel, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+subdir = src/mca/psensor
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/config/c_get_alignment.m4 \
+	$(top_srcdir)/config/libtool.m4 \
+	$(top_srcdir)/config/ltoptions.m4 \
+	$(top_srcdir)/config/ltsugar.m4 \
+	$(top_srcdir)/config/ltversion.m4 \
+	$(top_srcdir)/config/lt~obsolete.m4 \
+	$(top_srcdir)/config/pmix.m4 \
+	$(top_srcdir)/config/pmix_check_attributes.m4 \
+	$(top_srcdir)/config/pmix_check_broken_qsort.m4 \
+	$(top_srcdir)/config/pmix_check_compiler_version.m4 \
+	$(top_srcdir)/config/pmix_check_icc.m4 \
+	$(top_srcdir)/config/pmix_check_ident.m4 \
+	$(top_srcdir)/config/pmix_check_lock.m4 \
+	$(top_srcdir)/config/pmix_check_os_flavors.m4 \
+	$(top_srcdir)/config/pmix_check_package.m4 \
+	$(top_srcdir)/config/pmix_check_psm2.m4 \
+	$(top_srcdir)/config/pmix_check_pthread_pids.m4 \
+	$(top_srcdir)/config/pmix_check_vendor.m4 \
+	$(top_srcdir)/config/pmix_check_visibility.m4 \
+	$(top_srcdir)/config/pmix_check_withdir.m4 \
+	$(top_srcdir)/config/pmix_config_asm.m4 \
+	$(top_srcdir)/config/pmix_config_pthreads.m4 \
+	$(top_srcdir)/config/pmix_config_subdir.m4 \
+	$(top_srcdir)/config/pmix_config_subdir_args.m4 \
+	$(top_srcdir)/config/pmix_config_threads.m4 \
+	$(top_srcdir)/config/pmix_ensure_contains_optflags.m4 \
+	$(top_srcdir)/config/pmix_functions.m4 \
+	$(top_srcdir)/config/pmix_load_platform.m4 \
+	$(top_srcdir)/config/pmix_mca.m4 \
+	$(top_srcdir)/config/pmix_search_libs.m4 \
+	$(top_srcdir)/config/pmix_setup_cc.m4 \
+	$(top_srcdir)/config/pmix_setup_libevent.m4 \
+	$(top_srcdir)/config/pmix_setup_zlib.m4 \
+	$(top_srcdir)/config/pmix_try_assemble.m4 \
+	$(top_srcdir)/config/autogen_found_items.m4 \
+	$(top_srcdir)/src/mca/pdl/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/configure.m4 \
+	$(top_srcdir)/src/mca/pdl/pdlopen/configure.m4 \
+	$(top_srcdir)/src/mca/pdl/plibltdl/configure.m4 \
+	$(top_srcdir)/src/mca/pif/bsdx_ipv4/configure.m4 \
+	$(top_srcdir)/src/mca/pif/bsdx_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pif/linux_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pif/posix_ipv4/configure.m4 \
+	$(top_srcdir)/src/mca/pif/solaris_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/config/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/env/configure.m4 \
+	$(top_srcdir)/src/mca/pnet/opa/configure.m4 \
+	$(top_srcdir)/src/mca/psec/munge/configure.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__nobase_pmix_HEADERS_DIST) \
+	$(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/src/include/pmix_config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+libmca_psensor_la_LIBADD =
+am__objects_1 =
+am__dirstamp = $(am__leading_dot)dirstamp
+am_libmca_psensor_la_OBJECTS = $(am__objects_1) \
+	base/psensor_base_frame.lo base/psensor_base_select.lo \
+	base/psensor_base_stubs.lo
+libmca_psensor_la_OBJECTS = $(am_libmca_psensor_la_OBJECTS)
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/src/include
+depcomp = $(SHELL) $(top_srcdir)/./config/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libmca_psensor_la_SOURCES)
+DIST_SOURCES = $(libmca_psensor_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__nobase_pmix_HEADERS_DIST = psensor.h base/base.h
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(pmixdir)"
+HEADERS = $(nobase_pmix_HEADERS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/base/Makefile.am \
+	$(top_srcdir)/./config/depcomp
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CFLAGS = @CFLAGS@
+CLEANFILES = @CLEANFILES@
+CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MCA_PROJECT_SUBDIRS = @MCA_PROJECT_SUBDIRS@
+MCA_pmix_FRAMEWORKS = @MCA_pmix_FRAMEWORKS@
+MCA_pmix_FRAMEWORKS_SUBDIRS = @MCA_pmix_FRAMEWORKS_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS@
+MCA_pmix_FRAMEWORK_LIBS = @MCA_pmix_FRAMEWORK_LIBS@
+MCA_pmix_pdl_ALL_COMPONENTS = @MCA_pmix_pdl_ALL_COMPONENTS@
+MCA_pmix_pdl_ALL_SUBDIRS = @MCA_pmix_pdl_ALL_SUBDIRS@
+MCA_pmix_pdl_DSO_COMPONENTS = @MCA_pmix_pdl_DSO_COMPONENTS@
+MCA_pmix_pdl_DSO_SUBDIRS = @MCA_pmix_pdl_DSO_SUBDIRS@
+MCA_pmix_pdl_STATIC_COMPONENTS = @MCA_pmix_pdl_STATIC_COMPONENTS@
+MCA_pmix_pdl_STATIC_LTLIBS = @MCA_pmix_pdl_STATIC_LTLIBS@
+MCA_pmix_pdl_STATIC_SUBDIRS = @MCA_pmix_pdl_STATIC_SUBDIRS@
+MCA_pmix_pif_ALL_COMPONENTS = @MCA_pmix_pif_ALL_COMPONENTS@
+MCA_pmix_pif_ALL_SUBDIRS = @MCA_pmix_pif_ALL_SUBDIRS@
+MCA_pmix_pif_DSO_COMPONENTS = @MCA_pmix_pif_DSO_COMPONENTS@
+MCA_pmix_pif_DSO_SUBDIRS = @MCA_pmix_pif_DSO_SUBDIRS@
+MCA_pmix_pif_STATIC_COMPONENTS = @MCA_pmix_pif_STATIC_COMPONENTS@
+MCA_pmix_pif_STATIC_LTLIBS = @MCA_pmix_pif_STATIC_LTLIBS@
+MCA_pmix_pif_STATIC_SUBDIRS = @MCA_pmix_pif_STATIC_SUBDIRS@
+MCA_pmix_pinstalldirs_ALL_COMPONENTS = @MCA_pmix_pinstalldirs_ALL_COMPONENTS@
+MCA_pmix_pinstalldirs_ALL_SUBDIRS = @MCA_pmix_pinstalldirs_ALL_SUBDIRS@
+MCA_pmix_pinstalldirs_DSO_COMPONENTS = @MCA_pmix_pinstalldirs_DSO_COMPONENTS@
+MCA_pmix_pinstalldirs_DSO_SUBDIRS = @MCA_pmix_pinstalldirs_DSO_SUBDIRS@
+MCA_pmix_pinstalldirs_STATIC_COMPONENTS = @MCA_pmix_pinstalldirs_STATIC_COMPONENTS@
+MCA_pmix_pinstalldirs_STATIC_LTLIBS = @MCA_pmix_pinstalldirs_STATIC_LTLIBS@
+MCA_pmix_pinstalldirs_STATIC_SUBDIRS = @MCA_pmix_pinstalldirs_STATIC_SUBDIRS@
+MCA_pmix_pnet_ALL_COMPONENTS = @MCA_pmix_pnet_ALL_COMPONENTS@
+MCA_pmix_pnet_ALL_SUBDIRS = @MCA_pmix_pnet_ALL_SUBDIRS@
+MCA_pmix_pnet_DSO_COMPONENTS = @MCA_pmix_pnet_DSO_COMPONENTS@
+MCA_pmix_pnet_DSO_SUBDIRS = @MCA_pmix_pnet_DSO_SUBDIRS@
+MCA_pmix_pnet_STATIC_COMPONENTS = @MCA_pmix_pnet_STATIC_COMPONENTS@
+MCA_pmix_pnet_STATIC_LTLIBS = @MCA_pmix_pnet_STATIC_LTLIBS@
+MCA_pmix_pnet_STATIC_SUBDIRS = @MCA_pmix_pnet_STATIC_SUBDIRS@
+MCA_pmix_psec_ALL_COMPONENTS = @MCA_pmix_psec_ALL_COMPONENTS@
+MCA_pmix_psec_ALL_SUBDIRS = @MCA_pmix_psec_ALL_SUBDIRS@
+MCA_pmix_psec_DSO_COMPONENTS = @MCA_pmix_psec_DSO_COMPONENTS@
+MCA_pmix_psec_DSO_SUBDIRS = @MCA_pmix_psec_DSO_SUBDIRS@
+MCA_pmix_psec_STATIC_COMPONENTS = @MCA_pmix_psec_STATIC_COMPONENTS@
+MCA_pmix_psec_STATIC_LTLIBS = @MCA_pmix_psec_STATIC_LTLIBS@
+MCA_pmix_psec_STATIC_SUBDIRS = @MCA_pmix_psec_STATIC_SUBDIRS@
+MCA_pmix_psensor_ALL_COMPONENTS = @MCA_pmix_psensor_ALL_COMPONENTS@
+MCA_pmix_psensor_ALL_SUBDIRS = @MCA_pmix_psensor_ALL_SUBDIRS@
+MCA_pmix_psensor_DSO_COMPONENTS = @MCA_pmix_psensor_DSO_COMPONENTS@
+MCA_pmix_psensor_DSO_SUBDIRS = @MCA_pmix_psensor_DSO_SUBDIRS@
+MCA_pmix_psensor_STATIC_COMPONENTS = @MCA_pmix_psensor_STATIC_COMPONENTS@
+MCA_pmix_psensor_STATIC_LTLIBS = @MCA_pmix_psensor_STATIC_LTLIBS@
+MCA_pmix_psensor_STATIC_SUBDIRS = @MCA_pmix_psensor_STATIC_SUBDIRS@
+MCA_pmix_ptl_ALL_COMPONENTS = @MCA_pmix_ptl_ALL_COMPONENTS@
+MCA_pmix_ptl_ALL_SUBDIRS = @MCA_pmix_ptl_ALL_SUBDIRS@
+MCA_pmix_ptl_DSO_COMPONENTS = @MCA_pmix_ptl_DSO_COMPONENTS@
+MCA_pmix_ptl_DSO_SUBDIRS = @MCA_pmix_ptl_DSO_SUBDIRS@
+MCA_pmix_ptl_STATIC_COMPONENTS = @MCA_pmix_ptl_STATIC_COMPONENTS@
+MCA_pmix_ptl_STATIC_LTLIBS = @MCA_pmix_ptl_STATIC_LTLIBS@
+MCA_pmix_ptl_STATIC_SUBDIRS = @MCA_pmix_ptl_STATIC_SUBDIRS@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PMIX_ASM_GSYM = @PMIX_ASM_GSYM@
+PMIX_ASM_LSYM = @PMIX_ASM_LSYM@
+PMIX_ASM_SUPPORT_64BIT = @PMIX_ASM_SUPPORT_64BIT@
+PMIX_ASM_TEXT = @PMIX_ASM_TEXT@
+PMIX_ASM_TYPE = @PMIX_ASM_TYPE@
+PMIX_ASSEMBLY_ARCH = @PMIX_ASSEMBLY_ARCH@
+PMIX_ASSEMBLY_BUILTIN = @PMIX_ASSEMBLY_BUILTIN@
+PMIX_ASSEMBLY_FORMAT = @PMIX_ASSEMBLY_FORMAT@
+PMIX_AS_GLOBAL = @PMIX_AS_GLOBAL@
+PMIX_AS_LABEL_SUFFIX = @PMIX_AS_LABEL_SUFFIX@
+PMIX_CC_ABSOLUTE = @PMIX_CC_ABSOLUTE@
+PMIX_CONFIGURE_DATE = @PMIX_CONFIGURE_DATE@
+PMIX_CONFIGURE_HOST = @PMIX_CONFIGURE_HOST@
+PMIX_CONFIGURE_USER = @PMIX_CONFIGURE_USER@
+PMIX_EMBEDDED_CPPFLAGS = @PMIX_EMBEDDED_CPPFLAGS@
+PMIX_EMBEDDED_LDFLAGS = @PMIX_EMBEDDED_LDFLAGS@
+PMIX_EMBEDDED_LIBS = @PMIX_EMBEDDED_LIBS@
+PMIX_MAJOR_VERSION = @PMIX_MAJOR_VERSION@
+PMIX_MINOR_VERSION = @PMIX_MINOR_VERSION@
+PMIX_RELEASE_DATE = @PMIX_RELEASE_DATE@
+PMIX_RELEASE_VERSION = @PMIX_RELEASE_VERSION@
+PMIX_RENAME = @PMIX_RENAME@
+PMIX_VERSION = @PMIX_VERSION@
+PMIX_top_builddir = @PMIX_top_builddir@
+PMIX_top_srcdir = @PMIX_top_srcdir@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_prefix_program = @ac_prefix_program@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+libpmix_so_version = @libpmix_so_version@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pmix_have_pandoc = @pmix_have_pandoc@
+pmix_pdl_pdlopen_LIBS = @pmix_pdl_pdlopen_LIBS@
+pmix_pdl_plibltdl_CPPFLAGS = @pmix_pdl_plibltdl_CPPFLAGS@
+pmix_pdl_plibltdl_LDFLAGS = @pmix_pdl_plibltdl_LDFLAGS@
+pmix_pdl_plibltdl_LIBS = @pmix_pdl_plibltdl_LIBS@
+pmixdatadir = @pmixdatadir@
+pmixincludedir = @pmixincludedir@
+pmixlibdir = @pmixlibdir@
+pmixmajor = @pmixmajor@
+pmixminor = @pmixminor@
+pnet_opa_CFLAGS = @pnet_opa_CFLAGS@
+pnet_opa_CPPFLAGS = @pnet_opa_CPPFLAGS@
+pnet_opa_LDFLAGS = @pnet_opa_LDFLAGS@
+pnet_opa_LIBS = @pnet_opa_LIBS@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+psec_munge_CPPFLAGS = @psec_munge_CPPFLAGS@
+psec_munge_LDFLAGS = @psec_munge_LDFLAGS@
+psec_munge_LIBS = @psec_munge_LIBS@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+AM_CPPFLAGS = $(LTDLINCL)
+
+# main library setup
+noinst_LTLIBRARIES = libmca_psensor.la
+libmca_psensor_la_SOURCES = $(headers) base/psensor_base_frame.c \
+	base/psensor_base_select.c base/psensor_base_stubs.c
+
+# local files
+headers = psensor.h base/base.h
+
+# Conditionally install the header files
+ at WANT_INSTALL_HEADERS_TRUE@pmixdir = $(pmixincludedir)/$(subdir)
+ at WANT_INSTALL_HEADERS_TRUE@nobase_pmix_HEADERS = $(headers)
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/base/Makefile.am $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/mca/psensor/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/mca/psensor/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+$(srcdir)/base/Makefile.am $(am__empty):
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_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}; \
+	}
+base/$(am__dirstamp):
+	@$(MKDIR_P) base
+	@: > base/$(am__dirstamp)
+base/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) base/$(DEPDIR)
+	@: > base/$(DEPDIR)/$(am__dirstamp)
+base/psensor_base_frame.lo: base/$(am__dirstamp) \
+	base/$(DEPDIR)/$(am__dirstamp)
+base/psensor_base_select.lo: base/$(am__dirstamp) \
+	base/$(DEPDIR)/$(am__dirstamp)
+base/psensor_base_stubs.lo: base/$(am__dirstamp) \
+	base/$(DEPDIR)/$(am__dirstamp)
+
+libmca_psensor.la: $(libmca_psensor_la_OBJECTS) $(libmca_psensor_la_DEPENDENCIES) $(EXTRA_libmca_psensor_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(LINK)  $(libmca_psensor_la_OBJECTS) $(libmca_psensor_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+	-rm -f base/*.$(OBJEXT)
+	-rm -f base/*.lo
+
+distclean-compile:
+	-rm -f *.tab.c
+
+ at AMDEP_TRUE@@am__include@ @am__quote at base/$(DEPDIR)/psensor_base_frame.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at base/$(DEPDIR)/psensor_base_select.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at base/$(DEPDIR)/psensor_base_stubs.Plo at am__quote@
+
+.c.o:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+ at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+	-rm -rf base/.libs base/_libs
+install-nobase_pmixHEADERS: $(nobase_pmix_HEADERS)
+	@$(NORMAL_INSTALL)
+	@list='$(nobase_pmix_HEADERS)'; test -n "$(pmixdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(pmixdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(pmixdir)" || exit 1; \
+	fi; \
+	$(am__nobase_list) | while read dir files; do \
+	  xfiles=; for file in $$files; do \
+	    if test -f "$$file"; then xfiles="$$xfiles $$file"; \
+	    else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \
+	  test -z "$$xfiles" || { \
+	    test "x$$dir" = x. || { \
+	      echo " $(MKDIR_P) '$(DESTDIR)$(pmixdir)/$$dir'"; \
+	      $(MKDIR_P) "$(DESTDIR)$(pmixdir)/$$dir"; }; \
+	    echo " $(INSTALL_HEADER) $$xfiles '$(DESTDIR)$(pmixdir)/$$dir'"; \
+	    $(INSTALL_HEADER) $$xfiles "$(DESTDIR)$(pmixdir)/$$dir" || exit $$?; }; \
+	done
+
+uninstall-nobase_pmixHEADERS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(nobase_pmix_HEADERS)'; test -n "$(pmixdir)" || list=; \
+	$(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \
+	dir='$(DESTDIR)$(pmixdir)'; $(am__uninstall_files_from_dir)
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES) $(HEADERS)
+installdirs:
+	for dir in "$(DESTDIR)$(pmixdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+	-rm -f base/$(DEPDIR)/$(am__dirstamp)
+	-rm -f base/$(am__dirstamp)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf base/$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-local distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-nobase_pmixHEADERS
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf base/$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-nobase_pmixHEADERS
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-local 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-nobase_pmixHEADERS install-pdf install-pdf-am \
+	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-nobase_pmixHEADERS
+
+.PRECIOUS: Makefile
+
+
+distclean-local:
+	rm -f base/static-components.h
+
+# 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/mca/psensor/base/Makefile.am b/src/mca/psensor/base/Makefile.am
new file mode 100644
index 0000000..fe9c53e
--- /dev/null
+++ b/src/mca/psensor/base/Makefile.am
@@ -0,0 +1,19 @@
+#
+# Copyright (c) 2010      Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2012-2013 Los Alamos National Security, Inc. All rights reserved.
+#
+# Copyright (c) 2017      Intel, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+headers += \
+        base/base.h
+
+libmca_psensor_la_SOURCES += \
+        base/psensor_base_frame.c \
+        base/psensor_base_select.c \
+        base/psensor_base_stubs.c
diff --git a/src/mca/psensor/base/base.h b/src/mca/psensor/base/base.h
new file mode 100644
index 0000000..a01437a
--- /dev/null
+++ b/src/mca/psensor/base/base.h
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2009      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2013      Los Alamos National Security, LLC.  All rights reserved.
+ *
+ * Copyright (c) 2017      Intel, Inc.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+/** @file:
+ */
+
+#ifndef PMIX_PSENSOR_BASE_H_
+#define PMIX_PSENSOR_BASE_H_
+
+#include <src/include/pmix_config.h>
+
+#include "src/class/pmix_list.h"
+#include "src/mca/mca.h"
+#include "src/mca/base/pmix_mca_base_framework.h"
+
+#include "src/mca/psensor/psensor.h"
+
+BEGIN_C_DECLS
+
+/*
+ * MCA Framework
+ */
+PMIX_EXPORT extern pmix_mca_base_framework_t pmix_psensor_base_framework;
+
+PMIX_EXPORT int pmix_psensor_base_select(void);
+
+/* define a struct to hold framework-global values */
+typedef struct {
+    pmix_list_t actives;
+    pmix_event_base_t *evbase;
+} pmix_psensor_base_t;
+
+typedef struct {
+    pmix_list_item_t super;
+    pmix_psensor_base_component_t *component;
+    pmix_psensor_base_module_t *module;
+    int priority;
+} pmix_psensor_active_module_t;
+PMIX_CLASS_DECLARATION(pmix_psensor_active_module_t);
+
+PMIX_EXPORT extern pmix_psensor_base_t pmix_psensor_base;
+
+PMIX_EXPORT pmix_status_t pmix_psensor_base_start(pmix_peer_t *requestor, pmix_status_t error,
+                                                  const pmix_info_t *monitor,
+                                                  const pmix_info_t directives[], size_t ndirs);
+
+PMIX_EXPORT pmix_status_t pmix_psensor_base_stop(pmix_peer_t *requestor,
+                                                 char *id);
+
+END_C_DECLS
+#endif
diff --git a/src/mca/psensor/base/psensor_base_frame.c b/src/mca/psensor/base/psensor_base_frame.c
new file mode 100644
index 0000000..d10bab1
--- /dev/null
+++ b/src/mca/psensor/base/psensor_base_frame.c
@@ -0,0 +1,103 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2010      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2012-2013 Los Alamos National Security, Inc. All rights reserved.
+ *
+ * Copyright (c) 2017      Intel, Inc.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+
+#include <src/include/pmix_config.h>
+
+#include <pmix_common.h>
+
+#include <pthread.h>
+#include PMIX_EVENT_HEADER
+
+#include "src/mca/mca.h"
+#include "src/mca/base/base.h"
+#include "src/class/pmix_list.h"
+#include "src/runtime/pmix_progress_threads.h"
+#include "src/include/types.h"
+
+#include "src/mca/psensor/base/base.h"
+
+/*
+ * The following file was created by configure.  It contains extern
+ * statements and the definition of an array of pointers to each
+ * component's public mca_base_component_t struct.
+ */
+
+#include "src/mca/psensor/base/static-components.h"
+
+/*
+ * Global variables
+ */
+pmix_psensor_base_module_t pmix_psensor = {
+    pmix_psensor_base_start,
+    pmix_psensor_base_stop
+};
+pmix_psensor_base_t pmix_psensor_base = {{{0}}};
+
+static bool use_separate_thread = false;
+
+static int pmix_psensor_register(pmix_mca_base_register_flag_t flags)
+{
+    (void) pmix_mca_base_var_register("pmix", "psensor", "base", "use_separate_thread",
+                                      "Use a separate thread for monitoring local procs",
+                                      PMIX_MCA_BASE_VAR_TYPE_BOOL, NULL, 0, 0,
+                                      PMIX_INFO_LVL_9,
+                                      PMIX_MCA_BASE_VAR_SCOPE_READONLY,
+                                      &use_separate_thread);
+    return PMIX_SUCCESS;
+}
+
+
+static int pmix_psensor_base_close(void)
+{
+    PMIX_LIST_DESTRUCT(&pmix_psensor_base.actives);
+
+    if (use_separate_thread && NULL != pmix_psensor_base.evbase) {
+        (void)pmix_progress_thread_stop("PSENSOR");
+    }
+
+    /* Close all remaining available components */
+    return pmix_mca_base_framework_components_close(&pmix_psensor_base_framework, NULL);
+}
+
+/**
+ * Function for finding and opening either all MCA components, or the one
+ * that was specifically requested via a MCA parameter.
+ */
+static int pmix_psensor_base_open(pmix_mca_base_open_flag_t flags)
+{
+    /* construct the list of modules */
+    PMIX_CONSTRUCT(&pmix_psensor_base.actives, pmix_list_t);
+
+    if (use_separate_thread) {
+        /* create an event base and progress thread for us */
+        if (NULL == (pmix_psensor_base.evbase = pmix_progress_thread_init("PSENSOR"))) {
+            return PMIX_ERROR;
+        }
+
+    } else {
+        pmix_psensor_base.evbase = pmix_globals.evbase;
+    }
+
+    /* Open up all available components */
+    return pmix_mca_base_framework_components_open(&pmix_psensor_base_framework, flags);
+}
+
+PMIX_MCA_BASE_FRAMEWORK_DECLARE(pmix, psensor, "PMIx Monitoring Sensors",
+                                pmix_psensor_register,
+                                pmix_psensor_base_open, pmix_psensor_base_close,
+                                mca_psensor_base_static_components, 0);
+
+PMIX_CLASS_INSTANCE(pmix_psensor_active_module_t,
+                    pmix_list_item_t,
+                    NULL, NULL);
diff --git a/src/mca/psensor/base/psensor_base_select.c b/src/mca/psensor/base/psensor_base_select.c
new file mode 100644
index 0000000..4a1f1f0
--- /dev/null
+++ b/src/mca/psensor/base/psensor_base_select.c
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2005 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2016-2017 Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+#include <pmix_common.h>
+
+#include <string.h>
+
+#include "src/mca/mca.h"
+#include "src/mca/base/base.h"
+
+#include "src/mca/psensor/base/base.h"
+
+static bool selected = false;
+
+/* Function for selecting a prioritized list of components
+ * from all those that are available. */
+int pmix_psensor_base_select(void)
+{
+    pmix_mca_base_component_list_item_t *cli = NULL;
+    pmix_psensor_base_component_t *component = NULL;
+    pmix_psensor_active_module_t *newactive, *active;
+    pmix_mca_base_module_t *mod;
+    int pri;
+    bool inserted;
+
+    if (selected) {
+        /* ensure we don't do this twice */
+        return PMIX_SUCCESS;
+    }
+    selected = true;
+
+    /* Query all available components and ask if they have a module */
+    PMIX_LIST_FOREACH(cli, &pmix_psensor_base_framework.framework_components, pmix_mca_base_component_list_item_t) {
+        component = (pmix_psensor_base_component_t *) cli->cli_component;
+
+        pmix_output_verbose(5, pmix_psensor_base_framework.framework_output,
+                            "mca:psensor:select: checking available component %s",
+                            component->base.pmix_mca_component_name);
+
+        /* get the module for this component */
+        if (PMIX_SUCCESS != component->base.pmix_mca_query_component(&mod, &pri)) {
+            continue;
+        }
+
+        /* add to our prioritized list of available actives */
+        newactive = PMIX_NEW(pmix_psensor_active_module_t);
+        newactive->priority = pri;
+        newactive->component = component;
+        newactive->module = (pmix_psensor_base_module_t*)mod;
+
+        /* maintain priority order */
+        inserted = false;
+        PMIX_LIST_FOREACH(active, &pmix_psensor_base.actives, pmix_psensor_active_module_t) {
+            if (newactive->priority > active->priority) {
+                pmix_list_insert_pos(&pmix_psensor_base.actives,
+                                     (pmix_list_item_t*)active, &newactive->super);
+                inserted = true;
+                break;
+            }
+        }
+        if (!inserted) {
+            /* must be lowest priority - add to end */
+            pmix_list_append(&pmix_psensor_base.actives, &newactive->super);
+        }
+    }
+
+    if (4 < pmix_output_get_verbosity(pmix_psensor_base_framework.framework_output)) {
+        pmix_output(0, "Final PSENSOR priorities");
+        /* show the prioritized list */
+        PMIX_LIST_FOREACH(active, &pmix_psensor_base.actives, pmix_psensor_active_module_t) {
+            pmix_output(0, "\tPSENSOR: %s Priority: %d",
+                        active->component->base.pmix_mca_component_name, active->priority);
+        }
+    }
+
+    return PMIX_SUCCESS;;
+}
diff --git a/src/mca/psensor/base/psensor_base_stubs.c b/src/mca/psensor/base/psensor_base_stubs.c
new file mode 100644
index 0000000..c24b57d
--- /dev/null
+++ b/src/mca/psensor/base/psensor_base_stubs.c
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2010      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2012      Los Alamos National Security, Inc. All rights reserved.
+ * Copyright (c) 2014-2017 Intel, Inc.  All rights reserved.
+ *
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+
+#include <src/include/pmix_config.h>
+#include <pmix_common.h>
+
+#include "src/util/error.h"
+
+#include "src/mca/psensor/base/base.h"
+
+pmix_status_t pmix_psensor_base_start(pmix_peer_t *requestor, pmix_status_t error,
+                                      const pmix_info_t *monitor,
+                                      const pmix_info_t directives[], size_t ndirs)
+{
+    pmix_psensor_active_module_t *mod;
+    pmix_status_t rc;
+
+    pmix_output_verbose(5, pmix_psensor_base_framework.framework_output,
+                        "%s:%d sensor:base: starting sensors",
+                        pmix_globals.myid.nspace, pmix_globals.myid.rank);
+
+    /* call the start function of all modules in priority order */
+    PMIX_LIST_FOREACH(mod, &pmix_psensor_base.actives, pmix_psensor_active_module_t) {
+        if (NULL != mod->module->start) {
+            rc = mod->module->start(requestor, error, monitor, directives, ndirs);
+            if (PMIX_SUCCESS != rc && PMIX_ERR_TAKE_NEXT_OPTION != rc) {
+                return rc;
+            }
+        }
+    }
+
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_psensor_base_stop(pmix_peer_t *requestor,
+                                     char *id)
+{
+    pmix_psensor_active_module_t *mod;
+    pmix_status_t rc;
+
+    pmix_output_verbose(5, pmix_psensor_base_framework.framework_output,
+                        "%s:%d sensor:base: stopping sensors",
+                        pmix_globals.myid.nspace, pmix_globals.myid.rank);
+
+    /* call the stop function of all modules in priority order */
+    PMIX_LIST_FOREACH(mod, &pmix_psensor_base.actives, pmix_psensor_active_module_t) {
+        if (NULL != mod->module->stop) {
+            rc = mod->module->stop(requestor, id);
+            if (PMIX_SUCCESS != rc && PMIX_ERR_TAKE_NEXT_OPTION != rc) {
+                return rc;
+            }
+        }
+    }
+
+    return PMIX_SUCCESS;
+}
diff --git a/src/mca/psensor/file/Makefile.am b/src/mca/psensor/file/Makefile.am
new file mode 100644
index 0000000..30dce46
--- /dev/null
+++ b/src/mca/psensor/file/Makefile.am
@@ -0,0 +1,37 @@
+#
+# Copyright (c) 2009-2010 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2017      Intel, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+dist_pmixdata_DATA = help-pmix-psensor-file.txt
+
+sources = \
+        psensor_file.c \
+        psensor_file.h \
+        psensor_file_component.c
+
+# Make the output library in this directory, and name it either
+# mca_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la
+# (for static builds).
+
+if MCA_BUILD_pmix_psensor_file_DSO
+component_noinst =
+component_install = mca_psensor_file.la
+else
+component_noinst = libmca_psensor_file.la
+component_install =
+endif
+
+mcacomponentdir = $(pmixlibdir)
+mcacomponent_LTLIBRARIES = $(component_install)
+mca_psensor_file_la_SOURCES = $(sources)
+mca_psensor_file_la_LDFLAGS = -module -avoid-version
+
+noinst_LTLIBRARIES = $(component_noinst)
+libmca_psensor_file_la_SOURCES =$(sources)
+libmca_psensor_file_la_LDFLAGS = -module -avoid-version
diff --git a/src/mca/psensor/file/Makefile.in b/src/mca/psensor/file/Makefile.in
new file mode 100644
index 0000000..e29c59b
--- /dev/null
+++ b/src/mca/psensor/file/Makefile.in
@@ -0,0 +1,898 @@
+# Makefile.in generated by automake 1.15 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+#
+# Copyright (c) 2009-2010 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2017      Intel, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+subdir = src/mca/psensor/file
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/config/c_get_alignment.m4 \
+	$(top_srcdir)/config/libtool.m4 \
+	$(top_srcdir)/config/ltoptions.m4 \
+	$(top_srcdir)/config/ltsugar.m4 \
+	$(top_srcdir)/config/ltversion.m4 \
+	$(top_srcdir)/config/lt~obsolete.m4 \
+	$(top_srcdir)/config/pmix.m4 \
+	$(top_srcdir)/config/pmix_check_attributes.m4 \
+	$(top_srcdir)/config/pmix_check_broken_qsort.m4 \
+	$(top_srcdir)/config/pmix_check_compiler_version.m4 \
+	$(top_srcdir)/config/pmix_check_icc.m4 \
+	$(top_srcdir)/config/pmix_check_ident.m4 \
+	$(top_srcdir)/config/pmix_check_lock.m4 \
+	$(top_srcdir)/config/pmix_check_os_flavors.m4 \
+	$(top_srcdir)/config/pmix_check_package.m4 \
+	$(top_srcdir)/config/pmix_check_psm2.m4 \
+	$(top_srcdir)/config/pmix_check_pthread_pids.m4 \
+	$(top_srcdir)/config/pmix_check_vendor.m4 \
+	$(top_srcdir)/config/pmix_check_visibility.m4 \
+	$(top_srcdir)/config/pmix_check_withdir.m4 \
+	$(top_srcdir)/config/pmix_config_asm.m4 \
+	$(top_srcdir)/config/pmix_config_pthreads.m4 \
+	$(top_srcdir)/config/pmix_config_subdir.m4 \
+	$(top_srcdir)/config/pmix_config_subdir_args.m4 \
+	$(top_srcdir)/config/pmix_config_threads.m4 \
+	$(top_srcdir)/config/pmix_ensure_contains_optflags.m4 \
+	$(top_srcdir)/config/pmix_functions.m4 \
+	$(top_srcdir)/config/pmix_load_platform.m4 \
+	$(top_srcdir)/config/pmix_mca.m4 \
+	$(top_srcdir)/config/pmix_search_libs.m4 \
+	$(top_srcdir)/config/pmix_setup_cc.m4 \
+	$(top_srcdir)/config/pmix_setup_libevent.m4 \
+	$(top_srcdir)/config/pmix_setup_zlib.m4 \
+	$(top_srcdir)/config/pmix_try_assemble.m4 \
+	$(top_srcdir)/config/autogen_found_items.m4 \
+	$(top_srcdir)/src/mca/pdl/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/configure.m4 \
+	$(top_srcdir)/src/mca/pdl/pdlopen/configure.m4 \
+	$(top_srcdir)/src/mca/pdl/plibltdl/configure.m4 \
+	$(top_srcdir)/src/mca/pif/bsdx_ipv4/configure.m4 \
+	$(top_srcdir)/src/mca/pif/bsdx_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pif/linux_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pif/posix_ipv4/configure.m4 \
+	$(top_srcdir)/src/mca/pif/solaris_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/config/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/env/configure.m4 \
+	$(top_srcdir)/src/mca/pnet/opa/configure.m4 \
+	$(top_srcdir)/src/mca/psec/munge/configure.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(dist_pmixdata_DATA) \
+	$(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/src/include/pmix_config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(mcacomponentdir)" \
+	"$(DESTDIR)$(pmixdatadir)"
+LTLIBRARIES = $(mcacomponent_LTLIBRARIES) $(noinst_LTLIBRARIES)
+libmca_psensor_file_la_LIBADD =
+am__objects_1 = psensor_file.lo psensor_file_component.lo
+am_libmca_psensor_file_la_OBJECTS = $(am__objects_1)
+libmca_psensor_file_la_OBJECTS = $(am_libmca_psensor_file_la_OBJECTS)
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+libmca_psensor_file_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(AM_CFLAGS) $(CFLAGS) $(libmca_psensor_file_la_LDFLAGS) \
+	$(LDFLAGS) -o $@
+ at MCA_BUILD_pmix_psensor_file_DSO_FALSE@am_libmca_psensor_file_la_rpath =
+mca_psensor_file_la_LIBADD =
+am_mca_psensor_file_la_OBJECTS = $(am__objects_1)
+mca_psensor_file_la_OBJECTS = $(am_mca_psensor_file_la_OBJECTS)
+mca_psensor_file_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(AM_CFLAGS) $(CFLAGS) $(mca_psensor_file_la_LDFLAGS) \
+	$(LDFLAGS) -o $@
+ at MCA_BUILD_pmix_psensor_file_DSO_TRUE@am_mca_psensor_file_la_rpath =  \
+ at MCA_BUILD_pmix_psensor_file_DSO_TRUE@	-rpath \
+ at MCA_BUILD_pmix_psensor_file_DSO_TRUE@	$(mcacomponentdir)
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/src/include
+depcomp = $(SHELL) $(top_srcdir)/./config/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libmca_psensor_file_la_SOURCES) \
+	$(mca_psensor_file_la_SOURCES)
+DIST_SOURCES = $(libmca_psensor_file_la_SOURCES) \
+	$(mca_psensor_file_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+DATA = $(dist_pmixdata_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/./config/depcomp
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CFLAGS = @CFLAGS@
+CLEANFILES = @CLEANFILES@
+CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MCA_PROJECT_SUBDIRS = @MCA_PROJECT_SUBDIRS@
+MCA_pmix_FRAMEWORKS = @MCA_pmix_FRAMEWORKS@
+MCA_pmix_FRAMEWORKS_SUBDIRS = @MCA_pmix_FRAMEWORKS_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS@
+MCA_pmix_FRAMEWORK_LIBS = @MCA_pmix_FRAMEWORK_LIBS@
+MCA_pmix_pdl_ALL_COMPONENTS = @MCA_pmix_pdl_ALL_COMPONENTS@
+MCA_pmix_pdl_ALL_SUBDIRS = @MCA_pmix_pdl_ALL_SUBDIRS@
+MCA_pmix_pdl_DSO_COMPONENTS = @MCA_pmix_pdl_DSO_COMPONENTS@
+MCA_pmix_pdl_DSO_SUBDIRS = @MCA_pmix_pdl_DSO_SUBDIRS@
+MCA_pmix_pdl_STATIC_COMPONENTS = @MCA_pmix_pdl_STATIC_COMPONENTS@
+MCA_pmix_pdl_STATIC_LTLIBS = @MCA_pmix_pdl_STATIC_LTLIBS@
+MCA_pmix_pdl_STATIC_SUBDIRS = @MCA_pmix_pdl_STATIC_SUBDIRS@
+MCA_pmix_pif_ALL_COMPONENTS = @MCA_pmix_pif_ALL_COMPONENTS@
+MCA_pmix_pif_ALL_SUBDIRS = @MCA_pmix_pif_ALL_SUBDIRS@
+MCA_pmix_pif_DSO_COMPONENTS = @MCA_pmix_pif_DSO_COMPONENTS@
+MCA_pmix_pif_DSO_SUBDIRS = @MCA_pmix_pif_DSO_SUBDIRS@
+MCA_pmix_pif_STATIC_COMPONENTS = @MCA_pmix_pif_STATIC_COMPONENTS@
+MCA_pmix_pif_STATIC_LTLIBS = @MCA_pmix_pif_STATIC_LTLIBS@
+MCA_pmix_pif_STATIC_SUBDIRS = @MCA_pmix_pif_STATIC_SUBDIRS@
+MCA_pmix_pinstalldirs_ALL_COMPONENTS = @MCA_pmix_pinstalldirs_ALL_COMPONENTS@
+MCA_pmix_pinstalldirs_ALL_SUBDIRS = @MCA_pmix_pinstalldirs_ALL_SUBDIRS@
+MCA_pmix_pinstalldirs_DSO_COMPONENTS = @MCA_pmix_pinstalldirs_DSO_COMPONENTS@
+MCA_pmix_pinstalldirs_DSO_SUBDIRS = @MCA_pmix_pinstalldirs_DSO_SUBDIRS@
+MCA_pmix_pinstalldirs_STATIC_COMPONENTS = @MCA_pmix_pinstalldirs_STATIC_COMPONENTS@
+MCA_pmix_pinstalldirs_STATIC_LTLIBS = @MCA_pmix_pinstalldirs_STATIC_LTLIBS@
+MCA_pmix_pinstalldirs_STATIC_SUBDIRS = @MCA_pmix_pinstalldirs_STATIC_SUBDIRS@
+MCA_pmix_pnet_ALL_COMPONENTS = @MCA_pmix_pnet_ALL_COMPONENTS@
+MCA_pmix_pnet_ALL_SUBDIRS = @MCA_pmix_pnet_ALL_SUBDIRS@
+MCA_pmix_pnet_DSO_COMPONENTS = @MCA_pmix_pnet_DSO_COMPONENTS@
+MCA_pmix_pnet_DSO_SUBDIRS = @MCA_pmix_pnet_DSO_SUBDIRS@
+MCA_pmix_pnet_STATIC_COMPONENTS = @MCA_pmix_pnet_STATIC_COMPONENTS@
+MCA_pmix_pnet_STATIC_LTLIBS = @MCA_pmix_pnet_STATIC_LTLIBS@
+MCA_pmix_pnet_STATIC_SUBDIRS = @MCA_pmix_pnet_STATIC_SUBDIRS@
+MCA_pmix_psec_ALL_COMPONENTS = @MCA_pmix_psec_ALL_COMPONENTS@
+MCA_pmix_psec_ALL_SUBDIRS = @MCA_pmix_psec_ALL_SUBDIRS@
+MCA_pmix_psec_DSO_COMPONENTS = @MCA_pmix_psec_DSO_COMPONENTS@
+MCA_pmix_psec_DSO_SUBDIRS = @MCA_pmix_psec_DSO_SUBDIRS@
+MCA_pmix_psec_STATIC_COMPONENTS = @MCA_pmix_psec_STATIC_COMPONENTS@
+MCA_pmix_psec_STATIC_LTLIBS = @MCA_pmix_psec_STATIC_LTLIBS@
+MCA_pmix_psec_STATIC_SUBDIRS = @MCA_pmix_psec_STATIC_SUBDIRS@
+MCA_pmix_psensor_ALL_COMPONENTS = @MCA_pmix_psensor_ALL_COMPONENTS@
+MCA_pmix_psensor_ALL_SUBDIRS = @MCA_pmix_psensor_ALL_SUBDIRS@
+MCA_pmix_psensor_DSO_COMPONENTS = @MCA_pmix_psensor_DSO_COMPONENTS@
+MCA_pmix_psensor_DSO_SUBDIRS = @MCA_pmix_psensor_DSO_SUBDIRS@
+MCA_pmix_psensor_STATIC_COMPONENTS = @MCA_pmix_psensor_STATIC_COMPONENTS@
+MCA_pmix_psensor_STATIC_LTLIBS = @MCA_pmix_psensor_STATIC_LTLIBS@
+MCA_pmix_psensor_STATIC_SUBDIRS = @MCA_pmix_psensor_STATIC_SUBDIRS@
+MCA_pmix_ptl_ALL_COMPONENTS = @MCA_pmix_ptl_ALL_COMPONENTS@
+MCA_pmix_ptl_ALL_SUBDIRS = @MCA_pmix_ptl_ALL_SUBDIRS@
+MCA_pmix_ptl_DSO_COMPONENTS = @MCA_pmix_ptl_DSO_COMPONENTS@
+MCA_pmix_ptl_DSO_SUBDIRS = @MCA_pmix_ptl_DSO_SUBDIRS@
+MCA_pmix_ptl_STATIC_COMPONENTS = @MCA_pmix_ptl_STATIC_COMPONENTS@
+MCA_pmix_ptl_STATIC_LTLIBS = @MCA_pmix_ptl_STATIC_LTLIBS@
+MCA_pmix_ptl_STATIC_SUBDIRS = @MCA_pmix_ptl_STATIC_SUBDIRS@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PMIX_ASM_GSYM = @PMIX_ASM_GSYM@
+PMIX_ASM_LSYM = @PMIX_ASM_LSYM@
+PMIX_ASM_SUPPORT_64BIT = @PMIX_ASM_SUPPORT_64BIT@
+PMIX_ASM_TEXT = @PMIX_ASM_TEXT@
+PMIX_ASM_TYPE = @PMIX_ASM_TYPE@
+PMIX_ASSEMBLY_ARCH = @PMIX_ASSEMBLY_ARCH@
+PMIX_ASSEMBLY_BUILTIN = @PMIX_ASSEMBLY_BUILTIN@
+PMIX_ASSEMBLY_FORMAT = @PMIX_ASSEMBLY_FORMAT@
+PMIX_AS_GLOBAL = @PMIX_AS_GLOBAL@
+PMIX_AS_LABEL_SUFFIX = @PMIX_AS_LABEL_SUFFIX@
+PMIX_CC_ABSOLUTE = @PMIX_CC_ABSOLUTE@
+PMIX_CONFIGURE_DATE = @PMIX_CONFIGURE_DATE@
+PMIX_CONFIGURE_HOST = @PMIX_CONFIGURE_HOST@
+PMIX_CONFIGURE_USER = @PMIX_CONFIGURE_USER@
+PMIX_EMBEDDED_CPPFLAGS = @PMIX_EMBEDDED_CPPFLAGS@
+PMIX_EMBEDDED_LDFLAGS = @PMIX_EMBEDDED_LDFLAGS@
+PMIX_EMBEDDED_LIBS = @PMIX_EMBEDDED_LIBS@
+PMIX_MAJOR_VERSION = @PMIX_MAJOR_VERSION@
+PMIX_MINOR_VERSION = @PMIX_MINOR_VERSION@
+PMIX_RELEASE_DATE = @PMIX_RELEASE_DATE@
+PMIX_RELEASE_VERSION = @PMIX_RELEASE_VERSION@
+PMIX_RENAME = @PMIX_RENAME@
+PMIX_VERSION = @PMIX_VERSION@
+PMIX_top_builddir = @PMIX_top_builddir@
+PMIX_top_srcdir = @PMIX_top_srcdir@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_prefix_program = @ac_prefix_program@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+libpmix_so_version = @libpmix_so_version@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pmix_have_pandoc = @pmix_have_pandoc@
+pmix_pdl_pdlopen_LIBS = @pmix_pdl_pdlopen_LIBS@
+pmix_pdl_plibltdl_CPPFLAGS = @pmix_pdl_plibltdl_CPPFLAGS@
+pmix_pdl_plibltdl_LDFLAGS = @pmix_pdl_plibltdl_LDFLAGS@
+pmix_pdl_plibltdl_LIBS = @pmix_pdl_plibltdl_LIBS@
+pmixdatadir = @pmixdatadir@
+pmixincludedir = @pmixincludedir@
+pmixlibdir = @pmixlibdir@
+pmixmajor = @pmixmajor@
+pmixminor = @pmixminor@
+pnet_opa_CFLAGS = @pnet_opa_CFLAGS@
+pnet_opa_CPPFLAGS = @pnet_opa_CPPFLAGS@
+pnet_opa_LDFLAGS = @pnet_opa_LDFLAGS@
+pnet_opa_LIBS = @pnet_opa_LIBS@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+psec_munge_CPPFLAGS = @psec_munge_CPPFLAGS@
+psec_munge_LDFLAGS = @psec_munge_LDFLAGS@
+psec_munge_LIBS = @psec_munge_LIBS@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+dist_pmixdata_DATA = help-pmix-psensor-file.txt
+sources = \
+        psensor_file.c \
+        psensor_file.h \
+        psensor_file_component.c
+
+ at MCA_BUILD_pmix_psensor_file_DSO_FALSE@component_noinst = libmca_psensor_file.la
+
+# Make the output library in this directory, and name it either
+# mca_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la
+# (for static builds).
+ at MCA_BUILD_pmix_psensor_file_DSO_TRUE@component_noinst = 
+ at MCA_BUILD_pmix_psensor_file_DSO_FALSE@component_install = 
+ at MCA_BUILD_pmix_psensor_file_DSO_TRUE@component_install = mca_psensor_file.la
+mcacomponentdir = $(pmixlibdir)
+mcacomponent_LTLIBRARIES = $(component_install)
+mca_psensor_file_la_SOURCES = $(sources)
+mca_psensor_file_la_LDFLAGS = -module -avoid-version
+noinst_LTLIBRARIES = $(component_noinst)
+libmca_psensor_file_la_SOURCES = $(sources)
+libmca_psensor_file_la_LDFLAGS = -module -avoid-version
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/mca/psensor/file/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/mca/psensor/file/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+install-mcacomponentLTLIBRARIES: $(mcacomponent_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	@list='$(mcacomponent_LTLIBRARIES)'; test -n "$(mcacomponentdir)" || 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)$(mcacomponentdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(mcacomponentdir)" || exit 1; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(mcacomponentdir)'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(mcacomponentdir)"; \
+	}
+
+uninstall-mcacomponentLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(mcacomponent_LTLIBRARIES)'; test -n "$(mcacomponentdir)" || list=; \
+	for p in $$list; do \
+	  $(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(mcacomponentdir)/$$f'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(mcacomponentdir)/$$f"; \
+	done
+
+clean-mcacomponentLTLIBRARIES:
+	-test -z "$(mcacomponent_LTLIBRARIES)" || rm -f $(mcacomponent_LTLIBRARIES)
+	@list='$(mcacomponent_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}; \
+	}
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_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}; \
+	}
+
+libmca_psensor_file.la: $(libmca_psensor_file_la_OBJECTS) $(libmca_psensor_file_la_DEPENDENCIES) $(EXTRA_libmca_psensor_file_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(libmca_psensor_file_la_LINK) $(am_libmca_psensor_file_la_rpath) $(libmca_psensor_file_la_OBJECTS) $(libmca_psensor_file_la_LIBADD) $(LIBS)
+
+mca_psensor_file.la: $(mca_psensor_file_la_OBJECTS) $(mca_psensor_file_la_DEPENDENCIES) $(EXTRA_mca_psensor_file_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(mca_psensor_file_la_LINK) $(am_mca_psensor_file_la_rpath) $(mca_psensor_file_la_OBJECTS) $(mca_psensor_file_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/psensor_file.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/psensor_file_component.Plo at am__quote@
+
+.c.o:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+ at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-dist_pmixdataDATA: $(dist_pmixdata_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(dist_pmixdata_DATA)'; test -n "$(pmixdatadir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(pmixdatadir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(pmixdatadir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pmixdatadir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pmixdatadir)" || exit $$?; \
+	done
+
+uninstall-dist_pmixdataDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_pmixdata_DATA)'; test -n "$(pmixdatadir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(pmixdatadir)'; $(am__uninstall_files_from_dir)
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES) $(DATA)
+installdirs:
+	for dir in "$(DESTDIR)$(mcacomponentdir)" "$(DESTDIR)$(pmixdatadir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-mcacomponentLTLIBRARIES \
+	clean-noinstLTLIBRARIES mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-dist_pmixdataDATA \
+	install-mcacomponentLTLIBRARIES
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-dist_pmixdataDATA \
+	uninstall-mcacomponentLTLIBRARIES
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-mcacomponentLTLIBRARIES \
+	clean-noinstLTLIBRARIES 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-dist_pmixdataDATA install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man \
+	install-mcacomponentLTLIBRARIES install-pdf install-pdf-am \
+	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-dist_pmixdataDATA uninstall-mcacomponentLTLIBRARIES
+
+.PRECIOUS: Makefile
+
+
+# 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/mca/psensor/file/help-pmix-psensor-file.txt b/src/mca/psensor/file/help-pmix-psensor-file.txt
new file mode 100644
index 0000000..98fd3a0
--- /dev/null
+++ b/src/mca/psensor/file/help-pmix-psensor-file.txt
@@ -0,0 +1,19 @@
+# -*- text -*-
+#
+# Copyright (c) 2009      Cisco Systems, Inc.  All rights reserved.
+#
+# Copyright (c) 2017      Intel, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+# This is the US/English general help file for the file sensor
+#
+[file-stalled]
+A specified file is not changing, indicating a possibly stalled application:
+
+File:              %s
+Last size:         %lu
+Last access:       %sLast modification: %s
diff --git a/src/mca/psensor/file/psensor_file.c b/src/mca/psensor/file/psensor_file.c
new file mode 100644
index 0000000..e93bb88
--- /dev/null
+++ b/src/mca/psensor/file/psensor_file.c
@@ -0,0 +1,358 @@
+/*
+ * Copyright (c) 2010      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2004-2011 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2011-2012 Los Alamos National Security, LLC.
+ *                         All rights reserved.
+ *
+ * Copyright (c) 2017      Intel, Inc.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+#include <src/include/types.h>
+#include <pmix_common.h>
+
+#include <stdio.h>
+#include <stddef.h>
+#include <ctype.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_NETDB_H
+#include <netdb.h>
+#endif
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#include <fcntl.h>
+#include <errno.h>
+#include <signal.h>
+#ifdef HAVE_TIME_H
+#include <time.h>
+#endif
+#include <sys/stat.h>
+#include <sys/types.h>
+
+#include "src/class/pmix_list.h"
+#include "src/include/pmix_globals.h"
+#include "src/util/error.h"
+#include "src/util/output.h"
+#include "src/util/show_help.h"
+
+#include "src/mca/psensor/base/base.h"
+#include "psensor_file.h"
+
+/* declare the API functions */
+static pmix_status_t start(pmix_peer_t *requestor, pmix_status_t error,
+                           const pmix_info_t *monitor,
+                           const pmix_info_t directives[], size_t ndirs);
+static pmix_status_t stop(pmix_peer_t *requestor, char *id);
+
+/* instantiate the module */
+pmix_psensor_base_module_t pmix_psensor_file_module = {
+    .start = start,
+    .stop = stop
+};
+
+/* define a tracking object */
+typedef struct {
+    pmix_list_item_t super;
+    pmix_peer_t *requestor;
+    char *id;
+    bool event_active;
+    pmix_event_t ev;
+    pmix_event_t cdev;
+    struct timeval tv;
+    int tick;
+    char *file;
+    bool file_size;
+    bool file_access;
+    bool file_mod;
+    size_t last_size;
+    time_t last_access;
+    time_t last_mod;
+    uint32_t ndrops;
+    uint32_t nmisses;
+    pmix_status_t error;
+    pmix_data_range_t range;
+    pmix_info_t *info;
+    size_t ninfo;
+} file_tracker_t;
+static void ft_constructor(file_tracker_t *ft)
+{
+    ft->requestor = NULL;
+    ft->id = NULL;
+    ft->event_active = false;
+    ft->tv.tv_sec = 0;
+    ft->tv.tv_usec = 0;
+    ft->tick = 0;
+    ft->file_size = false;
+    ft->file_access = false;
+    ft->file_mod = false;
+    ft->last_size = 0;
+    ft->last_access = 0;
+    ft->last_mod = 0;
+    ft->ndrops = 0;
+    ft->nmisses = 0;
+    ft->error = PMIX_SUCCESS;
+    ft->range = PMIX_RANGE_NAMESPACE;
+    ft->info = NULL;
+    ft->ninfo = 0;
+}
+static void ft_destructor(file_tracker_t *ft)
+{
+    if (NULL != ft->requestor) {
+        PMIX_RELEASE(ft->requestor);
+    }
+    if (NULL != ft->id) {
+        free(ft->id);
+    }
+    if (ft->event_active) {
+        pmix_event_del(&ft->ev);
+    }
+    if (NULL != ft->file) {
+        free(ft->file);
+    }
+    if (NULL != ft->info) {
+        PMIX_INFO_FREE(ft->info, ft->ninfo);
+    }
+}
+PMIX_CLASS_INSTANCE(file_tracker_t,
+                    pmix_list_item_t,
+                    ft_constructor, ft_destructor);
+
+/* define a local caddy */
+typedef struct {
+    pmix_object_t super;
+    pmix_event_t ev;
+    pmix_peer_t *requestor;
+    char *id;
+} file_caddy_t;
+static void cd_con(file_caddy_t *p)
+{
+    p->requestor = NULL;
+    p->id = NULL;
+}
+static void cd_des(file_caddy_t *p)
+{
+    if (NULL != (p->requestor)) {
+        PMIX_RELEASE(p->requestor);
+    }
+    if (NULL != p->id) {
+        free(p->id);
+    }
+}
+PMIX_CLASS_INSTANCE(file_caddy_t,
+                    pmix_object_t,
+                    cd_con, cd_des);
+
+static void file_sample(int sd, short args, void *cbdata);
+
+static void add_tracker(int sd, short flags, void *cbdata)
+{
+    file_tracker_t *ft = (file_tracker_t*)cbdata;
+
+    PMIX_ACQUIRE_OBJECT(fd);
+
+    /* add the tracker to our list */
+    pmix_list_append(&mca_psensor_file_component.trackers, &ft->super);
+
+    /* setup the timer event */
+    pmix_event_evtimer_set(pmix_psensor_base.evbase, &ft->ev,
+                           file_sample, ft);
+    pmix_event_evtimer_add(&ft->ev, &ft->tv);
+    ft->event_active = true;
+}
+
+/*
+ * Start monitoring of local processes
+ */
+static pmix_status_t start(pmix_peer_t *requestor, pmix_status_t error,
+                           const pmix_info_t *monitor,
+                           const pmix_info_t directives[], size_t ndirs)
+{
+    file_tracker_t *ft;
+    size_t n;
+
+    PMIX_OUTPUT_VERBOSE((1, pmix_psensor_base_framework.framework_output,
+                         "[%s:%d] checking file monitoring for requestor %s:%d",
+                         pmix_globals.myid.nspace, pmix_globals.myid.rank,
+                         requestor->info->nptr->nspace, requestor->info->rank));
+
+    /* if they didn't ask to monitor a file, then nothing for us to do */
+    if (0 != strcmp(monitor->key, PMIX_MONITOR_FILE)) {
+        return PMIX_ERR_TAKE_NEXT_OPTION;
+    }
+
+    /* setup to track this monitoring operation */
+    ft = PMIX_NEW(file_tracker_t);
+    PMIX_RETAIN(requestor);
+    ft->requestor = requestor;
+    ft->file = strdup(monitor->value.data.string);
+
+    /* check the directives to see if what they want monitored */
+    for (n=0; n < ndirs; n++) {
+        if (0 == strcmp(directives[n].key, PMIX_MONITOR_FILE_SIZE)) {
+            ft->file_size = directives[n].value.data.flag;
+        } else if (0 == strcmp(directives[n].key, PMIX_MONITOR_FILE_ACCESS)) {
+            ft->file_access = directives[n].value.data.flag;
+        } else if (0 == strcmp(directives[n].key, PMIX_MONITOR_FILE_MODIFY)) {
+            ft->file_mod = directives[n].value.data.flag;
+        } else if (0 == strcmp(directives[n].key, PMIX_MONITOR_FILE_DROPS)) {
+            ft->ndrops = directives[n].value.data.uint32;
+        } else if (0 == strcmp(directives[n].key, PMIX_MONITOR_FILE_CHECK_TIME)) {
+            ft->tv.tv_sec = directives[n].value.data.uint32;
+        } else if (0 == strcmp(directives[n].key, PMIX_RANGE)) {
+            ft->range = directives[n].value.data.range;
+        }
+    }
+
+    if (0 == ft->tv.tv_sec ||
+        (!ft->file_size && !ft->file_access && !ft->file_mod)) {
+        /* didn't specify a sample rate, or what should be sampled */
+        PMIX_RELEASE(ft);
+        return PMIX_ERR_BAD_PARAM;
+    }
+
+    /* need to push into our event base to add this to our trackers */
+    pmix_event_assign(&ft->cdev, pmix_psensor_base.evbase, -1,
+                      EV_WRITE, add_tracker, ft);
+    PMIX_POST_OBJECT(ft);
+    pmix_event_active(&ft->cdev, EV_WRITE, 1);
+
+    return PMIX_SUCCESS;
+}
+
+
+static void del_tracker(int sd, short flags, void *cbdata)
+{
+    file_caddy_t *cd = (file_caddy_t*)cbdata;
+    file_tracker_t *ft, *ftnext;
+
+    PMIX_ACQUIRE_OBJECT(cd);
+
+    /* remove the tracker from our list */
+    PMIX_LIST_FOREACH_SAFE(ft, ftnext, &mca_psensor_file_component.trackers, file_tracker_t) {
+        if (ft->requestor != cd->requestor) {
+            continue;
+        }
+        if (NULL == cd->id ||
+            (NULL != ft->id && 0 == strcmp(ft->id, cd->id))) {
+            pmix_list_remove_item(&mca_psensor_file_component.trackers, &ft->super);
+            PMIX_RELEASE(ft);
+        }
+    }
+    PMIX_RELEASE(cd);
+}
+
+static pmix_status_t stop(pmix_peer_t *requestor, char *id)
+{
+    file_caddy_t *cd;
+
+    cd = PMIX_NEW(file_caddy_t);
+    PMIX_RETAIN(requestor);
+    cd->requestor = requestor;
+    cd->id = strdup(id);
+
+    /* need to push into our event base to add this to our trackers */
+    pmix_event_assign(&cd->ev, pmix_psensor_base.evbase, -1,
+                      EV_WRITE, del_tracker, cd);
+    PMIX_POST_OBJECT(cd);
+    pmix_event_active(&cd->ev, EV_WRITE, 1);
+
+    return PMIX_SUCCESS;
+}
+
+static void opcbfunc(pmix_status_t status, void *cbdata)
+{
+    file_tracker_t *ft = (file_tracker_t*)cbdata;
+
+    PMIX_RELEASE(ft);
+}
+
+static void file_sample(int sd, short args, void *cbdata)
+{
+    file_tracker_t *ft = (file_tracker_t*)cbdata;
+    struct stat buf;
+    pmix_status_t rc;
+    pmix_proc_t source;
+
+    PMIX_ACQUIRE_OBJECT(ft);
+
+    PMIX_OUTPUT_VERBOSE((1, pmix_psensor_base_framework.framework_output,
+                         "[%s:%d] sampling file %s",
+                         pmix_globals.myid.nspace, pmix_globals.myid.rank,
+                         ft->file));
+
+    /* stat the file and get its info */
+    if (0 > stat(ft->file, &buf)) {
+        /* cannot stat file */
+        PMIX_OUTPUT_VERBOSE((1, pmix_psensor_base_framework.framework_output,
+                             "[%s:%d] could not stat %s",
+                             pmix_globals.myid.nspace, pmix_globals.myid.rank,
+                             ft->file));
+        /* re-add the timer, in case this file shows up */
+        pmix_event_evtimer_add(&ft->ev, &ft->tv);
+        return;
+    }
+
+    PMIX_OUTPUT_VERBOSE((1, pmix_psensor_base_framework.framework_output,
+                         "[%s:%d] size %lu access %s\tmod %s",
+                         pmix_globals.myid.nspace, pmix_globals.myid.rank,
+                         (unsigned long)buf.st_size, ctime(&buf.st_atime), ctime(&buf.st_mtime)));
+
+    if (ft->file_size) {
+        if (buf.st_size == (int64_t)ft->last_size) {
+            ft->nmisses++;
+        } else {
+            ft->nmisses = 0;
+            ft->last_size = buf.st_size;
+        }
+    } else if (ft->file_access) {
+        if (buf.st_atime == ft->last_access) {
+            ft->nmisses++;
+        } else {
+            ft->nmisses = 0;
+            ft->last_access = buf.st_atime;
+        }
+    } else if (ft->file_mod) {
+        if (buf.st_mtime == ft->last_mod) {
+            ft->nmisses++;
+        } else {
+            ft->nmisses = 0;
+            ft->last_mod = buf.st_mtime;
+        }
+    }
+
+    PMIX_OUTPUT_VERBOSE((1, pmix_psensor_base_framework.framework_output,
+                         "[%s:%d] sampled file %s misses %d",
+                         pmix_globals.myid.nspace, pmix_globals.myid.rank,
+                         ft->file, ft->nmisses));
+
+    if (ft->nmisses == ft->ndrops) {
+        if (4 < pmix_output_get_verbosity(pmix_psensor_base_framework.framework_output)) {
+            pmix_show_help("help-pmix-psensor-file.txt", "file-stalled", true,
+                           ft->file, ft->last_size, ctime(&ft->last_access), ctime(&ft->last_mod));
+        }
+        /* stop monitoring this client */
+        pmix_list_remove_item(&mca_psensor_file_component.trackers, &ft->super);
+        /* generate an event */
+        (void)strncpy(source.nspace, ft->requestor->info->nptr->nspace, PMIX_MAX_NSLEN);
+        source.rank = ft->requestor->info->rank;
+        rc = PMIx_Notify_event(PMIX_MONITOR_FILE_ALERT, &source,
+                               ft->range, ft->info, ft->ninfo, opcbfunc, ft);
+        if (PMIX_SUCCESS != rc) {
+            PMIX_ERROR_LOG(rc);
+        }
+        return;
+    }
+
+    /* re-add the timer */
+    pmix_event_evtimer_add(&ft->ev, &ft->tv);
+}
diff --git a/src/mca/psensor/file/psensor_file.h b/src/mca/psensor/file/psensor_file.h
new file mode 100644
index 0000000..f78502c
--- /dev/null
+++ b/src/mca/psensor/file/psensor_file.h
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2010      Cisco Systems, Inc.  All rights reserved.
+ *
+ * Copyright (c) 2017      Intel, Inc.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+/**
+ * @file
+ *
+ * File movement sensor
+ */
+#ifndef PMIX_PSENSOR_FILE_H
+#define PMIX_PSENSOR_FILE_H
+
+#include <src/include/pmix_config.h>
+
+#include "src/class/pmix_list.h"
+
+#include "src/mca/psensor/psensor.h"
+
+BEGIN_C_DECLS
+
+typedef struct {
+    pmix_psensor_base_component_t super;
+    pmix_list_t trackers;
+} pmix_psensor_file_component_t;
+
+extern pmix_psensor_file_component_t mca_psensor_file_component;
+extern pmix_psensor_base_module_t pmix_psensor_file_module;
+
+
+END_C_DECLS
+
+#endif
diff --git a/src/mca/psensor/file/psensor_file_component.c b/src/mca/psensor/file/psensor_file_component.c
new file mode 100644
index 0000000..2b751d7
--- /dev/null
+++ b/src/mca/psensor/file/psensor_file_component.c
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2010      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2017      Intel, Inc.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+#include <pmix_common.h>
+
+#include "src/class/pmix_list.h"
+
+#include "src/mca/psensor/base/base.h"
+#include "src/mca/psensor/file/psensor_file.h"
+
+/*
+ * Local functions
+ */
+static int psensor_file_open(void);
+static int psensor_file_close(void);
+static int psensor_file_query(pmix_mca_base_module_t **module, int *priority);
+
+pmix_psensor_file_component_t mca_psensor_file_component = {
+    .super = {
+        .base = {
+            PMIX_PSENSOR_BASE_VERSION_1_0_0,
+
+            /* Component name and version */
+            .pmix_mca_component_name = "file",
+            PMIX_MCA_BASE_MAKE_VERSION(component,
+                                       PMIX_MAJOR_VERSION,
+                                       PMIX_MINOR_VERSION,
+                                       PMIX_RELEASE_VERSION),
+
+            /* Component open and close functions */
+            psensor_file_open,  /* component open  */
+            psensor_file_close, /* component close */
+            psensor_file_query  /* component query */
+        },
+    }
+};
+
+
+static int psensor_file_open(void)
+{
+    PMIX_CONSTRUCT(&mca_psensor_file_component.trackers, pmix_list_t);
+    return PMIX_SUCCESS;
+}
+
+
+static int psensor_file_query(pmix_mca_base_module_t **module, int *priority)
+{
+    *priority = 20;  /* irrelevant */
+    *module = (pmix_mca_base_module_t *)&pmix_psensor_file_module;
+    return PMIX_SUCCESS;
+}
+
+/**
+ *  Close all subsystems.
+ */
+
+static int psensor_file_close(void)
+{
+    PMIX_LIST_DESTRUCT(&mca_psensor_file_component.trackers);
+    return PMIX_SUCCESS;
+}
diff --git a/src/mca/psensor/heartbeat/Makefile.am b/src/mca/psensor/heartbeat/Makefile.am
new file mode 100644
index 0000000..df4fe04
--- /dev/null
+++ b/src/mca/psensor/heartbeat/Makefile.am
@@ -0,0 +1,38 @@
+#
+# Copyright (c) 2010      Cisco Systems, Inc.  All rights reserved.
+#
+# Copyright (c) 2017      Intel, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+dist_pmixdata_DATA = help-pmix-psensor-heartbeat.txt
+
+sources = \
+        psensor_heartbeat.c \
+        psensor_heartbeat.h \
+        psensor_heartbeat_component.c
+
+# Make the output library in this directory, and name it either
+# mca_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la
+# (for static builds).
+
+if MCA_BUILD_pmix_psensor_heartbeat_DSO
+component_noinst =
+component_install = mca_psensor_heartbeat.la
+else
+component_noinst = libmca_psensor_heartbeat.la
+component_install =
+endif
+
+mcacomponentdir = $(pmixlibdir)
+mcacomponent_LTLIBRARIES = $(component_install)
+mca_psensor_heartbeat_la_SOURCES = $(sources)
+mca_psensor_heartbeat_la_LDFLAGS = -module -avoid-version
+
+noinst_LTLIBRARIES = $(component_noinst)
+libmca_psensor_heartbeat_la_SOURCES =$(sources)
+libmca_psensor_heartbeat_la_LDFLAGS = -module -avoid-version
diff --git a/src/mca/psensor/heartbeat/Makefile.in b/src/mca/psensor/heartbeat/Makefile.in
new file mode 100644
index 0000000..e430a79
--- /dev/null
+++ b/src/mca/psensor/heartbeat/Makefile.in
@@ -0,0 +1,901 @@
+# Makefile.in generated by automake 1.15 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+#
+# Copyright (c) 2010      Cisco Systems, Inc.  All rights reserved.
+#
+# Copyright (c) 2017      Intel, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+subdir = src/mca/psensor/heartbeat
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/config/c_get_alignment.m4 \
+	$(top_srcdir)/config/libtool.m4 \
+	$(top_srcdir)/config/ltoptions.m4 \
+	$(top_srcdir)/config/ltsugar.m4 \
+	$(top_srcdir)/config/ltversion.m4 \
+	$(top_srcdir)/config/lt~obsolete.m4 \
+	$(top_srcdir)/config/pmix.m4 \
+	$(top_srcdir)/config/pmix_check_attributes.m4 \
+	$(top_srcdir)/config/pmix_check_broken_qsort.m4 \
+	$(top_srcdir)/config/pmix_check_compiler_version.m4 \
+	$(top_srcdir)/config/pmix_check_icc.m4 \
+	$(top_srcdir)/config/pmix_check_ident.m4 \
+	$(top_srcdir)/config/pmix_check_lock.m4 \
+	$(top_srcdir)/config/pmix_check_os_flavors.m4 \
+	$(top_srcdir)/config/pmix_check_package.m4 \
+	$(top_srcdir)/config/pmix_check_psm2.m4 \
+	$(top_srcdir)/config/pmix_check_pthread_pids.m4 \
+	$(top_srcdir)/config/pmix_check_vendor.m4 \
+	$(top_srcdir)/config/pmix_check_visibility.m4 \
+	$(top_srcdir)/config/pmix_check_withdir.m4 \
+	$(top_srcdir)/config/pmix_config_asm.m4 \
+	$(top_srcdir)/config/pmix_config_pthreads.m4 \
+	$(top_srcdir)/config/pmix_config_subdir.m4 \
+	$(top_srcdir)/config/pmix_config_subdir_args.m4 \
+	$(top_srcdir)/config/pmix_config_threads.m4 \
+	$(top_srcdir)/config/pmix_ensure_contains_optflags.m4 \
+	$(top_srcdir)/config/pmix_functions.m4 \
+	$(top_srcdir)/config/pmix_load_platform.m4 \
+	$(top_srcdir)/config/pmix_mca.m4 \
+	$(top_srcdir)/config/pmix_search_libs.m4 \
+	$(top_srcdir)/config/pmix_setup_cc.m4 \
+	$(top_srcdir)/config/pmix_setup_libevent.m4 \
+	$(top_srcdir)/config/pmix_setup_zlib.m4 \
+	$(top_srcdir)/config/pmix_try_assemble.m4 \
+	$(top_srcdir)/config/autogen_found_items.m4 \
+	$(top_srcdir)/src/mca/pdl/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/configure.m4 \
+	$(top_srcdir)/src/mca/pdl/pdlopen/configure.m4 \
+	$(top_srcdir)/src/mca/pdl/plibltdl/configure.m4 \
+	$(top_srcdir)/src/mca/pif/bsdx_ipv4/configure.m4 \
+	$(top_srcdir)/src/mca/pif/bsdx_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pif/linux_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pif/posix_ipv4/configure.m4 \
+	$(top_srcdir)/src/mca/pif/solaris_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/config/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/env/configure.m4 \
+	$(top_srcdir)/src/mca/pnet/opa/configure.m4 \
+	$(top_srcdir)/src/mca/psec/munge/configure.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(dist_pmixdata_DATA) \
+	$(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/src/include/pmix_config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(mcacomponentdir)" \
+	"$(DESTDIR)$(pmixdatadir)"
+LTLIBRARIES = $(mcacomponent_LTLIBRARIES) $(noinst_LTLIBRARIES)
+libmca_psensor_heartbeat_la_LIBADD =
+am__objects_1 = psensor_heartbeat.lo psensor_heartbeat_component.lo
+am_libmca_psensor_heartbeat_la_OBJECTS = $(am__objects_1)
+libmca_psensor_heartbeat_la_OBJECTS =  \
+	$(am_libmca_psensor_heartbeat_la_OBJECTS)
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+libmca_psensor_heartbeat_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(AM_CFLAGS) $(CFLAGS) $(libmca_psensor_heartbeat_la_LDFLAGS) \
+	$(LDFLAGS) -o $@
+ at MCA_BUILD_pmix_psensor_heartbeat_DSO_FALSE@am_libmca_psensor_heartbeat_la_rpath =
+mca_psensor_heartbeat_la_LIBADD =
+am_mca_psensor_heartbeat_la_OBJECTS = $(am__objects_1)
+mca_psensor_heartbeat_la_OBJECTS =  \
+	$(am_mca_psensor_heartbeat_la_OBJECTS)
+mca_psensor_heartbeat_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(AM_CFLAGS) $(CFLAGS) $(mca_psensor_heartbeat_la_LDFLAGS) \
+	$(LDFLAGS) -o $@
+ at MCA_BUILD_pmix_psensor_heartbeat_DSO_TRUE@am_mca_psensor_heartbeat_la_rpath =  \
+ at MCA_BUILD_pmix_psensor_heartbeat_DSO_TRUE@	-rpath \
+ at MCA_BUILD_pmix_psensor_heartbeat_DSO_TRUE@	$(mcacomponentdir)
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/src/include
+depcomp = $(SHELL) $(top_srcdir)/./config/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libmca_psensor_heartbeat_la_SOURCES) \
+	$(mca_psensor_heartbeat_la_SOURCES)
+DIST_SOURCES = $(libmca_psensor_heartbeat_la_SOURCES) \
+	$(mca_psensor_heartbeat_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+DATA = $(dist_pmixdata_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/./config/depcomp
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CFLAGS = @CFLAGS@
+CLEANFILES = @CLEANFILES@
+CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MCA_PROJECT_SUBDIRS = @MCA_PROJECT_SUBDIRS@
+MCA_pmix_FRAMEWORKS = @MCA_pmix_FRAMEWORKS@
+MCA_pmix_FRAMEWORKS_SUBDIRS = @MCA_pmix_FRAMEWORKS_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS@
+MCA_pmix_FRAMEWORK_LIBS = @MCA_pmix_FRAMEWORK_LIBS@
+MCA_pmix_pdl_ALL_COMPONENTS = @MCA_pmix_pdl_ALL_COMPONENTS@
+MCA_pmix_pdl_ALL_SUBDIRS = @MCA_pmix_pdl_ALL_SUBDIRS@
+MCA_pmix_pdl_DSO_COMPONENTS = @MCA_pmix_pdl_DSO_COMPONENTS@
+MCA_pmix_pdl_DSO_SUBDIRS = @MCA_pmix_pdl_DSO_SUBDIRS@
+MCA_pmix_pdl_STATIC_COMPONENTS = @MCA_pmix_pdl_STATIC_COMPONENTS@
+MCA_pmix_pdl_STATIC_LTLIBS = @MCA_pmix_pdl_STATIC_LTLIBS@
+MCA_pmix_pdl_STATIC_SUBDIRS = @MCA_pmix_pdl_STATIC_SUBDIRS@
+MCA_pmix_pif_ALL_COMPONENTS = @MCA_pmix_pif_ALL_COMPONENTS@
+MCA_pmix_pif_ALL_SUBDIRS = @MCA_pmix_pif_ALL_SUBDIRS@
+MCA_pmix_pif_DSO_COMPONENTS = @MCA_pmix_pif_DSO_COMPONENTS@
+MCA_pmix_pif_DSO_SUBDIRS = @MCA_pmix_pif_DSO_SUBDIRS@
+MCA_pmix_pif_STATIC_COMPONENTS = @MCA_pmix_pif_STATIC_COMPONENTS@
+MCA_pmix_pif_STATIC_LTLIBS = @MCA_pmix_pif_STATIC_LTLIBS@
+MCA_pmix_pif_STATIC_SUBDIRS = @MCA_pmix_pif_STATIC_SUBDIRS@
+MCA_pmix_pinstalldirs_ALL_COMPONENTS = @MCA_pmix_pinstalldirs_ALL_COMPONENTS@
+MCA_pmix_pinstalldirs_ALL_SUBDIRS = @MCA_pmix_pinstalldirs_ALL_SUBDIRS@
+MCA_pmix_pinstalldirs_DSO_COMPONENTS = @MCA_pmix_pinstalldirs_DSO_COMPONENTS@
+MCA_pmix_pinstalldirs_DSO_SUBDIRS = @MCA_pmix_pinstalldirs_DSO_SUBDIRS@
+MCA_pmix_pinstalldirs_STATIC_COMPONENTS = @MCA_pmix_pinstalldirs_STATIC_COMPONENTS@
+MCA_pmix_pinstalldirs_STATIC_LTLIBS = @MCA_pmix_pinstalldirs_STATIC_LTLIBS@
+MCA_pmix_pinstalldirs_STATIC_SUBDIRS = @MCA_pmix_pinstalldirs_STATIC_SUBDIRS@
+MCA_pmix_pnet_ALL_COMPONENTS = @MCA_pmix_pnet_ALL_COMPONENTS@
+MCA_pmix_pnet_ALL_SUBDIRS = @MCA_pmix_pnet_ALL_SUBDIRS@
+MCA_pmix_pnet_DSO_COMPONENTS = @MCA_pmix_pnet_DSO_COMPONENTS@
+MCA_pmix_pnet_DSO_SUBDIRS = @MCA_pmix_pnet_DSO_SUBDIRS@
+MCA_pmix_pnet_STATIC_COMPONENTS = @MCA_pmix_pnet_STATIC_COMPONENTS@
+MCA_pmix_pnet_STATIC_LTLIBS = @MCA_pmix_pnet_STATIC_LTLIBS@
+MCA_pmix_pnet_STATIC_SUBDIRS = @MCA_pmix_pnet_STATIC_SUBDIRS@
+MCA_pmix_psec_ALL_COMPONENTS = @MCA_pmix_psec_ALL_COMPONENTS@
+MCA_pmix_psec_ALL_SUBDIRS = @MCA_pmix_psec_ALL_SUBDIRS@
+MCA_pmix_psec_DSO_COMPONENTS = @MCA_pmix_psec_DSO_COMPONENTS@
+MCA_pmix_psec_DSO_SUBDIRS = @MCA_pmix_psec_DSO_SUBDIRS@
+MCA_pmix_psec_STATIC_COMPONENTS = @MCA_pmix_psec_STATIC_COMPONENTS@
+MCA_pmix_psec_STATIC_LTLIBS = @MCA_pmix_psec_STATIC_LTLIBS@
+MCA_pmix_psec_STATIC_SUBDIRS = @MCA_pmix_psec_STATIC_SUBDIRS@
+MCA_pmix_psensor_ALL_COMPONENTS = @MCA_pmix_psensor_ALL_COMPONENTS@
+MCA_pmix_psensor_ALL_SUBDIRS = @MCA_pmix_psensor_ALL_SUBDIRS@
+MCA_pmix_psensor_DSO_COMPONENTS = @MCA_pmix_psensor_DSO_COMPONENTS@
+MCA_pmix_psensor_DSO_SUBDIRS = @MCA_pmix_psensor_DSO_SUBDIRS@
+MCA_pmix_psensor_STATIC_COMPONENTS = @MCA_pmix_psensor_STATIC_COMPONENTS@
+MCA_pmix_psensor_STATIC_LTLIBS = @MCA_pmix_psensor_STATIC_LTLIBS@
+MCA_pmix_psensor_STATIC_SUBDIRS = @MCA_pmix_psensor_STATIC_SUBDIRS@
+MCA_pmix_ptl_ALL_COMPONENTS = @MCA_pmix_ptl_ALL_COMPONENTS@
+MCA_pmix_ptl_ALL_SUBDIRS = @MCA_pmix_ptl_ALL_SUBDIRS@
+MCA_pmix_ptl_DSO_COMPONENTS = @MCA_pmix_ptl_DSO_COMPONENTS@
+MCA_pmix_ptl_DSO_SUBDIRS = @MCA_pmix_ptl_DSO_SUBDIRS@
+MCA_pmix_ptl_STATIC_COMPONENTS = @MCA_pmix_ptl_STATIC_COMPONENTS@
+MCA_pmix_ptl_STATIC_LTLIBS = @MCA_pmix_ptl_STATIC_LTLIBS@
+MCA_pmix_ptl_STATIC_SUBDIRS = @MCA_pmix_ptl_STATIC_SUBDIRS@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PMIX_ASM_GSYM = @PMIX_ASM_GSYM@
+PMIX_ASM_LSYM = @PMIX_ASM_LSYM@
+PMIX_ASM_SUPPORT_64BIT = @PMIX_ASM_SUPPORT_64BIT@
+PMIX_ASM_TEXT = @PMIX_ASM_TEXT@
+PMIX_ASM_TYPE = @PMIX_ASM_TYPE@
+PMIX_ASSEMBLY_ARCH = @PMIX_ASSEMBLY_ARCH@
+PMIX_ASSEMBLY_BUILTIN = @PMIX_ASSEMBLY_BUILTIN@
+PMIX_ASSEMBLY_FORMAT = @PMIX_ASSEMBLY_FORMAT@
+PMIX_AS_GLOBAL = @PMIX_AS_GLOBAL@
+PMIX_AS_LABEL_SUFFIX = @PMIX_AS_LABEL_SUFFIX@
+PMIX_CC_ABSOLUTE = @PMIX_CC_ABSOLUTE@
+PMIX_CONFIGURE_DATE = @PMIX_CONFIGURE_DATE@
+PMIX_CONFIGURE_HOST = @PMIX_CONFIGURE_HOST@
+PMIX_CONFIGURE_USER = @PMIX_CONFIGURE_USER@
+PMIX_EMBEDDED_CPPFLAGS = @PMIX_EMBEDDED_CPPFLAGS@
+PMIX_EMBEDDED_LDFLAGS = @PMIX_EMBEDDED_LDFLAGS@
+PMIX_EMBEDDED_LIBS = @PMIX_EMBEDDED_LIBS@
+PMIX_MAJOR_VERSION = @PMIX_MAJOR_VERSION@
+PMIX_MINOR_VERSION = @PMIX_MINOR_VERSION@
+PMIX_RELEASE_DATE = @PMIX_RELEASE_DATE@
+PMIX_RELEASE_VERSION = @PMIX_RELEASE_VERSION@
+PMIX_RENAME = @PMIX_RENAME@
+PMIX_VERSION = @PMIX_VERSION@
+PMIX_top_builddir = @PMIX_top_builddir@
+PMIX_top_srcdir = @PMIX_top_srcdir@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_prefix_program = @ac_prefix_program@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+libpmix_so_version = @libpmix_so_version@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pmix_have_pandoc = @pmix_have_pandoc@
+pmix_pdl_pdlopen_LIBS = @pmix_pdl_pdlopen_LIBS@
+pmix_pdl_plibltdl_CPPFLAGS = @pmix_pdl_plibltdl_CPPFLAGS@
+pmix_pdl_plibltdl_LDFLAGS = @pmix_pdl_plibltdl_LDFLAGS@
+pmix_pdl_plibltdl_LIBS = @pmix_pdl_plibltdl_LIBS@
+pmixdatadir = @pmixdatadir@
+pmixincludedir = @pmixincludedir@
+pmixlibdir = @pmixlibdir@
+pmixmajor = @pmixmajor@
+pmixminor = @pmixminor@
+pnet_opa_CFLAGS = @pnet_opa_CFLAGS@
+pnet_opa_CPPFLAGS = @pnet_opa_CPPFLAGS@
+pnet_opa_LDFLAGS = @pnet_opa_LDFLAGS@
+pnet_opa_LIBS = @pnet_opa_LIBS@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+psec_munge_CPPFLAGS = @psec_munge_CPPFLAGS@
+psec_munge_LDFLAGS = @psec_munge_LDFLAGS@
+psec_munge_LIBS = @psec_munge_LIBS@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+dist_pmixdata_DATA = help-pmix-psensor-heartbeat.txt
+sources = \
+        psensor_heartbeat.c \
+        psensor_heartbeat.h \
+        psensor_heartbeat_component.c
+
+ at MCA_BUILD_pmix_psensor_heartbeat_DSO_FALSE@component_noinst = libmca_psensor_heartbeat.la
+
+# Make the output library in this directory, and name it either
+# mca_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la
+# (for static builds).
+ at MCA_BUILD_pmix_psensor_heartbeat_DSO_TRUE@component_noinst = 
+ at MCA_BUILD_pmix_psensor_heartbeat_DSO_FALSE@component_install = 
+ at MCA_BUILD_pmix_psensor_heartbeat_DSO_TRUE@component_install = mca_psensor_heartbeat.la
+mcacomponentdir = $(pmixlibdir)
+mcacomponent_LTLIBRARIES = $(component_install)
+mca_psensor_heartbeat_la_SOURCES = $(sources)
+mca_psensor_heartbeat_la_LDFLAGS = -module -avoid-version
+noinst_LTLIBRARIES = $(component_noinst)
+libmca_psensor_heartbeat_la_SOURCES = $(sources)
+libmca_psensor_heartbeat_la_LDFLAGS = -module -avoid-version
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/mca/psensor/heartbeat/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/mca/psensor/heartbeat/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+install-mcacomponentLTLIBRARIES: $(mcacomponent_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	@list='$(mcacomponent_LTLIBRARIES)'; test -n "$(mcacomponentdir)" || 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)$(mcacomponentdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(mcacomponentdir)" || exit 1; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(mcacomponentdir)'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(mcacomponentdir)"; \
+	}
+
+uninstall-mcacomponentLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(mcacomponent_LTLIBRARIES)'; test -n "$(mcacomponentdir)" || list=; \
+	for p in $$list; do \
+	  $(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(mcacomponentdir)/$$f'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(mcacomponentdir)/$$f"; \
+	done
+
+clean-mcacomponentLTLIBRARIES:
+	-test -z "$(mcacomponent_LTLIBRARIES)" || rm -f $(mcacomponent_LTLIBRARIES)
+	@list='$(mcacomponent_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}; \
+	}
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_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}; \
+	}
+
+libmca_psensor_heartbeat.la: $(libmca_psensor_heartbeat_la_OBJECTS) $(libmca_psensor_heartbeat_la_DEPENDENCIES) $(EXTRA_libmca_psensor_heartbeat_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(libmca_psensor_heartbeat_la_LINK) $(am_libmca_psensor_heartbeat_la_rpath) $(libmca_psensor_heartbeat_la_OBJECTS) $(libmca_psensor_heartbeat_la_LIBADD) $(LIBS)
+
+mca_psensor_heartbeat.la: $(mca_psensor_heartbeat_la_OBJECTS) $(mca_psensor_heartbeat_la_DEPENDENCIES) $(EXTRA_mca_psensor_heartbeat_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(mca_psensor_heartbeat_la_LINK) $(am_mca_psensor_heartbeat_la_rpath) $(mca_psensor_heartbeat_la_OBJECTS) $(mca_psensor_heartbeat_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/psensor_heartbeat.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/psensor_heartbeat_component.Plo at am__quote@
+
+.c.o:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+ at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-dist_pmixdataDATA: $(dist_pmixdata_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(dist_pmixdata_DATA)'; test -n "$(pmixdatadir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(pmixdatadir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(pmixdatadir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pmixdatadir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pmixdatadir)" || exit $$?; \
+	done
+
+uninstall-dist_pmixdataDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_pmixdata_DATA)'; test -n "$(pmixdatadir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(pmixdatadir)'; $(am__uninstall_files_from_dir)
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES) $(DATA)
+installdirs:
+	for dir in "$(DESTDIR)$(mcacomponentdir)" "$(DESTDIR)$(pmixdatadir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-mcacomponentLTLIBRARIES \
+	clean-noinstLTLIBRARIES mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-dist_pmixdataDATA \
+	install-mcacomponentLTLIBRARIES
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-dist_pmixdataDATA \
+	uninstall-mcacomponentLTLIBRARIES
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-mcacomponentLTLIBRARIES \
+	clean-noinstLTLIBRARIES 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-dist_pmixdataDATA install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man \
+	install-mcacomponentLTLIBRARIES install-pdf install-pdf-am \
+	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-dist_pmixdataDATA uninstall-mcacomponentLTLIBRARIES
+
+.PRECIOUS: Makefile
+
+
+# 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/mca/psensor/heartbeat/help-pmix-psensor-heartbeat.txt b/src/mca/psensor/heartbeat/help-pmix-psensor-heartbeat.txt
new file mode 100644
index 0000000..945e60b
--- /dev/null
+++ b/src/mca/psensor/heartbeat/help-pmix-psensor-heartbeat.txt
@@ -0,0 +1,20 @@
+# -*- text -*-
+#
+# Copyright (c) 2010      Cisco Systems, Inc.  All rights reserved.
+#
+# Copyright (c) 2017      Intel, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+# This is the US/English general help file for the memory usage sensor
+#
+[mem-limit-exceeded]
+A process has exceeded the specified limit on memory usage:
+
+Node:         %s
+Process rank: %s
+Memory used:  %luGbytes
+Memory limit: %luGbytes
diff --git a/src/mca/psensor/heartbeat/psensor_heartbeat.c b/src/mca/psensor/heartbeat/psensor_heartbeat.c
new file mode 100644
index 0000000..3147cfd
--- /dev/null
+++ b/src/mca/psensor/heartbeat/psensor_heartbeat.c
@@ -0,0 +1,341 @@
+/*
+ * Copyright (c) 2010      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2011-2012 Los Alamos National Security, LLC.  All rights
+ *                         reserved.
+  *
+ * Copyright (c) 2017      Intel, Inc.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+#include <pmix_common.h>
+
+#include <errno.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif  /* HAVE_UNISTD_H */
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif  /* HAVE_STRING_H */
+#include <stdio.h>
+#include <pthread.h>
+#include PMIX_EVENT_HEADER
+
+#include "src/util/argv.h"
+#include "src/util/error.h"
+#include "src/util/output.h"
+#include "src/util/show_help.h"
+#include "src/include/pmix_globals.h"
+#include "src/mca/ptl/ptl.h"
+
+#include "src/mca/psensor/base/base.h"
+#include "psensor_heartbeat.h"
+
+/* declare the API functions */
+static pmix_status_t heartbeat_start(pmix_peer_t *requestor, pmix_status_t error,
+                                     const pmix_info_t *monitor,
+                                     const pmix_info_t directives[], size_t ndirs);
+static pmix_status_t heartbeat_stop(pmix_peer_t *requestor, char *id);
+
+/* instantiate the module */
+pmix_psensor_base_module_t pmix_psensor_heartbeat_module = {
+    .start = heartbeat_start,
+    .stop = heartbeat_stop
+};
+
+/* tracker object */
+typedef struct {
+    pmix_list_item_t super;
+    pmix_peer_t *requestor;
+    char *id;
+    bool event_active;
+    pmix_event_t ev;
+    pmix_event_t cdev;
+    struct timeval tv;
+    uint32_t nbeats;
+    uint32_t ndrops;
+    uint32_t nmissed;
+    pmix_status_t error;
+    pmix_data_range_t range;
+    pmix_info_t *info;
+    size_t ninfo;
+} pmix_heartbeat_trkr_t;
+
+static void ft_constructor(pmix_heartbeat_trkr_t *ft)
+{
+    ft->requestor = NULL;
+    ft->id = NULL;
+    ft->event_active = false;
+    ft->tv.tv_sec = 0;
+    ft->tv.tv_usec = 0;
+    ft->nbeats = 0;
+    ft->ndrops = 0;
+    ft->nmissed = 0;
+    ft->error = PMIX_SUCCESS;
+    ft->range = PMIX_RANGE_NAMESPACE;
+    ft->info = NULL;
+    ft->ninfo = 0;
+}
+static void ft_destructor(pmix_heartbeat_trkr_t *ft)
+{
+    if (NULL != ft->requestor) {
+        PMIX_RELEASE(ft->requestor);
+    }
+    if (NULL != ft->id) {
+        free(ft->id);
+    }
+    if (ft->event_active) {
+        pmix_event_del(&ft->ev);
+    }
+    if (NULL != ft->info) {
+        PMIX_INFO_FREE(ft->info, ft->ninfo);
+    }
+}
+PMIX_CLASS_INSTANCE(pmix_heartbeat_trkr_t,
+                    pmix_list_item_t,
+                    ft_constructor, ft_destructor);
+
+/* define a local caddy */
+typedef struct {
+    pmix_object_t super;
+    pmix_event_t ev;
+    pmix_peer_t *requestor;
+    char *id;
+} heartbeat_caddy_t;
+static void cd_con(heartbeat_caddy_t *p)
+{
+    p->requestor = NULL;
+    p->id = NULL;
+}
+static void cd_des(heartbeat_caddy_t *p)
+{
+    if (NULL != (p->requestor)) {
+        PMIX_RELEASE(p->requestor);
+    }
+    if (NULL != p->id) {
+        free(p->id);
+    }
+}
+PMIX_CLASS_INSTANCE(heartbeat_caddy_t,
+                    pmix_object_t,
+                    cd_con, cd_des);
+
+typedef struct {
+    pmix_object_t super;
+    pmix_event_t ev;
+    pmix_peer_t *peer;
+} pmix_psensor_beat_t;
+
+static void bcon(pmix_psensor_beat_t *p)
+{
+    p->peer = NULL;
+}
+static void bdes(pmix_psensor_beat_t *p)
+{
+    if (NULL != p->peer) {
+        PMIX_RELEASE(p->peer);
+    }
+}
+PMIX_CLASS_INSTANCE(pmix_psensor_beat_t,
+                    pmix_object_t,
+                    bcon, bdes);
+
+static void check_heartbeat(int fd, short dummy, void *arg);
+
+static void add_tracker(int sd, short flags, void *cbdata)
+{
+    pmix_heartbeat_trkr_t *ft = (pmix_heartbeat_trkr_t*)cbdata;
+
+    PMIX_ACQUIRE_OBJECT(ft);
+
+    /* add the tracker to our list */
+    pmix_list_append(&mca_psensor_heartbeat_component.trackers, &ft->super);
+
+    /* setup the timer event */
+    pmix_event_evtimer_set(pmix_psensor_base.evbase, &ft->ev,
+                           check_heartbeat, ft);
+    pmix_event_evtimer_add(&ft->ev, &ft->tv);
+    ft->event_active = true;
+}
+
+static pmix_status_t heartbeat_start(pmix_peer_t *requestor, pmix_status_t error,
+                                     const pmix_info_t *monitor,
+                                     const pmix_info_t directives[], size_t ndirs)
+{
+    pmix_heartbeat_trkr_t *ft;
+    size_t n;
+
+    PMIX_OUTPUT_VERBOSE((1, pmix_psensor_base_framework.framework_output,
+                         "[%s:%d] checking heartbeat monitoring for requestor %s:%d",
+                         pmix_globals.myid.nspace, pmix_globals.myid.rank,
+                         requestor->info->nptr->nspace, requestor->info->rank));
+
+    /* if they didn't ask for heartbeats, then nothing for us to do */
+    if (0 != strcmp(monitor->key, PMIX_MONITOR_HEARTBEAT)) {
+        return PMIX_ERR_TAKE_NEXT_OPTION;
+    }
+
+    /* setup to track this monitoring operation */
+    ft = PMIX_NEW(pmix_heartbeat_trkr_t);
+    PMIX_RETAIN(requestor);
+    ft->requestor = requestor;
+    ft->error = error;
+
+    /* check the directives to see what they want monitored */
+    for (n=0; n < ndirs; n++) {
+        if (0 == strcmp(directives[n].key, PMIX_MONITOR_HEARTBEAT_TIME)) {
+            ft->tv.tv_sec = directives[n].value.data.uint32;
+        } else if (0 == strcmp(directives[n].key, PMIX_MONITOR_HEARTBEAT_DROPS)) {
+            ft->ndrops = directives[n].value.data.uint32;
+        } else if (0 == strcmp(directives[n].key, PMIX_RANGE)) {
+            ft->range = directives[n].value.data.range;
+        }
+    }
+
+    if (0 == ft->tv.tv_sec) {
+        /* didn't specify a sample rate, or what should be sampled */
+        PMIX_RELEASE(ft);
+        return PMIX_ERR_BAD_PARAM;
+    }
+
+    /* need to push into our event base to add this to our trackers */
+    pmix_event_assign(&ft->cdev, pmix_psensor_base.evbase, -1,
+                      EV_WRITE, add_tracker, ft);
+    PMIX_POST_OBJECT(ft);
+    pmix_event_active(&ft->cdev, EV_WRITE, 1);
+
+    return PMIX_SUCCESS;
+}
+
+static void del_tracker(int sd, short flags, void *cbdata)
+{
+    heartbeat_caddy_t *cd = (heartbeat_caddy_t*)cbdata;
+    pmix_heartbeat_trkr_t *ft, *ftnext;
+
+    PMIX_ACQUIRE_OBJECT(cd);
+
+    /* remove the tracker from our list */
+    PMIX_LIST_FOREACH_SAFE(ft, ftnext, &mca_psensor_heartbeat_component.trackers, pmix_heartbeat_trkr_t) {
+        if (ft->requestor != cd->requestor) {
+            continue;
+        }
+        if (NULL == cd->id ||
+            (NULL != ft->id && 0 == strcmp(ft->id, cd->id))) {
+            pmix_list_remove_item(&mca_psensor_heartbeat_component.trackers, &ft->super);
+            PMIX_RELEASE(ft);
+        }
+    }
+    PMIX_RELEASE(cd);
+}
+
+static pmix_status_t heartbeat_stop(pmix_peer_t *requestor, char *id)
+{
+    heartbeat_caddy_t *cd;
+
+    cd = PMIX_NEW(heartbeat_caddy_t);
+    PMIX_RETAIN(requestor);
+    cd->requestor = requestor;
+    cd->id = strdup(id);
+
+    /* need to push into our event base to add this to our trackers */
+    pmix_event_assign(&cd->ev, pmix_psensor_base.evbase, -1,
+                      EV_WRITE, del_tracker, cd);
+    PMIX_POST_OBJECT(cd);
+    pmix_event_active(&cd->ev, EV_WRITE, 1);
+
+    return PMIX_SUCCESS;
+}
+
+static void opcbfunc(pmix_status_t status, void *cbdata)
+{
+    pmix_heartbeat_trkr_t *ft = (pmix_heartbeat_trkr_t*)cbdata;
+
+    PMIX_RELEASE(ft);
+}
+
+/* this function automatically gets periodically called
+ * by the event library so we can check on the state
+ * of the various procs we are monitoring
+ */
+static void check_heartbeat(int fd, short dummy, void *cbdata)
+{
+    pmix_heartbeat_trkr_t *ft = (pmix_heartbeat_trkr_t*)cbdata;
+    pmix_status_t rc;
+    pmix_proc_t source;
+
+    PMIX_ACQUIRE_OBJECT(ft);
+
+    PMIX_OUTPUT_VERBOSE((1, pmix_psensor_base_framework.framework_output,
+                         "[%s:%d] sensor:check_heartbeat for proc %s:%d",
+                         pmix_globals.myid.nspace, pmix_globals.myid.rank,
+                        ft->requestor->info->nptr->nspace, ft->requestor->info->rank));
+
+    if (0 == ft->nbeats) {
+        /* no heartbeat recvd in last window */
+        PMIX_OUTPUT_VERBOSE((1, pmix_psensor_base_framework.framework_output,
+                             "[%s:%d] sensor:check_heartbeat failed for proc %s:%d",
+                             pmix_globals.myid.nspace, pmix_globals.myid.rank,
+                             ft->requestor->info->nptr->nspace, ft->requestor->info->rank));
+        /* stop monitoring this client */
+        pmix_list_remove_item(&mca_psensor_heartbeat_component.trackers, &ft->super);
+        /* generate an event */
+        (void)strncpy(source.nspace, ft->requestor->info->nptr->nspace, PMIX_MAX_NSLEN);
+        source.rank = ft->requestor->info->rank;
+        rc = PMIx_Notify_event(PMIX_MONITOR_HEARTBEAT_ALERT, &source,
+                               ft->range, ft->info, ft->ninfo, opcbfunc, ft);
+        if (PMIX_SUCCESS != rc) {
+            PMIX_ERROR_LOG(rc);
+        }
+        return;
+    } else {
+        PMIX_OUTPUT_VERBOSE((1, pmix_psensor_base_framework.framework_output,
+                             "[%s:%d] sensor:check_heartbeat detected %d beats for proc %s:%d",
+                             pmix_globals.myid.nspace, pmix_globals.myid.rank, ft->nbeats,
+                             ft->requestor->info->nptr->nspace, ft->requestor->info->rank));
+    }
+    /* reset for next period */
+    ft->nbeats = 0;
+
+    /* reset the timer */
+    pmix_event_evtimer_add(&ft->ev, &ft->tv);
+}
+
+static void add_beat(int sd, short args, void *cbdata)
+{
+    pmix_psensor_beat_t *b = (pmix_psensor_beat_t*)cbdata;
+    pmix_heartbeat_trkr_t *ft;
+
+    PMIX_ACQUIRE_OBJECT(b);
+
+    /* find this peer in our trackers */
+    PMIX_LIST_FOREACH(ft, &mca_psensor_heartbeat_component.trackers, pmix_heartbeat_trkr_t) {
+        if (ft->requestor == b->peer) {
+            /* increment the beat count */
+            ++ft->nbeats;
+            break;
+        }
+    }
+
+    PMIX_RELEASE(b);
+}
+
+void pmix_psensor_heartbeat_recv_beats(struct pmix_peer_t *peer,
+                                       pmix_ptl_hdr_t *hdr,
+                                       pmix_buffer_t *buf, void *cbdata)
+{
+    pmix_psensor_beat_t *b;
+
+    b = PMIX_NEW(pmix_psensor_beat_t);
+    PMIX_RETAIN(peer);
+    b->peer = peer;
+
+    /* shift this to our thread for processing */
+    pmix_event_assign(&b->ev, pmix_psensor_base.evbase, -1,
+                      EV_WRITE, add_beat, b);
+    PMIX_POST_OBJECT(b);
+    pmix_event_active(&b->ev, EV_WRITE, 1);
+}
diff --git a/src/mca/psensor/heartbeat/psensor_heartbeat.h b/src/mca/psensor/heartbeat/psensor_heartbeat.h
new file mode 100644
index 0000000..2f904b6
--- /dev/null
+++ b/src/mca/psensor/heartbeat/psensor_heartbeat.h
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2010      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2012      Los Alamos National Security, Inc. All rights reserved.
+ *
+ * Copyright (c) 2017      Intel, Inc.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+/**
+ * @file
+ *
+ * Heartbeat sensor
+ */
+#ifndef PMIX_PSENSOR_HEARTBEAT_H
+#define PMIX_PSENSOR_HEARTBEAT_H
+
+#include <src/include/pmix_config.h>
+#include <src/include/types.h>
+
+#include "src/class/pmix_list.h"
+#include "src/include/pmix_globals.h"
+#include "src/mca/psensor/psensor.h"
+
+BEGIN_C_DECLS
+
+typedef struct {
+    pmix_psensor_base_component_t super;
+    pmix_list_t trackers;
+} pmix_psensor_heartbeat_component_t;
+
+PMIX_EXPORT extern pmix_psensor_heartbeat_component_t mca_psensor_heartbeat_component;
+extern pmix_psensor_base_module_t pmix_psensor_heartbeat_module;
+
+void pmix_psensor_heartbeat_recv_beats(struct pmix_peer_t *peer,
+                                       pmix_ptl_hdr_t *hdr,
+                                       pmix_buffer_t *buf, void *cbdata);
+
+END_C_DECLS
+
+#endif
diff --git a/src/mca/psensor/heartbeat/psensor_heartbeat_component.c b/src/mca/psensor/heartbeat/psensor_heartbeat_component.c
new file mode 100644
index 0000000..e16a26a
--- /dev/null
+++ b/src/mca/psensor/heartbeat/psensor_heartbeat_component.c
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2010      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2012      Los Alamos National Security, Inc. All rights reserved.
+ * Copyright (c) 2017      Intel, Inc.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+#include <pmix_common.h>
+
+#include "src/mca/ptl/ptl.h"
+#include "src/mca/psensor/base/base.h"
+#include "src/mca/psensor/heartbeat/psensor_heartbeat.h"
+
+/*
+ * Local functions
+ */
+
+static int heartbeat_open(void);
+static int heartbeat_close(void);
+static int heartbeat_query(pmix_mca_base_module_t **module, int *priority);
+
+pmix_psensor_heartbeat_component_t mca_psensor_heartbeat_component = {
+    .super = {
+        .base = {
+            PMIX_PSENSOR_BASE_VERSION_1_0_0,
+
+            /* Component name and version */
+            .pmix_mca_component_name = "heartbeat",
+            PMIX_MCA_BASE_MAKE_VERSION(component,
+                                       PMIX_MAJOR_VERSION,
+                                       PMIX_MINOR_VERSION,
+                                       PMIX_RELEASE_VERSION),
+
+            /* Component open and close functions */
+            heartbeat_open,  /* component open  */
+            heartbeat_close, /* component close */
+            heartbeat_query  /* component query */
+        }
+    }
+};
+
+
+/**
+  * component open/close/init function
+  */
+static int heartbeat_open(void)
+{
+    PMIX_CONSTRUCT(&mca_psensor_heartbeat_component.trackers, pmix_list_t);
+
+    /* setup to receive heartbeats */
+    pmix_ptl.recv(pmix_globals.mypeer, pmix_psensor_heartbeat_recv_beats, PMIX_PTL_TAG_HEARTBEAT);
+
+    return PMIX_SUCCESS;
+}
+
+
+static int heartbeat_query(pmix_mca_base_module_t **module, int *priority)
+{
+    *priority = 5;  // irrelevant
+    *module = (pmix_mca_base_module_t *)&pmix_psensor_heartbeat_module;
+    return PMIX_SUCCESS;
+}
+
+/**
+ *  Close all subsystems.
+ */
+
+static int heartbeat_close(void)
+{
+    /* cancel our persistent recv */
+    pmix_ptl.cancel(pmix_globals.mypeer, PMIX_PTL_TAG_HEARTBEAT);
+
+    PMIX_LIST_DESTRUCT(&mca_psensor_heartbeat_component.trackers);
+
+    return PMIX_SUCCESS;
+}
diff --git a/src/mca/psensor/psensor.h b/src/mca/psensor/psensor.h
new file mode 100644
index 0000000..e1c019e
--- /dev/null
+++ b/src/mca/psensor/psensor.h
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2009      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2012      Los Alamos National Security, Inc. All rights reserved.
+ * Copyright (c) 2014-2017 Intel, Inc.  All rights reserved.
+ *
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ *
+ * @file:
+ *
+ */
+
+#ifndef PMIX_PSENSOR_H_
+#define PMIX_PSENSOR_H_
+
+#include <src/include/pmix_config.h>
+
+#include "src/class/pmix_list.h"
+#include "src/mca/mca.h"
+#include "src/include/pmix_globals.h"
+
+BEGIN_C_DECLS
+
+/*
+ * Component functions - all MUST be provided!
+ */
+
+/* start a sensor operation:
+ *
+ * requestor - the process requesting this operation
+ *
+ * monitor - a PMIx attribute specifying what is to be monitored
+ *
+ * directives - an array of pmix_info_t specifying relevant limits on values, and action
+ *              to be taken when limits exceeded. Can include
+ *              user-provided "id" string */
+typedef pmix_status_t (*pmix_psensor_base_module_start_fn_t)(pmix_peer_t *requestor, pmix_status_t error,
+                                                             const pmix_info_t *monitor,
+                                                             const pmix_info_t directives[], size_t ndirs);
+
+/* stop a sensor operation:
+ *
+ * requestor - the process requesting this operation
+ *
+ * id - the "id" string provided by the user at the time the
+ *      affected monitoring operation was started. A NULL indicates
+ *      that all operations started by this requestor are to
+ *      be terminated */
+typedef pmix_status_t (*pmix_psensor_base_module_stop_fn_t)(pmix_peer_t *requestor,
+                                                            char *id);
+
+/* API module */
+/*
+ * Ver 1.0
+ */
+typedef struct pmix_psensor_base_module_1_0_0_t {
+    pmix_psensor_base_module_start_fn_t      start;
+    pmix_psensor_base_module_stop_fn_t       stop;
+} pmix_psensor_base_module_t;
+
+/*
+ * the standard component data structure
+ */
+typedef struct pmix_psensor_base_component_1_0_0_t {
+    pmix_mca_base_component_t base;
+    pmix_mca_base_component_data_t data;
+} pmix_psensor_base_component_t;
+
+
+
+/*
+ * Macro for use in components that are of type sensor v1.0.0
+ */
+#define PMIX_PSENSOR_BASE_VERSION_1_0_0 \
+  PMIX_MCA_BASE_VERSION_1_0_0("psensor", 1, 0, 0)
+
+/* Global structure for accessing sensor functions
+ */
+PMIX_EXPORT extern pmix_psensor_base_module_t pmix_psensor;  /* holds API function pointers */
+
+END_C_DECLS
+
+#endif /* MCA_SENSOR_H */
diff --git a/src/mca/ptl/Makefile.am b/src/mca/ptl/Makefile.am
new file mode 100644
index 0000000..dcc0b26
--- /dev/null
+++ b/src/mca/ptl/Makefile.am
@@ -0,0 +1,44 @@
+# -*- makefile -*-
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2012      Los Alamos National Security, Inc.  All rights reserved.
+# Copyright (c) 2013-2016 Intel, Inc. All rights reserved
+# Copyright (c) 2016      Cisco Systems, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+AM_CPPFLAGS = $(LTDLINCL)
+
+# main library setup
+noinst_LTLIBRARIES = libmca_ptl.la
+libmca_ptl_la_SOURCES =
+
+# local files
+headers = ptl.h ptl_types.h
+sources =
+
+# Conditionally install the header files
+if WANT_INSTALL_HEADERS
+pmixdir = $(pmixincludedir)/$(subdir)
+nobase_pmix_HEADERS = $(headers)
+endif
+
+include base/Makefile.include
+
+libmca_ptl_la_SOURCES += $(headers) $(sources)
+
+distclean-local:
+	rm -f base/static-components.h
diff --git a/src/mca/ptl/Makefile.in b/src/mca/ptl/Makefile.in
new file mode 100644
index 0000000..754bfda
--- /dev/null
+++ b/src/mca/ptl/Makefile.in
@@ -0,0 +1,910 @@
+# Makefile.in generated by automake 1.15 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+# -*- makefile -*-
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2012      Los Alamos National Security, Inc.  All rights reserved.
+# Copyright (c) 2013-2016 Intel, Inc. All rights reserved
+# Copyright (c) 2016      Cisco Systems, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# -*- makefile -*-
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2012      Los Alamos National Security, Inc.  All rights reserved.
+# Copyright (c) 2013-2016 Intel, Inc. All rights reserved
+# Copyright (c) 2016      Cisco Systems, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# This makefile.include does not stand on its own - it is included from
+# src/Makefile.am
+
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+subdir = src/mca/ptl
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/config/c_get_alignment.m4 \
+	$(top_srcdir)/config/libtool.m4 \
+	$(top_srcdir)/config/ltoptions.m4 \
+	$(top_srcdir)/config/ltsugar.m4 \
+	$(top_srcdir)/config/ltversion.m4 \
+	$(top_srcdir)/config/lt~obsolete.m4 \
+	$(top_srcdir)/config/pmix.m4 \
+	$(top_srcdir)/config/pmix_check_attributes.m4 \
+	$(top_srcdir)/config/pmix_check_broken_qsort.m4 \
+	$(top_srcdir)/config/pmix_check_compiler_version.m4 \
+	$(top_srcdir)/config/pmix_check_icc.m4 \
+	$(top_srcdir)/config/pmix_check_ident.m4 \
+	$(top_srcdir)/config/pmix_check_lock.m4 \
+	$(top_srcdir)/config/pmix_check_os_flavors.m4 \
+	$(top_srcdir)/config/pmix_check_package.m4 \
+	$(top_srcdir)/config/pmix_check_psm2.m4 \
+	$(top_srcdir)/config/pmix_check_pthread_pids.m4 \
+	$(top_srcdir)/config/pmix_check_vendor.m4 \
+	$(top_srcdir)/config/pmix_check_visibility.m4 \
+	$(top_srcdir)/config/pmix_check_withdir.m4 \
+	$(top_srcdir)/config/pmix_config_asm.m4 \
+	$(top_srcdir)/config/pmix_config_pthreads.m4 \
+	$(top_srcdir)/config/pmix_config_subdir.m4 \
+	$(top_srcdir)/config/pmix_config_subdir_args.m4 \
+	$(top_srcdir)/config/pmix_config_threads.m4 \
+	$(top_srcdir)/config/pmix_ensure_contains_optflags.m4 \
+	$(top_srcdir)/config/pmix_functions.m4 \
+	$(top_srcdir)/config/pmix_load_platform.m4 \
+	$(top_srcdir)/config/pmix_mca.m4 \
+	$(top_srcdir)/config/pmix_search_libs.m4 \
+	$(top_srcdir)/config/pmix_setup_cc.m4 \
+	$(top_srcdir)/config/pmix_setup_libevent.m4 \
+	$(top_srcdir)/config/pmix_setup_zlib.m4 \
+	$(top_srcdir)/config/pmix_try_assemble.m4 \
+	$(top_srcdir)/config/autogen_found_items.m4 \
+	$(top_srcdir)/src/mca/pdl/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/configure.m4 \
+	$(top_srcdir)/src/mca/pdl/pdlopen/configure.m4 \
+	$(top_srcdir)/src/mca/pdl/plibltdl/configure.m4 \
+	$(top_srcdir)/src/mca/pif/bsdx_ipv4/configure.m4 \
+	$(top_srcdir)/src/mca/pif/bsdx_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pif/linux_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pif/posix_ipv4/configure.m4 \
+	$(top_srcdir)/src/mca/pif/solaris_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/config/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/env/configure.m4 \
+	$(top_srcdir)/src/mca/pnet/opa/configure.m4 \
+	$(top_srcdir)/src/mca/psec/munge/configure.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__nobase_pmix_HEADERS_DIST) \
+	$(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/src/include/pmix_config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+libmca_ptl_la_LIBADD =
+am__objects_1 =
+am__dirstamp = $(am__leading_dot)dirstamp
+am__objects_2 = base/ptl_base_frame.lo base/ptl_base_select.lo \
+	base/ptl_base_sendrecv.lo base/ptl_base_listener.lo \
+	base/ptl_base_stubs.lo base/ptl_base_connect.lo
+am_libmca_ptl_la_OBJECTS = $(am__objects_1) $(am__objects_2)
+libmca_ptl_la_OBJECTS = $(am_libmca_ptl_la_OBJECTS)
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/src/include
+depcomp = $(SHELL) $(top_srcdir)/./config/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libmca_ptl_la_SOURCES)
+DIST_SOURCES = $(libmca_ptl_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__nobase_pmix_HEADERS_DIST = ptl.h ptl_types.h base/base.h
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(pmixdir)"
+HEADERS = $(nobase_pmix_HEADERS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+	$(srcdir)/base/Makefile.include $(top_srcdir)/./config/depcomp
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CFLAGS = @CFLAGS@
+CLEANFILES = @CLEANFILES@
+CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MCA_PROJECT_SUBDIRS = @MCA_PROJECT_SUBDIRS@
+MCA_pmix_FRAMEWORKS = @MCA_pmix_FRAMEWORKS@
+MCA_pmix_FRAMEWORKS_SUBDIRS = @MCA_pmix_FRAMEWORKS_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS@
+MCA_pmix_FRAMEWORK_LIBS = @MCA_pmix_FRAMEWORK_LIBS@
+MCA_pmix_pdl_ALL_COMPONENTS = @MCA_pmix_pdl_ALL_COMPONENTS@
+MCA_pmix_pdl_ALL_SUBDIRS = @MCA_pmix_pdl_ALL_SUBDIRS@
+MCA_pmix_pdl_DSO_COMPONENTS = @MCA_pmix_pdl_DSO_COMPONENTS@
+MCA_pmix_pdl_DSO_SUBDIRS = @MCA_pmix_pdl_DSO_SUBDIRS@
+MCA_pmix_pdl_STATIC_COMPONENTS = @MCA_pmix_pdl_STATIC_COMPONENTS@
+MCA_pmix_pdl_STATIC_LTLIBS = @MCA_pmix_pdl_STATIC_LTLIBS@
+MCA_pmix_pdl_STATIC_SUBDIRS = @MCA_pmix_pdl_STATIC_SUBDIRS@
+MCA_pmix_pif_ALL_COMPONENTS = @MCA_pmix_pif_ALL_COMPONENTS@
+MCA_pmix_pif_ALL_SUBDIRS = @MCA_pmix_pif_ALL_SUBDIRS@
+MCA_pmix_pif_DSO_COMPONENTS = @MCA_pmix_pif_DSO_COMPONENTS@
+MCA_pmix_pif_DSO_SUBDIRS = @MCA_pmix_pif_DSO_SUBDIRS@
+MCA_pmix_pif_STATIC_COMPONENTS = @MCA_pmix_pif_STATIC_COMPONENTS@
+MCA_pmix_pif_STATIC_LTLIBS = @MCA_pmix_pif_STATIC_LTLIBS@
+MCA_pmix_pif_STATIC_SUBDIRS = @MCA_pmix_pif_STATIC_SUBDIRS@
+MCA_pmix_pinstalldirs_ALL_COMPONENTS = @MCA_pmix_pinstalldirs_ALL_COMPONENTS@
+MCA_pmix_pinstalldirs_ALL_SUBDIRS = @MCA_pmix_pinstalldirs_ALL_SUBDIRS@
+MCA_pmix_pinstalldirs_DSO_COMPONENTS = @MCA_pmix_pinstalldirs_DSO_COMPONENTS@
+MCA_pmix_pinstalldirs_DSO_SUBDIRS = @MCA_pmix_pinstalldirs_DSO_SUBDIRS@
+MCA_pmix_pinstalldirs_STATIC_COMPONENTS = @MCA_pmix_pinstalldirs_STATIC_COMPONENTS@
+MCA_pmix_pinstalldirs_STATIC_LTLIBS = @MCA_pmix_pinstalldirs_STATIC_LTLIBS@
+MCA_pmix_pinstalldirs_STATIC_SUBDIRS = @MCA_pmix_pinstalldirs_STATIC_SUBDIRS@
+MCA_pmix_pnet_ALL_COMPONENTS = @MCA_pmix_pnet_ALL_COMPONENTS@
+MCA_pmix_pnet_ALL_SUBDIRS = @MCA_pmix_pnet_ALL_SUBDIRS@
+MCA_pmix_pnet_DSO_COMPONENTS = @MCA_pmix_pnet_DSO_COMPONENTS@
+MCA_pmix_pnet_DSO_SUBDIRS = @MCA_pmix_pnet_DSO_SUBDIRS@
+MCA_pmix_pnet_STATIC_COMPONENTS = @MCA_pmix_pnet_STATIC_COMPONENTS@
+MCA_pmix_pnet_STATIC_LTLIBS = @MCA_pmix_pnet_STATIC_LTLIBS@
+MCA_pmix_pnet_STATIC_SUBDIRS = @MCA_pmix_pnet_STATIC_SUBDIRS@
+MCA_pmix_psec_ALL_COMPONENTS = @MCA_pmix_psec_ALL_COMPONENTS@
+MCA_pmix_psec_ALL_SUBDIRS = @MCA_pmix_psec_ALL_SUBDIRS@
+MCA_pmix_psec_DSO_COMPONENTS = @MCA_pmix_psec_DSO_COMPONENTS@
+MCA_pmix_psec_DSO_SUBDIRS = @MCA_pmix_psec_DSO_SUBDIRS@
+MCA_pmix_psec_STATIC_COMPONENTS = @MCA_pmix_psec_STATIC_COMPONENTS@
+MCA_pmix_psec_STATIC_LTLIBS = @MCA_pmix_psec_STATIC_LTLIBS@
+MCA_pmix_psec_STATIC_SUBDIRS = @MCA_pmix_psec_STATIC_SUBDIRS@
+MCA_pmix_psensor_ALL_COMPONENTS = @MCA_pmix_psensor_ALL_COMPONENTS@
+MCA_pmix_psensor_ALL_SUBDIRS = @MCA_pmix_psensor_ALL_SUBDIRS@
+MCA_pmix_psensor_DSO_COMPONENTS = @MCA_pmix_psensor_DSO_COMPONENTS@
+MCA_pmix_psensor_DSO_SUBDIRS = @MCA_pmix_psensor_DSO_SUBDIRS@
+MCA_pmix_psensor_STATIC_COMPONENTS = @MCA_pmix_psensor_STATIC_COMPONENTS@
+MCA_pmix_psensor_STATIC_LTLIBS = @MCA_pmix_psensor_STATIC_LTLIBS@
+MCA_pmix_psensor_STATIC_SUBDIRS = @MCA_pmix_psensor_STATIC_SUBDIRS@
+MCA_pmix_ptl_ALL_COMPONENTS = @MCA_pmix_ptl_ALL_COMPONENTS@
+MCA_pmix_ptl_ALL_SUBDIRS = @MCA_pmix_ptl_ALL_SUBDIRS@
+MCA_pmix_ptl_DSO_COMPONENTS = @MCA_pmix_ptl_DSO_COMPONENTS@
+MCA_pmix_ptl_DSO_SUBDIRS = @MCA_pmix_ptl_DSO_SUBDIRS@
+MCA_pmix_ptl_STATIC_COMPONENTS = @MCA_pmix_ptl_STATIC_COMPONENTS@
+MCA_pmix_ptl_STATIC_LTLIBS = @MCA_pmix_ptl_STATIC_LTLIBS@
+MCA_pmix_ptl_STATIC_SUBDIRS = @MCA_pmix_ptl_STATIC_SUBDIRS@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PMIX_ASM_GSYM = @PMIX_ASM_GSYM@
+PMIX_ASM_LSYM = @PMIX_ASM_LSYM@
+PMIX_ASM_SUPPORT_64BIT = @PMIX_ASM_SUPPORT_64BIT@
+PMIX_ASM_TEXT = @PMIX_ASM_TEXT@
+PMIX_ASM_TYPE = @PMIX_ASM_TYPE@
+PMIX_ASSEMBLY_ARCH = @PMIX_ASSEMBLY_ARCH@
+PMIX_ASSEMBLY_BUILTIN = @PMIX_ASSEMBLY_BUILTIN@
+PMIX_ASSEMBLY_FORMAT = @PMIX_ASSEMBLY_FORMAT@
+PMIX_AS_GLOBAL = @PMIX_AS_GLOBAL@
+PMIX_AS_LABEL_SUFFIX = @PMIX_AS_LABEL_SUFFIX@
+PMIX_CC_ABSOLUTE = @PMIX_CC_ABSOLUTE@
+PMIX_CONFIGURE_DATE = @PMIX_CONFIGURE_DATE@
+PMIX_CONFIGURE_HOST = @PMIX_CONFIGURE_HOST@
+PMIX_CONFIGURE_USER = @PMIX_CONFIGURE_USER@
+PMIX_EMBEDDED_CPPFLAGS = @PMIX_EMBEDDED_CPPFLAGS@
+PMIX_EMBEDDED_LDFLAGS = @PMIX_EMBEDDED_LDFLAGS@
+PMIX_EMBEDDED_LIBS = @PMIX_EMBEDDED_LIBS@
+PMIX_MAJOR_VERSION = @PMIX_MAJOR_VERSION@
+PMIX_MINOR_VERSION = @PMIX_MINOR_VERSION@
+PMIX_RELEASE_DATE = @PMIX_RELEASE_DATE@
+PMIX_RELEASE_VERSION = @PMIX_RELEASE_VERSION@
+PMIX_RENAME = @PMIX_RENAME@
+PMIX_VERSION = @PMIX_VERSION@
+PMIX_top_builddir = @PMIX_top_builddir@
+PMIX_top_srcdir = @PMIX_top_srcdir@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_prefix_program = @ac_prefix_program@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+libpmix_so_version = @libpmix_so_version@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pmix_have_pandoc = @pmix_have_pandoc@
+pmix_pdl_pdlopen_LIBS = @pmix_pdl_pdlopen_LIBS@
+pmix_pdl_plibltdl_CPPFLAGS = @pmix_pdl_plibltdl_CPPFLAGS@
+pmix_pdl_plibltdl_LDFLAGS = @pmix_pdl_plibltdl_LDFLAGS@
+pmix_pdl_plibltdl_LIBS = @pmix_pdl_plibltdl_LIBS@
+pmixdatadir = @pmixdatadir@
+pmixincludedir = @pmixincludedir@
+pmixlibdir = @pmixlibdir@
+pmixmajor = @pmixmajor@
+pmixminor = @pmixminor@
+pnet_opa_CFLAGS = @pnet_opa_CFLAGS@
+pnet_opa_CPPFLAGS = @pnet_opa_CPPFLAGS@
+pnet_opa_LDFLAGS = @pnet_opa_LDFLAGS@
+pnet_opa_LIBS = @pnet_opa_LIBS@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+psec_munge_CPPFLAGS = @psec_munge_CPPFLAGS@
+psec_munge_LDFLAGS = @psec_munge_LDFLAGS@
+psec_munge_LIBS = @psec_munge_LIBS@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+AM_CPPFLAGS = $(LTDLINCL)
+
+# main library setup
+noinst_LTLIBRARIES = libmca_ptl.la
+libmca_ptl_la_SOURCES = $(headers) $(sources)
+
+# local files
+headers = ptl.h ptl_types.h base/base.h
+sources = base/ptl_base_frame.c base/ptl_base_select.c \
+	base/ptl_base_sendrecv.c base/ptl_base_listener.c \
+	base/ptl_base_stubs.c base/ptl_base_connect.c
+
+# Conditionally install the header files
+ at WANT_INSTALL_HEADERS_TRUE@pmixdir = $(pmixincludedir)/$(subdir)
+ at WANT_INSTALL_HEADERS_TRUE@nobase_pmix_HEADERS = $(headers)
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/base/Makefile.include $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/mca/ptl/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/mca/ptl/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+$(srcdir)/base/Makefile.include $(am__empty):
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_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}; \
+	}
+base/$(am__dirstamp):
+	@$(MKDIR_P) base
+	@: > base/$(am__dirstamp)
+base/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) base/$(DEPDIR)
+	@: > base/$(DEPDIR)/$(am__dirstamp)
+base/ptl_base_frame.lo: base/$(am__dirstamp) \
+	base/$(DEPDIR)/$(am__dirstamp)
+base/ptl_base_select.lo: base/$(am__dirstamp) \
+	base/$(DEPDIR)/$(am__dirstamp)
+base/ptl_base_sendrecv.lo: base/$(am__dirstamp) \
+	base/$(DEPDIR)/$(am__dirstamp)
+base/ptl_base_listener.lo: base/$(am__dirstamp) \
+	base/$(DEPDIR)/$(am__dirstamp)
+base/ptl_base_stubs.lo: base/$(am__dirstamp) \
+	base/$(DEPDIR)/$(am__dirstamp)
+base/ptl_base_connect.lo: base/$(am__dirstamp) \
+	base/$(DEPDIR)/$(am__dirstamp)
+
+libmca_ptl.la: $(libmca_ptl_la_OBJECTS) $(libmca_ptl_la_DEPENDENCIES) $(EXTRA_libmca_ptl_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(LINK)  $(libmca_ptl_la_OBJECTS) $(libmca_ptl_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+	-rm -f base/*.$(OBJEXT)
+	-rm -f base/*.lo
+
+distclean-compile:
+	-rm -f *.tab.c
+
+ at AMDEP_TRUE@@am__include@ @am__quote at base/$(DEPDIR)/ptl_base_connect.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at base/$(DEPDIR)/ptl_base_frame.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at base/$(DEPDIR)/ptl_base_listener.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at base/$(DEPDIR)/ptl_base_select.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at base/$(DEPDIR)/ptl_base_sendrecv.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at base/$(DEPDIR)/ptl_base_stubs.Plo at am__quote@
+
+.c.o:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+ at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+	-rm -rf base/.libs base/_libs
+install-nobase_pmixHEADERS: $(nobase_pmix_HEADERS)
+	@$(NORMAL_INSTALL)
+	@list='$(nobase_pmix_HEADERS)'; test -n "$(pmixdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(pmixdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(pmixdir)" || exit 1; \
+	fi; \
+	$(am__nobase_list) | while read dir files; do \
+	  xfiles=; for file in $$files; do \
+	    if test -f "$$file"; then xfiles="$$xfiles $$file"; \
+	    else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \
+	  test -z "$$xfiles" || { \
+	    test "x$$dir" = x. || { \
+	      echo " $(MKDIR_P) '$(DESTDIR)$(pmixdir)/$$dir'"; \
+	      $(MKDIR_P) "$(DESTDIR)$(pmixdir)/$$dir"; }; \
+	    echo " $(INSTALL_HEADER) $$xfiles '$(DESTDIR)$(pmixdir)/$$dir'"; \
+	    $(INSTALL_HEADER) $$xfiles "$(DESTDIR)$(pmixdir)/$$dir" || exit $$?; }; \
+	done
+
+uninstall-nobase_pmixHEADERS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(nobase_pmix_HEADERS)'; test -n "$(pmixdir)" || list=; \
+	$(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \
+	dir='$(DESTDIR)$(pmixdir)'; $(am__uninstall_files_from_dir)
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES) $(HEADERS)
+installdirs:
+	for dir in "$(DESTDIR)$(pmixdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+	-rm -f base/$(DEPDIR)/$(am__dirstamp)
+	-rm -f base/$(am__dirstamp)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf base/$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-local distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-nobase_pmixHEADERS
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf base/$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-nobase_pmixHEADERS
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-local 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-nobase_pmixHEADERS install-pdf install-pdf-am \
+	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-nobase_pmixHEADERS
+
+.PRECIOUS: Makefile
+
+
+distclean-local:
+	rm -f base/static-components.h
+
+# 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/mca/ptl/base/Makefile.include b/src/mca/ptl/base/Makefile.include
new file mode 100644
index 0000000..ef53421
--- /dev/null
+++ b/src/mca/ptl/base/Makefile.include
@@ -0,0 +1,35 @@
+# -*- makefile -*-
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2012      Los Alamos National Security, Inc.  All rights reserved.
+# Copyright (c) 2013-2016 Intel, Inc. All rights reserved
+# Copyright (c) 2016      Cisco Systems, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# This makefile.include does not stand on its own - it is included from
+# src/Makefile.am
+
+headers += \
+         base/base.h
+
+sources += \
+        base/ptl_base_frame.c \
+        base/ptl_base_select.c \
+        base/ptl_base_sendrecv.c \
+        base/ptl_base_listener.c \
+        base/ptl_base_stubs.c \
+        base/ptl_base_connect.c
diff --git a/src/mca/ptl/base/base.h b/src/mca/ptl/base/base.h
new file mode 100644
index 0000000..ac92ed9
--- /dev/null
+++ b/src/mca/ptl/base/base.h
@@ -0,0 +1,126 @@
+/* -*- C -*-
+ *
+ * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2006 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2012      Los Alamos National Security, Inc.  All rights reserved.
+ * Copyright (c) 2014-2017 Intel, Inc. All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ *
+ */
+#ifndef PMIX_PTL_BASE_H_
+#define PMIX_PTL_BASE_H_
+
+#include <src/include/pmix_config.h>
+
+
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h> /* for struct timeval */
+#endif
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+
+#include "src/class/pmix_pointer_array.h"
+#include "src/mca/mca.h"
+#include "src/mca/base/pmix_mca_base_framework.h"
+
+#include "src/mca/ptl/ptl.h"
+
+
+ BEGIN_C_DECLS
+
+/*
+ * MCA Framework
+ */
+PMIX_EXPORT extern pmix_mca_base_framework_t pmix_ptl_base_framework;
+/**
+ * PTL select function
+ *
+ * Cycle across available components and construct the list
+ * of active modules
+ */
+pmix_status_t pmix_ptl_base_select(void);
+
+/**
+ * Track an active component
+ */
+struct pmix_ptl_base_active_t {
+    pmix_list_item_t super;
+    pmix_status_t pri;
+    pmix_ptl_base_component_t *component;
+    pmix_ptl_module_t *module;
+};
+typedef struct pmix_ptl_base_active_t pmix_ptl_base_active_t;
+PMIX_CLASS_DECLARATION(pmix_ptl_base_active_t);
+
+
+/* framework globals */
+struct pmix_ptl_globals_t {
+    pmix_list_t actives;
+    bool initialized;
+    pmix_list_t posted_recvs;     // list of pmix_ptl_posted_recv_t
+    pmix_list_t unexpected_msgs;
+    int stop_thread[2];
+    bool listen_thread_active;
+    pmix_list_t listeners;
+};
+typedef struct pmix_ptl_globals_t pmix_ptl_globals_t;
+
+PMIX_EXPORT extern pmix_ptl_globals_t pmix_ptl_globals;
+
+/* API stubs */
+PMIX_EXPORT pmix_status_t pmix_ptl_stub_set_notification_cbfunc(pmix_ptl_cbfunc_t cbfunc);
+PMIX_EXPORT char* pmix_ptl_stub_get_available_modules(void);
+PMIX_EXPORT pmix_status_t pmix_ptl_stub_send_recv(struct pmix_peer_t *peer,
+                                                  pmix_buffer_t *bfr,
+                                                  pmix_ptl_cbfunc_t cbfunc,
+                                                  void *cbdata);
+PMIX_EXPORT pmix_status_t pmix_ptl_stub_send_oneway(struct pmix_peer_t *peer,
+                                                    pmix_buffer_t *bfr,
+                                                    pmix_ptl_tag_t tag);
+PMIX_EXPORT pmix_status_t pmix_ptl_stub_connect_to_peer(struct pmix_peer_t *peer,
+                                                        pmix_info_t info[], size_t ninfo);
+PMIX_EXPORT pmix_status_t pmix_ptl_stub_register_recv(struct pmix_peer_t *peer,
+                                                      pmix_ptl_cbfunc_t cbfunc,
+                                                      pmix_ptl_tag_t tag);
+PMIX_EXPORT pmix_status_t pmix_ptl_stub_cancel_recv(struct pmix_peer_t *peer,
+                                                    pmix_ptl_tag_t tag);
+
+PMIX_EXPORT pmix_status_t pmix_ptl_base_start_listening(pmix_info_t *info, size_t ninfo);
+PMIX_EXPORT void pmix_ptl_base_stop_listening(void);
+
+
+/* base support functions */
+PMIX_EXPORT void pmix_ptl_base_send(int sd, short args, void *cbdata);
+PMIX_EXPORT void pmix_ptl_base_send_recv(int sd, short args, void *cbdata);
+PMIX_EXPORT void pmix_ptl_base_send_handler(int sd, short flags, void *cbdata);
+PMIX_EXPORT void pmix_ptl_base_recv_handler(int sd, short flags, void *cbdata);
+PMIX_EXPORT void pmix_ptl_base_process_msg(int fd, short flags, void *cbdata);
+PMIX_EXPORT pmix_status_t pmix_ptl_base_set_nonblocking(int sd);
+PMIX_EXPORT pmix_status_t pmix_ptl_base_set_blocking(int sd);
+PMIX_EXPORT pmix_status_t pmix_ptl_base_send_blocking(int sd, char *ptr, size_t size);
+PMIX_EXPORT pmix_status_t pmix_ptl_base_recv_blocking(int sd, char *data, size_t size);
+PMIX_EXPORT pmix_status_t pmix_ptl_base_connect(struct sockaddr_storage *addr,
+                                                pmix_socklen_t len, int *fd);
+PMIX_EXPORT void pmix_ptl_base_connection_handler(int sd, short args, void *cbdata);
+PMIX_EXPORT pmix_status_t pmix_ptl_base_send_connect_ack(int sd);
+PMIX_EXPORT pmix_status_t pmix_ptl_base_recv_connect_ack(int sd);
+
+
+END_C_DECLS
+
+#endif
diff --git a/src/mca/ptl/base/ptl_base_connect.c b/src/mca/ptl/base/ptl_base_connect.c
new file mode 100644
index 0000000..f66d61e
--- /dev/null
+++ b/src/mca/ptl/base/ptl_base_connect.c
@@ -0,0 +1,249 @@
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2006 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2015-2016 Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+#include "include/pmix_stdint.h"
+
+#include <stdio.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+
+#include "include/pmix_socket_errno.h"
+#include "src/util/argv.h"
+#include "src/util/error.h"
+#include "src/util/getid.h"
+#include "src/util/strnlen.h"
+#include "src/include/pmix_globals.h"
+#include "src/client/pmix_client_ops.h"
+#include "src/server/pmix_server_ops.h"
+
+#include "src/mca/ptl/base/base.h"
+
+pmix_status_t pmix_ptl_base_set_nonblocking(int sd)
+{
+    int flags;
+     /* setup the socket as non-blocking */
+    if ((flags = fcntl(sd, F_GETFL, 0)) < 0) {
+        pmix_output(0, "ptl:base:set_nonblocking: fcntl(F_GETFL) failed: %s (%d)\n",
+                    strerror(pmix_socket_errno),
+                    pmix_socket_errno);
+    } else {
+        flags |= O_NONBLOCK;
+        if(fcntl(sd, F_SETFL, flags) < 0)
+            pmix_output(0, "ptl:base:set_nonblocking: fcntl(F_SETFL) failed: %s (%d)\n",
+                        strerror(pmix_socket_errno),
+                        pmix_socket_errno);
+    }
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_ptl_base_set_blocking(int sd)
+{
+    int flags;
+     /* setup the socket as non-blocking */
+    if ((flags = fcntl(sd, F_GETFL, 0)) < 0) {
+        pmix_output(0, "ptl:base:set_blocking: fcntl(F_GETFL) failed: %s (%d)\n",
+                    strerror(pmix_socket_errno),
+                    pmix_socket_errno);
+    } else {
+        flags &= ~(O_NONBLOCK);
+        if(fcntl(sd, F_SETFL, flags) < 0)
+            pmix_output(0, "ptl:base:set_blocking: fcntl(F_SETFL) failed: %s (%d)\n",
+                        strerror(pmix_socket_errno),
+                        pmix_socket_errno);
+    }
+    return PMIX_SUCCESS;
+}
+
+/*
+ * A blocking send on a non-blocking socket. Used to send the small amount of connection
+ * information that identifies the peers endpoint.
+ */
+pmix_status_t pmix_ptl_base_send_blocking(int sd, char *ptr, size_t size)
+{
+    size_t cnt = 0;
+    int retval;
+
+    pmix_output_verbose(8, pmix_globals.debug_output,
+                        "send blocking of %"PRIsize_t" bytes to socket %d",
+                        size, sd );
+    while (cnt < size) {
+        retval = send(sd, (char*)ptr+cnt, size-cnt, 0);
+        if (retval < 0) {
+            if (EAGAIN == pmix_socket_errno ||
+                EWOULDBLOCK == pmix_socket_errno) {
+                /* just cycle and let it try again */
+                pmix_output_verbose(8, pmix_globals.debug_output,
+                                    "blocking_send received error %d:%s from remote - cycling",
+                                    pmix_socket_errno, strerror(pmix_socket_errno));
+                continue;
+            }
+            if (pmix_socket_errno != EINTR) {
+                pmix_output_verbose(8, pmix_globals.debug_output,
+                                    "ptl:base:peer_send_blocking: send() to socket %d failed: %s (%d)\n",
+                                    sd, strerror(pmix_socket_errno),
+                                    pmix_socket_errno);
+                return PMIX_ERR_UNREACH;
+            }
+            continue;
+        }
+        cnt += retval;
+    }
+
+    pmix_output_verbose(8, pmix_globals.debug_output,
+                        "blocking send complete to socket %d", sd);
+    return PMIX_SUCCESS;
+}
+
+/*
+ * A blocking recv on a non-blocking socket. Used to receive the small amount of connection
+ * information that identifies the peers endpoint.
+ */
+pmix_status_t pmix_ptl_base_recv_blocking(int sd, char *data, size_t size)
+{
+    size_t cnt = 0;
+
+    pmix_output_verbose(8, pmix_globals.debug_output,
+                        "waiting for blocking recv of %"PRIsize_t" bytes", size);
+
+    while (cnt < size) {
+        int retval = recv(sd, (char *)data+cnt, size-cnt, MSG_WAITALL);
+
+        /* remote closed connection */
+        if (retval == 0) {
+            pmix_output_verbose(8, pmix_globals.debug_output,
+                                "ptl:base:recv_blocking: remote closed connection");
+            return PMIX_ERR_UNREACH;
+        }
+
+        /* handle errors */
+        if (retval < 0) {
+            if (EAGAIN == pmix_socket_errno ||
+                EWOULDBLOCK == pmix_socket_errno) {
+                /* just cycle and let it try again */
+                pmix_output_verbose(8, pmix_globals.debug_output,
+                                    "blocking_recv received error %d:%s from remote - cycling",
+                                    pmix_socket_errno, strerror(pmix_socket_errno));
+                continue;
+            }
+            if (pmix_socket_errno != EINTR ) {
+                /* If we overflow the listen backlog, it's
+                   possible that even though we finished the three
+                   way handshake, the remote host was unable to
+                   transition the connection from half connected
+                   (received the initial SYN) to fully connected
+                   (in the listen backlog).  We likely won't see
+                   the failure until we try to receive, due to
+                   timing and the like.  The first thing we'll get
+                   in that case is a RST packet, which receive
+                   will turn into a connection reset by peer
+                   errno.  In that case, leave the socket in
+                   CONNECT_ACK and propogate the error up to
+                   recv_connect_ack, who will try to establish the
+                   connection again */
+                pmix_output_verbose(8, pmix_globals.debug_output,
+                                    "blocking_recv received error %d:%s from remote - aborting",
+                                    pmix_socket_errno, strerror(pmix_socket_errno));
+                return PMIX_ERR_UNREACH;
+            }
+            continue;
+        }
+        cnt += retval;
+    }
+
+    pmix_output_verbose(8, pmix_globals.debug_output,
+                        "blocking receive complete from remote");
+    return PMIX_SUCCESS;
+}
+
+#define PMIX_MAX_RETRIES 10
+
+pmix_status_t pmix_ptl_base_connect(struct sockaddr_storage *addr,
+                                    pmix_socklen_t addrlen, int *fd)
+{
+    int sd = -1;
+    int retries = 0;
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "ptl_base_connect: attempting to connect to server");
+
+    while (retries < PMIX_MAX_RETRIES) {
+        retries++;
+        /* Create the new socket */
+        sd = socket(addr->ss_family, SOCK_STREAM, 0);
+        if (sd < 0) {
+            pmix_output(0, "pmix:create_socket: socket() failed: %s (%d)\n",
+                        strerror(pmix_socket_errno),
+                        pmix_socket_errno);
+            continue;
+        }
+        pmix_output_verbose(2, pmix_globals.debug_output,
+                            "usock_peer_try_connect: attempting to connect to server on socket %d", sd);
+        /* try to connect */
+        if (connect(sd, (struct sockaddr*)addr, addrlen) < 0) {
+            if (pmix_socket_errno == ETIMEDOUT) {
+                /* The server may be too busy to accept new connections */
+                pmix_output_verbose(2, pmix_globals.debug_output,
+                                    "timeout connecting to server");
+                CLOSE_THE_SOCKET(sd);
+                continue;
+            }
+
+            /* Some kernels (Linux 2.6) will automatically software
+             abort a connection that was ECONNREFUSED on the last
+             attempt, without even trying to establish the
+             connection.  Handle that case in a semi-rational
+             way by trying twice before giving up */
+            if (ECONNABORTED == pmix_socket_errno) {
+                pmix_output_verbose(2, pmix_globals.debug_output,
+                                    "connection to server aborted by OS - retrying");
+                CLOSE_THE_SOCKET(sd);
+                continue;
+            } else {
+                pmix_output_verbose(2, pmix_globals.debug_output,
+                                    "Connect failed: %s (%d)", strerror(pmix_socket_errno),
+                                    pmix_socket_errno);
+                CLOSE_THE_SOCKET(sd);
+                continue;
+            }
+        } else {
+            /* otherwise, the connect succeeded - so break out of the loop */
+            break;
+        }
+    }
+
+    if (retries == PMIX_MAX_RETRIES || sd < 0){
+        /* We were unsuccessful in establishing this connection, and are
+         * not likely to suddenly become successful */
+        if (0 <= sd) {
+            CLOSE_THE_SOCKET(sd);
+        }
+        return PMIX_ERR_UNREACH;
+    }
+    *fd = sd;
+
+    return PMIX_SUCCESS;
+}
diff --git a/src/mca/ptl/base/ptl_base_frame.c b/src/mca/ptl/base/ptl_base_frame.c
new file mode 100644
index 0000000..fbcf19c
--- /dev/null
+++ b/src/mca/ptl/base/ptl_base_frame.c
@@ -0,0 +1,259 @@
+/* -*- Mode: C; c-basic-offset:4 ; -*- */
+/*
+ * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2009 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2012-2013 Los Alamos National Security, Inc.  All rights reserved.
+ * Copyright (c) 2014-2017 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2015-2017 Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+/** @file:
+ *
+ */
+#include <src/include/pmix_config.h>
+
+#include <pmix_common.h>
+
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+#ifdef HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
+
+#include "src/mca/mca.h"
+#include "src/mca/base/base.h"
+#include "src/mca/base/pmix_mca_base_var.h"
+#include "src/mca/base/pmix_mca_base_framework.h"
+#include "src/class/pmix_list.h"
+#include "src/client/pmix_client_ops.h"
+#include "src/mca/ptl/base/base.h"
+
+/*
+ * The following file was created by configure.  It contains extern
+ * statements and the definition of an array of pointers to each
+ * component's public mca_base_component_t struct.
+ */
+
+#include "src/mca/ptl/base/static-components.h"
+
+/* Instantiate the global vars */
+pmix_ptl_globals_t pmix_ptl_globals = {{{0}}};
+pmix_ptl_API_t pmix_ptl = {
+    .set_notification_cbfunc = pmix_ptl_stub_set_notification_cbfunc,
+    .get_available_modules = pmix_ptl_stub_get_available_modules,
+    .send_recv = pmix_ptl_stub_send_recv,
+    .send_oneway = pmix_ptl_stub_send_oneway,
+    .connect_to_peer = pmix_ptl_stub_connect_to_peer,
+    .recv = pmix_ptl_stub_register_recv,
+    .cancel = pmix_ptl_stub_cancel_recv,
+    .start_listening = pmix_ptl_base_start_listening,
+    .stop_listening = pmix_ptl_base_stop_listening
+};
+
+static int pmix_ptl_register(pmix_mca_base_register_flag_t flags)
+{
+    return PMIX_SUCCESS;
+}
+
+static pmix_status_t pmix_ptl_close(void)
+{
+    if (!pmix_ptl_globals.initialized) {
+        return PMIX_SUCCESS;
+    }
+    pmix_ptl_globals.initialized = false;
+
+    /* ensure the listen thread has been shut down */
+    pmix_ptl.stop_listening();
+
+    if (NULL != pmix_client_globals.myserver) {
+        if (0 <= pmix_client_globals.myserver->sd) {
+            CLOSE_THE_SOCKET(pmix_client_globals.myserver->sd);
+            pmix_client_globals.myserver->sd = -1;
+        }
+    }
+
+    /* the components will cleanup when closed */
+    PMIX_LIST_DESTRUCT(&pmix_ptl_globals.actives);
+    PMIX_LIST_DESTRUCT(&pmix_ptl_globals.posted_recvs);
+    PMIX_LIST_DESTRUCT(&pmix_ptl_globals.unexpected_msgs);
+    PMIX_LIST_DESTRUCT(&pmix_ptl_globals.listeners);
+
+    return pmix_mca_base_framework_components_close(&pmix_ptl_base_framework, NULL);
+}
+
+static pmix_status_t pmix_ptl_open(pmix_mca_base_open_flag_t flags)
+{
+    /* initialize globals */
+    pmix_ptl_globals.initialized = true;
+    PMIX_CONSTRUCT(&pmix_ptl_globals.actives, pmix_list_t);
+    PMIX_CONSTRUCT(&pmix_ptl_globals.posted_recvs, pmix_list_t);
+    PMIX_CONSTRUCT(&pmix_ptl_globals.unexpected_msgs, pmix_list_t);
+    pmix_ptl_globals.listen_thread_active = false;
+    PMIX_CONSTRUCT(&pmix_ptl_globals.listeners, pmix_list_t);
+
+    /* Open up all available components */
+    return pmix_mca_base_framework_components_open(&pmix_ptl_base_framework, flags);
+}
+
+PMIX_MCA_BASE_FRAMEWORK_DECLARE(pmix, ptl, "PMIx Transfer Layer",
+                                pmix_ptl_register, pmix_ptl_open, pmix_ptl_close,
+                                mca_ptl_base_static_components, 0);
+
+/***   INSTANTIATE INTERNAL CLASSES   ***/
+PMIX_CLASS_INSTANCE(pmix_ptl_base_active_t,
+                    pmix_list_item_t,
+                    NULL, NULL);
+
+static void scon(pmix_ptl_send_t *p)
+{
+    memset(&p->hdr, 0, sizeof(pmix_ptl_hdr_t));
+    p->hdr.tag = UINT32_MAX;
+    p->hdr.nbytes = 0;
+    p->data = NULL;
+    p->hdr_sent = false;
+    p->sdptr = NULL;
+    p->sdbytes = 0;
+}
+static void sdes(pmix_ptl_send_t *p)
+{
+    if (NULL != p->data) {
+        PMIX_RELEASE(p->data);
+    }
+}
+PMIX_CLASS_INSTANCE(pmix_ptl_send_t,
+                    pmix_list_item_t,
+                    scon, sdes);
+
+static void rcon(pmix_ptl_recv_t *p)
+{
+    p->peer = NULL;
+    memset(&p->hdr, 0, sizeof(pmix_ptl_hdr_t));
+    p->hdr.tag = UINT32_MAX;
+    p->hdr.nbytes = 0;
+    p->data = NULL;
+    p->hdr_recvd = false;
+    p->rdptr = NULL;
+    p->rdbytes = 0;
+}
+static void rdes(pmix_ptl_recv_t *p)
+{
+    if (NULL != p->peer) {
+        PMIX_RELEASE(p->peer);
+    }
+}
+PMIX_CLASS_INSTANCE(pmix_ptl_recv_t,
+                    pmix_list_item_t,
+                    rcon, rdes);
+
+static void prcon(pmix_ptl_posted_recv_t *p)
+{
+    p->tag = UINT32_MAX;
+    p->cbfunc = NULL;
+    p->cbdata = NULL;
+}
+PMIX_CLASS_INSTANCE(pmix_ptl_posted_recv_t,
+                    pmix_list_item_t,
+                    prcon, NULL);
+
+
+static void srcon(pmix_ptl_sr_t *p)
+{
+    p->peer = NULL;
+    p->bfr = NULL;
+    p->cbfunc = NULL;
+    p->cbdata = NULL;
+}
+static void srdes(pmix_ptl_sr_t *p)
+{
+    if (NULL != p->peer) {
+        PMIX_RELEASE(p->peer);
+    }
+}
+PMIX_EXPORT PMIX_CLASS_INSTANCE(pmix_ptl_sr_t,
+                                pmix_object_t,
+                                srcon, srdes);
+
+static void pccon(pmix_pending_connection_t *p)
+{
+    memset(p->nspace, 0, PMIX_MAX_NSLEN+1);
+    p->info = NULL;
+    p->ninfo = 0;
+    p->bfrop = NULL;
+    p->psec = NULL;
+    p->ptl = NULL;
+    p->cred = NULL;
+}
+static void pcdes(pmix_pending_connection_t *p)
+{
+    if (NULL != p->info) {
+        PMIX_INFO_FREE(p->info, p->ninfo);
+    }
+    if (NULL != p->bfrop) {
+        free(p->bfrop);
+    }
+    if (NULL != p->psec) {
+        free(p->psec);
+    }
+    if (NULL != p->cred) {
+        free(p->cred);
+    }
+}
+PMIX_EXPORT PMIX_CLASS_INSTANCE(pmix_pending_connection_t,
+                                pmix_object_t,
+                                pccon, pcdes);
+
+static void lcon(pmix_listener_t *p)
+{
+    p->socket = -1;
+    p->varname = NULL;
+    p->uri = NULL;
+    p->owner_given = false;
+    p->group_given = false;
+    p->mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH;
+}
+static void ldes(pmix_listener_t *p)
+{
+    if (0 <= p->socket) {
+        CLOSE_THE_SOCKET(p->socket);
+    }
+    if (NULL != p->varname) {
+        free(p->varname);
+    }
+    if (NULL != p->uri) {
+        free(p->uri);
+    }
+}
+PMIX_EXPORT PMIX_CLASS_INSTANCE(pmix_listener_t,
+                                pmix_list_item_t,
+                                lcon, ldes);
+
+static void qcon(pmix_ptl_queue_t *p)
+{
+    p->peer = NULL;
+}
+static void qdes(pmix_ptl_queue_t *p)
+{
+    if (NULL != p->peer) {
+        PMIX_RELEASE(p->peer);
+    }
+}
+PMIX_EXPORT PMIX_CLASS_INSTANCE(pmix_ptl_queue_t,
+                                pmix_object_t,
+                                qcon, qdes);
diff --git a/src/mca/ptl/base/ptl_base_listener.c b/src/mca/ptl/base/ptl_base_listener.c
new file mode 100644
index 0000000..94decd2
--- /dev/null
+++ b/src/mca/ptl/base/ptl_base_listener.c
@@ -0,0 +1,299 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2014-2017 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2014-2016 Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2014-2015 Artem Y. Polyakov <artpol84 at gmail.com>.
+ *                         All rights reserved.
+ * Copyright (c) 2016      Mellanox Technologies, Inc.
+ *                         All rights reserved.
+ * Copyright (c) 2016      IBM Corporation.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+
+#include <src/include/types.h>
+#include <src/include/pmix_stdint.h>
+#include <src/include/pmix_socket_errno.h>
+
+#include <pmix_server.h>
+#include "src/include/pmix_globals.h"
+
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+#include <fcntl.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_SYS_UN_H
+#include <sys/un.h>
+#endif
+#ifdef HAVE_SYS_UIO_H
+#include <sys/uio.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#include <ctype.h>
+#include <sys/stat.h>
+#include PMIX_EVENT_HEADER
+#include <pthread.h>
+
+#include "src/class/pmix_list.h"
+#include "src/util/error.h"
+#include "src/util/fd.h"
+#include "src/util/output.h"
+#include "src/util/pmix_environ.h"
+
+ #include "src/mca/ptl/base/base.h"
+
+// local functions for connection support
+static void* listen_thread(void *obj);
+static pthread_t engine;
+static bool setup_complete = false;
+
+/* Cycle across all available plugins and provide them with
+ * an opportunity to register rendezvous points (server-side
+ * function). Function is to return PMIX_SUCCESS if at least
+ * one rendezvous can be defined. */
+static pmix_status_t setup_listeners(pmix_info_t *info, size_t ninfo, bool *need_listener)
+{
+    pmix_ptl_base_active_t *active;
+    pmix_status_t rc;
+    size_t n;
+    bool single = false;
+
+    if (!pmix_ptl_globals.initialized) {
+        return PMIX_ERR_INIT;
+    }
+
+    /* scan the directives to see if they want only one listener setup */
+    if (NULL != info) {
+        for (n=0; n < ninfo; n++) {
+            if (0 == strncmp(info[n].key, PMIX_SINGLE_LISTENER, PMIX_MAX_KEYLEN) &&
+                (PMIX_UNDEF == info[n].value.type || info[n].value.data.flag)) {
+                single = true;
+                break;
+            }
+        }
+    }
+
+    PMIX_LIST_FOREACH(active, &pmix_ptl_globals.actives, pmix_ptl_base_active_t) {
+        if (NULL != active->component->setup_listener) {
+            rc = active->component->setup_listener(info, ninfo, need_listener);
+            if (PMIX_SUCCESS != rc && PMIX_ERR_NOT_AVAILABLE != rc) {
+                return rc;
+            }
+            if (single) {
+                return PMIX_SUCCESS;
+            }
+        }
+    }
+    /* we must have at least one listener */
+    if (0 == pmix_list_get_size(&pmix_ptl_globals.listeners)) {
+        return PMIX_ERR_INIT;
+    }
+    return PMIX_SUCCESS;
+}
+
+/*
+ * start listening thread
+ */
+pmix_status_t pmix_ptl_base_start_listening(pmix_info_t *info, size_t ninfo)
+{
+    pmix_status_t rc;
+    bool need_listener = false;
+
+    /* setup the listeners */
+    if (!setup_complete) {
+        if (PMIX_SUCCESS != (rc = setup_listeners(info, ninfo, &need_listener))) {
+            return rc;
+        }
+    }
+    setup_complete = true;
+
+    /* if we don't need a listener thread, then we are done */
+    if (!need_listener) {
+        return PMIX_SUCCESS;
+    }
+
+    /*** spawn internal listener thread */
+    if (0 > pipe(pmix_ptl_globals.stop_thread)) {
+        PMIX_ERROR_LOG(PMIX_ERR_IN_ERRNO);
+        return PMIX_ERR_OUT_OF_RESOURCE;
+    }
+    /* Make sure the pipe FDs are set to close-on-exec so that
+       they don't leak into children */
+    if (pmix_fd_set_cloexec(pmix_ptl_globals.stop_thread[0]) != PMIX_SUCCESS ||
+        pmix_fd_set_cloexec(pmix_ptl_globals.stop_thread[1]) != PMIX_SUCCESS) {
+        PMIX_ERROR_LOG(PMIX_ERR_IN_ERRNO);
+        close(pmix_ptl_globals.stop_thread[0]);
+        close(pmix_ptl_globals.stop_thread[1]);
+        return PMIX_ERR_OUT_OF_RESOURCE;
+    }
+    /* fork off the listener thread */
+    pmix_ptl_globals.listen_thread_active = true;
+    if (0 > pthread_create(&engine, NULL, listen_thread, NULL)) {
+        pmix_ptl_globals.listen_thread_active = false;
+        return PMIX_ERROR;
+    }
+
+    return PMIX_SUCCESS;
+}
+
+void pmix_ptl_base_stop_listening(void)
+{
+    int i;
+    pmix_listener_t *lt;
+
+    pmix_output_verbose(8, pmix_globals.debug_output,
+                        "listen_thread: shutdown");
+
+    if (!pmix_ptl_globals.listen_thread_active) {
+        /* nothing we can do */
+        return;
+    }
+
+    /* mark it as inactive */
+    pmix_ptl_globals.listen_thread_active = false;
+    /* use the block to break it loose just in
+     * case the thread is blocked in a call to select for
+     * a long time */
+    i=1;
+    if (0 > write(pmix_ptl_globals.stop_thread[1], &i, sizeof(int))) {
+        return;
+    }
+    /* wait for thread to exit */
+    pthread_join(engine, NULL);
+    /* close the sockets to remove the connection points */
+    PMIX_LIST_FOREACH(lt, &pmix_ptl_globals.listeners, pmix_listener_t) {
+        CLOSE_THE_SOCKET(lt->socket);
+        lt->socket = -1;
+    }
+}
+
+static void* listen_thread(void *obj)
+{
+    int rc, max, accepted_connections;
+    socklen_t addrlen = sizeof(struct sockaddr_storage);
+    pmix_pending_connection_t *pending_connection;
+    struct timeval timeout;
+    fd_set readfds;
+    pmix_listener_t *lt;
+
+    pmix_output_verbose(8, pmix_globals.debug_output,
+                        "listen_thread: active");
+
+
+    while (pmix_ptl_globals.listen_thread_active) {
+        FD_ZERO(&readfds);
+        max = -1;
+        PMIX_LIST_FOREACH(lt, &pmix_ptl_globals.listeners, pmix_listener_t) {
+            FD_SET(lt->socket, &readfds);
+            max = (lt->socket > max) ? lt->socket : max;
+        }
+        /* add the stop_thread fd */
+        FD_SET(pmix_ptl_globals.stop_thread[0], &readfds);
+        max = (pmix_ptl_globals.stop_thread[0] > max) ? pmix_ptl_globals.stop_thread[0] : max;
+
+        /* set timeout interval */
+        timeout.tv_sec = 2;
+        timeout.tv_usec = 0;
+
+        /* Block in a select to avoid hammering the cpu.  If a connection
+         * comes in, we'll get woken up right away.
+         */
+        rc = select(max + 1, &readfds, NULL, NULL, &timeout);
+        if (!pmix_ptl_globals.listen_thread_active) {
+            /* we've been asked to terminate */
+            close(pmix_ptl_globals.stop_thread[0]);
+            close(pmix_ptl_globals.stop_thread[1]);
+            return NULL;
+        }
+        if (rc < 0) {
+            continue;
+        }
+
+        /* Spin accepting connections until all active listen sockets
+         * do not have any incoming connections, pushing each connection
+         * onto the event queue for processing
+         */
+        do {
+            accepted_connections = 0;
+            PMIX_LIST_FOREACH(lt, &pmix_ptl_globals.listeners, pmix_listener_t) {
+
+                /* according to the man pages, select replaces the given descriptor
+                 * set with a subset consisting of those descriptors that are ready
+                 * for the specified operation - in this case, a read. So we need to
+                 * first check to see if this file descriptor is included in the
+                 * returned subset
+                 */
+                if (0 == FD_ISSET(lt->socket, &readfds)) {
+                    /* this descriptor is not included */
+                    continue;
+                }
+
+                /* this descriptor is ready to be read, which means a connection
+                 * request has been received - so harvest it. All we want to do
+                 * here is accept the connection and push the info onto the event
+                 * library for subsequent processing - we don't want to actually
+                 * process the connection here as it takes too long, and so the
+                 * OS might start rejecting connections due to timeout.
+                 */
+                pending_connection = PMIX_NEW(pmix_pending_connection_t);
+                pending_connection->protocol = lt->protocol;
+                pending_connection->ptl = lt->ptl;
+                pmix_event_assign(&pending_connection->ev, pmix_globals.evbase, -1,
+                                  EV_WRITE, lt->cbfunc, pending_connection);
+                pending_connection->sd = accept(lt->socket,
+                                                (struct sockaddr*)&(pending_connection->addr),
+                                                &addrlen);
+                if (pending_connection->sd < 0) {
+                    PMIX_RELEASE(pending_connection);
+                    if (pmix_socket_errno != EAGAIN ||
+                        pmix_socket_errno != EWOULDBLOCK) {
+                        if (EMFILE == pmix_socket_errno ||
+                            ENOBUFS == pmix_socket_errno ||
+                            ENOMEM == pmix_socket_errno) {
+                            PMIX_ERROR_LOG(PMIX_ERR_OUT_OF_RESOURCE);
+                        } else if (EINVAL == pmix_socket_errno ||
+                                   EINTR == pmix_socket_errno) {
+                            /* race condition at finalize */
+                            goto done;
+                        } else if (ECONNABORTED == pmix_socket_errno) {
+                            /* they aborted the attempt */
+                            continue;
+                        } else {
+                            pmix_output(0, "listen_thread: accept() failed: %s (%d).",
+                                        strerror(pmix_socket_errno), pmix_socket_errno);
+                        }
+                        goto done;
+                    }
+                    continue;
+                }
+
+                pmix_output_verbose(8, pmix_globals.debug_output,
+                                    "listen_thread: new connection: (%d, %d)",
+                                    pending_connection->sd, pmix_socket_errno);
+                /* post the object */
+                PMIX_POST_OBJECT(pending_connection);
+                /* activate the event */
+                pmix_event_active(&pending_connection->ev, EV_WRITE, 1);
+                accepted_connections++;
+            }
+        } while (accepted_connections > 0);
+    }
+
+ done:
+    pmix_ptl_globals.listen_thread_active = false;
+    return NULL;
+}
diff --git a/src/mca/ptl/base/ptl_base_select.c b/src/mca/ptl/base/ptl_base_select.c
new file mode 100644
index 0000000..5e70a07
--- /dev/null
+++ b/src/mca/ptl/base/ptl_base_select.c
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2005 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2016-2017 Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+#include <pmix_common.h>
+
+#include <string.h>
+
+#include "src/mca/mca.h"
+#include "src/mca/base/base.h"
+
+#include "src/mca/ptl/base/base.h"
+
+static bool selected = false;
+
+/* Function for selecting a prioritized list of components
+ * from all those that are available. */
+int pmix_ptl_base_select(void)
+{
+    pmix_mca_base_component_list_item_t *cli = NULL;
+    pmix_ptl_base_component_t *component = NULL;
+    pmix_ptl_base_active_t *newactive, *active;
+    pmix_mca_base_module_t *mod;
+    int pri;
+    bool inserted;
+
+    if (selected) {
+        /* ensure we don't do this twice */
+        return PMIX_SUCCESS;
+    }
+    selected = true;
+
+    /* Query all available components and ask if they have a module */
+    PMIX_LIST_FOREACH(cli, &pmix_ptl_base_framework.framework_components, pmix_mca_base_component_list_item_t) {
+        component = (pmix_ptl_base_component_t *) cli->cli_component;
+
+        pmix_output_verbose(5, pmix_ptl_base_framework.framework_output,
+                            "mca:ptl:select: checking available component %s",
+                            component->base.pmix_mca_component_name);
+
+        /* get the module for this component */
+        if (PMIX_SUCCESS != component->base.pmix_mca_query_component(&mod, &pri)) {
+            continue;
+        }
+
+        /* add to our prioritized list of available actives */
+        newactive = PMIX_NEW(pmix_ptl_base_active_t);
+        newactive->pri = component->priority;
+        newactive->component = component;
+        newactive->module = (pmix_ptl_module_t*)mod;
+
+        /* maintain priority order */
+        inserted = false;
+        PMIX_LIST_FOREACH(active, &pmix_ptl_globals.actives, pmix_ptl_base_active_t) {
+            if (newactive->pri > active->pri) {
+                pmix_list_insert_pos(&pmix_ptl_globals.actives,
+                                     &active->super, &newactive->super);
+                inserted = true;
+                break;
+            }
+        }
+        if (!inserted) {
+            /* must be lowest priority - add to end */
+            pmix_list_append(&pmix_ptl_globals.actives, &newactive->super);
+        }
+    }
+
+    if (4 < pmix_output_get_verbosity(pmix_ptl_base_framework.framework_output)) {
+        pmix_output(0, "Final PTL priorities");
+        /* show the prioritized list */
+        PMIX_LIST_FOREACH(active, &pmix_ptl_globals.actives, pmix_ptl_base_active_t) {
+            pmix_output(0, "\tPTL: %s Priority: %d",
+                        active->component->base.pmix_mca_component_name, active->pri);
+        }
+    }
+
+    return PMIX_SUCCESS;;
+}
diff --git a/src/mca/ptl/base/ptl_base_sendrecv.c b/src/mca/ptl/base/ptl_base_sendrecv.c
new file mode 100644
index 0000000..350c4d8
--- /dev/null
+++ b/src/mca/ptl/base/ptl_base_sendrecv.c
@@ -0,0 +1,729 @@
+/*
+ * Copyright (c) 2014-2017 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2014      Artem Y. Polyakov <artpol84 at gmail.com>.
+ *                         All rights reserved.
+ * Copyright (c) 2015-2017 Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2016      Mellanox Technologies, Inc.
+ *                         All rights reserved.
+ * Copyright (c) 2016      IBM Corporation.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+#include <src/include/pmix_config.h>
+
+#include <src/include/types.h>
+#include <src/include/pmix_stdint.h>
+#include <src/include/pmix_socket_errno.h>
+
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+#include <fcntl.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_SYS_UN_H
+#include <sys/un.h>
+#endif
+#ifdef HAVE_SYS_UIO_H
+#include <sys/uio.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
+#include "src/class/pmix_pointer_array.h"
+#include "src/include/pmix_globals.h"
+#include "src/client/pmix_client_ops.h"
+#include "src/server/pmix_server_ops.h"
+#include "src/util/error.h"
+
+#include "src/mca/ptl/base/base.h"
+
+static uint32_t current_tag = PMIX_PTL_TAG_DYNAMIC;
+
+static void _notify_complete(pmix_status_t status, void *cbdata)
+{
+    pmix_event_chain_t *chain = (pmix_event_chain_t*)cbdata;
+    PMIX_RELEASE(chain);
+}
+
+static void lost_connection(pmix_peer_t *peer, pmix_status_t err)
+{
+    pmix_server_trkr_t *trk;
+    pmix_rank_info_t *rinfo, *rnext;
+    pmix_trkr_caddy_t *tcd;
+    pmix_regevents_info_t *reginfoptr, *regnext;
+    pmix_peer_events_info_t *pr, *pnext;
+    pmix_rank_info_t *info, *pinfo;
+    pmix_ptl_posted_recv_t *rcv;
+    pmix_buffer_t buf;
+    pmix_ptl_hdr_t hdr;
+
+    /* stop all events */
+    if (peer->recv_ev_active) {
+        pmix_event_del(&peer->recv_event);
+        peer->recv_ev_active = false;
+    }
+    if (peer->send_ev_active) {
+        pmix_event_del(&peer->send_event);
+        peer->send_ev_active = false;
+    }
+    if (NULL != peer->recv_msg) {
+        PMIX_RELEASE(peer->recv_msg);
+        peer->recv_msg = NULL;
+    }
+    CLOSE_THE_SOCKET(peer->sd);
+
+    if (PMIX_PROC_SERVER == pmix_globals.proc_type) {
+        /* if I am a server, then we need to ensure that
+         * we properly account for the loss of this client
+         * from any local collectives in which it was
+         * participating - note that the proc would not
+         * have been added to any collective tracker until
+         * after it successfully connected */
+        PMIX_LIST_FOREACH(trk, &pmix_server_globals.collectives, pmix_server_trkr_t) {
+            /* see if this proc is participating in this tracker */
+            PMIX_LIST_FOREACH_SAFE(rinfo, rnext, &trk->ranks, pmix_rank_info_t) {
+                if (0 != strncmp(rinfo->nptr->nspace, peer->info->nptr->nspace, PMIX_MAX_NSLEN)) {
+                    continue;
+                }
+                if (rinfo->rank != peer->info->rank) {
+                    continue;
+                }
+                /* it is - adjust the count */
+                --trk->nlocal;
+                /* remove it from the list */
+                pmix_list_remove_item(&trk->ranks, &rinfo->super);
+                PMIX_RELEASE(rinfo);
+                /* check for completion */
+                if (pmix_list_get_size(&trk->local_cbs) == trk->nlocal) {
+                    /* complete, so now we need to process it
+                     * we don't want to block someone
+                     * here, so kick any completed trackers into a
+                     * new event for processing */
+                    PMIX_EXECUTE_COLLECTIVE(tcd, trk, pmix_server_execute_collective);
+                }
+            }
+        }
+        /* remove this proc from the list of ranks for this nspace if it is still there */
+        PMIX_LIST_FOREACH_SAFE(info, pinfo, &(peer->info->nptr->server->ranks), pmix_rank_info_t) {
+            if (info == peer->info) {
+                pmix_list_remove_item(&(peer->info->nptr->server->ranks), &(peer->info->super));
+            }
+        }
+        /* reduce the number of local procs */
+        --peer->info->nptr->server->nlocalprocs;
+        /* now decrease the refcount - might actually free the object */
+        PMIX_RELEASE(peer->info);
+        /* remove this client from our array */
+        pmix_pointer_array_set_item(&pmix_server_globals.clients,
+                                    peer->index, NULL);
+        /* cleanup any remaining events they have registered for */
+        PMIX_LIST_FOREACH_SAFE(reginfoptr, regnext, &pmix_server_globals.events, pmix_regevents_info_t) {
+            PMIX_LIST_FOREACH_SAFE(pr, pnext, &reginfoptr->peers, pmix_peer_events_info_t) {
+                if (peer == pr->peer) {
+                    pmix_list_remove_item(&reginfoptr->peers, &pr->super);
+                    PMIX_RELEASE(pr);
+                    if (0 == pmix_list_get_size(&reginfoptr->peers)) {
+                        pmix_list_remove_item(&pmix_server_globals.events, &reginfoptr->super);
+                        PMIX_RELEASE(reginfoptr);
+                        break;
+                    }
+                }
+            }
+        }
+        if (!peer->finalized) {
+            /* if this peer already called finalize, then
+             * we are just seeing their connection go away
+             * when they terminate - so do not generate
+             * an event. If not, then we do */
+            PMIX_REPORT_EVENT(err, peer, PMIX_RANGE_NAMESPACE, _notify_complete);
+        }
+        PMIX_RELEASE(peer);
+     } else {
+        /* if I am a client, there is only
+         * one connection we can have */
+        pmix_globals.connected = false;
+         /* set the public error status */
+        err = PMIX_ERR_LOST_CONNECTION_TO_SERVER;
+        /* it is possible that we have sendrecv's in progress where
+         * we are waiting for a response to arrive. Since we have
+         * lost connection to the server, that will never happen.
+         * Thus, to preclude any chance of hanging, cycle thru
+         * the list of posted recvs and complete any that are
+         * the return call from a sendrecv - i.e., any that are
+         * waiting on dynamic tags */
+        PMIX_CONSTRUCT(&buf, pmix_buffer_t);
+        hdr.nbytes = 0; // initialize the hdr to something safe
+        PMIX_LIST_FOREACH(rcv, &pmix_ptl_globals.posted_recvs, pmix_ptl_posted_recv_t) {
+            if (UINT_MAX != rcv->tag && NULL != rcv->cbfunc) {
+                /* construct and load the buffer */
+                hdr.tag = rcv->tag;
+                rcv->cbfunc(pmix_globals.mypeer, &hdr, &buf, rcv->cbdata);
+            }
+        }
+        PMIX_DESTRUCT(&buf);
+        /* if I called finalize, then don't generate an event */
+        if (!pmix_globals.mypeer->finalized) {
+            PMIX_REPORT_EVENT(err, pmix_client_globals.myserver, PMIX_RANGE_LOCAL, _notify_complete);
+        }
+    }
+}
+
+static pmix_status_t send_msg(int sd, pmix_ptl_send_t *msg)
+{
+    struct iovec iov[2];
+    int iov_count;
+    ssize_t remain = msg->sdbytes, rc;
+
+    iov[0].iov_base = msg->sdptr;
+    iov[0].iov_len = msg->sdbytes;
+    if (!msg->hdr_sent && NULL != msg->data) {
+        iov[1].iov_base = msg->data->base_ptr;
+        iov[1].iov_len = ntohl(msg->hdr.nbytes);
+        remain += ntohl(msg->hdr.nbytes);
+        iov_count = 2;
+    } else {
+        iov_count = 1;
+    }
+  retry:
+    rc = writev(sd, iov, iov_count);
+    if (PMIX_LIKELY(rc == remain)) {
+        /* we successfully sent the header and the msg data if any */
+        msg->hdr_sent = true;
+        msg->sdbytes = 0;
+        msg->sdptr = (char *)iov[iov_count-1].iov_base + iov[iov_count-1].iov_len;
+        return PMIX_SUCCESS;
+    } else if (rc < 0) {
+        if (pmix_socket_errno == EINTR) {
+            goto retry;
+        } else if (pmix_socket_errno == EAGAIN) {
+            /* tell the caller to keep this message on active,
+             * but let the event lib cycle so other messages
+             * can progress while this socket is busy
+             */
+            return PMIX_ERR_RESOURCE_BUSY;
+        } else if (pmix_socket_errno == EWOULDBLOCK) {
+            /* tell the caller to keep this message on active,
+             * but let the event lib cycle so other messages
+             * can progress while this socket is busy
+             */
+            return PMIX_ERR_WOULD_BLOCK;
+        } else {
+            /* we hit an error and cannot progress this message */
+            pmix_output(0, "pmix_ptl_base: send_msg: write failed: %s (%d) [sd = %d]",
+                        strerror(pmix_socket_errno),
+                        pmix_socket_errno, sd);
+            return PMIX_ERR_UNREACH;
+        }
+    } else {
+        /* short writev. This usually means the kernel buffer is full,
+         * so there is no point for retrying at that time.
+         * simply update the msg and return with PMIX_ERR_RESOURCE_BUSY */
+        if ((size_t)rc < msg->sdbytes) {
+            /* partial write of the header or the msg data */
+            msg->sdptr = (char *)msg->sdptr + rc;
+            msg->sdbytes -= rc;
+        } else {
+            /* header was fully written, but only a part of the msg data was written */
+            msg->hdr_sent = true;
+            rc -= msg->sdbytes;
+            if (NULL != msg->data) {
+                /* technically, this should never happen as iov_count
+                 * would be 1 for a zero-byte message, and so we cannot
+                 * have a case where we write the header and part of the
+                 * msg. However, code checkers don't know that and are
+                 * fooled by our earlier check for NULL, and so
+                 * we silence their warnings by using this check */
+                msg->sdptr = (char *)msg->data->base_ptr + rc;
+            }
+            msg->sdbytes = ntohl(msg->hdr.nbytes) - rc;
+        }
+        return PMIX_ERR_RESOURCE_BUSY;
+    }
+}
+
+static pmix_status_t read_bytes(int sd, char **buf, size_t *remain)
+{
+    pmix_status_t ret = PMIX_SUCCESS;
+    int rc;
+    char *ptr = *buf;
+
+    /* read until all bytes recvd or error */
+    while (0 < *remain) {
+        rc = read(sd, ptr, *remain);
+        if (rc < 0) {
+            if(pmix_socket_errno == EINTR) {
+                continue;
+            } else if (pmix_socket_errno == EAGAIN) {
+                /* tell the caller to keep this message on active,
+                 * but let the event lib cycle so other messages
+                 * can progress while this socket is busy
+                 */
+                ret = PMIX_ERR_RESOURCE_BUSY;
+                goto exit;
+            } else if (pmix_socket_errno == EWOULDBLOCK) {
+                /* tell the caller to keep this message on active,
+                 * but let the event lib cycle so other messages
+                 * can progress while this socket is busy
+                 */
+                ret = PMIX_ERR_WOULD_BLOCK;
+                goto exit;
+            }
+            /* we hit an error and cannot progress this message - report
+             * the error back to the RML and let the caller know
+             * to abort this message
+             */
+            pmix_output_verbose(2, pmix_globals.debug_output,
+                                "pmix_ptl_base_msg_recv: readv failed: %s (%d)",
+                                strerror(pmix_socket_errno),
+                                pmix_socket_errno);
+            ret = PMIX_ERR_UNREACH;
+            goto exit;
+        } else if (0 == rc) {
+            /* the remote peer closed the connection */
+            ret = PMIX_ERR_UNREACH;
+            goto exit;
+        }
+        /* we were able to read something, so adjust counters and location */
+        *remain -= rc;
+        ptr += rc;
+    }
+    /* we read the full data block */
+  exit:
+    *buf = ptr;
+    return ret;
+}
+
+/*
+ * A file descriptor is available/ready for send. Check the state
+ * of the socket and take the appropriate action.
+ */
+void pmix_ptl_base_send_handler(int sd, short flags, void *cbdata)
+{
+    pmix_peer_t *peer = (pmix_peer_t*)cbdata;
+    pmix_ptl_send_t *msg = peer->send_msg;
+    pmix_status_t rc;
+
+    /* acquire the object */
+    PMIX_ACQUIRE_OBJECT(peer);
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "%s:%d ptl:base:send_handler SENDING TO PEER %s:%d tag %u with %s msg",
+                        pmix_globals.myid.nspace, pmix_globals.myid.rank,
+                        peer->info->nptr->nspace, peer->info->rank,
+                        (NULL == msg) ? UINT_MAX : ntohl(msg->hdr.tag),
+                        (NULL == msg) ? "NULL" : "NON-NULL");
+
+    if (NULL != msg) {
+        pmix_output_verbose(2, pmix_globals.debug_output,
+                            "ptl:base:send_handler SENDING MSG");
+        if (PMIX_SUCCESS == (rc = send_msg(peer->sd, msg))) {
+            // message is complete
+            pmix_output_verbose(2, pmix_globals.debug_output,
+                                "ptl:base:send_handler MSG SENT");
+            PMIX_RELEASE(msg);
+            peer->send_msg = NULL;
+        } else if (PMIX_ERR_RESOURCE_BUSY == rc ||
+                   PMIX_ERR_WOULD_BLOCK == rc) {
+            /* exit this event and let the event lib progress */
+            pmix_output_verbose(2, pmix_globals.debug_output,
+                                "ptl:base:send_handler RES BUSY OR WOULD BLOCK");
+            /* ensure we post the modified peer object before another thread
+             * picks it back up */
+            PMIX_POST_OBJECT(peer);
+            return;
+        } else {
+            pmix_output_verbose(5, pmix_globals.debug_output,
+                                "%s:%d SEND ERROR %s",
+                                pmix_globals.myid.nspace, pmix_globals.myid.rank,
+                                PMIx_Error_string(rc));
+            // report the error
+            pmix_event_del(&peer->send_event);
+            peer->send_ev_active = false;
+            PMIX_RELEASE(msg);
+            peer->send_msg = NULL;
+            lost_connection(peer, rc);
+            /* ensure we post the modified peer object before another thread
+             * picks it back up */
+            PMIX_POST_OBJECT(peer);
+            return;
+        }
+
+        /* if current message completed - progress any pending sends by
+         * moving the next in the queue into the "on-deck" position. Note
+         * that this doesn't mean we send the message right now - we will
+         * wait for another send_event to fire before doing so. This gives
+         * us a chance to service any pending recvs.
+         */
+        peer->send_msg = (pmix_ptl_send_t*)
+            pmix_list_remove_first(&peer->send_queue);
+    }
+
+    /* if nothing else to do unregister for send event notifications */
+    if (NULL == peer->send_msg && peer->send_ev_active) {
+        pmix_event_del(&peer->send_event);
+        peer->send_ev_active = false;
+    }
+    /* ensure we post the modified peer object before another thread
+     * picks it back up */
+    PMIX_POST_OBJECT(peer);
+}
+
+/*
+ * Dispatch to the appropriate action routine based on the state
+ * of the connection with the peer.
+ */
+
+void pmix_ptl_base_recv_handler(int sd, short flags, void *cbdata)
+{
+    pmix_status_t rc;
+    pmix_peer_t *peer = (pmix_peer_t*)cbdata;
+    pmix_ptl_recv_t *msg = NULL;
+    pmix_ptl_hdr_t hdr;
+    size_t nbytes;
+    char *ptr;
+
+    /* acquire the object */
+    PMIX_ACQUIRE_OBJECT(peer);
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "%s:%d ptl:base:recv:handler called with peer %s:%d",
+                        pmix_globals.myid.nspace, pmix_globals.myid.rank,
+                        (NULL == peer) ? "NULL" : peer->info->nptr->nspace,
+                        (NULL == peer) ? PMIX_RANK_UNDEF : peer->info->rank);
+
+    if (NULL == peer) {
+        return;
+    }
+    /* allocate a new message and setup for recv */
+    if (NULL == peer->recv_msg) {
+        pmix_output_verbose(2, pmix_globals.debug_output,
+                            "ptl:base:recv:handler allocate new recv msg");
+        peer->recv_msg = PMIX_NEW(pmix_ptl_recv_t);
+        if (NULL == peer->recv_msg) {
+            pmix_output(0, "sptl:base:recv_handler: unable to allocate recv message\n");
+            goto err_close;
+        }
+        PMIX_RETAIN(peer);
+        peer->recv_msg->peer = peer;  // provide a handle back to the peer object
+        /* start by reading the header */
+        peer->recv_msg->rdptr = (char*)&peer->recv_msg->hdr;
+        peer->recv_msg->rdbytes = sizeof(pmix_ptl_hdr_t);
+    }
+    msg = peer->recv_msg;
+    msg->sd = sd;
+    /* if the header hasn't been completely read, read it */
+    if (!msg->hdr_recvd) {
+         pmix_output_verbose(2, pmix_globals.debug_output,
+                            "ptl:base:recv:handler read hdr on socket %d", peer->sd);
+        nbytes = sizeof(pmix_ptl_hdr_t);
+        ptr = (char*)&hdr;
+        if (PMIX_SUCCESS == (rc = read_bytes(peer->sd, &ptr, &nbytes))) {
+            /* completed reading the header */
+            peer->recv_msg->hdr_recvd = true;
+            /* convert the hdr to host format */
+            peer->recv_msg->hdr.pindex = ntohl(hdr.pindex);
+            peer->recv_msg->hdr.tag = ntohl(hdr.tag);
+            peer->recv_msg->hdr.nbytes = ntohl(hdr.nbytes);
+            pmix_output_verbose(2, pmix_globals.debug_output,
+                                "RECVD MSG FOR TAG %d SIZE %d",
+                                (int)peer->recv_msg->hdr.tag,
+                                (int)peer->recv_msg->hdr.nbytes);
+            /* if this is a zero-byte message, then we are done */
+            if (0 == peer->recv_msg->hdr.nbytes) {
+                pmix_output_verbose(2, pmix_globals.debug_output,
+                                    "RECVD ZERO-BYTE MESSAGE FROM %s:%d for tag %d",
+                                    peer->info->nptr->nspace, peer->info->rank,
+                                    peer->recv_msg->hdr.tag);
+                peer->recv_msg->data = NULL;  // make sure
+                peer->recv_msg->rdptr = NULL;
+                peer->recv_msg->rdbytes = 0;
+                /* post it for delivery */
+                PMIX_ACTIVATE_POST_MSG(peer->recv_msg);
+                peer->recv_msg = NULL;
+                PMIX_POST_OBJECT(peer);
+                return;
+            } else {
+                pmix_output_verbose(2, pmix_globals.debug_output,
+                                    "ptl:base:recv:handler allocate data region of size %lu",
+                                    (unsigned long)peer->recv_msg->hdr.nbytes);
+                /* allocate the data region */
+                peer->recv_msg->data = (char*)malloc(peer->recv_msg->hdr.nbytes);
+                memset(peer->recv_msg->data, 0, peer->recv_msg->hdr.nbytes);
+                /* point to it */
+                peer->recv_msg->rdptr = peer->recv_msg->data;
+                peer->recv_msg->rdbytes = peer->recv_msg->hdr.nbytes;
+            }
+            /* fall thru and attempt to read the data */
+        } else if (PMIX_ERR_RESOURCE_BUSY == rc ||
+                   PMIX_ERR_WOULD_BLOCK == rc) {
+            /* exit this event and let the event lib progress */
+            return;
+        } else {
+            /* the remote peer closed the connection - report that condition
+             * and let the caller know
+             */
+            pmix_output_verbose(2, pmix_globals.debug_output,
+                                "ptl:base:msg_recv: peer %s:%d closed connection",
+                                peer->info->nptr->nspace, peer->info->rank);
+            goto err_close;
+        }
+    }
+
+    if (peer->recv_msg->hdr_recvd) {
+        /* continue to read the data block - we start from
+         * wherever we left off, which could be at the
+         * beginning or somewhere in the message
+         */
+        if (PMIX_SUCCESS == (rc = read_bytes(peer->sd, &msg->rdptr, &msg->rdbytes))) {
+            /* we recvd all of the message */
+            pmix_output_verbose(2, pmix_globals.debug_output,
+                                "%s:%d RECVD COMPLETE MESSAGE FROM SERVER OF %d BYTES FOR TAG %d ON PEER SOCKET %d",
+                                pmix_globals.myid.nspace, pmix_globals.myid.rank,
+                                (int)peer->recv_msg->hdr.nbytes,
+                                peer->recv_msg->hdr.tag, peer->sd);
+            /* post it for delivery */
+            PMIX_ACTIVATE_POST_MSG(peer->recv_msg);
+            peer->recv_msg = NULL;
+            /* ensure we post the modified peer object before another thread
+             * picks it back up */
+            PMIX_POST_OBJECT(peer);
+            return;
+        } else if (PMIX_ERR_RESOURCE_BUSY == rc ||
+                   PMIX_ERR_WOULD_BLOCK == rc) {
+            /* exit this event and let the event lib progress */
+            /* ensure we post the modified peer object before another thread
+             * picks it back up */
+            PMIX_POST_OBJECT(peer);
+            return;
+        } else {
+            /* the remote peer closed the connection - report that condition
+             * and let the caller know
+             */
+            pmix_output_verbose(2, pmix_globals.debug_output,
+                                "%s:%d ptl:base:msg_recv: peer %s:%d closed connection",
+                                pmix_globals.myid.nspace, pmix_globals.myid.rank,
+                                peer->info->nptr->nspace, peer->info->rank);
+            goto err_close;
+        }
+    }
+    /* success */
+    return;
+
+  err_close:
+    /* stop all events */
+    if (peer->recv_ev_active) {
+        pmix_event_del(&peer->recv_event);
+        peer->recv_ev_active = false;
+    }
+    if (peer->send_ev_active) {
+        pmix_event_del(&peer->send_event);
+        peer->send_ev_active = false;
+    }
+    if (NULL != peer->recv_msg) {
+        PMIX_RELEASE(peer->recv_msg);
+        peer->recv_msg = NULL;
+    }
+    lost_connection(peer, PMIX_ERR_UNREACH);
+    /* ensure we post the modified peer object before another thread
+     * picks it back up */
+    PMIX_POST_OBJECT(peer);
+}
+
+void pmix_ptl_base_send(int sd, short args, void *cbdata)
+{
+    pmix_ptl_queue_t *queue = (pmix_ptl_queue_t*)cbdata;
+    pmix_ptl_send_t *snd;
+
+    /* acquire the object */
+    PMIX_ACQUIRE_OBJECT(queue);
+
+    if (NULL == queue->peer || queue->peer->sd < 0 ||
+        NULL == queue->peer->info || NULL == queue->peer->info->nptr) {
+        /* this peer has lost connection */
+        PMIX_RELEASE(queue);
+        /* ensure we post the object before another thread
+         * picks it back up */
+        PMIX_POST_OBJECT(queue);
+        return;
+    }
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "[%s:%d] send to %s:%d on tag %d",
+                        __FILE__, __LINE__,
+                        (queue->peer)->info->nptr->nspace,
+                        (queue->peer)->info->rank, (queue->tag));
+
+    snd = PMIX_NEW(pmix_ptl_send_t);
+    snd->hdr.pindex = htonl(pmix_globals.pindex);
+    snd->hdr.tag = htonl(queue->tag);
+    snd->hdr.nbytes = htonl((queue->buf)->bytes_used);
+    snd->data = (queue->buf);
+    /* always start with the header */
+    snd->sdptr = (char*)&snd->hdr;
+    snd->sdbytes = sizeof(pmix_ptl_hdr_t);
+
+    /* if there is no message on-deck, put this one there */
+    if (NULL == (queue->peer)->send_msg) {
+        (queue->peer)->send_msg = snd;
+    } else {
+        /* add it to the queue */
+        pmix_list_append(&(queue->peer)->send_queue, &snd->super);
+    }
+    /* ensure the send event is active */
+    if (!(queue->peer)->send_ev_active) {
+        (queue->peer)->send_ev_active = true;
+        PMIX_POST_OBJECT(queue->peer);
+        pmix_event_add(&(queue->peer)->send_event, 0);
+    }
+    PMIX_RELEASE(queue);
+    PMIX_POST_OBJECT(snd);
+}
+
+void pmix_ptl_base_send_recv(int fd, short args, void *cbdata)
+{
+    pmix_ptl_sr_t *ms = (pmix_ptl_sr_t*)cbdata;
+    pmix_ptl_posted_recv_t *req;
+    pmix_ptl_send_t *snd;
+    uint32_t tag;
+
+    /* acquire the object */
+    PMIX_ACQUIRE_OBJECT(ms);
+
+    if (ms->peer->sd < 0) {
+        /* this peer's socket has been closed */
+        PMIX_RELEASE(ms);
+        /* ensure we post the object before another thread
+         * picks it back up */
+        PMIX_POST_OBJECT(NULL);
+        return;
+    }
+
+    /* take the next tag in the sequence */
+    current_tag++;
+    if (UINT32_MAX == current_tag ) {
+        current_tag = PMIX_PTL_TAG_DYNAMIC;
+    }
+    tag = current_tag;
+
+    if (NULL != ms->cbfunc) {
+        /* if a callback msg is expected, setup a recv for it */
+        req = PMIX_NEW(pmix_ptl_posted_recv_t);
+        req->tag = tag;
+        req->cbfunc = ms->cbfunc;
+        req->cbdata = ms->cbdata;
+
+        pmix_output_verbose(5, pmix_globals.debug_output,
+                            "posting recv on tag %d", req->tag);
+        /* add it to the list of recvs - we cannot have unexpected messages
+         * in this subsystem as the server never sends us something that
+         * we didn't previously request */
+        pmix_list_prepend(&pmix_ptl_globals.posted_recvs, &req->super);
+    }
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "QUEIENG MSG TO SERVER OF SIZE %d",
+                        (int)ms->bfr->bytes_used);
+    snd = PMIX_NEW(pmix_ptl_send_t);
+    snd->hdr.pindex = htonl(pmix_globals.pindex);
+    snd->hdr.tag = htonl(tag);
+    snd->hdr.nbytes = htonl(ms->bfr->bytes_used);
+    snd->data = ms->bfr;
+    /* always start with the header */
+    snd->sdptr = (char*)&snd->hdr;
+    snd->sdbytes = sizeof(pmix_ptl_hdr_t);
+
+    /* if there is no message on-deck, put this one there */
+    if (NULL == ms->peer->send_msg) {
+        ms->peer->send_msg = snd;
+    } else {
+        /* add it to the queue */
+        pmix_list_append(&ms->peer->send_queue, &snd->super);
+    }
+    /* ensure the send event is active */
+    if (!ms->peer->send_ev_active) {
+        ms->peer->send_ev_active = true;
+        PMIX_POST_OBJECT(snd);
+        pmix_event_add(&ms->peer->send_event, 0);
+    }
+    /* cleanup */
+    PMIX_RELEASE(ms);
+    PMIX_POST_OBJECT(snd);
+}
+
+void pmix_ptl_base_process_msg(int fd, short flags, void *cbdata)
+{
+    pmix_ptl_recv_t *msg = (pmix_ptl_recv_t*)cbdata;
+    pmix_ptl_posted_recv_t *rcv;
+    pmix_buffer_t buf;
+
+    /* acquire the object */
+    PMIX_ACQUIRE_OBJECT(msg);
+
+    pmix_output_verbose(5, pmix_globals.debug_output,
+                        "%s:%d message received %d bytes for tag %u on socket %d",
+                        pmix_globals.myid.nspace, pmix_globals.myid.rank,
+                        (int)msg->hdr.nbytes, msg->hdr.tag, msg->sd);
+
+    /* see if we have a waiting recv for this message */
+    PMIX_LIST_FOREACH(rcv, &pmix_ptl_globals.posted_recvs, pmix_ptl_posted_recv_t) {
+        pmix_output_verbose(5, pmix_globals.debug_output,
+                            "checking msg on tag %u for tag %u",
+                            msg->hdr.tag, rcv->tag);
+
+        if (msg->hdr.tag == rcv->tag || UINT_MAX == rcv->tag) {
+            if (NULL != rcv->cbfunc) {
+                /* construct and load the buffer */
+                PMIX_CONSTRUCT(&buf, pmix_buffer_t);
+                if (NULL != msg->data) {
+                    buf.base_ptr = (char*)msg->data;
+                    buf.bytes_allocated = buf.bytes_used = msg->hdr.nbytes;
+                    buf.unpack_ptr = buf.base_ptr;
+                    buf.pack_ptr = ((char*)buf.base_ptr) + buf.bytes_used;
+                }
+                msg->data = NULL;  // protect the data region
+                pmix_output_verbose(5, pmix_globals.debug_output,
+                                     "%s:%d EXECUTE CALLBACK for tag %u",
+                                     pmix_globals.myid.nspace, pmix_globals.myid.rank,
+                                     msg->hdr.tag);
+                rcv->cbfunc(msg->peer, &msg->hdr, &buf, rcv->cbdata);
+                pmix_output_verbose(5, pmix_globals.debug_output,
+                                    "%s:%d CALLBACK COMPLETE",
+                                    pmix_globals.myid.nspace, pmix_globals.myid.rank);
+                PMIX_DESTRUCT(&buf);  // free's the msg data
+            }
+            /* done with the recv if it is a dynamic tag */
+            if (PMIX_PTL_TAG_DYNAMIC <= rcv->tag && UINT_MAX != rcv->tag) {
+                pmix_list_remove_item(&pmix_ptl_globals.posted_recvs, &rcv->super);
+                PMIX_RELEASE(rcv);
+            }
+            PMIX_RELEASE(msg);
+            return;
+        }
+    }
+
+    /* if the tag in this message is above the dynamic marker, then
+     * that is an error */
+    if (PMIX_PTL_TAG_DYNAMIC <= msg->hdr.tag) {
+        pmix_output(0, "UNEXPECTED MESSAGE tag = %d", msg->hdr.tag);
+        PMIX_REPORT_EVENT(PMIX_ERROR, msg->peer, PMIX_RANGE_NAMESPACE, _notify_complete);
+        PMIX_RELEASE(msg);
+        return;
+    }
+
+    /* it is possible that someone may post a recv for this message
+     * at some point, so we have to hold onto it */
+    pmix_list_append(&pmix_ptl_globals.unexpected_msgs, &msg->super);
+    /* ensure we post the modified object before another thread
+     * picks it back up */
+    PMIX_POST_OBJECT(msg);
+}
diff --git a/src/mca/ptl/base/ptl_base_stubs.c b/src/mca/ptl/base/ptl_base_stubs.c
new file mode 100644
index 0000000..f13fde1
--- /dev/null
+++ b/src/mca/ptl/base/ptl_base_stubs.c
@@ -0,0 +1,196 @@
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2006 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2015-2017 Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+
+#include <stdio.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#include "src/util/argv.h"
+#include "src/util/error.h"
+#include "src/include/pmix_globals.h"
+
+#include "src/mca/ptl/base/base.h"
+
+pmix_status_t pmix_ptl_stub_set_notification_cbfunc(pmix_ptl_cbfunc_t cbfunc)
+{
+    pmix_ptl_posted_recv_t *req;
+
+    /* post a persistent recv for the special 0 tag so the client can recv
+     * error notifications from the server */
+    req = PMIX_NEW(pmix_ptl_posted_recv_t);
+    if (NULL == req) {
+        return PMIX_ERR_NOMEM;
+    }
+    req->tag = 0;
+    req->cbfunc = cbfunc;
+    pmix_output_verbose(5, pmix_globals.debug_output,
+                        "posting notification recv on tag %d", req->tag);
+    /* add it to the list of recvs - we cannot have unexpected messages
+     * in this subsystem as the server never sends us something that
+     * we didn't previously request */
+    pmix_list_prepend(&pmix_ptl_globals.posted_recvs, &req->super);
+    return PMIX_SUCCESS;
+}
+
+char* pmix_ptl_stub_get_available_modules(void)
+{
+    pmix_ptl_base_active_t *active;
+    char **tmp=NULL, *reply=NULL;
+
+    if (!pmix_ptl_globals.initialized) {
+        return NULL;
+    }
+
+    PMIX_LIST_FOREACH(active, &pmix_ptl_globals.actives, pmix_ptl_base_active_t) {
+        pmix_argv_append_nosize(&tmp, active->component->base.pmix_mca_component_name);
+    }
+    if (NULL != tmp) {
+        reply = pmix_argv_join(tmp, ',');
+        pmix_argv_free(tmp);
+    }
+    return reply;
+}
+
+pmix_status_t pmix_ptl_stub_send_recv(struct pmix_peer_t *peer,
+                                      pmix_buffer_t *bfr,
+                                      pmix_ptl_cbfunc_t cbfunc,
+                                      void *cbdata)
+{
+    pmix_peer_t *pr = (pmix_peer_t*)peer;
+
+    return pr->compat.ptl->send_recv(peer, bfr, cbfunc, cbdata);
+}
+
+pmix_status_t pmix_ptl_stub_send_oneway(struct pmix_peer_t *peer,
+                                        pmix_buffer_t *bfr,
+                                        pmix_ptl_tag_t tag)
+{
+    pmix_peer_t *pr = (pmix_peer_t*)peer;
+    return pr->compat.ptl->send(peer, bfr, tag);
+}
+
+pmix_status_t pmix_ptl_stub_connect_to_peer(struct pmix_peer_t *peer,
+                                            pmix_info_t info[], size_t ninfo)
+{
+    pmix_peer_t *pr = (pmix_peer_t*)peer;
+    pmix_ptl_base_active_t *active;
+
+    PMIX_LIST_FOREACH(active, &pmix_ptl_globals.actives, pmix_ptl_base_active_t) {
+        if (NULL != active->module->connect_to_peer) {
+            if (PMIX_SUCCESS == active->module->connect_to_peer(peer, info, ninfo)) {
+                pr->compat.ptl = active->module;
+                return PMIX_SUCCESS;
+            }
+        }
+    }
+
+    return PMIX_ERR_UNREACH;
+}
+
+static void post_recv(int fd, short args, void *cbdata)
+{
+    pmix_ptl_posted_recv_t *req = (pmix_ptl_posted_recv_t*)cbdata;
+    pmix_ptl_recv_t *msg, *nmsg;
+    pmix_buffer_t buf;
+
+    pmix_output_verbose(5, pmix_globals.debug_output,
+                        "posting recv on tag %d", req->tag);
+
+    /* add it to the list of recvs */
+    pmix_list_append(&pmix_ptl_globals.posted_recvs, &req->super);
+
+    /* now check the unexpected msg queue to see if we already
+     * recvd something for it */
+    PMIX_LIST_FOREACH_SAFE(msg, nmsg, &pmix_ptl_globals.unexpected_msgs, pmix_ptl_recv_t) {
+        if (msg->hdr.tag == req->tag || UINT_MAX == req->tag) {
+            if (NULL != req->cbfunc) {
+                /* construct and load the buffer */
+                PMIX_CONSTRUCT(&buf, pmix_buffer_t);
+                if (NULL != msg->data) {
+                    buf.base_ptr = (char*)msg->data;
+                    buf.bytes_allocated = buf.bytes_used = msg->hdr.nbytes;
+                    buf.unpack_ptr = buf.base_ptr;
+                    buf.pack_ptr = ((char*)buf.base_ptr) + buf.bytes_used;
+                }
+                msg->data = NULL;  // protect the data region
+                req->cbfunc(msg->peer, &msg->hdr, &buf, req->cbdata);
+                PMIX_DESTRUCT(&buf);  // free's the msg data
+            }
+            pmix_list_remove_item(&pmix_ptl_globals.unexpected_msgs, &msg->super);
+            PMIX_RELEASE(msg);
+        }
+    }
+}
+
+pmix_status_t pmix_ptl_stub_register_recv(struct pmix_peer_t *peer,
+                                          pmix_ptl_cbfunc_t cbfunc,
+                                          pmix_ptl_tag_t tag)
+{
+    pmix_ptl_posted_recv_t *req;
+
+    req = PMIX_NEW(pmix_ptl_posted_recv_t);
+    if (NULL == req) {
+        return PMIX_ERR_NOMEM;
+    }
+    req->tag = tag;
+    req->cbfunc = cbfunc;
+    /* have to push this into an event so we can add this
+     * to the list of posted recvs */
+    pmix_event_assign(&(req->ev), pmix_globals.evbase, -1,
+                      EV_WRITE, post_recv, req);
+    pmix_event_active(&(req->ev), EV_WRITE, 1);
+    return PMIX_SUCCESS;
+}
+
+static void cancel_recv(int fd, short args, void *cbdata)
+{
+    pmix_ptl_posted_recv_t *req = (pmix_ptl_posted_recv_t*)cbdata;
+    pmix_ptl_posted_recv_t *rcv;
+
+    PMIX_LIST_FOREACH(rcv, &pmix_ptl_globals.posted_recvs, pmix_ptl_posted_recv_t) {
+        if (rcv->tag == req->tag) {
+            pmix_list_remove_item(&pmix_ptl_globals.posted_recvs, &rcv->super);
+            PMIX_RELEASE(rcv);
+            PMIX_RELEASE(req);
+            return;
+        }
+    }
+    PMIX_RELEASE(req);
+}
+
+pmix_status_t pmix_ptl_stub_cancel_recv(struct pmix_peer_t *peer,
+                                        pmix_ptl_tag_t tag)
+{
+    pmix_ptl_posted_recv_t *req;
+
+    req = PMIX_NEW(pmix_ptl_posted_recv_t);
+    if (NULL == req) {
+        return PMIX_ERR_NOMEM;
+    }
+    req->tag = tag;
+    /* have to push this into an event so we can modify
+     * the list of posted recvs */
+    pmix_event_assign(&(req->ev), pmix_globals.evbase, -1,
+                      EV_WRITE, cancel_recv, req);
+    pmix_event_active(&(req->ev), EV_WRITE, 1);
+    return PMIX_SUCCESS;
+}
diff --git a/src/mca/ptl/ptl.h b/src/mca/ptl/ptl.h
new file mode 100644
index 0000000..f2f5ad6
--- /dev/null
+++ b/src/mca/ptl/ptl.h
@@ -0,0 +1,212 @@
+/* -*- Mode: C; c-basic-offset:4 ; -*- */
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2005 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2012      Los Alamos National Security, Inc. All rights reserved.
+ * Copyright (c) 2013-2017 Intel, Inc. All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2016      Mellanox Technologies, Inc.
+ *                         All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+/**
+ * @file
+ *
+ * Data packing subsystem.
+ */
+
+#ifndef PMIX_PTL_H_
+#define PMIX_PTL_H_
+
+#include <src/include/pmix_config.h>
+
+#include <src/include/types.h>
+
+#include "src/mca/mca.h"
+#include "src/mca/base/pmix_mca_base_var.h"
+#include "src/mca/base/pmix_mca_base_framework.h"
+#include "src/buffer_ops/types.h"
+
+#include "ptl_types.h"
+
+BEGIN_C_DECLS
+
+/* forward declaration */
+struct pmix_peer_t;
+
+/* The overall objective of this framework is to provide transport
+ * options by which a server can communicate with a client:
+ *
+ * (a) across different versions of the library - e.g., when the
+ *     connection handshake changes.
+ *
+ * (b) using different transports as necessitated by different
+ *     environments.
+ *
+ * This is a mult-select framework - i.e., multiple components
+ * are selected and "active" at the same time. The intent is
+ * to have one component for each use-case, with the
+ * expectation that the community will do its best not to revise
+ * communications in manners that expand components to support (a).
+ * Thus, new variations should be rare, and only a few components
+ * will exist.
+ *
+ * The framework itself reflects the fact that any given peer
+ * will utilize only one messaging method.
+ * Thus, once a peer is identified, it will pass its version string
+ * to this framework's "assign_module" function, which will then
+ * pass it to each component until one returns a module capable of
+ * processing the given version. This module is then "attached" to
+ * the pmix_peer_t object so it can be used for all subsequent
+ * communication to/from that peer.
+ *
+ * Accordingly, there are two levels of APIs defined for this
+ * framework:
+ *
+ * (a) component level - these allow for init/finalize of the
+ *     component, and assignment of a module to a given peer
+ *     based on the version that peer is using
+ *
+ * (b) module level - implement send/recv/etc. Note that the
+ *     module only needs to provide those functions that differ
+ *     from the base functions - they don't need to duplicate
+ *     all that code!
+ */
+
+/****    MODULE INTERFACE DEFINITION    ****/
+
+/* initialize an active plugin - note that servers may have
+ * multiple active plugins, while clients can only have one */
+typedef pmix_status_t (*pmix_ptl_init_fn_t)(void);
+
+/* finalize an active plugin */
+typedef void (*pmix_ptl_finalize_fn_t)(void);
+
+/* (TWO-WAY) send a message to the peer, and get a response delivered
+ * to the specified callback function. The buffer will be free'd
+ * at the completion of the send, and the cbfunc will be called
+ * when the corresponding reply is received */
+typedef pmix_status_t (*pmix_ptl_send_recv_fn_t)(struct pmix_peer_t *peer,
+                                                 pmix_buffer_t *bfr,
+                                                 pmix_ptl_cbfunc_t cbfunc,
+                                                 void *cbdata);
+
+/* (ONE-WAY) send a message to the peer. The buffer will be free'd
+ * at the completion of the send */
+typedef pmix_status_t (*pmix_ptl_send_fn_t)(struct pmix_peer_t *peer,
+                                            pmix_buffer_t *bfr,
+                                            pmix_ptl_tag_t tag);
+
+/* (ONE-WAY) register a persistent recv */
+typedef pmix_status_t (*pmix_ptl_recv_fn_t)(struct pmix_peer_t *peer,
+                                            pmix_ptl_cbfunc_t cbfunc,
+                                            pmix_ptl_tag_t tag);
+
+/* Cancel a persistent recv */
+typedef pmix_status_t (*pmix_ptl_cancel_fn_t)(struct pmix_peer_t *peer,
+                                              pmix_ptl_tag_t tag);
+
+/* connect to a peer - this is a blocking function
+ * to establish a connection to a peer. It assigns
+ * the corresponding module to the peer's compat
+ * structure for future use */
+typedef pmix_status_t (*pmix_ptl_connect_to_peer_fn_t)(struct pmix_peer_t *peer,
+                                                       pmix_info_t info[], size_t ninfo);
+
+
+/**
+ * Base structure for a PTL module
+ */
+struct pmix_ptl_module_t {
+    pmix_ptl_init_fn_t                  init;
+    pmix_ptl_finalize_fn_t              finalize;
+    pmix_ptl_send_recv_fn_t             send_recv;
+    pmix_ptl_send_fn_t                  send;
+    pmix_ptl_recv_fn_t                  recv;
+    pmix_ptl_cancel_fn_t                cancel;
+    pmix_ptl_connect_to_peer_fn_t       connect_to_peer;
+};
+typedef struct pmix_ptl_module_t pmix_ptl_module_t;
+
+/****    API MODULE DEFINITION    ****/
+/* set the notification callback function to the provided one */
+typedef pmix_status_t (*pmix_ptl_set_notification_cbfunc_fn_t)(pmix_ptl_cbfunc_t cbfunc);
+
+/* get a list of available support - caller must free results
+ * when done. The list is returned as a comma-delimited string
+ * of available components in priority order, suitable for
+ * passing to the assign_module function */
+typedef char* (*pmix_ptl_get_available_modules_fn_t)(void);
+
+/* Start listening for PMIx clients (server-side function) */
+typedef pmix_status_t (*pmix_ptl_start_listening_fn_t)(pmix_info_t *info, size_t ninfo);
+
+/* Stop listening for PMIx clients and cleanup all rendezvous
+ * points (server-side function) */
+typedef void (*pmix_ptl_stop_listening_fn_t)(void);
+
+typedef struct {
+    pmix_ptl_set_notification_cbfunc_fn_t   set_notification_cbfunc;
+    pmix_ptl_get_available_modules_fn_t     get_available_modules;
+    pmix_ptl_send_recv_fn_t                 send_recv;
+    pmix_ptl_send_fn_t                      send_oneway;
+    pmix_ptl_recv_fn_t                      recv;
+    pmix_ptl_cancel_fn_t                    cancel;
+    pmix_ptl_connect_to_peer_fn_t           connect_to_peer;
+    pmix_ptl_start_listening_fn_t           start_listening;
+    pmix_ptl_stop_listening_fn_t            stop_listening;
+} pmix_ptl_API_t;
+
+PMIX_EXPORT extern pmix_ptl_API_t pmix_ptl;
+
+
+/****    COMPONENT STRUCTURE DEFINITION    ****/
+
+/* define a component-level API for establishing a
+ * communication rendezvous point for local procs. Each active component
+ * would be given an opportunity to register a listener with the
+ * PTL base, and/or to establish their own method for handling
+ * connection requests. The component sets the need_listener flag
+ * to true if a listener thread is required - otherwise, it does _not_
+ * modify this parameter */
+typedef pmix_status_t (*pmix_ptl_base_setup_listener_fn_t)(pmix_info_t info[], size_t ninfo,
+                                                           bool *need_listener);
+
+/*
+ * the standard component data structure
+ */
+struct pmix_ptl_base_component_t {
+    pmix_mca_base_component_t                       base;
+    pmix_mca_base_component_data_t                  data;
+    int                                             priority;
+    char*                                           uri;
+    pmix_ptl_base_setup_listener_fn_t               setup_listener;
+};
+typedef struct pmix_ptl_base_component_t pmix_ptl_base_component_t;
+
+
+/****    DEFINE SOME GENERAL ACCESS FUNCTIONS    ****/
+
+
+/*
+ * Macro for use in components that are of type ptl
+ */
+#define PMIX_PTL_BASE_VERSION_1_0_0 \
+    PMIX_MCA_BASE_VERSION_1_0_0("ptl", 1, 0, 0)
+
+END_C_DECLS
+
+#endif /* PMIX_PTL_H */
diff --git a/src/mca/ptl/ptl_types.h b/src/mca/ptl/ptl_types.h
new file mode 100644
index 0000000..55e6176
--- /dev/null
+++ b/src/mca/ptl/ptl_types.h
@@ -0,0 +1,270 @@
+/* -*- C -*-
+ *
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2006 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2007-2011 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2012-2013 Los Alamos National Security, Inc. All rights reserved.
+ * Copyright (c) 2014-2017 Intel, Inc.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+/**
+ * @file
+ *
+ * Buffer management types.
+ */
+
+#ifndef PMIX_PTL_TYPES_H_
+#define PMIX_PTL_TYPES_H_
+
+#include <src/include/pmix_config.h>
+#include "src/include/types.h"
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_SYS_UN_H
+#include <sys/un.h>
+#endif
+#ifdef HAVE_SYS_UIO_H
+#include <sys/uio.h>
+#endif
+#ifdef HAVE_NET_UIO_H
+#include <net/uio.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#include PMIX_EVENT_HEADER
+
+#include "src/class/pmix_list.h"
+#include "src/util/output.h"
+#include "src/buffer_ops/types.h"
+
+BEGIN_C_DECLS
+
+// forward declaration
+struct pmix_peer_t;
+struct pmix_ptl_module_t;
+
+/****    MESSAGING STRUCTURES    ****/
+typedef uint32_t pmix_ptl_tag_t;
+/* define a range of "reserved" tags - these
+ * are tags that are used for persistent recvs
+ * within the system */
+#define PMIX_PTL_TAG_NOTIFY           0
+#define PMIX_PTL_TAG_HEARTBEAT        1
+
+/* define the start of dynamic tags that are
+ * assigned for send/recv operations */
+#define PMIX_PTL_TAG_DYNAMIC        100
+
+
+/* header for messages */
+typedef struct {
+    int32_t pindex;
+    pmix_ptl_tag_t tag;
+    size_t nbytes;
+} pmix_ptl_hdr_t;
+
+/* define the messaging cbfunc */
+typedef void (*pmix_ptl_cbfunc_t)(struct pmix_peer_t *peer,
+                                  pmix_ptl_hdr_t *hdr,
+                                  pmix_buffer_t *buf, void *cbdata);
+
+/* define a callback function for notifying that server connection
+ * has completed */
+typedef void (*pmix_ptl_connect_cbfunc_t)(pmix_status_t status, void *cbdata);
+
+/* define a callback function for processing pending connections */
+typedef void (*pmix_ptl_pending_cbfunc_t)(int sd, short args, void *cbdata);
+
+
+/* structure for sending a message */
+typedef struct {
+    pmix_list_item_t super;
+    pmix_event_t ev;
+    pmix_ptl_hdr_t hdr;
+    pmix_buffer_t *data;
+    bool hdr_sent;
+    char *sdptr;
+    size_t sdbytes;
+} pmix_ptl_send_t;
+PMIX_CLASS_DECLARATION(pmix_ptl_send_t);
+
+/* structure for recving a message */
+typedef struct {
+    pmix_list_item_t super;
+    pmix_event_t ev;
+    struct pmix_peer_t *peer;
+    int sd;
+    pmix_ptl_hdr_t hdr;
+    char *data;
+    bool hdr_recvd;
+    char *rdptr;
+    size_t rdbytes;
+} pmix_ptl_recv_t;
+PMIX_CLASS_DECLARATION(pmix_ptl_recv_t);
+
+/* structure for tracking posted recvs */
+typedef struct {
+    pmix_list_item_t super;
+    pmix_event_t ev;
+    uint32_t tag;
+    pmix_ptl_cbfunc_t cbfunc;
+    void *cbdata;
+} pmix_ptl_posted_recv_t;
+PMIX_CLASS_DECLARATION(pmix_ptl_posted_recv_t);
+
+/* struct for posting send/recv request */
+typedef struct {
+    pmix_object_t super;
+    volatile bool active;
+    pmix_event_t ev;
+    struct pmix_peer_t *peer;
+    pmix_status_t status;
+    pmix_buffer_t *bfr;
+    pmix_ptl_cbfunc_t cbfunc;
+    void *cbdata;
+} pmix_ptl_sr_t;
+PMIX_CLASS_DECLARATION(pmix_ptl_sr_t);
+
+typedef struct {
+    pmix_object_t super;
+    volatile bool active;
+    pmix_event_t ev;
+    struct pmix_peer_t *peer;
+    pmix_buffer_t *buf;
+    pmix_ptl_tag_t tag;
+} pmix_ptl_queue_t;
+PMIX_CLASS_DECLARATION(pmix_ptl_queue_t);
+
+/* define listener protocol types */
+typedef uint16_t pmix_listener_protocol_t;
+#define PMIX_PROTOCOL_V1        0       // legacy usock
+#define PMIX_PROTOCOL_V2        1       // tcp
+#define PMIX_PROTOCOL_V3        2       // updated usock
+
+/* connection support */
+typedef struct {
+    pmix_object_t super;
+    pmix_event_t ev;
+    pmix_listener_protocol_t protocol;
+    int sd;
+    char nspace[PMIX_MAX_NSLEN+1];
+    pmix_info_t *info;
+    size_t ninfo;
+    pmix_status_t status;
+    struct sockaddr_storage addr;
+    char *bfrop;
+    char *psec;
+    struct pmix_ptl_module_t *ptl;
+    pmix_bfrop_buffer_type_t buffer_type;
+    char *cred;
+    size_t len;
+    uid_t uid;
+    gid_t gid;
+} pmix_pending_connection_t;
+PMIX_CLASS_DECLARATION(pmix_pending_connection_t);
+
+/* listener objects */
+typedef struct pmix_listener_t {
+    pmix_list_item_t super;
+    pmix_listener_protocol_t protocol;
+    struct pmix_ptl_module_t *ptl;
+    int socket;
+    char *varname;
+    char *uri;
+    uint32_t owner;
+    bool owner_given;
+    uint32_t group;
+    bool group_given;
+    uint32_t mode;
+    pmix_ptl_pending_cbfunc_t cbfunc;
+} pmix_listener_t;
+PMIX_CLASS_DECLARATION(pmix_listener_t);
+
+
+#define PMIX_ACTIVATE_POST_MSG(ms)                                      \
+    do {                                                                \
+        pmix_output_verbose(5, pmix_globals.debug_output,               \
+                            "[%s:%d] post msg",                         \
+                            __FILE__, __LINE__);                        \
+        pmix_event_assign(&((ms)->ev), pmix_globals.evbase, -1,         \
+                          EV_WRITE, pmix_ptl_base_process_msg, (ms));   \
+        PMIX_POST_OBJECT(ms);                                           \
+        pmix_event_active(&((ms)->ev), EV_WRITE, 1);                    \
+    } while (0)
+
+#define PMIX_SND_CADDY(c, h, s)                                         \
+    do {                                                                \
+        (c) = PMIX_NEW(pmix_server_caddy_t);                            \
+        (void)memcpy(&(c)->hdr, &(h), sizeof(pmix_ptl_hdr_t));          \
+        PMIX_RETAIN((s));                                               \
+        (c)->snd = (s);                                                 \
+    } while (0)
+
+/* queue a message to be sent to one of our procs - must
+ * provide the following params:
+ * p - pmix_peer_t of target recipient
+ * t - tag to be sent to
+ * b - buffer to be sent
+ */
+#define PMIX_SERVER_QUEUE_REPLY(p, t, b)                                                \
+    do {                                                                                \
+        pmix_ptl_send_t *snd;                                                           \
+        pmix_output_verbose(5, pmix_globals.debug_output,                               \
+                            "[%s:%d] queue callback called: reply to %s:%d on tag %d size %d",  \
+                            __FILE__, __LINE__,                                         \
+                            (p)->info->nptr->nspace,                                    \
+                            (p)->info->rank, (t), (int)(b)->bytes_used);                \
+        snd = PMIX_NEW(pmix_ptl_send_t);                                                \
+        snd->hdr.pindex = htonl(pmix_globals.pindex);                                   \
+        snd->hdr.tag = htonl(t);                                                        \
+        snd->hdr.nbytes = htonl((b)->bytes_used);                                       \
+        snd->data = (b);                                                                \
+        /* always start with the header */                                              \
+        snd->sdptr = (char*)&snd->hdr;                                                  \
+        snd->sdbytes = sizeof(pmix_ptl_hdr_t);                                          \
+        /* if there is no message on-deck, put this one there */                        \
+        if (NULL == (p)->send_msg) {                                                    \
+            (p)->send_msg = snd;                                                        \
+        } else {                                                                        \
+            /* add it to the queue */                                                   \
+            pmix_list_append(&(p)->send_queue, &snd->super);                            \
+        }                                                                               \
+        /* ensure the send event is active */                                           \
+        if (!(p)->send_ev_active && 0 <= (p)->sd) {                                     \
+            (p)->send_ev_active = true;                                                 \
+            PMIX_POST_OBJECT(snd);                                                      \
+            pmix_event_add(&(p)->send_event, 0);                                        \
+        }                                                                               \
+    } while (0)
+
+#define CLOSE_THE_SOCKET(socket)                \
+    do {                                        \
+        if (0 <= socket) {                      \
+            shutdown(socket, 2);                \
+            close(socket);                      \
+            socket = -1;                        \
+        }                                       \
+    } while (0)
+
+
+END_C_DECLS
+
+#endif /* PMIX_PTL_TYPES_H */
diff --git a/src/mca/ptl/tcp/Makefile.am b/src/mca/ptl/tcp/Makefile.am
new file mode 100644
index 0000000..6788aba
--- /dev/null
+++ b/src/mca/ptl/tcp/Makefile.am
@@ -0,0 +1,50 @@
+# -*- makefile -*-
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2012      Los Alamos National Security, Inc.  All rights reserved.
+# Copyright (c) 2013-2016 Intel, Inc. All rights reserved
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+headers = ptl_tcp.h
+sources = \
+        ptl_tcp_component.c \
+        ptl_tcp.c
+
+# Make the output library in this directory, and name it either
+# mca_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la
+# (for static builds).
+
+if MCA_BUILD_pmix_ptl_tcp_DSO
+lib =
+lib_sources =
+component = mca_ptl_tcp.la
+component_sources = $(headers) $(sources)
+else
+lib = libmca_ptl_tcp.la
+lib_sources = $(headers) $(sources)
+component =
+component_sources =
+endif
+
+mcacomponentdir = $(pmixlibdir)
+mcacomponent_LTLIBRARIES = $(component)
+mca_ptl_tcp_la_SOURCES = $(component_sources)
+mca_ptl_tcp_la_LDFLAGS = -module -avoid-version
+
+noinst_LTLIBRARIES = $(lib)
+libmca_ptl_tcp_la_SOURCES = $(lib_sources)
+libmca_ptl_tcp_la_LDFLAGS = -module -avoid-version
diff --git a/src/mca/ptl/tcp/Makefile.in b/src/mca/ptl/tcp/Makefile.in
new file mode 100644
index 0000000..a513884
--- /dev/null
+++ b/src/mca/ptl/tcp/Makefile.in
@@ -0,0 +1,891 @@
+# Makefile.in generated by automake 1.15 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+# -*- makefile -*-
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2012      Los Alamos National Security, Inc.  All rights reserved.
+# Copyright (c) 2013-2016 Intel, Inc. All rights reserved
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+subdir = src/mca/ptl/tcp
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/config/c_get_alignment.m4 \
+	$(top_srcdir)/config/libtool.m4 \
+	$(top_srcdir)/config/ltoptions.m4 \
+	$(top_srcdir)/config/ltsugar.m4 \
+	$(top_srcdir)/config/ltversion.m4 \
+	$(top_srcdir)/config/lt~obsolete.m4 \
+	$(top_srcdir)/config/pmix.m4 \
+	$(top_srcdir)/config/pmix_check_attributes.m4 \
+	$(top_srcdir)/config/pmix_check_broken_qsort.m4 \
+	$(top_srcdir)/config/pmix_check_compiler_version.m4 \
+	$(top_srcdir)/config/pmix_check_icc.m4 \
+	$(top_srcdir)/config/pmix_check_ident.m4 \
+	$(top_srcdir)/config/pmix_check_lock.m4 \
+	$(top_srcdir)/config/pmix_check_os_flavors.m4 \
+	$(top_srcdir)/config/pmix_check_package.m4 \
+	$(top_srcdir)/config/pmix_check_psm2.m4 \
+	$(top_srcdir)/config/pmix_check_pthread_pids.m4 \
+	$(top_srcdir)/config/pmix_check_vendor.m4 \
+	$(top_srcdir)/config/pmix_check_visibility.m4 \
+	$(top_srcdir)/config/pmix_check_withdir.m4 \
+	$(top_srcdir)/config/pmix_config_asm.m4 \
+	$(top_srcdir)/config/pmix_config_pthreads.m4 \
+	$(top_srcdir)/config/pmix_config_subdir.m4 \
+	$(top_srcdir)/config/pmix_config_subdir_args.m4 \
+	$(top_srcdir)/config/pmix_config_threads.m4 \
+	$(top_srcdir)/config/pmix_ensure_contains_optflags.m4 \
+	$(top_srcdir)/config/pmix_functions.m4 \
+	$(top_srcdir)/config/pmix_load_platform.m4 \
+	$(top_srcdir)/config/pmix_mca.m4 \
+	$(top_srcdir)/config/pmix_search_libs.m4 \
+	$(top_srcdir)/config/pmix_setup_cc.m4 \
+	$(top_srcdir)/config/pmix_setup_libevent.m4 \
+	$(top_srcdir)/config/pmix_setup_zlib.m4 \
+	$(top_srcdir)/config/pmix_try_assemble.m4 \
+	$(top_srcdir)/config/autogen_found_items.m4 \
+	$(top_srcdir)/src/mca/pdl/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/configure.m4 \
+	$(top_srcdir)/src/mca/pdl/pdlopen/configure.m4 \
+	$(top_srcdir)/src/mca/pdl/plibltdl/configure.m4 \
+	$(top_srcdir)/src/mca/pif/bsdx_ipv4/configure.m4 \
+	$(top_srcdir)/src/mca/pif/bsdx_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pif/linux_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pif/posix_ipv4/configure.m4 \
+	$(top_srcdir)/src/mca/pif/solaris_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/config/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/env/configure.m4 \
+	$(top_srcdir)/src/mca/pnet/opa/configure.m4 \
+	$(top_srcdir)/src/mca/psec/munge/configure.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/src/include/pmix_config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(mcacomponentdir)"
+LTLIBRARIES = $(mcacomponent_LTLIBRARIES) $(noinst_LTLIBRARIES)
+libmca_ptl_tcp_la_LIBADD =
+am__libmca_ptl_tcp_la_SOURCES_DIST = ptl_tcp.h ptl_tcp_component.c \
+	ptl_tcp.c
+am__objects_1 =
+am__objects_2 = ptl_tcp_component.lo ptl_tcp.lo
+ at MCA_BUILD_pmix_ptl_tcp_DSO_FALSE@am__objects_3 = $(am__objects_1) \
+ at MCA_BUILD_pmix_ptl_tcp_DSO_FALSE@	$(am__objects_2)
+am_libmca_ptl_tcp_la_OBJECTS = $(am__objects_3)
+libmca_ptl_tcp_la_OBJECTS = $(am_libmca_ptl_tcp_la_OBJECTS)
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+libmca_ptl_tcp_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(AM_CFLAGS) $(CFLAGS) $(libmca_ptl_tcp_la_LDFLAGS) $(LDFLAGS) \
+	-o $@
+ at MCA_BUILD_pmix_ptl_tcp_DSO_FALSE@am_libmca_ptl_tcp_la_rpath =
+mca_ptl_tcp_la_LIBADD =
+am__mca_ptl_tcp_la_SOURCES_DIST = ptl_tcp.h ptl_tcp_component.c \
+	ptl_tcp.c
+ at MCA_BUILD_pmix_ptl_tcp_DSO_TRUE@am__objects_4 = $(am__objects_1) \
+ at MCA_BUILD_pmix_ptl_tcp_DSO_TRUE@	$(am__objects_2)
+am_mca_ptl_tcp_la_OBJECTS = $(am__objects_4)
+mca_ptl_tcp_la_OBJECTS = $(am_mca_ptl_tcp_la_OBJECTS)
+mca_ptl_tcp_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(AM_CFLAGS) $(CFLAGS) $(mca_ptl_tcp_la_LDFLAGS) $(LDFLAGS) -o \
+	$@
+ at MCA_BUILD_pmix_ptl_tcp_DSO_TRUE@am_mca_ptl_tcp_la_rpath = -rpath \
+ at MCA_BUILD_pmix_ptl_tcp_DSO_TRUE@	$(mcacomponentdir)
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/src/include
+depcomp = $(SHELL) $(top_srcdir)/./config/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libmca_ptl_tcp_la_SOURCES) $(mca_ptl_tcp_la_SOURCES)
+DIST_SOURCES = $(am__libmca_ptl_tcp_la_SOURCES_DIST) \
+	$(am__mca_ptl_tcp_la_SOURCES_DIST)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/./config/depcomp
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CFLAGS = @CFLAGS@
+CLEANFILES = @CLEANFILES@
+CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MCA_PROJECT_SUBDIRS = @MCA_PROJECT_SUBDIRS@
+MCA_pmix_FRAMEWORKS = @MCA_pmix_FRAMEWORKS@
+MCA_pmix_FRAMEWORKS_SUBDIRS = @MCA_pmix_FRAMEWORKS_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS@
+MCA_pmix_FRAMEWORK_LIBS = @MCA_pmix_FRAMEWORK_LIBS@
+MCA_pmix_pdl_ALL_COMPONENTS = @MCA_pmix_pdl_ALL_COMPONENTS@
+MCA_pmix_pdl_ALL_SUBDIRS = @MCA_pmix_pdl_ALL_SUBDIRS@
+MCA_pmix_pdl_DSO_COMPONENTS = @MCA_pmix_pdl_DSO_COMPONENTS@
+MCA_pmix_pdl_DSO_SUBDIRS = @MCA_pmix_pdl_DSO_SUBDIRS@
+MCA_pmix_pdl_STATIC_COMPONENTS = @MCA_pmix_pdl_STATIC_COMPONENTS@
+MCA_pmix_pdl_STATIC_LTLIBS = @MCA_pmix_pdl_STATIC_LTLIBS@
+MCA_pmix_pdl_STATIC_SUBDIRS = @MCA_pmix_pdl_STATIC_SUBDIRS@
+MCA_pmix_pif_ALL_COMPONENTS = @MCA_pmix_pif_ALL_COMPONENTS@
+MCA_pmix_pif_ALL_SUBDIRS = @MCA_pmix_pif_ALL_SUBDIRS@
+MCA_pmix_pif_DSO_COMPONENTS = @MCA_pmix_pif_DSO_COMPONENTS@
+MCA_pmix_pif_DSO_SUBDIRS = @MCA_pmix_pif_DSO_SUBDIRS@
+MCA_pmix_pif_STATIC_COMPONENTS = @MCA_pmix_pif_STATIC_COMPONENTS@
+MCA_pmix_pif_STATIC_LTLIBS = @MCA_pmix_pif_STATIC_LTLIBS@
+MCA_pmix_pif_STATIC_SUBDIRS = @MCA_pmix_pif_STATIC_SUBDIRS@
+MCA_pmix_pinstalldirs_ALL_COMPONENTS = @MCA_pmix_pinstalldirs_ALL_COMPONENTS@
+MCA_pmix_pinstalldirs_ALL_SUBDIRS = @MCA_pmix_pinstalldirs_ALL_SUBDIRS@
+MCA_pmix_pinstalldirs_DSO_COMPONENTS = @MCA_pmix_pinstalldirs_DSO_COMPONENTS@
+MCA_pmix_pinstalldirs_DSO_SUBDIRS = @MCA_pmix_pinstalldirs_DSO_SUBDIRS@
+MCA_pmix_pinstalldirs_STATIC_COMPONENTS = @MCA_pmix_pinstalldirs_STATIC_COMPONENTS@
+MCA_pmix_pinstalldirs_STATIC_LTLIBS = @MCA_pmix_pinstalldirs_STATIC_LTLIBS@
+MCA_pmix_pinstalldirs_STATIC_SUBDIRS = @MCA_pmix_pinstalldirs_STATIC_SUBDIRS@
+MCA_pmix_pnet_ALL_COMPONENTS = @MCA_pmix_pnet_ALL_COMPONENTS@
+MCA_pmix_pnet_ALL_SUBDIRS = @MCA_pmix_pnet_ALL_SUBDIRS@
+MCA_pmix_pnet_DSO_COMPONENTS = @MCA_pmix_pnet_DSO_COMPONENTS@
+MCA_pmix_pnet_DSO_SUBDIRS = @MCA_pmix_pnet_DSO_SUBDIRS@
+MCA_pmix_pnet_STATIC_COMPONENTS = @MCA_pmix_pnet_STATIC_COMPONENTS@
+MCA_pmix_pnet_STATIC_LTLIBS = @MCA_pmix_pnet_STATIC_LTLIBS@
+MCA_pmix_pnet_STATIC_SUBDIRS = @MCA_pmix_pnet_STATIC_SUBDIRS@
+MCA_pmix_psec_ALL_COMPONENTS = @MCA_pmix_psec_ALL_COMPONENTS@
+MCA_pmix_psec_ALL_SUBDIRS = @MCA_pmix_psec_ALL_SUBDIRS@
+MCA_pmix_psec_DSO_COMPONENTS = @MCA_pmix_psec_DSO_COMPONENTS@
+MCA_pmix_psec_DSO_SUBDIRS = @MCA_pmix_psec_DSO_SUBDIRS@
+MCA_pmix_psec_STATIC_COMPONENTS = @MCA_pmix_psec_STATIC_COMPONENTS@
+MCA_pmix_psec_STATIC_LTLIBS = @MCA_pmix_psec_STATIC_LTLIBS@
+MCA_pmix_psec_STATIC_SUBDIRS = @MCA_pmix_psec_STATIC_SUBDIRS@
+MCA_pmix_psensor_ALL_COMPONENTS = @MCA_pmix_psensor_ALL_COMPONENTS@
+MCA_pmix_psensor_ALL_SUBDIRS = @MCA_pmix_psensor_ALL_SUBDIRS@
+MCA_pmix_psensor_DSO_COMPONENTS = @MCA_pmix_psensor_DSO_COMPONENTS@
+MCA_pmix_psensor_DSO_SUBDIRS = @MCA_pmix_psensor_DSO_SUBDIRS@
+MCA_pmix_psensor_STATIC_COMPONENTS = @MCA_pmix_psensor_STATIC_COMPONENTS@
+MCA_pmix_psensor_STATIC_LTLIBS = @MCA_pmix_psensor_STATIC_LTLIBS@
+MCA_pmix_psensor_STATIC_SUBDIRS = @MCA_pmix_psensor_STATIC_SUBDIRS@
+MCA_pmix_ptl_ALL_COMPONENTS = @MCA_pmix_ptl_ALL_COMPONENTS@
+MCA_pmix_ptl_ALL_SUBDIRS = @MCA_pmix_ptl_ALL_SUBDIRS@
+MCA_pmix_ptl_DSO_COMPONENTS = @MCA_pmix_ptl_DSO_COMPONENTS@
+MCA_pmix_ptl_DSO_SUBDIRS = @MCA_pmix_ptl_DSO_SUBDIRS@
+MCA_pmix_ptl_STATIC_COMPONENTS = @MCA_pmix_ptl_STATIC_COMPONENTS@
+MCA_pmix_ptl_STATIC_LTLIBS = @MCA_pmix_ptl_STATIC_LTLIBS@
+MCA_pmix_ptl_STATIC_SUBDIRS = @MCA_pmix_ptl_STATIC_SUBDIRS@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PMIX_ASM_GSYM = @PMIX_ASM_GSYM@
+PMIX_ASM_LSYM = @PMIX_ASM_LSYM@
+PMIX_ASM_SUPPORT_64BIT = @PMIX_ASM_SUPPORT_64BIT@
+PMIX_ASM_TEXT = @PMIX_ASM_TEXT@
+PMIX_ASM_TYPE = @PMIX_ASM_TYPE@
+PMIX_ASSEMBLY_ARCH = @PMIX_ASSEMBLY_ARCH@
+PMIX_ASSEMBLY_BUILTIN = @PMIX_ASSEMBLY_BUILTIN@
+PMIX_ASSEMBLY_FORMAT = @PMIX_ASSEMBLY_FORMAT@
+PMIX_AS_GLOBAL = @PMIX_AS_GLOBAL@
+PMIX_AS_LABEL_SUFFIX = @PMIX_AS_LABEL_SUFFIX@
+PMIX_CC_ABSOLUTE = @PMIX_CC_ABSOLUTE@
+PMIX_CONFIGURE_DATE = @PMIX_CONFIGURE_DATE@
+PMIX_CONFIGURE_HOST = @PMIX_CONFIGURE_HOST@
+PMIX_CONFIGURE_USER = @PMIX_CONFIGURE_USER@
+PMIX_EMBEDDED_CPPFLAGS = @PMIX_EMBEDDED_CPPFLAGS@
+PMIX_EMBEDDED_LDFLAGS = @PMIX_EMBEDDED_LDFLAGS@
+PMIX_EMBEDDED_LIBS = @PMIX_EMBEDDED_LIBS@
+PMIX_MAJOR_VERSION = @PMIX_MAJOR_VERSION@
+PMIX_MINOR_VERSION = @PMIX_MINOR_VERSION@
+PMIX_RELEASE_DATE = @PMIX_RELEASE_DATE@
+PMIX_RELEASE_VERSION = @PMIX_RELEASE_VERSION@
+PMIX_RENAME = @PMIX_RENAME@
+PMIX_VERSION = @PMIX_VERSION@
+PMIX_top_builddir = @PMIX_top_builddir@
+PMIX_top_srcdir = @PMIX_top_srcdir@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_prefix_program = @ac_prefix_program@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+libpmix_so_version = @libpmix_so_version@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pmix_have_pandoc = @pmix_have_pandoc@
+pmix_pdl_pdlopen_LIBS = @pmix_pdl_pdlopen_LIBS@
+pmix_pdl_plibltdl_CPPFLAGS = @pmix_pdl_plibltdl_CPPFLAGS@
+pmix_pdl_plibltdl_LDFLAGS = @pmix_pdl_plibltdl_LDFLAGS@
+pmix_pdl_plibltdl_LIBS = @pmix_pdl_plibltdl_LIBS@
+pmixdatadir = @pmixdatadir@
+pmixincludedir = @pmixincludedir@
+pmixlibdir = @pmixlibdir@
+pmixmajor = @pmixmajor@
+pmixminor = @pmixminor@
+pnet_opa_CFLAGS = @pnet_opa_CFLAGS@
+pnet_opa_CPPFLAGS = @pnet_opa_CPPFLAGS@
+pnet_opa_LDFLAGS = @pnet_opa_LDFLAGS@
+pnet_opa_LIBS = @pnet_opa_LIBS@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+psec_munge_CPPFLAGS = @psec_munge_CPPFLAGS@
+psec_munge_LDFLAGS = @psec_munge_LDFLAGS@
+psec_munge_LIBS = @psec_munge_LIBS@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+headers = ptl_tcp.h
+sources = \
+        ptl_tcp_component.c \
+        ptl_tcp.c
+
+ at MCA_BUILD_pmix_ptl_tcp_DSO_FALSE@lib = libmca_ptl_tcp.la
+
+# Make the output library in this directory, and name it either
+# mca_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la
+# (for static builds).
+ at MCA_BUILD_pmix_ptl_tcp_DSO_TRUE@lib = 
+ at MCA_BUILD_pmix_ptl_tcp_DSO_FALSE@lib_sources = $(headers) $(sources)
+ at MCA_BUILD_pmix_ptl_tcp_DSO_TRUE@lib_sources = 
+ at MCA_BUILD_pmix_ptl_tcp_DSO_FALSE@component = 
+ at MCA_BUILD_pmix_ptl_tcp_DSO_TRUE@component = mca_ptl_tcp.la
+ at MCA_BUILD_pmix_ptl_tcp_DSO_FALSE@component_sources = 
+ at MCA_BUILD_pmix_ptl_tcp_DSO_TRUE@component_sources = $(headers) $(sources)
+mcacomponentdir = $(pmixlibdir)
+mcacomponent_LTLIBRARIES = $(component)
+mca_ptl_tcp_la_SOURCES = $(component_sources)
+mca_ptl_tcp_la_LDFLAGS = -module -avoid-version
+noinst_LTLIBRARIES = $(lib)
+libmca_ptl_tcp_la_SOURCES = $(lib_sources)
+libmca_ptl_tcp_la_LDFLAGS = -module -avoid-version
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/mca/ptl/tcp/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/mca/ptl/tcp/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+install-mcacomponentLTLIBRARIES: $(mcacomponent_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	@list='$(mcacomponent_LTLIBRARIES)'; test -n "$(mcacomponentdir)" || 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)$(mcacomponentdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(mcacomponentdir)" || exit 1; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(mcacomponentdir)'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(mcacomponentdir)"; \
+	}
+
+uninstall-mcacomponentLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(mcacomponent_LTLIBRARIES)'; test -n "$(mcacomponentdir)" || list=; \
+	for p in $$list; do \
+	  $(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(mcacomponentdir)/$$f'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(mcacomponentdir)/$$f"; \
+	done
+
+clean-mcacomponentLTLIBRARIES:
+	-test -z "$(mcacomponent_LTLIBRARIES)" || rm -f $(mcacomponent_LTLIBRARIES)
+	@list='$(mcacomponent_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}; \
+	}
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_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}; \
+	}
+
+libmca_ptl_tcp.la: $(libmca_ptl_tcp_la_OBJECTS) $(libmca_ptl_tcp_la_DEPENDENCIES) $(EXTRA_libmca_ptl_tcp_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(libmca_ptl_tcp_la_LINK) $(am_libmca_ptl_tcp_la_rpath) $(libmca_ptl_tcp_la_OBJECTS) $(libmca_ptl_tcp_la_LIBADD) $(LIBS)
+
+mca_ptl_tcp.la: $(mca_ptl_tcp_la_OBJECTS) $(mca_ptl_tcp_la_DEPENDENCIES) $(EXTRA_mca_ptl_tcp_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(mca_ptl_tcp_la_LINK) $(am_mca_ptl_tcp_la_rpath) $(mca_ptl_tcp_la_OBJECTS) $(mca_ptl_tcp_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ptl_tcp.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ptl_tcp_component.Plo at am__quote@
+
+.c.o:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+ at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+	for dir in "$(DESTDIR)$(mcacomponentdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-mcacomponentLTLIBRARIES \
+	clean-noinstLTLIBRARIES mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-mcacomponentLTLIBRARIES
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-mcacomponentLTLIBRARIES
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-mcacomponentLTLIBRARIES \
+	clean-noinstLTLIBRARIES 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-mcacomponentLTLIBRARIES install-pdf install-pdf-am \
+	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-mcacomponentLTLIBRARIES
+
+.PRECIOUS: Makefile
+
+
+# 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/mca/ptl/tcp/ptl_tcp.c b/src/mca/ptl/tcp/ptl_tcp.c
new file mode 100644
index 0000000..883bc2f
--- /dev/null
+++ b/src/mca/ptl/tcp/ptl_tcp.c
@@ -0,0 +1,883 @@
+/*
+ * Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2011 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2010-2011 Oak Ridge National Labs.  All rights reserved.
+ * Copyright (c) 2011-2014 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2011-2013 Los Alamos National Security, LLC.  All rights
+ *                         reserved.
+ * Copyright (c) 2013-2017 Intel, Inc.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ *
+ */
+
+#include <src/include/pmix_config.h>
+
+#ifdef HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_SYS_UIO_H
+#include <sys/uio.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
+#include <dirent.h>
+
+#include "src/include/pmix_globals.h"
+#include "src/include/pmix_socket_errno.h"
+#include "src/client/pmix_client_ops.h"
+#include "src/server/pmix_server_ops.h"
+#include "src/util/argv.h"
+#include "src/util/error.h"
+#include "src/util/os_path.h"
+
+#include "src/mca/ptl/base/base.h"
+#include "ptl_tcp.h"
+
+static pmix_status_t init(void);
+static void finalize(void);
+static pmix_status_t connect_to_peer(struct pmix_peer_t *peer,
+                                     pmix_info_t *info, size_t ninfo);
+static pmix_status_t send_recv(struct pmix_peer_t *peer,
+                               pmix_buffer_t *bfr,
+                               pmix_ptl_cbfunc_t cbfunc,
+                               void *cbdata);
+static pmix_status_t send_oneway(struct pmix_peer_t *peer,
+                                 pmix_buffer_t *bfr,
+                                 pmix_ptl_tag_t tag);
+
+pmix_ptl_module_t pmix_ptl_tcp_module = {
+    .init = init,
+    .finalize = finalize,
+    .send_recv = send_recv,
+    .send = send_oneway,
+    .connect_to_peer = connect_to_peer
+};
+
+static pmix_status_t recv_connect_ack(int sd);
+static pmix_status_t send_connect_ack(int sd);
+
+
+static pmix_status_t init(void)
+{
+    return PMIX_SUCCESS;
+}
+
+static void finalize(void)
+{
+}
+
+static char *pmix_getline(FILE *fp)
+{
+    char *ret, *buff;
+    char input[1024];
+
+    ret = fgets(input, 1024, fp);
+    if (NULL != ret) {
+       input[strlen(input)-1] = '\0';  /* remove newline */
+       buff = strdup(input);
+       return buff;
+    }
+
+    return NULL;
+}
+
+static pmix_status_t parse_uri_file(char *filename,
+                                    char **uri,
+                                    char **nspace,
+                                    pmix_rank_t *rank);
+static pmix_status_t try_connect(int *sd);
+static pmix_status_t df_search(char *dirname, char *prefix,
+                               int *sd, char **nspace,
+                               pmix_rank_t *rank);
+
+static pmix_status_t connect_to_peer(struct pmix_peer_t *peer,
+                                     pmix_info_t *info, size_t ninfo)
+{
+    char *evar, **uri, *suri;
+    char *filename, *nspace=NULL;
+    pmix_rank_t rank = PMIX_RANK_WILDCARD;
+    char *p, *p2;
+    int sd, rc;
+    size_t n;
+    char myhost[PMIX_MAXHOSTNAMELEN];
+    bool system_level = false;
+    bool system_level_only = false;
+
+    pmix_output_verbose(2, pmix_ptl_base_framework.framework_output,
+                        "ptl:tcp: connecting to server");
+
+    /* see if the connection info is in the info array - if
+     * so, then that overrides all other options */
+
+
+    /* if I am a client, then we need to look for the appropriate
+     * connection info in the environment */
+    if (PMIX_PROC_IS_CLIENT) {
+        if (NULL == (evar = getenv("PMIX_SERVER_URI2"))) {
+            /* not us */
+            return PMIX_ERR_NOT_SUPPORTED;
+        }
+
+        /* the URI consists of  elements:
+        *    - server nspace.rank
+        *    - ptl rendezvous URI
+        */
+        uri = pmix_argv_split(evar, ';');
+        if (2 != pmix_argv_count(uri)) {
+            PMIX_ERROR_LOG(PMIX_ERR_BAD_PARAM);
+            pmix_argv_free(uri);
+            return PMIX_ERR_NOT_SUPPORTED;
+        }
+
+        /* set the server nspace */
+        p = uri[0];
+        if (NULL == (p2 = strchr(p, '.'))) {
+            PMIX_ERROR_LOG(PMIX_ERR_BAD_PARAM);
+            pmix_argv_free(uri);
+            return PMIX_ERR_NOT_SUPPORTED;
+        }
+        *p2 = '\0';
+        ++p2;
+        nspace = strdup(p);
+        rank = strtoull(p2, NULL, 10);
+
+        /* save the URI, but do not overwrite what we may have received from
+         * the info-key directives */
+        if (NULL == mca_ptl_tcp_component.super.uri) {
+            mca_ptl_tcp_component.super.uri = strdup(uri[1]);
+        }
+        pmix_argv_free(uri);
+
+        pmix_output_verbose(2, pmix_ptl_base_framework.framework_output,
+                            "ptl:tcp:client attempt connect to %s",
+                            mca_ptl_tcp_component.super.uri);
+
+        /* go ahead and try to connect */
+        if (PMIX_SUCCESS != (rc = try_connect(&sd))) {
+            free(nspace);
+            return rc;
+        }
+        goto complete;
+
+    }
+
+    /* get here if we are a tool - check any provided directives
+     * to see where they want us to connect to */
+    if (NULL != info) {
+        for (n=0; n < ninfo; n++) {
+            if (0 == strcmp(info[n].key, PMIX_CONNECT_TO_SYSTEM)) {
+                system_level_only = true;
+            } else if (0 == strcmp(info[n].key, PMIX_CONNECT_SYSTEM_FIRST)) {
+                /* try the system-level */
+                system_level = true;
+            } else if (0 == strcmp(info[n].key, PMIX_SERVER_PIDINFO)) {
+                mca_ptl_tcp_component.tool_pid = info[n].value.data.pid;
+            } else if (0 == strcmp(info[n].key, PMIX_SERVER_URI)) {
+                if (NULL == mca_ptl_tcp_component.super.uri) {
+                    free(mca_ptl_tcp_component.super.uri);
+                }
+                mca_ptl_tcp_component.super.uri = strdup(info[n].value.data.string);
+            }
+        }
+    }
+    gethostname(myhost, sizeof(myhost));
+    /* if we were given a URI via MCA param, then look no further */
+    if (NULL != mca_ptl_tcp_component.super.uri) {
+        /* if the string starts with "file:", then they are pointing
+         * us to a file we need to read to get the URI itself */
+        if (0 != strncmp(mca_ptl_tcp_component.super.uri, "file:", 5)) {
+            pmix_output_verbose(2, pmix_ptl_base_framework.framework_output,
+                                "ptl:tcp:tool getting connection info from %s",
+                                mca_ptl_tcp_component.super.uri);
+            nspace = NULL;
+            rc = parse_uri_file(&mca_ptl_tcp_component.super.uri[6], &suri, &nspace, &rank);
+            if (PMIX_SUCCESS != rc) {
+                return PMIX_ERR_UNREACH;
+            }
+            free(mca_ptl_tcp_component.super.uri);
+            mca_ptl_tcp_component.super.uri = suri;
+        }
+        pmix_output_verbose(2, pmix_ptl_base_framework.framework_output,
+                            "ptl:tcp:tool attempt connect using given URI %s",
+                            mca_ptl_tcp_component.super.uri);
+        /* go ahead and try to connect */
+        if (PMIX_SUCCESS != (rc = try_connect(&sd))) {
+            if (NULL != nspace) {
+                free(nspace);
+            }
+            return rc;
+        }
+        goto complete;
+    }
+
+
+    /* if they asked for system-level, we start there */
+    if (system_level || system_level_only) {
+        if (0 > asprintf(&filename, "%s/pmix.sys.%s", mca_ptl_tcp_component.system_tmpdir, myhost)) {
+            return PMIX_ERR_NOMEM;
+        }
+        pmix_output_verbose(2, pmix_ptl_base_framework.framework_output,
+                            "ptl:tcp:tool looking for system server at %s",
+                            filename);
+        /* try to read the file */
+        rc = parse_uri_file(filename, &suri, &nspace, &rank);
+        free(filename);
+        if (PMIX_SUCCESS == rc) {
+            mca_ptl_tcp_component.super.uri = suri;
+            pmix_output_verbose(2, pmix_ptl_base_framework.framework_output,
+                                "ptl:tcp:tool attempt connect to system server at %s",
+                                mca_ptl_tcp_component.super.uri);
+            /* go ahead and try to connect */
+            if (PMIX_SUCCESS == try_connect(&sd)) {
+                goto complete;
+            }
+            free(nspace);
+        }
+    }
+
+    /* we get here if they either didn't ask for a system-level connection,
+     * or they asked for it and it didn't succeed. If they _only_ wanted
+     * a system-level connection, then we are done */
+    if (system_level_only) {
+        pmix_output_verbose(2, pmix_ptl_base_framework.framework_output,
+                            "ptl:tcp: connecting to system failed");
+        return PMIX_ERR_UNREACH;
+    }
+
+    /* now try the session-level connection - if they gave us a pid, then
+     * look for it */
+    if (0 != mca_ptl_tcp_component.tool_pid) {
+        if (0 > asprintf(&filename, "pmix.%s.tool.%d",
+                         myhost, mca_ptl_tcp_component.tool_pid)) {
+            return PMIX_ERR_NOMEM;
+        }
+        pmix_output_verbose(2, pmix_ptl_base_framework.framework_output,
+                            "ptl:tcp:tool searching for given session server %s",
+                            filename);
+        nspace = NULL;
+        rc = df_search(mca_ptl_tcp_component.system_tmpdir,
+                       filename, &sd, &nspace, &rank);
+        free(filename);
+        if (PMIX_SUCCESS == rc) {
+            goto complete;
+        }
+        if (NULL != nspace) {
+            free(nspace);
+        }
+        /* since they gave us a specific pid and we couldn't
+         * connect to it, return an error */
+        return PMIX_ERR_UNREACH;
+    }
+
+    /* they didn't give us a pid, so we will search to see what session-level
+     * tools are available to this user. We will take the first connection
+     * that succeeds - this is based on the likelihood that there is only
+     * one session per user on a node */
+
+    if (0 > asprintf(&filename, "pmix.%s.tool", myhost)) {
+        return PMIX_ERR_NOMEM;
+    }
+    pmix_output_verbose(2, pmix_ptl_base_framework.framework_output,
+                        "ptl:tcp:tool searching for session server %s",
+                        filename);
+    nspace = NULL;
+    rc = df_search(mca_ptl_tcp_component.system_tmpdir,
+                   filename, &sd, &nspace, &rank);
+    free(filename);
+    if (PMIX_SUCCESS != rc) {
+        if (NULL != nspace){
+            free(nspace);
+        }
+        return PMIX_ERR_UNREACH;
+    }
+
+  complete:
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "sock_peer_try_connect: Connection across to server succeeded");
+
+    /* do a final bozo check */
+    if (NULL == nspace || PMIX_RANK_WILDCARD == rank) {
+        CLOSE_THE_SOCKET(sd);
+        return PMIX_ERR_UNREACH;
+    }
+    /* mark the connection as made */
+    pmix_globals.connected = true;
+    pmix_client_globals.myserver->sd = sd;
+
+    /* setup the server info */
+    if (NULL == pmix_client_globals.myserver->info) {
+        pmix_client_globals.myserver->info = PMIX_NEW(pmix_rank_info_t);
+    }
+    if (NULL == pmix_client_globals.myserver->info->nptr) {
+        pmix_client_globals.myserver->info->nptr = PMIX_NEW(pmix_nspace_t);
+    }
+    (void)strncpy(pmix_client_globals.myserver->info->nptr->nspace, nspace, PMIX_MAX_NSLEN);
+    free(nspace);
+    pmix_client_globals.myserver->info->rank = rank;
+
+    pmix_ptl_base_set_nonblocking(sd);
+
+    /* setup recv event */
+    pmix_event_assign(&pmix_client_globals.myserver->recv_event,
+                      pmix_globals.evbase,
+                      pmix_client_globals.myserver->sd,
+                      EV_READ | EV_PERSIST,
+                      pmix_ptl_base_recv_handler, pmix_client_globals.myserver);
+    pmix_client_globals.myserver->recv_ev_active = true;
+    PMIX_POST_OBJECT(pmix_client_globals.myserver);
+    pmix_event_add(&pmix_client_globals.myserver->recv_event, 0);
+
+    /* setup send event */
+    pmix_event_assign(&pmix_client_globals.myserver->send_event,
+                      pmix_globals.evbase,
+                      pmix_client_globals.myserver->sd,
+                      EV_WRITE|EV_PERSIST,
+                      pmix_ptl_base_send_handler, pmix_client_globals.myserver);
+    pmix_client_globals.myserver->send_ev_active = false;
+
+    return PMIX_SUCCESS;
+}
+
+static pmix_status_t send_recv(struct pmix_peer_t *peer,
+                               pmix_buffer_t *bfr,
+                               pmix_ptl_cbfunc_t cbfunc,
+                               void *cbdata)
+{
+    pmix_ptl_sr_t *ms;
+    pmix_peer_t *pr = (pmix_peer_t*)peer;
+
+    pmix_output_verbose(2, pmix_ptl_base_framework.framework_output,
+                        "[%s:%d] post send to server",
+                        __FILE__, __LINE__);
+
+    ms = PMIX_NEW(pmix_ptl_sr_t);
+    PMIX_RETAIN(pr);
+    ms->peer = pr;
+    ms->bfr = bfr;
+    ms->cbfunc = cbfunc;
+    ms->cbdata = cbdata;
+    PMIX_THREADSHIFT(ms, pmix_ptl_base_send_recv);
+    return PMIX_SUCCESS;
+}
+
+static pmix_status_t send_oneway(struct pmix_peer_t *peer,
+                                 pmix_buffer_t *bfr,
+                                 pmix_ptl_tag_t tag)
+{
+    pmix_ptl_queue_t *q;
+    pmix_peer_t *pr = (pmix_peer_t*)peer;
+
+    /* we have to transfer this to an event for thread
+     * safety as we need to post this message on the
+     * peer's send queue */
+    q = PMIX_NEW(pmix_ptl_queue_t);
+    PMIX_RETAIN(pr);
+    q->peer = pr;
+    q->buf = bfr;
+    q->tag = tag;
+    PMIX_THREADSHIFT(q, pmix_ptl_base_send);
+    return PMIX_SUCCESS;
+}
+
+
+/****    SUPPORTING FUNCTIONS    ****/
+static pmix_status_t parse_uri_file(char *filename,
+                                    char **uri,
+                                    char **nspace,
+                                    pmix_rank_t *rank)
+{
+    FILE *fp;
+    char *srvr, *p, *p2;
+
+    fp = fopen(filename, "r");
+    if (NULL == fp) {
+        /* if we cannot open the file, then the server must not
+         * be configured to support tool connections, or this
+         * user isn't authorized to access it */
+        return PMIX_ERR_UNREACH;
+    }
+    /* get the URI */
+    srvr = pmix_getline(fp);
+    if (NULL == srvr) {
+        PMIX_ERROR_LOG(PMIX_ERR_FILE_READ_FAILURE);
+        fclose(fp);
+        return PMIX_ERR_UNREACH;
+    }
+    fclose(fp);
+    /* up to the first ';' is the server nspace/rank */
+    if (NULL == (p = strchr(srvr, ';'))) {
+        /* malformed */
+        free(srvr);
+        return PMIX_ERR_UNREACH;
+    }
+    *p = '\0';
+    ++p;  // move past the semicolon
+    /* the nspace is the section up to the '.' */
+    if (NULL == (p2 = strchr(srvr, '.'))) {
+        /* malformed */
+        free(srvr);
+        return PMIX_ERR_UNREACH;
+    }
+    *p2 = '\0';
+    ++p2;
+    /* set the server nspace */
+    *nspace = strdup(p);
+    *rank = strtoull(p2, NULL, 10);
+
+    /* now parse the uri itself */
+    *uri = strdup(p);
+    free(srvr);
+
+    return PMIX_SUCCESS;
+}
+
+static pmix_status_t try_connect(int *sd)
+{
+    char *p, *p2, *host;
+    struct sockaddr_in *in;
+    struct sockaddr_in6 *in6;
+    size_t len;
+    pmix_status_t rc;
+
+    pmix_output_verbose(2, pmix_ptl_base_framework.framework_output,
+                        "pmix:tcp try connect to %s",
+                        mca_ptl_tcp_component.super.uri);
+
+    /* mark that we are the active module for this server */
+    pmix_client_globals.myserver->compat.ptl = &pmix_ptl_tcp_module;
+
+    /* setup the path to the daemon rendezvous point */
+    memset(&mca_ptl_tcp_component.connection, 0, sizeof(struct sockaddr_storage));
+    if (0 == strncmp(mca_ptl_tcp_component.super.uri, "tcp4", 4)) {
+        /* separate the IP address from the port */
+        p = strdup(mca_ptl_tcp_component.super.uri);
+        if (NULL == p) {
+            PMIX_ERROR_LOG(PMIX_ERR_NOMEM);
+            return PMIX_ERR_NOMEM;
+        }
+        p2 = strchr(&p[7], ':');
+        if (NULL == p2) {
+            free(p);
+            PMIX_ERROR_LOG(PMIX_ERR_BAD_PARAM);
+            return PMIX_ERR_BAD_PARAM;
+        }
+        *p2 = '\0';
+        ++p2;
+        host = &p[7];
+        /* load the address */
+        in = (struct sockaddr_in*)&mca_ptl_tcp_component.connection;
+        in->sin_family = AF_INET;
+        in->sin_addr.s_addr = inet_addr(host);
+        if (in->sin_addr.s_addr == INADDR_NONE) {
+            free(p);
+            PMIX_ERROR_LOG(PMIX_ERR_BAD_PARAM);
+            return PMIX_ERR_BAD_PARAM;
+        }
+        in->sin_port = htons(atoi(p2));
+        len = sizeof(struct sockaddr_in);
+    } else {
+        /* separate the IP address from the port */
+        p = strdup(mca_ptl_tcp_component.super.uri);
+        if (NULL == p) {
+            PMIX_ERROR_LOG(PMIX_ERR_NOMEM);
+            return PMIX_ERR_NOMEM;
+        }
+        p2 = strchr(&p[7], ':');
+        if (NULL == p2) {
+            free(p);
+            PMIX_ERROR_LOG(PMIX_ERR_BAD_PARAM);
+            return PMIX_ERR_BAD_PARAM;
+        }
+        *p2 = '\0';
+        if (']' == p[strlen(p)-1]) {
+            p[strlen(p)-1] = '\0';
+        }
+        if ('[' == p[7]) {
+            host = &p[8];
+        } else {
+            host = &p[7];
+        }
+        /* load the address */
+        in6 = (struct sockaddr_in6*)&mca_ptl_tcp_component.connection;
+        in6->sin6_family = AF_INET6;
+        if (0 == inet_pton(AF_INET6, host, (void*)&in6->sin6_addr)) {
+            pmix_output (0, "ptl_tcp_parse_uri: Could not convert %s\n", host);
+            free(p);
+            PMIX_ERROR_LOG(PMIX_ERR_BAD_PARAM);
+            return PMIX_ERR_BAD_PARAM;
+        }
+        in6->sin6_port = htons(atoi(p2));
+        len = sizeof(struct sockaddr_in6);
+    }
+    free(p);
+
+    /* establish the connection */
+    if (PMIX_SUCCESS != (rc = pmix_ptl_base_connect(&mca_ptl_tcp_component.connection, len, sd))) {
+        PMIX_ERROR_LOG(rc);
+        return rc;
+    }
+
+    /* send our identity and any authentication credentials to the server */
+    if (PMIX_SUCCESS != (rc = send_connect_ack(*sd))) {
+        PMIX_ERROR_LOG(rc);
+        CLOSE_THE_SOCKET(*sd);
+        return rc;
+    }
+
+    /* do whatever handshake is required */
+    if (PMIX_SUCCESS != (rc = recv_connect_ack(*sd))) {
+        PMIX_ERROR_LOG(rc);
+        CLOSE_THE_SOCKET(*sd);
+        return rc;
+    }
+
+    return PMIX_SUCCESS;
+}
+static pmix_status_t send_connect_ack(int sd)
+{
+    char *msg;
+    pmix_ptl_hdr_t hdr;
+    size_t sdsize=0, csize=0, len;
+    char *cred = NULL;
+    char *sec;
+    pmix_status_t rc;
+    uint8_t flag;
+    uid_t euid;
+    gid_t egid;
+    uint32_t u32;
+
+    pmix_output_verbose(2, pmix_ptl_base_framework.framework_output,
+                        "pmix:tcp SEND CONNECT ACK");
+
+    /* if we are a server, then we shouldn't be here */
+    if (PMIX_PROC_IS_SERVER) {
+        return PMIX_ERR_NOT_SUPPORTED;
+    }
+
+    /* setup the header */
+    memset(&hdr, 0, sizeof(pmix_ptl_hdr_t));
+    hdr.pindex = -1;
+    hdr.tag = UINT32_MAX;
+
+    /* a security module was assigned to us during rte_init based
+     * on a list of available security modules provided by our
+     * local PMIx server, if known. Now use that module to
+     * get a credential, if the security system provides one. Not
+     * every psec module will do so, thus we must first check */
+    rc = pmix_psec.create_cred(pmix_client_globals.myserver,
+                               PMIX_PROTOCOL_V2, &cred, &len);
+    if (PMIX_SUCCESS != rc) {
+        return rc;
+    }
+
+    /* allow space for a marker indicating client vs tool */
+    sdsize = 1;
+
+    if (PMIX_PROC_IS_CLIENT) {
+        flag = 0;
+        /* reserve space for our nspace and rank info */
+        sdsize += strlen(pmix_globals.myid.nspace) + 1 + sizeof(int);
+    } else {
+        flag = 1;
+        /* add space for our uid/gid for ACL purposes */
+        sdsize += 2*sizeof(uint32_t);
+    }
+
+    /* add the name of our active sec module - we selected it
+     * in pmix_client.c prior to entering here */
+    sec = pmix_globals.mypeer->compat.psec->name;
+
+    /* set the number of bytes to be read beyond the header */
+    hdr.nbytes = sdsize + strlen(PMIX_VERSION) + 1 + strlen(sec) + 1 + sizeof(uint32_t) + len;  // must NULL terminate the strings!
+
+    /* create a space for our message */
+    sdsize = (sizeof(hdr) + hdr.nbytes);
+    if (NULL == (msg = (char*)malloc(sdsize))) {
+        if (NULL != cred) {
+            free(cred);
+        }
+        free(sec);
+        return PMIX_ERR_OUT_OF_RESOURCE;
+    }
+    memset(msg, 0, sdsize);
+
+    /* load the message */
+    csize=0;
+    memcpy(msg, &hdr, sizeof(pmix_ptl_hdr_t));
+    csize += sizeof(pmix_ptl_hdr_t);
+
+    /* provide our active psec module */
+    memcpy(msg+csize, sec, strlen(sec));
+    csize += strlen(sec)+1;
+
+    /* load the length of the credential - we put this in uint32_t
+     * format as that is a fixed size, and convert to network
+     * byte order for heterogeneity */
+    u32 = htonl((uint32_t)len);
+    memcpy(msg+csize, &u32, sizeof(uint32_t));
+    csize += sizeof(uint32_t);
+    /* load the credential */
+    if (0 < u32) {
+        memcpy(msg+csize, cred, len);
+        csize += len;
+    }
+
+    /* load our process type - this is a single byte,
+     * so no worry about heterogeneity here */
+    memcpy(msg+csize, &flag, 1);
+    csize += 1;
+
+    if (PMIX_PROC_IS_CLIENT) {
+        /* if we are a client, provide our nspace/rank */
+        memcpy(msg+csize, pmix_globals.myid.nspace, strlen(pmix_globals.myid.nspace));
+        csize += strlen(pmix_globals.myid.nspace)+1;
+        /* again, need to convert */
+        u32 = htonl((uint32_t)pmix_globals.myid.rank);
+        memcpy(msg+csize, &u32, sizeof(uint32_t));
+        csize += sizeof(uint32_t);
+    } else {
+        /* if we are a tool, provide our uid/gid for ACL support - note
+         * that we have to convert so we can handle heterogeneity */
+        euid = geteuid();
+        u32 = htonl(euid);
+        memcpy(msg+csize, &u32, sizeof(uint32_t));
+        csize += sizeof(uint32_t);
+        egid = getegid();
+        u32 = htonl(egid);
+        memcpy(msg+csize, &u32, sizeof(uint32_t));
+        csize += sizeof(uint32_t);
+    }
+
+    /* provide our version */
+    memcpy(msg+csize, PMIX_VERSION, strlen(PMIX_VERSION));
+    csize += strlen(PMIX_VERSION)+1;
+
+    /* send the entire message across */
+    if (PMIX_SUCCESS != pmix_ptl_base_send_blocking(sd, msg, sdsize)) {
+        free(msg);
+        if (NULL != cred) {
+            free(cred);
+        }
+        return PMIX_ERR_UNREACH;
+    }
+    free(msg);
+    if (NULL != cred) {
+        free(cred);
+    }
+    return PMIX_SUCCESS;
+}
+
+/* we receive a connection acknowledgement from the server,
+ * consisting of nothing more than a status report. If success,
+ * then we initiate authentication method */
+static pmix_status_t recv_connect_ack(int sd)
+{
+    pmix_status_t reply;
+    pmix_status_t rc;
+    struct timeval tv, save;
+    pmix_socklen_t sz;
+    bool sockopt = true;
+    uint32_t u32;
+    char nspace[PMIX_MAX_NSLEN+1];
+
+    pmix_output_verbose(2, pmix_ptl_base_framework.framework_output,
+                        "pmix: RECV CONNECT ACK FROM SERVER");
+
+    /* get the current timeout value so we can reset to it */
+    sz = sizeof(save);
+    if (0 != getsockopt(sd, SOL_SOCKET, SO_RCVTIMEO, (void*)&save, &sz)) {
+        if (ENOPROTOOPT == errno) {
+            sockopt = false;
+        } else {
+           return PMIX_ERR_UNREACH;
+       }
+   } else {
+        /* set a timeout on the blocking recv so we don't hang */
+        tv.tv_sec  = 2;
+        tv.tv_usec = 0;
+        if (0 != setsockopt(sd, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv))) {
+            pmix_output_verbose(2, pmix_ptl_base_framework.framework_output,
+                                "pmix: recv_connect_ack could not setsockopt SO_RCVTIMEO");
+            return PMIX_ERR_UNREACH;
+        }
+    }
+
+    /* receive the status reply */
+    rc = pmix_ptl_base_recv_blocking(sd, (char*)&u32, sizeof(uint32_t));
+    if (PMIX_SUCCESS != rc) {
+        PMIX_ERROR_LOG(rc);
+        return rc;
+    }
+    reply = ntohl(u32);
+
+    if (PMIX_PROC_IS_CLIENT) {
+        /* see if they want us to do the handshake */
+        if (PMIX_ERR_READY_FOR_HANDSHAKE == reply) {
+            rc = pmix_psec.client_handshake(pmix_client_globals.myserver, sd);
+            if (PMIX_SUCCESS != rc) {
+                return rc;
+            }
+        } else if (PMIX_SUCCESS != reply) {
+            return reply;
+        }
+        pmix_output_verbose(2, pmix_ptl_base_framework.framework_output,
+                            "pmix: RECV CONNECT CONFIRMATION");
+
+        /* receive our index into the server's client array */
+        rc = pmix_ptl_base_recv_blocking(sd, (char*)&u32, sizeof(uint32_t));
+        if (PMIX_SUCCESS != rc) {
+            PMIX_ERROR_LOG(rc);
+            return rc;
+        }
+        pmix_globals.pindex = ntohl(u32);
+    } else {  // we are a tool
+        /* if the status indicates an error, then we are done */
+        if (PMIX_SUCCESS != reply) {
+            PMIX_ERROR_LOG(reply);
+            return reply;
+        }
+        /* recv our nspace */
+        rc = pmix_ptl_base_recv_blocking(sd, (char*)&pmix_globals.myid.nspace, PMIX_MAX_NSLEN+1);
+        if (PMIX_SUCCESS != rc) {
+            PMIX_ERROR_LOG(rc);
+            return rc;
+        }
+        /* our rank is always zero */
+        pmix_globals.myid.rank = 0;
+
+        /* get the server's nspace and rank so we can send to it */
+        if (NULL == pmix_client_globals.myserver->info) {
+            pmix_client_globals.myserver->info = PMIX_NEW(pmix_rank_info_t);
+        }
+        if (NULL == pmix_client_globals.myserver->info->nptr) {
+            pmix_client_globals.myserver->info->nptr = PMIX_NEW(pmix_nspace_t);
+        }
+        pmix_ptl_base_recv_blocking(sd, (char*)nspace, PMIX_MAX_NSLEN+1);
+        (void)strncpy(pmix_client_globals.myserver->info->nptr->nspace, nspace, PMIX_MAX_NSLEN);
+        pmix_ptl_base_recv_blocking(sd, (char*)&(pmix_client_globals.myserver->info->rank), sizeof(int));
+
+        pmix_output_verbose(2, pmix_ptl_base_framework.framework_output,
+                            "pmix: RECV CONNECT CONFIRMATION FOR TOOL %s:%d FROM SERVER %s:%d",
+                            pmix_globals.myid.nspace, pmix_globals.myid.rank,
+                            pmix_client_globals.myserver->info->nptr->nspace,
+                            pmix_client_globals.myserver->info->rank);
+
+        /* get the returned status from the security handshake */
+        pmix_ptl_base_recv_blocking(sd, (char*)&reply, sizeof(pmix_status_t));
+        if (PMIX_SUCCESS != reply) {
+            /* see if they want us to do the handshake */
+            if (PMIX_ERR_READY_FOR_HANDSHAKE == reply) {
+                reply = pmix_psec.client_handshake(pmix_client_globals.myserver, sd);
+                if (PMIX_SUCCESS != reply) {
+                    return reply;
+                }
+                /* if the handshake succeeded, then fall thru to the next step */
+            } else {
+                return reply;
+            }
+        }
+    }
+
+    if (sockopt) {
+        if (0 != setsockopt(sd, SOL_SOCKET, SO_RCVTIMEO, &save, sz)) {
+            return PMIX_ERR_UNREACH;
+        }
+    }
+
+    return PMIX_SUCCESS;
+}
+
+static pmix_status_t df_search(char *dirname, char *prefix,
+                               int *sd, char **nspace,
+                               pmix_rank_t *rank)
+{
+    char *suri, *nsp, *newdir;
+    pmix_rank_t rk;
+    pmix_status_t rc;
+    DIR *cur_dirp;
+    struct dirent * dir_entry;
+
+    if (NULL == (cur_dirp = opendir(dirname))) {
+        return PMIX_ERR_NOT_FOUND;
+    }
+
+    pmix_output_verbose(2, pmix_ptl_base_framework.framework_output,
+                        "pmix:tcp: searching directory %s", dirname);
+
+    /* search the entries for something that starts with the provided prefix */
+    while (NULL != (dir_entry = readdir(cur_dirp))) {
+        /* ignore the . and .. entries */
+        if (0 == strcmp(dir_entry->d_name, ".") ||
+            0 == strcmp(dir_entry->d_name, "..")) {
+            continue;
+        }
+        /* if it is a directory, down search */
+        if (DT_DIR == dir_entry->d_type) {
+            newdir = pmix_os_path(false, dirname, dir_entry->d_name, NULL);
+            rc = df_search(newdir, prefix, sd, nspace, rank);
+            free(newdir);
+            if (PMIX_SUCCESS == rc) {
+                closedir(cur_dirp);
+                return rc;
+            }
+            continue;
+        }
+        /* if it isn't a regular file, ignore it */
+        if (DT_REG != dir_entry->d_type) {
+            pmix_output_verbose(2, pmix_ptl_base_framework.framework_output,
+                                "pmix:tcp: ignoring %s", dir_entry->d_name);
+            continue;
+        }
+        pmix_output_verbose(2, pmix_ptl_base_framework.framework_output,
+                            "pmix:tcp: checking %s vs %s", dir_entry->d_name, prefix);
+        /* see if it starts with our prefix */
+        if (0 == strncmp(dir_entry->d_name, prefix, strlen(prefix))) {
+            /* try to read this file */
+            newdir = pmix_os_path(false, dirname, dir_entry->d_name, NULL);
+            pmix_output_verbose(2, pmix_ptl_base_framework.framework_output,
+                                "pmix:tcp: reading file %s", newdir);
+            rc = parse_uri_file(newdir, &suri, &nsp, &rk);
+            free(newdir);
+            if (PMIX_SUCCESS == rc) {
+                if (NULL != mca_ptl_tcp_component.super.uri) {
+                    free(mca_ptl_tcp_component.super.uri);
+                }
+                mca_ptl_tcp_component.super.uri = suri;
+                /* go ahead and try to connect */
+                pmix_output_verbose(2, pmix_ptl_base_framework.framework_output,
+                                    "pmix:tcp: attempting to connect to %s", suri);
+                if (PMIX_SUCCESS == try_connect(sd)) {
+                    (*nspace) = nsp;
+                    *rank = rk;
+                    closedir(cur_dirp);
+                    return PMIX_SUCCESS;
+                }
+                free(nsp);
+            }
+        }
+    }
+    closedir(cur_dirp);
+    return PMIX_ERR_NOT_FOUND;
+}
diff --git a/src/mca/ptl/tcp/ptl_tcp.h b/src/mca/ptl/tcp/ptl_tcp.h
new file mode 100644
index 0000000..60421fd
--- /dev/null
+++ b/src/mca/ptl/tcp/ptl_tcp.h
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2006 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2016-2017 Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#ifndef PMIX_PTL_TCP_H
+#define PMIX_PTL_TCP_H
+
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif
+#ifdef HAVE_NETDB_H
+#include <netdb.h>
+#endif
+
+#include "src/mca/ptl/ptl.h"
+
+BEGIN_C_DECLS
+
+typedef struct {
+    pmix_ptl_base_component_t super;
+    char *session_tmpdir;
+    char *system_tmpdir;
+    char *if_include;
+    char *if_exclude;
+    int ipv4_port;
+    int ipv6_port;
+    bool disable_ipv4_family;
+    bool disable_ipv6_family;
+    struct sockaddr_storage connection;
+    char *session_filename;
+    char *system_filename;
+    pid_t tool_pid;
+} pmix_ptl_tcp_component_t;
+
+extern pmix_ptl_tcp_component_t mca_ptl_tcp_component;
+
+extern pmix_ptl_module_t pmix_ptl_tcp_module;
+
+END_C_DECLS
+
+#endif /* PMIX_PTL_TCP_H */
diff --git a/src/mca/ptl/tcp/ptl_tcp_component.c b/src/mca/ptl/tcp/ptl_tcp_component.c
new file mode 100644
index 0000000..74b9191
--- /dev/null
+++ b/src/mca/ptl/tcp/ptl_tcp_component.c
@@ -0,0 +1,1270 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2005 The University of Tennptlee and The University
+ *                         of Tennptlee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2015      Los Alamos National Security, LLC. All rights
+ *                         reserved.
+ * Copyright (c) 2016-2017 Intel, Inc.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ *
+ * These symbols are in a file by themselves to provide nice linker
+ * semantics.  Since linkers generally pull in symbols by object
+ * files, keeping these symbols as the only symbols in this file
+ * prevents utility programs such as "ompi_info" from having to import
+ * entire components just to query their version and parameters.
+ */
+
+#include <src/include/pmix_config.h>
+#include <pmix_common.h>
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
+#include <fcntl.h>
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif
+#ifdef HAVE_NETDB_H
+#include <netdb.h>
+#endif
+#include <ctype.h>
+
+#include "src/include/pmix_socket_errno.h"
+#include "src/util/argv.h"
+#include "src/util/error.h"
+#include "src/util/fd.h"
+#include "src/util/net.h"
+#include "src/util/os_path.h"
+#include "src/util/parse_options.h"
+#include "src/util/pif.h"
+#include "src/util/show_help.h"
+#include "src/util/strnlen.h"
+#include "src/server/pmix_server_ops.h"
+#include "src/mca/psec/base/base.h"
+
+#include "src/mca/ptl/base/base.h"
+#include "src/mca/ptl/tcp/ptl_tcp.h"
+
+static pmix_status_t component_open(void);
+static pmix_status_t component_close(void);
+static int component_register(void);
+static int component_query(pmix_mca_base_module_t **module, int *priority);
+static pmix_status_t setup_listener(pmix_info_t info[], size_t ninfo,
+                                    bool *need_listener);
+
+/*
+ * Instantiate the public struct with all of our public information
+ * and pointers to our public functions in it
+ */
+ PMIX_EXPORT pmix_ptl_tcp_component_t mca_ptl_tcp_component = {
+    .super = {
+        .base = {
+            PMIX_PTL_BASE_VERSION_1_0_0,
+
+            /* Component name and version */
+            .pmix_mca_component_name = "tcp",
+            PMIX_MCA_BASE_MAKE_VERSION(component,
+                                       PMIX_MAJOR_VERSION,
+                                       PMIX_MINOR_VERSION,
+                                       PMIX_RELEASE_VERSION),
+
+            /* Component open and close functions */
+            .pmix_mca_open_component = component_open,
+            .pmix_mca_close_component = component_close,
+            .pmix_mca_register_component_params = component_register,
+            .pmix_mca_query_component = component_query
+        },
+        .priority = 30,
+        .uri = NULL,
+        .setup_listener = setup_listener
+    },
+    .session_tmpdir = NULL,
+    .system_tmpdir = NULL,
+    .if_include = NULL,
+    .if_exclude = NULL,
+    .ipv4_port = 0,
+    .ipv6_port = 0,
+    .disable_ipv4_family = false,
+    .disable_ipv6_family = true,
+    .session_filename = NULL,
+    .system_filename = NULL,
+    .tool_pid = 0
+};
+
+static char **split_and_resolve(char **orig_str, char *name);
+static void connection_handler(int sd, short args, void *cbdata);
+static void cnct_cbfunc(pmix_status_t status,
+                        pmix_proc_t *proc, void *cbdata);
+
+static int component_register(void)
+{
+    pmix_mca_base_component_t *component = &mca_ptl_tcp_component.super.base;
+
+    (void)pmix_mca_base_component_var_register(component, "server_uri",
+                                               "URI of a server a tool wishes to connect to",
+                                               PMIX_MCA_BASE_VAR_TYPE_STRING, NULL, 0, 0,
+                                               PMIX_INFO_LVL_2,
+                                               PMIX_MCA_BASE_VAR_SCOPE_LOCAL,
+                                               &mca_ptl_tcp_component.super.uri);
+
+    (void)pmix_mca_base_component_var_register(component, "tool_pid",
+                                               "pid of a tool we are to connect to",
+                                               PMIX_MCA_BASE_VAR_TYPE_INT, NULL, 0, 0,
+                                               PMIX_INFO_LVL_2,
+                                               PMIX_MCA_BASE_VAR_SCOPE_LOCAL,
+                                               &mca_ptl_tcp_component.tool_pid);
+
+    (void)pmix_mca_base_component_var_register(component, "if_include",
+                                               "Comma-delimited list of devices and/or CIDR notation of TCP networks (e.g., \"eth0,192.168.0.0/16\").  Mutually exclusive with ptl_tcp_if_exclude.",
+                                               PMIX_MCA_BASE_VAR_TYPE_STRING, NULL, 0, 0,
+                                               PMIX_INFO_LVL_2,
+                                               PMIX_MCA_BASE_VAR_SCOPE_LOCAL,
+                                               &mca_ptl_tcp_component.if_include);
+
+    (void)pmix_mca_base_component_var_register(component, "if_exclude",
+                                               "Comma-delimited list of devices and/or CIDR notation of TCP networks to NOT use -- all devices not matching these specifications will be used (e.g., \"eth0,192.168.0.0/16\").  If set to a non-default value, it is mutually exclusive with ptl_tcp_if_include.",
+                                               PMIX_MCA_BASE_VAR_TYPE_STRING, NULL, 0, 0,
+                                               PMIX_INFO_LVL_2,
+                                               PMIX_MCA_BASE_VAR_SCOPE_LOCAL,
+                                               &mca_ptl_tcp_component.if_exclude);
+
+    /* if_include and if_exclude need to be mutually exclusive */
+    if (NULL != mca_ptl_tcp_component.if_include &&
+        NULL != mca_ptl_tcp_component.if_exclude) {
+        /* Return ERR_NOT_AVAILABLE so that a warning message about
+           "open" failing is not printed */
+        pmix_show_help("help-ptl-tcp.txt", "include-exclude", true,
+                       mca_ptl_tcp_component.if_include,
+                       mca_ptl_tcp_component.if_exclude);
+        return PMIX_ERR_NOT_AVAILABLE;
+    }
+
+    (void)pmix_mca_base_component_var_register(component, "ipv4_port",
+                                          "IPv4 port to be used",
+                                          PMIX_MCA_BASE_VAR_TYPE_INT, NULL, 0, 0,
+                                          PMIX_INFO_LVL_4,
+                                          PMIX_MCA_BASE_VAR_SCOPE_READONLY,
+                                          &mca_ptl_tcp_component.ipv4_port);
+
+    (void)pmix_mca_base_component_var_register(component, "ipv6_port",
+                                          "IPv6 port to be used",
+                                          PMIX_MCA_BASE_VAR_TYPE_INT, NULL, 0, 0,
+                                          PMIX_INFO_LVL_4,
+                                          PMIX_MCA_BASE_VAR_SCOPE_READONLY,
+                                          &mca_ptl_tcp_component.ipv6_port);
+
+    (void)pmix_mca_base_component_var_register(component, "disable_ipv4_family",
+                                          "Disable the IPv4 interfaces",
+                                          PMIX_MCA_BASE_VAR_TYPE_BOOL, NULL, 0, 0,
+                                          PMIX_INFO_LVL_4,
+                                          PMIX_MCA_BASE_VAR_SCOPE_READONLY,
+                                          &mca_ptl_tcp_component.disable_ipv4_family);
+
+    (void)pmix_mca_base_component_var_register(component, "disable_ipv6_family",
+                                          "Disable the IPv6 interfaces",
+                                          PMIX_MCA_BASE_VAR_TYPE_BOOL, NULL, 0, 0,
+                                          PMIX_INFO_LVL_4,
+                                          PMIX_MCA_BASE_VAR_SCOPE_READONLY,
+                                          &mca_ptl_tcp_component.disable_ipv6_family);
+
+    return PMIX_SUCCESS;
+}
+
+static pmix_status_t component_open(void)
+{
+    char *tdir;
+
+    memset(&mca_ptl_tcp_component.connection, 0, sizeof(mca_ptl_tcp_component.connection));
+
+    /* check for environ-based directives
+     * on system tmpdir to use */
+    if (NULL != (tdir = getenv("PMIX_SERVER_TMPDIR"))) {
+        mca_ptl_tcp_component.session_tmpdir = strdup(tdir);
+    }
+
+    if (NULL != (tdir = getenv("PMIX_SYSTEM_TMPDIR"))) {
+        mca_ptl_tcp_component.system_tmpdir = strdup(tdir);
+    }
+
+    if (NULL == (tdir = getenv("TMPDIR"))) {
+        if (NULL == (tdir = getenv("TEMP"))) {
+            if (NULL == (tdir = getenv("TMP"))) {
+                tdir = "/tmp";
+            }
+        }
+    }
+    if (NULL == mca_ptl_tcp_component.session_tmpdir) {
+        mca_ptl_tcp_component.session_tmpdir = strdup(tdir);
+    }
+    if (NULL == mca_ptl_tcp_component.system_tmpdir) {
+        mca_ptl_tcp_component.system_tmpdir = strdup(tdir);
+    }
+    return PMIX_SUCCESS;
+}
+
+
+pmix_status_t component_close(void)
+{
+    if (NULL != mca_ptl_tcp_component.system_filename) {
+        unlink(mca_ptl_tcp_component.system_filename);
+    }
+    if (NULL != mca_ptl_tcp_component.session_filename) {
+        unlink(mca_ptl_tcp_component.session_filename);
+    }
+    return PMIX_SUCCESS;
+}
+
+static int component_query(pmix_mca_base_module_t **module, int *priority)
+{
+    *module = (pmix_mca_base_module_t*)&pmix_ptl_tcp_module;
+    return PMIX_SUCCESS;
+}
+
+/* if we are the server, then we need to discover the available
+ * interfaces, filter them thru any given directives, and select
+ * the one we will listen on for connection requests. This will
+ * be a loopback device by default, unless we are asked to support
+ * tool connections - in that case, we will take a non-loopback
+ * device by default, if one is available after filtering directives
+ *
+ * NOTE: we accept MCA parameters, but info keys override them
+ */
+static pmix_status_t setup_listener(pmix_info_t info[], size_t ninfo,
+                                    bool *need_listener)
+{
+    int flags = 0;
+    pmix_listener_t *lt;
+    int i, rc, saveindex = -1;
+    char **interfaces = NULL;
+    bool including = false;
+    char name[32];
+    struct sockaddr_storage my_ss;
+    int kindex;
+    size_t n;
+    bool remote_connections = false;
+    bool session_tool = false;
+    bool system_tool = false;
+    pmix_socklen_t addrlen;
+    char *prefix, myhost[PMIX_MAXHOSTNAMELEN];
+    char myconnhost[PMIX_MAXHOSTNAMELEN];
+    int myport;
+
+    pmix_output_verbose(2, pmix_ptl_base_framework.framework_output,
+                        "ptl:tcp setup_listener");
+
+    /* if we are not a server, then we shouldn't be doing this */
+    if (PMIX_PROC_SERVER != pmix_globals.proc_type) {
+        return PMIX_ERR_NOT_SUPPORTED;
+    }
+
+    /* scan the info keys and process any override instructions */
+    if (NULL != info) {
+        for (n=0; n < ninfo; n++) {
+            if (0 == strcmp(info[n].key, PMIX_TCP_IF_INCLUDE)) {
+                if (NULL != mca_ptl_tcp_component.if_include) {
+                    free(mca_ptl_tcp_component.if_include);
+                }
+                mca_ptl_tcp_component.if_include = strdup(info[n].value.data.string);
+            } else if (0 == strcmp(info[n].key, PMIX_TCP_IF_EXCLUDE)) {
+                if (NULL != mca_ptl_tcp_component.if_exclude) {
+                    free(mca_ptl_tcp_component.if_exclude);
+                }
+                mca_ptl_tcp_component.if_exclude = strdup(info[n].value.data.string);
+            } else if (0 == strcmp(info[n].key, PMIX_TCP_IPV4_PORT)) {
+                mca_ptl_tcp_component.ipv4_port = info[n].value.data.integer;
+            } else if (0 == strcmp(info[n].key, PMIX_TCP_IPV6_PORT)) {
+                mca_ptl_tcp_component.ipv6_port = info[n].value.data.integer;
+            } else if (0 == strcmp(info[n].key, PMIX_TCP_DISABLE_IPV4)) {
+                if (PMIX_UNDEF == info[n].value.type) {
+                    mca_ptl_tcp_component.disable_ipv4_family = true;
+                } else {
+                    mca_ptl_tcp_component.disable_ipv4_family = info[n].value.data.flag;
+                }
+            } else if (0 == strcmp(info[n].key, PMIX_TCP_DISABLE_IPV6)) {
+                if (PMIX_UNDEF == info[n].value.type) {
+                    mca_ptl_tcp_component.disable_ipv6_family = true;
+                } else {
+                    mca_ptl_tcp_component.disable_ipv6_family = info[n].value.data.flag;
+                }
+            } else if (0 == strcmp(info[n].key, PMIX_SERVER_REMOTE_CONNECTIONS)) {
+                if (PMIX_UNDEF == info[n].value.type) {
+                    remote_connections = true;
+                } else {
+                    remote_connections = info[n].value.data.flag;
+                }
+            } else if (0 == strcmp(info[n].key, PMIX_TCP_URI)) {
+                if (NULL != mca_ptl_tcp_component.super.uri) {
+                    free(mca_ptl_tcp_component.super.uri);
+                }
+                mca_ptl_tcp_component.super.uri = strdup(info[n].value.data.string);
+            } else if (0 == strcmp(info[n].key, PMIX_SERVER_TMPDIR)) {
+                if (NULL != mca_ptl_tcp_component.session_tmpdir) {
+                    free(mca_ptl_tcp_component.session_tmpdir);
+                }
+                mca_ptl_tcp_component.session_tmpdir = strdup(info[n].value.data.string);
+            } else if (0 == strcmp(info[n].key, PMIX_SYSTEM_TMPDIR)) {
+                if (NULL != mca_ptl_tcp_component.system_tmpdir) {
+                    free(mca_ptl_tcp_component.system_tmpdir);
+                }
+                mca_ptl_tcp_component.system_tmpdir = strdup(info[n].value.data.string);
+            } else if (0 == strcmp(info[n].key, PMIX_SERVER_TOOL_SUPPORT)) {
+                if (PMIX_UNDEF == info[n].value.type) {
+                    session_tool = true;
+                } else {
+                    session_tool = info[n].value.data.flag;
+                }
+            } else if (0 == strcmp(info[n].key, PMIX_SERVER_SYSTEM_SUPPORT)) {
+               if (PMIX_UNDEF == info[n].value.type) {
+                   system_tool = true;
+               } else {
+                   system_tool = info[n].value.data.flag;
+               }
+           }
+        }
+    }
+
+    /* if interface include was given, construct a list
+     * of those interfaces which match the specifications - remember,
+     * the includes could be given as named interfaces, IP addrs, or
+     * subnet+mask
+     */
+    if (NULL != mca_ptl_tcp_component.if_include) {
+        interfaces = split_and_resolve(&mca_ptl_tcp_component.if_include,
+                                       "include");
+        including = true;
+    } else if (NULL != mca_ptl_tcp_component.if_exclude) {
+        interfaces = split_and_resolve(&mca_ptl_tcp_component.if_exclude,
+                                       "exclude");
+        including = false;
+    }
+
+    /* look at all available interfaces and pick one - we default to a
+     * loopback interface if available, but otherwise pick the first
+     * available interface since we are only talking locally */
+    for (i = pmix_ifbegin(); i >= 0; i = pmix_ifnext(i)) {
+        if (PMIX_SUCCESS != pmix_ifindextoaddr(i, (struct sockaddr*)&my_ss, sizeof(my_ss))) {
+            pmix_output (0, "ptl_tcp: problems getting address for index %i (kernel index %i)\n",
+                         i, pmix_ifindextokindex(i));
+            continue;
+        }
+        /* ignore non-ip4/6 interfaces */
+        if (AF_INET != my_ss.ss_family &&
+            AF_INET6 != my_ss.ss_family) {
+            continue;
+        }
+        /* get the name for diagnostic purposes */
+        pmix_ifindextoname(i, name, sizeof(name));
+
+        /* ignore any virtual interfaces */
+        if (0 == strncmp(name, "vir", 3)) {
+            continue;
+        }
+        /* ignore any interfaces in a disabled family */
+        if (AF_INET == my_ss.ss_family &&
+            mca_ptl_tcp_component.disable_ipv4_family) {
+            continue;
+        } else if (AF_INET6 == my_ss.ss_family &&
+                   mca_ptl_tcp_component.disable_ipv6_family) {
+            continue;
+        }
+        /* get the kernel index */
+        kindex = pmix_ifindextokindex(i);
+        if (kindex <= 0) {
+            continue;
+        }
+        pmix_output_verbose(10, pmix_ptl_base_framework.framework_output,
+                            "WORKING INTERFACE %d KERNEL INDEX %d FAMILY: %s", i, kindex,
+                            (AF_INET == my_ss.ss_family) ? "V4" : "V6");
+        /* handle include/exclude directives */
+        if (NULL != interfaces) {
+            /* check for match */
+            rc = pmix_ifmatches(kindex, interfaces);
+            /* if one of the network specifications isn't parseable, then
+             * error out as we can't do what was requested
+             */
+            if (PMIX_ERR_NETWORK_NOT_PARSEABLE == rc) {
+                pmix_show_help("help-ptl-tcp.txt", "not-parseable", true);
+                pmix_argv_free(interfaces);
+                return PMIX_ERR_BAD_PARAM;
+            }
+            /* if we are including, then ignore this if not present */
+            if (including) {
+                if (PMIX_SUCCESS != rc) {
+                    pmix_output_verbose(10, pmix_ptl_base_framework.framework_output,
+                                        "ptl:tcp:init rejecting interface %s (not in include list)", name);
+                    continue;
+                }
+            } else {
+                /* we are excluding, so ignore if present */
+                if (PMIX_SUCCESS == rc) {
+                    pmix_output_verbose(10, pmix_ptl_base_framework.framework_output,
+                                        "ptl:tcp:init rejecting interface %s (in exclude list)", name);
+                    continue;
+                }
+            }
+        }
+
+        /* if this is the loopback device and they didn't enable
+         * remote connections, then we are done */
+        if (pmix_ifisloopback(i)) {
+            if (remote_connections) {
+                /* ignore loopback */
+                continue;
+            } else {
+                pmix_output_verbose(5, pmix_ptl_base_framework.framework_output,
+                                    "ptl:tcp:init loopback interface %s selected", name);
+                saveindex = i;
+                break;
+            }
+        } else {
+            /* if this is the first one we found, then hang on to it - we
+             * will use it if a loopback device is not found */
+            if (saveindex < 0) {
+                saveindex = i;
+            }
+        }
+    }
+    /* cleanup */
+    if (NULL != interfaces) {
+        pmix_argv_free(interfaces);
+    }
+
+    /* if we didn't find anything, then we cannot operate */
+    if (saveindex < 0) {
+        return PMIX_ERR_NOT_AVAILABLE;
+    }
+
+    /* save the connection */
+    if (PMIX_SUCCESS != pmix_ifindextoaddr(saveindex,
+                                           (struct sockaddr*)&mca_ptl_tcp_component.connection,
+                                           sizeof(struct sockaddr))) {
+        pmix_output (0, "ptl:tcp: problems getting address for kernel index %i\n",
+                     pmix_ifindextokindex(saveindex));
+        return PMIX_ERR_NOT_AVAILABLE;
+    }
+
+    /* set the port */
+    if (AF_INET == mca_ptl_tcp_component.connection.ss_family) {
+        ((struct sockaddr_in*) &mca_ptl_tcp_component.connection)->sin_port = htons(mca_ptl_tcp_component.ipv4_port);
+        if (0 != mca_ptl_tcp_component.ipv4_port) {
+            flags = 1;
+        }
+    } else if (AF_INET6 == mca_ptl_tcp_component.connection.ss_family) {
+        ((struct sockaddr_in6*) &mca_ptl_tcp_component.connection)->sin6_port = htons(mca_ptl_tcp_component.ipv6_port);
+        if (0 != mca_ptl_tcp_component.ipv6_port) {
+            flags = 1;
+        }
+    }
+
+    lt = PMIX_NEW(pmix_listener_t);
+    lt->varname = strdup("PMIX_SERVER_URI2");
+    lt->protocol = PMIX_PROTOCOL_V2;
+    lt->ptl = (struct pmix_ptl_module_t*)&pmix_ptl_tcp_module;
+    lt->cbfunc = connection_handler;
+
+    addrlen = sizeof(struct sockaddr_storage);
+    /* create a listen socket for incoming connection attempts */
+    lt->socket = socket(mca_ptl_tcp_component.connection.ss_family, SOCK_STREAM, 0);
+    if (lt->socket < 0) {
+        printf("%s:%d socket() failed\n", __FILE__, __LINE__);
+        goto sockerror;
+    }
+    /* set reusing ports flag */
+    if (setsockopt (lt->socket, SOL_SOCKET, SO_REUSEADDR, (const char *)&flags, sizeof(flags)) < 0) {
+        pmix_output(0, "ptl:tcp:create_listen: unable to set the "
+                    "SO_REUSEADDR option (%s:%d)\n",
+                    strerror(pmix_socket_errno), pmix_socket_errno);
+        CLOSE_THE_SOCKET(lt->socket);
+        goto sockerror;
+    }
+
+    /* Set the socket to close-on-exec so that no children inherit
+     * this FD */
+    if (pmix_fd_set_cloexec(lt->socket) != PMIX_SUCCESS) {
+        CLOSE_THE_SOCKET(lt->socket);
+        goto sockerror;
+    }
+
+    if (bind(lt->socket, (struct sockaddr*)&mca_ptl_tcp_component.connection, sizeof(struct sockaddr)) < 0) {
+        printf("%s:%d bind() failed: %s\n", __FILE__, __LINE__, strerror(errno));
+        CLOSE_THE_SOCKET(lt->socket);
+        goto sockerror;
+    }
+
+    /* resolve assigned port */
+    if (getsockname(lt->socket, (struct sockaddr*)&mca_ptl_tcp_component.connection, &addrlen) < 0) {
+        pmix_output(0, "ptl:tcp:create_listen: getsockname(): %s (%d)",
+                    strerror(pmix_socket_errno), pmix_socket_errno);
+        CLOSE_THE_SOCKET(lt->socket);
+        goto sockerror;
+    }
+
+    /* setup listen backlog to maximum allowed by kernel */
+    if (listen(lt->socket, SOMAXCONN) < 0) {
+        printf("%s:%d listen() failed\n", __FILE__, __LINE__);
+        CLOSE_THE_SOCKET(lt->socket);
+        goto sockerror;
+    }
+
+    /* set socket up to be non-blocking, otherwise accept could block */
+    if ((flags = fcntl(lt->socket, F_GETFL, 0)) < 0) {
+        printf("%s:%d fcntl(F_GETFL) failed\n", __FILE__, __LINE__);
+        CLOSE_THE_SOCKET(lt->socket);
+        goto sockerror;
+    }
+    flags |= O_NONBLOCK;
+    if (fcntl(lt->socket, F_SETFL, flags) < 0) {
+        printf("%s:%d fcntl(F_SETFL) failed\n", __FILE__, __LINE__);
+        CLOSE_THE_SOCKET(lt->socket);
+        goto sockerror;
+    }
+
+    gethostname(myhost, sizeof(myhost));
+    if (AF_INET == mca_ptl_tcp_component.connection.ss_family) {
+        prefix = "tcp4://";
+        myport = ntohs(((struct sockaddr_in*) &mca_ptl_tcp_component.connection)->sin_port);
+        inet_ntop(AF_INET, &((struct sockaddr_in*) &mca_ptl_tcp_component.connection)->sin_addr,
+                  myconnhost, PMIX_MAXHOSTNAMELEN);
+    } else if (AF_INET6 == mca_ptl_tcp_component.connection.ss_family) {
+        prefix = "tcp6://";
+        myport = ntohs(((struct sockaddr_in6*) &mca_ptl_tcp_component.connection)->sin6_port);
+        inet_ntop(AF_INET6, &((struct sockaddr_in6*) &mca_ptl_tcp_component.connection)->sin6_addr,
+                  myconnhost, PMIX_MAXHOSTNAMELEN);
+    } else {
+        goto sockerror;
+    }
+
+    asprintf(&lt->uri, "%s.%d;%s%s:%d", pmix_globals.myid.nspace, pmix_globals.myid.rank, prefix, myconnhost, myport);
+    if (NULL == lt->uri) {
+        CLOSE_THE_SOCKET(lt->socket);
+        goto sockerror;
+    }
+    pmix_output_verbose(2, pmix_ptl_base_framework.framework_output,
+                        "ptl:tcp URI %s", lt->uri);
+
+    /* if we are going to support tools, then drop contact file(s) */
+    if (system_tool) {
+        FILE *fp;
+
+        if (0 > asprintf(&mca_ptl_tcp_component.system_filename, "%s/pmix.sys.%s",
+                         mca_ptl_tcp_component.system_tmpdir, myhost)) {
+            CLOSE_THE_SOCKET(lt->socket);
+            goto sockerror;
+        }
+        fp = fopen(mca_ptl_tcp_component.system_filename, "w");
+        if (NULL == fp) {
+            pmix_output(0, "Impossible to open the file %s in write mode\n", mca_ptl_tcp_component.system_filename);
+            PMIX_ERROR_LOG(PMIX_ERR_FILE_OPEN_FAILURE);
+            CLOSE_THE_SOCKET(lt->socket);
+            free(mca_ptl_tcp_component.system_filename);
+            mca_ptl_tcp_component.system_filename = NULL;
+            goto sockerror;
+        }
+
+        /* output my nspace and rank plus the URI */
+        fprintf(fp, "%s.%d:%s\n", pmix_globals.myid.nspace, pmix_globals.myid.rank, lt->uri);
+        fclose(fp);
+        /* set the file mode */
+        if (0 != chmod(mca_ptl_tcp_component.system_filename, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH)) {
+            PMIX_ERROR_LOG(PMIX_ERR_FILE_OPEN_FAILURE);
+            CLOSE_THE_SOCKET(lt->socket);
+            free(mca_ptl_tcp_component.system_filename);
+            mca_ptl_tcp_component.system_filename = NULL;
+            goto sockerror;
+        }
+    }
+    if (session_tool) {
+        FILE *fp;
+        pid_t mypid;
+
+        mypid = getpid();
+        if (0 > asprintf(&mca_ptl_tcp_component.session_filename, "%s/pmix.%s.tool.%d",
+                         mca_ptl_tcp_component.session_tmpdir, myhost, mypid)) {
+            CLOSE_THE_SOCKET(lt->socket);
+            goto sockerror;
+        }
+        fp = fopen(mca_ptl_tcp_component.session_filename, "w");
+        if (NULL == fp) {
+            pmix_output(0, "Impossible to open the file %s in write mode\n", mca_ptl_tcp_component.session_filename);
+            PMIX_ERROR_LOG(PMIX_ERR_FILE_OPEN_FAILURE);
+            CLOSE_THE_SOCKET(lt->socket);
+            free(mca_ptl_tcp_component.session_filename);
+            mca_ptl_tcp_component.session_filename = NULL;
+            goto sockerror;
+        }
+
+        /* output my nspace and rank plus the URI */
+        fprintf(fp, "%s.%d:%s\n", pmix_globals.myid.nspace, pmix_globals.myid.rank, lt->uri);
+        fclose(fp);
+        /* set the file mode */
+        if (0 != chmod(mca_ptl_tcp_component.session_filename, S_IRUSR | S_IWUSR | S_IRGRP)) {
+            PMIX_ERROR_LOG(PMIX_ERR_FILE_OPEN_FAILURE);
+            CLOSE_THE_SOCKET(lt->socket);
+            free(mca_ptl_tcp_component.system_filename);
+            mca_ptl_tcp_component.system_filename = NULL;
+            goto sockerror;
+        }
+    }
+
+    /* we need listener thread support */
+    *need_listener = true;
+    pmix_list_append(&pmix_ptl_globals.listeners, &lt->super);
+
+    return PMIX_SUCCESS;
+
+  sockerror:
+    PMIX_RELEASE(lt);
+    return PMIX_ERROR;
+}
+
+/*
+ * Go through a list of argv; if there are any subnet specifications
+ * (a.b.c.d/e), resolve them to an interface name (Currently only
+ * supporting IPv4).  If unresolvable, warn and remove.
+ */
+static char **split_and_resolve(char **orig_str, char *name)
+{
+    int i, ret, save, if_index;
+    char **argv, *str, *tmp;
+    char if_name[IF_NAMESIZE];
+    struct sockaddr_storage argv_inaddr, if_inaddr;
+    uint32_t argv_prefix;
+
+    /* Sanity check */
+    if (NULL == orig_str || NULL == *orig_str) {
+        return NULL;
+    }
+
+    argv = pmix_argv_split(*orig_str, ',');
+    if (NULL == argv) {
+        return NULL;
+    }
+    for (save = i = 0; NULL != argv[i]; ++i) {
+        if (isalpha(argv[i][0])) {
+            argv[save++] = argv[i];
+            continue;
+        }
+
+        /* Found a subnet notation.  Convert it to an IP
+           address/netmask.  Get the prefix first. */
+        argv_prefix = 0;
+        tmp = strdup(argv[i]);
+        str = strchr(argv[i], '/');
+        if (NULL == str) {
+            pmix_show_help("help-ptl-tcp.txt", "invalid if_inexclude",
+                           true, name, tmp, "Invalid specification (missing \"/\")");
+            free(argv[i]);
+            free(tmp);
+            continue;
+        }
+        *str = '\0';
+        argv_prefix = atoi(str + 1);
+
+        /* Now convert the IPv4 address */
+        ((struct sockaddr*) &argv_inaddr)->sa_family = AF_INET;
+        ret = inet_pton(AF_INET, argv[i],
+                        &((struct sockaddr_in*) &argv_inaddr)->sin_addr);
+        free(argv[i]);
+
+        if (1 != ret) {
+            pmix_show_help("help-ptl-tcp.txt", "invalid if_inexclude",
+                           true, name, tmp,
+                           "Invalid specification (inet_pton() failed)");
+            free(tmp);
+            continue;
+        }
+        pmix_output_verbose(20, pmix_ptl_base_framework.framework_output,
+                            "ptl:tcp: Searching for %s address+prefix: %s / %u",
+                            name,
+                            pmix_net_get_hostname((struct sockaddr*) &argv_inaddr),
+                            argv_prefix);
+
+        /* Go through all interfaces and see if we can find a match */
+        for (if_index = pmix_ifbegin(); if_index >= 0;
+                           if_index = pmix_ifnext(if_index)) {
+            pmix_ifindextoaddr(if_index,
+                               (struct sockaddr*) &if_inaddr,
+                               sizeof(if_inaddr));
+            if (pmix_net_samenetwork((struct sockaddr*) &argv_inaddr,
+                                     (struct sockaddr*) &if_inaddr,
+                                     argv_prefix)) {
+                break;
+            }
+        }
+        /* If we didn't find a match, keep trying */
+        if (if_index < 0) {
+            pmix_show_help("help-ptl-tcp.txt", "invalid if_inexclude",
+                           true, name, tmp,
+                           "Did not find interface matching this subnet");
+            free(tmp);
+            continue;
+        }
+
+        /* We found a match; get the name and replace it in the
+           argv */
+        pmix_ifindextoname(if_index, if_name, sizeof(if_name));
+        pmix_output_verbose(20, pmix_ptl_base_framework.framework_output,
+                            "ptl:tcp: Found match: %s (%s)",
+                            pmix_net_get_hostname((struct sockaddr*) &if_inaddr),
+                            if_name);
+        argv[save++] = strdup(if_name);
+        free(tmp);
+    }
+
+    /* The list may have been compressed if there were invalid
+       entries, so ensure we end it with a NULL entry */
+    argv[save] = NULL;
+    free(*orig_str);
+    *orig_str = pmix_argv_join(argv, ',');
+    return argv;
+}
+
+static void connection_handler(int sd, short args, void *cbdata)
+{
+    pmix_pending_connection_t *pnd = (pmix_pending_connection_t*)cbdata;
+    pmix_ptl_hdr_t hdr;
+    pmix_peer_t *peer;
+    pmix_rank_t rank;
+    pmix_status_t rc;
+    char *msg, *mg;
+    char *sec;
+    char *nspace;
+    uint32_t len, u32;
+    size_t cnt, msglen, n;
+    uint8_t flag;
+    pmix_nspace_t *nptr, *tmp;
+    bool found;
+    pmix_rank_info_t *info;
+    pmix_proc_t proc;
+
+    /* acquire the object */
+    PMIX_ACQUIRE_OBJECT(pnd);
+
+    pmix_output_verbose(8, pmix_ptl_base_framework.framework_output,
+                        "ptl:tcp:connection_handler: new connection: %d",
+                        pnd->sd);
+
+    /* ensure the socket is in blocking mode */
+    pmix_ptl_base_set_blocking(pnd->sd);
+
+    /* ensure all is zero'd */
+    memset(&hdr, 0, sizeof(pmix_ptl_hdr_t));
+
+    /* get the header */
+    if (PMIX_SUCCESS != (rc = pmix_ptl_base_recv_blocking(pnd->sd, (char*)&hdr, sizeof(pmix_ptl_hdr_t)))) {
+        CLOSE_THE_SOCKET(pnd->sd);
+        PMIX_RELEASE(pnd);
+        return;
+    }
+
+    /* get the id, authentication and version payload (and possibly
+     * security credential) - to guard against potential attacks,
+     * we'll set an arbitrary limit per a define */
+    if (PMIX_MAX_CRED_SIZE < hdr.nbytes) {
+        CLOSE_THE_SOCKET(pnd->sd);
+        PMIX_RELEASE(pnd);
+        return;
+    }
+    if (NULL == (msg = (char*)malloc(hdr.nbytes))) {
+        CLOSE_THE_SOCKET(pnd->sd);
+        PMIX_RELEASE(pnd);
+        return;
+    }
+    if (PMIX_SUCCESS != (rc = pmix_ptl_base_recv_blocking(pnd->sd, msg, hdr.nbytes))) {
+        /* unable to complete the recv */
+        pmix_output_verbose(2, pmix_ptl_base_framework.framework_output,
+                            "ptl:tcp:connection_handler unable to complete recv of connect-ack with client ON SOCKET %d",
+                            pnd->sd);
+        free(msg);
+        CLOSE_THE_SOCKET(pnd->sd);
+        PMIX_RELEASE(pnd);
+        return;
+    }
+
+    cnt = hdr.nbytes;
+    mg = msg;
+    /* extract the name of the sec module they used */
+    PMIX_STRNLEN(msglen, mg, cnt);
+    if (msglen < cnt) {
+        sec = mg;
+        mg += strlen(sec) + 1;
+        cnt -= strlen(sec) + 1;
+    } else {
+        PMIX_ERROR_LOG(PMIX_ERR_BAD_PARAM);
+        free(msg);
+        /* send an error reply to the client */
+        rc = PMIX_ERR_BAD_PARAM;
+        goto error;
+    }
+
+    /* extract any credential so we can validate this connection
+     * before doing anything else */
+    if (sizeof(uint32_t) <= cnt) {
+        memcpy(&len, mg, sizeof(uint32_t));
+        mg += sizeof(uint32_t);
+        cnt -= sizeof(uint32_t);
+    } else {
+        PMIX_ERROR_LOG(PMIX_ERR_BAD_PARAM);
+        free(msg);
+        /* send an error reply to the client */
+        rc = PMIX_ERR_BAD_PARAM;
+        goto error;
+    }
+    /* convert it to host byte order */
+    pnd->len = ntohl(len);
+    /* if a credential is present, then create space and
+     * extract it for processing */
+    if (0 < pnd->len) {
+        pnd->cred = (char*)malloc(pnd->len);
+        if (NULL == pnd->cred) {
+            /* probably cannot send an error reply if we are out of memory */
+            free(msg);
+            CLOSE_THE_SOCKET(pnd->sd);
+            PMIX_RELEASE(pnd);
+            return;
+        }
+        memcpy(pnd->cred, mg, pnd->len);
+        mg += pnd->len;
+        cnt -= pnd->len;
+    }
+
+    /* get the request type */
+    if (1 <= cnt) {
+        memcpy(&flag, mg, 1);
+        ++mg;
+        --cnt;
+    } else {
+        free(msg);
+        /* send an error reply to the client */
+        rc = PMIX_ERR_BAD_PARAM;
+        goto error;
+    }
+
+    /* see if this is a tool connection request */
+    if (1 == flag) {
+        /* does the server support tool connections? */
+        if (NULL == pmix_host_server.tool_connected) {
+            /* send an error reply to the client */
+            rc = PMIX_ERR_NOT_SUPPORTED;
+            goto error;
+        }
+        /* extract the uid/gid */
+        if (sizeof(uint32_t) <= cnt) {
+            memcpy(&u32, mg, sizeof(uint32_t));
+            mg += sizeof(uint32_t);
+            cnt -= sizeof(uint32_t);
+            pnd->uid = ntohl(u32);
+        } else {
+           free(msg);
+           /* send an error reply to the client */
+           rc = PMIX_ERR_BAD_PARAM;
+           goto error;
+        }
+        if (sizeof(uint32_t) <= cnt) {
+            memcpy(&u32, mg, sizeof(uint32_t));
+            mg += sizeof(uint32_t);
+            cnt -= sizeof(uint32_t);
+            pnd->gid = ntohl(u32);
+        } else {
+           free(msg);
+           /* send an error reply to the client */
+           rc = PMIX_ERR_BAD_PARAM;
+           goto error;
+        }
+        /* setup the info array to pass the relevant info
+         * to the server - starting with the version, if present */
+        n = 0;
+        PMIX_STRNLEN(msglen, mg, cnt);
+        if (msglen < cnt) {
+            pnd->ninfo = 4;
+            PMIX_INFO_CREATE(pnd->info, pnd->ninfo);
+            (void)strncpy(pnd->info[n].key, PMIX_VERSION_INFO, PMIX_MAX_KEYLEN);
+            pnd->info[n].value.type = PMIX_STRING;
+            pnd->info[n].value.data.string = strdup(mg);
+            ++n;
+        } else {
+            pnd->ninfo = 3;
+            PMIX_INFO_CREATE(pnd->info, pnd->ninfo);
+        }
+        /* provide the user id */
+        (void)strncpy(pnd->info[n].key, PMIX_USERID, PMIX_MAX_KEYLEN);
+        pnd->info[n].value.type = PMIX_UINT32;
+        pnd->info[n].value.data.uint32 = pnd->uid;
+        ++n;
+        /* and the group id */
+        (void)strncpy(pnd->info[n].key, PMIX_GRPID, PMIX_MAX_KEYLEN);
+        pnd->info[n].value.type = PMIX_UINT32;
+        pnd->info[n].value.data.uint32 = pnd->gid;
+        ++n;
+        /* pass along the bfrop, buffer_type, and sec fields so
+         * we can assign them once we create a peer object */
+        pnd->psec = strdup(sec);
+        /* release the msg */
+        free(msg);
+        /* request an nspace for this requestor - it will
+         * automatically be assigned rank=0 */
+        pmix_host_server.tool_connected(pnd->info, pnd->ninfo, cnct_cbfunc, pnd);
+        return;
+    }
+
+    /* they must be a client, so get their nspace/rank */
+    PMIX_STRNLEN(msglen, mg, cnt);
+    if (msglen < cnt) {
+        nspace = mg;
+        mg += strlen(nspace) + 1;
+        cnt -= strlen(nspace) + 1;
+    } else {
+        free(msg);
+        /* send an error reply to the client */
+        rc = PMIX_ERR_BAD_PARAM;
+        goto error;
+    }
+
+    if (sizeof(pmix_rank_t) <= cnt) {
+        /* have to convert this to host order */
+        memcpy(&u32, mg, sizeof(uint32_t));
+        rank = ntohl(u32);
+        mg += sizeof(uint32_t);
+        cnt -= sizeof(uint32_t);
+    } else {
+        free(msg);
+        /* send an error reply to the client */
+        rc = PMIX_ERR_BAD_PARAM;
+        goto error;
+    }
+
+    /* see if we know this nspace */
+    nptr = NULL;
+    PMIX_LIST_FOREACH(tmp, &pmix_globals.nspaces, pmix_nspace_t) {
+        if (0 == strcmp(tmp->nspace, nspace)) {
+            nptr = tmp;
+            break;
+        }
+    }
+    if (NULL == nptr) {
+        /* we don't know this namespace, reject it */
+        free(msg);
+        /* send an error reply to the client */
+        rc = PMIX_ERR_NOT_FOUND;
+        goto error;
+    }
+
+    /* see if we have this peer in our list */
+    info = NULL;
+    found = false;
+    PMIX_LIST_FOREACH(info, &nptr->server->ranks, pmix_rank_info_t) {
+        if (info->rank == rank) {
+            found = true;
+            break;
+        }
+    }
+    if (!found) {
+        /* rank unknown, reject it */
+        free(msg);
+        /* send an error reply to the client */
+        rc = PMIX_ERR_NOT_FOUND;
+        goto error;
+    }
+
+    /* a peer can connect on multiple sockets since it can fork/exec
+     * a child that also calls PMIX_Init, so add it here if necessary.
+     * Create the tracker for this peer */
+    peer = PMIX_NEW(pmix_peer_t);
+    if (NULL == peer) {
+        /* probably cannot send an error reply if we are out of memory */
+        free(msg);
+        CLOSE_THE_SOCKET(pnd->sd);
+        PMIX_RELEASE(pnd);
+        return;
+    }
+    PMIX_RETAIN(info);
+    peer->info = info;
+    PMIX_RETAIN(nptr);
+    peer->info->nptr = nptr;
+    info->proc_cnt++; /* increase number of processes on this rank */
+    peer->sd = pnd->sd;
+    if (0 > (peer->index = pmix_pointer_array_add(&pmix_server_globals.clients, peer))) {
+        free(msg);
+        info->proc_cnt--;
+        PMIX_RELEASE(info);
+        PMIX_RELEASE(peer);
+        /* probably cannot send an error reply if we are out of memory */
+        CLOSE_THE_SOCKET(pnd->sd);
+        PMIX_RELEASE(pnd);
+        return;
+    }
+
+    /* set the sec module to match this peer */
+    rc = pmix_psec.assign_module(peer, sec);
+    if (PMIX_SUCCESS != rc) {
+        free(msg);
+        info->proc_cnt--;
+        PMIX_RELEASE(info);
+        pmix_pointer_array_set_item(&pmix_server_globals.clients, peer->index, NULL);
+        PMIX_RELEASE(peer);
+        /* send an error reply to the client */
+        goto error;
+    }
+    free(msg);
+
+    /* the choice of PTL module is obviously us */
+    peer->compat.ptl = &pmix_ptl_tcp_module;
+
+    /* validate the connection */
+    rc = pmix_psec.validate_connection(peer, PMIX_PROTOCOL_V2,
+                                       pnd->cred, pnd->len);
+    if (PMIX_SUCCESS != rc) {
+        pmix_output_verbose(2, pmix_ptl_base_framework.framework_output,
+                            "validation of client connection failed");
+        info->proc_cnt--;
+        PMIX_RELEASE(info);
+        pmix_pointer_array_set_item(&pmix_server_globals.clients, peer->index, NULL);
+        PMIX_RELEASE(peer);
+        /* send an error reply to the client */
+        goto error;
+    }
+
+    pmix_output_verbose(2, pmix_ptl_base_framework.framework_output,
+                        "client connection validated");
+
+    /* tell the client all is good */
+    u32 = htonl(PMIX_SUCCESS);
+    if (PMIX_SUCCESS != (rc = pmix_ptl_base_send_blocking(pnd->sd, (char*)&u32, sizeof(uint32_t)))) {
+        PMIX_ERROR_LOG(rc);
+        info->proc_cnt--;
+        PMIX_RELEASE(info);
+        pmix_pointer_array_set_item(&pmix_server_globals.clients, peer->index, NULL);
+        PMIX_RELEASE(peer);
+        CLOSE_THE_SOCKET(pnd->sd);
+        PMIX_RELEASE(pnd);
+        return;
+    }
+      /* send the client's array index */
+    u32 = htonl(peer->index);
+      if (PMIX_SUCCESS != (rc = pmix_ptl_base_send_blocking(pnd->sd, (char*)&u32, sizeof(uint32_t)))) {
+          PMIX_ERROR_LOG(rc);
+          info->proc_cnt--;
+          PMIX_RELEASE(info);
+          pmix_pointer_array_set_item(&pmix_server_globals.clients, peer->index, NULL);
+          PMIX_RELEASE(peer);
+          goto error;
+      }
+
+      pmix_output_verbose(2, pmix_ptl_base_framework.framework_output,
+                          "connect-ack from client completed");
+
+      /* let the host server know that this client has connected */
+      if (NULL != pmix_host_server.client_connected) {
+          (void)strncpy(proc.nspace, peer->info->nptr->nspace, PMIX_MAX_NSLEN);
+          proc.rank = peer->info->rank;
+          rc = pmix_host_server.client_connected(&proc, peer->info->server_object,
+                                                 NULL, NULL);
+          if (PMIX_SUCCESS != rc) {
+              PMIX_ERROR_LOG(rc);
+          }
+      }
+
+    pmix_ptl_base_set_nonblocking(pnd->sd);
+
+    /* start the events for this client */
+    pmix_event_assign(&peer->recv_event, pmix_globals.evbase, pnd->sd,
+                      EV_READ|EV_PERSIST, pmix_ptl_base_recv_handler, peer);
+    pmix_event_add(&peer->recv_event, NULL);
+    peer->recv_ev_active = true;
+    pmix_event_assign(&peer->send_event, pmix_globals.evbase, pnd->sd,
+                      EV_WRITE|EV_PERSIST, pmix_ptl_base_send_handler, peer);
+    pmix_output_verbose(2, pmix_ptl_base_framework.framework_output,
+                        "pmix:server client %s:%u has connected on socket %d",
+                        peer->info->nptr->nspace, peer->info->rank, peer->sd);
+    PMIX_RELEASE(pnd);
+    return;
+
+  error:
+    /* send an error reply to the client */
+    u32 = htonl(rc);
+    if (PMIX_SUCCESS != (rc = pmix_ptl_base_send_blocking(pnd->sd, (char*)&u32, sizeof(int)))) {
+        PMIX_ERROR_LOG(rc);
+        CLOSE_THE_SOCKET(pnd->sd);
+    }
+    PMIX_RELEASE(pnd);
+    return;
+}
+
+/* process the callback with tool connection info */
+static void process_cbfunc(int sd, short args, void *cbdata)
+{
+    pmix_setup_caddy_t *cd = (pmix_setup_caddy_t*)cbdata;
+    pmix_pending_connection_t *pnd = (pmix_pending_connection_t*)cd->cbdata;
+    pmix_nspace_t *nptr;
+    pmix_rank_info_t *info;
+    int rc;
+    uint32_t u32;
+
+    /* acquire the object */
+    PMIX_ACQUIRE_OBJECT(cd);
+
+    /* send this status so they don't hang */
+    u32 = ntohl(cd->status);
+    if (PMIX_SUCCESS != (rc = pmix_ptl_base_send_blocking(pnd->sd, (char*)&u32, sizeof(uint32_t)))) {
+        PMIX_ERROR_LOG(rc);
+        CLOSE_THE_SOCKET(pnd->sd);
+        PMIX_RELEASE(pnd);
+        PMIX_RELEASE(cd);
+        return;
+    }
+
+    /* if the request failed, then we are done */
+    if (PMIX_SUCCESS != cd->status) {
+        PMIX_RELEASE(pnd);
+        PMIX_RELEASE(cd);
+        return;
+    }
+
+    /* send the nspace back to the tool */
+    if (PMIX_SUCCESS != (rc = pmix_ptl_base_send_blocking(pnd->sd, cd->proc.nspace, PMIX_MAX_NSLEN+1))) {
+        PMIX_ERROR_LOG(rc);
+        CLOSE_THE_SOCKET(pnd->sd);
+        PMIX_RELEASE(pnd);
+        PMIX_RELEASE(cd);
+        return;
+    }
+
+    /* send my nspace back to the tool */
+    if (PMIX_SUCCESS != (rc = pmix_ptl_base_send_blocking(pnd->sd, pmix_globals.myid.nspace, PMIX_MAX_NSLEN+1))) {
+        PMIX_ERROR_LOG(rc);
+        CLOSE_THE_SOCKET(pnd->sd);
+        PMIX_RELEASE(pnd);
+        PMIX_RELEASE(cd);
+        return;
+    }
+
+    /* send my rank back to the tool */
+    u32 = ntohl(pmix_globals.myid.rank);
+    if (PMIX_SUCCESS != (rc = pmix_ptl_base_send_blocking(pnd->sd, (char*)&u32, sizeof(uint32_t)))) {
+        PMIX_ERROR_LOG(rc);
+        CLOSE_THE_SOCKET(pnd->sd);
+        PMIX_RELEASE(pnd);
+        PMIX_RELEASE(cd);
+        return;
+    }
+
+    /* add this tool rank to the nspace */
+    info = PMIX_NEW(pmix_rank_info_t);
+    (void)strncpy(info->nptr->nspace, cd->proc.nspace, PMIX_MAX_NSLEN);
+    info->rank = 0;
+    /* add this nspace to our pool */
+    nptr = PMIX_NEW(pmix_nspace_t);
+    info->nptr = nptr;
+    (void)strncpy(nptr->nspace, cd->proc.nspace, PMIX_MAX_NSLEN);
+    pmix_list_append(&pmix_globals.nspaces, &nptr->super);
+    /* need to include the uid/gid for validation */
+    info->uid = pnd->uid;
+    info->gid = pnd->gid;
+    pmix_list_append(&nptr->server->ranks, &info->super);
+
+    /* setup a peer object for this tool */
+    pmix_peer_t *peer = PMIX_NEW(pmix_peer_t);
+    PMIX_RETAIN(info);
+    peer->info = info;
+    PMIX_RETAIN(nptr);
+    peer->info->nptr = nptr;
+    peer->proc_cnt = 1;
+    peer->sd = pnd->sd;
+
+    /* get the appropriate compatibility modules based on the
+     * info provided by the tool during the initial connection request */
+    rc = pmix_psec.assign_module(peer, pnd->psec);
+    if (PMIX_SUCCESS != rc) {
+        PMIX_RELEASE(peer);
+        pmix_list_remove_item(&pmix_globals.nspaces, &nptr->super);
+        PMIX_RELEASE(nptr);  // will release the info object
+        CLOSE_THE_SOCKET(pnd->sd);
+        goto done;
+    }
+    /* the choice of PTL module was obviously made by the connecting
+     * tool as we received this request via that channel, so simply
+     * record it here for future use */
+    peer->compat.ptl = &pmix_ptl_tcp_module;
+
+    /* validate the connection */
+    rc = pmix_psec.validate_connection(peer, PMIX_PROTOCOL_V2,
+                                       pnd->cred, pnd->len);
+    if (PMIX_SUCCESS != rc) {
+        pmix_output_verbose(2, pmix_ptl_base_framework.framework_output,
+                            "validation of tool credentials failed: %s",
+                            PMIx_Error_string(rc));
+        PMIX_RELEASE(peer);
+        pmix_list_remove_item(&pmix_globals.nspaces, &nptr->super);
+        PMIX_RELEASE(nptr);  // will release the info object
+        CLOSE_THE_SOCKET(pnd->sd);
+        goto done;
+    }
+
+    /* set the socket non-blocking for all further operations */
+    pmix_ptl_base_set_nonblocking(pnd->sd);
+
+    if (0 > (peer->index = pmix_pointer_array_add(&pmix_server_globals.clients, peer))) {
+        PMIX_RELEASE(pnd);
+        PMIX_RELEASE(cd);
+        PMIX_RELEASE(peer);
+        pmix_list_remove_item(&pmix_globals.nspaces, &nptr->super);
+        PMIX_RELEASE(nptr);  // will release the info object
+        /* probably cannot send an error reply if we are out of memory */
+        return;
+    }
+
+    /* start the events for this tool */
+    pmix_event_assign(&peer->recv_event, pmix_globals.evbase, pnd->sd,
+                      EV_READ|EV_PERSIST, pmix_ptl_base_recv_handler, peer);
+    pmix_event_add(&peer->recv_event, NULL);
+    peer->recv_ev_active = true;
+    pmix_event_assign(&peer->send_event, pmix_globals.evbase, pnd->sd,
+                      EV_WRITE|EV_PERSIST, pmix_ptl_base_send_handler, peer);
+    pmix_output_verbose(2, pmix_ptl_base_framework.framework_output,
+                        "pmix:server tool %s:%d has connected on socket %d",
+                        peer->info->nptr->nspace, peer->info->rank, peer->sd);
+
+  done:
+    PMIX_RELEASE(pnd);
+    PMIX_RELEASE(cd);
+}
+
+/* receive a callback from the host RM with an nspace
+ * for a connecting tool */
+static void cnct_cbfunc(pmix_status_t status,
+                        pmix_proc_t *proc, void *cbdata)
+{
+    pmix_setup_caddy_t *cd;
+
+    pmix_output_verbose(2, pmix_ptl_base_framework.framework_output,
+                        "pmix:tcp:cnct_cbfunc returning %s:%d",
+                        proc->nspace, proc->rank);
+
+    /* need to thread-shift this into our context */
+    cd = PMIX_NEW(pmix_setup_caddy_t);
+    cd->status = status;
+    (void)strncpy(cd->proc.nspace, proc->nspace, PMIX_MAX_NSLEN);
+    cd->cbdata = cbdata;
+    PMIX_THREADSHIFT(cd, process_cbfunc);
+}
diff --git a/src/mca/ptl/usock/Makefile.am b/src/mca/ptl/usock/Makefile.am
new file mode 100644
index 0000000..e6606e2
--- /dev/null
+++ b/src/mca/ptl/usock/Makefile.am
@@ -0,0 +1,50 @@
+# -*- makefile -*-
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2012      Los Alamos National Security, Inc.  All rights reserved.
+# Copyright (c) 2013-2016 Intel, Inc. All rights reserved
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+headers = ptl_usock.h
+sources = \
+        ptl_usock_component.c \
+        ptl_usock.c
+
+# Make the output library in this directory, and name it either
+# mca_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la
+# (for static builds).
+
+if MCA_BUILD_pmix_ptl_usock_DSO
+lib =
+lib_sources =
+component = mca_ptl_usock.la
+component_sources = $(headers) $(sources)
+else
+lib = libmca_ptl_usock.la
+lib_sources = $(headers) $(sources)
+component =
+component_sources =
+endif
+
+mcacomponentdir = $(pmixlibdir)
+mcacomponent_LTLIBRARIES = $(component)
+mca_ptl_usock_la_SOURCES = $(component_sources)
+mca_ptl_usock_la_LDFLAGS = -module -avoid-version
+
+noinst_LTLIBRARIES = $(lib)
+libmca_ptl_usock_la_SOURCES = $(lib_sources)
+libmca_ptl_usock_la_LDFLAGS = -module -avoid-version
diff --git a/src/mca/ptl/usock/Makefile.in b/src/mca/ptl/usock/Makefile.in
new file mode 100644
index 0000000..5bd530b
--- /dev/null
+++ b/src/mca/ptl/usock/Makefile.in
@@ -0,0 +1,891 @@
+# Makefile.in generated by automake 1.15 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+# -*- makefile -*-
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2012      Los Alamos National Security, Inc.  All rights reserved.
+# Copyright (c) 2013-2016 Intel, Inc. All rights reserved
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+subdir = src/mca/ptl/usock
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/config/c_get_alignment.m4 \
+	$(top_srcdir)/config/libtool.m4 \
+	$(top_srcdir)/config/ltoptions.m4 \
+	$(top_srcdir)/config/ltsugar.m4 \
+	$(top_srcdir)/config/ltversion.m4 \
+	$(top_srcdir)/config/lt~obsolete.m4 \
+	$(top_srcdir)/config/pmix.m4 \
+	$(top_srcdir)/config/pmix_check_attributes.m4 \
+	$(top_srcdir)/config/pmix_check_broken_qsort.m4 \
+	$(top_srcdir)/config/pmix_check_compiler_version.m4 \
+	$(top_srcdir)/config/pmix_check_icc.m4 \
+	$(top_srcdir)/config/pmix_check_ident.m4 \
+	$(top_srcdir)/config/pmix_check_lock.m4 \
+	$(top_srcdir)/config/pmix_check_os_flavors.m4 \
+	$(top_srcdir)/config/pmix_check_package.m4 \
+	$(top_srcdir)/config/pmix_check_psm2.m4 \
+	$(top_srcdir)/config/pmix_check_pthread_pids.m4 \
+	$(top_srcdir)/config/pmix_check_vendor.m4 \
+	$(top_srcdir)/config/pmix_check_visibility.m4 \
+	$(top_srcdir)/config/pmix_check_withdir.m4 \
+	$(top_srcdir)/config/pmix_config_asm.m4 \
+	$(top_srcdir)/config/pmix_config_pthreads.m4 \
+	$(top_srcdir)/config/pmix_config_subdir.m4 \
+	$(top_srcdir)/config/pmix_config_subdir_args.m4 \
+	$(top_srcdir)/config/pmix_config_threads.m4 \
+	$(top_srcdir)/config/pmix_ensure_contains_optflags.m4 \
+	$(top_srcdir)/config/pmix_functions.m4 \
+	$(top_srcdir)/config/pmix_load_platform.m4 \
+	$(top_srcdir)/config/pmix_mca.m4 \
+	$(top_srcdir)/config/pmix_search_libs.m4 \
+	$(top_srcdir)/config/pmix_setup_cc.m4 \
+	$(top_srcdir)/config/pmix_setup_libevent.m4 \
+	$(top_srcdir)/config/pmix_setup_zlib.m4 \
+	$(top_srcdir)/config/pmix_try_assemble.m4 \
+	$(top_srcdir)/config/autogen_found_items.m4 \
+	$(top_srcdir)/src/mca/pdl/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/configure.m4 \
+	$(top_srcdir)/src/mca/pdl/pdlopen/configure.m4 \
+	$(top_srcdir)/src/mca/pdl/plibltdl/configure.m4 \
+	$(top_srcdir)/src/mca/pif/bsdx_ipv4/configure.m4 \
+	$(top_srcdir)/src/mca/pif/bsdx_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pif/linux_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pif/posix_ipv4/configure.m4 \
+	$(top_srcdir)/src/mca/pif/solaris_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/config/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/env/configure.m4 \
+	$(top_srcdir)/src/mca/pnet/opa/configure.m4 \
+	$(top_srcdir)/src/mca/psec/munge/configure.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/src/include/pmix_config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(mcacomponentdir)"
+LTLIBRARIES = $(mcacomponent_LTLIBRARIES) $(noinst_LTLIBRARIES)
+libmca_ptl_usock_la_LIBADD =
+am__libmca_ptl_usock_la_SOURCES_DIST = ptl_usock.h \
+	ptl_usock_component.c ptl_usock.c
+am__objects_1 =
+am__objects_2 = ptl_usock_component.lo ptl_usock.lo
+ at MCA_BUILD_pmix_ptl_usock_DSO_FALSE@am__objects_3 = $(am__objects_1) \
+ at MCA_BUILD_pmix_ptl_usock_DSO_FALSE@	$(am__objects_2)
+am_libmca_ptl_usock_la_OBJECTS = $(am__objects_3)
+libmca_ptl_usock_la_OBJECTS = $(am_libmca_ptl_usock_la_OBJECTS)
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+libmca_ptl_usock_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(AM_CFLAGS) $(CFLAGS) $(libmca_ptl_usock_la_LDFLAGS) \
+	$(LDFLAGS) -o $@
+ at MCA_BUILD_pmix_ptl_usock_DSO_FALSE@am_libmca_ptl_usock_la_rpath =
+mca_ptl_usock_la_LIBADD =
+am__mca_ptl_usock_la_SOURCES_DIST = ptl_usock.h ptl_usock_component.c \
+	ptl_usock.c
+ at MCA_BUILD_pmix_ptl_usock_DSO_TRUE@am__objects_4 = $(am__objects_1) \
+ at MCA_BUILD_pmix_ptl_usock_DSO_TRUE@	$(am__objects_2)
+am_mca_ptl_usock_la_OBJECTS = $(am__objects_4)
+mca_ptl_usock_la_OBJECTS = $(am_mca_ptl_usock_la_OBJECTS)
+mca_ptl_usock_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(AM_CFLAGS) $(CFLAGS) $(mca_ptl_usock_la_LDFLAGS) $(LDFLAGS) \
+	-o $@
+ at MCA_BUILD_pmix_ptl_usock_DSO_TRUE@am_mca_ptl_usock_la_rpath = -rpath \
+ at MCA_BUILD_pmix_ptl_usock_DSO_TRUE@	$(mcacomponentdir)
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/src/include
+depcomp = $(SHELL) $(top_srcdir)/./config/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libmca_ptl_usock_la_SOURCES) $(mca_ptl_usock_la_SOURCES)
+DIST_SOURCES = $(am__libmca_ptl_usock_la_SOURCES_DIST) \
+	$(am__mca_ptl_usock_la_SOURCES_DIST)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/./config/depcomp
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CFLAGS = @CFLAGS@
+CLEANFILES = @CLEANFILES@
+CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MCA_PROJECT_SUBDIRS = @MCA_PROJECT_SUBDIRS@
+MCA_pmix_FRAMEWORKS = @MCA_pmix_FRAMEWORKS@
+MCA_pmix_FRAMEWORKS_SUBDIRS = @MCA_pmix_FRAMEWORKS_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS@
+MCA_pmix_FRAMEWORK_LIBS = @MCA_pmix_FRAMEWORK_LIBS@
+MCA_pmix_pdl_ALL_COMPONENTS = @MCA_pmix_pdl_ALL_COMPONENTS@
+MCA_pmix_pdl_ALL_SUBDIRS = @MCA_pmix_pdl_ALL_SUBDIRS@
+MCA_pmix_pdl_DSO_COMPONENTS = @MCA_pmix_pdl_DSO_COMPONENTS@
+MCA_pmix_pdl_DSO_SUBDIRS = @MCA_pmix_pdl_DSO_SUBDIRS@
+MCA_pmix_pdl_STATIC_COMPONENTS = @MCA_pmix_pdl_STATIC_COMPONENTS@
+MCA_pmix_pdl_STATIC_LTLIBS = @MCA_pmix_pdl_STATIC_LTLIBS@
+MCA_pmix_pdl_STATIC_SUBDIRS = @MCA_pmix_pdl_STATIC_SUBDIRS@
+MCA_pmix_pif_ALL_COMPONENTS = @MCA_pmix_pif_ALL_COMPONENTS@
+MCA_pmix_pif_ALL_SUBDIRS = @MCA_pmix_pif_ALL_SUBDIRS@
+MCA_pmix_pif_DSO_COMPONENTS = @MCA_pmix_pif_DSO_COMPONENTS@
+MCA_pmix_pif_DSO_SUBDIRS = @MCA_pmix_pif_DSO_SUBDIRS@
+MCA_pmix_pif_STATIC_COMPONENTS = @MCA_pmix_pif_STATIC_COMPONENTS@
+MCA_pmix_pif_STATIC_LTLIBS = @MCA_pmix_pif_STATIC_LTLIBS@
+MCA_pmix_pif_STATIC_SUBDIRS = @MCA_pmix_pif_STATIC_SUBDIRS@
+MCA_pmix_pinstalldirs_ALL_COMPONENTS = @MCA_pmix_pinstalldirs_ALL_COMPONENTS@
+MCA_pmix_pinstalldirs_ALL_SUBDIRS = @MCA_pmix_pinstalldirs_ALL_SUBDIRS@
+MCA_pmix_pinstalldirs_DSO_COMPONENTS = @MCA_pmix_pinstalldirs_DSO_COMPONENTS@
+MCA_pmix_pinstalldirs_DSO_SUBDIRS = @MCA_pmix_pinstalldirs_DSO_SUBDIRS@
+MCA_pmix_pinstalldirs_STATIC_COMPONENTS = @MCA_pmix_pinstalldirs_STATIC_COMPONENTS@
+MCA_pmix_pinstalldirs_STATIC_LTLIBS = @MCA_pmix_pinstalldirs_STATIC_LTLIBS@
+MCA_pmix_pinstalldirs_STATIC_SUBDIRS = @MCA_pmix_pinstalldirs_STATIC_SUBDIRS@
+MCA_pmix_pnet_ALL_COMPONENTS = @MCA_pmix_pnet_ALL_COMPONENTS@
+MCA_pmix_pnet_ALL_SUBDIRS = @MCA_pmix_pnet_ALL_SUBDIRS@
+MCA_pmix_pnet_DSO_COMPONENTS = @MCA_pmix_pnet_DSO_COMPONENTS@
+MCA_pmix_pnet_DSO_SUBDIRS = @MCA_pmix_pnet_DSO_SUBDIRS@
+MCA_pmix_pnet_STATIC_COMPONENTS = @MCA_pmix_pnet_STATIC_COMPONENTS@
+MCA_pmix_pnet_STATIC_LTLIBS = @MCA_pmix_pnet_STATIC_LTLIBS@
+MCA_pmix_pnet_STATIC_SUBDIRS = @MCA_pmix_pnet_STATIC_SUBDIRS@
+MCA_pmix_psec_ALL_COMPONENTS = @MCA_pmix_psec_ALL_COMPONENTS@
+MCA_pmix_psec_ALL_SUBDIRS = @MCA_pmix_psec_ALL_SUBDIRS@
+MCA_pmix_psec_DSO_COMPONENTS = @MCA_pmix_psec_DSO_COMPONENTS@
+MCA_pmix_psec_DSO_SUBDIRS = @MCA_pmix_psec_DSO_SUBDIRS@
+MCA_pmix_psec_STATIC_COMPONENTS = @MCA_pmix_psec_STATIC_COMPONENTS@
+MCA_pmix_psec_STATIC_LTLIBS = @MCA_pmix_psec_STATIC_LTLIBS@
+MCA_pmix_psec_STATIC_SUBDIRS = @MCA_pmix_psec_STATIC_SUBDIRS@
+MCA_pmix_psensor_ALL_COMPONENTS = @MCA_pmix_psensor_ALL_COMPONENTS@
+MCA_pmix_psensor_ALL_SUBDIRS = @MCA_pmix_psensor_ALL_SUBDIRS@
+MCA_pmix_psensor_DSO_COMPONENTS = @MCA_pmix_psensor_DSO_COMPONENTS@
+MCA_pmix_psensor_DSO_SUBDIRS = @MCA_pmix_psensor_DSO_SUBDIRS@
+MCA_pmix_psensor_STATIC_COMPONENTS = @MCA_pmix_psensor_STATIC_COMPONENTS@
+MCA_pmix_psensor_STATIC_LTLIBS = @MCA_pmix_psensor_STATIC_LTLIBS@
+MCA_pmix_psensor_STATIC_SUBDIRS = @MCA_pmix_psensor_STATIC_SUBDIRS@
+MCA_pmix_ptl_ALL_COMPONENTS = @MCA_pmix_ptl_ALL_COMPONENTS@
+MCA_pmix_ptl_ALL_SUBDIRS = @MCA_pmix_ptl_ALL_SUBDIRS@
+MCA_pmix_ptl_DSO_COMPONENTS = @MCA_pmix_ptl_DSO_COMPONENTS@
+MCA_pmix_ptl_DSO_SUBDIRS = @MCA_pmix_ptl_DSO_SUBDIRS@
+MCA_pmix_ptl_STATIC_COMPONENTS = @MCA_pmix_ptl_STATIC_COMPONENTS@
+MCA_pmix_ptl_STATIC_LTLIBS = @MCA_pmix_ptl_STATIC_LTLIBS@
+MCA_pmix_ptl_STATIC_SUBDIRS = @MCA_pmix_ptl_STATIC_SUBDIRS@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PMIX_ASM_GSYM = @PMIX_ASM_GSYM@
+PMIX_ASM_LSYM = @PMIX_ASM_LSYM@
+PMIX_ASM_SUPPORT_64BIT = @PMIX_ASM_SUPPORT_64BIT@
+PMIX_ASM_TEXT = @PMIX_ASM_TEXT@
+PMIX_ASM_TYPE = @PMIX_ASM_TYPE@
+PMIX_ASSEMBLY_ARCH = @PMIX_ASSEMBLY_ARCH@
+PMIX_ASSEMBLY_BUILTIN = @PMIX_ASSEMBLY_BUILTIN@
+PMIX_ASSEMBLY_FORMAT = @PMIX_ASSEMBLY_FORMAT@
+PMIX_AS_GLOBAL = @PMIX_AS_GLOBAL@
+PMIX_AS_LABEL_SUFFIX = @PMIX_AS_LABEL_SUFFIX@
+PMIX_CC_ABSOLUTE = @PMIX_CC_ABSOLUTE@
+PMIX_CONFIGURE_DATE = @PMIX_CONFIGURE_DATE@
+PMIX_CONFIGURE_HOST = @PMIX_CONFIGURE_HOST@
+PMIX_CONFIGURE_USER = @PMIX_CONFIGURE_USER@
+PMIX_EMBEDDED_CPPFLAGS = @PMIX_EMBEDDED_CPPFLAGS@
+PMIX_EMBEDDED_LDFLAGS = @PMIX_EMBEDDED_LDFLAGS@
+PMIX_EMBEDDED_LIBS = @PMIX_EMBEDDED_LIBS@
+PMIX_MAJOR_VERSION = @PMIX_MAJOR_VERSION@
+PMIX_MINOR_VERSION = @PMIX_MINOR_VERSION@
+PMIX_RELEASE_DATE = @PMIX_RELEASE_DATE@
+PMIX_RELEASE_VERSION = @PMIX_RELEASE_VERSION@
+PMIX_RENAME = @PMIX_RENAME@
+PMIX_VERSION = @PMIX_VERSION@
+PMIX_top_builddir = @PMIX_top_builddir@
+PMIX_top_srcdir = @PMIX_top_srcdir@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_prefix_program = @ac_prefix_program@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+libpmix_so_version = @libpmix_so_version@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pmix_have_pandoc = @pmix_have_pandoc@
+pmix_pdl_pdlopen_LIBS = @pmix_pdl_pdlopen_LIBS@
+pmix_pdl_plibltdl_CPPFLAGS = @pmix_pdl_plibltdl_CPPFLAGS@
+pmix_pdl_plibltdl_LDFLAGS = @pmix_pdl_plibltdl_LDFLAGS@
+pmix_pdl_plibltdl_LIBS = @pmix_pdl_plibltdl_LIBS@
+pmixdatadir = @pmixdatadir@
+pmixincludedir = @pmixincludedir@
+pmixlibdir = @pmixlibdir@
+pmixmajor = @pmixmajor@
+pmixminor = @pmixminor@
+pnet_opa_CFLAGS = @pnet_opa_CFLAGS@
+pnet_opa_CPPFLAGS = @pnet_opa_CPPFLAGS@
+pnet_opa_LDFLAGS = @pnet_opa_LDFLAGS@
+pnet_opa_LIBS = @pnet_opa_LIBS@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+psec_munge_CPPFLAGS = @psec_munge_CPPFLAGS@
+psec_munge_LDFLAGS = @psec_munge_LDFLAGS@
+psec_munge_LIBS = @psec_munge_LIBS@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+headers = ptl_usock.h
+sources = \
+        ptl_usock_component.c \
+        ptl_usock.c
+
+ at MCA_BUILD_pmix_ptl_usock_DSO_FALSE@lib = libmca_ptl_usock.la
+
+# Make the output library in this directory, and name it either
+# mca_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la
+# (for static builds).
+ at MCA_BUILD_pmix_ptl_usock_DSO_TRUE@lib = 
+ at MCA_BUILD_pmix_ptl_usock_DSO_FALSE@lib_sources = $(headers) $(sources)
+ at MCA_BUILD_pmix_ptl_usock_DSO_TRUE@lib_sources = 
+ at MCA_BUILD_pmix_ptl_usock_DSO_FALSE@component = 
+ at MCA_BUILD_pmix_ptl_usock_DSO_TRUE@component = mca_ptl_usock.la
+ at MCA_BUILD_pmix_ptl_usock_DSO_FALSE@component_sources = 
+ at MCA_BUILD_pmix_ptl_usock_DSO_TRUE@component_sources = $(headers) $(sources)
+mcacomponentdir = $(pmixlibdir)
+mcacomponent_LTLIBRARIES = $(component)
+mca_ptl_usock_la_SOURCES = $(component_sources)
+mca_ptl_usock_la_LDFLAGS = -module -avoid-version
+noinst_LTLIBRARIES = $(lib)
+libmca_ptl_usock_la_SOURCES = $(lib_sources)
+libmca_ptl_usock_la_LDFLAGS = -module -avoid-version
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/mca/ptl/usock/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/mca/ptl/usock/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+install-mcacomponentLTLIBRARIES: $(mcacomponent_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	@list='$(mcacomponent_LTLIBRARIES)'; test -n "$(mcacomponentdir)" || 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)$(mcacomponentdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(mcacomponentdir)" || exit 1; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(mcacomponentdir)'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(mcacomponentdir)"; \
+	}
+
+uninstall-mcacomponentLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(mcacomponent_LTLIBRARIES)'; test -n "$(mcacomponentdir)" || list=; \
+	for p in $$list; do \
+	  $(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(mcacomponentdir)/$$f'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(mcacomponentdir)/$$f"; \
+	done
+
+clean-mcacomponentLTLIBRARIES:
+	-test -z "$(mcacomponent_LTLIBRARIES)" || rm -f $(mcacomponent_LTLIBRARIES)
+	@list='$(mcacomponent_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}; \
+	}
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_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}; \
+	}
+
+libmca_ptl_usock.la: $(libmca_ptl_usock_la_OBJECTS) $(libmca_ptl_usock_la_DEPENDENCIES) $(EXTRA_libmca_ptl_usock_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(libmca_ptl_usock_la_LINK) $(am_libmca_ptl_usock_la_rpath) $(libmca_ptl_usock_la_OBJECTS) $(libmca_ptl_usock_la_LIBADD) $(LIBS)
+
+mca_ptl_usock.la: $(mca_ptl_usock_la_OBJECTS) $(mca_ptl_usock_la_DEPENDENCIES) $(EXTRA_mca_ptl_usock_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(mca_ptl_usock_la_LINK) $(am_mca_ptl_usock_la_rpath) $(mca_ptl_usock_la_OBJECTS) $(mca_ptl_usock_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ptl_usock.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ptl_usock_component.Plo at am__quote@
+
+.c.o:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+ at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+	for dir in "$(DESTDIR)$(mcacomponentdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-mcacomponentLTLIBRARIES \
+	clean-noinstLTLIBRARIES mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-mcacomponentLTLIBRARIES
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-mcacomponentLTLIBRARIES
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-mcacomponentLTLIBRARIES \
+	clean-noinstLTLIBRARIES 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-mcacomponentLTLIBRARIES install-pdf install-pdf-am \
+	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-mcacomponentLTLIBRARIES
+
+.PRECIOUS: Makefile
+
+
+# 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/mca/ptl/usock/ptl_usock.c b/src/mca/ptl/usock/ptl_usock.c
new file mode 100644
index 0000000..0a090bb
--- /dev/null
+++ b/src/mca/ptl/usock/ptl_usock.c
@@ -0,0 +1,358 @@
+/*
+ * Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2011 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2010-2011 Oak Ridge National Labs.  All rights reserved.
+ * Copyright (c) 2011-2014 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2011-2013 Los Alamos National Security, LLC.  All rights
+ *                         reserved.
+ * Copyright (c) 2013-2017 Intel, Inc.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ *
+ */
+
+#include <src/include/pmix_config.h>
+#include "pmix_common.h"
+
+#ifdef HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_SYS_UN_H
+#include <sys/un.h>
+#endif
+#ifdef HAVE_SYS_UIO_H
+#include <sys/uio.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
+
+#include "src/util/argv.h"
+#include "src/util/error.h"
+#include "src/client/pmix_client_ops.h"
+#include "src/include/pmix_globals.h"
+#include "src/include/pmix_socket_errno.h"
+#include "src/mca/psec/psec.h"
+
+#include "src/mca/ptl/base/base.h"
+#include "ptl_usock.h"
+
+static pmix_status_t init(void);
+static void finalize(void);
+static pmix_status_t connect_to_peer(struct pmix_peer_t *peer,
+                                     pmix_info_t *info, size_t ninfo);
+static pmix_status_t send_recv(struct pmix_peer_t *peer,
+                               pmix_buffer_t *bfr,
+                               pmix_ptl_cbfunc_t cbfunc,
+                               void *cbdata);
+static pmix_status_t send_oneway(struct pmix_peer_t *peer,
+                                 pmix_buffer_t *bfr,
+                                 pmix_ptl_tag_t tag);
+
+pmix_ptl_module_t pmix_ptl_usock_module = {
+    .init = init,
+    .finalize = finalize,
+    .send_recv = send_recv,
+    .send = send_oneway,
+    .connect_to_peer = connect_to_peer
+};
+
+static pmix_status_t recv_connect_ack(int sd);
+static pmix_status_t send_connect_ack(int sd);
+
+static pmix_status_t init(void)
+{
+    return PMIX_SUCCESS;
+}
+
+static void finalize(void)
+{
+}
+
+static pmix_status_t connect_to_peer(struct pmix_peer_t *peer,
+                                     pmix_info_t *info, size_t ninfo)
+{
+    struct sockaddr_un *address;
+    char *evar, **uri;
+    pmix_status_t rc;
+    int sd;
+    pmix_socklen_t len;
+
+    /* if we are not a client, there is nothing we can do */
+    if (!PMIX_PROC_IS_CLIENT) {
+        return PMIX_ERR_NOT_SUPPORTED;
+    }
+
+    /* if we don't have a path to the daemon rendezvous point,
+     * then we need to return an error */
+    if (NULL == (evar = getenv("PMIX_SERVER_URI"))) {
+        /* let the caller know that the server isn't available */
+        return PMIX_ERR_SERVER_NOT_AVAIL;
+    }
+    uri = pmix_argv_split(evar, ':');
+    if (3 != pmix_argv_count(uri)) {
+        pmix_argv_free(uri);
+        return PMIX_ERROR;
+    }
+
+    /* set the server nspace */
+    pmix_client_globals.myserver->info = PMIX_NEW(pmix_rank_info_t);
+    pmix_client_globals.myserver->info->nptr = PMIX_NEW(pmix_nspace_t);
+    (void)strncpy(pmix_client_globals.myserver->info->nptr->nspace, uri[0], PMIX_MAX_NSLEN);
+
+    /* set the server rank */
+    pmix_client_globals.myserver->info->rank = strtoull(uri[1], NULL, 10);
+
+    /* setup the path to the daemon rendezvous point */
+    memset(&mca_ptl_usock_component.connection, 0, sizeof(struct sockaddr_storage));
+    address = (struct sockaddr_un*)&mca_ptl_usock_component.connection;
+    address->sun_family = AF_UNIX;
+    snprintf(address->sun_path, sizeof(address->sun_path)-1, "%s", uri[2]);
+    /* if the rendezvous file doesn't exist, that's an error */
+    if (0 != access(uri[2], R_OK)) {
+        pmix_argv_free(uri);
+        return PMIX_ERR_NOT_FOUND;
+    }
+    pmix_argv_free(uri);
+
+    /* establish the connection */
+    len = sizeof(struct sockaddr_un);
+    if (PMIX_SUCCESS != (rc = pmix_ptl_base_connect(&mca_ptl_usock_component.connection, len, &sd))) {
+        PMIX_ERROR_LOG(rc);
+        return rc;
+    }
+    pmix_client_globals.myserver->sd = sd;
+
+    /* send our identity and any authentication credentials to the server */
+    if (PMIX_SUCCESS != (rc = send_connect_ack(sd))) {
+        CLOSE_THE_SOCKET(sd);
+        return rc;
+    }
+
+    /* do whatever handshake is required */
+    if (PMIX_SUCCESS != (rc = recv_connect_ack(sd))) {
+        CLOSE_THE_SOCKET(sd);
+        return rc;
+    }
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "sock_peer_try_connect: Connection across to server succeeded");
+
+    /* mark the connection as made */
+    pmix_globals.connected = true;
+
+    pmix_ptl_base_set_nonblocking(sd);
+
+    /* setup recv event */
+    pmix_event_assign(&pmix_client_globals.myserver->recv_event,
+                      pmix_globals.evbase,
+                      pmix_client_globals.myserver->sd,
+                      EV_READ | EV_PERSIST,
+                      pmix_ptl_base_recv_handler, &pmix_client_globals.myserver);
+    pmix_event_add(&pmix_client_globals.myserver->recv_event, 0);
+    pmix_client_globals.myserver->recv_ev_active = true;
+
+    /* setup send event */
+    pmix_event_assign(&pmix_client_globals.myserver->send_event,
+                      pmix_globals.evbase,
+                      pmix_client_globals.myserver->sd,
+                      EV_WRITE|EV_PERSIST,
+                      pmix_ptl_base_send_handler, &pmix_client_globals.myserver);
+    pmix_client_globals.myserver->send_ev_active = false;
+
+    return PMIX_SUCCESS;
+}
+
+static pmix_status_t send_recv(struct pmix_peer_t *peer,
+                               pmix_buffer_t *bfr,
+                               pmix_ptl_cbfunc_t cbfunc,
+                               void *cbdata)
+{
+    pmix_ptl_sr_t *ms;
+
+    pmix_output_verbose(5, pmix_globals.debug_output,
+                        "[%s:%d] post send to server",
+                        __FILE__, __LINE__);
+
+    ms = PMIX_NEW(pmix_ptl_sr_t);
+    ms->peer = peer;
+    ms->bfr = bfr;
+    ms->cbfunc = cbfunc;
+    ms->cbdata = cbdata;
+    PMIX_THREADSHIFT(ms, pmix_ptl_base_send_recv);
+    return PMIX_SUCCESS;
+}
+
+static pmix_status_t send_oneway(struct pmix_peer_t *peer,
+                                 pmix_buffer_t *bfr,
+                                 pmix_ptl_tag_t tag)
+{
+    pmix_ptl_queue_t *q;
+    pmix_peer_t *pr = (pmix_peer_t*)peer;
+
+    /* we have to transfer this to an event for thread
+     * safety as we need to post this message on the
+     * peer's send queue */
+    q = PMIX_NEW(pmix_ptl_queue_t);
+    PMIX_RETAIN(pr);
+    q->peer = peer;
+    q->buf = bfr;
+    q->tag = tag;
+    PMIX_THREADSHIFT(q, pmix_ptl_base_send);
+
+    return PMIX_SUCCESS;
+}
+
+static pmix_status_t send_connect_ack(int sd)
+{
+    char *msg;
+    pmix_usock_hdr_t hdr;
+    size_t sdsize=0, csize=0, len;
+    char *cred = NULL;
+    pmix_status_t rc;
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "pmix: SEND CONNECT ACK");
+
+    /* setup the header */
+    memset(&hdr, 0, sizeof(pmix_usock_hdr_t));
+    hdr.pindex = -1;
+    hdr.tag = UINT32_MAX;
+
+    /* reserve space for the nspace and rank info */
+    sdsize = strlen(pmix_globals.myid.nspace) + 1 + sizeof(int);
+
+    /* get a credential, if the security system provides one. Not
+     * every SPC will do so, thus we must first check */
+    if (PMIX_SUCCESS != (rc = pmix_psec.create_cred(pmix_client_globals.myserver,
+                                                    PMIX_PROTOCOL_V1, &cred, &len))) {
+        return rc;
+    }
+
+    /* set the number of bytes to be read beyond the header */
+    hdr.nbytes = sdsize + strlen(PMIX_VERSION) + 1 + len;  // must NULL terminate the VERSION string!
+
+    /* create a space for our message */
+    sdsize = (sizeof(hdr) + hdr.nbytes);
+    if (NULL == (msg = (char*)malloc(sdsize))) {
+        if (NULL != cred) {
+            free(cred);
+        }
+        return PMIX_ERR_OUT_OF_RESOURCE;
+    }
+    memset(msg, 0, sdsize);
+
+    /* load the message */
+    csize=0;
+    memcpy(msg, &hdr, sizeof(pmix_usock_hdr_t));
+    csize += sizeof(pmix_usock_hdr_t);
+    memcpy(msg+csize, pmix_globals.myid.nspace, strlen(pmix_globals.myid.nspace));
+    csize += strlen(pmix_globals.myid.nspace)+1;
+    memcpy(msg+csize, &pmix_globals.myid.rank, sizeof(int));
+    csize += sizeof(int);
+    memcpy(msg+csize, PMIX_VERSION, strlen(PMIX_VERSION));
+    csize += strlen(PMIX_VERSION)+1;
+    if (NULL != cred) {
+        memcpy(msg+csize, cred, strlen(cred));  // leaves last position in msg set to NULL
+    }
+
+    if (PMIX_SUCCESS != pmix_ptl_base_send_blocking(sd, msg, sdsize)) {
+        free(msg);
+        if (NULL != cred) {
+            free(cred);
+        }
+        return PMIX_ERR_UNREACH;
+    }
+    free(msg);
+    if (NULL != cred) {
+        free(cred);
+    }
+    return PMIX_SUCCESS;
+}
+
+/* we receive a connection acknowledgement from the server,
+ * consisting of nothing more than a status report. If success,
+ * then we initiate authentication method */
+static pmix_status_t recv_connect_ack(int sd)
+{
+    pmix_status_t reply;
+    pmix_status_t rc;
+    struct timeval tv, save;
+    pmix_socklen_t sz;
+    bool sockopt = true;
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "pmix: RECV CONNECT ACK FROM SERVER");
+
+    /* get the current timeout value so we can reset to it */
+    sz = sizeof(save);
+    if (0 != getsockopt(sd, SOL_SOCKET, SO_RCVTIMEO, (void*)&save, &sz)) {
+        if (ENOPROTOOPT == errno) {
+            sockopt = false;
+        } else {
+             return PMIX_ERR_UNREACH;
+        }
+    } else {
+        /* set a timeout on the blocking recv so we don't hang */
+        tv.tv_sec  = 2;
+        tv.tv_usec = 0;
+        if (0 != setsockopt(sd, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv))) {
+            pmix_output_verbose(2, pmix_globals.debug_output,
+                                "pmix: recv_connect_ack could not setsockopt SO_RCVTIMEO");
+            return PMIX_ERR_UNREACH;
+        }
+    }
+
+    /* receive the status reply */
+    rc = pmix_ptl_base_recv_blocking(sd, (char*)&reply, sizeof(int));
+    if (PMIX_SUCCESS != rc) {
+        PMIX_ERROR_LOG(rc);
+        return rc;
+    }
+
+    /* see if they want us to do the handshake */
+    if (PMIX_ERR_READY_FOR_HANDSHAKE == reply) {
+        if (PMIX_SUCCESS != (rc = pmix_psec.client_handshake(pmix_client_globals.myserver, sd))) {
+            return rc;
+        }
+    } else if (PMIX_SUCCESS != reply) {
+        return reply;
+    }
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "pmix: RECV CONNECT CONFIRMATION");
+
+    /* receive our index into the server's client array */
+    rc = pmix_ptl_base_recv_blocking(sd, (char*)&pmix_globals.pindex, sizeof(int));
+    if (PMIX_SUCCESS != rc) {
+        PMIX_ERROR_LOG(rc);
+        return rc;
+    }
+    if (sockopt) {
+        /* return the socket to normal */
+        if (0 != setsockopt(sd, SOL_SOCKET, SO_RCVTIMEO, &save, sz)) {
+            return PMIX_ERR_UNREACH;
+        }
+    }
+
+    return PMIX_SUCCESS;
+}
diff --git a/src/mca/ptl/usock/ptl_usock.h b/src/mca/ptl/usock/ptl_usock.h
new file mode 100644
index 0000000..358b23a
--- /dev/null
+++ b/src/mca/ptl/usock/ptl_usock.h
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2006 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2016      Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#ifndef PMIX_PTL_USOCK_H
+#define PMIX_PTL_USOCK_H
+
+#include "src/mca/ptl/ptl.h"
+
+BEGIN_C_DECLS
+
+typedef struct {
+    pmix_ptl_base_component_t super;
+    char *tmpdir;
+    struct sockaddr_storage connection;
+    char *filename;
+} pmix_ptl_usock_component_t;
+
+/* header for messages */
+typedef struct {
+    int pindex;
+    uint32_t tag;
+    size_t nbytes;
+} pmix_usock_hdr_t;
+
+extern pmix_ptl_usock_component_t mca_ptl_usock_component;
+
+extern pmix_ptl_module_t pmix_ptl_usock_module;
+
+END_C_DECLS
+
+#endif /* PMIX_PTL_USOCK_H */
diff --git a/src/mca/ptl/usock/ptl_usock_component.c b/src/mca/ptl/usock/ptl_usock_component.c
new file mode 100644
index 0000000..8f363be
--- /dev/null
+++ b/src/mca/ptl/usock/ptl_usock_component.c
@@ -0,0 +1,630 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2005 The University of Tennptlee and The University
+ *                         of Tennptlee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2015      Los Alamos National Security, LLC. All rights
+ *                         reserved.
+ * Copyright (c) 2016-2017 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2017      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ *
+ * These symbols are in a file by themselves to provide nice linker
+ * semantics.  Since linkers generally pull in symbols by object
+ * files, keeping these symbols as the only symbols in this file
+ * prevents utility programs such as "ompi_info" from having to import
+ * entire components just to query their version and parameters.
+ */
+
+#include <src/include/pmix_config.h>
+#include <pmix_common.h>
+
+#ifdef HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_SYS_UN_H
+#include <sys/un.h>
+#endif
+#ifdef HAVE_SYS_UIO_H
+#include <sys/uio.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
+#include <errno.h>
+
+#include "src/util/argv.h"
+#include "src/util/error.h"
+#include "src/util/fd.h"
+#include "src/util/show_help.h"
+#include "src/util/strnlen.h"
+#include "src/mca/psec/psec.h"
+#include "src/server/pmix_server_ops.h"
+
+#include "src/mca/ptl/base/base.h"
+#include "src/mca/ptl/usock/ptl_usock.h"
+
+static pmix_status_t component_open(void);
+static pmix_status_t component_close(void);
+static int component_query(pmix_mca_base_module_t **module, int *priority);
+static pmix_status_t setup_listener(pmix_info_t info[], size_t ninfo,
+                                    bool *need_listener);
+
+/*
+ * Instantiate the public struct with all of our public information
+ * and pointers to our public functions in it
+ */
+PMIX_EXPORT pmix_ptl_usock_component_t mca_ptl_usock_component = {
+    .super = {
+        .base = {
+            PMIX_PTL_BASE_VERSION_1_0_0,
+
+            /* Component name and version */
+            .pmix_mca_component_name = "usock",
+            PMIX_MCA_BASE_MAKE_VERSION(component,
+                                       PMIX_MAJOR_VERSION,
+                                       PMIX_MINOR_VERSION,
+                                       PMIX_RELEASE_VERSION),
+
+            /* Component open and close functions */
+            .pmix_mca_open_component = component_open,
+            .pmix_mca_close_component = component_close,
+            .pmix_mca_query_component = component_query
+        },
+        .priority = 15,
+        .uri = NULL,
+        .setup_listener = setup_listener
+    },
+    .tmpdir = NULL,
+    .filename = NULL
+};
+
+static void connection_handler(int sd, short args, void *cbdata);
+static void listener_cb(int incoming_sd, void *cbdata);
+static char *sec_mode = NULL;
+
+pmix_status_t component_open(void)
+{
+    char *tdir;
+
+    memset(&mca_ptl_usock_component.connection, 0, sizeof(mca_ptl_usock_component.connection));
+
+    /* check for environ-based directives
+     * on system tmpdir to use */
+    if (NULL == (tdir = getenv("PMIX_SYSTEM_TMPDIR"))) {
+        if (NULL == (tdir = getenv("TMPDIR"))) {
+            if (NULL == (tdir = getenv("TEMP"))) {
+                if (NULL == (tdir = getenv("TMP"))) {
+                    tdir = "/tmp";
+                }
+            }
+        }
+    }
+    if (NULL != tdir) {
+        mca_ptl_usock_component.tmpdir = strdup(tdir);
+    }
+
+    return PMIX_SUCCESS;
+}
+
+
+pmix_status_t component_close(void)
+{
+    if (NULL != sec_mode) {
+        free(sec_mode);
+    }
+    if (NULL != mca_ptl_usock_component.tmpdir) {
+        free(mca_ptl_usock_component.tmpdir);
+    }
+    if (NULL != mca_ptl_usock_component.super.uri) {
+        free(mca_ptl_usock_component.super.uri);
+    }
+    if (NULL != mca_ptl_usock_component.filename) {
+        /* remove the file */
+        unlink(mca_ptl_usock_component.filename);
+        free(mca_ptl_usock_component.filename);
+    }
+
+    return PMIX_SUCCESS;
+}
+
+static int component_query(pmix_mca_base_module_t **module, int *priority)
+{
+    *module = (pmix_mca_base_module_t*)&pmix_ptl_usock_module;
+    return PMIX_SUCCESS;
+}
+
+/* if we are the server, then we need to setup a usock rendezvous
+ * point for legacy releases, but only do so if requested as some
+ * systems may not wish to support older releases. The system can,
+ * of course, simply use the MCA param method to disable this
+ * component (PMIX_MCA_ptl=^usock), or can tell us to disqualify
+ * ourselves using an info key to this API.
+ *
+ * NOTE: we accept MCA parameters, but info keys override them
+ */
+static pmix_status_t setup_listener(pmix_info_t info[], size_t ninfo,
+                                    bool *need_listener)
+{
+    int flags;
+    size_t n;
+    pmix_listener_t *lt;
+    pmix_status_t rc;
+    socklen_t addrlen;
+    struct sockaddr_un *address;
+    bool disabled = false;
+    char *secmods, **options, *pmix_pid;
+    pid_t mypid;
+
+    pmix_output_verbose(2, pmix_ptl_base_framework.framework_output,
+                        "ptl:usock setup_listener");
+
+    /* if we are not a server, then we shouldn't be doing this */
+    if (PMIX_PROC_SERVER != pmix_globals.proc_type) {
+        return PMIX_ERR_NOT_SUPPORTED;
+    }
+
+    /* scan the info keys and process any override instructions */
+    if (NULL != info) {
+        for (n=0; n < ninfo; n++) {
+            if (0 == strcmp(info[n].key, PMIX_USOCK_DISABLE)) {
+                if (PMIX_UNDEF == info[n].value.type) {
+                    disabled = true;;
+                } else {
+                    disabled = info[n].value.data.flag;
+                }
+                break;
+            }
+        }
+    }
+
+    /* see if we have been disabled */
+    if (disabled) {
+        pmix_output_verbose(2, pmix_ptl_base_framework.framework_output,
+                            "ptl:usock not available");
+        return PMIX_ERR_NOT_AVAILABLE;
+    }
+
+    pmix_output_verbose(2, pmix_ptl_base_framework.framework_output,
+                        "ptl:usock setting up listener");
+
+    addrlen = sizeof(struct sockaddr_un);
+    address = (struct sockaddr_un*)&mca_ptl_usock_component.connection;
+    address->sun_family = AF_UNIX;
+
+    /* any client we hear from will be using v1.x protocols. This
+     * means that they cannot tell us what security module they
+     * are using as this wasn't included in their handshake. So
+     * the best we can assume is that they are using the highest
+     * priority default we have */
+    secmods = pmix_psec.get_available_modules();
+    options = pmix_argv_split(secmods, ',');
+    sec_mode = strdup(options[0]);
+    pmix_argv_free(options);
+    free(secmods);
+
+    /* define the listener */
+    lt = PMIX_NEW(pmix_listener_t);
+
+    /* for now, just setup the v1.1 series rendezvous point
+     * we use the pid to reduce collisions */
+    mypid = getpid();
+    if (0 > asprintf(&pmix_pid, "%s/pmix-%d", mca_ptl_usock_component.tmpdir, mypid)) {
+        PMIX_RELEASE(lt);
+        return PMIX_ERR_NOMEM;
+    }
+    if ((strlen(pmix_pid) + 1) > sizeof(address->sun_path)-1) {
+        pmix_show_help("help-pmix-server.txt", "rnd-path-too-long", true,
+                       mca_ptl_usock_component.tmpdir, pmix_pid);
+        free(pmix_pid);
+        PMIX_RELEASE(lt);
+        return PMIX_ERR_INVALID_LENGTH;
+    }
+    snprintf(address->sun_path, sizeof(address->sun_path)-1, "%s", pmix_pid);
+    free(pmix_pid);
+    /* set the URI */
+    lt->varname = strdup("PMIX_SERVER_URI");
+    if (0 > asprintf(&lt->uri, "%s:%lu:%s", pmix_globals.myid.nspace,
+                    (unsigned long)pmix_globals.myid.rank, address->sun_path)) {
+        PMIX_RELEASE(lt);
+        return PMIX_ERR_NOMEM;
+    }
+    /* save the rendezvous filename for later removal */
+    mca_ptl_usock_component.filename = strdup(address->sun_path);
+
+    lt->protocol = PMIX_PROTOCOL_V1;
+    lt->ptl = (struct pmix_ptl_module_t*)&pmix_ptl_usock_module;
+    lt->cbfunc = connection_handler;
+    pmix_list_append(&pmix_ptl_globals.listeners, &lt->super);
+
+    /* create a listen socket for incoming connection attempts */
+    lt->socket = socket(PF_UNIX, SOCK_STREAM, 0);
+    if (lt->socket < 0) {
+        printf("%s:%d socket() failed\n", __FILE__, __LINE__);
+        goto sockerror;
+    }
+    /* Set the socket to close-on-exec so that no children inherit
+     * this FD */
+    if (pmix_fd_set_cloexec(lt->socket) != PMIX_SUCCESS) {
+        CLOSE_THE_SOCKET(lt->socket);
+        goto sockerror;
+    }
+
+    if (bind(lt->socket, (struct sockaddr*)address, addrlen) < 0) {
+        printf("%s:%d bind() failed\n", __FILE__, __LINE__);
+        CLOSE_THE_SOCKET(lt->socket);
+        goto sockerror;
+    }
+    /* chown as required */
+    if (lt->owner_given) {
+        if (0 != chown(address->sun_path, lt->owner, -1)) {
+            pmix_output(0, "CANNOT CHOWN socket %s: %s", address->sun_path, strerror (errno));
+            CLOSE_THE_SOCKET(lt->socket);
+            goto sockerror;
+        }
+    }
+    if (lt->group_given) {
+        if (0 != chown(address->sun_path, -1, lt->group)) {
+            pmix_output(0, "CANNOT CHOWN socket %s: %s", address->sun_path, strerror (errno));
+            CLOSE_THE_SOCKET(lt->socket);
+            goto sockerror;
+        }
+    }
+    /* set the mode as required */
+    if (0 != chmod(address->sun_path, lt->mode)) {
+        pmix_output(0, "CANNOT CHMOD socket %s: %s", address->sun_path, strerror (errno));
+        CLOSE_THE_SOCKET(lt->socket);
+        goto sockerror;
+    }
+
+    /* setup listen backlog to maximum allowed by kernel */
+    if (listen(lt->socket, SOMAXCONN) < 0) {
+        printf("%s:%d listen() failed\n", __FILE__, __LINE__);
+        CLOSE_THE_SOCKET(lt->socket);
+        goto sockerror;
+    }
+
+    /* set socket up to be non-blocking, otherwise accept could block */
+    if ((flags = fcntl(lt->socket, F_GETFL, 0)) < 0) {
+        printf("%s:%d fcntl(F_GETFL) failed\n", __FILE__, __LINE__);
+        CLOSE_THE_SOCKET(lt->socket);
+        goto sockerror;
+    }
+    flags |= O_NONBLOCK;
+    if (fcntl(lt->socket, F_SETFL, flags) < 0) {
+        printf("%s:%d fcntl(F_SETFL) failed\n", __FILE__, __LINE__);
+        CLOSE_THE_SOCKET(lt->socket);
+        goto sockerror;
+    }
+
+    /* if the server will listen for us, then ask it to do so now */
+    rc = PMIX_ERR_NOT_SUPPORTED;
+    if (NULL != pmix_host_server.listener) {
+        rc = pmix_host_server.listener(lt->socket, listener_cb, (void*)lt);
+    }
+
+    if (PMIX_SUCCESS != rc) {
+        *need_listener = true;
+    }
+
+    return PMIX_SUCCESS;
+
+  sockerror:
+      pmix_list_remove_item(&pmix_ptl_globals.listeners, &lt->super);
+      PMIX_RELEASE(lt);
+      return PMIX_ERROR;
+}
+
+static void listener_cb(int incoming_sd, void *cbdata)
+{
+    pmix_pending_connection_t *pending_connection;
+
+    /* throw it into our event library for processing */
+    pmix_output_verbose(8, pmix_ptl_base_framework.framework_output,
+                        "listen_cb: pushing new connection %d into evbase",
+                        incoming_sd);
+    pending_connection = PMIX_NEW(pmix_pending_connection_t);
+    pending_connection->sd = incoming_sd;
+    pmix_event_assign(&pending_connection->ev, pmix_globals.evbase, -1,
+                      EV_WRITE, connection_handler, pending_connection);
+    pmix_event_active(&pending_connection->ev, EV_WRITE, 1);
+}
+
+/* Parse init-ack message:
+ *    NSPACE<0><rank>VERSION<0>[CRED<0>]
+ */
+static pmix_status_t parse_connect_ack (char *msg, unsigned int len,
+                                        char **nspace, unsigned int *rank,
+                                        char **version, char **cred)
+{
+    unsigned int msglen;
+
+    PMIX_STRNLEN(msglen, msg, len);
+    if (msglen < len) {
+        *nspace = msg;
+        msg += strlen(*nspace) + 1;
+        len -= strlen(*nspace) + 1;
+    } else {
+        return PMIX_ERR_BAD_PARAM;
+    }
+
+    PMIX_STRNLEN(msglen, msg, len);
+    if (msglen <= len) {
+        memcpy(rank, msg, sizeof(int));
+        msg += sizeof(int);
+        len -= sizeof(int);
+    } else {
+        return PMIX_ERR_BAD_PARAM;
+    }
+
+    PMIX_STRNLEN(msglen, msg, len);
+    if (msglen < len) {
+        *version = msg;
+        msg += strlen(*version) + 1;
+        len -= strlen(*version) + 1;
+    } else {
+        return PMIX_ERR_BAD_PARAM;
+    }
+
+    PMIX_STRNLEN(msglen, msg, len);
+    if (msglen < len)
+        *cred = msg;
+    else {
+        *cred = NULL;
+    }
+
+    return PMIX_SUCCESS;
+}
+
+
+static void connection_handler(int sd, short args, void *cbdata)
+{
+    pmix_pending_connection_t *pnd = (pmix_pending_connection_t*)cbdata;
+    char *msg, *nspace, *version, *cred;
+    pmix_status_t rc;
+    unsigned int rank;
+    pmix_usock_hdr_t hdr;
+    pmix_nspace_t *nptr, *tmp;
+    pmix_rank_info_t *info;
+    pmix_peer_t *psave = NULL;
+    bool found;
+    pmix_proc_t proc;
+    size_t len;
+
+    /* acquire the object */
+    PMIX_ACQUIRE_OBJECT(pnd);
+
+    pmix_output_verbose(2, pmix_ptl_base_framework.framework_output,
+                        "USOCK CONNECTION FROM PEER ON SOCKET %d", pnd->sd);
+
+    /* ensure all is zero'd */
+    memset(&hdr, 0, sizeof(pmix_usock_hdr_t));
+
+    /* get the header */
+    if (PMIX_SUCCESS != (rc = pmix_ptl_base_recv_blocking(pnd->sd, (char*)&hdr, sizeof(pmix_usock_hdr_t)))) {
+        CLOSE_THE_SOCKET(pnd->sd);
+        PMIX_RELEASE(pnd);
+        return;
+    }
+
+    /* get the id, authentication and version payload (and possibly
+     * security credential) - to guard against potential attacks,
+     * we'll set an arbitrary limit per a define */
+    if (PMIX_MAX_CRED_SIZE < hdr.nbytes) {
+        CLOSE_THE_SOCKET(pnd->sd);
+        PMIX_RELEASE(pnd);
+        return;
+    }
+    if (NULL == (msg = (char*)malloc(hdr.nbytes))) {
+        CLOSE_THE_SOCKET(pnd->sd);
+        PMIX_RELEASE(pnd);
+        return;
+    }
+    if (PMIX_SUCCESS != pmix_ptl_base_recv_blocking(pnd->sd, msg, hdr.nbytes)) {
+        /* unable to complete the recv */
+        pmix_output_verbose(2, pmix_ptl_base_framework.framework_output,
+                            "unable to complete recv of connect-ack with client ON SOCKET %d", pnd->sd);
+        free(msg);
+        CLOSE_THE_SOCKET(pnd->sd);
+        PMIX_RELEASE(pnd);
+        return;
+    }
+
+    if (PMIX_SUCCESS != (rc = parse_connect_ack (msg, hdr.nbytes, &nspace,
+                                                 &rank, &version, &cred))) {
+        pmix_output_verbose(2, pmix_ptl_base_framework.framework_output,
+                            "error parsing connect-ack from client ON SOCKET %d", pnd->sd);
+        free(msg);
+        CLOSE_THE_SOCKET(pnd->sd);
+        PMIX_RELEASE(pnd);
+        return;
+    }
+
+    pmix_output_verbose(2, pmix_ptl_base_framework.framework_output,
+                        "connect-ack recvd from peer %s:%d:%s on socket %d",
+                        nspace, rank, version, pnd->sd);
+
+    /* do not check the version - we only retain it at this
+     * time in case we need to check it at some future date.
+     * For now, our intent is to retain backward compatibility
+     * and so we will assume that all versions are compatible. */
+
+    /* see if we know this nspace */
+    nptr = NULL;
+    PMIX_LIST_FOREACH(tmp, &pmix_globals.nspaces, pmix_nspace_t) {
+        if (0 == strcmp(tmp->nspace, nspace)) {
+            nptr = tmp;
+            break;
+        }
+    }
+    if (NULL == nptr) {
+        /* we don't know this namespace, reject it */
+        free(msg);
+        /* send an error reply to the client */
+        rc = PMIX_ERR_NOT_FOUND;
+        goto error;
+    }
+
+    /* see if we have this peer in our list */
+    info = NULL;
+    found = false;
+    PMIX_LIST_FOREACH(info, &nptr->server->ranks, pmix_rank_info_t) {
+        if (info->rank == rank) {
+            found = true;
+            break;
+        }
+    }
+    if (!found) {
+        /* rank unknown, reject it */
+        free(msg);
+        /* send an error reply to the client */
+        rc = PMIX_ERR_NOT_FOUND;
+        goto error;
+    }
+    /* a peer can connect on multiple sockets since it can fork/exec
+     * a child that also calls PMIx_Init, so add it here if necessary.
+     * Create the tracker for this peer */
+    psave = PMIX_NEW(pmix_peer_t);
+    if (NULL == psave) {
+        free(msg);
+        rc = PMIX_ERR_NOMEM;
+        goto error;
+    }
+    PMIX_RETAIN(info);
+    psave->info = info;
+    info->proc_cnt++; /* increase number of processes on this rank */
+    psave->sd = pnd->sd;
+    if (0 > (psave->index = pmix_pointer_array_add(&pmix_server_globals.clients, psave))) {
+        free(msg);
+        info->proc_cnt--;
+        PMIX_RELEASE(info);
+        PMIX_RELEASE(psave);
+        /* probably cannot send an error reply if we are out of memory */
+        CLOSE_THE_SOCKET(pnd->sd);
+        PMIX_RELEASE(pnd);
+        return;
+    }
+
+    /* get the appropriate compatibility modules */
+    if (PMIX_SUCCESS != pmix_psec.assign_module((struct pmix_peer_t*)psave, sec_mode)) {
+        free(msg);
+        info->proc_cnt--;
+        PMIX_RELEASE(info);
+        PMIX_RELEASE(psave);
+        pmix_pointer_array_set_item(&pmix_server_globals.clients, psave->index, NULL);
+        /* send an error reply to the client */
+        goto error;
+    }
+    /* the choice of PTL module was obviously made by the connecting
+     * tool as we received this request via that channel, so simply
+     * record it here for future use */
+    psave->compat.ptl = &pmix_ptl_usock_module;
+
+    /* validate the connection */
+    if (NULL == cred) {
+        len = 0;
+    } else {
+        len = strlen(cred);
+    }
+    if (PMIX_SUCCESS != (rc = pmix_psec.validate_connection((struct pmix_peer_t*)psave,
+                                                            PMIX_PROTOCOL_V1, cred, len))) {
+        pmix_output_verbose(2, pmix_ptl_base_framework.framework_output,
+                            "validation of client credentials failed: %s",
+                            PMIx_Error_string(rc));
+        free(msg);
+        info->proc_cnt--;
+        PMIX_RELEASE(info);
+        PMIX_RELEASE(psave);
+        pmix_pointer_array_set_item(&pmix_server_globals.clients, psave->index, NULL);
+        /* send an error reply to the client */
+        goto error;
+    }
+    free(msg);
+
+    /* send them success */
+    rc = PMIX_SUCCESS;
+    if (PMIX_SUCCESS != (rc = pmix_ptl_base_send_blocking(pnd->sd, (char*)&rc, sizeof(int)))) {
+        PMIX_ERROR_LOG(rc);
+        info->proc_cnt--;
+        PMIX_RELEASE(info);
+        pmix_pointer_array_set_item(&pmix_server_globals.clients, psave->index, NULL);
+        PMIX_RELEASE(psave);
+        CLOSE_THE_SOCKET(pnd->sd);
+        PMIX_RELEASE(pnd);
+        return;
+    }
+
+    /* send the client's array index */
+    if (PMIX_SUCCESS != (rc = pmix_ptl_base_send_blocking(pnd->sd, (char*)&psave->index, sizeof(int)))) {
+        PMIX_ERROR_LOG(rc);
+        info->proc_cnt--;
+        PMIX_RELEASE(info);
+        pmix_pointer_array_set_item(&pmix_server_globals.clients, psave->index, NULL);
+        PMIX_RELEASE(psave);
+        CLOSE_THE_SOCKET(pnd->sd);
+        PMIX_RELEASE(pnd);
+        return;
+    }
+
+    pmix_output_verbose(2, pmix_ptl_base_framework.framework_output,
+                        "connect-ack from client completed");
+
+    /* let the host server know that this client has connected */
+    if (NULL != pmix_host_server.client_connected) {
+        (void)strncpy(proc.nspace, psave->info->nptr->nspace, PMIX_MAX_NSLEN);
+        proc.rank = psave->info->rank;
+        rc = pmix_host_server.client_connected(&proc, psave->info->server_object, NULL, NULL);
+        if (PMIX_SUCCESS != rc) {
+            PMIX_ERROR_LOG(rc);
+            info->proc_cnt--;
+            PMIX_RELEASE(info);
+            pmix_pointer_array_set_item(&pmix_server_globals.clients, psave->index, NULL);
+            PMIX_RELEASE(psave);
+            CLOSE_THE_SOCKET(pnd->sd);
+        }
+    }
+
+    /* start the events for this client */
+    pmix_event_assign(&psave->recv_event, pmix_globals.evbase, pnd->sd,
+                      EV_READ|EV_PERSIST, pmix_ptl_base_recv_handler, psave);
+    pmix_event_add(&psave->recv_event, NULL);
+    psave->recv_ev_active = true;
+    pmix_event_assign(&psave->send_event, pmix_globals.evbase, pnd->sd,
+                      EV_WRITE|EV_PERSIST, pmix_ptl_base_send_handler, psave);
+    pmix_output_verbose(2, pmix_ptl_base_framework.framework_output,
+                        "pmix:server client %s:%u has connected on socket %d",
+                        psave->info->nptr->nspace, psave->info->rank, psave->sd);
+
+    PMIX_RELEASE(pnd);
+    return;
+
+  error:
+    /* send an error reply to the client */
+    if (PMIX_SUCCESS != pmix_ptl_base_send_blocking(pnd->sd, (char*)&rc, sizeof(int))) {
+        PMIX_ERROR_LOG(rc);
+    }
+    CLOSE_THE_SOCKET(pnd->sd);
+    PMIX_RELEASE(pnd);
+    return;
+}
diff --git a/src/runtime/Makefile.include b/src/runtime/Makefile.include
new file mode 100644
index 0000000..9c1c170
--- /dev/null
+++ b/src/runtime/Makefile.include
@@ -0,0 +1,36 @@
+# -*- makefile -*-
+#
+# Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2012      Los Alamos National Security, LLC.
+#                         All rights reserved.
+# Copyright (c) 2014-2016 Intel, Inc. All rights reserved
+# Copyright (c) 2014      Cisco Systems, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# This makefile.am does not stand on its own - it is included from src/Makefile.am
+
+dist_pmixdata_DATA += runtime/help-pmix-runtime.txt
+
+headers += \
+        runtime/pmix_rte.h \
+        runtime/pmix_progress_threads.h
+
+libpmix_la_SOURCES += \
+        runtime/pmix_finalize.c \
+        runtime/pmix_init.c \
+        runtime/pmix_params.c \
+        runtime/pmix_progress_threads.c
diff --git a/src/runtime/help-pmix-runtime.txt b/src/runtime/help-pmix-runtime.txt
new file mode 100644
index 0000000..3f78275
--- /dev/null
+++ b/src/runtime/help-pmix-runtime.txt
@@ -0,0 +1,42 @@
+# -*- text -*-
+#
+# Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2011      Oak Ridge National Labs.  All rights reserved.
+# Copyright (c) 2014 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2017      Intel, Inc. All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+# This is the US/English general help file for PMIX.
+#
+[pmix_init:startup:internal-failure]
+It looks like pmix_init failed for some reason; your parallel process is
+likely to abort.  There are many reasons that a parallel process can
+fail during pmix_init; some of which are due to configuration or
+environment problems.  This failure appears to be an internal failure;
+here's some additional information (which may only be relevant to an
+PMIX developer):
+
+  %s failed
+  --> Returned value %d instead of PMIX_SUCCESS
+#
+[missingdata]
+PMIx has detected that the host RM failed to provide all the job-level
+information specified by the PMIx standard. This is not necessarily
+a fatal situation, but may negatively impact your launch performance.
+
+If you feel you have received this warning in error, or wish to ignore
+it in the future, you can disable it by setting the PMIx MCA parameter
+"pmix_suppress_missing_data_warning=1"
diff --git a/src/runtime/pmix_finalize.c b/src/runtime/pmix_finalize.c
new file mode 100644
index 0000000..4caeea2
--- /dev/null
+++ b/src/runtime/pmix_finalize.c
@@ -0,0 +1,130 @@
+/*
+ * Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2005 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2008-2015 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2010-2015 Los Alamos National Security, LLC.
+ *                         All rights reserved.
+ * Copyright (c) 2013-2017 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2016      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+/** @file **/
+
+#include <src/include/pmix_config.h>
+
+#include "src/class/pmix_object.h"
+#include "src/client/pmix_client_ops.h"
+#include "src/util/output.h"
+#include "src/util/keyval_parse.h"
+#include "src/util/show_help.h"
+#include "src/mca/base/base.h"
+#include "src/mca/base/pmix_mca_base_var.h"
+#include "src/mca/pif/base/base.h"
+#include "src/mca/pinstalldirs/base/base.h"
+#include "src/mca/pnet/base/base.h"
+#include "src/mca/psec/base/base.h"
+#include "src/mca/ptl/base/base.h"
+#include "src/dstore/pmix_dstore.h"
+#include PMIX_EVENT_HEADER
+
+#include "src/runtime/pmix_rte.h"
+#include "src/runtime/pmix_progress_threads.h"
+
+extern int pmix_initialized;
+extern bool pmix_init_called;
+
+static void __pmix_attribute_destructor__ pmix_cleanup (void)
+{
+    if (!pmix_initialized) {
+        /* nothing to do */
+        return;
+    }
+
+    /* finalize the class/object system */
+    pmix_class_finalize();
+}
+
+void pmix_rte_finalize(void)
+{
+    if( --pmix_initialized != 0 ) {
+        if( pmix_initialized < 0 ) {
+            fprintf(stderr, "PMIx Finalize called too many times\n");
+            return;
+        }
+        return;
+    }
+
+    /* cleanup communications */
+    (void)pmix_mca_base_framework_close(&pmix_ptl_base_framework);
+    #if defined(PMIX_ENABLE_DSTORE) && (PMIX_ENABLE_DSTORE == 1)
+        pmix_dstore_finalize();
+    #endif /* PMIX_ENABLE_DSTORE */
+
+    /* close the security framework */
+    (void)pmix_mca_base_framework_close(&pmix_psec_base_framework);
+
+    /* close the pnet framework */
+    (void)pmix_mca_base_framework_close(&pmix_pnet_base_framework);
+
+    /* finalize the mca */
+    /* Clear out all the registered MCA params */
+    pmix_deregister_params();
+    pmix_mca_base_var_finalize();
+
+    /* keyval lex-based parser */
+    pmix_util_keyval_parse_finalize();
+
+    (void)pmix_mca_base_framework_close(&pmix_pinstalldirs_base_framework);
+    (void)pmix_mca_base_framework_close(&pmix_pif_base_framework);
+    (void)pmix_mca_base_close();
+
+    /* finalize the show_help system */
+    pmix_show_help_finalize();
+
+    /* finalize the output system.  This has to come *after* the
+       malloc code, as the malloc code needs to call into this, but
+       the malloc code turning off doesn't affect pmix_output that
+       much */
+    pmix_output_finalize();
+
+    /* close the bfrops */
+    pmix_bfrop_close();
+
+    /* clean out the globals */
+    PMIX_RELEASE(pmix_globals.mypeer);
+    PMIX_LIST_DESTRUCT(&pmix_globals.nspaces);
+    if (NULL != pmix_globals.cache_local) {
+        PMIX_RELEASE(pmix_globals.cache_local);
+    }
+    if (NULL != pmix_globals.cache_remote) {
+        PMIX_RELEASE(pmix_globals.cache_remote);
+    }
+    PMIX_DESTRUCT(&pmix_globals.events);
+    PMIX_LIST_DESTRUCT(&pmix_globals.cached_events);
+    PMIX_DESTRUCT(&pmix_globals.notifications);
+
+    /* now safe to release the event base */
+    if (!pmix_globals.external_evbase) {
+        (void)pmix_progress_thread_stop(NULL);
+    }
+
+
+#if PMIX_NO_LIB_DESTRUCTOR
+    pmix_cleanup();
+#endif
+
+}
diff --git a/src/runtime/pmix_init.c b/src/runtime/pmix_init.c
new file mode 100644
index 0000000..0249279
--- /dev/null
+++ b/src/runtime/pmix_init.c
@@ -0,0 +1,255 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2005 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2007-2012 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2007      Sun Microsystems, Inc.  All rights reserved.
+ * Copyright (c) 2009      Oak Ridge National Labs.  All rights reserved.
+ * Copyright (c) 2010-2015 Los Alamos National Security, LLC.
+ *                         All rights reserved.
+ * Copyright (c) 2013-2017 Intel, Inc. All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+/** @file **/
+
+#include <src/include/pmix_config.h>
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#include PMIX_EVENT_HEADER
+#include "event2/thread.h"
+
+#include <pmix_rename.h>
+
+#include "src/util/output.h"
+#include "src/util/show_help.h"
+#include "src/mca/base/base.h"
+#include "src/mca/base/pmix_mca_base_var.h"
+#include "src/mca/pif/base/base.h"
+#include "src/mca/pinstalldirs/base/base.h"
+#include "src/mca/pnet/base/base.h"
+#include "src/mca/psec/base/base.h"
+#include "src/mca/ptl/base/base.h"
+
+#include "src/event/pmix_event.h"
+#include "src/include/types.h"
+#include "src/util/error.h"
+#include "src/util/keyval_parse.h"
+#include "src/buffer_ops/buffer_ops.h"
+
+#include "src/runtime/pmix_rte.h"
+#include "src/runtime/pmix_progress_threads.h"
+
+#if PMIX_CC_USE_PRAGMA_IDENT
+#pragma ident PMIX_IDENT_STRING
+#elif PMIX_CC_USE_IDENT
+#ident PMIX_IDENT_STRING
+#endif
+const char pmix_version_string[] = PMIX_IDENT_STRING;
+
+int pmix_initialized = 0;
+bool pmix_init_called = false;
+/* we have to export the pmix_globals object so
+ * all plugins can access it. However, it is included
+ * in the pmix_rename.h file for external protection */
+PMIX_EXPORT pmix_globals_t pmix_globals = {
+    .init_cntr = 0,
+    .mypeer = NULL,
+    .proc_type = PMIX_PROC_UNDEF,
+    .pindex = 0,
+    .evbase = NULL,
+    .external_evbase = false,
+    .debug_output = -1,
+    .connected = false,
+    .cache_local = NULL,
+    .cache_remote = NULL
+};
+
+
+int pmix_rte_init(pmix_proc_type_t type,
+                  pmix_info_t info[], size_t ninfo,
+                  pmix_ptl_cbfunc_t cbfunc)
+{
+    int ret, debug_level;
+    char *error = NULL, *evar;
+    size_t n;
+
+    if( ++pmix_initialized != 1 ) {
+        if( pmix_initialized < 1 ) {
+            return PMIX_ERROR;
+        }
+        return PMIX_SUCCESS;
+    }
+
+    #if PMIX_NO_LIB_DESTRUCTOR
+        if (pmix_init_called) {
+            /* can't use show_help here */
+            fprintf (stderr, "pmix_init: attempted to initialize after finalize without compiler "
+                     "support for either __attribute__(destructor) or linker support for -fini -- process "
+                     "will likely abort\n");
+            return PMIX_ERR_NOT_SUPPORTED;
+        }
+    #endif
+
+    pmix_init_called = true;
+
+    /* initialize the output system */
+    if (!pmix_output_init()) {
+        return PMIX_ERROR;
+    }
+
+    /* initialize install dirs code */
+    if (PMIX_SUCCESS != (ret = pmix_mca_base_framework_open(&pmix_pinstalldirs_base_framework, 0))) {
+        fprintf(stderr, "pmix_pinstalldirs_base_open() failed -- process will likely abort (%s:%d, returned %d instead of PMIX_SUCCESS)\n",
+                __FILE__, __LINE__, ret);
+        return ret;
+    }
+
+    /* initialize the help system */
+    pmix_show_help_init();
+
+    /* keyval lex-based parser */
+    if (PMIX_SUCCESS != (ret = pmix_util_keyval_parse_init())) {
+        error = "pmix_util_keyval_parse_init";
+        goto return_error;
+    }
+
+    /* Setup the parameter system */
+    if (PMIX_SUCCESS != (ret = pmix_mca_base_var_init())) {
+        error = "mca_base_var_init";
+        goto return_error;
+    }
+
+    /* register params for pmix */
+    if (PMIX_SUCCESS != (ret = pmix_register_params())) {
+        error = "pmix_register_params";
+        goto return_error;
+    }
+
+    /* initialize the mca */
+    if (PMIX_SUCCESS != (ret = pmix_mca_base_open())) {
+        error = "mca_base_open";
+        goto return_error;
+    }
+
+    /* setup the globals structure */
+    pmix_globals.proc_type = type;
+    memset(&pmix_globals.myid, 0, sizeof(pmix_proc_t));
+    PMIX_CONSTRUCT(&pmix_globals.nspaces, pmix_list_t);
+    PMIX_CONSTRUCT(&pmix_globals.events, pmix_events_t);
+    pmix_globals.event_window.tv_sec = pmix_event_caching_window;
+    pmix_globals.event_window.tv_usec = 0;
+    PMIX_CONSTRUCT(&pmix_globals.cached_events, pmix_list_t);
+    /* construct the global notification ring buffer */
+    PMIX_CONSTRUCT(&pmix_globals.notifications, pmix_ring_buffer_t);
+    pmix_ring_buffer_init(&pmix_globals.notifications, 256);
+
+    /* get our effective id's */
+    pmix_globals.uid = geteuid();
+    pmix_globals.gid = getegid();
+    /* see if debug is requested */
+    if (NULL != (evar = getenv("PMIX_DEBUG"))) {
+        debug_level = strtol(evar, NULL, 10);
+        pmix_globals.debug_output = pmix_output_open(NULL);
+        pmix_output_set_verbosity(pmix_globals.debug_output, debug_level);
+    }
+    /* create our peer object */
+    pmix_globals.mypeer = PMIX_NEW(pmix_peer_t);
+    if (NULL == pmix_globals.mypeer) {
+        ret = PMIX_ERR_NOMEM;
+        goto return_error;
+    }
+
+    /* scan incoming info for directives */
+    if (NULL != info) {
+        for (n=0; n < ninfo; n++) {
+            if (0 == strcmp(PMIX_EVENT_BASE, info[n].key)) {
+                pmix_globals.evbase = (pmix_event_base_t*)info[n].value.data.ptr;
+                pmix_globals.external_evbase = true;
+            }
+        }
+    }
+    pmix_bfrop_open();
+
+    /* the choice of modules to use when communicating with a peer
+     * will be done by the individual init functions and at the
+     * time of connection to that peer */
+
+    /* open the ptl and select the active plugins */
+    if( PMIX_SUCCESS != (ret = pmix_mca_base_framework_open(&pmix_ptl_base_framework, 0)) ) {
+        error = "pmix_ptl_base_open";
+        goto return_error;
+    }
+    if( PMIX_SUCCESS != (ret = pmix_ptl_base_select()) ) {
+        error = "pmix_ptl_base_select";
+        goto return_error;
+    }
+    /* set the notification callback function */
+    if (PMIX_SUCCESS != (ret = pmix_ptl.set_notification_cbfunc(cbfunc))) {
+        error = "pmix_ptl_set_notification_cbfunc";
+        goto return_error;
+    }
+
+    /* open the psec and select the active plugins */
+    if (PMIX_SUCCESS != (ret = pmix_mca_base_framework_open(&pmix_psec_base_framework, 0))) {
+        error = "pmix_psec_base_open";
+        goto return_error;
+    }
+    if (PMIX_SUCCESS != (ret = pmix_psec_base_select())) {
+        error = "pmix_psec_base_select";
+        goto return_error;
+    }
+
+    /* initialize pif framework */
+    if (PMIX_SUCCESS != (ret = pmix_mca_base_framework_open(&pmix_pif_base_framework, 0))) {
+        error = "pmix_pif_base_open";
+        return ret;
+    }
+
+    /* open the pnet and select the active modules for this environment */
+    if (PMIX_SUCCESS != (ret = pmix_mca_base_framework_open(&pmix_pnet_base_framework, 0))) {
+        error = "pmix_pnet_base_open";
+        goto return_error;
+    }
+    if (PMIX_SUCCESS != (ret = pmix_pnet_base_select())) {
+        error = "pmix_pnet_base_select";
+        goto return_error;
+    }
+
+    /* tell libevent that we need thread support */
+    pmix_event_use_threads();
+
+    /* if an external event base wasn't provide, create one */
+    if (!pmix_globals.external_evbase) {
+        /* create an event base and progress thread for us */
+        if (NULL == (pmix_globals.evbase = pmix_progress_thread_init(NULL))) {
+            error = "progress thread";
+            ret = PMIX_ERROR;
+            goto return_error;
+        }
+    }
+
+    return PMIX_SUCCESS;
+
+ return_error:
+    pmix_show_help( "help-pmix-runtime.txt",
+                    "pmix_init:startup:internal-failure", true,
+                    error, ret );
+    return ret;
+}
diff --git a/src/runtime/pmix_params.c b/src/runtime/pmix_params.c
new file mode 100644
index 0000000..c0a40f9
--- /dev/null
+++ b/src/runtime/pmix_params.c
@@ -0,0 +1,117 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2014 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2006      Los Alamos National Security, LLC.  All rights
+ *                         reserved.
+ * Copyright (c) 2008-2015 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2009      Oak Ridge National Labs.  All rights reserved.
+ * Copyright (c) 2010-2014 Los Alamos National Security, LLC.
+ *                         All rights reserved.
+ * Copyright (c) 2014      Hochschule Esslingen.  All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2015      Mellanox Technologies, Inc.
+ *                         All rights reserved.
+ * Copyright (c) 2016-2017 Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include "pmix_config.h"
+
+#include "src/include/types.h"
+#include "src/mca/base/pmix_mca_base_var.h"
+#include "src/runtime/pmix_rte.h"
+#include "src/util/timings.h"
+
+#if PMIX_ENABLE_TIMING
+char *pmix_timing_output = NULL;
+bool pmix_timing_overhead = true;
+#endif
+
+static bool pmix_register_done = false;
+char *pmix_net_private_ipv4 = NULL;
+int pmix_event_caching_window = 1;
+bool pmix_suppress_missing_data_warning = false;
+
+pmix_status_t pmix_register_params(void)
+{
+    int ret;
+
+    if (pmix_register_done) {
+        return PMIX_SUCCESS;
+    }
+
+    pmix_register_done = true;
+
+#if PMIX_ENABLE_TIMING
+    pmix_timing_output = NULL;
+    (void) pmix_mca_base_var_register ("pmix", "pmix", NULL, "timing_output",
+                                  "The name of output file for timing information. If this parameter is not set then output will be directed into PMIX debug channel.",
+                                  PMIX_MCA_BASE_VAR_TYPE_STRING, NULL, 0, 0,
+                                  PMIX_INFO_LVL_9, PMIX_MCA_BASE_VAR_SCOPE_ALL,
+                                  &pmix_timing_output);
+
+    pmix_timing_overhead = true;
+    (void) pmix_mca_base_var_register ("pmix", "pmix", NULL, "timing_overhead",
+                                  "Timing framework introduce additional overhead (malloc's mostly)."
+                                  " The time spend in such costly routines is measured and may be accounted"
+                                  " (subtracted from timestamps). 'true' means consider overhead, 'false' - ignore (default: true).",
+                                  PMIX_MCA_BASE_VAR_TYPE_BOOL, NULL, 0, 0,
+                                  PMIX_INFO_LVL_9, PMIX_MCA_BASE_VAR_SCOPE_ALL,
+                                  &pmix_timing_overhead);
+#endif
+
+    /* RFC1918 defines
+       - 10.0.0./8
+       - 172.16.0.0/12
+       - 192.168.0.0/16
+
+       RFC3330 also mentions
+       - 169.254.0.0/16 for DHCP onlink iff there's no DHCP server
+    */
+    pmix_net_private_ipv4 = "10.0.0.0/8;172.16.0.0/12;192.168.0.0/16;169.254.0.0/16";
+    ret = pmix_mca_base_var_register ("pmix", "pmix", "net", "private_ipv4",
+                                      "Semicolon-delimited list of CIDR notation entries specifying what networks are considered \"private\" (default value based on RFC1918 and RFC3330)",
+                                      PMIX_MCA_BASE_VAR_TYPE_STRING, NULL, 0, PMIX_MCA_BASE_VAR_FLAG_SETTABLE,
+                                      PMIX_INFO_LVL_3, PMIX_MCA_BASE_VAR_SCOPE_ALL_EQ,
+                                      &pmix_net_private_ipv4);
+    if (0 > ret) {
+        return ret;
+    }
+
+    (void) pmix_mca_base_var_register ("pmix", "pmix", NULL, "event_caching_window",
+                                  "Time (in seconds) to aggregate events before reporting them - this "
+                                  "suppresses event cascades when processes abnormally terminate",
+                                  PMIX_MCA_BASE_VAR_TYPE_INT, NULL, 0, 0,
+                                  PMIX_INFO_LVL_1, PMIX_MCA_BASE_VAR_SCOPE_ALL,
+                                  &pmix_event_caching_window);
+
+    (void) pmix_mca_base_var_register ("pmix", "pmix", NULL, "suppress_missing_data_warning",
+                                  "Suppress warning that PMIx is missing job-level data that "
+                                  "is supposed to be provided by the host RM.",
+                                  PMIX_MCA_BASE_VAR_TYPE_BOOL, NULL, 0, 0,
+                                  PMIX_INFO_LVL_1, PMIX_MCA_BASE_VAR_SCOPE_ALL,
+                                  &pmix_suppress_missing_data_warning);
+
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_deregister_params(void)
+{
+    pmix_register_done = false;
+
+    return PMIX_SUCCESS;
+}
diff --git a/src/runtime/pmix_progress_threads.c b/src/runtime/pmix_progress_threads.c
new file mode 100644
index 0000000..df0af87
--- /dev/null
+++ b/src/runtime/pmix_progress_threads.c
@@ -0,0 +1,328 @@
+/*
+ * Copyright (c) 2014-2017 Intel, Inc. All rights reserved.
+ * Copyright (c) 2015      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2017      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+#include "src/include/types.h"
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#include <string.h>
+#include <pthread.h>
+#include PMIX_EVENT_HEADER
+
+#include "src/class/pmix_list.h"
+#include "src/threads/threads.h"
+#include "src/util/error.h"
+#include "src/util/fd.h"
+
+#include "src/runtime/pmix_progress_threads.h"
+
+
+/* create a tracking object for progress threads */
+typedef struct {
+    pmix_list_item_t super;
+
+    int refcount;
+    char *name;
+
+    pmix_event_base_t *ev_base;
+
+    /* This will be set to false when it is time for the progress
+       thread to exit */
+    volatile bool ev_active;
+
+    /* This event will always be set on the ev_base (so that the
+       ev_base is not empty!) */
+    pmix_event_t block;
+
+    bool engine_constructed;
+    pmix_thread_t engine;
+} pmix_progress_tracker_t;
+
+static void tracker_constructor(pmix_progress_tracker_t *p)
+{
+    p->refcount = 1;  // start at one since someone created it
+    p->name = NULL;
+    p->ev_base = NULL;
+    p->ev_active = false;
+    p->engine_constructed = false;
+}
+
+static void tracker_destructor(pmix_progress_tracker_t *p)
+{
+    pmix_event_del(&p->block);
+
+    if (NULL != p->name) {
+        free(p->name);
+    }
+    if (NULL != p->ev_base) {
+        pmix_event_base_free(p->ev_base);
+    }
+    if (p->engine_constructed) {
+        PMIX_DESTRUCT(&p->engine);
+    }
+}
+
+static PMIX_CLASS_INSTANCE(pmix_progress_tracker_t,
+                          pmix_list_item_t,
+                          tracker_constructor,
+                          tracker_destructor);
+
+static bool inited = false;
+static pmix_list_t tracking;
+static struct timeval long_timeout = {
+    .tv_sec = 3600,
+    .tv_usec = 0
+};
+static const char *shared_thread_name = "PMIX-wide async progress thread";
+
+/*
+ * If this event is fired, just restart it so that this event base
+ * continues to have something to block on.
+ */
+static void dummy_timeout_cb(int fd, short args, void *cbdata)
+{
+    pmix_progress_tracker_t *trk = (pmix_progress_tracker_t*)cbdata;
+
+    pmix_event_add(&trk->block, &long_timeout);
+}
+
+/*
+ * Main for the progress thread
+ */
+static void* progress_engine(pmix_object_t *obj)
+{
+    pmix_thread_t *t = (pmix_thread_t*)obj;
+    pmix_progress_tracker_t *trk = (pmix_progress_tracker_t*)t->t_arg;
+
+    while (trk->ev_active) {
+        pmix_event_loop(trk->ev_base, PMIX_EVLOOP_ONCE);
+    }
+
+    return PMIX_THREAD_CANCELLED;
+}
+
+static void stop_progress_engine(pmix_progress_tracker_t *trk)
+{
+    assert(trk->ev_active);
+    trk->ev_active = false;
+
+    /* break the event loop - this will cause the loop to exit upon
+       completion of any current event */
+    pmix_event_base_loopbreak(trk->ev_base);
+
+    pmix_thread_join(&trk->engine, NULL);
+}
+
+static int start_progress_engine(pmix_progress_tracker_t *trk)
+{
+    assert(!trk->ev_active);
+    trk->ev_active = true;
+
+    /* fork off a thread to progress it */
+    trk->engine.t_run = progress_engine;
+    trk->engine.t_arg = trk;
+
+    int rc = pmix_thread_start(&trk->engine);
+    if (PMIX_SUCCESS != rc) {
+        PMIX_ERROR_LOG(rc);
+    }
+
+    return rc;
+}
+
+pmix_event_base_t *pmix_progress_thread_init(const char *name)
+{
+    pmix_progress_tracker_t *trk;
+    int rc;
+
+    if (!inited) {
+        PMIX_CONSTRUCT(&tracking, pmix_list_t);
+        inited = true;
+    }
+
+    if (NULL == name) {
+        name = shared_thread_name;
+    }
+
+    /* check if we already have this thread */
+    PMIX_LIST_FOREACH(trk, &tracking, pmix_progress_tracker_t) {
+        if (0 == strcmp(name, trk->name)) {
+            /* we do, so up the refcount on it */
+            ++trk->refcount;
+            /* return the existing base */
+            return trk->ev_base;
+        }
+    }
+
+    trk = PMIX_NEW(pmix_progress_tracker_t);
+    if (NULL == trk) {
+        PMIX_ERROR_LOG(PMIX_ERR_OUT_OF_RESOURCE);
+        return NULL;
+    }
+
+    trk->name = strdup(name);
+    if (NULL == trk->name) {
+        PMIX_ERROR_LOG(PMIX_ERR_OUT_OF_RESOURCE);
+        PMIX_RELEASE(trk);
+        return NULL;
+    }
+
+    if (NULL == (trk->ev_base = pmix_event_base_create())) {
+        PMIX_ERROR_LOG(PMIX_ERR_OUT_OF_RESOURCE);
+        PMIX_RELEASE(trk);
+        return NULL;
+    }
+
+    /* add an event to the new event base (if there are no events,
+       pmix_event_loop() will return immediately) */
+    pmix_event_assign(&trk->block, trk->ev_base, -1, PMIX_EV_PERSIST,
+                   dummy_timeout_cb, trk);
+    pmix_event_add(&trk->block, &long_timeout);
+
+    /* construct the thread object */
+    PMIX_CONSTRUCT(&trk->engine, pmix_thread_t);
+    trk->engine_constructed = true;
+    if (PMIX_SUCCESS != (rc = start_progress_engine(trk))) {
+        PMIX_ERROR_LOG(rc);
+        PMIX_RELEASE(trk);
+        return NULL;
+    }
+    pmix_list_append(&tracking, &trk->super);
+
+    return trk->ev_base;
+}
+
+int pmix_progress_thread_stop(const char *name)
+{
+    pmix_progress_tracker_t *trk;
+
+    if (!inited) {
+        /* nothing we can do */
+        return PMIX_ERR_NOT_FOUND;
+    }
+
+    if (NULL == name) {
+        name = shared_thread_name;
+    }
+
+    /* find the specified engine */
+    PMIX_LIST_FOREACH(trk, &tracking, pmix_progress_tracker_t) {
+        if (0 == strcmp(name, trk->name)) {
+            /* decrement the refcount */
+            --trk->refcount;
+
+            /* If the refcount is still above 0, we're done here */
+            if (trk->refcount > 0) {
+                return PMIX_SUCCESS;
+            }
+
+            /* If the progress thread is active, stop it */
+            if (trk->ev_active) {
+                stop_progress_engine(trk);
+            }
+            pmix_list_remove_item(&tracking, &trk->super);
+            PMIX_RELEASE(trk);
+            return PMIX_SUCCESS;
+        }
+    }
+
+    return PMIX_ERR_NOT_FOUND;
+}
+
+int pmix_progress_thread_finalize(const char *name)
+{
+    pmix_progress_tracker_t *trk;
+
+    if (!inited) {
+        /* nothing we can do */
+        return PMIX_ERR_NOT_FOUND;
+    }
+
+    if (NULL == name) {
+        name = shared_thread_name;
+    }
+
+    /* find the specified engine */
+    PMIX_LIST_FOREACH(trk, &tracking, pmix_progress_tracker_t) {
+        if (0 == strcmp(name, trk->name)) {
+            /* If the refcount is still above 0, we're done here */
+            if (trk->refcount > 0) {
+                return PMIX_SUCCESS;
+            }
+
+            pmix_list_remove_item(&tracking, &trk->super);
+            PMIX_RELEASE(trk);
+            return PMIX_SUCCESS;
+        }
+    }
+
+    return PMIX_ERR_NOT_FOUND;
+}
+
+/*
+ * Stop the progress thread, but don't delete the tracker (or event base)
+ */
+int pmix_progress_thread_pause(const char *name)
+{
+    pmix_progress_tracker_t *trk;
+
+    if (!inited) {
+        /* nothing we can do */
+        return PMIX_ERR_NOT_FOUND;
+    }
+
+    if (NULL == name) {
+        name = shared_thread_name;
+    }
+
+    /* find the specified engine */
+    PMIX_LIST_FOREACH(trk, &tracking, pmix_progress_tracker_t) {
+        if (0 == strcmp(name, trk->name)) {
+            if (trk->ev_active) {
+                stop_progress_engine(trk);
+            }
+
+            return PMIX_SUCCESS;
+        }
+    }
+
+    return PMIX_ERR_NOT_FOUND;
+}
+
+int pmix_progress_thread_resume(const char *name)
+{
+    pmix_progress_tracker_t *trk;
+
+    if (!inited) {
+        /* nothing we can do */
+        return PMIX_ERR_NOT_FOUND;
+    }
+
+    if (NULL == name) {
+        name = shared_thread_name;
+    }
+
+    /* find the specified engine */
+    PMIX_LIST_FOREACH(trk, &tracking, pmix_progress_tracker_t) {
+        if (0 == strcmp(name, trk->name)) {
+            if (trk->ev_active) {
+                return PMIX_ERR_RESOURCE_BUSY;
+            }
+
+            return start_progress_engine(trk);
+        }
+    }
+
+    return PMIX_ERR_NOT_FOUND;
+}
diff --git a/src/runtime/pmix_progress_threads.h b/src/runtime/pmix_progress_threads.h
new file mode 100644
index 0000000..1dfb1df
--- /dev/null
+++ b/src/runtime/pmix_progress_threads.h
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2014-2017 Intel, Inc. All rights reserved.
+ * Copyright (c) 2015      Cisco Systems, Inc.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#ifndef PMIX_PROGRESS_THREADS_H
+#define PMIX_PROGRESS_THREADS_H
+
+#include "pmix_config.h"
+
+#include <pthread.h>
+#include PMIX_EVENT_HEADER
+
+#include "src/include/types.h"
+
+/**
+ * Initialize a progress thread name; if a progress thread is not
+ * already associated with that name, start a progress thread.
+ *
+ * If you have general events that need to run in *a* progress thread
+ * (but not necessarily a your own, dedicated progress thread), pass
+ * NULL the "name" argument to the pmix_progress_thead_init() function
+ * to glom on to the general PMIX-wide progress thread.
+ *
+ * If a name is passed that was already used in a prior call to
+ * pmix_progress_thread_init(), the event base associated with that
+ * already-running progress thread will be returned (i.e., no new
+ * progress thread will be started).
+ */
+pmix_event_base_t *pmix_progress_thread_init(const char *name);
+
+/**
+ * Stop a progress thread name (reference counted).
+ *
+ * Once this function is invoked as many times as
+ * pmix_progress_thread_init() was invoked on this name (or NULL), the
+ * progress function is shut down.
+ * it is destroyed.
+ *
+ * Will return PMIX_ERR_NOT_FOUND if the progress thread name does not
+ * exist; PMIX_SUCCESS otherwise.
+ */
+int pmix_progress_thread_stop(const char *name);
+
+/**
+ * Finalize a progress thread name (reference counted).
+ *
+ * Once this function is invoked after pmix_progress_thread_stop() has been called
+ * as many times as pmix_progress_thread_init() was invoked on this name (or NULL),
+ * the event base associated with it is destroyed.
+ *
+ * Will return PMIX_ERR_NOT_FOUND if the progress thread name does not
+ * exist; PMIX_SUCCESS otherwise.
+ */
+int pmix_progress_thread_finalize(const char *name);
+
+/**
+ * Temporarily pause the progress thread associated with this name.
+ *
+ * This function does not destroy the event base associated with this
+ * progress thread name, but it does stop processing all events on
+ * that event base until pmix_progress_thread_resume() is invoked on
+ * that name.
+ *
+ * Will return PMIX_ERR_NOT_FOUND if the progress thread name does not
+ * exist; PMIX_SUCCESS otherwise.
+ */
+int pmix_progress_thread_pause(const char *name);
+
+/**
+ * Restart a previously-paused progress thread associated with this
+ * name.
+ *
+ * Will return PMIX_ERR_NOT_FOUND if the progress thread name does not
+ * exist; PMIX_SUCCESS otherwise.
+ */
+int pmix_progress_thread_resume(const char *name);
+
+#endif
diff --git a/src/runtime/pmix_rte.h b/src/runtime/pmix_rte.h
new file mode 100644
index 0000000..74f590c
--- /dev/null
+++ b/src/runtime/pmix_rte.h
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2007 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2008      Sun Microsystems, Inc.  All rights reserved.
+ * Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2014-2017 Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+/** @file **/
+
+#ifndef PMIX_RTE_H
+#define PMIX_RTE_H
+
+#include "pmix_config.h"
+#include "pmix_common.h"
+#include "src/class/pmix_object.h"
+
+#include <stdio.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include PMIX_EVENT_HEADER
+
+#include "src/include/pmix_globals.h"
+#include "src/mca/ptl/ptl_types.h"
+
+BEGIN_C_DECLS
+
+#if PMIX_ENABLE_TIMING
+extern char *pmix_timing_sync_file;
+extern char *pmix_timing_output;
+extern bool pmix_timing_overhead;
+#endif
+
+extern int pmix_initialized;
+extern char *pmix_net_private_ipv4;
+extern int pmix_event_caching_window;
+extern bool pmix_suppress_missing_data_warning;
+
+/** version string of pmix */
+extern const char pmix_version_string[];
+
+/**
+ * Initialize the PMIX layer, including the MCA system.
+ *
+ * @retval PMIX_SUCCESS Upon success.
+ * @retval PMIX_ERROR Upon failure.
+ *
+ */
+pmix_status_t pmix_rte_init(pmix_proc_type_t type,
+                            pmix_info_t info[], size_t ninfo,
+                            pmix_ptl_cbfunc_t cbfunc);
+
+/**
+ * Finalize the PMIX layer, including the MCA system.
+ *
+ */
+void pmix_rte_finalize(void);
+
+/**
+ * Internal function.  Do not call.
+ */
+pmix_status_t pmix_register_params(void);
+pmix_status_t pmix_deregister_params(void);
+
+END_C_DECLS
+
+#endif /* PMIX_RTE_H */
diff --git a/src/server/Makefile.include b/src/server/Makefile.include
new file mode 100644
index 0000000..7e7caca
--- /dev/null
+++ b/src/server/Makefile.include
@@ -0,0 +1,23 @@
+# -*- makefile -*-
+#
+# Copyright (c) 2014-2016 Intel, Inc.  All rights reserved.
+# Copyright (c) 2014      Artem Y. Polyakov <artpol84 at gmail.com>.
+#                         All rights reserved.
+# Copyright (c) 2016      Cisco Systems, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+dist_pmixdata_DATA += server/help-pmix-server.txt
+
+headers += \
+        server/pmix_server_ops.h
+
+sources += \
+        server/pmix_server.c \
+        server/pmix_server_ops.c \
+        server/pmix_server_regex.c \
+        server/pmix_server_get.c
diff --git a/src/server/help-pmix-server.txt b/src/server/help-pmix-server.txt
new file mode 100644
index 0000000..894ec39
--- /dev/null
+++ b/src/server/help-pmix-server.txt
@@ -0,0 +1,38 @@
+# -*- text -*-
+#
+# Copyright (c) 2016      Intel, Inc. All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+#
+[rnd-path-too-long]
+The PMIx server was unable to setup a rendezvous file due to your
+system's restriction for Unix's socket's path-length.
+
+   Temporary directory: %s
+   Rendezvous filename: %s
+
+Please try to set TMPDIR to something short (like /tmp) or change
+your computer's name to something shorter (see uname -n).
+[listener-failed-start]
+The PMIx server was unable to setup a rendezvous point. This is
+usually due to a conflicting stale named pipe from a prior failed
+job, thus preventing the server from binding to its assigned socket.
+
+  Rendezvous filename: %s
+
+Please remove the stale file and try again.
+[data-store-failed]
+The PMIx server was unable to store the specified key-value:
+
+  Key: %s
+
+The precise reason for the failure was provided in the above
+"error-log" message. This is probably something that should
+be referred to the PMIx developers.
+[listener-thread-start]
+The PMIx server's listener thread failed to start. We cannot
+continue.
diff --git a/src/server/pmix_server.c b/src/server/pmix_server.c
new file mode 100644
index 0000000..ca22d7c
--- /dev/null
+++ b/src/server/pmix_server.c
@@ -0,0 +1,2553 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2014-2017 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2014-2017 Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2014-2015 Artem Y. Polyakov <artpol84 at gmail.com>.
+ *                         All rights reserved.
+ * Copyright (c) 2016      Mellanox Technologies, Inc.
+ *                         All rights reserved.
+ * Copyright (c) 2016      IBM Corporation.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+
+#include <src/include/types.h>
+#include <src/include/pmix_stdint.h>
+#include <src/include/pmix_socket_errno.h>
+
+#include <pmix_server.h>
+#include <pmix_common.h>
+#include <pmix_rename.h>
+
+#include "src/include/pmix_globals.h"
+
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+#include <fcntl.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_SYS_UN_H
+#include <sys/un.h>
+#endif
+#ifdef HAVE_SYS_UIO_H
+#include <sys/uio.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#include <ctype.h>
+#include <sys/stat.h>
+#include PMIX_EVENT_HEADER
+#include PMIX_EVENT2_THREAD_HEADER
+
+#include "src/util/argv.h"
+#include "src/util/error.h"
+#include "src/util/output.h"
+#include "src/util/pmix_environ.h"
+#include "src/util/show_help.h"
+#include "src/mca/base/base.h"
+#include "src/mca/base/pmix_mca_base_var.h"
+#include "src/mca/pinstalldirs/base/base.h"
+#include "src/mca/pnet/pnet.h"
+#include "src/runtime/pmix_progress_threads.h"
+#include "src/runtime/pmix_rte.h"
+#include "src/mca/ptl/base/base.h"
+#if defined(PMIX_ENABLE_DSTORE) && (PMIX_ENABLE_DSTORE == 1)
+#include "src/dstore/pmix_dstore.h"
+#endif /* PMIX_ENABLE_DSTORE */
+#include "src/include/pmix_jobdata.h"
+
+#include "pmix_server_ops.h"
+
+// global variables
+pmix_server_globals_t pmix_server_globals = {{{0}}};
+
+// local variables
+static char *security_mode = NULL;
+static char *ptl_mode = NULL;
+static pid_t mypid;
+
+// local functions for connection support
+static void server_message_handler(struct pmix_peer_t *pr,
+                                   pmix_ptl_hdr_t *hdr,
+                                   pmix_buffer_t *buf, void *cbdata);
+
+static inline int _my_client(const char *nspace, pmix_rank_t rank);
+
+static pmix_status_t initialize_server_base(pmix_server_module_t *module)
+{
+    /* setup the server-specific globals */
+    PMIX_CONSTRUCT(&pmix_server_globals.clients, pmix_pointer_array_t);
+    pmix_pointer_array_init(&pmix_server_globals.clients, 1, INT_MAX, 1);
+    PMIX_CONSTRUCT(&pmix_server_globals.collectives, pmix_list_t);
+    PMIX_CONSTRUCT(&pmix_server_globals.remote_pnd, pmix_list_t);
+    PMIX_CONSTRUCT(&pmix_server_globals.gdata, pmix_buffer_t);
+    PMIX_CONSTRUCT(&pmix_server_globals.events, pmix_list_t);
+    PMIX_CONSTRUCT(&pmix_server_globals.local_reqs, pmix_list_t);
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "pmix:server init called");
+
+    /* setup the function pointers */
+    memset(&pmix_host_server, 0, sizeof(pmix_server_module_t));
+    pmix_host_server = *module;
+
+    return PMIX_SUCCESS;
+}
+
+PMIX_EXPORT pmix_status_t PMIx_server_init(pmix_server_module_t *module,
+                                           pmix_info_t info[], size_t ninfo)
+{
+    pmix_ptl_posted_recv_t *req;
+    pmix_status_t rc;
+    size_t n, m;
+    pmix_kval_t kv;
+    bool protect, nspace_given = false, rank_given = false;
+    char *protected[] = {
+        PMIX_USERID,
+        PMIX_GRPID,
+        PMIX_SOCKET_MODE,
+        PMIX_SERVER_TOOL_SUPPORT,
+        PMIX_SERVER_SYSTEM_SUPPORT,
+        NULL
+    };
+    char *evar;
+    pmix_rank_info_t *rinfo;
+
+    PMIX_ACQUIRE_THREAD(&pmix_global_lock);
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "pmix:server init called");
+
+    /* setup the runtime - this init's the globals,
+     * opens and initializes the required frameworks */
+    if (PMIX_SUCCESS != (rc = pmix_rte_init(PMIX_PROC_SERVER, info, ninfo, NULL))) {
+        PMIX_ERROR_LOG(rc);
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return rc;
+    }
+
+    if (0 != (rc = initialize_server_base(module))) {
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return rc;
+    }
+
+    /* check the info keys for info we
+     * need to provide to every client and
+     * directives aimed at us */
+    if (NULL != info) {
+        PMIX_CONSTRUCT(&kv, pmix_kval_t);
+        for (n=0; n < ninfo; n++) {
+            if (0 == strncmp(info[n].key, PMIX_SERVER_NSPACE, PMIX_MAX_KEYLEN)) {
+                (void)strncpy(pmix_globals.myid.nspace, info[n].value.data.string, PMIX_MAX_NSLEN);
+                nspace_given = true;
+                continue;
+            }
+            if (0 == strncmp(info[n].key, PMIX_SERVER_RANK, PMIX_MAX_KEYLEN)) {
+                pmix_globals.myid.rank = info[n].value.data.rank;
+                rank_given = true;
+                continue;
+            }
+            /* check the list of protected keys */
+            protect = false;
+            for (m=0; NULL != protected[m]; m++) {
+                if (0 == strcmp(info[n].key, protected[m])) {
+                    protect = true;
+                    break;
+                }
+            }
+            if (protect) {
+                continue;
+            }
+            /* store and pass along to every client */
+            kv.key = info[n].key;
+            kv.value = &info[n].value;
+            if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(&pmix_server_globals.gdata, &kv, 1, PMIX_KVAL))) {
+                PMIX_ERROR_LOG(rc);
+                pmix_show_help("help-pmix-server.txt", "data-store-failed", true, kv.key);
+                /* protect the incoming data */
+                kv.key = NULL;
+                kv.value = NULL;
+                PMIX_DESTRUCT(&kv);
+                PMIX_RELEASE_THREAD(&pmix_global_lock);
+                return rc;
+            }
+        }
+        /* protect the incoming data */
+        kv.key = NULL;
+        kv.value = NULL;
+        PMIX_DESTRUCT(&kv);
+    }
+
+    if (!nspace_given) {
+        /* look for our namespace, if one was given */
+        if (NULL == (evar = getenv("PMIX_SERVER_NAMESPACE"))) {
+            /* use a fake namespace */
+            (void)strncpy(pmix_globals.myid.nspace, "pmix-server", PMIX_MAX_NSLEN);
+        } else {
+            (void)strncpy(pmix_globals.myid.nspace, evar, PMIX_MAX_NSLEN);
+        }
+    }
+    if (!rank_given) {
+        /* look for our rank, if one was given */
+        mypid = getpid();
+        if (NULL == (evar = getenv("PMIX_SERVER_RANK"))) {
+            /* use our pid */
+            pmix_globals.myid.rank = mypid;
+        } else {
+            pmix_globals.myid.rank = strtol(evar, NULL, 10);
+        }
+    }
+
+    /* copy it into mypeer entries */
+    if (NULL == pmix_globals.mypeer->info) {
+        rinfo = PMIX_NEW(pmix_rank_info_t);
+        pmix_globals.mypeer->info = rinfo;
+    } else {
+        rinfo = pmix_globals.mypeer->info;
+    }
+    if (NULL == rinfo->nptr) {
+        rinfo->nptr = PMIX_NEW(pmix_nspace_t);
+        /* ensure our own nspace is first on the list */
+        PMIX_RETAIN(rinfo->nptr);
+        rinfo->nptr->server = PMIX_NEW(pmix_server_nspace_t);
+        pmix_list_prepend(&pmix_globals.nspaces, &rinfo->nptr->super);
+    }
+    (void)strncpy(rinfo->nptr->nspace, pmix_globals.myid.nspace, PMIX_MAX_NSLEN);
+    rinfo->rank = pmix_globals.myid.rank;
+
+
+#if defined(PMIX_ENABLE_DSTORE) && (PMIX_ENABLE_DSTORE == 1)
+    if (PMIX_SUCCESS != (rc = pmix_dstore_init(info, ninfo))) {
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return rc;
+    }
+#endif /* PMIX_ENABLE_DSTORE */
+
+    /* setup the wildcard recv for inbound messages from clients */
+    req = PMIX_NEW(pmix_ptl_posted_recv_t);
+    req->tag = UINT32_MAX;
+    req->cbfunc = server_message_handler;
+    /* add it to the end of the list of recvs */
+    pmix_list_append(&pmix_ptl_globals.posted_recvs, &req->super);
+
+    if (PMIX_SUCCESS != pmix_ptl_base_start_listening(info, ninfo)) {
+        pmix_show_help("help-pmix-server.txt", "listener-thread-start", true);
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return PMIX_ERR_INIT;
+    }
+
+    /* get our available security modules */
+    security_mode = pmix_psec.get_available_modules();
+
+    /* get our available ptl modules */
+    ptl_mode = pmix_ptl.get_available_modules();
+
+    /* just in case, assign our own default modules */
+    if (PMIX_SUCCESS != (rc = pmix_psec.assign_module(pmix_globals.mypeer, NULL))) {
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return PMIX_ERR_INIT;
+    }
+
+    ++pmix_globals.init_cntr;
+    PMIX_RELEASE_THREAD(&pmix_global_lock);
+
+    return PMIX_SUCCESS;
+}
+
+PMIX_EXPORT pmix_status_t PMIx_server_finalize(void)
+{
+    int i;
+    pmix_peer_t *peer;
+
+    PMIX_ACQUIRE_THREAD(&pmix_global_lock);
+    if (pmix_globals.init_cntr <= 0) {
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return PMIX_ERR_INIT;
+    }
+
+    if (1 != pmix_globals.init_cntr) {
+        --pmix_globals.init_cntr;
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return PMIX_SUCCESS;
+    }
+    pmix_globals.init_cntr = 0;
+    PMIX_RELEASE_THREAD(&pmix_global_lock);
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "pmix:server finalize called");
+
+    if (!pmix_globals.external_evbase) {
+        /* stop the progress thread, but leave the event base
+         * still constructed. This will allow us to safely
+         * tear down the infrastructure, including removal
+         * of any events objects may be holding */
+        (void)pmix_progress_thread_pause(NULL);
+    }
+
+    pmix_ptl_base_stop_listening();
+
+    for (i=0; i < pmix_server_globals.clients.size; i++) {
+        if (NULL != (peer = (pmix_peer_t*)pmix_pointer_array_get_item(&pmix_server_globals.clients, i))) {
+            PMIX_RELEASE(peer);
+        }
+    }
+    PMIX_DESTRUCT(&pmix_server_globals.clients);
+    PMIX_LIST_DESTRUCT(&pmix_server_globals.collectives);
+    PMIX_LIST_DESTRUCT(&pmix_server_globals.remote_pnd);
+    PMIX_LIST_DESTRUCT(&pmix_server_globals.local_reqs);
+    PMIX_DESTRUCT(&pmix_server_globals.gdata);
+    PMIX_LIST_DESTRUCT(&pmix_server_globals.events);
+
+    if (NULL != security_mode) {
+        free(security_mode);
+    }
+
+    if (NULL != ptl_mode) {
+        free(ptl_mode);
+    }
+
+    pmix_bfrop_close();
+    pmix_rte_finalize();
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "pmix:server finalize complete");
+
+    return PMIX_SUCCESS;
+}
+
+static void _register_nspace(int sd, short args, void *cbdata)
+{
+    pmix_setup_caddy_t *cd = (pmix_setup_caddy_t*)cbdata;
+    pmix_nspace_t *nptr, *tmp;
+    pmix_status_t rc;
+    size_t i, j, size;
+    int rank;
+    pmix_kval_t kv;
+    char **nodes=NULL, **procs=NULL;
+    pmix_buffer_t buf2;
+    pmix_info_t *iptr;
+    pmix_value_t val;
+    char *msg;
+#if defined(PMIX_ENABLE_DSTORE) && (PMIX_ENABLE_DSTORE == 1)
+    bool nodata = false;
+    pmix_buffer_t *jobdata = PMIX_NEW(pmix_buffer_t);
+    char *nspace = NULL;
+    int32_t cnt;
+#endif
+
+    PMIX_ACQUIRE_OBJECT(caddy);
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "pmix:server _register_nspace %s", cd->proc.nspace);
+
+    /* see if we already have this nspace */
+    nptr = NULL;
+    PMIX_LIST_FOREACH(tmp, &pmix_globals.nspaces, pmix_nspace_t) {
+        if (0 == strcmp(tmp->nspace, cd->proc.nspace)) {
+            nptr = tmp;
+            /* release any existing packed data - we will replace it */
+            if (0 < nptr->server->job_info.bytes_used) {
+                PMIX_DESTRUCT(&nptr->server->job_info);
+                PMIX_CONSTRUCT(&nptr->server->job_info, pmix_buffer_t);
+            }
+            break;
+        }
+    }
+    if (NULL == nptr) {
+        nptr = PMIX_NEW(pmix_nspace_t);
+        (void)strncpy(nptr->nspace, cd->proc.nspace, PMIX_MAX_NSLEN);
+        nptr->server = PMIX_NEW(pmix_server_nspace_t);
+        pmix_list_append(&pmix_globals.nspaces, &nptr->super);
+    }
+    nptr->server->nlocalprocs = cd->nlocalprocs;
+    /* see if we have everyone */
+    if (nptr->server->nlocalprocs == pmix_list_get_size(&nptr->server->ranks)) {
+        nptr->server->all_registered = true;
+    }
+    /* pack the name of the nspace */
+    msg = nptr->nspace;
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(&nptr->server->job_info, &msg, 1, PMIX_STRING))) {
+        PMIX_ERROR_LOG(rc);
+        pmix_list_remove_item(&pmix_globals.nspaces, &nptr->super);
+        PMIX_RELEASE(nptr);
+        goto release;
+    }
+
+    /* pack the provided info */
+    PMIX_CONSTRUCT(&kv, pmix_kval_t);
+    for (i=0; i < cd->ninfo; i++) {
+        pmix_output_verbose(2, pmix_globals.debug_output,
+                            "pmix:server _register_nspace recording %s",
+                            cd->info[i].key);
+
+        if (0 == strcmp(cd->info[i].key, PMIX_REGISTER_NODATA)) {
+#if defined(PMIX_ENABLE_DSTORE) && (PMIX_ENABLE_DSTORE == 1)
+            /* we don't want to save any job data for this nspace */
+            nodata = true;
+#endif
+            /* free anything that was previously stored */
+            PMIX_DESTRUCT(&nptr->server->job_info);
+            PMIX_CONSTRUCT(&nptr->server->job_info, pmix_buffer_t);
+            break;
+        }
+        if (0 == strcmp(cd->info[i].key, PMIX_NODE_MAP)) {
+            /* parse the regex to get the argv array of node names */
+            if (PMIX_SUCCESS != (rc = pmix_regex_parse_nodes(cd->info[i].value.data.string, &nodes))) {
+                PMIX_ERROR_LOG(rc);
+                continue;
+            }
+            /* if we have already found the proc map, then pass
+             * the detailed map */
+            if (NULL != procs) {
+                pmix_pack_proc_map(&nptr->server->job_info, nodes, procs);
+                pmix_argv_free(nodes);
+                nodes = NULL;
+                pmix_argv_free(procs);
+                procs = NULL;
+            }
+        } else if (0 == strcmp(cd->info[i].key, PMIX_PROC_MAP)) {
+            /* parse the regex to get the argv array containg proc ranks on each node */
+            if (PMIX_SUCCESS != (rc = pmix_regex_parse_procs(cd->info[i].value.data.string, &procs))) {
+                PMIX_ERROR_LOG(rc);
+                continue;
+            }
+            /* if we have already recv'd the node map, then record
+             * the detailed map */
+            if (NULL != nodes) {
+                pmix_pack_proc_map(&nptr->server->job_info, nodes, procs);
+                pmix_argv_free(nodes);
+                nodes = NULL;
+                pmix_argv_free(procs);
+                procs = NULL;
+            }
+        } else if (0 == strcmp(cd->info[i].key, PMIX_PROC_DATA)) {
+            /* an array of data pertaining to a specific proc */
+            if (PMIX_DATA_ARRAY != cd->info[i].value.type ||
+                PMIX_INFO != cd->info[i].value.data.darray->type) {
+                PMIX_ERROR_LOG(PMIX_ERR_BAD_PARAM);
+                goto release;
+            }
+            size = cd->info[i].value.data.darray->size;
+            iptr = (pmix_info_t*)cd->info[i].value.data.darray->array;
+            PMIX_CONSTRUCT(&buf2, pmix_buffer_t);
+            /* first element of the array must be the rank */
+            if (0 != strcmp(iptr[0].key, PMIX_RANK)) {
+                PMIX_ERROR_LOG(PMIX_ERR_BAD_PARAM);
+                PMIX_DESTRUCT(&buf2);
+                goto release;
+            }
+            /* pack it separately */
+            rank = iptr[0].value.data.rank;
+            if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(&buf2, &rank, 1, PMIX_PROC_RANK))) {
+                PMIX_ERROR_LOG(rc);
+                pmix_list_remove_item(&pmix_globals.nspaces, &nptr->super);
+                PMIX_RELEASE(nptr);
+                PMIX_DESTRUCT(&buf2);
+                goto release;
+            }
+            /* cycle thru the values for this rank and pack them */
+            for (j=1; j < size; j++) {
+                kv.key = iptr[j].key;
+                kv.value = &iptr[j].value;
+                if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(&buf2, &kv, 1, PMIX_KVAL))) {
+                    PMIX_ERROR_LOG(rc);
+                    pmix_list_remove_item(&pmix_globals.nspaces, &nptr->super);
+                    PMIX_RELEASE(nptr);
+                    PMIX_DESTRUCT(&buf2);
+                    goto release;
+                }
+            }
+            /* now add the blob */
+            kv.key = PMIX_PROC_BLOB;
+            kv.value = &val;
+            val.type = PMIX_BYTE_OBJECT;
+            val.data.bo.bytes = buf2.base_ptr;
+            val.data.bo.size = buf2.bytes_used;
+            if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(&nptr->server->job_info, &kv, 1, PMIX_KVAL))) {
+                PMIX_ERROR_LOG(rc);
+                pmix_list_remove_item(&pmix_globals.nspaces, &nptr->super);
+                PMIX_RELEASE(nptr);
+                PMIX_DESTRUCT(&buf2);
+                goto release;
+            }
+            PMIX_DESTRUCT(&buf2);
+        } else {
+            /* just a value relating to the entire job */
+            kv.key = cd->info[i].key;
+            kv.value = &cd->info[i].value;
+
+            if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(&nptr->server->job_info, &kv, 1, PMIX_KVAL))) {
+                PMIX_ERROR_LOG(rc);
+                pmix_list_remove_item(&pmix_globals.nspaces, &nptr->super);
+                PMIX_RELEASE(nptr);
+                goto release;
+            }
+        }
+    }
+    /* do not destruct the kv object - no memory leak will result */
+
+#if defined(PMIX_ENABLE_DSTORE) && (PMIX_ENABLE_DSTORE == 1)
+    if (PMIX_SUCCESS != (rc = pmix_dstore_nspace_add(cd->proc.nspace, cd->info, cd->ninfo))) {
+        PMIX_ERROR_LOG(rc);
+        goto release;
+    }
+    if (!nodata) {
+        pmix_bfrop.copy_payload(jobdata, &nptr->server->job_info);
+        pmix_bfrop.copy_payload(jobdata, &pmix_server_globals.gdata);
+
+        /* unpack the nspace - we don't really need it, but have to
+        * unpack it to maintain sequence */
+        cnt = 1;
+        if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(jobdata, &nspace, &cnt, PMIX_STRING))) {
+            PMIX_ERROR_LOG(rc);
+            goto release;
+        }
+        if (PMIX_SUCCESS != (rc = pmix_job_data_dstore_store(cd->proc.nspace, jobdata))) {
+            PMIX_ERROR_LOG(rc);
+            goto release;
+        }
+    }
+#endif
+
+ release:
+    if (NULL != nodes) {
+        pmix_argv_free(nodes);
+    }
+    if (NULL != procs) {
+        pmix_argv_free(procs);
+    }
+    if (NULL != cd->opcbfunc) {
+        cd->opcbfunc(rc, cd->cbdata);
+    }
+#if defined(PMIX_ENABLE_DSTORE) && (PMIX_ENABLE_DSTORE == 1)
+    if (NULL != nspace) {
+        free(nspace);
+    }
+    if (NULL != jobdata) {
+        PMIX_RELEASE(jobdata);
+    }
+#endif
+    PMIX_RELEASE(cd);
+}
+
+/* setup the data for a job */
+PMIX_EXPORT pmix_status_t PMIx_server_register_nspace(const char nspace[], int nlocalprocs,
+                                                      pmix_info_t info[], size_t ninfo,
+                                                      pmix_op_cbfunc_t cbfunc, void *cbdata)
+{
+    pmix_setup_caddy_t *cd;
+
+    PMIX_ACQUIRE_THREAD(&pmix_global_lock);
+    if (pmix_globals.init_cntr <= 0) {
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return PMIX_ERR_INIT;
+    }
+    PMIX_RELEASE_THREAD(&pmix_global_lock);
+
+    cd = PMIX_NEW(pmix_setup_caddy_t);
+    (void)strncpy(cd->proc.nspace, nspace, PMIX_MAX_NSLEN);
+    cd->nlocalprocs = nlocalprocs;
+    cd->opcbfunc = cbfunc;
+    cd->cbdata = cbdata;
+    /* copy across the info array, if given */
+    if (0 < ninfo) {
+        cd->ninfo = ninfo;
+        cd->info = info;
+    }
+
+    /* we have to push this into our event library to avoid
+     * potential threading issues */
+    PMIX_THREADSHIFT(cd, _register_nspace);
+    return PMIX_SUCCESS;
+}
+
+static void _deregister_nspace(int sd, short args, void *cbdata)
+{
+    pmix_setup_caddy_t *cd = (pmix_setup_caddy_t*)cbdata;
+    pmix_nspace_t *tmp;
+    pmix_status_t rc = PMIX_SUCCESS;
+
+    PMIX_ACQUIRE_OBJECT(cd);
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "pmix:server _deregister_nspace %s",
+                        cd->proc.nspace);
+
+    /* see if we already have this nspace */
+    PMIX_LIST_FOREACH(tmp, &pmix_globals.nspaces, pmix_nspace_t) {
+        if (0 == strcmp(tmp->nspace, cd->proc.nspace)) {
+            pmix_list_remove_item(&pmix_globals.nspaces, &tmp->super);
+            PMIX_RELEASE(tmp);
+            break;
+        }
+    }
+
+#if defined(PMIX_ENABLE_DSTORE) && (PMIX_ENABLE_DSTORE == 1)
+    rc = pmix_dstore_nspace_del(cd->proc.nspace);
+#endif
+
+    /* release any job-level resources */
+    pmix_pnet.local_app_finalized(cd->proc.nspace);
+
+    /* release the caller */
+    if (NULL != cd->opcbfunc) {
+        cd->opcbfunc(rc, cd->cbdata);
+    }
+    PMIX_RELEASE(cd);
+}
+
+PMIX_EXPORT void PMIx_server_deregister_nspace(const char nspace[],
+                                               pmix_op_cbfunc_t cbfunc,
+                                               void *cbdata)
+{
+    pmix_setup_caddy_t *cd;
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "pmix:server deregister nspace %s",
+                        nspace);
+
+    PMIX_ACQUIRE_THREAD(&pmix_global_lock);
+    if (pmix_globals.init_cntr <= 0) {
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        if (NULL != cbfunc) {
+            cbfunc(PMIX_ERR_INIT, cbdata);
+        }
+        return;
+    }
+    PMIX_RELEASE_THREAD(&pmix_global_lock);
+
+     cd = PMIX_NEW(pmix_setup_caddy_t);
+    (void)strncpy(cd->proc.nspace, nspace, PMIX_MAX_NSLEN);
+    cd->opcbfunc = cbfunc;
+    cd->cbdata = cbdata;
+
+    /* we have to push this into our event library to avoid
+     * potential threading issues */
+    PMIX_THREADSHIFT(cd, _deregister_nspace);
+}
+
+void pmix_server_execute_collective(int sd, short args, void *cbdata)
+{
+    pmix_trkr_caddy_t *tcd = (pmix_trkr_caddy_t*)cbdata;
+    pmix_server_trkr_t *trk = tcd->trk;
+    char *data = NULL;
+    size_t sz = 0;
+    pmix_buffer_t bucket, xfer;
+    pmix_rank_info_t *info;
+    pmix_value_t *val;
+
+    PMIX_ACQUIRE_OBJECT(tcd);
+
+    /* we don't need to check for non-NULL APIs here as
+     * that was already done when the tracker was created */
+    if (PMIX_FENCENB_CMD == trk->type) {
+        /* if the user asked us to collect data, then we have
+         * to provide any locally collected data to the host
+         * server so they can circulate it - only take data
+         * from the specified procs as not everyone is necessarily
+         * participating! And only take data intended for remote
+         * distribution as local data will be added when we send
+         * the result to our local clients */
+        PMIX_CONSTRUCT(&bucket, pmix_buffer_t);
+
+        assert( PMIX_COLLECT_MAX < UCHAR_MAX );
+        unsigned char tmp = (unsigned char)trk->collect_type;
+        pmix_bfrop.pack(&bucket, &tmp, 1, PMIX_BYTE);
+
+        if (PMIX_COLLECT_YES == trk->collect_type) {
+            pmix_buffer_t databuf;
+            PMIX_CONSTRUCT(&databuf, pmix_buffer_t);
+            pmix_output_verbose(2, pmix_globals.debug_output,
+                                "fence - assembling data");
+            PMIX_LIST_FOREACH(info, &trk->ranks, pmix_rank_info_t) {
+                pmix_buffer_t rankbuf;
+                PMIX_CONSTRUCT(&rankbuf, pmix_buffer_t);
+                /* get any remote contribution - note that there
+                 * may not be a contribution */
+                if (PMIX_SUCCESS == pmix_hash_fetch(&info->nptr->server->myremote, info->rank, "modex", &val) &&
+                    NULL != val) {
+                    /* pack the proc so we know the source */
+                    char *foobar = info->nptr->nspace;
+                    pmix_bfrop.pack(&rankbuf, &foobar, 1, PMIX_STRING);
+                    pmix_bfrop.pack(&rankbuf, &info->rank, 1, PMIX_PROC_RANK);
+                    PMIX_CONSTRUCT(&xfer, pmix_buffer_t);
+                    PMIX_LOAD_BUFFER(&xfer, val->data.bo.bytes, val->data.bo.size);
+                    PMIX_VALUE_RELEASE(val);
+                    pmix_buffer_t *pxfer = &xfer;
+                    pmix_bfrop.pack(&rankbuf, &pxfer, 1, PMIX_BUFFER);
+                    PMIX_DESTRUCT(&xfer);
+                    /* now pack this proc's contribution into the bucket */
+                    pmix_buffer_t *pdatabuf = &rankbuf;
+                    pmix_bfrop.pack(&databuf, &pdatabuf, 1, PMIX_BUFFER);
+                }
+                PMIX_DESTRUCT(&rankbuf);
+            }
+            // TODO: we have multiple data movings while only one is actually need
+            pmix_buffer_t *pbkt = &databuf;
+            pmix_bfrop.pack(&bucket, &pbkt, 1, PMIX_BUFFER);
+            PMIX_DESTRUCT(&databuf);
+        }
+        PMIX_UNLOAD_BUFFER(&bucket, data, sz);
+        PMIX_DESTRUCT(&bucket);
+        pmix_host_server.fence_nb(trk->pcs, trk->npcs,
+                                  trk->info, trk->ninfo,
+                                  data, sz, trk->modexcbfunc, trk);
+    } else if (PMIX_CONNECTNB_CMD == trk->type) {
+        pmix_host_server.connect(trk->pcs, trk->npcs,
+                                 trk->info, trk->ninfo,
+                                 trk->op_cbfunc, trk);
+    } else if (PMIX_DISCONNECTNB_CMD == trk->type) {
+        pmix_host_server.disconnect(trk->pcs, trk->npcs,
+                                    trk->info, trk->ninfo,
+                                    trk->op_cbfunc, trk);
+    } else {
+        /* unknown type */
+        PMIX_ERROR_LOG(PMIX_ERR_NOT_FOUND);
+        pmix_list_remove_item(&pmix_server_globals.collectives, &trk->super);
+        PMIX_RELEASE(trk);
+    }
+    PMIX_RELEASE(tcd);
+}
+
+static void _register_client(int sd, short args, void *cbdata)
+{
+    pmix_setup_caddy_t *cd = (pmix_setup_caddy_t*)cbdata;
+    pmix_rank_info_t *info, *iptr, *iptr2;
+    pmix_nspace_t *nptr, *tmp;
+    pmix_server_trkr_t *trk;
+    pmix_trkr_caddy_t *tcd;
+    bool all_def;
+    size_t i;
+
+    PMIX_ACQUIRE_OBJECT(cd);
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "pmix:server _register_client for nspace %s rank %d",
+                        cd->proc.nspace, cd->proc.rank);
+
+    /* see if we already have this nspace */
+    nptr = NULL;
+    PMIX_LIST_FOREACH(tmp, &pmix_globals.nspaces, pmix_nspace_t) {
+        if (0 == strcmp(tmp->nspace, cd->proc.nspace)) {
+            nptr = tmp;
+            break;
+        }
+    }
+    if (NULL == nptr) {
+        nptr = PMIX_NEW(pmix_nspace_t);
+        (void)strncpy(nptr->nspace, cd->proc.nspace, PMIX_MAX_NSLEN);
+        /* add the server object */
+        nptr->server = PMIX_NEW(pmix_server_nspace_t);
+        pmix_list_append(&pmix_globals.nspaces, &nptr->super);
+    }
+    /* setup a peer object for this client - since the host server
+     * only deals with the original processes and not any clones,
+     * we know this function will be called only once per rank */
+    info = PMIX_NEW(pmix_rank_info_t);
+    PMIX_RETAIN(nptr);
+    info->nptr = nptr;
+    info->rank = cd->proc.rank;
+    info->uid = cd->uid;
+    info->gid = cd->gid;
+    info->server_object = cd->server_object;
+    pmix_list_append(&nptr->server->ranks, &info->super);
+    /* see if we have everyone */
+    if (nptr->server->nlocalprocs == pmix_list_get_size(&nptr->server->ranks)) {
+        nptr->server->all_registered = true;
+        /* check any pending trackers to see if they are
+         * waiting for us. There is a slight race condition whereby
+         * the host server could have spawned the local client and
+         * it called back into the collective -before- our local event
+         * would fire the register_client callback. Deal with that here. */
+        PMIX_LIST_FOREACH(trk, &pmix_server_globals.collectives, pmix_server_trkr_t) {
+            /* if this tracker is already complete, then we
+             * don't need to update it */
+            if (trk->def_complete) {
+                continue;
+            }
+            /* see if any of our procs are involved - the tracker will
+             * have been created because a callback was received, but
+             * no rank info will have been entered since the clients
+             * had not yet been registered. Thus, we couldn't enter rank
+             * objects into the tracker as we didn't know which
+             * of the ranks were local */
+            for (i=0; i < trk->npcs; i++) {
+                if (0 != strncmp(cd->proc.nspace, trk->pcs[i].nspace, PMIX_MAX_NSLEN)) {
+                    continue;
+                }
+                /* need to check if this rank is one of mine */
+                PMIX_LIST_FOREACH(iptr, &nptr->server->ranks, pmix_rank_info_t) {
+                    if (PMIX_RANK_WILDCARD == trk->pcs[i].rank ||
+                        iptr->rank == trk->pcs[i].rank) {
+                        /* add a tracker for this proc - don't need more than
+                         * the nspace pointer and rank */
+                        iptr2 = PMIX_NEW(pmix_rank_info_t);
+                        PMIX_RETAIN(info->nptr);
+                        iptr2->nptr = info->nptr;
+                        iptr2->rank = info->rank;
+                        pmix_list_append(&trk->ranks, &iptr2->super);
+                        /* track the count */
+                        ++trk->nlocal;
+                    }
+                }
+            }
+            /* we need to know if this tracker is now complete - the only
+             * way to do this is to check if all participating
+             * nspaces are fully registered */
+            all_def = true;
+            /* search all the involved procs - fortunately, this
+             * list is usually very small */
+            PMIX_LIST_FOREACH(iptr, &trk->ranks, pmix_rank_info_t) {
+                if (!iptr->nptr->server->all_registered) {
+                    /* nope */
+                    all_def = false;
+                    break;
+                }
+            }
+            /* update this tracker's status */
+            trk->def_complete = all_def;
+            /* is this now completed? */
+            if (trk->def_complete && pmix_list_get_size(&trk->local_cbs) == trk->nlocal) {
+                /* it did, so now we need to process it
+                 * we don't want to block someone
+                 * here, so kick any completed trackers into a
+                 * new event for processing */
+                PMIX_EXECUTE_COLLECTIVE(tcd, trk, pmix_server_execute_collective);
+            }
+        }
+        /* also check any pending local modex requests to see if
+         * someone has been waiting for a request on a remote proc
+         * in one of our nspaces, but we didn't know all the local procs
+         * and so couldn't determine the proc was remote */
+        pmix_pending_nspace_requests(nptr);
+    }
+    /* let the caller know we are done */
+    if (NULL != cd->opcbfunc) {
+        cd->opcbfunc(PMIX_SUCCESS, cd->cbdata);
+    }
+    PMIX_RELEASE(cd);
+}
+
+PMIX_EXPORT pmix_status_t PMIx_server_register_client(const pmix_proc_t *proc,
+                                                      uid_t uid, gid_t gid, void *server_object,
+                                                      pmix_op_cbfunc_t cbfunc, void *cbdata)
+{
+    pmix_setup_caddy_t *cd;
+
+    PMIX_ACQUIRE_THREAD(&pmix_global_lock);
+    if (pmix_globals.init_cntr <= 0) {
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return PMIX_ERR_INIT;
+    }
+    PMIX_RELEASE_THREAD(&pmix_global_lock);
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "pmix:server register client %s:%d",
+                        proc->nspace, proc->rank);
+
+     cd = PMIX_NEW(pmix_setup_caddy_t);
+    (void)strncpy(cd->proc.nspace, proc->nspace, PMIX_MAX_NSLEN);
+    cd->proc.rank = proc->rank;
+    cd->uid = uid;
+    cd->gid = gid;
+    cd->server_object = server_object;
+    cd->opcbfunc = cbfunc;
+    cd->cbdata = cbdata;
+
+    /* we have to push this into our event library to avoid
+     * potential threading issues */
+    PMIX_THREADSHIFT(cd, _register_client);
+    return PMIX_SUCCESS;
+}
+
+static void _deregister_client(int sd, short args, void *cbdata)
+{
+    pmix_setup_caddy_t *cd = (pmix_setup_caddy_t*)cbdata;
+    pmix_rank_info_t *info;
+    pmix_nspace_t *nptr, *tmp;
+
+    PMIX_ACQUIRE_OBJECT(cd);
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "pmix:server _deregister_client for nspace %s rank %d",
+                        cd->proc.nspace, cd->proc.rank);
+
+    /* see if we already have this nspace */
+    nptr = NULL;
+    PMIX_LIST_FOREACH(tmp, &pmix_globals.nspaces, pmix_nspace_t) {
+        if (0 == strcmp(tmp->nspace, cd->proc.nspace)) {
+            nptr = tmp;
+            break;
+        }
+    }
+    if (NULL == nptr) {
+        /* nothing to do */
+        goto cleanup;
+    }
+    /* find and remove this client */
+    PMIX_LIST_FOREACH(info, &nptr->server->ranks, pmix_rank_info_t) {
+        if (info->rank == cd->proc.rank) {
+            pmix_list_remove_item(&nptr->server->ranks, &info->super);
+            PMIX_RELEASE(info);
+            break;
+        }
+    }
+
+  cleanup:
+    if (NULL != cd->opcbfunc) {
+        cd->opcbfunc(PMIX_SUCCESS, cd->cbdata);
+    }
+    PMIX_RELEASE(cd);
+}
+
+PMIX_EXPORT void PMIx_server_deregister_client(const pmix_proc_t *proc,
+                                               pmix_op_cbfunc_t cbfunc, void *cbdata)
+{
+    pmix_setup_caddy_t *cd;
+
+    PMIX_ACQUIRE_THREAD(&pmix_global_lock);
+    if (pmix_globals.init_cntr <= 0) {
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        if (NULL != cbfunc) {
+            cbfunc(PMIX_ERR_INIT, cbdata);
+        }
+        return;
+    }
+    PMIX_RELEASE_THREAD(&pmix_global_lock);
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "pmix:server deregister client %s:%d",
+                        proc->nspace, proc->rank);
+
+     cd = PMIX_NEW(pmix_setup_caddy_t);
+    (void)strncpy(cd->proc.nspace, proc->nspace, PMIX_MAX_NSLEN);
+    cd->proc.rank = proc->rank;
+    cd->opcbfunc = cbfunc;
+    cd->cbdata = cbdata;
+
+    /* we have to push this into our event library to avoid
+     * potential threading issues */
+    PMIX_THREADSHIFT(cd, _deregister_client);
+}
+
+/* setup the envars for a child process */
+PMIX_EXPORT pmix_status_t PMIx_server_setup_fork(const pmix_proc_t *proc, char ***env)
+{
+    char rankstr[128];
+    pmix_listener_t *lt;
+    pmix_status_t rc;
+
+    PMIX_ACQUIRE_THREAD(&pmix_global_lock);
+    if (pmix_globals.init_cntr <= 0) {
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return PMIX_ERR_INIT;
+    }
+    PMIX_RELEASE_THREAD(&pmix_global_lock);
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "pmix:server setup_fork for nspace %s rank %d",
+                        proc->nspace, proc->rank);
+
+    /* pass the nspace */
+    pmix_setenv("PMIX_NAMESPACE", proc->nspace, true, env);
+    /* pass the rank */
+    (void)snprintf(rankstr, 127, "%d", proc->rank);
+    pmix_setenv("PMIX_RANK", rankstr, true, env);
+    /* pass our rendezvous info */
+    PMIX_LIST_FOREACH(lt, &pmix_ptl_globals.listeners, pmix_listener_t) {
+        if (NULL != lt->uri && NULL != lt->varname) {
+            pmix_setenv(lt->varname, lt->uri, true, env);
+        }
+    }
+    /* pass our active security modules */
+    pmix_setenv("PMIX_SECURITY_MODE", security_mode, true, env);
+    /* pass our available ptl modules */
+    pmix_setenv("PMIX_PTL_MODULE", ptl_mode, true, env);
+
+#if defined(PMIX_ENABLE_DSTORE) && (PMIX_ENABLE_DSTORE == 1)
+    /* pass dstore path to files */
+    if (PMIX_SUCCESS != (rc = pmix_dstore_patch_env(proc->nspace, env))) {
+        PMIX_ERROR_LOG(rc);
+        return rc;
+    }
+#endif
+
+    /* get any network contribution */
+    if (PMIX_SUCCESS != (rc = pmix_pnet.setup_fork(proc, env))) {
+        PMIX_ERROR_LOG(rc);
+        return rc;
+    }
+
+    return PMIX_SUCCESS;
+}
+
+/***************************************************************************************************
+ *  Support calls from the host server down to us requesting direct modex data provided by one     *
+ *  of our local clients                                                                           *
+ ***************************************************************************************************/
+
+static void _dmodex_req(int sd, short args, void *cbdata)
+{
+    pmix_setup_caddy_t *cd = (pmix_setup_caddy_t*)cbdata;
+    pmix_rank_info_t *info, *iptr;
+    pmix_nspace_t *nptr, *ns;
+    pmix_buffer_t pbkt;
+    pmix_value_t *val;
+    char *data = NULL;
+    size_t sz = 0;
+    pmix_dmdx_remote_t *dcd;
+    pmix_status_t rc;
+
+    PMIX_ACQUIRE_OBJECT(cd);
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "DMODX LOOKING FOR %s:%d",
+                        cd->proc.nspace, cd->proc.rank);
+    /* this should be one of my clients, but a race condition
+     * could cause this request to arrive prior to us having
+     * been informed of it - so first check to see if we know
+     * about this nspace yet */
+    nptr = NULL;
+    PMIX_LIST_FOREACH(ns, &pmix_globals.nspaces, pmix_nspace_t) {
+        if (0 == strcmp(ns->nspace, cd->proc.nspace)) {
+            nptr = ns;
+            break;
+        }
+    }
+    if (NULL == nptr) {
+        /* we don't know this namespace yet, and so we obviously
+         * haven't received the data from this proc yet - defer
+         * the request until we do */
+        dcd = PMIX_NEW(pmix_dmdx_remote_t);
+        PMIX_RETAIN(cd);
+        dcd->cd = cd;
+        pmix_list_append(&pmix_server_globals.remote_pnd, &dcd->super);
+        PMIX_WAKEUP_THREAD(&cd->lock);  // ensure the request doesn't hang
+        return;
+    }
+
+    /* They are asking for job level data for this process */
+    if (cd->proc.rank == PMIX_RANK_WILDCARD) {
+
+       data = nptr->server->job_info.base_ptr;
+       sz = nptr->server->job_info.bytes_used;
+
+       /* execute the callback */
+       cd->cbfunc(PMIX_SUCCESS, data, sz, cd->cbdata);
+       PMIX_WAKEUP_THREAD(&cd->lock);  // ensure the request doesn't hang
+       return;
+    }
+
+    /* see if we have this peer in our list */
+    info = NULL;
+    PMIX_LIST_FOREACH(iptr, &nptr->server->ranks, pmix_rank_info_t) {
+        if (iptr->rank == cd->proc.rank) {
+            info = iptr;
+            break;
+        }
+    }
+    if (NULL == info) {
+        /* rank isn't known yet - defer
+         * the request until we do */
+        dcd = PMIX_NEW(pmix_dmdx_remote_t);
+        PMIX_RETAIN(cd);
+        dcd->cd = cd;
+        pmix_list_append(&pmix_server_globals.remote_pnd, &dcd->super);
+        PMIX_WAKEUP_THREAD(&cd->lock);  // ensure the request doesn't hang
+        return;
+    }
+
+    /* have we received the modex from this proc yet - if
+     * not, then defer */
+    if (!info->modex_recvd) {
+        /* track the request so we can fulfill it once
+         * data is recvd */
+        dcd = PMIX_NEW(pmix_dmdx_remote_t);
+        PMIX_RETAIN(cd);
+        dcd->cd = cd;
+        pmix_list_append(&pmix_server_globals.remote_pnd, &dcd->super);
+        PMIX_WAKEUP_THREAD(&cd->lock);  // ensure the request doesn't hang
+        return;
+    }
+
+    /* collect the remote/global data from this proc */
+    PMIX_CONSTRUCT(&pbkt, pmix_buffer_t);
+    /* get any remote contribution - note that there
+     * may not be a contribution */
+    if (PMIX_SUCCESS == (rc = pmix_hash_fetch(&nptr->server->myremote, info->rank, "modex", &val)) &&
+        NULL != val) {
+        data = val->data.bo.bytes;
+        sz = val->data.bo.size;
+        /* protect the data */
+        val->data.bo.bytes = NULL;
+        val->data.bo.size = 0;
+        PMIX_VALUE_RELEASE(val);
+    }
+
+    /* execute the callback */
+    cd->cbfunc(rc, data, sz, cd->cbdata);
+    if (NULL != data) {
+        free(data);
+    }
+    PMIX_WAKEUP_THREAD(&cd->lock);
+}
+
+PMIX_EXPORT pmix_status_t PMIx_server_dmodex_request(const pmix_proc_t *proc,
+                                                     pmix_dmodex_response_fn_t cbfunc,
+                                                     void *cbdata)
+{
+    pmix_setup_caddy_t *cd;
+
+    PMIX_ACQUIRE_THREAD(&pmix_global_lock);
+    if (pmix_globals.init_cntr <= 0) {
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return PMIX_ERR_INIT;
+    }
+    PMIX_RELEASE_THREAD(&pmix_global_lock);
+
+    /* protect against bozo */
+    if (NULL == cbfunc || NULL == proc) {
+        return PMIX_ERR_BAD_PARAM;
+    }
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "pmix:server dmodex request%s:%d",
+                        proc->nspace, proc->rank);
+
+    cd = PMIX_NEW(pmix_setup_caddy_t);
+    (void)strncpy(cd->proc.nspace, proc->nspace, PMIX_MAX_NSLEN);
+    cd->proc.rank = proc->rank;
+    cd->cbfunc = cbfunc;
+    cd->cbdata = cbdata;
+
+    /* we have to push this into our event library to avoid
+     * potential threading issues */
+    PMIX_THREADSHIFT(cd, _dmodex_req);
+
+    PMIX_WAIT_THREAD(&cd->lock);
+    PMIX_RELEASE(cd);
+    return PMIX_SUCCESS;
+}
+
+static void _store_internal(int sd, short args, void *cbdata)
+{
+    pmix_shift_caddy_t *cd = (pmix_shift_caddy_t*)cbdata;
+    pmix_nspace_t *ns, *nsptr;
+
+    PMIX_ACQUIRE_OBJECT(cd);
+
+    ns = NULL;
+    PMIX_LIST_FOREACH(nsptr, &pmix_globals.nspaces, pmix_nspace_t) {
+        if (0 == strncmp(cd->nspace, nsptr->nspace, PMIX_MAX_NSLEN)) {
+            ns = nsptr;
+            break;
+        }
+    }
+    if (NULL == ns) {
+        /* shouldn't be possible */
+        cd->status = PMIX_ERR_NOT_FOUND;
+    } else {
+        cd->status = pmix_hash_store(&ns->internal, cd->rank, cd->kv);
+    }
+    if (cd->lock.active) {
+        PMIX_WAKEUP_THREAD(&cd->lock);
+    }
+ }
+
+PMIX_EXPORT pmix_status_t PMIx_Store_internal(const pmix_proc_t *proc,
+                                              const char *key, pmix_value_t *val)
+{
+    pmix_shift_caddy_t *cd;
+    pmix_status_t rc;
+
+    PMIX_ACQUIRE_THREAD(&pmix_global_lock);
+    if (pmix_globals.init_cntr <= 0) {
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return PMIX_ERR_INIT;
+    }
+    PMIX_RELEASE_THREAD(&pmix_global_lock);
+
+    /* setup to thread shift this request */
+    cd = PMIX_NEW(pmix_shift_caddy_t);
+    cd->nspace = proc->nspace;
+    cd->rank = proc->rank;
+
+    cd->kv = PMIX_NEW(pmix_kval_t);
+    cd->kv->key = strdup((char*)key);
+    cd->kv->value = (pmix_value_t*)malloc(sizeof(pmix_value_t));
+    rc = pmix_value_xfer(cd->kv->value, val);
+    if (PMIX_SUCCESS != rc) {
+        PMIX_ERROR_LOG(rc);
+        PMIX_RELEASE(cd);
+        return rc;
+    }
+
+    PMIX_THREADSHIFT(cd, _store_internal);
+    PMIX_WAIT_THREAD(&cd->lock);
+    rc = cd->status;
+    PMIX_RELEASE(cd);
+
+    return rc;
+}
+
+#define PMIX_MAX_NODE_PREFIX        50
+
+PMIX_EXPORT pmix_status_t PMIx_generate_regex(const char *input, char **regexp)
+{
+    char *vptr, *vsave;
+    char prefix[PMIX_MAX_NODE_PREFIX];
+    int i, j, len, startnum, vnum, numdigits;
+    bool found, fullval;
+    char *suffix, *sfx;
+    pmix_regex_value_t *vreg;
+    pmix_regex_range_t *range;
+    pmix_list_t vids;
+    char **regexargs = NULL, *tmp, *tmp2;
+    char *cptr;
+
+    PMIX_ACQUIRE_THREAD(&pmix_global_lock);
+    if (pmix_globals.init_cntr <= 0) {
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return PMIX_ERR_INIT;
+    }
+    PMIX_RELEASE_THREAD(&pmix_global_lock);
+
+    /* define the default */
+    *regexp = NULL;
+
+    /* setup the list of results */
+    PMIX_CONSTRUCT(&vids, pmix_list_t);
+
+    /* cycle thru the array of input values - first copy
+     * it so we don't overwrite what we were given*/
+    vsave = strdup(input);
+    vptr = vsave;
+    while (NULL != (cptr = strchr(vptr, ',')) || 0 < strlen(vptr)) {
+        if (NULL != cptr) {
+            *cptr = '\0';
+        }
+        /* determine this node's prefix by looking for first non-alpha char */
+        fullval = false;
+        len = strlen(vptr);
+        startnum = -1;
+        memset(prefix, 0, PMIX_MAX_NODE_PREFIX);
+        numdigits = 0;
+        for (i=0, j=0; i < len; i++) {
+            if (!isalpha(vptr[i])) {
+                /* found a non-alpha char */
+                if (!isdigit(vptr[i])) {
+                    /* if it is anything but a digit, we just use
+                     * the entire name
+                     */
+                    fullval = true;
+                    break;
+                }
+                /* count the size of the numeric field - but don't
+                 * add the digits to the prefix
+                 */
+                numdigits++;
+                if (startnum < 0) {
+                    /* okay, this defines end of the prefix */
+                    startnum = i;
+                }
+                continue;
+            }
+            if (startnum < 0) {
+                prefix[j++] = vptr[i];
+            }
+        }
+        if (fullval || startnum < 0) {
+            /* can't compress this name - just add it to the list */
+            vreg = PMIX_NEW(pmix_regex_value_t);
+            vreg->prefix = strdup(vptr);
+            pmix_list_append(&vids, &vreg->super);
+            /* move to the next posn */
+            if (NULL == cptr) {
+                break;
+            }
+            vptr = cptr + 1;
+            continue;
+        }
+        /* convert the digits and get any suffix */
+        vnum = strtol(&vptr[startnum], &sfx, 10);
+        if (NULL != sfx) {
+            suffix = strdup(sfx);
+        } else {
+            suffix = NULL;
+        }
+        /* is this value already on our list? */
+        found = false;
+        PMIX_LIST_FOREACH(vreg, &vids, pmix_regex_value_t) {
+            if (0 < strlen(prefix) && NULL == vreg->prefix) {
+                continue;
+            }
+            if (0 == strlen(prefix) && NULL != vreg->prefix) {
+                continue;
+            }
+            if (0 < strlen(prefix) && NULL != vreg->prefix
+                && 0 != strcmp(prefix, vreg->prefix)) {
+                continue;
+            }
+            if (NULL == suffix && NULL != vreg->suffix) {
+                continue;
+            }
+            if (NULL != suffix && NULL == vreg->suffix) {
+                continue;
+            }
+            if (NULL != suffix && NULL != vreg->suffix &&
+                0 != strcmp(suffix, vreg->suffix)) {
+                continue;
+            }
+            if (numdigits != vreg->num_digits) {
+                continue;
+            }
+            /* found a match - flag it */
+            found = true;
+            /* get the last range on this nodeid - we do this
+             * to preserve order
+             */
+            range = (pmix_regex_range_t*)pmix_list_get_last(&vreg->ranges);
+            if (NULL == range) {
+                /* first range for this value */
+                range = PMIX_NEW(pmix_regex_range_t);
+                range->start = vnum;
+                range->cnt = 1;
+                pmix_list_append(&vreg->ranges, &range->super);
+                break;
+            }
+            /* see if the value is out of sequence */
+            if (vnum != (range->start + range->cnt)) {
+                /* start a new range */
+                range = PMIX_NEW(pmix_regex_range_t);
+                range->start = vnum;
+                range->cnt = 1;
+                pmix_list_append(&vreg->ranges, &range->super);
+                break;
+            }
+            /* everything matches - just increment the cnt */
+            range->cnt++;
+            break;
+        }
+        if (!found) {
+            /* need to add it */
+            vreg = PMIX_NEW(pmix_regex_value_t);
+            if (0 < strlen(prefix)) {
+                vreg->prefix = strdup(prefix);
+            }
+            if (NULL != suffix) {
+                vreg->suffix = strdup(suffix);
+            }
+            vreg->num_digits = numdigits;
+            pmix_list_append(&vids, &vreg->super);
+            /* record the first range for this value - we took
+             * care of values we can't compress above
+             */
+            range = PMIX_NEW(pmix_regex_range_t);
+            range->start = vnum;
+            range->cnt = 1;
+            pmix_list_append(&vreg->ranges, &range->super);
+        }
+        if (NULL != suffix) {
+            free(suffix);
+        }
+        /* move to the next posn */
+        if (NULL == cptr) {
+            break;
+        }
+        vptr = cptr + 1;
+    }
+    free(vsave);
+
+    /* begin constructing the regular expression */
+    while (NULL != (vreg = (pmix_regex_value_t*)pmix_list_remove_first(&vids))) {
+        /* if no ranges, then just add the name */
+        if (0 == pmix_list_get_size(&vreg->ranges)) {
+            if (NULL != vreg->prefix) {
+                /* solitary value */
+                if (0 > asprintf(&tmp, "%s", vreg->prefix)) {
+                    return PMIX_ERR_NOMEM;
+                }
+                pmix_argv_append_nosize(&regexargs, tmp);
+                free(tmp);
+            }
+            PMIX_RELEASE(vreg);
+            continue;
+        }
+        /* start the regex for this value with the prefix */
+        if (NULL != vreg->prefix) {
+            if (0 > asprintf(&tmp, "%s[%d:", vreg->prefix, vreg->num_digits)) {
+                return PMIX_ERR_NOMEM;
+            }
+        } else {
+            if (0 > asprintf(&tmp, "[%d:", vreg->num_digits)) {
+                return PMIX_ERR_NOMEM;
+            }
+        }
+        /* add the ranges */
+        while (NULL != (range = (pmix_regex_range_t*)pmix_list_remove_first(&vreg->ranges))) {
+            if (1 == range->cnt) {
+                if (0 > asprintf(&tmp2, "%s%d,", tmp, range->start)) {
+                    return PMIX_ERR_NOMEM;
+                }
+            } else {
+                if (0 > asprintf(&tmp2, "%s%d-%d,", tmp, range->start, range->start + range->cnt - 1)) {
+                    return PMIX_ERR_NOMEM;
+                }
+            }
+            free(tmp);
+            tmp = tmp2;
+            PMIX_RELEASE(range);
+        }
+        /* replace the final comma */
+        tmp[strlen(tmp)-1] = ']';
+        if (NULL != vreg->suffix) {
+            /* add in the suffix, if provided */
+            if (0 > asprintf(&tmp2, "%s%s", tmp, vreg->suffix)) {
+                return PMIX_ERR_NOMEM;
+            }
+            free(tmp);
+            tmp = tmp2;
+        }
+        pmix_argv_append_nosize(&regexargs, tmp);
+        free(tmp);
+        PMIX_RELEASE(vreg);
+    }
+
+    /* assemble final result */
+    tmp = pmix_argv_join(regexargs, ',');
+    if (0 > asprintf(regexp, "pmix[%s]", tmp)) {
+        return PMIX_ERR_NOMEM;
+    }
+    free(tmp);
+
+    /* cleanup */
+    pmix_argv_free(regexargs);
+
+    PMIX_DESTRUCT(&vids);
+    return PMIX_SUCCESS;
+}
+
+PMIX_EXPORT pmix_status_t PMIx_generate_ppn(const char *input, char **regexp)
+{
+    char **ppn, **npn;
+    int i, j, start, end;
+    pmix_regex_value_t *vreg;
+    pmix_regex_range_t *rng;
+    pmix_list_t nodes;
+    char *tmp, *tmp2;
+    char *cptr;
+
+    PMIX_ACQUIRE_THREAD(&pmix_global_lock);
+    if (pmix_globals.init_cntr <= 0) {
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return PMIX_ERR_INIT;
+    }
+    PMIX_RELEASE_THREAD(&pmix_global_lock);
+
+    /* define the default */
+    *regexp = NULL;
+
+    /* setup the list of results */
+    PMIX_CONSTRUCT(&nodes, pmix_list_t);
+
+    /* split the input by node */
+    ppn = pmix_argv_split(input, ';');
+
+    /* for each node, split the input by comma */
+    for (i=0; NULL != ppn[i]; i++) {
+        rng = NULL;
+        /* create a record for this node */
+        vreg = PMIX_NEW(pmix_regex_value_t);
+        pmix_list_append(&nodes, &vreg->super);
+        /* split the input for this node */
+        npn = pmix_argv_split(ppn[i], ',');
+        /* look at each element */
+        for (j=0; NULL != npn[j]; j++) {
+            /* is this a range? */
+            if (NULL != (cptr = strchr(npn[j], '-'))) {
+                /* terminate the string */
+                *cptr = '\0';
+                ++cptr;
+                start = strtol(npn[j], NULL, 10);
+                end = strtol(cptr, NULL, 10);
+                /* are we collecting a range? */
+                if (NULL == rng) {
+                    /* no - better start one */
+                    rng = PMIX_NEW(pmix_regex_range_t);
+                    rng->start = start;
+                    rng->cnt = end - start + 1;
+                    pmix_list_append(&vreg->ranges, &rng->super);
+                } else {
+                    /* is this a continuation of the current range? */
+                    if (start == (rng->start + rng->cnt)) {
+                        /* just add it to the end of this range */
+                        rng->cnt++;
+                    } else {
+                        /* nope, there is a break - create new range */
+                        rng = PMIX_NEW(pmix_regex_range_t);
+                        rng->start = start;
+                        rng->cnt = end - start + 1;
+                        pmix_list_append(&vreg->ranges, &rng->super);
+                    }
+                }
+            } else {
+                /* single rank given */
+                start = strtol(npn[j], NULL, 10);
+                /* are we collecting a range? */
+                if (NULL == rng) {
+                    /* no - better start one */
+                    rng = PMIX_NEW(pmix_regex_range_t);
+                    rng->start = start;
+                    rng->cnt = 1;
+                    pmix_list_append(&vreg->ranges, &rng->super);
+                } else {
+                    /* is this a continuation of the current range? */
+                    if (start == (rng->start + rng->cnt)) {
+                        /* just add it to the end of this range */
+                        rng->cnt++;
+                    } else {
+                        /* nope, there is a break - create new range */
+                        rng = PMIX_NEW(pmix_regex_range_t);
+                        rng->start = start;
+                        rng->cnt = 1;
+                        pmix_list_append(&vreg->ranges, &rng->super);
+                    }
+                }
+            }
+        }
+        pmix_argv_free(npn);
+    }
+    pmix_argv_free(ppn);
+
+
+    /* begin constructing the regular expression */
+    tmp = strdup("pmix[");
+    PMIX_LIST_FOREACH(vreg, &nodes, pmix_regex_value_t) {
+        while (NULL != (rng = (pmix_regex_range_t*)pmix_list_remove_first(&vreg->ranges))) {
+            if (1 == rng->cnt) {
+                if (0 > asprintf(&tmp2, "%s%d,", tmp, rng->start)) {
+                    return PMIX_ERR_NOMEM;
+                }
+            } else {
+                if (0 > asprintf(&tmp2, "%s%d-%d,", tmp, rng->start, rng->start + rng->cnt - 1)) {
+                    return PMIX_ERR_NOMEM;
+                }
+            }
+            free(tmp);
+            tmp = tmp2;
+            PMIX_RELEASE(rng);
+        }
+        /* replace the final comma */
+        tmp[strlen(tmp)-1] = ';';
+    }
+
+    /* replace the final semi-colon */
+    tmp[strlen(tmp)-1] = ']';
+
+    /* assemble final result */
+    *regexp = tmp;
+
+    PMIX_LIST_DESTRUCT(&nodes);
+    return PMIX_SUCCESS;
+}
+
+static void _setup_op(pmix_status_t rc, void *cbdata)
+{
+    pmix_setup_caddy_t *fcd = (pmix_setup_caddy_t*)cbdata;
+
+    if (NULL != fcd->info) {
+        PMIX_INFO_FREE(fcd->info, fcd->ninfo);
+    }
+    PMIX_RELEASE(fcd);
+}
+
+static void _setup_app(int sd, short args, void *cbdata)
+{
+    pmix_setup_caddy_t *cd = (pmix_setup_caddy_t*)cbdata;
+    pmix_setup_caddy_t *fcd = NULL;
+    pmix_status_t rc;
+    pmix_list_t ilist;
+    pmix_kval_t *kv;
+    size_t n;
+
+    PMIX_ACQUIRE_OBJECT(cd);
+
+    PMIX_CONSTRUCT(&ilist, pmix_list_t);
+
+    /* pass to the network libraries */
+    if (PMIX_SUCCESS != (rc = pmix_pnet.setup_app(cd->nspace, &ilist))) {
+        goto depart;
+    }
+
+    /* setup the return callback */
+    fcd = PMIX_NEW(pmix_setup_caddy_t);
+    if (NULL == fcd) {
+        rc = PMIX_ERR_NOMEM;
+        PMIX_ERROR_LOG(PMIX_ERR_NOMEM);
+        goto depart;
+    }
+
+    /* if anything came back, construct the info array */
+    if (0 < (fcd->ninfo = pmix_list_get_size(&ilist))) {
+        PMIX_INFO_CREATE(fcd->info, fcd->ninfo);
+        n = 0;
+        PMIX_LIST_FOREACH(kv, &ilist, pmix_kval_t) {
+            (void)strncpy(fcd->info[n].key, kv->key, PMIX_MAX_KEYLEN);
+            if (PMIX_SUCCESS != (rc = pmix_value_xfer(&fcd->info[n].value, kv->value))) {
+                PMIX_INFO_FREE(fcd->info, fcd->ninfo);
+                PMIX_RELEASE(fcd);
+                fcd = NULL;
+                goto depart;
+            }
+        }
+    }
+
+  depart:
+    /* always execute the callback to avoid hanging */
+    if (NULL != cd->setupcbfunc) {
+        if (NULL == fcd) {
+            cd->setupcbfunc(rc, NULL, 0, cd->cbdata, NULL, NULL);
+        } else {
+            cd->setupcbfunc(rc, fcd->info, fcd->ninfo, cd->cbdata, _setup_op, fcd);
+        }
+    }
+
+    /* cleanup memory */
+    PMIX_LIST_DESTRUCT(&ilist);
+    if (NULL != cd->nspace) {
+        free(cd->nspace);
+    }
+    PMIX_RELEASE(cd);
+}
+
+pmix_status_t PMIx_server_setup_application(const char nspace[],
+                                            pmix_info_t info[], size_t ninfo,
+                                            pmix_setup_application_cbfunc_t cbfunc, void *cbdata)
+{
+    pmix_setup_caddy_t *cd;
+
+    PMIX_ACQUIRE_THREAD(&pmix_global_lock);
+    if (pmix_globals.init_cntr <= 0) {
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return PMIX_ERR_INIT;
+    }
+    PMIX_RELEASE_THREAD(&pmix_global_lock);
+
+    /* need to threadshift this request */
+    cd = PMIX_NEW(pmix_setup_caddy_t);
+    if (NULL == cd) {
+        return PMIX_ERR_NOMEM;
+    }
+    if (NULL != nspace) {
+        cd->nspace = strdup(nspace);
+    }
+    cd->info = info;
+    cd->ninfo = ninfo;
+    cd->setupcbfunc = cbfunc;
+    cd->cbdata = cbdata;
+    PMIX_THREADSHIFT(cd, _setup_app);
+
+    return PMIX_SUCCESS;
+}
+
+static void _setup_local_support(int sd, short args, void *cbdata)
+{
+    pmix_setup_caddy_t *cd = (pmix_setup_caddy_t*)cbdata;
+    pmix_status_t rc;
+
+    PMIX_ACQUIRE_OBJECT(cd);
+
+    /* pass to the network libraries */
+    rc = pmix_pnet.setup_local_network(cd->nspace, cd->info, cd->ninfo);
+
+    /* pass the info back */
+    if (NULL != cd->opcbfunc) {
+        cd->opcbfunc(rc, cd->cbdata);
+    }
+    /* cleanup memory */
+    if (NULL != cd->nspace) {
+        free(cd->nspace);
+    }
+    PMIX_RELEASE(cd);
+}
+
+pmix_status_t PMIx_server_setup_local_support(const char nspace[],
+                                              pmix_info_t info[], size_t ninfo,
+                                              pmix_op_cbfunc_t cbfunc, void *cbdata)
+{
+    pmix_setup_caddy_t *cd;
+
+    PMIX_ACQUIRE_THREAD(&pmix_global_lock);
+    if (pmix_globals.init_cntr <= 0) {
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return PMIX_ERR_INIT;
+    }
+    PMIX_RELEASE_THREAD(&pmix_global_lock);
+
+    /* need to threadshift this request */
+    cd = PMIX_NEW(pmix_setup_caddy_t);
+    if (NULL == cd) {
+        return PMIX_ERR_NOMEM;
+    }
+    if (NULL != nspace) {
+        cd->nspace = strdup(nspace);
+    }
+    cd->info = info;
+    cd->ninfo = ninfo;
+    cd->opcbfunc = cbfunc;
+    cd->cbdata = cbdata;
+    PMIX_THREADSHIFT(cd, _setup_local_support);
+
+    return PMIX_SUCCESS;
+}
+
+
+/****    THE FOLLOWING CALLBACK FUNCTIONS ARE USED BY THE HOST SERVER    ****
+ ****    THEY THEREFORE CAN OCCUR IN EITHER THE HOST SERVER'S THREAD     ****
+ ****    CONTEXT, OR IN OUR OWN THREAD CONTEXT IF THE CALLBACK OCCURS    ****
+ ****    IMMEDIATELY. THUS ANYTHING THAT ACCESSES A GLOBAL ENTITY        ****
+ ****    MUST BE PUSHED INTO AN EVENT FOR PROTECTION                     ****/
+
+static void op_cbfunc(pmix_status_t status, void *cbdata)
+{
+    pmix_server_caddy_t *cd = (pmix_server_caddy_t*)cbdata;
+    pmix_buffer_t *reply;
+    pmix_status_t rc;
+
+    /* no need to thread-shift here as no global data is
+     * being accessed */
+
+    /* setup the reply with the returned status */
+    reply = PMIX_NEW(pmix_buffer_t);
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(reply, &status, 1, PMIX_STATUS))) {
+        PMIX_ERROR_LOG(rc);
+        PMIX_RELEASE(reply);
+        PMIX_RELEASE(cd);
+        return;
+    }
+
+    /* the function that created the server_caddy did a
+     * retain on the peer, so we don't have to worry about
+     * it still being present - send a copy to the originator */
+    if (PMIX_SUCCESS != (rc = pmix_ptl.send_oneway(cd->peer, reply, cd->hdr.tag))) {
+        PMIX_ERROR_LOG(rc);
+        PMIX_RELEASE(reply);
+    }
+
+    /* cleanup */
+    PMIX_RELEASE(cd);
+}
+
+static void _spcb(int sd, short args, void *cbdata)
+{
+    pmix_shift_caddy_t *cd = (pmix_shift_caddy_t*)cbdata;
+    pmix_nspace_t *nptr, *ns;
+    pmix_buffer_t *reply;
+    pmix_status_t rc;
+    char          *msg;
+
+    PMIX_ACQUIRE_OBJECT(cd);
+
+    /* setup the reply with the returned status */
+    reply = PMIX_NEW(pmix_buffer_t);
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(reply, &cd->status, 1, PMIX_STATUS))) {
+        PMIX_ERROR_LOG(rc);
+        PMIX_RELEASE(cd->cd);
+        PMIX_WAKEUP_THREAD(&cd->lock);
+        return;
+    }
+    if (PMIX_SUCCESS == cd->status) {
+        /* add any job-related info we have on that nspace - this will
+         * include the name of the nspace */
+        nptr = NULL;
+        PMIX_LIST_FOREACH(ns, &pmix_globals.nspaces, pmix_nspace_t) {
+            if (0 == strcmp(ns->nspace, cd->nspace)) {
+                nptr = ns;
+                break;
+            }
+        }
+        if (NULL == nptr) {
+            /* This can happen if there are no processes from this
+             * namespace running on this host.  In this case just
+             * pack the name of the namespace because we need that. */
+            msg = (char*)cd->nspace;
+            pmix_bfrop.pack(reply, &msg, 1, PMIX_STRING);
+        } else {
+            pmix_bfrop.copy_payload(reply, &nptr->server->job_info);
+        }
+    }
+
+    /* the function that created the server_caddy did a
+     * retain on the peer, so we don't have to worry about
+     * it still being present - tell the originator the result */
+    PMIX_SERVER_QUEUE_REPLY(cd->cd->peer, cd->cd->hdr.tag, reply);
+    /* cleanup */
+    PMIX_RELEASE(cd->cd);
+    PMIX_WAKEUP_THREAD(&cd->lock);
+}
+
+static void spawn_cbfunc(pmix_status_t status, char *nspace, void *cbdata)
+{
+    pmix_shift_caddy_t *cd;
+
+    /* need to thread-shift this request */
+    cd = PMIX_NEW(pmix_shift_caddy_t);
+    cd->status = status;
+    cd->nspace = nspace;
+    cd->cd = (pmix_server_caddy_t*)cbdata;;
+
+    PMIX_THREADSHIFT(cd, _spcb);
+    PMIX_WAIT_THREAD(&cd->lock);
+    PMIX_RELEASE(cd);
+}
+
+static void lookup_cbfunc(pmix_status_t status, pmix_pdata_t pdata[], size_t ndata,
+                          void *cbdata)
+{
+    pmix_server_caddy_t *cd = (pmix_server_caddy_t*)cbdata;
+    pmix_buffer_t *reply;
+    pmix_status_t rc;
+
+    /* no need to thread-shift as no global data is accessed */
+
+    /* setup the reply with the returned status */
+    reply = PMIX_NEW(pmix_buffer_t);
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(reply, &status, 1, PMIX_STATUS))) {
+        PMIX_ERROR_LOG(rc);
+        PMIX_RELEASE(reply);
+        return;
+    }
+    if (PMIX_SUCCESS == status) {
+        /* pack the returned data objects */
+        if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(reply, &ndata, 1, PMIX_SIZE))) {
+            PMIX_ERROR_LOG(rc);
+            PMIX_RELEASE(reply);
+            return;
+        }
+        if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(reply, pdata, ndata, PMIX_PDATA))) {
+            PMIX_ERROR_LOG(rc);
+            PMIX_RELEASE(reply);
+            return;
+        }
+    }
+
+    /* the function that created the server_caddy did a
+     * retain on the peer, so we don't have to worry about
+     * it still being present - tell the originator the result */
+    PMIX_SERVER_QUEUE_REPLY(cd->peer, cd->hdr.tag, reply);
+    /* cleanup */
+    PMIX_RELEASE(cd);
+}
+
+static void _mdxcbfunc(int sd, short argc, void *cbdata)
+{
+    pmix_shift_caddy_t *scd = (pmix_shift_caddy_t*)cbdata;
+    pmix_server_trkr_t *tracker = scd->tracker;
+    pmix_buffer_t xfer, *bptr, *databuf=NULL, *bpscope, *reply;
+    pmix_nspace_t *nptr, *ns;
+    pmix_server_caddy_t *cd;
+    char *nspace;
+    int rank;
+    pmix_status_t rc = PMIX_SUCCESS;
+    int32_t cnt = 1;
+    char byte;
+
+    PMIX_ACQUIRE_OBJECT(scd);
+
+    /* pass the blobs being returned */
+    PMIX_CONSTRUCT(&xfer, pmix_buffer_t);
+
+    if (PMIX_SUCCESS != scd->status) {
+        rc = scd->status;
+        goto finish_collective;
+    }
+
+    if (PMIX_COLLECT_INVALID == tracker->collect_type) {
+        rc = PMIX_ERR_INVALID_ARG;
+        goto finish_collective;
+    }
+
+    PMIX_LOAD_BUFFER(&xfer, scd->data, scd->ndata);
+
+    /* if data was returned, unpack and store it */
+    while (PMIX_SUCCESS == (rc = pmix_bfrop.unpack(&xfer, &byte, &cnt, PMIX_BYTE))) {
+        pmix_collect_t ctype = (pmix_collect_t)byte;
+
+        // Check that this blob was accumulated with the same data collection setting
+        if (ctype != tracker->collect_type) {
+            rc = PMIX_ERR_INVALID_ARG;
+            goto finish_collective;
+        }
+
+        // Skip the rest of the iteration if there is no data
+        if (PMIX_COLLECT_YES != tracker->collect_type) {
+            continue;
+        }
+
+        // Extract the node-wise blob containing rank data
+        cnt = 1;
+        if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(&xfer, &databuf, &cnt, PMIX_BUFFER))) {
+            rc = PMIX_ERR_DATA_VALUE_NOT_FOUND;
+            goto finish_collective;
+        }
+
+        // Loop over rank blobs
+        cnt = 1;
+        while (PMIX_SUCCESS == (rc = pmix_bfrop.unpack(databuf, &bptr, &cnt, PMIX_BUFFER))) {
+            /* unpack the nspace */
+            cnt = 1;
+            if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(bptr, &nspace, &cnt, PMIX_STRING))) {
+                PMIX_ERROR_LOG(rc);
+                goto finish_collective;
+            }
+            pmix_output_verbose(2, pmix_globals.debug_output,
+                                "server:modex_cbfunc unpacked blob for npsace %s", nspace);
+            /* find the nspace object */
+            nptr = NULL;
+            PMIX_LIST_FOREACH(ns, &pmix_globals.nspaces, pmix_nspace_t) {
+                if (0 == strcmp(nspace, ns->nspace)) {
+                    nptr = ns;
+                    break;
+                }
+            }
+
+            if (NULL == nptr) {
+                /* Shouldn't happen. The Fence is performed among well-known
+                 * set of processes in known namespaces. Consider this as
+                 * unrecoverable fault.
+                 */
+                pmix_output_verbose(8, pmix_globals.debug_output,
+                                    "modex_cbfunc: unknown nspace %s, Fence ", nspace);
+                free(nspace);
+                /*
+                 * TODO: if some namespaces are OK and the bad one is not the first
+                 * the server is in inconsistent state. Should we rely on the client to abort
+                 * computation or this is our task?
+                 */
+                rc = PMIX_ERR_INVALID_NAMESPACE;
+                goto finish_collective;
+            }
+            free(nspace);
+
+            /* unpack the rank */
+            cnt = 1;
+            if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(bptr, &rank, &cnt, PMIX_PROC_RANK))) {
+                PMIX_ERROR_LOG(rc);
+                goto finish_collective;
+            }
+            pmix_output_verbose(2, pmix_globals.debug_output,
+                                "client:unpack fence received blob for rank %d", rank);
+            /* there may be multiple blobs for this rank, each from a different scope */
+            cnt = 1;
+            while (PMIX_SUCCESS == (rc = pmix_bfrop.unpack(bptr, &bpscope, &cnt, PMIX_BUFFER))) {
+                /* don't store blobs to the sm dstore from local clients */
+                if (_my_client(nptr->nspace, rank)) {
+                    continue;
+                }
+                pmix_kval_t *kp = PMIX_NEW(pmix_kval_t);
+                kp->key = strdup("modex");
+                PMIX_VALUE_CREATE(kp->value, 1);
+                kp->value->type = PMIX_BYTE_OBJECT;
+                PMIX_UNLOAD_BUFFER(bpscope, kp->value->data.bo.bytes, kp->value->data.bo.size);
+                /* store it in the appropriate hash */
+                if (PMIX_SUCCESS != (rc = pmix_hash_store(&nptr->server->remote, rank, kp))) {
+                    PMIX_ERROR_LOG(rc);
+                }
+#if defined(PMIX_ENABLE_DSTORE) && (PMIX_ENABLE_DSTORE == 1)
+                if (PMIX_SUCCESS != (rc = pmix_dstore_store(nptr->nspace, rank, kp))) {
+                    PMIX_ERROR_LOG(rc);
+                }
+#endif /* PMIX_ENABLE_DSTORE */
+                PMIX_RELEASE(kp);  // maintain acctg
+            }  // while bpscope
+            if (PMIX_ERR_UNPACK_READ_PAST_END_OF_BUFFER != rc) {
+                PMIX_ERROR_LOG(rc);
+                /*
+                 * TODO: if some buffers are OK and the bad one is not the first
+                 * the server is in inconsistent state. Should we rely on the client to abort
+                 * computation or this is our task?
+                 */
+                goto finish_collective;
+            }
+            PMIX_RELEASE(bpscope);
+            PMIX_RELEASE(bptr);
+            cnt = 1;
+        }
+        if (PMIX_ERR_UNPACK_READ_PAST_END_OF_BUFFER != rc) {
+            goto finish_collective;
+        } else {
+            rc = PMIX_SUCCESS;
+        }
+        cnt = 1;
+    } // while bptr
+
+    if (PMIX_ERR_UNPACK_READ_PAST_END_OF_BUFFER == rc) {
+        rc = PMIX_SUCCESS;
+    }
+
+  finish_collective:
+    if (NULL != databuf) {
+        PMIX_RELEASE(databuf);
+    }
+    /* setup the reply, starting with the returned status */
+    reply = PMIX_NEW(pmix_buffer_t);
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(reply, &rc, 1, PMIX_STATUS))) {
+        PMIX_ERROR_LOG(rc);
+        goto cleanup;
+    }
+
+    /* loop across all procs in the tracker, sending them the reply */
+    PMIX_LIST_FOREACH(cd, &tracker->local_cbs, pmix_server_caddy_t) {
+        PMIX_RETAIN(reply);
+        pmix_output_verbose(2, pmix_globals.debug_output,
+                            "server:modex_cbfunc reply being sent to %s:%d",
+                            cd->peer->info->nptr->nspace, cd->peer->info->rank);
+        PMIX_SERVER_QUEUE_REPLY(cd->peer, cd->hdr.tag, reply);
+    }
+
+  cleanup:
+    /* Protect data from being free'd because RM pass
+     * the pointer that is set to the middle of some
+     * buffer (the case with SLURM).
+     * RM is responsible on the release of the buffer
+     */
+    xfer.base_ptr = NULL;
+    xfer.bytes_used = 0;
+    PMIX_DESTRUCT(&xfer);
+
+    PMIX_RELEASE(reply);  // maintain accounting
+    pmix_list_remove_item(&pmix_server_globals.collectives, &tracker->super);
+    PMIX_RELEASE(tracker);
+
+    /* we are done */
+    if (NULL != scd->cbfunc.relfn) {
+        scd->cbfunc.relfn(scd->cbdata);
+    }
+    PMIX_RELEASE(scd);
+}
+static void modex_cbfunc(pmix_status_t status, const char *data, size_t ndata, void *cbdata,
+                         pmix_release_cbfunc_t relfn, void *relcbd)
+{
+    pmix_server_trkr_t *tracker = (pmix_server_trkr_t*)cbdata;
+    pmix_shift_caddy_t *scd;
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "server:modex_cbfunc called with %d bytes", (int)ndata);
+
+    if (NULL == tracker) {
+        /* nothing to do - but be sure to give them
+         * a release if they want it */
+        if (NULL != relfn) {
+            relfn(relcbd);
+        }
+        return;
+    }
+
+    /* need to thread-shift this callback as it accesses global data */
+    scd = PMIX_NEW(pmix_shift_caddy_t);
+    scd->status = status;
+    scd->data = data;
+    scd->ndata = ndata;
+    scd->tracker = tracker;
+    scd->cbfunc.relfn = relfn;
+    scd->cbdata = relcbd;
+    PMIX_THREADSHIFT(scd, _mdxcbfunc);
+}
+
+static void get_cbfunc(pmix_status_t status, const char *data, size_t ndata, void *cbdata,
+                       pmix_release_cbfunc_t relfn, void *relcbd)
+{
+    pmix_server_caddy_t *cd = (pmix_server_caddy_t*)cbdata;
+    pmix_buffer_t *reply, buf;
+    pmix_status_t rc;
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "server:get_cbfunc called with %d elements", (int)ndata);
+
+    /* no need to thread-shift here as no global data is accessed */
+
+    if (NULL == cd) {
+        /* nothing to do - but be sure to give them
+         * a release if they want it */
+        if (NULL != relfn) {
+            relfn(relcbd);
+        }
+        return;
+    }
+
+    /* setup the reply, starting with the returned status */
+    reply = PMIX_NEW(pmix_buffer_t);
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(reply, &status, 1, PMIX_STATUS))) {
+        PMIX_ERROR_LOG(rc);
+        goto cleanup;
+    }
+    /* pack the blob being returned */
+    PMIX_CONSTRUCT(&buf, pmix_buffer_t);
+    PMIX_LOAD_BUFFER(&buf, data, ndata);
+    pmix_bfrop.copy_payload(reply, &buf);
+    buf.base_ptr = NULL;
+    buf.bytes_used = 0;
+    PMIX_DESTRUCT(&buf);
+    /* send the data to the requestor */
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "server:get_cbfunc reply being sent to %s:%d",
+                        cd->peer->info->nptr->nspace, cd->peer->info->rank);
+    pmix_output_hexdump(5, pmix_globals.debug_output,
+            reply->base_ptr, (reply->bytes_used < 256 ? reply->bytes_used : 256));
+
+    PMIX_SERVER_QUEUE_REPLY(cd->peer, cd->hdr.tag, reply);
+
+ cleanup:
+    /* if someone wants a release, give it to them */
+    if (NULL != relfn) {
+        relfn(relcbd);
+    }
+    PMIX_RELEASE(cd);
+}
+
+static void _cnct(int sd, short args, void *cbdata)
+{
+    pmix_shift_caddy_t *scd = (pmix_shift_caddy_t*)cbdata;
+    pmix_server_trkr_t *tracker = scd->tracker;
+    pmix_buffer_t *reply;
+    pmix_status_t rc;
+    int i;
+    pmix_server_caddy_t *cd;
+    char **nspaces=NULL;
+    pmix_nspace_t *nptr;
+    pmix_buffer_t *job_info_ptr;
+
+    PMIX_ACQUIRE_OBJECT(scd);
+
+    /* setup the reply, starting with the returned status */
+    reply = PMIX_NEW(pmix_buffer_t);
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(reply, &scd->status, 1, PMIX_STATUS))) {
+        PMIX_ERROR_LOG(rc);
+        goto cleanup;
+    }
+
+    if (PMIX_CONNECTNB_CMD == tracker->type) {
+        /* find the unique nspaces that are participating */
+        PMIX_LIST_FOREACH(cd, &tracker->local_cbs, pmix_server_caddy_t) {
+            pmix_argv_append_unique_nosize(&nspaces, cd->peer->info->nptr->nspace, false);
+        }
+
+        /* loop across all participating nspaces and include their
+         * job-related info */
+        for (i=0; NULL != nspaces[i]; i++) {
+            PMIX_LIST_FOREACH(nptr, &pmix_globals.nspaces, pmix_nspace_t) {
+                if (0 != strcmp(nspaces[i], nptr->nspace)) {
+                    continue;
+                }
+                job_info_ptr = &nptr->server->job_info;
+                if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(reply, &job_info_ptr, 1, PMIX_BUFFER))) {
+                    PMIX_ERROR_LOG(rc);
+                    pmix_argv_free(nspaces);
+                    goto cleanup;
+                }
+            }
+        }
+        pmix_argv_free(nspaces);
+    }
+
+    /* loop across all procs in the tracker, sending them the reply */
+    PMIX_LIST_FOREACH(cd, &tracker->local_cbs, pmix_server_caddy_t) {
+        PMIX_RETAIN(reply);
+        pmix_output_verbose(2, pmix_globals.debug_output,
+                            "server:cnct_cbfunc reply being sent to %s:%d",
+                            cd->peer->info->nptr->nspace, cd->peer->info->rank);
+        PMIX_SERVER_QUEUE_REPLY(cd->peer, cd->hdr.tag, reply);
+    }
+
+  cleanup:
+    PMIX_RELEASE(reply);  // maintain accounting
+    pmix_list_remove_item(&pmix_server_globals.collectives, &tracker->super);
+    PMIX_RELEASE(tracker);
+
+    /* we are done */
+    PMIX_RELEASE(scd);
+}
+
+static void cnct_cbfunc(pmix_status_t status, void *cbdata)
+{
+    pmix_server_trkr_t *tracker = (pmix_server_trkr_t*)cbdata;
+    pmix_shift_caddy_t *scd;
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "server:cnct_cbfunc called");
+
+    if (NULL == tracker) {
+        /* nothing to do */
+        return;
+    }
+
+    /* need to thread-shift this callback as it accesses global data */
+    scd = PMIX_NEW(pmix_shift_caddy_t);
+    scd->status = status;
+    scd->tracker = tracker;
+    PMIX_THREADSHIFT(scd, _cnct);
+}
+
+static void regevents_cbfunc(pmix_status_t status, void *cbdata)
+{
+    pmix_status_t rc;
+    pmix_server_caddy_t *cd = (pmix_server_caddy_t*) cbdata;
+    pmix_buffer_t *reply;
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "server:regevents_cbfunc called status = %d", status);
+
+    reply = PMIX_NEW(pmix_buffer_t);
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(reply, &status, 1, PMIX_STATUS))) {
+        PMIX_ERROR_LOG(rc);
+    }
+    // send reply
+    PMIX_SERVER_QUEUE_REPLY(cd->peer, cd->hdr.tag, reply);
+    PMIX_RELEASE(cd);
+}
+
+static void notifyerror_cbfunc (pmix_status_t status, void *cbdata)
+{
+    pmix_status_t rc;
+    pmix_server_caddy_t *cd = (pmix_server_caddy_t*) cbdata;
+    pmix_buffer_t *reply = PMIX_NEW(pmix_buffer_t);
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "server:notifyerror_cbfunc called status = %d", status);
+
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(reply, &status, 1, PMIX_STATUS))) {
+        PMIX_ERROR_LOG(rc);
+    }
+    // send reply
+    PMIX_SERVER_QUEUE_REPLY(cd->peer, cd->hdr.tag, reply);
+    PMIX_RELEASE(cd);
+}
+
+
+static void query_cbfunc(pmix_status_t status,
+                         pmix_info_t *info, size_t ninfo,
+                         void *cbdata,
+                         pmix_release_cbfunc_t release_fn,
+                         void *release_cbdata)
+{
+    pmix_query_caddy_t *qcd = (pmix_query_caddy_t*)cbdata;
+    pmix_server_caddy_t *cd = (pmix_server_caddy_t*)qcd->cbdata;
+    pmix_buffer_t *reply = PMIX_NEW(pmix_buffer_t);
+    pmix_status_t rc;
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "pmix:query callback with status %d", status);
+
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(reply, &status, 1, PMIX_STATUS))) {
+        PMIX_ERROR_LOG(rc);
+        goto complete;
+    }
+    /* pack the returned data */
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(reply, &ninfo, 1, PMIX_SIZE))) {
+        PMIX_ERROR_LOG(rc);
+        goto complete;
+    }
+    if (0 < ninfo) {
+        if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(reply, info, ninfo, PMIX_INFO))) {
+            PMIX_ERROR_LOG(rc);
+        }
+    }
+
+  complete:
+    // send reply
+    PMIX_SERVER_QUEUE_REPLY(cd->peer, cd->hdr.tag, reply);
+    // cleanup
+    if (NULL != qcd->queries) {
+        PMIX_QUERY_FREE(qcd->queries, qcd->nqueries);
+    }
+    if (NULL != qcd->info) {
+        PMIX_INFO_FREE(qcd->info, qcd->ninfo);
+    }
+    PMIX_RELEASE(qcd);
+    PMIX_RELEASE(cd);
+}
+
+/* the switchyard is the primary message handling function. It's purpose
+ * is to take incoming commands (packed into a buffer), unpack them,
+ * and then call the corresponding host server's function to execute
+ * them. Some commands involve only a single proc (i.e., the one
+ * sending the command) and can be executed while we wait. In these cases,
+ * the switchyard will construct and pack a reply buffer to be returned
+ * to the sender.
+ *
+ * Other cases (either multi-process collective or cmds that require
+ * an async reply) cannot generate an immediate reply. In these cases,
+ * the reply buffer will be NULL. An appropriate callback function will
+ * be called that will be responsible for eventually replying to the
+ * calling processes.
+ *
+ * Should an error be encountered at any time within the switchyard, an
+ * error reply buffer will be returned so that the caller can be notified,
+ * thereby preventing the process from hanging. */
+static pmix_status_t server_switchyard(pmix_peer_t *peer, uint32_t tag,
+                                       pmix_buffer_t *buf)
+{
+    pmix_status_t rc=PMIX_ERR_NOT_SUPPORTED;
+    int32_t cnt;
+    pmix_cmd_t cmd;
+    pmix_server_caddy_t *cd;
+    pmix_proc_t proc;
+    pmix_buffer_t *reply;
+    pmix_regevents_info_t *reginfo;
+    pmix_peer_events_info_t *prev;
+
+    /* retrieve the cmd */
+    cnt = 1;
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, &cmd, &cnt, PMIX_CMD))) {
+        PMIX_ERROR_LOG(rc);
+        return rc;
+    }
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "recvd pmix cmd %d from %s:%d",
+                        cmd, peer->info->nptr->nspace, peer->info->rank);
+
+    if (PMIX_REQ_CMD == cmd) {
+        reply = PMIX_NEW(pmix_buffer_t);
+
+#if defined(PMIX_ENABLE_DSTORE) && (PMIX_ENABLE_DSTORE == 1)
+        char *msg = peer->info->nptr->nspace;
+        if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(reply, &msg, 1, PMIX_STRING))) {
+            PMIX_ERROR_LOG(rc);
+            return rc;
+        }
+#else
+        pmix_bfrop.copy_payload(reply, &(peer->info->nptr->server->job_info));
+        pmix_bfrop.copy_payload(reply, &(pmix_server_globals.gdata));
+#endif
+        PMIX_SERVER_QUEUE_REPLY(peer, tag, reply);
+        return PMIX_SUCCESS; // don't reply twice
+    }
+
+    if (PMIX_ABORT_CMD == cmd) {
+        PMIX_PEER_CADDY(cd, peer, tag);
+        if (PMIX_SUCCESS != (rc = pmix_server_abort(peer, buf, op_cbfunc, cd))) {
+            PMIX_RELEASE(cd);
+        }
+        return rc;
+    }
+
+    if (PMIX_COMMIT_CMD == cmd) {
+        rc = pmix_server_commit(peer, buf);
+        reply = PMIX_NEW(pmix_buffer_t);
+        pmix_bfrop.pack(reply, &rc, 1, PMIX_STATUS);
+        PMIX_SERVER_QUEUE_REPLY(peer, tag, reply);
+        return PMIX_SUCCESS; // don't reply twice
+    }
+
+    if (PMIX_FENCENB_CMD == cmd) {
+        PMIX_PEER_CADDY(cd, peer, tag);
+        if (PMIX_SUCCESS != (rc = pmix_server_fence(cd, buf, modex_cbfunc, op_cbfunc))) {
+            PMIX_RELEASE(cd);
+        }
+        return rc;
+    }
+
+    if (PMIX_GETNB_CMD == cmd) {
+        PMIX_PEER_CADDY(cd, peer, tag);
+        if (PMIX_SUCCESS != (rc = pmix_server_get(buf, get_cbfunc, cd))) {
+            PMIX_RELEASE(cd);
+        }
+        return rc;
+    }
+
+    if (PMIX_FINALIZE_CMD == cmd) {
+        pmix_output_verbose(2, pmix_globals.debug_output,
+                            "recvd FINALIZE");
+        /* mark that this peer called finalize */
+        peer->finalized = true;
+        /* call the local server, if supported */
+        if (NULL != pmix_host_server.client_finalized) {
+            PMIX_PEER_CADDY(cd, peer, tag);
+            (void)strncpy(proc.nspace, peer->info->nptr->nspace, PMIX_MAX_NSLEN);
+            proc.rank = peer->info->rank;
+            /* since the client is finalizing, remove them from any event
+             * registrations they may still have on our list */
+            PMIX_LIST_FOREACH(reginfo, &pmix_server_globals.events, pmix_regevents_info_t) {
+                PMIX_LIST_FOREACH(prev, &reginfo->peers, pmix_peer_events_info_t) {
+                    if (prev->peer == peer) {
+                        pmix_list_remove_item(&reginfo->peers, &prev->super);
+                        PMIX_RELEASE(prev);
+                        break;
+                    }
+                }
+            }
+            /* now tell the host server */
+            if (PMIX_SUCCESS != (rc = pmix_host_server.client_finalized(&proc, peer->info->server_object,
+                                                                        op_cbfunc, cd))) {
+                PMIX_RELEASE(cd);
+            } else {
+                /* don't reply to them ourselves - we will do so when the host
+                 * server calls us back */
+                return rc;
+            }
+        }
+        /* turn off the recv event - we shouldn't hear anything
+         * more from this proc */
+        if (peer->recv_ev_active) {
+            pmix_event_del(&peer->recv_event);
+            peer->recv_ev_active = false;
+        }
+        /* let the network libraries cleanup */
+        pmix_pnet.child_finalized(peer);
+        return rc;
+    }
+
+
+    if (PMIX_PUBLISHNB_CMD == cmd) {
+        PMIX_PEER_CADDY(cd, peer, tag);
+        if (PMIX_SUCCESS != (rc = pmix_server_publish(peer, buf, op_cbfunc, cd))) {
+            PMIX_RELEASE(cd);
+        }
+        return rc;
+    }
+
+
+    if (PMIX_LOOKUPNB_CMD == cmd) {
+        PMIX_PEER_CADDY(cd, peer, tag);
+        if (PMIX_SUCCESS != (rc = pmix_server_lookup(peer, buf, lookup_cbfunc, cd))) {
+            PMIX_RELEASE(cd);
+        }
+        return rc;
+    }
+
+
+    if (PMIX_UNPUBLISHNB_CMD == cmd) {
+        PMIX_PEER_CADDY(cd, peer, tag);
+        if (PMIX_SUCCESS != (rc = pmix_server_unpublish(peer, buf, op_cbfunc, cd))) {
+            PMIX_RELEASE(cd);
+        }
+        return rc;
+    }
+
+
+    if (PMIX_SPAWNNB_CMD == cmd) {
+        PMIX_PEER_CADDY(cd, peer, tag);
+        if (PMIX_SUCCESS != (rc = pmix_server_spawn(peer, buf, spawn_cbfunc, cd))) {
+            PMIX_RELEASE(cd);
+        }
+        return rc;
+    }
+
+
+    if (PMIX_CONNECTNB_CMD == cmd) {
+        PMIX_PEER_CADDY(cd, peer, tag);
+        rc = pmix_server_connect(cd, buf, false, cnct_cbfunc);
+        PMIX_RELEASE(cd);
+        return rc;
+    }
+
+    if (PMIX_DISCONNECTNB_CMD == cmd) {
+        PMIX_PEER_CADDY(cd, peer, tag);
+        rc = pmix_server_connect(cd, buf, true, cnct_cbfunc);
+        PMIX_RELEASE(cd);
+        return rc;
+    }
+
+    if (PMIX_REGEVENTS_CMD == cmd) {
+        PMIX_PEER_CADDY(cd, peer, tag);
+        if (PMIX_SUCCESS != (rc = pmix_server_register_events(peer, buf, regevents_cbfunc, cd))) {
+            PMIX_RELEASE(cd);
+        }
+        return rc;
+    }
+
+    if (PMIX_DEREGEVENTS_CMD == cmd) {
+        pmix_server_deregister_events(peer, buf);
+        return PMIX_SUCCESS;
+    }
+
+    if (PMIX_NOTIFY_CMD == cmd) {
+        PMIX_PEER_CADDY(cd, peer, tag);
+        rc = pmix_server_event_recvd_from_client(peer, buf, notifyerror_cbfunc, cd);
+        return rc;
+    }
+
+    if (PMIX_QUERY_CMD == cmd) {
+        PMIX_PEER_CADDY(cd, peer, tag);
+        rc = pmix_server_query(peer, buf, query_cbfunc, cd);
+        return rc;
+    }
+
+    if (PMIX_LOG_CMD == cmd) {
+        PMIX_PEER_CADDY(cd, peer, tag);
+        rc = pmix_server_log(peer, buf, op_cbfunc, cd);
+        return rc;
+    }
+
+    if (PMIX_ALLOC_CMD == cmd) {
+        PMIX_PEER_CADDY(cd, peer, tag);
+        rc = pmix_server_alloc(peer, buf, query_cbfunc, cd);
+        return rc;
+    }
+
+    if (PMIX_JOB_CONTROL_CMD == cmd) {
+        PMIX_PEER_CADDY(cd, peer, tag);
+        rc = pmix_server_job_ctrl(peer, buf, query_cbfunc, cd);
+        return rc;
+    }
+
+    if (PMIX_MONITOR_CMD == cmd) {
+        PMIX_PEER_CADDY(cd, peer, tag);
+        rc = pmix_server_monitor(peer, buf, query_cbfunc, cd);
+        return rc;
+    }
+
+    return PMIX_ERR_NOT_SUPPORTED;
+}
+
+static void server_message_handler(struct pmix_peer_t *pr,
+                                   pmix_ptl_hdr_t *hdr,
+                                   pmix_buffer_t *buf, void *cbdata)
+{
+    pmix_peer_t *peer = (pmix_peer_t*)pr;
+    pmix_buffer_t *reply;
+    pmix_status_t rc;
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "SWITCHYARD for %s:%d:%d",
+                        peer->info->nptr->nspace,
+                        peer->info->rank, peer->sd);
+
+    rc = server_switchyard(peer, hdr->tag, buf);
+    /* send the return, if there was an error returned */
+    if (PMIX_SUCCESS != rc) {
+        reply = PMIX_NEW(pmix_buffer_t);
+        pmix_bfrop.pack(reply, &rc, 1, PMIX_STATUS);
+        PMIX_SERVER_QUEUE_REPLY(peer, hdr->tag, reply);
+    }
+}
+
+static inline int _my_client(const char *nspace, pmix_rank_t rank)
+{
+    pmix_peer_t *peer;
+    int i;
+    int local = 0;
+
+    for (i = 0; i < pmix_server_globals.clients.size; i++) {
+        if (NULL != (peer = (pmix_peer_t *)pmix_pointer_array_get_item(&pmix_server_globals.clients, i))) {
+            if (0 == strcmp(peer->info->nptr->nspace, nspace) && peer->info->rank == rank) {
+                local = 1;
+                break;
+            }
+        }
+    }
+
+    return local;
+}
diff --git a/src/server/pmix_server_get.c b/src/server/pmix_server_get.c
new file mode 100644
index 0000000..ab1915a
--- /dev/null
+++ b/src/server/pmix_server_get.c
@@ -0,0 +1,716 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2014-2017 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2014-2015 Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2014-2015 Artem Y. Polyakov <artpol84 at gmail.com>.
+ *                         All rights reserved.
+ * Copyright (c) 2016      Mellanox Technologies, Inc.
+ *                         All rights reserved.
+ * Copyright (c) 2016      IBM Corporation.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+
+#include <src/include/types.h>
+#include <src/include/pmix_stdint.h>
+#include <src/include/pmix_socket_errno.h>
+
+#include <pmix_server.h>
+#include <pmix_rename.h>
+#include "src/include/pmix_globals.h"
+
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+#include <fcntl.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_SYS_UN_H
+#include <sys/un.h>
+#endif
+#ifdef HAVE_SYS_UIO_H
+#include <sys/uio.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#include PMIX_EVENT_HEADER
+
+#include "src/class/pmix_list.h"
+#include "src/buffer_ops/buffer_ops.h"
+#include "src/util/argv.h"
+#include "src/util/error.h"
+#include "src/util/output.h"
+#include "src/util/pmix_environ.h"
+#if defined(PMIX_ENABLE_DSTORE) && (PMIX_ENABLE_DSTORE == 1)
+#include "src/dstore/pmix_dstore.h"
+#endif /* PMIX_ENABLE_DSTORE */
+
+#include "pmix_server_ops.h"
+
+extern pmix_server_module_t pmix_host_server;
+
+typedef struct {
+    pmix_object_t super;
+    pmix_event_t ev;
+    volatile bool active;
+    pmix_status_t status;
+    const char *data;
+    size_t ndata;
+    pmix_dmdx_local_t *lcd;
+    pmix_release_cbfunc_t relcbfunc;
+    void *cbdata;
+} pmix_dmdx_reply_caddy_t;
+static void dcd_con(pmix_dmdx_reply_caddy_t *p)
+{
+    p->status = PMIX_ERROR;
+    p->ndata = 0;
+    p->lcd = NULL;
+    p->relcbfunc = NULL;
+    p->cbdata = NULL;
+}
+PMIX_CLASS_INSTANCE(pmix_dmdx_reply_caddy_t,
+                   pmix_object_t, dcd_con, NULL);
+
+
+static void dmdx_cbfunc(pmix_status_t status, const char *data,
+                        size_t ndata, void *cbdata,
+                        pmix_release_cbfunc_t relfn, void *relcbdata);
+static pmix_status_t _satisfy_request(pmix_nspace_t *ns, pmix_rank_t rank,
+                                      pmix_server_caddy_t *cd,
+                                      pmix_modex_cbfunc_t cbfunc, void *cbdata, bool *scope);
+static pmix_status_t create_local_tracker(char nspace[], pmix_rank_t rank,
+                                          pmix_info_t info[], size_t ninfo,
+                                          pmix_modex_cbfunc_t cbfunc,
+                                          void *cbdata,
+                                          pmix_dmdx_local_t **lcd);
+
+
+/* declare a function whose sole purpose is to
+ * free data that we provided to our host server
+ * when servicing dmodex requests */
+static void relfn(void *cbdata)
+{
+    char *data = (char*)cbdata;
+    if (NULL != data) {
+        free(data);
+    }
+}
+
+
+pmix_status_t pmix_server_get(pmix_buffer_t *buf,
+                              pmix_modex_cbfunc_t cbfunc,
+                              void *cbdata)
+{
+    pmix_server_caddy_t *cd = (pmix_server_caddy_t*)cbdata;
+    int32_t cnt;
+    pmix_status_t rc;
+    pmix_rank_t rank;
+    char *cptr;
+    char nspace[PMIX_MAX_NSLEN+1];
+    pmix_nspace_t *ns, *nptr;
+    pmix_info_t *info=NULL;
+    size_t ninfo=0;
+    pmix_dmdx_local_t *lcd;
+    bool local;
+    bool localonly = false;
+    pmix_buffer_t pbkt;
+    char *data;
+    size_t sz, n;
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "recvd GET");
+
+    /* setup */
+    memset(nspace, 0, sizeof(nspace));
+
+    /* retrieve the nspace and rank of the requested proc */
+    cnt = 1;
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, &cptr, &cnt, PMIX_STRING))) {
+        PMIX_ERROR_LOG(rc);
+        return rc;
+    }
+    (void)strncpy(nspace, cptr, PMIX_MAX_NSLEN);
+    free(cptr);
+    cnt = 1;
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, &rank, &cnt, PMIX_PROC_RANK))) {
+        PMIX_ERROR_LOG(rc);
+        return rc;
+    }
+    /* retrieve any provided info structs */
+    cnt = 1;
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, &ninfo, &cnt, PMIX_SIZE))) {
+        PMIX_ERROR_LOG(rc);
+        return rc;
+    }
+    if (0 < ninfo) {
+        PMIX_INFO_CREATE(info, ninfo);
+        cnt = ninfo;
+        if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, info, &cnt, PMIX_INFO))) {
+            PMIX_ERROR_LOG(rc);
+            PMIX_INFO_FREE(info, ninfo);
+            return rc;
+        }
+    }
+
+    /* search for directives we can deal with here */
+    for (n=0; n < ninfo; n++) {
+        if (0 == strcmp(info[n].key, PMIX_IMMEDIATE)) {
+            if (PMIX_UNDEF == info[n].value.type || info[n].value.data.flag) {
+                /* just check our own data - don't wait
+                 * or request it from someone else */
+                localonly = true;
+            }
+        }
+    }
+
+    /* find the nspace object for this client */
+    nptr = NULL;
+    PMIX_LIST_FOREACH(ns, &pmix_globals.nspaces, pmix_nspace_t) {
+        if (0 == strcmp(nspace, ns->nspace)) {
+            nptr = ns;
+            break;
+        }
+    }
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "%s:%d EXECUTE GET FOR %s:%d ON BEHALF OF %s:%d",
+                        pmix_globals.myid.nspace,
+                        pmix_globals.myid.rank, nspace, rank,
+                        cd->peer->info->nptr->nspace,
+                        cd->peer->info->rank);
+
+    if (NULL == nptr || NULL == nptr->server) {
+        if (localonly) {
+            return PMIX_ERR_NOT_FOUND;
+        }
+        /* this is for an nspace we don't know about yet, so
+         * record the request for data from this process and
+         * give the host server a chance to tell us about it */
+        rc = create_local_tracker(nspace, rank, info, ninfo,
+                                  cbfunc, cbdata, &lcd);
+        if (PMIX_ERR_NOMEM == rc) {
+            PMIX_INFO_FREE(info, ninfo);
+            return rc;
+        }
+
+        /*
+         * Its possible there are no local processes on this
+         * host, so lets ask for this explicitly.  There can
+         * be a timing issue here if this information shows
+         * up on its own, but I believe we handle it ok.  */
+        if( NULL != pmix_host_server.direct_modex ){
+                pmix_host_server.direct_modex(&lcd->proc, info, ninfo, dmdx_cbfunc, lcd);
+        }
+        return (rc == PMIX_ERR_NOT_FOUND ? PMIX_SUCCESS : rc);
+    }
+
+    /* if the rank is wildcard, then they are asking for the job-level
+     * info for this nspace - provide it */
+    if (PMIX_RANK_WILDCARD == rank) {
+        PMIX_CONSTRUCT(&pbkt, pmix_buffer_t);
+        pmix_bfrop.pack(&pbkt, &rank, 1, PMIX_PROC_RANK);
+        /* the client is expecting this to arrive as a byte object
+         * containing a buffer, so package it accordingly */
+        pmix_bfrop.pack(&pbkt, &nptr->server->job_info, 1, PMIX_BUFFER);
+        PMIX_UNLOAD_BUFFER(&pbkt, data, sz);
+        PMIX_DESTRUCT(&pbkt);
+        cbfunc(PMIX_SUCCESS, data, sz, cbdata, relfn, data);
+        return PMIX_SUCCESS;
+    }
+
+    /* We have to wait for all local clients to be registered before
+     * we can know whether this request is for data from a local or a
+     * remote client because one client might ask for data about another
+     * client that the host RM hasn't told us about yet. Fortunately,
+     * we do know how many clients to expect, so first check to see if
+     * all clients have been registered with us */
+     if (!nptr->server->all_registered) {
+        if (localonly) {
+            return PMIX_ERR_NOT_FOUND;
+        }
+        /* we cannot do anything further, so just track this request
+         * for now */
+        rc = create_local_tracker(nspace, rank, info, ninfo,
+                                  cbfunc, cbdata, &lcd);
+        if (PMIX_ERR_NOMEM == rc) {
+            PMIX_INFO_FREE(info, ninfo);
+        }
+        return rc;
+    }
+
+    /* see if we already have this data */
+    rc = _satisfy_request(nptr, rank, cd, cbfunc, cbdata, &local);
+    if( PMIX_SUCCESS == rc ){
+        /* request was successfully satisfied */
+        PMIX_INFO_FREE(info, ninfo);
+        return rc;
+    }
+
+    /* If we get here, then we don't have the data at this time. If
+     * the user doesn't want to look for it, then we are done */
+    if (localonly) {
+        return PMIX_ERR_NOT_FOUND;
+    }
+
+    /* Check to see if we already have a pending request for the data - if
+     * we do, then we can just wait for it to arrive */
+    rc = create_local_tracker(nspace, rank, info, ninfo,
+                              cbfunc, cbdata, &lcd);
+    if (PMIX_SUCCESS == rc) {
+       /* we are already waiting for the data - nothing more
+        * for us to do as the function added the new request
+        * to the tracker for us */
+       return PMIX_SUCCESS;
+    }
+    if (PMIX_ERR_NOT_FOUND != rc || NULL == lcd) {
+        /* we have a problem - e.g., out of memory */
+        PMIX_INFO_FREE(info, ninfo);
+        return rc;
+    }
+
+    /* Getting here means that we didn't already have a request for
+     * for data pending, and so we created a new tracker for this
+     * request. We know the identity of all our local clients, so
+     * if this is one, then we have nothing further to do - we will
+     * fulfill the request once the process commits its data */
+    if (local) {
+        return PMIX_SUCCESS;
+    }
+
+    /* this isn't a local client of ours, so we need to ask the host
+     * resource manager server to please get the info for us from
+     * whomever is hosting the target process */
+    if (NULL != pmix_host_server.direct_modex) {
+        rc = pmix_host_server.direct_modex(&lcd->proc, info, ninfo, dmdx_cbfunc, lcd);
+    } else {
+        /* if we don't have direct modex feature, just respond with "not found" */
+        cbfunc(PMIX_ERR_NOT_FOUND, NULL, 0, cbdata, NULL, NULL);
+        PMIX_INFO_FREE(info, ninfo);
+        pmix_list_remove_item(&pmix_server_globals.local_reqs, &lcd->super);
+        PMIX_RELEASE(lcd);
+        rc = PMIX_ERR_NOT_FOUND;
+    }
+
+    return rc;
+}
+
+static pmix_status_t create_local_tracker(char nspace[], pmix_rank_t rank,
+                                          pmix_info_t info[], size_t ninfo,
+                                          pmix_modex_cbfunc_t cbfunc,
+                                          void *cbdata,
+                                          pmix_dmdx_local_t **ld)
+{
+    pmix_dmdx_local_t *lcd, *cd;
+    pmix_dmdx_request_t *req;
+    pmix_status_t rc;
+
+    /* define default */
+    *ld = NULL;
+
+    /* see if we already have an existing request for data
+     * from this namespace/rank */
+    lcd = NULL;
+    PMIX_LIST_FOREACH(cd, &pmix_server_globals.local_reqs, pmix_dmdx_local_t) {
+        if (0 != strncmp(nspace, cd->proc.nspace, PMIX_MAX_NSLEN) ||
+                rank != cd->proc.rank ) {
+            continue;
+        }
+        lcd = cd;
+        break;
+    }
+    if (NULL != lcd) {
+        /* we already have a request, so just track that someone
+         * else wants data from the same target */
+        rc = PMIX_SUCCESS; // indicates we found an existing request
+        goto complete;
+    }
+    /* we do not have an existing request, so let's create
+     * one and add it to our list */
+    lcd = PMIX_NEW(pmix_dmdx_local_t);
+    if (NULL == lcd){
+        return PMIX_ERR_NOMEM;
+    }
+    strncpy(lcd->proc.nspace, nspace, PMIX_MAX_NSLEN);
+    lcd->proc.rank = rank;
+    lcd->info = info;
+    lcd->ninfo = ninfo;
+    pmix_list_append(&pmix_server_globals.local_reqs, &lcd->super);
+    rc = PMIX_ERR_NOT_FOUND;  // indicates that we created a new request tracker
+
+  complete:
+    /* track this specific requestor so we return the
+     * data to them */
+    req = PMIX_NEW(pmix_dmdx_request_t);
+    req->cbfunc = cbfunc;
+    req->cbdata = cbdata;
+    pmix_list_append(&lcd->loc_reqs, &req->super);
+    *ld = lcd;
+    return rc;
+}
+
+void pmix_pending_nspace_requests(pmix_nspace_t *nptr)
+{
+    pmix_dmdx_local_t *cd, *cd_next;
+
+    /* Now that we know all local ranks, go along request list and ask for remote data
+     * for the non-local ranks, and resolve all pending requests for local procs
+     * that were waiting for registration to complete
+     */
+    PMIX_LIST_FOREACH_SAFE(cd, cd_next, &pmix_server_globals.local_reqs, pmix_dmdx_local_t) {
+        pmix_rank_info_t *info;
+        bool found = false;
+
+        if (0 != strncmp(nptr->nspace, cd->proc.nspace, PMIX_MAX_NSLEN) ) {
+            continue;
+        }
+
+        PMIX_LIST_FOREACH(info, &nptr->server->ranks, pmix_rank_info_t) {
+            if (info->rank == cd->proc.rank) {
+                found = true;  // we will satisy this request upon commit from new proc
+                break;
+            }
+        }
+
+        /* if not found - this is remote process and we need to send
+         * corresponding direct modex request */
+        if( !found ){
+            if( NULL != pmix_host_server.direct_modex ){
+                pmix_host_server.direct_modex(&cd->proc, cd->info, cd->ninfo, dmdx_cbfunc, cd);
+            } else {
+                pmix_dmdx_request_t *req, *req_next;
+                PMIX_LIST_FOREACH_SAFE(req, req_next, &cd->loc_reqs, pmix_dmdx_request_t) {
+                    req->cbfunc(PMIX_ERR_NOT_FOUND, NULL, 0, req->cbdata, NULL, NULL);
+                    pmix_list_remove_item(&cd->loc_reqs, &req->super);
+                    PMIX_RELEASE(req);
+                }
+                pmix_list_remove_item(&pmix_server_globals.local_reqs, &cd->super);
+                PMIX_RELEASE(cd);
+            }
+        }
+    }
+}
+
+static pmix_status_t _satisfy_request(pmix_nspace_t *nptr, pmix_rank_t rank,
+                                      pmix_server_caddy_t *cd,
+                                      pmix_modex_cbfunc_t cbfunc,
+                                      void *cbdata, bool *scope)
+{
+    pmix_status_t rc;
+    pmix_value_t *val;
+    char *data;
+    size_t sz;
+    pmix_rank_t cur_rank;
+    int found = 0;
+    pmix_buffer_t pbkt, *pbptr;
+    void *last;
+    pmix_hash_table_t *hts[3];
+    pmix_hash_table_t **htptr;
+    pmix_rank_info_t *iptr;
+    bool local;
+
+    /* Since we know about all the local clients in this nspace,
+     * let's first try to satisfy the request with any available data.
+     * By default, we assume we are looking for data from a remote
+     * client, and then check to see if this is one of my local
+     * clients - if so, then we look in that hash table */
+    memset(hts, 0, sizeof(hts));
+    if (PMIX_RANK_UNDEF == rank) {
+        local = true;
+        hts[0] = &nptr->server->remote;
+        hts[1] = &nptr->server->mylocal;
+    } else if (PMIX_RANK_WILDCARD == rank) {
+        local = true;
+        hts[0] = NULL;
+    } else {
+        local = false;
+        hts[0] = &nptr->server->remote;
+        PMIX_LIST_FOREACH(iptr, &nptr->server->ranks, pmix_rank_info_t) {
+            if (iptr->rank == rank) {
+                /* it is known local client - check the local table */
+                hts[0] = &nptr->server->mylocal;
+                local = true;
+                break;
+            }
+        }
+    }
+
+    if (NULL != scope) {
+        *scope = local;
+    }
+
+    /* check to see if this data already has been
+     * obtained as a result of a prior direct modex request from
+     * a remote peer, or due to data from a local client
+     * having been committed */
+    htptr = hts;
+    PMIX_CONSTRUCT(&pbkt, pmix_buffer_t);
+
+    /* if they are asking about a rank from an nspace different
+     * from their own, then include a copy of the job-level info */
+    if (rank == PMIX_RANK_WILDCARD || (NULL != cd &&
+        0 != strncmp(nptr->nspace, cd->peer->info->nptr->nspace, PMIX_MAX_NSLEN))) {
+        cur_rank = PMIX_RANK_WILDCARD;
+        if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(&pbkt, &cur_rank, 1, PMIX_PROC_RANK))) {
+            PMIX_ERROR_LOG(rc);
+            PMIX_DESTRUCT(&pbkt);
+            cbfunc(rc, NULL, 0, cbdata, NULL, NULL);
+            return rc;
+        }
+        /* the client is expecting this to arrive as a byte object
+         * containing a buffer, so package it accordingly */
+        pbptr = &nptr->server->job_info;
+        if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(&pbkt, &pbptr, 1, PMIX_BUFFER))) {
+            PMIX_ERROR_LOG(rc);
+            PMIX_DESTRUCT(&pbkt);
+            cbfunc(rc, NULL, 0, cbdata, NULL, NULL);
+            return rc;
+        }
+        if (rank == PMIX_RANK_WILDCARD) {
+            found++;
+        }
+    }
+
+    while (NULL != *htptr) {
+        cur_rank = rank;
+        if (PMIX_RANK_UNDEF == rank) {
+            rc = pmix_hash_fetch_by_key(*htptr, "modex", &cur_rank, &val, &last);
+        } else {
+            rc = pmix_hash_fetch(*htptr, cur_rank, "modex", &val);
+        }
+        while (PMIX_SUCCESS == rc) {
+            if (NULL != val) {
+#if defined(PMIX_ENABLE_DSTORE) && (PMIX_ENABLE_DSTORE == 1)
+                pmix_kval_t *kv;
+
+                /* setup to xfer the data */
+                kv = PMIX_NEW(pmix_kval_t);
+                kv->key = strdup("modex");
+                kv->value = (pmix_value_t *)malloc(sizeof(pmix_value_t));
+                rc = pmix_value_xfer(kv->value, val);
+                if (PMIX_SUCCESS != (rc = pmix_dstore_store(nptr->nspace, cur_rank, kv))) {
+                        PMIX_ERROR_LOG(rc);
+                }
+                PMIX_RELEASE(kv);
+#else
+                pmix_buffer_t xfer, *xptr;
+                pmix_bfrop.pack(&pbkt, &cur_rank, 1, PMIX_PROC_RANK);
+                /* the client is expecting this to arrive as a byte object
+                 * containing a buffer, so package it accordingly */
+                PMIX_CONSTRUCT(&xfer, pmix_buffer_t);
+                xptr = &xfer;
+                PMIX_LOAD_BUFFER(&xfer, val->data.bo.bytes, val->data.bo.size);
+                pmix_bfrop.pack(&pbkt, &xptr, 1, PMIX_BUFFER);
+                xfer.base_ptr = NULL; // protect the passed data
+                xfer.bytes_used = 0;
+                PMIX_DESTRUCT(&xfer);
+#endif /* PMIX_ENABLE_DSTORE */
+                PMIX_VALUE_RELEASE(val);
+                found++;
+            }
+            if (PMIX_RANK_UNDEF == rank) {
+                rc = pmix_hash_fetch_by_key(*htptr, NULL, &cur_rank, &val, &last);
+            } else {
+                break;
+            }
+        }
+        htptr++;
+    }
+    PMIX_UNLOAD_BUFFER(&pbkt, data, sz);
+    PMIX_DESTRUCT(&pbkt);
+
+    if (found) {
+        /* pass it back */
+        cbfunc(PMIX_SUCCESS, data, sz, cbdata, relfn, data);
+        return PMIX_SUCCESS;
+    }
+
+    return PMIX_ERR_NOT_FOUND;
+}
+
+/* Resolve pending requests to this namespace/rank */
+pmix_status_t pmix_pending_resolve(pmix_nspace_t *nptr, pmix_rank_t rank,
+                                   pmix_status_t status, pmix_dmdx_local_t *lcd)
+{
+    pmix_dmdx_local_t *cd, *ptr;
+    pmix_dmdx_request_t *req;
+
+    /* find corresponding request (if exists) */
+    if (NULL == lcd) {
+        ptr = NULL;
+        if (NULL != nptr) {
+            PMIX_LIST_FOREACH(cd, &pmix_server_globals.local_reqs, pmix_dmdx_local_t) {
+                if (0 != strncmp(nptr->nspace, cd->proc.nspace, PMIX_MAX_NSLEN) ||
+                        rank != cd->proc.rank) {
+                    continue;
+                }
+                ptr = cd;
+                break;
+            }
+        }
+        if (NULL == ptr) {
+            return PMIX_SUCCESS;
+        }
+    } else {
+        ptr = lcd;
+    }
+
+    /* somebody was interested in this rank */
+    if (PMIX_SUCCESS != status){
+        /* if we've got an error for this request - just forward it*/
+        PMIX_LIST_FOREACH(req, &ptr->loc_reqs, pmix_dmdx_request_t) {
+            req->cbfunc(status, NULL, 0, req->cbdata, NULL, NULL);
+        }
+    } else if (NULL != nptr) {
+        /* if we've got the blob - try to satisfy requests */
+        /* run through all the requests to this rank */
+        PMIX_LIST_FOREACH(req, &ptr->loc_reqs, pmix_dmdx_request_t) {
+            pmix_status_t rc;
+            rc = _satisfy_request(nptr, rank, NULL, req->cbfunc, req->cbdata, NULL);
+            if( PMIX_SUCCESS != rc ){
+                /* if we can't satisfy this particular request (missing key?) */
+                req->cbfunc(rc, NULL, 0, req->cbdata, NULL, NULL);
+            }
+        }
+    }
+    /* remove all requests to this rank and cleanup the corresponding structure */
+    pmix_list_remove_item(&pmix_server_globals.local_reqs, (pmix_list_item_t*)ptr);
+    PMIX_RELEASE(ptr);
+
+    return PMIX_SUCCESS;
+}
+
+/* process the returned data from the host RM server */
+static void _process_dmdx_reply(int fd, short args, void *cbdata)
+{
+    pmix_dmdx_reply_caddy_t *caddy = (pmix_dmdx_reply_caddy_t *)cbdata;
+    pmix_kval_t *kp;
+    pmix_nspace_t *ns, *nptr;
+    pmix_status_t rc;
+
+    PMIX_ACQUIRE_OBJECT(caddy);
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                    "[%s:%d] process dmdx reply from %s:%u",
+                    __FILE__, __LINE__,
+                    caddy->lcd->proc.nspace, caddy->lcd->proc.rank);
+
+    /* find the nspace object for this client */
+    nptr = NULL;
+    PMIX_LIST_FOREACH(ns, &pmix_globals.nspaces, pmix_nspace_t) {
+        if (0 == strcmp(caddy->lcd->proc.nspace, ns->nspace)) {
+            nptr = ns;
+            break;
+        }
+    }
+
+    if (NULL == nptr) {
+        /*
+         * We may not have this namespace because someone asked about this namespace
+         * but there are not processses from it running on this host
+         */
+        nptr = PMIX_NEW(pmix_nspace_t);
+        (void)strncpy(nptr->nspace, caddy->lcd->proc.nspace, PMIX_MAX_NSLEN);
+        nptr->server = PMIX_NEW(pmix_server_nspace_t);
+        pmix_list_append(&pmix_globals.nspaces, &nptr->super);
+    }
+
+    /* if the request was successfully satisfied, then store the data
+     * in our hash table for remote procs. Although we could immediately
+     * resolve any outstanding requests on our tracking list, we instead
+     * store the data first so we can immediately satisfy any future
+     * requests. Then, rather than duplicate the resolve code here, we
+     * will let the pmix_pending_resolve function go ahead and retrieve
+     * it from the hash table.
+     *
+     * NOTE: A NULL data pointer indicates that the data has already
+     * been returned via completion of a background fence_nb operation.
+     * In this case, all we need to do is resolve the request */
+    if (PMIX_SUCCESS == caddy->status && NULL != caddy->data) {
+        if (caddy->lcd->proc.rank == PMIX_RANK_WILDCARD) {
+            void * where = malloc(caddy->ndata);
+            if (where) {
+               memcpy(where, caddy->data, caddy->ndata);
+               PMIX_LOAD_BUFFER(&nptr->server->job_info, where, caddy->ndata);
+            } else {
+               /* The data was stored, so hate to change caddy->status just because
+                * we could not store it locally.
+                */
+               PMIX_ERROR_LOG(PMIX_ERR_NOMEM);
+            }
+        } else {
+            kp = PMIX_NEW(pmix_kval_t);
+            kp->key = strdup("modex");
+            PMIX_VALUE_CREATE(kp->value, 1);
+            kp->value->type = PMIX_BYTE_OBJECT;
+            /* we don't know if the host is going to save this data
+             * or not, so we have to copy it - the client is expecting
+             * this to arrive as a byte object containing a buffer, so
+             * package it accordingly */
+            kp->value->data.bo.bytes = malloc(caddy->ndata);
+            if (kp->value->data.bo.bytes) {
+                memcpy(kp->value->data.bo.bytes, caddy->data, caddy->ndata);
+                kp->value->data.bo.size = caddy->ndata;
+                /* store it in the appropriate hash */
+                if (PMIX_SUCCESS != (rc = pmix_hash_store(&nptr->server->remote, caddy->lcd->proc.rank, kp))) {
+                    PMIX_ERROR_LOG(rc);
+                }
+            } else {
+               /* The data was stored, so hate to change caddy->status just because
+                * we could not store it locally.
+                */
+               PMIX_ERROR_LOG(PMIX_ERR_NOMEM);
+            }
+            PMIX_RELEASE(kp);  // maintain acctg
+        }
+    }
+
+    /* always execute the callback to avoid having the client hang */
+    pmix_pending_resolve(nptr, caddy->lcd->proc.rank, caddy->status, caddy->lcd);
+
+    /* now call the release function so the host server
+     * knows it can release the data */
+    if (NULL != caddy->relcbfunc) {
+        caddy->relcbfunc(caddy->cbdata);
+    }
+    PMIX_RELEASE(caddy);
+}
+
+/* this is the callback function that the host RM server will call
+ * when it gets requested info back from a remote server */
+static void dmdx_cbfunc(pmix_status_t status,
+                        const char *data, size_t ndata, void *cbdata,
+                        pmix_release_cbfunc_t release_fn, void *release_cbdata)
+{
+    pmix_dmdx_reply_caddy_t *caddy;
+
+    /* because the host RM is calling us from their own thread, we
+     * need to thread-shift into our local progress thread before
+     * accessing any global info */
+    caddy = PMIX_NEW(pmix_dmdx_reply_caddy_t);
+    caddy->status = status;
+    /* point to the callers cbfunc */
+    caddy->relcbfunc = release_fn;
+    caddy->cbdata = release_cbdata;
+
+    /* point to the returned data and our own internal
+     * tracker */
+    caddy->data   = data;
+    caddy->ndata  = ndata;
+    caddy->lcd    = (pmix_dmdx_local_t *)cbdata;
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "[%s:%d] queue dmdx reply for %s:%u",
+                        __FILE__, __LINE__,
+                        caddy->lcd->proc.nspace, caddy->lcd->proc.rank);
+    PMIX_THREADSHIFT(caddy, _process_dmdx_reply);
+}
diff --git a/src/server/pmix_server_ops.c b/src/server/pmix_server_ops.c
new file mode 100644
index 0000000..5826c4b
--- /dev/null
+++ b/src/server/pmix_server_ops.c
@@ -0,0 +1,1843 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2014-2017 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2014-2017 Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2014-2015 Artem Y. Polyakov <artpol84 at gmail.com>.
+ *                         All rights reserved.
+ * Copyright (c) 2016-2017 Mellanox Technologies, Inc.
+ *                         All rights reserved.
+ * Copyright (c) 2016      IBM Corporation.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+
+#include <src/include/types.h>
+#include <src/include/pmix_stdint.h>
+#include <src/include/pmix_socket_errno.h>
+
+#include <pmix_server.h>
+#include "src/include/pmix_globals.h"
+
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
+#include <fcntl.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_SYS_UN_H
+#include <sys/un.h>
+#endif
+#ifdef HAVE_SYS_UIO_H
+#include <sys/uio.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#include PMIX_EVENT_HEADER
+
+#include "src/class/pmix_list.h"
+#include "src/buffer_ops/buffer_ops.h"
+#include "src/util/argv.h"
+#include "src/util/error.h"
+#include "src/util/output.h"
+#include "src/util/pmix_environ.h"
+
+#include "pmix_server_ops.h"
+
+#if defined(PMIX_ENABLE_DSTORE) && (PMIX_ENABLE_DSTORE == 1)
+#include "src/dstore/pmix_dstore.h"
+#endif /* PMIX_ENABLE_DSTORE */
+
+
+pmix_server_module_t pmix_host_server = {0};
+
+pmix_status_t pmix_server_abort(pmix_peer_t *peer, pmix_buffer_t *buf,
+                                pmix_op_cbfunc_t cbfunc, void *cbdata)
+{
+    int32_t cnt;
+    pmix_status_t rc;
+    int status;
+    char *msg;
+    size_t nprocs;
+    pmix_proc_t *procs = NULL;
+    pmix_proc_t proc;
+
+    pmix_output_verbose(2, pmix_globals.debug_output, "recvd ABORT");
+
+    /* unpack the status */
+    cnt = 1;
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, &status, &cnt, PMIX_STATUS))) {
+        return rc;
+    }
+    /* unpack the message */
+    cnt = 1;
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, &msg, &cnt, PMIX_STRING))) {
+        return rc;
+    }
+    /* unpack the number of procs */
+    cnt = 1;
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, &nprocs, &cnt, PMIX_SIZE))) {
+        return rc;
+    }
+
+    /* unpack any provided procs - these are the procs the caller
+     * wants aborted */
+    if (0 < nprocs) {
+        PMIX_PROC_CREATE(procs, nprocs);
+        cnt = nprocs;
+        if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, procs, &cnt, PMIX_PROC))) {
+            return rc;
+        }
+    }
+
+    /* let the local host's server execute it */
+    if (NULL != pmix_host_server.abort) {
+        (void)strncpy(proc.nspace, peer->info->nptr->nspace, PMIX_MAX_NSLEN);
+        proc.rank = peer->info->rank;
+        rc = pmix_host_server.abort(&proc, peer->info->server_object, status, msg,
+                                    procs, nprocs, cbfunc, cbdata);
+    } else {
+        rc = PMIX_ERR_NOT_SUPPORTED;
+        /* release the caller */
+        if (NULL != cbfunc) {
+            cbfunc(rc, cbdata);
+        }
+    }
+    PMIX_PROC_FREE(procs, nprocs);
+
+    /* the client passed this msg to us so we could give
+     * it to the host server - we are done with it now */
+    if (NULL != msg) {
+        free(msg);
+    }
+
+    return rc;
+}
+
+pmix_status_t pmix_server_commit(pmix_peer_t *peer, pmix_buffer_t *buf)
+{
+    int32_t cnt;
+    pmix_status_t rc;
+    pmix_buffer_t *b2;
+    pmix_kval_t *kp;
+    pmix_scope_t scope;
+    pmix_hash_table_t *ht;
+    pmix_nspace_t *nptr;
+    pmix_rank_info_t *info;
+    pmix_dmdx_remote_t *dcd, *dcdnext;
+    pmix_value_t *val;
+    char *data;
+    size_t sz;
+
+    /* shorthand */
+    info = peer->info;
+    nptr = info->nptr;
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "%s:%d EXECUTE COMMIT FOR %s:%d",
+                        pmix_globals.myid.nspace,
+                        pmix_globals.myid.rank,
+                        nptr->nspace, info->rank);
+
+    /* this buffer will contain one or more buffers, each
+     * representing a different scope. These need to be locally
+     * stored separately so we can provide required data based
+     * on the requestor's location */
+    cnt = 1;
+    while (PMIX_SUCCESS == (rc = pmix_bfrop.unpack(buf, &scope, &cnt, PMIX_SCOPE))) {
+        if (PMIX_LOCAL == scope) {
+            ht = &nptr->server->mylocal;
+        } else if (PMIX_REMOTE == scope) {
+            ht = &nptr->server->myremote;
+        } else {
+            PMIX_ERROR_LOG(PMIX_ERR_BAD_PARAM);
+            rc = PMIX_ERR_BAD_PARAM;
+            return rc;
+        }
+        /* unpack and store the blob */
+        cnt = 1;
+        if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, &b2, &cnt, PMIX_BUFFER))) {
+            PMIX_ERROR_LOG(rc);
+            return rc;
+        }
+
+        /* create the new data storage */
+        kp = PMIX_NEW(pmix_kval_t);
+        kp->key = strdup("modex");
+        PMIX_VALUE_CREATE(kp->value, 1);
+        kp->value->type = PMIX_BYTE_OBJECT;
+
+#if defined(PMIX_ENABLE_DSTORE) && (PMIX_ENABLE_DSTORE == 1)
+        /* The local buffer must go directly the dstore */
+        if( PMIX_LOCAL == scope ){
+            /* need to deposit this in the dstore now */
+            PMIX_UNLOAD_BUFFER(b2, kp->value->data.bo.bytes, kp->value->data.bo.size);
+            if (PMIX_SUCCESS != (rc = pmix_dstore_store(nptr->nspace, info->rank, kp))) {
+                PMIX_ERROR_LOG(rc);
+            }
+
+            /* restore the buffer for subsequent processing */
+            PMIX_LOAD_BUFFER(b2, kp->value->data.bo.bytes, kp->value->data.bo.size);
+            kp->value->data.bo.bytes = NULL;
+            kp->value->data.bo.size = 0;
+        }
+#endif /* PMIX_ENABLE_DSTORE */
+
+        /* see if we already have info for this proc */
+        if (PMIX_SUCCESS == pmix_hash_fetch(ht, info->rank, "modex", &val) && NULL != val) {
+            /* get space for the new new data blob */
+            kp->value->data.bo.bytes = (char*)malloc(b2->bytes_used + val->data.bo.size);
+            memcpy(kp->value->data.bo.bytes, val->data.bo.bytes, val->data.bo.size);
+            memcpy(kp->value->data.bo.bytes+val->data.bo.size, b2->base_ptr, b2->bytes_used);
+            kp->value->data.bo.size = val->data.bo.size + b2->bytes_used;
+            /* release the storage */
+            PMIX_VALUE_FREE(val, 1);
+        } else {
+            PMIX_UNLOAD_BUFFER(b2, kp->value->data.bo.bytes, kp->value->data.bo.size);
+        }
+
+        /* store it in the appropriate hash */
+        if (PMIX_SUCCESS != (rc = pmix_hash_store(ht, info->rank, kp))) {
+            PMIX_ERROR_LOG(rc);
+        }
+        /* maintain the accounting */
+        PMIX_RELEASE(kp);
+        PMIX_RELEASE(b2);
+
+        cnt = 1;
+    }
+    if (PMIX_ERR_UNPACK_READ_PAST_END_OF_BUFFER != rc) {
+        PMIX_ERROR_LOG(rc);
+        return rc;
+    }
+    rc = PMIX_SUCCESS;
+    /* mark us as having successfully received a blob from this proc */
+    info->modex_recvd = true;
+
+    /* see if anyone remote is waiting on this data - could be more than one */
+    PMIX_LIST_FOREACH_SAFE(dcd, dcdnext, &pmix_server_globals.remote_pnd, pmix_dmdx_remote_t) {
+        if (0 != strncmp(dcd->cd->proc.nspace, nptr->nspace, PMIX_MAX_NSLEN)) {
+            continue;
+        }
+        if (dcd->cd->proc.rank == info->rank) {
+           /* we can now fulfill this request - collect the
+             * remote/global data from this proc */
+            /* get any remote contribution - note that there
+             * may not be a contribution */
+            data = NULL;
+            sz = 0;
+            if (PMIX_SUCCESS == pmix_hash_fetch(&nptr->server->myremote, info->rank, "modex", &val) &&
+                NULL != val) {
+                data = val->data.bo.bytes;
+                sz = val->data.bo.size;
+                /* protect the data */
+                val->data.bo.bytes = NULL;
+                val->data.bo.size = 0;
+                PMIX_VALUE_RELEASE(val);
+            }
+            /* execute the callback */
+            dcd->cd->cbfunc(PMIX_SUCCESS, data, sz, dcd->cd->cbdata);
+            if (NULL != data) {
+                free(data);
+            }
+            /* we have finished this request */
+            pmix_list_remove_item(&pmix_server_globals.remote_pnd, &dcd->super);
+            PMIX_RELEASE(dcd);
+        }
+    }
+    /* see if anyone local is waiting on this data- could be more than one */
+    return pmix_pending_resolve(nptr, info->rank, PMIX_SUCCESS, NULL);
+}
+
+/* get an existing object for tracking LOCAL participation in a collective
+ * operation such as "fence". The only way this function can be
+ * called is if at least one local client process is participating
+ * in the operation. Thus, we know that at least one process is
+ * involved AND has called the collective operation.
+ *
+ * NOTE: the host server *cannot* call us with a collective operation
+ * as there is no mechanism by which it can do so. We call the host
+ * server only after all participating local procs have called us.
+ * So it is impossible for us to be called with a collective without
+ * us already knowing about all local participants.
+ *
+ * procs - the array of procs participating in the collective,
+ *         regardless of location
+ * nprocs - the number of procs in the array
+ */
+static pmix_server_trkr_t* get_tracker(pmix_proc_t *procs,
+                                       size_t nprocs, pmix_cmd_t type)
+{
+    pmix_server_trkr_t *trk;
+    size_t i, j;
+    size_t matches;
+
+    pmix_output_verbose(5, pmix_globals.debug_output,
+                        "get_tracker called with %d procs", (int)nprocs);
+
+    /* bozo check - should never happen outside of programmer error */
+    if (NULL == procs) {
+        PMIX_ERROR_LOG(PMIX_ERR_BAD_PARAM);
+        return NULL;
+    }
+
+    /* there is no shortcut way to search the trackers - all
+     * we can do is perform a brute-force search. Fortunately,
+     * it is highly unlikely that there will be more than one
+     * or two active at a time, and they are most likely to
+     * involve only a single proc with WILDCARD rank - so this
+     * shouldn't take long */
+    PMIX_LIST_FOREACH(trk, &pmix_server_globals.collectives, pmix_server_trkr_t) {
+        /* Collective operation if unique identified by
+         * the set of participating processes and the type of collective
+         */
+        if (nprocs != trk->npcs) {
+            continue;
+        }
+        if (type != trk->type) {
+            continue;
+        }
+        matches = 0;
+        for (i=0; i < nprocs; i++) {
+            /* the procs may be in different order, so we have
+             * to do an exhaustive search */
+            for (j=0; j < trk->npcs; j++) {
+                if (0 == strcmp(procs[i].nspace, trk->pcs[j].nspace) &&
+                    procs[i].rank == trk->pcs[j].rank) {
+                    ++matches;
+                    break;
+                }
+            }
+        }
+        if (trk->npcs == matches) {
+            return trk;
+        }
+    }
+    /* No tracker was found */
+    return NULL;
+}
+
+/* create a new object for tracking LOCAL participation in a collective
+ * operation such as "fence". The only way this function can be
+ * called is if at least one local client process is participating
+ * in the operation. Thus, we know that at least one process is
+ * involved AND has called the collective operation.
+ *
+ * NOTE: the host server *cannot* call us with a collective operation
+ * as there is no mechanism by which it can do so. We call the host
+ * server only after all participating local procs have called us.
+ * So it is impossible for us to be called with a collective without
+ * us already knowing about all local participants.
+ *
+ * procs - the array of procs participating in the collective,
+ *         regardless of location
+ * nprocs - the number of procs in the array
+ */
+static pmix_server_trkr_t* new_tracker(pmix_proc_t *procs,
+                                       size_t nprocs, pmix_cmd_t type)
+{
+    pmix_server_trkr_t *trk;
+    pmix_rank_info_t *iptr, *info;
+    size_t i;
+    bool all_def;
+    pmix_nspace_t *nptr, *ns;
+
+    pmix_output_verbose(5, pmix_globals.debug_output,
+                        "new_tracker called with %d procs", (int)nprocs);
+
+    /* bozo check - should never happen outside of programmer error */
+    if (NULL == procs) {
+        PMIX_ERROR_LOG(PMIX_ERR_BAD_PARAM);
+        return NULL;
+    }
+
+    pmix_output_verbose(5, pmix_globals.debug_output,
+                        "adding new tracker with %d procs", (int)nprocs);
+
+    /* get here if this tracker is new - create it */
+    trk = PMIX_NEW(pmix_server_trkr_t);
+
+    /* copy the procs */
+    PMIX_PROC_CREATE(trk->pcs, nprocs);
+    trk->npcs = nprocs;
+    trk->type = type;
+
+    all_def = true;
+    for (i=0; i < nprocs; i++) {
+        (void)strncpy(trk->pcs[i].nspace, procs[i].nspace, PMIX_MAX_NSLEN);
+        trk->pcs[i].rank = procs[i].rank;
+        /* is this nspace known to us? */
+        nptr = NULL;
+        PMIX_LIST_FOREACH(ns, &pmix_globals.nspaces, pmix_nspace_t) {
+            if (0 == strcmp(procs[i].nspace, ns->nspace)) {
+                nptr = ns;
+                break;
+            }
+        }
+        if (NULL == nptr) {
+            /* cannot be a local proc */
+            pmix_output_verbose(5, pmix_globals.debug_output,
+                                "new_tracker: unknown nspace %s",
+                                procs[i].nspace);
+            continue;
+        }
+        /* have all the clients for this nspace been defined? */
+        if (!nptr->server->all_registered) {
+            /* nope, so no point in going further on this one - we'll
+             * process it once all the procs are known */
+            all_def = false;
+            pmix_output_verbose(5, pmix_globals.debug_output,
+                                "new_tracker: all clients not registered nspace %s",
+                                procs[i].nspace);
+            continue;
+        }
+        /* is this one of my local ranks? */
+        PMIX_LIST_FOREACH(info, &nptr->server->ranks, pmix_rank_info_t) {
+            if (procs[i].rank == info->rank ||
+                PMIX_RANK_WILDCARD == procs[i].rank) {
+                pmix_output_verbose(5, pmix_globals.debug_output,
+                                    "adding local proc %s.%d to tracker",
+                                    info->nptr->nspace, info->rank);
+                /* add a tracker for this proc - don't need more than
+                 * the nspace pointer and rank */
+                iptr = PMIX_NEW(pmix_rank_info_t);
+                PMIX_RETAIN(info->nptr);
+                iptr->nptr = info->nptr;
+                iptr->rank = info->rank;
+                pmix_list_append(&trk->ranks, &iptr->super);
+                /* track the count */
+                ++trk->nlocal;
+                if (PMIX_RANK_WILDCARD != procs[i].rank) {
+                    break;
+                }
+            }
+        }
+    }
+    if (all_def) {
+        trk->def_complete = true;
+    }
+    pmix_list_append(&pmix_server_globals.collectives, &trk->super);
+    return trk;
+}
+
+pmix_status_t pmix_server_fence(pmix_server_caddy_t *cd,
+                                pmix_buffer_t *buf,
+                                pmix_modex_cbfunc_t modexcbfunc,
+                                pmix_op_cbfunc_t opcbfunc)
+{
+    int32_t cnt;
+    pmix_status_t rc;
+    size_t nprocs;
+    pmix_proc_t *procs=NULL;
+    bool collect_data = false;
+    pmix_server_trkr_t *trk;
+    char *data = NULL;
+    size_t sz = 0;
+    pmix_buffer_t bucket, xfer;
+    pmix_rank_info_t *rkinfo;
+    pmix_value_t *val;
+    pmix_info_t *info = NULL;
+    size_t ninfo=0, n;
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "recvd FENCE");
+
+    if (NULL == pmix_host_server.fence_nb) {
+        PMIX_ERROR_LOG(PMIX_ERR_NOT_SUPPORTED);
+        return PMIX_ERR_NOT_SUPPORTED;
+    }
+
+    /* unpack the number of procs */
+    cnt = 1;
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, &nprocs, &cnt, PMIX_SIZE))) {
+        return rc;
+    }
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "recvd fence from %s:%u with %d procs",
+                        cd->peer->info->nptr->nspace, cd->peer->info->rank, (int)nprocs);
+    /* there must be at least one as the client has to at least provide
+     * their own namespace */
+    if (nprocs < 1) {
+        return PMIX_ERR_BAD_PARAM;
+    }
+
+    /* create space for the procs */
+    PMIX_PROC_CREATE(procs, nprocs);
+    /* unpack the procs */
+    cnt = nprocs;
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, procs, &cnt, PMIX_PROC))) {
+        goto cleanup;
+    }
+
+    /* unpack the number of provided info structs */
+    cnt = 1;
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, &ninfo, &cnt, PMIX_SIZE))) {
+        return rc;
+    }
+    if (0 < ninfo) {
+        PMIX_INFO_CREATE(info, ninfo);
+        /* unpack the info */
+        cnt = ninfo;
+        if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, info, &cnt, PMIX_INFO))) {
+            goto cleanup;
+        }
+        /* see if we are to collect data - we don't internally care
+         * about any other directives */
+        for (n=0; n < ninfo; n++) {
+            if (0 == strcmp(info[n].key, PMIX_COLLECT_DATA)) {
+                collect_data = true;
+                break;
+            }
+        }
+    }
+
+    /* find/create the local tracker for this operation */
+    if (NULL == (trk = get_tracker(procs, nprocs, PMIX_FENCENB_CMD))) {
+        /* If no tracker was found - create and initialize it once */
+        if (NULL == (trk = new_tracker(procs, nprocs, PMIX_FENCENB_CMD))) {
+            /* only if a bozo error occurs */
+            PMIX_ERROR_LOG(PMIX_ERROR);
+            /* DO NOT HANG */
+            if (NULL != opcbfunc) {
+                opcbfunc(PMIX_ERROR, cd);
+            }
+            rc = PMIX_ERROR;
+            goto cleanup;
+        }
+        trk->type = PMIX_FENCENB_CMD;
+        trk->modexcbfunc = modexcbfunc;
+       /* mark if they want the data back */
+        if (collect_data) {
+            trk->collect_type = PMIX_COLLECT_YES;
+        } else {
+            trk->collect_type = PMIX_COLLECT_NO;
+        }
+    } else {
+        switch (trk->collect_type) {
+        case PMIX_COLLECT_NO:
+            if (collect_data) {
+                trk->collect_type = PMIX_COLLECT_INVALID;
+            }
+            break;
+        case PMIX_COLLECT_YES:
+            if (!collect_data) {
+                trk->collect_type = PMIX_COLLECT_INVALID;
+            }
+            break;
+        default:
+            break;
+        }
+    }
+    /* we only save the info structs from the first caller
+     * who provides them - it is a user error to provide
+     * different values from different participants */
+    if (NULL == trk->info) {
+        trk->info = info;
+        trk->ninfo = ninfo;
+    } else {
+        /* cleanup */
+        PMIX_INFO_FREE(info, ninfo);
+        info = NULL;
+    }
+
+    /* add this contributor to the tracker so they get
+     * notified when we are done */
+    pmix_list_append(&trk->local_cbs, &cd->super);
+    /* if all local contributions have been received,
+     * let the local host's server know that we are at the
+     * "fence" point - they will callback once the barrier
+     * across all participants has been completed */
+    if (trk->def_complete &&
+        pmix_list_get_size(&trk->local_cbs) == trk->nlocal) {
+        pmix_output_verbose(2, pmix_globals.debug_output,
+                            "fence complete");
+        /* if the user asked us to collect data, then we have
+         * to provide any locally collected data to the host
+         * server so they can circulate it - only take data
+         * from the specified procs as not everyone is necessarily
+         * participating! And only take data intended for remote
+         * distribution */
+
+        PMIX_CONSTRUCT(&bucket, pmix_buffer_t);
+
+        assert( PMIX_COLLECT_MAX < UCHAR_MAX );
+        unsigned char tmp = (unsigned char)trk->collect_type;
+        pmix_bfrop.pack(&bucket, &tmp, 1, PMIX_BYTE);
+
+        if (PMIX_COLLECT_YES == trk->collect_type) {
+            pmix_buffer_t databuf;
+            PMIX_CONSTRUCT(&databuf, pmix_buffer_t);
+            pmix_output_verbose(2, pmix_globals.debug_output,
+                                "fence - assembling data");
+            PMIX_LIST_FOREACH(rkinfo, &trk->ranks, pmix_rank_info_t) {
+                pmix_buffer_t rankbuf;
+                PMIX_CONSTRUCT(&rankbuf, pmix_buffer_t);
+                /* get any remote contribution - note that there
+                 * may not be a contribution */
+                if (PMIX_SUCCESS == pmix_hash_fetch(&rkinfo->nptr->server->myremote, rkinfo->rank, "modex", &val) &&
+                    NULL != val) {
+                    /* pack the proc so we know the source */
+                    char *foobar = rkinfo->nptr->nspace;
+                    pmix_bfrop.pack(&rankbuf, &foobar, 1, PMIX_STRING);
+                    pmix_bfrop.pack(&rankbuf, &rkinfo->rank, 1, PMIX_PROC_RANK);
+                    PMIX_CONSTRUCT(&xfer, pmix_buffer_t);
+                    PMIX_LOAD_BUFFER(&xfer, val->data.bo.bytes, val->data.bo.size);
+                    PMIX_VALUE_RELEASE(val);
+                    pmix_buffer_t *pxfer = &xfer;
+                    pmix_bfrop.pack(&rankbuf, &pxfer, 1, PMIX_BUFFER);
+                    PMIX_DESTRUCT(&xfer);
+                    /* now pack this proc's contribution into the bucket */
+                    pmix_buffer_t *pdatabuf = &rankbuf;
+                    pmix_bfrop.pack(&databuf, &pdatabuf, 1, PMIX_BUFFER);
+                }
+                PMIX_DESTRUCT(&rankbuf);
+            }
+            // TODO: we have multiple data movings while only one is actually need
+            pmix_buffer_t *pbkt = &databuf;
+            pmix_bfrop.pack(&bucket, &pbkt, 1, PMIX_BUFFER);
+            PMIX_DESTRUCT(&databuf);
+        }
+
+        PMIX_UNLOAD_BUFFER(&bucket, data, sz);
+        PMIX_DESTRUCT(&bucket);
+        pmix_host_server.fence_nb(trk->pcs, trk->npcs,
+                                  trk->info, trk->ninfo,
+                                  data, sz, trk->modexcbfunc, trk);
+    }
+
+ cleanup:
+    PMIX_PROC_FREE(procs, nprocs);
+    return rc;
+}
+
+pmix_status_t pmix_server_publish(pmix_peer_t *peer,
+                                  pmix_buffer_t *buf,
+                                  pmix_op_cbfunc_t cbfunc, void *cbdata)
+{
+    pmix_status_t rc;
+    int32_t cnt;
+    size_t ninfo, einfo;
+    pmix_info_t *info = NULL;
+    pmix_proc_t proc;
+    uint32_t uid;
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "recvd PUBLISH");
+
+    if (NULL == pmix_host_server.publish) {
+        return PMIX_ERR_NOT_SUPPORTED;
+    }
+
+    /* unpack the effective user id */
+    cnt=1;
+    if  (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, &uid, &cnt, PMIX_UINT32))) {
+        PMIX_ERROR_LOG(rc);
+        return rc;
+    }
+    /* unpack the number of info objects */
+    cnt=1;
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, &ninfo, &cnt, PMIX_SIZE))) {
+        PMIX_ERROR_LOG(rc);
+        return rc;
+    }
+    /* we will be adding one for the user id */
+    einfo = ninfo + 1;
+    PMIX_INFO_CREATE(info, einfo);
+    /* unpack the array of info objects */
+    if (0 < ninfo) {
+        cnt=ninfo;
+        if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, info, &cnt, PMIX_INFO))) {
+            PMIX_ERROR_LOG(rc);
+            goto cleanup;
+        }
+    }
+    (void)strncpy(info[einfo-1].key, PMIX_USERID, PMIX_MAX_KEYLEN);
+    info[einfo-1].value.type = PMIX_UINT32;
+    info[einfo-1].value.data.uint32 = uid;
+
+    /* call the local server */
+    (void)strncpy(proc.nspace, peer->info->nptr->nspace, PMIX_MAX_NSLEN);
+    proc.rank = peer->info->rank;
+    rc = pmix_host_server.publish(&proc, info, einfo, cbfunc, cbdata);
+
+ cleanup:
+    PMIX_INFO_FREE(info, einfo);
+    return rc;
+}
+
+pmix_status_t pmix_server_lookup(pmix_peer_t *peer,
+                                 pmix_buffer_t *buf,
+                                 pmix_lookup_cbfunc_t cbfunc, void *cbdata)
+{
+    int32_t cnt;
+    pmix_status_t rc;
+    size_t nkeys, i;
+    char **keys=NULL, *sptr;
+    pmix_info_t *info = NULL;
+    size_t ninfo, einfo;
+    pmix_proc_t proc;
+    uint32_t uid;
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "recvd LOOKUP");
+
+    if (NULL == pmix_host_server.lookup) {
+        return PMIX_ERR_NOT_SUPPORTED;
+    }
+
+    /* unpack the effective user id */
+    cnt=1;
+    if  (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, &uid, &cnt, PMIX_UINT32))) {
+        PMIX_ERROR_LOG(rc);
+        return rc;
+    }
+    /* unpack the number of keys */
+    cnt=1;
+    if  (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, &nkeys, &cnt, PMIX_SIZE))) {
+         PMIX_ERROR_LOG(rc);
+        return rc;
+    }
+    /* unpack the array of keys */
+    for (i=0; i < nkeys; i++) {
+        cnt=1;
+        if  (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, &sptr, &cnt, PMIX_STRING))) {
+            PMIX_ERROR_LOG(rc);
+            goto cleanup;
+        }
+        pmix_argv_append_nosize(&keys, sptr);
+        free(sptr);
+    }
+    /* unpack the number of info objects */
+    cnt=1;
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, &ninfo, &cnt, PMIX_SIZE))) {
+        PMIX_ERROR_LOG(rc);
+        return rc;
+    }
+    /* we will be adding one for the user id */
+    einfo = ninfo + 1;
+    PMIX_INFO_CREATE(info, einfo);
+    /* unpack the array of info objects */
+    if (0 < ninfo) {
+        cnt=ninfo;
+        if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, info, &cnt, PMIX_INFO))) {
+            PMIX_ERROR_LOG(rc);
+            goto cleanup;
+        }
+    }
+    (void)strncpy(info[einfo-1].key, PMIX_USERID, PMIX_MAX_KEYLEN);
+    info[einfo-1].value.type = PMIX_UINT32;
+    info[einfo-1].value.data.uint32 = uid;
+
+    /* call the local server */
+    (void)strncpy(proc.nspace, peer->info->nptr->nspace, PMIX_MAX_NSLEN);
+    proc.rank = peer->info->rank;
+    rc = pmix_host_server.lookup(&proc, keys, info, einfo, cbfunc, cbdata);
+
+ cleanup:
+    PMIX_INFO_FREE(info, einfo);
+    pmix_argv_free(keys);
+    return rc;
+}
+
+pmix_status_t pmix_server_unpublish(pmix_peer_t *peer,
+                                    pmix_buffer_t *buf,
+                                    pmix_op_cbfunc_t cbfunc, void *cbdata)
+{
+    int32_t cnt;
+    pmix_status_t rc;
+    size_t i, nkeys, ninfo, einfo;
+    char **keys=NULL, *sptr;
+    pmix_proc_t proc;
+    uint32_t uid;
+    pmix_info_t *info;
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "recvd UNPUBLISH");
+
+    if (NULL == pmix_host_server.unpublish) {
+        return PMIX_ERR_NOT_SUPPORTED;
+    }
+
+    /* unpack the effective user id */
+    cnt=1;
+    if  (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, &uid, &cnt, PMIX_UINT32))) {
+        PMIX_ERROR_LOG(rc);
+        return rc;
+    }
+    /* unpack the number of keys */
+    cnt=1;
+    if  (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, &nkeys, &cnt, PMIX_SIZE))) {
+        PMIX_ERROR_LOG(rc);
+        return rc;
+    }
+    /* unpack the keys */
+    for (i=0; i < nkeys; i++) {
+        cnt=1;
+        if  (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, &sptr, &cnt, PMIX_STRING))) {
+            PMIX_ERROR_LOG(rc);
+            goto cleanup;
+        }
+        pmix_argv_append_nosize(&keys, sptr);
+        free(sptr);
+    }
+    /* unpack the number of info objects */
+    cnt=1;
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, &ninfo, &cnt, PMIX_SIZE))) {
+        PMIX_ERROR_LOG(rc);
+        return rc;
+    }
+    /* we will be adding one for the user id */
+    einfo = ninfo + 1;
+    PMIX_INFO_CREATE(info, einfo);
+    /* unpack the array of info objects */
+    if (0 < ninfo) {
+        cnt=ninfo;
+        if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, info, &cnt, PMIX_INFO))) {
+            PMIX_ERROR_LOG(rc);
+            goto cleanup;
+        }
+    }
+    (void)strncpy(info[einfo-1].key, PMIX_USERID, PMIX_MAX_KEYLEN);
+    info[einfo-1].value.type = PMIX_UINT32;
+    info[einfo-1].value.data.uint32 = uid;
+
+    /* call the local server */
+    (void)strncpy(proc.nspace, peer->info->nptr->nspace, PMIX_MAX_NSLEN);
+    proc.rank = peer->info->rank;
+    rc = pmix_host_server.unpublish(&proc, keys, info, einfo, cbfunc, cbdata);
+
+ cleanup:
+    pmix_argv_free(keys);
+    return rc;
+}
+
+pmix_status_t pmix_server_spawn(pmix_peer_t *peer,
+                                pmix_buffer_t *buf,
+                                pmix_spawn_cbfunc_t cbfunc,
+                                void *cbdata)
+{
+    int32_t cnt;
+    size_t napps, ninfo;
+    pmix_info_t *info=NULL;
+    pmix_app_t *apps=NULL;
+    pmix_status_t rc;
+    pmix_proc_t proc;
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "recvd SPAWN");
+
+    if (NULL == pmix_host_server.spawn) {
+        PMIX_ERROR_LOG(PMIX_ERR_NOT_SUPPORTED);
+        return PMIX_ERR_NOT_SUPPORTED;
+    }
+
+    /* unpack the number of job-level directives */
+    cnt=1;
+    if  (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, &ninfo, &cnt, PMIX_SIZE))) {
+        PMIX_ERROR_LOG(rc);
+        return rc;
+    }
+    /* unpack the array of directives */
+    if (0 < ninfo) {
+        PMIX_INFO_CREATE(info, ninfo);
+        cnt=ninfo;
+        if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, info, &cnt, PMIX_INFO))) {
+            PMIX_ERROR_LOG(rc);
+            goto cleanup;
+        }
+    }
+
+    /* unpack the number of apps */
+    cnt=1;
+    if  (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, &napps, &cnt, PMIX_SIZE))) {
+        PMIX_ERROR_LOG(rc);
+        return rc;
+    }
+    /* unpack the array of apps */
+    if (0 < napps) {
+        PMIX_APP_CREATE(apps, napps);
+        cnt=napps;
+        if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, apps, &cnt, PMIX_APP))) {
+            PMIX_ERROR_LOG(rc);
+            goto cleanup;
+        }
+    }
+    /* call the local server */
+    (void)strncpy(proc.nspace, peer->info->nptr->nspace, PMIX_MAX_NSLEN);
+    proc.rank = peer->info->rank;
+    rc = pmix_host_server.spawn(&proc, info, ninfo, apps, napps, cbfunc, cbdata);
+
+ cleanup:
+    if (NULL != info) {
+        PMIX_INFO_FREE(info, ninfo);
+    }
+    if (NULL != apps) {
+        PMIX_APP_FREE(apps, napps);
+    }
+    return rc;
+}
+
+pmix_status_t pmix_server_connect(pmix_server_caddy_t *cd,
+                                  pmix_buffer_t *buf, bool disconnect,
+                                  pmix_op_cbfunc_t cbfunc)
+{
+    int32_t cnt;
+    pmix_status_t rc;
+    pmix_proc_t *procs = NULL;
+    size_t nprocs;
+    pmix_server_trkr_t *trk;
+    pmix_info_t *info = NULL;
+    size_t ninfo=0;
+    pmix_cmd_t type = PMIX_CONNECTNB_CMD;
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "recvd CONNECT from peer %s:%d",
+                        cd->peer->info->nptr->nspace, cd->peer->info->rank);
+
+    if ((disconnect && NULL == pmix_host_server.disconnect) ||
+        (!disconnect && NULL == pmix_host_server.connect)) {
+        return PMIX_ERR_NOT_SUPPORTED;
+    }
+
+    /* unpack the number of procs */
+    cnt = 1;
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, &nprocs, &cnt, PMIX_SIZE))) {
+        PMIX_ERROR_LOG(rc);
+        goto cleanup;
+    }
+    /* there must be at least one proc - we do not allow the client
+     * to send us NULL proc as the server has no idea what to do
+     * with that situation. Instead, the client should at least send
+     * us their own namespace for the use-case where the connection
+     * spans all procs in that namespace */
+    if (nprocs < 1) {
+        PMIX_ERROR_LOG(PMIX_ERR_BAD_PARAM);
+        rc = PMIX_ERR_BAD_PARAM;
+        goto cleanup;
+    }
+
+    /* unpack the procs */
+    PMIX_PROC_CREATE(procs, nprocs);
+    cnt = nprocs;
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, procs, &cnt, PMIX_PROC))) {
+        PMIX_ERROR_LOG(rc);
+        goto cleanup;
+    }
+
+    /* unpack the number of provided info structs */
+    cnt = 1;
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, &ninfo, &cnt, PMIX_SIZE))) {
+        return rc;
+    }
+    if (0 < ninfo) {
+        PMIX_INFO_CREATE(info, ninfo);
+        /* unpack the info */
+        cnt = ninfo;
+        if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, info, &cnt, PMIX_INFO))) {
+            goto cleanup;
+        }
+    }
+
+    /* find/create the local tracker for this operation */
+    if (disconnect) {
+        type = PMIX_DISCONNECTNB_CMD;
+    }
+    if (NULL == (trk = get_tracker(procs, nprocs, type))) {
+        if (NULL == (trk = new_tracker(procs, nprocs, type))) {
+            /* only if a bozo error occurs */
+            PMIX_ERROR_LOG(PMIX_ERROR);
+            /* DO NOT HANG */
+            if (NULL != cbfunc) {
+                cbfunc(PMIX_ERROR, cd);
+            }
+            rc = PMIX_ERROR;
+            goto cleanup;
+        }
+        trk->op_cbfunc = cbfunc;
+    }
+
+    /* add this contributor to the tracker so they get
+     * notified when we are done */
+    PMIX_RETAIN(cd);  // prevent the caddy from being released when we return
+    pmix_list_append(&trk->local_cbs, &cd->super);
+    /* if all local contributions have been received,
+     * let the local host's server know that we are at the
+     * "fence" point - they will callback once the [dis]connect
+     * across all participants has been completed */
+    if (trk->def_complete &&
+        pmix_list_get_size(&trk->local_cbs) == trk->nlocal) {
+        if (disconnect) {
+            rc = pmix_host_server.disconnect(procs, nprocs, info, ninfo, cbfunc, trk);
+        } else {
+            rc = pmix_host_server.connect(procs, nprocs, info, ninfo, cbfunc, trk);
+        }
+    } else {
+        rc = PMIX_SUCCESS;
+    }
+
+  cleanup:
+    if (NULL != procs) {
+        PMIX_PROC_FREE(procs, nprocs);
+    }
+    if (NULL != info) {
+        PMIX_INFO_FREE(info, ninfo);
+    }
+    return rc;
+}
+
+pmix_status_t pmix_server_register_events(pmix_peer_t *peer,
+                                          pmix_buffer_t *buf,
+                                          pmix_op_cbfunc_t cbfunc,
+                                          void *cbdata)
+{
+    int32_t cnt;
+    pmix_status_t rc;
+    pmix_status_t *codes = NULL;
+    pmix_info_t *info = NULL;
+    size_t ninfo=0, ncodes, n, k;
+    pmix_regevents_info_t *reginfo;
+    pmix_peer_events_info_t *prev;
+    pmix_notify_caddy_t *cd;
+    int i;
+    bool enviro_events = false;
+    bool found, matched;
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "recvd register events");
+
+    /* unpack the number of codes */
+    cnt=1;
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, &ncodes, &cnt, PMIX_SIZE))) {
+        PMIX_ERROR_LOG(rc);
+        return rc;
+    }
+    /* unpack the array of codes */
+    if (0 < ncodes) {
+        codes = (pmix_status_t*)malloc(ncodes * sizeof(pmix_status_t));
+        cnt=ncodes;
+        if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, codes, &cnt, PMIX_STATUS))) {
+            PMIX_ERROR_LOG(rc);
+            goto cleanup;
+        }
+    }
+
+    /* unpack the number of info objects */
+    cnt=1;
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, &ninfo, &cnt, PMIX_SIZE))) {
+        PMIX_ERROR_LOG(rc);
+        return rc;
+    }
+    /* unpack the array of info objects */
+    if (0 < ninfo) {
+        PMIX_INFO_CREATE(info, ninfo);
+        cnt=ninfo;
+        if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, info, &cnt, PMIX_INFO))) {
+            PMIX_ERROR_LOG(rc);
+            goto cleanup;
+        }
+    }
+
+    /* see if they asked for enviro events */
+    for (n=0; n < ninfo; n++) {
+        if (0 == strcmp(info[n].key, PMIX_EVENT_ENVIRO_LEVEL)) {
+            if (PMIX_UNDEF == info[n].value.type ||
+                (PMIX_BOOL == info[n].value.type && info[n].value.data.flag)) {
+                enviro_events = true;
+            }
+            break;
+        }
+    }
+
+    /* if they asked for enviro events, and our host doesn't support
+     * register_events, then we cannot meet the request */
+    if (enviro_events && NULL == pmix_host_server.register_events) {
+        enviro_events = false;
+        rc = PMIX_ERR_NOT_SUPPORTED;
+        goto cleanup;
+    }
+
+    /* store the event registration info so we can call the registered
+     * client when the server notifies the event */
+    k=0;
+    do {
+        found = false;
+        PMIX_LIST_FOREACH(reginfo, &pmix_server_globals.events, pmix_regevents_info_t) {
+            if (NULL == codes) {
+                if (PMIX_MAX_ERR_CONSTANT == reginfo->code) {
+                    /* both are default handlers */
+                    found = true;
+                    break;
+                } else {
+                    continue;
+                }
+            } else {
+                if (PMIX_MAX_ERR_CONSTANT == reginfo->code) {
+                    continue;
+                } else if (codes[k] == reginfo->code) {
+                    found = true;
+                    break;
+                }
+            }
+        }
+        if (found) {
+            /* found it - add this peer if we don't already have it */
+            found = false;
+            PMIX_LIST_FOREACH(prev, &reginfo->peers, pmix_peer_events_info_t) {
+                if (prev->peer == peer) {
+                    /* already have it */
+                    rc = PMIX_SUCCESS;
+                    found = true;
+                    break;
+                }
+            }
+            if (!found) {
+                /* get here if we don't already have this peer */
+                prev = PMIX_NEW(pmix_peer_events_info_t);
+                PMIX_RETAIN(peer);
+                prev->peer = peer;
+                prev->enviro_events = enviro_events;
+                pmix_list_append(&reginfo->peers, &prev->super);
+            }
+        } else {
+            /* if we get here, then we didn't find an existing registration for this code */
+            reginfo = PMIX_NEW(pmix_regevents_info_t);
+            if (NULL == codes) {
+                reginfo->code = PMIX_MAX_ERR_CONSTANT;
+            } else {
+                reginfo->code = codes[k];
+            }
+            pmix_list_append(&pmix_server_globals.events, &reginfo->super);
+            prev = PMIX_NEW(pmix_peer_events_info_t);
+            PMIX_RETAIN(peer);
+            prev->peer = peer;
+            prev->enviro_events = enviro_events;
+            pmix_list_append(&reginfo->peers, &prev->super);
+        }
+        ++k;
+    } while (k < ncodes);
+
+    /* if they asked for enviro events, call the local server */
+    if (enviro_events) {
+        if (PMIX_SUCCESS != (rc = pmix_host_server.register_events(codes, ncodes, info, ninfo, cbfunc, cbdata))) {
+            pmix_output_verbose(2, pmix_globals.debug_output,
+                                 "server register events: host server reg events returned rc =%d", rc);
+        } else {
+            goto check;
+        }
+    }
+
+  cleanup:
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "server register events: ninfo =%lu rc =%d", ninfo, rc);
+    /* be sure to execute the callback */
+    if (NULL != cbfunc) {
+        cbfunc(rc, cbdata);
+    }
+    if (NULL != info) {
+        PMIX_INFO_FREE(info, ninfo);
+    }
+    if (PMIX_SUCCESS != rc) {
+        if (!enviro_events) {
+            if (NULL != codes) {
+                free(codes);
+            }
+        }
+        return rc;
+    }
+
+  check:
+    /* check if any matching notifications have been cached */
+    for (i=0; i < pmix_globals.notifications.size; i++) {
+        if (NULL == (cd = (pmix_notify_caddy_t*)pmix_ring_buffer_poke(&pmix_globals.notifications, i))) {
+            break;
+        }
+        found = false;
+        if (NULL == codes) {
+            /* they registered a default event handler - always matches */
+            found = true;
+        } else {
+            for (k=0; k < ncodes; k++) {
+                if (codes[k] == cd->status) {
+                    found = true;
+                    break;
+                }
+            }
+        }
+        if (found) {
+           /* if we were given specific targets, check if this is one */
+            if (NULL != cd->targets) {
+                matched = false;
+                for (n=0; n < cd->ntargets; n++) {
+                    if (0 != strncmp(peer->info->nptr->nspace, cd->targets[n].nspace, PMIX_MAX_NSLEN)) {
+                        continue;
+                    }
+                    /* if the source of the event is the same peer just registered, then ignore it
+                     * as the event notification system will have already locally
+                     * processed it */
+                    if (0 == strncmp(peer->info->nptr->nspace, cd->source.nspace, PMIX_MAX_NSLEN) &&
+                        peer->info->rank == cd->source.rank) {
+                        continue;
+                    }
+                    if (PMIX_RANK_WILDCARD == cd->targets[n].rank ||
+                        peer->info->rank == cd->targets[n].rank) {
+                        matched = true;
+                        break;
+                    }
+                }
+                if (!matched) {
+                    /* do not notify this one */
+                    continue;
+                }
+            }
+           /* all matches - notify */
+            PMIX_RETAIN(cd->buf);
+            PMIX_SERVER_QUEUE_REPLY(peer, 0, cd->buf);
+        }
+    }
+    if (!enviro_events) {
+        if (NULL != codes) {
+            free(codes);
+        }
+    }
+
+    return PMIX_SUCCESS;
+}
+
+void pmix_server_deregister_events(pmix_peer_t *peer,
+                                   pmix_buffer_t *buf)
+{
+    int32_t cnt;
+    pmix_status_t rc, code;
+    pmix_regevents_info_t *reginfo = NULL;
+    pmix_regevents_info_t *reginfo_next;
+    pmix_peer_events_info_t *prev;
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "recvd deregister events");
+
+    /* unpack codes and process until done */
+    cnt=1;
+    while (PMIX_SUCCESS == (rc = pmix_bfrop.unpack(buf, &code, &cnt, PMIX_STATUS))) {
+        PMIX_LIST_FOREACH_SAFE(reginfo, reginfo_next, &pmix_server_globals.events, pmix_regevents_info_t) {
+            if (code == reginfo->code) {
+                /* found it - remove this peer from the list */
+                PMIX_LIST_FOREACH(prev, &reginfo->peers, pmix_peer_events_info_t) {
+                    if (prev->peer == peer) {
+                        /* found it */
+                        pmix_list_remove_item(&reginfo->peers, &prev->super);
+                        PMIX_RELEASE(prev);
+                        break;
+                    }
+                }
+                /* if all of the peers for this code are now gone, then remove it */
+                if (0 == pmix_list_get_size(&reginfo->peers)) {
+                    pmix_list_remove_item(&pmix_server_globals.events, &reginfo->super);
+                    /* if this was registered with the host, then deregister it */
+                    PMIX_RELEASE(reginfo);
+                }
+            }
+        }
+    }
+    if (PMIX_ERR_UNPACK_READ_PAST_END_OF_BUFFER != rc) {
+        PMIX_ERROR_LOG(rc);
+    }
+}
+
+
+static void local_cbfunc(pmix_status_t status, void *cbdata)
+{
+    pmix_notify_caddy_t *cd = (pmix_notify_caddy_t*)cbdata;
+
+    if (NULL != cd->cbfunc) {
+        cd->cbfunc(status, cd->cbdata);
+    }
+    PMIX_RELEASE(cd);
+}
+
+pmix_status_t pmix_server_event_recvd_from_client(pmix_peer_t *peer,
+                                                  pmix_buffer_t *buf,
+                                                  pmix_op_cbfunc_t cbfunc,
+                                                  void *cbdata)
+{
+    int32_t cnt;
+    pmix_status_t rc;
+    pmix_notify_caddy_t *cd;
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "recvd event notification from client");
+
+    if (NULL == pmix_host_server.notify_event) {
+        return PMIX_ERR_NOT_SUPPORTED;
+    }
+
+    cd = PMIX_NEW(pmix_notify_caddy_t);
+    cd->cbfunc = cbfunc;
+    cd->cbdata = cbdata;
+    /* set the source */
+    (void)strncpy(cd->source.nspace, peer->info->nptr->nspace, PMIX_MAX_NSLEN);
+    cd->source.rank = peer->info->rank;
+
+    /* unpack status */
+    cnt = 1;
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, &cd->status, &cnt, PMIX_STATUS))) {
+        PMIX_ERROR_LOG(rc);
+        goto exit;
+    }
+
+    /* unpack the range */
+    cnt = 1;
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, &cd->range, &cnt, PMIX_DATA_RANGE))) {
+        PMIX_ERROR_LOG(rc);
+        goto exit;
+    }
+
+    /* unpack the info keys */
+    cnt = 1;
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, &cd->ninfo, &cnt, PMIX_SIZE))) {
+        PMIX_ERROR_LOG(rc);
+        goto exit;
+    }
+    if (0 < cd->ninfo) {
+        PMIX_INFO_CREATE(cd->info, cd->ninfo);
+        cnt = cd->ninfo;
+        if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, cd->info, &cnt, PMIX_INFO))) {
+            PMIX_ERROR_LOG(rc);
+            goto exit;
+        }
+    }
+
+    /* check the range directive - if it is LOCAL, then we just
+     * process it ourselves. Otherwise, it needs to go up to our
+     * host for dissemination */
+    if (PMIX_RANGE_LOCAL == cd->range) {
+        if (PMIX_SUCCESS != (rc = pmix_server_notify_client_of_event(cd->status,
+                                                                     &cd->source,
+                                                                     cd->range,
+                                                                     cd->info, cd->ninfo,
+                                                                     local_cbfunc, cd))) {
+            goto exit;
+        }
+        return PMIX_SUCCESS;
+    }
+
+    /* when we receive an event from a client, we just pass it to
+     * our host RM for distribution - if any targeted recipients
+     * are local to us, the host RM will let us know */
+    pmix_host_server.notify_event(cd->status, &cd->source, cd->range,
+                                  cd->info, cd->ninfo, local_cbfunc, cd);
+    return PMIX_SUCCESS;
+
+  exit:
+    PMIX_RELEASE(cd);
+    cbfunc(rc, cbdata);
+    return rc;
+}
+
+pmix_status_t pmix_server_query(pmix_peer_t *peer,
+                                pmix_buffer_t *buf,
+                                pmix_info_cbfunc_t cbfunc,
+                                void *cbdata)
+{
+    int32_t cnt;
+    pmix_status_t rc;
+    pmix_query_caddy_t *cd;
+    pmix_proc_t proc;
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "recvd query from client");
+
+    if (NULL == pmix_host_server.query) {
+        return PMIX_ERR_NOT_SUPPORTED;
+    }
+
+    cd = PMIX_NEW(pmix_query_caddy_t);
+    cd->cbdata = cbdata;
+    /* unpack the number of queries */
+    cnt = 1;
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, &cd->nqueries, &cnt, PMIX_SIZE))) {
+        PMIX_ERROR_LOG(rc);
+        goto exit;
+    }
+    /* unpack the queries */
+    if (0 < cd->nqueries) {
+        PMIX_QUERY_CREATE(cd->queries, cd->nqueries);
+        cnt = cd->nqueries;
+        if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, cd->queries, &cnt, PMIX_QUERY))) {
+            PMIX_ERROR_LOG(rc);
+            goto exit;
+        }
+    }
+
+    /* setup the requesting peer name */
+    (void)strncpy(proc.nspace, peer->info->nptr->nspace, PMIX_MAX_NSLEN);
+    proc.rank = peer->info->rank;
+
+    /* ask the host for the info */
+    if (PMIX_SUCCESS != (rc = pmix_host_server.query(&proc, cd->queries, cd->nqueries,
+                                                     cbfunc, cd))) {
+        goto exit;
+    }
+    return PMIX_SUCCESS;
+
+  exit:
+    PMIX_RELEASE(cd);
+    return rc;
+}
+
+static void logcbfn(pmix_status_t status, void *cbdata)
+{
+    pmix_shift_caddy_t *cd = (pmix_shift_caddy_t*)cbdata;
+    if (NULL != cd->cbfunc.opcbfn) {
+        cd->cbfunc.opcbfn(status, cd->cbdata);
+    }
+    PMIX_RELEASE(cd);
+}
+pmix_status_t pmix_server_log(pmix_peer_t *peer,
+                              pmix_buffer_t *buf,
+                              pmix_op_cbfunc_t cbfunc,
+                              void *cbdata)
+{
+    int32_t cnt;
+    pmix_status_t rc;
+    pmix_shift_caddy_t *cd;
+    pmix_proc_t proc;
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "recvd log from client");
+
+    if (NULL == pmix_host_server.log) {
+        return PMIX_ERR_NOT_SUPPORTED;
+    }
+
+    cd = PMIX_NEW(pmix_shift_caddy_t);
+    cd->cbfunc.opcbfn = cbfunc;
+    cd->cbdata = cbdata;
+    /* unpack the number of data */
+    cnt = 1;
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, &cd->ninfo, &cnt, PMIX_SIZE))) {
+        PMIX_ERROR_LOG(rc);
+        goto exit;
+    }
+    /* unpack the data */
+    if (0 < cd->ninfo) {
+        PMIX_INFO_CREATE(cd->info, cd->ninfo);
+        cnt = cd->ninfo;
+        if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, cd->info, &cnt, PMIX_INFO))) {
+            PMIX_ERROR_LOG(rc);
+            goto exit;
+        }
+    }
+    /* unpack the number of directives */
+    cnt = 1;
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, &cd->ndirs, &cnt, PMIX_SIZE))) {
+        PMIX_ERROR_LOG(rc);
+        goto exit;
+    }
+    /* unpack the directives */
+    if (0 < cd->ndirs) {
+        PMIX_INFO_CREATE(cd->directives, cd->ndirs);
+        cnt = cd->ndirs;
+        if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, cd->directives, &cnt, PMIX_INFO))) {
+            PMIX_ERROR_LOG(rc);
+            goto exit;
+        }
+    }
+
+    /* setup the requesting peer name */
+    (void)strncpy(proc.nspace, peer->info->nptr->nspace, PMIX_MAX_NSLEN);
+    proc.rank = peer->info->rank;
+
+    /* ask the host to log the info */
+    pmix_host_server.log(&proc, cd->info, cd->ninfo,
+                         cd->directives, cd->ndirs,
+                         logcbfn, cd);
+    return PMIX_SUCCESS;
+
+  exit:
+    PMIX_RELEASE(cd);
+    return rc;
+}
+
+pmix_status_t pmix_server_alloc(pmix_peer_t *peer,
+                                pmix_buffer_t *buf,
+                                pmix_info_cbfunc_t cbfunc,
+                                void *cbdata)
+{
+    int32_t cnt;
+    pmix_status_t rc;
+    pmix_query_caddy_t *cd;
+    pmix_proc_t proc;
+    pmix_alloc_directive_t directive;
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "recvd query from client");
+
+    if (NULL == pmix_host_server.allocate) {
+        return PMIX_ERR_NOT_SUPPORTED;
+    }
+
+    cd = PMIX_NEW(pmix_query_caddy_t);
+    cd->cbdata = cbdata;
+
+    /* unpack the directive */
+    cnt = 1;
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, &directive, &cnt, PMIX_ALLOC_DIRECTIVE))) {
+        PMIX_ERROR_LOG(rc);
+        goto exit;
+    }
+
+    /* unpack the number of info objects */
+    cnt = 1;
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, &cd->ninfo, &cnt, PMIX_SIZE))) {
+        PMIX_ERROR_LOG(rc);
+        goto exit;
+    }
+    /* unpack the info */
+    if (0 < cd->ninfo) {
+        PMIX_INFO_CREATE(cd->info, cd->ninfo);
+        cnt = cd->ninfo;
+        if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, cd->info, &cnt, PMIX_INFO))) {
+            PMIX_ERROR_LOG(rc);
+            goto exit;
+        }
+    }
+
+    /* setup the requesting peer name */
+    (void)strncpy(proc.nspace, peer->info->nptr->nspace, PMIX_MAX_NSLEN);
+    proc.rank = peer->info->rank;
+
+    /* ask the host to execute the request */
+    if (PMIX_SUCCESS != (rc = pmix_host_server.allocate(&proc, directive,
+                                                        cd->info, cd->ninfo,
+                                                        cbfunc, cd))) {
+        goto exit;
+    }
+    return PMIX_SUCCESS;
+
+  exit:
+    PMIX_RELEASE(cd);
+    return rc;
+}
+
+pmix_status_t pmix_server_job_ctrl(pmix_peer_t *peer,
+                                   pmix_buffer_t *buf,
+                                   pmix_info_cbfunc_t cbfunc,
+                                   void *cbdata)
+{
+    int32_t cnt;
+    pmix_status_t rc;
+    pmix_query_caddy_t *cd;
+    pmix_proc_t proc;
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "recvd job control request from client");
+
+    if (NULL == pmix_host_server.job_control) {
+        return PMIX_ERR_NOT_SUPPORTED;
+    }
+
+    cd = PMIX_NEW(pmix_query_caddy_t);
+    cd->cbdata = cbdata;
+
+    /* unpack the number of targets */
+    cnt = 1;
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, &cd->ntargets, &cnt, PMIX_SIZE))) {
+        PMIX_ERROR_LOG(rc);
+        goto exit;
+    }
+    if (0 < cd->ntargets) {
+        PMIX_PROC_CREATE(cd->targets, cd->ntargets);
+        cnt = cd->ntargets;
+        if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, cd->targets, &cnt, PMIX_PROC))) {
+            PMIX_ERROR_LOG(rc);
+            goto exit;
+        }
+    }
+    /* unpack the number of info objects */
+    cnt = 1;
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, &cd->ninfo, &cnt, PMIX_SIZE))) {
+        PMIX_ERROR_LOG(rc);
+        goto exit;
+    }
+    /* unpack the info */
+    if (0 < cd->ninfo) {
+        PMIX_INFO_CREATE(cd->info, cd->ninfo);
+        cnt = cd->ninfo;
+        if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, cd->info, &cnt, PMIX_INFO))) {
+            PMIX_ERROR_LOG(rc);
+            goto exit;
+        }
+    }
+
+    /* setup the requesting peer name */
+    (void)strncpy(proc.nspace, peer->info->nptr->nspace, PMIX_MAX_NSLEN);
+    proc.rank = peer->info->rank;
+
+    /* ask the host to execute the request */
+    if (PMIX_SUCCESS != (rc = pmix_host_server.job_control(&proc,
+                                                           cd->targets, cd->ntargets,
+                                                           cd->info, cd->ninfo,
+                                                           cbfunc, cd))) {
+        goto exit;
+    }
+    return PMIX_SUCCESS;
+
+  exit:
+    PMIX_RELEASE(cd);
+    return rc;
+}
+
+pmix_status_t pmix_server_monitor(pmix_peer_t *peer,
+                                  pmix_buffer_t *buf,
+                                  pmix_info_cbfunc_t cbfunc,
+                                  void *cbdata)
+{
+    int32_t cnt;
+    pmix_info_t monitor;
+    pmix_status_t rc, error;
+    pmix_query_caddy_t *cd;
+    pmix_proc_t proc;
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "recvd monitor request from client");
+
+    if (NULL == pmix_host_server.monitor) {
+        return PMIX_ERR_NOT_SUPPORTED;
+    }
+
+    cd = PMIX_NEW(pmix_query_caddy_t);
+    cd->cbdata = cbdata;
+
+    /* unpack what is to be monitored */
+    PMIX_INFO_CONSTRUCT(&monitor);
+    cnt = 1;
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, &monitor, &cnt, PMIX_INFO))) {
+        PMIX_ERROR_LOG(rc);
+        goto exit;
+    }
+
+    /* unpack the error code */
+    cnt = 1;
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, &error, &cnt, PMIX_STATUS))) {
+        PMIX_ERROR_LOG(rc);
+        goto exit;
+    }
+
+    /* unpack the number of directives */
+    cnt = 1;
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, &cd->ninfo, &cnt, PMIX_SIZE))) {
+        PMIX_ERROR_LOG(rc);
+        goto exit;
+    }
+    /* unpack the directives */
+    if (0 < cd->ninfo) {
+        PMIX_INFO_CREATE(cd->info, cd->ninfo);
+        cnt = cd->ninfo;
+        if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, cd->info, &cnt, PMIX_INFO))) {
+            PMIX_ERROR_LOG(rc);
+            goto exit;
+        }
+    }
+
+    /* setup the requesting peer name */
+    (void)strncpy(proc.nspace, peer->info->nptr->nspace, PMIX_MAX_NSLEN);
+    proc.rank = peer->info->rank;
+
+    /* ask the host to execute the request */
+    if (PMIX_SUCCESS != (rc = pmix_host_server.monitor(&proc, &monitor, error,
+                                                       cd->info, cd->ninfo,
+                                                       cbfunc, cd))) {
+        goto exit;
+    }
+    return PMIX_SUCCESS;
+
+  exit:
+    PMIX_INFO_DESTRUCT(&monitor);
+    PMIX_RELEASE(cd);
+    return rc;
+}
+
+/*****    INSTANCE SERVER LIBRARY CLASSES    *****/
+static void tcon(pmix_server_trkr_t *t)
+{
+    t->pcs = NULL;
+    t->npcs = 0;
+    PMIX_CONSTRUCT_LOCK(&t->lock);
+    t->def_complete = false;
+    PMIX_CONSTRUCT(&t->ranks, pmix_list_t);
+    PMIX_CONSTRUCT(&t->local_cbs, pmix_list_t);
+    t->nlocal = 0;
+    t->local_cnt = 0;
+    t->info = NULL;
+    t->ninfo = 0;
+    /* this needs to be set explicitly */
+    t->collect_type = PMIX_COLLECT_INVALID;
+    t->modexcbfunc = NULL;
+    t->op_cbfunc = NULL;
+}
+static void tdes(pmix_server_trkr_t *t)
+{
+    PMIX_DESTRUCT_LOCK(&t->lock);
+    if (NULL != t->pcs) {
+        free(t->pcs);
+    }
+    PMIX_LIST_DESTRUCT(&t->ranks);
+    PMIX_LIST_DESTRUCT(&t->local_cbs);
+    PMIX_INFO_FREE(t->info, t->ninfo);
+}
+PMIX_CLASS_INSTANCE(pmix_server_trkr_t,
+                   pmix_list_item_t,
+                   tcon, tdes);
+
+static void cdcon(pmix_server_caddy_t *cd)
+{
+    cd->peer = NULL;
+    PMIX_CONSTRUCT(&cd->snd, pmix_snd_caddy_t);
+}
+static void cddes(pmix_server_caddy_t *cd)
+{
+    if (NULL != cd->peer) {
+        PMIX_RELEASE(cd->peer);
+    }
+    PMIX_DESTRUCT(&cd->snd);
+}
+PMIX_CLASS_INSTANCE(pmix_server_caddy_t,
+                   pmix_list_item_t,
+                   cdcon, cddes);
+
+
+PMIX_CLASS_INSTANCE(pmix_snd_caddy_t,
+                   pmix_object_t,
+                   NULL, NULL);
+
+static void scadcon(pmix_setup_caddy_t *p)
+{
+    memset(&p->proc, 0, sizeof(pmix_proc_t));
+    PMIX_CONSTRUCT_LOCK(&p->lock);
+    p->nspace = NULL;
+    p->server_object = NULL;
+    p->nlocalprocs = 0;
+    p->info = NULL;
+    p->ninfo = 0;
+    p->cbfunc = NULL;
+    p->opcbfunc = NULL;
+    p->setupcbfunc = NULL;
+    p->cbdata = NULL;
+}
+static void scaddes(pmix_setup_caddy_t *p)
+{
+    PMIX_DESTRUCT_LOCK(&p->lock);
+}
+PMIX_EXPORT PMIX_CLASS_INSTANCE(pmix_setup_caddy_t,
+                                pmix_object_t,
+                                scadcon, scaddes);
+
+static void ncon(pmix_notify_caddy_t *p)
+{
+    PMIX_CONSTRUCT_LOCK(&p->lock);
+    memset(p->source.nspace, 0, PMIX_MAX_NSLEN+1);
+    p->source.rank = PMIX_RANK_UNDEF;
+    p->range = PMIX_RANGE_UNDEF;
+    p->targets = NULL;
+    p->ntargets = 0;
+    p->nondefault = false;
+    p->info = NULL;
+    p->ninfo = 0;
+    p->buf = PMIX_NEW(pmix_buffer_t);
+}
+static void ndes(pmix_notify_caddy_t *p)
+{
+    PMIX_DESTRUCT_LOCK(&p->lock);
+    if (NULL != p->info) {
+        PMIX_INFO_FREE(p->info, p->ninfo);
+    }
+    if (NULL != p->targets) {
+        free(p->targets);
+    }
+    if (NULL != p->buf) {
+        PMIX_RELEASE(p->buf);
+    }
+}
+PMIX_CLASS_INSTANCE(pmix_notify_caddy_t,
+                    pmix_object_t,
+                    ncon, ndes);
+
+
+PMIX_CLASS_INSTANCE(pmix_trkr_caddy_t,
+                    pmix_object_t,
+                    NULL, NULL);
+
+static void dmcon(pmix_dmdx_remote_t *p)
+{
+    p->cd = NULL;
+}
+static void dmdes(pmix_dmdx_remote_t *p)
+{
+    if (NULL != p->cd) {
+        PMIX_RELEASE(p->cd);
+    }
+}
+PMIX_CLASS_INSTANCE(pmix_dmdx_remote_t,
+                    pmix_list_item_t,
+                    dmcon, dmdes);
+
+PMIX_CLASS_INSTANCE(pmix_dmdx_request_t,
+                    pmix_list_item_t,
+                    NULL, NULL);
+
+static void lmcon(pmix_dmdx_local_t *p)
+{
+    memset(&p->proc, 0, sizeof(pmix_proc_t));
+    PMIX_CONSTRUCT(&p->loc_reqs, pmix_list_t);
+    p->info = NULL;
+    p->ninfo = 0;
+}
+static void lmdes(pmix_dmdx_local_t *p)
+{
+    if (NULL != p->info) {
+        PMIX_INFO_FREE(p->info, p->ninfo);
+    }
+    PMIX_LIST_DESTRUCT(&p->loc_reqs);
+}
+PMIX_CLASS_INSTANCE(pmix_dmdx_local_t,
+                    pmix_list_item_t,
+                    lmcon, lmdes);
+
+static void prevcon(pmix_peer_events_info_t *p)
+{
+    p->peer = NULL;
+}
+static void prevdes(pmix_peer_events_info_t *p)
+{
+    if (NULL != p->peer) {
+        PMIX_RELEASE(p->peer);
+    }
+}
+PMIX_CLASS_INSTANCE(pmix_peer_events_info_t,
+                    pmix_list_item_t,
+                    prevcon, prevdes);
+
+static void regcon(pmix_regevents_info_t *p)
+{
+    PMIX_CONSTRUCT(&p->peers, pmix_list_t);
+}
+static void regdes(pmix_regevents_info_t *p)
+{
+    PMIX_LIST_DESTRUCT(&p->peers);
+}
+PMIX_CLASS_INSTANCE(pmix_regevents_info_t,
+                    pmix_list_item_t,
+                    regcon, regdes);
diff --git a/src/server/pmix_server_ops.h b/src/server/pmix_server_ops.h
new file mode 100644
index 0000000..dac731d
--- /dev/null
+++ b/src/server/pmix_server_ops.h
@@ -0,0 +1,222 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2015-2017 Intel, Inc. All rights reserved.
+ * Copyright (c) 2015      Artem Y. Polyakov <artpol84 at gmail.com>.
+ *                         All rights reserved.
+ * Copyright (c) 2015      Mellanox Technologies, Inc.
+ *                         All rights reserved.
+ * Copyright (c) 2016      IBM Corporation.  All rights reserved.
+ * Copyright (c) 2016      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * $COPYRIGHT$
+ */
+
+#ifndef PMIX_SERVER_OPS_H
+#define PMIX_SERVER_OPS_H
+
+#include <src/include/pmix_config.h>
+
+#include <pmix_common.h>
+#include <src/class/pmix_ring_buffer.h>
+#include <pmix_server.h>
+#include "src/threads/threads.h"
+#include "src/util/hash.h"
+
+typedef struct {
+    pmix_object_t super;
+    pmix_event_t ev;
+    pmix_server_trkr_t *trk;
+} pmix_trkr_caddy_t;
+PMIX_CLASS_DECLARATION(pmix_trkr_caddy_t);
+
+typedef struct {
+    pmix_object_t super;
+    pmix_event_t ev;
+    pmix_lock_t lock;
+    char *nspace;
+    pmix_status_t status;
+    pmix_proc_t proc;
+    uid_t uid;
+    gid_t gid;
+    void *server_object;
+    int nlocalprocs;
+    pmix_info_t *info;
+    size_t ninfo;
+    pmix_op_cbfunc_t opcbfunc;
+    pmix_dmodex_response_fn_t cbfunc;
+    pmix_setup_application_cbfunc_t setupcbfunc;
+    void *cbdata;
+} pmix_setup_caddy_t;
+PMIX_CLASS_DECLARATION(pmix_setup_caddy_t);
+
+typedef struct {
+    pmix_list_item_t super;
+    pmix_setup_caddy_t *cd;
+} pmix_dmdx_remote_t;
+PMIX_CLASS_DECLARATION(pmix_dmdx_remote_t);
+
+typedef struct {
+    pmix_list_item_t super;
+    pmix_modex_cbfunc_t cbfunc;     // cbfunc to be executed when data is available
+    void *cbdata;
+} pmix_dmdx_request_t;
+PMIX_CLASS_DECLARATION(pmix_dmdx_request_t);
+
+typedef struct {
+    pmix_list_item_t super;
+    pmix_proc_t proc;               // id of proc whose data is being requested
+    pmix_list_t loc_reqs;           // list of pmix_dmdx_request_t elem's keeping track of
+                                    // all local ranks that are interested in this namespace-rank
+    pmix_info_t *info;              // array of info structs for this request
+    size_t ninfo;                   // number of info structs
+} pmix_dmdx_local_t;
+PMIX_CLASS_DECLARATION(pmix_dmdx_local_t);
+
+/* event/error registration book keeping */
+typedef struct {
+    pmix_list_item_t super;
+    pmix_peer_t *peer;
+    bool enviro_events;
+} pmix_peer_events_info_t;
+PMIX_CLASS_DECLARATION(pmix_peer_events_info_t);
+
+typedef struct {
+    pmix_list_item_t super;
+    pmix_list_t peers;              // list of pmix_prevents_info_t
+    int code;
+} pmix_regevents_info_t;
+PMIX_CLASS_DECLARATION(pmix_regevents_info_t);
+
+typedef struct {
+    pmix_pointer_array_t clients;           // array of pmix_peer_t local clients
+    pmix_list_t collectives;                // list of active pmix_server_trkr_t
+    pmix_list_t remote_pnd;                 // list of pmix_dmdx_remote_t awaiting arrival of data fror servicing remote req's
+    pmix_list_t local_reqs;                 // list of pmix_dmdx_local_t awaiting arrival of data from local neighbours
+    pmix_buffer_t gdata;                    // cache of data given to me for passing to all clients
+    pmix_list_t events;                     // list of pmix_regevents_info_t registered events
+    bool tool_connections_allowed;
+} pmix_server_globals_t;
+
+#define PMIX_PEER_CADDY(c, p, t)                \
+    do {                                        \
+        (c) = PMIX_NEW(pmix_server_caddy_t);    \
+        (c)->hdr.tag = (t);                     \
+        PMIX_RETAIN((p));                       \
+        (c)->peer = (p);                        \
+    } while (0)
+
+#define PMIX_SETUP_COLLECTIVE(c, t)             \
+    do {                                        \
+        (c) = PMIX_NEW(pmix_trkr_caddy_t);      \
+        (c)->trk = (t);                         \
+    } while (0)
+
+#define PMIX_EXECUTE_COLLECTIVE(c, t, f)                        \
+    do {                                                        \
+        PMIX_SETUP_COLLECTIVE(c, t);                            \
+        pmix_event_assign(&((c)->ev), pmix_globals.evbase, -1,  \
+                          EV_WRITE, (f), (c));                  \
+        pmix_event_active(&((c)->ev), EV_WRITE, 1);             \
+    } while (0)
+
+
+
+bool pmix_server_trk_update(pmix_server_trkr_t *trk);
+
+void pmix_pending_nspace_requests(pmix_nspace_t *nptr);
+pmix_status_t pmix_pending_resolve(pmix_nspace_t *nptr, pmix_rank_t rank,
+                                   pmix_status_t status, pmix_dmdx_local_t *lcd);
+
+
+pmix_status_t pmix_server_abort(pmix_peer_t *peer, pmix_buffer_t *buf,
+                                pmix_op_cbfunc_t cbfunc, void *cbdata);
+
+pmix_status_t pmix_server_commit(pmix_peer_t *peer, pmix_buffer_t *buf);
+
+pmix_status_t pmix_server_fence(pmix_server_caddy_t *cd,
+                                pmix_buffer_t *buf,
+                                pmix_modex_cbfunc_t modexcbfunc,
+                                pmix_op_cbfunc_t opcbfunc);
+
+pmix_status_t pmix_server_get(pmix_buffer_t *buf,
+                              pmix_modex_cbfunc_t cbfunc,
+                              void *cbdata);
+
+pmix_status_t pmix_server_publish(pmix_peer_t *peer,
+                                  pmix_buffer_t *buf,
+                                  pmix_op_cbfunc_t cbfunc,
+                                  void *cbdata);
+
+pmix_status_t pmix_server_lookup(pmix_peer_t *peer,
+                                 pmix_buffer_t *buf,
+                                 pmix_lookup_cbfunc_t cbfunc,
+                                 void *cbdata);
+
+pmix_status_t pmix_server_unpublish(pmix_peer_t *peer,
+                                    pmix_buffer_t *buf,
+                                    pmix_op_cbfunc_t cbfunc,
+                                    void *cbdata);
+
+pmix_status_t pmix_server_spawn(pmix_peer_t *peer,
+                                pmix_buffer_t *buf,
+                                pmix_spawn_cbfunc_t cbfunc,
+                                void *cbdata);
+
+pmix_status_t pmix_server_connect(pmix_server_caddy_t *cd,
+                                  pmix_buffer_t *buf, bool disconnect,
+                                  pmix_op_cbfunc_t cbfunc);
+
+void pmix_pack_proc_map(pmix_buffer_t *buf,
+                        char **nodes, char **procs);
+pmix_status_t pmix_regex_parse_nodes(const char *regexp, char ***names);
+pmix_status_t pmix_regex_parse_procs(const char *regexp, char ***procs);
+
+pmix_status_t pmix_server_notify_error(pmix_status_t status,
+                                       pmix_proc_t procs[], size_t nprocs,
+                                       pmix_proc_t error_procs[], size_t error_nprocs,
+                                       pmix_info_t info[], size_t ninfo,
+                                       pmix_op_cbfunc_t cbfunc, void *cbdata);
+
+pmix_status_t pmix_server_register_events(pmix_peer_t *peer,
+                                          pmix_buffer_t *buf,
+                                          pmix_op_cbfunc_t cbfunc,
+                                          void *cbdata);
+
+void pmix_server_deregister_events(pmix_peer_t *peer,
+                                   pmix_buffer_t *buf);
+
+pmix_status_t pmix_server_query(pmix_peer_t *peer,
+                                pmix_buffer_t *buf,
+                                pmix_info_cbfunc_t cbfunc,
+                                void *cbdata);
+
+pmix_status_t pmix_server_log(pmix_peer_t *peer,
+                              pmix_buffer_t *buf,
+                              pmix_op_cbfunc_t cbfunc,
+                              void *cbdata);
+
+pmix_status_t pmix_server_alloc(pmix_peer_t *peer,
+                                pmix_buffer_t *buf,
+                                pmix_info_cbfunc_t cbfunc,
+                                void *cbdata);
+
+pmix_status_t pmix_server_job_ctrl(pmix_peer_t *peer,
+                                   pmix_buffer_t *buf,
+                                   pmix_info_cbfunc_t cbfunc,
+                                   void *cbdata);
+
+pmix_status_t pmix_server_monitor(pmix_peer_t *peer,
+                                  pmix_buffer_t *buf,
+                                  pmix_info_cbfunc_t cbfunc,
+                                  void *cbdata);
+
+pmix_status_t pmix_server_event_recvd_from_client(pmix_peer_t *peer,
+                                                  pmix_buffer_t *buf,
+                                                  pmix_op_cbfunc_t cbfunc,
+                                                  void *cbdata);
+void pmix_server_execute_collective(int sd, short args, void *cbdata);
+
+PMIX_EXPORT extern pmix_server_module_t pmix_host_server;
+PMIX_EXPORT extern pmix_server_globals_t pmix_server_globals;
+
+#endif // PMIX_SERVER_OPS_H
diff --git a/src/server/pmix_server_regex.c b/src/server/pmix_server_regex.c
new file mode 100644
index 0000000..646656f
--- /dev/null
+++ b/src/server/pmix_server_regex.c
@@ -0,0 +1,553 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2014-2017 Intel, Inc. All rights reserved.
+ * Copyright (c) 2014-2015 Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2014      Artem Y. Polyakov <artpol84 at gmail.com>.
+ *                         All rights reserved.
+ * Copyright (c) 2016      Mellanox Technologies, Inc.
+ *                         All rights reserved.
+ * Copyright (c) 2016      IBM Corporation.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+
+#include <src/include/types.h>
+#include <src/include/pmix_stdint.h>
+#include <pmix_rename.h>
+
+#include "src/include/pmix_globals.h"
+
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+#include <fcntl.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#include <ctype.h>
+
+#include "src/class/pmix_list.h"
+#include "src/buffer_ops/buffer_ops.h"
+#include "src/util/argv.h"
+#include "src/util/error.h"
+#include "src/util/output.h"
+#include "src/server/pmix_server_ops.h"
+
+static pmix_status_t regex_parse_value_ranges(char *base, char *ranges,
+                                              int num_digits, char *suffix,
+                                              char ***names);
+static pmix_status_t regex_parse_value_range(char *base, char *range,
+                                             int num_digits, char *suffix,
+                                             char ***names);
+static pmix_status_t pmix_regex_extract_nodes(char *regexp, char ***names);
+static pmix_status_t pmix_regex_extract_ppn(char *regexp, char ***procs);
+
+/* we need to pass three things to the client:
+ *
+ * (a) the list of nodes involved in this nspace
+ *
+ * (b) the hostname for each proc in this nspace
+ *
+ * (c) the list of procs on each node for reverse lookup
+ */
+void pmix_pack_proc_map(pmix_buffer_t *buf,
+                        char **nodes, char **procs)
+{
+    pmix_kval_t kv;
+    pmix_value_t val;
+    pmix_status_t rc;
+    pmix_buffer_t buf2;
+    size_t i, nnodes;
+
+    /* bozo check - need procs for each node */
+    if (pmix_argv_count(nodes) != pmix_argv_count(procs)) {
+        PMIX_ERROR_LOG(PMIX_ERR_BAD_PARAM);
+        return;
+    }
+
+    PMIX_CONSTRUCT(&buf2, pmix_buffer_t);
+    PMIX_CONSTRUCT(&kv, pmix_kval_t);
+    kv.value = &val;
+    val.type = PMIX_STRING;
+
+    /* pass the number of nodes involved in this namespace */
+    nnodes = pmix_argv_count(nodes);
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(&buf2, &nnodes, 1, PMIX_SIZE))) {
+        PMIX_ERROR_LOG(rc);
+        goto cleanup;
+    }
+
+    for (i=0; i < nnodes; i++) {
+        /* pass the complete list of procs on this node */
+        kv.key = nodes[i];
+        val.data.string = procs[i];
+        if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(&buf2, &kv, 1, PMIX_KVAL))) {
+            PMIX_ERROR_LOG(rc);
+            kv.key = NULL;
+            val.data.string = NULL;
+            goto cleanup;
+        }
+    }
+    kv.key = NULL;
+    val.data.string = NULL;
+
+    /* pass the completed blob */
+    kv.key = PMIX_MAP_BLOB;
+    val.type = PMIX_BYTE_OBJECT;
+    val.data.bo.bytes = buf2.base_ptr;
+    val.data.bo.size = buf2.bytes_used;
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(buf, &kv, 1, PMIX_KVAL))) {
+        PMIX_ERROR_LOG(rc);
+    }
+    kv.key = NULL;
+    kv.value = NULL;
+    val.data.bo.bytes = NULL;
+    val.data.bo.size = 0;
+
+ cleanup:
+    PMIX_DESTRUCT(&buf2);
+    PMIX_DESTRUCT(&kv);
+    return;
+}
+
+
+PMIX_EXPORT pmix_status_t pmix_regex_parse_nodes(const char *regexp, char ***names)
+{
+    char *tmp, *ptr;
+    pmix_status_t rc;
+
+    /* set default */
+    *names = NULL;
+
+    /* protect against bozo */
+    if (NULL == regexp) {
+        return PMIX_SUCCESS;
+    }
+
+    /* protect the input string */
+    tmp = strdup(regexp);
+    /* strip the trailing bracket */
+    tmp[strlen(tmp)-1] = '\0';
+
+    /* the regex generator used to create this regex
+     * is tagged at the beginning of the string */
+    if (NULL == (ptr = strchr(tmp, '['))) {
+        PMIX_ERROR_LOG(PMIX_ERR_BAD_PARAM);
+        free(tmp);
+        return PMIX_ERR_BAD_PARAM;
+    }
+    *ptr = '\0';
+    ++ptr;
+
+    /* if it was done by PMIx, use that parser */
+    if (0 == strcmp(tmp, "pmix")) {
+        if (PMIX_SUCCESS != (rc = pmix_regex_extract_nodes(ptr, names))) {
+            PMIX_ERROR_LOG(rc);
+        }
+    } else {
+        PMIX_ERROR_LOG(PMIX_ERR_NOT_SUPPORTED);
+        rc = PMIX_ERR_NOT_SUPPORTED;
+    }
+    free(tmp);
+    return rc;
+}
+
+
+PMIX_EXPORT pmix_status_t pmix_regex_parse_procs(const char *regexp, char ***procs)
+{
+    char *tmp, *ptr;
+    pmix_status_t rc;
+
+    /* set default */
+    *procs = NULL;
+
+    /* protect against bozo */
+    if (NULL == regexp) {
+        return PMIX_SUCCESS;
+    }
+
+    /* protect the input string */
+    tmp = strdup(regexp);
+    /* strip the trailing bracket */
+    tmp[strlen(tmp)-1] = '\0';
+
+    /* the regex generator used to create this regex
+     * is tagged at the beginning of the string */
+    if (NULL == (ptr = strchr(tmp, '['))) {
+        PMIX_ERROR_LOG(PMIX_ERR_BAD_PARAM);
+        free(tmp);
+        return PMIX_ERR_BAD_PARAM;
+    }
+    *ptr = '\0';
+    ++ptr;
+
+    /* if it was done by PMIx, use that parser */
+    if (0 == strcmp(tmp, "pmix")) {
+        if (PMIX_SUCCESS != (rc = pmix_regex_extract_ppn(ptr, procs))) {
+            PMIX_ERROR_LOG(rc);
+        }
+    } else {
+        PMIX_ERROR_LOG(PMIX_ERR_NOT_SUPPORTED);
+        rc = PMIX_ERR_NOT_SUPPORTED;
+    }
+    free(tmp);
+    return rc;
+}
+
+
+static pmix_status_t pmix_regex_extract_nodes(char *regexp, char ***names)
+{
+    int i, j, k, len;
+    pmix_status_t ret;
+    char *base;
+    char *orig, *suffix;
+    bool found_range = false;
+    bool more_to_come = false;
+    int num_digits;
+
+    /* set the default */
+    *names = NULL;
+
+    if (NULL == regexp) {
+        return PMIX_SUCCESS;
+    }
+
+    orig = base = strdup(regexp);
+    if (NULL == base) {
+        PMIX_ERROR_LOG(PMIX_ERR_OUT_OF_RESOURCE);
+        return PMIX_ERR_OUT_OF_RESOURCE;
+    }
+
+    PMIX_OUTPUT_VERBOSE((1, pmix_globals.debug_output,
+                         "pmix:extract:nodes: checking list: %s", regexp));
+
+    do {
+        /* Find the base */
+        len = strlen(base);
+        for (i = 0; i <= len; ++i) {
+            if (base[i] == '[') {
+                /* we found a range. this gets dealt with below */
+                base[i] = '\0';
+                found_range = true;
+                break;
+            }
+            if (base[i] == ',') {
+                /* we found a singleton value, and there are more to come */
+                base[i] = '\0';
+                found_range = false;
+                more_to_come = true;
+                break;
+            }
+            if (base[i] == '\0') {
+                /* we found a singleton value */
+                found_range = false;
+                more_to_come = false;
+                break;
+            }
+        }
+        if (i == 0 && !found_range) {
+            /* we found a special character at the beginning of the string */
+            free(orig);
+            return PMIX_ERR_BAD_PARAM;
+        }
+
+        if (found_range) {
+            /* If we found a range, get the number of digits in the numbers */
+            i++;  /* step over the [ */
+            for (j=i; j < len; j++) {
+                if (base[j] == ':') {
+                    base[j] = '\0';
+                    break;
+                }
+            }
+            if (j >= len) {
+                /* we didn't find the number of digits */
+                free(orig);
+                return PMIX_ERR_BAD_PARAM;
+            }
+            num_digits = strtol(&base[i], NULL, 10);
+            i = j + 1;  /* step over the : */
+            /* now find the end of the range */
+            for (j = i; j < len; ++j) {
+                if (base[j] == ']') {
+                    base[j] = '\0';
+                    break;
+                }
+            }
+            if (j >= len) {
+                /* we didn't find the end of the range */
+                free(orig);
+                return PMIX_ERR_BAD_PARAM;
+            }
+            /* check for a suffix */
+            if (j+1 < len && base[j+1] != ',') {
+                /* find the next comma, if present */
+                for (k=j+1; k < len && base[k] != ','; k++);
+                if (k < len) {
+                    base[k] = '\0';
+                }
+                suffix = strdup(&base[j+1]);
+                if (k < len) {
+                    base[k] = ',';
+                }
+                j = k-1;
+            } else {
+                suffix = NULL;
+            }
+            PMIX_OUTPUT_VERBOSE((1, pmix_globals.debug_output,
+                                 "regex:extract:nodes: parsing range %s %s %s",
+                                 base, base + i, suffix));
+
+            ret = regex_parse_value_ranges(base, base + i, num_digits, suffix, names);
+            if (NULL != suffix) {
+                free(suffix);
+            }
+            if (PMIX_SUCCESS != ret) {
+                free(orig);
+                return ret;
+            }
+            if (j+1 < len && base[j + 1] == ',') {
+                more_to_come = true;
+                base = &base[j + 2];
+            } else {
+                more_to_come = false;
+            }
+        } else {
+            /* If we didn't find a range, just add the value */
+            if(PMIX_SUCCESS != (ret = pmix_argv_append_nosize(names, base))) {
+                PMIX_ERROR_LOG(ret);
+                free(orig);
+                return ret;
+            }
+            /* step over the comma */
+            i++;
+            /* set base equal to the (possible) next base to look at */
+            base = &base[i];
+        }
+    } while(more_to_come);
+
+    free(orig);
+
+    /* All done */
+    return ret;
+}
+
+
+/*
+ * Parse one or more ranges in a set
+ *
+ * @param base     The base text of the value name
+ * @param *ranges  A pointer to a range. This can contain multiple ranges
+ *                 (i.e. "1-3,10" or "5" or "9,0100-0130,250")
+ * @param ***names An argv array to add the newly discovered values to
+ */
+static pmix_status_t regex_parse_value_ranges(char *base, char *ranges,
+                                              int num_digits, char *suffix,
+                                              char ***names)
+{
+    int i, len;
+    pmix_status_t ret;
+    char *start, *orig;
+
+    /* Look for commas, the separator between ranges */
+
+    len = strlen(ranges);
+    for (orig = start = ranges, i = 0; i < len; ++i) {
+        if (',' == ranges[i]) {
+            ranges[i] = '\0';
+            ret = regex_parse_value_range(base, start, num_digits, suffix, names);
+            if (PMIX_SUCCESS != ret) {
+                PMIX_ERROR_LOG(ret);
+                return ret;
+            }
+            start = ranges + i + 1;
+        }
+    }
+
+    /* Pick up the last range, if it exists */
+
+    if (start < orig + len) {
+
+        PMIX_OUTPUT_VERBOSE((1, pmix_globals.debug_output,
+                             "regex:parse:ranges: parse range %s (2)", start));
+
+        ret = regex_parse_value_range(base, start, num_digits, suffix, names);
+        if (PMIX_SUCCESS != ret) {
+            PMIX_ERROR_LOG(ret);
+            return ret;
+        }
+    }
+
+    /* All done */
+    return PMIX_SUCCESS;
+}
+
+
+/*
+ * Parse a single range in a set and add the full names of the values
+ * found to the names argv
+ *
+ * @param base     The base text of the value name
+ * @param *ranges  A pointer to a single range. (i.e. "1-3" or "5")
+ * @param ***names An argv array to add the newly discovered values to
+ */
+static pmix_status_t regex_parse_value_range(char *base, char *range,
+                                             int num_digits, char *suffix,
+                                             char ***names)
+{
+    char *str, tmp[132];
+    size_t i, k, start, end;
+    size_t base_len, len;
+    bool found;
+    pmix_status_t ret;
+
+    if (NULL == base || NULL == range) {
+        return PMIX_ERROR;
+    }
+
+    len = strlen(range);
+    base_len = strlen(base);
+    /* Silence compiler warnings; start and end are always assigned
+     properly, below */
+    start = end = 0;
+
+    /* Look for the beginning of the first number */
+
+    for (found = false, i = 0; i < len; ++i) {
+        if (isdigit((int) range[i])) {
+            if (!found) {
+                start = atoi(range + i);
+                found = true;
+                break;
+            }
+        }
+    }
+    if (!found) {
+        PMIX_ERROR_LOG(PMIX_ERR_NOT_FOUND);
+        return PMIX_ERR_NOT_FOUND;
+    }
+
+    /* Look for the end of the first number */
+
+    for (found = false; i < len; ++i) {
+        if (!isdigit(range[i])) {
+            break;
+        }
+    }
+
+    /* Was there no range, just a single number? */
+
+    if (i >= len) {
+        end = start;
+        found = true;
+    } else {
+        /* Nope, there was a range.  Look for the beginning of the second
+         * number
+         */
+        for (; i < len; ++i) {
+            if (isdigit(range[i])) {
+                end = strtol(range + i, NULL, 10);
+                found = true;
+                break;
+            }
+        }
+    }
+    if (!found) {
+        PMIX_ERROR_LOG(PMIX_ERR_NOT_FOUND);
+        return PMIX_ERR_NOT_FOUND;
+    }
+
+    /* Make strings for all values in the range */
+
+    len = base_len + num_digits + 32;
+    if (NULL != suffix) {
+        len += strlen(suffix);
+    }
+    str = (char *) malloc(len);
+    if (NULL == str) {
+        PMIX_ERROR_LOG(PMIX_ERR_OUT_OF_RESOURCE);
+        return PMIX_ERR_OUT_OF_RESOURCE;
+    }
+    for (i = start; i <= end; ++i) {
+        memset(str, 0, len);
+        strcpy(str, base);
+        /* we need to zero-pad the digits */
+        for (k=0; k < (size_t)num_digits; k++) {
+            str[k+base_len] = '0';
+        }
+        memset(tmp, 0, 132);
+        snprintf(tmp, 132, "%lu", (unsigned long)i);
+        for (k=0; k < strlen(tmp); k++) {
+            str[base_len + num_digits - k - 1] = tmp[strlen(tmp)-k-1];
+        }
+        /* if there is a suffix, add it */
+        if (NULL != suffix) {
+            strcat(str, suffix);
+        }
+        ret = pmix_argv_append_nosize(names, str);
+        if(PMIX_SUCCESS != ret) {
+            PMIX_ERROR_LOG(ret);
+            free(str);
+            return ret;
+        }
+    }
+    free(str);
+
+    /* All done */
+    return PMIX_SUCCESS;
+}
+
+static pmix_status_t pmix_regex_extract_ppn(char *regexp, char ***procs)
+{
+    char **rngs, **nds, *t, **ps=NULL;
+    int i, j, k, start, end;
+
+    /* split on semi-colons for nodes */
+    nds = pmix_argv_split(regexp, ';');
+    for (j=0; NULL != nds[j]; j++) {
+        /* for each node, split it by comma */
+        rngs = pmix_argv_split(nds[j], ',');
+        /* parse each element */
+        for (i=0; NULL != rngs[i]; i++) {
+            /* look for a range */
+            if (NULL == (t = strchr(rngs[i], '-'))) {
+                /* just one value */
+                pmix_argv_append_nosize(&ps, rngs[i]);
+            } else {
+                /* handle the range */
+                *t = '\0';
+                start = strtol(rngs[i], NULL, 10);
+                ++t;
+                end = strtol(t, NULL, 10);
+                for (k=start; k <= end; k++) {
+                    if (0 > asprintf(&t, "%d", k)) {
+                        pmix_argv_free(nds);
+                        pmix_argv_free(rngs);
+                        return PMIX_ERR_NOMEM;
+                    }
+                    pmix_argv_append_nosize(&ps, t);
+                    free(t);
+                }
+            }
+        }
+        pmix_argv_free(rngs);
+        /* create the node entry */
+        t = pmix_argv_join(ps, ',');
+        pmix_argv_append_nosize(procs, t);
+        free(t);
+        pmix_argv_free(ps);
+        ps = NULL;
+    }
+
+    pmix_argv_free(nds);
+    return PMIX_SUCCESS;
+}
diff --git a/src/sm/Makefile.include b/src/sm/Makefile.include
new file mode 100644
index 0000000..9ce6302
--- /dev/null
+++ b/src/sm/Makefile.include
@@ -0,0 +1,17 @@
+#
+# Copyright (c) 2016      Mellanox Technologies, Inc.
+#                         All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+headers += \
+        sm/pmix_sm.h \
+        sm/pmix_mmap.h
+
+sources += \
+        sm/pmix_sm.c \
+        sm/pmix_mmap.c
diff --git a/src/sm/pmix_mmap.c b/src/sm/pmix_mmap.c
new file mode 100644
index 0000000..495370d
--- /dev/null
+++ b/src/sm/pmix_mmap.c
@@ -0,0 +1,191 @@
+/*
+ * Copyright (c) 2015-2016 Mellanox Technologies, Inc.
+ *                         All rights reserved.
+ * Copyright (c) 2017      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+
+#include <unistd.h>
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#include <sys/mman.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <errno.h>
+
+#include <src/include/pmix_config.h>
+#include <pmix_common.h>
+#include "src/include/pmix_globals.h"
+
+#include "pmix_sm.h"
+#include "pmix_mmap.h"
+
+#if !defined(MAP_ANONYMOUS) && defined(MAP_ANON)
+#    define MAP_ANONYMOUS MAP_ANON
+#endif /* MAP_ANONYMOUS and MAP_ANON */
+
+
+static int _mmap_segment_create(pmix_sm_seg_t *sm_seg, const char *file_name, size_t size);
+static int _mmap_segment_attach(pmix_sm_seg_t *sm_seg, pmix_sm_access_mode_t sm_mode);
+static int _mmap_segment_detach(pmix_sm_seg_t *sm_seg);
+static int _mmap_segment_unlink(pmix_sm_seg_t *sm_seg);
+
+pmix_sm_base_module_t pmix_sm_mmap_module = {
+    "mmap",
+    _mmap_segment_create,
+    _mmap_segment_attach,
+    _mmap_segment_detach,
+    _mmap_segment_unlink
+};
+
+
+int _mmap_segment_create(pmix_sm_seg_t *sm_seg, const char *file_name, size_t size)
+{
+    int rc = PMIX_SUCCESS;
+    void *seg_addr = MAP_FAILED;
+    pid_t my_pid = getpid();
+
+    _segment_ds_reset(sm_seg);
+    /* enough space is available, so create the segment */
+    if (-1 == (sm_seg->seg_id = open(file_name, O_CREAT | O_RDWR, 0600))) {
+        pmix_output_verbose(2, pmix_globals.debug_output,
+                "sys call open(2) fail\n");
+        rc = PMIX_ERROR;
+        goto out;
+    }
+    /* size backing file - note the use of real_size here */
+#ifdef HAVE_POSIX_FALLOCATE
+    if (0 != (rc = posix_fallocate(sm_seg->seg_id, 0, size))) {
+        pmix_output_verbose(2, pmix_globals.debug_output,
+                "sys call posix_fallocate(2) fail\n");
+        if (ENOSPC == rc) {
+            rc = PMIX_ERR_OUT_OF_RESOURCE;
+            goto out;
+        } else if ((ENOTSUP != rc)
+#ifdef EOPNOTSUPP
+                            && (EOPNOTSUPP != rc)
+#endif
+        ){
+            rc = PMIX_ERROR;
+            goto out;
+        }
+        /* else:
+         * Not supported by OS and/or filesystem.
+         * Must fall-back to ftruncate().
+         */
+    } else {
+        goto map_memory;
+    }
+#endif
+    if (0 != ftruncate(sm_seg->seg_id, size)) {
+        pmix_output_verbose(2, pmix_globals.debug_output,
+                "sys call ftruncate(2) fail\n");
+        rc = PMIX_ERROR;
+        goto out;
+    } else {
+        rc = PMIX_SUCCESS;
+    }
+
+map_memory:
+    if (MAP_FAILED == (seg_addr = mmap(NULL, size,
+                                       PROT_READ | PROT_WRITE, MAP_SHARED,
+                                       sm_seg->seg_id, 0))) {
+        pmix_output_verbose(2, pmix_globals.debug_output,
+                "sys call mmap(2) fail\n");
+        rc = PMIX_ERROR;
+        goto out;
+    }
+    sm_seg->seg_cpid = my_pid;
+    sm_seg->seg_size = size;
+    sm_seg->seg_base_addr = (unsigned char *)seg_addr;
+    (void)strncpy(sm_seg->seg_name, file_name, PMIX_PATH_MAX - 1);
+
+out:
+    if (-1 != sm_seg->seg_id) {
+        if (0 != close(sm_seg->seg_id)) {
+            pmix_output_verbose(2, pmix_globals.debug_output,
+                    "sys call close(2) fail\n");
+            rc = PMIX_ERROR;
+         }
+     }
+    /* an error occured, so invalidate the shmem object and munmap if needed */
+    if (PMIX_SUCCESS != rc) {
+        if (MAP_FAILED != seg_addr) {
+            munmap((void *)seg_addr, size);
+        }
+        _segment_ds_reset(sm_seg);
+    }
+    return rc;
+}
+
+int _mmap_segment_attach(pmix_sm_seg_t *sm_seg, pmix_sm_access_mode_t sm_mode)
+{
+    mode_t mode = O_RDWR;
+    int mmap_prot = PROT_READ | PROT_WRITE;
+
+    if (sm_mode == PMIX_SM_RONLY) {
+        mode = O_RDONLY;
+        mmap_prot = PROT_READ;
+    }
+
+    if (-1 == (sm_seg->seg_id = open(sm_seg->seg_name, mode))) {
+        return PMIX_ERROR;
+    }
+    if (MAP_FAILED == (sm_seg->seg_base_addr = (unsigned char *)
+                mmap(NULL, sm_seg->seg_size,
+                    mmap_prot, MAP_SHARED,
+                    sm_seg->seg_id, 0))) {
+        /* mmap failed, so close the file and return NULL - no error check
+         * here because we are already in an error path...
+         */
+        pmix_output_verbose(2, pmix_globals.debug_output,
+                "sys call mmap(2) fail\n");
+        close(sm_seg->seg_id);
+        return PMIX_ERROR;
+    }
+    /* all is well */
+    /* if close fails here, that's okay.  just let the user know and
+     * continue.  if we got this far, open and mmap were successful...
+     */
+    if (0 != close(sm_seg->seg_id)) {
+        pmix_output_verbose(2, pmix_globals.debug_output,
+                "sys call close(2) fail\n");
+    }
+    sm_seg->seg_cpid = 0;/* FIXME */
+    return PMIX_SUCCESS;
+}
+
+int _mmap_segment_detach(pmix_sm_seg_t *sm_seg)
+{
+    int rc = PMIX_SUCCESS;
+
+    if (0 != munmap((void *)sm_seg->seg_base_addr, sm_seg->seg_size)) {
+        pmix_output_verbose(2, pmix_globals.debug_output,
+                "sys call munmap(2) fail\n");
+        rc = PMIX_ERROR;
+    }
+    /* reset the contents of the pmix_sm_seg_t associated with this
+     * shared memory segment.
+     */
+    _segment_ds_reset(sm_seg);
+    return rc;
+}
+
+int _mmap_segment_unlink(pmix_sm_seg_t *sm_seg)
+{
+    if (-1 == unlink(sm_seg->seg_name)) {
+        pmix_output_verbose(2, pmix_globals.debug_output,
+                "sys call unlink(2) fail\n");
+        return PMIX_ERROR;
+    }
+
+    sm_seg->seg_id = PMIX_SHMEM_DS_ID_INVALID;
+    return PMIX_SUCCESS;
+}
diff --git a/src/sm/pmix_mmap.h b/src/sm/pmix_mmap.h
new file mode 100644
index 0000000..349fb10
--- /dev/null
+++ b/src/sm/pmix_mmap.h
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2015-2016 Mellanox Technologies, Inc.
+ *                         All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#ifndef PMIX_SM_MMAP_H
+#define PMIX_SM_MMAP_H
+
+#include <src/include/pmix_config.h>
+
+
+#include "pmix_sm.h"
+
+BEGIN_C_DECLS
+
+extern pmix_sm_base_module_t pmix_sm_mmap_module;
+
+END_C_DECLS
+
+#endif /* PMIX_SM_MMAP_H */
diff --git a/src/sm/pmix_sm.c b/src/sm/pmix_sm.c
new file mode 100644
index 0000000..2676926
--- /dev/null
+++ b/src/sm/pmix_sm.c
@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 2015-2016 Mellanox Technologies, Inc.
+ *                         All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+#include <pmix_common.h>
+#include "src/include/pmix_globals.h"
+
+#include "pmix_sm.h"
+#include "pmix_mmap.h"
+
+
+/*
+ * Array of all possible SMs
+ */
+
+/****  ENSURE THE FOLLOWING VALUE IS AT LEAST AS
+ ****  LARGE AS THE TOTAL NUMBER OF SUPPORTED SPCs
+ ****  IN THE ARRAY BELOW
+ */
+
+static pmix_sm_base_module_t *all[] = {
+    &pmix_sm_mmap_module,
+
+    /* Always end the array with a NULL */
+    NULL
+};
+
+pmix_sm_base_module_t pmix_sm = {0};
+
+int pmix_sm_init(void)
+{
+    pmix_sm = *all[0];
+    return PMIX_SUCCESS;
+}
+
+void pmix_sm_finalize(void)
+{
+    return ;
+}
+
+int pmix_sm_segment_create(pmix_sm_seg_t *sm_seg, const char *file_name, size_t size)
+{
+    if (!pmix_sm.segment_create) {
+        return PMIX_ERR_NOT_SUPPORTED;
+    }
+
+    return pmix_sm.segment_create(sm_seg, file_name, size);
+}
+
+int pmix_sm_segment_attach(pmix_sm_seg_t *sm_seg, pmix_sm_access_mode_t sm_mode)
+{
+    if (!pmix_sm.segment_attach) {
+        return PMIX_ERR_NOT_SUPPORTED;
+    }
+
+    return pmix_sm.segment_attach(sm_seg, sm_mode);
+}
+
+int pmix_sm_segment_detach(pmix_sm_seg_t *sm_seg)
+{
+    if (!pmix_sm.segment_detach) {
+        return PMIX_ERR_NOT_SUPPORTED;
+    }
+
+    return pmix_sm.segment_detach(sm_seg);
+}
+
+int pmix_sm_segment_unlink(pmix_sm_seg_t *sm_seg)
+{
+    if (!pmix_sm.segment_unlink) {
+        return PMIX_ERR_NOT_SUPPORTED;
+    }
+
+    return pmix_sm.segment_unlink(sm_seg);
+}
diff --git a/src/sm/pmix_sm.h b/src/sm/pmix_sm.h
new file mode 100644
index 0000000..4e24959
--- /dev/null
+++ b/src/sm/pmix_sm.h
@@ -0,0 +1,121 @@
+/*
+ * Copyright (c) 2015-2016 Mellanox Technologies, Inc.
+ *                         All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#ifndef PMIX_SM_H
+#define PMIX_SM_H
+
+#include <src/include/pmix_config.h>
+
+
+
+BEGIN_C_DECLS
+
+#if !defined(MAP_FAILED)
+#    define MAP_FAILED ((char*)-1)
+#endif /* MAP_FAILED */
+
+#define PMIX_SHMEM_DS_ID_INVALID -1
+
+typedef enum {
+    PMIX_SM_RONLY,
+    PMIX_SM_RW
+} pmix_sm_access_mode_t;
+
+typedef struct pmix_sm_seg_t {
+    /* pid of the shared memory segment creator */
+    pid_t seg_cpid;
+    /* ds id */
+    int seg_id;
+    /* size of shared memory segment */
+    size_t seg_size;
+    /* base address of shared memory segment */
+    unsigned char *seg_base_addr;
+    char seg_name[PMIX_PATH_MAX];
+} pmix_sm_seg_t;
+
+int pmix_sm_init(void);
+void pmix_sm_finalize(void);
+int pmix_sm_segment_create(pmix_sm_seg_t *sm_seg, const char *file_name, size_t size);
+int pmix_sm_segment_attach(pmix_sm_seg_t *sm_seg, pmix_sm_access_mode_t sm_mode);
+int pmix_sm_segment_detach(pmix_sm_seg_t *sm_seg);
+int pmix_sm_segment_unlink(pmix_sm_seg_t *sm_seg);
+
+static inline void _segment_ds_reset(pmix_sm_seg_t *sm_seg)
+{
+    sm_seg->seg_cpid = 0;
+    sm_seg->seg_id = PMIX_SHMEM_DS_ID_INVALID;
+    sm_seg->seg_size = 0;
+    memset(sm_seg->seg_name, '\0', PMIX_PATH_MAX);
+    sm_seg->seg_base_addr = (unsigned char *)MAP_FAILED;
+}
+
+
+/**
+* create a new shared memory segment and initialize members in structure
+* pointed to by sm_seg.
+*
+* @param sm_seg   pointer to pmix_sm_seg_t structure
+*
+* @param file_name unique string identifier that must be a valid,
+*                 writable path (IN).
+*
+* @param size     size of the shared memory segment.
+*
+* @return PMIX_SUCCESS on success.
+*/
+typedef int (*pmix_sm_base_module_segment_create_fn_t)(pmix_sm_seg_t *sm_seg, const char *file_name, size_t size);
+
+/**
+* attach to an existing shared memory segment initialized by segment_create.
+*
+* @param sm_seg  pointer to initialized pmix_sm_seg_t typedef'd
+*                structure (IN/OUT).
+*
+* @return        base address of shared memory segment on success. returns
+*                NULL otherwise.
+*/
+typedef int (*pmix_sm_base_module_segment_attach_fn_t)(pmix_sm_seg_t *sm_seg, pmix_sm_access_mode_t sm_mode);
+
+/**
+* detach from an existing shared memory segment.
+*
+* @param sm_seg  pointer to initialized pmix_sm_seg_t typedef'd structure
+*                (IN/OUT).
+*
+* @return PMIX_SUCCESS on success.
+*/
+typedef int (*pmix_sm_base_module_segment_detach_fn_t)(pmix_sm_seg_t *sm_seg);
+
+/**
+* unlink an existing shared memory segment.
+*
+* @param sm_seg  pointer to initialized pmix_sm_seg_t typedef'd structure
+*                (IN/OUT).
+*
+* @return PMIX_SUCCESS on success.
+*/
+typedef int (*pmix_sm_base_module_unlink_fn_t)(pmix_sm_seg_t *sm_seg);
+
+
+/**
+* structure for sm modules
+*/
+typedef struct {
+    const char *name;
+    pmix_sm_base_module_segment_create_fn_t  segment_create;
+    pmix_sm_base_module_segment_attach_fn_t  segment_attach;
+    pmix_sm_base_module_segment_detach_fn_t  segment_detach;
+    pmix_sm_base_module_unlink_fn_t          segment_unlink;
+} pmix_sm_base_module_t;
+
+
+END_C_DECLS
+
+#endif /* PMIX_SM_H */
diff --git a/src/threads/Makefile.include b/src/threads/Makefile.include
new file mode 100644
index 0000000..d0d41f1
--- /dev/null
+++ b/src/threads/Makefile.include
@@ -0,0 +1,38 @@
+# -*- makefile -*-
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2016 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2014 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2015      Research Organization for Information Science
+#                         and Technology (RIST). All rights reserved.
+# Copyright (c) 2017      Intel, Inc. All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# This makefile.am does not stand on its own - it is included from pmix/Makefile.am
+
+# Source code files
+headers += \
+        threads/mutex.h \
+        threads/mutex_unix.h \
+        threads/threads.h \
+        threads/tsd.h \
+        threads/wait_sync.h \
+	threads/thread_usage.h
+
+libpmix_la_SOURCES += \
+        threads/mutex.c \
+        threads/thread.c \
+        threads/wait_sync.c
diff --git a/src/threads/mutex.c b/src/threads/mutex.c
new file mode 100644
index 0000000..d7f5e92
--- /dev/null
+++ b/src/threads/mutex.c
@@ -0,0 +1,94 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2005 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2007-2016 Los Alamos National Security, LLC.  All rights
+ *                         reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2017      Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include "pmix_config.h"
+
+#include "src/threads/mutex.h"
+
+static void pmix_mutex_construct(pmix_mutex_t *m)
+{
+#if PMIX_ENABLE_DEBUG
+    pthread_mutexattr_t attr;
+    pthread_mutexattr_init(&attr);
+
+    /* set type to ERRORCHECK so that we catch recursive locks */
+#if PMIX_HAVE_PTHREAD_MUTEX_ERRORCHECK_NP
+    pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK_NP);
+#elif PMIX_HAVE_PTHREAD_MUTEX_ERRORCHECK
+    pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK);
+#endif /* PMIX_HAVE_PTHREAD_MUTEX_ERRORCHECK_NP */
+
+    pthread_mutex_init(&m->m_lock_pthread, &attr);
+    pthread_mutexattr_destroy(&attr);
+
+    m->m_lock_debug = 0;
+    m->m_lock_file = NULL;
+    m->m_lock_line = 0;
+#else
+
+    /* Without debugging, choose the fastest available mutexes */
+    pthread_mutex_init(&m->m_lock_pthread, NULL);
+
+#endif /* PMIX_ENABLE_DEBUG */
+
+#if PMIX_HAVE_ATOMIC_SPINLOCKS
+    pmix_atomic_init( &m->m_lock_atomic, PMIX_ATOMIC_UNLOCKED );
+#endif
+}
+
+static void pmix_mutex_destruct(pmix_mutex_t *m)
+{
+    pthread_mutex_destroy(&m->m_lock_pthread);
+}
+
+PMIX_CLASS_INSTANCE(pmix_mutex_t,
+                   pmix_object_t,
+                   pmix_mutex_construct,
+                   pmix_mutex_destruct);
+
+static void pmix_recursive_mutex_construct(pmix_recursive_mutex_t *m)
+{
+    pthread_mutexattr_t attr;
+    pthread_mutexattr_init(&attr);
+
+#if PMIX_ENABLE_DEBUG
+    m->m_lock_debug = 0;
+    m->m_lock_file = NULL;
+    m->m_lock_line = 0;
+#endif
+
+    pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
+
+    pthread_mutex_init(&m->m_lock_pthread, &attr);
+    pthread_mutexattr_destroy(&attr);
+
+#if PMIX_HAVE_ATOMIC_SPINLOCKS
+    pmix_atomic_init( &m->m_lock_atomic, PMIX_ATOMIC_UNLOCKED );
+#endif
+}
+
+PMIX_CLASS_INSTANCE(pmix_recursive_mutex_t,
+                   pmix_object_t,
+                   pmix_recursive_mutex_construct,
+                   pmix_mutex_destruct);
diff --git a/src/threads/mutex.h b/src/threads/mutex.h
new file mode 100644
index 0000000..37a3a4c
--- /dev/null
+++ b/src/threads/mutex.h
@@ -0,0 +1,103 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2016 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2007      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2007-2016 Los Alamos National Security, LLC.  All rights
+ *                         reserved.
+ * Copyright (c) 2007      Voltaire. All rights reserved.
+ * Copyright (c) 2010      Oracle and/or its affiliates.  All rights reserved.
+ *
+ * Copyright (c) 2017      Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#ifndef  PMIX_MUTEX_H
+#define  PMIX_MUTEX_H 1
+
+#include "pmix_config.h"
+
+#include "src/threads/thread_usage.h"
+
+BEGIN_C_DECLS
+
+/**
+ * @file:
+ *
+ * Mutual exclusion functions.
+ *
+ * Functions for locking of critical sections.
+ */
+
+/**
+ * Opaque mutex object
+ */
+typedef struct pmix_mutex_t pmix_mutex_t;
+typedef struct pmix_mutex_t pmix_recursive_mutex_t;
+
+/**
+ * Try to acquire a mutex.
+ *
+ * @param mutex         Address of the mutex.
+ * @return              0 if the mutex was acquired, 1 otherwise.
+ */
+static inline int pmix_mutex_trylock(pmix_mutex_t *mutex);
+
+
+/**
+ * Acquire a mutex.
+ *
+ * @param mutex         Address of the mutex.
+ */
+static inline void pmix_mutex_lock(pmix_mutex_t *mutex);
+
+
+/**
+ * Release a mutex.
+ *
+ * @param mutex         Address of the mutex.
+ */
+static inline void pmix_mutex_unlock(pmix_mutex_t *mutex);
+
+
+/**
+ * Try to acquire a mutex using atomic operations.
+ *
+ * @param mutex         Address of the mutex.
+ * @return              0 if the mutex was acquired, 1 otherwise.
+ */
+static inline int pmix_mutex_atomic_trylock(pmix_mutex_t *mutex);
+
+
+/**
+ * Acquire a mutex using atomic operations.
+ *
+ * @param mutex         Address of the mutex.
+ */
+static inline void pmix_mutex_atomic_lock(pmix_mutex_t *mutex);
+
+
+/**
+ * Release a mutex using atomic operations.
+ *
+ * @param mutex         Address of the mutex.
+ */
+static inline void pmix_mutex_atomic_unlock(pmix_mutex_t *mutex);
+
+END_C_DECLS
+
+#include "mutex_unix.h"
+
+#endif                          /* PMIX_MUTEX_H */
diff --git a/src/threads/mutex_unix.h b/src/threads/mutex_unix.h
new file mode 100644
index 0000000..ffe3249
--- /dev/null
+++ b/src/threads/mutex_unix.h
@@ -0,0 +1,215 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2006 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2007-2015 Los Alamos National Security, LLC.  All rights
+ *                         reserved.
+ * Copyright (c) 2015-2016 Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2017      Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#ifndef  PMIX_MUTEX_UNIX_H
+#define  PMIX_MUTEX_UNIX_H 1
+
+/**
+ * @file:
+ *
+ * Mutual exclusion functions: Unix implementation.
+ *
+ * Functions for locking of critical sections.
+ *
+ * On unix, use pthreads or our own atomic operations as
+ * available.
+ */
+
+#include "pmix_config.h"
+
+#include <pthread.h>
+#include <errno.h>
+#include <stdio.h>
+
+#include "src/class/pmix_object.h"
+#include "src/atomics/sys/atomic.h"
+
+BEGIN_C_DECLS
+
+struct pmix_mutex_t {
+    pmix_object_t super;
+
+    pthread_mutex_t m_lock_pthread;
+
+#if PMIX_ENABLE_DEBUG
+    int m_lock_debug;
+    const char *m_lock_file;
+    int m_lock_line;
+#endif
+
+    pmix_atomic_lock_t m_lock_atomic;
+};
+PMIX_EXPORT PMIX_CLASS_DECLARATION(pmix_mutex_t);
+PMIX_EXPORT PMIX_CLASS_DECLARATION(pmix_recursive_mutex_t);
+
+#if defined(PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP)
+#define PMIX_PTHREAD_RECURSIVE_MUTEX_INITIALIZER PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
+#elif defined(PTHREAD_RECURSIVE_MUTEX_INITIALIZER)
+#define PMIX_PTHREAD_RECURSIVE_MUTEX_INITIALIZER PTHREAD_RECURSIVE_MUTEX_INITIALIZER
+#endif
+
+#if PMIX_ENABLE_DEBUG
+#define PMIX_MUTEX_STATIC_INIT                                          \
+    {                                                                   \
+        .super = PMIX_OBJ_STATIC_INIT(pmix_mutex_t),                    \
+        .m_lock_pthread = PTHREAD_MUTEX_INITIALIZER,                    \
+        .m_lock_debug = 0,                                              \
+        .m_lock_file = NULL,                                            \
+        .m_lock_line = 0,                                               \
+        .m_lock_atomic = { .u = { .lock = PMIX_ATOMIC_UNLOCKED } },     \
+    }
+#else
+#define PMIX_MUTEX_STATIC_INIT                                          \
+    {                                                                   \
+        .super = PMIX_OBJ_STATIC_INIT(pmix_mutex_t),                    \
+        .m_lock_pthread = PTHREAD_MUTEX_INITIALIZER,                    \
+        .m_lock_atomic = { .u = { .lock = PMIX_ATOMIC_UNLOCKED } },     \
+    }
+#endif
+
+#if defined(PMIX_PTHREAD_RECURSIVE_MUTEX_INITIALIZER)
+
+#if PMIX_ENABLE_DEBUG
+#define PMIX_RECURSIVE_MUTEX_STATIC_INIT                                \
+    {                                                                   \
+        .super = PMIX_OBJ_STATIC_INIT(pmix_mutex_t),                    \
+        .m_lock_pthread = PMIX_PTHREAD_RECURSIVE_MUTEX_INITIALIZER,     \
+        .m_lock_debug = 0,                                              \
+        .m_lock_file = NULL,                                            \
+        .m_lock_line = 0,                                               \
+        .m_lock_atomic = { .u = { .lock = PMIX_ATOMIC_UNLOCKED } },     \
+    }
+#else
+#define PMIX_RECURSIVE_MUTEX_STATIC_INIT                                \
+    {                                                                   \
+        .super = PMIX_OBJ_STATIC_INIT(pmix_mutex_t),                    \
+        .m_lock_pthread = PMIX_PTHREAD_RECURSIVE_MUTEX_INITIALIZER,     \
+        .m_lock_atomic = { .u = { .lock = PMIX_ATOMIC_UNLOCKED } },     \
+    }
+#endif
+
+#endif
+
+/************************************************************************
+ *
+ * mutex operations (non-atomic versions)
+ *
+ ************************************************************************/
+
+static inline int pmix_mutex_trylock(pmix_mutex_t *m)
+{
+#if PMIX_ENABLE_DEBUG
+    int ret = pthread_mutex_trylock(&m->m_lock_pthread);
+    if (ret == EDEADLK) {
+        errno = ret;
+        perror("pmix_mutex_trylock()");
+        abort();
+    }
+    return ret;
+#else
+    return pthread_mutex_trylock(&m->m_lock_pthread);
+#endif
+}
+
+static inline void pmix_mutex_lock(pmix_mutex_t *m)
+{
+#if PMIX_ENABLE_DEBUG
+    int ret = pthread_mutex_lock(&m->m_lock_pthread);
+    if (ret == EDEADLK) {
+        errno = ret;
+        perror("pmix_mutex_lock()");
+        abort();
+    }
+#else
+    pthread_mutex_lock(&m->m_lock_pthread);
+#endif
+}
+
+static inline void pmix_mutex_unlock(pmix_mutex_t *m)
+{
+#if PMIX_ENABLE_DEBUG
+    int ret = pthread_mutex_unlock(&m->m_lock_pthread);
+    if (ret == EPERM) {
+        errno = ret;
+        perror("pmix_mutex_unlock");
+        abort();
+    }
+#else
+    pthread_mutex_unlock(&m->m_lock_pthread);
+#endif
+}
+
+/************************************************************************
+ *
+ * mutex operations (atomic versions)
+ *
+ ************************************************************************/
+
+#if PMIX_HAVE_ATOMIC_SPINLOCKS
+
+/************************************************************************
+ * Spin Locks
+ ************************************************************************/
+
+static inline int pmix_mutex_atomic_trylock(pmix_mutex_t *m)
+{
+    return pmix_atomic_trylock(&m->m_lock_atomic);
+}
+
+static inline void pmix_mutex_atomic_lock(pmix_mutex_t *m)
+{
+    pmix_atomic_lock(&m->m_lock_atomic);
+}
+
+static inline void pmix_mutex_atomic_unlock(pmix_mutex_t *m)
+{
+    pmix_atomic_unlock(&m->m_lock_atomic);
+}
+
+#else
+
+/************************************************************************
+ * Standard locking
+ ************************************************************************/
+
+static inline int pmix_mutex_atomic_trylock(pmix_mutex_t *m)
+{
+    return pmix_mutex_trylock(m);
+}
+
+static inline void pmix_mutex_atomic_lock(pmix_mutex_t *m)
+{
+    pmix_mutex_lock(m);
+}
+
+static inline void pmix_mutex_atomic_unlock(pmix_mutex_t *m)
+{
+    pmix_mutex_unlock(m);
+}
+
+#endif
+
+END_C_DECLS
+
+#endif                          /* PMIX_MUTEX_UNIX_H */
diff --git a/src/threads/thread.c b/src/threads/thread.c
new file mode 100644
index 0000000..6513cc9
--- /dev/null
+++ b/src/threads/thread.c
@@ -0,0 +1,134 @@
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2005 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2010      Cisco Systems, Inc. All rights reserved.
+ * Copyright (c) 2015-2017 Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2017      Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include "pmix_config.h"
+
+#include "src/threads/threads.h"
+#include "src/threads/tsd.h"
+#include "pmix_common.h"
+
+bool pmix_debug_threads = false;
+
+static void pmix_thread_construct(pmix_thread_t *t);
+
+static pthread_t pmix_main_thread;
+
+struct pmix_tsd_key_value {
+    pmix_tsd_key_t key;
+    pmix_tsd_destructor_t destructor;
+};
+
+static struct pmix_tsd_key_value *pmix_tsd_key_values = NULL;
+static int pmix_tsd_key_values_count = 0;
+
+PMIX_EXPORT PMIX_CLASS_INSTANCE(pmix_thread_t,
+                                pmix_object_t,
+                                pmix_thread_construct, NULL);
+
+
+/*
+ * Constructor
+ */
+static void pmix_thread_construct(pmix_thread_t *t)
+{
+    t->t_run = 0;
+    t->t_handle = (pthread_t) -1;
+}
+
+int pmix_thread_start(pmix_thread_t *t)
+{
+    int rc;
+
+    if (PMIX_ENABLE_DEBUG) {
+        if (NULL == t->t_run || t->t_handle != (pthread_t) -1) {
+            return PMIX_ERR_BAD_PARAM;
+        }
+    }
+
+    rc = pthread_create(&t->t_handle, NULL, (void*(*)(void*)) t->t_run, t);
+
+    return (rc == 0) ? PMIX_SUCCESS : PMIX_ERROR;
+}
+
+
+int pmix_thread_join(pmix_thread_t *t, void **thr_return)
+{
+    int rc = pthread_join(t->t_handle, thr_return);
+    t->t_handle = (pthread_t) -1;
+    return (rc == 0) ? PMIX_SUCCESS : PMIX_ERROR;
+}
+
+
+bool pmix_thread_self_compare(pmix_thread_t *t)
+{
+    return t->t_handle == pthread_self();
+}
+
+
+pmix_thread_t *pmix_thread_get_self(void)
+{
+    pmix_thread_t *t = PMIX_NEW(pmix_thread_t);
+    t->t_handle = pthread_self();
+    return t;
+}
+
+void pmix_thread_kill(pmix_thread_t *t, int sig)
+{
+    pthread_kill(t->t_handle, sig);
+}
+
+int pmix_tsd_key_create(pmix_tsd_key_t *key,
+                    pmix_tsd_destructor_t destructor)
+{
+    int rc;
+    rc = pthread_key_create(key, destructor);
+    if ((0 == rc) && (pthread_self() == pmix_main_thread)) {
+        pmix_tsd_key_values = (struct pmix_tsd_key_value *)realloc(pmix_tsd_key_values, (pmix_tsd_key_values_count+1) * sizeof(struct pmix_tsd_key_value));
+        pmix_tsd_key_values[pmix_tsd_key_values_count].key = *key;
+        pmix_tsd_key_values[pmix_tsd_key_values_count].destructor = destructor;
+        pmix_tsd_key_values_count ++;
+    }
+    return rc;
+}
+
+int pmix_tsd_keys_destruct()
+{
+    int i;
+    void * ptr;
+    for (i=0; i<pmix_tsd_key_values_count; i++) {
+        if(PMIX_SUCCESS == pmix_tsd_getspecific(pmix_tsd_key_values[i].key, &ptr)) {
+            if (NULL != pmix_tsd_key_values[i].destructor) {
+                pmix_tsd_key_values[i].destructor(ptr);
+                pmix_tsd_setspecific(pmix_tsd_key_values[i].key, NULL);
+            }
+        }
+    }
+    if (0 < pmix_tsd_key_values_count) {
+        free(pmix_tsd_key_values);
+        pmix_tsd_key_values_count = 0;
+    }
+    return PMIX_SUCCESS;
+}
+
+void pmix_thread_set_main() {
+    pmix_main_thread = pthread_self();
+}
diff --git a/src/threads/thread_usage.h b/src/threads/thread_usage.h
new file mode 100644
index 0000000..3092e3a
--- /dev/null
+++ b/src/threads/thread_usage.h
@@ -0,0 +1,109 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2007 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2006 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2007-2014 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2014-2016 Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2015-2016 Los Alamos National Security, LLC. All rights
+ *                         reserved.
+ * Copyright (c) 2017      Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#if !defined(PMIX_THREAD_USAGE_H)
+#define PMIX_THREAD_USAGE_H
+
+#include "pmix_config.h"
+
+#include "src/atomics/sys/atomic.h"
+#include "src/include/prefetch.h"
+
+/**
+ * Use an atomic operation for increment/decrement
+ */
+
+#define PMIX_THREAD_DEFINE_ATOMIC_ADD(type, suffix)     \
+static inline type pmix_thread_add_ ## suffix (volatile type *addr, type delta) \
+{                                                                   \
+    return pmix_atomic_add_ ## suffix (addr, delta);                \
+}
+
+#define PMIX_THREAD_DEFINE_ATOMIC_SUB(type, suffix)     \
+static inline type pmix_thread_sub_ ## suffix (volatile type *addr, type delta) \
+{                                                                       \
+    return pmix_atomic_sub_ ## suffix (addr, delta);                \
+}
+
+#define PMIX_THREAD_DEFINE_ATOMIC_CMPSET(type, addr_type, suffix)       \
+static inline bool pmix_thread_cmpset_bool_ ## suffix (volatile addr_type *addr, type compare, type value) \
+{                                                                       \
+   return pmix_atomic_cmpset_ ## suffix ((volatile type *) addr, compare, value); \
+}
+
+#define PMIX_THREAD_DEFINE_ATOMIC_SWAP(type, addr_type, suffix)         \
+static inline type pmix_thread_swap_ ## suffix (volatile addr_type *ptr, type newvalue) \
+{                                                                       \
+    return pmix_atomic_swap_ ## suffix ((volatile type *) ptr, newvalue); \
+}
+
+PMIX_THREAD_DEFINE_ATOMIC_ADD(int32_t, 32)
+PMIX_THREAD_DEFINE_ATOMIC_ADD(size_t, size_t)
+PMIX_THREAD_DEFINE_ATOMIC_SUB(size_t, size_t)
+PMIX_THREAD_DEFINE_ATOMIC_CMPSET(int32_t, int32_t, 32)
+PMIX_THREAD_DEFINE_ATOMIC_CMPSET(void *, intptr_t, ptr)
+PMIX_THREAD_DEFINE_ATOMIC_SWAP(int32_t, int32_t, 32)
+PMIX_THREAD_DEFINE_ATOMIC_SWAP(void *, intptr_t, ptr)
+
+#define PMIX_THREAD_ADD32 pmix_thread_add_32
+#define PMIX_ATOMIC_ADD32 pmix_thread_add_32
+
+#define PMIX_THREAD_ADD_SIZE_T pmix_thread_add_size_t
+#define PMIX_ATOMIC_ADD_SIZE_T pmix_thread_add_size_t
+
+#define PMIX_THREAD_SUB_SIZE_T pmix_thread_sub_size_t
+#define PMIX_ATOMIC_SUB_SIZE_T pmix_thread_sub_size_t
+
+#define PMIX_THREAD_CMPSET_32 pmix_thread_cmpset_bool_32
+#define PMIX_ATOMIC_CMPSET_32 pmix_thread_cmpset_bool_32
+
+#define PMIX_THREAD_CMPSET_PTR(x, y, z) pmix_thread_cmpset_bool_ptr ((volatile intptr_t *) x, (void *) y, (void *) z)
+#define PMIX_ATOMIC_CMPSET_PTR PMIX_THREAD_CMPSET_PTR
+
+#define PMIX_THREAD_SWAP_32 pmix_thread_swap_32
+#define PMIX_ATOMIC_SWAP_32 pmix_thread_swap_32
+
+#define PMIX_THREAD_SWAP_PTR(x, y) pmix_thread_swap_ptr ((volatile intptr_t *) x, (void *) y)
+#define PMIX_ATOMIC_SWAP_PTR PMIX_THREAD_SWAP_PTR
+
+/* define 64-bit macros is 64-bit atomic math is available */
+#if PMIX_HAVE_ATOMIC_MATH_64
+
+PMIX_THREAD_DEFINE_ATOMIC_ADD(int64_t, 64)
+PMIX_THREAD_DEFINE_ATOMIC_CMPSET(int64_t, int64_t, 64)
+PMIX_THREAD_DEFINE_ATOMIC_SWAP(int64_t, int64_t, 64)
+
+#define PMIX_THREAD_ADD64 pmix_thread_add_64
+#define PMIX_ATOMIC_ADD64 pmix_thread_add_64
+
+#define PMIX_THREAD_CMPSET_64 pmix_thread_cmpset_bool_64
+#define PMIX_ATOMIC_CMPSET_64 pmix_thread_cmpset_bool_64
+
+#define PMIX_THREAD_SWAP_64 pmix_thread_swap_64
+#define PMIX_ATOMIC_SWAP_64 pmix_thread_swap_64
+
+#endif
+
+#endif /* !defined(PMIX_THREAD_USAGE_H) */
diff --git a/src/threads/threads.h b/src/threads/threads.h
new file mode 100644
index 0000000..d66e594
--- /dev/null
+++ b/src/threads/threads.h
@@ -0,0 +1,204 @@
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2006 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2010      Cisco Systems, Inc. All rights reserved.
+ * Copyright (c) 2010      Oracle and/or its affiliates.  All rights reserved.
+ * Copyright (c) 2015-2017 Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2017      Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#ifndef PMIX_THREAD_H
+#define PMIX_THREAD_H 1
+
+#include "pmix_config.h"
+
+#include <pthread.h>
+#include <signal.h>
+
+#include "src/class/pmix_object.h"
+#if PMIX_ENABLE_DEBUG
+#include "src/util/output.h"
+#endif
+
+#include "mutex.h"
+
+BEGIN_C_DECLS
+
+typedef void *(*pmix_thread_fn_t) (pmix_object_t *);
+
+#define PMIX_THREAD_CANCELLED   ((void*)1);
+
+struct pmix_thread_t {
+    pmix_object_t super;
+    pmix_thread_fn_t t_run;
+    void* t_arg;
+    pthread_t t_handle;
+};
+
+typedef struct pmix_thread_t pmix_thread_t;
+
+#if PMIX_ENABLE_DEBUG
+PMIX_EXPORT extern bool pmix_debug_threads;
+#endif
+
+
+PMIX_EXPORT PMIX_CLASS_DECLARATION(pmix_thread_t);
+
+#define pmix_condition_wait(a,b)    pthread_cond_wait(a, &(b)->m_lock_pthread)
+typedef pthread_cond_t pmix_condition_t;
+#define pmix_condition_broadcast(a) pthread_cond_broadcast(a)
+#define pmix_condition_signal(a)    pthread_cond_signal(a)
+#define PMIX_CONDITION_STATIC_INIT PTHREAD_COND_INITIALIZER
+
+typedef struct {
+    pmix_mutex_t mutex;
+    pmix_condition_t cond;
+    volatile bool active;
+} pmix_lock_t;
+
+#define PMIX_CONSTRUCT_LOCK(l)                          \
+    do {                                                \
+        PMIX_CONSTRUCT(&(l)->mutex, pmix_mutex_t);      \
+        pthread_cond_init(&(l)->cond, NULL);            \
+        (l)->active = true;                             \
+    } while(0)
+
+#define PMIX_DESTRUCT_LOCK(l)               \
+    do {                                    \
+        PMIX_DESTRUCT(&(l)->mutex);         \
+        pthread_cond_destroy(&(l)->cond);   \
+    } while(0)
+
+
+#if PMIX_ENABLE_DEBUG
+#define PMIX_ACQUIRE_THREAD(lck)                                \
+    do {                                                        \
+        pmix_mutex_lock(&(lck)->mutex);                         \
+        if (pmix_debug_threads) {                               \
+            pmix_output(0, "Waiting for thread %s:%d",          \
+                        __FILE__, __LINE__);                    \
+        }                                                       \
+        while ((lck)->active) {                                 \
+            pmix_condition_wait(&(lck)->cond, &(lck)->mutex);   \
+        }                                                       \
+        if (pmix_debug_threads) {                               \
+            pmix_output(0, "Thread obtained %s:%d",             \
+                        __FILE__, __LINE__);                    \
+        }                                                       \
+        PMIX_ACQUIRE_OBJECT(lck);                               \
+        (lck)->active = true;                                   \
+    } while(0)
+#else
+#define PMIX_ACQUIRE_THREAD(lck)                                \
+    do {                                                        \
+        pmix_mutex_lock(&(lck)->mutex);                         \
+        while ((lck)->active) {                                 \
+            pmix_condition_wait(&(lck)->cond, &(lck)->mutex);   \
+        }                                                       \
+        PMIX_ACQUIRE_OBJECT(lck);                               \
+        (lck)->active = true;                                   \
+    } while(0)
+#endif
+
+
+#if PMIX_ENABLE_DEBUG
+#define PMIX_WAIT_THREAD(lck)                                   \
+    do {                                                        \
+        pmix_mutex_lock(&(lck)->mutex);                         \
+        if (pmix_debug_threads) {                               \
+            pmix_output(0, "Waiting for thread %s:%d",          \
+                        __FILE__, __LINE__);                    \
+        }                                                       \
+        while ((lck)->active) {                                 \
+            pmix_condition_wait(&(lck)->cond, &(lck)->mutex);   \
+        }                                                       \
+        if (pmix_debug_threads) {                               \
+            pmix_output(0, "Thread obtained %s:%d",             \
+                        __FILE__, __LINE__);                    \
+        }                                                       \
+        PMIX_ACQUIRE_OBJECT(lck);                               \
+        pmix_mutex_unlock(&(lck)->mutex);                       \
+    } while(0)
+#else
+#define PMIX_WAIT_THREAD(lck)                                   \
+    do {                                                        \
+        pmix_mutex_lock(&(lck)->mutex);                         \
+        while ((lck)->active) {                                 \
+            pmix_condition_wait(&(lck)->cond, &(lck)->mutex);   \
+        }                                                       \
+        PMIX_ACQUIRE_OBJECT(lck);                               \
+        pmix_mutex_unlock(&(lck)->mutex);                       \
+    } while(0)
+#endif
+
+
+#if PMIX_ENABLE_DEBUG
+#define PMIX_RELEASE_THREAD(lck)                        \
+    do {                                                \
+        if (pmix_debug_threads) {                       \
+            pmix_output(0, "Releasing thread %s:%d",    \
+                        __FILE__, __LINE__);            \
+        }                                               \
+        (lck)->active = false;                          \
+        PMIX_POST_OBJECT(lck);                  \
+        pmix_condition_broadcast(&(lck)->cond);         \
+        pmix_mutex_unlock(&(lck)->mutex);               \
+    } while(0)
+#else
+#define PMIX_RELEASE_THREAD(lck)                \
+    do {                                        \
+        (lck)->active = false;                  \
+        PMIX_POST_OBJECT(lck);                  \
+        pmix_condition_broadcast(&(lck)->cond); \
+        pmix_mutex_unlock(&(lck)->mutex);       \
+    } while(0)
+#endif
+
+
+#define PMIX_WAKEUP_THREAD(lck)                 \
+    do {                                        \
+        pmix_mutex_lock(&(lck)->mutex);         \
+        (lck)->active = false;                  \
+        PMIX_POST_OBJECT(lck);                  \
+        pmix_condition_broadcast(&(lck)->cond); \
+        pmix_mutex_unlock(&(lck)->mutex);       \
+    } while(0)
+
+
+/* provide a macro for forward-proofing the shifting
+ * of objects between threads - at some point, we
+ * may revamp our threading model */
+
+/* post an object to another thread - for now, we
+ * only have a memory barrier */
+#define PMIX_POST_OBJECT(o)     pmix_atomic_wmb()
+
+/* acquire an object from another thread - for now,
+ * we only have a memory barrier */
+#define PMIX_ACQUIRE_OBJECT(o)  pmix_atomic_rmb()
+
+
+PMIX_EXPORT int  pmix_thread_start(pmix_thread_t *);
+PMIX_EXPORT int  pmix_thread_join(pmix_thread_t *, void **thread_return);
+PMIX_EXPORT bool pmix_thread_self_compare(pmix_thread_t*);
+PMIX_EXPORT pmix_thread_t *pmix_thread_get_self(void);
+PMIX_EXPORT void pmix_thread_kill(pmix_thread_t *, int sig);
+PMIX_EXPORT void pmix_thread_set_main(void);
+
+END_C_DECLS
+
+#endif /* PMIX_THREAD_H */
diff --git a/src/threads/tsd.h b/src/threads/tsd.h
new file mode 100644
index 0000000..5890272
--- /dev/null
+++ b/src/threads/tsd.h
@@ -0,0 +1,179 @@
+/*
+ * Copyright (c) 2007-2013 Los Alamos National Security, LLC.  All rights
+ *                         reserved.
+ * Copyright (c) 2008      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2015-2017 Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2017      Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+
+#ifndef PMIX_THREADS_TSD_H
+#define PMIX_THREADS_TSD_H
+
+#include "pmix_config.h"
+
+#include <pthread.h>
+
+#include "pmix_common.h"
+
+BEGIN_C_DECLS
+
+/**
+ * @file
+ *
+ * Thread Specific Datastore Interface
+ *
+ * Functions for providing thread-specific datastore capabilities.
+ */
+
+
+/**
+ * Prototype for callback when tsd data is being destroyed
+ */
+typedef void (*pmix_tsd_destructor_t)(void *value);
+
+#if defined(DOXYGEN)
+
+/**
+ * Typedef for thread-specific data key
+ */
+typedef void* pmix_tsd_key_t;
+
+
+/**
+ * Delete a thread-specific data key
+ *
+ * Delete a thread-specific data key previously returned by
+ * pmix_tsd_key_create().  The destructor associated with the key is
+ * not fired in any thread and memory cleanup is the responsibility of
+ * the caller.
+ *
+ * @note Unlike pthread_key_delete, this function should not be called
+ * from within a destructor.  It can not be universally supported at
+ * this time.
+ *
+ * @param key[in]       The key for accessing thread-specific data
+ *
+ * @retval PMIX_SUCCESS Success
+ * @retval EINVAL       Invalid key
+ */
+PMIX_EXPORT int pmix_tsd_key_delete(pmix_tsd_key_t key);
+
+
+/**
+ * Set a thread-specific data value
+ *
+ * Associates value with key in the current thread.  The value for the
+ * key in other threads is not changed.  Different threads may assign
+ * different values to the same key.
+ *
+ * @note This function should not be called within
+ * pmix_tsd_key_delete().
+ *
+ * @param key[in]       Thread specific data key to modify
+ * @param value[in]     Value to associate with key
+ *
+ * @retval PMIX_SUCCESS Success
+ * @retval ENOMEM       Insufficient memory exists to associate the
+ *                      value with the key
+ * @retval EINVAL       Invalid key
+ */
+PMIX_EXPORT int pmix_tsd_setspecific(pmix_tsd_key_t key, void *value);
+
+
+/**
+ * Get a thread-specific data value
+ *
+ * Get the data associated with the given key, as set by
+ * pmix_tsd_setspecific().  If pmix_tsd_setspecific() hasn't been
+ * called in the current thread with the given key, NULL is returned
+ * in valuep.
+ *
+ * @param key[in]       Thread specific data key to modify
+ * @param value[out]     Value to associate with key
+ *
+ * @retval PMIX_SUCCESS Success
+ * @retval ENOMEM       Insufficient memory exists to associate the
+ *                      value with the key
+ * @retval EINVAL       Invalid key
+ */
+PMIX_EXPORT int pmix_tsd_getspecific(pmix_tsd_key_t key, void **valuep);
+
+#else
+
+typedef pthread_key_t pmix_tsd_key_t;
+
+static inline int
+pmix_tsd_key_delete(pmix_tsd_key_t key)
+{
+    return pthread_key_delete(key);
+}
+
+static inline int
+pmix_tsd_setspecific(pmix_tsd_key_t key, void *value)
+{
+    return pthread_setspecific(key, value);
+}
+
+static inline int
+pmix_tsd_getspecific(pmix_tsd_key_t key, void **valuep)
+{
+    *valuep = pthread_getspecific(key);
+    return PMIX_SUCCESS;
+}
+
+#endif
+
+/**
+ * Create thread-specific data key
+ *
+ * Create a thread-specific data key visible to all threads in the
+ * current process.  The returned key is valid in all threads,
+ * although the values bound to the key by pmix_tsd_setspecific() are
+ * allocated on a per-thread basis and persist for the life of the
+ * calling thread.
+ *
+ * Upon key creation, the value NULL is associated with the new key in
+ * all active threads.  When a new thread is created, the value NULL
+ * is associated with all defined keys in the new thread.
+ *
+ * The destructor parameter may be NULL.  At thread exit, if
+ * destructor is non-NULL AND the thread has a non-NULL value
+ * associated with the key, the function is called with the current
+ * value as its argument.
+ *
+ * @param key[out]       The key for accessing thread-specific data
+ * @param destructor[in] Cleanup function to call when a thread exits
+ *
+ * @retval PMIX_SUCCESS  Success
+ * @retval EAGAIN        The system lacked the necessary resource to
+ *                       create another thread specific data key
+ * @retval ENOMEM        Insufficient memory exists to create the key
+ */
+PMIX_EXPORT int pmix_tsd_key_create(pmix_tsd_key_t *key,
+                                      pmix_tsd_destructor_t destructor);
+
+
+/**
+ * Destruct all thread-specific data keys
+ *
+ * Destruct all thread-specific data keys and invoke the destructor
+ *
+ * This should only be invoked in the main thread.
+ * This is made necessary since destructors are not invoked on the
+ * keys of the main thread, since there is no such thing as
+ * pthread_join(main_thread)
+ *
+ * @retval PMIX_SUCCESS  Success
+ */
+PMIX_EXPORT int pmix_tsd_keys_destruct(void);
+
+END_C_DECLS
+
+#endif /* PMIX_MTHREADS_TSD_H */
diff --git a/src/threads/wait_sync.c b/src/threads/wait_sync.c
new file mode 100644
index 0000000..c825f4c
--- /dev/null
+++ b/src/threads/wait_sync.c
@@ -0,0 +1,102 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2014-2016 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2016      Los Alamos National Security, LLC. All rights
+ *                         reserved.
+ * Copyright (c) 2017      Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+#include "wait_sync.h"
+
+static pmix_mutex_t wait_sync_lock = PMIX_MUTEX_STATIC_INIT;
+static pmix_wait_sync_t* wait_sync_list = NULL;
+
+#define PMIX_WAIT_SYNC_PASS_OWNERSHIP(who)                  \
+    do {                                               \
+        pthread_mutex_lock( &(who)->lock);             \
+        pthread_cond_signal( &(who)->condition );      \
+        pthread_mutex_unlock( &(who)->lock);           \
+    } while(0)
+
+int pmix_sync_wait_mt(pmix_wait_sync_t *sync)
+{
+    /* Don't stop if the waiting synchronization is completed. We avoid the
+     * race condition around the release of the synchronization using the
+     * signaling field.
+     */
+    if(sync->count <= 0)
+        return (0 == sync->status) ? PMIX_SUCCESS : PMIX_ERROR;
+
+    /* lock so nobody can signal us during the list updating */
+    pthread_mutex_lock(&sync->lock);
+
+    /* Now that we hold the lock make sure another thread has not already
+     * call cond_signal.
+     */
+    if(sync->count <= 0) {
+        pthread_mutex_unlock(&sync->lock);
+        return (0 == sync->status) ? PMIX_SUCCESS : PMIX_ERROR;
+    }
+
+    /* Insert sync on the list of pending synchronization constructs */
+    pmix_mutex_lock(&wait_sync_lock);
+    if( NULL == wait_sync_list ) {
+        sync->next = sync->prev = sync;
+        wait_sync_list = sync;
+    } else {
+        sync->prev = wait_sync_list->prev;
+        sync->prev->next = sync;
+        sync->next = wait_sync_list;
+        wait_sync_list->prev = sync;
+    }
+    pmix_mutex_unlock(&wait_sync_lock);
+
+    /**
+     * If we are not responsible for progresing, go silent until something worth noticing happen:
+     *  - this thread has been promoted to take care of the progress
+     *  - our sync has been triggered.
+     */
+ check_status:
+    if( sync != wait_sync_list ) {
+        pthread_cond_wait(&sync->condition, &sync->lock);
+
+        /**
+         * At this point either the sync was completed in which case
+         * we should remove it from the wait list, or/and I was
+         * promoted as the progress manager.
+         */
+
+        if( sync->count <= 0 ) {  /* Completed? */
+            pthread_mutex_unlock(&sync->lock);
+            goto i_am_done;
+        }
+        /* either promoted, or spurious wakeup ! */
+        goto check_status;
+    }
+
+    pthread_mutex_unlock(&sync->lock);
+    while(sync->count > 0) {  /* progress till completion */
+    }
+    assert(sync == wait_sync_list);
+
+ i_am_done:
+    /* My sync is now complete. Trim the list: remove self, wake next */
+    pmix_mutex_lock(&wait_sync_lock);
+    sync->prev->next = sync->next;
+    sync->next->prev = sync->prev;
+    /* In case I am the progress manager, pass the duties on */
+    if( sync == wait_sync_list ) {
+        wait_sync_list = (sync == sync->next) ? NULL : sync->next;
+        if( NULL != wait_sync_list )
+            PMIX_WAIT_SYNC_PASS_OWNERSHIP(wait_sync_list);
+    }
+    pmix_mutex_unlock(&wait_sync_lock);
+
+    return (0 == sync->status) ? PMIX_SUCCESS : PMIX_ERROR;
+}
diff --git a/src/threads/wait_sync.h b/src/threads/wait_sync.h
new file mode 100644
index 0000000..4430912
--- /dev/null
+++ b/src/threads/wait_sync.h
@@ -0,0 +1,119 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2014-2016 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2016      Los Alamos National Security, LLC. All rights
+ *                         reserved.
+ * Copyright (c) 2016      Mellanox Technologies. All rights reserved.
+ * Copyright (c) 2016      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2017      Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#if !defined(PMIX_THREADS_WAIT_SYNC_H)
+#define PMIX_THREADS_WAIT_SYNC_H
+
+#include "src/include/prefetch.h"
+#include "src/atomics/sys/atomic.h"
+#include "src/threads/threads.h"
+#include "src/util/error.h"
+#include <pthread.h>
+
+BEGIN_C_DECLS
+
+typedef struct pmix_wait_sync_t {
+    int32_t count;
+    int32_t status;
+    pthread_cond_t condition;
+    pthread_mutex_t lock;
+    struct pmix_wait_sync_t *next;
+    struct pmix_wait_sync_t *prev;
+    volatile bool signaling;
+} pmix_wait_sync_t;
+
+#define REQUEST_PENDING        (void*)0L
+#define REQUEST_COMPLETED      (void*)1L
+
+#define PMIX_SYNC_WAIT(sync)    sync_wait_mt (sync)
+
+/* The loop in release handles a race condition between the signaling
+ * thread and the destruction of the condition variable. The signaling
+ * member will be set to false after the final signaling thread has
+ * finished operating on the sync object. This is done to avoid
+ * extra atomics in the signalling function and keep it as fast
+ * as possible. Note that the race window is small so spinning here
+ * is more optimal than sleeping since this macro is called in
+ * the critical path. */
+#define PMIX_WAIT_SYNC_RELEASE(sync)                       \
+        while ((sync)->signaling) {                   \
+            continue;                                 \
+        }                                             \
+        pthread_cond_destroy(&(sync)->condition);     \
+        pthread_mutex_destroy(&(sync)->lock);
+
+#define PMIX_WAIT_SYNC_RELEASE_NOWAIT(sync)                \
+        pthread_cond_destroy(&(sync)->condition);     \
+        pthread_mutex_destroy(&(sync)->lock);
+
+
+#define PMIX_WAIT_SYNC_SIGNAL(sync)                        \
+        pthread_mutex_lock(&(sync->lock));            \
+        pthread_cond_signal(&sync->condition);        \
+        pthread_mutex_unlock(&(sync->lock));          \
+        sync->signaling = false;
+
+#define PMIX_WAIT_SYNC_SIGNALLED(sync){                    \
+        (sync)->signaling = false;                    \
+}
+
+PMIX_EXPORT int pmix_sync_wait_mt(pmix_wait_sync_t *sync);
+static inline int pmix_sync_wait_st (pmix_wait_sync_t *sync)
+{
+    while (sync->count > 0) {
+    }
+
+    return sync->status;
+}
+
+
+#define PMIX_WAIT_SYNC_INIT(sync,c)                                  \
+    do {                                                        \
+        (sync)->count = (c);                                    \
+        (sync)->next = NULL;                                    \
+        (sync)->prev = NULL;                                    \
+        (sync)->status = 0;                                     \
+        (sync)->signaling = (0 != (c));                         \
+        pthread_cond_init (&(sync)->condition, NULL);           \
+        pthread_mutex_init (&(sync)->lock, NULL);               \
+    } while(0)
+
+/**
+ * Update the status of the synchronization primitive. If an error is
+ * reported the synchronization is completed and the signal
+ * triggered. The status of the synchronization will be reported to
+ * the waiting threads.
+ */
+static inline void pmix_wait_sync_update(pmix_wait_sync_t *sync, int updates, int status)
+{
+    if( PMIX_LIKELY(PMIX_SUCCESS == status) ) {
+        if( 0 != (PMIX_THREAD_ADD32(&sync->count, -updates)) ) {
+            return;
+        }
+    } else {
+        /* this is an error path so just use the atomic */
+        sync->status = PMIX_ERROR;
+        pmix_atomic_wmb ();
+        pmix_atomic_swap_32 (&sync->count, 0);
+    }
+    PMIX_WAIT_SYNC_SIGNAL(sync);
+}
+
+END_C_DECLS
+
+#endif /* defined(PMIX_THREADS_WAIT_SYNC_H) */
diff --git a/src/tool/Makefile.include b/src/tool/Makefile.include
new file mode 100644
index 0000000..7d638ab
--- /dev/null
+++ b/src/tool/Makefile.include
@@ -0,0 +1,11 @@
+#
+# Copyright (c) 2014-2016 Intel, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+sources += \
+        tool/pmix_tool.c
diff --git a/src/tool/pmix_tool.c b/src/tool/pmix_tool.c
new file mode 100644
index 0000000..196938a
--- /dev/null
+++ b/src/tool/pmix_tool.c
@@ -0,0 +1,599 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2014-2017 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2014-2016 Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2014      Artem Y. Polyakov <artpol84 at gmail.com>.
+ *                         All rights reserved.
+ * Copyright (c) 2016      Mellanox Technologies, Inc.
+ *                         All rights reserved.
+ * Copyright (c) 2016      IBM Corporation.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+
+#include <src/include/types.h>
+#include <src/include/pmix_socket_errno.h>
+
+#include "src/client/pmix_client_ops.h"
+#include <pmix_tool.h>
+#include <pmix_rename.h>
+
+#include "src/include/pmix_globals.h"
+
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+#include <fcntl.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_SYS_UN_H
+#include <sys/un.h>
+#endif
+#ifdef HAVE_SYS_UIO_H
+#include <sys/uio.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_DIRENT_H
+#include <dirent.h>
+#endif  /* HAVE_DIRENT_H */
+
+#include PMIX_EVENT_HEADER
+#include PMIX_EVENT2_THREAD_HEADER
+
+#if PMIX_CC_USE_PRAGMA_IDENT
+#pragma ident PMIX_VERSION
+#elif PMIX_CC_USE_IDENT
+#ident PMIX_VERSION
+#endif
+
+extern pmix_client_globals_t pmix_client_globals;
+
+#include "src/class/pmix_list.h"
+#include "src/buffer_ops/buffer_ops.h"
+#include "src/util/argv.h"
+#include "src/util/error.h"
+#include "src/util/hash.h"
+#include "src/util/output.h"
+#include "src/runtime/pmix_progress_threads.h"
+#include "src/runtime/pmix_rte.h"
+#include "src/mca/ptl/ptl.h"
+#include "src/mca/psec/psec.h"
+#include "src/include/pmix_globals.h"
+#if defined(PMIX_ENABLE_DSTORE) && (PMIX_ENABLE_DSTORE == 1)
+#include "src/dstore/pmix_dstore.h"
+#endif /* PMIX_ENABLE_DSTORE */
+
+#define PMIX_MAX_RETRIES 10
+
+static void _notify_complete(pmix_status_t status, void *cbdata)
+{
+    pmix_event_chain_t *chain = (pmix_event_chain_t*)cbdata;
+    PMIX_RELEASE(chain);
+}
+
+static void pmix_tool_notify_recv(struct pmix_peer_t *peer,
+                                  pmix_ptl_hdr_t *hdr,
+                                  pmix_buffer_t *buf, void *cbdata)
+{
+    pmix_status_t rc;
+    int32_t cnt;
+    pmix_cmd_t cmd;
+    pmix_event_chain_t *chain;
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "pmix:tool_notify_recv - processing event");
+
+      /* start the local notification chain */
+    chain = PMIX_NEW(pmix_event_chain_t);
+    chain->final_cbfunc = _notify_complete;
+    chain->final_cbdata = chain;
+
+    cnt=1;
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, &cmd, &cnt, PMIX_CMD))) {
+        PMIX_ERROR_LOG(rc);
+        goto error;
+    }
+    /* unpack the status */
+    cnt=1;
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, &chain->status, &cnt, PMIX_STATUS))) {
+        PMIX_ERROR_LOG(rc);
+        goto error;
+    }
+
+    /* unpack the source of the event */
+    cnt=1;
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, &chain->source, &cnt, PMIX_PROC))) {
+        PMIX_ERROR_LOG(rc);
+        goto error;
+    }
+
+    /* unpack the info that might have been provided */
+    cnt=1;
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, &chain->ninfo, &cnt, PMIX_SIZE))) {
+        PMIX_ERROR_LOG(rc);
+        goto error;
+    }
+    if (0 < chain->ninfo) {
+        PMIX_INFO_CREATE(chain->info, chain->ninfo);
+        cnt = chain->ninfo;
+        if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, chain->info, &cnt, PMIX_INFO))) {
+            PMIX_ERROR_LOG(rc);
+            goto error;
+        }
+    }
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "[%s:%d] pmix:tool_notify_recv - processing event %d, calling errhandler",
+                        pmix_globals.myid.nspace, pmix_globals.myid.rank, chain->status);
+
+    pmix_invoke_local_event_hdlr(chain);
+    return;
+
+  error:
+    /* we always need to return */
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "pmix:tool_notify_recv - unpack error status =%d, calling def errhandler", rc);
+    chain = PMIX_NEW(pmix_event_chain_t);
+    chain->status = rc;
+    pmix_invoke_local_event_hdlr(chain);
+}
+
+
+PMIX_EXPORT int PMIx_tool_init(pmix_proc_t *proc,
+                               pmix_info_t info[], size_t ninfo)
+{
+    pmix_kval_t *kptr;
+    pmix_status_t rc;
+    pmix_nspace_t *nptr, *nsptr;
+    char hostname[PMIX_MAX_NSLEN];
+
+    PMIX_ACQUIRE_THREAD(&pmix_global_lock);
+
+    if (NULL == proc) {
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return PMIX_ERR_BAD_PARAM;
+    }
+    if (0 < pmix_globals.init_cntr) {
+        /* since we have been called before, the nspace and
+         * rank should be known. So return them here if
+         * requested */
+         if (NULL != proc) {
+            (void)strncpy(proc->nspace, pmix_globals.myid.nspace, PMIX_MAX_NSLEN);
+            proc->rank = pmix_globals.myid.rank;
+        }
+        ++pmix_globals.init_cntr;
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return PMIX_SUCCESS;
+    }
+
+    /* if we were given an nspace in the environment, then we
+     * must have been spawned by a PMIx server - so even though
+     * we technically will operate as a tool, we are actually
+     * a "client" of the PMIx server and should connect that way */
+    if (NULL != getenv("PMIX_NAMESPACE")) {
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return PMIx_Init(proc, info, ninfo);
+    }
+
+    /* setup the runtime - this init's the globals,
+     * opens and initializes the required frameworks */
+    if (PMIX_SUCCESS != (rc = pmix_rte_init(PMIX_PROC_TOOL, info, ninfo,
+                                            pmix_tool_notify_recv))) {
+        PMIX_ERROR_LOG(rc);
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return rc;
+    }
+
+    PMIX_CONSTRUCT(&pmix_client_globals.pending_requests, pmix_list_t);
+    pmix_client_globals.myserver = PMIX_NEW(pmix_peer_t);
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "pmix: init called");
+
+    /* select our psec module - we take the default as we cannot
+     * do any better */
+    if (PMIX_SUCCESS != (rc = pmix_psec.assign_module(pmix_globals.mypeer, NULL))) {
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return PMIX_ERR_INIT;
+    }
+    /* the server will have to use the same */
+    pmix_client_globals.myserver->compat.psec = pmix_globals.mypeer->compat.psec;
+
+    /* connect to the server - returns job info if successful */
+    if (PMIX_SUCCESS != (rc = pmix_ptl.connect_to_peer(pmix_client_globals.myserver, info, ninfo))){
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return rc;
+    }
+
+    /* increment our init reference counter */
+    pmix_globals.init_cntr++;
+
+    /* Success, so copy the nspace and rank */
+    (void)strncpy(proc->nspace, pmix_globals.myid.nspace, PMIX_MAX_NSLEN);
+    proc->rank = pmix_globals.myid.rank;
+
+    /* now finish the initialization by filling our local
+     * datastore with typical job-related info. No point
+     * in having the server generate these as we are
+     * obviously a singleton, and so the values are well-known */
+    nsptr = NULL;
+    PMIX_LIST_FOREACH(nptr, &pmix_globals.nspaces, pmix_nspace_t) {
+        if (0 == strncmp(pmix_globals.myid.nspace, nptr->nspace, PMIX_MAX_NSLEN)) {
+            nsptr = nptr;
+            break;
+        }
+    }
+    if (NULL == nsptr) {
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return PMIX_ERR_NOT_FOUND;
+    }
+
+    /* the jobid is just our nspace */
+    kptr = PMIX_NEW(pmix_kval_t);
+    kptr->key = strdup(PMIX_JOBID);
+    PMIX_VALUE_CREATE(kptr->value, 1);
+    kptr->value->type = PMIX_STRING;
+    kptr->value->data.string = strdup(nsptr->nspace);
+    if (PMIX_SUCCESS != (rc = pmix_hash_store(&nsptr->internal, pmix_globals.myid.rank, kptr))) {
+        PMIX_ERROR_LOG(rc);
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return rc;
+    }
+    PMIX_RELEASE(kptr); // maintain accounting
+
+    /* our rank */
+    kptr = PMIX_NEW(pmix_kval_t);
+    kptr->key = strdup(PMIX_RANK);
+    PMIX_VALUE_CREATE(kptr->value, 1);
+    kptr->value->type = PMIX_INT;
+    kptr->value->data.integer = 0;
+    if (PMIX_SUCCESS != (rc = pmix_hash_store(&nsptr->internal, pmix_globals.myid.rank, kptr))) {
+        PMIX_ERROR_LOG(rc);
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return rc;
+    }
+    PMIX_RELEASE(kptr); // maintain accounting
+
+    /* nproc offset */
+    kptr = PMIX_NEW(pmix_kval_t);
+    kptr->key = strdup(PMIX_NPROC_OFFSET);
+    PMIX_VALUE_CREATE(kptr->value, 1);
+    kptr->value->type = PMIX_UINT32;
+    kptr->value->data.uint32 = 0;
+    if (PMIX_SUCCESS != (rc = pmix_hash_store(&nsptr->internal, pmix_globals.myid.rank, kptr))) {
+        PMIX_ERROR_LOG(rc);
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return rc;
+    }
+    PMIX_RELEASE(kptr); // maintain accounting
+
+    /* node size */
+    kptr = PMIX_NEW(pmix_kval_t);
+    kptr->key = strdup(PMIX_NODE_SIZE);
+    PMIX_VALUE_CREATE(kptr->value, 1);
+    kptr->value->type = PMIX_UINT32;
+    kptr->value->data.uint32 = 1;
+    if (PMIX_SUCCESS != (rc = pmix_hash_store(&nsptr->internal, pmix_globals.myid.rank, kptr))) {
+        PMIX_ERROR_LOG(rc);
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return rc;
+    }
+    PMIX_RELEASE(kptr); // maintain accounting
+
+    /* local peers */
+    kptr = PMIX_NEW(pmix_kval_t);
+    kptr->key = strdup(PMIX_LOCAL_PEERS);
+    PMIX_VALUE_CREATE(kptr->value, 1);
+    kptr->value->type = PMIX_STRING;
+    kptr->value->data.string = strdup("0");
+    if (PMIX_SUCCESS != (rc = pmix_hash_store(&nsptr->internal, pmix_globals.myid.rank, kptr))) {
+        PMIX_ERROR_LOG(rc);
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return rc;
+    }
+    PMIX_RELEASE(kptr); // maintain accounting
+
+    /* local leader */
+    kptr = PMIX_NEW(pmix_kval_t);
+    kptr->key = strdup(PMIX_LOCALLDR);
+    PMIX_VALUE_CREATE(kptr->value, 1);
+    kptr->value->type = PMIX_UINT32;
+    kptr->value->data.uint32 = 0;
+    if (PMIX_SUCCESS != (rc = pmix_hash_store(&nsptr->internal, pmix_globals.myid.rank, kptr))) {
+        PMIX_ERROR_LOG(rc);
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+    }
+    PMIX_RELEASE(kptr); // maintain accounting
+
+    /* universe size */
+    kptr = PMIX_NEW(pmix_kval_t);
+    kptr->key = strdup(PMIX_UNIV_SIZE);
+    PMIX_VALUE_CREATE(kptr->value, 1);
+    kptr->value->type = PMIX_UINT32;
+    kptr->value->data.uint32 = 1;
+    if (PMIX_SUCCESS != (rc = pmix_hash_store(&nsptr->internal, pmix_globals.myid.rank, kptr))) {
+        PMIX_ERROR_LOG(rc);
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return rc;
+    }
+    PMIX_RELEASE(kptr); // maintain accounting
+
+    /* job size - we are our very own job, so we have no peers */
+    kptr = PMIX_NEW(pmix_kval_t);
+    kptr->key = strdup(PMIX_JOB_SIZE);
+    PMIX_VALUE_CREATE(kptr->value, 1);
+    kptr->value->type = PMIX_UINT32;
+    kptr->value->data.uint32 = 1;
+    if (PMIX_SUCCESS != (rc = pmix_hash_store(&nsptr->internal, pmix_globals.myid.rank, kptr))) {
+        PMIX_ERROR_LOG(rc);
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return rc;
+    }
+    PMIX_RELEASE(kptr); // maintain accounting
+
+    /* local size - only us in our job */
+    kptr = PMIX_NEW(pmix_kval_t);
+    kptr->key = strdup(PMIX_LOCAL_SIZE);
+    PMIX_VALUE_CREATE(kptr->value, 1);
+    kptr->value->type = PMIX_UINT32;
+    kptr->value->data.uint32 = 1;
+    if (PMIX_SUCCESS != (rc = pmix_hash_store(&nsptr->internal, pmix_globals.myid.rank, kptr))) {
+        PMIX_ERROR_LOG(rc);
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return rc;
+    }
+    PMIX_RELEASE(kptr); // maintain accounting
+
+    /* max procs - since we are a self-started tool, there is no
+     * allocation within which we can grow ourselves */
+    kptr = PMIX_NEW(pmix_kval_t);
+    kptr->key = strdup(PMIX_MAX_PROCS);
+    PMIX_VALUE_CREATE(kptr->value, 1);
+    kptr->value->type = PMIX_UINT32;
+    kptr->value->data.uint32 = 1;
+    if (PMIX_SUCCESS != (rc = pmix_hash_store(&nsptr->internal, pmix_globals.myid.rank, kptr))) {
+        PMIX_ERROR_LOG(rc);
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return rc;
+    }
+    PMIX_RELEASE(kptr); // maintain accounting
+
+    /* app number */
+    kptr = PMIX_NEW(pmix_kval_t);
+    kptr->key = strdup(PMIX_APPNUM);
+    PMIX_VALUE_CREATE(kptr->value, 1);
+    kptr->value->type = PMIX_UINT32;
+    kptr->value->data.uint32 = 0;
+    if (PMIX_SUCCESS != (rc = pmix_hash_store(&nsptr->internal, pmix_globals.myid.rank, kptr))) {
+        PMIX_ERROR_LOG(rc);
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return rc;
+    }
+    PMIX_RELEASE(kptr); // maintain accounting
+
+    /* app leader */
+    kptr = PMIX_NEW(pmix_kval_t);
+    kptr->key = strdup(PMIX_APPLDR);
+    PMIX_VALUE_CREATE(kptr->value, 1);
+    kptr->value->type = PMIX_UINT32;
+    kptr->value->data.uint32 = 0;
+    if (PMIX_SUCCESS != (rc = pmix_hash_store(&nsptr->internal, pmix_globals.myid.rank, kptr))) {
+        PMIX_ERROR_LOG(rc);
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return rc;
+    }
+    PMIX_RELEASE(kptr); // maintain accounting
+
+    /* app rank */
+    kptr = PMIX_NEW(pmix_kval_t);
+    kptr->key = strdup(PMIX_APP_RANK);
+    PMIX_VALUE_CREATE(kptr->value, 1);
+    kptr->value->type = PMIX_UINT32;
+    kptr->value->data.uint32 = 0;
+    if (PMIX_SUCCESS != (rc = pmix_hash_store(&nsptr->internal, pmix_globals.myid.rank, kptr))) {
+        PMIX_ERROR_LOG(rc);
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return rc;
+    }
+    PMIX_RELEASE(kptr); // maintain accounting
+
+    /* global rank */
+    kptr = PMIX_NEW(pmix_kval_t);
+    kptr->key = strdup(PMIX_GLOBAL_RANK);
+    PMIX_VALUE_CREATE(kptr->value, 1);
+    kptr->value->type = PMIX_UINT32;
+    kptr->value->data.uint32 = 0;
+    if (PMIX_SUCCESS != (rc = pmix_hash_store(&nsptr->internal, pmix_globals.myid.rank, kptr))) {
+        PMIX_ERROR_LOG(rc);
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return rc;
+    }
+    PMIX_RELEASE(kptr); // maintain accounting
+
+    /* local rank - we are alone in our job */
+    kptr = PMIX_NEW(pmix_kval_t);
+    kptr->key = strdup(PMIX_LOCAL_RANK);
+    PMIX_VALUE_CREATE(kptr->value, 1);
+    kptr->value->type = PMIX_UINT32;
+    kptr->value->data.uint32 = 0;
+    if (PMIX_SUCCESS != (rc = pmix_hash_store(&nsptr->internal, pmix_globals.myid.rank, kptr))) {
+        PMIX_ERROR_LOG(rc);
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return rc;
+    }
+    PMIX_RELEASE(kptr); // maintain accounting
+
+    /* we cannot know the node rank as we don't know what
+     * other processes are executing on this node - so
+     * we'll add that info to the server-tool handshake
+     * and load it from there */
+
+    /* hostname */
+     gethostname(hostname, PMIX_MAX_NSLEN);
+     kptr = PMIX_NEW(pmix_kval_t);
+     kptr->key = strdup(PMIX_HOSTNAME);
+     PMIX_VALUE_CREATE(kptr->value, 1);
+     kptr->value->type = PMIX_STRING;
+     kptr->value->data.string = strdup(hostname);
+     if (PMIX_SUCCESS != (rc = pmix_hash_store(&nsptr->internal, pmix_globals.myid.rank, kptr))) {
+        PMIX_ERROR_LOG(rc);
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return rc;
+    }
+    PMIX_RELEASE(kptr); // maintain accounting
+
+    /* we cannot know the RM's nodeid for this host, so
+     * we'll add that info to the server-tool handshake
+     * and load it from there */
+
+    /* the nodemap is simply our hostname as there is no
+     * regex to generate */
+     kptr = PMIX_NEW(pmix_kval_t);
+     kptr->key = strdup(PMIX_NODE_MAP);
+     PMIX_VALUE_CREATE(kptr->value, 1);
+     kptr->value->type = PMIX_STRING;
+     kptr->value->data.string = strdup(hostname);
+     if (PMIX_SUCCESS != (rc = pmix_hash_store(&nsptr->internal, pmix_globals.myid.rank, kptr))) {
+        PMIX_ERROR_LOG(rc);
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return rc;
+    }
+    PMIX_RELEASE(kptr); // maintain accounting
+
+    /* likewise, the proc map is just our rank as we are
+     * the only proc in this job */
+    kptr = PMIX_NEW(pmix_kval_t);
+    kptr->key = strdup(PMIX_PROC_MAP);
+    PMIX_VALUE_CREATE(kptr->value, 1);
+    kptr->value->type = PMIX_STRING;
+    kptr->value->data.string = strdup("0");
+    if (PMIX_SUCCESS != (rc = pmix_hash_store(&nsptr->internal, pmix_globals.myid.rank, kptr))) {
+        PMIX_ERROR_LOG(rc);
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return rc;
+    }
+    PMIX_RELEASE(kptr); // maintain accounting
+
+    PMIX_RELEASE_THREAD(&pmix_global_lock);
+    return rc;
+}
+
+typedef struct {
+    pmix_lock_t lock;
+    pmix_event_t ev;
+    bool active;
+} pmix_tool_timeout_t;
+
+/* timer callback */
+static void fin_timeout(int sd, short args, void *cbdata)
+{
+    pmix_tool_timeout_t *tev;
+    tev = (pmix_tool_timeout_t*)cbdata;
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "pmix:tool finwait timeout fired");
+    if (tev->active) {
+        tev->active = false;
+        PMIX_WAKEUP_THREAD(&tev->lock);
+    }
+}
+/* callback for finalize completion */
+static void finwait_cbfunc(struct pmix_peer_t *pr,
+                           pmix_ptl_hdr_t *hdr,
+                           pmix_buffer_t *buf, void *cbdata)
+{
+    pmix_tool_timeout_t *tev;
+    tev = (pmix_tool_timeout_t*)cbdata;
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "pmix:tool finwait_cbfunc received");
+    if (tev->active) {
+        tev->active = false;
+        pmix_event_del(&tev->ev);  // stop the timer
+        PMIX_WAKEUP_THREAD(&tev->lock);
+    }
+}
+
+PMIX_EXPORT pmix_status_t PMIx_tool_finalize(void)
+{
+    pmix_buffer_t *msg;
+    pmix_cmd_t cmd = PMIX_FINALIZE_CMD;
+    pmix_status_t rc;
+    pmix_tool_timeout_t tev;
+    struct timeval tv = {2, 0};
+
+    PMIX_ACQUIRE_THREAD(&pmix_global_lock);
+    if (1 != pmix_globals.init_cntr) {
+        --pmix_globals.init_cntr;
+        PMIX_RELEASE_THREAD(&pmix_global_lock);
+        return PMIX_SUCCESS;
+    }
+    pmix_globals.init_cntr = 0;
+    PMIX_RELEASE_THREAD(&pmix_global_lock);
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "pmix:tool finalize called");
+
+    /* setup a cmd message to notify the PMIx
+     * server that we are normally terminating */
+    msg = PMIX_NEW(pmix_buffer_t);
+    /* pack the cmd */
+    if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(msg, &cmd, 1, PMIX_CMD))) {
+        PMIX_ERROR_LOG(rc);
+        PMIX_RELEASE(msg);
+        return rc;
+    }
+
+
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                         "pmix:tool sending finalize sync to server");
+
+    /* setup a timer to protect ourselves should the server be unable
+     * to answer for some reason */
+    PMIX_CONSTRUCT_LOCK(&tev.lock);
+    pmix_event_assign(&tev.ev, pmix_globals.evbase, -1, 0,
+                      fin_timeout, &tev);
+    tev.active = true;
+    PMIX_POST_OBJECT(&tev);
+    pmix_event_add(&tev.ev, &tv);
+    if (PMIX_SUCCESS != (rc = pmix_ptl.send_recv(pmix_client_globals.myserver, msg,
+                                                 finwait_cbfunc, (void*)&tev))){
+        return rc;
+    }
+
+    /* wait for the ack to return */
+    PMIX_WAIT_THREAD(&tev.lock);
+    PMIX_DESTRUCT_LOCK(&tev.lock);
+    if (tev.active) {
+        pmix_event_del(&tev.ev);
+    }
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                         "pmix:tool finalize sync received");
+
+    if (!pmix_globals.external_evbase) {
+        /* stop the progress thread, but leave the event base
+         * still constructed. This will allow us to safely
+         * tear down the infrastructure, including removal
+         * of any events objects may be holding */
+        (void)pmix_progress_thread_pause(NULL);
+    }
+
+    PMIX_RELEASE(pmix_client_globals.myserver);
+    PMIX_LIST_DESTRUCT(&pmix_client_globals.pending_requests);
+
+    /* shutdown services */
+    pmix_rte_finalize();
+
+    return PMIX_SUCCESS;
+}
diff --git a/src/util/Makefile.include b/src/util/Makefile.include
new file mode 100644
index 0000000..1a4065d
--- /dev/null
+++ b/src/util/Makefile.include
@@ -0,0 +1,81 @@
+# -*- makefile -*-
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2007-2016 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2013      NVIDIA Corporation.  All rights reserved.
+# Copyright (c) 2013-2016 Intel, Inc. All rights reserved
+# Copyright (c) 2016      Research Organization for Information Science
+#                         and Technology (RIST). All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+AM_LFLAGS = -Ppmix_show_help_yy
+LEX_OUTPUT_ROOT = lex.pmix_show_help_yy
+
+# Source code files
+
+headers += \
+        util/alfg.h \
+        util/argv.h \
+        util/error.h \
+        util/printf.h \
+        util/output.h \
+        util/pmix_environ.h \
+        util/crc.h \
+        util/fd.h \
+        util/timings.h \
+        util/os_path.h \
+        util/basename.h \
+        util/keyval_parse.h \
+        util/show_help.h \
+        util/show_help_lex.h \
+        util/path.h \
+        util/getid.h \
+        util/strnlen.h \
+        util/hash.h \
+        util/net.h \
+        util/pif.h \
+        util/tsd.h \
+        util/parse_options.h \
+        util/compress.h
+
+sources += \
+        util/alfg.c \
+        util/argv.c \
+        util/error.c \
+        util/printf.c \
+        util/output.c \
+        util/pmix_environ.c \
+        util/crc.c \
+        util/fd.c \
+        util/timings.c \
+        util/os_path.c \
+        util/basename.c \
+        util/keyval_parse.c \
+        util/show_help.c \
+        util/show_help_lex.l \
+        util/path.c \
+        util/getid.c \
+        util/hash.c \
+        util/net.c \
+        util/pif.c \
+        util/parse_options.c \
+        util/compress.c
+
+libpmix_la_LIBADD += \
+        util/keyval/libpmixutilkeyval.la
+libpmix_la_DEPENDENCIES += \
+        util/keyval/libpmixutilkeyval.la
diff --git a/src/util/alfg.c b/src/util/alfg.c
new file mode 100644
index 0000000..87e0e85
--- /dev/null
+++ b/src/util/alfg.c
@@ -0,0 +1,136 @@
+/*
+ * Copyright (c) 2014      Mellanox Technologies, Inc.
+ *                         All rights reserved.
+ * Copyright (c) 2016      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2016      Intel, Inc.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+
+#include <string.h>
+
+#include "alfg.h"
+
+/* Mask corresponding to the primitive polynomial
+ *---------------------------------------------------
+ *
+ * p(x) = 1 + x^25 + x^27 + x^29 + x^30 + x^31 + x^32
+ *
+ *---------------------------------------------------
+ */
+#define MASK 0x80000057U
+
+/* Additive lagged Fibonacci parameters:
+ *---------------------------------------------------
+ *
+ * x_n = (x_(n - TAP1) + x_(n - TAP2) ) mod M
+ *
+ *---------------------------------------------------
+ */
+#define TAP1 127
+#define TAP2 97
+#define CBIT 21  /* Canonical bit */
+
+
+/**
+ * @brief      Galois shift register: Used to seed the ALFG's
+ *             canonical rectangle
+ *
+ * @param[in]  unsigned int *seed: used to seed the Galois register
+ * @param[out] uint32_t lsb: least significant bit of the Galois
+ *             register after shift
+ */
+static uint32_t galois(unsigned int *seed){
+
+    uint32_t lsb;
+    lsb = (*seed & 1) ? 1 : 0;
+    *seed >>= 1;
+    /* tap it with the mask */
+    *seed = *seed ^ (lsb*MASK);
+
+    return lsb;
+}
+
+/* PMIX global rng buffer */
+static pmix_rng_buff_t alfg_buffer;
+
+/**
+ * @brief   Routine to seed the ALFG register
+ *
+ * @param[in]   uint32_t seed
+ * @param[out]  pmix_rng_buff_t *buff: handle to ALFG buffer state
+ */
+int pmix_srand(pmix_rng_buff_t *buff, uint32_t seed) {
+
+    int i, j;
+    uint32_t seed_cpy = seed;
+    buff->tap1 = TAP1 - 1;
+    buff->tap2 = TAP2 - 1;
+
+    /* zero out the register */
+    for( i = 0; i < TAP1; i++){
+        buff->alfg[i] = 0;
+    }
+    /* set the canonical bit */
+    buff->alfg[CBIT] = 1;
+
+    /* seed the ALFG register by blasting
+     * the canonical rectangle with bits
+    */
+    for ( j = 1; j < TAP1; j++){
+        for( i = 1; i < 32; i++){
+            buff->alfg[j] = buff->alfg[j] ^ ((galois(&seed_cpy))<<i);
+        }
+    }
+    /* copy the ALFG to the global buffer */
+    memcpy(&alfg_buffer, buff, sizeof(alfg_buffer));
+
+    return 1;
+
+}
+
+/**
+ * @brief       The additive lagged Fibonnaci PRNG
+ *
+ * @param[in]   pmix_rng_buff_t *buff: handle to ALFG buffer state
+ * @param[out]  32-bit unsigned random integer
+ */
+
+uint32_t pmix_rand(pmix_rng_buff_t *buff){
+
+    int *tap1 = &(buff->tap1);
+    int *tap2 = &(buff->tap2);
+    uint64_t overflow;
+    uint32_t temp;
+
+    /* prevent overflow */
+    overflow = (uint64_t) buff->alfg[*tap1] + (uint64_t) buff->alfg[*tap2];
+    /* circular buffer arithmetic */
+    temp = (*tap1 + 1) == TAP1 ?  0 :  (*tap1 + 1);
+    /* Division modulo 2^32 */
+    buff->alfg[temp] = (uint32_t) ( overflow & ((1ULL<<32) -1));
+
+    /* increment tap points */
+    *tap1 = (*tap1 + 1)%TAP1;
+    *tap2 = (*tap2 + 1)%TAP1;
+
+    return buff->alfg[temp];
+
+}
+
+/**
+ * @brief      A wrapper for pmix_rand() with our global ALFG buffer;
+ *
+ * @param[in]  none
+ * @param[out] int, the same as normal rand(3)
+ */
+int pmix_random(void){
+    /* always return a positive int */
+    return (int)(pmix_rand(&alfg_buffer) & 0x7FFFFFFF);
+}
diff --git a/src/util/alfg.h b/src/util/alfg.h
new file mode 100644
index 0000000..8011ec6
--- /dev/null
+++ b/src/util/alfg.h
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2014      Mellanox Technologies, Inc.
+ *                         All rights reserved.
+ * Copyright (c) 2014      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2014-2017 Intel, Inc.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#ifndef PMIX_ALFG_H
+#define PMIX_ALFG_H
+
+#include <src/include/pmix_config.h>
+#include <pmix_common.h>
+
+#include "src/include/pmix_stdint.h"
+
+
+struct pmix_rng_buff_t {
+    uint32_t alfg[127];
+    int tap1;
+    int tap2;
+};
+typedef struct pmix_rng_buff_t pmix_rng_buff_t;
+
+
+/* NOTE: UNLIKE OTHER PMIX FUNCTIONS, THIS FUNCTION RETURNS A 1 IF
+ * SUCCESSFUL INSTEAD OF PMIX_SUCCESS */
+PMIX_EXPORT int pmix_srand(pmix_rng_buff_t *buff, uint32_t seed);
+
+PMIX_EXPORT uint32_t pmix_rand(pmix_rng_buff_t *buff);
+
+PMIX_EXPORT int pmix_random(void);
+
+#endif /* PMIX_ALFG_H */
diff --git a/src/util/argv.c b/src/util/argv.c
new file mode 100644
index 0000000..f5c08f8
--- /dev/null
+++ b/src/util/argv.c
@@ -0,0 +1,588 @@
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2005 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2007      Voltaire. All rights reserved.
+ * Copyright (c) 2012      Los Alamos National Security, LLC. All rights reserved.
+ * Copyright (c) 2014-2016 Intel, Inc.  All rights reserved.
+ *
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+
+
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif  /* HAVE_STDLIB_H */
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif  /* HAVE_STRING_H */
+
+#include "src/util/argv.h"
+
+#define ARGSIZE 128
+
+
+/*
+ * Append a string to the end of a new or existing argv array.
+ */
+pmix_status_t pmix_argv_append(int *argc, char ***argv, const char *arg)
+{
+    pmix_status_t rc;
+
+    /* add the new element */
+    if (PMIX_SUCCESS != (rc = pmix_argv_append_nosize(argv, arg))) {
+        return rc;
+    }
+
+    *argc = pmix_argv_count(*argv);
+
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_argv_append_nosize(char ***argv, const char *arg)
+{
+    int argc;
+
+  /* Create new argv. */
+
+  if (NULL == *argv) {
+    *argv = (char**) malloc(2 * sizeof(char *));
+    if (NULL == *argv) {
+        return PMIX_ERR_OUT_OF_RESOURCE;
+    }
+    argc = 0;
+    (*argv)[0] = NULL;
+    (*argv)[1] = NULL;
+  }
+
+  /* Extend existing argv. */
+  else {
+        /* count how many entries currently exist */
+        argc = pmix_argv_count(*argv);
+
+        *argv = (char**) realloc(*argv, (argc + 2) * sizeof(char *));
+        if (NULL == *argv) {
+            return PMIX_ERR_OUT_OF_RESOURCE;
+        }
+    }
+
+    /* Set the newest element to point to a copy of the arg string */
+
+    (*argv)[argc] = strdup(arg);
+    if (NULL == (*argv)[argc]) {
+        return PMIX_ERR_OUT_OF_RESOURCE;
+    }
+
+    argc = argc + 1;
+    (*argv)[argc] = NULL;
+
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_argv_prepend_nosize(char ***argv, const char *arg)
+{
+    int argc;
+    int i;
+
+    /* Create new argv. */
+
+    if (NULL == *argv) {
+        *argv = (char**) malloc(2 * sizeof(char *));
+        if (NULL == *argv) {
+            return PMIX_ERR_OUT_OF_RESOURCE;
+        }
+        (*argv)[0] = strdup(arg);
+        (*argv)[1] = NULL;
+    } else {
+        /* count how many entries currently exist */
+        argc = pmix_argv_count(*argv);
+
+        *argv = (char**) realloc(*argv, (argc + 2) * sizeof(char *));
+        if (NULL == *argv) {
+            return PMIX_ERR_OUT_OF_RESOURCE;
+        }
+        (*argv)[argc+1] = NULL;
+
+        /* shift all existing elements down 1 */
+        for (i=argc; 0 < i; i--) {
+            (*argv)[i] = (*argv)[i-1];
+        }
+        (*argv)[0] = strdup(arg);
+    }
+
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_argv_append_unique_nosize(char ***argv, const char *arg, bool overwrite)
+{
+    int i;
+
+    /* if the provided array is NULL, then the arg cannot be present,
+     * so just go ahead and append
+     */
+    if (NULL == *argv) {
+        return pmix_argv_append_nosize(argv, arg);
+    }
+
+    /* see if this arg is already present in the array */
+    for (i=0; NULL != (*argv)[i]; i++) {
+        if (0 == strcmp(arg, (*argv)[i])) {
+            /* already exists - are we authorized to overwrite? */
+            if (overwrite) {
+                free((*argv)[i]);
+                (*argv)[i] = strdup(arg);
+            }
+            return PMIX_SUCCESS;
+        }
+    }
+
+    /* we get here if the arg is not in the array - so add it */
+    return pmix_argv_append_nosize(argv, arg);
+}
+
+/*
+ * Free a NULL-terminated argv array.
+ */
+void pmix_argv_free(char **argv)
+{
+  char **p;
+
+  if (NULL == argv)
+    return;
+
+  for (p = argv; NULL != *p; ++p) {
+    free(*p);
+  }
+
+  free(argv);
+}
+
+
+/*
+ * Split a string into a NULL-terminated argv array.
+ */
+static char **pmix_argv_split_inter(const char *src_string, int delimiter,
+        int include_empty)
+{
+  char arg[ARGSIZE];
+  char **argv = NULL;
+  const char *p;
+  char *argtemp;
+  int argc = 0;
+  size_t arglen;
+
+  while (src_string && *src_string) {
+    p = src_string;
+    arglen = 0;
+
+    while (('\0' != *p) && (*p != delimiter)) {
+      ++p;
+      ++arglen;
+    }
+
+    /* zero length argument, skip */
+
+    if (src_string == p) {
+      if (include_empty) {
+        arg[0] = '\0';
+        if (PMIX_SUCCESS != pmix_argv_append(&argc, &argv, arg))
+          return NULL;
+      }
+    }
+
+    /* tail argument, add straight from the original string */
+
+    else if ('\0' == *p) {
+      if (PMIX_SUCCESS != pmix_argv_append(&argc, &argv, src_string))
+        return NULL;
+      src_string = p;
+      continue;
+    }
+
+    /* long argument, malloc buffer, copy and add */
+
+    else if (arglen > (ARGSIZE - 1)) {
+        argtemp = (char*) malloc(arglen + 1);
+      if (NULL == argtemp)
+        return NULL;
+
+      strncpy(argtemp, src_string, arglen);
+      argtemp[arglen] = '\0';
+
+      if (PMIX_SUCCESS != pmix_argv_append(&argc, &argv, argtemp)) {
+        free(argtemp);
+        return NULL;
+      }
+
+      free(argtemp);
+    }
+
+    /* short argument, copy to buffer and add */
+
+    else {
+      strncpy(arg, src_string, arglen);
+      arg[arglen] = '\0';
+
+      if (PMIX_SUCCESS != pmix_argv_append(&argc, &argv, arg))
+        return NULL;
+    }
+
+    src_string = p + 1;
+  }
+
+  /* All done */
+
+  return argv;
+}
+
+char **pmix_argv_split(const char *src_string, int delimiter)
+{
+    return pmix_argv_split_inter(src_string, delimiter, 0);
+}
+
+char **pmix_argv_split_with_empty(const char *src_string, int delimiter)
+{
+    return pmix_argv_split_inter(src_string, delimiter, 1);
+}
+
+/*
+ * Return the length of a NULL-terminated argv array.
+ */
+int pmix_argv_count(char **argv)
+{
+  char **p;
+  int i;
+
+  if (NULL == argv)
+    return 0;
+
+  for (i = 0, p = argv; *p; i++, p++)
+    continue;
+
+  return i;
+}
+
+
+/*
+ * Join all the elements of an argv array into a single
+ * newly-allocated string.
+ */
+char *pmix_argv_join(char **argv, int delimiter)
+{
+  char **p;
+  char *pp;
+  char *str;
+  size_t str_len = 0;
+  size_t i;
+
+  /* Bozo case */
+
+  if (NULL == argv || NULL == argv[0]) {
+      return strdup("");
+  }
+
+  /* Find the total string length in argv including delimiters.  The
+     last delimiter is replaced by the NULL character. */
+
+  for (p = argv; *p; ++p) {
+    str_len += strlen(*p) + 1;
+  }
+
+  /* Allocate the string. */
+
+  if (NULL == (str = (char*) malloc(str_len)))
+    return NULL;
+
+  /* Loop filling in the string. */
+
+  str[--str_len] = '\0';
+  p = argv;
+  pp = *p;
+
+  for (i = 0; i < str_len; ++i) {
+    if ('\0' == *pp) {
+
+      /* End of a string, fill in a delimiter and go to the next
+         string. */
+
+      str[i] = (char) delimiter;
+      ++p;
+      pp = *p;
+    } else {
+      str[i] = *pp++;
+    }
+  }
+
+  /* All done */
+
+  return str;
+}
+
+
+/*
+ * Join all the elements of an argv array from within a
+ * specified range into a single newly-allocated string.
+ */
+char *pmix_argv_join_range(char **argv, size_t start, size_t end, int delimiter)
+{
+    char **p;
+    char *pp;
+    char *str;
+    size_t str_len = 0;
+    size_t i;
+
+    /* Bozo case */
+
+    if (NULL == argv || NULL == argv[0] || (int)start > pmix_argv_count(argv)) {
+        return strdup("");
+    }
+
+    /* Find the total string length in argv including delimiters.  The
+     last delimiter is replaced by the NULL character. */
+
+    for (p = &argv[start], i=start; *p && i < end; ++p, ++i) {
+        str_len += strlen(*p) + 1;
+    }
+
+    /* Allocate the string. */
+
+    if (NULL == (str = (char*) malloc(str_len)))
+        return NULL;
+
+    /* Loop filling in the string. */
+
+    str[--str_len] = '\0';
+    p = &argv[start];
+    pp = *p;
+
+    for (i = 0; i < str_len; ++i) {
+        if ('\0' == *pp) {
+
+            /* End of a string, fill in a delimiter and go to the next
+             string. */
+
+            str[i] = (char) delimiter;
+            ++p;
+            pp = *p;
+        } else {
+            str[i] = *pp++;
+        }
+    }
+
+    /* All done */
+
+    return str;
+}
+
+
+/*
+ * Return the number of bytes consumed by an argv array.
+ */
+size_t pmix_argv_len(char **argv)
+{
+  char **p;
+  size_t length;
+
+  if (NULL == argv)
+    return (size_t) 0;
+
+  length = sizeof(char *);
+
+  for (p = argv; *p; ++p) {
+    length += strlen(*p) + 1 + sizeof(char *);
+  }
+
+  return length;
+}
+
+
+/*
+ * Copy a NULL-terminated argv array.
+ */
+char **pmix_argv_copy(char **argv)
+{
+  char **dupv = NULL;
+  int dupc = 0;
+
+  if (NULL == argv)
+    return NULL;
+
+  /* create an "empty" list, so that we return something valid if we
+     were passed a valid list with no contained elements */
+  dupv = (char**) malloc(sizeof(char*));
+  dupv[0] = NULL;
+
+  while (NULL != *argv) {
+    if (PMIX_SUCCESS != pmix_argv_append(&dupc, &dupv, *argv)) {
+      pmix_argv_free(dupv);
+      return NULL;
+    }
+
+    ++argv;
+  }
+
+  /* All done */
+
+  return dupv;
+}
+
+
+pmix_status_t pmix_argv_delete(int *argc, char ***argv, int start, int num_to_delete)
+{
+    int i;
+    int count;
+    int suffix_count;
+    char **tmp;
+
+    /* Check for the bozo cases */
+    if (NULL == argv || NULL == *argv || 0 == num_to_delete) {
+        return PMIX_SUCCESS;
+    }
+    count = pmix_argv_count(*argv);
+    if (start > count) {
+        return PMIX_SUCCESS;
+    } else if (start < 0 || num_to_delete < 0) {
+        return PMIX_ERR_BAD_PARAM;
+    }
+
+    /* Ok, we have some tokens to delete.  Calculate the new length of
+       the argv array. */
+
+    suffix_count = count - (start + num_to_delete);
+    if (suffix_count < 0) {
+        suffix_count = 0;
+    }
+
+    /* Free all items that are being deleted */
+
+    for (i = start; i < count && i < start + num_to_delete; ++i) {
+        free((*argv)[i]);
+    }
+
+    /* Copy the suffix over the deleted items */
+
+    for (i = start; i < start + suffix_count; ++i) {
+        (*argv)[i] = (*argv)[i + num_to_delete];
+    }
+
+    /* Add the trailing NULL */
+
+    (*argv)[i] = NULL;
+
+    /* adjust the argv array */
+    tmp = (char**)realloc(*argv, sizeof(char*) * (i + 1));
+    if (NULL != tmp) *argv = tmp;
+
+    /* adjust the argc */
+    (*argc) -= num_to_delete;
+
+    return PMIX_SUCCESS;
+}
+
+
+pmix_status_t pmix_argv_insert(char ***target, int start, char **source)
+{
+    int i, source_count, target_count;
+    int suffix_count;
+
+    /* Check for the bozo cases */
+
+    if (NULL == target || NULL == *target || start < 0) {
+        return PMIX_ERR_BAD_PARAM;
+    } else if (NULL == source) {
+        return PMIX_SUCCESS;
+    }
+
+    /* Easy case: appending to the end */
+
+    target_count = pmix_argv_count(*target);
+    source_count = pmix_argv_count(source);
+    if (start > target_count) {
+        for (i = 0; i < source_count; ++i) {
+            pmix_argv_append(&target_count, target, source[i]);
+        }
+    }
+
+    /* Harder: insertting into the middle */
+
+    else {
+
+        /* Alloc out new space */
+
+        *target = (char**) realloc(*target,
+                                   sizeof(char *) * (target_count + source_count + 1));
+
+        /* Move suffix items down to the end */
+
+        suffix_count = target_count - start;
+        for (i = suffix_count - 1; i >= 0; --i) {
+            (*target)[start + source_count + i] =
+                (*target)[start + i];
+        }
+        (*target)[start + suffix_count + source_count] = NULL;
+
+        /* Strdup in the source argv */
+
+        for (i = start; i < start + source_count; ++i) {
+            (*target)[i] = strdup(source[i - start]);
+        }
+    }
+
+    /* All done */
+
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_argv_insert_element(char ***target, int location, char *source)
+{
+    int i, target_count;
+    int suffix_count;
+
+    /* Check for the bozo cases */
+
+    if (NULL == target || NULL == *target || location < 0) {
+        return PMIX_ERR_BAD_PARAM;
+    } else if (NULL == source) {
+        return PMIX_SUCCESS;
+    }
+
+    /* Easy case: appending to the end */
+    target_count = pmix_argv_count(*target);
+    if (location > target_count) {
+        pmix_argv_append(&target_count, target, source);
+        return PMIX_SUCCESS;
+    }
+
+    /* Alloc out new space */
+    *target = (char**) realloc(*target,
+                               sizeof(char*) * (target_count + 2));
+
+    /* Move suffix items down to the end */
+    suffix_count = target_count - location;
+    for (i = suffix_count - 1; i >= 0; --i) {
+        (*target)[location + 1 + i] =
+        (*target)[location + i];
+    }
+    (*target)[location + suffix_count + 1] = NULL;
+
+    /* Strdup in the source */
+    (*target)[location] = strdup(source);
+
+    /* All done */
+    return PMIX_SUCCESS;
+}
diff --git a/src/util/argv.h b/src/util/argv.h
new file mode 100644
index 0000000..44d83e7
--- /dev/null
+++ b/src/util/argv.h
@@ -0,0 +1,306 @@
+/*
+ * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2005 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2008 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2007      Los Alamos National Security, LLC.
+ *                         All rights reserved.
+ * Copyright (c) 2007      Voltaire. All rights reserved.
+ * Copyright (c) 2012      Los Alamos National Security, LLC. All rights reserved.
+ * Copyright (c) 2015-2016 Intel, Inc.  All rights reserved.
+ *
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+/**
+ * @file
+ *
+ * Generic routines for "argv"-like handling.  Helpful for creating
+ * arrays of strings, especially when creating command lines.
+ */
+
+#ifndef PMIX_ARGV_H
+#define PMIX_ARGV_H
+
+#include <src/include/pmix_config.h>
+
+
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
+#include <pmix_common.h>
+
+BEGIN_C_DECLS
+
+  /**
+   * Append a string (by value) to an new or existing NULL-terminated
+   * argv array.
+   *
+   * @param argc Pointer to the length of the argv array.  Must not be
+   * NULL.
+   * @param argv Pointer to an argv array.
+   * @param str Pointer to the string to append.
+   *
+   * @retval PMIX_SUCCESS On success
+   * @retval PMIX_ERROR On failure
+   *
+   * This function adds a string to an argv array of strings by value;
+   * it is permissable to pass a string on the stack as the str
+   * argument to this function.
+   *
+   * To add the first entry to an argv array, call this function with
+   * (*argv == NULL).  This function will allocate an array of length
+   * 2; the first entry will point to a copy of the string passed in
+   * arg, the second entry will be set to NULL.
+   *
+   * If (*argv != NULL), it will be realloc'ed to be 1 (char*) larger,
+   * and the next-to-last entry will point to a copy of the string
+   * passed in arg.  The last entry will be set to NULL.
+   *
+   * Just to reinforce what was stated above: the string is copied by
+   * value into the argv array; there is no need to keep the original
+   * string (i.e., the arg parameter) after invoking this function.
+   */
+PMIX_EXPORT pmix_status_t pmix_argv_append(int *argc, char ***argv, const char *arg) __pmix_attribute_nonnull__(1) __pmix_attribute_nonnull__(3);
+
+  /**
+   * Append to an argv-style array, but ignore the size of the array.
+   *
+   * @param argv Pointer to an argv array.
+   * @param str Pointer to the string to append.
+   *
+   * @retval PMIX_SUCCESS On success
+   * @retval PMIX_ERROR On failure
+   *
+   * This function is identical to the pmix_argv_append() function
+   * except that it does not take a pointer to an argc (integer
+   * representing the size of the array).  This is handy for
+   * argv-style arrays that do not have integers that are actively
+   * maintaing their sizes.
+   */
+PMIX_EXPORT pmix_status_t pmix_argv_append_nosize(char ***argv, const char *arg);
+
+/**
+ * Insert the provided arg at the beginning of the array
+ *
+ * @param argv Pointer to an argv array
+ * @param str Pointer to the string to prepend
+ *
+ * @retval PMIX_SUCCESS On success
+ * @retval PMIX_ERROR On failure
+ */
+PMIX_EXPORT pmix_status_t pmix_argv_prepend_nosize(char ***argv, const char *arg);
+
+/**
+ * Append to an argv-style array, but only if the provided argument
+ * doesn't already exist somewhere in the array. Ignore the size of the array.
+ *
+ * @param argv Pointer to an argv array.
+ * @param str Pointer to the string to append.
+ * @param bool Whether or not to overwrite a matching value if found
+ *
+ * @retval PMIX_SUCCESS On success
+ * @retval PMIX_ERROR On failure
+ *
+ * This function is identical to the pmix_argv_append_nosize() function
+ * except that it only appends the provided argument if it does not already
+ * exist in the provided array, or overwrites it if it is.
+ */
+PMIX_EXPORT pmix_status_t pmix_argv_append_unique_nosize(char ***argv, const char *arg, bool overwrite);
+
+/**
+   * Free a NULL-terminated argv array.
+   *
+   * @param argv Argv array to free.
+   *
+   * This function frees an argv array and all of the strings that it
+   * contains.  Since the argv parameter is passed by value, it is not
+   * set to NULL in the caller's scope upon return.
+   *
+   * It is safe to invoke this function with a NULL pointer.  It is
+   * not safe to invoke this function with a non-NULL-terminated argv
+   * array.
+   */
+PMIX_EXPORT void pmix_argv_free(char **argv);
+
+  /**
+   * Split a string into a NULL-terminated argv array. Do not include empty
+   * strings in result array.
+   *
+   * @param src_string Input string.
+   * @param delimiter Delimiter character.
+   *
+   * @retval argv pointer to new argv array on success
+   * @retval NULL on error
+   *
+   * All strings are insertted into the argv array by value; the
+   * newly-allocated array makes no references to the src_string
+   * argument (i.e., it can be freed after calling this function
+   * without invalidating the output argv).
+   */
+PMIX_EXPORT char **pmix_argv_split(const char *src_string, int delimiter) __pmix_attribute_malloc__ __pmix_attribute_warn_unused_result__;
+
+  /**
+   * Split a string into a NULL-terminated argv array. Include empty
+   * strings in result array.
+   *
+   * @param src_string Input string.
+   * @param delimiter Delimiter character.
+   *
+   * @retval argv pointer to new argv array on success
+   * @retval NULL on error
+   *
+   * All strings are insertted into the argv array by value; the
+   * newly-allocated array makes no references to the src_string
+   * argument (i.e., it can be freed after calling this function
+   * without invalidating the output argv).
+   */
+PMIX_EXPORT char **pmix_argv_split_with_empty(const char *src_string, int delimiter) __pmix_attribute_malloc__ __pmix_attribute_warn_unused_result__;
+
+  /**
+   * Return the length of a NULL-terminated argv array.
+   *
+   * @param argv The input argv array.
+   *
+   * @retval 0 If NULL is passed as argv.
+   * @retval count Number of entries in the argv array.
+   *
+   * The argv array must be NULL-terminated.
+   */
+PMIX_EXPORT int pmix_argv_count(char **argv);
+
+  /**
+   * Join all the elements of an argv array into a single
+   * newly-allocated string.
+   *
+   * @param argv The input argv array.
+   * @param delimiter Delimiter character placed between each argv string.
+   *
+   * @retval new_string Output string on success.
+   * @retval NULL On failure.
+   *
+   * Similar to the Perl join function, this function takes an input
+   * argv and joins them into into a single string separated by the
+   * delimiter character.
+   *
+   * It is the callers responsibility to free the returned string.
+   */
+PMIX_EXPORT char *pmix_argv_join(char **argv, int delimiter) __pmix_attribute_malloc__ __pmix_attribute_warn_unused_result__;
+
+PMIX_EXPORT char *pmix_argv_join_range(char **argv, size_t start, size_t end, int delimiter) __pmix_attribute_malloc__ __pmix_attribute_warn_unused_result__;
+
+  /**
+   * Return the number of bytes consumed by an argv array.
+   *
+   * @param argv The input argv array.
+   *
+   * Count the number of bytes consumed by a NULL-terminated argv
+   * array.  This includes the number of bytes used by each of the
+   * strings as well as the pointers used in the argv array.
+   */
+PMIX_EXPORT size_t pmix_argv_len(char **argv);
+
+  /**
+   * Copy a NULL-terminated argv array.
+   *
+   * @param argv The input argv array.
+   *
+   * @retval argv Copied argv array on success.
+   * @retval NULL On failure.
+   *
+   * Copy an argv array, including copying all off its strings.
+   * Specifically, the output argv will be an array of the same length
+   * as the input argv, and strcmp(argv_in[i], argv_out[i]) will be 0.
+   */
+PMIX_EXPORT char **pmix_argv_copy(char **argv) __pmix_attribute_malloc__ __pmix_attribute_warn_unused_result__;
+
+    /**
+     * Delete one or more tokens from the middle of an argv.
+     *
+     * @param argv The argv to delete from
+     * @param start The index of the first token to delete
+     * @param num_to_delete How many tokens to delete
+     *
+     * @retval PMIX_SUCCESS Always
+     *
+     * Delete some tokens from within an existing argv.  The start
+     * parameter specifies the first token to delete, and will delete
+     * (num_to_delete-1) tokens following it.  argv will be realloc()ed
+     * to *argc - num_deleted size.
+     *
+     * If start is beyond the end of the argv array, this function is
+     * a no-op.
+     *
+     * If num_to_delete runs beyond the end of the argv array, this
+     * function will delete all tokens starting with start to the end
+     * of the array.
+     *
+     * All deleted items in the argv array will have their contents
+     * free()ed (it is assumed that the argv "owns" the memory that
+     * the pointer points to).
+     */
+PMIX_EXPORT pmix_status_t pmix_argv_delete(int *argc, char ***argv,
+                                              int start, int num_to_delete);
+
+    /**
+     * Insert one argv array into the middle of another
+     *
+     * @param target The argv to insert tokens into
+     * @param start Index where the first token will be placed in target
+     * @param source The argv to copy tokens from
+     *
+     * @retval PMIX_SUCCESS upon success
+     * @retval PMIX_BAD_PARAM if any parameters are non-sensical
+     *
+     * This function takes one arg and inserts it in the middle of
+     * another.  The first token in source will be insertted at index
+     * start in the target argv; all other tokens will follow it.
+     * Similar to pmix_argv_append(), the target may be realloc()'ed
+     * to accomodate the new storage requirements.
+     *
+     * The source array is left unaffected -- its contents are copied
+     * by value over to the target array (i.e., the strings that
+     * source points to are strdup'ed into the new locations in
+     * target).
+     */
+PMIX_EXPORT pmix_status_t pmix_argv_insert(char ***target, int start, char **source);
+
+/**
+ * Insert one argv element in front of a specific position in an array
+ *
+ * @param target The argv to insert tokens into
+ * @param location Index where the token will be placed in target
+ * @param source The token to be inserted
+ *
+ * @retval PMIX_SUCCESS upon success
+ * @retval PMIX_BAD_PARAM if any parameters are non-sensical
+ *
+ * This function takes one arg and inserts it in the middle of
+ * another.  The token will be inserted at the specified index
+ * in the target argv; all other tokens will be shifted down.
+ * Similar to pmix_argv_append(), the target may be realloc()'ed
+ * to accomodate the new storage requirements.
+ *
+ * The source token is left unaffected -- its contents are copied
+ * by value over to the target array (i.e., the string that
+ * source points to is strdup'ed into the new location in
+ * target).
+ */
+PMIX_EXPORT pmix_status_t pmix_argv_insert_element(char ***target, int location, char *source);
+
+END_C_DECLS
+
+#endif /* PMIX_ARGV_H */
diff --git a/src/util/basename.c b/src/util/basename.c
new file mode 100644
index 0000000..64e5c27
--- /dev/null
+++ b/src/util/basename.c
@@ -0,0 +1,139 @@
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2005 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2009-2014 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2014      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2014-2015 Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+
+
+#include <stdlib.h>
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif  /* HAVE_STRING_H */
+#ifdef HAVE_LIBGEN_H
+#include <libgen.h>
+#endif  /* HAVE_LIBGEN_H */
+
+#include "src/util/basename.h"
+#include "src/util/os_path.h"
+
+/**
+ * Return a pointer into the original string where the last PATH delimiter
+ * was found. It does not modify the original string. Moreover, it does not
+ * scan the full string, but only the part allowed by the specified number
+ * of characters.
+ * If the last character on the string is a path separator, it will be skipped.
+ */
+static inline char* pmix_find_last_path_separator( const char* filename, size_t n )
+{
+    char* p = (char*)filename + n;
+
+    /* First skip the latest separators */
+    for ( ; p >= filename; p-- ) {
+        if( *p != PMIX_PATH_SEP[0] )
+            break;
+    }
+
+    for ( ; p >= filename; p-- ) {
+        if( *p == PMIX_PATH_SEP[0] )
+            return p;
+    }
+
+    return NULL;  /* nothing found inside the filename */
+}
+
+char *pmix_basename(const char *filename)
+{
+    size_t i;
+    char *tmp, *ret = NULL;
+    const char sep = PMIX_PATH_SEP[0];
+
+    /* Check for the bozo case */
+    if (NULL == filename) {
+        return NULL;
+    }
+    if (0 == strlen(filename)) {
+        return strdup("");
+    }
+    if (sep == filename[0] && '\0' == filename[1]) {
+        return strdup(filename);
+    }
+
+    /* Remove trailing sep's (note that we already know that strlen > 0) */
+    tmp = strdup(filename);
+    for (i = strlen(tmp) - 1; i > 0; --i) {
+        if (sep == tmp[i]) {
+            tmp[i] = '\0';
+        } else {
+            break;
+        }
+    }
+    if (0 == i) {
+        tmp[0] = sep;
+        return tmp;
+    }
+
+    /* Look for the final sep */
+    ret = pmix_find_last_path_separator( tmp, strlen(tmp) );
+    if (NULL == ret) {
+        return tmp;
+    }
+    ret = strdup(ret + 1);
+    free(tmp);
+    return ret;
+}
+
+char* pmix_dirname(const char* filename)
+{
+#if defined(HAVE_DIRNAME) || PMIX_HAVE_DIRNAME
+    char* safe_tmp = strdup(filename), *result;
+    result = strdup(dirname(safe_tmp));
+    free(safe_tmp);
+    return result;
+#else
+    const char* p = pmix_find_last_path_separator(filename, strlen(filename));
+    /* NOTE: p will be NULL if no path separator was in the filename - i.e.,
+     * if filename is just a local file */
+
+    for( ; NULL != p && p != filename; p-- ) {
+        if( (*p == '\\') || (*p == '/') ) {
+            /* If there are several delimiters remove them all */
+            for( --p; p != filename; p-- ) {
+                if( (*p != '\\') && (*p != '/') ) {
+                    p++;
+                    break;
+                }
+            }
+            if( p != filename ) {
+                char* ret = (char*)malloc( p - filename + 1 );
+#ifdef HAVE_STRNCPY_S
+                strncpy_s( ret, (p - filename + 1), filename, p - filename );
+#else
+                strncpy(ret, filename, p - filename);
+#endif
+                ret[p - filename] = '\0';
+                return pmix_make_filename_os_friendly(ret);
+            }
+            break;  /* return the duplicate of "." */
+        }
+    }
+    return strdup(".");
+#endif  /* defined(HAVE_DIRNAME) || PMIX_HAVE_DIRNAME */
+}
diff --git a/src/util/basename.h b/src/util/basename.h
new file mode 100644
index 0000000..c18c9ed
--- /dev/null
+++ b/src/util/basename.h
@@ -0,0 +1,114 @@
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2005 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2015-2017 Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+/**
+ * @file
+ *
+ * Returns an OS-independant basename() of a given filename.
+ */
+
+#ifndef PMIX_BASENAME_H
+#define PMIX_BASENAME_H
+
+#include <src/include/pmix_config.h>
+#include <pmix_common.h>
+
+BEGIN_C_DECLS
+
+/**
+ * Return the basename of a filename.
+ *
+ * @param filename The filename to examine
+ *
+ * @returns A string containing the basename, or NULL if there is an error
+ *
+ * The contents of the \em filename parameter are unchanged.  This
+ * function returns a new string containing the basename of the
+ * filename (which must be eventually freed by the caller), or
+ * NULL if there is an error.  Trailing "/" characters in the
+ * filename do not count, unless it is in the only part of the
+ * filename (e.g., "/" or "C:\").
+ *
+ * This function will do the Right Things on POSIX and
+ * Windows-based operating systems.  For example:
+ *
+ * foo.txt returns "foo.txt"
+ *
+ * /foo/bar/baz returns "baz"
+ *
+ * /yow.c returns "yow.c"
+ *
+ * / returns "/"
+ *
+ * C:\foo\bar\baz returns "baz"
+ *
+ * D:foo.txt returns "foo.txt"
+ *
+ * E:\yow.c returns "yow.c"
+ *
+ * F: returns "F:"
+ *
+ * G:\ returns "G:"
+ *
+ * The caller is responsible for freeing the returned string.
+ */
+char *pmix_basename(const char* filename) __pmix_attribute_malloc__ __pmix_attribute_warn_unused_result__;
+
+/**
+ * Return the dirname of a filename.
+ *
+ * @param filename The filename to examine
+ *
+ * @returns A string containing the dirname, or NULL if there is an error
+ *
+ * The contents of the \em filename parameter are unchanged.  This
+ * function returns a new string containing the dirname of the
+ * filename (which must be eventually freed by the caller), or
+ * NULL if there is an error.  Trailing "/" characters in the
+ * filename do not count, unless it is in the only part of the
+ * filename (e.g., "/" or "C:\").
+ *
+ * This function will do the Right Things on POSIX and
+ * Windows-based operating systems.  For example:
+ *
+ * foo.txt returns "foo.txt"
+ *
+ * /foo/bar/baz returns "/foo/bar"
+ *
+ * /yow.c returns "/"
+ *
+ * / returns ""
+ *
+ * C:\foo\bar\baz returns "C:\foo\bar"
+ *
+ * D:foo.txt returns "D:"
+ *
+ * E:\yow.c returns "E:"
+ *
+ * F: returns ""
+ *
+ * G:\ returns ""
+ *
+ * The caller is responsible for freeing the returned string.
+ */
+char *pmix_dirname(const char* filename) __pmix_attribute_malloc__ __pmix_attribute_warn_unused_result__;
+
+END_C_DECLS
+
+#endif /* PMIX_BASENAME_H */
diff --git a/src/util/compress.c b/src/util/compress.c
new file mode 100644
index 0000000..867a3d5
--- /dev/null
+++ b/src/util/compress.c
@@ -0,0 +1,148 @@
+/*
+ * Copyright (c) 2016      Intel, Inc. All rights reserved.
+ * Copyright (c) 2017      Cisco Systems, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+
+
+#include <stdlib.h>
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+#ifdef HAVE_ZLIB_H
+#include <zlib.h>
+#endif
+
+#include "src/include/pmix_globals.h"
+#include "src/util/compress.h"
+
+#if PMIX_HAVE_ZLIB
+bool pmix_util_compress_string(char *instring,
+                               uint8_t **outbytes,
+                               size_t *nbytes)
+{
+    z_stream strm;
+    size_t len, outlen;
+    uint8_t *tmp, *ptr;
+    uint32_t inlen;
+
+    /* set default output */
+    *outbytes = NULL;
+
+    /* setup the stream */
+    inlen = strlen(instring);
+    memset (&strm, 0, sizeof (strm));
+    deflateInit (&strm, 9);
+
+    /* get an upper bound on the required output storage */
+    len = deflateBound(&strm, inlen);
+    if (NULL == (tmp = (uint8_t*)malloc(len))) {
+        *outbytes = NULL;
+        return false;
+    }
+    strm.next_in = (uint8_t*)instring;
+    strm.avail_in = strlen(instring);
+
+    /* allocating the upper bound guarantees zlib will
+     * always successfully compress into the available space */
+    strm.avail_out = len;
+    strm.next_out = tmp;
+
+    deflate (&strm, Z_FINISH);
+    deflateEnd (&strm);
+
+    /* allocate 4 bytes beyond the size reqd by zlib so we
+     * can pass the size of the uncompressed string to the
+     * decompress side */
+    outlen = len - strm.avail_out + sizeof(uint32_t);
+    ptr = (uint8_t*)malloc(outlen);
+    if (NULL == ptr) {
+        free(tmp);
+        return false;
+    }
+    *outbytes = ptr;
+    *nbytes = outlen;
+
+    /* fold the uncompressed length into the buffer */
+    memcpy(ptr, &inlen, sizeof(uint32_t));
+    ptr += sizeof(uint32_t);
+    /* bring over the compressed data */
+    memcpy(ptr, tmp, outlen-sizeof(uint32_t));
+    free(tmp);
+    pmix_output_verbose(10, pmix_globals.debug_output,
+                        "JOBDATA COMPRESS INPUT STRING OF LEN %d OUTPUT SIZE %lu",
+                        inlen, outlen-sizeof(uint32_t));
+    return true;  // we did the compression
+}
+#else
+bool pmix_util_compress_string(char *instring,
+                               uint8_t **outbytes,
+                               size_t *nbytes)
+{
+    return false;  // we did not compress
+}
+#endif
+
+#if PMIX_HAVE_ZLIB
+void pmix_util_uncompress_string(char **outstring,
+                                 uint8_t *inbytes, size_t len)
+{
+    uint8_t *dest;
+    int32_t len2;
+    z_stream strm;
+    int rc;
+
+    /* set the default error answer */
+    *outstring = NULL;
+
+    /* the first 4 bytes contains the uncompressed size */
+    memcpy(&len2, inbytes, sizeof(uint32_t));
+
+    pmix_output_verbose(10, pmix_globals.debug_output,
+                        "DECOMPRESSING INPUT OF LEN %lu OUTPUT %d", len, len2);
+
+    /* setting destination to the fully decompressed size, +1 to
+     * hold the NULL terminator */
+    dest = (uint8_t*)malloc(len2+1);
+    if (NULL == dest) {
+        return;
+    }
+    memset(dest, 0, len2+1);
+
+    memset (&strm, 0, sizeof (strm));
+    if (Z_OK != inflateInit(&strm)) {
+        free(dest);
+        return;
+    }
+    strm.avail_in = len;
+    strm.next_in = (uint8_t*)(inbytes + sizeof(uint32_t));
+    strm.avail_out = len2;
+    strm.next_out = (uint8_t*)dest;
+
+    rc = inflate (&strm, Z_FINISH);
+    inflateEnd (&strm);
+    /* ensure this is NULL terminated! */
+    dest[len2] = '\0';
+    *outstring = (char*)dest;
+    pmix_output_verbose(10, pmix_globals.debug_output,
+                        "\tFINAL LEN: %lu CODE: %d", strlen(*outstring), rc);
+    return;
+}
+#else
+/* this can never actually be used - there is no way we should
+ * receive a PMIX_COMPRESSED_STRING unless we compressed it,
+ * which means PMIX_HAVE_ZLIB must have been true. Still, we
+ * include the stub just to avoid requiring #if's in the rest
+ * of the code */
+void pmix_util_uncompress_string(char **outstring,
+                                 uint8_t *inbytes, size_t len)
+{
+    *outstring = NULL;
+}
+#endif
diff --git a/src/util/compress.h b/src/util/compress.h
new file mode 100644
index 0000000..b07b0d2
--- /dev/null
+++ b/src/util/compress.h
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2005 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2015-2016 Intel, Inc.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+/**
+ * @file
+ *
+ * Compress/decompress long strings
+ */
+
+#ifndef PMIX_COMPRESS_H
+#define PMIX_COMPRESS_H
+
+#include <src/include/pmix_config.h>
+
+
+BEGIN_C_DECLS
+
+/* define a limit for storing raw strings */
+#define PMIX_STRING_LIMIT  512
+
+/* define a macro for quickly checking if a string exceeds the
+ * compression limit */
+#define PMIX_STRING_SIZE_CHECK(s) \
+    (PMIX_STRING == (s)->type && NULL != (s)->data.string && PMIX_STRING_LIMIT < strlen((s)->data.string))
+
+/**
+ * Compress a string into a byte object using Zlib
+ */
+PMIX_EXPORT bool pmix_util_compress_string(char *instring,
+                                           uint8_t **outbytes,
+                                           size_t *nbytes);
+
+/**
+ * Decompress a byte object into a string using Zlib
+ */
+PMIX_EXPORT void pmix_util_uncompress_string(char **outstring,
+                                             uint8_t *inbytes, size_t len);
+
+END_C_DECLS
+
+#endif /* PMIX_COMPRESS_H */
diff --git a/src/util/crc.c b/src/util/crc.c
new file mode 100644
index 0000000..5045e45
--- /dev/null
+++ b/src/util/crc.c
@@ -0,0 +1,1205 @@
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2006 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2014-2016 Intel, Inc.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+
+#include <src/include/pmix_config.h>
+
+
+#ifdef HAVE_STDIO_H
+#include <stdio.h>
+#endif /* HAVE_STDIO_H */
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif  /* HAVE_STDLIB_H */
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif  /* HAVE_STRINGS_H */
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif  /* HAVE_STRING_H */
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif  /* HAVE_UNISTD_H */
+
+#include "src/util/crc.h"
+
+
+#if (PMIX_ALIGNMENT_LONG == 8)
+#define PMIX_CRC_WORD_MASK_ 0x7
+#elif (PMIX_ALIGNMENT_LONG == 4)
+#define PMIX_CRC_WORD_MASK_ 0x3
+#else
+#define PMIX_CRC_WORD_MASK_ 0xFFFF
+#endif
+
+
+#define WORDALIGNED(v) \
+    (((intptr_t)v & PMIX_CRC_WORD_MASK_) ? false : true)
+
+
+#define INTALIGNED(v) \
+    (((intptr_t)v & 3) ? false : true)
+
+/*
+ * this version of bcopy_csum() looks a little too long, but it
+ * handles cumulative checksumming for arbitrary lengths and address
+ * alignments as best as it can; the contents of lastPartialLong and
+ * lastPartialLength are updated to reflected the last partial word's
+ * value and length (in bytes) -- this should allow proper handling of
+ * checksumming contiguous or noncontiguous buffers via multiple calls
+ * of bcopy_csum() - Mitch
+ */
+
+unsigned long
+pmix_bcopy_csum_partial (
+    const void *  source,
+    void *  destination,
+    size_t copylen,
+    size_t csumlen,
+    unsigned long *  lastPartialLong,
+    size_t*  lastPartialLength
+    )
+{
+    unsigned long *  src = (unsigned long *) source;
+    unsigned long *  dest = (unsigned long *) destination;
+    unsigned long csum = 0;
+    size_t csumlenresidue;
+    unsigned long i, temp;
+
+    csumlenresidue = (csumlen > copylen) ? (csumlen - copylen) : 0;
+    temp = *lastPartialLong;
+
+    if (WORDALIGNED(source) && WORDALIGNED(dest)) {
+        if (*lastPartialLength) {
+            /* do we have enough data to fill out the partial word? */
+            if (copylen >= (sizeof(unsigned long) - *lastPartialLength)) { /* YES, we do... */
+                memcpy(((char *)&temp + *lastPartialLength), src,
+                       (sizeof(unsigned long) - *lastPartialLength));
+                memcpy(dest, ((char *)&temp + *lastPartialLength),
+                       (sizeof(unsigned long) - *lastPartialLength));
+                src = (unsigned long *)((char *)src + sizeof(unsigned long) - *lastPartialLength);
+                dest = (unsigned long *)((char *)dest + sizeof(unsigned long) - *lastPartialLength);
+                csum += (temp - *lastPartialLong);
+                copylen -= sizeof(unsigned long) - *lastPartialLength;
+                /* now we have an unaligned source and an unaligned destination */
+                for( ;copylen >= sizeof(*src); copylen -= sizeof(*src)) {
+                    memcpy(&temp, src, sizeof(temp));
+                    src++;
+                    csum += temp;
+                    memcpy(dest, &temp, sizeof(temp));
+                    dest++;
+                }
+                *lastPartialLength = 0;
+                *lastPartialLong = 0;
+            }
+            else { /* NO, we don't... */
+                memcpy(((char *)&temp + *lastPartialLength), src, copylen);
+                memcpy(dest, ((char *)&temp + *lastPartialLength), copylen);
+                src = (unsigned long *)((char *)src + copylen);
+                dest = (unsigned long *)((char *)dest + copylen);
+                csum += (temp - *lastPartialLong);
+                *lastPartialLong = temp;
+                *lastPartialLength += copylen;
+                copylen = 0;
+            }
+        }
+        else { /* fast path... */
+            size_t numLongs = copylen/sizeof(unsigned long);
+            for(i = 0; i < numLongs; i++) {
+                    csum += *src;
+                    *dest++ = *src++;
+            }
+            *lastPartialLong = 0;
+            *lastPartialLength = 0;
+            if (WORDALIGNED(copylen) && (csumlenresidue == 0)) {
+                    return(csum);
+            }
+            else {
+                    copylen -= i * sizeof(unsigned long);
+            }
+        }
+    } else if (WORDALIGNED(source)) {
+        if (*lastPartialLength) {
+            /* do we have enough data to fill out the partial word? */
+            if (copylen >= (sizeof(unsigned long) - *lastPartialLength)) { /* YES, we do... */
+                memcpy(((char *)&temp + *lastPartialLength), src,
+                       (sizeof(unsigned long) - *lastPartialLength));
+                memcpy(dest, ((char *)&temp + *lastPartialLength),
+                       (sizeof(unsigned long) - *lastPartialLength));
+                src = (unsigned long *)((char *)src + sizeof(unsigned long) - *lastPartialLength);
+                dest = (unsigned long *)((char *)dest + sizeof(unsigned long) - *lastPartialLength);
+                csum += (temp - *lastPartialLong);
+                copylen -= sizeof(unsigned long) - *lastPartialLength;
+                /* now we have an unaligned source and an unknown alignment for our destination */
+                if (WORDALIGNED(dest)) {
+                    size_t numLongs = copylen/sizeof(unsigned long);
+                    for(i = 0; i < numLongs; i++) {
+                            memcpy(&temp, src, sizeof(temp));
+                            src++;
+                            csum += temp;
+                            *dest++ = temp;
+                    }
+                    copylen -= i * sizeof(unsigned long);
+                }
+                else {
+                    for( ;copylen >= sizeof(*src); copylen -= sizeof(*src)) {
+                            memcpy(&temp, src, sizeof(temp));
+                            src++;
+                            csum += temp;
+                            memcpy(dest, &temp, sizeof(temp));
+                            dest++;
+                    }
+                }
+                *lastPartialLong = 0;
+                *lastPartialLength = 0;
+            }
+            else { /* NO, we don't... */
+                    memcpy(((char *)&temp + *lastPartialLength), src, copylen);
+                    memcpy(dest, ((char *)&temp + *lastPartialLength), copylen);
+                    src = (unsigned long *)((char *)src + copylen);
+                    dest = (unsigned long *)((char *)dest + copylen);
+                    csum += (temp - *lastPartialLong);
+                    *lastPartialLong = temp;
+                    *lastPartialLength += copylen;
+                    copylen = 0;
+            }
+        }
+        else {
+            for( ;copylen >= sizeof(*src); copylen -= sizeof(*src)) {
+                temp = *src++;
+                csum += temp;
+                memcpy(dest, &temp, sizeof(temp));
+                dest++;
+            }
+            *lastPartialLong = 0;
+            *lastPartialLength = 0;
+        }
+    } else if (WORDALIGNED(dest)) {
+        if (*lastPartialLength) {
+            /* do we have enough data to fill out the partial word? */
+            if (copylen >= (sizeof(unsigned long) - *lastPartialLength)) { /* YES, we do... */
+                memcpy(((char *)&temp + *lastPartialLength), src,
+                       (sizeof(unsigned long) - *lastPartialLength));
+                memcpy(dest, ((char *)&temp + *lastPartialLength),
+                       (sizeof(unsigned long) - *lastPartialLength));
+                src = (unsigned long *)((char *)src + sizeof(unsigned long) - *lastPartialLength);
+                dest = (unsigned long *)((char *)dest + sizeof(unsigned long) - *lastPartialLength);
+                csum += (temp - *lastPartialLong);
+                copylen -= sizeof(unsigned long) - *lastPartialLength;
+                /* now we have a source of unknown alignment and a unaligned destination */
+                if (WORDALIGNED(src)) {
+                    for( ;copylen >= sizeof(*src); copylen -= sizeof(*src)) {
+                        temp = *src++;
+                        csum += temp;
+                        memcpy(dest, &temp, sizeof(temp));
+                        dest++;
+                    }
+                    *lastPartialLong = 0;
+                    *lastPartialLength = 0;
+                }
+                else {
+                    for( ;copylen >= sizeof(*src); copylen -= sizeof(*src)) {
+                        memcpy(&temp, src, sizeof(temp));
+                        src++;
+                        csum += temp;
+                        memcpy(dest, &temp, sizeof(temp));
+                        dest++;
+                    }
+                    *lastPartialLength = 0;
+                    *lastPartialLong = 0;
+                }
+            }
+            else { /* NO, we don't... */
+                memcpy(((char *)&temp + *lastPartialLength), src, copylen);
+                memcpy(dest, ((char *)&temp + *lastPartialLength), copylen);
+                src = (unsigned long *)((char *)src + copylen);
+                dest = (unsigned long *)((char *)dest + copylen);
+                csum += (temp - *lastPartialLong);
+                *lastPartialLong = temp;
+                *lastPartialLength += copylen;
+                copylen = 0;
+            }
+        }
+        else {
+            for( ;copylen >= sizeof(*src); copylen -= sizeof(*src)) {
+                memcpy(&temp, src, sizeof(temp));
+                src++;
+                csum += temp;
+                *dest++ = temp;
+            }
+            *lastPartialLength = 0;
+            *lastPartialLong = 0;
+        }
+    } else {
+        if (*lastPartialLength) {
+            /* do we have enough data to fill out the partial word? */
+            if (copylen >= (sizeof(unsigned long) - *lastPartialLength)) { /* YES, we do... */
+                memcpy(((char *)&temp + *lastPartialLength), src,
+                       (sizeof(unsigned long) - *lastPartialLength));
+                memcpy(dest, ((char *)&temp + *lastPartialLength),
+                       (sizeof(unsigned long) - *lastPartialLength));
+                src = (unsigned long *)((char *)src + sizeof(unsigned long) - *lastPartialLength);
+                dest = (unsigned long *)((char *)dest + sizeof(unsigned long) - *lastPartialLength);
+                csum += (temp - *lastPartialLong);
+                copylen -= sizeof(unsigned long) - *lastPartialLength;
+                /* now we have an unknown alignment for our source and destination */
+                if (WORDALIGNED(src) && WORDALIGNED(dest)) {
+                    size_t numLongs = copylen/sizeof(unsigned long);
+                    for(i = 0; i < numLongs; i++) {
+                            csum += *src;
+                            *dest++ = *src++;
+                    }
+                    copylen -= i * sizeof(unsigned long);
+                }
+                else { /* safe but slower for all other alignments */
+                    for( ;copylen >= sizeof(*src); copylen -= sizeof(*src)) {
+                            memcpy(&temp, src, sizeof(temp));
+                            src++;
+                            csum += temp;
+                            memcpy(dest, &temp, sizeof(temp));
+                            dest++;
+                    }
+                }
+                *lastPartialLong = 0;
+                *lastPartialLength = 0;
+            }
+            else { /* NO, we don't... */
+                memcpy(((char *)&temp + *lastPartialLength), src, copylen);
+                memcpy(dest, ((char *)&temp + *lastPartialLength), copylen);
+                src = (unsigned long *)((char *)src + copylen);
+                dest = (unsigned long *)((char *)dest + copylen);
+                csum += (temp - *lastPartialLong);
+                *lastPartialLong = temp;
+                *lastPartialLength += copylen;
+                copylen = 0;
+            }
+        }
+        else {
+            for( ;copylen >= sizeof(*src); copylen -= sizeof(*src)) {
+                memcpy(&temp, src, sizeof(temp));
+                src++;
+                csum += temp;
+                memcpy(dest, &temp, sizeof(temp));
+                dest++;
+            }
+            *lastPartialLength = 0;
+            *lastPartialLong = 0;
+        }
+    }
+
+    /* if copylen is non-zero there was a bit left, less than an unsigned long's worth */
+    if ((copylen != 0) && (csumlenresidue == 0)) {
+        temp = *lastPartialLong;
+        if (*lastPartialLength) {
+            if (copylen >= (sizeof(unsigned long) - *lastPartialLength)) {
+                /* copy all remaining bytes from src to dest */
+                unsigned long copytemp = 0;
+                memcpy(&copytemp, src, copylen);
+                memcpy(dest, &copytemp, copylen);
+                /* fill out rest of partial word and add to checksum */
+                memcpy(((char *)&temp + *lastPartialLength), src,
+                       (sizeof(unsigned long) - *lastPartialLength));
+                /* avoid unsigned arithmetic overflow by subtracting the old partial
+                 * word from the new one before adding to the checksum...
+        */
+                csum += (temp - *lastPartialLong);
+                copylen -= sizeof(unsigned long) - *lastPartialLength;
+                src = (unsigned long *)((char *)src + sizeof(unsigned long) - *lastPartialLength);
+                *lastPartialLength = copylen;
+                /* reset temp, and calculate next partial word */
+                temp = 0;
+                if (copylen) {
+                    memcpy(&temp, src, copylen);
+                }
+                /* add it to the the checksum */
+                csum += temp;
+                *lastPartialLong = temp;
+            }
+            else {
+                /* copy all remaining bytes from src to dest */
+                unsigned long copytemp = 0;
+                memcpy(&copytemp, src, copylen);
+                memcpy(dest, &copytemp, copylen);
+                /* fill out rest of partial word and add to checksum */
+                memcpy(((char *)&temp + *lastPartialLength), src,
+                       copylen);
+                /* avoid unsigned arithmetic overflow by subtracting the old partial
+                 * word from the new one before adding to the checksum...
+        */
+                csum += temp - *lastPartialLong;
+                *lastPartialLong = temp;
+                *lastPartialLength += copylen;
+            }
+        }
+        else { /* fast path... */
+            /* temp and *lastPartialLong are 0 if *lastPartialLength is 0... */
+            memcpy(&temp, src, copylen);
+            csum += temp;
+            memcpy(dest, &temp, copylen);
+            *lastPartialLong = temp;
+            *lastPartialLength = copylen;
+            /* done...return the checksum */
+        }
+    }
+    else if (csumlenresidue != 0) {
+        if (copylen != 0) {
+            temp = 0;
+            memcpy(&temp, src, copylen);
+            memcpy(dest, &temp, copylen);
+        }
+        if (csumlenresidue < (sizeof(unsigned long) - copylen - *lastPartialLength)) {
+            temp = *lastPartialLong;
+            memcpy(((char *)&temp + *lastPartialLength), src, (copylen + csumlenresidue));
+            /* avoid unsigned arithmetic overflow by subtracting the old partial */
+            /* word from the new one before adding to the checksum... */
+            csum += temp - *lastPartialLong;
+            src++;
+            *lastPartialLong = temp;
+            *lastPartialLength += copylen + csumlenresidue;
+            csumlenresidue = 0;
+        }
+        else {
+            /* we have enough chksum data to fill out our last partial */
+            /* word */
+            temp = *lastPartialLong;
+            memcpy(((char *)&temp + *lastPartialLength), src,
+                   (sizeof(unsigned long) - *lastPartialLength));
+            /* avoid unsigned arithmetic overflow by subtracting the old partial */
+            /* word from the new one before adding to the checksum... */
+            csum += temp - *lastPartialLong;
+            src = (unsigned long *)((char *)src + sizeof(unsigned long) - *lastPartialLength);
+            csumlenresidue -= sizeof(unsigned long) - *lastPartialLength - copylen;
+            *lastPartialLength = 0;
+            *lastPartialLong = 0;
+        }
+        if (WORDALIGNED(src)) {
+            for (i = 0; i < csumlenresidue/sizeof(unsigned long); i++) {
+                csum += *src++;
+            }
+        }
+        else {
+            for (i = 0; i < csumlenresidue/sizeof(unsigned long); i++) {
+                memcpy(&temp, src, sizeof(temp));
+                csum += temp;
+                src++;
+            }
+        }
+        csumlenresidue -= i * sizeof(unsigned long);
+        if (csumlenresidue) {
+            temp = 0;
+            memcpy(&temp, src, csumlenresidue);
+            csum += temp;
+            *lastPartialLong = temp;
+            *lastPartialLength = csumlenresidue;
+        }
+    } /* end else if (csumlenresidue != 0) */
+
+    return csum;
+}
+
+unsigned int
+pmix_bcopy_uicsum_partial (
+    const void *  source,
+    void *  destination,
+    size_t copylen,
+    size_t csumlen,
+    unsigned int*  lastPartialInt,
+    size_t*  lastPartialLength
+    )
+{
+    unsigned int *  src = (unsigned int *) source;
+    unsigned int *  dest = (unsigned int *) destination;
+    unsigned int csum = 0;
+    size_t csumlenresidue;
+    unsigned long i;
+    unsigned int temp;
+
+    csumlenresidue = (csumlen > copylen) ? (csumlen - copylen) : 0;
+    temp = *lastPartialInt;
+
+    if (INTALIGNED(source) && INTALIGNED(dest)) {
+        if (*lastPartialLength) {
+            /* do we have enough data to fill out the partial word? */
+            if (copylen >= (sizeof(unsigned int) - *lastPartialLength)) { /* YES, we do... */
+                memcpy(((char *)&temp + *lastPartialLength), src,
+                       (sizeof(unsigned int) - *lastPartialLength));
+                memcpy(dest, ((char *)&temp + *lastPartialLength),
+                       (sizeof(unsigned int) - *lastPartialLength));
+                src = (unsigned int *)((char *)src + sizeof(unsigned int) - *lastPartialLength);
+                dest = (unsigned int *)((char *)dest + sizeof(unsigned int) - *lastPartialLength);
+                csum += (temp - *lastPartialInt);
+                copylen -= sizeof(unsigned int) - *lastPartialLength;
+                /* now we have an unaligned source and an unaligned destination */
+                for( ;copylen >= sizeof(*src); copylen -= sizeof(*src)) {
+                    memcpy(&temp, src, sizeof(temp));
+                    src++;
+                    csum += temp;
+                    memcpy(dest, &temp, sizeof(temp));
+                    dest++;
+                }
+                *lastPartialLength = 0;
+                *lastPartialInt = 0;
+            }
+            else { /* NO, we don't... */
+                memcpy(((char *)&temp + *lastPartialLength), src, copylen);
+                memcpy(dest, ((char *)&temp + *lastPartialLength), copylen);
+                src = (unsigned int *)((char *)src + copylen);
+                dest = (unsigned int *)((char *)dest + copylen);
+                csum += (temp - *lastPartialInt);
+                *lastPartialInt = temp;
+                *lastPartialLength += copylen;
+                copylen = 0;
+            }
+        }
+        else { /* fast path... */
+            size_t numLongs = copylen/sizeof(unsigned int);
+            for(i = 0; i < numLongs; i++) {
+                    csum += *src;
+                    *dest++ = *src++;
+            }
+            *lastPartialInt = 0;
+            *lastPartialLength = 0;
+            if (INTALIGNED(copylen) && (csumlenresidue == 0)) {
+                    return(csum);
+            }
+            else {
+                    copylen -= i * sizeof(unsigned int);
+            }
+        }
+    } else if (INTALIGNED(source)) {
+        if (*lastPartialLength) {
+            /* do we have enough data to fill out the partial word? */
+            if (copylen >= (sizeof(unsigned int) - *lastPartialLength)) { /* YES, we do... */
+                memcpy(((char *)&temp + *lastPartialLength), src,
+                       (sizeof(unsigned int) - *lastPartialLength));
+                memcpy(dest, ((char *)&temp + *lastPartialLength),
+                       (sizeof(unsigned int) - *lastPartialLength));
+                src = (unsigned int *)((char *)src + sizeof(unsigned int) - *lastPartialLength);
+                dest = (unsigned int *)((char *)dest + sizeof(unsigned int) - *lastPartialLength);
+                csum += (temp - *lastPartialInt);
+                copylen -= sizeof(unsigned int) - *lastPartialLength;
+                /* now we have an unaligned source and an unknown alignment for our destination */
+                if (INTALIGNED(dest)) {
+                    size_t numLongs = copylen/sizeof(unsigned int);
+                    for(i = 0; i < numLongs; i++) {
+                        memcpy(&temp, src, sizeof(temp));
+                        src++;
+                        csum += temp;
+                        *dest++ = temp;
+                    }
+                    copylen -= i * sizeof(unsigned int);
+                }
+                else {
+                    for( ;copylen >= sizeof(*src); copylen -= sizeof(*src)) {
+                        memcpy(&temp, src, sizeof(temp));
+                        src++;
+                        csum += temp;
+                        memcpy(dest, &temp, sizeof(temp));
+                        dest++;
+                    }
+                }
+                *lastPartialInt = 0;
+                *lastPartialLength = 0;
+            }
+            else { /* NO, we don't... */
+                memcpy(((char *)&temp + *lastPartialLength), src, copylen);
+                memcpy(dest, ((char *)&temp + *lastPartialLength), copylen);
+                src = (unsigned int *)((char *)src + copylen);
+                dest = (unsigned int *)((char *)dest + copylen);
+                csum += (temp - *lastPartialInt);
+                *lastPartialInt = temp;
+                *lastPartialLength += copylen;
+                copylen = 0;
+            }
+        }
+        else {
+            for( ;copylen >= sizeof(*src); copylen -= sizeof(*src)) {
+                temp = *src++;
+                csum += temp;
+                memcpy(dest, &temp, sizeof(temp));
+                dest++;
+            }
+            *lastPartialInt = 0;
+            *lastPartialLength = 0;
+        }
+    } else if (INTALIGNED(dest)) {
+        if (*lastPartialLength) {
+            /* do we have enough data to fill out the partial word? */
+            if (copylen >= (sizeof(unsigned int) - *lastPartialLength)) { /* YES, we do... */
+                memcpy(((char *)&temp + *lastPartialLength), src,
+                       (sizeof(unsigned int) - *lastPartialLength));
+                memcpy(dest, ((char *)&temp + *lastPartialLength),
+                       (sizeof(unsigned int) - *lastPartialLength));
+                src = (unsigned int *)((char *)src + sizeof(unsigned int) - *lastPartialLength);
+                dest = (unsigned int *)((char *)dest + sizeof(unsigned int) - *lastPartialLength);
+                csum += (temp - *lastPartialInt);
+                copylen -= sizeof(unsigned int) - *lastPartialLength;
+                /* now we have a source of unknown alignment and a unaligned destination */
+                if (INTALIGNED(src)) {
+                    for( ;copylen >= sizeof(*src); copylen -= sizeof(*src)) {
+                        temp = *src++;
+                        csum += temp;
+                        memcpy(dest, &temp, sizeof(temp));
+                        dest++;
+                    }
+                    *lastPartialInt = 0;
+                    *lastPartialLength = 0;
+                }
+                else {
+                    for( ;copylen >= sizeof(*src); copylen -= sizeof(*src)) {
+                        memcpy(&temp, src, sizeof(temp));
+                        src++;
+                        csum += temp;
+                        memcpy(dest, &temp, sizeof(temp));
+                        dest++;
+                    }
+                    *lastPartialLength = 0;
+                    *lastPartialInt = 0;
+                }
+            }
+            else { /* NO, we don't... */
+                memcpy(((char *)&temp + *lastPartialLength), src, copylen);
+                memcpy(dest, ((char *)&temp + *lastPartialLength), copylen);
+                src = (unsigned int *)((char *)src + copylen);
+                dest = (unsigned int *)((char *)dest + copylen);
+                csum += (temp - *lastPartialInt);
+                *lastPartialInt = temp;
+                *lastPartialLength += copylen;
+                copylen = 0;
+            }
+        }
+        else {
+            for( ;copylen >= sizeof(*src); copylen -= sizeof(*src)) {
+                memcpy(&temp, src, sizeof(temp));
+                src++;
+                csum += temp;
+                *dest++ = temp;
+            }
+            *lastPartialLength = 0;
+            *lastPartialInt = 0;
+        }
+    } else {
+        if (*lastPartialLength) {
+            /* do we have enough data to fill out the partial word? */
+            if (copylen >= (sizeof(unsigned int) - *lastPartialLength)) { /* YES, we do... */
+                memcpy(((char *)&temp + *lastPartialLength), src,
+                       (sizeof(unsigned int) - *lastPartialLength));
+                memcpy(dest, ((char *)&temp + *lastPartialLength),
+                       (sizeof(unsigned int) - *lastPartialLength));
+                src = (unsigned int *)((char *)src + sizeof(unsigned int) - *lastPartialLength);
+                dest = (unsigned int *)((char *)dest + sizeof(unsigned int) - *lastPartialLength);
+                csum += (temp - *lastPartialInt);
+                copylen -= sizeof(unsigned int) - *lastPartialLength;
+                /* now we have an unknown alignment for our source and destination */
+                if (INTALIGNED(src) && INTALIGNED(dest)) {
+                    size_t numLongs = copylen/sizeof(unsigned int);
+                    for(i = 0; i < numLongs; i++) {
+                        csum += *src;
+                        *dest++ = *src++;
+                    }
+                    copylen -= i * sizeof(unsigned int);
+                }
+                else { /* safe but slower for all other alignments */
+                    for( ;copylen >= sizeof(*src); copylen -= sizeof(*src)) {
+                        memcpy(&temp, src, sizeof(temp));
+                        src++;
+                        csum += temp;
+                        memcpy(dest, &temp, sizeof(temp));
+                        dest++;
+                    }
+                }
+                *lastPartialInt = 0;
+                *lastPartialLength = 0;
+            }
+            else { /* NO, we don't... */
+                memcpy(((char *)&temp + *lastPartialLength), src, copylen);
+                memcpy(dest, ((char *)&temp + *lastPartialLength), copylen);
+                src = (unsigned int *)((char *)src + copylen);
+                dest = (unsigned int *)((char *)dest + copylen);
+                csum += (temp - *lastPartialInt);
+                *lastPartialInt = temp;
+                *lastPartialLength += copylen;
+                copylen = 0;
+            }
+        }
+        else {
+            for( ;copylen >= sizeof(*src); copylen -= sizeof(*src)) {
+                memcpy(&temp, src, sizeof(temp));
+                src++;
+                csum += temp;
+                memcpy(dest, &temp, sizeof(temp));
+                dest++;
+            }
+            *lastPartialLength = 0;
+            *lastPartialInt = 0;
+        }
+    }
+
+    /* if copylen is non-zero there was a bit left, less than an unsigned int's worth */
+    if ((copylen != 0) && (csumlenresidue == 0)) {
+        temp = *lastPartialInt;
+        if (*lastPartialLength) {
+            if (copylen >= (sizeof(unsigned int) - *lastPartialLength)) {
+                /* copy all remaining bytes from src to dest */
+                unsigned int copytemp = 0;
+                memcpy(&copytemp, src, copylen);
+                memcpy(dest, &copytemp, copylen);
+                /* fill out rest of partial word and add to checksum */
+                memcpy(((char *)&temp + *lastPartialLength), src,
+                       (sizeof(unsigned int) - *lastPartialLength));
+                /* avoid unsigned arithmetic overflow by subtracting the old partial
+                 * word from the new one before adding to the checksum...
+        */
+                csum += (temp - *lastPartialInt);
+                copylen -= sizeof(unsigned int) - *lastPartialLength;
+                src = (unsigned int *)((char *)src + sizeof(unsigned int) - *lastPartialLength);
+                *lastPartialLength = copylen;
+                /* reset temp, and calculate next partial word */
+                temp = 0;
+                if (copylen) {
+                    memcpy(&temp, src, copylen);
+                }
+                /* add it to the the checksum */
+                csum += temp;
+                *lastPartialInt = temp;
+            }
+            else {
+                /* copy all remaining bytes from src to dest */
+                unsigned int copytemp = 0;
+                memcpy(&copytemp, src, copylen);
+                memcpy(dest, &copytemp, copylen);
+                /* fill out rest of partial word and add to checksum */
+                memcpy(((char *)&temp + *lastPartialLength), src,
+                       copylen);
+                /* avoid unsigned arithmetic overflow by subtracting the old partial
+                 * word from the new one before adding to the checksum...
+        */
+                csum += temp - *lastPartialInt;
+                *lastPartialInt = temp;
+                *lastPartialLength += copylen;
+            }
+        }
+        else { /* fast path... */
+            /* temp and *lastPartialInt are 0 if *lastPartialLength is 0... */
+            memcpy(&temp, src, copylen);
+            csum += temp;
+            memcpy(dest, &temp, copylen);
+            *lastPartialInt = temp;
+            *lastPartialLength = copylen;
+            /* done...return the checksum */
+        }
+    }
+    else if (csumlenresidue != 0) {
+        if (copylen != 0) {
+            temp = 0;
+            memcpy(&temp, src, copylen);
+            memcpy(dest, &temp, copylen);
+        }
+        if (csumlenresidue < (sizeof(unsigned int) - copylen - *lastPartialLength)) {
+            temp = *lastPartialInt;
+            memcpy(((char *)&temp + *lastPartialLength), src, (copylen + csumlenresidue));
+            /* avoid unsigned arithmetic overflow by subtracting the old partial
+             * word from the new one before adding to the checksum...
+        */
+            csum += temp - *lastPartialInt;
+            src++;
+            *lastPartialInt = temp;
+            *lastPartialLength += copylen + csumlenresidue;
+            csumlenresidue = 0;
+        }
+        else {
+            /* we have enough chksum data to fill out our last partial
+             * word
+        */
+            temp = *lastPartialInt;
+            memcpy(((char *)&temp + *lastPartialLength), src,
+                   (sizeof(unsigned int) - *lastPartialLength));
+            /* avoid unsigned arithmetic overflow by subtracting the old partial
+             * word from the new one before adding to the checksum...
+        */
+            csum += temp - *lastPartialInt;
+            src = (unsigned int *)((char *)src + sizeof(unsigned int) - *lastPartialLength);
+            csumlenresidue -= sizeof(unsigned int) - *lastPartialLength - copylen;
+            *lastPartialLength = 0;
+            *lastPartialInt = 0;
+        }
+        if (INTALIGNED(src)) {
+            for (i = 0; i < csumlenresidue/sizeof(unsigned int); i++) {
+                csum += *src++;
+            }
+        }
+        else {
+            for (i = 0; i < csumlenresidue/sizeof(unsigned int); i++) {
+                memcpy(&temp, src, sizeof(temp));
+                csum += temp;
+                src++;
+            }
+        }
+        csumlenresidue -= i * sizeof(unsigned int);
+        if (csumlenresidue) {
+            temp = 0;
+            memcpy(&temp, src, csumlenresidue);
+            csum += temp;
+            *lastPartialInt = temp;
+            *lastPartialLength = csumlenresidue;
+        }
+    } /* end else if (csumlenresidue != 0) */
+
+    return csum;
+}
+
+
+/*
+ * csum() generates a bcopy_csum() - compatible checksum that can be
+ * called multiple times
+ */
+
+unsigned long
+pmix_csum_partial (
+    const void *  source,
+    size_t csumlen,
+    unsigned long*  lastPartialLong,
+    size_t* lastPartialLength
+    )
+{
+    unsigned long *  src = (unsigned long *) source;
+    unsigned long csum = 0;
+    unsigned long i, temp;
+
+
+
+    temp = *lastPartialLong;
+
+    if (WORDALIGNED(source))  {
+        if (*lastPartialLength) {
+            /* do we have enough data to fill out the partial word? */
+            if (csumlen >= (sizeof(unsigned long) - *lastPartialLength)) { /* YES, we do... */
+                memcpy(((char *)&temp + *lastPartialLength), src,
+                       (sizeof(unsigned long) - *lastPartialLength));
+                src = (unsigned long *)((char *)src + sizeof(unsigned long) - *lastPartialLength);
+                csum += (temp - *lastPartialLong);
+                csumlen -= sizeof(unsigned long) - *lastPartialLength;
+                /* now we have an unaligned source */
+                for(i = 0; i < csumlen/sizeof(unsigned long); i++) {
+                    memcpy(&temp, src, sizeof(temp));
+                    csum += temp;
+                    src++;
+                }
+                csumlen -= i * sizeof(unsigned long);
+                *lastPartialLong = 0;
+                *lastPartialLength = 0;
+            }
+            else { /* NO, we don't... */
+                memcpy(((char *)&temp + *lastPartialLength), src, csumlen);
+                src = (unsigned long *)((char *)src + csumlen);
+                csum += (temp - *lastPartialLong);
+                *lastPartialLong = temp;
+                *lastPartialLength += csumlen;
+                csumlen = 0;
+            }
+        }
+        else { /* fast path... */
+            size_t numLongs = csumlen/sizeof(unsigned long);
+            for(i = 0; i < numLongs; i++) {
+                    csum += *src++;
+            }
+            *lastPartialLong = 0;
+            *lastPartialLength = 0;
+            if (WORDALIGNED(csumlen)) {
+                    return(csum);
+            }
+            else {
+                    csumlen -= i * sizeof(unsigned long);
+            }
+        }
+    } else {
+        if (*lastPartialLength) {
+            /* do we have enough data to fill out the partial word? */
+            if (csumlen >= (sizeof(unsigned long) - *lastPartialLength)) { /* YES, we do... */
+                memcpy(((char *)&temp + *lastPartialLength), src,
+                       (sizeof(unsigned long) - *lastPartialLength));
+                src = (unsigned long *)((char *)src + sizeof(unsigned long) - *lastPartialLength);
+                csum += (temp - *lastPartialLong);
+                csumlen -= sizeof(unsigned long) - *lastPartialLength;
+                /* now we have a source of unknown alignment */
+                if (WORDALIGNED(src)) {
+                    for(i = 0; i < csumlen/sizeof(unsigned long); i++) {
+                        csum += *src++;
+                    }
+                    csumlen -= i * sizeof(unsigned long);
+                    *lastPartialLong = 0;
+                    *lastPartialLength = 0;
+                }
+                else {
+                    for(i = 0; i < csumlen/sizeof(unsigned long); i++) {
+                        memcpy(&temp, src, sizeof(temp));
+                        csum += temp;
+                        src++;
+                    }
+                    csumlen -= i * sizeof(unsigned long);
+                    *lastPartialLong = 0;
+                    *lastPartialLength = 0;
+                }
+            }
+            else { /* NO, we don't... */
+                memcpy(((char *)&temp + *lastPartialLength), src, csumlen);
+                src = (unsigned long *)((char *)src + csumlen);
+                csum += (temp - *lastPartialLong);
+                *lastPartialLong = temp;
+                *lastPartialLength += csumlen;
+                csumlen = 0;
+            }
+        }
+        else {
+            for( ;csumlen >= sizeof(*src); csumlen -= sizeof(*src)) {
+                memcpy(&temp, src, sizeof(temp));
+                src++;
+                csum += temp;
+            }
+            *lastPartialLength = 0;
+            *lastPartialLong = 0;
+        }
+    }
+
+    /* if csumlen is non-zero there was a bit left, less than an unsigned long's worth */
+    if (csumlen != 0) {
+        temp = *lastPartialLong;
+        if (*lastPartialLength) {
+            if (csumlen >= (sizeof(unsigned long) - *lastPartialLength)) {
+                /* fill out rest of partial word and add to checksum */
+                memcpy(((char *)&temp + *lastPartialLength), src,
+                       (sizeof(unsigned long) - *lastPartialLength));
+                csum += (temp - *lastPartialLong);
+                csumlen -= sizeof(unsigned long) - *lastPartialLength;
+                src = (unsigned long *)((char *)src + sizeof(unsigned long) - *lastPartialLength);
+                *lastPartialLength = csumlen;
+                /* reset temp, and calculate next partial word */
+                temp = 0;
+                if (csumlen) {
+                    memcpy(&temp, src, csumlen);
+                }
+                /* add it to the the checksum */
+                csum += temp;
+                *lastPartialLong = temp;
+            }
+            else {
+                /* fill out rest of partial word and add to checksum */
+                memcpy(((char *)&temp + *lastPartialLength), src,
+                       csumlen);
+                csum += (temp - *lastPartialLong);
+                *lastPartialLong = temp;
+                *lastPartialLength += csumlen;
+            }
+        }
+        else { /* fast path... */
+            /* temp and *lastPartialLong are 0 if *lastPartialLength is 0... */
+            memcpy(&temp, src, csumlen);
+            csum += temp;
+            *lastPartialLong = temp;
+            *lastPartialLength = csumlen;
+            /* done...return the checksum */
+        }
+    }
+
+    return csum;
+}
+
+unsigned int
+pmix_uicsum_partial (
+    const void *  source,
+    size_t csumlen,
+    unsigned int*  lastPartialInt,
+    size_t*  lastPartialLength
+    )
+{
+    unsigned int *  src = (unsigned int *) source;
+    unsigned int csum = 0;
+    unsigned int temp;
+    unsigned long i;
+
+
+    temp = *lastPartialInt;
+
+    if (INTALIGNED(source))  {
+        if (*lastPartialLength) {
+            /* do we have enough data to fill out the partial word? */
+            if (csumlen >= (sizeof(unsigned int) - *lastPartialLength)) { /* YES, we do... */
+                memcpy(((char *)&temp + *lastPartialLength), src,
+                       (sizeof(unsigned int) - *lastPartialLength));
+                src = (unsigned int *)((char *)src + sizeof(unsigned int) - *lastPartialLength);
+                csum += (temp - *lastPartialInt);
+                csumlen -= sizeof(unsigned int) - *lastPartialLength;
+                /* now we have an unaligned source */
+                for(i = 0; i < csumlen/sizeof(unsigned int); i++) {
+                    memcpy(&temp, src, sizeof(temp));
+                    csum += temp;
+                    src++;
+                }
+                csumlen -= i * sizeof(unsigned int);
+                *lastPartialInt = 0;
+                *lastPartialLength = 0;
+            }
+            else { /* NO, we don't... */
+                memcpy(((char *)&temp + *lastPartialLength), src, csumlen);
+                src = (unsigned int *)((char *)src + csumlen);
+                csum += (temp - *lastPartialInt);
+                *lastPartialInt = temp;
+                *lastPartialLength += csumlen;
+                csumlen = 0;
+            }
+        }
+        else { /* fast path... */
+            size_t numLongs = csumlen/sizeof(unsigned int);
+            for(i = 0; i < numLongs; i++) {
+                    csum += *src++;
+            }
+            *lastPartialInt = 0;
+            *lastPartialLength = 0;
+            if (INTALIGNED(csumlen)) {
+                    return(csum);
+            }
+            else {
+                    csumlen -= i * sizeof(unsigned int);
+            }
+        }
+    } else {
+        if (*lastPartialLength) {
+            /* do we have enough data to fill out the partial word? */
+            if (csumlen >= (sizeof(unsigned int) - *lastPartialLength)) { /* YES, we do... */
+                memcpy(((char *)&temp + *lastPartialLength), src,
+                       (sizeof(unsigned int) - *lastPartialLength));
+                src = (unsigned int *)((char *)src + sizeof(unsigned int) - *lastPartialLength);
+                csum += (temp - *lastPartialInt);
+                csumlen -= sizeof(unsigned int) - *lastPartialLength;
+                /* now we have a source of unknown alignment */
+                if (INTALIGNED(src)) {
+                    for(i = 0; i < csumlen/sizeof(unsigned int); i++) {
+                        csum += *src++;
+                    }
+                    csumlen -= i * sizeof(unsigned int);
+                    *lastPartialInt = 0;
+                    *lastPartialLength = 0;
+                }
+                else {
+                    for(i = 0; i < csumlen/sizeof(unsigned int); i++) {
+                        memcpy(&temp, src, sizeof(temp));
+                        csum += temp;
+                        src++;
+                    }
+                    csumlen -= i * sizeof(unsigned int);
+                    *lastPartialInt = 0;
+                    *lastPartialLength = 0;
+                }
+            }
+            else { /* NO, we don't... */
+                memcpy(((char *)&temp + *lastPartialLength), src, csumlen);
+                src = (unsigned int *)((char *)src + csumlen);
+                csum += (temp - *lastPartialInt);
+                *lastPartialInt = temp;
+                *lastPartialLength += csumlen;
+                csumlen = 0;
+            }
+        }
+        else {
+            for( ;csumlen >= sizeof(*src); csumlen -= sizeof(*src)) {
+                memcpy(&temp, src, sizeof(temp));
+                src++;
+                csum += temp;
+            }
+            *lastPartialLength = 0;
+            *lastPartialInt = 0;
+        }
+    }
+
+    /* if csumlen is non-zero there was a bit left, less than an unsigned int's worth */
+    if (csumlen != 0) {
+        temp = *lastPartialInt;
+        if (*lastPartialLength) {
+            if (csumlen >= (sizeof(unsigned int) - *lastPartialLength)) {
+                /* fill out rest of partial word and add to checksum */
+                memcpy(((char *)&temp + *lastPartialLength), src,
+                       (sizeof(unsigned int) - *lastPartialLength));
+                csum += (temp - *lastPartialInt);
+                csumlen -= sizeof(unsigned int) - *lastPartialLength;
+                src = (unsigned int *)((char *)src + sizeof(unsigned int) - *lastPartialLength);
+                *lastPartialLength = csumlen;
+                /* reset temp, and calculate next partial word */
+                temp = 0;
+                if (csumlen) {
+                    memcpy(&temp, src, csumlen);
+                }
+                /* add it to the the checksum */
+                csum += temp;
+                *lastPartialInt = temp;
+            }
+            else {
+                /* fill out rest of partial word and add to checksum */
+                memcpy(((char *)&temp + *lastPartialLength), src,
+                       csumlen);
+                csum += (temp - *lastPartialInt);
+                *lastPartialInt = temp;
+                *lastPartialLength += csumlen;
+            }
+        }
+        else { /* fast path... */
+            /* temp and *lastPartialInt are 0 if *lastPartialLength is 0... */
+            memcpy(&temp, src, csumlen);
+            csum += temp;
+            *lastPartialInt = temp;
+            *lastPartialLength = csumlen;
+            /* done...return the checksum */
+        }
+    }
+
+    return csum;
+}
+
+/* globals for CRC32 bcopy and calculation routines */
+
+static bool _pmix_crc_table_initialized = false;
+static unsigned int _pmix_crc_table[256];
+
+/* CRC32 table generation routine - thanks to Charles Michael Heard for his
+ * optimized CRC32 code...
+ */
+
+void pmix_initialize_crc_table(void)
+{
+    register int i,j;
+    register unsigned int crc_accum;
+
+    for (i = 0; i < 256; i++) {
+        crc_accum = (i << 24);
+        for (j = 0; j < 8; j++) {
+            if (crc_accum & 0x80000000)
+                crc_accum = (crc_accum << 1) ^ CRC_POLYNOMIAL;
+            else
+                crc_accum = (crc_accum << 1);
+        }
+        _pmix_crc_table[i] = crc_accum;
+    }
+
+    /* set global bool to true to do this work once! */
+    _pmix_crc_table_initialized = true;
+    return;
+}
+
+unsigned int pmix_bcopy_uicrc_partial(
+    const void *  source,
+    void *  destination,
+    size_t copylen,
+    size_t crclen,
+    unsigned int partial_crc)
+{
+    size_t crclenresidue = (crclen > copylen) ? (crclen - copylen) : 0;
+    register int i, j;
+    register unsigned char t;
+    unsigned int tmp;
+
+    if (!_pmix_crc_table_initialized) {
+        pmix_initialize_crc_table();
+    }
+
+    if (INTALIGNED(source) && INTALIGNED(destination)) {
+        register unsigned int *  src = (unsigned int *)source;
+        register unsigned int *  dst = (unsigned int *)destination;
+        register unsigned char *ts, *td;
+        /* copy whole integers */
+        while (copylen >= sizeof(unsigned int)) {
+            tmp = *src++;
+            *dst++ = tmp;
+            ts = (unsigned char *)&tmp;
+            for (j = 0; j < (int)sizeof(unsigned int); j++) {
+                i = ((partial_crc >> 24) ^ *ts++) & 0xff;
+                partial_crc = (partial_crc << 8) ^ _pmix_crc_table[i];
+            }
+            copylen -= sizeof(unsigned int);
+        }
+        ts = (unsigned char *)src;
+        td = (unsigned char *)dst;
+        /* copy partial integer */
+        while (copylen--) {
+            t = *ts++;
+            *td++ = t;
+            i = ((partial_crc >> 24) ^ t) & 0xff;
+            partial_crc = (partial_crc << 8) ^ _pmix_crc_table[i];
+        }
+        /* calculate CRC over remaining bytes... */
+        while (crclenresidue--) {
+            i = ((partial_crc >> 24) ^ *ts++) & 0xff;
+            partial_crc = (partial_crc << 8) ^ _pmix_crc_table[i];
+        }
+    }
+    else {
+        register unsigned char *  src = (unsigned char *)source;
+        register unsigned char *  dst = (unsigned char *)destination;
+        while (copylen--) {
+            t = *src++;
+            *dst++ = t;
+            i = ((partial_crc >> 24) ^ t) & 0xff;
+            partial_crc = (partial_crc << 8) ^ _pmix_crc_table[i];
+        }
+        while (crclenresidue--) {
+            i = ((partial_crc >> 24) ^ *src++) & 0xff;
+            partial_crc = (partial_crc << 8) ^ _pmix_crc_table[i];
+        }
+    }
+
+    return partial_crc;
+}
+
+
+unsigned int pmix_uicrc_partial(
+    const void *  source, size_t crclen, unsigned int partial_crc)
+{
+    register int i, j;
+    register unsigned char * t;
+    unsigned int tmp;
+
+    if (!_pmix_crc_table_initialized) {
+        pmix_initialize_crc_table();
+    }
+
+    if (INTALIGNED(source)) {
+        register unsigned int *  src = (unsigned int *)source;
+        while (crclen >= sizeof(unsigned int)) {
+            tmp = *src++;
+            t = (unsigned char *)&tmp;
+            for (j = 0; j < (int)sizeof(unsigned int); j++) {
+                i = ((partial_crc >> 24) ^ *t++) & 0xff;
+                partial_crc = (partial_crc << 8) ^ _pmix_crc_table[i];
+            }
+            crclen -= sizeof(unsigned int);
+        }
+        t = (unsigned char *)src;
+        while (crclen--) {
+            i = ((partial_crc >> 24) ^ *t++) & 0xff;
+            partial_crc = (partial_crc << 8) ^ _pmix_crc_table[i];
+        }
+    }
+    else {
+        register unsigned char *  src = (unsigned char *)source;
+        while (crclen--) {
+            i = ((partial_crc >> 24) ^ *src++) & 0xff;
+            partial_crc = (partial_crc << 8) ^ _pmix_crc_table[i];
+        }
+    }
+
+    return partial_crc;
+}
diff --git a/src/util/crc.h b/src/util/crc.h
new file mode 100644
index 0000000..ed1e43d
--- /dev/null
+++ b/src/util/crc.h
@@ -0,0 +1,185 @@
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2006 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2009      IBM Corporation.  All rights reserved.
+ * Copyright (c) 2009      Los Alamos National Security, LLC.  All rights
+ *                         reserved.
+ * Copyright (c) 2015-2016 Intel, Inc.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#ifndef _PMIX_CRC_H_
+#define _PMIX_CRC_H_
+
+#include <src/include/pmix_config.h>
+
+
+#include <stddef.h>
+
+BEGIN_C_DECLS
+
+#define CRC_POLYNOMIAL ((unsigned int)0x04c11db7)
+#define CRC_INITIAL_REGISTER ((unsigned int)0xffffffff)
+
+
+#define PMIX_CSUM( SRC, LEN )  pmix_uicsum( SRC, LEN )
+#define PMIX_CSUM_PARTIAL( SRC, LEN, UI1, UI2 ) \
+    pmix_uicsum_partial( SRC, LEN, UI1, UI2 )
+#define PMIX_CSUM_BCOPY_PARTIAL( SRC, DST, LEN1, LEN2, UI1, UI2 ) \
+    pmix_bcopy_uicsum_partial( SRC, DST, LEN1, LEN2, UI1, UI2 )
+#define PMIX_CSUM_ZERO  0
+
+
+unsigned long
+pmix_bcopy_csum_partial(
+    const void *  source,
+    void *  destination,
+    size_t copylen,
+    size_t csumlen,
+    unsigned long*  lastPartialLong,
+    size_t*  lastPartialLength
+    );
+
+static inline unsigned long
+pmix_bcopy_csum (
+    const void *  source,
+    void *  destination,
+    size_t copylen,
+    size_t csumlen
+    )
+{
+    unsigned long plong = 0;
+    size_t plength = 0;
+    return pmix_bcopy_csum_partial(source, destination, copylen, csumlen, &plong, &plength);
+}
+
+unsigned int
+pmix_bcopy_uicsum_partial (
+    const void *  source,
+    void *  destination,
+    size_t copylen,
+    size_t csumlen,
+    unsigned int*  lastPartialInt,
+    size_t*  lastPartialLength
+    );
+
+static inline unsigned int
+pmix_bcopy_uicsum (
+    const void *  source,
+    void *  destination,
+    size_t copylen,
+    size_t csumlen
+    )
+{
+    unsigned int pint = 0;
+    size_t plength = 0;
+    return pmix_bcopy_uicsum_partial(source, destination, copylen, csumlen, &pint, &plength);
+}
+
+unsigned long
+pmix_csum_partial (
+    const void *  source,
+    size_t csumlen,
+    unsigned long*  lastPartialLong,
+    size_t*  lastPartialLength
+    );
+
+
+static inline unsigned long
+pmix_csum(const void *  source, size_t csumlen)
+{
+    unsigned long lastPartialLong = 0;
+    size_t lastPartialLength = 0;
+    return pmix_csum_partial(source, csumlen, &lastPartialLong, &lastPartialLength);
+}
+/*
+ * The buffer passed to this function is assumed to be 16-bit aligned
+ */
+static inline uint16_t
+pmix_csum16 (const void *  source, size_t csumlen)
+{
+    uint16_t *src = (uint16_t *) source;
+    register uint32_t csum = 0;
+
+    while (csumlen > 1) {
+            csum += *src++;
+        csumlen -= 2;
+    }
+    /* Add leftover byte, if any */
+    if(csumlen > 0)
+        csum += *((unsigned char*)src);
+    /* Fold 32-bit checksum to 16 bits */
+    while(csum >> 16) {
+        csum = (csum & 0xFFFF) + (csum >> 16);
+    }
+    return csum;
+}
+
+unsigned int
+pmix_uicsum_partial (
+    const void *  source,
+    size_t csumlen,
+    unsigned int *  lastPartialInt,
+    size_t*  lastPartialLength
+    );
+
+static inline unsigned int
+pmix_uicsum(const void *  source, size_t csumlen)
+{
+    unsigned int lastPartialInt = 0;
+    size_t lastPartialLength = 0;
+    return pmix_uicsum_partial(source, csumlen, &lastPartialInt, &lastPartialLength);
+}
+
+/*
+ * CRC Support
+ */
+
+void pmix_initialize_crc_table(void);
+
+unsigned int
+pmix_bcopy_uicrc_partial(
+    const void *  source,
+    void *  destination,
+    size_t copylen,
+    size_t crclen,
+    unsigned int partial_crc);
+
+static inline unsigned int
+pmix_bcopy_uicrc(
+    const void *  source,
+    void *  destination,
+    size_t copylen,
+    size_t crclen)
+{
+    return pmix_bcopy_uicrc_partial(source, destination, copylen, crclen, CRC_INITIAL_REGISTER);
+}
+
+unsigned int
+pmix_uicrc_partial(
+    const void *  source,
+    size_t crclen,
+    unsigned int partial_crc);
+
+
+static inline unsigned int
+pmix_uicrc(const void *  source, size_t crclen)
+{
+    return pmix_uicrc_partial(source, crclen, CRC_INITIAL_REGISTER);
+}
+
+END_C_DECLS
+
+#endif
diff --git a/src/util/error.c b/src/util/error.c
new file mode 100644
index 0000000..29ee09f
--- /dev/null
+++ b/src/util/error.c
@@ -0,0 +1,177 @@
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2005 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2007-2012 Los Alamos National Security, LLC.
+ *                         All rights reserved.
+ * Copyright (c) 2014-2017 Intel, Inc.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+
+
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+#include <errno.h>
+#include <stdio.h>
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+
+#include <pmix_common.h>
+#include "src/include/pmix_globals.h"
+#include "src/util/error.h"
+
+PMIX_EXPORT const char* PMIx_Error_string(pmix_status_t errnum)
+{
+    switch(errnum) {
+    case PMIX_ERR_UNPACK_READ_PAST_END_OF_BUFFER:
+        return "UNPACK-PAST-END";
+    case PMIX_ERR_LOST_CONNECTION_TO_SERVER:
+        return "LOST_CONNECTION_TO_SERVER";
+    case PMIX_ERR_NOT_SUPPORTED:
+        return "NOT-SUPPORTED";
+    case PMIX_ERR_NOT_FOUND:
+        return "NOT-FOUND";
+    case PMIX_ERR_SERVER_NOT_AVAIL:
+        return "SERVER-NOT-AVAIL";
+    case PMIX_ERR_INVALID_NAMESPACE:
+        return "INVALID-NAMESPACE";
+    case PMIX_ERR_INVALID_SIZE:
+        return "INVALID-SIZE";
+    case PMIX_ERR_INVALID_KEYVALP:
+        return "INVALID-KEYVAL";
+    case PMIX_ERR_INVALID_NUM_PARSED:
+        return "INVALID-NUM-PARSED";
+    case PMIX_ERR_TAKE_NEXT_OPTION:
+        return "TAKE-NEXT-OPTION";
+
+    case PMIX_ERR_INVALID_ARGS:
+        return "INVALID-ARGS";
+    case PMIX_ERR_INVALID_NUM_ARGS:
+        return "INVALID-NUM-ARGS";
+    case PMIX_ERR_INVALID_LENGTH:
+        return "INVALID-LENGTH";
+    case PMIX_ERR_INVALID_VAL_LENGTH:
+        return "INVALID-VAL-LENGTH";
+    case PMIX_ERR_INVALID_VAL:
+        return "INVALID-VAL";
+    case PMIX_ERR_INVALID_KEY_LENGTH:
+        return "INVALID-KEY-LENGTH";
+    case PMIX_ERR_INVALID_KEY:
+        return "INVALID-KEY";
+    case PMIX_ERR_INVALID_ARG:
+        return "INVALID-ARG";
+    case PMIX_ERR_NOMEM:
+        return "NO-MEM";
+    case PMIX_ERR_INIT:
+        return "INIT";
+
+    case PMIX_ERR_DATA_VALUE_NOT_FOUND:
+        return "DATA-VALUE-NOT-FOUND";
+    case PMIX_ERR_OUT_OF_RESOURCE:
+        return "OUT-OF-RESOURCE";
+    case PMIX_ERR_BAD_PARAM:
+        return "BAD-PARAM";
+    case PMIX_ERR_IN_ERRNO:
+        return "ERR-IN-ERRNO";
+    case PMIX_ERR_UNREACH:
+        return "UNREACHABLE";
+    case PMIX_ERR_TIMEOUT:
+        return "TIMEOUT";
+    case PMIX_ERR_NO_PERMISSIONS:
+        return "NO-PERMISSIONS";
+    case PMIX_ERR_PACK_MISMATCH:
+        return "PACK-MISMATCH";
+    case PMIX_ERR_PACK_FAILURE:
+        return "PACK-FAILURE";
+
+    case PMIX_ERR_UNPACK_FAILURE:
+        return "UNPACK-FAILURE";
+    case PMIX_ERR_UNPACK_INADEQUATE_SPACE:
+        return "UNPACK-INADEQUATE-SPACE";
+    case PMIX_ERR_TYPE_MISMATCH:
+        return "TYPE-MISMATCH";
+    case PMIX_ERR_PROC_ENTRY_NOT_FOUND:
+        return "PROC-ENTRY-NOT-FOUND";
+    case PMIX_ERR_UNKNOWN_DATA_TYPE:
+        return "UNKNOWN-DATA-TYPE";
+    case PMIX_ERR_WOULD_BLOCK:
+        return "WOULD-BLOCK";
+    case PMIX_ERR_READY_FOR_HANDSHAKE:
+        return "READY-FOR-HANDSHAKE";
+    case PMIX_ERR_HANDSHAKE_FAILED:
+        return "HANDSHAKE-FAILED";
+    case PMIX_ERR_INVALID_CRED:
+        return "INVALID-CREDENTIAL";
+    case PMIX_EXISTS:
+        return "EXISTS";
+    case PMIX_ERR_SERVER_FAILED_REQUEST:
+        return "SERVER FAILED REQUEST";
+    case PMIX_ERR_PROC_MIGRATE:
+        return "PROC-MIGRATE";
+    case PMIX_ERR_PROC_CHECKPOINT:
+        return "PROC-CHECKPOINT-ERROR";
+    case PMIX_ERR_PROC_RESTART:
+        return "PROC_RESTART";
+    case PMIX_ERR_PROC_ABORTING:
+        return "PROC-ABORTING";
+    case PMIX_ERR_PROC_REQUESTED_ABORT:
+        return "PROC-ABORT-REQUESTED";
+    case PMIX_ERR_PROC_ABORTED:
+        return "PROC-ABORTED";
+    case PMIX_ERR_DEBUGGER_RELEASE:
+        return "DEBUGGER-RELEASE";
+    case PMIX_ERR_SILENT:
+        return "SILENT_ERROR";
+    case PMIX_ERROR:
+        return "ERROR";
+    case PMIX_ERR_NOT_AVAILABLE:
+        return "PMIX_ERR_NOT_AVAILABLE";
+    case PMIX_ERR_FATAL:
+        return "PMIX_ERR_FATAL";
+    case PMIX_ERR_VALUE_OUT_OF_BOUNDS:
+        return "PMIX_ERR_VALUE_OUT_OF_BOUNDS";
+    case PMIX_ERR_NETWORK_NOT_PARSEABLE:
+        return "PMIX_ERR_NETWORK_NOT_PARSEABLE";
+    case PMIX_ERR_FILE_OPEN_FAILURE:
+        return "PMIX_ERR_FILE_OPEN_FAILURE";
+    case PMIX_ERR_FILE_READ_FAILURE:
+        return "PMIX_ERR_FILE_READ_FAILURE";
+    case PMIX_ERR_PERM:
+        return "PMIX_ERR_PERM";
+    case PMIX_ERR_JOB_TERMINATED:
+        return "PMIX_ERR_JOB_TERMINATED";
+    case PMIX_MAX_ERR_CONSTANT:
+        return "PMIX_ERR_WILDCARD";
+    case PMIX_NOTIFY_ALLOC_COMPLETE:
+        return "PMIX ALLOC OPERATION COMPLETE";
+    case PMIX_JCTRL_CHECKPOINT:
+        return "PMIX JOB CONTROL CHECKPOINT";
+    case PMIX_JCTRL_PREEMPT_ALERT:
+        return "PMIX PRE-EMPTION ALERT";
+    case PMIX_MONITOR_HEARTBEAT_ALERT:
+        return "PMIX HEARTBEAT ALERT";
+    case PMIX_MONITOR_FILE_ALERT:
+        return "PMIX FILE MONITOR ALERT";
+    case PMIX_MODEL_DECLARED:
+        return "PMIX MODEL DECLARED";
+    case PMIX_SUCCESS:
+        return "SUCCESS";
+    default:
+        return "ERROR STRING NOT FOUND";
+    }
+}
diff --git a/src/util/error.h b/src/util/error.h
new file mode 100644
index 0000000..1883c44
--- /dev/null
+++ b/src/util/error.h
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2006 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2015-2017 Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#ifndef PMIX_UTIL_ERROR_H
+#define PMIX_UTIL_ERROR_H
+
+#include <src/include/pmix_config.h>
+
+
+#include <pmix_common.h>
+#include "src/util/output.h"
+
+ BEGIN_C_DECLS
+
+/* internal error codes - never exposed outside of the library */
+#define PMIX_ERR_NOT_AVAILABLE                          (PMIX_INTERNAL_ERR_BASE - 28)
+#define PMIX_ERR_FATAL                                  (PMIX_INTERNAL_ERR_BASE - 29)
+#define PMIX_ERR_VALUE_OUT_OF_BOUNDS                    (PMIX_INTERNAL_ERR_BASE - 30)
+#define PMIX_ERR_PERM                                   (PMIX_INTERNAL_ERR_BASE - 31)
+#define PMIX_ERR_OPERATION_IN_PROGRESS                  (PMIX_INTERNAL_ERR_BASE - 32)
+#define PMIX_ERR_NETWORK_NOT_PARSEABLE                  (PMIX_INTERNAL_ERR_BASE - 33)
+#define PMIX_ERR_FILE_OPEN_FAILURE                      (PMIX_INTERNAL_ERR_BASE - 34)
+#define PMIX_ERR_FILE_READ_FAILURE                      (PMIX_INTERNAL_ERR_BASE - 35)
+#define PMIX_ERR_TAKE_NEXT_OPTION                       (PMIX_INTERNAL_ERR_BASE - 36)
+
+#define PMIX_ERROR_LOG(r)                                           \
+ do {                                                               \
+    if (PMIX_ERR_SILENT != (r)) {                                   \
+        pmix_output(0, "PMIX ERROR: %s in file %s at line %d",      \
+                    PMIx_Error_string((r)), __FILE__, __LINE__);    \
+    }                                                               \
+} while (0)
+
+ END_C_DECLS
+
+#endif /* PMIX_UTIL_ERROR_H */
diff --git a/src/util/fd.c b/src/util/fd.c
new file mode 100644
index 0000000..616c6fe
--- /dev/null
+++ b/src/util/fd.c
@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 2008-2014 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2009      Sandia National Laboratories. All rights reserved.
+ * Copyright (c) 2014-2016 Intel, Inc. All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+
+#include <pmix_common.h>
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#include <errno.h>
+#include <fcntl.h>
+
+#include "src/util/error.h"
+#include "src/util/fd.h"
+
+
+/*
+ * Simple loop over reading from a fd
+ */
+pmix_status_t pmix_fd_read(int fd, int len, void *buffer)
+{
+    int rc;
+    char *b = buffer;
+
+    while (len > 0) {
+        rc = read(fd, b, len);
+        if (rc < 0 && (EAGAIN == errno || EINTR == errno)) {
+            continue;
+        } else if (rc > 0) {
+            len -= rc;
+            b += rc;
+        } else if (0 == rc) {
+            return PMIX_ERR_TIMEOUT;
+        } else {
+            return PMIX_ERR_IN_ERRNO;
+        }
+    }
+    return PMIX_SUCCESS;
+}
+
+
+/*
+ * Simple loop over writing to an fd
+ */
+pmix_status_t pmix_fd_write(int fd, int len, const void *buffer)
+{
+    int rc;
+    const char *b = buffer;
+
+    while (len > 0) {
+        rc = write(fd, b, len);
+        if (rc < 0 && (EAGAIN == errno || EINTR == errno)) {
+            continue;
+        } else if (rc > 0) {
+            len -= rc;
+            b += rc;
+        } else {
+            return PMIX_ERR_IN_ERRNO;
+        }
+    }
+
+    return PMIX_SUCCESS;
+}
+
+
+pmix_status_t pmix_fd_set_cloexec(int fd)
+{
+#ifdef FD_CLOEXEC
+    int flags;
+
+    /* Stevens says that we should get the fd's flags before we set
+       them.  So say we all. */
+    flags = fcntl(fd, F_GETFD, 0);
+    if (-1 == flags) {
+        return PMIX_ERR_IN_ERRNO;
+    }
+
+    if (fcntl(fd, F_SETFD, FD_CLOEXEC | flags) == -1) {
+        return PMIX_ERR_IN_ERRNO;
+    }
+#endif
+
+    return PMIX_SUCCESS;
+}
diff --git a/src/util/fd.h b/src/util/fd.h
new file mode 100644
index 0000000..d67fe24
--- /dev/null
+++ b/src/util/fd.h
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2008-2014 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2009      Sandia National Laboratories. All rights reserved.
+ * Copyright (c) 2014-2016 Intel, Inc.  All rights reserved.
+ *
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+/* @file */
+
+#ifndef PMIX_UTIL_FD_H_
+#define PMIX_UTIL_FD_H_
+
+#include <src/include/pmix_config.h>
+
+
+BEGIN_C_DECLS
+
+/**
+ * Read a complete buffer from a file descriptor.
+ *
+ * @param fd File descriptor
+ * @param len Number of bytes to read
+ * @param buffer Pre-allocated buffer (large enough to hold len bytes)
+ *
+ * @returns PMIX_SUCCESS upon success.
+ * @returns PMIX_ERR_TIMEOUT if the fd closes before reading the full amount.
+ * @returns PMIX_ERR_IN_ERRNO otherwise.
+ *
+ * Loop over reading from the fd until len bytes are read or an error
+ * occurs.  EAGAIN and EINTR are transparently handled.
+ */
+PMIX_EXPORT pmix_status_t pmix_fd_read(int fd, int len, void *buffer);
+
+/**
+ * Write a complete buffer to a file descriptor.
+ *
+ * @param fd File descriptor
+ * @param len Number of bytes to write
+ * @param buffer Buffer to write from
+ *
+ * @returns PMIX_SUCCESS upon success.
+ * @returns PMIX_ERR_IN_ERRNO otherwise.
+ *
+ * Loop over writing to the fd until len bytes are written or an error
+ * occurs.  EAGAIN and EINTR are transparently handled.
+ */
+PMIX_EXPORT pmix_status_t pmix_fd_write(int fd, int len, const void *buffer);
+
+/**
+ * Convenience function to set a file descriptor to be close-on-exec.
+ *
+ * @param fd File descriptor
+ *
+ * @returns PMIX_SUCCESS upon success (or if the system does not
+ * support close-on-exec behavior).
+ * @returns PMIX_ERR_IN_ERRNO otherwise.
+ *
+ * This is simply a convenience function because there's a few steps
+ * to setting a file descriptor to be close-on-exec.
+ */
+PMIX_EXPORT pmix_status_t pmix_fd_set_cloexec(int fd);
+
+END_C_DECLS
+
+#endif
diff --git a/src/util/getid.c b/src/util/getid.c
new file mode 100644
index 0000000..f3ad8a9
--- /dev/null
+++ b/src/util/getid.c
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2013 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2007      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2015      Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+/*
+ * Buffer safe printf functions for portability to archaic platforms.
+ */
+
+#include <src/include/pmix_config.h>
+#include "include/pmix_common.h"
+#include "src/include/pmix_socket_errno.h"
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
+#include "src/include/pmix_globals.h"
+#include "src/util/error.h"
+#include "src/util/output.h"
+
+#include "src/util/getid.h"
+
+pmix_status_t pmix_util_getid(int sd, uid_t *uid, gid_t *gid)
+{
+#if defined(SO_PEERCRED)
+#ifdef HAVE_STRUCT_SOCKPEERCRED_UID
+#define HAVE_STRUCT_UCRED_UID
+    struct sockpeercred ucred;
+#else
+    struct ucred ucred;
+#endif
+    socklen_t crlen = sizeof (ucred);
+#endif
+
+#if defined(SO_PEERCRED) && (defined(HAVE_STRUCT_UCRED_UID) || defined(HAVE_STRUCT_UCRED_CR_UID))
+    /* Ignore received 'cred' and validate ucred for socket instead. */
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "getid: checking getsockopt for peer credentials");
+    if (getsockopt(sd, SOL_SOCKET, SO_PEERCRED, &ucred, &crlen) < 0) {
+        pmix_output_verbose(2, pmix_globals.debug_output,
+                            "getid: getsockopt SO_PEERCRED failed: %s",
+                            strerror (pmix_socket_errno));
+        return PMIX_ERR_INVALID_CRED;
+    }
+#if defined(HAVE_STRUCT_UCRED_UID)
+    *uid = ucred.uid;
+    *gid = ucred.gid;
+#else
+    *uid = ucred.cr_uid;
+    *gid = ucred.cr_gid;
+#endif
+
+#elif defined(HAVE_GETPEEREID)
+    pmix_output_verbose(2, pmix_globals.debug_output,
+                        "getid: checking getpeereid for peer credentials");
+    if (0 != getpeereid(sd, uid, gid)) {
+        pmix_output_verbose(2, pmix_globals.debug_output,
+                            "getid: getsockopt getpeereid failed: %s",
+                            strerror (pmix_socket_errno));
+        return PMIX_ERR_INVALID_CRED;
+    }
+#else
+    return PMIX_ERR_NOT_SUPPORTED;
+#endif
+
+    return PMIX_SUCCESS;
+}
diff --git a/src/util/getid.h b/src/util/getid.h
new file mode 100644
index 0000000..871eb6a
--- /dev/null
+++ b/src/util/getid.h
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2016      Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#ifndef PMIX_GETID_H
+#define PMIX_GETID_H
+
+#include <src/include/pmix_config.h>
+#include "include/pmix_common.h"
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
+BEGIN_C_DECLS
+
+/* lookup the effective uid and gid of a socket */
+pmix_status_t pmix_util_getid(int sd, uid_t *uid, gid_t *gid);
+
+END_C_DECLS
+
+#endif /* PMIX_PRINTF_H */
+
diff --git a/src/util/hash.c b/src/util/hash.c
new file mode 100644
index 0000000..fe31dd2
--- /dev/null
+++ b/src/util/hash.c
@@ -0,0 +1,367 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2010      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2004-2011 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2011-2014 Los Alamos National Security, LLC.  All rights
+ *                         reserved.
+ * Copyright (c) 2014-2017 Intel, Inc. All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2016      Mellanox Technologies, Inc.
+ *                         All rights reserved.
+ * Copyright (c) 2016      IBM Corporation.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ *
+ */
+
+#include <src/include/pmix_config.h>
+
+#include <src/include/pmix_stdint.h>
+#include <src/include/hash_string.h>
+
+#include <string.h>
+
+#include "src/include/pmix_globals.h"
+#include "src/class/pmix_hash_table.h"
+#include "src/class/pmix_pointer_array.h"
+#include "src/buffer_ops/buffer_ops.h"
+#include "src/util/error.h"
+#include "src/util/output.h"
+
+#include "src/util/hash.h"
+
+/**
+ * Data for a particular pmix process
+ * The name association is maintained in the
+ * proc_data hash table.
+ */
+typedef struct {
+    /** Structure can be put on lists (including in hash tables) */
+    pmix_list_item_t super;
+    /* List of pmix_kval_t structures containing all data
+       received from this process */
+    pmix_list_t data;
+} pmix_proc_data_t;
+static void pdcon(pmix_proc_data_t *p)
+{
+    PMIX_CONSTRUCT(&p->data, pmix_list_t);
+}
+static void pddes(pmix_proc_data_t *p)
+{
+    PMIX_LIST_DESTRUCT(&p->data);
+}
+static PMIX_CLASS_INSTANCE(pmix_proc_data_t,
+                           pmix_list_item_t,
+                           pdcon, pddes);
+
+static pmix_kval_t* lookup_keyval(pmix_list_t *data,
+                                  const char *key);
+static pmix_proc_data_t* lookup_proc(pmix_hash_table_t *jtable,
+                                     uint64_t id, bool create);
+
+pmix_status_t pmix_hash_store(pmix_hash_table_t *table,
+                              pmix_rank_t rank, pmix_kval_t *kin)
+{
+    pmix_proc_data_t *proc_data;
+    uint64_t id;
+    pmix_kval_t *hv;
+
+    pmix_output_verbose(10, pmix_globals.debug_output,
+                        "HASH:STORE rank %d key %s",
+                        rank, kin->key);
+
+    id = (uint64_t)rank;
+
+    /* lookup the proc data object for this proc - create
+     * it if we don't already have it */
+    if (NULL == (proc_data = lookup_proc(table, id, true))) {
+        return PMIX_ERR_OUT_OF_RESOURCE;
+    }
+
+    /* see if we already have this key-value */
+    hv = lookup_keyval(&proc_data->data, kin->key);
+    if (NULL != hv) {
+        /* yes we do - so remove the current value
+         * and replace it */
+        pmix_list_remove_item(&proc_data->data, &hv->super);
+        PMIX_RELEASE(hv);
+    }
+    PMIX_RETAIN(kin);
+    pmix_list_append(&proc_data->data, &kin->super);
+
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_hash_fetch(pmix_hash_table_t *table, pmix_rank_t rank,
+                              const char *key, pmix_value_t **kvs)
+{
+    pmix_status_t rc = PMIX_SUCCESS;
+    pmix_proc_data_t *proc_data;
+    pmix_kval_t *hv;
+    uint64_t id;
+    char *node;
+    pmix_info_t *info;
+    size_t ninfo, n;
+    pmix_value_t *val;
+
+    pmix_output_verbose(10, pmix_globals.debug_output,
+                        "HASH:FETCH rank %d key %s",
+                        rank, (NULL == key) ? "NULL" : key);
+
+    id = (uint64_t)rank;
+
+    /* - PMIX_RANK_UNDEF should return following statuses
+     * PMIX_ERR_PROC_ENTRY_NOT_FOUND | PMIX_SUCCESS
+     * - specified rank can return following statuses
+     * PMIX_ERR_PROC_ENTRY_NOT_FOUND | PMIX_ERR_NOT_FOUND | PMIX_SUCCESS
+     * special logic is basing on these statuses on a client and a server */
+    if (PMIX_RANK_UNDEF == rank) {
+        rc = pmix_hash_table_get_first_key_uint64(table, &id,
+                (void**)&proc_data, (void**)&node);
+        if (PMIX_SUCCESS != rc) {
+            pmix_output_verbose(10, pmix_globals.debug_output,
+                                "HASH:FETCH proc data for rank %d not found",
+                                rank);
+            return PMIX_ERR_PROC_ENTRY_NOT_FOUND;
+        }
+    }
+
+    while (PMIX_SUCCESS == rc) {
+        proc_data = lookup_proc(table, id, false);
+        if (NULL == proc_data) {
+            pmix_output_verbose(10, pmix_globals.debug_output,
+                                "HASH:FETCH proc data for rank %d not found",
+                                rank);
+            return PMIX_ERR_PROC_ENTRY_NOT_FOUND;
+        }
+
+        /* if the key is NULL, then the user wants -all- data
+         * put by the specified rank */
+        if (NULL == key) {
+            /* we will return the data as an array of pmix_info_t
+             * in the kvs pmix_value_t */
+            val = (pmix_value_t*)malloc(sizeof(pmix_value_t));
+            if (NULL == val) {
+                return PMIX_ERR_NOMEM;
+            }
+            val->type = PMIX_DATA_ARRAY;
+            val->data.darray = (pmix_data_array_t*)malloc(sizeof(pmix_data_array_t));
+            if (NULL == val->data.darray) {
+                PMIX_VALUE_RELEASE(val);
+                return PMIX_ERR_NOMEM;
+            }
+            val->data.darray->type = PMIX_INFO;
+            val->data.darray->size = 0;
+            val->data.darray->array = NULL;
+            ninfo = pmix_list_get_size(&proc_data->data);
+            PMIX_INFO_CREATE(info, ninfo);
+            if (NULL == info) {
+                PMIX_VALUE_RELEASE(val);
+                return PMIX_ERR_NOMEM;
+            }
+            /* copy the list elements */
+            n=0;
+            PMIX_LIST_FOREACH(hv, &proc_data->data, pmix_kval_t) {
+                (void)strncpy(info[n].key, hv->key, PMIX_MAX_KEYLEN);
+                pmix_value_xfer(&info[n].value, hv->value);
+                ++n;
+            }
+            val->data.darray->size = ninfo;
+            val->data.darray->array = info;
+            *kvs = val;
+            return PMIX_SUCCESS;
+        } else {
+            /* find the value from within this proc_data object */
+            hv = lookup_keyval(&proc_data->data, key);
+            if (NULL != hv) {
+                /* create the copy */
+                if (PMIX_SUCCESS != (rc = pmix_bfrop.copy((void**)kvs, hv->value, PMIX_VALUE))) {
+                    PMIX_ERROR_LOG(rc);
+                    return rc;
+                }
+                break;
+            } else if (PMIX_RANK_UNDEF != rank) {
+                pmix_output_verbose(10, pmix_globals.debug_output,
+                                    "HASH:FETCH data for key %s not found", key);
+                return PMIX_ERR_NOT_FOUND;
+            }
+        }
+
+        rc = pmix_hash_table_get_next_key_uint64(table, &id,
+                (void**)&proc_data, node, (void**)&node);
+        if (PMIX_SUCCESS != rc) {
+            pmix_output_verbose(10, pmix_globals.debug_output,
+                                "HASH:FETCH data for key %s not found", key);
+            return PMIX_ERR_PROC_ENTRY_NOT_FOUND;
+        }
+    }
+
+    return rc;
+}
+
+pmix_status_t pmix_hash_fetch_by_key(pmix_hash_table_t *table, const char *key,
+                                     pmix_rank_t *rank, pmix_value_t **kvs, void **last)
+{
+    pmix_status_t rc = PMIX_SUCCESS;
+    pmix_proc_data_t *proc_data;
+    pmix_kval_t *hv;
+    uint64_t id;
+    char *node;
+    static const char *key_r = NULL;
+
+    if (key == NULL && (node = *last) == NULL) {
+        return PMIX_ERR_PROC_ENTRY_NOT_FOUND;
+    }
+
+    if (key == NULL && key_r == NULL) {
+        return PMIX_ERR_PROC_ENTRY_NOT_FOUND;
+    }
+
+    if (key) {
+        rc = pmix_hash_table_get_first_key_uint64(table, &id,
+                (void**)&proc_data, (void**)&node);
+        key_r = key;
+    } else {
+        rc = pmix_hash_table_get_next_key_uint64(table, &id,
+                (void**)&proc_data, node, (void**)&node);
+    }
+
+    pmix_output_verbose(10, pmix_globals.debug_output,
+                        "HASH:FETCH BY KEY rank %d key %s",
+                        (int)id, key_r);
+
+    if (PMIX_SUCCESS != rc) {
+        pmix_output_verbose(10, pmix_globals.debug_output,
+                            "HASH:FETCH proc data for key %s not found",
+                            key_r);
+        return PMIX_ERR_PROC_ENTRY_NOT_FOUND;
+    }
+
+    /* find the value from within this proc_data object */
+    hv = lookup_keyval(&proc_data->data, key_r);
+    if (hv) {
+        /* create the copy */
+        if (PMIX_SUCCESS != (rc = pmix_bfrop.copy((void**)kvs, hv->value, PMIX_VALUE))) {
+            PMIX_ERROR_LOG(rc);
+            return rc;
+        }
+    } else {
+        return PMIX_ERR_NOT_FOUND;
+    }
+
+    *rank = (int)id;
+    *last = node;
+
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t pmix_hash_remove_data(pmix_hash_table_t *table,
+                                    pmix_rank_t rank, const char *key)
+{
+    pmix_status_t rc = PMIX_SUCCESS;
+    pmix_proc_data_t *proc_data;
+    pmix_kval_t *kv;
+    uint64_t id;
+    char *node;
+
+    id = (uint64_t)rank;
+
+    /* if the rank is wildcard, we want to apply this to
+     * all rank entries */
+    if (PMIX_RANK_UNDEF == rank) {
+        rc = pmix_hash_table_get_first_key_uint64(table, &id,
+                (void**)&proc_data, (void**)&node);
+        while (PMIX_SUCCESS == rc) {
+            if (NULL != proc_data) {
+                if (NULL == key) {
+                    PMIX_RELEASE(proc_data);
+                } else {
+                    PMIX_LIST_FOREACH(kv, &proc_data->data, pmix_kval_t) {
+                        if (0 == strcmp(key, kv->key)) {
+                            pmix_list_remove_item(&proc_data->data, &kv->super);
+                            PMIX_RELEASE(kv);
+                            break;
+                        }
+                    }
+                }
+            }
+            rc = pmix_hash_table_get_next_key_uint64(table, &id,
+                    (void**)&proc_data, node, (void**)&node);
+        }
+    }
+
+    /* lookup the specified proc */
+    if (NULL == (proc_data = lookup_proc(table, id, false))) {
+        /* no data for this proc */
+        return PMIX_SUCCESS;
+    }
+
+    /* if key is NULL, remove all data for this proc */
+    if (NULL == key) {
+        while (NULL != (kv = (pmix_kval_t*)pmix_list_remove_first(&proc_data->data))) {
+            PMIX_RELEASE(kv);
+        }
+        /* remove the proc_data object itself from the jtable */
+        pmix_hash_table_remove_value_uint64(table, id);
+        /* cleanup */
+        PMIX_RELEASE(proc_data);
+        return PMIX_SUCCESS;
+    }
+
+    /* remove this item */
+    PMIX_LIST_FOREACH(kv, &proc_data->data, pmix_kval_t) {
+        if (0 == strcmp(key, kv->key)) {
+            pmix_list_remove_item(&proc_data->data, &kv->super);
+            PMIX_RELEASE(kv);
+            break;
+        }
+    }
+
+    return PMIX_SUCCESS;
+}
+
+/**
+ * Find data for a given key in a given pmix_list_t.
+ */
+static pmix_kval_t* lookup_keyval(pmix_list_t *data,
+                                  const char *key)
+{
+    pmix_kval_t *kv;
+
+    PMIX_LIST_FOREACH(kv, data, pmix_kval_t) {
+        if (0 == strcmp(key, kv->key)) {
+            return kv;
+        }
+    }
+    return NULL;
+}
+
+
+/**
+ * Find proc_data_t container associated with given
+ * pmix_identifier_t.
+ */
+static pmix_proc_data_t* lookup_proc(pmix_hash_table_t *jtable,
+                                     uint64_t id, bool create)
+{
+    pmix_proc_data_t *proc_data = NULL;
+
+    pmix_hash_table_get_value_uint64(jtable, id, (void**)&proc_data);
+    if (NULL == proc_data && create) {
+        /* The proc clearly exists, so create a data structure for it */
+        proc_data = PMIX_NEW(pmix_proc_data_t);
+        if (NULL == proc_data) {
+            pmix_output(0, "pmix:client:hash:lookup_pmix_proc: unable to allocate proc_data_t\n");
+            return NULL;
+        }
+        pmix_hash_table_set_value_uint64(jtable, id, proc_data);
+    }
+
+    return proc_data;
+}
diff --git a/src/util/hash.h b/src/util/hash.h
new file mode 100644
index 0000000..6b385b2
--- /dev/null
+++ b/src/util/hash.h
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2010      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2012      Los Alamos National Security, Inc. All rights reserved.
+ * Copyright (c) 2014-2015 Intel, Inc. All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#ifndef PMIX_HASH_H
+#define PMIX_HASH_H
+
+#include <src/include/pmix_config.h>
+
+
+#include "src/buffer_ops/buffer_ops.h"
+#include "src/class/pmix_hash_table.h"
+
+BEGIN_C_DECLS
+
+/* store a value in the given hash table for the specified
+ * rank index.*/
+pmix_status_t pmix_hash_store(pmix_hash_table_t *table,
+                              pmix_rank_t rank, pmix_kval_t *kv);
+
+/* Fetch the value for a specified key and rank from within
+ * the given hash_table */
+pmix_status_t pmix_hash_fetch(pmix_hash_table_t *table, pmix_rank_t rank,
+                              const char *key, pmix_value_t **kvs);
+
+/* Fetch the value for a specified key from within
+ * the given hash_table
+ * It gets the next portion of data from table, where matching key.
+ * To get the first data from table, function is called with key parameter as string.
+ * Remaining data from table are obtained by calling function with a null pointer for the key parameter.*/
+pmix_status_t pmix_hash_fetch_by_key(pmix_hash_table_t *table, const char *key,
+                                     pmix_rank_t *rank, pmix_value_t **kvs, void **last);
+
+/* remove the specified key-value from the given hash_table.
+ * A NULL key will result in removal of all data for the
+ * given rank. A rank of PMIX_RANK_WILDCARD indicates that
+ * the specified key  is to be removed from the data for all
+ * ranks in the table. Combining key=NULL with rank=PMIX_RANK_WILDCARD
+ * will therefore result in removal of all data from the
+ * table */
+pmix_status_t pmix_hash_remove_data(pmix_hash_table_t *table,
+                                    pmix_rank_t rank, const char *key);
+
+END_C_DECLS
+
+#endif /* PMIX_HASH_H */
diff --git a/src/util/keyval/Makefile.am b/src/util/keyval/Makefile.am
new file mode 100644
index 0000000..70572ec
--- /dev/null
+++ b/src/util/keyval/Makefile.am
@@ -0,0 +1,32 @@
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2016      Intel, Inc. All rights reserved
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+
+AM_LFLAGS = -Ppmix_util_keyval_yy
+LEX_OUTPUT_ROOT = lex.pmix_util_keyval_yy
+
+noinst_LTLIBRARIES = libpmixutilkeyval.la
+
+# Source code files
+
+libpmixutilkeyval_la_SOURCES = \
+	keyval_lex.h \
+        keyval_lex.l
+
+MAINTAINERCLEANFILES = keyval_lex.c
diff --git a/src/util/keyval/Makefile.in b/src/util/keyval/Makefile.in
new file mode 100644
index 0000000..9554dd0
--- /dev/null
+++ b/src/util/keyval/Makefile.in
@@ -0,0 +1,791 @@
+# Makefile.in generated by automake 1.15 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2016      Intel, Inc. All rights reserved
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+subdir = src/util/keyval
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/config/c_get_alignment.m4 \
+	$(top_srcdir)/config/libtool.m4 \
+	$(top_srcdir)/config/ltoptions.m4 \
+	$(top_srcdir)/config/ltsugar.m4 \
+	$(top_srcdir)/config/ltversion.m4 \
+	$(top_srcdir)/config/lt~obsolete.m4 \
+	$(top_srcdir)/config/pmix.m4 \
+	$(top_srcdir)/config/pmix_check_attributes.m4 \
+	$(top_srcdir)/config/pmix_check_broken_qsort.m4 \
+	$(top_srcdir)/config/pmix_check_compiler_version.m4 \
+	$(top_srcdir)/config/pmix_check_icc.m4 \
+	$(top_srcdir)/config/pmix_check_ident.m4 \
+	$(top_srcdir)/config/pmix_check_lock.m4 \
+	$(top_srcdir)/config/pmix_check_os_flavors.m4 \
+	$(top_srcdir)/config/pmix_check_package.m4 \
+	$(top_srcdir)/config/pmix_check_psm2.m4 \
+	$(top_srcdir)/config/pmix_check_pthread_pids.m4 \
+	$(top_srcdir)/config/pmix_check_vendor.m4 \
+	$(top_srcdir)/config/pmix_check_visibility.m4 \
+	$(top_srcdir)/config/pmix_check_withdir.m4 \
+	$(top_srcdir)/config/pmix_config_asm.m4 \
+	$(top_srcdir)/config/pmix_config_pthreads.m4 \
+	$(top_srcdir)/config/pmix_config_subdir.m4 \
+	$(top_srcdir)/config/pmix_config_subdir_args.m4 \
+	$(top_srcdir)/config/pmix_config_threads.m4 \
+	$(top_srcdir)/config/pmix_ensure_contains_optflags.m4 \
+	$(top_srcdir)/config/pmix_functions.m4 \
+	$(top_srcdir)/config/pmix_load_platform.m4 \
+	$(top_srcdir)/config/pmix_mca.m4 \
+	$(top_srcdir)/config/pmix_search_libs.m4 \
+	$(top_srcdir)/config/pmix_setup_cc.m4 \
+	$(top_srcdir)/config/pmix_setup_libevent.m4 \
+	$(top_srcdir)/config/pmix_setup_zlib.m4 \
+	$(top_srcdir)/config/pmix_try_assemble.m4 \
+	$(top_srcdir)/config/autogen_found_items.m4 \
+	$(top_srcdir)/src/mca/pdl/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/configure.m4 \
+	$(top_srcdir)/src/mca/pdl/pdlopen/configure.m4 \
+	$(top_srcdir)/src/mca/pdl/plibltdl/configure.m4 \
+	$(top_srcdir)/src/mca/pif/bsdx_ipv4/configure.m4 \
+	$(top_srcdir)/src/mca/pif/bsdx_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pif/linux_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pif/posix_ipv4/configure.m4 \
+	$(top_srcdir)/src/mca/pif/solaris_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/config/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/env/configure.m4 \
+	$(top_srcdir)/src/mca/pnet/opa/configure.m4 \
+	$(top_srcdir)/src/mca/psec/munge/configure.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/src/include/pmix_config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+libpmixutilkeyval_la_LIBADD =
+am_libpmixutilkeyval_la_OBJECTS = keyval_lex.lo
+libpmixutilkeyval_la_OBJECTS = $(am_libpmixutilkeyval_la_OBJECTS)
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/src/include
+depcomp = $(SHELL) $(top_srcdir)/./config/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+LEXCOMPILE = $(LEX) $(AM_LFLAGS) $(LFLAGS)
+LTLEXCOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(LEX) $(AM_LFLAGS) $(LFLAGS)
+AM_V_LEX = $(am__v_LEX_ at AM_V@)
+am__v_LEX_ = $(am__v_LEX_ at AM_DEFAULT_V@)
+am__v_LEX_0 = @echo "  LEX     " $@;
+am__v_LEX_1 = 
+YLWRAP = $(top_srcdir)/./config/ylwrap
+SOURCES = $(libpmixutilkeyval_la_SOURCES)
+DIST_SOURCES = $(libpmixutilkeyval_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/./config/depcomp \
+	$(top_srcdir)/./config/ylwrap keyval_lex.c
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CFLAGS = @CFLAGS@
+CLEANFILES = @CLEANFILES@
+CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = lex.pmix_util_keyval_yy
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MCA_PROJECT_SUBDIRS = @MCA_PROJECT_SUBDIRS@
+MCA_pmix_FRAMEWORKS = @MCA_pmix_FRAMEWORKS@
+MCA_pmix_FRAMEWORKS_SUBDIRS = @MCA_pmix_FRAMEWORKS_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS@
+MCA_pmix_FRAMEWORK_LIBS = @MCA_pmix_FRAMEWORK_LIBS@
+MCA_pmix_pdl_ALL_COMPONENTS = @MCA_pmix_pdl_ALL_COMPONENTS@
+MCA_pmix_pdl_ALL_SUBDIRS = @MCA_pmix_pdl_ALL_SUBDIRS@
+MCA_pmix_pdl_DSO_COMPONENTS = @MCA_pmix_pdl_DSO_COMPONENTS@
+MCA_pmix_pdl_DSO_SUBDIRS = @MCA_pmix_pdl_DSO_SUBDIRS@
+MCA_pmix_pdl_STATIC_COMPONENTS = @MCA_pmix_pdl_STATIC_COMPONENTS@
+MCA_pmix_pdl_STATIC_LTLIBS = @MCA_pmix_pdl_STATIC_LTLIBS@
+MCA_pmix_pdl_STATIC_SUBDIRS = @MCA_pmix_pdl_STATIC_SUBDIRS@
+MCA_pmix_pif_ALL_COMPONENTS = @MCA_pmix_pif_ALL_COMPONENTS@
+MCA_pmix_pif_ALL_SUBDIRS = @MCA_pmix_pif_ALL_SUBDIRS@
+MCA_pmix_pif_DSO_COMPONENTS = @MCA_pmix_pif_DSO_COMPONENTS@
+MCA_pmix_pif_DSO_SUBDIRS = @MCA_pmix_pif_DSO_SUBDIRS@
+MCA_pmix_pif_STATIC_COMPONENTS = @MCA_pmix_pif_STATIC_COMPONENTS@
+MCA_pmix_pif_STATIC_LTLIBS = @MCA_pmix_pif_STATIC_LTLIBS@
+MCA_pmix_pif_STATIC_SUBDIRS = @MCA_pmix_pif_STATIC_SUBDIRS@
+MCA_pmix_pinstalldirs_ALL_COMPONENTS = @MCA_pmix_pinstalldirs_ALL_COMPONENTS@
+MCA_pmix_pinstalldirs_ALL_SUBDIRS = @MCA_pmix_pinstalldirs_ALL_SUBDIRS@
+MCA_pmix_pinstalldirs_DSO_COMPONENTS = @MCA_pmix_pinstalldirs_DSO_COMPONENTS@
+MCA_pmix_pinstalldirs_DSO_SUBDIRS = @MCA_pmix_pinstalldirs_DSO_SUBDIRS@
+MCA_pmix_pinstalldirs_STATIC_COMPONENTS = @MCA_pmix_pinstalldirs_STATIC_COMPONENTS@
+MCA_pmix_pinstalldirs_STATIC_LTLIBS = @MCA_pmix_pinstalldirs_STATIC_LTLIBS@
+MCA_pmix_pinstalldirs_STATIC_SUBDIRS = @MCA_pmix_pinstalldirs_STATIC_SUBDIRS@
+MCA_pmix_pnet_ALL_COMPONENTS = @MCA_pmix_pnet_ALL_COMPONENTS@
+MCA_pmix_pnet_ALL_SUBDIRS = @MCA_pmix_pnet_ALL_SUBDIRS@
+MCA_pmix_pnet_DSO_COMPONENTS = @MCA_pmix_pnet_DSO_COMPONENTS@
+MCA_pmix_pnet_DSO_SUBDIRS = @MCA_pmix_pnet_DSO_SUBDIRS@
+MCA_pmix_pnet_STATIC_COMPONENTS = @MCA_pmix_pnet_STATIC_COMPONENTS@
+MCA_pmix_pnet_STATIC_LTLIBS = @MCA_pmix_pnet_STATIC_LTLIBS@
+MCA_pmix_pnet_STATIC_SUBDIRS = @MCA_pmix_pnet_STATIC_SUBDIRS@
+MCA_pmix_psec_ALL_COMPONENTS = @MCA_pmix_psec_ALL_COMPONENTS@
+MCA_pmix_psec_ALL_SUBDIRS = @MCA_pmix_psec_ALL_SUBDIRS@
+MCA_pmix_psec_DSO_COMPONENTS = @MCA_pmix_psec_DSO_COMPONENTS@
+MCA_pmix_psec_DSO_SUBDIRS = @MCA_pmix_psec_DSO_SUBDIRS@
+MCA_pmix_psec_STATIC_COMPONENTS = @MCA_pmix_psec_STATIC_COMPONENTS@
+MCA_pmix_psec_STATIC_LTLIBS = @MCA_pmix_psec_STATIC_LTLIBS@
+MCA_pmix_psec_STATIC_SUBDIRS = @MCA_pmix_psec_STATIC_SUBDIRS@
+MCA_pmix_psensor_ALL_COMPONENTS = @MCA_pmix_psensor_ALL_COMPONENTS@
+MCA_pmix_psensor_ALL_SUBDIRS = @MCA_pmix_psensor_ALL_SUBDIRS@
+MCA_pmix_psensor_DSO_COMPONENTS = @MCA_pmix_psensor_DSO_COMPONENTS@
+MCA_pmix_psensor_DSO_SUBDIRS = @MCA_pmix_psensor_DSO_SUBDIRS@
+MCA_pmix_psensor_STATIC_COMPONENTS = @MCA_pmix_psensor_STATIC_COMPONENTS@
+MCA_pmix_psensor_STATIC_LTLIBS = @MCA_pmix_psensor_STATIC_LTLIBS@
+MCA_pmix_psensor_STATIC_SUBDIRS = @MCA_pmix_psensor_STATIC_SUBDIRS@
+MCA_pmix_ptl_ALL_COMPONENTS = @MCA_pmix_ptl_ALL_COMPONENTS@
+MCA_pmix_ptl_ALL_SUBDIRS = @MCA_pmix_ptl_ALL_SUBDIRS@
+MCA_pmix_ptl_DSO_COMPONENTS = @MCA_pmix_ptl_DSO_COMPONENTS@
+MCA_pmix_ptl_DSO_SUBDIRS = @MCA_pmix_ptl_DSO_SUBDIRS@
+MCA_pmix_ptl_STATIC_COMPONENTS = @MCA_pmix_ptl_STATIC_COMPONENTS@
+MCA_pmix_ptl_STATIC_LTLIBS = @MCA_pmix_ptl_STATIC_LTLIBS@
+MCA_pmix_ptl_STATIC_SUBDIRS = @MCA_pmix_ptl_STATIC_SUBDIRS@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PMIX_ASM_GSYM = @PMIX_ASM_GSYM@
+PMIX_ASM_LSYM = @PMIX_ASM_LSYM@
+PMIX_ASM_SUPPORT_64BIT = @PMIX_ASM_SUPPORT_64BIT@
+PMIX_ASM_TEXT = @PMIX_ASM_TEXT@
+PMIX_ASM_TYPE = @PMIX_ASM_TYPE@
+PMIX_ASSEMBLY_ARCH = @PMIX_ASSEMBLY_ARCH@
+PMIX_ASSEMBLY_BUILTIN = @PMIX_ASSEMBLY_BUILTIN@
+PMIX_ASSEMBLY_FORMAT = @PMIX_ASSEMBLY_FORMAT@
+PMIX_AS_GLOBAL = @PMIX_AS_GLOBAL@
+PMIX_AS_LABEL_SUFFIX = @PMIX_AS_LABEL_SUFFIX@
+PMIX_CC_ABSOLUTE = @PMIX_CC_ABSOLUTE@
+PMIX_CONFIGURE_DATE = @PMIX_CONFIGURE_DATE@
+PMIX_CONFIGURE_HOST = @PMIX_CONFIGURE_HOST@
+PMIX_CONFIGURE_USER = @PMIX_CONFIGURE_USER@
+PMIX_EMBEDDED_CPPFLAGS = @PMIX_EMBEDDED_CPPFLAGS@
+PMIX_EMBEDDED_LDFLAGS = @PMIX_EMBEDDED_LDFLAGS@
+PMIX_EMBEDDED_LIBS = @PMIX_EMBEDDED_LIBS@
+PMIX_MAJOR_VERSION = @PMIX_MAJOR_VERSION@
+PMIX_MINOR_VERSION = @PMIX_MINOR_VERSION@
+PMIX_RELEASE_DATE = @PMIX_RELEASE_DATE@
+PMIX_RELEASE_VERSION = @PMIX_RELEASE_VERSION@
+PMIX_RENAME = @PMIX_RENAME@
+PMIX_VERSION = @PMIX_VERSION@
+PMIX_top_builddir = @PMIX_top_builddir@
+PMIX_top_srcdir = @PMIX_top_srcdir@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_prefix_program = @ac_prefix_program@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+libpmix_so_version = @libpmix_so_version@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pmix_have_pandoc = @pmix_have_pandoc@
+pmix_pdl_pdlopen_LIBS = @pmix_pdl_pdlopen_LIBS@
+pmix_pdl_plibltdl_CPPFLAGS = @pmix_pdl_plibltdl_CPPFLAGS@
+pmix_pdl_plibltdl_LDFLAGS = @pmix_pdl_plibltdl_LDFLAGS@
+pmix_pdl_plibltdl_LIBS = @pmix_pdl_plibltdl_LIBS@
+pmixdatadir = @pmixdatadir@
+pmixincludedir = @pmixincludedir@
+pmixlibdir = @pmixlibdir@
+pmixmajor = @pmixmajor@
+pmixminor = @pmixminor@
+pnet_opa_CFLAGS = @pnet_opa_CFLAGS@
+pnet_opa_CPPFLAGS = @pnet_opa_CPPFLAGS@
+pnet_opa_LDFLAGS = @pnet_opa_LDFLAGS@
+pnet_opa_LIBS = @pnet_opa_LIBS@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+psec_munge_CPPFLAGS = @psec_munge_CPPFLAGS@
+psec_munge_LDFLAGS = @psec_munge_LDFLAGS@
+psec_munge_LIBS = @psec_munge_LIBS@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+AM_LFLAGS = -Ppmix_util_keyval_yy
+noinst_LTLIBRARIES = libpmixutilkeyval.la
+
+# Source code files
+libpmixutilkeyval_la_SOURCES = \
+	keyval_lex.h \
+        keyval_lex.l
+
+MAINTAINERCLEANFILES = keyval_lex.c
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .l .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/util/keyval/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/util/keyval/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_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}; \
+	}
+
+libpmixutilkeyval.la: $(libpmixutilkeyval_la_OBJECTS) $(libpmixutilkeyval_la_DEPENDENCIES) $(EXTRA_libpmixutilkeyval_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(LINK)  $(libpmixutilkeyval_la_OBJECTS) $(libpmixutilkeyval_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/keyval_lex.Plo at am__quote@
+
+.c.o:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+ at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+.l.c:
+	$(AM_V_LEX)$(am__skiplex) $(SHELL) $(YLWRAP) $< $(LEX_OUTPUT_ROOT).c $@ -- $(LEXCOMPILE)
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+	-rm -f keyval_lex.c
+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstLTLIBRARIES 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-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
+
+.PRECIOUS: Makefile
+
+
+# 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/util/keyval/keyval_lex.c b/src/util/keyval/keyval_lex.c
new file mode 100644
index 0000000..852f21c
--- /dev/null
+++ b/src/util/keyval/keyval_lex.c
@@ -0,0 +1,2069 @@
+
+#line 3 "keyval_lex.c"
+
+#define  YY_INT_ALIGNED short int
+
+/* A lexical scanner generated by flex */
+
+#define yy_create_buffer pmix_util_keyval_yy_create_buffer
+#define yy_delete_buffer pmix_util_keyval_yy_delete_buffer
+#define yy_flex_debug pmix_util_keyval_yy_flex_debug
+#define yy_init_buffer pmix_util_keyval_yy_init_buffer
+#define yy_flush_buffer pmix_util_keyval_yy_flush_buffer
+#define yy_load_buffer_state pmix_util_keyval_yy_load_buffer_state
+#define yy_switch_to_buffer pmix_util_keyval_yy_switch_to_buffer
+#define yyin pmix_util_keyval_yyin
+#define yyleng pmix_util_keyval_yyleng
+#define yylex pmix_util_keyval_yylex
+#define yylineno pmix_util_keyval_yylineno
+#define yyout pmix_util_keyval_yyout
+#define yyrestart pmix_util_keyval_yyrestart
+#define yytext pmix_util_keyval_yytext
+#define yywrap pmix_util_keyval_yywrap
+#define yyalloc pmix_util_keyval_yyalloc
+#define yyrealloc pmix_util_keyval_yyrealloc
+#define yyfree pmix_util_keyval_yyfree
+
+#define FLEX_SCANNER
+#define YY_FLEX_MAJOR_VERSION 2
+#define YY_FLEX_MINOR_VERSION 5
+#define YY_FLEX_SUBMINOR_VERSION 37
+#if YY_FLEX_SUBMINOR_VERSION > 0
+#define FLEX_BETA
+#endif
+
+/* First, we deal with  platform-specific or compiler-specific issues. */
+
+/* begin standard C headers. */
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <stdlib.h>
+
+/* end standard C headers. */
+
+/* flex integer type definitions */
+
+#ifndef FLEXINT_H
+#define FLEXINT_H
+
+/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
+
+#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+
+/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
+ * if you want the limit (max/min) macros for int types. 
+ */
+#ifndef __STDC_LIMIT_MACROS
+#define __STDC_LIMIT_MACROS 1
+#endif
+
+#include <inttypes.h>
+typedef int8_t flex_int8_t;
+typedef uint8_t flex_uint8_t;
+typedef int16_t flex_int16_t;
+typedef uint16_t flex_uint16_t;
+typedef int32_t flex_int32_t;
+typedef uint32_t flex_uint32_t;
+#else
+typedef signed char flex_int8_t;
+typedef short int flex_int16_t;
+typedef int flex_int32_t;
+typedef unsigned char flex_uint8_t; 
+typedef unsigned short int flex_uint16_t;
+typedef unsigned int flex_uint32_t;
+
+/* Limits of integral types. */
+#ifndef INT8_MIN
+#define INT8_MIN               (-128)
+#endif
+#ifndef INT16_MIN
+#define INT16_MIN              (-32767-1)
+#endif
+#ifndef INT32_MIN
+#define INT32_MIN              (-2147483647-1)
+#endif
+#ifndef INT8_MAX
+#define INT8_MAX               (127)
+#endif
+#ifndef INT16_MAX
+#define INT16_MAX              (32767)
+#endif
+#ifndef INT32_MAX
+#define INT32_MAX              (2147483647)
+#endif
+#ifndef UINT8_MAX
+#define UINT8_MAX              (255U)
+#endif
+#ifndef UINT16_MAX
+#define UINT16_MAX             (65535U)
+#endif
+#ifndef UINT32_MAX
+#define UINT32_MAX             (4294967295U)
+#endif
+
+#endif /* ! C99 */
+
+#endif /* ! FLEXINT_H */
+
+#ifdef __cplusplus
+
+/* The "const" storage-class-modifier is valid. */
+#define YY_USE_CONST
+
+#else	/* ! __cplusplus */
+
+/* C99 requires __STDC__ to be defined as 1. */
+#if defined (__STDC__)
+
+#define YY_USE_CONST
+
+#endif	/* defined (__STDC__) */
+#endif	/* ! __cplusplus */
+
+#ifdef YY_USE_CONST
+#define yyconst const
+#else
+#define yyconst
+#endif
+
+/* Returned upon end-of-file. */
+#define YY_NULL 0
+
+/* Promotes a possibly negative, possibly signed char to an unsigned
+ * integer for use as an array index.  If the signed char is negative,
+ * we want to instead treat it as an 8-bit unsigned char, hence the
+ * double cast.
+ */
+#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c)
+
+/* Enter a start condition.  This macro really ought to take a parameter,
+ * but we do it the disgusting crufty way forced on us by the ()-less
+ * definition of BEGIN.
+ */
+#define BEGIN (yy_start) = 1 + 2 *
+
+/* Translate the current start state into a value that can be later handed
+ * to BEGIN to return to the state.  The YYSTATE alias is for lex
+ * compatibility.
+ */
+#define YY_START (((yy_start) - 1) / 2)
+#define YYSTATE YY_START
+
+/* Action number for EOF rule of a given start state. */
+#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
+
+/* Special action meaning "start processing a new file". */
+#define YY_NEW_FILE pmix_util_keyval_yyrestart(pmix_util_keyval_yyin  )
+
+#define YY_END_OF_BUFFER_CHAR 0
+
+/* Size of default input buffer. */
+#ifndef YY_BUF_SIZE
+#define YY_BUF_SIZE 16384
+#endif
+
+/* The state buf must be large enough to hold one state per character in the main buffer.
+ */
+#define YY_STATE_BUF_SIZE   ((YY_BUF_SIZE + 2) * sizeof(yy_state_type))
+
+#ifndef YY_TYPEDEF_YY_BUFFER_STATE
+#define YY_TYPEDEF_YY_BUFFER_STATE
+typedef struct yy_buffer_state *YY_BUFFER_STATE;
+#endif
+
+#ifndef YY_TYPEDEF_YY_SIZE_T
+#define YY_TYPEDEF_YY_SIZE_T
+typedef size_t yy_size_t;
+#endif
+
+extern yy_size_t pmix_util_keyval_yyleng;
+
+extern FILE *pmix_util_keyval_yyin, *pmix_util_keyval_yyout;
+
+#define EOB_ACT_CONTINUE_SCAN 0
+#define EOB_ACT_END_OF_FILE 1
+#define EOB_ACT_LAST_MATCH 2
+
+    /* Note: We specifically omit the test for yy_rule_can_match_eol because it requires
+     *       access to the local variable yy_act. Since yyless() is a macro, it would break
+     *       existing scanners that call yyless() from OUTSIDE pmix_util_keyval_yylex. 
+     *       One obvious solution it to make yy_act a global. I tried that, and saw
+     *       a 5% performance hit in a non-pmix_util_keyval_yylineno scanner, because yy_act is
+     *       normally declared as a register variable-- so it is not worth it.
+     */
+    #define  YY_LESS_LINENO(n) \
+            do { \
+                int yyl;\
+                for ( yyl = n; yyl < pmix_util_keyval_yyleng; ++yyl )\
+                    if ( pmix_util_keyval_yytext[yyl] == '\n' )\
+                        --pmix_util_keyval_yylineno;\
+            }while(0)
+    
+/* Return all but the first "n" matched characters back to the input stream. */
+#define yyless(n) \
+	do \
+		{ \
+		/* Undo effects of setting up pmix_util_keyval_yytext. */ \
+        int yyless_macro_arg = (n); \
+        YY_LESS_LINENO(yyless_macro_arg);\
+		*yy_cp = (yy_hold_char); \
+		YY_RESTORE_YY_MORE_OFFSET \
+		(yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
+		YY_DO_BEFORE_ACTION; /* set up pmix_util_keyval_yytext again */ \
+		} \
+	while ( 0 )
+
+#define unput(c) yyunput( c, (yytext_ptr)  )
+
+#ifndef YY_STRUCT_YY_BUFFER_STATE
+#define YY_STRUCT_YY_BUFFER_STATE
+struct yy_buffer_state
+	{
+	FILE *yy_input_file;
+
+	char *yy_ch_buf;		/* input buffer */
+	char *yy_buf_pos;		/* current position in input buffer */
+
+	/* Size of input buffer in bytes, not including room for EOB
+	 * characters.
+	 */
+	yy_size_t yy_buf_size;
+
+	/* Number of characters read into yy_ch_buf, not including EOB
+	 * characters.
+	 */
+	yy_size_t yy_n_chars;
+
+	/* Whether we "own" the buffer - i.e., we know we created it,
+	 * and can realloc() it to grow it, and should free() it to
+	 * delete it.
+	 */
+	int yy_is_our_buffer;
+
+	/* Whether this is an "interactive" input source; if so, and
+	 * if we're using stdio for input, then we want to use getc()
+	 * instead of fread(), to make sure we stop fetching input after
+	 * each newline.
+	 */
+	int yy_is_interactive;
+
+	/* Whether we're considered to be at the beginning of a line.
+	 * If so, '^' rules will be active on the next match, otherwise
+	 * not.
+	 */
+	int yy_at_bol;
+
+    int yy_bs_lineno; /**< The line count. */
+    int yy_bs_column; /**< The column count. */
+    
+	/* Whether to try to fill the input buffer when we reach the
+	 * end of it.
+	 */
+	int yy_fill_buffer;
+
+	int yy_buffer_status;
+
+#define YY_BUFFER_NEW 0
+#define YY_BUFFER_NORMAL 1
+	/* When an EOF's been seen but there's still some text to process
+	 * then we mark the buffer as YY_EOF_PENDING, to indicate that we
+	 * shouldn't try reading from the input source any more.  We might
+	 * still have a bunch of tokens to match, though, because of
+	 * possible backing-up.
+	 *
+	 * When we actually see the EOF, we change the status to "new"
+	 * (via pmix_util_keyval_yyrestart()), so that the user can continue scanning by
+	 * just pointing pmix_util_keyval_yyin at a new input file.
+	 */
+#define YY_BUFFER_EOF_PENDING 2
+
+	};
+#endif /* !YY_STRUCT_YY_BUFFER_STATE */
+
+/* Stack of input buffers. */
+static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */
+static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */
+static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
+
+/* We provide macros for accessing buffer states in case in the
+ * future we want to put the buffer states in a more general
+ * "scanner state".
+ *
+ * Returns the top of the stack, or NULL.
+ */
+#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \
+                          ? (yy_buffer_stack)[(yy_buffer_stack_top)] \
+                          : NULL)
+
+/* Same as previous macro, but useful when we know that the buffer stack is not
+ * NULL or when we need an lvalue. For internal use only.
+ */
+#define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)]
+
+/* yy_hold_char holds the character lost when pmix_util_keyval_yytext is formed. */
+static char yy_hold_char;
+static yy_size_t yy_n_chars;		/* number of characters read into yy_ch_buf */
+yy_size_t pmix_util_keyval_yyleng;
+
+/* Points to current character in buffer. */
+static char *yy_c_buf_p = (char *) 0;
+static int yy_init = 0;		/* whether we need to initialize */
+static int yy_start = 0;	/* start state number */
+
+/* Flag which is used to allow pmix_util_keyval_yywrap()'s to do buffer switches
+ * instead of setting up a fresh pmix_util_keyval_yyin.  A bit of a hack ...
+ */
+static int yy_did_buffer_switch_on_eof;
+
+void pmix_util_keyval_yyrestart (FILE *input_file  );
+void pmix_util_keyval_yy_switch_to_buffer (YY_BUFFER_STATE new_buffer  );
+YY_BUFFER_STATE pmix_util_keyval_yy_create_buffer (FILE *file,int size  );
+void pmix_util_keyval_yy_delete_buffer (YY_BUFFER_STATE b  );
+void pmix_util_keyval_yy_flush_buffer (YY_BUFFER_STATE b  );
+void pmix_util_keyval_yypush_buffer_state (YY_BUFFER_STATE new_buffer  );
+void pmix_util_keyval_yypop_buffer_state (void );
+
+static void pmix_util_keyval_yyensure_buffer_stack (void );
+static void pmix_util_keyval_yy_load_buffer_state (void );
+static void pmix_util_keyval_yy_init_buffer (YY_BUFFER_STATE b,FILE *file  );
+
+#define YY_FLUSH_BUFFER pmix_util_keyval_yy_flush_buffer(YY_CURRENT_BUFFER )
+
+YY_BUFFER_STATE pmix_util_keyval_yy_scan_buffer (char *base,yy_size_t size  );
+YY_BUFFER_STATE pmix_util_keyval_yy_scan_string (yyconst char *yy_str  );
+YY_BUFFER_STATE pmix_util_keyval_yy_scan_bytes (yyconst char *bytes,yy_size_t len  );
+
+void *pmix_util_keyval_yyalloc (yy_size_t  );
+void *pmix_util_keyval_yyrealloc (void *,yy_size_t  );
+void pmix_util_keyval_yyfree (void *  );
+
+#define yy_new_buffer pmix_util_keyval_yy_create_buffer
+
+#define yy_set_interactive(is_interactive) \
+	{ \
+	if ( ! YY_CURRENT_BUFFER ){ \
+        pmix_util_keyval_yyensure_buffer_stack (); \
+		YY_CURRENT_BUFFER_LVALUE =    \
+            pmix_util_keyval_yy_create_buffer(pmix_util_keyval_yyin,YY_BUF_SIZE ); \
+	} \
+	YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
+	}
+
+#define yy_set_bol(at_bol) \
+	{ \
+	if ( ! YY_CURRENT_BUFFER ){\
+        pmix_util_keyval_yyensure_buffer_stack (); \
+		YY_CURRENT_BUFFER_LVALUE =    \
+            pmix_util_keyval_yy_create_buffer(pmix_util_keyval_yyin,YY_BUF_SIZE ); \
+	} \
+	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
+	}
+
+#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
+
+/* Begin user sect3 */
+
+typedef unsigned char YY_CHAR;
+
+FILE *pmix_util_keyval_yyin = (FILE *) 0, *pmix_util_keyval_yyout = (FILE *) 0;
+
+typedef int yy_state_type;
+
+extern int pmix_util_keyval_yylineno;
+
+int pmix_util_keyval_yylineno = 1;
+
+extern char *pmix_util_keyval_yytext;
+#define yytext_ptr pmix_util_keyval_yytext
+
+static yy_state_type yy_get_previous_state (void );
+static yy_state_type yy_try_NUL_trans (yy_state_type current_state  );
+static int yy_get_next_buffer (void );
+static void yy_fatal_error (yyconst char msg[]  );
+
+/* Done after the current pattern has been matched and before the
+ * corresponding action - sets up pmix_util_keyval_yytext.
+ */
+#define YY_DO_BEFORE_ACTION \
+	(yytext_ptr) = yy_bp; \
+	pmix_util_keyval_yyleng = (size_t) (yy_cp - yy_bp); \
+	(yy_hold_char) = *yy_cp; \
+	*yy_cp = '\0'; \
+	(yy_c_buf_p) = yy_cp;
+
+#define YY_NUM_RULES 22
+#define YY_END_OF_BUFFER 23
+/* This struct is not used in this scanner,
+   but its presence is necessary. */
+struct yy_trans_info
+	{
+	flex_int32_t yy_verify;
+	flex_int32_t yy_nxt;
+	};
+static yyconst flex_int16_t yy_acclist[93] =
+    {   0,
+        5,    5,   23,   21,   22,   10,   21,   22,    1,   22,
+       21,   22,   11,   21,   22,   11,   21,   22,   21,   22,
+        9,   21,   22, 8205,   22,16397,   22,   12,   22, 8205,
+       22,16397,    5,   22,    7,   22,    6,   22,   14,   22,
+       22,   17,   22,   14,   22,   14,   22,   14,   22,   10,
+        1,    9,    2,   11,   11,   11,   11,    4,    9, 8205,
+    16397, 8205,   12, 8205,16397, 8205,    5,    6,    6,    8,
+       14,   17,   14,   14,   14,   14,   14,   11,    3,   16,
+       14,   16,   15,   14,   15,   11,   20,   20,   20,   19,
+       19,   18
+
+    } ;
+
+static yyconst flex_int16_t yy_accept[85] =
+    {   0,
+        1,    1,    1,    1,    1,    2,    3,    3,    3,    4,
+        6,    9,   11,   13,   16,   19,   21,   24,   27,   28,
+       30,   33,   35,   37,   39,   41,   42,   44,   46,   48,
+       50,   51,   52,   53,   53,   54,   55,   56,   57,   58,
+       59,   59,   60,   62,   63,   63,   64,   66,   67,   68,
+       69,   70,   71,   72,   72,   73,   74,   75,   75,   76,
+       77,   77,   78,   79,   79,   79,   80,   80,   81,   83,
+       83,   84,   86,   87,   87,   87,   88,   89,   90,   91,
+       91,   92,   93,   93
+    } ;
+
+static yyconst flex_int32_t yy_ec[256] =
+    {   0,
+        1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
+        4,    4,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    2,    1,    5,    6,    1,    1,    1,    7,    1,
+        1,    8,    1,    1,    9,   10,   11,   10,   10,   10,
+       10,   10,   10,   10,   10,   10,   10,    1,    1,    1,
+       12,    1,    1,    1,   10,   10,   10,   10,   10,   10,
+       10,   10,   10,   10,   10,   10,   10,   10,   10,   10,
+       10,   10,   10,   10,   10,   10,   10,   10,   10,   10,
+        1,    1,    1,    1,   10,    1,   13,   10,   14,   10,
+
+       10,   10,   10,   10,   10,   10,   10,   10,   15,   10,
+       10,   10,   10,   10,   10,   10,   10,   10,   10,   16,
+       10,   10,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1
+    } ;
+
+static yyconst flex_int32_t yy_meta[17] =
+    {   0,
+        1,    2,    3,    4,    1,    1,    1,    5,    6,    6,
+        1,    1,    6,    6,    6,    6
+    } ;
+
+static yyconst flex_int16_t yy_base[100] =
+    {   0,
+        0,    0,   15,   18,   20,   21,   28,   34,  143,  252,
+       40,  252,  121,   44,   52,   37,   23,  115,   67,  252,
+       70,    0,  252,   38,    0,  111,  252,   73,   45,   49,
+        0,  252,   60,  105,  252,   50,    0,   93,   76,  252,
+       98,   77,   98,   91,   80,  252,   83,   86,    0,   83,
+       84,  252,    0,   60,  252,   94,   97,   50,  101,  102,
+       33,  108,   21,  109,   23,  252,  114,    0,    0,  118,
+        0,    0,  119,  125,  140,  252,  136,    0,  151,  152,
+      155,  156,  252,  160,  166,  172,  178,  184,  190,  196,
+      202,  207,  211,  217,  223,  229,  235,  240,  245
+
+    } ;
+
+static yyconst flex_int16_t yy_def[100] =
+    {   0,
+       83,    1,   84,   84,   85,   85,   86,   86,   83,   83,
+       83,   83,   87,   83,   14,   83,   83,   88,   88,   83,
+       88,   89,   83,   90,   91,   92,   83,   91,   93,   94,
+       11,   83,   83,   87,   83,   15,   15,   15,   15,   83,
+       95,   83,   88,   88,   88,   83,   88,   88,   89,   90,
+       90,   83,   91,   92,   83,   91,   93,   96,   93,   94,
+       97,   94,   15,   98,   95,   83,   96,   67,   59,   97,
+       70,   62,   15,   83,   99,   83,   74,   74,   83,   99,
+       83,   83,    0,   83,   83,   83,   83,   83,   83,   83,
+       83,   83,   83,   83,   83,   83,   83,   83,   83
+
+    } ;
+
+static yyconst flex_int16_t yy_nxt[269] =
+    {   0,
+       10,   11,   12,   11,   10,   13,   10,   10,   14,   15,
+       16,   17,   15,   15,   15,   15,   19,   20,   21,   19,
+       20,   21,   23,   23,   42,   66,   42,   24,   24,   26,
+       27,   28,   29,   73,   30,   26,   27,   28,   29,   70,
+       30,   31,   32,   31,   40,   51,   58,   41,   52,   59,
+       61,   33,   36,   37,   67,   62,   37,   37,   38,   39,
+       37,   42,   55,   42,   38,   39,   37,   37,   45,   46,
+       47,   48,   46,   47,   54,   55,   56,   64,   42,   64,
+       42,   45,   46,   47,   48,   46,   47,   48,   46,   47,
+       83,   51,   44,   83,   52,   54,   55,   56,   58,   44,
+
+       66,   59,   68,   61,   69,   59,   63,   35,   62,   71,
+       64,   72,   64,   55,   62,   68,   44,   68,   67,   71,
+       75,   71,   75,   35,   70,   76,   77,   76,   77,   76,
+       76,   76,   76,   78,   78,   76,   79,   78,   78,   78,
+       78,   75,   83,   75,   76,   76,   83,   83,   76,   76,
+       76,   76,   81,   82,   81,   82,   81,   82,   81,   82,
+       18,   18,   18,   18,   18,   18,   22,   22,   22,   22,
+       22,   22,   25,   25,   25,   25,   25,   25,   34,   34,
+       34,   34,   34,   34,   43,   43,   83,   43,   43,   43,
+       49,   49,   83,   49,   83,   49,   50,   50,   83,   50,
+
+       50,   50,   53,   83,   83,   53,   53,   53,   54,   54,
+       54,   57,   57,   83,   57,   57,   57,   60,   60,   83,
+       60,   60,   60,   65,   65,   65,   65,   65,   65,   58,
+       58,   83,   58,   58,   58,   61,   61,   83,   61,   61,
+       61,   74,   83,   74,   83,   74,   80,   83,   80,   83,
+       80,    9,   83,   83,   83,   83,   83,   83,   83,   83,
+       83,   83,   83,   83,   83,   83,   83,   83
+    } ;
+
+static yyconst flex_int16_t yy_chk[269] =
+    {   0,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    3,    3,    3,    4,
+        4,    4,    5,    6,   17,   65,   17,    5,    6,    7,
+        7,    7,    7,   63,    7,    8,    8,    8,    8,   61,
+        8,   11,   11,   11,   16,   24,   29,   16,   24,   29,
+       30,   11,   14,   14,   58,   30,   14,   14,   14,   14,
+       15,   33,   54,   33,   36,   36,   15,   15,   19,   19,
+       19,   21,   21,   21,   28,   28,   28,   39,   42,   39,
+       42,   45,   45,   45,   47,   47,   47,   48,   48,   48,
+       50,   51,   44,   50,   51,   56,   56,   56,   57,   43,
+
+       41,   57,   59,   60,   59,   59,   38,   34,   60,   62,
+       64,   62,   64,   26,   62,   67,   18,   67,   67,   70,
+       73,   70,   73,   13,   70,   74,   74,   74,   74,   74,
+       74,   74,   74,   74,   74,   74,   74,   74,   74,   74,
+       74,   75,    9,   75,   77,   77,    0,    0,   77,   77,
+       77,   77,   79,   80,   79,   80,   81,   82,   81,   82,
+       84,   84,   84,   84,   84,   84,   85,   85,   85,   85,
+       85,   85,   86,   86,   86,   86,   86,   86,   87,   87,
+       87,   87,   87,   87,   88,   88,    0,   88,   88,   88,
+       89,   89,    0,   89,    0,   89,   90,   90,    0,   90,
+
+       90,   90,   91,    0,    0,   91,   91,   91,   92,   92,
+       92,   93,   93,    0,   93,   93,   93,   94,   94,    0,
+       94,   94,   94,   95,   95,   95,   95,   95,   95,   96,
+       96,    0,   96,   96,   96,   97,   97,    0,   97,   97,
+       97,   98,    0,   98,    0,   98,   99,    0,   99,    0,
+       99,   83,   83,   83,   83,   83,   83,   83,   83,   83,
+       83,   83,   83,   83,   83,   83,   83,   83
+    } ;
+
+/* Table of booleans, true if rule could match eol. */
+static yyconst flex_int32_t yy_rule_can_match_eol[23] =
+    {   0,
+1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 
+    1, 0, 0,     };
+
+extern int pmix_util_keyval_yy_flex_debug;
+int pmix_util_keyval_yy_flex_debug = 0;
+
+static yy_state_type *yy_state_buf=0, *yy_state_ptr=0;
+static char *yy_full_match;
+static int yy_lp;
+static int yy_looking_for_trail_begin = 0;
+static int yy_full_lp;
+static int *yy_full_state;
+#define YY_TRAILING_MASK 0x2000
+#define YY_TRAILING_HEAD_MASK 0x4000
+#define REJECT \
+{ \
+*yy_cp = (yy_hold_char); /* undo effects of setting up pmix_util_keyval_yytext */ \
+yy_cp = (yy_full_match); /* restore poss. backed-over text */ \
+(yy_lp) = (yy_full_lp); /* restore orig. accepting pos. */ \
+(yy_state_ptr) = (yy_full_state); /* restore orig. state */ \
+yy_current_state = *(yy_state_ptr); /* restore curr. state */ \
+++(yy_lp); \
+goto find_rule; \
+}
+
+#define yymore() yymore_used_but_not_detected
+#define YY_MORE_ADJ 0
+#define YY_RESTORE_YY_MORE_OFFSET
+char *pmix_util_keyval_yytext;
+#line 1 "keyval_lex.l"
+#define YY_NO_INPUT 1
+#line 6 "keyval_lex.l"
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2006 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2012      Los Alamos National Security, LLC. All rights
+ *                         reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+
+#include <stdio.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#include "src/util/keyval/keyval_lex.h"
+
+/*
+ * local functions
+ */
+
+BEGIN_C_DECLS
+
+int pmix_util_keyval_yywrap(void);
+
+END_C_DECLS
+
+/*
+ * global variables
+ */
+int pmix_util_keyval_yynewlines = 1;
+bool pmix_util_keyval_parse_done = false;
+char *pmix_util_keyval_string = NULL;
+
+
+
+
+#line 651 "keyval_lex.c"
+
+#define INITIAL 0
+#define VALUE 1
+#define comment 2
+#define MCA_VALUE 3
+
+#ifndef YY_NO_UNISTD_H
+/* Special case for "unistd.h", since it is non-ANSI. We include it way
+ * down here because we want the user's section 1 to have been scanned first.
+ * The user has a chance to override it with an option.
+ */
+#include <unistd.h>
+#endif
+
+#ifndef YY_EXTRA_TYPE
+#define YY_EXTRA_TYPE void *
+#endif
+
+static int yy_init_globals (void );
+
+/* Accessor methods to globals.
+   These are made visible to non-reentrant scanners for convenience. */
+
+int pmix_util_keyval_yylex_destroy (void );
+
+int pmix_util_keyval_yyget_debug (void );
+
+void pmix_util_keyval_yyset_debug (int debug_flag  );
+
+YY_EXTRA_TYPE pmix_util_keyval_yyget_extra (void );
+
+void pmix_util_keyval_yyset_extra (YY_EXTRA_TYPE user_defined  );
+
+FILE *pmix_util_keyval_yyget_in (void );
+
+void pmix_util_keyval_yyset_in  (FILE * in_str  );
+
+FILE *pmix_util_keyval_yyget_out (void );
+
+void pmix_util_keyval_yyset_out  (FILE * out_str  );
+
+yy_size_t pmix_util_keyval_yyget_leng (void );
+
+char *pmix_util_keyval_yyget_text (void );
+
+int pmix_util_keyval_yyget_lineno (void );
+
+void pmix_util_keyval_yyset_lineno (int line_number  );
+
+/* Macros after this point can all be overridden by user definitions in
+ * section 1.
+ */
+
+#ifndef YY_SKIP_YYWRAP
+#ifdef __cplusplus
+extern "C" int pmix_util_keyval_yywrap (void );
+#else
+extern int pmix_util_keyval_yywrap (void );
+#endif
+#endif
+
+#ifndef yytext_ptr
+static void yy_flex_strncpy (char *,yyconst char *,int );
+#endif
+
+#ifdef YY_NEED_STRLEN
+static int yy_flex_strlen (yyconst char * );
+#endif
+
+#ifndef YY_NO_INPUT
+
+#ifdef __cplusplus
+static int yyinput (void );
+#else
+static int input (void );
+#endif
+
+#endif
+
+/* Amount of stuff to slurp up with each read. */
+#ifndef YY_READ_BUF_SIZE
+#define YY_READ_BUF_SIZE 8192
+#endif
+
+/* Copy whatever the last rule matched to the standard output. */
+#ifndef ECHO
+/* This used to be an fputs(), but since the string might contain NUL's,
+ * we now use fwrite().
+ */
+#define ECHO do { if (fwrite( pmix_util_keyval_yytext, pmix_util_keyval_yyleng, 1, pmix_util_keyval_yyout )) {} } while (0)
+#endif
+
+/* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
+ * is returned in "result".
+ */
+#ifndef YY_INPUT
+#define YY_INPUT(buf,result,max_size) \
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
+		{ \
+		int c = '*'; \
+		size_t n; \
+		for ( n = 0; n < max_size && \
+			     (c = getc( pmix_util_keyval_yyin )) != EOF && c != '\n'; ++n ) \
+			buf[n] = (char) c; \
+		if ( c == '\n' ) \
+			buf[n++] = (char) c; \
+		if ( c == EOF && ferror( pmix_util_keyval_yyin ) ) \
+			YY_FATAL_ERROR( "input in flex scanner failed" ); \
+		result = n; \
+		} \
+	else \
+		{ \
+		errno=0; \
+		while ( (result = fread(buf, 1, max_size, pmix_util_keyval_yyin))==0 && ferror(pmix_util_keyval_yyin)) \
+			{ \
+			if( errno != EINTR) \
+				{ \
+				YY_FATAL_ERROR( "input in flex scanner failed" ); \
+				break; \
+				} \
+			errno=0; \
+			clearerr(pmix_util_keyval_yyin); \
+			} \
+		}\
+\
+
+#endif
+
+/* No semi-colon after return; correct usage is to write "yyterminate();" -
+ * we don't want an extra ';' after the "return" because that will cause
+ * some compilers to complain about unreachable statements.
+ */
+#ifndef yyterminate
+#define yyterminate() return YY_NULL
+#endif
+
+/* Number of entries by which start-condition stack grows. */
+#ifndef YY_START_STACK_INCR
+#define YY_START_STACK_INCR 25
+#endif
+
+/* Report a fatal error. */
+#ifndef YY_FATAL_ERROR
+#define YY_FATAL_ERROR(msg) yy_fatal_error( msg )
+#endif
+
+/* end tables serialization structures and prototypes */
+
+/* Default declaration of generated scanner - a define so the user can
+ * easily add parameters.
+ */
+#ifndef YY_DECL
+#define YY_DECL_IS_OURS 1
+
+extern int pmix_util_keyval_yylex (void);
+
+#define YY_DECL int pmix_util_keyval_yylex (void)
+#endif /* !YY_DECL */
+
+/* Code executed at the beginning of each rule, after pmix_util_keyval_yytext and pmix_util_keyval_yyleng
+ * have been set up.
+ */
+#ifndef YY_USER_ACTION
+#define YY_USER_ACTION
+#endif
+
+/* Code executed at the end of each rule. */
+#ifndef YY_BREAK
+#define YY_BREAK break;
+#endif
+
+#define YY_RULE_SETUP \
+	YY_USER_ACTION
+
+/** The main scanner function which does all the work.
+ */
+YY_DECL
+{
+	register yy_state_type yy_current_state;
+	register char *yy_cp, *yy_bp;
+	register int yy_act;
+    
+#line 61 "keyval_lex.l"
+
+
+#line 837 "keyval_lex.c"
+
+	if ( !(yy_init) )
+		{
+		(yy_init) = 1;
+
+#ifdef YY_USER_INIT
+		YY_USER_INIT;
+#endif
+
+        /* Create the reject buffer large enough to save one state per allowed character. */
+        if ( ! (yy_state_buf) )
+            (yy_state_buf) = (yy_state_type *)pmix_util_keyval_yyalloc(YY_STATE_BUF_SIZE  );
+            if ( ! (yy_state_buf) )
+                YY_FATAL_ERROR( "out of dynamic memory in pmix_util_keyval_yylex()" );
+
+		if ( ! (yy_start) )
+			(yy_start) = 1;	/* first start state */
+
+		if ( ! pmix_util_keyval_yyin )
+			pmix_util_keyval_yyin = stdin;
+
+		if ( ! pmix_util_keyval_yyout )
+			pmix_util_keyval_yyout = stdout;
+
+		if ( ! YY_CURRENT_BUFFER ) {
+			pmix_util_keyval_yyensure_buffer_stack ();
+			YY_CURRENT_BUFFER_LVALUE =
+				pmix_util_keyval_yy_create_buffer(pmix_util_keyval_yyin,YY_BUF_SIZE );
+		}
+
+		pmix_util_keyval_yy_load_buffer_state( );
+		}
+
+	while ( 1 )		/* loops until end-of-file is reached */
+		{
+		yy_cp = (yy_c_buf_p);
+
+		/* Support of pmix_util_keyval_yytext. */
+		*yy_cp = (yy_hold_char);
+
+		/* yy_bp points to the position in yy_ch_buf of the start of
+		 * the current run.
+		 */
+		yy_bp = yy_cp;
+
+		yy_current_state = (yy_start);
+
+		(yy_state_ptr) = (yy_state_buf);
+		*(yy_state_ptr)++ = yy_current_state;
+
+yy_match:
+		do
+			{
+			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
+			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+				{
+				yy_current_state = (int) yy_def[yy_current_state];
+				if ( yy_current_state >= 84 )
+					yy_c = yy_meta[(unsigned int) yy_c];
+				}
+			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+			*(yy_state_ptr)++ = yy_current_state;
+			++yy_cp;
+			}
+		while ( yy_base[yy_current_state] != 252 );
+
+yy_find_action:
+		yy_current_state = *--(yy_state_ptr);
+		(yy_lp) = yy_accept[yy_current_state];
+find_rule: /* we branch to this label when backing up */
+		for ( ; ; ) /* until we find what rule we matched */
+			{
+			if ( (yy_lp) && (yy_lp) < yy_accept[yy_current_state + 1] )
+				{
+				yy_act = yy_acclist[(yy_lp)];
+				if ( yy_act & YY_TRAILING_HEAD_MASK ||
+				     (yy_looking_for_trail_begin) )
+					{
+					if ( yy_act == (yy_looking_for_trail_begin) )
+						{
+						(yy_looking_for_trail_begin) = 0;
+						yy_act &= ~YY_TRAILING_HEAD_MASK;
+						break;
+						}
+					}
+				else if ( yy_act & YY_TRAILING_MASK )
+					{
+					(yy_looking_for_trail_begin) = yy_act & ~YY_TRAILING_MASK;
+					(yy_looking_for_trail_begin) |= YY_TRAILING_HEAD_MASK;
+					}
+				else
+					{
+					(yy_full_match) = yy_cp;
+					(yy_full_state) = (yy_state_ptr);
+					(yy_full_lp) = (yy_lp);
+					break;
+					}
+				++(yy_lp);
+				goto find_rule;
+				}
+			--yy_cp;
+			yy_current_state = *--(yy_state_ptr);
+			(yy_lp) = yy_accept[yy_current_state];
+			}
+
+		YY_DO_BEFORE_ACTION;
+
+		if ( yy_act != YY_END_OF_BUFFER && yy_rule_can_match_eol[yy_act] )
+			{
+			int yyl;
+			for ( yyl = 0; yyl < pmix_util_keyval_yyleng; ++yyl )
+				if ( pmix_util_keyval_yytext[yyl] == '\n' )
+					   
+    pmix_util_keyval_yylineno++;
+;
+			}
+
+do_action:	/* This label is used only to access EOF actions. */
+
+		switch ( yy_act )
+	{ /* beginning of action switch */
+case 1:
+/* rule 1 can match eol */
+YY_RULE_SETUP
+#line 63 "keyval_lex.l"
+{ pmix_util_keyval_yynewlines++; return PMIX_UTIL_KEYVAL_PARSE_NEWLINE; }
+	YY_BREAK
+case 2:
+/* rule 2 can match eol */
+YY_RULE_SETUP
+#line 64 "keyval_lex.l"
+{ pmix_util_keyval_yynewlines++; return PMIX_UTIL_KEYVAL_PARSE_NEWLINE; }
+	YY_BREAK
+case 3:
+/* rule 3 can match eol */
+YY_RULE_SETUP
+#line 65 "keyval_lex.l"
+{ pmix_util_keyval_yynewlines++; return PMIX_UTIL_KEYVAL_PARSE_NEWLINE; }
+	YY_BREAK
+case 4:
+YY_RULE_SETUP
+#line 67 "keyval_lex.l"
+{ BEGIN(comment);
+                      return PMIX_UTIL_KEYVAL_PARSE_NEWLINE; }
+	YY_BREAK
+case 5:
+YY_RULE_SETUP
+#line 69 "keyval_lex.l"
+; /* Eat up non '*'s */
+	YY_BREAK
+case 6:
+YY_RULE_SETUP
+#line 70 "keyval_lex.l"
+; /* Eat '*'s not followed by a '/' */
+	YY_BREAK
+case 7:
+/* rule 7 can match eol */
+YY_RULE_SETUP
+#line 71 "keyval_lex.l"
+{ pmix_util_keyval_yynewlines++;
+                      return PMIX_UTIL_KEYVAL_PARSE_NEWLINE; }
+	YY_BREAK
+case 8:
+YY_RULE_SETUP
+#line 73 "keyval_lex.l"
+{ BEGIN(INITIAL); /* Done with Block Comment */
+                      return PMIX_UTIL_KEYVAL_PARSE_NEWLINE; }
+	YY_BREAK
+case 9:
+YY_RULE_SETUP
+#line 76 "keyval_lex.l"
+{ BEGIN(VALUE); return PMIX_UTIL_KEYVAL_PARSE_EQUAL; }
+	YY_BREAK
+case 10:
+YY_RULE_SETUP
+#line 77 "keyval_lex.l"
+; /* whitespace */
+	YY_BREAK
+case 11:
+YY_RULE_SETUP
+#line 78 "keyval_lex.l"
+{ return PMIX_UTIL_KEYVAL_PARSE_SINGLE_WORD; }
+	YY_BREAK
+case 12:
+/* rule 12 can match eol */
+YY_RULE_SETUP
+#line 80 "keyval_lex.l"
+{ BEGIN(INITIAL); return PMIX_UTIL_KEYVAL_PARSE_NEWLINE; }
+	YY_BREAK
+case 13:
+YY_RULE_SETUP
+#line 81 "keyval_lex.l"
+{ return PMIX_UTIL_KEYVAL_PARSE_VALUE; }
+	YY_BREAK
+case 14:
+YY_RULE_SETUP
+#line 83 "keyval_lex.l"
+{ BEGIN(INITIAL); return PMIX_UTIL_KEYVAL_PARSE_VALUE; }
+	YY_BREAK
+case 15:
+YY_RULE_SETUP
+#line 84 "keyval_lex.l"
+{ BEGIN(INITIAL); return PMIX_UTIL_KEYVAL_PARSE_VALUE; }
+	YY_BREAK
+case 16:
+YY_RULE_SETUP
+#line 85 "keyval_lex.l"
+{ BEGIN(INITIAL); return PMIX_UTIL_KEYVAL_PARSE_VALUE; }
+	YY_BREAK
+case 17:
+/* rule 17 can match eol */
+YY_RULE_SETUP
+#line 86 "keyval_lex.l"
+{ BEGIN(INITIAL); BEGIN(INITIAL); return PMIX_UTIL_KEYVAL_PARSE_NEWLINE; }
+	YY_BREAK
+case 18:
+YY_RULE_SETUP
+#line 88 "keyval_lex.l"
+{BEGIN(MCA_VALUE); return PMIX_UTIL_KEYVAL_PARSE_MCAVAR; }
+	YY_BREAK
+case 19:
+YY_RULE_SETUP
+#line 89 "keyval_lex.l"
+{BEGIN(MCA_VALUE); return PMIX_UTIL_KEYVAL_PARSE_ENVEQL; }
+	YY_BREAK
+case 20:
+/* rule 20 can match eol */
+*yy_cp = (yy_hold_char); /* undo effects of setting up pmix_util_keyval_yytext */
+(yy_c_buf_p) = yy_cp -= 1;
+YY_DO_BEFORE_ACTION; /* set up pmix_util_keyval_yytext again */
+YY_RULE_SETUP
+#line 90 "keyval_lex.l"
+{ return PMIX_UTIL_KEYVAL_PARSE_ENVVAR; }
+	YY_BREAK
+case 21:
+YY_RULE_SETUP
+#line 92 "keyval_lex.l"
+{ return PMIX_UTIL_KEYVAL_PARSE_ERROR; }
+	YY_BREAK
+case 22:
+YY_RULE_SETUP
+#line 94 "keyval_lex.l"
+ECHO;
+	YY_BREAK
+#line 1082 "keyval_lex.c"
+			case YY_STATE_EOF(INITIAL):
+			case YY_STATE_EOF(VALUE):
+			case YY_STATE_EOF(comment):
+			case YY_STATE_EOF(MCA_VALUE):
+				yyterminate();
+
+	case YY_END_OF_BUFFER:
+		{
+		/* Amount of text matched not including the EOB char. */
+		int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) - 1;
+
+		/* Undo the effects of YY_DO_BEFORE_ACTION. */
+		*yy_cp = (yy_hold_char);
+		YY_RESTORE_YY_MORE_OFFSET
+
+		if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW )
+			{
+			/* We're scanning a new file or input source.  It's
+			 * possible that this happened because the user
+			 * just pointed pmix_util_keyval_yyin at a new source and called
+			 * pmix_util_keyval_yylex().  If so, then we have to assure
+			 * consistency between YY_CURRENT_BUFFER and our
+			 * globals.  Here is the right place to do so, because
+			 * this is the first action (other than possibly a
+			 * back-up) that will match for the new input source.
+			 */
+			(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+			YY_CURRENT_BUFFER_LVALUE->yy_input_file = pmix_util_keyval_yyin;
+			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
+			}
+
+		/* Note that here we test for yy_c_buf_p "<=" to the position
+		 * of the first EOB in the buffer, since yy_c_buf_p will
+		 * already have been incremented past the NUL character
+		 * (since all states make transitions on EOB to the
+		 * end-of-buffer state).  Contrast this with the test
+		 * in input().
+		 */
+		if ( (yy_c_buf_p) <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
+			{ /* This was really a NUL. */
+			yy_state_type yy_next_state;
+
+			(yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text;
+
+			yy_current_state = yy_get_previous_state(  );
+
+			/* Okay, we're now positioned to make the NUL
+			 * transition.  We couldn't have
+			 * yy_get_previous_state() go ahead and do it
+			 * for us because it doesn't know how to deal
+			 * with the possibility of jamming (and we don't
+			 * want to build jamming into it because then it
+			 * will run more slowly).
+			 */
+
+			yy_next_state = yy_try_NUL_trans( yy_current_state );
+
+			yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+
+			if ( yy_next_state )
+				{
+				/* Consume the NUL. */
+				yy_cp = ++(yy_c_buf_p);
+				yy_current_state = yy_next_state;
+				goto yy_match;
+				}
+
+			else
+				{
+				yy_cp = (yy_c_buf_p);
+				goto yy_find_action;
+				}
+			}
+
+		else switch ( yy_get_next_buffer(  ) )
+			{
+			case EOB_ACT_END_OF_FILE:
+				{
+				(yy_did_buffer_switch_on_eof) = 0;
+
+				if ( pmix_util_keyval_yywrap( ) )
+					{
+					/* Note: because we've taken care in
+					 * yy_get_next_buffer() to have set up
+					 * pmix_util_keyval_yytext, we can now set up
+					 * yy_c_buf_p so that if some total
+					 * hoser (like flex itself) wants to
+					 * call the scanner after we return the
+					 * YY_NULL, it'll still work - another
+					 * YY_NULL will get returned.
+					 */
+					(yy_c_buf_p) = (yytext_ptr) + YY_MORE_ADJ;
+
+					yy_act = YY_STATE_EOF(YY_START);
+					goto do_action;
+					}
+
+				else
+					{
+					if ( ! (yy_did_buffer_switch_on_eof) )
+						YY_NEW_FILE;
+					}
+				break;
+				}
+
+			case EOB_ACT_CONTINUE_SCAN:
+				(yy_c_buf_p) =
+					(yytext_ptr) + yy_amount_of_matched_text;
+
+				yy_current_state = yy_get_previous_state(  );
+
+				yy_cp = (yy_c_buf_p);
+				yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+				goto yy_match;
+
+			case EOB_ACT_LAST_MATCH:
+				(yy_c_buf_p) =
+				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)];
+
+				yy_current_state = yy_get_previous_state(  );
+
+				yy_cp = (yy_c_buf_p);
+				yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+				goto yy_find_action;
+			}
+		break;
+		}
+
+	default:
+		YY_FATAL_ERROR(
+			"fatal flex scanner internal error--no action found" );
+	} /* end of action switch */
+		} /* end of scanning one token */
+} /* end of pmix_util_keyval_yylex */
+
+/* yy_get_next_buffer - try to read in a new buffer
+ *
+ * Returns a code representing an action:
+ *	EOB_ACT_LAST_MATCH -
+ *	EOB_ACT_CONTINUE_SCAN - continue scanning from current position
+ *	EOB_ACT_END_OF_FILE - end of file
+ */
+static int yy_get_next_buffer (void)
+{
+    	register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
+	register char *source = (yytext_ptr);
+	register int number_to_move, i;
+	int ret_val;
+
+	if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
+		YY_FATAL_ERROR(
+		"fatal flex scanner internal error--end of buffer missed" );
+
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 )
+		{ /* Don't try to fill the buffer, so this is an EOF. */
+		if ( (yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1 )
+			{
+			/* We matched a single character, the EOB, so
+			 * treat this as a final EOF.
+			 */
+			return EOB_ACT_END_OF_FILE;
+			}
+
+		else
+			{
+			/* We matched some text prior to the EOB, first
+			 * process it.
+			 */
+			return EOB_ACT_LAST_MATCH;
+			}
+		}
+
+	/* Try to read more data. */
+
+	/* First move last chars to start of buffer. */
+	number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1;
+
+	for ( i = 0; i < number_to_move; ++i )
+		*(dest++) = *(source++);
+
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING )
+		/* don't do the read, it's not guaranteed to return an EOF,
+		 * just force an EOF
+		 */
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0;
+
+	else
+		{
+			yy_size_t num_to_read =
+			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
+
+		while ( num_to_read <= 0 )
+			{ /* Not enough room in the buffer - grow it. */
+
+			YY_FATAL_ERROR(
+"input buffer overflow, can't enlarge buffer because scanner uses REJECT" );
+
+			}
+
+		if ( num_to_read > YY_READ_BUF_SIZE )
+			num_to_read = YY_READ_BUF_SIZE;
+
+		/* Read in more data. */
+		YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
+			(yy_n_chars), num_to_read );
+
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+		}
+
+	if ( (yy_n_chars) == 0 )
+		{
+		if ( number_to_move == YY_MORE_ADJ )
+			{
+			ret_val = EOB_ACT_END_OF_FILE;
+			pmix_util_keyval_yyrestart(pmix_util_keyval_yyin  );
+			}
+
+		else
+			{
+			ret_val = EOB_ACT_LAST_MATCH;
+			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status =
+				YY_BUFFER_EOF_PENDING;
+			}
+		}
+
+	else
+		ret_val = EOB_ACT_CONTINUE_SCAN;
+
+	if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
+		/* Extend the array by 50%, plus the number we really need. */
+		yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
+		YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) pmix_util_keyval_yyrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size  );
+		if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
+			YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
+	}
+
+	(yy_n_chars) += number_to_move;
+	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR;
+	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR;
+
+	(yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0];
+
+	return ret_val;
+}
+
+/* yy_get_previous_state - get the state just before the EOB char was reached */
+
+    static yy_state_type yy_get_previous_state (void)
+{
+	register yy_state_type yy_current_state;
+	register char *yy_cp;
+    
+	yy_current_state = (yy_start);
+
+	(yy_state_ptr) = (yy_state_buf);
+	*(yy_state_ptr)++ = yy_current_state;
+
+	for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
+		{
+		register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
+		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+			{
+			yy_current_state = (int) yy_def[yy_current_state];
+			if ( yy_current_state >= 84 )
+				yy_c = yy_meta[(unsigned int) yy_c];
+			}
+		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+		*(yy_state_ptr)++ = yy_current_state;
+		}
+
+	return yy_current_state;
+}
+
+/* yy_try_NUL_trans - try to make a transition on the NUL character
+ *
+ * synopsis
+ *	next_state = yy_try_NUL_trans( current_state );
+ */
+    static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state )
+{
+	register int yy_is_jam;
+    
+	register YY_CHAR yy_c = 1;
+	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+		{
+		yy_current_state = (int) yy_def[yy_current_state];
+		if ( yy_current_state >= 84 )
+			yy_c = yy_meta[(unsigned int) yy_c];
+		}
+	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+	yy_is_jam = (yy_current_state == 83);
+	if ( ! yy_is_jam )
+		*(yy_state_ptr)++ = yy_current_state;
+
+		return yy_is_jam ? 0 : yy_current_state;
+}
+
+#ifndef YY_NO_INPUT
+#ifdef __cplusplus
+    static int yyinput (void)
+#else
+    static int input  (void)
+#endif
+
+{
+	int c;
+    
+	*(yy_c_buf_p) = (yy_hold_char);
+
+	if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
+		{
+		/* yy_c_buf_p now points to the character we want to return.
+		 * If this occurs *before* the EOB characters, then it's a
+		 * valid NUL; if not, then we've hit the end of the buffer.
+		 */
+		if ( (yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
+			/* This was really a NUL. */
+			*(yy_c_buf_p) = '\0';
+
+		else
+			{ /* need more input */
+			yy_size_t offset = (yy_c_buf_p) - (yytext_ptr);
+			++(yy_c_buf_p);
+
+			switch ( yy_get_next_buffer(  ) )
+				{
+				case EOB_ACT_LAST_MATCH:
+					/* This happens because yy_g_n_b()
+					 * sees that we've accumulated a
+					 * token and flags that we need to
+					 * try matching the token before
+					 * proceeding.  But for input(),
+					 * there's no matching to consider.
+					 * So convert the EOB_ACT_LAST_MATCH
+					 * to EOB_ACT_END_OF_FILE.
+					 */
+
+					/* Reset buffer status. */
+					pmix_util_keyval_yyrestart(pmix_util_keyval_yyin );
+
+					/*FALLTHROUGH*/
+
+				case EOB_ACT_END_OF_FILE:
+					{
+					if ( pmix_util_keyval_yywrap( ) )
+						return EOF;
+
+					if ( ! (yy_did_buffer_switch_on_eof) )
+						YY_NEW_FILE;
+#ifdef __cplusplus
+					return yyinput();
+#else
+					return input();
+#endif
+					}
+
+				case EOB_ACT_CONTINUE_SCAN:
+					(yy_c_buf_p) = (yytext_ptr) + offset;
+					break;
+				}
+			}
+		}
+
+	c = *(unsigned char *) (yy_c_buf_p);	/* cast for 8-bit char's */
+	*(yy_c_buf_p) = '\0';	/* preserve pmix_util_keyval_yytext */
+	(yy_hold_char) = *++(yy_c_buf_p);
+
+	if ( c == '\n' )
+		   
+    pmix_util_keyval_yylineno++;
+;
+
+	return c;
+}
+#endif	/* ifndef YY_NO_INPUT */
+
+/** Immediately switch to a different input stream.
+ * @param input_file A readable stream.
+ * 
+ * @note This function does not reset the start condition to @c INITIAL .
+ */
+    void pmix_util_keyval_yyrestart  (FILE * input_file )
+{
+    
+	if ( ! YY_CURRENT_BUFFER ){
+        pmix_util_keyval_yyensure_buffer_stack ();
+		YY_CURRENT_BUFFER_LVALUE =
+            pmix_util_keyval_yy_create_buffer(pmix_util_keyval_yyin,YY_BUF_SIZE );
+	}
+
+	pmix_util_keyval_yy_init_buffer(YY_CURRENT_BUFFER,input_file );
+	pmix_util_keyval_yy_load_buffer_state( );
+}
+
+/** Switch to a different input buffer.
+ * @param new_buffer The new input buffer.
+ * 
+ */
+    void pmix_util_keyval_yy_switch_to_buffer  (YY_BUFFER_STATE  new_buffer )
+{
+    
+	/* TODO. We should be able to replace this entire function body
+	 * with
+	 *		pmix_util_keyval_yypop_buffer_state();
+	 *		pmix_util_keyval_yypush_buffer_state(new_buffer);
+     */
+	pmix_util_keyval_yyensure_buffer_stack ();
+	if ( YY_CURRENT_BUFFER == new_buffer )
+		return;
+
+	if ( YY_CURRENT_BUFFER )
+		{
+		/* Flush out information for old buffer. */
+		*(yy_c_buf_p) = (yy_hold_char);
+		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+		}
+
+	YY_CURRENT_BUFFER_LVALUE = new_buffer;
+	pmix_util_keyval_yy_load_buffer_state( );
+
+	/* We don't actually know whether we did this switch during
+	 * EOF (pmix_util_keyval_yywrap()) processing, but the only time this flag
+	 * is looked at is after pmix_util_keyval_yywrap() is called, so it's safe
+	 * to go ahead and always set it.
+	 */
+	(yy_did_buffer_switch_on_eof) = 1;
+}
+
+static void pmix_util_keyval_yy_load_buffer_state  (void)
+{
+    	(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+	(yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
+	pmix_util_keyval_yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
+	(yy_hold_char) = *(yy_c_buf_p);
+}
+
+/** Allocate and initialize an input buffer state.
+ * @param file A readable stream.
+ * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.
+ * 
+ * @return the allocated buffer state.
+ */
+    YY_BUFFER_STATE pmix_util_keyval_yy_create_buffer  (FILE * file, int  size )
+{
+	YY_BUFFER_STATE b;
+    
+	b = (YY_BUFFER_STATE) pmix_util_keyval_yyalloc(sizeof( struct yy_buffer_state )  );
+	if ( ! b )
+		YY_FATAL_ERROR( "out of dynamic memory in pmix_util_keyval_yy_create_buffer()" );
+
+	b->yy_buf_size = size;
+
+	/* yy_ch_buf has to be 2 characters longer than the size given because
+	 * we need to put in 2 end-of-buffer characters.
+	 */
+	b->yy_ch_buf = (char *) pmix_util_keyval_yyalloc(b->yy_buf_size + 2  );
+	if ( ! b->yy_ch_buf )
+		YY_FATAL_ERROR( "out of dynamic memory in pmix_util_keyval_yy_create_buffer()" );
+
+	b->yy_is_our_buffer = 1;
+
+	pmix_util_keyval_yy_init_buffer(b,file );
+
+	return b;
+}
+
+/** Destroy the buffer.
+ * @param b a buffer created with pmix_util_keyval_yy_create_buffer()
+ * 
+ */
+    void pmix_util_keyval_yy_delete_buffer (YY_BUFFER_STATE  b )
+{
+    
+	if ( ! b )
+		return;
+
+	if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */
+		YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
+
+	if ( b->yy_is_our_buffer )
+		pmix_util_keyval_yyfree((void *) b->yy_ch_buf  );
+
+	pmix_util_keyval_yyfree((void *) b  );
+}
+
+/* Initializes or reinitializes a buffer.
+ * This function is sometimes called more than once on the same buffer,
+ * such as during a pmix_util_keyval_yyrestart() or at EOF.
+ */
+    static void pmix_util_keyval_yy_init_buffer  (YY_BUFFER_STATE  b, FILE * file )
+
+{
+	int oerrno = errno;
+    
+	pmix_util_keyval_yy_flush_buffer(b );
+
+	b->yy_input_file = file;
+	b->yy_fill_buffer = 1;
+
+    /* If b is the current buffer, then pmix_util_keyval_yy_init_buffer was _probably_
+     * called from pmix_util_keyval_yyrestart() or through yy_get_next_buffer.
+     * In that case, we don't want to reset the lineno or column.
+     */
+    if (b != YY_CURRENT_BUFFER){
+        b->yy_bs_lineno = 1;
+        b->yy_bs_column = 0;
+    }
+
+        b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
+    
+	errno = oerrno;
+}
+
+/** Discard all buffered characters. On the next scan, YY_INPUT will be called.
+ * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
+ * 
+ */
+    void pmix_util_keyval_yy_flush_buffer (YY_BUFFER_STATE  b )
+{
+    	if ( ! b )
+		return;
+
+	b->yy_n_chars = 0;
+
+	/* We always need two end-of-buffer characters.  The first causes
+	 * a transition to the end-of-buffer state.  The second causes
+	 * a jam in that state.
+	 */
+	b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR;
+	b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR;
+
+	b->yy_buf_pos = &b->yy_ch_buf[0];
+
+	b->yy_at_bol = 1;
+	b->yy_buffer_status = YY_BUFFER_NEW;
+
+	if ( b == YY_CURRENT_BUFFER )
+		pmix_util_keyval_yy_load_buffer_state( );
+}
+
+/** Pushes the new state onto the stack. The new state becomes
+ *  the current state. This function will allocate the stack
+ *  if necessary.
+ *  @param new_buffer The new state.
+ *  
+ */
+void pmix_util_keyval_yypush_buffer_state (YY_BUFFER_STATE new_buffer )
+{
+    	if (new_buffer == NULL)
+		return;
+
+	pmix_util_keyval_yyensure_buffer_stack();
+
+	/* This block is copied from pmix_util_keyval_yy_switch_to_buffer. */
+	if ( YY_CURRENT_BUFFER )
+		{
+		/* Flush out information for old buffer. */
+		*(yy_c_buf_p) = (yy_hold_char);
+		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+		}
+
+	/* Only push if top exists. Otherwise, replace top. */
+	if (YY_CURRENT_BUFFER)
+		(yy_buffer_stack_top)++;
+	YY_CURRENT_BUFFER_LVALUE = new_buffer;
+
+	/* copied from pmix_util_keyval_yy_switch_to_buffer. */
+	pmix_util_keyval_yy_load_buffer_state( );
+	(yy_did_buffer_switch_on_eof) = 1;
+}
+
+/** Removes and deletes the top of the stack, if present.
+ *  The next element becomes the new top.
+ *  
+ */
+void pmix_util_keyval_yypop_buffer_state (void)
+{
+    	if (!YY_CURRENT_BUFFER)
+		return;
+
+	pmix_util_keyval_yy_delete_buffer(YY_CURRENT_BUFFER );
+	YY_CURRENT_BUFFER_LVALUE = NULL;
+	if ((yy_buffer_stack_top) > 0)
+		--(yy_buffer_stack_top);
+
+	if (YY_CURRENT_BUFFER) {
+		pmix_util_keyval_yy_load_buffer_state( );
+		(yy_did_buffer_switch_on_eof) = 1;
+	}
+}
+
+/* Allocates the stack if it does not exist.
+ *  Guarantees space for at least one push.
+ */
+static void pmix_util_keyval_yyensure_buffer_stack (void)
+{
+	yy_size_t num_to_alloc;
+    
+	if (!(yy_buffer_stack)) {
+
+		/* First allocation is just for 2 elements, since we don't know if this
+		 * scanner will even need a stack. We use 2 instead of 1 to avoid an
+		 * immediate realloc on the next call.
+         */
+		num_to_alloc = 1;
+		(yy_buffer_stack) = (struct yy_buffer_state**)pmix_util_keyval_yyalloc
+								(num_to_alloc * sizeof(struct yy_buffer_state*)
+								);
+		if ( ! (yy_buffer_stack) )
+			YY_FATAL_ERROR( "out of dynamic memory in pmix_util_keyval_yyensure_buffer_stack()" );
+								  
+		memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
+				
+		(yy_buffer_stack_max) = num_to_alloc;
+		(yy_buffer_stack_top) = 0;
+		return;
+	}
+
+	if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){
+
+		/* Increase the buffer to prepare for a possible push. */
+		int grow_size = 8 /* arbitrary grow size */;
+
+		num_to_alloc = (yy_buffer_stack_max) + grow_size;
+		(yy_buffer_stack) = (struct yy_buffer_state**)pmix_util_keyval_yyrealloc
+								((yy_buffer_stack),
+								num_to_alloc * sizeof(struct yy_buffer_state*)
+								);
+		if ( ! (yy_buffer_stack) )
+			YY_FATAL_ERROR( "out of dynamic memory in pmix_util_keyval_yyensure_buffer_stack()" );
+
+		/* zero only the new slots.*/
+		memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*));
+		(yy_buffer_stack_max) = num_to_alloc;
+	}
+}
+
+/** Setup the input buffer state to scan directly from a user-specified character buffer.
+ * @param base the character buffer
+ * @param size the size in bytes of the character buffer
+ * 
+ * @return the newly allocated buffer state object. 
+ */
+YY_BUFFER_STATE pmix_util_keyval_yy_scan_buffer  (char * base, yy_size_t  size )
+{
+	YY_BUFFER_STATE b;
+    
+	if ( size < 2 ||
+	     base[size-2] != YY_END_OF_BUFFER_CHAR ||
+	     base[size-1] != YY_END_OF_BUFFER_CHAR )
+		/* They forgot to leave room for the EOB's. */
+		return 0;
+
+	b = (YY_BUFFER_STATE) pmix_util_keyval_yyalloc(sizeof( struct yy_buffer_state )  );
+	if ( ! b )
+		YY_FATAL_ERROR( "out of dynamic memory in pmix_util_keyval_yy_scan_buffer()" );
+
+	b->yy_buf_size = size - 2;	/* "- 2" to take care of EOB's */
+	b->yy_buf_pos = b->yy_ch_buf = base;
+	b->yy_is_our_buffer = 0;
+	b->yy_input_file = 0;
+	b->yy_n_chars = b->yy_buf_size;
+	b->yy_is_interactive = 0;
+	b->yy_at_bol = 1;
+	b->yy_fill_buffer = 0;
+	b->yy_buffer_status = YY_BUFFER_NEW;
+
+	pmix_util_keyval_yy_switch_to_buffer(b  );
+
+	return b;
+}
+
+/** Setup the input buffer state to scan a string. The next call to pmix_util_keyval_yylex() will
+ * scan from a @e copy of @a str.
+ * @param yystr a NUL-terminated string to scan
+ * 
+ * @return the newly allocated buffer state object.
+ * @note If you want to scan bytes that may contain NUL values, then use
+ *       pmix_util_keyval_yy_scan_bytes() instead.
+ */
+YY_BUFFER_STATE pmix_util_keyval_yy_scan_string (yyconst char * yystr )
+{
+    
+	return pmix_util_keyval_yy_scan_bytes(yystr,strlen(yystr) );
+}
+
+/** Setup the input buffer state to scan the given bytes. The next call to pmix_util_keyval_yylex() will
+ * scan from a @e copy of @a bytes.
+ * @param yybytes the byte buffer to scan
+ * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
+ * 
+ * @return the newly allocated buffer state object.
+ */
+YY_BUFFER_STATE pmix_util_keyval_yy_scan_bytes  (yyconst char * yybytes, yy_size_t  _yybytes_len )
+{
+	YY_BUFFER_STATE b;
+	char *buf;
+	yy_size_t n;
+	int i;
+    
+	/* Get memory for full buffer, including space for trailing EOB's. */
+	n = _yybytes_len + 2;
+	buf = (char *) pmix_util_keyval_yyalloc(n  );
+	if ( ! buf )
+		YY_FATAL_ERROR( "out of dynamic memory in pmix_util_keyval_yy_scan_bytes()" );
+
+	for ( i = 0; i < _yybytes_len; ++i )
+		buf[i] = yybytes[i];
+
+	buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;
+
+	b = pmix_util_keyval_yy_scan_buffer(buf,n );
+	if ( ! b )
+		YY_FATAL_ERROR( "bad buffer in pmix_util_keyval_yy_scan_bytes()" );
+
+	/* It's okay to grow etc. this buffer, and we should throw it
+	 * away when we're done.
+	 */
+	b->yy_is_our_buffer = 1;
+
+	return b;
+}
+
+#ifndef YY_EXIT_FAILURE
+#define YY_EXIT_FAILURE 2
+#endif
+
+static void yy_fatal_error (yyconst char* msg )
+{
+    	(void) fprintf( stderr, "%s\n", msg );
+	exit( YY_EXIT_FAILURE );
+}
+
+/* Redefine yyless() so it works in section 3 code. */
+
+#undef yyless
+#define yyless(n) \
+	do \
+		{ \
+		/* Undo effects of setting up pmix_util_keyval_yytext. */ \
+        int yyless_macro_arg = (n); \
+        YY_LESS_LINENO(yyless_macro_arg);\
+		pmix_util_keyval_yytext[pmix_util_keyval_yyleng] = (yy_hold_char); \
+		(yy_c_buf_p) = pmix_util_keyval_yytext + yyless_macro_arg; \
+		(yy_hold_char) = *(yy_c_buf_p); \
+		*(yy_c_buf_p) = '\0'; \
+		pmix_util_keyval_yyleng = yyless_macro_arg; \
+		} \
+	while ( 0 )
+
+/* Accessor  methods (get/set functions) to struct members. */
+
+/** Get the current line number.
+ * 
+ */
+int pmix_util_keyval_yyget_lineno  (void)
+{
+        
+    return pmix_util_keyval_yylineno;
+}
+
+/** Get the input stream.
+ * 
+ */
+FILE *pmix_util_keyval_yyget_in  (void)
+{
+        return pmix_util_keyval_yyin;
+}
+
+/** Get the output stream.
+ * 
+ */
+FILE *pmix_util_keyval_yyget_out  (void)
+{
+        return pmix_util_keyval_yyout;
+}
+
+/** Get the length of the current token.
+ * 
+ */
+yy_size_t pmix_util_keyval_yyget_leng  (void)
+{
+        return pmix_util_keyval_yyleng;
+}
+
+/** Get the current token.
+ * 
+ */
+
+char *pmix_util_keyval_yyget_text  (void)
+{
+        return pmix_util_keyval_yytext;
+}
+
+/** Set the current line number.
+ * @param line_number
+ * 
+ */
+void pmix_util_keyval_yyset_lineno (int  line_number )
+{
+    
+    pmix_util_keyval_yylineno = line_number;
+}
+
+/** Set the input stream. This does not discard the current
+ * input buffer.
+ * @param in_str A readable stream.
+ * 
+ * @see pmix_util_keyval_yy_switch_to_buffer
+ */
+void pmix_util_keyval_yyset_in (FILE *  in_str )
+{
+        pmix_util_keyval_yyin = in_str ;
+}
+
+void pmix_util_keyval_yyset_out (FILE *  out_str )
+{
+        pmix_util_keyval_yyout = out_str ;
+}
+
+int pmix_util_keyval_yyget_debug  (void)
+{
+        return pmix_util_keyval_yy_flex_debug;
+}
+
+void pmix_util_keyval_yyset_debug (int  bdebug )
+{
+        pmix_util_keyval_yy_flex_debug = bdebug ;
+}
+
+static int yy_init_globals (void)
+{
+        /* Initialization is the same as for the non-reentrant scanner.
+     * This function is called from pmix_util_keyval_yylex_destroy(), so don't allocate here.
+     */
+
+    /* We do not touch pmix_util_keyval_yylineno unless the option is enabled. */
+    pmix_util_keyval_yylineno =  1;
+    
+    (yy_buffer_stack) = 0;
+    (yy_buffer_stack_top) = 0;
+    (yy_buffer_stack_max) = 0;
+    (yy_c_buf_p) = (char *) 0;
+    (yy_init) = 0;
+    (yy_start) = 0;
+
+    (yy_state_buf) = 0;
+    (yy_state_ptr) = 0;
+    (yy_full_match) = 0;
+    (yy_lp) = 0;
+
+/* Defined in main.c */
+#ifdef YY_STDINIT
+    pmix_util_keyval_yyin = stdin;
+    pmix_util_keyval_yyout = stdout;
+#else
+    pmix_util_keyval_yyin = (FILE *) 0;
+    pmix_util_keyval_yyout = (FILE *) 0;
+#endif
+
+    /* For future reference: Set errno on error, since we are called by
+     * pmix_util_keyval_yylex_init()
+     */
+    return 0;
+}
+
+/* pmix_util_keyval_yylex_destroy is for both reentrant and non-reentrant scanners. */
+int pmix_util_keyval_yylex_destroy  (void)
+{
+    
+    /* Pop the buffer stack, destroying each element. */
+	while(YY_CURRENT_BUFFER){
+		pmix_util_keyval_yy_delete_buffer(YY_CURRENT_BUFFER  );
+		YY_CURRENT_BUFFER_LVALUE = NULL;
+		pmix_util_keyval_yypop_buffer_state();
+	}
+
+	/* Destroy the stack itself. */
+	pmix_util_keyval_yyfree((yy_buffer_stack) );
+	(yy_buffer_stack) = NULL;
+
+    pmix_util_keyval_yyfree ( (yy_state_buf) );
+    (yy_state_buf)  = NULL;
+
+    /* Reset the globals. This is important in a non-reentrant scanner so the next time
+     * pmix_util_keyval_yylex() is called, initialization will occur. */
+    yy_init_globals( );
+
+    return 0;
+}
+
+/*
+ * Internal utility routines.
+ */
+
+#ifndef yytext_ptr
+static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
+{
+	register int i;
+	for ( i = 0; i < n; ++i )
+		s1[i] = s2[i];
+}
+#endif
+
+#ifdef YY_NEED_STRLEN
+static int yy_flex_strlen (yyconst char * s )
+{
+	register int n;
+	for ( n = 0; s[n]; ++n )
+		;
+
+	return n;
+}
+#endif
+
+void *pmix_util_keyval_yyalloc (yy_size_t  size )
+{
+	return (void *) malloc( size );
+}
+
+void *pmix_util_keyval_yyrealloc  (void * ptr, yy_size_t  size )
+{
+	/* The cast to (char *) in the following accommodates both
+	 * implementations that use char* generic pointers, and those
+	 * that use void* generic pointers.  It works with the latter
+	 * because both ANSI C and C++ allow castless assignment from
+	 * any pointer type to void*, and deal with argument conversions
+	 * as though doing an assignment.
+	 */
+	return (void *) realloc( (char *) ptr, size );
+}
+
+void pmix_util_keyval_yyfree (void * ptr )
+{
+	free( (char *) ptr );	/* see pmix_util_keyval_yyrealloc() for (char *) cast */
+}
+
+#define YYTABLES_NAME "yytables"
+
+#line 94 "keyval_lex.l"
+
+
+
+/* Old flex (2.5.4a? and older) does not define a destroy function */
+#if !defined(YY_FLEX_SUBMINOR_VERSION)
+#define YY_FLEX_SUBMINOR_VERSION 0
+#endif
+
+#if (YY_FLEX_MAJOR_VERSION < 2) || (YY_FLEX_MAJOR_VERSION == 2 && (YY_FLEX_MINOR_VERSION < 5 || (YY_FLEX_MINOR_VERSION == 5 && YY_FLEX_SUBMINOR_VERSION < 5)))
+int pmix_util_keyval_yylex_destroy(void)
+{
+    if (NULL != YY_CURRENT_BUFFER) {
+        pmix_util_keyval_yy_delete_buffer(YY_CURRENT_BUFFER);
+#if defined(YY_CURRENT_BUFFER_LVALUE)
+        YY_CURRENT_BUFFER_LVALUE = NULL;
+#else
+        YY_CURRENT_BUFFER = NULL;
+#endif  /* YY_CURRENT_BUFFER_LVALUE */
+    }
+    return YY_NULL;
+}
+#endif
+
+int pmix_util_keyval_yywrap(void)
+{
+    pmix_util_keyval_parse_done = true;
+    return 1;
+}
+
+/*
+ * Ensure that we have a valid yybuffer to use.  Specifically, if this
+ * scanner is invoked a second time, finish_parsing() (above) will
+ * have been executed, and the current buffer will have been freed.
+ * Flex doesn't recognize this fact because as far as it's concerned,
+ * its internal state was already initialized, so it thinks it should
+ * have a valid buffer.  Hence, here we ensure to give it a valid
+ * buffer.
+ */
+int pmix_util_keyval_init_buffer(FILE *file)
+{
+    YY_BUFFER_STATE buf = pmix_util_keyval_yy_create_buffer(file,YY_BUF_SIZE);
+    pmix_util_keyval_yy_switch_to_buffer(buf);
+
+    return 0;
+}
+
diff --git a/src/util/keyval/keyval_lex.h b/src/util/keyval/keyval_lex.h
new file mode 100644
index 0000000..7789827
--- /dev/null
+++ b/src/util/keyval/keyval_lex.h
@@ -0,0 +1,74 @@
+/* -*- C -*-
+ *
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2005 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ # Copyright (c) 2016      Intel, Inc. All rights reserved
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#ifndef PMIX_UTIL_KEYVAL_LEX_H_
+#define PMIX_UTIL_KEYVAL_LEX_H_
+
+#include <src/include/pmix_config.h>
+
+#ifdef malloc
+#undef malloc
+#endif
+#ifdef realloc
+#undef realloc
+#endif
+#ifdef free
+#undef free
+#endif
+
+#include <stdio.h>
+
+int pmix_util_keyval_yylex(void);
+int pmix_util_keyval_init_buffer(FILE *file);
+int pmix_util_keyval_yylex_destroy(void);
+
+extern FILE *pmix_util_keyval_yyin;
+extern bool pmix_util_keyval_parse_done;
+extern char *pmix_util_keyval_yytext;
+extern int pmix_util_keyval_yynewlines;
+extern int pmix_util_keyval_yylineno;
+
+/*
+ * Make lex-generated files not issue compiler warnings
+ */
+#define YY_STACK_USED 0
+#define YY_ALWAYS_INTERACTIVE 0
+#define YY_NEVER_INTERACTIVE 0
+#define YY_MAIN 0
+#define YY_NO_UNPUT 1
+#define YY_SKIP_YYWRAP 1
+
+enum pmix_keyval_parse_state_t {
+    PMIX_UTIL_KEYVAL_PARSE_DONE,
+    PMIX_UTIL_KEYVAL_PARSE_ERROR,
+
+    PMIX_UTIL_KEYVAL_PARSE_NEWLINE,
+    PMIX_UTIL_KEYVAL_PARSE_EQUAL,
+    PMIX_UTIL_KEYVAL_PARSE_SINGLE_WORD,
+    PMIX_UTIL_KEYVAL_PARSE_VALUE,
+    PMIX_UTIL_KEYVAL_PARSE_MCAVAR,
+    PMIX_UTIL_KEYVAL_PARSE_ENVVAR,
+    PMIX_UTIL_KEYVAL_PARSE_ENVEQL,
+
+    PMIX_UTIL_KEYVAL_PARSE_MAX
+};
+typedef enum pmix_keyval_parse_state_t pmix_keyval_parse_state_t;
+
+#endif
diff --git a/src/util/keyval/keyval_lex.l b/src/util/keyval/keyval_lex.l
new file mode 100644
index 0000000..9b9d0d6
--- /dev/null
+++ b/src/util/keyval/keyval_lex.l
@@ -0,0 +1,137 @@
+%option nounput
+%option noinput
+%option yylineno
+
+%{ /* -*- C -*- */
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2006 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2012      Los Alamos National Security, LLC. All rights
+ *                         reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+
+#include <stdio.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#include "src/util/keyval/keyval_lex.h"
+
+/*
+ * local functions
+ */
+
+BEGIN_C_DECLS
+
+int pmix_util_keyval_yywrap(void);
+
+END_C_DECLS
+
+/*
+ * global variables
+ */
+int pmix_util_keyval_yynewlines = 1;
+bool pmix_util_keyval_parse_done = false;
+char *pmix_util_keyval_string = NULL;
+
+%}
+
+WHITE       [\f\t\v ]
+CHAR        [A-Za-z0-9_\-\.]
+
+%x VALUE
+%x comment
+%x MCA_VALUE
+
+%%
+
+{WHITE}*\n          { pmix_util_keyval_yynewlines++; return PMIX_UTIL_KEYVAL_PARSE_NEWLINE; }
+#.*\n               { pmix_util_keyval_yynewlines++; return PMIX_UTIL_KEYVAL_PARSE_NEWLINE; }
+"//".*\n            { pmix_util_keyval_yynewlines++; return PMIX_UTIL_KEYVAL_PARSE_NEWLINE; }
+
+"/*"                { BEGIN(comment);
+                      return PMIX_UTIL_KEYVAL_PARSE_NEWLINE; }
+<comment>[^*\n]*       ; /* Eat up non '*'s */
+<comment>"*"+[^*/\n]*  ; /* Eat '*'s not followed by a '/' */
+<comment>\n         { pmix_util_keyval_yynewlines++;
+                      return PMIX_UTIL_KEYVAL_PARSE_NEWLINE; }
+<comment>"*"+"/"    { BEGIN(INITIAL); /* Done with Block Comment */
+                      return PMIX_UTIL_KEYVAL_PARSE_NEWLINE; }
+
+{WHITE}*"="{WHITE}* { BEGIN(VALUE); return PMIX_UTIL_KEYVAL_PARSE_EQUAL; }
+{WHITE}+            ; /* whitespace */
+{CHAR}+             { return PMIX_UTIL_KEYVAL_PARSE_SINGLE_WORD; }
+
+<VALUE>{WHITE}*\n   { BEGIN(INITIAL); return PMIX_UTIL_KEYVAL_PARSE_NEWLINE; }
+<VALUE>[^\n]*[^\t \n]/[\t ]*      { return PMIX_UTIL_KEYVAL_PARSE_VALUE; }
+
+<MCA_VALUE>[^\n \t]+      { BEGIN(INITIAL); return PMIX_UTIL_KEYVAL_PARSE_VALUE; }
+<MCA_VALUE>"'"[^\n]*"'"{WHITE}+      { BEGIN(INITIAL); return PMIX_UTIL_KEYVAL_PARSE_VALUE; }
+<MCA_VALUE>"\""[^\n]*"\""{WHITE}+      { BEGIN(INITIAL); return PMIX_UTIL_KEYVAL_PARSE_VALUE; }
+<MCA_VALUE>{WHITE}*\n   { BEGIN(INITIAL); BEGIN(INITIAL); return PMIX_UTIL_KEYVAL_PARSE_NEWLINE; }
+
+"-"?"-mca"{WHITE}+{CHAR}+{WHITE}+ {BEGIN(MCA_VALUE); return PMIX_UTIL_KEYVAL_PARSE_MCAVAR; }
+"-"?"-x"{WHITE}+{CHAR}+{WHITE}*"="{WHITE}* {BEGIN(MCA_VALUE); return PMIX_UTIL_KEYVAL_PARSE_ENVEQL; }
+"-"?"-x"{WHITE}+{CHAR}+{WHITE}*/[^=] { return PMIX_UTIL_KEYVAL_PARSE_ENVVAR; }
+
+.	            { return PMIX_UTIL_KEYVAL_PARSE_ERROR; }
+
+%%
+
+/* Old flex (2.5.4a? and older) does not define a destroy function */
+#if !defined(YY_FLEX_SUBMINOR_VERSION)
+#define YY_FLEX_SUBMINOR_VERSION 0
+#endif
+
+#if (YY_FLEX_MAJOR_VERSION < 2) || (YY_FLEX_MAJOR_VERSION == 2 && (YY_FLEX_MINOR_VERSION < 5 || (YY_FLEX_MINOR_VERSION == 5 && YY_FLEX_SUBMINOR_VERSION < 5)))
+int pmix_util_keyval_yylex_destroy(void)
+{
+    if (NULL != YY_CURRENT_BUFFER) {
+        yy_delete_buffer(YY_CURRENT_BUFFER);
+#if defined(YY_CURRENT_BUFFER_LVALUE)
+        YY_CURRENT_BUFFER_LVALUE = NULL;
+#else
+        YY_CURRENT_BUFFER = NULL;
+#endif  /* YY_CURRENT_BUFFER_LVALUE */
+    }
+    return YY_NULL;
+}
+#endif
+
+int pmix_util_keyval_yywrap(void)
+{
+    pmix_util_keyval_parse_done = true;
+    return 1;
+}
+
+/*
+ * Ensure that we have a valid yybuffer to use.  Specifically, if this
+ * scanner is invoked a second time, finish_parsing() (above) will
+ * have been executed, and the current buffer will have been freed.
+ * Flex doesn't recognize this fact because as far as it's concerned,
+ * its internal state was already initialized, so it thinks it should
+ * have a valid buffer.  Hence, here we ensure to give it a valid
+ * buffer.
+ */
+int pmix_util_keyval_init_buffer(FILE *file)
+{
+    YY_BUFFER_STATE buf = yy_create_buffer(file, YY_BUF_SIZE);
+    yy_switch_to_buffer(buf);
+
+    return 0;
+}
diff --git a/src/util/keyval_parse.c b/src/util/keyval_parse.c
new file mode 100644
index 0000000..c07e65e
--- /dev/null
+++ b/src/util/keyval_parse.c
@@ -0,0 +1,363 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2005 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2015-2016 Los Alamos National Security, LLC. All rights
+ *                         reserved.
+ * Copyright (c) 2016      Intel, Inc. All rights reserved
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+
+#include "pmix_common.h"
+#include "src/util/keyval_parse.h"
+#include "src/util/keyval/keyval_lex.h"
+#include "src/util/output.h"
+#include <string.h>
+#include <ctype.h>
+
+int pmix_util_keyval_parse_lineno = 0;
+
+static const char *keyval_filename;
+static pmix_keyval_parse_fn_t keyval_callback;
+static char *key_buffer = NULL;
+static size_t key_buffer_len = 0;
+
+static int parse_line(void);
+static int parse_line_new(pmix_keyval_parse_state_t first_val);
+static void parse_error(int num);
+
+static char *env_str = NULL;
+static int envsize = 1024;
+
+int pmix_util_keyval_parse_init(void)
+{
+    return PMIX_SUCCESS;
+}
+
+
+int
+pmix_util_keyval_parse_finalize(void)
+{
+    if (NULL != key_buffer) free(key_buffer);
+    key_buffer = NULL;
+    key_buffer_len = 0;
+
+    return PMIX_SUCCESS;
+}
+
+int
+pmix_util_keyval_parse(const char *filename,
+                       pmix_keyval_parse_fn_t callback)
+{
+    int val;
+    int ret = PMIX_SUCCESS;;
+
+    keyval_filename = filename;
+    keyval_callback = callback;
+
+    /* Open the pmix */
+    pmix_util_keyval_yyin = fopen(keyval_filename, "r");
+    if (NULL == pmix_util_keyval_yyin) {
+        ret = PMIX_ERR_NOT_FOUND;
+        goto cleanup;
+    }
+
+    pmix_util_keyval_parse_done = false;
+    pmix_util_keyval_yynewlines = 1;
+    pmix_util_keyval_init_buffer(pmix_util_keyval_yyin);
+    while (!pmix_util_keyval_parse_done) {
+        val = pmix_util_keyval_yylex();
+        switch (val) {
+        case PMIX_UTIL_KEYVAL_PARSE_DONE:
+            /* This will also set pmix_util_keyval_parse_done to true, so just
+               break here */
+            break;
+
+        case PMIX_UTIL_KEYVAL_PARSE_NEWLINE:
+            /* blank line!  ignore it */
+            break;
+
+        case PMIX_UTIL_KEYVAL_PARSE_SINGLE_WORD:
+            parse_line();
+            break;
+
+        case PMIX_UTIL_KEYVAL_PARSE_MCAVAR:
+        case PMIX_UTIL_KEYVAL_PARSE_ENVVAR:
+        case PMIX_UTIL_KEYVAL_PARSE_ENVEQL:
+            parse_line_new(val);
+            break;
+
+        default:
+            /* anything else is an error */
+            parse_error(1);
+            break;
+        }
+    }
+    fclose(pmix_util_keyval_yyin);
+    pmix_util_keyval_yylex_destroy ();
+
+cleanup:
+    return ret;
+}
+
+
+
+static int parse_line(void)
+{
+    int val;
+
+    pmix_util_keyval_parse_lineno = pmix_util_keyval_yylineno;
+
+    /* Save the name name */
+    if (key_buffer_len < strlen(pmix_util_keyval_yytext) + 1) {
+        char *tmp;
+        key_buffer_len = strlen(pmix_util_keyval_yytext) + 1;
+        tmp = (char*)realloc(key_buffer, key_buffer_len);
+        if (NULL == tmp) {
+            free(key_buffer);
+            key_buffer_len = 0;
+            key_buffer = NULL;
+            return PMIX_ERR_OUT_OF_RESOURCE;
+        }
+        key_buffer = tmp;
+    }
+
+    strncpy(key_buffer, pmix_util_keyval_yytext, key_buffer_len);
+
+    /* The first thing we have to see is an "=" */
+
+    val = pmix_util_keyval_yylex();
+    if (pmix_util_keyval_parse_done || PMIX_UTIL_KEYVAL_PARSE_EQUAL != val) {
+        parse_error(2);
+        return PMIX_ERROR;
+    }
+
+    /* Next we get the value */
+
+    val = pmix_util_keyval_yylex();
+    if (PMIX_UTIL_KEYVAL_PARSE_SINGLE_WORD == val ||
+        PMIX_UTIL_KEYVAL_PARSE_VALUE == val) {
+        keyval_callback(key_buffer, pmix_util_keyval_yytext);
+
+        /* Now we need to see the newline */
+
+        val = pmix_util_keyval_yylex();
+        if (PMIX_UTIL_KEYVAL_PARSE_NEWLINE == val ||
+            PMIX_UTIL_KEYVAL_PARSE_DONE == val) {
+            return PMIX_SUCCESS;
+        }
+    }
+
+    /* Did we get an EOL or EOF? */
+
+    else if (PMIX_UTIL_KEYVAL_PARSE_DONE == val ||
+             PMIX_UTIL_KEYVAL_PARSE_NEWLINE == val) {
+        keyval_callback(key_buffer, NULL);
+        return PMIX_SUCCESS;
+    }
+
+    /* Nope -- we got something unexpected.  Bonk! */
+    parse_error(3);
+    return PMIX_ERROR;
+}
+
+
+static void parse_error(int num)
+{
+    /* JMS need better error/warning message here */
+    pmix_output(0, "keyval parser: error %d reading file %s at line %d:\n  %s\n",
+                num, keyval_filename, pmix_util_keyval_yynewlines, pmix_util_keyval_yytext);
+}
+
+int pmix_util_keyval_save_internal_envars(pmix_keyval_parse_fn_t callback)
+{
+    if (NULL != env_str && 0 < strlen(env_str)) {
+        callback("mca_base_env_list_internal", env_str);
+        free(env_str);
+        env_str = NULL;
+    }
+    return PMIX_SUCCESS;
+}
+
+static void trim_name(char *buffer, const char* prefix, const char* suffix)
+{
+    char *pchr, *echr;
+    size_t buffer_len;
+
+    if (NULL == buffer) {
+        return;
+    }
+
+    buffer_len = strlen (buffer);
+
+    pchr = buffer;
+    if (NULL != prefix) {
+        size_t prefix_len = strlen (prefix);
+
+        if (0 == strncmp (buffer, prefix, prefix_len)) {
+            pchr += prefix_len;
+        }
+    }
+
+    /* trim spaces at the beginning */
+    while (isspace (*pchr)) {
+        pchr++;
+    }
+
+    /* trim spaces at the end */
+    echr = buffer + buffer_len;
+    while (echr > buffer && isspace (*(echr - 1))) {
+        echr--;
+    }
+    echr[0] = '\0';
+
+    if (NULL != suffix && (uintptr_t) (echr - buffer) > strlen (suffix)) {
+        size_t suffix_len = strlen (suffix);
+
+        echr -= suffix_len;
+
+        if (0 == strncmp (echr, suffix, strlen(suffix))) {
+            do {
+                echr--;
+            } while (isspace (*echr));
+            echr[1] = '\0';
+        }
+    }
+
+    if (buffer != pchr) {
+        /* move the trimmed string to the beginning of the buffer */
+        memmove (buffer, pchr, strlen (pchr) + 1);
+    }
+}
+
+static int save_param_name (void)
+{
+    if (key_buffer_len < strlen(pmix_util_keyval_yytext) + 1) {
+        char *tmp;
+        key_buffer_len = strlen(pmix_util_keyval_yytext) + 1;
+        tmp = (char*)realloc(key_buffer, key_buffer_len);
+        if (NULL == tmp) {
+            free(key_buffer);
+            key_buffer_len = 0;
+            key_buffer = NULL;
+            return PMIX_ERR_OUT_OF_RESOURCE;
+        }
+        key_buffer = tmp;
+    }
+
+    strncpy (key_buffer, pmix_util_keyval_yytext, key_buffer_len);
+
+    return PMIX_SUCCESS;
+}
+
+static int add_to_env_str(char *var, char *val)
+{
+    int sz, varsz, valsz;
+    void *tmp;
+
+    if (NULL == var) {
+        return PMIX_ERR_BAD_PARAM;
+    }
+
+    if (NULL != env_str) {
+        varsz = strlen(var);
+        valsz = (NULL != val) ? strlen(val) : 0;
+        sz = strlen(env_str)+varsz+valsz+2;
+        if (envsize <= sz) {
+            envsize *=2;
+
+            tmp = realloc(env_str, envsize);
+            if (NULL == tmp) {
+                return PMIX_ERR_OUT_OF_RESOURCE;
+            }
+            env_str = tmp;
+        }
+        strcat(env_str, ";");
+    } else {
+        env_str = calloc(1, envsize);
+        if (NULL == env_str) {
+            return PMIX_ERR_OUT_OF_RESOURCE;
+        }
+    }
+
+    strcat(env_str, var);
+    if (NULL != val) {
+        strcat(env_str, "=");
+        strcat(env_str, val);
+    }
+
+    return PMIX_SUCCESS;
+}
+
+static int parse_line_new(pmix_keyval_parse_state_t first_val)
+{
+    pmix_keyval_parse_state_t val;
+    char *tmp;
+    int rc;
+
+    val = first_val;
+    while (PMIX_UTIL_KEYVAL_PARSE_NEWLINE != val && PMIX_UTIL_KEYVAL_PARSE_DONE != val) {
+        rc = save_param_name ();
+        if (PMIX_SUCCESS != rc) {
+            return rc;
+        }
+
+        if (PMIX_UTIL_KEYVAL_PARSE_MCAVAR == val) {
+            trim_name (key_buffer, "-mca", NULL);
+            trim_name (key_buffer, "--mca", NULL);
+
+            val = pmix_util_keyval_yylex();
+            if (PMIX_UTIL_KEYVAL_PARSE_VALUE == val) {
+                if (NULL != pmix_util_keyval_yytext) {
+                    tmp = strdup(pmix_util_keyval_yytext);
+                    if ('\'' == tmp[0] || '\"' == tmp[0]) {
+                        trim_name (tmp, "\'", "\'");
+                        trim_name (tmp, "\"", "\"");
+                    }
+                    keyval_callback(key_buffer, tmp);
+                    free(tmp);
+                }
+            } else {
+                parse_error(4);
+                return PMIX_ERROR;
+            }
+        } else if (PMIX_UTIL_KEYVAL_PARSE_ENVEQL == val) {
+            trim_name (key_buffer, "-x", "=");
+            trim_name (key_buffer, "--x", NULL);
+
+            val = pmix_util_keyval_yylex();
+            if (PMIX_UTIL_KEYVAL_PARSE_VALUE == val) {
+                add_to_env_str(key_buffer, pmix_util_keyval_yytext);
+            } else {
+                parse_error(5);
+                return PMIX_ERROR;
+            }
+        } else if (PMIX_UTIL_KEYVAL_PARSE_ENVVAR == val) {
+            trim_name (key_buffer, "-x", "=");
+            trim_name (key_buffer, "--x", NULL);
+            add_to_env_str(key_buffer, NULL);
+        } else {
+            /* we got something unexpected.  Bonk! */
+            parse_error(6);
+            return PMIX_ERROR;
+        }
+
+        val = pmix_util_keyval_yylex();
+    }
+
+    return PMIX_SUCCESS;
+}
diff --git a/src/util/keyval_parse.h b/src/util/keyval_parse.h
new file mode 100644
index 0000000..2d6e9f4
--- /dev/null
+++ b/src/util/keyval_parse.h
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2005 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2016      Intel, Inc. All rights reserved
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+/** @file */
+
+#ifndef PMIX_UTIL_KEYVAL_PARSE_H
+#define PMIX_UTIL_KEYVAL_PARSE_H
+
+#include <src/include/pmix_config.h>
+
+BEGIN_C_DECLS
+
+extern int pmix_util_keyval_parse_lineno;
+
+/**
+ * Callback triggered for each key = value pair
+ *
+ * Callback triggered from pmix_util_keyval_parse for each key = value
+ * pair.  Both key and value will be pointers into static buffers.
+ * The buffers must not be free()ed and contents may be overwritten
+ * immediately after the callback returns.
+ */
+typedef void (*pmix_keyval_parse_fn_t)(const char *key, const char *value);
+
+/**
+ * Parse \c filename, made up of key = value pairs.
+ *
+ * Parse \c filename, made up of key = value pairs.  For each line
+ * that appears to contain a key = value pair, \c callback will be
+ * called exactly once.  In a multithreaded context, calls to
+ * pmix_util_keyval_parse() will serialize multiple calls.
+ */
+int pmix_util_keyval_parse(const char *filename,
+                                         pmix_keyval_parse_fn_t callback);
+
+int pmix_util_keyval_parse_init(void);
+
+int pmix_util_keyval_parse_finalize(void);
+
+int pmix_util_keyval_save_internal_envars(pmix_keyval_parse_fn_t callback);
+
+END_C_DECLS
+
+#endif
diff --git a/src/util/net.c b/src/util/net.c
new file mode 100644
index 0000000..b074a14
--- /dev/null
+++ b/src/util/net.c
@@ -0,0 +1,486 @@
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2005 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+ *                         reserved.
+ * Copyright (c) 2009-2015 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2013      Intel, Inc.  All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include "pmix_config.h"
+#include "pmix_common.h"
+
+#include <stdio.h>
+#include <string.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#include <errno.h>
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_SYS_SOCKIO_H
+#include <sys/sockio.h>
+#endif
+#ifdef HAVE_SYS_IOCTL_H
+#include <sys/ioctl.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif
+#ifdef HAVE_NET_IF_H
+#if defined(__APPLE__) && defined(_LP64)
+/* Apple engineering suggested using options align=power as a
+   workaround for a bug in OS X 10.4 (Tiger) that prevented ioctl(...,
+   SIOCGIFCONF, ...) from working properly in 64 bit mode on Power PC.
+   It turns out that the underlying issue is the size of struct
+   ifconf, which the kernel expects to be 12 and natural 64 bit
+   alignment would make 16.  The same bug appears in 64 bit mode on
+   Intel macs, but align=power is a no-op there, so instead, use the
+   pack pragma to instruct the compiler to pack on 4 byte words, which
+   has the same effect as align=power for our needs and works on both
+   Intel and Power PC Macs. */
+#pragma pack(push,4)
+#endif
+#include <net/if.h>
+#if defined(__APPLE__) && defined(_LP64)
+#pragma pack(pop)
+#endif
+#endif
+#ifdef HAVE_NETDB_H
+#include <netdb.h>
+#endif
+#ifdef HAVE_IFADDRS_H
+#include <ifaddrs.h>
+#endif
+
+#include "src/util/net.h"
+#include "src/util/output.h"
+#include "src/util/argv.h"
+#include "src/util/show_help.h"
+#include "src/util/tsd.h"
+#include "src/runtime/pmix_rte.h"
+
+/* this function doesn't depend on sockaddr_h */
+bool pmix_net_isaddr(const char *name)
+{
+    struct addrinfo hint, *res = NULL;
+
+    /* initialize the hint */
+    memset(&hint, '\0', sizeof hint);
+
+    /* indicate that we don't know the family */
+    hint.ai_family = PF_UNSPEC;
+    hint.ai_flags = AI_NUMERICHOST;
+
+    if (0 != getaddrinfo(name, NULL, &hint, &res)) {
+        /* the input wasn't a recognizable address */
+        return false;
+    }
+    /* we don't care what family - all we care is that
+     * it is indeed an address
+     */
+    freeaddrinfo(res);
+    return true;
+}
+
+#ifdef HAVE_STRUCT_SOCKADDR_IN
+
+typedef struct private_ipv4_t {
+    in_addr_t addr;
+    uint32_t netmask_bits;
+} private_ipv4_t;
+
+static private_ipv4_t* private_ipv4 = NULL;
+
+static pmix_tsd_key_t hostname_tsd_key;
+
+
+static void
+hostname_cleanup(void *value)
+{
+    if (NULL != value) free(value);
+}
+
+
+static char*
+get_hostname_buffer(void)
+{
+    void *buffer;
+    int ret;
+
+    ret = pmix_tsd_getspecific(hostname_tsd_key, &buffer);
+    if (PMIX_SUCCESS != ret) return NULL;
+
+    if (NULL == buffer) {
+        buffer = (void*) malloc((NI_MAXHOST + 1) * sizeof(char));
+        ret = pmix_tsd_setspecific(hostname_tsd_key, buffer);
+    }
+
+    return (char*) buffer;
+}
+
+int
+pmix_net_init(void)
+{
+    char **args, *arg;
+    uint32_t a, b, c, d, bits, addr;
+    int i, count, found_bad = 0;
+
+    args = pmix_argv_split(pmix_net_private_ipv4, ';');
+    if( NULL != args ) {
+        count = pmix_argv_count(args);
+        private_ipv4 = (private_ipv4_t*)malloc( (count + 1) * sizeof(private_ipv4_t));
+        if( NULL == private_ipv4 ) {
+            pmix_output(0, "Unable to allocate memory for the private addresses array" );
+            pmix_argv_free(args);
+            goto do_local_init;
+        }
+        for( i = 0; i < count; i++ ) {
+            arg = args[i];
+
+            (void)sscanf( arg, "%u.%u.%u.%u/%u", &a, &b, &c, &d, &bits );
+
+            if( (a > 255) || (b > 255) || (c > 255) ||
+                (d > 255) || (bits > 32) ) {
+                if (0 == found_bad) {
+                    pmix_show_help("help-pmix-runtime.txt",
+                                   "malformed net_private_ipv4",
+                                   true, args[i]);
+                    found_bad = 1;
+                }
+                continue;
+            }
+            addr = (a << 24) | (b << 16) | (c << 8) | d;
+            private_ipv4[i].addr = htonl(addr);
+            private_ipv4[i].netmask_bits = bits;
+        }
+        private_ipv4[i].addr         = 0;
+        private_ipv4[i].netmask_bits = 0;
+        pmix_argv_free(args);
+    }
+
+ do_local_init:
+    return pmix_tsd_key_create(&hostname_tsd_key, hostname_cleanup);
+}
+
+
+int
+pmix_net_finalize()
+{
+    free(private_ipv4);
+    private_ipv4 = NULL;
+
+    return PMIX_SUCCESS;
+}
+
+
+/* convert a CIDR prefixlen to netmask (in network byte order) */
+uint32_t
+pmix_net_prefix2netmask(uint32_t prefixlen)
+{
+    return htonl (((1 << prefixlen) - 1) << (32 - prefixlen));
+}
+
+
+bool
+pmix_net_islocalhost(const struct sockaddr *addr)
+{
+    switch (addr->sa_family) {
+    case AF_INET:
+        {
+            const struct sockaddr_in *inaddr = (struct sockaddr_in*) addr;
+            /* if it's in the 127. domain, it shouldn't be routed
+               (0x7f == 127) */
+            if (0x7F000000 == (0x7F000000 & ntohl(inaddr->sin_addr.s_addr))) {
+                return true;
+            }
+            return false;
+        }
+        break;
+
+    case AF_INET6:
+        {
+            const struct sockaddr_in6 *inaddr = (struct sockaddr_in6*) addr;
+            if (IN6_IS_ADDR_LOOPBACK (&inaddr->sin6_addr)) {
+               return true; /* Bug, FIXME: check for 127.0.0.1/8 */
+            }
+            return false;
+        }
+        break;
+
+    default:
+        pmix_output(0, "unhandled sa_family %d passed to pmix_net_islocalhost",
+                    addr->sa_family);
+        return false;
+        break;
+    }
+}
+
+
+bool
+pmix_net_samenetwork(const struct sockaddr *addr1,
+                     const struct sockaddr *addr2,
+                     uint32_t plen)
+{
+    uint32_t prefixlen;
+
+    if(addr1->sa_family != addr2->sa_family) {
+        return false; /* address families must be equal */
+    }
+
+    switch (addr1->sa_family) {
+    case AF_INET:
+        {
+            if (0 == plen) {
+                prefixlen = 32;
+            } else {
+                prefixlen = plen;
+            }
+            struct sockaddr_in inaddr1, inaddr2;
+            /* Use temporary variables and memcpy's so that we don't
+               run into bus errors on Solaris/SPARC */
+            memcpy(&inaddr1, addr1, sizeof(inaddr1));
+            memcpy(&inaddr2, addr2, sizeof(inaddr2));
+            uint32_t netmask = pmix_net_prefix2netmask (prefixlen);
+
+            if((inaddr1.sin_addr.s_addr & netmask) ==
+               (inaddr2.sin_addr.s_addr & netmask)) {
+                return true;
+            }
+            return false;
+        }
+        break;
+
+    case AF_INET6:
+        {
+            struct sockaddr_in6 inaddr1, inaddr2;
+            /* Use temporary variables and memcpy's so that we don't
+               run into bus errors on Solaris/SPARC */
+            memcpy(&inaddr1, addr1, sizeof(inaddr1));
+            memcpy(&inaddr2, addr2, sizeof(inaddr2));
+            struct in6_addr *a6_1 = (struct in6_addr*) &inaddr1.sin6_addr;
+            struct in6_addr *a6_2 = (struct in6_addr*) &inaddr2.sin6_addr;
+
+            if (0 == plen) {
+                prefixlen = 64;
+            } else {
+                prefixlen = plen;
+            }
+            if (64 == prefixlen) {
+                /* prefixlen is always /64, any other case would be routing.
+                   Compare the first eight bytes (64 bits) and hope that
+                   endianess is not an issue on any system as long as
+                   addresses are always stored in network byte order.
+                */
+                if (((const uint32_t *) (a6_1))[0] ==
+                    ((const uint32_t *) (a6_2))[0] &&
+                    ((const uint32_t *) (a6_1))[1] ==
+                    ((const uint32_t *) (a6_2))[1]) {
+                    return true;
+                }
+            }
+            return false;
+        }
+        break;
+
+    default:
+        pmix_output(0, "unhandled sa_family %d passed to pmix_samenetwork",
+                    addr1->sa_family);
+    }
+
+    return false;
+}
+
+
+/**
+ * Returns true if the given address is a public IPv4 address.
+ */
+bool
+pmix_net_addr_isipv4public(const struct sockaddr *addr)
+{
+    switch (addr->sa_family) {
+        case AF_INET6:
+            return false;
+
+        case AF_INET:
+            {
+                const struct sockaddr_in *inaddr = (struct sockaddr_in*) addr;
+                int i;
+
+                if( NULL == private_ipv4 ) {
+                    return true;
+                }
+
+                for( i = 0; private_ipv4[i].addr != 0; i++ ) {
+                    if( private_ipv4[i].addr == (inaddr->sin_addr.s_addr &
+                                                 pmix_net_prefix2netmask(private_ipv4[i].netmask_bits)) )
+                        return false;
+                }
+
+            }
+            return true;
+        default:
+            pmix_output (0,
+                         "unhandled sa_family %d passed to pmix_net_addr_isipv4public\n",
+                         addr->sa_family);
+    }
+
+    return false;
+}
+
+
+char*
+pmix_net_get_hostname(const struct sockaddr *addr)
+{
+    char *name = get_hostname_buffer();
+    int error;
+    socklen_t addrlen;
+    char *p;
+
+    if (NULL == name) {
+        pmix_output(0, "pmix_sockaddr2str: malloc() failed\n");
+        return NULL;
+    }
+    memset(name, 0, sizeof(*name));
+
+    switch (addr->sa_family) {
+    case AF_INET:
+        addrlen = sizeof (struct sockaddr_in);
+        break;
+    case AF_INET6:
+#if defined( __NetBSD__)
+        /* hotfix for netbsd: on my netbsd machine, getnameinfo
+           returns an unkown error code. */
+        if(NULL == inet_ntop(AF_INET6, &((struct sockaddr_in6*) addr)->sin6_addr,
+                             name, NI_MAXHOST)) {
+            pmix_output(0, "pmix_sockaddr2str failed with error code %d", errno);
+            free(name);
+            return NULL;
+        }
+        return name;
+#else
+        addrlen = sizeof (struct sockaddr_in6);
+#endif
+        break;
+    default:
+        free(name);
+        return NULL;
+    }
+
+    error = getnameinfo(addr, addrlen,
+                        name, NI_MAXHOST, NULL, 0, NI_NUMERICHOST);
+
+    if (error) {
+       int err = errno;
+       pmix_output (0, "pmix_sockaddr2str failed:%s (return code %i)\n",
+                    gai_strerror(err), error);
+       free (name);
+       return NULL;
+    }
+    /* strip any trailing % data as it isn't pertinent */
+    if (NULL != (p = strrchr(name, '%'))) {
+        *p = '\0';
+    }
+    return name;
+}
+
+
+int
+pmix_net_get_port(const struct sockaddr *addr)
+{
+    switch (addr->sa_family) {
+    case AF_INET:
+        return ntohs(((struct sockaddr_in*) addr)->sin_port);
+        break;
+
+    case AF_INET6:
+        return ntohs(((struct sockaddr_in6*) addr)->sin6_port);
+        break;
+    }
+
+    return -1;
+}
+
+
+#else /* HAVE_STRUCT_SOCKADDR_IN */
+
+int
+pmix_net_init()
+{
+    return PMIX_SUCCESS;
+}
+
+
+int
+pmix_net_finalize()
+{
+    return PMIX_SUCCESS;
+}
+
+
+uint32_t
+pmix_net_prefix2netmask(uint32_t prefixlen)
+{
+    return 0;
+}
+
+
+bool
+pmix_net_islocalhost(const struct sockaddr *addr)
+{
+    return false;
+}
+
+
+bool
+pmix_net_samenetwork(const struct sockaddr *addr1,
+                     const struct sockaddr *addr2,
+                     uint32_t prefixlen)
+{
+    return false;
+}
+
+
+bool
+pmix_net_addr_isipv4public(const struct sockaddr *addr)
+{
+    return false;
+}
+
+
+char*
+pmix_net_get_hostname(const struct sockaddr *addr)
+{
+    return NULL;
+}
+
+
+int
+pmix_net_get_port(const struct sockaddr *addr)
+{
+    return -1;
+}
+
+#endif /* HAVE_STRUCT_SOCKADDR_IN */
diff --git a/src/util/net.h b/src/util/net.h
new file mode 100644
index 0000000..9ffa1bd
--- /dev/null
+++ b/src/util/net.h
@@ -0,0 +1,150 @@
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2005 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+ *                         reserved.
+ * Copyright (c) 2017      Intel, Inc.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+/* @file */
+
+#ifndef PMIX_UTIL_NET_H
+#define PMIX_UTIL_NET_H
+
+#include "pmix_config.h"
+
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+
+BEGIN_C_DECLS
+
+/**
+ * Intiailize the network helper subsystem
+ *
+ * Initialize the network helper subsystem.  Should be called exactly
+ * once for any process that will use any function in the network
+ * helper subsystem.
+ *
+ * @retval PMIX_SUCCESS   Success
+ * @retval PMIX_ERR_TEMP_OUT_OF_RESOURCE Not enough memory for static
+ *                        buffer creation
+ */
+PMIX_EXPORT int pmix_net_init(void);
+
+
+/**
+ * Finalize the network helper subsystem
+ *
+ * Finalize the network helper subsystem.  Should be called exactly
+ * once for any process that will use any function in the network
+ * helper subsystem.
+ *
+ * @retval PMIX_SUCCESS   Success
+ */
+PMIX_EXPORT int pmix_net_finalize(void);
+
+
+/**
+ * Calculate netmask in network byte order from CIDR notation
+ *
+ * @param prefixlen (IN)  CIDR prefixlen
+ * @return                netmask in network byte order
+ */
+PMIX_EXPORT uint32_t pmix_net_prefix2netmask(uint32_t prefixlen);
+
+
+/**
+ * Determine if given IP address is in the localhost range
+ *
+ * Determine if the given IP address is in the localhost range
+ * (127.0.0.0/8), meaning that it can't be used to connect to machines
+ * outside the current host.
+ *
+ * @param addr             struct sockaddr_in of IP address
+ * @return                 true if \c addr is a localhost address,
+ *                         false otherwise.
+ */
+PMIX_EXPORT bool pmix_net_islocalhost(const struct sockaddr *addr);
+
+
+/**
+ * Are we on the same network?
+ *
+ * For IPv6, we only need to check for /64, there are no other
+ * local netmasks.
+ *
+ * @param addr1             struct sockaddr of address
+ * @param addr2             struct sockaddr of address
+ * @param prefixlen         netmask (either CIDR or IPv6 prefixlen)
+ * @return                  true if \c addr1 and \c addr2 are on the
+ *                          same net, false otherwise.
+ */
+PMIX_EXPORT bool pmix_net_samenetwork(const struct sockaddr *addr1,
+                                      const struct sockaddr *addr2,
+                                      uint32_t prefixlen);
+
+
+/**
+ * Is the given address a public IPv4 address?  Returns false for IPv6
+ * address.
+ *
+ * @param addr      address as struct sockaddr
+ * @return          true, if \c addr is IPv4 public, false otherwise
+ */
+PMIX_EXPORT bool pmix_net_addr_isipv4public(const struct sockaddr *addr);
+
+
+/**
+ * Get string version of address
+ *
+ * Return the un-resolved address in a string format.  The string will
+ * be returned in a per-thread static buffer and should not be freed
+ * by the user.
+ *
+ * @param addr              struct sockaddr of address
+ * @return                  literal representation of \c addr
+ */
+PMIX_EXPORT char* pmix_net_get_hostname(const struct sockaddr *addr);
+
+
+/**
+ * Get port number from struct sockaddr
+ *
+ * Return the port number (as an integr) from either a struct
+ * sockaddr_in or a struct sockaddr_in6.
+ *
+ * @param addr             struct sockaddr containing address
+ * @return                 port number from \addr
+ */
+PMIX_EXPORT int pmix_net_get_port(const struct sockaddr *addr);
+
+/**
+ * Test if a string is actually an IP address
+ *
+ * Returns true if the string is of IPv4 or IPv6 address form
+ */
+PMIX_EXPORT bool pmix_net_isaddr(const char *name);
+
+END_C_DECLS
+
+#endif /* PMIX_UTIL_NET_H */
diff --git a/src/util/os_path.c b/src/util/os_path.c
new file mode 100644
index 0000000..6abedaf
--- /dev/null
+++ b/src/util/os_path.c
@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2005 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2015-2016 Intel, Inc.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+
+
+#include <string.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif  /* HAVE_UNISTD_H */
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif  /* HAVE_SYS_PARAM_H */
+#include <stdlib.h>
+#include <stdarg.h>
+
+#include "src/util/os_path.h"
+
+static const char *path_sep = PMIX_PATH_SEP;
+
+char *pmix_os_path(bool relative, ...)
+{
+    va_list ap;
+    char *element, *path;
+    size_t num_elements, total_length;
+
+    va_start(ap, relative);
+
+    /* no way to protect ourselves from reading too far, so have to
+       trust caller that they ended the list with the NULL */
+
+    num_elements = 0;
+    total_length = 0;
+    while (NULL != (element = va_arg(ap, char*))) {
+        num_elements++;
+        total_length = total_length + strlen(element);
+        if( path_sep[0] != element[0] ) total_length++;
+    }
+    va_end(ap);
+
+    if (0 == num_elements) { /* must be looking for a simple answer */
+        path = (char *)malloc(3);
+        path[0] = '\0';
+        if (relative) {
+            strcpy(path, ".");
+            strcat(path, path_sep);
+        } else {
+            strcpy(path, path_sep);
+        }
+        return(path);
+    }
+
+    /* setup path with enough room for the string terminator, the elements, and
+       the separator between each of the elements */
+    total_length = total_length + num_elements * strlen(path_sep) + 1;
+    if(relative) {
+        total_length++;
+    }
+
+    if (total_length > PMIX_PATH_MAX) {  /* path length is too long - reject it */
+        return(NULL);
+    }
+
+    path = (char *)malloc(total_length);
+    if (NULL == path) {
+        return(NULL);
+    }
+    path[0] = 0;
+
+    if (relative) {
+        strcpy(path, ".");
+    }
+
+    va_start(ap, relative);
+    if( NULL != (element = va_arg(ap, char*)) ) {
+        if (path_sep[0] != element[0]) {
+            strcat(path, path_sep);
+        }
+        strcat(path, element);
+    }
+    while (NULL != (element=va_arg(ap, char*))) {
+        if (path_sep[0] != element[0]) {
+            strcat(path, path_sep);
+        }
+        strcat(path, element);
+    }
+
+    va_end(ap);
+    return pmix_make_filename_os_friendly(path);
+}
diff --git a/src/util/os_path.h b/src/util/os_path.h
new file mode 100644
index 0000000..9f3c71b
--- /dev/null
+++ b/src/util/os_path.h
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2005 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2015-2017 Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+/** @file:
+ * Creates an operating system-acceptable path name.
+ *
+ * The pmix_os_path() function takes a variable number of string arguments and
+ * concatenates them into a path name using the path separator character appropriate
+ * to the local operating system. NOTE: the string returned by this function has been
+ * malloc'd - thus, the user is responsible for free'ing the memory used by
+ * the string.
+ *
+ * CRITICAL NOTE: The input variable list MUST be terminated by a NULL value. Failure
+ * to do this will cause the program to suffer a catastrophic failure - usually a
+ * segmentation violation or bus error.
+ *
+ * The function calls orte_sys_info() to ensure that the path separator character
+ * has been identified. If that value cannot be identified for some reason,
+ * the function will return a NULL value. Likewise, specifying a path name that
+ * exceeds the maximum allowable path name length on the local system will result
+ * in the return of a NULL value.
+ *
+ *
+ */
+
+#ifndef PMIX_OS_PATH_H
+#define PMIX_OS_PATH_H
+
+#include <src/include/pmix_config.h>
+#include <pmix_common.h>
+
+#include <stdio.h>
+#include <stdarg.h>
+
+BEGIN_C_DECLS
+
+/**
+ * @param relative A boolean that specifies if the path name is to be constructed
+ * relative to the current directory or as an absolute path. If no path
+ * elements are included in the function call, then the function returns
+ * "." for a relative path name and "<path separator char>" -
+ * the top of the directory tree - for an absolute path name.
+ * @param elem1,elem2,... A variable number of (char *)path_elements
+ * can be provided to the function, terminated by a NULL value. These
+ * elements will be concatenated, each separated by the path separator
+ * character, into a path name and returned.
+ * @retval path_name A pointer to a fully qualified path name composed of the
+ * provided path elements, separated by the path separator character
+ * appropriate to the local operating system. The path_name string has been malloc'd
+ * and therefore the user is responsible for free'ing the field.
+*/
+PMIX_EXPORT char *pmix_os_path(bool relative, ...) __pmix_attribute_malloc__ __pmix_attribute_sentinel__ __pmix_attribute_warn_unused_result__;
+
+/**
+ * Convert the path to be OS friendly. On UNIX this function will
+ * be empty.
+ */
+#define pmix_make_filename_os_friendly(PATH)   (PATH)
+
+END_C_DECLS
+
+#endif /* PMIX_OS_PATH_H */
diff --git a/src/util/output.c b/src/util/output.c
new file mode 100644
index 0000000..ec8c285
--- /dev/null
+++ b/src/util/output.c
@@ -0,0 +1,956 @@
+/*
+ * Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2008 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2006 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2006 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2007-2008 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2014-2017 Intel, Inc. All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+
+#include <pmix_common.h>
+
+#include <stdio.h>
+#include <ctype.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#ifdef HAVE_SYSLOG_H
+#include <syslog.h>
+#endif
+#include <string.h>
+#include <fcntl.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+
+#include "src/util/pmix_environ.h"
+#include "src/util/error.h"
+#include "src/util/output.h"
+
+/*
+ * Private data
+ */
+static int verbose_stream = -1;
+static pmix_output_stream_t verbose;
+static char *output_dir = NULL;
+static char *output_prefix = NULL;
+
+
+/*
+ * Internal data structures and helpers for the generalized output
+ * stream mechanism.
+ */
+typedef struct {
+    bool ldi_used;
+    bool ldi_enabled;
+    int ldi_verbose_level;
+
+    bool ldi_syslog;
+    int ldi_syslog_priority;
+
+    char *ldi_syslog_ident;
+    char *ldi_prefix;
+    int ldi_prefix_len;
+
+    char *ldi_suffix;
+    int ldi_suffix_len;
+
+    bool ldi_stdout;
+    bool ldi_stderr;
+
+    bool ldi_file;
+    bool ldi_file_want_append;
+    char *ldi_file_suffix;
+    int ldi_fd;
+    int ldi_file_num_lines_lost;
+} output_desc_t;
+
+/*
+ * Private functions
+ */
+static void construct(pmix_object_t *stream);
+static void destruct(pmix_object_t *stream);
+static int do_open(int output_id, pmix_output_stream_t * lds);
+static int open_file(int i);
+static void free_descriptor(int output_id);
+static int make_string(char **out, char **no_newline_string, output_desc_t *ldi,
+                       const char *format, va_list arglist);
+static int output(int output_id, const char *format, va_list arglist);
+
+
+#define PMIX_OUTPUT_MAX_STREAMS 64
+#if defined(HAVE_SYSLOG)
+#define USE_SYSLOG 1
+#else
+#define USE_SYSLOG 0
+#endif
+
+/* global state */
+bool pmix_output_redirected_to_syslog = false;
+int pmix_output_redirected_syslog_pri = 0;
+
+/*
+ * Local state
+ */
+static bool initialized = false;
+static int default_stderr_fd = -1;
+static output_desc_t info[PMIX_OUTPUT_MAX_STREAMS];
+#if defined(HAVE_SYSLOG)
+static bool syslog_opened = false;
+#endif
+static char *redirect_syslog_ident = NULL;
+
+PMIX_CLASS_INSTANCE(pmix_output_stream_t, pmix_object_t, construct, destruct);
+
+/*
+ * Setup the output stream infrastructure
+ */
+bool pmix_output_init(void)
+{
+    int i;
+    char hostname[PMIX_MAXHOSTNAMELEN];
+    char *str;
+
+    if (initialized) {
+        return true;
+    }
+
+    str = getenv("PMIX_OUTPUT_STDERR_FD");
+    if (NULL != str) {
+        default_stderr_fd = atoi(str);
+    }
+    str = getenv("PMIX_OUTPUT_REDIRECT");
+    if (NULL != str) {
+        if (0 == strcasecmp(str, "syslog")) {
+            pmix_output_redirected_to_syslog = true;
+        }
+    }
+    str = getenv("PMIX_OUTPUT_SYSLOG_PRI");
+    if (NULL != str) {
+        if (0 == strcasecmp(str, "info")) {
+            pmix_output_redirected_syslog_pri = LOG_INFO;
+        } else if (0 == strcasecmp(str, "error")) {
+            pmix_output_redirected_syslog_pri = LOG_ERR;
+        } else if (0 == strcasecmp(str, "warn")) {
+            pmix_output_redirected_syslog_pri = LOG_WARNING;
+        } else {
+            pmix_output_redirected_syslog_pri = LOG_ERR;
+        }
+    } else {
+        pmix_output_redirected_syslog_pri = LOG_ERR;
+    }
+
+    str = getenv("PMIX_OUTPUT_SYSLOG_IDENT");
+    if (NULL != str) {
+        redirect_syslog_ident = strdup(str);
+    }
+
+    PMIX_CONSTRUCT(&verbose, pmix_output_stream_t);
+    if (pmix_output_redirected_to_syslog) {
+        verbose.lds_want_syslog = true;
+        verbose.lds_syslog_priority = pmix_output_redirected_syslog_pri;
+        if (NULL != str) {
+            verbose.lds_syslog_ident = strdup(redirect_syslog_ident);
+        }
+        verbose.lds_want_stderr = false;
+        verbose.lds_want_stdout = false;
+    } else {
+        verbose.lds_want_stderr = true;
+    }
+    gethostname(hostname, sizeof(hostname));
+    hostname[sizeof(hostname)-1] = '\0';
+    if (0 > asprintf(&verbose.lds_prefix, "[%s:%05d] ", hostname, getpid())) {
+        return PMIX_ERR_NOMEM;
+    }
+
+    for (i = 0; i < PMIX_OUTPUT_MAX_STREAMS; ++i) {
+        info[i].ldi_used = false;
+        info[i].ldi_enabled = false;
+
+        info[i].ldi_syslog = pmix_output_redirected_to_syslog;
+        info[i].ldi_file = false;
+        info[i].ldi_file_suffix = NULL;
+        info[i].ldi_file_want_append = false;
+        info[i].ldi_fd = -1;
+        info[i].ldi_file_num_lines_lost = 0;
+    }
+
+
+    initialized = true;
+
+    /* Set some defaults */
+
+    if (0 > asprintf(&output_prefix, "output-pid%d-", getpid())) {
+        return false;
+    }
+    output_dir = strdup(pmix_tmp_directory());
+
+    /* Open the default verbose stream */
+    verbose_stream = pmix_output_open(&verbose);
+    return true;
+}
+
+
+/*
+ * Open a stream
+ */
+int pmix_output_open(pmix_output_stream_t * lds)
+{
+    return do_open(-1, lds);
+}
+
+
+/*
+ * Reset the parameters on a stream
+ */
+int pmix_output_reopen(int output_id, pmix_output_stream_t * lds)
+{
+    return do_open(output_id, lds);
+}
+
+
+/*
+ * Enable and disable output streams
+ */
+bool pmix_output_switch(int output_id, bool enable)
+{
+    bool ret = false;
+
+    /* Setup */
+
+    if (!initialized) {
+        pmix_output_init();
+    }
+
+    if (output_id >= 0 && output_id < PMIX_OUTPUT_MAX_STREAMS) {
+        ret = info[output_id].ldi_enabled;
+        info[output_id].ldi_enabled = enable;
+    }
+
+    return ret;
+}
+
+
+/*
+ * Reopen all the streams; used during checkpoint/restart.
+ */
+void pmix_output_reopen_all(void)
+{
+    char *str;
+    char hostname[PMIX_MAXHOSTNAMELEN];
+
+    str = getenv("PMIX_OUTPUT_STDERR_FD");
+    if (NULL != str) {
+        default_stderr_fd = atoi(str);
+    } else {
+        default_stderr_fd = -1;
+    }
+
+    gethostname(hostname, sizeof(hostname));
+    if( NULL != verbose.lds_prefix ) {
+        free(verbose.lds_prefix);
+        verbose.lds_prefix = NULL;
+    }
+    if (0 > asprintf(&verbose.lds_prefix, "[%s:%05d] ", hostname, getpid())) {
+        verbose.lds_prefix = NULL;
+        return;
+    }
+}
+
+
+/*
+ * Close a stream
+ */
+void pmix_output_close(int output_id)
+{
+    int i;
+
+    /* Setup */
+
+    if (!initialized) {
+        return;
+    }
+
+    /* If it's valid, used, enabled, and has an open file descriptor,
+     * free the resources associated with the descriptor */
+
+    if (output_id >= 0 && output_id < PMIX_OUTPUT_MAX_STREAMS &&
+        info[output_id].ldi_used && info[output_id].ldi_enabled) {
+        free_descriptor(output_id);
+
+        /* If no one has the syslog open, we should close it */
+
+        for (i = 0; i < PMIX_OUTPUT_MAX_STREAMS; ++i) {
+            if (info[i].ldi_used && info[i].ldi_syslog) {
+                break;
+            }
+        }
+
+#if defined(HAVE_SYSLOG)
+        if (i >= PMIX_OUTPUT_MAX_STREAMS && syslog_opened) {
+            closelog();
+        }
+#endif
+    }
+
+}
+
+
+/*
+ * Main function to send output to a stream
+ */
+PMIX_EXPORT void pmix_output(int output_id, const char *format, ...)
+{
+    if (output_id >= 0 && output_id < PMIX_OUTPUT_MAX_STREAMS) {
+        va_list arglist;
+        va_start(arglist, format);
+        output(output_id, format, arglist);
+        va_end(arglist);
+    }
+}
+
+
+/*
+ * Send a message to a stream if the verbose level is high enough
+ */
+ PMIX_EXPORT void pmix_output_verbose(int level, int output_id, const char *format, ...)
+{
+    if (output_id >= 0 && output_id < PMIX_OUTPUT_MAX_STREAMS &&
+        info[output_id].ldi_verbose_level >= level) {
+        va_list arglist;
+        va_start(arglist, format);
+        output(output_id, format, arglist);
+        va_end(arglist);
+    }
+}
+
+
+/*
+ * Send a message to a stream if the verbose level is high enough
+ */
+void pmix_output_vverbose(int level, int output_id, const char *format,
+                          va_list arglist)
+{
+    if (output_id >= 0 && output_id < PMIX_OUTPUT_MAX_STREAMS &&
+        info[output_id].ldi_verbose_level >= level) {
+        output(output_id, format, arglist);
+    }
+}
+
+
+/*
+ * Set the verbosity level of a stream
+ */
+void pmix_output_set_verbosity(int output_id, int level)
+{
+    if (output_id >= 0 && output_id < PMIX_OUTPUT_MAX_STREAMS) {
+        info[output_id].ldi_verbose_level = level;
+    }
+}
+
+
+/*
+ * Control where output flies will go
+ */
+void pmix_output_set_output_file_info(const char *dir,
+                                      const char *prefix,
+                                      char **olddir,
+                                      char **oldprefix)
+{
+    if (NULL != olddir) {
+        *olddir = strdup(output_dir);
+    }
+    if (NULL != oldprefix) {
+        *oldprefix = strdup(output_prefix);
+    }
+
+    if (NULL != dir) {
+        free(output_dir);
+        output_dir = strdup(dir);
+    }
+    if (NULL != prefix) {
+        free(output_prefix);
+        output_prefix = strdup(prefix);
+    }
+}
+
+void pmix_output_hexdump(int verbose_level, int output_id,
+                         void *ptr, int buflen)
+{
+    unsigned char *buf = (unsigned char *) ptr;
+    char out_buf[120];
+    int ret = 0;
+    int out_pos = 0;
+    int i, j;
+
+    if (output_id >= 0 && output_id < PMIX_OUTPUT_MAX_STREAMS &&
+        info[output_id].ldi_verbose_level >= verbose_level) {
+        pmix_output_verbose(verbose_level, output_id, "dump data at %p %d bytes\n", ptr, buflen);
+        for (i = 0; i < buflen; i += 16) {
+            out_pos = 0;
+            ret = sprintf(out_buf + out_pos, "%06x: ", i);
+            if (ret < 0)
+            return;
+            out_pos += ret;
+            for (j = 0; j < 16; j++) {
+                if (i + j < buflen)
+                ret = sprintf(out_buf + out_pos, "%02x ",
+                        buf[i + j]);
+                else
+                ret = sprintf(out_buf + out_pos, "   ");
+                if (ret < 0)
+                return;
+                out_pos += ret;
+            }
+            ret = sprintf(out_buf + out_pos, " ");
+            if (ret < 0)
+            return;
+            out_pos += ret;
+            for (j = 0; j < 16; j++)
+            if (i + j < buflen) {
+                ret = sprintf(out_buf + out_pos, "%c",
+                        isprint(buf[i+j]) ?
+                        buf[i + j] :
+                        '.');
+                if (ret < 0)
+                return;
+                out_pos += ret;
+            }
+            ret = sprintf(out_buf + out_pos, "\n");
+            if (ret < 0)
+            return;
+            pmix_output_verbose(verbose_level, output_id, "%s", out_buf);
+        }
+    }
+}
+
+
+/*
+ * Shut down the output stream system
+ */
+void pmix_output_finalize(void)
+{
+    if (initialized) {
+        if (verbose_stream != -1) {
+            pmix_output_close(verbose_stream);
+        }
+        free(verbose.lds_prefix);
+        verbose_stream = -1;
+
+        free (output_prefix);
+        free (output_dir);
+        PMIX_DESTRUCT(&verbose);
+    }
+}
+
+/************************************************************************/
+
+/*
+ * Constructor
+ */
+static void construct(pmix_object_t *obj)
+{
+    pmix_output_stream_t *stream = (pmix_output_stream_t*) obj;
+
+    stream->lds_verbose_level = 0;
+    stream->lds_syslog_priority = 0;
+    stream->lds_syslog_ident = NULL;
+    stream->lds_prefix = NULL;
+    stream->lds_suffix = NULL;
+    stream->lds_is_debugging = false;
+    stream->lds_want_syslog = false;
+    stream->lds_want_stdout = false;
+    stream->lds_want_stderr = false;
+    stream->lds_want_file = false;
+    stream->lds_want_file_append = false;
+    stream->lds_file_suffix = NULL;
+}
+static void destruct(pmix_object_t *obj)
+{
+    pmix_output_stream_t *stream = (pmix_output_stream_t*) obj;
+
+    if( NULL != stream->lds_file_suffix ) {
+        free(stream->lds_file_suffix);
+        stream->lds_file_suffix = NULL;
+    }
+}
+
+/*
+ * Back-end of open() and reopen().
+ */
+static int do_open(int output_id, pmix_output_stream_t * lds)
+{
+    int i;
+    bool redirect_to_file = false;
+    char *str, *sfx;
+
+    /* Setup */
+
+    if (!initialized) {
+        pmix_output_init();
+    }
+
+    str = getenv("PMIX_OUTPUT_REDIRECT");
+    if (NULL != str && 0 == strcasecmp(str, "file")) {
+        redirect_to_file = true;
+    }
+    sfx = getenv("PMIX_OUTPUT_SUFFIX");
+
+    /* If output_id == -1, find an available stream, or return
+     * PMIX_ERROR */
+
+    if (-1 == output_id) {
+        for (i = 0; i < PMIX_OUTPUT_MAX_STREAMS; ++i) {
+            if (!info[i].ldi_used) {
+                break;
+            }
+        }
+        if (i >= PMIX_OUTPUT_MAX_STREAMS) {
+            return PMIX_ERR_OUT_OF_RESOURCE;
+        }
+    }
+
+    /* Otherwise, we're reopening, so we need to free all previous
+     * resources, close files, etc. */
+
+    else {
+        free_descriptor(output_id);
+        i = output_id;
+    }
+
+    /* Special case: if we got NULL for lds, then just use the default
+     * verbose */
+
+    if (NULL == lds) {
+        lds = &verbose;
+    }
+
+    /* Got a stream -- now initialize it and open relevant outputs */
+
+    info[i].ldi_used = true;
+    info[i].ldi_enabled = lds->lds_is_debugging ?
+        (bool) PMIX_ENABLE_DEBUG : true;
+    info[i].ldi_verbose_level = lds->lds_verbose_level;
+
+#if USE_SYSLOG
+#if defined(HAVE_SYSLOG)
+    if (pmix_output_redirected_to_syslog) {
+        info[i].ldi_syslog = true;
+        info[i].ldi_syslog_priority = pmix_output_redirected_syslog_pri;
+        if (NULL != redirect_syslog_ident) {
+            info[i].ldi_syslog_ident = strdup(redirect_syslog_ident);
+            openlog(redirect_syslog_ident, LOG_PID, LOG_USER);
+        } else {
+            info[i].ldi_syslog_ident = NULL;
+            openlog("pmix", LOG_PID, LOG_USER);
+        }
+        syslog_opened = true;
+    } else {
+#endif
+        info[i].ldi_syslog = lds->lds_want_syslog;
+        if (lds->lds_want_syslog) {
+
+#if defined(HAVE_SYSLOG)
+            if (NULL != lds->lds_syslog_ident) {
+                info[i].ldi_syslog_ident = strdup(lds->lds_syslog_ident);
+                openlog(lds->lds_syslog_ident, LOG_PID, LOG_USER);
+            } else {
+                info[i].ldi_syslog_ident = NULL;
+                openlog("pmix", LOG_PID, LOG_USER);
+            }
+#endif
+            syslog_opened = true;
+            info[i].ldi_syslog_priority = lds->lds_syslog_priority;
+        }
+
+#if defined(HAVE_SYSLOG)
+    }
+#endif
+
+#else
+    info[i].ldi_syslog = false;
+#endif
+
+    if (NULL != lds->lds_prefix) {
+        info[i].ldi_prefix = strdup(lds->lds_prefix);
+        info[i].ldi_prefix_len = (int)strlen(lds->lds_prefix);
+    } else {
+        info[i].ldi_prefix = NULL;
+        info[i].ldi_prefix_len = 0;
+    }
+
+    if (NULL != lds->lds_suffix) {
+        info[i].ldi_suffix = strdup(lds->lds_suffix);
+        info[i].ldi_suffix_len = (int)strlen(lds->lds_suffix);
+    } else {
+        info[i].ldi_suffix = NULL;
+        info[i].ldi_suffix_len = 0;
+    }
+
+    if (pmix_output_redirected_to_syslog) {
+        /* since all is redirected to syslog, ensure
+         * we don't duplicate the output to the std places
+         */
+        info[i].ldi_stdout = false;
+        info[i].ldi_stderr = false;
+        info[i].ldi_file = false;
+        info[i].ldi_fd = -1;
+    } else {
+        /* since we aren't redirecting to syslog, use what was
+         * given to us
+         */
+        if (NULL != str && redirect_to_file) {
+            info[i].ldi_stdout = false;
+            info[i].ldi_stderr = false;
+            info[i].ldi_file = true;
+        } else {
+            info[i].ldi_stdout = lds->lds_want_stdout;
+            info[i].ldi_stderr = lds->lds_want_stderr;
+
+            info[i].ldi_fd = -1;
+            info[i].ldi_file = lds->lds_want_file;
+        }
+        if (NULL != sfx) {
+            info[i].ldi_file_suffix = strdup(sfx);
+        } else {
+            info[i].ldi_file_suffix = (NULL == lds->lds_file_suffix) ? NULL :
+                strdup(lds->lds_file_suffix);
+        }
+        info[i].ldi_file_want_append = lds->lds_want_file_append;
+        info[i].ldi_file_num_lines_lost = 0;
+    }
+
+    /* Don't open a file in the session directory now -- do that lazily
+     * so that if there's no output, we don't have an empty file */
+
+    return i;
+}
+
+
+static int open_file(int i)
+{
+    int flags;
+    char *filename;
+    int n;
+
+    /* first check to see if this file is already open
+     * on someone else's stream - if so, we don't want
+     * to open it twice
+     */
+    for (n=0; n < PMIX_OUTPUT_MAX_STREAMS; n++) {
+        if (i == n) {
+            continue;
+        }
+        if (!info[n].ldi_used) {
+            continue;
+        }
+        if (!info[n].ldi_file) {
+            continue;
+        }
+        if (NULL != info[i].ldi_file_suffix &&
+            NULL != info[n].ldi_file_suffix) {
+            if (0 != strcmp(info[i].ldi_file_suffix, info[n].ldi_file_suffix)) {
+                break;
+            }
+        }
+        if (NULL == info[i].ldi_file_suffix &&
+            NULL != info[n].ldi_file_suffix) {
+            break;
+        }
+        if (NULL != info[i].ldi_file_suffix &&
+            NULL == info[n].ldi_file_suffix) {
+            break;
+        }
+        if (info[n].ldi_fd < 0) {
+            break;
+        }
+        info[i].ldi_fd = info[n].ldi_fd;
+        return PMIX_SUCCESS;
+    }
+
+    /* Setup the filename and open flags */
+
+    if (NULL != output_dir) {
+        filename = (char *) malloc(PMIX_PATH_MAX);
+        if (NULL == filename) {
+            return PMIX_ERR_OUT_OF_RESOURCE;
+        }
+        strncpy(filename, output_dir, PMIX_PATH_MAX);
+        strcat(filename, "/");
+        if (NULL != output_prefix) {
+            strcat(filename, output_prefix);
+        }
+        if (info[i].ldi_file_suffix != NULL) {
+            strcat(filename, info[i].ldi_file_suffix);
+        } else {
+            info[i].ldi_file_suffix = NULL;
+            strcat(filename, "output.txt");
+        }
+        flags = O_CREAT | O_RDWR;
+        if (!info[i].ldi_file_want_append) {
+            flags |= O_TRUNC;
+        }
+
+        /* Actually open the file */
+        info[i].ldi_fd = open(filename, flags, 0644);
+        free(filename);  /* release the filename in all cases */
+        if (-1 == info[i].ldi_fd) {
+            info[i].ldi_used = false;
+            return PMIX_ERR_IN_ERRNO;
+        }
+
+        /* Make the file be close-on-exec to prevent child inheritance
+         * problems */
+        if (-1 == fcntl(info[i].ldi_fd, F_SETFD, 1)) {
+           return PMIX_ERR_IN_ERRNO;
+        }
+
+    }
+
+    /* Return successfully even if the session dir did not exist yet;
+     * we'll try opening it later */
+
+    return PMIX_SUCCESS;
+}
+
+
+/*
+ * Free all the resources associated with a descriptor.
+ */
+static void free_descriptor(int output_id)
+{
+    output_desc_t *ldi;
+
+    if (output_id >= 0 && output_id < PMIX_OUTPUT_MAX_STREAMS &&
+        info[output_id].ldi_used && info[output_id].ldi_enabled) {
+        ldi = &info[output_id];
+
+        if (-1 != ldi->ldi_fd) {
+            close(ldi->ldi_fd);
+        }
+        ldi->ldi_used = false;
+
+        /* If we strduped a prefix, suffix, or syslog ident, free it */
+
+        if (NULL != ldi->ldi_prefix) {
+            free(ldi->ldi_prefix);
+        }
+        ldi->ldi_prefix = NULL;
+
+    if (NULL != ldi->ldi_suffix) {
+        free(ldi->ldi_suffix);
+    }
+    ldi->ldi_suffix = NULL;
+
+    if (NULL != ldi->ldi_file_suffix) {
+            free(ldi->ldi_file_suffix);
+        }
+        ldi->ldi_file_suffix = NULL;
+
+        if (NULL != ldi->ldi_syslog_ident) {
+            free(ldi->ldi_syslog_ident);
+        }
+        ldi->ldi_syslog_ident = NULL;
+    }
+}
+
+
+static int make_string(char **out, char **no_newline_string, output_desc_t *ldi,
+                       const char *format, va_list arglist)
+{
+    size_t len, total_len, temp_str_len;
+    bool want_newline = false;
+    char *temp_str;
+
+    /* Make the formatted string */
+    *out = NULL;
+    if (0 > vasprintf(no_newline_string, format, arglist)) {
+        return PMIX_ERR_NOMEM;
+    }
+    total_len = len = strlen(*no_newline_string);
+    if ('\n' != (*no_newline_string)[len - 1]) {
+        want_newline = true;
+        ++total_len;
+    } else if (NULL != ldi->ldi_suffix) {
+        /* if we have a suffix, then we don't want a
+         * newline to appear before it
+         */
+        (*no_newline_string)[len - 1] = '\0';
+        want_newline = true; /* add newline to end after suffix */
+        /* total_len won't change since we just moved the newline
+         * to appear after the suffix
+         */
+    }
+    if (NULL != ldi->ldi_prefix) {
+        total_len += strlen(ldi->ldi_prefix);
+    }
+    if (NULL != ldi->ldi_suffix) {
+        total_len += strlen(ldi->ldi_suffix);
+    }
+    temp_str = (char *) malloc(total_len * 2);
+    if (NULL == temp_str) {
+        return PMIX_ERR_OUT_OF_RESOURCE;
+    }
+    temp_str_len = total_len * 2;
+    if (NULL != ldi->ldi_prefix && NULL != ldi->ldi_suffix) {
+        if (want_newline) {
+            snprintf(temp_str, temp_str_len, "%s%s%s\n",
+                     ldi->ldi_prefix, *no_newline_string, ldi->ldi_suffix);
+        } else {
+            snprintf(temp_str, temp_str_len, "%s%s%s", ldi->ldi_prefix,
+                     *no_newline_string, ldi->ldi_suffix);
+        }
+    } else if (NULL != ldi->ldi_prefix) {
+        if (want_newline) {
+            snprintf(temp_str, temp_str_len, "%s%s\n",
+                     ldi->ldi_prefix, *no_newline_string);
+        } else {
+            snprintf(temp_str, temp_str_len, "%s%s", ldi->ldi_prefix,
+                     *no_newline_string);
+        }
+    } else if (NULL != ldi->ldi_suffix) {
+        if (want_newline) {
+            snprintf(temp_str, temp_str_len, "%s%s\n",
+                     *no_newline_string, ldi->ldi_suffix);
+        } else {
+            snprintf(temp_str, temp_str_len, "%s%s",
+                     *no_newline_string, ldi->ldi_suffix);
+        }
+    } else {
+        if (want_newline) {
+            snprintf(temp_str, temp_str_len, "%s\n", *no_newline_string);
+        } else {
+            snprintf(temp_str, temp_str_len, "%s", *no_newline_string);
+        }
+    }
+    *out = temp_str;
+    return PMIX_SUCCESS;
+}
+
+/*
+ * Do the actual output.  Take a va_list so that we can be called from
+ * multiple different places, even functions that took "..." as input
+ * arguments.
+ */
+static int output(int output_id, const char *format, va_list arglist)
+{
+    int rc = PMIX_SUCCESS;
+    char *str=NULL, *out = NULL;
+    output_desc_t *ldi;
+
+    /* Setup */
+
+    if (!initialized) {
+        pmix_output_init();
+    }
+
+    /* If it's valid, used, and enabled, output */
+
+    if (output_id >= 0 && output_id < PMIX_OUTPUT_MAX_STREAMS &&
+        info[output_id].ldi_used && info[output_id].ldi_enabled) {
+        ldi = &info[output_id];
+
+        /* Make the strings */
+        if (PMIX_SUCCESS != (rc = make_string(&out, &str, ldi, format, arglist))) {
+            goto cleanup;
+        }
+
+        /* Syslog output -- does not use the newline-appended string */
+#if defined(HAVE_SYSLOG)
+        if (ldi->ldi_syslog) {
+            syslog(ldi->ldi_syslog_priority, "%s", str);
+        }
+#endif
+
+        /* stdout output */
+        if (ldi->ldi_stdout) {
+            if (0 > write(fileno(stdout), out, (int)strlen(out))) {
+                rc = PMIX_ERROR;
+                goto cleanup;
+            }
+            fflush(stdout);
+        }
+
+        /* stderr output */
+        if (ldi->ldi_stderr) {
+            if (0 > write((-1 == default_stderr_fd) ?
+                          fileno(stderr) : default_stderr_fd,
+                          out, (int)strlen(out))) {
+                rc = PMIX_ERROR;
+                goto cleanup;
+            }
+            fflush(stderr);
+        }
+
+        /* File output -- first check to see if the file opening was
+         * delayed.  If so, try to open it.  If we failed to open it,
+         * then just discard (there are big warnings in the
+         * pmix_output.h docs about this!). */
+
+        if (ldi->ldi_file) {
+            if (ldi->ldi_fd == -1) {
+                if (PMIX_SUCCESS != open_file(output_id)) {
+                    ++ldi->ldi_file_num_lines_lost;
+                } else if (ldi->ldi_file_num_lines_lost > 0 && 0 <= ldi->ldi_fd) {
+                    char buffer[BUFSIZ];
+                    char *out = buffer;
+                    memset(buffer, 0, BUFSIZ);
+                    snprintf(buffer, BUFSIZ - 1,
+                             "[WARNING: %d lines lost because the PMIx process session directory did\n not exist when pmix_output() was invoked]\n",
+                             ldi->ldi_file_num_lines_lost);
+                    if (0 > write(ldi->ldi_fd, buffer, (int)strlen(buffer))) {
+                        rc = PMIX_ERROR;
+                        goto cleanup;
+                    }
+                    ldi->ldi_file_num_lines_lost = 0;
+                    if (out != buffer) {
+                        free(out);
+                    }
+                }
+            }
+            if (ldi->ldi_fd != -1) {
+                if (0 > write(ldi->ldi_fd, out, (int)strlen(out))) {
+                    rc = PMIX_ERROR;
+                    goto cleanup;
+                }
+            }
+        }
+        free(str);
+        str = NULL;
+    }
+
+  cleanup:
+    if (NULL != str) {
+        free(str);
+    }
+    if (NULL != out) {
+        free(out);
+    }
+    return rc;
+}
+
+int pmix_output_get_verbosity(int output_id)
+{
+    if (output_id >= 0 && output_id < PMIX_OUTPUT_MAX_STREAMS && info[output_id].ldi_used) {
+        return info[output_id].ldi_verbose_level;
+    } else {
+        return -1;
+    }
+}
diff --git a/src/util/output.h b/src/util/output.h
new file mode 100644
index 0000000..78bbcf1
--- /dev/null
+++ b/src/util/output.h
@@ -0,0 +1,546 @@
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2006 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2007-2011 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2010      Oracle and/or its affiliates.  All rights reserved.
+ * Copyright (c) 2015-2017 Intel, Inc. All rights reserved.
+ * Copyright (c) 2016      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+/** @file
+ * PMIX output stream facility.
+ *
+ * The PMIX output stream facility is used to send output from the PMIX
+ * libraries to output devices.  It is meant to fully replace all
+ * forms of printf() (and friends).  Output streams are opened via the
+ * pmix_output_open() function call, and then sent output via
+ * pmix_output_verbose(), PMIX_OUTPUT(), and pmix_output().  Streams are
+ * closed with pmix_output_close().
+ *
+ * Streams can multiplex output to several kinds of outputs (one of
+ * each):
+ *
+ * - the syslog (if available)
+ * - standard output
+ * - standard error
+ * - file
+ *
+ * Which outputs to use are specified during pmix_output_open().
+ *
+ * WARNING: When using "file" as an output destination, be aware that
+ * the file may not exist until the session directory for the process
+ * exists.  This is at least part of the way through MPI_INIT (for
+ * example).  Most MCA components and internals of PMIx won't be
+ * affected by this, but some RTE / startup aspects of PMIx will
+ * not be able to write to a file for output.  See pmix_output() for
+ * details on what happens in these cases.
+ *
+ * pmix_output_open() returns an integer handle that is used in
+ * successive calls to PMIX_OUTPUT() and pmix_output() to send output to
+ * the stream.
+ *
+ * The default "verbose" stream is opened after invoking
+ * pmix_output_init() (and closed after invoking
+ * pmix_output_finalize()).  This stream outputs to stderr only, and
+ * has a stream handle ID of 0.
+ *
+ * It is erroneous to have one thread close a stream and have another
+ * try to write to it.  Multiple threads writing to a single stream
+ * will be serialized in an unspecified order.
+ */
+
+#ifndef PMIX_OUTPUT_H_
+#define PMIX_OUTPUT_H_
+
+#include <src/include/pmix_config.h>
+
+
+#ifdef HAVE_STDARG_H
+#include <stdarg.h>
+#endif
+
+#include "pmix_rename.h"
+#include "src/class/pmix_object.h"
+
+BEGIN_C_DECLS
+
+/* There are systems where all output needs to be redirected to syslog
+ * and away from stdout/stderr or files - e.g., embedded systems whose
+ * sole file system is in flash. To support such systems, we provide
+ * the following environmental variables that support redirecting -all-
+ * output (both from pmix_output and stdout/stderr of processes) to
+ * syslog:
+ *
+ * PMIX_OUTPUT_REDIRECT - set to "syslog" to redirect to syslog. Other
+ *                        options may someday be supported
+ * PMIX_OUTPUT_SYSLOG_PRI - set to "info", "error", or "warn" to have
+ *                        output sent to syslog at that priority
+ * PMIX_OUTPUT_SYSLOG_IDENT - a string identifier for the log
+ *
+ * We also define two global variables that notify all other
+ * layers that output is being redirected to syslog at the given
+ * priority. These are used, for example, by the IO forwarding
+ * subsystem to tell it to dump any collected output directly to
+ * syslog instead of forwarding it to another location.
+ */
+extern bool pmix_output_redirected_to_syslog;
+extern int pmix_output_redirected_syslog_pri;
+
+/**
+ * \class pmix_output_stream_t
+ *
+ * Structure used to request the opening of a PMIX output stream.  A
+ * pointer to this structure is passed to pmix_output_open() to tell
+ * the pmix_output subsystem where to send output for a given stream.
+ * It is valid to specify multiple destinations of output for a stream
+ * -- output streams can be multiplexed to multiple different
+ * destinations through the pmix_output facility.
+ *
+ * Note that all strings in this struct are cached on the stream by
+ * value; there is no need to keep them allocated after the return
+ * from pmix_output_open().
+ */
+struct pmix_output_stream_t {
+    /** Class parent */
+    pmix_object_t super;
+
+    /**
+     * Indicate the starting verbosity level of the stream.
+     *
+     * Verbose levels are a convenience mechanisms, and are only
+     * consulted when output is sent to a stream through the
+     * pmix_output_verbose() function.  Verbose levels are ignored in
+     * PMIX_OUTPUT() and pmix_output().
+     *
+     * Valid verbose levels typically start at 0 (meaning "minimal
+     * information").  Higher verbosity levels generally indicate that
+     * more output and diagnostics should be displayed.
+     */
+    int lds_verbose_level;
+
+    /**
+     * When pmix_output_stream_t::lds_want_syslog is true, this field is
+     * examined to see what priority output from the stream should be
+     * sent to the syslog.
+     *
+     * This value should be set as per the syslog(3) man page.  It is
+     * typically the OR value of "facilty" and "level" values described
+     * in the man page.
+     */
+    int lds_syslog_priority;
+    /**
+     * When pmix_output_stream_t::lds_want_syslog is true, this field is
+     * examined to see what ident value should be passed to openlog(3).
+     *
+     * If a NULL value is given, the string "pmix" is used.
+     */
+#if !defined(__WINDOWS__)
+    char *lds_syslog_ident;
+#elif !defined(_MSC_VER)
+    char *lds_syslog_ident;
+#else
+    HANDLE lds_syslog_ident;
+#endif  /* !defined(__WINDOWS__) */
+
+    /**
+     * String prefix added to all output on the stream.
+     *
+     * When this field is non-NULL, it is prefixed to all lines of
+     * output on the stream.  When this field is NULL, no prefix is
+     * added to each line of output in the stream. The prefix is copied
+     * to an internal structure in the call to pmix_output_open()!
+     */
+    char *lds_prefix;
+
+    /**
+     * String suffix added to all output on the stream.
+     *
+     * When this field is non-NULL, it is appended to all lines of
+     * output on the stream.  When this field is NULL, no suffix is
+     * added to each line of output in the stream. The suffix is copied
+     * to an internal structure in the call to pmix_output_open()!
+     */
+    char *lds_suffix;
+
+    /**
+     * Indicates whether the output of the stream is
+     * debugging/developer-only output or not.
+     *
+     * This field should be "true" if the output is for debugging
+     * purposes only.  In that case, the output will never be sent to
+     * the stream unless PMIX was configured with --enable-debug.
+     */
+    bool lds_is_debugging;
+
+    /**
+     * Indicates whether output of the stream should be sent to the
+     * syslog or not.
+     *
+     * If this field is true, output from this stream is sent to the
+     * syslog, and the following fields are also examined:
+     *
+     * - lds_syslog_priority
+     * - lds_syslog_ident
+     * - lds_prefix
+     *
+     * If this field is false, the above three fields are ignored.
+     */
+    bool lds_want_syslog;
+
+    /**
+     * Whether to send stream output to stdout or not.
+     *
+     * If this field is true, stream output is sent to stdout.
+     */
+    bool lds_want_stdout;
+    /**
+     * Whether to send stream output to stderr or not.
+     *
+     * If this field is true, stream output is sent to stderr.
+     */
+    bool lds_want_stderr;
+
+    /**
+     * Whether to send stream output to a file or not.
+     *
+     * When this field is true, stream output is sent to a file, and the
+     * following fields are also examined:
+     *
+     * - lds_want_file_append
+     * - lda_file_suffix
+     */
+    bool lds_want_file;
+    /**
+     * When pmix_output_stream_t::lds_want_file is true, this field
+     * indicates whether to append the file (if it exists) or overwrite
+     * it.
+     *
+     * If false, the file is opened with the O_TRUNC flag.
+     */
+    bool lds_want_file_append;
+    /**
+     * When pmix_output_stream_t::lds_want_file is true, this field
+     * indicates the string suffix to add to the filename.
+     *
+     * The output file will be in the directory and begin with the
+     * prefix set by pmix_output_set_output_file_info() (e.g.,
+     * "$dir/$prefix$suffix").  If this field is NULL and
+     * lds_want_file is true, then the suffix "output.txt" is used.
+     *
+     * Note that it is possible that the output directory may not
+     * exist when pmix_output_open() is invoked.  See pmix_output()
+     * for details on what happens in this situation.
+     */
+    char *lds_file_suffix;
+
+};
+
+    /**
+     * Convenience typedef
+     */
+    typedef struct pmix_output_stream_t pmix_output_stream_t;
+
+    /**
+     * Initializes the output stream system and opens a default
+     * "verbose" stream.
+     *
+     * @retval true Upon success.
+     * @retval false Upon failure.
+     *
+     * This should be the first function invoked in the output
+     * subsystem.  After this call, the default "verbose" stream is open
+     * and can be written to via calls to pmix_output_verbose() and
+     * pmix_output_error().
+     *
+     * By definition, the default verbose stream has a handle ID of 0,
+     * and has a verbose level of 0.
+     */
+    bool pmix_output_init(void);
+
+    /**
+     * Shut down the output stream system.
+     *
+     * Shut down the output stream system, including the default verbose
+     * stream.
+     */
+    void pmix_output_finalize(void);
+
+    /**
+     * Opens an output stream.
+     *
+     * @param lds A pointer to pmix_output_stream_t describing what the
+     * characteristics of the output stream should be.
+     *
+     * This function opens an output stream and returns an integer
+     * handle.  The caller is responsible for maintaining the handle and
+     * using it in successive calls to PMIX_OUTPUT(), pmix_output(),
+     * pmix_output_switch(), and pmix_output_close().
+     *
+     * If lds is NULL, the default descriptions will be used, meaning
+     * that output will only be sent to stderr.
+     *
+     * It is safe to have multiple threads invoke this function
+     * simultaneously; their execution will be serialized in an
+     * unspecified manner.
+     *
+     * Be sure to see pmix_output() for a description of what happens
+     * when open_open() / pmix_output() is directed to send output to a
+     * file but the process session directory does not yet exist.
+     */
+    int pmix_output_open(pmix_output_stream_t *lds);
+
+    /**
+     * Re-opens / redirects an output stream.
+     *
+     * @param output_id Stream handle to reopen
+     * @param lds A pointer to pmix_output_stream_t describing what the
+     * characteristics of the reopened output stream should be.
+     *
+     * This function redirects an existing stream into a new [set of]
+     * location[s], as specified by the lds parameter.  If the output_id
+     * passed is invalid, this call is effectively the same as opening a
+     * new stream with a specific stream handle.
+     */
+    int pmix_output_reopen(int output_id, pmix_output_stream_t *lds);
+
+    /**
+     * Enables and disables output streams.
+     *
+     * @param output_id Stream handle to switch
+     * @param enable Boolean indicating whether to enable the stream
+     * output or not.
+     *
+     * @returns The previous enable state of the stream (true == enabled,
+     * false == disabled).
+     *
+     * The output of a stream can be temporarily disabled by passing an
+     * enable value to false, and later resumed by passing an enable
+     * value of true.  This does not close the stream -- it simply tells
+     * the pmix_output subsystem to intercept and discard any output sent
+     * to the stream via PMIX_OUTPUT() or pmix_output() until the output
+     * is re-enabled.
+     */
+    bool pmix_output_switch(int output_id, bool enable);
+
+    /**
+     * \internal
+     *
+     * Reopens all existing output streams.
+     *
+     * This function should never be called by user applications; it is
+     * typically only invoked after a restart (i.e., in a new process)
+     * where output streams need to be re-initialized.
+     */
+    void pmix_output_reopen_all(void);
+
+    /**
+     * Close an output stream.
+     *
+     * @param output_id Handle of the stream to close.
+     *
+     * Close an output stream.  No output will be sent to the stream
+     * after it is closed.  Be aware that output handles tend to be
+     * re-used; it is possible that after a stream is closed, if another
+     * stream is opened, it will get the same handle value.
+     */
+    void pmix_output_close(int output_id);
+
+    /**
+     * Main function to send output to a stream.
+     *
+     * @param output_id Stream id returned from pmix_output_open().
+     * @param format printf-style format string.
+     * @param varargs printf-style varargs list to fill the string
+     * specified by the format parameter.
+     *
+     * This is the main function to send output to custom streams (note
+     * that output to the default "verbose" stream is handled through
+     * pmix_output_verbose() and pmix_output_error()).
+     *
+     * It is never necessary to send a trailing "\n" in the strings to
+     * this function; some streams requires newlines, others do not --
+     * this function will append newlines as necessary.
+     *
+     * Verbosity levels are ignored in this function.
+     *
+     * Note that for output streams that are directed to files, the
+     * files are stored under the process' session directory.  If the
+     * session directory does not exist when pmix_output() is invoked,
+     * the output will be discarded!  Once the session directory is
+     * created, pmix_output() will automatically create the file and
+     * writing to it.
+     */
+    void pmix_output(int output_id, const char *format, ...) __pmix_attribute_format__(__printf__, 2, 3);
+
+    /**
+     * Send output to a stream only if the passed verbosity level is
+     * high enough.
+     *
+     * @param output_id Stream id returned from pmix_output_open().
+     * @param level Target verbosity level.
+     * @param format printf-style format string.
+     * @param varargs printf-style varargs list to fill the string
+     * specified by the format parameter.
+     *
+     * Output is only sent to the stream if the current verbosity level
+     * is greater than or equal to the level parameter.  This mechanism
+     * can be used to send "information" kinds of output to user
+     * applications, but only when the user has asked for a high enough
+     * verbosity level.
+     *
+     * It is never necessary to send a trailing "\n" in the strings to
+     * this function; some streams requires newlines, others do not --
+     * this function will append newlines as necessary.
+     *
+     * This function is really a convenience wrapper around checking the
+     * current verbosity level set on the stream, and if the passed
+     * level is less than or equal to the stream's verbosity level, this
+     * function will effectively invoke pmix_output to send the output to
+     * the stream.
+     *
+     * @see pmix_output_set_verbosity()
+     */
+    void pmix_output_verbose(int verbose_level, int output_id,
+                                           const char *format, ...) __pmix_attribute_format__(__printf__, 3, 4);
+
+   /**
+    * Same as pmix_output_verbose(), but takes a va_list form of varargs.
+    */
+    void pmix_output_vverbose(int verbose_level, int output_id,
+                                            const char *format, va_list ap) __pmix_attribute_format__(__printf__, 3, 0);
+
+    /**
+     * Set the verbosity level for a stream.
+     *
+     * @param output_id Stream id returned from pmix_output_open().
+     * @param level New verbosity level
+     *
+     * This function sets the verbosity level on a given stream.  It
+     * will be used for all future invocations of pmix_output_verbose().
+     */
+    void pmix_output_set_verbosity(int output_id, int level);
+
+    /**
+     * Get the verbosity level for a stream
+     *
+     * @param output_id Stream id returned from pmix_output_open()
+     * @returns Verbosity of stream
+     */
+    int pmix_output_get_verbosity(int output_id);
+
+    /**
+     * Set characteristics for output files.
+     *
+     * @param dir Directory where output files will go
+     * @param olddir If non-NULL, the directory where output files
+     * were previously opened
+     * @param prefix Prefix of files in the output directory
+     * @param oldprefix If non-NULL, the old prefix
+     *
+     * This function controls the final filename used for all new
+     * output streams that request output files.  Specifically, when
+     * pmix_output_stream_t::lds_want_file is true, the output
+     * filename will be of the form $dir/$prefix$suffix.
+     *
+     * The default value for the output directory is whatever is
+     * specified in the TMPDIR environment variable if it exists, or
+     * $HOME if it does not.  The default value for the prefix is
+     * "output-pid<pid>-" (where "<pid>" is replaced by the PID of the
+     * current process).
+     *
+     * If dir or prefix are NULL, new values are not set.  The strings
+     * represented by dir and prefix are copied into internal storage;
+     * it is safe to pass string constants or free() these values
+     * after pmix_output_set_output_file_info() returns.
+     *
+     * If olddir or oldprefix are not NULL, copies of the old
+     * directory and prefix (respectively) are returned in these
+     * parameters.  The caller is responsible for calling (free) on
+     * these values.  This allows one to get the old values, output an
+     * output file in a specific directory and/or with a specific
+     * prefix, and then restore the old values.
+     *
+     * Note that this function only affects the creation of \em new
+     * streams -- streams that have already started writing to output
+     * files are not affected (i.e., their output files are not moved
+     * to the new directory).  More specifically, the pmix_output
+     * system only opens/creates output files lazily -- so calling
+     * this function affects both new streams \em and any stream that
+     * was previously opened but had not yet output anything.
+     */
+    void pmix_output_set_output_file_info(const char *dir,
+                                                        const char *prefix,
+                                                        char **olddir,
+                                                        char **oldprefix);
+
+    /**
+     * Same as pmix_output_verbose(), but pointer to buffer and size.
+     */
+    void pmix_output_hexdump(int verbose_level, int output_id,
+                                           void *ptr, int buflen);
+
+#if PMIX_ENABLE_DEBUG
+    /**
+     * Main macro for use in sending debugging output to output streams;
+     * will be "compiled out" when PMIX is configured without
+     * --enable-debug.
+     *
+     * @see pmix_output()
+     */
+#define PMIX_OUTPUT(a) pmix_output a
+
+    /**
+     * Macro for use in sending debugging output to the output
+     * streams.  Will be "compiled out" when PMIX is configured
+     * without --enable-debug.
+     *
+     * @see pmix_output_verbose()
+     */
+#define PMIX_OUTPUT_VERBOSE(a) pmix_output_verbose a
+#else
+    /**
+     * Main macro for use in sending debugging output to output streams;
+     * will be "compiled out" when PMIX is configured without
+     * --enable-debug.
+     *
+     * @see pmix_output()
+     */
+#define PMIX_OUTPUT(a)
+
+    /**
+     * Macro for use in sending debugging output to the output
+     * streams.  Will be "compiled out" when PMIX is configured
+     * without --enable-debug.
+     *
+     * @see pmix_output_verbose()
+     */
+#define PMIX_OUTPUT_VERBOSE(a)
+#endif
+
+/**
+ * Declare the class of this type.  Note that the constructor for
+ * this class is for convenience only -- it is \em not necessary
+ * to be invoked.  If the constructor it used, it sets all values
+ * in the struct to be false / 0 (i.e., turning off all output).
+ * The intended usage is to invoke the constructor and then enable
+ * the output fields that you want.
+ */
+PMIX_CLASS_DECLARATION(pmix_output_stream_t);
+
+END_C_DECLS
+
+#endif /* PMIX_OUTPUT_H_ */
diff --git a/src/util/parse_options.c b/src/util/parse_options.c
new file mode 100644
index 0000000..d7679af
--- /dev/null
+++ b/src/util/parse_options.c
@@ -0,0 +1,143 @@
+/*
+ * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2008 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2008      Sun Microsystems, Inc.  All rights reserved.
+ * Copyright (c) 2008      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2016      Intel, Inc.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+#include "pmix_config.h"
+#include "pmix_common.h"
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
+#include "src/util/argv.h"
+#include "src/util/output.h"
+
+#include "src/util/parse_options.h"
+
+void pmix_util_parse_range_options(char *inp, char ***output)
+{
+    char **r1=NULL, **r2=NULL;
+    int i, vint;
+    int start, end, n;
+    char nstr[32];
+    char *input, *bang;
+    bool bang_option=false;
+
+    /* protect against null input */
+    if (NULL == inp) {
+        return;
+    }
+
+    /* protect the provided input */
+    input = strdup(inp);
+
+    /* check for the special '!' operator */
+    if (NULL != (bang = strchr(input, '!'))) {
+        bang_option = true;
+        *bang = '\0';
+    }
+
+    /* split on commas */
+    r1 = pmix_argv_split(input, ',');
+    /* for each resulting element, check for range */
+    for (i=0; i < pmix_argv_count(r1); i++) {
+        r2 = pmix_argv_split(r1[i], '-');
+        if (1 < pmix_argv_count(r2)) {
+            /* given range - get start and end */
+            start = strtol(r2[0], NULL, 10);
+            end = strtol(r2[1], NULL, 10);
+        } else {
+            /* check for wildcard - have to do this here because
+             * the -1 would have been caught in the split
+             */
+            vint = strtol(r1[i], NULL, 10);
+            if (-1 == vint) {
+                pmix_argv_free(*output);
+                *output = NULL;
+                pmix_argv_append_nosize(output, "-1");
+                pmix_argv_free(r2);
+                goto cleanup;
+            }
+            start = strtol(r2[0], NULL, 10);
+            end = start;
+        }
+        for (n = start; n <= end; n++) {
+            snprintf(nstr, 32, "%d", n);
+            pmix_argv_append_nosize(output, nstr);
+        }
+        pmix_argv_free(r2);
+    }
+
+cleanup:
+    if (bang_option) {
+        pmix_argv_append_nosize(output, "BANG");
+    }
+    free(input);
+    pmix_argv_free(r1);
+
+}
+
+void pmix_util_get_ranges(char *inp, char ***startpts, char ***endpts)
+{
+    char **r1=NULL, **r2=NULL;
+    int i;
+    char *input;
+
+    /* protect against null input */
+    if (NULL == inp) {
+        return;
+    }
+
+    /* protect the provided input */
+    input = strdup(inp);
+
+    /* split on commas */
+    r1 = pmix_argv_split(input, ',');
+    /* for each resulting element, check for range */
+    for (i=0; i < pmix_argv_count(r1); i++) {
+        r2 = pmix_argv_split(r1[i], '-');
+        if (2 == pmix_argv_count(r2)) {
+            /* given range - get start and end */
+            pmix_argv_append_nosize(startpts, r2[0]);
+            pmix_argv_append_nosize(endpts, r2[1]);
+        } else if (1 == pmix_argv_count(r2)) {
+            /* only one value provided, so it is both the start
+             * and the end
+             */
+            pmix_argv_append_nosize(startpts, r2[0]);
+            pmix_argv_append_nosize(endpts, r2[0]);
+        } else {
+            /* no idea how to parse this */
+            pmix_output(0, "Unknown parse error on string: %s(%s)", inp, r1[i]);
+        }
+        pmix_argv_free(r2);
+    }
+
+    free(input);
+    pmix_argv_free(r1);
+
+}
diff --git a/src/util/parse_options.h b/src/util/parse_options.h
new file mode 100644
index 0000000..67e2390
--- /dev/null
+++ b/src/util/parse_options.h
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2006 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2008      Sun Microsystems, Inc.  All rights reserved.
+ * Copyright (c) 2016      Intel, Inc.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+/** @file:
+ *
+ */
+
+#ifndef _PMIX_PARSE_OPTIONS_H_
+#define _PMIX_PARSE_OPTIONS_H_
+
+#include "pmix_config.h"
+
+BEGIN_C_DECLS
+
+PMIX_EXPORT void pmix_util_parse_range_options(char *input, char ***output);
+
+PMIX_EXPORT void pmix_util_get_ranges(char *inp, char ***startpts, char ***endpts);
+
+END_C_DECLS
+#endif
diff --git a/src/util/path.c b/src/util/path.c
new file mode 100644
index 0000000..4c532ef
--- /dev/null
+++ b/src/util/path.c
@@ -0,0 +1,717 @@
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2007 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2009-2014 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2010      IBM Corporation.  All rights reserved.
+ * Copyright (c) 2012-2013 Los Alamos National Security, LLC.
+ *                         All rights reserved.
+ * Copyright (c) 2014-2016 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2016      University of Houston. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_SHLWAPI_H
+#include <shlwapi.h>
+#endif
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#ifdef HAVE_SYS_MOUNT_H
+#include <sys/mount.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
+#ifdef HAVE_SYS_VFS_H
+#include <sys/vfs.h>
+#endif
+#ifdef HAVE_SYS_STATFS_H
+#include <sys/statfs.h>
+#endif
+#ifdef HAVE_SYS_STATVFS_H
+#include <sys/statvfs.h>
+#endif
+#ifdef HAVE_SYS_MOUNT_H
+#include <sys/mount.h>
+#endif
+#ifdef HAVE_MNTENT_H
+#include <mntent.h>
+#endif
+#ifdef HAVE_PATHS_H
+#include <paths.h>
+#endif
+
+#ifdef _PATH_MOUNTED
+#define MOUNTED_FILE _PATH_MOUNTED
+#else
+#define MOUNTED_FILE "/etc/mtab"
+#endif
+
+
+#include "src/include/pmix_stdint.h"
+#include "src/util/output.h"
+#include "src/util/path.h"
+#include "src/util/os_path.h"
+#include "src/util/argv.h"
+
+/*
+ * Sanity check to ensure we have either statfs or statvfs
+ */
+#if !defined(HAVE_STATFS) && !defined(HAVE_STATVFS)
+#error Must have either statfs() or statvfs()
+#endif
+
+/*
+ * Note that some OS's (e.g., NetBSD and Solaris) have statfs(), but
+ * no struct statfs (!).  So check to make sure we have struct statfs
+ * before allowing the use of statfs().
+ */
+#if defined(HAVE_STATFS) && \
+    (defined(HAVE_STRUCT_STATFS_F_FSTYPENAME) || \
+     defined(HAVE_STRUCT_STATFS_F_TYPE))
+#define USE_STATFS 1
+#endif
+
+static void path_env_load(char *path, int *pargc, char ***pargv);
+static char *list_env_get(char *var, char **list);
+
+bool pmix_path_is_absolute( const char *path )
+{
+    if( PMIX_PATH_SEP[0] == *path ) {
+        return true;
+    }
+    return false;
+}
+
+/**
+ *  Locates a file with certain permissions
+ */
+char *pmix_path_find(char *fname, char **pathv, int mode, char **envv)
+{
+    char *fullpath;
+    char *delimit;
+    char *env;
+    char *pfix;
+    int i;
+
+    /* If absolute path is given, return it without searching. */
+    if( pmix_path_is_absolute(fname) ) {
+        return pmix_path_access(fname, NULL, mode);
+    }
+
+    /* Initialize. */
+
+    fullpath = NULL;
+    i = 0;
+
+    /* Consider each directory until the file is found.  Thus, the
+       order of directories is important. */
+
+    while (pathv[i] && NULL == fullpath) {
+
+        /* Replace environment variable at the head of the string. */
+        if ('$' == *pathv[i]) {
+            delimit = strchr(pathv[i], PMIX_PATH_SEP[0]);
+            if (delimit) {
+                *delimit = '\0';
+            }
+            env = list_env_get(pathv[i]+1, envv);
+            if (delimit) {
+                *delimit = PMIX_PATH_SEP[0];
+            }
+            if (NULL != env) {
+                if (!delimit) {
+                    fullpath = pmix_path_access(fname, env, mode);
+                } else {
+                    pfix = (char*) malloc(strlen(env) + strlen(delimit) + 1);
+                    if (NULL == pfix) {
+                        return NULL;
+                    }
+                    strcpy(pfix, env);
+                    strcat(pfix, delimit);
+                    fullpath = pmix_path_access(fname, pfix, mode);
+                    free(pfix);
+                }
+            }
+        }
+        else {
+            fullpath = pmix_path_access(fname, pathv[i], mode);
+        }
+        i++;
+    }
+    return pmix_make_filename_os_friendly(fullpath);
+}
+
+/*
+ * Locates a file with certain permissions from a list of search paths
+ */
+char *pmix_path_findv(char *fname, int mode, char **envv, char *wrkdir)
+{
+    char **dirv;
+    char *fullpath;
+    char *path;
+    int dirc;
+    int i;
+    bool found_dot = false;
+
+    /* Set the local search paths. */
+
+    dirc = 0;
+    dirv = NULL;
+
+    if (NULL != (path = list_env_get("PATH", envv))) {
+        path_env_load(path, &dirc, &dirv);
+    }
+
+    /* Replace the "." path by the working directory. */
+
+    if (NULL != wrkdir) {
+        for (i = 0; i < dirc; ++i) {
+            if (0 == strcmp(dirv[i], ".")) {
+                found_dot = true;
+                free(dirv[i]);
+                dirv[i] = strdup(wrkdir);
+                if (NULL == dirv[i]){
+                    return NULL;
+                }
+            }
+        }
+    }
+
+    /* If we didn't find "." in the path and we have a wrkdir, append
+       the wrkdir to the end of the path */
+
+    if (!found_dot && NULL != wrkdir) {
+        pmix_argv_append(&dirc, &dirv, wrkdir);
+    }
+
+    if(NULL == dirv)
+        return NULL;
+    fullpath = pmix_path_find(fname, dirv, mode, envv);
+    pmix_argv_free(dirv);
+    return fullpath;
+}
+
+
+/**
+ *  Forms a complete pathname and checks it for existance and
+ *  permissions
+ *
+ *  Accepts:
+ *      -fname File name
+ *      -path  Path prefix
+ *      -mode  Target permissions which must be satisfied
+ *
+ *  Returns:
+ *      -Full pathname of located file Success
+ *      -NULL Failure
+ */
+char *pmix_path_access(char *fname, char *path, int mode)
+{
+    char *fullpath = NULL;
+    struct stat buf;
+
+    /* Allocate space for the full pathname. */
+    if (NULL == path) {
+        fullpath = pmix_os_path(false, fname, NULL);
+    } else {
+        fullpath = pmix_os_path(false, path, fname, NULL);
+    }
+    if (NULL == fullpath)
+        return NULL;
+
+    /* first check to see - is this a file or a directory? We
+     * only want files
+     */
+    if (0 != stat(fullpath, &buf)) {
+        /* couldn't stat the path - obviously, this also meets the
+         * existence check, if that was requested
+         */
+        free(fullpath);
+        return NULL;
+    }
+
+    if (!(S_IFREG & buf.st_mode) &&
+        !(S_IFLNK & buf.st_mode)) {
+        /* this isn't a regular file or a symbolic link, so
+         * ignore it
+         */
+        free(fullpath);
+        return NULL;
+    }
+
+    /* check the permissions */
+    if ((X_OK & mode) && !(S_IXUSR & buf.st_mode)) {
+        /* if they asked us to check executable permission,
+         * and that isn't set, then return NULL
+         */
+        free(fullpath);
+        return NULL;
+    }
+    if ((R_OK & mode) && !(S_IRUSR & buf.st_mode)) {
+        /* if they asked us to check read permission,
+         * and that isn't set, then return NULL
+         */
+        free(fullpath);
+        return NULL;
+    }
+    if ((W_OK & mode) && !(S_IWUSR & buf.st_mode)) {
+        /* if they asked us to check write permission,
+         * and that isn't set, then return NULL
+         */
+        free(fullpath);
+        return NULL;
+    }
+
+    /* must have met all criteria! */
+    return fullpath;
+}
+
+
+/**
+ *
+ *  Loads argument array with $PATH env var.
+ *
+ *  Accepts
+ *      -path String contiaing the $PATH
+ *      -argc Pointer to argc
+ *      -argv Pointer to list of argv
+ */
+static void path_env_load(char *path, int *pargc, char ***pargv)
+{
+    char *p;
+    char saved;
+
+    if (NULL == path) {
+        *pargc = 0;
+        return;
+    }
+
+    /* Loop through the paths (delimited by PATHENVSEP), adding each
+       one to argv. */
+
+    while ('\0' != *path) {
+
+        /* Locate the delimiter. */
+
+        for (p = path; *p && (*p != PMIX_ENV_SEP); ++p) {
+            continue;
+        }
+
+        /* Add the path. */
+
+        if (p != path) {
+            saved = *p;
+            *p = '\0';
+            pmix_argv_append(pargc, pargv, path);
+            *p = saved;
+            path = p;
+        }
+
+        /* Skip past the delimiter, if present. */
+
+        if (*path) {
+            ++path;
+        }
+    }
+}
+
+
+/**
+ *  Gets value of variable in list or environment. Looks in the list first
+ *
+ *  Accepts:
+ *      -var  String variable
+ *      -list Pointer to environment list
+ *
+ *  Returns:
+ *      -List Pointer to environment list Success
+ *      -NULL Failure
+ */
+static char *list_env_get(char *var, char **list)
+{
+    size_t n;
+
+    if (NULL != list) {
+        n = strlen(var);
+
+        while (NULL != *list) {
+            if ((0 == strncmp(var, *list, n)) && ('=' == (*list)[n])) {
+                return (*list + n + 1);
+            }
+            ++list;
+        }
+    }
+    return getenv(var);
+}
+
+/**
+ * Try to figure out the absolute path based on the application name
+ * (usually argv[0]). If the path is already absolute return a copy, if
+ * it start with . look into the current directory, if not dig into
+ * the $PATH.
+ * In case of error or if executable was not found (as an example if
+ * the application did a cwd between the start and this call), the
+ * function will return NULL. Otherwise, an newly allocated string
+ * will be returned.
+ */
+char* pmix_find_absolute_path( char* app_name )
+{
+    char* abs_app_name;
+    char cwd[PMIX_PATH_MAX], *pcwd;
+
+    if( pmix_path_is_absolute(app_name) ) { /* already absolute path */
+        abs_app_name = app_name;
+    } else if ( '.' == app_name[0] ||
+               NULL != strchr(app_name, PMIX_PATH_SEP[0])) {
+        /* the app is in the current directory or below it */
+        pcwd = getcwd( cwd, PMIX_PATH_MAX );
+        if( NULL == pcwd ) {
+            /* too bad there is no way we can get the app absolute name */
+            return NULL;
+        }
+        abs_app_name = pmix_os_path( false, pcwd, app_name, NULL );
+    } else {
+        /* Otherwise try to search for the application in the PATH ... */
+        abs_app_name = pmix_path_findv( app_name, X_OK, NULL, NULL );
+    }
+
+    if( NULL != abs_app_name ) {
+        char* resolved_path = (char*)malloc(PMIX_PATH_MAX);
+        realpath( abs_app_name, resolved_path );
+        if( abs_app_name != app_name ) free(abs_app_name);
+        return resolved_path;
+    }
+    return NULL;
+}
+
+/**
+ * Read real FS type from /etc/mtab, needed to translate autofs fs type into real fs type
+ * TODO: solaris? OSX?
+ * Limitations: autofs on solaris/osx will be assumed as "nfs" type
+ */
+
+static char *pmix_check_mtab(char *dev_path)
+{
+
+#ifdef HAVE_MNTENT_H
+    FILE * mtab = NULL;
+    struct mntent * part = NULL;
+
+    if ((mtab = setmntent(MOUNTED_FILE, "r")) != NULL) {
+        while (NULL != (part = getmntent(mtab))) {
+            if ((NULL != part->mnt_dir) &&
+                (NULL != part->mnt_type) &&
+                (0 == strcmp(part->mnt_dir, dev_path)))
+            {
+                endmntent(mtab);
+                return strdup(part->mnt_type);
+            }
+        }
+        endmntent(mtab);
+    }
+#endif
+    return NULL;
+}
+
+
+/**
+ * @brief Figure out, whether fname is on network file system
+ *
+ * Try to figure out, whether the file name specified through fname is
+ * on any network file system (currently NFS, Lustre, Panasas and GPFS).
+ *
+ * If the file is not created, the parent directory is checked.
+ * This allows checking for NFS prior to opening the file.
+ *
+ * @fname[in]          File name to check
+ * @fstype[out]        File system type if retval is true
+ *
+ * @retval true                If fname is on NFS, Lustre, Panasas or GPFS
+ * @retval false               otherwise
+ *
+ *
+ * Linux:
+ *   statfs(const char *path, struct statfs *buf);
+ *          with fsid_t  f_fsid;  (in kernel struct{ int val[2] };)
+ *          return 0 success, -1 on failure with errno set.
+ *   statvfs (const char *path, struct statvfs *buf);
+ *          with unsigned long  f_fsid;   -- returns wrong info
+ *          return 0 success, -1 on failure with errno set.
+ * Solaris:
+ *   statvfs (const char *path, struct statvfs *buf);
+ *          with f_basetype, contains a string of length FSTYPSZ
+ *          return 0 success, -1 on failure with errno set.
+ * FreeBSD:
+ *   statfs(const char *path, struct statfs *buf);
+ *          with f_fstypename, contains a string of length MFSNAMELEN
+ *          return 0 success, -1 on failure with errno set.
+ *          compliant with: 4.4BSD.
+ * NetBSD:
+ *   statvfs (const char *path, struct statvfs *buf);
+ *          with f_fstypename, contains a string of length VFS_NAMELEN
+ *          return 0 success, -1 on failure with errno set.
+ * Mac OSX (10.6.2 through 10.9):
+ *   statvfs(const char * restrict path, struct statvfs * restrict buf);
+ *          with fsid    Not meaningful in this implementation.
+ *          is just a wrapper around statfs()
+ *   statfs(const char *path, struct statfs *buf);
+ *          with f_fstypename, contains a string of length MFSTYPENAMELEN
+ *          return 0 success, -1 on failure with errno set.
+ */
+#ifndef LL_SUPER_MAGIC
+#define LL_SUPER_MAGIC                    0x0BD00BD0     /* Lustre magic number */
+#endif
+#ifndef NFS_SUPER_MAGIC
+#define NFS_SUPER_MAGIC                   0x6969
+#endif
+#ifndef PAN_KERNEL_FS_CLIENT_SUPER_MAGIC
+#define PAN_KERNEL_FS_CLIENT_SUPER_MAGIC  0xAAD7AAEA     /* Panasas FS */
+#endif
+#ifndef GPFS_SUPER_MAGIC
+#define GPFS_SUPER_MAGIC  0x47504653    /* Thats GPFS in ASCII */
+#endif
+#ifndef AUTOFS_SUPER_MAGIC
+#define AUTOFS_SUPER_MAGIC 0x0187
+#endif
+#ifndef PVFS2_SUPER_MAGIC
+#define PVFS2_SUPER_MAGIC 0x20030528
+#endif
+
+#define MASK2        0xffff
+#define MASK4    0xffffffff
+
+bool pmix_path_nfs(char *fname, char **ret_fstype)
+{
+    int i;
+    int fsrc = -1;
+    int vfsrc = -1;
+    int trials;
+    char * file = strdup (fname);
+#if defined(USE_STATFS)
+    struct statfs fsbuf;
+#endif
+#if defined(HAVE_STATVFS)
+    struct statvfs vfsbuf;
+#endif
+    /*
+     * Be sure to update the test (test/util/pmix_path_nfs.c)
+     * while adding a new Network/Cluster Filesystem here
+     */
+    static struct fs_types_t {
+        unsigned long long f_fsid;
+        unsigned long long f_mask;
+        const char * f_fsname;
+    } fs_types[] = {
+        {LL_SUPER_MAGIC,                   MASK4, "lustre"},
+        {NFS_SUPER_MAGIC,                  MASK2, "nfs"},
+        {AUTOFS_SUPER_MAGIC,               MASK2, "autofs"},
+        {PAN_KERNEL_FS_CLIENT_SUPER_MAGIC, MASK4, "panfs"},
+        {GPFS_SUPER_MAGIC,                 MASK4, "gpfs"},
+        {PVFS2_SUPER_MAGIC,                MASK4, "pvfs2"}
+    };
+#define FS_TYPES_NUM (int)(sizeof (fs_types)/sizeof (fs_types[0]))
+
+    /*
+     * First, get the OS-dependent struct stat(v)fs buf.  This may
+     * return the ESTALE error on NFS, if the underlying file/path has
+     * changed.
+     */
+again:
+#if defined(USE_STATFS)
+    trials = 5;
+    do {
+        fsrc = statfs(file, &fsbuf);
+    } while (-1 == fsrc && ESTALE == errno && (0 < --trials));
+#endif
+#if defined(HAVE_STATVFS)
+    trials = 5;
+    do {
+        vfsrc = statvfs(file, &vfsbuf);
+    } while (-1 == vfsrc && ESTALE == errno && (0 < --trials));
+#endif
+
+    /* In case some error with the current filename, try the parent
+       directory */
+    if (-1 == fsrc && -1 == vfsrc) {
+        char * last_sep;
+
+        PMIX_OUTPUT_VERBOSE((10, 0, "pmix_path_nfs: stat(v)fs on file:%s failed errno:%d directory:%s\n",
+                             fname, errno, file));
+        if (EPERM == errno) {
+            free(file);
+            if ( NULL != ret_fstype ) {
+                *ret_fstype = NULL;
+            }
+            return false;
+        }
+
+        last_sep = strrchr(file, PMIX_PATH_SEP[0]);
+        /* Stop the search, when we have searched past root '/' */
+        if (NULL == last_sep || (1 == strlen(last_sep) &&
+            PMIX_PATH_SEP[0] == *last_sep)) {
+            free (file);
+            if ( NULL != ret_fstype ) {
+                *ret_fstype=NULL;
+            }
+            return false;
+        }
+        *last_sep = '\0';
+
+        goto again;
+    }
+
+    /* Next, extract the magic value */
+    for (i = 0; i < FS_TYPES_NUM; i++) {
+#if defined(USE_STATFS)
+        /* These are uses of struct statfs */
+#    if defined(HAVE_STRUCT_STATFS_F_FSTYPENAME)
+        if (0 == fsrc &&
+            0 == strncasecmp(fs_types[i].f_fsname, fsbuf.f_fstypename,
+                             sizeof(fsbuf.f_fstypename))) {
+            goto found;
+        }
+#    endif
+#    if defined(HAVE_STRUCT_STATFS_F_TYPE)
+        if (0 == fsrc &&
+            fs_types[i].f_fsid == (fsbuf.f_type & fs_types[i].f_mask)) {
+            goto found;
+        }
+#    endif
+#endif
+
+#if defined(HAVE_STATVFS)
+        /* These are uses of struct statvfs */
+#    if defined(HAVE_STRUCT_STATVFS_F_BASETYPE)
+        if (0 == vfsrc &&
+            0 == strncasecmp(fs_types[i].f_fsname, vfsbuf.f_basetype,
+                             sizeof(vfsbuf.f_basetype))) {
+            goto found;
+        }
+#    endif
+#    if defined(HAVE_STRUCT_STATVFS_F_FSTYPENAME)
+        if (0 == vfsrc &&
+            0 == strncasecmp(fs_types[i].f_fsname, vfsbuf.f_fstypename,
+                             sizeof(vfsbuf.f_fstypename))) {
+            goto found;
+        }
+#    endif
+#endif
+    }
+
+    free (file);
+    if ( NULL != ret_fstype ) {
+        *ret_fstype=NULL;
+    }
+    return false;
+
+#if defined(HAVE_STRUCT_STATFS_F_FSTYPENAME) || \
+    defined(HAVE_STRUCT_STATFS_F_TYPE) || \
+    defined(HAVE_STRUCT_STATVFS_F_BASETYPE) || \
+    defined(HAVE_STRUCT_STATVFS_F_FSTYPENAME)
+  found:
+#endif
+
+    free (file);
+    if (AUTOFS_SUPER_MAGIC == fs_types[i].f_fsid) {
+        char *fs_type = pmix_check_mtab(fname);
+        int x;
+        if (NULL != fs_type) {
+            for (x = 0; x < FS_TYPES_NUM; x++) {
+                if (AUTOFS_SUPER_MAGIC == fs_types[x].f_fsid) {
+                    continue;
+                }
+                if (0 == strcasecmp(fs_types[x].f_fsname, fs_type)) {
+                    PMIX_OUTPUT_VERBOSE((10, 0, "pmix_path_nfs: file:%s on fs:%s\n", fname, fs_type));
+                    free(fs_type);
+                    if ( NULL != ret_fstype ) {
+                        *ret_fstype = strdup(fs_types[x].f_fsname);
+                    }
+                    return true;
+                }
+            }
+            free(fs_type);
+            if ( NULL != ret_fstype ) {
+                *ret_fstype=NULL;
+            }
+            return false;
+        }
+    }
+
+    PMIX_OUTPUT_VERBOSE((10, 0, "pmix_path_nfs: file:%s on fs:%s\n",
+                fname, fs_types[i].f_fsname));
+    if ( NULL != ret_fstype ) {
+        *ret_fstype = strdup (fs_types[i].f_fsname);
+    }
+    return true;
+
+#undef FS_TYPES_NUM
+}
+
+int
+pmix_path_df(const char *path,
+             uint64_t *out_avail)
+{
+    int rc = -1;
+    int trials = 5;
+    int err = 0;
+#if defined(USE_STATFS)
+    struct statfs buf;
+#elif defined(HAVE_STATVFS)
+    struct statvfs buf;
+#endif
+
+    if (NULL == path || NULL == out_avail) {
+        return PMIX_ERROR;
+    }
+    *out_avail = 0;
+
+    do {
+#if defined(USE_STATFS)
+        rc = statfs(path, &buf);
+#elif defined(HAVE_STATVFS)
+        rc = statvfs(path, &buf);
+#endif
+        err = errno;
+    } while (-1 == rc && ESTALE == err && (--trials > 0));
+
+    if (-1 == rc) {
+        PMIX_OUTPUT_VERBOSE((10, 2, "pmix_path_df: stat(v)fs on "
+                             "path: %s failed with errno: %d (%s)\n",
+                             path, err, strerror(err)));
+        return PMIX_ERROR;
+    }
+
+    /* now set the amount of free space available on path */
+                               /* sometimes buf.f_bavail is negative */
+    *out_avail = buf.f_bsize * ((int)buf.f_bavail < 0 ? 0 : buf.f_bavail);
+
+    PMIX_OUTPUT_VERBOSE((10, 2, "pmix_path_df: stat(v)fs states "
+                         "path: %s has %"PRIu64 " B of free space.",
+                         path, *out_avail));
+
+    return PMIX_SUCCESS;
+}
diff --git a/src/util/path.h b/src/util/path.h
new file mode 100644
index 0000000..b9ab1d5
--- /dev/null
+++ b/src/util/path.h
@@ -0,0 +1,162 @@
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2007 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2012      Los Alamos National Security, LLC.
+ *                         All rights reserved.
+ * Copyright (c) 2016      University of Houston. All rights reserved.
+ * Copyright (c) 2016      Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ *
+ * @file
+ */
+
+#ifndef PMIX_PATH_H
+#define PMIX_PATH_H
+
+#include <src/include/pmix_config.h>
+
+#include "pmix_common.h"
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+BEGIN_C_DECLS
+
+/**
+ *  Locates a file with certain permissions
+ *
+ *  @param fname File name
+ *  @param pathv Array of search directories
+ *  @param mode  Permissions which must be satisfied (see access(2))
+ *  @param envv  Pointer to string containing environment
+ *
+ *  @retval Full pathname of located file Success
+ *  @retval NULL Failure
+ *
+ *  Environment variables can appear in the form $variable at the
+ *  start of a prefix path and will be replaced by the environment
+ *  value if it is defined; otherwise the whole prefix is ignored.
+ *  Environment variables must be followed by a path delimiter or
+ *  end-of-string.
+ *
+ * The caller is responsible for freeing the returned string.
+ */
+char *pmix_path_find(char *fname, char **pathv, int mode,
+                                   char **envv) __pmix_attribute_malloc__ __pmix_attribute_warn_unused_result__;
+
+/**
+ *  Locates a file with certain permissions from a list of search
+ *  paths
+ *
+ *  @param fname File name
+ *  @param mode  Target permissions which must be satisfied (see access(2))
+ *  @param envv  Pointer to environment list
+ *  @param wrkdir Working directory
+ *
+ *  @retval Full pathname of located file Success
+ *  @retval NULL Failure
+ *
+ *  Locates a file with certain permissions from the list of paths
+ *  given by the $PATH environment variable.  Replaces "." in the
+ *  path with the working dir.
+ *
+ * The caller is responsible for freeing the returned string.
+ */
+char *pmix_path_findv(char *fname, int mode,
+                                    char **envv, char *wrkdir) __pmix_attribute_malloc__ __pmix_attribute_warn_unused_result__;
+/**
+ *  Detect if the requested path is absolute or relative.
+ *
+ *  @param path  File name
+ *
+ *  @retval true if the path is absolute
+ *  @retval false otherwise
+ *
+ *  Detect if a path is absolute or relative. Handle Windows
+ *  with special care as an absolute path on Windows starts
+ *  with [A-Za-z]: or \\ instead of the usual / on UNIX.
+ */
+bool pmix_path_is_absolute( const char *path );
+
+/**
+ * Find the absolute path for an executable and return it.
+ *
+ *  @param app_name  Executable name
+ *
+ *  @retval The absolute path if the application can be reached,
+ *  @retval NULL otherwise.
+ *
+ * Try to figure out the absolute path based on the application name
+ * (usually argv[0]). If the path is already absolute return a copy, if
+ * it start with . look into the current directory, if not dig into
+ * the $PATH.
+ * In case of error or if executable was not found (as an example if
+ * the application did a cwd between the start and this call), the
+ * function will return NULL. Otherwise, an newly allocated string
+ * will be returned.
+ */
+char* pmix_find_absolute_path( char* app_name ) __pmix_attribute_warn_unused_result__;
+
+/**
+ * Forms a complete pathname and checks it for existance and
+ * permissions
+ *
+ * @param fname File name
+ * @param path Path prefix, if NULL then fname is an absolute path
+ * @param mode Target permissions which must be satisfied (see access(2))
+ *
+ * @retval NULL Failure
+ * @retval Full pathname of the located file on Success
+ *
+ * The caller is responsible for freeing the returned string.
+ */
+char *pmix_path_access(char *fname, char *path, int mode) __pmix_attribute_malloc__ __pmix_attribute_warn_unused_result__;
+
+
+/**
+ * @brief Figure out, whether fname is on network file system
+ * and return fstype if known
+ *
+ * Try to figure out, whether the file name specified through fname is
+ * on any network file system (currently NFS, Lustre, GPFS,  Panasas
+ * and PVFS2 ).
+ *
+ * If the file is not created, the parent directory is checked.
+ * This allows checking for NFS prior to opening the file.
+ *
+ * @fname[in]     File name to check
+ * @fstype[out]   File system type if retval is true
+ *
+ * @retval true                If fname is on NFS, Lustre or Panasas
+ * @retval false               otherwise
+ */
+bool pmix_path_nfs(char *fname, char **fstype) __pmix_attribute_warn_unused_result__;
+
+/**
+ * @brief Returns the disk usage of path.
+ *
+ * @param[in] path       Path to check
+ * @out_avail[out]       Amount of free space available on path (if successful)
+ *
+ * @retval PMIX_SUCCESS  If the operation was successful
+ * @retval PMIX_ERROR    otherwise
+ */
+int
+pmix_path_df(const char *path,
+             uint64_t *out_avail)__pmix_attribute_warn_unused_result__;
+
+END_C_DECLS
+#endif /* PMIX_PATH_H */
diff --git a/src/util/pif.c b/src/util/pif.c
new file mode 100644
index 0000000..ab594e0
--- /dev/null
+++ b/src/util/pif.c
@@ -0,0 +1,831 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2005 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2009 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2008      Sun Microsystems, Inc.  All rights reserved.
+ * Copyright (c) 2010-2015 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2014      Los Alamos National Security, LLC. All rights
+ *                         reserved.
+ * Copyright (c) 2015-2016 Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2016      Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include "pmix_config.h"
+#include "pmix_common.h"
+
+#include <string.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#include <errno.h>
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_SYS_SOCKIO_H
+#include <sys/sockio.h>
+#endif
+#ifdef HAVE_SYS_IOCTL_H
+#include <sys/ioctl.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif
+#ifdef HAVE_NET_IF_H
+#if defined(__APPLE__) && defined(_LP64)
+/* Apple engineering suggested using options align=power as a
+   workaround for a bug in OS X 10.4 (Tiger) that prevented ioctl(...,
+   SIOCGIFCONF, ...) from working properly in 64 bit mode on Power PC.
+   It turns out that the underlying issue is the size of struct
+   ifconf, which the kernel expects to be 12 and natural 64 bit
+   alignment would make 16.  The same bug appears in 64 bit mode on
+   Intel macs, but align=power is a no-op there, so instead, use the
+   pack pragma to instruct the compiler to pack on 4 byte words, which
+   has the same effect as align=power for our needs and works on both
+   Intel and Power PC Macs. */
+#pragma pack(push,4)
+#endif
+#include <net/if.h>
+#if defined(__APPLE__) && defined(_LP64)
+#pragma pack(pop)
+#endif
+#endif
+#ifdef HAVE_NETDB_H
+#include <netdb.h>
+#endif
+#ifdef HAVE_IFADDRS_H
+#include <ifaddrs.h>
+#endif
+#include <ctype.h>
+
+#include "src/class/pmix_list.h"
+#include "src/util/error.h"
+#include "src/util/pif.h"
+#include "src/util/net.h"
+#include "src/util/output.h"
+#include "src/util/argv.h"
+#include "src/util/show_help.h"
+
+#include "src/mca/pif/base/base.h"
+
+#ifdef HAVE_STRUCT_SOCKADDR_IN
+
+#ifndef MIN
+#  define MIN(a,b)                ((a) < (b) ? (a) : (b))
+#endif
+
+/*
+ *  Look for interface by name and returns its address
+ *  as a dotted decimal formatted string.
+ */
+
+int pmix_ifnametoaddr(const char* if_name, struct sockaddr* addr, int length)
+{
+    pmix_pif_t* intf;
+
+    for (intf =  (pmix_pif_t*)pmix_list_get_first(&pmix_if_list);
+        intf != (pmix_pif_t*)pmix_list_get_end(&pmix_if_list);
+        intf =  (pmix_pif_t*)pmix_list_get_next(intf)) {
+        if (strcmp(intf->if_name, if_name) == 0) {
+            memcpy(addr, &intf->if_addr, length);
+            return PMIX_SUCCESS;
+        }
+    }
+    return PMIX_ERROR;
+}
+
+
+/*
+ *  Look for interface by name and returns its
+ *  corresponding pmix_list index.
+ */
+
+int pmix_ifnametoindex(const char* if_name)
+{
+    pmix_pif_t* intf;
+
+    for (intf =  (pmix_pif_t*)pmix_list_get_first(&pmix_if_list);
+        intf != (pmix_pif_t*)pmix_list_get_end(&pmix_if_list);
+        intf =  (pmix_pif_t*)pmix_list_get_next(intf)) {
+        if (strcmp(intf->if_name, if_name) == 0) {
+            return intf->if_index;
+        }
+    }
+    return -1;
+}
+
+
+/*
+ *  Look for interface by name and returns its
+ *  corresponding kernel index.
+ */
+
+int16_t pmix_ifnametokindex(const char* if_name)
+{
+    pmix_pif_t* intf;
+
+    for (intf =  (pmix_pif_t*)pmix_list_get_first(&pmix_if_list);
+        intf != (pmix_pif_t*)pmix_list_get_end(&pmix_if_list);
+        intf =  (pmix_pif_t*)pmix_list_get_next(intf)) {
+        if (strcmp(intf->if_name, if_name) == 0) {
+            return intf->if_kernel_index;
+        }
+    }
+    return -1;
+}
+
+
+/*
+ *  Look for interface by pmix_list index and returns its
+ *  corresponding kernel index.
+ */
+
+int pmix_ifindextokindex(int if_index)
+{
+    pmix_pif_t* intf;
+
+    for (intf =  (pmix_pif_t*)pmix_list_get_first(&pmix_if_list);
+        intf != (pmix_pif_t*)pmix_list_get_end(&pmix_if_list);
+        intf =  (pmix_pif_t*)pmix_list_get_next(intf)) {
+        if (if_index == intf->if_index) {
+            return intf->if_kernel_index;
+        }
+    }
+    return -1;
+}
+
+
+/*
+ *  Attempt to resolve the adddress (given as either IPv4/IPv6 string
+ *  or hostname) and lookup corresponding interface.
+ */
+
+int pmix_ifaddrtoname(const char* if_addr, char* if_name, int length)
+{
+    pmix_pif_t* intf;
+    int error;
+    struct addrinfo hints, *res = NULL, *r;
+
+    /* if the user asked us not to resolve interfaces, then just return */
+    if (pmix_if_do_not_resolve) {
+        /* return not found so ifislocal will declare
+         * the node to be non-local
+         */
+        return PMIX_ERR_NOT_FOUND;
+    }
+
+    memset(&hints, 0, sizeof(hints));
+    hints.ai_family = PF_UNSPEC;
+    hints.ai_socktype = SOCK_STREAM;
+    error = getaddrinfo(if_addr, NULL, &hints, &res);
+
+    if (error) {
+        if (NULL != res) {
+            freeaddrinfo (res);
+        }
+        return PMIX_ERR_NOT_FOUND;
+    }
+
+    for (r = res; r != NULL; r = r->ai_next) {
+        for (intf =  (pmix_pif_t*)pmix_list_get_first(&pmix_if_list);
+            intf != (pmix_pif_t*)pmix_list_get_end(&pmix_if_list);
+            intf =  (pmix_pif_t*)pmix_list_get_next(intf)) {
+
+            if (AF_INET == r->ai_family) {
+                struct sockaddr_in ipv4;
+                struct sockaddr_in *inaddr;
+
+                inaddr = (struct sockaddr_in*) &intf->if_addr;
+                memcpy (&ipv4, r->ai_addr, r->ai_addrlen);
+
+                if (inaddr->sin_addr.s_addr == ipv4.sin_addr.s_addr) {
+                    strncpy(if_name, intf->if_name, length);
+                    freeaddrinfo (res);
+                    return PMIX_SUCCESS;
+                }
+            }
+            else {
+                if (IN6_ARE_ADDR_EQUAL(&((struct sockaddr_in6*) &intf->if_addr)->sin6_addr,
+                    &((struct sockaddr_in6*) r->ai_addr)->sin6_addr)) {
+                    strncpy(if_name, intf->if_name, length);
+                    freeaddrinfo (res);
+                    return PMIX_SUCCESS;
+                }
+            }
+        }
+    }
+    if (NULL != res) {
+        freeaddrinfo (res);
+    }
+
+    /* if we get here, it wasn't found */
+    return PMIX_ERR_NOT_FOUND;
+}
+
+/*
+ *  Attempt to resolve the address (given as either IPv4/IPv6 string
+ *  or hostname) and return the kernel index of the interface
+ *  on the same network as the specified address
+ */
+int16_t pmix_ifaddrtokindex(const char* if_addr)
+{
+    pmix_pif_t* intf;
+    int error;
+    struct addrinfo hints, *res = NULL, *r;
+    int if_kernel_index;
+    size_t len;
+
+    memset(&hints, 0, sizeof(hints));
+    hints.ai_family = PF_UNSPEC;
+    hints.ai_socktype = SOCK_STREAM;
+    error = getaddrinfo(if_addr, NULL, &hints, &res);
+
+    if (error) {
+        if (NULL != res) {
+            freeaddrinfo (res);
+        }
+        return PMIX_ERR_NOT_FOUND;
+    }
+
+    for (r = res; r != NULL; r = r->ai_next) {
+        PMIX_LIST_FOREACH(intf, &pmix_if_list, pmix_pif_t) {
+            if (AF_INET == r->ai_family && AF_INET == intf->af_family) {
+                struct sockaddr ipv4;
+                memset(&ipv4, 0, sizeof(struct sockaddr));
+                len = (r->ai_addrlen < sizeof(struct sockaddr_in)) ? r->ai_addrlen : sizeof(struct sockaddr_in);
+                memcpy(&ipv4, r->ai_addr, len);
+                if (pmix_net_samenetwork(&ipv4, (struct sockaddr*)&intf->if_addr, intf->if_mask)) {
+                    if_kernel_index = intf->if_kernel_index;
+                    freeaddrinfo (res);
+                    return if_kernel_index;
+                }
+            } else if (AF_INET6 == r->ai_family && AF_INET6 == intf->af_family) {
+                struct sockaddr_in6 ipv6;
+                len = (r->ai_addrlen < sizeof(struct sockaddr_in6)) ? r->ai_addrlen : sizeof(struct sockaddr_in6);
+                memcpy(&ipv6, r->ai_addr, len);
+                if (pmix_net_samenetwork((struct sockaddr*)((struct sockaddr_in6*)&intf->if_addr),
+                                         (struct sockaddr*)&ipv6, intf->if_mask)) {
+                    if_kernel_index = intf->if_kernel_index;
+                    freeaddrinfo (res);
+                    return if_kernel_index;
+                }
+            }
+        }
+    }
+    if (NULL != res) {
+        freeaddrinfo (res);
+    }
+    return PMIX_ERR_NOT_FOUND;
+}
+
+/*
+ *  Return the number of discovered interface.
+ */
+
+int pmix_ifcount(void)
+{
+    return pmix_list_get_size(&pmix_if_list);
+}
+
+
+/*
+ *  Return the pmix_list interface index for the first
+ *  interface in our list.
+ */
+
+int pmix_ifbegin(void)
+{
+    pmix_pif_t *intf;
+
+    intf = (pmix_pif_t*)pmix_list_get_first(&pmix_if_list);
+    if (NULL != intf)
+        return intf->if_index;
+    return (-1);
+}
+
+
+/*
+ *  Located the current position in the list by if_index and
+ *  return the interface index of the next element in our list
+ *  (if it exists).
+ */
+
+int pmix_ifnext(int if_index)
+{
+    pmix_pif_t *intf;
+
+    for (intf =  (pmix_pif_t*)pmix_list_get_first(&pmix_if_list);
+        intf != (pmix_pif_t*)pmix_list_get_end(&pmix_if_list);
+        intf =  (pmix_pif_t*)pmix_list_get_next(intf)) {
+        if (intf->if_index == if_index) {
+            do {
+                pmix_pif_t* if_next = (pmix_pif_t*)pmix_list_get_next(intf);
+                pmix_pif_t* if_end =  (pmix_pif_t*)pmix_list_get_end(&pmix_if_list);
+                if (if_next == if_end) {
+                    return -1;
+                }
+                intf = if_next;
+            } while(intf->if_index == if_index);
+            return intf->if_index;
+        }
+    }
+    return (-1);
+}
+
+
+/*
+ *  Lookup the interface by pmix_list index and return the
+ *  primary address assigned to the interface.
+ */
+
+int pmix_ifindextoaddr(int if_index, struct sockaddr* if_addr, unsigned int length)
+{
+    pmix_pif_t* intf;
+
+    for (intf =  (pmix_pif_t*)pmix_list_get_first(&pmix_if_list);
+         intf != (pmix_pif_t*)pmix_list_get_end(&pmix_if_list);
+         intf =  (pmix_pif_t*)pmix_list_get_next(intf)) {
+        if (intf->if_index == if_index) {
+            memcpy(if_addr, &intf->if_addr, MIN(length, sizeof (intf->if_addr)));
+            return PMIX_SUCCESS;
+        }
+    }
+    return PMIX_ERROR;
+}
+
+
+/*
+ *  Lookup the interface by pmix_list kindex and return the
+ *  primary address assigned to the interface.
+ */
+int pmix_ifkindextoaddr(int if_kindex, struct sockaddr* if_addr, unsigned int length)
+{
+    pmix_pif_t* intf;
+
+    for (intf =  (pmix_pif_t*)pmix_list_get_first(&pmix_if_list);
+         intf != (pmix_pif_t*)pmix_list_get_end(&pmix_if_list);
+         intf =  (pmix_pif_t*)pmix_list_get_next(intf)) {
+        if (intf->if_kernel_index == if_kindex) {
+            memcpy(if_addr, &intf->if_addr, MIN(length, sizeof (intf->if_addr)));
+            return PMIX_SUCCESS;
+        }
+    }
+    return PMIX_ERROR;
+}
+
+
+/*
+ *  Lookup the interface by pmix_list index and return the
+ *  network mask assigned to the interface.
+ */
+
+int pmix_ifindextomask(int if_index, uint32_t* if_mask, int length)
+{
+    pmix_pif_t* intf;
+
+    for (intf =  (pmix_pif_t*)pmix_list_get_first(&pmix_if_list);
+        intf != (pmix_pif_t*)pmix_list_get_end(&pmix_if_list);
+        intf =  (pmix_pif_t*)pmix_list_get_next(intf)) {
+        if (intf->if_index == if_index) {
+            memcpy(if_mask, &intf->if_mask, length);
+            return PMIX_SUCCESS;
+        }
+    }
+    return PMIX_ERROR;
+}
+
+/*
+ *  Lookup the interface by pmix_list index and return the
+ *  MAC assigned to the interface.
+ */
+
+int pmix_ifindextomac(int if_index, uint8_t mac[6])
+{
+    pmix_pif_t* intf;
+
+    for (intf = (pmix_pif_t*)pmix_list_get_first(&pmix_if_list);
+        intf != (pmix_pif_t*)pmix_list_get_end(&pmix_if_list);
+        intf = (pmix_pif_t*)pmix_list_get_next(intf)) {
+        if (intf->if_index == if_index) {
+            memcpy(mac, &intf->if_mac, 6);
+            return PMIX_SUCCESS;
+        }
+    }
+    return PMIX_ERROR;
+}
+
+/*
+ *  Lookup the interface by pmix_list index and return the
+ *  MTU assigned to the interface.
+ */
+
+int pmix_ifindextomtu(int if_index, int *mtu)
+{
+    pmix_pif_t* intf;
+
+    for (intf = (pmix_pif_t*)pmix_list_get_first(&pmix_if_list);
+        intf != (pmix_pif_t*)pmix_list_get_end(&pmix_if_list);
+        intf = (pmix_pif_t*)pmix_list_get_next(intf)) {
+        if (intf->if_index == if_index) {
+            *mtu = intf->ifmtu;
+            return PMIX_SUCCESS;
+        }
+    }
+    return PMIX_ERROR;
+}
+
+/*
+ *  Lookup the interface by pmix_list index and return the
+ *  flags assigned to the interface.
+ */
+
+int pmix_ifindextoflags(int if_index, uint32_t* if_flags)
+{
+    pmix_pif_t* intf;
+
+    for (intf =  (pmix_pif_t*)pmix_list_get_first(&pmix_if_list);
+        intf != (pmix_pif_t*)pmix_list_get_end(&pmix_if_list);
+        intf =  (pmix_pif_t*)pmix_list_get_next(intf)) {
+        if (intf->if_index == if_index) {
+            memcpy(if_flags, &intf->if_flags, sizeof(uint32_t));
+            return PMIX_SUCCESS;
+        }
+    }
+    return PMIX_ERROR;
+}
+
+
+
+/*
+ *  Lookup the interface by pmix_list index and return
+ *  the associated name.
+ */
+
+int pmix_ifindextoname(int if_index, char* if_name, int length)
+{
+    pmix_pif_t *intf;
+
+    for (intf =  (pmix_pif_t*)pmix_list_get_first(&pmix_if_list);
+        intf != (pmix_pif_t*)pmix_list_get_end(&pmix_if_list);
+        intf =  (pmix_pif_t*)pmix_list_get_next(intf)) {
+        if (intf->if_index == if_index) {
+            strncpy(if_name, intf->if_name, length);
+            return PMIX_SUCCESS;
+        }
+    }
+    return PMIX_ERROR;
+}
+
+
+/*
+ *  Lookup the interface by kernel index and return
+ *  the associated name.
+ */
+
+int pmix_ifkindextoname(int if_kindex, char* if_name, int length)
+{
+    pmix_pif_t *intf;
+
+    for (intf =  (pmix_pif_t*)pmix_list_get_first(&pmix_if_list);
+        intf != (pmix_pif_t*)pmix_list_get_end(&pmix_if_list);
+        intf =  (pmix_pif_t*)pmix_list_get_next(intf)) {
+        if (intf->if_kernel_index == if_kindex) {
+            strncpy(if_name, intf->if_name, length);
+            return PMIX_SUCCESS;
+        }
+    }
+    return PMIX_ERROR;
+}
+
+
+#define ADDRLEN 100
+bool
+pmix_ifislocal(const char *hostname)
+{
+    char addrname[NI_MAXHOST]; /* should be larger than ADDRLEN, but I think
+                                  they really mean IFNAMESIZE */
+
+    if (PMIX_SUCCESS == pmix_ifaddrtoname(hostname, addrname, ADDRLEN)) {
+        return true;
+    }
+
+    return false;
+}
+
+static int parse_ipv4_dots(const char *addr, uint32_t* net, int* dots)
+{
+    const char *start = addr, *end;
+    uint32_t n[]={0,0,0,0};
+    int i;
+
+    /* now assemble the address */
+    for( i = 0; i < 4; i++ ) {
+        n[i] = strtoul(start, (char**)&end, 10);
+        if( end == start ) {
+            /* this is not an error, but indicates that
+             * we were given a partial address - e.g.,
+             * 192.168 - usually indicating an IP range
+             * in CIDR notation. So just return what we have
+             */
+            break;
+        }
+        /* did we read something sensible? */
+        if( n[i] > 255 ) {
+            return PMIX_ERR_NETWORK_NOT_PARSEABLE;
+        }
+        /* skip all the . */
+        for( start = end; '\0' != *start; start++ )
+            if( '.' != *start ) break;
+    }
+    *dots = i;
+    *net = PMIX_PIF_ASSEMBLE_NETWORK(n[0], n[1], n[2], n[3]);
+    return PMIX_SUCCESS;
+}
+
+int
+pmix_iftupletoaddr(const char *inaddr, uint32_t *net, uint32_t *mask)
+{
+    int pval, dots, rc = PMIX_SUCCESS;
+    const char *ptr;
+
+    /* if a mask was desired... */
+    if (NULL != mask) {
+        /* set default */
+        *mask = 0xFFFFFFFF;
+
+        /* if entry includes mask, split that off */
+        if (NULL != (ptr = strchr(inaddr, '/'))) {
+            ptr = ptr + 1;  /* skip the / */
+            /* is the mask a tuple? */
+            if (NULL != strchr(ptr, '.')) {
+                /* yes - extract mask from it */
+                rc = parse_ipv4_dots(ptr, mask, &dots);
+            } else {
+                /* no - must be an int telling us how much of the addr to use: e.g., /16
+                 * For more information please read http://en.wikipedia.org/wiki/Subnetwork.
+                 */
+                pval = strtol(ptr, NULL, 10);
+                if ((pval > 31) || (pval < 1)) {
+                    pmix_output(0, "pmix_iftupletoaddr: unknown mask");
+                    return PMIX_ERR_NETWORK_NOT_PARSEABLE;
+                }
+                *mask = 0xFFFFFFFF << (32 - pval);
+            }
+        } else {
+            /* use the number of dots to determine it */
+            for (ptr = inaddr, pval = 0; '\0'!= *ptr; ptr++) {
+                if ('.' == *ptr) {
+                    pval++;
+                }
+            }
+            /* if we have three dots, then we have four
+             * fields since it is a full address, so the
+             * default netmask is fine
+             */
+            if (3 == pval) {
+                *mask = 0xFFFFFFFF;
+            } else if (2 == pval) {         /* 2 dots */
+                *mask = 0xFFFFFF00;
+            } else if (1 == pval) {  /* 1 dot */
+                *mask = 0xFFFF0000;
+            } else if (0 == pval) {  /* no dots */
+                *mask = 0xFF000000;
+            } else {
+                pmix_output(0, "pmix_iftupletoaddr: unknown mask");
+                return PMIX_ERR_NETWORK_NOT_PARSEABLE;
+            }
+        }
+    }
+
+    /* if network addr is desired... */
+    if (NULL != net) {
+        /* now assemble the address */
+        rc = parse_ipv4_dots(inaddr, net, &dots);
+    }
+
+    return rc;
+}
+
+/*
+ *  Determine if the specified interface is loopback
+ */
+
+bool pmix_ifisloopback(int if_index)
+{
+    pmix_pif_t* intf;
+
+    for (intf =  (pmix_pif_t*)pmix_list_get_first(&pmix_if_list);
+        intf != (pmix_pif_t*)pmix_list_get_end(&pmix_if_list);
+        intf =  (pmix_pif_t*)pmix_list_get_next(intf)) {
+        if (intf->if_index == if_index) {
+            if ((intf->if_flags & IFF_LOOPBACK) != 0) {
+                return true;
+            }
+        }
+    }
+    return false;
+}
+
+/* Determine if an interface matches any entry in the given list, taking
+ * into account that the list entries could be given as named interfaces,
+ * IP addrs, or subnet+mask
+ */
+int pmix_ifmatches(int kidx, char **nets)
+{
+    bool named_if;
+    int i, rc;
+    size_t j;
+    int kindex;
+    struct sockaddr_in inaddr;
+    uint32_t addr, netaddr, netmask;
+
+    /* get the address info for the given network in case we need it */
+    if (PMIX_SUCCESS != (rc = pmix_ifkindextoaddr(kidx, (struct sockaddr*)&inaddr, sizeof(inaddr)))) {
+        return rc;
+    }
+    addr = ntohl(inaddr.sin_addr.s_addr);
+
+    for (i=0; NULL != nets[i]; i++) {
+        /* if the specified interface contains letters in it, then it
+         * was given as an interface name and not an IP tuple
+         */
+        named_if = false;
+        for (j=0; j < strlen(nets[i]); j++) {
+            if (isalpha(nets[i][j]) && '.' != nets[i][j]) {
+                named_if = true;
+                break;
+            }
+        }
+        if (named_if) {
+            if (0 > (kindex = pmix_ifnametokindex(nets[i]))) {
+                continue;
+            }
+            if (kindex == kidx) {
+                return PMIX_SUCCESS;
+            }
+        } else {
+            if (PMIX_SUCCESS != (rc = pmix_iftupletoaddr(nets[i], &netaddr, &netmask))) {
+                pmix_show_help("help-pmix-util.txt", "invalid-net-mask", true, nets[i]);
+                return rc;
+            }
+            if (netaddr == (addr & netmask)) {
+                return PMIX_SUCCESS;
+            }
+        }
+    }
+    /* get here if not found */
+    return PMIX_ERR_NOT_FOUND;
+}
+
+void pmix_ifgetaliases(char ***aliases)
+{
+    pmix_pif_t* intf;
+    char ipv4[INET_ADDRSTRLEN];
+    struct sockaddr_in *addr;
+    char ipv6[INET6_ADDRSTRLEN];
+    struct sockaddr_in6 *addr6;
+
+    /* set default answer */
+    *aliases = NULL;
+
+    for (intf =  (pmix_pif_t*)pmix_list_get_first(&pmix_if_list);
+        intf != (pmix_pif_t*)pmix_list_get_end(&pmix_if_list);
+        intf =  (pmix_pif_t*)pmix_list_get_next(intf)) {
+        addr = (struct sockaddr_in*) &intf->if_addr;
+        /* ignore purely loopback interfaces */
+        if ((intf->if_flags & IFF_LOOPBACK) != 0) {
+            continue;
+        }
+        if (addr->sin_family == AF_INET) {
+            inet_ntop(AF_INET, &(addr->sin_addr.s_addr), ipv4, INET_ADDRSTRLEN);
+            pmix_argv_append_nosize(aliases, ipv4);
+        } else {
+            addr6 = (struct sockaddr_in6*) &intf->if_addr;
+            inet_ntop(AF_INET6, &(addr6->sin6_addr), ipv6, INET6_ADDRSTRLEN);
+            pmix_argv_append_nosize(aliases, ipv6);
+        }
+    }
+}
+
+#else /* HAVE_STRUCT_SOCKADDR_IN */
+
+/* if we don't have struct sockaddr_in, we don't have traditional
+   ethernet devices.  Just make everything a no-op error call */
+
+int
+pmix_ifnametoaddr(const char* if_name,
+                  struct sockaddr* if_addr, int size)
+{
+    return PMIX_ERR_NOT_SUPPORTED;
+}
+
+int
+pmix_ifaddrtoname(const char* if_addr,
+                  char* if_name, int size)
+{
+    return PMIX_ERR_NOT_SUPPORTED;
+}
+
+int
+pmix_ifnametoindex(const char* if_name)
+{
+    return PMIX_ERR_NOT_SUPPORTED;
+}
+
+int16_t
+pmix_ifnametokindex(const char* if_name)
+{
+    return PMIX_ERR_NOT_SUPPORTED;
+}
+
+int
+pmix_ifindextokindex(int if_index)
+{
+    return PMIX_ERR_NOT_SUPPORTED;
+}
+
+int
+pmix_ifcount(void)
+{
+    return PMIX_ERR_NOT_SUPPORTED;
+}
+
+int
+pmix_ifbegin(void)
+{
+    return PMIX_ERR_NOT_SUPPORTED;
+}
+
+int
+pmix_ifnext(int if_index)
+{
+    return PMIX_ERR_NOT_SUPPORTED;
+}
+
+int
+pmix_ifindextoname(int if_index, char* if_name, int length)
+{
+    return PMIX_ERR_NOT_SUPPORTED;
+}
+
+int
+pmix_ifkindextoname(int kif_index, char* if_name, int length)
+{
+    return PMIX_ERR_NOT_SUPPORTED;
+}
+
+int
+pmix_ifindextoaddr(int if_index, struct sockaddr* if_addr, unsigned int length)
+{
+    return PMIX_ERR_NOT_SUPPORTED;
+}
+
+int
+pmix_ifindextomask(int if_index, uint32_t* if_addr, int length)
+{
+    return PMIX_ERR_NOT_SUPPORTED;
+}
+
+bool
+pmix_ifislocal(const char *hostname)
+{
+    return false;
+}
+
+int
+pmix_iftupletoaddr(const char *inaddr, uint32_t *net, uint32_t *mask)
+{
+    return 0;
+}
+
+int pmix_ifmatches(int idx, char **nets)
+{
+    return PMIX_ERR_NOT_SUPPORTED;
+}
+
+void pmix_ifgetaliases(char ***aliases)
+{
+    /* set default answer */
+    *aliases = NULL;
+}
+
+#endif /* HAVE_STRUCT_SOCKADDR_IN */
diff --git a/src/util/pif.h b/src/util/pif.h
new file mode 100644
index 0000000..fb9f1b7
--- /dev/null
+++ b/src/util/pif.h
@@ -0,0 +1,231 @@
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2005 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+ *                         reserved.
+ * Copyright (c) 2008      Sun Microsystems, Inc.  All rights reserved.
+ * Copyright (c) 2013      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2016      Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+/* @file */
+
+#ifndef PMIX_PIF_UTIL_
+#define PMIX_PIF_UTIL_
+
+#include "pmix_config.h"
+
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+
+#ifndef IF_NAMESIZE
+#define IF_NAMESIZE 32
+#endif
+
+BEGIN_C_DECLS
+
+#define PMIX_PIF_FORMAT_ADDR(n)                              \
+    (((n) >> 24) & 0x000000FF), (((n) >> 16) & 0x000000FF), \
+    (((n) >> 8) & 0x000000FF), ((n) & 0x000000FF)
+
+#define PMIX_PIF_ASSEMBLE_NETWORK(n1, n2, n3, n4)    \
+    (((n1) << 24) & 0xFF000000) |                   \
+    (((n2) << 16) & 0x00FF0000) |                   \
+    (((n3) <<  8) & 0x0000FF00) |                   \
+    ( (n4)        & 0x000000FF)
+
+/**
+ *  Lookup an interface by name and return its primary address.
+ *
+ *  @param if_name (IN)   Interface name
+ *  @param if_addr (OUT)  Interface address buffer
+ *  @param size    (IN)   Interface address buffer size
+ */
+PMIX_EXPORT int pmix_ifnametoaddr(const char* if_name,
+                                  struct sockaddr* if_addr,
+                                  int size);
+
+/**
+ *  Lookup an interface by address and return its name.
+ *
+ *  @param if_addr (IN)   Interface address (hostname or dotted-quad)
+ *  @param if_name (OUT)  Interface name buffer
+ *  @param size    (IN)   Interface name buffer size
+ */
+PMIX_EXPORT int pmix_ifaddrtoname(const char* if_addr,
+                                  char* if_name, int size);
+
+/**
+ *  Lookup an interface by name and return its pmix_list index.
+ *
+ *  @param if_name (IN)  Interface name
+ *  @return              Interface pmix_list index
+ */
+PMIX_EXPORT int pmix_ifnametoindex(const char* if_name);
+
+/**
+ *  Lookup an interface by name and return its kernel index.
+ *
+ *  @param if_name (IN)  Interface name
+ *  @return              Interface kernel index
+ */
+PMIX_EXPORT int16_t pmix_ifnametokindex(const char* if_name);
+
+/*
+ *  Attempt to resolve an address (given as either IPv4/IPv6 string
+ *  or hostname) and return the kernel index of the interface
+ *  that is on the same network as the specified address
+ */
+PMIX_EXPORT int16_t pmix_ifaddrtokindex(const char* if_addr);
+
+/**
+ *  Lookup an interface by pmix_list index and return its kernel index.
+ *
+ *  @param if_name (IN)  Interface pmix_list index
+ *  @return              Interface kernel index
+ */
+PMIX_EXPORT int pmix_ifindextokindex(int if_index);
+
+/**
+ *  Returns the number of available interfaces.
+ */
+PMIX_EXPORT int pmix_ifcount(void);
+
+/**
+ *  Returns the index of the first available interface.
+ */
+PMIX_EXPORT int pmix_ifbegin(void);
+
+/**
+ *  Lookup the current position in the interface list by
+ *  index and return the next available index (if it exists).
+ *
+ *  @param if_index   Returns the next available index from the
+ *                    current position.
+ */
+PMIX_EXPORT int pmix_ifnext(int if_index);
+
+/**
+ *  Lookup an interface by index and return its name.
+ *
+ *  @param if_index (IN)  Interface index
+ *  @param if_name (OUT)  Interface name buffer
+ *  @param size (IN)      Interface name buffer size
+ */
+PMIX_EXPORT int pmix_ifindextoname(int if_index, char* if_name, int);
+
+/**
+ *  Lookup an interface by kernel index and return its name.
+ *
+ *  @param if_index (IN)  Interface kernel index
+ *  @param if_name (OUT)  Interface name buffer
+ *  @param size (IN)      Interface name buffer size
+ */
+PMIX_EXPORT int pmix_ifkindextoname(int if_kindex, char* if_name, int);
+
+/**
+ *  Lookup an interface by index and return its primary address.
+ *
+ *  @param if_index (IN)  Interface index
+ *  @param if_name (OUT)  Interface address buffer
+ *  @param size (IN)      Interface address buffer size
+ */
+PMIX_EXPORT int pmix_ifindextoaddr(int if_index, struct sockaddr*,
+                                   unsigned int);
+PMIX_EXPORT int pmix_ifkindextoaddr(int if_kindex,
+                                    struct sockaddr* if_addr,
+                                    unsigned int length);
+
+/**
+ *  Lookup an interface by index and return its network mask (in CIDR
+ *  notation -- NOT the actual netmask itself!).
+ *
+ *  @param if_index (IN)  Interface index
+ *  @param if_name (OUT)  Interface address buffer
+ *  @param size (IN)      Interface address buffer size
+ */
+PMIX_EXPORT int pmix_ifindextomask(int if_index, uint32_t*, int);
+
+/**
+ *  Lookup an interface by index and return its MAC address.
+ *
+ *  @param if_index (IN)  Interface index
+ *  @param if_mac (OUT)   Interface's MAC address
+ */
+PMIX_EXPORT int pmix_ifindextomac(int if_index, uint8_t if_mac[6]);
+
+/**
+ *  Lookup an interface by index and return its MTU.
+ *
+ *  @param if_index (IN)  Interface index
+ *  @param if_mtu (OUT)   Interface's MTU
+ */
+PMIX_EXPORT int pmix_ifindextomtu(int if_index, int *mtu);
+
+/**
+ *  Lookup an interface by index and return its flags.
+ *
+ *  @param if_index (IN)  Interface index
+ *  @param if_flags (OUT) Interface flags
+ */
+PMIX_EXPORT int pmix_ifindextoflags(int if_index, uint32_t*);
+
+/**
+ * Determine if given hostname / IP address is a local address
+ *
+ * @param hostname (IN)    Hostname (or stringified IP address)
+ * @return                 true if \c hostname is local, false otherwise
+ */
+PMIX_EXPORT bool pmix_ifislocal(const char *hostname);
+
+/**
+ * Convert a dot-delimited network tuple to an IP address
+ *
+ * @param addr (IN) character string tuple
+ * @param net (IN) Pointer to returned network address
+ * @param mask (IN) Pointer to returned netmask
+ * @return PMIX_SUCCESS if no problems encountered
+ * @return PMIX_ERROR if data could not be released
+ */
+PMIX_EXPORT int pmix_iftupletoaddr(const char *addr, uint32_t *net, uint32_t *mask);
+
+/**
+ * Determine if given interface is loopback
+ *
+ *  @param if_index (IN)  Interface index
+ */
+PMIX_EXPORT bool pmix_ifisloopback(int if_index);
+
+/*
+ * Determine if a specified interface is included in a NULL-terminated argv array
+ */
+PMIX_EXPORT int pmix_ifmatches(int kidx, char **nets);
+
+/*
+ * Provide a list of strings that contain all known aliases for this node
+ */
+PMIX_EXPORT void pmix_ifgetaliases(char ***aliases);
+
+END_C_DECLS
+
+#endif
diff --git a/src/util/pmix_environ.c b/src/util/pmix_environ.c
new file mode 100644
index 0000000..7dd0e42
--- /dev/null
+++ b/src/util/pmix_environ.c
@@ -0,0 +1,241 @@
+/*
+ * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2005 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2006      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2007-2013 Los Alamos National Security, LLC.  All rights
+ *                         reserved.
+ * Copyright (c) 2014-2017 Intel, Inc. All rights reserved.
+ * Copyright (c) 2016      IBM Corporation.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+
+#include <pmix_common.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "src/util/printf.h"
+#include "src/util/argv.h"
+#include "src/util/pmix_environ.h"
+
+#define PMIX_DEFAULT_TMPDIR "/tmp"
+
+/*
+ * Merge two environ-like char arrays, ensuring that there are no
+ * duplicate entires
+ */
+PMIX_EXPORT char **pmix_environ_merge(char **minor, char **major)
+{
+    int i;
+    char **ret = NULL;
+    char *name, *value;
+
+    /* Check for bozo cases */
+
+    if (NULL == major) {
+        if (NULL == minor) {
+            return NULL;
+        } else {
+            return pmix_argv_copy(minor);
+        }
+    }
+
+    /* First, copy major */
+
+    ret = pmix_argv_copy(major);
+
+    /* Do we have something in minor? */
+
+    if (NULL == minor) {
+        return ret;
+    }
+
+    /* Now go through minor and call pmix_setenv(), but with overwrite
+       as false */
+
+    for (i = 0; NULL != minor[i]; ++i) {
+        value = strchr(minor[i], '=');
+        if (NULL == value) {
+            pmix_setenv(minor[i], NULL, false, &ret);
+        } else {
+
+            /* strdup minor[i] in case it's a constat string */
+
+            name = strdup(minor[i]);
+            value = name + (value - minor[i]);
+            *value = '\0';
+            pmix_setenv(name, value + 1, false, &ret);
+            free(name);
+        }
+    }
+
+    /* All done */
+
+    return ret;
+}
+
+/*
+ * Portable version of setenv(), allowing editing of any environ-like
+ * array
+ */
+PMIX_EXPORT pmix_status_t pmix_setenv(const char *name,
+                                      const char *value,
+                                      bool overwrite,
+                                      char ***env)
+{
+    int i;
+    char *newvalue, *compare;
+    size_t len;
+
+    /* Make the new value */
+
+    if (NULL == value) {
+        i = asprintf(&newvalue, "%s=", name);
+    } else {
+        i = asprintf(&newvalue, "%s=%s", name, value);
+    }
+    if (NULL == newvalue || 0 > i) {
+        return PMIX_ERR_OUT_OF_RESOURCE;
+    }
+
+    /* Check the bozo case */
+
+    if( NULL == env ) {
+        return PMIX_ERR_BAD_PARAM;
+    } else if (NULL == *env) {
+        i = 0;
+        pmix_argv_append(&i, env, newvalue);
+        free(newvalue);
+        return PMIX_SUCCESS;
+    }
+
+    /* If this is the "environ" array, use putenv */
+    if( *env == environ ) {
+        /* THIS IS POTENTIALLY A MEMORY LEAK!  But I am doing it
+           because so that we don't violate the law of least
+           astonishmet for PMIX developers (i.e., those that don't
+           check the return code of pmix_setenv() and notice that we
+           returned an error if you passed in the real environ) */
+        putenv(newvalue);
+        return PMIX_SUCCESS;
+    }
+
+    /* Make something easy to compare to */
+
+    i = asprintf(&compare, "%s=", name);
+    if (NULL == compare || 0 > i) {
+        free(newvalue);
+        return PMIX_ERR_OUT_OF_RESOURCE;
+    }
+    len = strlen(compare);
+
+    /* Look for a duplicate that's already set in the env */
+
+    for (i = 0; (*env)[i] != NULL; ++i) {
+        if (0 == strncmp((*env)[i], compare, len)) {
+            if (overwrite) {
+                free((*env)[i]);
+                (*env)[i] = newvalue;
+                free(compare);
+                return PMIX_SUCCESS;
+            } else {
+                free(compare);
+                free(newvalue);
+                return PMIX_EXISTS;
+            }
+        }
+    }
+
+    /* If we found no match, append this value */
+
+    i = pmix_argv_count(*env);
+    pmix_argv_append(&i, env, newvalue);
+
+    /* All done */
+
+    free(compare);
+    free(newvalue);
+    return PMIX_SUCCESS;
+}
+
+
+/*
+ * Portable version of unsetenv(), allowing editing of any
+ * environ-like array
+ */
+PMIX_EXPORT pmix_status_t pmix_unsetenv(const char *name, char ***env)
+{
+    int i;
+    char *compare;
+    size_t len;
+    bool found;
+
+    /* Check for bozo case */
+
+    if (NULL == *env) {
+        return PMIX_SUCCESS;
+    }
+
+    /* Make something easy to compare to */
+
+    i = asprintf(&compare, "%s=", name);
+    if (NULL == compare || 0 > i) {
+        return PMIX_ERR_OUT_OF_RESOURCE;
+    }
+    len = strlen(compare);
+
+    /* Look for a duplicate that's already set in the env.  If we find
+       it, free it, and then start shifting all elements down one in
+       the array. */
+
+    found = false;
+    for (i = 0; (*env)[i] != NULL; ++i) {
+        if (0 != strncmp((*env)[i], compare, len))
+            continue;
+        if (environ != *env) {
+            free((*env)[i]);
+        }
+        for (; (*env)[i] != NULL; ++i)
+            (*env)[i] = (*env)[i + 1];
+        found = true;
+        break;
+    }
+    free(compare);
+
+    /* All done */
+
+    return (found) ? PMIX_SUCCESS : PMIX_ERR_NOT_FOUND;
+}
+
+PMIX_EXPORT const char* pmix_tmp_directory( void )
+{
+    const char* str;
+
+    if( NULL == (str = getenv("TMPDIR")) )
+        if( NULL == (str = getenv("TEMP")) )
+            if( NULL == (str = getenv("TMP")) )
+                str = PMIX_DEFAULT_TMPDIR;
+    return str;
+}
+
+PMIX_EXPORT const char* pmix_home_directory( void )
+{
+    char* home = getenv("HOME");
+
+    return home;
+}
diff --git a/src/util/pmix_environ.h b/src/util/pmix_environ.h
new file mode 100644
index 0000000..f6ec9c9
--- /dev/null
+++ b/src/util/pmix_environ.h
@@ -0,0 +1,151 @@
+/*
+ * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2005 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2007-2013 Los Alamos National Security, LLC.  All rights
+ *                         reserved.
+ * Copyright (c) 2015      Intel, Inc. All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2016      IBM Corporation.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+/**
+ * @file
+ *
+ * Generic helper routines for environment manipulation.
+ */
+
+#ifndef PMIX_ENVIRON_H
+#define PMIX_ENVIRON_H
+
+#include <src/include/pmix_config.h>
+
+
+#ifdef HAVE_CRT_EXTERNS_H
+#include <crt_externs.h>
+#endif
+
+#include <pmix_common.h>
+
+BEGIN_C_DECLS
+
+/**
+ * Merge two environ-like arrays into a single, new array, ensuring
+ * that there are no duplicate entries.
+ *
+ * @param minor Set 1 of the environ's to merge
+ * @param major Set 2 of the environ's to merge
+ * @retval New array of environ
+ *
+ * Merge two environ-like arrays into a single, new array,
+ * ensuring that there are no duplicate entires.  If there are
+ * duplicates, entries in the \em major array are favored over
+ * those in the \em minor array.
+ *
+ * Both \em major and \em minor are expected to be argv-style
+ * arrays (i.e., terminated with a NULL pointer).
+ *
+ * The array that is returned is an unencumbered array that should
+ * later be freed with a call to pmix_argv_free().
+ *
+ * Either (or both) of \em major and \em minor can be NULL.  If
+ * one of the two is NULL, the other list is simply copied to the
+ * output.  If both are NULL, NULL is returned.
+ */
+char **pmix_environ_merge(char **minor, char **major) __pmix_attribute_warn_unused_result__;
+
+/**
+ * Portable version of setenv(3), allowing editing of any
+ * environ-like array.
+ *
+ * @param name String name of the environment variable to look for
+ * @param value String value to set (may be NULL)
+ * @param overwrite Whether to overwrite any existing value with
+ * the same name
+ * @param env The environment to use
+ *
+ * @retval PMIX_ERR_OUT_OF_RESOURCE If internal malloc() fails.
+ * @retval PMIX_EXISTS If the name already exists in \em env and
+ * \em overwrite is false (and therefore the \em value was not
+ * saved in \em env)
+ * @retval PMIX_SUCESS If the value replaced another value or is
+ * appended to \em env.
+ *
+ * \em env is expected to be a NULL-terminated array of pointers
+ * (argv-style).  Note that unlike some implementations of
+ * putenv(3), if \em value is insertted in \em env, it is copied.
+ * So the caller can modify/free both \em name and \em value after
+ * pmix_setenv() returns.
+ *
+ * The \em env array will be grown if necessary.
+ *
+ * It is permissable to invoke this function with the
+ * system-defined \em environ variable.  For example:
+ *
+ * \code
+ *   #include "pmix/util/pmix_environ.h"
+ *   pmix_setenv("foo", "bar", true, &environ);
+ * \endcode
+ *
+ * NOTE: If you use the real environ, pmix_setenv() will turn
+ * around and perform putenv() to put the value in the
+ * environment.  This may very well lead to a memory leak, so its
+ * use is strongly discouraged.
+ *
+ * It is also permissable to call this function with an empty \em
+ * env, as long as it is pre-initialized with NULL:
+ *
+ * \code
+ *   char **my_env = NULL;
+ *   pmix_setenv("foo", "bar", true, &my_env);
+ * \endcode
+ */
+pmix_status_t pmix_setenv(const char *name, const char *value,
+                              bool overwrite, char ***env) __pmix_attribute_nonnull__(1);
+
+/**
+ * Portable version of unsetenv(3), allowing editing of any
+ * environ-like array.
+ *
+ * @param name String name of the environment variable to look for
+ * @param env The environment to use
+ *
+ * @retval PMIX_ERR_OUT_OF_RESOURCE If an internal malloc fails.
+ * @retval PMIX_ERR_NOT_FOUND If \em name is not found in \em env.
+ * @retval PMIX_SUCCESS If \em name is found and successfully deleted.
+ *
+ * If \em name is found in \em env, the string corresponding to
+ * that entry is freed and its entry is eliminated from the array.
+ */
+pmix_status_t pmix_unsetenv(const char *name, char ***env) __pmix_attribute_nonnull__(1);
+
+/* A consistent way to retrieve the home and tmp directory on all supported
+ * platforms.
+ */
+const char* pmix_home_directory( void );
+const char* pmix_tmp_directory( void );
+
+/* Some care is needed with environ on OS X when dealing with shared
+   libraries.  Handle that care here... */
+#ifdef HAVE__NSGETENVIRON
+#define environ (*_NSGetEnviron())
+#else
+extern char **environ;
+#endif
+
+END_C_DECLS
+
+#endif /* PMIX_ENVIRON */
diff --git a/src/util/printf.c b/src/util/printf.c
new file mode 100644
index 0000000..410c952
--- /dev/null
+++ b/src/util/printf.c
@@ -0,0 +1,323 @@
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2013 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2007      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2015      Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+/*
+ * Buffer safe printf functions for portability to archaic platforms.
+ */
+
+#include <src/include/pmix_config.h>
+
+
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "src/util/printf.h"
+#include "src/util/output.h"
+
+/*
+ * Make a good guess about how long a printf-style varargs formatted
+ * string will be once all the % escapes are filled in.  We don't
+ * handle every % escape here, but we handle enough, and then add a
+ * fudge factor in at the end.
+ */
+static int guess_strlen(const char *fmt, va_list ap)
+{
+    char *sarg, carg;
+    double darg;
+    float farg;
+    size_t i;
+    int iarg;
+    int len;
+    long larg;
+
+    /* Start off with a fudge factor of 128 to handle the % escapes that
+       we aren't calculating here */
+
+    len = (int)strlen(fmt) + 128;
+    for (i = 0; i < strlen(fmt); ++i) {
+        if ('%' == fmt[i] && i + 1 < strlen(fmt)
+            && '%' != fmt[i + 1]) {
+            ++i;
+            switch (fmt[i]) {
+            case 'c':
+                carg = va_arg(ap, int);
+                len += 1;  /* let's suppose it's a printable char */
+                (void)carg;  /* prevent compiler from complaining about set but not used variables */
+                break;
+            case 's':
+                sarg = va_arg(ap, char *);
+
+                /* If there's an arg, get the strlen, otherwise we'll
+                 * use (null) */
+
+                if (NULL != sarg) {
+                    len += (int)strlen(sarg);
+                } else {
+#if PMIX_ENABLE_DEBUG
+                    pmix_output(0, "PMIX DEBUG WARNING: Got a NULL argument to pmix_vasprintf!\n");
+#endif
+                    len += 5;
+                }
+                break;
+
+            case 'd':
+            case 'i':
+                iarg = va_arg(ap, int);
+                /* Alloc for minus sign */
+                if (iarg < 0)
+                    ++len;
+                /* Now get the log10 */
+                do {
+                    ++len;
+                    iarg /= 10;
+                } while (0 != iarg);
+                break;
+
+            case 'x':
+            case 'X':
+                iarg = va_arg(ap, int);
+                /* Now get the log16 */
+                do {
+                    ++len;
+                    iarg /= 16;
+                } while (0 != iarg);
+                break;
+
+            case 'f':
+                farg = (float)va_arg(ap, int);
+                /* Alloc for minus sign */
+                if (farg < 0) {
+                    ++len;
+                    farg = -farg;
+                }
+                /* Alloc for 3 decimal places + '.' */
+                len += 4;
+                /* Now get the log10 */
+                do {
+                    ++len;
+                    farg /= 10.0;
+                } while (0 != farg);
+                break;
+
+            case 'g':
+                darg = va_arg(ap, int);
+                /* Alloc for minus sign */
+                if (darg < 0) {
+                    ++len;
+                    darg = -darg;
+                }
+                /* Alloc for 3 decimal places + '.' */
+                len += 4;
+                /* Now get the log10 */
+                do {
+                    ++len;
+                    darg /= 10.0;
+                } while (0 != darg);
+                break;
+
+            case 'l':
+                /* Get %ld %lx %lX %lf */
+                if (i + 1 < strlen(fmt)) {
+                    ++i;
+                    switch (fmt[i]) {
+                    case 'x':
+                    case 'X':
+                        larg = va_arg(ap, int);
+                        /* Now get the log16 */
+                        do {
+                            ++len;
+                            larg /= 16;
+                        } while (0 != larg);
+                        break;
+
+                    case 'f':
+                        darg = va_arg(ap, int);
+                        /* Alloc for minus sign */
+                        if (darg < 0) {
+                            ++len;
+                            darg = -darg;
+                        }
+                        /* Alloc for 3 decimal places + '.' */
+                        len += 4;
+                        /* Now get the log10 */
+                        do {
+                            ++len;
+                            darg /= 10.0;
+                        } while (0 != darg);
+                        break;
+
+                    case 'd':
+                    default:
+                        larg = va_arg(ap, int);
+                        /* Now get the log10 */
+                        do {
+                            ++len;
+                            larg /= 10;
+                        } while (0 != larg);
+                        break;
+                    }
+                }
+
+            default:
+                break;
+            }
+        }
+    }
+
+    return len;
+}
+
+
+int pmix_asprintf(char **ptr, const char *fmt, ...)
+{
+    int length;
+    va_list ap;
+
+    va_start(ap, fmt);
+    length = pmix_vasprintf(ptr, fmt, ap);
+    va_end(ap);
+
+    return length;
+}
+
+
+int pmix_vasprintf(char **ptr, const char *fmt, va_list ap)
+{
+    int length;
+    va_list ap2;
+
+    /* va_list might have pointer to internal state and using
+       it twice is a bad idea.  So make a copy for the second
+       use.  Copy order taken from Autoconf docs. */
+#if PMIX_HAVE_VA_COPY
+    va_copy(ap2, ap);
+#elif PMIX_HAVE_UNDERSCORE_VA_COPY
+    __va_copy(ap2, ap);
+#else
+    memcpy (&ap2, &ap, sizeof(va_list));
+#endif
+
+    /* guess the size */
+    length = guess_strlen(fmt, ap);
+
+    /* allocate a buffer */
+    *ptr = (char *) malloc((size_t) length + 1);
+    if (NULL == *ptr) {
+        errno = ENOMEM;
+        va_end(ap2);
+        return -1;
+    }
+
+    /* fill the buffer */
+    length = vsprintf(*ptr, fmt, ap2);
+#if PMIX_HAVE_VA_COPY || PMIX_HAVE_UNDERSCORE_VA_COPY
+    va_end(ap2);
+#endif  /* PMIX_HAVE_VA_COPY || PMIX_HAVE_UNDERSCORE_VA_COPY */
+
+    /* realloc */
+    *ptr = (char*) realloc(*ptr, (size_t) length + 1);
+    if (NULL == *ptr) {
+        errno = ENOMEM;
+        return -1;
+    }
+
+    return length;
+}
+
+
+int pmix_snprintf(char *str, size_t size, const char *fmt, ...)
+{
+    int length;
+    va_list ap;
+
+    va_start(ap, fmt);
+    length = pmix_vsnprintf(str, size, fmt, ap);
+    va_end(ap);
+
+    return length;
+}
+
+
+int pmix_vsnprintf(char *str, size_t size, const char *fmt, va_list ap)
+{
+    int length;
+    char *buf;
+
+    length = pmix_vasprintf(&buf, fmt, ap);
+    if (length < 0) {
+        return length;
+    }
+
+    /* return the length when given a null buffer (C99) */
+    if (str) {
+        if ((size_t) length < size) {
+            strcpy(str, buf);
+        } else {
+            memcpy(str, buf, size - 1);
+            str[size] = '\0';
+        }
+    }
+
+    /* free allocated buffer */
+    free(buf);
+
+    return length;
+}
+
+
+#ifdef TEST
+
+int main(int argc, char *argv[])
+{
+    char a[10];
+    char b[173];
+    char *s;
+    int length;
+
+    puts("test for NULL buffer in snprintf:");
+    length = pmix_snprintf(NULL, 0, "this is a string %d", 1004);
+    printf("length = %d\n", length);
+
+    puts("test of snprintf to an undersize buffer:");
+    length = pmix_snprintf(a, sizeof(a), "this is a string %d", 1004);
+    printf("string = %s\n", a);
+    printf("length = %d\n", length);
+    printf("strlen = %d\n", (int) strlen(a));
+
+    puts("test of snprintf to an oversize buffer:");
+    length = pmix_snprintf(b, sizeof(b), "this is a string %d", 1004);
+    printf("string = %s\n", b);
+    printf("length = %d\n", length);
+    printf("strlen = %d\n", (int) strlen(b));
+
+    puts("test of asprintf:");
+    length = pmix_asprintf(&s, "this is a string %d", 1004);
+    printf("string = %s\n", s);
+    printf("length = %d\n", length);
+    printf("strlen = %d\n", (int) strlen(s));
+
+    free(s);
+
+    return 0;
+}
+
+#endif
diff --git a/src/util/printf.h b/src/util/printf.h
new file mode 100644
index 0000000..e2a19df
--- /dev/null
+++ b/src/util/printf.h
@@ -0,0 +1,131 @@
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2005 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2007 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2015-2017 Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+/** @file
+ *
+ * Buffer safe printf functions for portability to archaic platforms.
+ */
+
+#ifndef PMIX_PRINTF_H
+#define PMIX_PRINTF_H
+
+#include <src/include/pmix_config.h>
+#include <pmix_common.h>
+
+#include <stdarg.h>
+#include <stdlib.h>
+
+BEGIN_C_DECLS
+
+/**
+ * Writes to a string under the control of a format string
+ * that specifies how subsequent arguments are converted for output.
+ *
+ * @param str   Output string buffer
+ * @param size  Size of string buffer
+ * @param fmt   Output format
+ * @return      Length of output string
+ *
+ * At most size-1 characters are printed into the output string (the
+ * size'th character then gets the terminating `\0'); if the return
+ * value is greater than or equal to the size argument, the string was
+ * too short and some of the printed characters were discarded.  The
+ * output is always null-terminated.
+ *
+ * Returns the number of characters that would have been printed if
+ * the size were unlimited (again, not including the final `\0').
+ *
+ * THIS IS A PORTABILITY FEATURE: USE snprintf() in CODE.
+ */
+int  pmix_snprintf(char *str, size_t size, const char *fmt, ...) __pmix_attribute_format__(__printf__, 3, 4);
+
+
+/**
+ * Writes to a string under the control of a format string that
+ * specifies how arguments accessed via the variable-length argument
+ * facilities of stdarg(3) are converted for output.
+ *
+ * @param str   Output string buffer
+ * @param size  Size of string buffer
+ * @param fmt   Output format
+ * @param ap    Variable argument list pointer
+ * @return      Length of output string
+ *
+ * At most size-1 characters are printed into the output string (the
+ * size'th character then gets the terminating `\0'); if the return
+ * value is greater than or equal to the size argument, the string was
+ * too short and some of the printed characters were discarded.  The
+ * output is always null-terminated.
+ *
+ * Returns the number of characters that would have been printed if
+ * the size were unlimited (again, not including the final `\0').
+ *
+ * THIS IS A PORTABILITY FEATURE: USE vsnprintf() in CODE.
+ */
+int  pmix_vsnprintf(char *str, size_t size, const char *fmt, va_list ap) __pmix_attribute_format__(__printf__, 3, 0);
+
+/**
+ * Allocates and writes to a string under the control of a format
+ * string that specifies how subsequent arguments are converted for
+ * output.
+ *
+ * @param *ptr  Pointer to output string buffer
+ * @param fmt   Output format
+ * @return      Length of output string
+ *
+ * Sets *ptr to be a pointer to a buffer sufficiently large to hold
+ * the formatted string.  This pointer should be passed to free(3) to
+ * release the allocated storage when it is no longer needed.  If
+ * sufficient space cannot be allocated, asprintf() and vasprintf()
+ * will return -1 and set ret to be a NULL pointer.
+ *
+ * Returns the number of characters printed.
+ *
+ * THIS IS A PORTABILITY FEATURE: USE asprintf() in CODE.
+ */
+int  pmix_asprintf(char **ptr, const char *fmt, ...) __pmix_attribute_format__(__printf__, 2, 3);
+
+
+/**
+ * Allocates and writes to a string under the control of a format
+ * string that specifies how arguments accessed via the
+ * variable-length argument facilities of stdarg(3) are converted for
+ * output.
+ *
+ * @param *ptr  Pointer to output string buffer
+ * @param fmt   Output format
+ * @param ap    Variable argument list pointer
+ * @return      Length of output string
+ *
+ * Sets *ptr to be a pointer to a buffer sufficiently large to hold
+ * the formatted string.  This pointer should be passed to free(3) to
+ * release the allocated storage when it is no longer needed.  If
+ * sufficient space cannot be allocated, asprintf() and vasprintf()
+ * will return -1 and set ret to be a NULL pointer.
+ *
+ * Returns the number of characters printed.
+ *
+ * THIS IS A PORTABILITY FEATURE: USE vasprintf() in CODE.
+ */
+int  pmix_vasprintf(char **ptr, const char *fmt, va_list ap) __pmix_attribute_format__(__printf__, 2, 0);
+
+
+END_C_DECLS
+
+#endif /* PMIX_PRINTF_H */
diff --git a/src/util/show_help.c b/src/util/show_help.c
new file mode 100644
index 0000000..1b8bc48
--- /dev/null
+++ b/src/util/show_help.c
@@ -0,0 +1,372 @@
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2006 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2008      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2016-2017 Intel, Inc.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+
+#include <stdio.h>
+#include <string.h>
+#include <locale.h>
+#include <errno.h>
+
+#include "src/mca/pinstalldirs/pinstalldirs.h"
+#include "src/util/show_help.h"
+#include "src/util/show_help_lex.h"
+#include "src/util/printf.h"
+#include "src/util/argv.h"
+#include "src/util/os_path.h"
+#include "src/util/output.h"
+#include "pmix_common.h"
+
+
+/*
+ * Private variables
+ */
+static const char *default_filename = "help-messages";
+static const char *dash_line = "--------------------------------------------------------------------------\n";
+static int output_stream = -1;
+static char **search_dirs = NULL;
+
+/*
+ * Local functions
+ */
+static int pmix_show_vhelp_internal(const char *filename, const char *topic,
+                                    bool want_error_header, va_list arglist);
+static int pmix_show_help_internal(const char *filename, const char *topic,
+                                   bool want_error_header, ...);
+
+pmix_show_help_fn_t pmix_show_help = pmix_show_help_internal;
+pmix_show_vhelp_fn_t pmix_show_vhelp = pmix_show_vhelp_internal;
+
+
+int pmix_show_help_init(void)
+{
+    pmix_output_stream_t lds;
+
+    PMIX_CONSTRUCT(&lds, pmix_output_stream_t);
+    lds.lds_want_stderr = true;
+    output_stream = pmix_output_open(&lds);
+
+    pmix_argv_append_nosize(&search_dirs, pmix_pinstall_dirs.pmixdatadir);
+
+    return PMIX_SUCCESS;
+}
+
+int pmix_show_help_finalize(void)
+{
+    pmix_output_close(output_stream);
+    output_stream = -1;
+
+    /* destruct the search list */
+    if (NULL != search_dirs) {
+        pmix_argv_free(search_dirs);
+        search_dirs = NULL;
+    };
+
+    return PMIX_SUCCESS;
+}
+
+/*
+ * Make one big string with all the lines.  This isn't the most
+ * efficient method in the world, but we're going for clarity here --
+ * not optimization.  :-)
+ */
+static int array2string(char **outstring,
+                        bool want_error_header, char **lines)
+{
+    int i, count;
+    size_t len;
+
+    /* See how much space we need */
+
+    len = want_error_header ? 2 * strlen(dash_line) : 0;
+    count = pmix_argv_count(lines);
+    for (i = 0; i < count; ++i) {
+        if (NULL == lines[i]) {
+            break;
+        }
+        len += strlen(lines[i]) + 1;
+    }
+
+    /* Malloc it out */
+
+    (*outstring) = (char*) malloc(len + 1);
+    if (NULL == *outstring) {
+        return PMIX_ERR_OUT_OF_RESOURCE;
+    }
+
+    /* Fill the big string */
+
+    *(*outstring) = '\0';
+    if (want_error_header) {
+        strcat(*outstring, dash_line);
+    }
+    for (i = 0; i < count; ++i) {
+        if (NULL == lines[i]) {
+            break;
+        }
+        strcat(*outstring, lines[i]);
+        strcat(*outstring, "\n");
+    }
+    if (want_error_header) {
+        strcat(*outstring, dash_line);
+    }
+
+    return PMIX_SUCCESS;
+}
+
+
+/*
+ * Find the right file to open
+ */
+static int open_file(const char *base, const char *topic)
+{
+    char *filename;
+    char *err_msg = NULL;
+    size_t base_len;
+    int i;
+
+    /* If no filename was supplied, use the default */
+
+    if (NULL == base) {
+        base = default_filename;
+    }
+
+    /* if this is called prior to someone initializing the system,
+     * then don't try to look
+     */
+    if (NULL != search_dirs) {
+        /* Try to open the file.  If we can't find it, try it with a .txt
+         * extension.
+         */
+        for (i=0; NULL != search_dirs[i]; i++) {
+            filename = pmix_os_path( false, search_dirs[i], base, NULL );
+            pmix_show_help_yyin = fopen(filename, "r");
+            if (NULL == pmix_show_help_yyin) {
+                asprintf(&err_msg, "%s: %s", filename, strerror(errno));
+                base_len = strlen(base);
+                if (4 > base_len || 0 != strcmp(base + base_len - 4, ".txt")) {
+                    free(filename);
+                    asprintf(&filename, "%s%s%s.txt", search_dirs[i], PMIX_PATH_SEP, base);
+                    pmix_show_help_yyin = fopen(filename, "r");
+                }
+            }
+            free(filename);
+            if (NULL != pmix_show_help_yyin) {
+                break;
+            }
+        }
+    }
+
+    /* If we still couldn't open it, then something is wrong */
+    if (NULL == pmix_show_help_yyin) {
+        pmix_output(output_stream, "%sSorry!  You were supposed to get help about:\n    %s\nBut I couldn't open the help file:\n    %s.  Sorry!\n%s", dash_line, topic, err_msg, dash_line);
+        free(err_msg);
+        return PMIX_ERR_NOT_FOUND;
+    }
+
+    if (NULL != err_msg) {
+        free(err_msg);
+    }
+
+    /* Set the buffer */
+
+    pmix_show_help_init_buffer(pmix_show_help_yyin);
+
+    /* Happiness */
+
+    return PMIX_SUCCESS;
+}
+
+
+/*
+ * In the file that has already been opened, find the topic that we're
+ * supposed to output
+ */
+static int find_topic(const char *base, const char *topic)
+{
+    int token, ret;
+    char *tmp;
+
+    /* Examine every topic */
+
+    while (1) {
+        token = pmix_show_help_yylex();
+        switch (token) {
+        case PMIX_SHOW_HELP_PARSE_TOPIC:
+            tmp = strdup(pmix_show_help_yytext);
+            if (NULL == tmp) {
+                return PMIX_ERR_OUT_OF_RESOURCE;
+            }
+            tmp[strlen(tmp) - 1] = '\0';
+            ret = strcmp(tmp + 1, topic);
+            free(tmp);
+            if (0 == ret) {
+                return PMIX_SUCCESS;
+            }
+            break;
+
+        case PMIX_SHOW_HELP_PARSE_MESSAGE:
+            break;
+
+        case PMIX_SHOW_HELP_PARSE_DONE:
+            pmix_output(output_stream, "%sSorry!  You were supposed to get help about:\n    %s\nfrom the file:\n    %s\nBut I couldn't find that topic in the file.  Sorry!\n%s", dash_line, topic, base, dash_line);
+            return PMIX_ERR_NOT_FOUND;
+            break;
+
+        default:
+            break;
+        }
+    }
+
+    /* Never get here */
+}
+
+
+/*
+ * We have an open file, and we're pointed at the right topic.  So
+ * read in all the lines in the topic and make a list of them.
+ */
+static int read_topic(char ***array)
+{
+    int token, rc;
+
+    while (1) {
+        token = pmix_show_help_yylex();
+        switch (token) {
+        case PMIX_SHOW_HELP_PARSE_MESSAGE:
+            /* pmix_argv_append_nosize does strdup(pmix_show_help_yytext) */
+            rc = pmix_argv_append_nosize(array, pmix_show_help_yytext);
+            if (rc != PMIX_SUCCESS) {
+                return rc;
+            }
+            break;
+
+        default:
+            return PMIX_SUCCESS;
+            break;
+        }
+    }
+
+    /* Never get here */
+}
+
+
+static int load_array(char ***array, const char *filename, const char *topic)
+{
+    int ret;
+
+    if (PMIX_SUCCESS != (ret = open_file(filename, topic))) {
+        return ret;
+    }
+
+    ret = find_topic(filename, topic);
+    if (PMIX_SUCCESS == ret) {
+        ret = read_topic(array);
+    }
+
+    fclose(pmix_show_help_yyin);
+    pmix_show_help_yylex_destroy ();
+
+    if (PMIX_SUCCESS != ret) {
+        pmix_argv_free(*array);
+    }
+
+    return ret;
+}
+
+char *pmix_show_help_vstring(const char *filename, const char *topic,
+                             bool want_error_header, va_list arglist)
+{
+    int rc;
+    char *single_string, *output, **array = NULL;
+
+    /* Load the message */
+    if (PMIX_SUCCESS != (rc = load_array(&array, filename, topic))) {
+        return NULL;
+    }
+
+    /* Convert it to a single raw string */
+    rc = array2string(&single_string, want_error_header, array);
+
+    if (PMIX_SUCCESS == rc) {
+        /* Apply the formatting to make the final output string */
+        if (0 > vasprintf(&output, single_string, arglist)) {
+            output = NULL;
+        }
+        free(single_string);
+    }
+
+    pmix_argv_free(array);
+    return (PMIX_SUCCESS == rc) ? output : NULL;
+}
+
+char *pmix_show_help_string(const char *filename, const char *topic,
+                            bool want_error_handler, ...)
+{
+    char *output;
+    va_list arglist;
+
+    va_start(arglist, want_error_handler);
+    output = pmix_show_help_vstring(filename, topic, want_error_handler,
+                                    arglist);
+    va_end(arglist);
+
+    return output;
+}
+
+static int pmix_show_vhelp_internal(const char *filename, const char *topic,
+                                    bool want_error_header, va_list arglist)
+{
+    char *output;
+
+    /* Convert it to a single string */
+    output = pmix_show_help_vstring(filename, topic, want_error_header,
+                                    arglist);
+
+    /* If we got a single string, output it with formatting */
+    if (NULL != output) {
+        pmix_output(output_stream, "%s", output);
+        free(output);
+    }
+
+    return (NULL == output) ? PMIX_ERROR : PMIX_SUCCESS;
+}
+
+static int pmix_show_help_internal(const char *filename, const char *topic,
+                                   bool want_error_header, ...)
+{
+    va_list arglist;
+    int rc;
+
+    /* Convert it to a single string */
+    va_start(arglist, want_error_header);
+    rc = pmix_show_vhelp(filename, topic, want_error_header, arglist);
+    va_end(arglist);
+
+    return rc;
+}
+
+int pmix_show_help_add_dir(const char *directory)
+{
+    pmix_argv_append_nosize(&search_dirs, directory);
+    return PMIX_SUCCESS;
+}
diff --git a/src/util/show_help.h b/src/util/show_help.h
new file mode 100644
index 0000000..f57f364
--- /dev/null
+++ b/src/util/show_help.h
@@ -0,0 +1,178 @@
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2006 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2008-2011 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2016-2017 Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+/**
+ * @file
+ *
+ * The "show help" subsystem (SHS) in PMIX is intended to help the
+ * developer convey meaningful information to the user (read longer
+ * than is convenient in a single printf), particularly when errors
+ * occur.  The SHS allows the storage of arbitrary-length help
+ * messages in text files which can be parameterized by text filename,
+ * message name, POSIX locale, and printf()-style parameters (e.g.,
+ * "%s", "%d", etc.).  Note that the primary purpose of the SHS is to
+ * display help messages, but it can actually be used to display any
+ * arbitrary text messages.
+ *
+ * The function pmix_show_help() is used to find a help message and
+ * display it.  Its important parameters are a filename, message name,
+ * and printf()-style varargs parameters used to substitute into the
+ * message.
+ *
+ * It was originally intended that this system would support a very
+ * simple version of i18n-like support, but we got (strong) feedback
+ * that i18n support was not desired.  So it never happened.
+ *
+ * As such, the file lookup is quite straightforward -- the caller
+ * passes in the filename to find the help message, and the SHS looks
+ * for that file in $pkgdatadir (typically $prefix/share/pmix).
+ *
+ * Once the file is successfully opened, the SHS looks for the
+ * appropriate help message to display.  It looks for the message name
+ * in the file, reads in the message, and displays it.  printf()-like
+ * substitutions are performed (e.g., %d, %s, etc.) --
+ * pmix_show_help() takes a variable legnth argument list that are
+ * used for these substitutions.
+ *
+ * The format of the help file is simplistic:
+ *
+ * - Comments begin with #.  Any characters after a # on a line are
+ *   ignored.  It is not possible to escape a #.
+ * - Message names are on a line by themselves and marked with [].
+ *   Names can be any ASCII string within the [] (excluding the
+ *   characters newline, linefeed, [, ], and #).
+ * - Messages are any characters between message names and/or the end
+ *   of the file.
+ *
+ * Here's a sample helpfile:
+ *
+ * \verbatimbegin
+ * # This is a comment.
+ * [topic 1]
+ * Here's the first message.  Let's substitute in an integer: %d.
+ * The quick brown fox jumped over the lazy %s.
+ * # This is another comment -- it's not displayed in the first message.
+ * [another:topic:foo:foo:foo]
+ * This is the second message.  Let's just keep rolling along to get
+ * to the second line in the message for this example.
+ * \verbatimend
+ *
+ * It is expected that help messages will be grouped by filename;
+ * similar messages should be in a single file.  For example, an MCA
+ * component may install its own helpfile in PMIX's $pkgdatadir,
+ * and therefore the component can invoke pmix_show_help() to display
+ * its own help messages.
+ *
+ * Message files in $pkgdatadir have a naming convention: they
+ * generally start with the prefix "help-" and are followed by a name
+ * descriptive of what kind of messages they contain.  MCA components
+ * should generally abide by the MCA prefix rule, with the exception
+ * that they should start the filename with "help-", as mentioned
+ * previously.
+ */
+
+#ifndef PMIX_SHOW_HELP_H
+#define PMIX_SHOW_HELP_H
+
+#include <src/include/pmix_config.h>
+#include <pmix_common.h>
+
+#include <stdarg.h>
+
+BEGIN_C_DECLS
+
+/**
+ * \internal
+ *
+ * Initialization of show_help subsystem
+ */
+int pmix_show_help_init(void);
+
+
+/**
+ * \internal
+ *
+ * Finalization of show_help subsystem
+ */
+int pmix_show_help_finalize(void);
+
+
+/**
+ * Look up a text message in a text file and display it to the
+ * stderr using printf()-like substitutions (%d, %s, etc.).
+ *
+ * @param filename File where the text messages are contained.
+ * @param topic String index of which message to display from the
+ * text file.
+ * @param want_error_header Display error-bar line header and
+ * footer with the message.
+ * @param varargs Any additional parameters are substituted,
+ * printf()-style into the help message that is displayed.
+ *
+ * This function looks for the filename in the $pkgdatadir
+ * (typically $prefix/share/pmix), and looks up the message
+ * based on the topic, and displays it.  If want_error_header is
+ * true, a header and footer of asterisks are also displayed.
+ */
+typedef int (*pmix_show_help_fn_t)(const char *filename, const char *topic,
+                                   bool want_error_header, ...);
+PMIX_EXPORT extern pmix_show_help_fn_t pmix_show_help;
+
+/**
+ * This function does the same thing as pmix_show_help(), but accepts
+ * a va_list form of varargs.
+ */
+typedef int (*pmix_show_vhelp_fn_t)(const char *filename, const char *topic,
+                                    bool want_error_header, va_list ap);
+PMIX_EXPORT extern pmix_show_vhelp_fn_t pmix_show_vhelp;
+
+/**
+ * This function does the same thing as pmix_show_help(), but returns
+ * its output in a string (that must be freed by the caller).
+ */
+PMIX_EXPORT char* pmix_show_help_string(const char *filename,
+                                        const char *topic,
+                                        bool want_error_header, ...);
+
+/**
+ * This function does the same thing as pmix_show_help_string(), but
+ * accepts a va_list form of varargs.
+ */
+PMIX_EXPORT char* pmix_show_help_vstring(const char *filename,
+                                         const char *topic,
+                                         bool want_error_header, va_list ap);
+
+/**
+ * This function adds another search location for the files that
+ * back show_help messages. Locations will be searched starting
+ * with the prefix installation directory, then cycled through
+ * any additional directories in the order they were added
+ *
+ * This interface allows libraries that use OMPI to take advantage
+ * of the show_help functionality. OMPI defines the show_help directory
+ * based on where OMPI was installed. However, if the library wants to
+ * use show_help to provide error output specific to itself, then it
+ * nees to tell show_help how to find its own show_help files - without
+ * interfering with the linked ORTE libs when they need to do show_help.
+ */
+int pmix_show_help_add_dir(const char *directory);
+
+END_C_DECLS
+
+#endif
diff --git a/src/util/show_help_lex.c b/src/util/show_help_lex.c
new file mode 100644
index 0000000..d066e98
--- /dev/null
+++ b/src/util/show_help_lex.c
@@ -0,0 +1,1863 @@
+
+#line 3 "util/show_help_lex.c"
+
+#define  YY_INT_ALIGNED short int
+
+/* A lexical scanner generated by flex */
+
+#define yy_create_buffer pmix_show_help_yy_create_buffer
+#define yy_delete_buffer pmix_show_help_yy_delete_buffer
+#define yy_flex_debug pmix_show_help_yy_flex_debug
+#define yy_init_buffer pmix_show_help_yy_init_buffer
+#define yy_flush_buffer pmix_show_help_yy_flush_buffer
+#define yy_load_buffer_state pmix_show_help_yy_load_buffer_state
+#define yy_switch_to_buffer pmix_show_help_yy_switch_to_buffer
+#define yyin pmix_show_help_yyin
+#define yyleng pmix_show_help_yyleng
+#define yylex pmix_show_help_yylex
+#define yylineno pmix_show_help_yylineno
+#define yyout pmix_show_help_yyout
+#define yyrestart pmix_show_help_yyrestart
+#define yytext pmix_show_help_yytext
+#define yywrap pmix_show_help_yywrap
+#define yyalloc pmix_show_help_yyalloc
+#define yyrealloc pmix_show_help_yyrealloc
+#define yyfree pmix_show_help_yyfree
+
+#define FLEX_SCANNER
+#define YY_FLEX_MAJOR_VERSION 2
+#define YY_FLEX_MINOR_VERSION 5
+#define YY_FLEX_SUBMINOR_VERSION 37
+#if YY_FLEX_SUBMINOR_VERSION > 0
+#define FLEX_BETA
+#endif
+
+/* First, we deal with  platform-specific or compiler-specific issues. */
+
+/* begin standard C headers. */
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <stdlib.h>
+
+/* end standard C headers. */
+
+/* flex integer type definitions */
+
+#ifndef FLEXINT_H
+#define FLEXINT_H
+
+/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
+
+#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+
+/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
+ * if you want the limit (max/min) macros for int types. 
+ */
+#ifndef __STDC_LIMIT_MACROS
+#define __STDC_LIMIT_MACROS 1
+#endif
+
+#include <inttypes.h>
+typedef int8_t flex_int8_t;
+typedef uint8_t flex_uint8_t;
+typedef int16_t flex_int16_t;
+typedef uint16_t flex_uint16_t;
+typedef int32_t flex_int32_t;
+typedef uint32_t flex_uint32_t;
+#else
+typedef signed char flex_int8_t;
+typedef short int flex_int16_t;
+typedef int flex_int32_t;
+typedef unsigned char flex_uint8_t; 
+typedef unsigned short int flex_uint16_t;
+typedef unsigned int flex_uint32_t;
+
+/* Limits of integral types. */
+#ifndef INT8_MIN
+#define INT8_MIN               (-128)
+#endif
+#ifndef INT16_MIN
+#define INT16_MIN              (-32767-1)
+#endif
+#ifndef INT32_MIN
+#define INT32_MIN              (-2147483647-1)
+#endif
+#ifndef INT8_MAX
+#define INT8_MAX               (127)
+#endif
+#ifndef INT16_MAX
+#define INT16_MAX              (32767)
+#endif
+#ifndef INT32_MAX
+#define INT32_MAX              (2147483647)
+#endif
+#ifndef UINT8_MAX
+#define UINT8_MAX              (255U)
+#endif
+#ifndef UINT16_MAX
+#define UINT16_MAX             (65535U)
+#endif
+#ifndef UINT32_MAX
+#define UINT32_MAX             (4294967295U)
+#endif
+
+#endif /* ! C99 */
+
+#endif /* ! FLEXINT_H */
+
+#ifdef __cplusplus
+
+/* The "const" storage-class-modifier is valid. */
+#define YY_USE_CONST
+
+#else	/* ! __cplusplus */
+
+/* C99 requires __STDC__ to be defined as 1. */
+#if defined (__STDC__)
+
+#define YY_USE_CONST
+
+#endif	/* defined (__STDC__) */
+#endif	/* ! __cplusplus */
+
+#ifdef YY_USE_CONST
+#define yyconst const
+#else
+#define yyconst
+#endif
+
+/* Returned upon end-of-file. */
+#define YY_NULL 0
+
+/* Promotes a possibly negative, possibly signed char to an unsigned
+ * integer for use as an array index.  If the signed char is negative,
+ * we want to instead treat it as an 8-bit unsigned char, hence the
+ * double cast.
+ */
+#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c)
+
+/* Enter a start condition.  This macro really ought to take a parameter,
+ * but we do it the disgusting crufty way forced on us by the ()-less
+ * definition of BEGIN.
+ */
+#define BEGIN (yy_start) = 1 + 2 *
+
+/* Translate the current start state into a value that can be later handed
+ * to BEGIN to return to the state.  The YYSTATE alias is for lex
+ * compatibility.
+ */
+#define YY_START (((yy_start) - 1) / 2)
+#define YYSTATE YY_START
+
+/* Action number for EOF rule of a given start state. */
+#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
+
+/* Special action meaning "start processing a new file". */
+#define YY_NEW_FILE pmix_show_help_yyrestart(pmix_show_help_yyin  )
+
+#define YY_END_OF_BUFFER_CHAR 0
+
+/* Size of default input buffer. */
+#ifndef YY_BUF_SIZE
+#define YY_BUF_SIZE 16384
+#endif
+
+/* The state buf must be large enough to hold one state per character in the main buffer.
+ */
+#define YY_STATE_BUF_SIZE   ((YY_BUF_SIZE + 2) * sizeof(yy_state_type))
+
+#ifndef YY_TYPEDEF_YY_BUFFER_STATE
+#define YY_TYPEDEF_YY_BUFFER_STATE
+typedef struct yy_buffer_state *YY_BUFFER_STATE;
+#endif
+
+#ifndef YY_TYPEDEF_YY_SIZE_T
+#define YY_TYPEDEF_YY_SIZE_T
+typedef size_t yy_size_t;
+#endif
+
+extern yy_size_t pmix_show_help_yyleng;
+
+extern FILE *pmix_show_help_yyin, *pmix_show_help_yyout;
+
+#define EOB_ACT_CONTINUE_SCAN 0
+#define EOB_ACT_END_OF_FILE 1
+#define EOB_ACT_LAST_MATCH 2
+
+    #define YY_LESS_LINENO(n)
+    
+/* Return all but the first "n" matched characters back to the input stream. */
+#define yyless(n) \
+	do \
+		{ \
+		/* Undo effects of setting up pmix_show_help_yytext. */ \
+        int yyless_macro_arg = (n); \
+        YY_LESS_LINENO(yyless_macro_arg);\
+		*yy_cp = (yy_hold_char); \
+		YY_RESTORE_YY_MORE_OFFSET \
+		(yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
+		YY_DO_BEFORE_ACTION; /* set up pmix_show_help_yytext again */ \
+		} \
+	while ( 0 )
+
+#define unput(c) yyunput( c, (yytext_ptr)  )
+
+#ifndef YY_STRUCT_YY_BUFFER_STATE
+#define YY_STRUCT_YY_BUFFER_STATE
+struct yy_buffer_state
+	{
+	FILE *yy_input_file;
+
+	char *yy_ch_buf;		/* input buffer */
+	char *yy_buf_pos;		/* current position in input buffer */
+
+	/* Size of input buffer in bytes, not including room for EOB
+	 * characters.
+	 */
+	yy_size_t yy_buf_size;
+
+	/* Number of characters read into yy_ch_buf, not including EOB
+	 * characters.
+	 */
+	yy_size_t yy_n_chars;
+
+	/* Whether we "own" the buffer - i.e., we know we created it,
+	 * and can realloc() it to grow it, and should free() it to
+	 * delete it.
+	 */
+	int yy_is_our_buffer;
+
+	/* Whether this is an "interactive" input source; if so, and
+	 * if we're using stdio for input, then we want to use getc()
+	 * instead of fread(), to make sure we stop fetching input after
+	 * each newline.
+	 */
+	int yy_is_interactive;
+
+	/* Whether we're considered to be at the beginning of a line.
+	 * If so, '^' rules will be active on the next match, otherwise
+	 * not.
+	 */
+	int yy_at_bol;
+
+    int yy_bs_lineno; /**< The line count. */
+    int yy_bs_column; /**< The column count. */
+    
+	/* Whether to try to fill the input buffer when we reach the
+	 * end of it.
+	 */
+	int yy_fill_buffer;
+
+	int yy_buffer_status;
+
+#define YY_BUFFER_NEW 0
+#define YY_BUFFER_NORMAL 1
+	/* When an EOF's been seen but there's still some text to process
+	 * then we mark the buffer as YY_EOF_PENDING, to indicate that we
+	 * shouldn't try reading from the input source any more.  We might
+	 * still have a bunch of tokens to match, though, because of
+	 * possible backing-up.
+	 *
+	 * When we actually see the EOF, we change the status to "new"
+	 * (via pmix_show_help_yyrestart()), so that the user can continue scanning by
+	 * just pointing pmix_show_help_yyin at a new input file.
+	 */
+#define YY_BUFFER_EOF_PENDING 2
+
+	};
+#endif /* !YY_STRUCT_YY_BUFFER_STATE */
+
+/* Stack of input buffers. */
+static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */
+static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */
+static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
+
+/* We provide macros for accessing buffer states in case in the
+ * future we want to put the buffer states in a more general
+ * "scanner state".
+ *
+ * Returns the top of the stack, or NULL.
+ */
+#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \
+                          ? (yy_buffer_stack)[(yy_buffer_stack_top)] \
+                          : NULL)
+
+/* Same as previous macro, but useful when we know that the buffer stack is not
+ * NULL or when we need an lvalue. For internal use only.
+ */
+#define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)]
+
+/* yy_hold_char holds the character lost when pmix_show_help_yytext is formed. */
+static char yy_hold_char;
+static yy_size_t yy_n_chars;		/* number of characters read into yy_ch_buf */
+yy_size_t pmix_show_help_yyleng;
+
+/* Points to current character in buffer. */
+static char *yy_c_buf_p = (char *) 0;
+static int yy_init = 0;		/* whether we need to initialize */
+static int yy_start = 0;	/* start state number */
+
+/* Flag which is used to allow pmix_show_help_yywrap()'s to do buffer switches
+ * instead of setting up a fresh pmix_show_help_yyin.  A bit of a hack ...
+ */
+static int yy_did_buffer_switch_on_eof;
+
+void pmix_show_help_yyrestart (FILE *input_file  );
+void pmix_show_help_yy_switch_to_buffer (YY_BUFFER_STATE new_buffer  );
+YY_BUFFER_STATE pmix_show_help_yy_create_buffer (FILE *file,int size  );
+void pmix_show_help_yy_delete_buffer (YY_BUFFER_STATE b  );
+void pmix_show_help_yy_flush_buffer (YY_BUFFER_STATE b  );
+void pmix_show_help_yypush_buffer_state (YY_BUFFER_STATE new_buffer  );
+void pmix_show_help_yypop_buffer_state (void );
+
+static void pmix_show_help_yyensure_buffer_stack (void );
+static void pmix_show_help_yy_load_buffer_state (void );
+static void pmix_show_help_yy_init_buffer (YY_BUFFER_STATE b,FILE *file  );
+
+#define YY_FLUSH_BUFFER pmix_show_help_yy_flush_buffer(YY_CURRENT_BUFFER )
+
+YY_BUFFER_STATE pmix_show_help_yy_scan_buffer (char *base,yy_size_t size  );
+YY_BUFFER_STATE pmix_show_help_yy_scan_string (yyconst char *yy_str  );
+YY_BUFFER_STATE pmix_show_help_yy_scan_bytes (yyconst char *bytes,yy_size_t len  );
+
+void *pmix_show_help_yyalloc (yy_size_t  );
+void *pmix_show_help_yyrealloc (void *,yy_size_t  );
+void pmix_show_help_yyfree (void *  );
+
+#define yy_new_buffer pmix_show_help_yy_create_buffer
+
+#define yy_set_interactive(is_interactive) \
+	{ \
+	if ( ! YY_CURRENT_BUFFER ){ \
+        pmix_show_help_yyensure_buffer_stack (); \
+		YY_CURRENT_BUFFER_LVALUE =    \
+            pmix_show_help_yy_create_buffer(pmix_show_help_yyin,YY_BUF_SIZE ); \
+	} \
+	YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
+	}
+
+#define yy_set_bol(at_bol) \
+	{ \
+	if ( ! YY_CURRENT_BUFFER ){\
+        pmix_show_help_yyensure_buffer_stack (); \
+		YY_CURRENT_BUFFER_LVALUE =    \
+            pmix_show_help_yy_create_buffer(pmix_show_help_yyin,YY_BUF_SIZE ); \
+	} \
+	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
+	}
+
+#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
+
+/* Begin user sect3 */
+
+typedef unsigned char YY_CHAR;
+
+FILE *pmix_show_help_yyin = (FILE *) 0, *pmix_show_help_yyout = (FILE *) 0;
+
+typedef int yy_state_type;
+
+extern int pmix_show_help_yylineno;
+
+int pmix_show_help_yylineno = 1;
+
+extern char *pmix_show_help_yytext;
+#define yytext_ptr pmix_show_help_yytext
+
+static yy_state_type yy_get_previous_state (void );
+static yy_state_type yy_try_NUL_trans (yy_state_type current_state  );
+static int yy_get_next_buffer (void );
+static void yy_fatal_error (yyconst char msg[]  );
+
+/* Done after the current pattern has been matched and before the
+ * corresponding action - sets up pmix_show_help_yytext.
+ */
+#define YY_DO_BEFORE_ACTION \
+	(yytext_ptr) = yy_bp; \
+	pmix_show_help_yyleng = (size_t) (yy_cp - yy_bp); \
+	(yy_hold_char) = *yy_cp; \
+	*yy_cp = '\0'; \
+	(yy_c_buf_p) = yy_cp;
+
+#define YY_NUM_RULES 5
+#define YY_END_OF_BUFFER 6
+/* This struct is not used in this scanner,
+   but its presence is necessary. */
+struct yy_trans_info
+	{
+	flex_int32_t yy_verify;
+	flex_int32_t yy_nxt;
+	};
+static yyconst flex_int16_t yy_acclist[17] =
+    {   0,
+        6,    5,    4,    5,    5,    5,    5,    3,    5,    4,
+        1,    4,    3,16386, 8194,    4
+    } ;
+
+static yyconst flex_int16_t yy_accept[24] =
+    {   0,
+        1,    1,    1,    1,    1,    2,    3,    5,    6,    7,
+        8,   10,   10,   11,   11,   13,   13,   13,   14,   15,
+       15,   17,   17
+    } ;
+
+static yyconst flex_int32_t yy_ec[256] =
+    {   0,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    2,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    3,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        4,    1,    5,    1,    1,    1,    1,    1,    1,    1,
+
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1
+    } ;
+
+static yyconst flex_int32_t yy_meta[6] =
+    {   0,
+        1,    1,    1,    1,    1
+    } ;
+
+static yyconst flex_int16_t yy_base[30] =
+    {   0,
+        0,    3,   28,   27,   28,   25,   31,   24,   23,   22,
+       31,   21,   31,   20,   31,    7,   19,   31,   11,   15,
+       31,   31,   18,   17,   14,   13,   10,    9,    0
+    } ;
+
+static yyconst flex_int16_t yy_def[30] =
+    {   0,
+       23,   22,   24,   24,   22,   25,   22,   26,   27,   28,
+       22,   25,   22,   26,   22,   27,   28,   22,   29,   29,
+       22,    0,   22,   22,   22,   22,   22,   22,   22
+    } ;
+
+static yyconst flex_int16_t yy_nxt[37] =
+    {   0,
+       20,    7,    8,    6,    7,    8,    9,    6,   13,   17,
+       16,   19,   21,   14,   12,   19,   21,   10,    6,   19,
+       18,   15,   13,   18,   13,   15,   13,   22,   11,   11,
+        5,   22,   22,   22,   22,   22
+    } ;
+
+static yyconst flex_int16_t yy_chk[37] =
+    {   0,
+       29,    1,    1,    2,    2,    2,    2,    2,   16,   28,
+       27,   16,   19,   26,   25,   19,   20,   24,   23,   20,
+       17,   14,   12,   10,    9,    8,    6,    5,    4,    3,
+       22,   22,   22,   22,   22,   22
+    } ;
+
+extern int pmix_show_help_yy_flex_debug;
+int pmix_show_help_yy_flex_debug = 0;
+
+static yy_state_type *yy_state_buf=0, *yy_state_ptr=0;
+static char *yy_full_match;
+static int yy_lp;
+static int yy_looking_for_trail_begin = 0;
+static int yy_full_lp;
+static int *yy_full_state;
+#define YY_TRAILING_MASK 0x2000
+#define YY_TRAILING_HEAD_MASK 0x4000
+#define REJECT \
+{ \
+*yy_cp = (yy_hold_char); /* undo effects of setting up pmix_show_help_yytext */ \
+yy_cp = (yy_full_match); /* restore poss. backed-over text */ \
+(yy_lp) = (yy_full_lp); /* restore orig. accepting pos. */ \
+(yy_state_ptr) = (yy_full_state); /* restore orig. state */ \
+yy_current_state = *(yy_state_ptr); /* restore curr. state */ \
+++(yy_lp); \
+goto find_rule; \
+}
+
+#define yymore() yymore_used_but_not_detected
+#define YY_MORE_ADJ 0
+#define YY_RESTORE_YY_MORE_OFFSET
+char *pmix_show_help_yytext;
+#line 1 "util/show_help_lex.l"
+#define YY_NO_INPUT 1
+#line 5 "util/show_help_lex.l"
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2006 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2016      Intel, Inc. All rights reserved
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+
+#include <stdio.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#include "src/util/show_help_lex.h"
+
+BEGIN_C_DECLS
+
+/*
+ * public functions
+ */
+extern int pmix_show_help_finish_parsing(void);
+
+/*
+ * local functions
+ */
+static int pmix_show_help_yywrap(void);
+
+END_C_DECLS
+
+/*
+ * global variables
+ */
+int pmix_show_help_yynewlines = 1;
+bool pmix_show_help_parse_done = false;
+
+
+#line 550 "util/show_help_lex.c"
+
+#define INITIAL 0
+#define CHOMP 1
+
+#ifndef YY_NO_UNISTD_H
+/* Special case for "unistd.h", since it is non-ANSI. We include it way
+ * down here because we want the user's section 1 to have been scanned first.
+ * The user has a chance to override it with an option.
+ */
+#include <unistd.h>
+#endif
+
+#ifndef YY_EXTRA_TYPE
+#define YY_EXTRA_TYPE void *
+#endif
+
+static int yy_init_globals (void );
+
+/* Accessor methods to globals.
+   These are made visible to non-reentrant scanners for convenience. */
+
+int pmix_show_help_yylex_destroy (void );
+
+int pmix_show_help_yyget_debug (void );
+
+void pmix_show_help_yyset_debug (int debug_flag  );
+
+YY_EXTRA_TYPE pmix_show_help_yyget_extra (void );
+
+void pmix_show_help_yyset_extra (YY_EXTRA_TYPE user_defined  );
+
+FILE *pmix_show_help_yyget_in (void );
+
+void pmix_show_help_yyset_in  (FILE * in_str  );
+
+FILE *pmix_show_help_yyget_out (void );
+
+void pmix_show_help_yyset_out  (FILE * out_str  );
+
+yy_size_t pmix_show_help_yyget_leng (void );
+
+char *pmix_show_help_yyget_text (void );
+
+int pmix_show_help_yyget_lineno (void );
+
+void pmix_show_help_yyset_lineno (int line_number  );
+
+/* Macros after this point can all be overridden by user definitions in
+ * section 1.
+ */
+
+#ifndef YY_SKIP_YYWRAP
+#ifdef __cplusplus
+extern "C" int pmix_show_help_yywrap (void );
+#else
+extern int pmix_show_help_yywrap (void );
+#endif
+#endif
+
+#ifndef yytext_ptr
+static void yy_flex_strncpy (char *,yyconst char *,int );
+#endif
+
+#ifdef YY_NEED_STRLEN
+static int yy_flex_strlen (yyconst char * );
+#endif
+
+#ifndef YY_NO_INPUT
+
+#ifdef __cplusplus
+static int yyinput (void );
+#else
+static int input (void );
+#endif
+
+#endif
+
+/* Amount of stuff to slurp up with each read. */
+#ifndef YY_READ_BUF_SIZE
+#define YY_READ_BUF_SIZE 8192
+#endif
+
+/* Copy whatever the last rule matched to the standard output. */
+#ifndef ECHO
+/* This used to be an fputs(), but since the string might contain NUL's,
+ * we now use fwrite().
+ */
+#define ECHO do { if (fwrite( pmix_show_help_yytext, pmix_show_help_yyleng, 1, pmix_show_help_yyout )) {} } while (0)
+#endif
+
+/* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
+ * is returned in "result".
+ */
+#ifndef YY_INPUT
+#define YY_INPUT(buf,result,max_size) \
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
+		{ \
+		int c = '*'; \
+		size_t n; \
+		for ( n = 0; n < max_size && \
+			     (c = getc( pmix_show_help_yyin )) != EOF && c != '\n'; ++n ) \
+			buf[n] = (char) c; \
+		if ( c == '\n' ) \
+			buf[n++] = (char) c; \
+		if ( c == EOF && ferror( pmix_show_help_yyin ) ) \
+			YY_FATAL_ERROR( "input in flex scanner failed" ); \
+		result = n; \
+		} \
+	else \
+		{ \
+		errno=0; \
+		while ( (result = fread(buf, 1, max_size, pmix_show_help_yyin))==0 && ferror(pmix_show_help_yyin)) \
+			{ \
+			if( errno != EINTR) \
+				{ \
+				YY_FATAL_ERROR( "input in flex scanner failed" ); \
+				break; \
+				} \
+			errno=0; \
+			clearerr(pmix_show_help_yyin); \
+			} \
+		}\
+\
+
+#endif
+
+/* No semi-colon after return; correct usage is to write "yyterminate();" -
+ * we don't want an extra ';' after the "return" because that will cause
+ * some compilers to complain about unreachable statements.
+ */
+#ifndef yyterminate
+#define yyterminate() return YY_NULL
+#endif
+
+/* Number of entries by which start-condition stack grows. */
+#ifndef YY_START_STACK_INCR
+#define YY_START_STACK_INCR 25
+#endif
+
+/* Report a fatal error. */
+#ifndef YY_FATAL_ERROR
+#define YY_FATAL_ERROR(msg) yy_fatal_error( msg )
+#endif
+
+/* end tables serialization structures and prototypes */
+
+/* Default declaration of generated scanner - a define so the user can
+ * easily add parameters.
+ */
+#ifndef YY_DECL
+#define YY_DECL_IS_OURS 1
+
+extern int pmix_show_help_yylex (void);
+
+#define YY_DECL int pmix_show_help_yylex (void)
+#endif /* !YY_DECL */
+
+/* Code executed at the beginning of each rule, after pmix_show_help_yytext and pmix_show_help_yyleng
+ * have been set up.
+ */
+#ifndef YY_USER_ACTION
+#define YY_USER_ACTION
+#endif
+
+/* Code executed at the end of each rule. */
+#ifndef YY_BREAK
+#define YY_BREAK break;
+#endif
+
+#define YY_RULE_SETUP \
+	if ( pmix_show_help_yyleng > 0 ) \
+		YY_CURRENT_BUFFER_LVALUE->yy_at_bol = \
+				(pmix_show_help_yytext[pmix_show_help_yyleng - 1] == '\n'); \
+	YY_USER_ACTION
+
+/** The main scanner function which does all the work.
+ */
+YY_DECL
+{
+	register yy_state_type yy_current_state;
+	register char *yy_cp, *yy_bp;
+	register int yy_act;
+    
+#line 60 "util/show_help_lex.l"
+
+
+#line 737 "util/show_help_lex.c"
+
+	if ( !(yy_init) )
+		{
+		(yy_init) = 1;
+
+#ifdef YY_USER_INIT
+		YY_USER_INIT;
+#endif
+
+        /* Create the reject buffer large enough to save one state per allowed character. */
+        if ( ! (yy_state_buf) )
+            (yy_state_buf) = (yy_state_type *)pmix_show_help_yyalloc(YY_STATE_BUF_SIZE  );
+            if ( ! (yy_state_buf) )
+                YY_FATAL_ERROR( "out of dynamic memory in pmix_show_help_yylex()" );
+
+		if ( ! (yy_start) )
+			(yy_start) = 1;	/* first start state */
+
+		if ( ! pmix_show_help_yyin )
+			pmix_show_help_yyin = stdin;
+
+		if ( ! pmix_show_help_yyout )
+			pmix_show_help_yyout = stdout;
+
+		if ( ! YY_CURRENT_BUFFER ) {
+			pmix_show_help_yyensure_buffer_stack ();
+			YY_CURRENT_BUFFER_LVALUE =
+				pmix_show_help_yy_create_buffer(pmix_show_help_yyin,YY_BUF_SIZE );
+		}
+
+		pmix_show_help_yy_load_buffer_state( );
+		}
+
+	while ( 1 )		/* loops until end-of-file is reached */
+		{
+		yy_cp = (yy_c_buf_p);
+
+		/* Support of pmix_show_help_yytext. */
+		*yy_cp = (yy_hold_char);
+
+		/* yy_bp points to the position in yy_ch_buf of the start of
+		 * the current run.
+		 */
+		yy_bp = yy_cp;
+
+		yy_current_state = (yy_start);
+		yy_current_state += YY_AT_BOL();
+
+		(yy_state_ptr) = (yy_state_buf);
+		*(yy_state_ptr)++ = yy_current_state;
+
+yy_match:
+		do
+			{
+			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
+			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+				{
+				yy_current_state = (int) yy_def[yy_current_state];
+				if ( yy_current_state >= 23 )
+					yy_c = yy_meta[(unsigned int) yy_c];
+				}
+			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+			*(yy_state_ptr)++ = yy_current_state;
+			++yy_cp;
+			}
+		while ( yy_base[yy_current_state] != 31 );
+
+yy_find_action:
+		yy_current_state = *--(yy_state_ptr);
+		(yy_lp) = yy_accept[yy_current_state];
+find_rule: /* we branch to this label when backing up */
+		for ( ; ; ) /* until we find what rule we matched */
+			{
+			if ( (yy_lp) && (yy_lp) < yy_accept[yy_current_state + 1] )
+				{
+				yy_act = yy_acclist[(yy_lp)];
+				if ( yy_act & YY_TRAILING_HEAD_MASK ||
+				     (yy_looking_for_trail_begin) )
+					{
+					if ( yy_act == (yy_looking_for_trail_begin) )
+						{
+						(yy_looking_for_trail_begin) = 0;
+						yy_act &= ~YY_TRAILING_HEAD_MASK;
+						break;
+						}
+					}
+				else if ( yy_act & YY_TRAILING_MASK )
+					{
+					(yy_looking_for_trail_begin) = yy_act & ~YY_TRAILING_MASK;
+					(yy_looking_for_trail_begin) |= YY_TRAILING_HEAD_MASK;
+					}
+				else
+					{
+					(yy_full_match) = yy_cp;
+					(yy_full_state) = (yy_state_ptr);
+					(yy_full_lp) = (yy_lp);
+					break;
+					}
+				++(yy_lp);
+				goto find_rule;
+				}
+			--yy_cp;
+			yy_current_state = *--(yy_state_ptr);
+			(yy_lp) = yy_accept[yy_current_state];
+			}
+
+		YY_DO_BEFORE_ACTION;
+
+do_action:	/* This label is used only to access EOF actions. */
+
+		switch ( yy_act )
+	{ /* beginning of action switch */
+case 1:
+/* rule 1 can match eol */
+YY_RULE_SETUP
+#line 62 "util/show_help_lex.l"
+; /* comment line */
+	YY_BREAK
+case 2:
+/* rule 2 can match eol */
+YY_RULE_SETUP
+#line 64 "util/show_help_lex.l"
+{ BEGIN(CHOMP); return PMIX_SHOW_HELP_PARSE_TOPIC; }
+	YY_BREAK
+case 3:
+/* rule 3 can match eol */
+YY_RULE_SETUP
+#line 66 "util/show_help_lex.l"
+{ BEGIN(INITIAL); }
+	YY_BREAK
+case 4:
+/* rule 4 can match eol */
+*yy_cp = (yy_hold_char); /* undo effects of setting up pmix_show_help_yytext */
+(yy_c_buf_p) = yy_cp -= 1;
+YY_DO_BEFORE_ACTION; /* set up pmix_show_help_yytext again */
+YY_RULE_SETUP
+#line 68 "util/show_help_lex.l"
+{ BEGIN(CHOMP); return PMIX_SHOW_HELP_PARSE_MESSAGE; }
+	YY_BREAK
+case 5:
+YY_RULE_SETUP
+#line 70 "util/show_help_lex.l"
+ECHO;
+	YY_BREAK
+#line 882 "util/show_help_lex.c"
+			case YY_STATE_EOF(INITIAL):
+			case YY_STATE_EOF(CHOMP):
+				yyterminate();
+
+	case YY_END_OF_BUFFER:
+		{
+		/* Amount of text matched not including the EOB char. */
+		int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) - 1;
+
+		/* Undo the effects of YY_DO_BEFORE_ACTION. */
+		*yy_cp = (yy_hold_char);
+		YY_RESTORE_YY_MORE_OFFSET
+
+		if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW )
+			{
+			/* We're scanning a new file or input source.  It's
+			 * possible that this happened because the user
+			 * just pointed pmix_show_help_yyin at a new source and called
+			 * pmix_show_help_yylex().  If so, then we have to assure
+			 * consistency between YY_CURRENT_BUFFER and our
+			 * globals.  Here is the right place to do so, because
+			 * this is the first action (other than possibly a
+			 * back-up) that will match for the new input source.
+			 */
+			(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+			YY_CURRENT_BUFFER_LVALUE->yy_input_file = pmix_show_help_yyin;
+			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
+			}
+
+		/* Note that here we test for yy_c_buf_p "<=" to the position
+		 * of the first EOB in the buffer, since yy_c_buf_p will
+		 * already have been incremented past the NUL character
+		 * (since all states make transitions on EOB to the
+		 * end-of-buffer state).  Contrast this with the test
+		 * in input().
+		 */
+		if ( (yy_c_buf_p) <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
+			{ /* This was really a NUL. */
+			yy_state_type yy_next_state;
+
+			(yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text;
+
+			yy_current_state = yy_get_previous_state(  );
+
+			/* Okay, we're now positioned to make the NUL
+			 * transition.  We couldn't have
+			 * yy_get_previous_state() go ahead and do it
+			 * for us because it doesn't know how to deal
+			 * with the possibility of jamming (and we don't
+			 * want to build jamming into it because then it
+			 * will run more slowly).
+			 */
+
+			yy_next_state = yy_try_NUL_trans( yy_current_state );
+
+			yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+
+			if ( yy_next_state )
+				{
+				/* Consume the NUL. */
+				yy_cp = ++(yy_c_buf_p);
+				yy_current_state = yy_next_state;
+				goto yy_match;
+				}
+
+			else
+				{
+				yy_cp = (yy_c_buf_p);
+				goto yy_find_action;
+				}
+			}
+
+		else switch ( yy_get_next_buffer(  ) )
+			{
+			case EOB_ACT_END_OF_FILE:
+				{
+				(yy_did_buffer_switch_on_eof) = 0;
+
+				if ( pmix_show_help_yywrap( ) )
+					{
+					/* Note: because we've taken care in
+					 * yy_get_next_buffer() to have set up
+					 * pmix_show_help_yytext, we can now set up
+					 * yy_c_buf_p so that if some total
+					 * hoser (like flex itself) wants to
+					 * call the scanner after we return the
+					 * YY_NULL, it'll still work - another
+					 * YY_NULL will get returned.
+					 */
+					(yy_c_buf_p) = (yytext_ptr) + YY_MORE_ADJ;
+
+					yy_act = YY_STATE_EOF(YY_START);
+					goto do_action;
+					}
+
+				else
+					{
+					if ( ! (yy_did_buffer_switch_on_eof) )
+						YY_NEW_FILE;
+					}
+				break;
+				}
+
+			case EOB_ACT_CONTINUE_SCAN:
+				(yy_c_buf_p) =
+					(yytext_ptr) + yy_amount_of_matched_text;
+
+				yy_current_state = yy_get_previous_state(  );
+
+				yy_cp = (yy_c_buf_p);
+				yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+				goto yy_match;
+
+			case EOB_ACT_LAST_MATCH:
+				(yy_c_buf_p) =
+				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)];
+
+				yy_current_state = yy_get_previous_state(  );
+
+				yy_cp = (yy_c_buf_p);
+				yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+				goto yy_find_action;
+			}
+		break;
+		}
+
+	default:
+		YY_FATAL_ERROR(
+			"fatal flex scanner internal error--no action found" );
+	} /* end of action switch */
+		} /* end of scanning one token */
+} /* end of pmix_show_help_yylex */
+
+/* yy_get_next_buffer - try to read in a new buffer
+ *
+ * Returns a code representing an action:
+ *	EOB_ACT_LAST_MATCH -
+ *	EOB_ACT_CONTINUE_SCAN - continue scanning from current position
+ *	EOB_ACT_END_OF_FILE - end of file
+ */
+static int yy_get_next_buffer (void)
+{
+    	register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
+	register char *source = (yytext_ptr);
+	register int number_to_move, i;
+	int ret_val;
+
+	if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
+		YY_FATAL_ERROR(
+		"fatal flex scanner internal error--end of buffer missed" );
+
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 )
+		{ /* Don't try to fill the buffer, so this is an EOF. */
+		if ( (yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1 )
+			{
+			/* We matched a single character, the EOB, so
+			 * treat this as a final EOF.
+			 */
+			return EOB_ACT_END_OF_FILE;
+			}
+
+		else
+			{
+			/* We matched some text prior to the EOB, first
+			 * process it.
+			 */
+			return EOB_ACT_LAST_MATCH;
+			}
+		}
+
+	/* Try to read more data. */
+
+	/* First move last chars to start of buffer. */
+	number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1;
+
+	for ( i = 0; i < number_to_move; ++i )
+		*(dest++) = *(source++);
+
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING )
+		/* don't do the read, it's not guaranteed to return an EOF,
+		 * just force an EOF
+		 */
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0;
+
+	else
+		{
+			yy_size_t num_to_read =
+			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
+
+		while ( num_to_read <= 0 )
+			{ /* Not enough room in the buffer - grow it. */
+
+			YY_FATAL_ERROR(
+"input buffer overflow, can't enlarge buffer because scanner uses REJECT" );
+
+			}
+
+		if ( num_to_read > YY_READ_BUF_SIZE )
+			num_to_read = YY_READ_BUF_SIZE;
+
+		/* Read in more data. */
+		YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
+			(yy_n_chars), num_to_read );
+
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+		}
+
+	if ( (yy_n_chars) == 0 )
+		{
+		if ( number_to_move == YY_MORE_ADJ )
+			{
+			ret_val = EOB_ACT_END_OF_FILE;
+			pmix_show_help_yyrestart(pmix_show_help_yyin  );
+			}
+
+		else
+			{
+			ret_val = EOB_ACT_LAST_MATCH;
+			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status =
+				YY_BUFFER_EOF_PENDING;
+			}
+		}
+
+	else
+		ret_val = EOB_ACT_CONTINUE_SCAN;
+
+	if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
+		/* Extend the array by 50%, plus the number we really need. */
+		yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
+		YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) pmix_show_help_yyrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size  );
+		if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
+			YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
+	}
+
+	(yy_n_chars) += number_to_move;
+	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR;
+	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR;
+
+	(yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0];
+
+	return ret_val;
+}
+
+/* yy_get_previous_state - get the state just before the EOB char was reached */
+
+    static yy_state_type yy_get_previous_state (void)
+{
+	register yy_state_type yy_current_state;
+	register char *yy_cp;
+    
+	yy_current_state = (yy_start);
+	yy_current_state += YY_AT_BOL();
+
+	(yy_state_ptr) = (yy_state_buf);
+	*(yy_state_ptr)++ = yy_current_state;
+
+	for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
+		{
+		register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
+		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+			{
+			yy_current_state = (int) yy_def[yy_current_state];
+			if ( yy_current_state >= 23 )
+				yy_c = yy_meta[(unsigned int) yy_c];
+			}
+		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+		*(yy_state_ptr)++ = yy_current_state;
+		}
+
+	return yy_current_state;
+}
+
+/* yy_try_NUL_trans - try to make a transition on the NUL character
+ *
+ * synopsis
+ *	next_state = yy_try_NUL_trans( current_state );
+ */
+    static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state )
+{
+	register int yy_is_jam;
+    
+	register YY_CHAR yy_c = 1;
+	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+		{
+		yy_current_state = (int) yy_def[yy_current_state];
+		if ( yy_current_state >= 23 )
+			yy_c = yy_meta[(unsigned int) yy_c];
+		}
+	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+	yy_is_jam = (yy_current_state == 22);
+	if ( ! yy_is_jam )
+		*(yy_state_ptr)++ = yy_current_state;
+
+		return yy_is_jam ? 0 : yy_current_state;
+}
+
+#ifndef YY_NO_INPUT
+#ifdef __cplusplus
+    static int yyinput (void)
+#else
+    static int input  (void)
+#endif
+
+{
+	int c;
+    
+	*(yy_c_buf_p) = (yy_hold_char);
+
+	if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
+		{
+		/* yy_c_buf_p now points to the character we want to return.
+		 * If this occurs *before* the EOB characters, then it's a
+		 * valid NUL; if not, then we've hit the end of the buffer.
+		 */
+		if ( (yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
+			/* This was really a NUL. */
+			*(yy_c_buf_p) = '\0';
+
+		else
+			{ /* need more input */
+			yy_size_t offset = (yy_c_buf_p) - (yytext_ptr);
+			++(yy_c_buf_p);
+
+			switch ( yy_get_next_buffer(  ) )
+				{
+				case EOB_ACT_LAST_MATCH:
+					/* This happens because yy_g_n_b()
+					 * sees that we've accumulated a
+					 * token and flags that we need to
+					 * try matching the token before
+					 * proceeding.  But for input(),
+					 * there's no matching to consider.
+					 * So convert the EOB_ACT_LAST_MATCH
+					 * to EOB_ACT_END_OF_FILE.
+					 */
+
+					/* Reset buffer status. */
+					pmix_show_help_yyrestart(pmix_show_help_yyin );
+
+					/*FALLTHROUGH*/
+
+				case EOB_ACT_END_OF_FILE:
+					{
+					if ( pmix_show_help_yywrap( ) )
+						return EOF;
+
+					if ( ! (yy_did_buffer_switch_on_eof) )
+						YY_NEW_FILE;
+#ifdef __cplusplus
+					return yyinput();
+#else
+					return input();
+#endif
+					}
+
+				case EOB_ACT_CONTINUE_SCAN:
+					(yy_c_buf_p) = (yytext_ptr) + offset;
+					break;
+				}
+			}
+		}
+
+	c = *(unsigned char *) (yy_c_buf_p);	/* cast for 8-bit char's */
+	*(yy_c_buf_p) = '\0';	/* preserve pmix_show_help_yytext */
+	(yy_hold_char) = *++(yy_c_buf_p);
+
+	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = (c == '\n');
+
+	return c;
+}
+#endif	/* ifndef YY_NO_INPUT */
+
+/** Immediately switch to a different input stream.
+ * @param input_file A readable stream.
+ * 
+ * @note This function does not reset the start condition to @c INITIAL .
+ */
+    void pmix_show_help_yyrestart  (FILE * input_file )
+{
+    
+	if ( ! YY_CURRENT_BUFFER ){
+        pmix_show_help_yyensure_buffer_stack ();
+		YY_CURRENT_BUFFER_LVALUE =
+            pmix_show_help_yy_create_buffer(pmix_show_help_yyin,YY_BUF_SIZE );
+	}
+
+	pmix_show_help_yy_init_buffer(YY_CURRENT_BUFFER,input_file );
+	pmix_show_help_yy_load_buffer_state( );
+}
+
+/** Switch to a different input buffer.
+ * @param new_buffer The new input buffer.
+ * 
+ */
+    void pmix_show_help_yy_switch_to_buffer  (YY_BUFFER_STATE  new_buffer )
+{
+    
+	/* TODO. We should be able to replace this entire function body
+	 * with
+	 *		pmix_show_help_yypop_buffer_state();
+	 *		pmix_show_help_yypush_buffer_state(new_buffer);
+     */
+	pmix_show_help_yyensure_buffer_stack ();
+	if ( YY_CURRENT_BUFFER == new_buffer )
+		return;
+
+	if ( YY_CURRENT_BUFFER )
+		{
+		/* Flush out information for old buffer. */
+		*(yy_c_buf_p) = (yy_hold_char);
+		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+		}
+
+	YY_CURRENT_BUFFER_LVALUE = new_buffer;
+	pmix_show_help_yy_load_buffer_state( );
+
+	/* We don't actually know whether we did this switch during
+	 * EOF (pmix_show_help_yywrap()) processing, but the only time this flag
+	 * is looked at is after pmix_show_help_yywrap() is called, so it's safe
+	 * to go ahead and always set it.
+	 */
+	(yy_did_buffer_switch_on_eof) = 1;
+}
+
+static void pmix_show_help_yy_load_buffer_state  (void)
+{
+    	(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+	(yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
+	pmix_show_help_yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
+	(yy_hold_char) = *(yy_c_buf_p);
+}
+
+/** Allocate and initialize an input buffer state.
+ * @param file A readable stream.
+ * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.
+ * 
+ * @return the allocated buffer state.
+ */
+    YY_BUFFER_STATE pmix_show_help_yy_create_buffer  (FILE * file, int  size )
+{
+	YY_BUFFER_STATE b;
+    
+	b = (YY_BUFFER_STATE) pmix_show_help_yyalloc(sizeof( struct yy_buffer_state )  );
+	if ( ! b )
+		YY_FATAL_ERROR( "out of dynamic memory in pmix_show_help_yy_create_buffer()" );
+
+	b->yy_buf_size = size;
+
+	/* yy_ch_buf has to be 2 characters longer than the size given because
+	 * we need to put in 2 end-of-buffer characters.
+	 */
+	b->yy_ch_buf = (char *) pmix_show_help_yyalloc(b->yy_buf_size + 2  );
+	if ( ! b->yy_ch_buf )
+		YY_FATAL_ERROR( "out of dynamic memory in pmix_show_help_yy_create_buffer()" );
+
+	b->yy_is_our_buffer = 1;
+
+	pmix_show_help_yy_init_buffer(b,file );
+
+	return b;
+}
+
+/** Destroy the buffer.
+ * @param b a buffer created with pmix_show_help_yy_create_buffer()
+ * 
+ */
+    void pmix_show_help_yy_delete_buffer (YY_BUFFER_STATE  b )
+{
+    
+	if ( ! b )
+		return;
+
+	if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */
+		YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
+
+	if ( b->yy_is_our_buffer )
+		pmix_show_help_yyfree((void *) b->yy_ch_buf  );
+
+	pmix_show_help_yyfree((void *) b  );
+}
+
+/* Initializes or reinitializes a buffer.
+ * This function is sometimes called more than once on the same buffer,
+ * such as during a pmix_show_help_yyrestart() or at EOF.
+ */
+    static void pmix_show_help_yy_init_buffer  (YY_BUFFER_STATE  b, FILE * file )
+
+{
+	int oerrno = errno;
+    
+	pmix_show_help_yy_flush_buffer(b );
+
+	b->yy_input_file = file;
+	b->yy_fill_buffer = 1;
+
+    /* If b is the current buffer, then pmix_show_help_yy_init_buffer was _probably_
+     * called from pmix_show_help_yyrestart() or through yy_get_next_buffer.
+     * In that case, we don't want to reset the lineno or column.
+     */
+    if (b != YY_CURRENT_BUFFER){
+        b->yy_bs_lineno = 1;
+        b->yy_bs_column = 0;
+    }
+
+        b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
+    
+	errno = oerrno;
+}
+
+/** Discard all buffered characters. On the next scan, YY_INPUT will be called.
+ * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
+ * 
+ */
+    void pmix_show_help_yy_flush_buffer (YY_BUFFER_STATE  b )
+{
+    	if ( ! b )
+		return;
+
+	b->yy_n_chars = 0;
+
+	/* We always need two end-of-buffer characters.  The first causes
+	 * a transition to the end-of-buffer state.  The second causes
+	 * a jam in that state.
+	 */
+	b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR;
+	b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR;
+
+	b->yy_buf_pos = &b->yy_ch_buf[0];
+
+	b->yy_at_bol = 1;
+	b->yy_buffer_status = YY_BUFFER_NEW;
+
+	if ( b == YY_CURRENT_BUFFER )
+		pmix_show_help_yy_load_buffer_state( );
+}
+
+/** Pushes the new state onto the stack. The new state becomes
+ *  the current state. This function will allocate the stack
+ *  if necessary.
+ *  @param new_buffer The new state.
+ *  
+ */
+void pmix_show_help_yypush_buffer_state (YY_BUFFER_STATE new_buffer )
+{
+    	if (new_buffer == NULL)
+		return;
+
+	pmix_show_help_yyensure_buffer_stack();
+
+	/* This block is copied from pmix_show_help_yy_switch_to_buffer. */
+	if ( YY_CURRENT_BUFFER )
+		{
+		/* Flush out information for old buffer. */
+		*(yy_c_buf_p) = (yy_hold_char);
+		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+		}
+
+	/* Only push if top exists. Otherwise, replace top. */
+	if (YY_CURRENT_BUFFER)
+		(yy_buffer_stack_top)++;
+	YY_CURRENT_BUFFER_LVALUE = new_buffer;
+
+	/* copied from pmix_show_help_yy_switch_to_buffer. */
+	pmix_show_help_yy_load_buffer_state( );
+	(yy_did_buffer_switch_on_eof) = 1;
+}
+
+/** Removes and deletes the top of the stack, if present.
+ *  The next element becomes the new top.
+ *  
+ */
+void pmix_show_help_yypop_buffer_state (void)
+{
+    	if (!YY_CURRENT_BUFFER)
+		return;
+
+	pmix_show_help_yy_delete_buffer(YY_CURRENT_BUFFER );
+	YY_CURRENT_BUFFER_LVALUE = NULL;
+	if ((yy_buffer_stack_top) > 0)
+		--(yy_buffer_stack_top);
+
+	if (YY_CURRENT_BUFFER) {
+		pmix_show_help_yy_load_buffer_state( );
+		(yy_did_buffer_switch_on_eof) = 1;
+	}
+}
+
+/* Allocates the stack if it does not exist.
+ *  Guarantees space for at least one push.
+ */
+static void pmix_show_help_yyensure_buffer_stack (void)
+{
+	yy_size_t num_to_alloc;
+    
+	if (!(yy_buffer_stack)) {
+
+		/* First allocation is just for 2 elements, since we don't know if this
+		 * scanner will even need a stack. We use 2 instead of 1 to avoid an
+		 * immediate realloc on the next call.
+         */
+		num_to_alloc = 1;
+		(yy_buffer_stack) = (struct yy_buffer_state**)pmix_show_help_yyalloc
+								(num_to_alloc * sizeof(struct yy_buffer_state*)
+								);
+		if ( ! (yy_buffer_stack) )
+			YY_FATAL_ERROR( "out of dynamic memory in pmix_show_help_yyensure_buffer_stack()" );
+								  
+		memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
+				
+		(yy_buffer_stack_max) = num_to_alloc;
+		(yy_buffer_stack_top) = 0;
+		return;
+	}
+
+	if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){
+
+		/* Increase the buffer to prepare for a possible push. */
+		int grow_size = 8 /* arbitrary grow size */;
+
+		num_to_alloc = (yy_buffer_stack_max) + grow_size;
+		(yy_buffer_stack) = (struct yy_buffer_state**)pmix_show_help_yyrealloc
+								((yy_buffer_stack),
+								num_to_alloc * sizeof(struct yy_buffer_state*)
+								);
+		if ( ! (yy_buffer_stack) )
+			YY_FATAL_ERROR( "out of dynamic memory in pmix_show_help_yyensure_buffer_stack()" );
+
+		/* zero only the new slots.*/
+		memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*));
+		(yy_buffer_stack_max) = num_to_alloc;
+	}
+}
+
+/** Setup the input buffer state to scan directly from a user-specified character buffer.
+ * @param base the character buffer
+ * @param size the size in bytes of the character buffer
+ * 
+ * @return the newly allocated buffer state object. 
+ */
+YY_BUFFER_STATE pmix_show_help_yy_scan_buffer  (char * base, yy_size_t  size )
+{
+	YY_BUFFER_STATE b;
+    
+	if ( size < 2 ||
+	     base[size-2] != YY_END_OF_BUFFER_CHAR ||
+	     base[size-1] != YY_END_OF_BUFFER_CHAR )
+		/* They forgot to leave room for the EOB's. */
+		return 0;
+
+	b = (YY_BUFFER_STATE) pmix_show_help_yyalloc(sizeof( struct yy_buffer_state )  );
+	if ( ! b )
+		YY_FATAL_ERROR( "out of dynamic memory in pmix_show_help_yy_scan_buffer()" );
+
+	b->yy_buf_size = size - 2;	/* "- 2" to take care of EOB's */
+	b->yy_buf_pos = b->yy_ch_buf = base;
+	b->yy_is_our_buffer = 0;
+	b->yy_input_file = 0;
+	b->yy_n_chars = b->yy_buf_size;
+	b->yy_is_interactive = 0;
+	b->yy_at_bol = 1;
+	b->yy_fill_buffer = 0;
+	b->yy_buffer_status = YY_BUFFER_NEW;
+
+	pmix_show_help_yy_switch_to_buffer(b  );
+
+	return b;
+}
+
+/** Setup the input buffer state to scan a string. The next call to pmix_show_help_yylex() will
+ * scan from a @e copy of @a str.
+ * @param yystr a NUL-terminated string to scan
+ * 
+ * @return the newly allocated buffer state object.
+ * @note If you want to scan bytes that may contain NUL values, then use
+ *       pmix_show_help_yy_scan_bytes() instead.
+ */
+YY_BUFFER_STATE pmix_show_help_yy_scan_string (yyconst char * yystr )
+{
+    
+	return pmix_show_help_yy_scan_bytes(yystr,strlen(yystr) );
+}
+
+/** Setup the input buffer state to scan the given bytes. The next call to pmix_show_help_yylex() will
+ * scan from a @e copy of @a bytes.
+ * @param yybytes the byte buffer to scan
+ * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
+ * 
+ * @return the newly allocated buffer state object.
+ */
+YY_BUFFER_STATE pmix_show_help_yy_scan_bytes  (yyconst char * yybytes, yy_size_t  _yybytes_len )
+{
+	YY_BUFFER_STATE b;
+	char *buf;
+	yy_size_t n;
+	int i;
+    
+	/* Get memory for full buffer, including space for trailing EOB's. */
+	n = _yybytes_len + 2;
+	buf = (char *) pmix_show_help_yyalloc(n  );
+	if ( ! buf )
+		YY_FATAL_ERROR( "out of dynamic memory in pmix_show_help_yy_scan_bytes()" );
+
+	for ( i = 0; i < _yybytes_len; ++i )
+		buf[i] = yybytes[i];
+
+	buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;
+
+	b = pmix_show_help_yy_scan_buffer(buf,n );
+	if ( ! b )
+		YY_FATAL_ERROR( "bad buffer in pmix_show_help_yy_scan_bytes()" );
+
+	/* It's okay to grow etc. this buffer, and we should throw it
+	 * away when we're done.
+	 */
+	b->yy_is_our_buffer = 1;
+
+	return b;
+}
+
+#ifndef YY_EXIT_FAILURE
+#define YY_EXIT_FAILURE 2
+#endif
+
+static void yy_fatal_error (yyconst char* msg )
+{
+    	(void) fprintf( stderr, "%s\n", msg );
+	exit( YY_EXIT_FAILURE );
+}
+
+/* Redefine yyless() so it works in section 3 code. */
+
+#undef yyless
+#define yyless(n) \
+	do \
+		{ \
+		/* Undo effects of setting up pmix_show_help_yytext. */ \
+        int yyless_macro_arg = (n); \
+        YY_LESS_LINENO(yyless_macro_arg);\
+		pmix_show_help_yytext[pmix_show_help_yyleng] = (yy_hold_char); \
+		(yy_c_buf_p) = pmix_show_help_yytext + yyless_macro_arg; \
+		(yy_hold_char) = *(yy_c_buf_p); \
+		*(yy_c_buf_p) = '\0'; \
+		pmix_show_help_yyleng = yyless_macro_arg; \
+		} \
+	while ( 0 )
+
+/* Accessor  methods (get/set functions) to struct members. */
+
+/** Get the current line number.
+ * 
+ */
+int pmix_show_help_yyget_lineno  (void)
+{
+        
+    return pmix_show_help_yylineno;
+}
+
+/** Get the input stream.
+ * 
+ */
+FILE *pmix_show_help_yyget_in  (void)
+{
+        return pmix_show_help_yyin;
+}
+
+/** Get the output stream.
+ * 
+ */
+FILE *pmix_show_help_yyget_out  (void)
+{
+        return pmix_show_help_yyout;
+}
+
+/** Get the length of the current token.
+ * 
+ */
+yy_size_t pmix_show_help_yyget_leng  (void)
+{
+        return pmix_show_help_yyleng;
+}
+
+/** Get the current token.
+ * 
+ */
+
+char *pmix_show_help_yyget_text  (void)
+{
+        return pmix_show_help_yytext;
+}
+
+/** Set the current line number.
+ * @param line_number
+ * 
+ */
+void pmix_show_help_yyset_lineno (int  line_number )
+{
+    
+    pmix_show_help_yylineno = line_number;
+}
+
+/** Set the input stream. This does not discard the current
+ * input buffer.
+ * @param in_str A readable stream.
+ * 
+ * @see pmix_show_help_yy_switch_to_buffer
+ */
+void pmix_show_help_yyset_in (FILE *  in_str )
+{
+        pmix_show_help_yyin = in_str ;
+}
+
+void pmix_show_help_yyset_out (FILE *  out_str )
+{
+        pmix_show_help_yyout = out_str ;
+}
+
+int pmix_show_help_yyget_debug  (void)
+{
+        return pmix_show_help_yy_flex_debug;
+}
+
+void pmix_show_help_yyset_debug (int  bdebug )
+{
+        pmix_show_help_yy_flex_debug = bdebug ;
+}
+
+static int yy_init_globals (void)
+{
+        /* Initialization is the same as for the non-reentrant scanner.
+     * This function is called from pmix_show_help_yylex_destroy(), so don't allocate here.
+     */
+
+    (yy_buffer_stack) = 0;
+    (yy_buffer_stack_top) = 0;
+    (yy_buffer_stack_max) = 0;
+    (yy_c_buf_p) = (char *) 0;
+    (yy_init) = 0;
+    (yy_start) = 0;
+
+    (yy_state_buf) = 0;
+    (yy_state_ptr) = 0;
+    (yy_full_match) = 0;
+    (yy_lp) = 0;
+
+/* Defined in main.c */
+#ifdef YY_STDINIT
+    pmix_show_help_yyin = stdin;
+    pmix_show_help_yyout = stdout;
+#else
+    pmix_show_help_yyin = (FILE *) 0;
+    pmix_show_help_yyout = (FILE *) 0;
+#endif
+
+    /* For future reference: Set errno on error, since we are called by
+     * pmix_show_help_yylex_init()
+     */
+    return 0;
+}
+
+/* pmix_show_help_yylex_destroy is for both reentrant and non-reentrant scanners. */
+int pmix_show_help_yylex_destroy  (void)
+{
+    
+    /* Pop the buffer stack, destroying each element. */
+	while(YY_CURRENT_BUFFER){
+		pmix_show_help_yy_delete_buffer(YY_CURRENT_BUFFER  );
+		YY_CURRENT_BUFFER_LVALUE = NULL;
+		pmix_show_help_yypop_buffer_state();
+	}
+
+	/* Destroy the stack itself. */
+	pmix_show_help_yyfree((yy_buffer_stack) );
+	(yy_buffer_stack) = NULL;
+
+    pmix_show_help_yyfree ( (yy_state_buf) );
+    (yy_state_buf)  = NULL;
+
+    /* Reset the globals. This is important in a non-reentrant scanner so the next time
+     * pmix_show_help_yylex() is called, initialization will occur. */
+    yy_init_globals( );
+
+    return 0;
+}
+
+/*
+ * Internal utility routines.
+ */
+
+#ifndef yytext_ptr
+static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
+{
+	register int i;
+	for ( i = 0; i < n; ++i )
+		s1[i] = s2[i];
+}
+#endif
+
+#ifdef YY_NEED_STRLEN
+static int yy_flex_strlen (yyconst char * s )
+{
+	register int n;
+	for ( n = 0; s[n]; ++n )
+		;
+
+	return n;
+}
+#endif
+
+void *pmix_show_help_yyalloc (yy_size_t  size )
+{
+	return (void *) malloc( size );
+}
+
+void *pmix_show_help_yyrealloc  (void * ptr, yy_size_t  size )
+{
+	/* The cast to (char *) in the following accommodates both
+	 * implementations that use char* generic pointers, and those
+	 * that use void* generic pointers.  It works with the latter
+	 * because both ANSI C and C++ allow castless assignment from
+	 * any pointer type to void*, and deal with argument conversions
+	 * as though doing an assignment.
+	 */
+	return (void *) realloc( (char *) ptr, size );
+}
+
+void pmix_show_help_yyfree (void * ptr )
+{
+	free( (char *) ptr );	/* see pmix_show_help_yyrealloc() for (char *) cast */
+}
+
+#define YYTABLES_NAME "yytables"
+
+#line 70 "util/show_help_lex.l"
+
+
+
+/* Old flex (2.5.4a? and older) does not define a destroy function */
+#if !defined(YY_FLEX_SUBMINOR_VERSION)
+#define YY_FLEX_SUBMINOR_VERSION 0
+#endif
+
+#if (YY_FLEX_MAJOR_VERSION < 2) || (YY_FLEX_MAJOR_VERSION == 2 && (YY_FLEX_MINOR_VERSION < 5 || (YY_FLEX_MINOR_VERSION == 5 && YY_FLEX_SUBMINOR_VERSION < 5)))
+int pmix_show_help_yylex_destroy(void)
+{
+    if (NULL != YY_CURRENT_BUFFER) {
+        pmix_show_help_yy_delete_buffer(YY_CURRENT_BUFFER);
+#if defined(YY_CURRENT_BUFFER_LVALUE)
+        YY_CURRENT_BUFFER_LVALUE = NULL;
+#else
+        YY_CURRENT_BUFFER = NULL;
+#endif  /* YY_CURRENT_BUFFER_LVALUE */
+    }
+    return YY_NULL;
+}
+#endif
+
+static int pmix_show_help_yywrap(void)
+{
+    pmix_show_help_parse_done = true;
+    return 1;
+}
+
+
+/*
+ * Ensure that we have a valid yybuffer to use.  Specifically, if this
+ * scanner is invoked a second time, finish_parsing() (above) will
+ * have been executed, and the current buffer will have been freed.
+ * Flex doesn't recognize this fact because as far as it's concerned,
+ * its internal state was already initialized, so it thinks it should
+ * have a valid buffer.  Hence, here we ensure to give it a valid
+ * buffer.
+ */
+int pmix_show_help_init_buffer(FILE *file)
+{
+    YY_BUFFER_STATE buf = pmix_show_help_yy_create_buffer(file,YY_BUF_SIZE);
+    pmix_show_help_yy_switch_to_buffer(buf);
+
+    return 0;
+}
+
diff --git a/src/util/show_help_lex.h b/src/util/show_help_lex.h
new file mode 100644
index 0000000..a507e4d
--- /dev/null
+++ b/src/util/show_help_lex.h
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2005 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2006      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2016      Intel, Inc. All rights reserved
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#ifndef PMIX_SHOW_HELP_LEX_H
+#define PMIX_SHOW_HELP_LEX_H
+
+#include <src/include/pmix_config.h>
+
+#ifdef malloc
+#undef malloc
+#endif
+#ifdef realloc
+#undef realloc
+#endif
+#ifdef free
+#undef free
+#endif
+
+#include <stdio.h>
+BEGIN_C_DECLS
+int pmix_show_help_yylex(void);
+int pmix_show_help_init_buffer(FILE *file);
+int pmix_show_help_yylex_destroy(void);
+
+extern FILE *pmix_show_help_yyin;
+extern bool pmix_show_help_parse_done;
+extern char *pmix_show_help_yytext;
+extern int pmix_show_help_yynewlines;
+
+/*
+ * Make lex-generated files not issue compiler warnings
+ */
+#define YY_STACK_USED 0
+#define YY_ALWAYS_INTERACTIVE 0
+#define YY_NEVER_INTERACTIVE 0
+#define YY_MAIN 0
+#define YY_NO_UNPUT 1
+#define YY_SKIP_YYWRAP 1
+
+enum {
+    PMIX_SHOW_HELP_PARSE_DONE,
+    PMIX_SHOW_HELP_PARSE_ERROR,
+
+    PMIX_SHOW_HELP_PARSE_TOPIC,
+    PMIX_SHOW_HELP_PARSE_MESSAGE,
+
+    PMIX_SHOW_HELP_PARSE_MAX
+};
+END_C_DECLS
+#endif
diff --git a/src/util/show_help_lex.l b/src/util/show_help_lex.l
new file mode 100644
index 0000000..d48130f
--- /dev/null
+++ b/src/util/show_help_lex.l
@@ -0,0 +1,114 @@
+%option nounput
+%option noinput
+
+%{ /* -*- C -*- */
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2006 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2016      Intel, Inc. All rights reserved
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+
+#include <stdio.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#include "src/util/show_help_lex.h"
+
+BEGIN_C_DECLS
+
+/*
+ * public functions
+ */
+extern int pmix_show_help_finish_parsing(void);
+
+/*
+ * local functions
+ */
+static int pmix_show_help_yywrap(void);
+
+END_C_DECLS
+
+/*
+ * global variables
+ */
+int pmix_show_help_yynewlines = 1;
+bool pmix_show_help_parse_done = false;
+
+%}
+
+WHITE       [\f\t\v ]
+CHAR        [A-Za-z0-9_\-\.]
+
+%x CHOMP
+
+%%
+
+#.*\n               ; /* comment line */
+
+^\[.+\]/[^\]\n]*\n { BEGIN(CHOMP); return PMIX_SHOW_HELP_PARSE_TOPIC; }
+
+<CHOMP>.*\n { BEGIN(INITIAL); }
+
+.*/\n { BEGIN(CHOMP); return PMIX_SHOW_HELP_PARSE_MESSAGE; }
+
+%%
+
+/* Old flex (2.5.4a? and older) does not define a destroy function */
+#if !defined(YY_FLEX_SUBMINOR_VERSION)
+#define YY_FLEX_SUBMINOR_VERSION 0
+#endif
+
+#if (YY_FLEX_MAJOR_VERSION < 2) || (YY_FLEX_MAJOR_VERSION == 2 && (YY_FLEX_MINOR_VERSION < 5 || (YY_FLEX_MINOR_VERSION == 5 && YY_FLEX_SUBMINOR_VERSION < 5)))
+int pmix_show_help_yylex_destroy(void)
+{
+    if (NULL != YY_CURRENT_BUFFER) {
+        yy_delete_buffer(YY_CURRENT_BUFFER);
+#if defined(YY_CURRENT_BUFFER_LVALUE)
+        YY_CURRENT_BUFFER_LVALUE = NULL;
+#else
+        YY_CURRENT_BUFFER = NULL;
+#endif  /* YY_CURRENT_BUFFER_LVALUE */
+    }
+    return YY_NULL;
+}
+#endif
+
+static int pmix_show_help_yywrap(void)
+{
+    pmix_show_help_parse_done = true;
+    return 1;
+}
+
+
+/*
+ * Ensure that we have a valid yybuffer to use.  Specifically, if this
+ * scanner is invoked a second time, finish_parsing() (above) will
+ * have been executed, and the current buffer will have been freed.
+ * Flex doesn't recognize this fact because as far as it's concerned,
+ * its internal state was already initialized, so it thinks it should
+ * have a valid buffer.  Hence, here we ensure to give it a valid
+ * buffer.
+ */
+int pmix_show_help_init_buffer(FILE *file)
+{
+    YY_BUFFER_STATE buf = yy_create_buffer(file, YY_BUF_SIZE);
+    yy_switch_to_buffer(buf);
+
+    return 0;
+}
diff --git a/src/util/strnlen.h b/src/util/strnlen.h
new file mode 100644
index 0000000..d09cc1c
--- /dev/null
+++ b/src/util/strnlen.h
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2016      Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+/** @file
+ *
+ * Buffer strnlen function for portability to archaic platforms.
+ */
+
+#ifndef PMIX_STRNLEN_H
+#define PMIX_STRNLEN_H
+
+#include <src/include/pmix_config.h>
+
+#if defined(HAVE_STRNLEN)
+#define PMIX_STRNLEN(c, a, b)       \
+    (c) = strnlen(a, b)
+#else
+#define PMIX_STRNLEN(c, a, b)           \
+    do {                                \
+        size_t _x;                      \
+        (c) = 0;                        \
+        for (_x=0; _x < (b); _x++) {    \
+            if ('\0' == (a)[_x]) {      \
+                break;                  \
+            }                           \
+            ++(c);                      \
+        }                               \
+    } while(0)
+#endif
+
+#endif /* PMIX_STRNLEN_H */
+
diff --git a/src/util/timings.c b/src/util/timings.c
new file mode 100644
index 0000000..10779bb
--- /dev/null
+++ b/src/util/timings.c
@@ -0,0 +1,645 @@
+/*
+ * Copyright (C) 2014      Artem Polyakov <artpol84 at gmail.com>
+ * Copyright (c) 2014-2016 Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+
+#include <pmix_common.h>
+
+#include <stdlib.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <unistd.h>
+
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+
+#include <errno.h>
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_SYS_RESOURCE_H
+#include <sys/resource.h>
+#endif
+
+
+#if PMIX_ENABLE_TIMING
+
+#include "src/class/pmix_pointer_array.h"
+#include "src/class/pmix_list.h"
+#include "src/util/output.h"
+#include "src/util/basename.h"
+
+#include "src/util/timings.h"
+
+#define DELTAS_SANE_LIMIT (10*1024*1024)
+
+struct interval_descr{
+    pmix_timing_event_t *descr_ev, *begin_ev;
+    double interval, overhead;
+};
+
+pmix_timing_event_t *pmix_timing_event_alloc(pmix_timing_t *t);
+void pmix_timing_init(pmix_timing_t *t);
+pmix_timing_prep_t pmix_timing_prep_ev(pmix_timing_t *t, const char *fmt, ...);
+
+static PMIX_CLASS_INSTANCE(pmix_timing_event_t, pmix_list_item_t, NULL, NULL);
+
+
+static char *nodename = NULL;
+static char *jobid = "";
+static double hnp_offs = 0;
+static bool pmix_timing_overhead = false;
+
+void pmix_init_id(char* nspace, int rank)
+{
+    asprintf(&jobid, "%s:%d", nspace, rank);
+}
+
+/* Get current timestamp. Derived from MPI_Wtime */
+
+static double get_ts_gettimeofday(void)
+{
+    double ret;
+    /* Use gettimeofday() if we pmix wasn't initialized */
+    struct timeval tv;
+    gettimeofday(&tv, NULL);
+    ret = tv.tv_sec;
+    ret += (double)tv.tv_usec / 1000000.0;
+    return ret;
+}
+
+static get_ts_t _init_timestamping(void)
+{
+    return get_ts_gettimeofday;
+}
+
+
+pmix_timing_event_t *pmix_timing_event_alloc(pmix_timing_t *t)
+{
+    if( t->buffer_offset >= t->buffer_size ){
+        // notch timings overhead
+        double alloc_begin = t->get_ts();
+
+        t->buffer = malloc(sizeof(pmix_timing_event_t)*t->buffer_size);
+        if( t->buffer == NULL ){
+            return NULL;
+        }
+        memset(t->buffer, 0, sizeof(pmix_timing_event_t)*t->buffer_size);
+
+        double alloc_end = t->get_ts();
+
+        t->buffer_offset = 0;
+        t->buffer[0].fib = 1;
+        t->buffer[0].ts_ovh = alloc_end - alloc_begin;
+    }
+    int tmp = t->buffer_offset;
+    (t->buffer_offset)++;
+    return t->buffer + tmp;
+}
+
+void pmix_timing_init(pmix_timing_t *t)
+{
+    memset(t,0,sizeof(*t));
+
+    t->next_id_cntr = 0;
+    t->current_id = -1;
+    /* initialize events list */
+    t->events = PMIX_NEW(pmix_list_t);
+    /* Set buffer size */
+    t->buffer_size = PMIX_TIMING_BUFSIZE;
+    /* Set buffer_offset = buffer_size so new buffer
+     * will be allocated at first event report */
+    t->buffer_offset = t->buffer_size;
+    /* initialize gettime function */
+    t->get_ts = _init_timestamping();
+
+}
+
+pmix_timing_prep_t pmix_timing_prep_ev(pmix_timing_t *t, const char *fmt, ...)
+{
+    pmix_timing_event_t *ev = pmix_timing_event_alloc(t);
+    if( ev == NULL ){
+        pmix_timing_prep_t p = { t, NULL, PMIX_ERR_OUT_OF_RESOURCE };
+        return p;
+    }
+    PMIX_CONSTRUCT(ev, pmix_timing_event_t);
+    ev->ts = t->get_ts();
+    va_list args;
+    va_start( args, fmt );
+    vsnprintf(ev->descr, PMIX_TIMING_DESCR_MAX - 1, fmt, args);
+    ev->descr[PMIX_TIMING_DESCR_MAX-1] = '\0';
+    va_end( args );
+    pmix_timing_prep_t p = { t, ev, 0 };
+    return p;
+}
+
+pmix_timing_prep_t pmix_timing_prep_ev_end(pmix_timing_t *t, const char *fmt, ...)
+{
+    pmix_timing_prep_t p = { t, NULL, 0 };
+
+    if( t->current_id >= 0 ){
+        pmix_timing_event_t *ev = pmix_timing_event_alloc(t);
+        if( ev == NULL ){
+            pmix_timing_prep_t p = { t, NULL, PMIX_ERR_OUT_OF_RESOURCE };
+            return p;
+        }
+        PMIX_CONSTRUCT(ev, pmix_timing_event_t);
+        ev->ts = t->get_ts();
+        p.ev = ev;
+    }
+    return p;
+}
+
+void pmix_timing_add_step(pmix_timing_prep_t p,
+                          const char *func, const char *file, int line)
+{
+    if( !p.errcode ) {
+        p.ev->func = func;
+        p.ev->file = file;
+        p.ev->line = line;
+        p.ev->type = PMIX_TIMING_TRACE;
+        pmix_list_append(p.t->events, (pmix_list_item_t*)p.ev);
+    }
+}
+
+/* Add description of the interval */
+int pmix_timing_descr(pmix_timing_prep_t p,
+                           const char *func, const char *file, int line)
+{
+    if( !p.errcode ){
+        p.ev->func = func;
+        p.ev->file = file;
+        p.ev->line = line;
+        p.ev->type = PMIX_TIMING_INTDESCR;
+        p.ev->id = p.t->next_id_cntr;
+        (p.t->next_id_cntr)++;
+        pmix_list_append(p.t->events, (pmix_list_item_t*)p.ev);
+        return p.ev->id;
+    }
+    return -1;
+}
+
+void pmix_timing_start_id(pmix_timing_t *t, int id, const char *func, const char *file, int line)
+{
+    /* No description is needed. If everything is OK
+     * it'll be included in pmix_timing_start_init */
+    pmix_timing_event_t *ev = pmix_timing_event_alloc(t);
+    if( ev == NULL ){
+        return;
+    }
+    PMIX_CONSTRUCT(ev, pmix_timing_event_t);
+
+    t->current_id = id;
+    ev->ts = t->get_ts();
+    ev->func = func;
+    ev->file = file;
+    ev->line = line;
+    ev->type = PMIX_TIMING_INTBEGIN;
+    ev->id = id;
+    pmix_list_append(t->events, (pmix_list_item_t*)ev);
+}
+
+void pmix_timing_end(pmix_timing_t *t, int id, const char *func, const char *file, int line )
+{
+    /* No description is needed. If everything is OK
+     * it'll be included in pmix_timing_start_init */
+    pmix_timing_event_t *ev = pmix_timing_event_alloc(t);
+    if( ev == NULL ){
+        return;
+    }
+    PMIX_CONSTRUCT(ev, pmix_timing_event_t);
+
+    if( id < 0 ){
+        ev->id = t->current_id;
+        t->current_id = -1;
+    } else {
+        if( t->current_id == id ){
+            t->current_id = -1;
+        }
+        ev->id = id;
+    }
+    ev->ts = t->get_ts();
+    ev->func = func;
+    ev->file = file;
+    ev->line = line;
+    ev->type = PMIX_TIMING_INTEND;
+    pmix_list_append(t->events, (pmix_list_item_t*)ev);
+}
+
+void pmix_timing_end_prep(pmix_timing_prep_t p,
+                                        const char *func, const char *file, int line)
+{
+    pmix_timing_event_t *ev = p.ev;
+
+    if( !p.errcode && ( NULL != ev ) ){
+        assert(  p.t->current_id >=0 );
+        ev->id = p.t->current_id;
+        p.t->current_id = -1;
+        ev->func = func;
+        ev->file = file;
+        ev->line = line;
+        ev->type = PMIX_TIMING_INTEND;
+        pmix_list_append(p.t->events, (pmix_list_item_t*)ev);
+    }
+}
+
+static int _prepare_descriptions(pmix_timing_t *t, struct interval_descr **__descr)
+{
+    struct interval_descr *descr;
+    pmix_timing_event_t *ev, *next;
+
+    if( t->next_id_cntr == 0 ){
+        return 0;
+    }
+
+    *__descr = malloc(sizeof(struct interval_descr) * t->next_id_cntr);
+    descr = *__descr;
+    memset(descr, 0, sizeof(struct interval_descr) * t->next_id_cntr);
+
+    PMIX_LIST_FOREACH_SAFE(ev, next, t->events, pmix_timing_event_t){
+
+        /* pmix_output(0,"EVENT: type = %d, id=%d, ts = %.12le, ovh = %.12le %s",
+                    ev->type, ev->id, ev->ts, ev->ts_ovh,
+                    ev->descr );
+        */
+        switch(ev->type){
+        case PMIX_TIMING_INTDESCR:{
+            if( ev->id >= t->next_id_cntr){
+                char *file = pmix_basename(ev->file);
+                pmix_output(0,"pmix_timing: bad event id at %s:%d:%s, ignore and remove",
+                            file, ev->line, ev->func);
+                free(file);
+                pmix_list_remove_item(t->events, (pmix_list_item_t *)ev);
+                continue;
+            }
+            if( NULL != descr[ev->id].descr_ev ){
+                pmix_timing_event_t *prev = descr[ev->id].descr_ev;
+                char *file = pmix_basename(ev->file);
+                char *file_prev = pmix_basename(prev->file);
+                pmix_output(0,"pmix_timing: duplicated description at %s:%d:%s, "
+                            "previous: %s:%d:%s, ignore and remove", file, ev->line, ev->func,
+                            file_prev, prev->line, prev->func);
+                free(file);
+                free(file_prev);
+                pmix_list_remove_item(t->events, (pmix_list_item_t *)ev);
+                continue;
+            }
+
+            descr[ev->id].descr_ev = ev;
+            descr[ev->id].begin_ev = NULL;
+            descr[ev->id].interval = 0;
+            descr[ev->id].overhead = 0;
+            break;
+        }
+        case PMIX_TIMING_INTBEGIN:
+        case PMIX_TIMING_INTEND:{
+            if( ev->id >= t->next_id_cntr || (NULL == descr[ev->id].descr_ev ) ){
+                char *file = pmix_basename(ev->file);
+                pmix_output(0,"pmix_timing: bad event id at %s:%d:%s, ignore and remove",
+                            file, ev->line, ev->func);
+                free(file);
+                pmix_list_remove_item(t->events, (pmix_list_item_t *)ev);
+                continue;
+            }
+            break;
+        }
+        case PMIX_TIMING_TRACE:
+            break;
+        }
+    }
+    return t->next_id_cntr;
+}
+
+/* Output lines in portions that doesn't
+ * exceed PMIX_TIMING_OUTBUF_SIZE for later automatic processing */
+int pmix_timing_report(pmix_timing_t *t, char *fname)
+{
+    pmix_timing_event_t *ev;
+    FILE *fp = NULL;
+    char *buf = NULL;
+    int buf_size = 0;
+    struct interval_descr *descr = NULL;
+    int rc = PMIX_SUCCESS;
+
+    if( fname != NULL ){
+        fp = fopen(fname,"a");
+        if( fp == NULL ){
+            pmix_output(0, "pmix_timing_report: Cannot open %s file"
+                        " for writing timing information!",fname);
+            rc = PMIX_ERROR;
+            goto err_exit;
+        }
+    }
+
+    _prepare_descriptions(t, &descr);
+
+    buf = malloc(PMIX_TIMING_OUTBUF_SIZE+1);
+    if( buf == NULL ){
+        rc = PMIX_ERR_OUT_OF_RESOURCE;
+        goto err_exit;
+    }
+    buf[0] = '\0';
+
+    double overhead = 0;
+    PMIX_LIST_FOREACH(ev, t->events, pmix_timing_event_t){
+        char *line, *file;
+        if( ev->fib && pmix_timing_overhead ){
+            overhead += ev->ts_ovh;
+        }
+        file = pmix_basename(ev->file);
+        switch( ev->type ){
+        case PMIX_TIMING_INTDESCR:
+            // Service event, skip it.
+            continue;
+        case PMIX_TIMING_TRACE:
+            rc = asprintf(&line,"[%s:%d] %s \"%s\" [PMIX_TRACE] %s:%d %.10lf\n",
+                          nodename, getpid(), jobid, ev->descr, file, ev->line,
+                          ev->ts + hnp_offs + overhead);
+            break;
+        case PMIX_TIMING_INTBEGIN:
+            rc = asprintf(&line,"[%s:%d] %s \"%s [start]\" [PMIX_TRACE] %s:%d %.10lf\n",
+                          nodename, getpid(), jobid, descr[ev->id].descr_ev->descr,
+                          file, ev->line, ev->ts + hnp_offs + overhead);
+            break;
+        case PMIX_TIMING_INTEND:
+            rc = asprintf(&line,"[%s:%d] %s \"%s [stop]\" [PMIX_TRACE] %s:%d %.10lf\n",
+                          nodename, getpid(), jobid, descr[ev->id].descr_ev->descr,
+                          file, ev->line, ev->ts + hnp_offs + overhead);
+            break;
+        }
+        free(file);
+
+        if( rc < 0 ){
+            rc = PMIX_ERR_OUT_OF_RESOURCE;
+            goto err_exit;
+        }
+        rc = 0;
+
+        /* Sanity check: this shouldn't happen since description
+             * is event only 1KB long and other fields should never
+             * exceed 9KB */
+        assert( strlen(line) <= PMIX_TIMING_OUTBUF_SIZE );
+
+
+        if( buf_size + strlen(line) > PMIX_TIMING_OUTBUF_SIZE ){
+            // flush buffer to the file
+            if( fp != NULL ){
+                fprintf(fp,"%s", buf);
+                fprintf(fp,"\n");
+            } else {
+                pmix_output(0,"\n%s", buf);
+            }
+            buf[0] = '\0';
+            buf_size = 0;
+        }
+        sprintf(buf,"%s%s", buf, line);
+        buf_size += strlen(line);
+        free(line);
+    }
+
+    if( buf_size > 0 ){
+        // flush buffer to the file
+        if( fp != NULL ){
+            fprintf(fp,"%s", buf);
+            fprintf(fp,"\n");
+        } else {
+            pmix_output(0,"\n%s", buf);
+        }
+        buf[0] = '\0';
+        buf_size = 0;
+    }
+
+err_exit:
+    if( NULL != descr ){
+        free(descr);
+    }
+    if( buf != NULL ){
+        free(buf);
+    }
+    if( fp != NULL ){
+        fflush(fp);
+        fclose(fp);
+    }
+    return rc;
+}
+
+/* Output events as one buffer so the data won't be mixed
+ * with other output. This function is supposed to be human readable.
+ * The output goes only to stdout. */
+int pmix_timing_deltas(pmix_timing_t *t, char *fname)
+{
+    pmix_timing_event_t *ev;
+    FILE *fp = NULL;
+    char *buf = NULL;
+    struct interval_descr *descr = NULL;
+    int i, rc = PMIX_SUCCESS;
+    size_t buf_size = 0, buf_used = 0;
+
+    if( fname != NULL ){
+        fp = fopen(fname,"a");
+        if( fp == NULL ){
+            pmix_output(0, "pmix_timing_report: Cannot open %s file"
+                        " for writing timing information!",fname);
+            rc = PMIX_ERROR;
+            goto err_exit;
+        }
+    }
+
+    _prepare_descriptions(t, &descr);
+
+    PMIX_LIST_FOREACH(ev, t->events, pmix_timing_event_t){
+        int id;
+        if( ev->fib ){
+            /* this event caused buffered memory allocation
+             * for events. Account the overhead for all active
+             * intervals. */
+            int i;
+            for( i = 0; i < t->next_id_cntr; i++){
+                if( (NULL != descr[i].descr_ev) && (NULL != descr[i].begin_ev) ){
+                    if( pmix_timing_overhead ){
+                        descr[i].overhead += ev->ts_ovh;
+                    }
+                }
+            }
+        }
+
+        /* we already process all PMIX_TIMING_DESCR events
+         * and we ignore PMIX_TIMING_EVENT */
+        if( ev->type == PMIX_TIMING_INTDESCR ||
+                ev->type == PMIX_TIMING_TRACE){
+            /* skip */
+            continue;
+        }
+
+        id = ev->id;
+        if( id < 0 || id >= t->next_id_cntr ){
+            char *file = pmix_basename(ev->file);
+            pmix_output(0,"pmix_timing_deltas: bad interval event id: %d at %s:%d:%s (maxid=%d)",
+                        id, file, ev->line, ev->func, t->next_id_cntr - 1 );
+            free(file);
+            /* skip */
+            continue;
+        }
+
+        /* id's assigned auomatically. Ther shouldn't be any gaps in descr[] */
+        assert( NULL != descr[id].descr_ev);
+
+        if( ev->type == PMIX_TIMING_INTBEGIN ){
+            if( NULL != descr[id].begin_ev ){
+                /* the measurement on this interval was already
+                 * started! */
+                pmix_timing_event_t *prev = descr[ev->id].begin_ev;
+                char *file = pmix_basename(ev->file);
+                char *file_prev = pmix_basename(prev->file);
+                pmix_output(0,"pmix_timing_deltas: duplicated start statement at %s:%d:%s, "
+                            "previous: %s:%d:%s", file, ev->line, ev->func,
+                            file_prev, prev->line, prev->func);
+                free(file);
+                free(file_prev);
+            } else {
+                /* save pointer to the start of measurement event */
+                descr[id].begin_ev = ev;
+            }
+            /* done, go to the next event */
+            continue;
+        }
+
+        if( ev->type == PMIX_TIMING_INTEND ){
+            if( NULL == descr[id].begin_ev ){
+                /* the measurement on this interval wasn't started! */
+                char *file = pmix_basename(ev->file);
+                pmix_output(0,"pmix_timing_deltas: inteval end without start at %s:%d:%s",
+                            file, ev->line, ev->func );
+                free(file);
+            } else {
+                descr[id].interval += ev->ts - descr[id].begin_ev->ts;
+                descr[id].begin_ev = NULL;
+                if( ev->fib ){
+                    descr[id].overhead += ev->ts_ovh;
+                }
+            }
+            continue;
+        }
+
+        /* shouldn't ever get here: bad ev->type */
+        pmix_output(0, "pmix_timing_deltas: bad event type %d", ev->type);
+        assert(0);
+    }
+
+    buf = malloc(PMIX_TIMING_OUTBUF_SIZE + 1);
+    if( buf == NULL ){
+        rc = PMIX_ERR_OUT_OF_RESOURCE;
+        goto err_exit;
+    }
+    buf[0] = '\0';
+    buf_size = PMIX_TIMING_OUTBUF_SIZE + 1;
+    buf_used = 0;
+    for(i = 0; i < t->next_id_cntr; i++){
+        char *line = NULL;
+        size_t line_size;
+        rc = asprintf(&line,"[%s:%d] %s \"%s\" [PMIX_OVHD] %le\n",
+                      nodename, getpid(), jobid, descr[i].descr_ev->descr,
+                      descr[i].interval - descr[i].overhead);
+        if( rc < 0 ){
+            rc = PMIX_ERR_OUT_OF_RESOURCE;
+            goto err_exit;
+        }
+        rc = 0;
+        line_size = strlen(line);
+
+        /* Sanity check: this shouldn't happen since description
+         * is event only 1KB long and other fields should never
+         * exceed 9KB */
+        assert( line_size <= PMIX_TIMING_OUTBUF_SIZE );
+
+        if( buf_used + strlen(line) > buf_size ){
+            // Increase output buffer
+            while( buf_used + line_size > buf_size && buf_size < DELTAS_SANE_LIMIT){
+                buf_size += PMIX_TIMING_OUTBUF_SIZE + 1;
+            }
+            if( buf_size > DELTAS_SANE_LIMIT ){
+                pmix_output(0, "pmix_timing_report: delta sane limit overflow (%u > %u)!\n",
+                            (unsigned int)buf_size, DELTAS_SANE_LIMIT);
+                free(line);
+                rc = PMIX_ERR_OUT_OF_RESOURCE;
+                goto err_exit;
+            }
+            buf = realloc(buf, buf_size);
+            if( buf == NULL ){
+                pmix_output(0, "pmix_timing_deltas: Out of memory!\n");
+                rc = PMIX_ERR_OUT_OF_RESOURCE;
+                goto err_exit;
+            }
+        }
+        sprintf(buf,"%s%s", buf, line);
+        buf_used += line_size;
+        free(line);
+    }
+
+
+    if( buf_used > 0 ){
+        // flush buffer to the file
+        if( fp != NULL ){
+            fprintf(fp,"%s", buf);
+            fprintf(fp,"\n");
+        } else {
+            pmix_output(0,"\n%s", buf);
+        }
+        buf[0] = '\0';
+        buf_size = 0;
+    }
+
+err_exit:
+    if( NULL != descr ){
+        free(descr);
+    }
+    if( NULL != buf ){
+        free(buf);
+    }
+    if( fp != NULL ){
+        fflush(fp);
+        fclose(fp);
+    }
+    return rc;
+}
+
+void pmix_timing_release(pmix_timing_t *t)
+{
+    int cnt = pmix_list_get_size(t->events);
+
+    if( cnt > 0 ){
+        pmix_list_t *tmp = PMIX_NEW(pmix_list_t);
+        int i;
+        for(i=0; i<cnt; i++){
+            pmix_timing_event_t *ev = (pmix_timing_event_t *)pmix_list_remove_first(t->events);
+            if( ev->fib ){
+                pmix_list_append(tmp,(pmix_list_item_t*)ev);
+            }
+        }
+
+        cnt = pmix_list_get_size(tmp);
+        for(i=0; i<cnt; i++){
+            pmix_timing_event_t *ev = (pmix_timing_event_t *)pmix_list_remove_first(tmp);
+            free(ev);
+        }
+        PMIX_RELEASE(tmp);
+    } else {
+        // Error case. At list one event was inserted at initialization.
+
+    }
+
+    PMIX_RELEASE(t->events);
+    t->events = NULL;
+}
+#endif
diff --git a/src/util/timings.h b/src/util/timings.h
new file mode 100644
index 0000000..06dc993
--- /dev/null
+++ b/src/util/timings.h
@@ -0,0 +1,421 @@
+/*
+ * Copyright (C) 2014      Artem Polyakov <artpol84 at gmail.com>
+ * Copyright (c) 2014-2015 Intel, Inc. All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#ifndef PMIX_UTIL_TIMING_H
+#define PMIX_UTIL_TIMING_H
+
+#include <src/include/pmix_config.h>
+
+
+#include "src/class/pmix_list.h"
+
+#if PMIX_ENABLE_TIMING
+
+#define PMIX_TIMING_DESCR_MAX 1024
+#define PMIX_TIMING_BUFSIZE 32
+#define PMIX_TIMING_OUTBUF_SIZE (10*1024)
+
+typedef enum {
+    PMIX_TIMING_TRACE,
+    PMIX_TIMING_INTDESCR,
+    PMIX_TIMING_INTBEGIN,
+    PMIX_TIMING_INTEND
+} pmix_event_type_t;
+
+typedef struct {
+    pmix_list_item_t super;
+    int fib;
+    pmix_event_type_t type;
+    const char *func;
+    const char *file;
+    int line;
+    double ts, ts_ovh;
+    char descr[PMIX_TIMING_DESCR_MAX];
+    int id;
+} pmix_timing_event_t;
+
+typedef double (*get_ts_t)(void);
+
+typedef struct pmix_timing_t
+{
+    int next_id_cntr;
+    // not thread safe!
+    // The whole implementation is not thread safe now
+    // since it is supposed to be used in service
+    // thread only. Fix in the future or now?
+    int current_id;
+    pmix_list_t *events;
+    pmix_timing_event_t *buffer;
+    size_t buffer_offset, buffer_size;
+    get_ts_t get_ts;
+} pmix_timing_t;
+
+typedef struct {
+    pmix_timing_t *t;
+    pmix_timing_event_t *ev;
+    int errcode;
+} pmix_timing_prep_t;
+
+/* Pass down our namespace and rank for pretty-print purposes */
+void pmix_init_id(char* nspace, int rank);
+
+/**
+ * Initialize timing structure.
+ *
+ * @param t pointer to the timing handler structure
+ */
+void pmix_timing_init(pmix_timing_t *t);
+
+/**
+ * Prepare timing event, do all printf-like processing.
+ * Should not be directly used - for service purposes only.
+ *
+ * @param t pointer to the timing handler structure
+ * @param fmt printf-like format
+ * @param ... other parameters that should be converted to string representation
+ *
+ * @retval partly filled pmix_timing_prep_t structure
+  */
+pmix_timing_prep_t pmix_timing_prep_ev(pmix_timing_t *t, const char *fmt, ...);
+
+/**
+ * Prepare timing event, ignore printf-like processing.
+ * Should not be directly used - for service purposes only.
+ *
+ * @param t pointer to the timing handler structure
+ * @param fmt printf-like format
+ * @param ... other parameters that should be converted to string representation
+ *
+ * @retval partly filled pmix_timing_prep_t structure
+  */
+pmix_timing_prep_t pmix_timing_prep_ev_end(pmix_timing_t *t, const char *fmt, ...);
+
+/**
+ * Enqueue timing event into the list of events in handler 't'.
+ *
+ * @param p result of pmix_timing_prep_ev
+ * @param func function name where event occurs
+ * @param file file name where event occurs
+ * @param line line number in the file
+ *
+ * @retval
+ */
+void pmix_timing_add_step(pmix_timing_prep_t p, const char *func,
+                          const char *file, int line);
+
+/**
+ * Enqueue the description of the interval into a list of events
+ * in handler 't'.
+ *
+ * @param p result of pmix_timing_prep_ev
+ * @param func function name where event occurs
+ * @param file file name where event occurs
+ * @param line line number in the file
+ *
+ * @retval id of event interval
+ */
+int pmix_timing_descr(pmix_timing_prep_t p, const char *func,
+                      const char *file, int line);
+
+/**
+ * Enqueue the beginning of timing interval that already has the
+ * description and assigned id into the list of events
+ * in handler 't'.
+ *
+ * @param p result of pmix_timing_prep_ev
+ * @param func function name where event occurs
+ * @param file file name where event occurs
+ * @param line line number in the file
+ *
+ * @retval
+ */
+void pmix_timing_start_id(pmix_timing_t *t, int id, const char *func,
+                          const char *file, int line);
+
+/**
+ * Enqueue the end of timing interval that already has
+ * description and assigned id into the list of events
+ * in handler 't'.
+ *
+ * @param p result of pmix_timing_prep_ev
+ * @param func function name where event occurs
+ * @param file file name where event occurs
+ * @param line line number in the file
+ *
+ * @retval
+ */
+void pmix_timing_end(pmix_timing_t *t, int id, const char *func,
+                     const char *file, int line );
+
+/**
+ * Enqueue both description and start of timing interval
+ * into the list of events and assign its id.
+ *
+ * @param p result of pmix_timing_prep_ev
+ * @param func function name where event occurs
+ * @param file file name where event occurs
+ * @param line line number in the file
+ *
+ * @retval interval id
+ */
+static inline int pmix_timing_start_init(pmix_timing_prep_t p,
+                                         const char *func,
+                                         const char *file, int line)
+{
+    int id = pmix_timing_descr(p, func, file, line);
+    if( id < 0 )
+        return id;
+    pmix_timing_start_id(p.t, id, func, file, line);
+    return id;
+}
+
+/**
+ * The wrapper that is used to stop last measurement in PMIX_TIMING_MNEXT.
+ *
+ * @param p result of pmix_timing_prep_ev
+ * @param func function name where event occurs
+ * @param file file name where event occurs
+ * @param line line number in the file
+ *
+ * @retval interval id
+ */
+void pmix_timing_end_prep(pmix_timing_prep_t p,
+                          const char *func, const char *file, int line);
+
+/**
+ * Report all events that were enqueued in the timing handler 't'.
+ * - if fname == NULL the output will be done using pmix_output and
+ * each line will be prefixed with "prefix" to ease grep'ing.
+ * - otherwise the corresponding file will be used for output in "append" mode
+ * WARRNING: not all filesystems provide enough support for that feature, some records may
+ * disappear.
+ *
+ * @param t timing handler
+ * @param account_overhead consider malloc overhead introduced by timing code
+ * @param prefix prefix to use when no fname was specifyed to ease grep'ing
+ * @param fname name of the output file (may be NULL)
+ *
+ * @retval PMIX_SUCCESS On success
+ * @retval PMIX_ERROR or PMIX_ERR_OUT_OF_RESOURCE On failure
+ */
+pmix_status_t pmix_timing_report(pmix_timing_t *t, char *fname);
+
+/**
+ * Report all intervals that were enqueued in the timing handler 't'.
+ * - if fname == NULL the output will be done using pmix_output and
+ * each line will be prefixed with "prefix" to ease grep'ing.
+ * - otherwise the corresponding file will be used for output in "append" mode
+ * WARRNING: not all filesystems provide enough support for that feature, some records may
+ * disappear.
+ *
+ * @param t timing handler
+ * @param account_overhead consider malloc overhead introduced by timing code
+  * @param fname name of the output file (may be NULL)
+ *
+ * @retval PMIX_SUCCESS On success
+ * @retval PMIX_ERROR or PMIX_ERR_OUT_OF_RESOURCE On failure
+ */
+pmix_status_t pmix_timing_deltas(pmix_timing_t *t, char *fname);
+
+/**
+ * Release all memory allocated for the timing handler 't'.
+ *
+ * @param t timing handler
+ *
+ * @retval
+ */
+void pmix_timing_release(pmix_timing_t *t);
+
+/**
+ * Macro for passing down process id - compiled out
+ * when configured without --enable-timing
+ */
+#define PMIX_TIMING_ID(n, r) pmix_timing_id((n), (r));
+
+/**
+ * Main macro for use in declaring pmix timing handler;
+ * will be "compiled out" when PMIX is configured without
+ * --enable-timing.
+ *
+ */
+#define PMIX_TIMING_DECLARE(t) pmix_timing_t t;   /* need semicolon here to avoid warnings when not enabled */
+
+/**
+ * Main macro for use in declaring external pmix timing handler;
+ * will be "compiled out" when PMIX is configured without
+ * --enable-timing.
+ *
+ */
+#define PMIX_TIMING_DECLARE_EXT(x, t) x extern pmix_timing_t t;  /* need semicolon here to avoid warnings when not enabled */
+
+/**
+ * Main macro for use in initializing pmix timing handler;
+ * will be "compiled out" when PMIX is configured without
+ * --enable-timing.
+ *
+ * @see pmix_timing_init()
+ */
+#define PMIX_TIMING_INIT(t) pmix_timing_init(t)
+
+/**
+ * Macro that enqueues event with its description to the specified
+ * timing handler;
+ * will be "compiled out" when PMIX is configured without
+ * --enable-timing.
+ *
+ * @see pmix_timing_add_step()
+ */
+#define PMIX_TIMING_EVENT(x) pmix_timing_add_step( pmix_timing_prep_ev x, __FUNCTION__, __FILE__, __LINE__)
+
+/**
+ * MDESCR: Measurement DESCRiption
+ * Introduce new timing measurement with string description for the specified
+ * timing handler;
+ * will be "compiled out" when PMIX is configured without
+ * --enable-timing.
+ *
+ * @see pmix_timing_descr()
+ */
+#define PMIX_TIMING_MDESCR(x) pmix_timing_descr( pmix_timing_prep_ev x, __FUNCTION__, __FILE__, __LINE__)
+
+/**
+ * MSTART_ID: Measurement START by ID.
+ * Marks the beginning of the measurement with ID=id on the
+ * specified timing handler;
+ * will be "compiled out" when PMIX is configured without
+ * --enable-timing.
+ *
+ * @see pmix_timing_start_id()
+ */
+#define PMIX_TIMING_MSTART_ID(t, id) pmix_timing_start_id(t, id, __FUNCTION__, __FILE__, __LINE__)
+
+/**
+ * MSTART: Measurement START
+ * Introduce new timing measurement conjuncted with its start
+ * on the specifyed timing handler;
+ * will be "compiled out" when PMIX is configured without
+ * --enable-timing.
+ *
+ * @see pmix_timing_start_init()
+ */
+#define PMIX_TIMING_MSTART(x) pmix_timing_start_init( pmix_timing_prep_ev x, __FUNCTION__, __FILE__, __LINE__)
+
+/**
+ * MSTOP: STOP Measurement
+ * Finishes the most recent measurement on the specifyed timing handler;
+ * will be "compiled out" when PMIX is configured without
+ * --enable-timing.
+ *
+ * @see pmix_timing_end()
+ */
+#define PMIX_TIMING_MSTOP(t) pmix_timing_end(t, -1, __FUNCTION__, __FILE__, __LINE__)
+
+/**
+ * MSTOP_ID: STOP Measurement with ID=id.
+ * Finishes the measurement with give ID on the specifyed timing handler;
+ * will be "compiled out" when PMIX is configured without
+ * --enable-timing.
+ *
+ * @see pmix_timing_end()
+ */
+#define PMIX_TIMING_MSTOP_ID(t, id) pmix_timing_end(t, id, __FUNCTION__, __FILE__, __LINE__)
+
+/**
+ * MNEXT: start NEXT Measurement
+ * Convinient macro, may be implemented with the sequence of three previously
+ * defined macroses:
+ * - finish current measurement (PMIX_TIMING_MSTOP);
+ * - introduce new timing measurement (PMIX_TIMING_MDESCR);
+ * - starts next measurement (PMIX_TIMING_MSTART_ID)
+ * on the specifyed timing handler;
+ * will be "compiled out" when PMIX is configured without
+ * --enable-timing.
+ *
+ * @see pmix_timing_start_init()
+ */
+#define PMIX_TIMING_MNEXT(x) ( \
+    pmix_timing_end_prep(pmix_timing_prep_ev_end x,             \
+                            __FUNCTION__, __FILE__, __LINE__ ), \
+    pmix_timing_start_init( pmix_timing_prep_ev x,              \
+                            __FUNCTION__, __FILE__, __LINE__)   \
+)
+
+/**
+ * The macro for use in reporting collected events with absolute values;
+ * will be "compiled out" when PMIX is configured without
+ * --enable-timing.
+ *
+ * @param enable flag that enables/disables reporting. Used for fine-grained timing.
+ * @see pmix_timing_report()
+ */
+#define PMIX_TIMING_REPORT(enable, t) { \
+    if( enable ) { \
+        pmix_timing_report(t, pmix_timing_output); \
+    } \
+}
+
+/**
+ * The macro for use in reporting collected events with relative times;
+ * will be "compiled out" when PMIX is configured without
+ * --enable-timing.
+ *
+ * @param enable flag that enables/disables reporting. Used for fine-grained timing.
+ * @see pmix_timing_deltas()
+ */
+#define PMIX_TIMING_DELTAS(enable, t) { \
+    if( enable ) { \
+        pmix_timing_deltas(t, pmix_timing_output); \
+    } \
+}
+
+/**
+ * Main macro for use in releasing allocated resources;
+ * will be "compiled out" when PMIX is configured without
+ * --enable-timing.
+ *
+ * @see pmix_timing_release()
+ */
+#define PMIX_TIMING_RELEASE(t) pmix_timing_release(t)
+
+#else
+
+#define PMIX_TIMING_ID(n, r)
+
+#define PMIX_TIMING_DECLARE(t)
+
+#define PMIX_TIMING_DECLARE_EXT(x, t)
+
+#define PMIX_TIMING_INIT(t)
+
+#define PMIX_TIMING_EVENT(x)
+
+#define PMIX_TIMING_MDESCR(x)
+
+#define PMIX_TIMING_MSTART_ID(t, id)
+
+#define PMIX_TIMING_MSTART(x)
+
+#define PMIX_TIMING_MSTOP(t)
+
+#define PMIX_TIMING_MSTOP_ID(t, id)
+
+#define PMIX_TIMING_MNEXT(x)
+
+#define PMIX_TIMING_REPORT(enable, t)
+
+#define PMIX_TIMING_DELTAS(enable, t)
+
+#define PMIX_TIMING_RELEASE(t)
+
+#endif
+
+#endif
diff --git a/src/util/tsd.h b/src/util/tsd.h
new file mode 100644
index 0000000..1149fca
--- /dev/null
+++ b/src/util/tsd.h
@@ -0,0 +1,172 @@
+/*
+ * Copyright (c) 2007-2013 Los Alamos National Security, LLC.  All rights
+ *                         reserved.
+ * Copyright (c) 2008      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2016      Intel, Inc.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+
+#ifndef PMIX_THREADS_TSD_H
+#define PMIX_THREADS_TSD_H
+
+#include "pmix_config.h"
+#include "pmix_common.h"
+
+#include <pthread.h>
+
+
+BEGIN_C_DECLS
+
+/**
+ * @file
+ *
+ * Thread Specific Datastore Interface
+ *
+ * Functions for providing thread-specific datastore capabilities.
+ */
+
+
+/**
+ * Prototype for callback when tsd data is being destroyed
+ */
+typedef void (*pmix_tsd_destructor_t)(void *value);
+
+#if defined(DOXYGEN)
+
+/**
+ * Typedef for thread-specific data key
+ */
+typedef void* pmix_tsd_key_t;
+
+
+/**
+ * Create thread-specific data key
+ *
+ * Create a thread-specific data key visible to all threads in the
+ * current process.  The returned key is valid in all threads,
+ * although the values bound to the key by pmix_tsd_setspecific() are
+ * allocated on a per-thread basis and persist for the life of the
+ * calling thread.
+ *
+ * Upon key creation, the value NULL is associated with the new key in
+ * all active threads.  When a new thread is created, the value NULL
+ * is associated with all defined keys in the new thread.
+ *
+ * The destructor parameter may be NULL.  At thread exit, if
+ * destructor is non-NULL AND the thread has a non-NULL value
+ * associated with the key, the function is called with the current
+ * value as its argument.
+ *
+ * @param key[out]       The key for accessing thread-specific data
+ * @param destructor[in] Cleanup function to call when a thread exits
+ *
+ * @retval PMIX_SUCCESS  Success
+ * @retval EAGAIN        The system lacked the necessary resource to
+ *                       create another thread specific data key
+ * @retval ENOMEM        Insufficient memory exists to create the key
+ */
+PMIX_EXPORT int pmix_tsd_key_create(pmix_tsd_key_t *key,
+                                    pmix_tsd_destructor_t destructor);
+
+
+/**
+ * Delete a thread-specific data key
+ *
+ * Delete a thread-specific data key previously returned by
+ * pmix_tsd_key_create().  The destructor associated with the key is
+ * not fired in any thread and memory cleanup is the responsibility of
+ * the caller.
+ *
+ * @note Unlike pthread_key_delete, this function should not be called
+ * from within a destructor.  It can not be universally supported at
+ * this time.
+ *
+ * @param key[in]       The key for accessing thread-specific data
+ *
+ * @retval PMIX_SUCCESS Success
+ * @retval EINVAL       Invalid key
+ */
+PMIX_EXPORT int pmix_tsd_key_delete(pmix_tsd_key_t key);
+
+
+/**
+ * Set a thread-specific data value
+ *
+ * Associates value with key in the current thread.  The value for the
+ * key in other threads is not changed.  Different threads may assign
+ * different values to the same key.
+ *
+ * @note This function should not be called within
+ * pmix_tsd_key_delete().
+ *
+ * @param key[in]       Thread specific data key to modify
+ * @param value[in]     Value to associate with key
+ *
+ * @retval PMIX_SUCCESS Success
+ * @retval ENOMEM       Insufficient memory exists to associate the
+ *                      value with the key
+ * @retval EINVAL       Invalid key
+ */
+PMIX_EXPORT int pmix_tsd_setspecific(pmix_tsd_key_t key, void *value);
+
+
+/**
+ * Get a thread-specific data value
+ *
+ * Get the data associated with the given key, as set by
+ * pmix_tsd_setspecific().  If pmix_tsd_setspecific() hasn't been
+ * called in the current thread with the given key, NULL is returned
+ * in valuep.
+ *
+ * @param key[in]       Thread specific data key to modify
+ * @param value[out]     Value to associate with key
+ *
+ * @retval PMIX_SUCCESS Success
+ * @retval ENOMEM       Insufficient memory exists to associate the
+ *                      value with the key
+ * @retval EINVAL       Invalid key
+ */
+PMIX_EXPORT int pmix_tsd_getspecific(pmix_tsd_key_t key, void **valuep);
+
+#else
+
+typedef pthread_key_t pmix_tsd_key_t;
+
+static inline int
+pmix_tsd_key_create(pmix_tsd_key_t *key,
+                    pmix_tsd_destructor_t destructor)
+{
+    return pthread_key_create(key, destructor);
+}
+
+static inline int
+pmix_tsd_key_delete(pmix_tsd_key_t key)
+{
+    return pthread_key_delete(key);
+}
+
+static inline int
+pmix_tsd_setspecific(pmix_tsd_key_t key, void *value)
+{
+    return pthread_setspecific(key, value);
+}
+
+static inline int
+pmix_tsd_getspecific(pmix_tsd_key_t key, void **valuep)
+{
+    *valuep = pthread_getspecific(key);
+    return PMIX_SUCCESS;
+}
+
+#endif
+
+END_C_DECLS
+
+#endif /* PMIX_MTHREADS_TSD_H */
diff --git a/test/Makefile.am b/test/Makefile.am
new file mode 100644
index 0000000..f96895a
--- /dev/null
+++ b/test/Makefile.am
@@ -0,0 +1,76 @@
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2006-2010 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2012-2013 Los Alamos National Security, Inc.  All rights reserved.
+# Copyright (c) 2013-2017 Intel, Inc. All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+if !WANT_HIDDEN
+# these tests use internal symbols
+# use --disable-visibility
+SUBDIRS = simple
+endif
+
+headers = test_common.h cli_stages.h server_callbacks.h utils.h test_fence.h \
+        test_publish.h test_spawn.h test_cd.h test_resolve_peers.h test_error.h \
+        test_replace.h test_internal.h
+
+AM_CPPFLAGS = -I$(top_builddir)/src -I$(top_builddir)/src/include -I$(top_builddir)/src/api
+
+noinst_SCRIPTS = pmix_client_otheruser.sh
+noinst_PROGRAMS =
+
+if WANT_PMI_BACKWARD
+noinst_PROGRAMS += pmi_client pmi2_client
+endif
+
+noinst_PROGRAMS += pmix_test pmix_client pmix_regex
+
+pmix_test_SOURCES = $(headers) \
+        pmix_test.c test_common.c cli_stages.c server_callbacks.c utils.c
+pmix_test_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
+pmix_test_LDADD = \
+    $(top_builddir)/src/libpmix.la
+
+if WANT_PMI_BACKWARD
+pmi_client_SOURCES = $(headers) \
+        pmi_client.c
+pmi_client_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
+pmi_client_LDADD = \
+    $(top_builddir)/src/libpmix.la
+
+pmi2_client_SOURCES = $(headers) \
+        pmi2_client.c
+pmi2_client_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
+pmi2_client_LDADD = \
+    $(top_builddir)/src/libpmix.la
+endif
+
+pmix_client_SOURCES = $(headers) \
+        pmix_client.c test_fence.c test_common.c test_publish.c test_spawn.c \
+        test_cd.c test_resolve_peers.c test_error.c test_replace.c test_internal.c
+pmix_client_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
+pmix_client_LDADD = \
+    $(top_builddir)/src/libpmix.la
+
+pmix_regex_SOURCES = $(headers) \
+        pmix_regex.c test_common.c cli_stages.c utils.c
+pmix_regex_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
+pmix_regex_LDADD = \
+    $(top_builddir)/src/libpmix.la
+
+EXTRA_DIST = $(noinst_SCRIPTS)
diff --git a/test/Makefile.in b/test/Makefile.in
new file mode 100644
index 0000000..e4d6407
--- /dev/null
+++ b/test/Makefile.in
@@ -0,0 +1,1023 @@
+# Makefile.in generated by automake 1.15 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2006-2010 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2012-2013 Los Alamos National Security, Inc.  All rights reserved.
+# Copyright (c) 2013-2017 Intel, Inc. All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+noinst_PROGRAMS = $(am__EXEEXT_1) pmix_test$(EXEEXT) \
+	pmix_client$(EXEEXT) pmix_regex$(EXEEXT)
+ at WANT_PMI_BACKWARD_TRUE@am__append_1 = pmi_client pmi2_client
+subdir = test
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/config/c_get_alignment.m4 \
+	$(top_srcdir)/config/libtool.m4 \
+	$(top_srcdir)/config/ltoptions.m4 \
+	$(top_srcdir)/config/ltsugar.m4 \
+	$(top_srcdir)/config/ltversion.m4 \
+	$(top_srcdir)/config/lt~obsolete.m4 \
+	$(top_srcdir)/config/pmix.m4 \
+	$(top_srcdir)/config/pmix_check_attributes.m4 \
+	$(top_srcdir)/config/pmix_check_broken_qsort.m4 \
+	$(top_srcdir)/config/pmix_check_compiler_version.m4 \
+	$(top_srcdir)/config/pmix_check_icc.m4 \
+	$(top_srcdir)/config/pmix_check_ident.m4 \
+	$(top_srcdir)/config/pmix_check_lock.m4 \
+	$(top_srcdir)/config/pmix_check_os_flavors.m4 \
+	$(top_srcdir)/config/pmix_check_package.m4 \
+	$(top_srcdir)/config/pmix_check_psm2.m4 \
+	$(top_srcdir)/config/pmix_check_pthread_pids.m4 \
+	$(top_srcdir)/config/pmix_check_vendor.m4 \
+	$(top_srcdir)/config/pmix_check_visibility.m4 \
+	$(top_srcdir)/config/pmix_check_withdir.m4 \
+	$(top_srcdir)/config/pmix_config_asm.m4 \
+	$(top_srcdir)/config/pmix_config_pthreads.m4 \
+	$(top_srcdir)/config/pmix_config_subdir.m4 \
+	$(top_srcdir)/config/pmix_config_subdir_args.m4 \
+	$(top_srcdir)/config/pmix_config_threads.m4 \
+	$(top_srcdir)/config/pmix_ensure_contains_optflags.m4 \
+	$(top_srcdir)/config/pmix_functions.m4 \
+	$(top_srcdir)/config/pmix_load_platform.m4 \
+	$(top_srcdir)/config/pmix_mca.m4 \
+	$(top_srcdir)/config/pmix_search_libs.m4 \
+	$(top_srcdir)/config/pmix_setup_cc.m4 \
+	$(top_srcdir)/config/pmix_setup_libevent.m4 \
+	$(top_srcdir)/config/pmix_setup_zlib.m4 \
+	$(top_srcdir)/config/pmix_try_assemble.m4 \
+	$(top_srcdir)/config/autogen_found_items.m4 \
+	$(top_srcdir)/src/mca/pdl/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/configure.m4 \
+	$(top_srcdir)/src/mca/pdl/pdlopen/configure.m4 \
+	$(top_srcdir)/src/mca/pdl/plibltdl/configure.m4 \
+	$(top_srcdir)/src/mca/pif/bsdx_ipv4/configure.m4 \
+	$(top_srcdir)/src/mca/pif/bsdx_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pif/linux_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pif/posix_ipv4/configure.m4 \
+	$(top_srcdir)/src/mca/pif/solaris_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/config/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/env/configure.m4 \
+	$(top_srcdir)/src/mca/pnet/opa/configure.m4 \
+	$(top_srcdir)/src/mca/psec/munge/configure.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/src/include/pmix_config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+ at WANT_PMI_BACKWARD_TRUE@am__EXEEXT_1 = pmi_client$(EXEEXT) \
+ at WANT_PMI_BACKWARD_TRUE@	pmi2_client$(EXEEXT)
+PROGRAMS = $(noinst_PROGRAMS)
+am__pmi2_client_SOURCES_DIST = test_common.h cli_stages.h \
+	server_callbacks.h utils.h test_fence.h test_publish.h \
+	test_spawn.h test_cd.h test_resolve_peers.h test_error.h \
+	test_replace.h test_internal.h pmi2_client.c
+am__objects_1 =
+ at WANT_PMI_BACKWARD_TRUE@am_pmi2_client_OBJECTS = $(am__objects_1) \
+ at WANT_PMI_BACKWARD_TRUE@	pmi2_client.$(OBJEXT)
+pmi2_client_OBJECTS = $(am_pmi2_client_OBJECTS)
+ at WANT_PMI_BACKWARD_TRUE@pmi2_client_DEPENDENCIES =  \
+ at WANT_PMI_BACKWARD_TRUE@	$(top_builddir)/src/libpmix.la
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+pmi2_client_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(pmi2_client_LDFLAGS) $(LDFLAGS) -o $@
+am__pmi_client_SOURCES_DIST = test_common.h cli_stages.h \
+	server_callbacks.h utils.h test_fence.h test_publish.h \
+	test_spawn.h test_cd.h test_resolve_peers.h test_error.h \
+	test_replace.h test_internal.h pmi_client.c
+ at WANT_PMI_BACKWARD_TRUE@am_pmi_client_OBJECTS = $(am__objects_1) \
+ at WANT_PMI_BACKWARD_TRUE@	pmi_client.$(OBJEXT)
+pmi_client_OBJECTS = $(am_pmi_client_OBJECTS)
+ at WANT_PMI_BACKWARD_TRUE@pmi_client_DEPENDENCIES =  \
+ at WANT_PMI_BACKWARD_TRUE@	$(top_builddir)/src/libpmix.la
+pmi_client_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(pmi_client_LDFLAGS) $(LDFLAGS) -o $@
+am_pmix_client_OBJECTS = $(am__objects_1) pmix_client.$(OBJEXT) \
+	test_fence.$(OBJEXT) test_common.$(OBJEXT) \
+	test_publish.$(OBJEXT) test_spawn.$(OBJEXT) test_cd.$(OBJEXT) \
+	test_resolve_peers.$(OBJEXT) test_error.$(OBJEXT) \
+	test_replace.$(OBJEXT) test_internal.$(OBJEXT)
+pmix_client_OBJECTS = $(am_pmix_client_OBJECTS)
+pmix_client_DEPENDENCIES = $(top_builddir)/src/libpmix.la
+pmix_client_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(pmix_client_LDFLAGS) $(LDFLAGS) -o $@
+am_pmix_regex_OBJECTS = $(am__objects_1) pmix_regex.$(OBJEXT) \
+	test_common.$(OBJEXT) cli_stages.$(OBJEXT) utils.$(OBJEXT)
+pmix_regex_OBJECTS = $(am_pmix_regex_OBJECTS)
+pmix_regex_DEPENDENCIES = $(top_builddir)/src/libpmix.la
+pmix_regex_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(pmix_regex_LDFLAGS) $(LDFLAGS) -o $@
+am_pmix_test_OBJECTS = $(am__objects_1) pmix_test.$(OBJEXT) \
+	test_common.$(OBJEXT) cli_stages.$(OBJEXT) \
+	server_callbacks.$(OBJEXT) utils.$(OBJEXT)
+pmix_test_OBJECTS = $(am_pmix_test_OBJECTS)
+pmix_test_DEPENDENCIES = $(top_builddir)/src/libpmix.la
+pmix_test_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(pmix_test_LDFLAGS) $(LDFLAGS) -o $@
+SCRIPTS = $(noinst_SCRIPTS)
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/src/include
+depcomp = $(SHELL) $(top_srcdir)/./config/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(pmi2_client_SOURCES) $(pmi_client_SOURCES) \
+	$(pmix_client_SOURCES) $(pmix_regex_SOURCES) \
+	$(pmix_test_SOURCES)
+DIST_SOURCES = $(am__pmi2_client_SOURCES_DIST) \
+	$(am__pmi_client_SOURCES_DIST) $(pmix_client_SOURCES) \
+	$(pmix_regex_SOURCES) $(pmix_test_SOURCES)
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+	distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = simple
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/./config/depcomp \
+	README
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CFLAGS = @CFLAGS@
+CLEANFILES = @CLEANFILES@
+CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MCA_PROJECT_SUBDIRS = @MCA_PROJECT_SUBDIRS@
+MCA_pmix_FRAMEWORKS = @MCA_pmix_FRAMEWORKS@
+MCA_pmix_FRAMEWORKS_SUBDIRS = @MCA_pmix_FRAMEWORKS_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS@
+MCA_pmix_FRAMEWORK_LIBS = @MCA_pmix_FRAMEWORK_LIBS@
+MCA_pmix_pdl_ALL_COMPONENTS = @MCA_pmix_pdl_ALL_COMPONENTS@
+MCA_pmix_pdl_ALL_SUBDIRS = @MCA_pmix_pdl_ALL_SUBDIRS@
+MCA_pmix_pdl_DSO_COMPONENTS = @MCA_pmix_pdl_DSO_COMPONENTS@
+MCA_pmix_pdl_DSO_SUBDIRS = @MCA_pmix_pdl_DSO_SUBDIRS@
+MCA_pmix_pdl_STATIC_COMPONENTS = @MCA_pmix_pdl_STATIC_COMPONENTS@
+MCA_pmix_pdl_STATIC_LTLIBS = @MCA_pmix_pdl_STATIC_LTLIBS@
+MCA_pmix_pdl_STATIC_SUBDIRS = @MCA_pmix_pdl_STATIC_SUBDIRS@
+MCA_pmix_pif_ALL_COMPONENTS = @MCA_pmix_pif_ALL_COMPONENTS@
+MCA_pmix_pif_ALL_SUBDIRS = @MCA_pmix_pif_ALL_SUBDIRS@
+MCA_pmix_pif_DSO_COMPONENTS = @MCA_pmix_pif_DSO_COMPONENTS@
+MCA_pmix_pif_DSO_SUBDIRS = @MCA_pmix_pif_DSO_SUBDIRS@
+MCA_pmix_pif_STATIC_COMPONENTS = @MCA_pmix_pif_STATIC_COMPONENTS@
+MCA_pmix_pif_STATIC_LTLIBS = @MCA_pmix_pif_STATIC_LTLIBS@
+MCA_pmix_pif_STATIC_SUBDIRS = @MCA_pmix_pif_STATIC_SUBDIRS@
+MCA_pmix_pinstalldirs_ALL_COMPONENTS = @MCA_pmix_pinstalldirs_ALL_COMPONENTS@
+MCA_pmix_pinstalldirs_ALL_SUBDIRS = @MCA_pmix_pinstalldirs_ALL_SUBDIRS@
+MCA_pmix_pinstalldirs_DSO_COMPONENTS = @MCA_pmix_pinstalldirs_DSO_COMPONENTS@
+MCA_pmix_pinstalldirs_DSO_SUBDIRS = @MCA_pmix_pinstalldirs_DSO_SUBDIRS@
+MCA_pmix_pinstalldirs_STATIC_COMPONENTS = @MCA_pmix_pinstalldirs_STATIC_COMPONENTS@
+MCA_pmix_pinstalldirs_STATIC_LTLIBS = @MCA_pmix_pinstalldirs_STATIC_LTLIBS@
+MCA_pmix_pinstalldirs_STATIC_SUBDIRS = @MCA_pmix_pinstalldirs_STATIC_SUBDIRS@
+MCA_pmix_pnet_ALL_COMPONENTS = @MCA_pmix_pnet_ALL_COMPONENTS@
+MCA_pmix_pnet_ALL_SUBDIRS = @MCA_pmix_pnet_ALL_SUBDIRS@
+MCA_pmix_pnet_DSO_COMPONENTS = @MCA_pmix_pnet_DSO_COMPONENTS@
+MCA_pmix_pnet_DSO_SUBDIRS = @MCA_pmix_pnet_DSO_SUBDIRS@
+MCA_pmix_pnet_STATIC_COMPONENTS = @MCA_pmix_pnet_STATIC_COMPONENTS@
+MCA_pmix_pnet_STATIC_LTLIBS = @MCA_pmix_pnet_STATIC_LTLIBS@
+MCA_pmix_pnet_STATIC_SUBDIRS = @MCA_pmix_pnet_STATIC_SUBDIRS@
+MCA_pmix_psec_ALL_COMPONENTS = @MCA_pmix_psec_ALL_COMPONENTS@
+MCA_pmix_psec_ALL_SUBDIRS = @MCA_pmix_psec_ALL_SUBDIRS@
+MCA_pmix_psec_DSO_COMPONENTS = @MCA_pmix_psec_DSO_COMPONENTS@
+MCA_pmix_psec_DSO_SUBDIRS = @MCA_pmix_psec_DSO_SUBDIRS@
+MCA_pmix_psec_STATIC_COMPONENTS = @MCA_pmix_psec_STATIC_COMPONENTS@
+MCA_pmix_psec_STATIC_LTLIBS = @MCA_pmix_psec_STATIC_LTLIBS@
+MCA_pmix_psec_STATIC_SUBDIRS = @MCA_pmix_psec_STATIC_SUBDIRS@
+MCA_pmix_psensor_ALL_COMPONENTS = @MCA_pmix_psensor_ALL_COMPONENTS@
+MCA_pmix_psensor_ALL_SUBDIRS = @MCA_pmix_psensor_ALL_SUBDIRS@
+MCA_pmix_psensor_DSO_COMPONENTS = @MCA_pmix_psensor_DSO_COMPONENTS@
+MCA_pmix_psensor_DSO_SUBDIRS = @MCA_pmix_psensor_DSO_SUBDIRS@
+MCA_pmix_psensor_STATIC_COMPONENTS = @MCA_pmix_psensor_STATIC_COMPONENTS@
+MCA_pmix_psensor_STATIC_LTLIBS = @MCA_pmix_psensor_STATIC_LTLIBS@
+MCA_pmix_psensor_STATIC_SUBDIRS = @MCA_pmix_psensor_STATIC_SUBDIRS@
+MCA_pmix_ptl_ALL_COMPONENTS = @MCA_pmix_ptl_ALL_COMPONENTS@
+MCA_pmix_ptl_ALL_SUBDIRS = @MCA_pmix_ptl_ALL_SUBDIRS@
+MCA_pmix_ptl_DSO_COMPONENTS = @MCA_pmix_ptl_DSO_COMPONENTS@
+MCA_pmix_ptl_DSO_SUBDIRS = @MCA_pmix_ptl_DSO_SUBDIRS@
+MCA_pmix_ptl_STATIC_COMPONENTS = @MCA_pmix_ptl_STATIC_COMPONENTS@
+MCA_pmix_ptl_STATIC_LTLIBS = @MCA_pmix_ptl_STATIC_LTLIBS@
+MCA_pmix_ptl_STATIC_SUBDIRS = @MCA_pmix_ptl_STATIC_SUBDIRS@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PMIX_ASM_GSYM = @PMIX_ASM_GSYM@
+PMIX_ASM_LSYM = @PMIX_ASM_LSYM@
+PMIX_ASM_SUPPORT_64BIT = @PMIX_ASM_SUPPORT_64BIT@
+PMIX_ASM_TEXT = @PMIX_ASM_TEXT@
+PMIX_ASM_TYPE = @PMIX_ASM_TYPE@
+PMIX_ASSEMBLY_ARCH = @PMIX_ASSEMBLY_ARCH@
+PMIX_ASSEMBLY_BUILTIN = @PMIX_ASSEMBLY_BUILTIN@
+PMIX_ASSEMBLY_FORMAT = @PMIX_ASSEMBLY_FORMAT@
+PMIX_AS_GLOBAL = @PMIX_AS_GLOBAL@
+PMIX_AS_LABEL_SUFFIX = @PMIX_AS_LABEL_SUFFIX@
+PMIX_CC_ABSOLUTE = @PMIX_CC_ABSOLUTE@
+PMIX_CONFIGURE_DATE = @PMIX_CONFIGURE_DATE@
+PMIX_CONFIGURE_HOST = @PMIX_CONFIGURE_HOST@
+PMIX_CONFIGURE_USER = @PMIX_CONFIGURE_USER@
+PMIX_EMBEDDED_CPPFLAGS = @PMIX_EMBEDDED_CPPFLAGS@
+PMIX_EMBEDDED_LDFLAGS = @PMIX_EMBEDDED_LDFLAGS@
+PMIX_EMBEDDED_LIBS = @PMIX_EMBEDDED_LIBS@
+PMIX_MAJOR_VERSION = @PMIX_MAJOR_VERSION@
+PMIX_MINOR_VERSION = @PMIX_MINOR_VERSION@
+PMIX_RELEASE_DATE = @PMIX_RELEASE_DATE@
+PMIX_RELEASE_VERSION = @PMIX_RELEASE_VERSION@
+PMIX_RENAME = @PMIX_RENAME@
+PMIX_VERSION = @PMIX_VERSION@
+PMIX_top_builddir = @PMIX_top_builddir@
+PMIX_top_srcdir = @PMIX_top_srcdir@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_prefix_program = @ac_prefix_program@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+libpmix_so_version = @libpmix_so_version@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pmix_have_pandoc = @pmix_have_pandoc@
+pmix_pdl_pdlopen_LIBS = @pmix_pdl_pdlopen_LIBS@
+pmix_pdl_plibltdl_CPPFLAGS = @pmix_pdl_plibltdl_CPPFLAGS@
+pmix_pdl_plibltdl_LDFLAGS = @pmix_pdl_plibltdl_LDFLAGS@
+pmix_pdl_plibltdl_LIBS = @pmix_pdl_plibltdl_LIBS@
+pmixdatadir = @pmixdatadir@
+pmixincludedir = @pmixincludedir@
+pmixlibdir = @pmixlibdir@
+pmixmajor = @pmixmajor@
+pmixminor = @pmixminor@
+pnet_opa_CFLAGS = @pnet_opa_CFLAGS@
+pnet_opa_CPPFLAGS = @pnet_opa_CPPFLAGS@
+pnet_opa_LDFLAGS = @pnet_opa_LDFLAGS@
+pnet_opa_LIBS = @pnet_opa_LIBS@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+psec_munge_CPPFLAGS = @psec_munge_CPPFLAGS@
+psec_munge_LDFLAGS = @psec_munge_LDFLAGS@
+psec_munge_LIBS = @psec_munge_LIBS@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+
+# these tests use internal symbols
+# use --disable-visibility
+ at WANT_HIDDEN_FALSE@SUBDIRS = simple
+headers = test_common.h cli_stages.h server_callbacks.h utils.h test_fence.h \
+        test_publish.h test_spawn.h test_cd.h test_resolve_peers.h test_error.h \
+        test_replace.h test_internal.h
+
+AM_CPPFLAGS = -I$(top_builddir)/src -I$(top_builddir)/src/include -I$(top_builddir)/src/api
+noinst_SCRIPTS = pmix_client_otheruser.sh
+pmix_test_SOURCES = $(headers) \
+        pmix_test.c test_common.c cli_stages.c server_callbacks.c utils.c
+
+pmix_test_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
+pmix_test_LDADD = \
+    $(top_builddir)/src/libpmix.la
+
+ at WANT_PMI_BACKWARD_TRUE@pmi_client_SOURCES = $(headers) \
+ at WANT_PMI_BACKWARD_TRUE@        pmi_client.c
+
+ at WANT_PMI_BACKWARD_TRUE@pmi_client_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
+ at WANT_PMI_BACKWARD_TRUE@pmi_client_LDADD = \
+ at WANT_PMI_BACKWARD_TRUE@    $(top_builddir)/src/libpmix.la
+
+ at WANT_PMI_BACKWARD_TRUE@pmi2_client_SOURCES = $(headers) \
+ at WANT_PMI_BACKWARD_TRUE@        pmi2_client.c
+
+ at WANT_PMI_BACKWARD_TRUE@pmi2_client_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
+ at WANT_PMI_BACKWARD_TRUE@pmi2_client_LDADD = \
+ at WANT_PMI_BACKWARD_TRUE@    $(top_builddir)/src/libpmix.la
+
+pmix_client_SOURCES = $(headers) \
+        pmix_client.c test_fence.c test_common.c test_publish.c test_spawn.c \
+        test_cd.c test_resolve_peers.c test_error.c test_replace.c test_internal.c
+
+pmix_client_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
+pmix_client_LDADD = \
+    $(top_builddir)/src/libpmix.la
+
+pmix_regex_SOURCES = $(headers) \
+        pmix_regex.c test_common.c cli_stages.c utils.c
+
+pmix_regex_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
+pmix_regex_LDADD = \
+    $(top_builddir)/src/libpmix.la
+
+EXTRA_DIST = $(noinst_SCRIPTS)
+all: all-recursive
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign test/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign test/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstPROGRAMS:
+	@list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
+
+pmi2_client$(EXEEXT): $(pmi2_client_OBJECTS) $(pmi2_client_DEPENDENCIES) $(EXTRA_pmi2_client_DEPENDENCIES) 
+	@rm -f pmi2_client$(EXEEXT)
+	$(AM_V_CCLD)$(pmi2_client_LINK) $(pmi2_client_OBJECTS) $(pmi2_client_LDADD) $(LIBS)
+
+pmi_client$(EXEEXT): $(pmi_client_OBJECTS) $(pmi_client_DEPENDENCIES) $(EXTRA_pmi_client_DEPENDENCIES) 
+	@rm -f pmi_client$(EXEEXT)
+	$(AM_V_CCLD)$(pmi_client_LINK) $(pmi_client_OBJECTS) $(pmi_client_LDADD) $(LIBS)
+
+pmix_client$(EXEEXT): $(pmix_client_OBJECTS) $(pmix_client_DEPENDENCIES) $(EXTRA_pmix_client_DEPENDENCIES) 
+	@rm -f pmix_client$(EXEEXT)
+	$(AM_V_CCLD)$(pmix_client_LINK) $(pmix_client_OBJECTS) $(pmix_client_LDADD) $(LIBS)
+
+pmix_regex$(EXEEXT): $(pmix_regex_OBJECTS) $(pmix_regex_DEPENDENCIES) $(EXTRA_pmix_regex_DEPENDENCIES) 
+	@rm -f pmix_regex$(EXEEXT)
+	$(AM_V_CCLD)$(pmix_regex_LINK) $(pmix_regex_OBJECTS) $(pmix_regex_LDADD) $(LIBS)
+
+pmix_test$(EXEEXT): $(pmix_test_OBJECTS) $(pmix_test_DEPENDENCIES) $(EXTRA_pmix_test_DEPENDENCIES) 
+	@rm -f pmix_test$(EXEEXT)
+	$(AM_V_CCLD)$(pmix_test_LINK) $(pmix_test_OBJECTS) $(pmix_test_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/cli_stages.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pmi2_client.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pmi_client.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pmix_client.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pmix_regex.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pmix_test.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/server_callbacks.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/test_cd.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/test_common.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/test_error.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/test_fence.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/test_internal.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/test_publish.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/test_replace.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/test_resolve_peers.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/test_spawn.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/utils.Po at am__quote@
+
+.c.o:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+ at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+		am__skip_mode_fix=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile $(PROGRAMS) $(SCRIPTS)
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \
+	mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+html-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-recursive
+
+install-html-am:
+
+install-info: install-info-recursive
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: $(am__recursive_targets) install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+	check-am clean clean-generic clean-libtool \
+	clean-noinstPROGRAMS 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-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+	uninstall-am
+
+.PRECIOUS: Makefile
+
+
+# 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/test/README b/test/README
new file mode 100644
index 0000000..5525583
--- /dev/null
+++ b/test/README
@@ -0,0 +1,32 @@
+This is a short description how to run tests for pmix standalone library.
+
+To compile test the user should run make in the test subdirectory.
+
+To start testing, the user should run either pmix_test or pmix_test_lite executable.
+These applications are using two different versions of server functionality and fork
+client process which implementation is located in the pmix_client.c file.
+There are several command line options (available to see by -h argument).
+The main options are the following:
+
+--job-fence - run fence operation between processes from the same namespace. It has some additional parameters:
+   -c - this fence should include data exchange (collective modex). Direct modex (no data exchange) is done by default.
+   -nb - fence should be non-blocking (blocking by default).
+--fence "[<data_exchange><blocking> | ns0:ranks;ns1:ranks...][...]" - run multiple fences (each fence in square brackets)
+   with different configurations in parsable format.
+   Example: --fence "[db | 1:1,2 ; 2:3-6][1: ]" means that need to test two fences. The first one is blocking (b)
+   and with data exchange (d) including ranks 1,2 from namespace 1 and ranks 3-6 from namespace 2.
+   The second fence is non-blocking without data exchange including all processes from namespace 1.
+   The assumption is that ranks should be set in increasing order (no same ranks in the different namespaces).
+   It also has additional parameters:
+   --noise "[ns0:ranks;ns1:ranks...]" - imitate system noise on certain ranks. It has similar to --fence format [0:0;1:1-3]
+   to specify ranks which should sleep several seconds before doing fence test.
+--use-same-keys - put the same keys in the interim between multiple fences.
+--ns-dist "n1:n2:n3" register n namespaces (3 in this example) each with ni ranks (n1, n2 or n3). For example, --ns-dist 1:2:8
+   says server to register 3 namespaces: 1 proc in the 1st ns, 2 procs in the 2d ns, 8 procs in the 3d.
+
+--test-publish - test publish/lookup/unpublish api.
+--test-spawn - test spawn api.
+--test-connect - test connect/disconnect api.
+--test-resolve-peers - test resolve_peers api.
+
+File cmd_examples contains some command lines to test the main functionality.
diff --git a/test/cli_stages.c b/test/cli_stages.c
new file mode 100644
index 0000000..c69aecb
--- /dev/null
+++ b/test/cli_stages.c
@@ -0,0 +1,277 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2015-2016 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include "cli_stages.h"
+
+cli_info_t *cli_info = NULL;
+int cli_info_cnt = 0;
+bool test_abort = false;
+
+int cli_rank(cli_info_t *cli)
+{
+    int i;
+    for(i=0; i < cli_info_cnt; i++){
+        if( cli == &cli_info[i] ){
+            return i;
+        }
+    }
+    return -1;
+}
+
+void cli_init(int nprocs, cli_state_t order[])
+{
+    int n, i;
+    cli_info = malloc( sizeof(cli_info_t) * nprocs);
+    cli_info_cnt = nprocs;
+
+    for (n=0; n < nprocs; n++) {
+        cli_info[n].sd = -1;
+        cli_info[n].ev = NULL;
+        cli_info[n].pid = -1;
+        cli_info[n].state = CLI_UNINIT;
+        PMIX_CONSTRUCT(&(cli_info[n].modex), pmix_list_t);
+        for (i = 0; i < CLI_TERM+1; i++) {
+            cli_info[n].next_state[i] = order[i];
+        }
+        cli_info[n].rank = -1;
+        cli_info[n].ns = NULL;
+    }
+}
+
+void cli_connect(cli_info_t *cli, int sd, struct event_base * ebase, event_callback_fn callback)
+{
+    if( CLI_CONNECTED != cli->next_state[cli->state] ){
+        TEST_ERROR(("Rank %d has bad next state: expect %d have %d!",
+                     cli_rank(cli), CLI_CONNECTED, cli->next_state[cli->state]));
+        test_abort = true;
+        return;
+    }
+
+    cli->sd = sd;
+    cli->ev = event_new(ebase, sd,
+                      EV_READ|EV_PERSIST, callback, cli);
+    event_add(cli->ev,NULL);
+    pmix_ptl_base_set_nonblocking(sd);
+    TEST_VERBOSE(("Connection accepted from rank %d", cli_rank(cli) ));
+    cli->state = CLI_CONNECTED;
+}
+
+void cli_finalize(cli_info_t *cli)
+{
+    if( CLI_FIN != cli->next_state[cli->state] ){
+        TEST_ERROR(("rank %d: bad client next state: expect %d have %d!",
+                     cli_rank(cli), CLI_FIN, cli->next_state[cli->state]));
+        test_abort = true;
+    }
+
+    cli->state = CLI_FIN;
+}
+
+void cli_disconnect(cli_info_t *cli)
+{
+    if( CLI_DISCONN != cli->next_state[cli->state] ){
+        TEST_ERROR(("rank %d: bad client next state: expect %d have %d!",
+                     cli_rank(cli), CLI_DISCONN, cli->next_state[cli->state]));
+        test_abort = true;
+    }
+
+    if( 0 > cli->sd ){
+        TEST_ERROR(("Bad sd = %d of rank = %d ", cli->sd, cli_rank(cli)));
+        test_abort = true;
+    } else {
+        TEST_VERBOSE(("close sd = %d for rank = %d", cli->sd, cli_rank(cli)));
+        close(cli->sd);
+        cli->sd = -1;
+    }
+
+    if( NULL == cli->ev ){
+        TEST_ERROR(("Bad ev = NULL of rank = %d ", cli->sd, cli_rank(cli)));
+        test_abort = true;
+    } else {
+        TEST_VERBOSE(("remove event of rank %d from event queue", cli_rank(cli)));
+        event_del(cli->ev);
+        event_free(cli->ev);
+        cli->ev = NULL;
+    }
+
+    TEST_VERBOSE(("Destruct modex list for the rank %d", cli_rank(cli)));
+    PMIX_LIST_DESTRUCT(&(cli->modex));
+
+    cli->state = CLI_DISCONN;
+}
+
+void cli_terminate(cli_info_t *cli)
+{
+    if( CLI_TERM != cli->next_state[cli->state] ){
+        TEST_ERROR(("rank %d: bad client next state: expect %d have %d!",
+                     cli_rank(cli), CLI_TERM, cli->next_state[cli->state]));
+        test_abort = true;
+    }
+    cli->pid = -1;
+    TEST_VERBOSE(("Client rank = %d terminated", cli_rank(cli)));
+    cli->state = CLI_TERM;
+    if (NULL != cli->ns) {
+        free(cli->ns);
+    }
+}
+
+void cli_cleanup(cli_info_t *cli)
+{
+    if (CLI_TERM < cli->state) {
+        TEST_ERROR(("Bad rank %d state %d", cli_rank(cli), cli->state));
+        test_abort = true;
+        return;
+    }
+    switch( cli->next_state[cli->state] ){
+    case CLI_FORKED:
+        break;
+    case CLI_CONNECTED:
+        /* error - means that process terminated w/o calling finalize */
+        if (!test_abort) {
+            TEST_ERROR(("rank %d with state %d unexpectedly terminated.", cli_rank(cli), cli->state));
+        }
+        cli->state = CLI_TERM;
+        test_abort = true;
+        break;
+    case CLI_FIN:
+        /* error - means that process terminated w/o calling finalize */
+        if (!test_abort) {
+            TEST_ERROR(("rank %d with state %d unexpectedly terminated.", cli_rank(cli), cli->state));
+        }
+        cli_finalize(cli);
+        cli_cleanup(cli);
+        test_abort = true;
+        break;
+    case CLI_DISCONN:
+        cli_disconnect(cli);
+        cli_cleanup(cli);
+        break;
+    case CLI_TERM:
+        cli_terminate(cli);
+        break;
+    default:
+        TEST_ERROR(("Bad rank %d next state %d", cli_rank(cli), cli->next_state[cli->state]));
+        test_abort = true;
+        return;
+    }
+}
+
+
+bool test_terminated(void)
+{
+    bool ret = true;
+    int i;
+
+    // All clients should disconnect
+    for(i=0; i < cli_info_cnt; i++){
+        ret = ret && (CLI_TERM <= cli_info[i].state);
+    }
+    return (ret || test_abort);
+}
+
+void cli_wait_all(double timeout)
+{
+    struct timeval tv;
+    double start_time, cur_time;
+
+    gettimeofday(&tv, NULL);
+    start_time = tv.tv_sec + 1E-6*tv.tv_usec;
+    cur_time = start_time;
+
+    //TEST_VERBOSE(("Wait for all children to terminate"))
+
+    // Wait for all children to cleanup after the test.
+    while( !test_terminated() && ( timeout >= (cur_time - start_time) ) ){
+        struct timespec ts;
+        int status, i;
+        pid_t pid;
+        while( 0 < (pid = waitpid(-1, &status, WNOHANG) ) ){
+            TEST_VERBOSE(("waitpid = %d", pid));
+            for(i=0; i < cli_info_cnt; i++){
+                if( cli_info[i].pid == pid ){
+                    TEST_VERBOSE(("the child with pid = %d has rank = %d\n"
+                                "\t\texited = %d, signalled = %d", pid, i,
+                                WIFEXITED(status), WIFSIGNALED(status) ));
+                    if( WIFEXITED(status) || WIFSIGNALED(status) ){
+                        cli_cleanup(&cli_info[i]);
+                    }
+                }
+            }
+        }
+        if( pid < 0 ){
+            if( errno == ECHILD ){
+                TEST_VERBOSE(("No more children to wait. Happens on the last cli_wait_all call "
+                            "which is used to ensure that all children terminated.\n"));
+                break;
+            } else {
+                TEST_ERROR(("waitpid(): %d : %s", errno, strerror(errno)));
+                exit(0);
+            }
+        }
+        ts.tv_sec = 0;
+        ts.tv_nsec = 100000;
+        nanosleep(&ts, NULL);
+        // calculate current timestamp
+        gettimeofday(&tv, NULL);
+        cur_time = tv.tv_sec + 1E-6*tv.tv_usec;
+    }
+}
+
+void cli_kill_all(void)
+{
+    int i;
+    for(i = 0; i < cli_info_cnt; i++){
+        if( CLI_UNINIT == cli_info[i].state ){
+            TEST_ERROR(("Skip rank %d as it wasn't ever initialized (shouldn't happe)",
+                          i));
+            continue;
+        } else if( CLI_TERM <= cli_info[i].state ){
+            TEST_VERBOSE(("Skip rank %d as it was already terminated.", i));
+            continue;
+
+        }
+        TEST_VERBOSE(("Kill rank %d (pid = %d).", i, cli_info[i].pid));
+        kill(cli_info[i].pid, SIGKILL);
+        cli_cleanup(&cli_info[i]);
+    }
+}
+
+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)
+{
+    TEST_ERROR((" PMIX server event handler with status = %d", status));
+    /* notify clients of error */
+    PMIx_Notify_event(status, source,
+                      PMIX_RANGE_NAMESPACE,
+                      NULL, 0,
+                      op_callbk, NULL);
+}
+
+void op_callbk(pmix_status_t status,
+                      void *cbdata)
+{
+    TEST_VERBOSE(( "OP CALLBACK CALLED WITH STATUS %d", status));
+}
+
+void errhandler_reg_callbk (pmix_status_t status,
+                            size_t errhandler_ref,
+                            void *cbdata)
+{
+    TEST_VERBOSE(("ERRHANDLER REGISTRATION CALLBACK CALLED WITH STATUS %d, ref=%lu",
+                status, (unsigned long)errhandler_ref));
+}
+
diff --git a/test/cli_stages.h b/test/cli_stages.h
new file mode 100644
index 0000000..484b09c
--- /dev/null
+++ b/test/cli_stages.h
@@ -0,0 +1,79 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2015-2016 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+#include <signal.h>
+#include <fcntl.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/un.h>
+#include <sys/wait.h>
+#include <sys/time.h>
+#include <time.h>
+#include PMIX_EVENT_HEADER
+#include <errno.h>
+#include "src/include/pmix_globals.h"
+#include "pmix_server.h"
+#include "src/class/pmix_list.h"
+#include "src/mca/ptl/base/base.h"
+
+#include "test_common.h"
+
+// In correct scenario each client has to sequentially pass all of this stages
+typedef enum {
+    CLI_UNINIT, CLI_FORKED, CLI_CONNECTED, CLI_FIN, CLI_DISCONN, CLI_TERM, CLI_UNDEF
+} cli_state_t;
+
+typedef struct {
+    pmix_list_t modex;
+    pid_t pid;
+    int sd;
+    pmix_event_t *ev;
+    cli_state_t state;
+    cli_state_t next_state[CLI_TERM+1];
+    int rank;
+    char *ns;
+} cli_info_t;
+
+extern cli_info_t *cli_info;
+extern int cli_info_cnt;
+extern bool test_abort;
+
+int cli_rank(cli_info_t *cli);
+void cli_init(int nprocs, cli_state_t order[]);
+void cli_connect(cli_info_t *cli, int sd, struct event_base * ebase, event_callback_fn callback);
+void cli_finalize(cli_info_t *cli);
+void cli_disconnect(cli_info_t *cli);
+void cli_terminate(cli_info_t *cli);
+void cli_cleanup(cli_info_t *cli);
+void cli_wait_all(double timeout);
+void cli_kill_all(void);
+
+bool test_terminated(void);
+
+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);
+
+void op_callbk(pmix_status_t status,
+               void *cbdata);
+
+void errhandler_reg_callbk (pmix_status_t status,
+                            size_t errhandler_ref,
+                            void *cbdata);
+
+
diff --git a/test/pmi2_client.c b/test/pmi2_client.c
new file mode 100644
index 0000000..a7a944e
--- /dev/null
+++ b/test/pmi2_client.c
@@ -0,0 +1,572 @@
+/*
+ * Copyright (c) 2013-2017 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2015      Mellanox Technologies, Inc.
+ *                         All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ *
+ */
+
+#define _GNU_SOURCE
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <stdarg.h>
+
+#include "pmi2.h"
+
+/* Target is legacy SLURM pmi2 library implementation */
+static int _legacy = 0;
+/* Verbose level 0-silent, 1-fatal, 2-error, 3+ debug*/
+static int _verbose = 1;
+
+static void log_fatal(const char *format, ...)
+{
+    va_list arglist;
+    char **output = NULL;
+
+    va_start(arglist, format);
+    if (_verbose > 0) {
+        if (0 > vasprintf(output, format, arglist) ||
+            NULL == output || NULL == *output) {
+            va_end(arglist);
+            return;
+        }
+        fprintf(stderr, "FATAL: %s", *output);
+        free(*output);
+    }
+    va_end(arglist);
+}
+
+static void log_error(const char *format, ...)
+{
+    va_list arglist;
+    char **output = NULL;
+
+    va_start(arglist, format);
+    if (_verbose > 0) {
+        if (0 > vasprintf(output, format, arglist) ||
+            NULL == output || NULL == *output) {
+            va_end(arglist);
+            return;
+        }
+        fprintf(stderr, "ERROR: %s", *output);
+        free(*output);
+    }
+    va_end(arglist);
+}
+
+static void log_info(const char *format, ...)
+{
+    va_list arglist;
+    char **output = NULL;
+
+    va_start(arglist, format);
+    if (_verbose > 0) {
+        if (0 > vasprintf(output, format, arglist) ||
+            NULL == output || NULL == *output) {
+            va_end(arglist);
+            return;
+        }
+        fprintf(stderr, "INFO: %s", *output);
+        free(*output);
+    }
+    va_end(arglist);
+}
+
+#define log_assert(e, msg) \
+    do {                                                                \
+        if (!(e)) {                                                     \
+            log_fatal("%s at %s:%d\n", msg, __func__, __LINE__);    \
+            rc = -1;                                                    \
+        }                                                               \
+    } while (0)
+
+static inline long random_value(long min_value, long max_value)
+{
+   return ((min_value >= max_value) ? min_value : min_value + (rand() % (max_value - min_value + 1)));
+}
+
+static int test_item1(void);
+static int test_item2(void);
+static int test_item3(void);
+static int test_item4(void);
+static int test_item5(void);
+static int test_item6(void);
+static int test_item7(void);
+static int test_item8(void);
+static int test_item9(void);
+/* several sequence of fences is a buggy case for pmix v1.0 (see https://github.com/open-mpi/pmix/issues/37) */
+static int test_item10(void);
+
+static int spawned, size, rank, appnum;
+static char jobid[100];
+
+
+int main(int argc, char **argv)
+{
+    int ret = 0;
+    int rc;
+    char *str = NULL;
+    int ti = (argc > 1 ? atoi(argv[1]) : 0);
+
+    srand(time(NULL));
+    str = getenv("VERBOSE");
+    _verbose = (str ? atoi(str) : _verbose);
+
+    spawned = random_value(10, 20);
+    size = random_value(10, 20);
+    rank = random_value(10, 20);
+    appnum = random_value(10, 20);
+    if (PMI2_SUCCESS != (rc = PMI2_Init(&spawned, &size, &rank, &appnum))) {
+        log_fatal("PMI2_Init failed: %d\n", rc);
+        return rc;
+    }
+
+    str = getenv("PMIX_NAMESPACE");
+    _legacy = (str ? 0 : 1);
+
+    /* this test should be always run */
+    if (1) {
+        rc = test_item1();
+        ret += (rc ? 1 : 0);
+        log_info("TI1  : %s\n", (rc ? "FAIL" : "PASS"));
+    }
+
+    if (!ti || 2 == ti) {
+        rc = test_item2();
+        ret += (rc ? 1 : 0);
+        log_info("TI2  : %s\n", (rc ? "FAIL" : "PASS"));
+    }
+
+    if (!ti || 3 == ti) {
+        rc = test_item3();
+        ret += (rc ? 1 : 0);
+        log_info("TI3  : %s\n", (rc ? "FAIL" : "PASS"));
+    }
+
+    if (!ti || 4 == ti) {
+        rc = test_item4();
+        ret += (rc ? 1 : 0);
+        log_info("TI4  : %s\n", (rc ? "FAIL" : "PASS"));
+    }
+
+    if (!ti || 5 == ti) {
+        rc = test_item5();
+        ret += (rc ? 1 : 0);
+        log_info("TI5  : %s\n", (rc ? "FAIL" : "PASS"));
+    }
+
+    if (!ti || 6 == ti) {
+        rc = test_item6();
+        ret += (rc ? 1 : 0);
+        log_info("TI6  : %s\n", (rc ? "FAIL" : "PASS"));
+    }
+
+    if (!ti || 7 == ti) {
+        rc = test_item7();
+        ret += (rc ? 1 : 0);
+        log_info("TI7  : %s\n", (rc ? "FAIL" : "PASS"));
+    }
+
+    if (!ti || 8 == ti) {
+        rc = test_item8();
+        ret += (rc ? 1 : 0);
+        log_info("TI8  : %s\n", (rc ? "FAIL" : "PASS"));
+    }
+
+    if (!ti || 9 == ti) {
+        rc = test_item9();
+        ret += (rc ? 1 : 0);
+        log_info("TI9  : %s\n", (rc ? "FAIL" : "PASS"));
+    }
+
+    if (!ti || 10 == ti) {
+        rc = test_item10();
+        ret += (rc ? 1 : 0);
+        log_info("TI10  : %s\n", (rc ? "FAIL" : "PASS"));
+    }
+
+    if (PMI2_SUCCESS != (rc = PMI2_Finalize())) {
+        log_fatal("PMI2_Finalize failed: %d\n", rc);
+        return rc;
+    }
+
+    return ret;
+}
+
+static int test_item1(void)
+{
+    int rc = 0;
+
+    log_info("spawned=%d size=%d rank=%d appnum=%d\n", spawned, size, rank, appnum);
+
+    log_assert(spawned == 0 || spawned == 1, "");
+    log_assert(size >= 0, "");
+    log_assert(rank >= 0, "");
+    log_assert(rank < size, "");
+
+    sprintf(jobid, "%s", __func__);
+    if (PMI2_SUCCESS != (rc = PMI2_Job_GetId(jobid, sizeof(jobid)))) {
+        log_fatal("PMI2_Job_GetId failed: %d\n", rc);
+        return rc;
+    }
+
+    log_info("jobid=%s\n", jobid);
+    log_assert(memcmp(jobid, __func__, sizeof(__func__)), "");
+
+    return rc;
+}
+
+static int test_item2(void)
+{
+    int rc = 0;
+    int val = 0;
+
+    log_assert(PMI2_Initialized(), "");
+
+    val = random_value(10, 100);
+    if (PMI2_SUCCESS != (rc = PMI2_Job_GetRank(&val))) {
+        log_fatal("PMI2_Job_GetRank failed: %d\n", rc);
+        return rc;
+    }
+    log_assert(rank == val, "");
+
+    val = -1;
+    if (PMI2_SUCCESS != (rc = PMI2_Info_GetSize(&val))) {
+        log_fatal("PMI2_Info_GetSize failed: %d\n", rc);
+        return rc;
+    }
+    log_assert(0 < val, "");
+
+    return rc;
+}
+
+static int test_item3(void)
+{
+    int rc = 0;
+    char val[PMI2_MAX_VALLEN];
+    int found = 0;
+    /* Predefined Job attributes */
+    const char *tkeys[] = {
+            "universeSize",
+            "hasNameServ",
+            "physTopology",
+            "physTopologyLevels",
+            "cartDims",
+            "isHeterogeneous",
+            NULL
+    };
+    const char **ptr = tkeys;
+
+    if (_legacy || !_legacy) {
+        log_error("%s\n", "PMIx and SLURM/PMI2 does not set Job Attributes (Do not mark test as failed)");
+        return rc;
+    }
+
+    while (*ptr) {
+        if (PMI2_SUCCESS != (rc = PMI2_Info_GetJobAttr(*ptr, val, sizeof(val), &found))) {
+            log_fatal("PMI2_Info_GetJobAttr: [%s] %d\n", *ptr, rc);
+            return rc;
+        }
+        log_info("key=%s value=%s found=%d\n", *ptr, (found ? val : "N/A"), found);
+        if (!_legacy && !found) {
+            log_error("PMIx does not set: %s (Do not mark test as failed)\n", *ptr);
+        }
+        ptr++;
+    }
+
+    return rc;
+}
+
+static int test_item4(void)
+{
+    int rc = 0;
+    char val[PMI2_MAX_VALLEN];
+    int found = 0;
+    /* Predefined Node attributes */
+    const char *tkeys[] = {
+            "memPoolType",
+            "memSYSVid",
+            "memAnonMMAPfd",
+            "memNTName",
+            NULL
+    };
+    const char **ptr = tkeys;
+
+    if (_legacy || !_legacy) {
+        log_error("%s\n", "PMIx and SLURM/PMI2 does not set Node Attributes (Do not mark test as failed)");
+        return rc;
+    }
+
+    while (*ptr) {
+        if (PMI2_SUCCESS != (rc = PMI2_Info_GetNodeAttr(*ptr, val, sizeof(val), &found, 1))) {
+            log_fatal("PMI2_Info_GetNodeAttr: [%s] %d\n", *ptr, rc);
+            return rc;
+        }
+        log_info("key=%s value=%s found=%d\n", *ptr, (found ? val : "N/A"), found);
+        if (!_legacy && !found) {
+            log_error("PMIx does not set: %s (Do not mark test as failed)\n", *ptr);
+        }
+        ptr++;
+    }
+
+    return rc;
+}
+
+static int test_item5(void)
+{
+    int rc = 0;
+    char val[PMI2_MAX_VALLEN];
+    int found = 0;
+    const char *tkey = "sharedFilename";
+    const char *tval = "pmix-pmi2-check";
+
+    if (PMI2_SUCCESS != (rc = PMI2_Info_PutNodeAttr(tkey, tval))) {
+        log_fatal("PMI2_Info_PutNodeAttr %d\n", rc);
+        return rc;
+    }
+
+    if (PMI2_SUCCESS != (rc = PMI2_Info_GetNodeAttr(tkey, val, sizeof(val), &found, 1))) {
+        log_fatal("PMI2_Info_GetNodeAttr %d\n", rc);
+        return rc;
+    }
+
+    log_info("tkey=%s tval=%s val=%s found=%d\n", tkey, tval, val, found);
+
+    log_assert(found, "PMI2_Info_GetNodeAttr does not find expected key");
+    log_assert(strlen(tval) == strlen(val), "value does not meet expectation");
+    log_assert(!strcmp(tval, val), "value does not meet expectation");
+
+    return rc;
+}
+
+static int test_item6(void)
+{
+    int rc = 0;
+    char val[PMI2_MAX_VALLEN];
+    int len;
+    const char *tkey = __func__;
+    const char *tval = __FILE__;
+
+    if (PMI2_SUCCESS != (rc = PMI2_KVS_Put(tkey, tval))) {
+        log_fatal("PMI2_KVS_Put %d\n", rc);
+        return rc;
+    }
+
+    /* expected result: return error status */
+    rc = PMI2_KVS_Get(NULL, PMI2_ID_NULL, tkey, val, sizeof(val), &len);
+    if (PMI2_SUCCESS == rc) {
+        log_info("tkey=%s tval=%s val=%s len=%d\n", tkey, tval, val, len);
+        log_error("%s\n", "PMI2_KVS_Get should not find data w/o commit");
+        return 1;
+    }
+
+    return 0;
+}
+
+static int test_item7(void)
+{
+    int rc = 0;
+    char val[PMI2_MAX_VALLEN];
+    int len;
+    char tkey[PMI2_MAX_VALLEN];
+    char tval[PMI2_MAX_VALLEN];
+
+    sprintf(tkey, "KEY-%d", rank);
+    sprintf(tval, "VALUE-%d", rank);
+    if (PMI2_SUCCESS != (rc = PMI2_KVS_Put(tkey, tval))) {
+        log_fatal("PMI2_KVS_Put %d\n", rc);
+        return rc;
+    }
+
+    if (PMI2_SUCCESS != (rc = PMI2_KVS_Fence())) {
+        log_fatal("PMI2_KVS_Fence %d\n", rc);
+        return rc;
+    }
+
+    /* expected result: return error status */
+    rc = PMI2_KVS_Get(jobid, rank, tkey, val, sizeof(val), &len);
+    if (PMI2_SUCCESS != rc) {
+        log_fatal("PMI2_KVS_Get [%s=?] %d\n", tkey, rc);
+        return rc;
+    }
+
+    log_info("tkey=%s tval=%s val=%s len=%d\n", tkey, tval, val, len);
+
+    log_assert((int)strlen(tval) == len, "value does not meet expectation");
+    log_assert(!strcmp(tval, val), "value does not meet expectation");
+
+    return 0;
+}
+
+static int test_item8(void)
+{
+    int rc = 0;
+    int len;
+    char tkey[PMI2_MAX_VALLEN];
+    char tval[PMI2_MAX_VALLEN];
+    char val[PMI2_MAX_VALLEN];
+    int i = 0;
+
+    for (i = 0; i < size; i++) {
+        sprintf(tkey, "KEY-%d", i);
+        sprintf(tval, "VALUE-%d", i);
+        if (i == rank) {
+            if (PMI2_SUCCESS != (rc = PMI2_KVS_Put(tkey, tval))) {
+                log_fatal("PMI2_KVS_Put [%s=%s] %d\n", tkey, tval, rc);
+                return rc;
+            }
+        }
+    }
+
+    if (PMI2_SUCCESS != (rc = PMI2_KVS_Fence())) {
+        log_fatal("PMI2_KVS_Fence %d\n", rc);
+        return rc;
+    }
+
+    for (i = 0; i < size; i++) {
+        sprintf(tkey, "KEY-%d", i);
+        sprintf(tval, "VALUE-%d", i);
+        if (PMI2_SUCCESS != (rc = PMI2_KVS_Get(jobid, i, tkey, val, sizeof(val), &len))) {
+            log_fatal("PMI2_KVS_Get [%s=?] %d\n", tkey, rc);
+            return rc;
+        }
+
+        log_info("tkey=%s tval=%s val=%s len=%d\n", tkey, tval, val, len);
+
+        log_assert((int)strlen(tval) == len, "value does not meet expectation");
+        log_assert(!strcmp(tval, val), "value does not meet expectation");
+    }
+
+    return rc;
+}
+
+static int test_item9(void)
+{
+    int rc = 0;
+    int len;
+    char tkey[PMI2_MAX_VALLEN];
+    char tval[PMI2_MAX_VALLEN];
+    char val[PMI2_MAX_VALLEN];
+    int i = 0;
+
+    for (i = 0; i < size; i++) {
+        sprintf(tkey, "KEY-%d", i);
+        sprintf(tval, "VALUE-%d", i);
+        if (i == rank) {
+            log_info("Rank %d executing Put of key %s\n", rank, tkey);
+            if (PMI2_SUCCESS != (rc = PMI2_KVS_Put(tkey, tval))) {
+                log_fatal("PMI2_KVS_Put [%s=%s] %d\n", tkey, tval, rc);
+                return rc;
+            }
+        }
+    }
+
+    log_info("Rank %d executing Fence\n", rank);
+    if (PMI2_SUCCESS != (rc = PMI2_KVS_Fence())) {
+        log_fatal("PMI2_KVS_Fence %d\n", rc);
+        return rc;
+    }
+
+    for (i = 0; i < size; i++) {
+        sprintf(tkey, "KEY-%d", i);
+        sprintf(tval, "VALUE-%d", i);
+        log_info("Rank %d executing Get of key %s\n", rank, tkey);
+        if (PMI2_SUCCESS != (rc = PMI2_KVS_Get(jobid, PMI2_ID_NULL, tkey, val, sizeof(val), &len))) {
+            log_fatal("PMI2_KVS_Get [%s=?] %d\n", tkey, rc);
+            return rc;
+        }
+
+        log_info("tkey=%s tval=%s val=%s len=%d\n", tkey, tval, val, len);
+
+        log_assert((int)strlen(tval) == len, "value does not meet expectation");
+        log_assert(!strcmp(tval, val), "value does not meet expectation");
+    }
+
+    return rc;
+}
+
+static int test_item10(void)
+{
+    int rc = 0;
+    int i, j, r;
+    char symb, symb_start = 'a';
+    int fence_cnt;
+    int fence_num = 5;
+    int keys_per_fence = 50;
+    int val_size = random_value(10, PMI2_MAX_VALLEN / 10);
+    int keys_total = 0;
+
+    fence_cnt = 0;
+    while (fence_cnt < fence_num) {
+        log_info("fence_cnt=%d of fence_num=%d keys_per_fence=%d keys_total=%d val_size=%d\n",
+                fence_cnt, fence_num, keys_per_fence, keys_total, val_size);
+        symb = symb_start;
+        for (i = 0; i < keys_per_fence; i++) {
+            char key[PMI2_MAX_KEYLEN];
+            char val[PMI2_MAX_VALLEN] = "";
+            sprintf(key, "RANK%d-key-%d", rank, i + keys_total);
+            for (j = 0; j < val_size; j++) {
+                val[j] = symb;
+            }
+            symb++;
+            if (symb > 'z') {
+                symb = 'a';
+            }
+            if (PMI2_SUCCESS != (rc = PMI2_KVS_Put(key, val))) {
+                log_fatal("%d : PMI2_KVS_Put [%s=%s] %d\n", rank, key, val, rc);
+                return rc;
+            }
+            log_info("%d : PMI2_KVS_Put [%s=%s] %d\n", rank, key, val, rc);
+        }
+        symb_start = symb;
+        keys_total += keys_per_fence;
+
+        if (PMI2_SUCCESS != (rc = PMI2_KVS_Fence())) {
+            log_fatal("%d : PMI2_KVS_Fence %d\n", rank, rc);
+            return rc;
+        }
+
+        for (r = 0; r < size; r++) {
+            int len;
+            symb = 'a';
+            for (i = 0; i < keys_total; i++) {
+                char key[PMI2_MAX_KEYLEN];
+                char val[PMI2_MAX_VALLEN] = "";
+                sprintf(key, "RANK%d-key-%d", r, i);
+
+                if (PMI2_SUCCESS != (rc = PMI2_KVS_Get(jobid, r, key, val, sizeof(val), &len))) {
+                    log_fatal("%d : PMI2_KVS_Get [%s=?] %d\n", rank, key, rc);
+                    return rc;
+                }
+
+                log_info("%d : PMI2_KVS_Get from %d [%s=%s] %d\n", r, rank, key, val, rc);
+
+                if (len != val_size) {
+                    log_fatal("%d: failure on rank %d, key #%d: len mismatch:"
+                            " %d instead of %d\n", rank, r, i, len, val_size);
+                }
+
+                for (j = 0; j < val_size; j++) {
+                    if (val[j] != symb) {
+                        log_fatal("%d: failure on rank %d, key #%d: value mismatch"
+                                " at symb %d: \'%c\' instead of \'%c\'\n", rank,
+                                r, i, j, val[j], symb);
+                    }
+                }
+                symb++;
+                if (symb > 'z') {
+                    symb = 'a';
+                }
+            }
+        }
+        fence_cnt++;
+    }
+
+    return rc;
+}
diff --git a/test/pmi_client.c b/test/pmi_client.c
new file mode 100644
index 0000000..cfc9d9d
--- /dev/null
+++ b/test/pmi_client.c
@@ -0,0 +1,438 @@
+/*
+ * Copyright (c) 2013-2017 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2015      Mellanox Technologies, Inc.
+ *                         All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ *
+ */
+
+#define _GNU_SOURCE
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <stdarg.h>
+
+#include "pmi.h"
+
+/* Target is legacy SLURM pmi library implementation */
+static int _legacy = 0;
+/* Verbose level 0-silent, 1-fatal, 2-error, 3+ debug*/
+static int _verbose = 1;
+
+static void log_fatal(const char *format, ...)
+{
+    va_list arglist;
+    char **output = NULL;
+
+    va_start(arglist, format);
+    if (_verbose > 0) {
+        if (0 > vasprintf(output, format, arglist) ||
+            NULL == output || NULL == *output) {
+            va_end(arglist);
+            return;
+        }
+        fprintf(stderr, "FATAL: %s", *output);
+        free(*output);
+    }
+    va_end(arglist);
+}
+
+static void log_error(const char *format, ...)
+{
+    va_list arglist;
+    char **output = NULL;
+
+    va_start(arglist, format);
+    if (_verbose > 0) {
+        if (0 > vasprintf(output, format, arglist) ||
+            NULL == output || NULL == *output) {
+            va_end(arglist);
+            return;
+        }
+        fprintf(stderr, "ERROR: %s", *output);
+        free(*output);
+    }
+    va_end(arglist);
+}
+
+static void log_info(const char *format, ...)
+{
+    va_list arglist;
+    char **output = NULL;
+
+    va_start(arglist, format);
+    if (_verbose > 0) {
+        if (0 > vasprintf(output, format, arglist) ||
+            NULL == output || NULL == *output) {
+            va_end(arglist);
+            return;
+        }
+        fprintf(stderr, "INFO: %s", *output);
+        free(*output);
+    }
+    va_end(arglist);
+}
+
+#define log_assert(e, msg) \
+    do {                                                                \
+        if (!(e)) {                                                     \
+            log_fatal("%s at %s:%d\n", msg, __func__, __LINE__);    \
+            rc = -1;                                                    \
+        }                                                               \
+    } while (0)
+
+static inline long random_value(long min_value, long max_value)
+{
+   return ((min_value >= max_value) ? min_value : min_value + (rand() % (max_value - min_value + 1)));
+}
+
+static int test_item1(void);
+static int test_item2(void);
+static int test_item3(void);
+static int test_item4(void);
+static int test_item5(void);
+static int test_item6(void);
+static int test_item7(void);
+
+static int spawned, size, rank, appnum;
+static char jobid[255];
+
+
+int main(int argc, char **argv)
+{
+    int ret = 0;
+    int rc;
+    char *str = NULL;
+    int ti = (argc > 1 ? atoi(argv[1]) : 0);
+
+    srand(time(NULL));
+    str = getenv("VERBOSE");
+    _verbose = (str ? atoi(str) : _verbose);
+
+    spawned = random_value(10, 20);
+    size = random_value(10, 20);
+    rank = random_value(10, 20);
+    appnum = random_value(10, 20);
+    if (PMI_SUCCESS != (rc = PMI_Init(&spawned))) {
+        log_fatal("PMI_Init failed: %d\n", rc);
+        return rc;
+    }
+
+    str = getenv("PMIX_NAMESPACE");
+    _legacy = (str ? 0 : 1);
+
+    /* this test should be always run */
+    if (1) {
+        rc = test_item1();
+        ret += (rc ? 1 : 0);
+        log_info("TI1  : %s\n", (rc ? "FAIL" : "PASS"));
+    }
+
+    if (!ti || 2 == ti) {
+        rc = test_item2();
+        ret += (rc ? 1 : 0);
+        log_info("TI2  : %s\n", (rc ? "FAIL" : "PASS"));
+    }
+
+    if (!ti || 3 == ti) {
+        rc = test_item3();
+        ret += (rc ? 1 : 0);
+        log_info("TI3  : %s\n", (rc ? "FAIL" : "PASS"));
+    }
+
+    if (!ti || 4 == ti) {
+        rc = test_item4();
+        ret += (rc ? 1 : 0);
+        log_info("TI4  : %s\n", (rc ? "FAIL" : "PASS"));
+    }
+
+    if (!ti || 5 == ti) {
+        rc = test_item5();
+        ret += (rc ? 1 : 0);
+        log_info("TI5  : %s\n", (rc ? "FAIL" : "PASS"));
+    }
+
+    if (!ti || 6 == ti) {
+        rc = test_item6();
+        ret += (rc ? 1 : 0);
+        log_info("TI6  : %s\n", (rc ? "FAIL" : "PASS"));
+    }
+
+    if (!ti || 7 == ti) {
+        rc = test_item7();
+        ret += (rc ? 1 : 0);
+        log_info("TI7  : %s\n", (rc ? "FAIL" : "PASS"));
+    }
+
+    if (PMI_SUCCESS != (rc = PMI_Finalize())) {
+        log_fatal("PMI_Finalize failed: %d\n", rc);
+        return rc;
+    }
+
+    return ret;
+}
+
+static int test_item1(void)
+{
+    int rc = 0;
+    int val = 0;
+
+    log_assert(spawned == PMI_FALSE || spawned == PMI_TRUE, "");
+
+    if (PMI_SUCCESS != (rc = PMI_Get_size(&size))) {
+        log_fatal("PMI_Get_Size failed: %d\n", rc);
+        return rc;
+    }
+    log_assert(size >= 0, "");
+
+    if (PMI_SUCCESS != (rc = PMI_Get_rank(&rank))) {
+        log_fatal("PMI_Get_Rank failed: %d\n", rc);
+        return rc;
+    }
+    log_assert(rank >= 0, "");
+    log_assert(rank < size, "");
+
+    if (PMI_SUCCESS != (rc = PMI_Get_appnum(&appnum))) {
+        log_fatal("PMI_Get_appnum failed: %d\n", rc);
+        return rc;
+    }
+
+    log_info("spawned=%d size=%d rank=%d appnum=%d\n", spawned, size, rank, appnum);
+
+    val = random_value(10, 100);
+    if (PMI_SUCCESS != (rc = PMI_Get_universe_size(&val))) {
+        log_fatal("PMI_Get_universe_size failed: %d\n", rc);
+        return rc;
+    }
+    log_assert(size == val, "");
+
+    val = random_value(10, 100);
+    if (PMI_SUCCESS != (rc = PMI_Get_id_length_max(&val))) {
+        log_fatal("PMI_Get_id_length_max failed: %d\n", rc);
+        return rc;
+    }
+    log_info("PMI_Get_id_length_max=%d\n", val);
+    if (!_legacy) {
+        log_assert(sizeof(jobid) == val, "Check PMIX_MAX_NSLEN value in pmix_common.h");
+    }
+
+    sprintf(jobid, "%s", __func__);
+    if (PMI_SUCCESS != (rc = PMI_Get_id(jobid, sizeof(jobid)))) {
+        log_fatal("PMI_Get_id failed: %d\n", rc);
+        return rc;
+    }
+
+    log_info("jobid=%s\n", jobid);
+    log_assert(memcmp(jobid, __func__, sizeof(__func__)), "");
+
+    sprintf(jobid, "%s", __func__);
+    if (PMI_SUCCESS != (rc = PMI_Get_kvs_domain_id(jobid, sizeof(jobid)))) {
+        log_fatal("PMI_Get_kvs_domain_id failed: %d\n", rc);
+        return rc;
+    }
+
+    log_info("PMI_Get_kvs_domain_id=%s\n", jobid);
+    log_assert(memcmp(jobid, __func__, sizeof(__func__)), "");
+
+    sprintf(jobid, "%s", __func__);
+    if (PMI_SUCCESS != (rc = PMI_KVS_Get_my_name(jobid, sizeof(jobid)))) {
+        log_fatal("PMI_KVS_Get_my_name failed: %d\n", rc);
+        return rc;
+    }
+
+    log_info("PMI_KVS_Get_my_name=%s\n", jobid);
+    log_assert(memcmp(jobid, __func__, sizeof(__func__)), "");
+
+    return rc;
+}
+
+static int test_item2(void)
+{
+    int rc = 0;
+    PMI_BOOL val;
+
+    if (PMI_SUCCESS != (rc = PMI_Initialized(&val))) {
+        log_fatal("PMI_Initialized failed: %d\n", rc);
+        return rc;
+    }
+    log_assert(PMI_TRUE == val, "");
+
+    return rc;
+}
+
+static int test_item3(void)
+{
+    int rc = 0;
+    int val = 0;
+
+    val = random_value(10, 100);
+    if (PMI_SUCCESS != (rc = PMI_KVS_Get_key_length_max(&val))) {
+        log_fatal("PMI_KVS_Get_key_length_max failed: %d\n", rc);
+        return rc;
+    }
+    log_info("PMI_KVS_Get_key_length_max=%d\n", val);
+    if (!_legacy) {
+        log_assert(511 == val, "Check PMIX_MAX_KEYLEN value in pmix_common.h");
+    }
+
+    val = random_value(10, 100);
+    if (PMI_SUCCESS != (rc = PMI_KVS_Get_value_length_max(&val))) {
+        log_fatal("PMI_KVS_Get_value_length_max failed: %d\n", rc);
+        return rc;
+    }
+    log_info("PMI_KVS_Get_value_length_max=%d\n", val);
+    if (!_legacy) {
+        log_assert(4096 == val, "Check limitation for a value");
+    }
+
+    return rc;
+}
+
+static int test_item4(void)
+{
+    int rc = 0;
+    int val = 0;
+    int *ranks = NULL;
+    int i = 0;
+
+    val = -1;
+    if (PMI_SUCCESS != (rc = PMI_Get_clique_size(&val))) {
+        log_fatal("PMI_Get_clique_size failed: %d\n", rc);
+        return rc;
+    }
+    log_info("PMI_Get_clique_size=%d\n", val);
+    log_assert((0 < val) && (val <= size), "");
+
+    ranks = alloca(val*sizeof(int));
+    if (!ranks) {
+        return PMI_FAIL;
+    }
+
+    memset(ranks, (-1), val*sizeof(int));
+    if (PMI_SUCCESS != (rc = PMI_Get_clique_ranks(ranks, val))) {
+        log_fatal("PMI_Get_clique_ranks failed: %d\n", rc);
+        return rc;
+    }
+
+    for (i = 0; i < val; i++) {
+        if (!((0 <= ranks[i]) && (ranks[i] < size))) {
+            log_fatal("found invalid value in ranks array: ranks[%d]=%d\n", i, ranks[i]);
+            return rc;
+        }
+    }
+
+    return rc;
+}
+
+static int test_item5(void)
+{
+    int rc = 0;
+    char *val = NULL;
+    int val_size = 0;
+    /* Predefined Job attributes */
+    const char *tkeys[] = {
+            "PMI_process_mapping",
+            NULL
+    };
+    const char **ptr = tkeys;
+
+    if (_legacy || !_legacy) {
+        log_error("%s\n", "PMIx and SLURM/PMI1 do not set 'PMI_process_mapping' (Do not mark test as failed)");
+        return rc;
+    }
+
+    if (PMI_SUCCESS != (rc = PMI_KVS_Get_value_length_max(&val_size))) {
+        log_fatal("PMI_KVS_Get_value_length_max failed: %d\n", rc);
+        return rc;
+    }
+
+    val = alloca(val_size);
+    if (!val) {
+        return PMI_FAIL;
+    }
+
+    while (*ptr) {
+        if (PMI_SUCCESS != (rc = PMI_KVS_Get(jobid, *ptr, val, val_size))) {
+            log_fatal("PMI_KVS_Get: [%s] %d\n", *ptr, rc);
+            return rc;
+        }
+        log_info("key=%s value=%.80s\n", *ptr, val);
+        ptr++;
+    }
+
+    return rc;
+}
+
+static int test_item6(void)
+{
+    int rc = 0;
+    char val[100];
+    const char *tkey = __func__;
+    const char *tval = __FILE__;
+
+    if (PMI_SUCCESS != (rc = PMI_KVS_Put(jobid, tkey, tval))) {
+        log_fatal("PMI_KVS_Put %d\n", rc);
+        return rc;
+    }
+
+    if (PMI_SUCCESS != (rc = PMI_KVS_Get(jobid, tkey, val, sizeof(val)))) {
+        log_fatal("PMI_KVS_Get %d\n", rc);
+        return rc;
+    }
+
+    log_info("tkey=%s tval=%s val=%s\n", tkey, tval, val);
+
+    log_assert(!strcmp(tval, val), "value does not meet expectation");
+
+    return rc;
+}
+
+static int test_item7(void)
+{
+    int rc = 0;
+    char tkey[100];
+    char tval[100];
+    char val[100];
+    int i = 0;
+
+    for (i = 0; i < size; i++) {
+        sprintf(tkey, "KEY-%d", i);
+        sprintf(tval, "VALUE-%d", i);
+        if (i == rank) {
+            if (PMI_SUCCESS != (rc = PMI_KVS_Put(jobid, tkey, tval))) {
+                log_fatal("PMI_KVS_Put [%s=%s] %d\n", tkey, tval, rc);
+                return rc;
+            }
+        }
+    }
+
+    if (PMI_SUCCESS != (rc = PMI_KVS_Commit(jobid))) {
+        log_fatal("PMI_KVS_Commit %d\n", rc);
+        return rc;
+    }
+
+    if (PMI_SUCCESS != (rc = PMI_Barrier())) {
+        log_fatal("PMI_Barrier %d\n", rc);
+        return rc;
+    }
+
+    for (i = 0; i < size; i++) {
+        sprintf(tkey, "KEY-%d", i);
+        sprintf(tval, "VALUE-%d", i);
+        if (PMI_SUCCESS != (rc = PMI_KVS_Get(jobid, tkey, val, sizeof(val)))) {
+            log_fatal("PMI_KVS_Get [%s=?] %d\n", tkey, rc);
+            return rc;
+        }
+
+        log_info("tkey=%s tval=%s val=%s\n", tkey, tval, val);
+
+        log_assert(!strcmp(tval, val), "value does not meet expectation");
+    }
+
+    return rc;
+}
diff --git a/test/pmix_client.c b/test/pmix_client.c
new file mode 100644
index 0000000..53c7117
--- /dev/null
+++ b/test/pmix_client.c
@@ -0,0 +1,236 @@
+/*
+ * Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2011 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2006-2013 Los Alamos National Security, LLC.
+ *                         All rights reserved.
+ * Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2011      Oak Ridge National Labs.  All rights reserved.
+ * Copyright (c) 2013-2016 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2015-2017 Mellanox Technologies, Inc.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ *
+ */
+#include <src/include/pmix_config.h>
+#include <pmix.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <time.h>
+
+#include "src/class/pmix_object.h"
+#include "src/buffer_ops/types.h"
+#include "test_common.h"
+#include "test_fence.h"
+#include "test_publish.h"
+#include "test_spawn.h"
+#include "test_cd.h"
+#include "test_resolve_peers.h"
+#include "test_error.h"
+#include "test_replace.h"
+#include "test_internal.h"
+
+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)
+{
+    TEST_ERROR(("PMIX client: Error handler with status = %d", status))
+}
+
+static void op_callbk(pmix_status_t status,
+               void *cbdata)
+{
+    TEST_VERBOSE(( "OP CALLBACK CALLED WITH STATUS %d", status));
+}
+
+static void errhandler_reg_callbk (pmix_status_t status,
+                                   size_t errhandler_ref,
+                                   void *cbdata)
+{
+    TEST_VERBOSE(("PMIX client ERRHANDLER REGISTRATION CALLBACK CALLED WITH STATUS %d, ref=%lu",
+                  status, (unsigned long)errhandler_ref));
+}
+
+int main(int argc, char **argv)
+{
+    int rc;
+    pmix_value_t value;
+    pmix_value_t *val = &value;
+    test_params params;
+    INIT_TEST_PARAMS(params);
+    pmix_proc_t myproc, proc;
+
+    parse_cmd(argc, argv, &params);
+
+    // We don't know rank at this place!
+    TEST_VERBOSE(("Client ns %s rank %d: Start", params.nspace, params.rank));
+
+    /* handle early-fail test case */
+    if (1 == params.early_fail && 0 == params.rank) {
+        exit(0);
+    }
+
+    /* init us */
+    if (PMIX_SUCCESS != (rc = PMIx_Init(&myproc, NULL, 0))) {
+        TEST_ERROR(("Client ns %s rank %d: PMIx_Init failed: %d", params.nspace, params.rank, rc));
+        FREE_TEST_PARAMS(params);
+        exit(0);
+    }
+    PMIx_Register_event_handler(NULL, 0, NULL, 0, errhandler, errhandler_reg_callbk, NULL);
+    if (myproc.rank != params.rank) {
+        TEST_ERROR(("Client ns %s Rank returned in PMIx_Init %d does not match to rank from command line %d.", myproc.nspace, myproc.rank, params.rank));
+        FREE_TEST_PARAMS(params);
+        exit(0);
+    }
+    if ( NULL != params.prefix && -1 != params.ns_id) {
+        TEST_SET_FILE(params.prefix, params.ns_id, params.rank);
+    }
+    TEST_VERBOSE((" Client ns %s rank %d: PMIx_Init success", myproc.nspace, myproc.rank));
+
+    (void)strncpy(proc.nspace, myproc.nspace, PMIX_MAX_NSLEN);
+    proc.rank = PMIX_RANK_WILDCARD;
+    if (PMIX_SUCCESS != (rc = PMIx_Get(&proc, PMIX_UNIV_SIZE, NULL, 0, &val))) {
+        TEST_ERROR(("rank %d: PMIx_Get universe size failed: %d", myproc.rank, rc));
+        FREE_TEST_PARAMS(params);
+        exit(0);
+    }
+    if (NULL == val) {
+        TEST_ERROR(("rank %d: PMIx_Get universe size returned NULL value", myproc.rank));
+        FREE_TEST_PARAMS(params);
+        exit(0);
+    }
+    if (val->type != PMIX_UINT32 || val->data.uint32 != (uint32_t)params.ns_size ) {
+        TEST_ERROR(("rank %d: Universe size value or type mismatch,"
+                    " want %d(%d) get %d(%d)",
+                    myproc.rank, params.ns_size, PMIX_UINT32,
+                    val->data.integer, val->type));
+        FREE_TEST_PARAMS(params);
+        exit(0);
+    }
+
+    TEST_VERBOSE(("rank %d: Universe size check: PASSED", myproc.rank));
+
+    if( NULL != params.nspace && 0 != strcmp(myproc.nspace, params.nspace) ) {
+        TEST_ERROR(("rank %d: Bad nspace!", myproc.rank));
+        FREE_TEST_PARAMS(params);
+        exit(0);
+    }
+
+    if (NULL != params.fences) {
+        rc = test_fence(params, myproc.nspace, myproc.rank);
+        if (PMIX_SUCCESS != rc) {
+            FREE_TEST_PARAMS(params);
+            TEST_ERROR(("%s:%d Fence test failed: %d", myproc.nspace, myproc.rank, rc));
+            exit(0);
+        }
+    }
+
+    if (0 != params.test_job_fence) {
+        rc = test_job_fence(params, myproc.nspace, myproc.rank);
+        if (PMIX_SUCCESS != rc) {
+            FREE_TEST_PARAMS(params);
+            TEST_ERROR(("%s:%d Job fence test failed: %d", myproc.nspace, myproc.rank, rc));
+            exit(0);
+        }
+    }
+
+    if (0 != params.test_publish) {
+        rc = test_publish_lookup(myproc.nspace, myproc.rank);
+        if (PMIX_SUCCESS != rc) {
+            FREE_TEST_PARAMS(params);
+            TEST_ERROR(("%s:%d Publish/Lookup test failed: %d", myproc.nspace, myproc.rank, rc));
+            exit(0);
+        }
+    }
+
+    if (0 != params.test_spawn) {
+        rc = test_spawn(myproc.nspace, myproc.rank);
+        if (PMIX_SUCCESS != rc) {
+            FREE_TEST_PARAMS(params);
+            TEST_ERROR(("%s:%d Spawn test failed: %d", myproc.nspace, myproc.rank, rc));
+            exit(0);
+        }
+    }
+
+    if (0 != params.test_connect) {
+        rc = test_connect_disconnect(myproc.nspace, myproc.rank);
+        if (PMIX_SUCCESS != rc) {
+            FREE_TEST_PARAMS(params);
+            TEST_ERROR(("%s:%d Connect/Disconnect test failed: %d", myproc.nspace, myproc.rank, rc));
+            exit(0);
+        }
+    }
+
+    if (0 != params.test_resolve_peers) {
+        rc = test_resolve_peers(myproc.nspace, myproc.rank, params);
+        if (PMIX_SUCCESS != rc) {
+            FREE_TEST_PARAMS(params);
+            TEST_ERROR(("%s:%d Resolve peers test failed: %d", myproc.nspace, myproc.rank, rc));
+            exit(0);
+        }
+    }
+
+    if (0 != params.test_error) {
+        rc = test_error(myproc.nspace, myproc.rank, params);
+        if (PMIX_SUCCESS != rc) {
+            FREE_TEST_PARAMS(params);
+            TEST_ERROR(("%s:%d error registration and event handling test failed: %d", myproc.nspace, myproc.rank, rc));
+            exit(0);
+        }
+    }
+
+    if (NULL != params.key_replace) {
+        rc = test_replace(myproc.nspace, myproc.rank, params);
+        if (PMIX_SUCCESS != rc) {
+            FREE_TEST_PARAMS(params);
+            TEST_ERROR(("%s:%d error key replace test failed: %d", myproc.nspace, myproc.rank, rc));
+            exit(0);
+        }
+    }
+
+    if (params.test_internal) {
+        rc = test_internal(myproc.nspace, myproc.rank, params);
+        if (PMIX_SUCCESS != rc) {
+            FREE_TEST_PARAMS(params);
+            TEST_ERROR(("%s:%d error key store internal test failed: %d", myproc.nspace, myproc.rank, rc));
+            exit(0);
+        }
+    }
+
+    TEST_VERBOSE(("Client ns %s rank %d: PASSED", myproc.nspace, myproc.rank));
+    PMIx_Deregister_event_handler(1, op_callbk, NULL);
+
+    /* In case of direct modex we want to delay Finalize
+       until everybody has finished. Otherwise some processes
+       will fail to get data from others who already exited */
+    PMIx_Fence(NULL, 0, NULL, 0);
+
+    /* finalize us */
+    TEST_VERBOSE(("Client ns %s rank %d: Finalizing", myproc.nspace, myproc.rank));
+    if (PMIX_SUCCESS != (rc = PMIx_Finalize(NULL, 0))) {
+        TEST_ERROR(("Client ns %s rank %d:PMIx_Finalize failed: %d", myproc.nspace, myproc.rank, rc));
+    } else {
+        TEST_VERBOSE(("Client ns %s rank %d:PMIx_Finalize successfully completed", myproc.nspace, myproc.rank));
+    }
+
+    TEST_OUTPUT_CLEAR(("OK\n"));
+    TEST_CLOSE_FILE();
+    FREE_TEST_PARAMS(params);
+    exit(0);
+}
diff --git a/test/pmix_client_otheruser.sh b/test/pmix_client_otheruser.sh
new file mode 100755
index 0000000..c4aa638
--- /dev/null
+++ b/test/pmix_client_otheruser.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+OTHERUSER=dummy
+
+# To test sec:native we run client as a different user e.g.
+#
+#  ./pmix_test -e ./pmix_client_otheruser.sh
+#
+# Prerequisites:
+# - ensure directories leading up to source tree are o+x
+# - add dummy user and set OTHERUSER to its name
+# - give yourself passwordless sudo capability to that user
+#
+# The test should fail with message similar to
+#   PMIX ERROR: INVALID-CREDENTIAL in file
+#       ../src/server/pmix_server_listener.c at line 524
+#
+
+sudo --user $OTHERUSER --preserve-env ./pmix_client $*
diff --git a/test/pmix_regex.c b/test/pmix_regex.c
new file mode 100644
index 0000000..027f6fc
--- /dev/null
+++ b/test/pmix_regex.c
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2011 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2006-2013 Los Alamos National Security, LLC.
+ *                         All rights reserved.
+ * Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2011      Oak Ridge National Labs.  All rights reserved.
+ * Copyright (c) 2013-2015 Intel, Inc.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#include "src/util/argv.h"
+#include "src/util/pmix_environ.h"
+#include "src/util/output.h"
+#include "src/server/pmix_server_ops.h"
+
+#include "server_callbacks.h"
+#include "utils.h"
+
+#define TEST_NODES "odin001,odin002,odin003,odin010,odin011,odin075"
+#define TEST_PROCS "1,2,3,4;5-8;9,11-12;17-20;21-24;100"
+
+int main(int argc, char **argv)
+{
+    char *regex;
+    char **nodes, **procs;
+    pmix_status_t rc;
+
+    /* smoke test */
+    if (PMIX_SUCCESS != 0) {
+        TEST_ERROR(("ERROR IN COMPUTING CONSTANTS: PMIX_SUCCESS = %d", PMIX_SUCCESS));
+        exit(1);
+    }
+
+    TEST_VERBOSE(("Testing version %s", PMIx_Get_version()));
+
+    TEST_VERBOSE(("Start PMIx regex smoke test"));
+
+    fprintf(stderr, "NODES: %s\n", TEST_NODES);
+    PMIx_generate_regex(TEST_NODES, &regex);
+    fprintf(stderr, "REGEX: %s\n\n", regex);
+    /* test reverse parsing */
+    rc = pmix_regex_parse_nodes(regex, &nodes);
+    free(regex);
+    if (PMIX_SUCCESS == rc) {
+        regex = pmix_argv_join(nodes, ',');
+        pmix_argv_free(nodes);
+        fprintf(stderr, "NODES: %s\n", TEST_NODES);
+        fprintf(stderr, "RSULT: %s\n\n\n", regex);
+        free(regex);
+    } else {
+        fprintf(stderr, "Node reverse failed: %d\n\n\n", rc);
+    }
+
+    fprintf(stderr, "PROCS: %s\n", TEST_PROCS);
+    PMIx_generate_ppn(TEST_PROCS, &regex);
+    fprintf(stderr, "PPN: %s\n\n", regex);
+    /* test reverse parsing */
+    rc = pmix_regex_parse_procs(regex, &procs);
+    free(regex);
+    if (PMIX_SUCCESS == rc) {
+        regex = pmix_argv_join(procs, ';');
+        pmix_argv_free(procs);
+        fprintf(stderr, "PROCS: %s\n", TEST_PROCS);
+        fprintf(stderr, "RSULT: %s\n", regex);
+        free(regex);
+    } else {
+        fprintf(stderr, "PPN reverse failed: %d\n", rc);
+    }
+
+    return 0;
+}
+
diff --git a/test/pmix_test.c b/test/pmix_test.c
new file mode 100644
index 0000000..6969c55
--- /dev/null
+++ b/test/pmix_test.c
@@ -0,0 +1,206 @@
+/*
+ * Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2011 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2006-2013 Los Alamos National Security, LLC.
+ *                         All rights reserved.
+ * Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2011      Oak Ridge National Labs.  All rights reserved.
+ * Copyright (c) 2013-2016 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2015      Mellanox Technologies, Inc.
+ *                         All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#include "src/util/pmix_environ.h"
+#include "src/util/output.h"
+
+#include "server_callbacks.h"
+#include "utils.h"
+#include "src/include/pmix_globals.h"
+
+bool spawn_wait = false;
+
+int main(int argc, char **argv)
+{
+    char **client_env=NULL;
+    char **client_argv=NULL;
+    int rc;
+    struct stat stat_buf;
+    struct timeval tv;
+    double test_start;
+    cli_state_t order[CLI_TERM+1];
+    test_params params;
+    INIT_TEST_PARAMS(params);
+    int test_fail = 0;
+    char *tmp;
+    int ns_nprocs;
+
+    gettimeofday(&tv, NULL);
+    test_start = tv.tv_sec + 1E-6*tv.tv_usec;
+
+    /* smoke test */
+    if (PMIX_SUCCESS != 0) {
+        TEST_ERROR(("ERROR IN COMPUTING CONSTANTS: PMIX_SUCCESS = %d", PMIX_SUCCESS));
+        exit(1);
+    }
+
+    TEST_VERBOSE(("Testing version %s", PMIx_Get_version()));
+
+    parse_cmd(argc, argv, &params);
+    TEST_VERBOSE(("Start PMIx_lite smoke test (timeout is %d)", params.timeout));
+
+    /* verify executable */
+    if( 0 > ( rc = stat(params.binary, &stat_buf) ) ){
+        TEST_ERROR(("Cannot stat() executable \"%s\": %d: %s", params.binary, errno, strerror(errno)));
+        FREE_TEST_PARAMS(params);
+        return 0;
+    } else if( !S_ISREG(stat_buf.st_mode) ){
+        TEST_ERROR(("Client executable \"%s\": is not a regular file", params.binary));
+        FREE_TEST_PARAMS(params);
+        return 0;
+    }else if( !(stat_buf.st_mode & S_IXUSR) ){
+        TEST_ERROR(("Client executable \"%s\": has no executable flag", params.binary));
+        FREE_TEST_PARAMS(params);
+        return 0;
+    }
+
+    /* setup the server library */
+    pmix_info_t info[1];
+    (void)strncpy(info[0].key, PMIX_SOCKET_MODE, PMIX_MAX_KEYLEN);
+    info[0].value.type = PMIX_UINT32;
+    info[0].value.data.uint32 = 0666;
+
+    if (PMIX_SUCCESS != (rc = PMIx_server_init(&mymodule, info, 1))) {
+        TEST_ERROR(("Init failed with error %d", rc));
+        FREE_TEST_PARAMS(params);
+        return rc;
+    }
+    /* register the errhandler */
+    PMIx_Register_event_handler(NULL, 0, NULL, 0,
+                                errhandler, errhandler_reg_callbk, NULL);
+
+    order[CLI_UNINIT] = CLI_FORKED;
+    order[CLI_FORKED] = CLI_FIN;
+    order[CLI_CONNECTED] = CLI_UNDEF;
+    order[CLI_FIN] = CLI_TERM;
+    order[CLI_DISCONN] = CLI_UNDEF;
+    order[CLI_TERM] = CLI_UNDEF;
+    cli_init(params.nprocs, order);
+
+    /* set common argv and env */
+    client_env = pmix_argv_copy(environ);
+    set_client_argv(&params, &client_argv);
+
+    tmp = pmix_argv_join(client_argv, ' ');
+    TEST_VERBOSE(("Executing test: %s", tmp));
+    free(tmp);
+
+    int launched = 0;
+    /* set namespaces and fork clients */
+    if (NULL == params.ns_dist) {
+        /* we have a single namespace for all clients */
+        ns_nprocs = params.nprocs;
+        rc = launch_clients(ns_nprocs, params.binary, &client_env, &client_argv);
+        if (PMIX_SUCCESS != rc) {
+            FREE_TEST_PARAMS(params);
+            return rc;
+        }
+        launched += ns_nprocs;
+    } else {
+        char *pch;
+        pch = strtok(params.ns_dist, ":");
+        while (NULL != pch) {
+            ns_nprocs = (int)strtol(pch, NULL, 10);
+            if (params.nprocs < (uint32_t)(launched+ns_nprocs)) {
+                TEST_ERROR(("Total number of processes doesn't correspond number specified by ns_dist parameter."));
+                FREE_TEST_PARAMS(params);
+                return PMIX_ERROR;
+            }
+            if (0 < ns_nprocs) {
+                rc = launch_clients(ns_nprocs, params.binary, &client_env, &client_argv);
+                if (PMIX_SUCCESS != rc) {
+                    FREE_TEST_PARAMS(params);
+                    return rc;
+                }
+            }
+            pch = strtok (NULL, ":");
+            launched += ns_nprocs;
+        }
+    }
+    if (params.nprocs != (uint32_t)launched) {
+        TEST_ERROR(("Total number of processes doesn't correspond number specified by ns_dist parameter."));
+        cli_kill_all();
+        test_fail = 1;
+    }
+
+    /* hang around until the client(s) finalize */
+    while (!test_terminated()) {
+        // To avoid test hang we want to interrupt the loop each 0.1s
+        double test_current;
+
+        // check if we exceed the max time
+        gettimeofday(&tv, NULL);
+        test_current = tv.tv_sec + 1E-6*tv.tv_usec;
+        if( (test_current - test_start) > params.timeout ){
+            break;
+        }
+        cli_wait_all(0);
+    }
+
+    if( !test_terminated() ){
+        TEST_ERROR(("Test exited by a timeout!"));
+        cli_kill_all();
+        test_fail = 1;
+    }
+
+    if( test_abort ){
+        TEST_ERROR(("Test was aborted!"));
+        cli_kill_all();
+        test_fail = 1;
+    }
+
+    if (0 != params.test_spawn) {
+        PMIX_WAIT_FOR_COMPLETION(spawn_wait);
+    }
+
+    pmix_argv_free(client_argv);
+    pmix_argv_free(client_env);
+
+    /* deregister the errhandler */
+    PMIx_Deregister_event_handler(0, op_callbk, NULL);
+
+    cli_wait_all(1.0);
+
+    /* finalize the server library */
+    if (PMIX_SUCCESS != (rc = PMIx_server_finalize())) {
+        TEST_ERROR(("Finalize failed with error %d", rc));
+    }
+
+    FREE_TEST_PARAMS(params);
+
+    if (0 == test_fail) {
+        TEST_OUTPUT(("Test finished OK!"));
+    }
+
+    return test_fail;
+}
+
diff --git a/test/server_callbacks.c b/test/server_callbacks.c
new file mode 100644
index 0000000..df5c576
--- /dev/null
+++ b/test/server_callbacks.c
@@ -0,0 +1,348 @@
+/*
+ * Copyright (c) 2015-2016 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2015      Mellanox Technologies, Inc.
+ *                         All rights reserved.
+ * Copyright (c) 2016      IBM Corporation.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ *
+ */
+
+#include <pthread.h>
+#include "server_callbacks.h"
+#include "src/util/argv.h"
+
+extern int spawn_wait;
+
+pmix_server_module_t mymodule = {
+    .client_connected = connected,
+    .client_finalized = finalized,
+    .abort = abort_fn,
+    .fence_nb = fencenb_fn,
+    .direct_modex = dmodex_fn,
+    .publish = publish_fn,
+    .lookup = lookup_fn,
+    .unpublish = unpublish_fn,
+    .spawn = spawn_fn,
+    .connect = connect_fn,
+    .disconnect = disconnect_fn,
+    .register_events = regevents_fn,
+    .deregister_events = deregevents_fn
+};
+
+typedef struct {
+    pmix_list_item_t super;
+    pmix_modex_data_t data;
+} pmix_test_data_t;
+
+static void pcon(pmix_test_data_t *p)
+{
+    p->data.blob = NULL;
+    p->data.size = 0;
+}
+
+static void pdes(pmix_test_data_t *p)
+{
+    if (NULL != p->data.blob) {
+        free(p->data.blob);
+    }
+}
+
+PMIX_CLASS_INSTANCE(pmix_test_data_t,
+                    pmix_list_item_t,
+                    pcon, pdes);
+
+typedef struct {
+    pmix_list_item_t super;
+    pmix_info_t data;
+    char *namespace_published;
+    int rank_published;
+} pmix_test_info_t;
+
+static void tcon(pmix_test_info_t *p)
+{
+    PMIX_INFO_CONSTRUCT(&p->data);
+}
+
+static void tdes(pmix_test_info_t *p)
+{
+    PMIX_INFO_DESTRUCT(&p->data);
+}
+
+PMIX_CLASS_INSTANCE(pmix_test_info_t,
+                          pmix_list_item_t,
+                          tcon, tdes);
+
+pmix_list_t *pmix_test_published_list = NULL;
+
+static int finalized_count = 0;
+
+pmix_status_t connected(const pmix_proc_t *proc, void *server_object,
+                        pmix_op_cbfunc_t cbfunc, void *cbdata)
+{
+    if (NULL != cbfunc) {
+        cbfunc(PMIX_SUCCESS, cbdata);
+    }
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t finalized(const pmix_proc_t *proc, void *server_object,
+              pmix_op_cbfunc_t cbfunc, void *cbdata)
+{
+    if( CLI_TERM <= cli_info[proc->rank].state ){
+        TEST_ERROR(("double termination of rank %d", proc->rank));
+        return PMIX_SUCCESS;
+    }
+    TEST_VERBOSE(("Rank %d terminated", proc->rank));
+    cli_finalize(&cli_info[proc->rank]);
+    finalized_count++;
+    if (finalized_count == cli_info_cnt) {
+        if (NULL != pmix_test_published_list) {
+            PMIX_LIST_RELEASE(pmix_test_published_list);
+        }
+    }
+    if (NULL != cbfunc) {
+        cbfunc(PMIX_SUCCESS, cbdata);
+    }
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t abort_fn(const pmix_proc_t *proc, void *server_object,
+             int status, const char msg[],
+             pmix_proc_t procs[], size_t nprocs,
+             pmix_op_cbfunc_t cbfunc, void *cbdata)
+{
+    if (NULL != cbfunc) {
+        cbfunc(PMIX_SUCCESS, cbdata);
+    }
+    TEST_VERBOSE(("Abort is called with status = %d, msg = %s",
+                  status, msg));
+    test_abort = true;
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t fencenb_fn(const pmix_proc_t procs[], size_t nprocs,
+               const pmix_info_t info[], size_t ninfo,
+               char *data, size_t ndata,
+               pmix_modex_cbfunc_t cbfunc, void *cbdata)
+{
+    TEST_VERBOSE(("Getting data for %s:%d",
+                  procs[0].nspace, procs[0].rank));
+
+    /* In a perfect world, we should wait until
+     * the test servers from all involved procs
+     * respond. We don't have multi-server capability
+     * yet, so we'll just respond right away and
+     * return what we were given */
+
+    if (NULL != cbfunc) {
+        cbfunc(PMIX_SUCCESS, data, ndata, cbdata, NULL, NULL);
+    }
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t dmodex_fn(const pmix_proc_t *proc,
+              const pmix_info_t info[], size_t ninfo,
+              pmix_modex_cbfunc_t cbfunc, void *cbdata)
+{
+    TEST_VERBOSE(("Getting data for %s:%d", proc->nspace, proc->rank));
+
+    /* In a perfect world, we should call another server
+     * to get the data for one of its clients. We don't
+     * have multi-server capability yet, so we'll just
+     * respond right away */
+
+    if (NULL != cbfunc) {
+        cbfunc(PMIX_ERR_NOT_FOUND, NULL, 0, cbdata, NULL, NULL);
+    }
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t publish_fn(const pmix_proc_t *proc,
+               const pmix_info_t info[], size_t ninfo,
+               pmix_op_cbfunc_t cbfunc, void *cbdata)
+{
+    size_t i;
+    int found;
+    pmix_test_info_t *new_info, *old_info;
+    if (NULL == pmix_test_published_list) {
+        pmix_test_published_list = PMIX_NEW(pmix_list_t);
+    }
+    for (i = 0; i < ninfo; i++) {
+        found = 0;
+        PMIX_LIST_FOREACH(old_info, pmix_test_published_list, pmix_test_info_t) {
+            if (!strcmp(old_info->data.key, info[i].key)) {
+                found = 1;
+                break;
+            }
+        }
+        if (!found) {
+            new_info = PMIX_NEW(pmix_test_info_t);
+            strncpy(new_info->data.key, info[i].key, strlen(info[i].key)+1);
+            pmix_value_xfer(&new_info->data.value, (pmix_value_t*)&info[i].value);
+            new_info->namespace_published = strdup(proc->nspace);
+            new_info->rank_published = proc->rank;
+            pmix_list_append(pmix_test_published_list, &new_info->super);
+        }
+    }
+    if (NULL != cbfunc) {
+        cbfunc(PMIX_SUCCESS, cbdata);
+    }
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t lookup_fn(const pmix_proc_t *proc, char **keys,
+              const pmix_info_t info[], size_t ninfo,
+              pmix_lookup_cbfunc_t cbfunc, void *cbdata)
+{
+    size_t i, ndata, ret;
+    pmix_pdata_t *pdata;
+    pmix_test_info_t *tinfo;
+    if (NULL == pmix_test_published_list) {
+        return PMIX_ERR_NOT_FOUND;
+    }
+    ndata = pmix_argv_count(keys);
+    PMIX_PDATA_CREATE(pdata, ndata);
+    ret = 0;
+    for (i = 0; i < ndata; i++) {
+        PMIX_LIST_FOREACH(tinfo, pmix_test_published_list, pmix_test_info_t) {
+            if (0 == strcmp(tinfo->data.key, keys[i])) {
+                (void)strncpy(pdata[i].proc.nspace, tinfo->namespace_published, PMIX_MAX_NSLEN);
+                pdata[i].proc.rank = tinfo->rank_published;
+                (void)strncpy(pdata[i].key, keys[i], strlen(keys[i])+1);
+                pmix_value_xfer(&pdata[i].value, &tinfo->data.value);
+                ret++;
+                break;
+            }
+        }
+    }
+    if (NULL != cbfunc) {
+        cbfunc((ret == ndata) ? PMIX_SUCCESS : PMIX_ERR_NOT_FOUND, pdata, ndata, cbdata);
+    }
+    PMIX_PDATA_FREE(pdata, ndata);
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t unpublish_fn(const pmix_proc_t *proc, char **keys,
+                 const pmix_info_t info[], size_t ninfo,
+                 pmix_op_cbfunc_t cbfunc, void *cbdata)
+{
+    size_t i;
+    pmix_test_info_t *iptr, *next;
+    if (NULL == pmix_test_published_list) {
+        return PMIX_ERR_NOT_FOUND;
+    }
+    PMIX_LIST_FOREACH_SAFE(iptr, next, pmix_test_published_list, pmix_test_info_t) {
+        if (1) {  // if data posted by this process
+            if (NULL == keys) {
+                pmix_list_remove_item(pmix_test_published_list, &iptr->super);
+                PMIX_RELEASE(iptr);
+            } else {
+                ninfo = pmix_argv_count(keys);
+                for (i = 0; i < ninfo; i++) {
+                    if (!strcmp(iptr->data.key, keys[i])) {
+                        pmix_list_remove_item(pmix_test_published_list, &iptr->super);
+                        PMIX_RELEASE(iptr);
+                        break;
+                    }
+                }
+            }
+        }
+    }
+    if (NULL != cbfunc) {
+        cbfunc(PMIX_SUCCESS, cbdata);
+    }
+    return PMIX_SUCCESS;
+}
+
+typedef struct {
+    pmix_status_t status;
+    pmix_spawn_cbfunc_t cbfunc;
+    void *cbdata;
+} release_cbdata;
+
+
+static void * _release_cb(void *arg)
+{
+    release_cbdata *cb = (release_cbdata*)arg;
+    if (NULL != cb->cbfunc) {
+        cb->cbfunc(cb->status, "foobar", cb->cbdata);
+    }
+    free(cb);
+    spawn_wait = false;
+    pthread_exit(NULL);
+}
+
+static void release_cb(pmix_status_t status, void *cbdata)
+{
+    pthread_t thread;
+
+    if (0 > pthread_create(&thread, NULL, _release_cb, cbdata)) {
+        spawn_wait = false;
+        return;
+    }
+    pthread_detach(thread);
+}
+
+pmix_status_t spawn_fn(const pmix_proc_t *proc,
+             const pmix_info_t job_info[], size_t ninfo,
+             const pmix_app_t apps[], size_t napps,
+             pmix_spawn_cbfunc_t cbfunc, void *cbdata)
+{
+    release_cbdata *cb = malloc(sizeof(release_cbdata));
+
+    cb->status = PMIX_SUCCESS;
+    cb->cbfunc = cbfunc;
+    cb->cbdata = cbdata;
+
+    spawn_wait = true;
+    PMIx_server_register_nspace("foobar", napps, NULL, 0, release_cb, (void*)cb);
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t connect_fn(const pmix_proc_t procs[], size_t nprocs,
+               const pmix_info_t info[], size_t ninfo,
+               pmix_op_cbfunc_t cbfunc, void *cbdata)
+{
+    if (NULL != cbfunc) {
+        /* return PMIX_EXISTS here just to ensure we get the correct status on the client */
+        cbfunc(PMIX_EXISTS, cbdata);
+    }
+   return PMIX_SUCCESS;
+}
+
+pmix_status_t disconnect_fn(const pmix_proc_t procs[], size_t nprocs,
+                  const pmix_info_t info[], size_t ninfo,
+                  pmix_op_cbfunc_t cbfunc, void *cbdata)
+{
+    if (NULL != cbfunc) {
+        cbfunc(PMIX_SUCCESS, cbdata);
+    }
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t regevents_fn (pmix_status_t *codes, size_t ncodes,
+                           const pmix_info_t info[], size_t ninfo,
+                           pmix_op_cbfunc_t cbfunc, void *cbdata)
+{
+    TEST_VERBOSE ((" pmix host server regevents_fn called "));
+    if (NULL != cbfunc) {
+        cbfunc(PMIX_SUCCESS, cbdata);
+    }
+    return PMIX_SUCCESS;
+}
+
+pmix_status_t deregevents_fn (pmix_status_t *codes, size_t ncodes,
+                             pmix_op_cbfunc_t cbfunc, void *cbdata)
+{
+    TEST_VERBOSE ((" pmix host server deregevents_fn called "));
+    if (NULL != cbfunc) {
+        cbfunc(PMIX_SUCCESS, cbdata);
+    }
+    return PMIX_SUCCESS;
+}
diff --git a/test/server_callbacks.h b/test/server_callbacks.h
new file mode 100644
index 0000000..df0d5ca
--- /dev/null
+++ b/test/server_callbacks.h
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2015-2016 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2015      Mellanox Technologies, Inc.
+ *                         All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ *
+ */
+
+#ifndef PMIX_SERVER_CALLBACK_H
+#define PMIX_SERVER_CALLBACK_H
+
+#include "cli_stages.h"
+
+pmix_status_t connected(const pmix_proc_t *proc, void *server_object,
+                        pmix_op_cbfunc_t cbfunc, void *cbdata);
+pmix_status_t finalized(const pmix_proc_t *proc, void *server_object,
+                        pmix_op_cbfunc_t cbfunc, void *cbdata);
+pmix_status_t abort_fn(const pmix_proc_t *proc,
+                       void *server_object,
+                       int status, const char msg[],
+                       pmix_proc_t procs[], size_t nprocs,
+                       pmix_op_cbfunc_t cbfunc, void *cbdata);
+pmix_status_t fencenb_fn(const pmix_proc_t procs[], size_t nprocs,
+                         const pmix_info_t info[], size_t ninfo,
+                         char *data, size_t ndata,
+                         pmix_modex_cbfunc_t cbfunc, void *cbdata);
+pmix_status_t dmodex_fn(const pmix_proc_t *proc,
+                        const pmix_info_t info[], size_t ninfo,
+                        pmix_modex_cbfunc_t cbfunc, void *cbdata);
+pmix_status_t publish_fn(const pmix_proc_t *proc,
+                         const pmix_info_t info[], size_t ninfo,
+                         pmix_op_cbfunc_t cbfunc, void *cbdata);
+pmix_status_t lookup_fn(const pmix_proc_t *proc, char **keys,
+                        const pmix_info_t info[], size_t ninfo,
+                        pmix_lookup_cbfunc_t cbfunc, void *cbdata);
+pmix_status_t unpublish_fn(const pmix_proc_t *proc, char **keys,
+                           const pmix_info_t info[], size_t ninfo,
+                           pmix_op_cbfunc_t cbfunc, void *cbdata);
+pmix_status_t spawn_fn(const pmix_proc_t *proc,
+                       const pmix_info_t job_info[], size_t ninfo,
+                       const pmix_app_t apps[], size_t napps,
+                       pmix_spawn_cbfunc_t cbfunc, void *cbdata);
+pmix_status_t connect_fn(const pmix_proc_t procs[], size_t nprocs,
+                         const pmix_info_t info[], size_t ninfo,
+                         pmix_op_cbfunc_t cbfunc, void *cbdata);
+pmix_status_t disconnect_fn(const pmix_proc_t procs[], size_t nprocs,
+                            const pmix_info_t info[], size_t ninfo,
+                            pmix_op_cbfunc_t cbfunc, void *cbdata);
+pmix_status_t regevents_fn(pmix_status_t *codes, size_t ncodes,
+                           const pmix_info_t info[], size_t ninfo,
+                           pmix_op_cbfunc_t cbfunc, void *cbdata);
+pmix_status_t deregevents_fn(pmix_status_t *codes, size_t ncodes,
+                             pmix_op_cbfunc_t cbfunc, void *cbdata);
+extern pmix_server_module_t mymodule;
+
+#endif
diff --git a/test/simple/Makefile.am b/test/simple/Makefile.am
new file mode 100644
index 0000000..32f93de
--- /dev/null
+++ b/test/simple/Makefile.am
@@ -0,0 +1,78 @@
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2006-2010 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2012-2013 Los Alamos National Security, Inc.  All rights reserved.
+# Copyright (c) 2013-2017 Intel, Inc. All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+AM_CPPFLAGS = -I$(top_builddir)/src -I$(top_builddir)/src/include -I$(top_builddir)/include -I$(top_builddir)/include/pmix
+
+noinst_PROGRAMS = simptest simpclient simppub simpdyn simpft simpdmodex test_pmix simptool simpdie
+
+simptest_SOURCES = \
+        simptest.c
+simptest_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
+simptest_LDADD = \
+    $(top_builddir)/src/libpmix.la
+
+simpclient_SOURCES = \
+        simpclient.c
+simpclient_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
+simpclient_LDADD = \
+    $(top_builddir)/src/libpmix.la
+
+simppub_SOURCES = \
+        simppub.c
+simppub_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
+simppub_LDADD = \
+    $(top_builddir)/src/libpmix.la
+
+simpdmodex_SOURCES = \
+        simpdmodex.c
+simpdmodex_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
+simpdmodex_LDADD = \
+    $(top_builddir)/src/libpmix.la
+
+simpft_SOURCES = \
+        simpft.c
+simpft_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
+simpft_LDADD = \
+    $(top_builddir)/src/libpmix.la
+
+simpdyn_SOURCES = \
+        simpdyn.c
+simpdyn_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
+simpdyn_LDADD = \
+    $(top_builddir)/src/libpmix.la
+
+test_pmix_SOURCES = \
+        test_pmix.c
+test_pmix_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
+test_pmix_LDADD = \
+    $(top_builddir)/src/libpmix.la
+
+simptool_SOURCES = \
+        simptool.c
+simptool_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
+simptool_LDADD = \
+    $(top_builddir)/src/libpmix.la
+
+simpdie_SOURCES = \
+        simpdie.c
+simpdie_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
+simpdie_LDADD = \
+    $(top_builddir)/src/libpmix.la
diff --git a/test/simple/Makefile.in b/test/simple/Makefile.in
new file mode 100644
index 0000000..31fd8e6
--- /dev/null
+++ b/test/simple/Makefile.in
@@ -0,0 +1,934 @@
+# Makefile.in generated by automake 1.15 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2006-2010 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2012-2013 Los Alamos National Security, Inc.  All rights reserved.
+# Copyright (c) 2013-2017 Intel, Inc. All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+noinst_PROGRAMS = simptest$(EXEEXT) simpclient$(EXEEXT) \
+	simppub$(EXEEXT) simpdyn$(EXEEXT) simpft$(EXEEXT) \
+	simpdmodex$(EXEEXT) test_pmix$(EXEEXT) simptool$(EXEEXT) \
+	simpdie$(EXEEXT)
+subdir = test/simple
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/config/c_get_alignment.m4 \
+	$(top_srcdir)/config/libtool.m4 \
+	$(top_srcdir)/config/ltoptions.m4 \
+	$(top_srcdir)/config/ltsugar.m4 \
+	$(top_srcdir)/config/ltversion.m4 \
+	$(top_srcdir)/config/lt~obsolete.m4 \
+	$(top_srcdir)/config/pmix.m4 \
+	$(top_srcdir)/config/pmix_check_attributes.m4 \
+	$(top_srcdir)/config/pmix_check_broken_qsort.m4 \
+	$(top_srcdir)/config/pmix_check_compiler_version.m4 \
+	$(top_srcdir)/config/pmix_check_icc.m4 \
+	$(top_srcdir)/config/pmix_check_ident.m4 \
+	$(top_srcdir)/config/pmix_check_lock.m4 \
+	$(top_srcdir)/config/pmix_check_os_flavors.m4 \
+	$(top_srcdir)/config/pmix_check_package.m4 \
+	$(top_srcdir)/config/pmix_check_psm2.m4 \
+	$(top_srcdir)/config/pmix_check_pthread_pids.m4 \
+	$(top_srcdir)/config/pmix_check_vendor.m4 \
+	$(top_srcdir)/config/pmix_check_visibility.m4 \
+	$(top_srcdir)/config/pmix_check_withdir.m4 \
+	$(top_srcdir)/config/pmix_config_asm.m4 \
+	$(top_srcdir)/config/pmix_config_pthreads.m4 \
+	$(top_srcdir)/config/pmix_config_subdir.m4 \
+	$(top_srcdir)/config/pmix_config_subdir_args.m4 \
+	$(top_srcdir)/config/pmix_config_threads.m4 \
+	$(top_srcdir)/config/pmix_ensure_contains_optflags.m4 \
+	$(top_srcdir)/config/pmix_functions.m4 \
+	$(top_srcdir)/config/pmix_load_platform.m4 \
+	$(top_srcdir)/config/pmix_mca.m4 \
+	$(top_srcdir)/config/pmix_search_libs.m4 \
+	$(top_srcdir)/config/pmix_setup_cc.m4 \
+	$(top_srcdir)/config/pmix_setup_libevent.m4 \
+	$(top_srcdir)/config/pmix_setup_zlib.m4 \
+	$(top_srcdir)/config/pmix_try_assemble.m4 \
+	$(top_srcdir)/config/autogen_found_items.m4 \
+	$(top_srcdir)/src/mca/pdl/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/configure.m4 \
+	$(top_srcdir)/src/mca/pdl/pdlopen/configure.m4 \
+	$(top_srcdir)/src/mca/pdl/plibltdl/configure.m4 \
+	$(top_srcdir)/src/mca/pif/bsdx_ipv4/configure.m4 \
+	$(top_srcdir)/src/mca/pif/bsdx_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pif/linux_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pif/posix_ipv4/configure.m4 \
+	$(top_srcdir)/src/mca/pif/solaris_ipv6/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/config/configure.m4 \
+	$(top_srcdir)/src/mca/pinstalldirs/env/configure.m4 \
+	$(top_srcdir)/src/mca/pnet/opa/configure.m4 \
+	$(top_srcdir)/src/mca/psec/munge/configure.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/src/include/pmix_config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+PROGRAMS = $(noinst_PROGRAMS)
+am_simpclient_OBJECTS = simpclient.$(OBJEXT)
+simpclient_OBJECTS = $(am_simpclient_OBJECTS)
+simpclient_DEPENDENCIES = $(top_builddir)/src/libpmix.la
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+simpclient_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(simpclient_LDFLAGS) $(LDFLAGS) -o $@
+am_simpdie_OBJECTS = simpdie.$(OBJEXT)
+simpdie_OBJECTS = $(am_simpdie_OBJECTS)
+simpdie_DEPENDENCIES = $(top_builddir)/src/libpmix.la
+simpdie_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(simpdie_LDFLAGS) $(LDFLAGS) -o $@
+am_simpdmodex_OBJECTS = simpdmodex.$(OBJEXT)
+simpdmodex_OBJECTS = $(am_simpdmodex_OBJECTS)
+simpdmodex_DEPENDENCIES = $(top_builddir)/src/libpmix.la
+simpdmodex_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(simpdmodex_LDFLAGS) $(LDFLAGS) -o $@
+am_simpdyn_OBJECTS = simpdyn.$(OBJEXT)
+simpdyn_OBJECTS = $(am_simpdyn_OBJECTS)
+simpdyn_DEPENDENCIES = $(top_builddir)/src/libpmix.la
+simpdyn_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(simpdyn_LDFLAGS) $(LDFLAGS) -o $@
+am_simpft_OBJECTS = simpft.$(OBJEXT)
+simpft_OBJECTS = $(am_simpft_OBJECTS)
+simpft_DEPENDENCIES = $(top_builddir)/src/libpmix.la
+simpft_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(simpft_LDFLAGS) $(LDFLAGS) -o $@
+am_simppub_OBJECTS = simppub.$(OBJEXT)
+simppub_OBJECTS = $(am_simppub_OBJECTS)
+simppub_DEPENDENCIES = $(top_builddir)/src/libpmix.la
+simppub_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(simppub_LDFLAGS) $(LDFLAGS) -o $@
+am_simptest_OBJECTS = simptest.$(OBJEXT)
+simptest_OBJECTS = $(am_simptest_OBJECTS)
+simptest_DEPENDENCIES = $(top_builddir)/src/libpmix.la
+simptest_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(simptest_LDFLAGS) $(LDFLAGS) -o $@
+am_simptool_OBJECTS = simptool.$(OBJEXT)
+simptool_OBJECTS = $(am_simptool_OBJECTS)
+simptool_DEPENDENCIES = $(top_builddir)/src/libpmix.la
+simptool_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(simptool_LDFLAGS) $(LDFLAGS) -o $@
+am_test_pmix_OBJECTS = test_pmix.$(OBJEXT)
+test_pmix_OBJECTS = $(am_test_pmix_OBJECTS)
+test_pmix_DEPENDENCIES = $(top_builddir)/src/libpmix.la
+test_pmix_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(test_pmix_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/src/include
+depcomp = $(SHELL) $(top_srcdir)/./config/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(simpclient_SOURCES) $(simpdie_SOURCES) \
+	$(simpdmodex_SOURCES) $(simpdyn_SOURCES) $(simpft_SOURCES) \
+	$(simppub_SOURCES) $(simptest_SOURCES) $(simptool_SOURCES) \
+	$(test_pmix_SOURCES)
+DIST_SOURCES = $(simpclient_SOURCES) $(simpdie_SOURCES) \
+	$(simpdmodex_SOURCES) $(simpdyn_SOURCES) $(simpft_SOURCES) \
+	$(simppub_SOURCES) $(simptest_SOURCES) $(simptool_SOURCES) \
+	$(test_pmix_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/./config/depcomp
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CFLAGS = @CFLAGS@
+CLEANFILES = @CLEANFILES@
+CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MCA_PROJECT_SUBDIRS = @MCA_PROJECT_SUBDIRS@
+MCA_pmix_FRAMEWORKS = @MCA_pmix_FRAMEWORKS@
+MCA_pmix_FRAMEWORKS_SUBDIRS = @MCA_pmix_FRAMEWORKS_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_DSO_SUBDIRS@
+MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS = @MCA_pmix_FRAMEWORK_COMPONENT_STATIC_SUBDIRS@
+MCA_pmix_FRAMEWORK_LIBS = @MCA_pmix_FRAMEWORK_LIBS@
+MCA_pmix_pdl_ALL_COMPONENTS = @MCA_pmix_pdl_ALL_COMPONENTS@
+MCA_pmix_pdl_ALL_SUBDIRS = @MCA_pmix_pdl_ALL_SUBDIRS@
+MCA_pmix_pdl_DSO_COMPONENTS = @MCA_pmix_pdl_DSO_COMPONENTS@
+MCA_pmix_pdl_DSO_SUBDIRS = @MCA_pmix_pdl_DSO_SUBDIRS@
+MCA_pmix_pdl_STATIC_COMPONENTS = @MCA_pmix_pdl_STATIC_COMPONENTS@
+MCA_pmix_pdl_STATIC_LTLIBS = @MCA_pmix_pdl_STATIC_LTLIBS@
+MCA_pmix_pdl_STATIC_SUBDIRS = @MCA_pmix_pdl_STATIC_SUBDIRS@
+MCA_pmix_pif_ALL_COMPONENTS = @MCA_pmix_pif_ALL_COMPONENTS@
+MCA_pmix_pif_ALL_SUBDIRS = @MCA_pmix_pif_ALL_SUBDIRS@
+MCA_pmix_pif_DSO_COMPONENTS = @MCA_pmix_pif_DSO_COMPONENTS@
+MCA_pmix_pif_DSO_SUBDIRS = @MCA_pmix_pif_DSO_SUBDIRS@
+MCA_pmix_pif_STATIC_COMPONENTS = @MCA_pmix_pif_STATIC_COMPONENTS@
+MCA_pmix_pif_STATIC_LTLIBS = @MCA_pmix_pif_STATIC_LTLIBS@
+MCA_pmix_pif_STATIC_SUBDIRS = @MCA_pmix_pif_STATIC_SUBDIRS@
+MCA_pmix_pinstalldirs_ALL_COMPONENTS = @MCA_pmix_pinstalldirs_ALL_COMPONENTS@
+MCA_pmix_pinstalldirs_ALL_SUBDIRS = @MCA_pmix_pinstalldirs_ALL_SUBDIRS@
+MCA_pmix_pinstalldirs_DSO_COMPONENTS = @MCA_pmix_pinstalldirs_DSO_COMPONENTS@
+MCA_pmix_pinstalldirs_DSO_SUBDIRS = @MCA_pmix_pinstalldirs_DSO_SUBDIRS@
+MCA_pmix_pinstalldirs_STATIC_COMPONENTS = @MCA_pmix_pinstalldirs_STATIC_COMPONENTS@
+MCA_pmix_pinstalldirs_STATIC_LTLIBS = @MCA_pmix_pinstalldirs_STATIC_LTLIBS@
+MCA_pmix_pinstalldirs_STATIC_SUBDIRS = @MCA_pmix_pinstalldirs_STATIC_SUBDIRS@
+MCA_pmix_pnet_ALL_COMPONENTS = @MCA_pmix_pnet_ALL_COMPONENTS@
+MCA_pmix_pnet_ALL_SUBDIRS = @MCA_pmix_pnet_ALL_SUBDIRS@
+MCA_pmix_pnet_DSO_COMPONENTS = @MCA_pmix_pnet_DSO_COMPONENTS@
+MCA_pmix_pnet_DSO_SUBDIRS = @MCA_pmix_pnet_DSO_SUBDIRS@
+MCA_pmix_pnet_STATIC_COMPONENTS = @MCA_pmix_pnet_STATIC_COMPONENTS@
+MCA_pmix_pnet_STATIC_LTLIBS = @MCA_pmix_pnet_STATIC_LTLIBS@
+MCA_pmix_pnet_STATIC_SUBDIRS = @MCA_pmix_pnet_STATIC_SUBDIRS@
+MCA_pmix_psec_ALL_COMPONENTS = @MCA_pmix_psec_ALL_COMPONENTS@
+MCA_pmix_psec_ALL_SUBDIRS = @MCA_pmix_psec_ALL_SUBDIRS@
+MCA_pmix_psec_DSO_COMPONENTS = @MCA_pmix_psec_DSO_COMPONENTS@
+MCA_pmix_psec_DSO_SUBDIRS = @MCA_pmix_psec_DSO_SUBDIRS@
+MCA_pmix_psec_STATIC_COMPONENTS = @MCA_pmix_psec_STATIC_COMPONENTS@
+MCA_pmix_psec_STATIC_LTLIBS = @MCA_pmix_psec_STATIC_LTLIBS@
+MCA_pmix_psec_STATIC_SUBDIRS = @MCA_pmix_psec_STATIC_SUBDIRS@
+MCA_pmix_psensor_ALL_COMPONENTS = @MCA_pmix_psensor_ALL_COMPONENTS@
+MCA_pmix_psensor_ALL_SUBDIRS = @MCA_pmix_psensor_ALL_SUBDIRS@
+MCA_pmix_psensor_DSO_COMPONENTS = @MCA_pmix_psensor_DSO_COMPONENTS@
+MCA_pmix_psensor_DSO_SUBDIRS = @MCA_pmix_psensor_DSO_SUBDIRS@
+MCA_pmix_psensor_STATIC_COMPONENTS = @MCA_pmix_psensor_STATIC_COMPONENTS@
+MCA_pmix_psensor_STATIC_LTLIBS = @MCA_pmix_psensor_STATIC_LTLIBS@
+MCA_pmix_psensor_STATIC_SUBDIRS = @MCA_pmix_psensor_STATIC_SUBDIRS@
+MCA_pmix_ptl_ALL_COMPONENTS = @MCA_pmix_ptl_ALL_COMPONENTS@
+MCA_pmix_ptl_ALL_SUBDIRS = @MCA_pmix_ptl_ALL_SUBDIRS@
+MCA_pmix_ptl_DSO_COMPONENTS = @MCA_pmix_ptl_DSO_COMPONENTS@
+MCA_pmix_ptl_DSO_SUBDIRS = @MCA_pmix_ptl_DSO_SUBDIRS@
+MCA_pmix_ptl_STATIC_COMPONENTS = @MCA_pmix_ptl_STATIC_COMPONENTS@
+MCA_pmix_ptl_STATIC_LTLIBS = @MCA_pmix_ptl_STATIC_LTLIBS@
+MCA_pmix_ptl_STATIC_SUBDIRS = @MCA_pmix_ptl_STATIC_SUBDIRS@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PMIX_ASM_GSYM = @PMIX_ASM_GSYM@
+PMIX_ASM_LSYM = @PMIX_ASM_LSYM@
+PMIX_ASM_SUPPORT_64BIT = @PMIX_ASM_SUPPORT_64BIT@
+PMIX_ASM_TEXT = @PMIX_ASM_TEXT@
+PMIX_ASM_TYPE = @PMIX_ASM_TYPE@
+PMIX_ASSEMBLY_ARCH = @PMIX_ASSEMBLY_ARCH@
+PMIX_ASSEMBLY_BUILTIN = @PMIX_ASSEMBLY_BUILTIN@
+PMIX_ASSEMBLY_FORMAT = @PMIX_ASSEMBLY_FORMAT@
+PMIX_AS_GLOBAL = @PMIX_AS_GLOBAL@
+PMIX_AS_LABEL_SUFFIX = @PMIX_AS_LABEL_SUFFIX@
+PMIX_CC_ABSOLUTE = @PMIX_CC_ABSOLUTE@
+PMIX_CONFIGURE_DATE = @PMIX_CONFIGURE_DATE@
+PMIX_CONFIGURE_HOST = @PMIX_CONFIGURE_HOST@
+PMIX_CONFIGURE_USER = @PMIX_CONFIGURE_USER@
+PMIX_EMBEDDED_CPPFLAGS = @PMIX_EMBEDDED_CPPFLAGS@
+PMIX_EMBEDDED_LDFLAGS = @PMIX_EMBEDDED_LDFLAGS@
+PMIX_EMBEDDED_LIBS = @PMIX_EMBEDDED_LIBS@
+PMIX_MAJOR_VERSION = @PMIX_MAJOR_VERSION@
+PMIX_MINOR_VERSION = @PMIX_MINOR_VERSION@
+PMIX_RELEASE_DATE = @PMIX_RELEASE_DATE@
+PMIX_RELEASE_VERSION = @PMIX_RELEASE_VERSION@
+PMIX_RENAME = @PMIX_RENAME@
+PMIX_VERSION = @PMIX_VERSION@
+PMIX_top_builddir = @PMIX_top_builddir@
+PMIX_top_srcdir = @PMIX_top_srcdir@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_prefix_program = @ac_prefix_program@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+libpmix_so_version = @libpmix_so_version@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pmix_have_pandoc = @pmix_have_pandoc@
+pmix_pdl_pdlopen_LIBS = @pmix_pdl_pdlopen_LIBS@
+pmix_pdl_plibltdl_CPPFLAGS = @pmix_pdl_plibltdl_CPPFLAGS@
+pmix_pdl_plibltdl_LDFLAGS = @pmix_pdl_plibltdl_LDFLAGS@
+pmix_pdl_plibltdl_LIBS = @pmix_pdl_plibltdl_LIBS@
+pmixdatadir = @pmixdatadir@
+pmixincludedir = @pmixincludedir@
+pmixlibdir = @pmixlibdir@
+pmixmajor = @pmixmajor@
+pmixminor = @pmixminor@
+pnet_opa_CFLAGS = @pnet_opa_CFLAGS@
+pnet_opa_CPPFLAGS = @pnet_opa_CPPFLAGS@
+pnet_opa_LDFLAGS = @pnet_opa_LDFLAGS@
+pnet_opa_LIBS = @pnet_opa_LIBS@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+psec_munge_CPPFLAGS = @psec_munge_CPPFLAGS@
+psec_munge_LDFLAGS = @psec_munge_LDFLAGS@
+psec_munge_LIBS = @psec_munge_LIBS@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+AM_CPPFLAGS = -I$(top_builddir)/src -I$(top_builddir)/src/include -I$(top_builddir)/include -I$(top_builddir)/include/pmix
+simptest_SOURCES = \
+        simptest.c
+
+simptest_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
+simptest_LDADD = \
+    $(top_builddir)/src/libpmix.la
+
+simpclient_SOURCES = \
+        simpclient.c
+
+simpclient_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
+simpclient_LDADD = \
+    $(top_builddir)/src/libpmix.la
+
+simppub_SOURCES = \
+        simppub.c
+
+simppub_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
+simppub_LDADD = \
+    $(top_builddir)/src/libpmix.la
+
+simpdmodex_SOURCES = \
+        simpdmodex.c
+
+simpdmodex_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
+simpdmodex_LDADD = \
+    $(top_builddir)/src/libpmix.la
+
+simpft_SOURCES = \
+        simpft.c
+
+simpft_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
+simpft_LDADD = \
+    $(top_builddir)/src/libpmix.la
+
+simpdyn_SOURCES = \
+        simpdyn.c
+
+simpdyn_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
+simpdyn_LDADD = \
+    $(top_builddir)/src/libpmix.la
+
+test_pmix_SOURCES = \
+        test_pmix.c
+
+test_pmix_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
+test_pmix_LDADD = \
+    $(top_builddir)/src/libpmix.la
+
+simptool_SOURCES = \
+        simptool.c
+
+simptool_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
+simptool_LDADD = \
+    $(top_builddir)/src/libpmix.la
+
+simpdie_SOURCES = \
+        simpdie.c
+
+simpdie_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
+simpdie_LDADD = \
+    $(top_builddir)/src/libpmix.la
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign test/simple/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign test/simple/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstPROGRAMS:
+	@list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
+
+simpclient$(EXEEXT): $(simpclient_OBJECTS) $(simpclient_DEPENDENCIES) $(EXTRA_simpclient_DEPENDENCIES) 
+	@rm -f simpclient$(EXEEXT)
+	$(AM_V_CCLD)$(simpclient_LINK) $(simpclient_OBJECTS) $(simpclient_LDADD) $(LIBS)
+
+simpdie$(EXEEXT): $(simpdie_OBJECTS) $(simpdie_DEPENDENCIES) $(EXTRA_simpdie_DEPENDENCIES) 
+	@rm -f simpdie$(EXEEXT)
+	$(AM_V_CCLD)$(simpdie_LINK) $(simpdie_OBJECTS) $(simpdie_LDADD) $(LIBS)
+
+simpdmodex$(EXEEXT): $(simpdmodex_OBJECTS) $(simpdmodex_DEPENDENCIES) $(EXTRA_simpdmodex_DEPENDENCIES) 
+	@rm -f simpdmodex$(EXEEXT)
+	$(AM_V_CCLD)$(simpdmodex_LINK) $(simpdmodex_OBJECTS) $(simpdmodex_LDADD) $(LIBS)
+
+simpdyn$(EXEEXT): $(simpdyn_OBJECTS) $(simpdyn_DEPENDENCIES) $(EXTRA_simpdyn_DEPENDENCIES) 
+	@rm -f simpdyn$(EXEEXT)
+	$(AM_V_CCLD)$(simpdyn_LINK) $(simpdyn_OBJECTS) $(simpdyn_LDADD) $(LIBS)
+
+simpft$(EXEEXT): $(simpft_OBJECTS) $(simpft_DEPENDENCIES) $(EXTRA_simpft_DEPENDENCIES) 
+	@rm -f simpft$(EXEEXT)
+	$(AM_V_CCLD)$(simpft_LINK) $(simpft_OBJECTS) $(simpft_LDADD) $(LIBS)
+
+simppub$(EXEEXT): $(simppub_OBJECTS) $(simppub_DEPENDENCIES) $(EXTRA_simppub_DEPENDENCIES) 
+	@rm -f simppub$(EXEEXT)
+	$(AM_V_CCLD)$(simppub_LINK) $(simppub_OBJECTS) $(simppub_LDADD) $(LIBS)
+
+simptest$(EXEEXT): $(simptest_OBJECTS) $(simptest_DEPENDENCIES) $(EXTRA_simptest_DEPENDENCIES) 
+	@rm -f simptest$(EXEEXT)
+	$(AM_V_CCLD)$(simptest_LINK) $(simptest_OBJECTS) $(simptest_LDADD) $(LIBS)
+
+simptool$(EXEEXT): $(simptool_OBJECTS) $(simptool_DEPENDENCIES) $(EXTRA_simptool_DEPENDENCIES) 
+	@rm -f simptool$(EXEEXT)
+	$(AM_V_CCLD)$(simptool_LINK) $(simptool_OBJECTS) $(simptool_LDADD) $(LIBS)
+
+test_pmix$(EXEEXT): $(test_pmix_OBJECTS) $(test_pmix_DEPENDENCIES) $(EXTRA_test_pmix_DEPENDENCIES) 
+	@rm -f test_pmix$(EXEEXT)
+	$(AM_V_CCLD)$(test_pmix_LINK) $(test_pmix_OBJECTS) $(test_pmix_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/simpclient.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/simpdie.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/simpdmodex.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/simpdyn.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/simpft.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/simppub.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/simptest.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/simptool.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/test_pmix.Po at am__quote@
+
+.c.o:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+ at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(PROGRAMS)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstPROGRAMS 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-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
+
+.PRECIOUS: Makefile
+
+
+# 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/test/simple/simpclient.c b/test/simple/simpclient.c
new file mode 100644
index 0000000..cd58ee5
--- /dev/null
+++ b/test/simple/simpclient.c
@@ -0,0 +1,351 @@
+/*
+ * Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2011 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2006-2013 Los Alamos National Security, LLC.
+ *                         All rights reserved.
+ * Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2011      Oak Ridge National Labs.  All rights reserved.
+ * Copyright (c) 2013-2017 Intel, Inc. All rights reserved.
+ * Copyright (c) 2015      Mellanox Technologies, Inc.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ *
+ */
+
+#include <src/include/pmix_config.h>
+#include <pmix.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <time.h>
+
+#include "src/class/pmix_object.h"
+#include "src/buffer_ops/types.h"
+#include "src/util/output.h"
+#include "src/util/printf.h"
+
+#define MAXCNT 2
+
+static volatile bool completed = false;
+static pmix_proc_t myproc;
+
+static void notification_fn(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)
+{
+    pmix_output(0, "Client %s:%d NOTIFIED with status %s", myproc.nspace, myproc.rank, PMIx_Error_string(status));
+    if (NULL != cbfunc) {
+        cbfunc(PMIX_SUCCESS, NULL, 0, NULL, NULL, cbdata);
+    }
+    completed = true;
+}
+
+static void errhandler_reg_callbk(pmix_status_t status,
+                                  size_t errhandler_ref,
+                                  void *cbdata)
+{
+    volatile bool *active = (volatile bool*)cbdata;
+
+    pmix_output(0, "Client: ERRHANDLER REGISTRATION CALLBACK CALLED WITH STATUS %d, ref=%lu",
+                status, (unsigned long)errhandler_ref);
+    *active = false;
+}
+
+static void opcbfunc(pmix_status_t status, void *cbdata)
+{
+    volatile bool *active = (volatile bool*)cbdata;
+    *active = false;
+}
+
+/* this is an event notification function that we explicitly request
+ * be called when the PMIX_MODEL_DECLARED notification is issued.
+ * We could catch it in the general event notification function and test
+ * the status to see if the status matched, but it often is simpler
+ * to declare a use-specific notification callback point. In this case,
+ * we are asking to know whenever a model is declared as a means
+ * of testing server self-notification */
+static void model_callback(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)
+{
+    size_t n;
+
+    /* just let us know it was received */
+    fprintf(stderr, "%s:%d Model event handler called with status %d(%s)\n",
+            myproc.nspace, myproc.rank, status, PMIx_Error_string(status));
+    for (n=0; n < ninfo; n++) {
+        if (PMIX_STRING == info[n].value.type) {
+            fprintf(stderr, "%s:%d\t%s:\t%s\n",
+                    myproc.nspace, myproc.rank,
+                    info[n].key, info[n].value.data.string);
+        }
+    }
+
+    /* we must NOT tell the event handler state machine that we
+     * are the last step as that will prevent it from notifying
+     * anyone else that might be listening for declarations */
+    if (NULL != cbfunc) {
+        cbfunc(PMIX_SUCCESS, NULL, 0, NULL, NULL, cbdata);
+    }
+}
+
+/* event handler registration is done asynchronously */
+static void model_registration_callback(pmix_status_t status,
+                                        size_t evhandler_ref,
+                                        void *cbdata)
+{
+    volatile int *active = (volatile int*)cbdata;
+
+    fprintf(stderr, "simpclient EVENT HANDLER REGISTRATION RETURN STATUS %d, ref=%lu\n",
+               status, (unsigned long)evhandler_ref);
+    *active = false;
+}
+
+int main(int argc, char **argv)
+{
+    int rc;
+    pmix_value_t value;
+    pmix_value_t *val = &value;
+    char *tmp;
+    pmix_proc_t proc;
+    uint32_t nprocs, n;
+    int cnt, j;
+    bool doabort = false;
+    volatile bool active;
+    pmix_info_t info, *iptr;
+    size_t ninfo;
+    pmix_status_t code;
+
+    if (1 < argc) {
+        if (0 == strcmp("-abort", argv[1])) {
+            doabort = true;
+        }
+    }
+
+    /* init us and declare we are a test programming model */
+    PMIX_INFO_CREATE(iptr, 2);
+    PMIX_INFO_LOAD(&iptr[0], PMIX_PROGRAMMING_MODEL, "TEST", PMIX_STRING);
+    PMIX_INFO_LOAD(&iptr[1], PMIX_MODEL_LIBRARY_NAME, "PMIX", PMIX_STRING);
+    if (PMIX_SUCCESS != (rc = PMIx_Init(&myproc, iptr, 2))) {
+        pmix_output(0, "Client ns %s rank %d: PMIx_Init failed: %s",
+                    myproc.nspace, myproc.rank, PMIx_Error_string(rc));
+        exit(rc);
+    }
+    PMIX_INFO_FREE(iptr, 2);
+    pmix_output(0, "Client ns %s rank %d: Running", myproc.nspace, myproc.rank);
+
+    /* test something */
+    (void)strncpy(proc.nspace, myproc.nspace, PMIX_MAX_NSLEN);
+    proc.rank = PMIX_RANK_WILDCARD;
+    if (PMIX_SUCCESS != (rc = PMIx_Get(&proc, PMIX_JOB_SIZE, NULL, 0, &val))) {
+        pmix_output(0, "Client ns %s rank %d: PMIx_Get failed: %s",
+                    myproc.nspace, myproc.rank, PMIx_Error_string(rc));
+        exit(rc);
+    }
+    PMIX_VALUE_RELEASE(val);
+
+    /* register a handler specifically for when models declare */
+    active = true;
+    ninfo = 1;
+    PMIX_INFO_CREATE(iptr, ninfo);
+    PMIX_INFO_LOAD(&iptr[0], PMIX_EVENT_HDLR_NAME, "SIMPCLIENT-MODEL", PMIX_STRING);
+    code = PMIX_MODEL_DECLARED;
+    PMIx_Register_event_handler(&code, 1, iptr, ninfo,
+                                model_callback, model_registration_callback, (void*)&active);
+    while (active) {
+        usleep(10);
+    }
+    PMIX_INFO_FREE(iptr, ninfo);
+
+    /* register our errhandler */
+    active = true;
+    PMIx_Register_event_handler(NULL, 0, NULL, 0,
+                                notification_fn, errhandler_reg_callbk, (void*)&active);
+    while (active) {
+        usleep(10);
+    }
+
+    /* get our universe size */
+    (void)strncpy(proc.nspace, myproc.nspace, PMIX_MAX_NSLEN);
+    proc.rank = PMIX_RANK_WILDCARD;
+    if (PMIX_SUCCESS != (rc = PMIx_Get(&proc, PMIX_UNIV_SIZE, NULL, 0, &val))) {
+        pmix_output(0, "Client ns %s rank %d: PMIx_Get universe size failed: %s",
+                    myproc.nspace, myproc.rank, PMIx_Error_string(rc));
+        goto done;
+    }
+    nprocs = val->data.uint32;
+    PMIX_VALUE_RELEASE(val);
+    pmix_output(0, "Client %s:%d universe size %d", myproc.nspace, myproc.rank, nprocs);
+
+    /* put a few values */
+    (void)asprintf(&tmp, "%s-%d-internal", myproc.nspace, myproc.rank);
+    value.type = PMIX_UINT32;
+    value.data.uint32 = 1234;
+    if (PMIX_SUCCESS != (rc = PMIx_Store_internal(&myproc, tmp, &value))) {
+        pmix_output(0, "Client ns %s rank %d: PMIx_Store_internal failed: %s",
+                    myproc.nspace, myproc.rank, PMIx_Error_string(rc));
+        goto done;
+    }
+
+    for (cnt=0; cnt < MAXCNT; cnt++) {
+        (void)asprintf(&tmp, "%s-%d-local-%d", myproc.nspace, myproc.rank, cnt);
+        value.type = PMIX_UINT64;
+        value.data.uint64 = 1234;
+        if (PMIX_SUCCESS != (rc = PMIx_Put(PMIX_LOCAL, tmp, &value))) {
+            pmix_output(0, "Client ns %s rank %d: PMIx_Put internal failed: %s",
+                        myproc.nspace, myproc.rank, PMIx_Error_string(rc));
+            goto done;
+        }
+
+        (void)asprintf(&tmp, "%s-%d-remote-%d", myproc.nspace, myproc.rank, cnt);
+        value.type = PMIX_STRING;
+        value.data.string = "1234";
+        if (PMIX_SUCCESS != (rc = PMIx_Put(PMIX_REMOTE, tmp, &value))) {
+            pmix_output(0, "Client ns %s rank %d: PMIx_Put internal failed: %s",
+                        myproc.nspace, myproc.rank, PMIx_Error_string(rc));
+            goto done;
+        }
+
+        if (PMIX_SUCCESS != (rc = PMIx_Commit())) {
+            pmix_output(0, "Client ns %s rank %d cnt %d: PMIx_Commit failed: %s",
+                        myproc.nspace, myproc.rank, cnt, PMIx_Error_string(rc));
+            goto done;
+        }
+
+        /* call fence to ensure the data is received */
+        PMIX_PROC_CONSTRUCT(&proc);
+        (void)strncpy(proc.nspace, myproc.nspace, PMIX_MAX_NSLEN);
+        proc.rank = PMIX_RANK_WILDCARD;
+        if (PMIX_SUCCESS != (rc = PMIx_Fence(&proc, 1, NULL, 0))) {
+            pmix_output(0, "Client ns %s rank %d cnt %d: PMIx_Fence failed: %s",
+                        myproc.nspace, myproc.rank, cnt, PMIx_Error_string(rc));
+            goto done;
+        }
+
+        /* check the returned data */
+        (void)strncpy(proc.nspace, myproc.nspace, PMIX_MAX_NSLEN);
+        for (j=0; j <= cnt; j++) {
+            for (n=0; n < nprocs; n++) {
+                proc.rank = n;
+                (void)asprintf(&tmp, "%s-%d-local-%d", myproc.nspace, n, j);
+                if (PMIX_SUCCESS != (rc = PMIx_Get(&proc, tmp, NULL, 0, &val))) {
+                    pmix_output(0, "Client ns %s rank %d cnt %d: PMIx_Get %s failed: %s",
+                                myproc.nspace, myproc.rank, j, tmp, PMIx_Error_string(rc));
+                    continue;
+                }
+                if (PMIX_UINT64 != val->type) {
+                    pmix_output(0, "Client ns %s rank %d cnt %d: PMIx_Get %s returned wrong type: %d", myproc.nspace, myproc.rank, j, tmp, val->type);
+                    PMIX_VALUE_RELEASE(val);
+                    free(tmp);
+                    continue;
+                }
+                if (1234 != val->data.uint64) {
+                    pmix_output(0, "Client ns %s rank %d cnt %d: PMIx_Get %s returned wrong value: %d", myproc.nspace, myproc.rank, j, tmp, (int)val->data.uint64);
+                    PMIX_VALUE_RELEASE(val);
+                    free(tmp);
+                    continue;
+                }
+                pmix_output(0, "Client ns %s rank %d cnt %d: PMIx_Get %s returned correct", myproc.nspace, myproc.rank, j, tmp);
+                PMIX_VALUE_RELEASE(val);
+                free(tmp);
+
+                if (n != myproc.rank) {
+                    (void)asprintf(&tmp, "%s-%d-remote-%d", proc.nspace, n, j);
+                    if (PMIX_SUCCESS != (rc = PMIx_Get(&proc, tmp, NULL, 0, &val))) {
+                        /* this data should _not_ be found as we are on the same node
+                         * and the data was "put" with a PMIX_REMOTE scope */
+                        pmix_output(0, "Client ns %s rank %d cnt %d: PMIx_Get %s returned correct", myproc.nspace, myproc.rank, j, tmp);
+                        continue;
+                    }
+                    pmix_output(0, "Client ns %s rank %d cnt %d: PMIx_Get %s returned remote data for a local proc",
+                                myproc.nspace, myproc.rank, j, tmp);
+                    PMIX_VALUE_RELEASE(val);
+                    free(tmp);
+                }
+            }
+        }
+    }
+
+    /* now get the data blob for myself */
+    pmix_output(0, "Client ns %s rank %d testing internal modex blob",
+                myproc.nspace, myproc.rank);
+    if (PMIX_SUCCESS == (rc = PMIx_Get(&myproc, NULL, NULL, 0, &val))) {
+        if (PMIX_DATA_ARRAY != val->type) {
+            pmix_output(0, "Client ns %s rank %d did not return an array for its internal modex blob",
+                        myproc.nspace, myproc.rank);
+            PMIX_VALUE_RELEASE(val);
+        } else if (PMIX_INFO != val->data.darray->type) {
+            pmix_output(0, "Client ns %s rank %d returned an internal modex array of type %s instead of PMIX_INFO",
+                        myproc.nspace, myproc.rank, PMIx_Data_type_string(val->data.darray->type));
+            PMIX_VALUE_RELEASE(val);
+        } else if (0 == val->data.darray->size) {
+            pmix_output(0, "Client ns %s rank %d returned an internal modex array of zero length",
+                        myproc.nspace, myproc.rank);
+            PMIX_VALUE_RELEASE(val);
+        } else {
+            pmix_info_t *iptr = (pmix_info_t*)val->data.darray->array;
+            for (n=0; n < val->data.darray->size; n++) {
+                pmix_output(0, "\tKey: %s", iptr[n].key);
+            }
+            PMIX_VALUE_RELEASE(val);
+        }
+    } else {
+        pmix_output(0, "Client ns %s rank %d internal modex blob FAILED with error %s(%d)",
+                    myproc.nspace, myproc.rank, PMIx_Error_string(rc), rc);
+    }
+
+    /* log something */
+    PMIX_INFO_CONSTRUCT(&info);
+    (void)strncpy(info.key, "foobar", PMIX_MAX_KEYLEN);
+    info.value.type = PMIX_BOOL;
+    info.value.data.flag = true;
+    active = true;
+    PMIx_Log_nb(&info, 1, NULL, 0, opcbfunc, (void*)&active);
+    while (active) {
+        usleep(10);
+    }
+    PMIX_INFO_DESTRUCT(&info);
+
+    /* if requested and our rank is 0, call abort */
+    if (doabort) {
+        if (0 == myproc.rank) {
+            PMIx_Abort(PMIX_ERR_PROC_REQUESTED_ABORT, "CALLING ABORT", NULL, 0);
+        } else {
+            while(!completed) {
+                usleep(10);
+            }
+        }
+    }
+
+ done:
+    /* finalize us */
+    pmix_output(0, "Client ns %s rank %d: Finalizing", myproc.nspace, myproc.rank);
+    if (PMIX_SUCCESS != (rc = PMIx_Finalize(NULL, 0))) {
+        fprintf(stderr, "Client ns %s rank %d:PMIx_Finalize failed: %s\n",
+                myproc.nspace, myproc.rank, PMIx_Error_string(rc));
+    } else {
+        fprintf(stderr, "Client ns %s rank %d:PMIx_Finalize successfully completed\n", myproc.nspace, myproc.rank);
+    }
+    fflush(stderr);
+    return(rc);
+}
diff --git a/test/simple/simpdie.c b/test/simple/simpdie.c
new file mode 100644
index 0000000..1949e3e
--- /dev/null
+++ b/test/simple/simpdie.c
@@ -0,0 +1,159 @@
+/*
+ * Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2011 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2006-2013 Los Alamos National Security, LLC.
+ *                         All rights reserved.
+ * Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2011      Oak Ridge National Labs.  All rights reserved.
+ * Copyright (c) 2013-2017 Intel, Inc. All rights reserved.
+ * Copyright (c) 2015      Mellanox Technologies, Inc.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ *
+ */
+
+#include <src/include/pmix_config.h>
+#include <pmix.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <time.h>
+
+#include "src/class/pmix_object.h"
+#include "src/buffer_ops/types.h"
+#include "src/util/argv.h"
+#include "src/util/output.h"
+#include "src/util/printf.h"
+
+static pmix_proc_t myproc;
+static bool completed;
+
+static void notification_fn(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)
+{
+    size_t n;
+
+    pmix_output(0, "Client %s:%d NOTIFIED with status %d source %s:%d and %d info",
+                myproc.nspace, myproc.rank, status, source->nspace, source->rank, (int)ninfo);
+    for (n=0; n < ninfo; n++) {
+        if (0 == strncmp(info[n].key, PMIX_PROCID, PMIX_MAX_KEYLEN) &&
+            PMIX_PROC == info[n].value.type) {
+            pmix_output(0, "[%s:%d] added proc: %s:%d", myproc.nspace, myproc.rank,
+                        info[n].value.data.proc->nspace, info[n].value.data.proc->rank);
+        } else {
+            pmix_output(0, "[%s:%d] key: %s", myproc.nspace, myproc.rank, info[n].key);
+        }
+    }
+    if (NULL != cbfunc) {
+        cbfunc(PMIX_SUCCESS, NULL, 0, NULL, NULL, cbdata);
+    }
+    completed = true;
+}
+
+static void op_callbk(pmix_status_t status,
+                      void *cbdata)
+{
+    pmix_output(0, "CLIENT: OP CALLBACK CALLED WITH STATUS %d", status);
+}
+
+static void errhandler_reg_callbk (pmix_status_t status,
+                                   size_t errhandler_ref,
+                                   void *cbdata)
+{
+    pmix_output(0, "Client: ERRHANDLER REGISTRATION CALLBACK CALLED WITH STATUS %d, ref=%lu",
+                status, (unsigned long)errhandler_ref);
+}
+
+int main(int argc, char **argv)
+{
+    int rc;
+    pmix_value_t value;
+    pmix_value_t *val = &value;
+    pmix_proc_t proc;
+    uint32_t nprocs;
+
+    /* init us */
+    if (PMIX_SUCCESS != (rc = PMIx_Init(&myproc, NULL, 0))) {
+        pmix_output(0, "Client ns %s rank %d: PMIx_Init failed: %d", myproc.nspace, myproc.rank, rc);
+        exit(0);
+    }
+    pmix_output(0, "Client ns %s rank %d: Running", myproc.nspace, myproc.rank);
+
+    /* get our universe size */
+    (void)strncpy(proc.nspace, myproc.nspace, PMIX_MAX_NSLEN);
+    proc.rank = PMIX_RANK_WILDCARD;
+    if (PMIX_SUCCESS != (rc = PMIx_Get(&proc, PMIX_UNIV_SIZE, NULL, 0, &val))) {
+        pmix_output(0, "Client ns %s rank %d: PMIx_Get universe size failed: %d", myproc.nspace, myproc.rank, rc);
+        goto done;
+    }
+    nprocs = val->data.uint32;
+    PMIX_VALUE_RELEASE(val);
+    pmix_output(0, "Client %s:%d universe size %d", myproc.nspace, myproc.rank, nprocs);
+    completed = false;
+
+    /* register our errhandler */
+    PMIx_Register_event_handler(NULL, 0, NULL, 0,
+                                notification_fn, errhandler_reg_callbk, NULL);
+
+    /* call fence to sync */
+    PMIX_PROC_CONSTRUCT(&proc);
+    (void)strncpy(proc.nspace, myproc.nspace, PMIX_MAX_NSLEN);
+    proc.rank = PMIX_RANK_WILDCARD;
+    if (PMIX_SUCCESS != (rc = PMIx_Fence(&proc, 1, NULL, 0))) {
+        pmix_output(0, "Client ns %s rank %d: PMIx_Fence failed: %d", myproc.nspace, myproc.rank, rc);
+        goto done;
+    }
+
+    /* rank=0 dies */
+    if (4 < nprocs) {
+        /* have one exit */
+        if (0 == myproc.rank) {
+            pmix_output(0, "Client ns %s rank %d: bye-bye!", myproc.nspace, myproc.rank);
+            exit(1);
+        } else if (1 == myproc.rank) {
+            usleep(500000);
+            pmix_output(0, "Client ns %s rank %d: bye-bye!", myproc.nspace, myproc.rank);
+            exit(1);
+        }
+    } else if (0 == myproc.rank) {
+        pmix_output(0, "Client ns %s rank %d: bye-bye!", myproc.nspace, myproc.rank);
+        exit(1);
+    }
+    /* everyone simply waits */
+    while (!completed) {
+        struct timespec ts;
+        ts.tv_sec = 0;
+        ts.tv_nsec = 100000;
+        nanosleep(&ts, NULL);
+    }
+
+ done:
+    /* finalize us */
+    pmix_output(0, "Client ns %s rank %d: Finalizing", myproc.nspace, myproc.rank);
+    PMIx_Deregister_event_handler(1, op_callbk, NULL);
+
+    if (PMIX_SUCCESS != (rc = PMIx_Finalize(NULL, 0))) {
+        fprintf(stderr, "Client ns %s rank %d:PMIx_Finalize failed: %d\n", myproc.nspace, myproc.rank, rc);
+    } else {
+        fprintf(stderr, "Client ns %s rank %d:PMIx_Finalize successfully completed\n", myproc.nspace, myproc.rank);
+    }
+    fflush(stderr);
+    return(0);
+}
diff --git a/test/simple/simpdmodex.c b/test/simple/simpdmodex.c
new file mode 100644
index 0000000..c345e94
--- /dev/null
+++ b/test/simple/simpdmodex.c
@@ -0,0 +1,218 @@
+/*
+ * Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2011 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2006-2013 Los Alamos National Security, LLC.
+ *                         All rights reserved.
+ * Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2011      Oak Ridge National Labs.  All rights reserved.
+ * Copyright (c) 2013-2016 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2015      Mellanox Technologies, Inc.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ *
+ */
+
+#include <src/include/pmix_config.h>
+#include <pmix.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <time.h>
+
+#include "src/class/pmix_object.h"
+#include "src/buffer_ops/types.h"
+#include "src/util/output.h"
+#include "src/util/printf.h"
+
+static uint32_t nprocs;
+static pmix_proc_t myproc;
+static uint32_t getcount = 0;
+
+#define PMIX_WAIT_FOR_COMPLETION(a)             \
+    do {                                        \
+        while ((a)) {                           \
+            usleep(10);                         \
+        }                                       \
+    } while (0)
+
+static void opcbfunc(pmix_status_t status, void *cbdata)
+{
+    bool *active = (bool*)cbdata;
+
+    pmix_output(0, "%s:%d completed fence_nb", myproc.nspace, myproc.rank);
+    *active = false;
+}
+
+static void valcbfunc(pmix_status_t status,
+                      pmix_value_t *val, void *cbdata)
+{
+    char *key = (char*)cbdata;
+
+    if (PMIX_SUCCESS == status) {
+        if (NULL != strstr(key, "local")) {
+            if (PMIX_UINT64 != val->type) {
+                pmix_output(0, "%s:%d: PMIx_Get_nb Key %s returned wrong type: %d", myproc.nspace, myproc.rank, key, val->type);
+                goto done;
+            }
+            if (1234 != val->data.uint64) {
+                pmix_output(0, "%s:%d: PMIx_Get_nb Key %s returned wrong value: %d", myproc.nspace, myproc.rank, key, (int)val->data.uint64);
+                goto done;
+            }
+        } else if (NULL != strstr(key, "remote")) {
+            if (PMIX_STRING != val->type) {
+                pmix_output(0, "%s:%d: PMIx_Get_nb Key %s returned wrong type: %d", myproc.nspace, myproc.rank, key, val->type);
+                goto done;
+            }
+            if (0 != strcmp(val->data.string, "1234")) {
+                pmix_output(0, "%s:%d: PMIx_Get_nb Key %s returned wrong value: %s", myproc.nspace, myproc.rank, key, val->data.string);
+                goto done;
+            }
+        } else {
+            pmix_output(0, "%s:%d PMIx_Get_nb returned wrong key: %s", myproc.nspace, myproc.rank, key);
+            goto done;
+        }
+        pmix_output(0, "%s:%d PMIx_Get_nb Key %s returned correctly", myproc.nspace, myproc.rank, key);
+    } else {
+        pmix_output(0, "%s:%d PMIx_Get_nb Key %s failed", myproc.nspace, myproc.rank, key);
+    }
+ done:
+    free(key);
+    getcount++;
+}
+
+int main(int argc, char **argv)
+{
+    int rc;
+    pmix_value_t value;
+    pmix_value_t *val = &value;
+    char *tmp;
+    pmix_proc_t proc;
+    uint32_t n, num_gets;
+    bool active;
+
+    /* init us */
+    if (PMIX_SUCCESS != (rc = PMIx_Init(&myproc, NULL, 0))) {
+        pmix_output(0, "Client ns %s rank %d: PMIx_Init failed: %d", myproc.nspace, myproc.rank, rc);
+        exit(0);
+    }
+    pmix_output(0, "Client ns %s rank %d: Running", myproc.nspace, myproc.rank);
+
+    /* get our universe size */
+    (void)strncpy(proc.nspace, myproc.nspace, PMIX_MAX_NSLEN);
+    proc.rank = PMIX_RANK_WILDCARD;
+    if (PMIX_SUCCESS != (rc = PMIx_Get(&proc, PMIX_UNIV_SIZE, NULL, 0, &val))) {
+        pmix_output(0, "Client ns %s rank %d: PMIx_Get universe size failed: %d", myproc.nspace, myproc.rank, rc);
+        goto done;
+    }
+    nprocs = val->data.uint32;
+    PMIX_VALUE_RELEASE(val);
+    pmix_output(0, "Client %s:%d universe size %d", myproc.nspace, myproc.rank, nprocs);
+
+    /* put a few values */
+    (void)asprintf(&tmp, "%s-%d-internal", myproc.nspace, myproc.rank);
+    value.type = PMIX_UINT32;
+    value.data.uint32 = 1234;
+    if (PMIX_SUCCESS != (rc = PMIx_Store_internal(&myproc, tmp, &value))) {
+        pmix_output(0, "Client ns %s rank %d: PMIx_Store_internal failed: %d", myproc.nspace, myproc.rank, rc);
+        goto done;
+    }
+
+    (void)asprintf(&tmp, "%s-%d-local", myproc.nspace, myproc.rank);
+    value.type = PMIX_UINT64;
+    value.data.uint64 = 1234;
+    if (PMIX_SUCCESS != (rc = PMIx_Put(PMIX_LOCAL, tmp, &value))) {
+        pmix_output(0, "Client ns %s rank %d: PMIx_Put internal failed: %d", myproc.nspace, myproc.rank, rc);
+        goto done;
+    }
+
+    (void)asprintf(&tmp, "%s-%d-remote", myproc.nspace, myproc.rank);
+    value.type = PMIX_STRING;
+    value.data.string = "1234";
+    if (PMIX_SUCCESS != (rc = PMIx_Put(PMIX_REMOTE, tmp, &value))) {
+        pmix_output(0, "Client ns %s rank %d: PMIx_Put internal failed: %d", myproc.nspace, myproc.rank, rc);
+        goto done;
+    }
+
+    /* introduce a delay by one rank so we can check what happens
+     * if a "get" is received prior to data being provided */
+    if (0 == myproc.rank) {
+        sleep(2);
+    }
+
+    /* commit the data to the server */
+    if (PMIX_SUCCESS != (rc = PMIx_Commit())) {
+        pmix_output(0, "Client ns %s rank %d: PMIx_Commit failed: %d", myproc.nspace, myproc.rank, rc);
+        goto done;
+    }
+
+    /* call fence_nb, but don't return any data */
+    PMIX_PROC_CONSTRUCT(&proc);
+    (void)strncpy(proc.nspace, myproc.nspace, PMIX_MAX_NSLEN);
+    proc.rank = PMIX_RANK_WILDCARD;
+    active = true;
+    if (PMIX_SUCCESS != (rc = PMIx_Fence_nb(&proc, 1, NULL, 0, opcbfunc, &active))) {
+        pmix_output(0, "Client ns %s rank %d: PMIx_Fence failed: %d", myproc.nspace, myproc.rank, rc);
+        goto done;
+    }
+
+    /* get the committed data - ask for someone who doesn't exist as well */
+    num_gets = 0;
+    for (n=0; n < nprocs; n++) {
+        (void)asprintf(&tmp, "%s-%d-local", myproc.nspace, n);
+        proc.rank = n;
+        if (PMIX_SUCCESS != (rc = PMIx_Get_nb(&proc, tmp,
+                                              NULL, 0, valcbfunc, tmp))) {
+            pmix_output(0, "Client ns %s rank %d: PMIx_Get %s failed: %d", myproc.nspace, n, tmp, rc);
+            goto done;
+        }
+        ++num_gets;
+        (void)asprintf(&tmp, "%s-%d-remote", myproc.nspace, n);
+        if (PMIX_SUCCESS != (rc = PMIx_Get_nb(&proc, tmp,
+                                              NULL, 0, valcbfunc, tmp))) {
+            pmix_output(0, "Client ns %s rank %d: PMIx_Get %s failed: %d", myproc.nspace, n, tmp, rc);
+            goto done;
+        }
+        ++num_gets;
+    }
+
+    /* wait for the first fence to finish */
+    PMIX_WAIT_FOR_COMPLETION(active);
+
+    /* wait for all my "get" calls to complete */
+    while (getcount < num_gets) {
+        struct timespec ts;
+        ts.tv_sec = 0;
+        ts.tv_nsec = 100000;
+        nanosleep(&ts, NULL);
+    }
+
+    /* call fence again so everyone waits before leaving */
+    proc.rank = PMIX_RANK_WILDCARD;
+    if (PMIX_SUCCESS != (rc = PMIx_Fence(&proc, 1, NULL, 0))) {
+        pmix_output(0, "Client ns %s rank %d: PMIx_Fence failed: %d", myproc.nspace, myproc.rank, rc);
+        goto done;
+    }
+
+ done:
+    /* finalize us */
+    pmix_output(0, "Client ns %s rank %d: Finalizing", myproc.nspace, myproc.rank);
+    if (PMIX_SUCCESS != (rc = PMIx_Finalize(NULL, 0))) {
+        fprintf(stderr, "Client ns %s rank %d:PMIx_Finalize failed: %d\n", myproc.nspace, myproc.rank, rc);
+    } else {
+        fprintf(stderr, "Client ns %s rank %d:PMIx_Finalize successfully completed\n", myproc.nspace, myproc.rank);
+    }
+    fflush(stderr);
+    return(0);
+}
diff --git a/test/simple/simpdyn.c b/test/simple/simpdyn.c
new file mode 100644
index 0000000..a71f814
--- /dev/null
+++ b/test/simple/simpdyn.c
@@ -0,0 +1,198 @@
+/*
+ * Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2011 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2006-2013 Los Alamos National Security, LLC.
+ *                         All rights reserved.
+ * Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2011      Oak Ridge National Labs.  All rights reserved.
+ * Copyright (c) 2013-2016 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2015      Mellanox Technologies, Inc.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ *
+ */
+
+#include <src/include/pmix_config.h>
+#include <pmix.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <time.h>
+
+#include "src/class/pmix_object.h"
+#include "src/buffer_ops/types.h"
+#include "src/util/argv.h"
+#include "src/util/output.h"
+#include "src/util/pmix_environ.h"
+#include "src/util/printf.h"
+
+static pmix_proc_t myproc;
+
+int main(int argc, char **argv)
+{
+    int rc;
+    pmix_value_t value;
+    pmix_value_t *val = &value;
+    pmix_proc_t proc;
+    uint32_t nprocs;
+    char nsp2[PMIX_MAX_NSLEN+1];
+    pmix_app_t *app;
+    char hostname[PMIX_MAXHOSTNAMELEN];
+    pmix_proc_t *peers;
+    size_t npeers, ntmp=0;
+    char *nodelist;
+
+    gethostname(hostname, sizeof(hostname));
+
+    /* init us */
+    if (PMIX_SUCCESS != (rc = PMIx_Init(&myproc, NULL, 0))) {
+        pmix_output(0, "Client ns %s rank %d: PMIx_Init failed: %d", myproc.nspace, myproc.rank, rc);
+        exit(0);
+    }
+    pmix_output(0, "Client ns %s rank %d: Running", myproc.nspace, myproc.rank);
+
+    /* get our universe size */
+    (void)strncpy(proc.nspace, myproc.nspace, PMIX_MAX_NSLEN);
+    proc.rank = PMIX_RANK_WILDCARD;
+    if (PMIX_SUCCESS != (rc = PMIx_Get(&proc, PMIX_UNIV_SIZE, NULL, 0, &val))) {
+        pmix_output(0, "Client ns %s rank %d: PMIx_Get universe size failed: %d", myproc.nspace, myproc.rank, rc);
+        goto done;
+    }
+    nprocs = val->data.uint32;
+    PMIX_VALUE_RELEASE(val);
+    pmix_output(0, "Client %s:%d universe size %d", myproc.nspace, myproc.rank, nprocs);
+
+    /* call fence to sync */
+    PMIX_PROC_CONSTRUCT(&proc);
+    (void)strncpy(proc.nspace, myproc.nspace, PMIX_MAX_NSLEN);
+    proc.rank = PMIX_RANK_WILDCARD;
+    if (PMIX_SUCCESS != (rc = PMIx_Fence(&proc, 1, NULL, 0))) {
+        pmix_output(0, "Client ns %s rank %d: PMIx_Fence failed: %d", myproc.nspace, myproc.rank, rc);
+        goto done;
+    }
+
+    /* rank=0 calls spawn */
+    if (0 == myproc.rank) {
+        PMIX_APP_CREATE(app, 1);
+        app->cmd = strdup("gumby");
+        app->maxprocs = 2;
+        pmix_argv_append_nosize(&app->argv, "gumby");
+        pmix_argv_append_nosize(&app->argv, "-n");
+        pmix_argv_append_nosize(&app->argv, "2");
+        pmix_setenv("PMIX_ENV_VALUE", "3", true, &app->env);
+        PMIX_INFO_CREATE(app->info, 2);
+        (void)strncpy(app->info[0].key, "DARTH", PMIX_MAX_KEYLEN);
+        app->info[0].value.type = PMIX_INT8;
+        app->info[0].value.data.int8 = 12;
+        (void)strncpy(app->info[1].key, "VADER", PMIX_MAX_KEYLEN);
+        app->info[1].value.type = PMIX_DOUBLE;
+        app->info[1].value.data.dval = 12.34;
+
+        pmix_output(0, "Client ns %s rank %d: calling PMIx_Spawn", myproc.nspace, myproc.rank);
+        if (PMIX_SUCCESS != (rc = PMIx_Spawn(NULL, 0, app, 1, nsp2))) {
+            pmix_output(0, "Client ns %s rank %d: PMIx_Spawn failed: %d", myproc.nspace, myproc.rank, rc);
+            goto done;
+        }
+        PMIX_APP_FREE(app, 1);
+
+        /* check to see if we got the expected info back */
+        if (0 != strncmp(nsp2, "DYNSPACE", PMIX_MAX_NSLEN)) {
+            pmix_output(0, "Client ns %s rank %d: PMIx_Spawn returned incorrect nspace: %s", myproc.nspace, myproc.rank, nsp2);
+            goto done;
+        } else {
+            pmix_output(0, "Client ns %s rank %d: PMIx_Spawn succeeded returning nspace: %s", myproc.nspace, myproc.rank, nsp2);
+        }
+        /* get their universe size */
+        (void)strncpy(proc.nspace, nsp2, PMIX_MAX_NSLEN);
+        proc.rank = PMIX_RANK_WILDCARD;
+        val = NULL;
+        if (PMIX_SUCCESS != (rc = PMIx_Get(&proc, PMIX_UNIV_SIZE, NULL, 0, &val)) ||
+            NULL == val) {
+            pmix_output(0, "Client ns %s rank %d: PMIx_Get universe size failed: %d", myproc.nspace, myproc.rank, rc);
+            goto done;
+        }
+        ntmp = val->data.uint32;
+        PMIX_VALUE_RELEASE(val);
+        pmix_output(0, "Client %s:%d universe %s size %d", myproc.nspace, myproc.rank, nsp2, (int)ntmp);
+    }
+
+    /* just cycle the connect/disconnect functions */
+    if (PMIX_SUCCESS != (rc = PMIx_Connect(&proc, 1, NULL, 0))) {
+        pmix_output(0, "Client ns %s rank %d: PMIx_Connect failed: %d", myproc.nspace, myproc.rank, rc);
+        goto done;
+    }
+    pmix_output(0, "Client ns %s rank %d: PMIx_Connect succeeded", myproc.nspace, myproc.rank);
+    if (PMIX_SUCCESS != (rc = PMIx_Disconnect(&proc, 1, NULL, 0))) {
+        pmix_output(0, "Client ns %s rank %d: PMIx_Disonnect failed: %d", myproc.nspace, myproc.rank, rc);
+        goto done;
+    }
+    pmix_output(0, "Client ns %s rank %d: PMIx_Disconnect succeeded", myproc.nspace, myproc.rank);
+
+    /* finally, test the resolve functions */
+    if (0 == myproc.rank) {
+        if (PMIX_SUCCESS != (rc = PMIx_Resolve_peers(hostname, NULL, &peers, &npeers))) {
+            pmix_output(0, "Client ns %s rank %d: PMIx_Resolve_peers failed for nspace %s: %d", myproc.nspace, myproc.rank, nsp2, rc);
+            goto done;
+        }
+        if ((nprocs+ntmp) != npeers) {
+            pmix_output(0, "Client ns %s rank %d: PMIx_Resolve_peers returned incorrect npeers: %d vs %d", myproc.nspace, myproc.rank, (int)(nprocs+ntmp), (int)npeers);
+            goto done;
+        }
+        pmix_output(0, "Client ns %s rank %d: PMIx_Resolve_peers returned %d npeers", myproc.nspace, myproc.rank, (int)npeers);
+        if (PMIX_SUCCESS != (rc = PMIx_Resolve_nodes(nsp2, &nodelist))) {
+            pmix_output(0, "Client ns %s rank %d: PMIx_Resolve_nodes failed for nspace %s: %d", myproc.nspace, myproc.rank, nsp2, rc);
+            goto done;
+        }
+        pmix_output(0, "Client ns %s rank %d: PMIx_Resolve_nodes %s", myproc.nspace, myproc.rank, nodelist);
+    } else {
+        if (PMIX_SUCCESS != (rc = PMIx_Resolve_peers(hostname, myproc.nspace, &peers, &npeers))) {
+            pmix_output(0, "Client ns %s rank %d: PMIx_Resolve_peers failed for nspace %s: %d", myproc.nspace, myproc.rank, myproc.nspace, rc);
+            goto done;
+        }
+        if (nprocs != npeers) {
+            pmix_output(0, "Client ns %s rank %d: PMIx_Resolve_peers returned incorrect npeers: %d vs %d", myproc.nspace, myproc.rank, nprocs, (int)npeers);
+            goto done;
+        }
+        pmix_output(0, "Client ns %s rank %d: PMIx_Resolve_peers returned %d npeers", myproc.nspace, myproc.rank, (int)npeers);
+        if (PMIX_SUCCESS != (rc = PMIx_Resolve_nodes(myproc.nspace, &nodelist))) {
+            pmix_output(0, "Client ns %s rank %d: PMIx_Resolve_nodes failed: %d", myproc.nspace, myproc.rank, rc);
+            goto done;
+        }
+        pmix_output(0, "Client ns %s rank %d: PMIx_Resolve_nodes %s", myproc.nspace, myproc.rank, nodelist);
+    }
+    PMIX_PROC_FREE(peers, npeers);
+    free(nodelist);
+
+ done:
+    /* call fence to sync */
+    PMIX_PROC_CONSTRUCT(&proc);
+    (void)strncpy(proc.nspace, myproc.nspace, PMIX_MAX_NSLEN);
+    proc.rank = PMIX_RANK_WILDCARD;
+    if (PMIX_SUCCESS != (rc = PMIx_Fence(&proc, 1, NULL, 0))) {
+        pmix_output(0, "Client ns %s rank %d: PMIx_Fence failed: %d", myproc.nspace, myproc.rank, rc);
+        goto done;
+    }
+
+    /* finalize us */
+    pmix_output(0, "Client ns %s rank %d: Finalizing", myproc.nspace, myproc.rank);
+
+    if (PMIX_SUCCESS != (rc = PMIx_Finalize(NULL, 0))) {
+        fprintf(stderr, "Client ns %s rank %d:PMIx_Finalize failed: %d\n", myproc.nspace, myproc.rank, rc);
+    } else {
+        fprintf(stderr, "Client ns %s rank %d:PMIx_Finalize successfully completed\n", myproc.nspace, myproc.rank);
+    }
+    fflush(stderr);
+    return(0);
+}
diff --git a/test/simple/simpft.c b/test/simple/simpft.c
new file mode 100644
index 0000000..0844b93
--- /dev/null
+++ b/test/simple/simpft.c
@@ -0,0 +1,139 @@
+/*
+ * Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2011 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2006-2013 Los Alamos National Security, LLC.
+ *                         All rights reserved.
+ * Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2011      Oak Ridge National Labs.  All rights reserved.
+ * Copyright (c) 2013-2017 Intel, Inc. All rights reserved.
+ * Copyright (c) 2015      Mellanox Technologies, Inc.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ *
+ */
+
+#include <src/include/pmix_config.h>
+#include <pmix.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <time.h>
+
+#include "src/class/pmix_object.h"
+#include "src/buffer_ops/types.h"
+#include "src/util/argv.h"
+#include "src/util/output.h"
+#include "src/util/printf.h"
+
+static pmix_proc_t myproc;
+static bool completed;
+
+static void notification_fn(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)
+{
+    pmix_output(0, "Client %s:%d NOTIFIED with status %d", myproc.nspace, myproc.rank, status);
+    if (NULL != cbfunc) {
+        cbfunc(PMIX_SUCCESS, NULL, 0, NULL, NULL, cbdata);
+    }
+    completed = true;
+}
+
+static void op_callbk(pmix_status_t status,
+                      void *cbdata)
+{
+    pmix_output(0, "CLIENT: OP CALLBACK CALLED WITH STATUS %d", status);
+}
+
+static void errhandler_reg_callbk (pmix_status_t status,
+                                   size_t errhandler_ref,
+                                   void *cbdata)
+{
+    pmix_output(0, "Client: ERRHANDLER REGISTRATION CALLBACK CALLED WITH STATUS %d, ref=%lu",
+                status, (unsigned long)errhandler_ref);
+}
+
+int main(int argc, char **argv)
+{
+    int rc;
+    pmix_value_t value;
+    pmix_value_t *val = &value;
+    pmix_proc_t proc;
+    uint32_t nprocs;
+
+    /* init us */
+    if (PMIX_SUCCESS != (rc = PMIx_Init(&myproc, NULL, 0))) {
+        pmix_output(0, "Client ns %s rank %d: PMIx_Init failed: %d", myproc.nspace, myproc.rank, rc);
+        exit(0);
+    }
+    pmix_output(0, "Client ns %s rank %d: Running", myproc.nspace, myproc.rank);
+
+    /* get our universe size */
+    (void)strncpy(proc.nspace, myproc.nspace, PMIX_MAX_NSLEN);
+    proc.rank = PMIX_RANK_WILDCARD;
+    if (PMIX_SUCCESS != (rc = PMIx_Get(&proc, PMIX_UNIV_SIZE, NULL, 0, &val))) {
+        pmix_output(0, "Client ns %s rank %d: PMIx_Get universe size failed: %d", myproc.nspace, myproc.rank, rc);
+        goto done;
+    }
+    nprocs = val->data.uint32;
+    PMIX_VALUE_RELEASE(val);
+    pmix_output(0, "Client %s:%d universe size %d", myproc.nspace, myproc.rank, nprocs);
+    completed = false;
+
+    /* register our errhandler */
+    PMIx_Register_event_handler(NULL, 0, NULL, 0,
+                                notification_fn, errhandler_reg_callbk, NULL);
+
+    /* call fence to sync */
+    PMIX_PROC_CONSTRUCT(&proc);
+    (void)strncpy(proc.nspace, myproc.nspace, PMIX_MAX_NSLEN);
+    proc.rank = PMIX_RANK_WILDCARD;
+    if (PMIX_SUCCESS != (rc = PMIx_Fence(&proc, 1, NULL, 0))) {
+        pmix_output(0, "Client ns %s rank %d: PMIx_Fence failed: %d", myproc.nspace, myproc.rank, rc);
+        goto done;
+    }
+
+    /* rank=0 calls abort */
+    if (0 == myproc.rank) {
+        PMIx_Abort(PMIX_ERR_OUT_OF_RESOURCE, "Eat rocks",
+                   &proc, 1);
+        pmix_output(0, "Client ns %s rank %d: Abort called", myproc.nspace, myproc.rank);
+    } else {
+    /* everyone simply waits */
+        while (!completed) {
+            struct timespec ts;
+            ts.tv_sec = 0;
+            ts.tv_nsec = 100000;
+            nanosleep(&ts, NULL);
+        }
+    }
+
+ done:
+    /* finalize us */
+    pmix_output(0, "Client ns %s rank %d: Finalizing", myproc.nspace, myproc.rank);
+    PMIx_Deregister_event_handler(1, op_callbk, NULL);
+
+    if (PMIX_SUCCESS != (rc = PMIx_Finalize(NULL, 0))) {
+        fprintf(stderr, "Client ns %s rank %d:PMIx_Finalize failed: %d\n", myproc.nspace, myproc.rank, rc);
+    } else {
+        fprintf(stderr, "Client ns %s rank %d:PMIx_Finalize successfully completed\n", myproc.nspace, myproc.rank);
+    }
+    fflush(stderr);
+    return(0);
+}
diff --git a/test/simple/simppub.c b/test/simple/simppub.c
new file mode 100644
index 0000000..4d73146
--- /dev/null
+++ b/test/simple/simppub.c
@@ -0,0 +1,169 @@
+/*
+ * Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2011 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2006-2013 Los Alamos National Security, LLC.
+ *                         All rights reserved.
+ * Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2011      Oak Ridge National Labs.  All rights reserved.
+ * Copyright (c) 2013-2016 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2015      Mellanox Technologies, Inc.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ *
+ */
+
+#include <src/include/pmix_config.h>
+#include <pmix.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <time.h>
+
+#include "src/class/pmix_object.h"
+#include "src/buffer_ops/types.h"
+#include "src/util/argv.h"
+#include "src/util/output.h"
+#include "src/util/printf.h"
+
+int main(int argc, char **argv)
+{
+    int rc;
+    pmix_value_t value;
+    pmix_value_t *val = &value;
+    pmix_proc_t proc;
+    uint32_t nprocs;
+    pmix_info_t *info;
+    pmix_pdata_t *pdata;
+    pmix_proc_t myproc;
+
+    /* init us */
+    if (PMIX_SUCCESS != (rc = PMIx_Init(&myproc, NULL, 0))) {
+        pmix_output(0, "Client ns %s rank %d: PMIx_Init failed: %d", myproc.nspace, myproc.rank, rc);
+        exit(0);
+    }
+    pmix_output(0, "Client ns %s rank %d: Running", myproc.nspace, myproc.rank);
+
+    /* get our universe size */
+    (void)strncpy(proc.nspace, myproc.nspace, PMIX_MAX_NSLEN);
+    proc.rank = PMIX_RANK_WILDCARD;
+    if (PMIX_SUCCESS != (rc = PMIx_Get(&proc, PMIX_UNIV_SIZE, NULL, 0, &val))) {
+        pmix_output(0, "Client ns %s rank %d: PMIx_Get universe size failed: %d", myproc.nspace, myproc.rank, rc);
+        goto done;
+    }
+    nprocs = val->data.uint32;
+    PMIX_VALUE_RELEASE(val);
+    pmix_output(0, "Client %s:%d universe size %d", myproc.nspace, myproc.rank, nprocs);
+
+    /* call fence to ensure the data is received */
+    PMIX_PROC_CONSTRUCT(&proc);
+    (void)strncpy(proc.nspace, myproc.nspace, PMIX_MAX_NSLEN);
+    proc.rank = PMIX_RANK_WILDCARD;
+    if (PMIX_SUCCESS != (rc = PMIx_Fence(&proc, 1, NULL, 0))) {
+        pmix_output(0, "Client ns %s rank %d: PMIx_Fence failed: %d", myproc.nspace, myproc.rank, rc);
+        goto done;
+    }
+
+    /* publish something */
+    if (0 == myproc.rank) {
+        PMIX_INFO_CREATE(info, 2);
+        (void)strncpy(info[0].key, "FOOBAR", PMIX_MAX_KEYLEN);
+        info[0].value.type = PMIX_UINT8;
+        info[0].value.data.uint8 = 1;
+        (void)strncpy(info[1].key, "PANDA", PMIX_MAX_KEYLEN);
+        info[1].value.type = PMIX_SIZE;
+        info[1].value.data.size = 123456;
+        if (PMIX_SUCCESS != (rc = PMIx_Publish(info, 2))) {
+            pmix_output(0, "Client ns %s rank %d: PMIx_Publish failed: %d", myproc.nspace, myproc.rank, rc);
+            goto done;
+        }
+        PMIX_INFO_FREE(info, 2);
+    }
+
+    /* call fence again so all procs know the data
+     * has been published */
+    if (PMIX_SUCCESS != (rc = PMIx_Fence(&proc, 1, NULL, 0))) {
+        pmix_output(0, "Client ns %s rank %d: PMIx_Fence failed: %d", myproc.nspace, myproc.rank, rc);
+        goto done;
+    }
+
+    /* lookup something */
+    if (0 != myproc.rank) {
+        PMIX_PDATA_CREATE(pdata, 1);
+        (void)strncpy(pdata[0].key, "FOOBAR", PMIX_MAX_KEYLEN);
+        if (PMIX_SUCCESS != (rc = PMIx_Lookup(pdata, 1, NULL, 0))) {
+            pmix_output(0, "Client ns %s rank %d: PMIx_Lookup failed: %d", myproc.nspace, myproc.rank, rc);
+            goto done;
+        }
+        /* check the return for value and source */
+        if (0 != strncmp(myproc.nspace, pdata[0].proc.nspace, PMIX_MAX_NSLEN)) {
+            pmix_output(0, "Client ns %s rank %d: PMIx_Lookup returned wrong nspace: %s",
+                        myproc.nspace, myproc.rank, pdata[0].proc.nspace);
+            goto done;
+        }
+        if (0 != pdata[0].proc.rank) {
+            pmix_output(0, "Client ns %s rank %d: PMIx_Lookup returned wrong rank: %d",
+                        myproc.nspace, myproc.rank, pdata[0].proc.rank);
+            goto done;
+        }
+        if (PMIX_UINT8 != pdata[0].value.type) {
+            pmix_output(0, "Client ns %s rank %d: PMIx_Lookup returned wrong type: %d",
+                        myproc.nspace, myproc.rank, pdata[0].value.type);
+            goto done;
+        }
+        if (1 != pdata[0].value.data.uint8) {
+            pmix_output(0, "Client ns %s rank %d: PMIx_Lookup returned wrong value: %d",
+                        myproc.nspace, myproc.rank, (int)pdata[0].value.data.uint8);
+            goto done;
+        }
+        PMIX_PDATA_FREE(pdata, 1);
+        pmix_output(0, "PUBLISH-LOOKUP SUCCEEDED");
+    }
+
+    /* call fence again so rank 0 waits before leaving */
+    if (PMIX_SUCCESS != (rc = PMIx_Fence(&proc, 1, NULL, 0))) {
+        pmix_output(0, "Client ns %s rank %d: PMIx_Fence failed: %d", myproc.nspace, myproc.rank, rc);
+        goto done;
+    }
+
+    if (0 == myproc.rank) {
+        char **keys = NULL;
+        pmix_argv_append_nosize(&keys, "FOOBAR");
+        pmix_argv_append_nosize(&keys, "PANDA");
+
+        if (PMIX_SUCCESS != (rc = PMIx_Unpublish(keys, NULL, 0))) {
+            pmix_output(0, "Client ns %s rank %d: PMIx_Unpublish failed: %d", myproc.nspace, myproc.rank, rc);
+            goto done;
+        }
+        pmix_output(0, "UNPUBLISH SUCCEEDED");
+    }
+
+    /* call fence again so everyone waits for rank 0 before leaving */
+    proc.rank = PMIX_RANK_WILDCARD;
+    if (PMIX_SUCCESS != (rc = PMIx_Fence(&proc, 1, NULL, 0))) {
+        pmix_output(0, "Client ns %s rank %d: PMIx_Fence failed: %d", myproc.nspace, myproc.rank, rc);
+        goto done;
+    }
+
+ done:
+    /* finalize us */
+    pmix_output(0, "Client ns %s rank %d: Finalizing", myproc.nspace, myproc.rank);
+    if (PMIX_SUCCESS != (rc = PMIx_Finalize(NULL, 0))) {
+        fprintf(stderr, "Client ns %s rank %d:PMIx_Finalize failed: %d\n", myproc.nspace, myproc.rank, rc);
+    } else {
+        fprintf(stderr, "Client ns %s rank %d:PMIx_Finalize successfully completed\n", myproc.nspace, myproc.rank);
+    }
+    fflush(stderr);
+    return(0);
+}
diff --git a/test/simple/simptest.c b/test/simple/simptest.c
new file mode 100644
index 0000000..58b8980
--- /dev/null
+++ b/test/simple/simptest.c
@@ -0,0 +1,938 @@
+/*
+ * Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2011 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2006-2013 Los Alamos National Security, LLC.
+ *                         All rights reserved.
+ * Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2011      Oak Ridge National Labs.  All rights reserved.
+ * Copyright (c) 2013-2017 Intel, Inc. All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2016      IBM Corporation.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ *
+ */
+
+#include <src/include/pmix_config.h>
+#include <pmix_server.h>
+#include <src/include/types.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <time.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <errno.h>
+#include <signal.h>
+#include PMIX_EVENT_HEADER
+
+#include "src/util/pmix_environ.h"
+#include "src/util/output.h"
+#include "src/util/printf.h"
+#include "src/util/argv.h"
+#include "src/buffer_ops/buffer_ops.h"
+
+static pmix_status_t connected(const pmix_proc_t *proc, void *server_object,
+                               pmix_op_cbfunc_t cbfunc, void *cbdata);
+static pmix_status_t finalized(const pmix_proc_t *proc, void *server_object,
+                               pmix_op_cbfunc_t cbfunc, void *cbdata);
+static pmix_status_t abort_fn(const pmix_proc_t *proc, void *server_object,
+                              int status, const char msg[],
+                              pmix_proc_t procs[], size_t nprocs,
+                              pmix_op_cbfunc_t cbfunc, void *cbdata);
+static pmix_status_t fencenb_fn(const pmix_proc_t procs[], size_t nprocs,
+                                const pmix_info_t info[], size_t ninfo,
+                                char *data, size_t ndata,
+                                pmix_modex_cbfunc_t cbfunc, void *cbdata);
+static pmix_status_t dmodex_fn(const pmix_proc_t *proc,
+                               const pmix_info_t info[], size_t ninfo,
+                               pmix_modex_cbfunc_t cbfunc, void *cbdata);
+static pmix_status_t publish_fn(const pmix_proc_t *proc,
+                                const pmix_info_t info[], size_t ninfo,
+                                pmix_op_cbfunc_t cbfunc, void *cbdata);
+static pmix_status_t lookup_fn(const pmix_proc_t *proc, char **keys,
+                               const pmix_info_t info[], size_t ninfo,
+                               pmix_lookup_cbfunc_t cbfunc, void *cbdata);
+static pmix_status_t unpublish_fn(const pmix_proc_t *proc, char **keys,
+                                  const pmix_info_t info[], size_t ninfo,
+                                  pmix_op_cbfunc_t cbfunc, void *cbdata);
+static pmix_status_t spawn_fn(const pmix_proc_t *proc,
+                              const pmix_info_t job_info[], size_t ninfo,
+                              const pmix_app_t apps[], size_t napps,
+                              pmix_spawn_cbfunc_t cbfunc, void *cbdata);
+static pmix_status_t connect_fn(const pmix_proc_t procs[], size_t nprocs,
+                                const pmix_info_t info[], size_t ninfo,
+                                pmix_op_cbfunc_t cbfunc, void *cbdata);
+static pmix_status_t disconnect_fn(const pmix_proc_t procs[], size_t nprocs,
+                                   const pmix_info_t info[], size_t ninfo,
+                                   pmix_op_cbfunc_t cbfunc, void *cbdata);
+static pmix_status_t register_event_fn(pmix_status_t *codes, size_t ncodes,
+                                       const pmix_info_t info[], size_t ninfo,
+                                       pmix_op_cbfunc_t cbfunc, void *cbdata);
+static pmix_status_t deregister_events(pmix_status_t *codes, size_t ncodes,
+                                       pmix_op_cbfunc_t cbfunc, void *cbdata);
+static pmix_status_t notify_event(pmix_status_t code,
+                                  const pmix_proc_t *source,
+                                  pmix_data_range_t range,
+                                  pmix_info_t info[], size_t ninfo,
+                                  pmix_op_cbfunc_t cbfunc, void *cbdata);
+static pmix_status_t query_fn(pmix_proc_t *proct,
+                              pmix_query_t *queries, size_t nqueries,
+                              pmix_info_cbfunc_t cbfunc,
+                              void *cbdata);
+static void tool_connect_fn(pmix_info_t *info, size_t ninfo,
+                            pmix_tool_connection_cbfunc_t cbfunc,
+                            void *cbdata);
+static void log_fn(const pmix_proc_t *client,
+                   const pmix_info_t data[], size_t ndata,
+                   const pmix_info_t directives[], size_t ndirs,
+                   pmix_op_cbfunc_t cbfunc, void *cbdata);
+
+static pmix_server_module_t mymodule = {
+    .client_connected = connected,
+    .client_finalized = finalized,
+    .abort = abort_fn,
+    .fence_nb = fencenb_fn,
+    .direct_modex = dmodex_fn,
+    .publish = publish_fn,
+    .lookup = lookup_fn,
+    .unpublish = unpublish_fn,
+    .spawn = spawn_fn,
+    .connect = connect_fn,
+    .disconnect = disconnect_fn,
+    .register_events = register_event_fn,
+    .deregister_events = deregister_events,
+    .notify_event = notify_event,
+    .query = query_fn,
+    .tool_connected = tool_connect_fn,
+    .log = log_fn
+};
+
+typedef struct {
+    pmix_list_item_t super;
+    pmix_pdata_t pdata;
+} pmix_locdat_t;
+PMIX_CLASS_INSTANCE(pmix_locdat_t,
+                    pmix_list_item_t,
+                    NULL, NULL);
+
+typedef struct {
+    pmix_object_t super;
+    volatile bool active;
+    pmix_proc_t caller;
+    pmix_info_t *info;
+    size_t ninfo;
+    pmix_op_cbfunc_t cbfunc;
+    pmix_spawn_cbfunc_t spcbfunc;
+    void *cbdata;
+} myxfer_t;
+static void xfcon(myxfer_t *p)
+{
+    p->info = NULL;
+    p->ninfo = 0;
+    p->active = true;
+    p->cbfunc = NULL;
+    p->spcbfunc = NULL;
+    p->cbdata = NULL;
+}
+static void xfdes(myxfer_t *p)
+{
+    if (NULL != p->info) {
+        PMIX_INFO_FREE(p->info, p->ninfo);
+    }
+}
+PMIX_CLASS_INSTANCE(myxfer_t,
+                    pmix_object_t,
+                    xfcon, xfdes);
+
+typedef struct {
+    pmix_list_item_t super;
+    pid_t pid;
+} wait_tracker_t;
+PMIX_CLASS_INSTANCE(wait_tracker_t,
+                    pmix_list_item_t,
+                    NULL, NULL);
+
+static volatile int wakeup;
+static pmix_list_t pubdata;
+static pmix_event_t handler;
+static pmix_list_t children;
+
+static void set_namespace(int nprocs, char *ranks, char *nspace,
+                          pmix_op_cbfunc_t cbfunc, myxfer_t *x);
+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);
+static void wait_signal_callback(int fd, short event, void *arg);
+static void errhandler_reg_callbk (pmix_status_t status,
+                                   size_t errhandler_ref,
+                                   void *cbdata);
+
+static void opcbfunc(pmix_status_t status, void *cbdata)
+{
+    myxfer_t *x = (myxfer_t*)cbdata;
+
+    /* release the caller, if necessary */
+    if (NULL != x->cbfunc) {
+        x->cbfunc(PMIX_SUCCESS, x->cbdata);
+    }
+    x->active = false;
+}
+
+/* this is an event notification function that we explicitly request
+ * be called when the PMIX_MODEL_DECLARED notification is issued.
+ * We could catch it in the general event notification function and test
+ * the status to see if the status matched, but it often is simpler
+ * to declare a use-specific notification callback point. In this case,
+ * we are asking to know whenever a model is declared as a means
+ * of testing server self-notification */
+static void model_callback(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)
+{
+    size_t n;
+
+    /* just let us know it was received */
+    fprintf(stderr, "SIMPTEST: Model event handler called with status %d(%s)\n",
+            status, PMIx_Error_string(status));
+    for (n=0; n < ninfo; n++) {
+        if (PMIX_STRING == info[n].value.type) {
+            fprintf(stderr, "\t%s:\t%s\n", info[n].key, info[n].value.data.string);
+        }
+    }
+
+    /* we must NOT tell the event handler state machine that we
+     * are the last step as that will prevent it from notifying
+     * anyone else that might be listening for declarations */
+    if (NULL != cbfunc) {
+        cbfunc(PMIX_SUCCESS, NULL, 0, NULL, NULL, cbdata);
+    }
+    wakeup = 0;
+}
+
+/* event handler registration is done asynchronously */
+static void model_registration_callback(pmix_status_t status,
+                                        size_t evhandler_ref,
+                                        void *cbdata)
+{
+    volatile int *active = (volatile int*)cbdata;
+
+    if (PMIX_SUCCESS != status) {
+        fprintf(stderr, "simptest EVENT HANDLER REGISTRATION FAILED WITH STATUS %d, ref=%lu\n",
+                   status, (unsigned long)evhandler_ref);
+    }
+    *active = status;
+}
+
+int main(int argc, char **argv)
+{
+    char **client_env=NULL;
+    char **client_argv=NULL;
+    char *tmp, **atmp, *executable=NULL;
+    int rc, nprocs=1, n, k;
+    uid_t myuid;
+    gid_t mygid;
+    pid_t pid;
+    myxfer_t *x;
+    pmix_proc_t proc;
+    wait_tracker_t *child;
+    pmix_info_t *info;
+    size_t ninfo;
+    bool cross_version = false;
+    bool usock = true;
+    volatile int active;
+    pmix_status_t code;
+
+    /* smoke test */
+    if (PMIX_SUCCESS != 0) {
+        fprintf(stderr, "ERROR IN COMPUTING CONSTANTS: PMIX_SUCCESS = %d\n", PMIX_SUCCESS);
+        exit(1);
+    }
+
+    fprintf(stderr, "Testing version %s\n", PMIx_Get_version());
+
+    /* see if we were passed the number of procs to run or
+     * the executable to use */
+    for (n=1; n < argc; n++) {
+        if (0 == strcmp("-n", argv[n]) &&
+            NULL != argv[n+1]) {
+            nprocs = strtol(argv[n+1], NULL, 10);
+            ++n;  // step over the argument
+        } else if (0 == strcmp("-e", argv[n]) &&
+                   NULL != argv[n+1]) {
+            executable = strdup(argv[n+1]);
+            for (k=n+2; NULL != argv[k]; k++) {
+                pmix_argv_append_nosize(&client_argv, argv[k]);
+            }
+            n += k;
+        } else if (0 == strcmp("-x", argv[n])) {
+            /* cross-version test - we will set one child to
+             * run at a different version. Requires -n >= 2 */
+            cross_version = true;
+            usock = false;
+        } else if (0 == strcmp("-u", argv[n])) {
+            /* enable usock */
+            usock = false;
+        } else if (0 == strcmp("-h", argv[n])) {
+            /* print the options and exit */
+            fprintf(stderr, "usage: simptest <options>\n");
+            fprintf(stderr, "    -n N     Number of clients to run\n");
+            fprintf(stderr, "    -e foo   Name of the client executable to run (default: simpclient\n");
+            fprintf(stderr, "    -x       Test cross-version support\n");
+            fprintf(stderr, "    -u       Enable legacy usock support\n");
+            exit(0);
+        }
+    }
+    if (NULL == executable) {
+        executable = strdup("./simpclient");
+    }
+    if (cross_version && nprocs < 2) {
+        fprintf(stderr, "Cross-version testing requires at least two clients\n");
+        exit(1);
+    }
+
+    /* setup the server library and tell it to support tool connections */
+    ninfo = 2;
+    PMIX_INFO_CREATE(info, ninfo);
+    PMIX_INFO_LOAD(&info[0], PMIX_SERVER_TOOL_SUPPORT, NULL, PMIX_BOOL);
+    PMIX_INFO_LOAD(&info[1], PMIX_USOCK_DISABLE, &usock, PMIX_BOOL);
+    if (PMIX_SUCCESS != (rc = PMIx_server_init(&mymodule, info, 2))) {
+        fprintf(stderr, "Init failed with error %d\n", rc);
+        return rc;
+    }
+    PMIX_INFO_FREE(info, ninfo);
+
+    /* register the default errhandler */
+    active = -1;
+    ninfo = 1;
+    PMIX_INFO_CREATE(info, ninfo);
+    PMIX_INFO_LOAD(&info[0], PMIX_EVENT_HDLR_NAME, "SIMPTEST-DEFAULT", PMIX_STRING);
+    PMIx_Register_event_handler(NULL, 0, info, ninfo,
+                                errhandler, errhandler_reg_callbk, (void*)&active);
+    while (-1 == active) {
+        usleep(10);
+    }
+    PMIX_INFO_FREE(info, ninfo);
+    if (0 != active) {
+        exit(active);
+    }
+
+    /* register a handler specifically for when models declare */
+    active = -1;
+    ninfo = 1;
+    PMIX_INFO_CREATE(info, ninfo);
+    PMIX_INFO_LOAD(&info[0], PMIX_EVENT_HDLR_NAME, "SIMPTEST-MODEL", PMIX_STRING);
+    code = PMIX_MODEL_DECLARED;
+    PMIx_Register_event_handler(&code, 1, info, ninfo,
+                                model_callback, model_registration_callback, (void*)&active);
+    while (-1 == active) {
+        usleep(10);
+    }
+    PMIX_INFO_FREE(info, ninfo);
+    if (0 != active) {
+        exit(active);
+    }
+
+    /* setup the pub data, in case it is used */
+    PMIX_CONSTRUCT(&pubdata, pmix_list_t);
+
+    /* setup to see sigchld on the forked tests */
+    PMIX_CONSTRUCT(&children, pmix_list_t);
+    event_assign(&handler, pmix_globals.evbase, SIGCHLD,
+                 EV_SIGNAL|EV_PERSIST,wait_signal_callback, &handler);
+    event_add(&handler, NULL);
+
+    /* we have a single namespace for all clients */
+    atmp = NULL;
+    for (n=0; n < nprocs; n++) {
+        asprintf(&tmp, "%d", n);
+        pmix_argv_append_nosize(&atmp, tmp);
+        free(tmp);
+    }
+    tmp = pmix_argv_join(atmp, ',');
+    pmix_argv_free(atmp);
+    x = PMIX_NEW(myxfer_t);
+    set_namespace(nprocs, tmp, "foobar", opcbfunc, x);
+
+    /* set common argv and env */
+    client_env = pmix_argv_copy(environ);
+    pmix_argv_prepend_nosize(&client_argv, executable);
+
+    wakeup = nprocs;
+    myuid = getuid();
+    mygid = getgid();
+
+    /* if the nspace registration hasn't completed yet,
+     * wait for it here */
+    PMIX_WAIT_FOR_COMPLETION(x->active);
+    free(tmp);
+    PMIX_RELEASE(x);
+
+    /* fork/exec the test */
+    (void)strncpy(proc.nspace, "foobar", PMIX_MAX_NSLEN);
+    for (n = 0; n < nprocs; n++) {
+        proc.rank = n;
+        if (PMIX_SUCCESS != (rc = PMIx_server_setup_fork(&proc, &client_env))) {//n
+            fprintf(stderr, "Server fork setup failed with error %d\n", rc);
+            PMIx_server_finalize();
+            return rc;
+        }
+        /* if cross-version test is requested, then oscillate PTL support
+         * by rank */
+        if (cross_version) {
+            if (0 == n % 2) {
+                pmix_setenv("PMIX_MCA_ptl", "tcp", true, &client_env);
+            } else {
+                pmix_setenv("PMIX_MCA_ptl", "usock", true, &client_env);
+            }
+        }
+        x = PMIX_NEW(myxfer_t);
+        if (PMIX_SUCCESS != (rc = PMIx_server_register_client(&proc, myuid, mygid,
+                                                              NULL, opcbfunc, x))) {
+            fprintf(stderr, "Server register client failed with error %d\n", rc);
+            PMIx_server_finalize();
+            return rc;
+        }
+        /* don't fork/exec the client until we know it is registered
+         * so we avoid a potential race condition in the server */
+        PMIX_WAIT_FOR_COMPLETION(x->active);
+        PMIX_RELEASE(x);
+        pid = fork();
+        if (pid < 0) {
+            fprintf(stderr, "Fork failed\n");
+            PMIx_server_finalize();
+            return -1;
+        }
+        child = PMIX_NEW(wait_tracker_t);
+        child->pid = pid;
+        pmix_list_append(&children, &child->super);
+
+        if (pid == 0) {
+            execve(executable, client_argv, client_env);
+            /* Does not return */
+            exit(0);
+        }
+    }
+    free(executable);
+    pmix_argv_free(client_argv);
+    pmix_argv_free(client_env);
+
+    /* hang around until the client(s) finalize */
+    while (0 < wakeup) {
+        struct timespec ts;
+        ts.tv_sec = 0;
+        ts.tv_nsec = 100000;
+        nanosleep(&ts, NULL);
+    }
+
+    /* try notifying ourselves */
+    ninfo = 3;
+    PMIX_INFO_CREATE(info, ninfo);
+    PMIX_INFO_LOAD(&info[0], PMIX_PROGRAMMING_MODEL, "PMIX", PMIX_STRING);
+    PMIX_INFO_LOAD(&info[1], PMIX_MODEL_LIBRARY_NAME, "test", PMIX_STRING);
+    /* mark that it is not to go to any default handlers */
+    PMIX_INFO_LOAD(&info[2], PMIX_EVENT_NON_DEFAULT, NULL, PMIX_BOOL);
+    wakeup = -1;
+    PMIx_Notify_event(PMIX_MODEL_DECLARED,
+                      &pmix_globals.myid, PMIX_RANGE_PROC_LOCAL,
+                      info, ninfo, NULL, NULL);
+    while (-1 == wakeup) {
+        usleep(10);
+    }
+    PMIX_INFO_FREE(info, ninfo);
+
+    /* deregister the event handlers */
+    PMIx_Deregister_event_handler(0, NULL, NULL);
+
+    /* release any pub data */
+    PMIX_LIST_DESTRUCT(&pubdata);
+
+    /* finalize the server library */
+    if (PMIX_SUCCESS != (rc = PMIx_server_finalize())) {
+        fprintf(stderr, "Finalize failed with error %d\n", rc);
+    }
+
+    fprintf(stderr, "Test finished OK!\n");
+
+    return rc;
+}
+
+static void set_namespace(int nprocs, char *ranks, char *nspace,
+                          pmix_op_cbfunc_t cbfunc, myxfer_t *x)
+{
+    char *regex, *ppn;
+    char hostname[PMIX_MAXHOSTNAMELEN];
+
+    gethostname(hostname, sizeof(hostname));
+    x->ninfo = 7;
+
+    PMIX_INFO_CREATE(x->info, x->ninfo);
+    (void)strncpy(x->info[0].key, PMIX_UNIV_SIZE, PMIX_MAX_KEYLEN);
+    x->info[0].value.type = PMIX_UINT32;
+    x->info[0].value.data.uint32 = nprocs;
+
+    (void)strncpy(x->info[1].key, PMIX_SPAWNED, PMIX_MAX_KEYLEN);
+    x->info[1].value.type = PMIX_UINT32;
+    x->info[1].value.data.uint32 = 0;
+
+    (void)strncpy(x->info[2].key, PMIX_LOCAL_SIZE, PMIX_MAX_KEYLEN);
+    x->info[2].value.type = PMIX_UINT32;
+    x->info[2].value.data.uint32 = nprocs;
+
+    (void)strncpy(x->info[3].key, PMIX_LOCAL_PEERS, PMIX_MAX_KEYLEN);
+    x->info[3].value.type = PMIX_STRING;
+    x->info[3].value.data.string = strdup(ranks);
+
+    PMIx_generate_regex(hostname, &regex);
+    (void)strncpy(x->info[4].key, PMIX_NODE_MAP, PMIX_MAX_KEYLEN);
+    x->info[4].value.type = PMIX_STRING;
+    x->info[4].value.data.string = regex;
+
+    PMIx_generate_ppn(ranks, &ppn);
+    (void)strncpy(x->info[5].key, PMIX_PROC_MAP, PMIX_MAX_KEYLEN);
+    x->info[5].value.type = PMIX_STRING;
+    x->info[5].value.data.string = ppn;
+
+    (void)strncpy(x->info[6].key, PMIX_JOB_SIZE, PMIX_MAX_KEYLEN);
+    x->info[6].value.type = PMIX_UINT32;
+    x->info[6].value.data.uint32 = nprocs;
+
+    PMIx_server_register_nspace(nspace, nprocs, x->info, x->ninfo,
+                                cbfunc, x);
+}
+
+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)
+{
+    pmix_output(0, "SERVER: ERRHANDLER CALLED WITH STATUS %d", status);
+}
+
+static void errhandler_reg_callbk (pmix_status_t status,
+                                   size_t errhandler_ref,
+                                   void *cbdata)
+{
+    volatile int *active = (volatile int*)cbdata;
+
+    pmix_output(0, "SERVER: ERRHANDLER REGISTRATION CALLBACK CALLED WITH STATUS %d, ref=%lu",
+                status, (unsigned long)errhandler_ref);
+    *active = status;
+}
+
+static pmix_status_t connected(const pmix_proc_t *proc, void *server_object,
+                               pmix_op_cbfunc_t cbfunc, void *cbdata)
+{
+    if (NULL != cbfunc) {
+        cbfunc(PMIX_SUCCESS, cbdata);
+    }
+    return PMIX_SUCCESS;
+}
+static pmix_status_t finalized(const pmix_proc_t *proc, void *server_object,
+                     pmix_op_cbfunc_t cbfunc, void *cbdata)
+{
+    pmix_output(0, "SERVER: FINALIZED %s:%d WAKEUP %d",
+                proc->nspace, proc->rank, wakeup);
+    /* ensure we call the cbfunc so the proc can exit! */
+    if (NULL != cbfunc) {
+        cbfunc(PMIX_SUCCESS, cbdata);
+    }
+    return PMIX_SUCCESS;
+}
+
+static void abcbfunc(pmix_status_t status, void *cbdata)
+{
+    myxfer_t *x = (myxfer_t*)cbdata;
+
+    /* be sure to release the caller */
+    if (NULL != x->cbfunc) {
+        x->cbfunc(status, x->cbdata);
+    }
+    PMIX_RELEASE(x);
+}
+
+static pmix_status_t abort_fn(const pmix_proc_t *proc,
+                              void *server_object,
+                              int status, const char msg[],
+                              pmix_proc_t procs[], size_t nprocs,
+                              pmix_op_cbfunc_t cbfunc, void *cbdata)
+{
+    pmix_status_t rc;
+    myxfer_t *x;
+
+    if (NULL != procs) {
+        pmix_output(0, "SERVER: ABORT on %s:%d", procs[0].nspace, procs[0].rank);
+    } else {
+        pmix_output(0, "SERVER: ABORT OF ALL PROCS IN NSPACE %s", proc->nspace);
+    }
+
+    /* instead of aborting the specified procs, notify them
+     * (if they have registered their errhandler) */
+
+    /* use the myxfer_t object to ensure we release
+     * the caller when notification has been queued */
+    x = PMIX_NEW(myxfer_t);
+    (void)strncpy(x->caller.nspace, proc->nspace, PMIX_MAX_NSLEN);
+    x->caller.rank = proc->rank;
+
+    PMIX_INFO_CREATE(x->info, 2);
+    (void)strncpy(x->info[0].key, "DARTH", PMIX_MAX_KEYLEN);
+    x->info[0].value.type = PMIX_INT8;
+    x->info[0].value.data.int8 = 12;
+    (void)strncpy(x->info[1].key, "VADER", PMIX_MAX_KEYLEN);
+    x->info[1].value.type = PMIX_DOUBLE;
+    x->info[1].value.data.dval = 12.34;
+    x->cbfunc = cbfunc;
+    x->cbdata = cbdata;
+
+    if (PMIX_SUCCESS != (rc = PMIx_Notify_event(status, &x->caller,
+                                                PMIX_RANGE_NAMESPACE,
+                                                x->info, 2,
+                                                abcbfunc, x))) {
+        pmix_output(0, "SERVER: FAILED NOTIFY ERROR %d", (int)rc);
+    }
+
+    return PMIX_SUCCESS;
+}
+
+
+static pmix_status_t fencenb_fn(const pmix_proc_t procs[], size_t nprocs,
+                      const pmix_info_t info[], size_t ninfo,
+                      char *data, size_t ndata,
+                      pmix_modex_cbfunc_t cbfunc, void *cbdata)
+{
+    pmix_output(0, "SERVER: FENCENB");
+    /* pass the provided data back to each participating proc */
+    if (NULL != cbfunc) {
+        cbfunc(PMIX_SUCCESS, data, ndata, cbdata, NULL, NULL);
+    }
+    return PMIX_SUCCESS;
+}
+
+
+static pmix_status_t dmodex_fn(const pmix_proc_t *proc,
+                     const pmix_info_t info[], size_t ninfo,
+                     pmix_modex_cbfunc_t cbfunc, void *cbdata)
+{
+    pmix_output(0, "SERVER: DMODEX");
+
+    /* we don't have any data for remote procs as this
+     * test only runs one server - so report accordingly */
+    if (NULL != cbfunc) {
+        cbfunc(PMIX_ERR_NOT_FOUND, NULL, 0, cbdata, NULL, NULL);
+    }
+    return PMIX_SUCCESS;
+}
+
+
+static pmix_status_t publish_fn(const pmix_proc_t *proc,
+                      const pmix_info_t info[], size_t ninfo,
+                      pmix_op_cbfunc_t cbfunc, void *cbdata)
+{
+    pmix_locdat_t *p;
+    size_t n;
+
+    pmix_output(0, "SERVER: PUBLISH");
+
+    for (n=0; n < ninfo; n++) {
+        p = PMIX_NEW(pmix_locdat_t);
+        (void)strncpy(p->pdata.proc.nspace, proc->nspace, PMIX_MAX_NSLEN);
+        p->pdata.proc.rank = proc->rank;
+        (void)strncpy(p->pdata.key, info[n].key, PMIX_MAX_KEYLEN);
+        pmix_value_xfer(&p->pdata.value, (pmix_value_t*)&info[n].value);
+        pmix_list_append(&pubdata, &p->super);
+    }
+    if (NULL != cbfunc) {
+        cbfunc(PMIX_SUCCESS, cbdata);
+    }
+    return PMIX_SUCCESS;
+}
+
+
+static pmix_status_t lookup_fn(const pmix_proc_t *proc, char **keys,
+                     const pmix_info_t info[], size_t ninfo,
+                     pmix_lookup_cbfunc_t cbfunc, void *cbdata)
+{
+    pmix_locdat_t *p, *p2;
+    pmix_list_t results;
+    size_t i, n;
+    pmix_pdata_t *pd = NULL;
+    pmix_status_t ret = PMIX_ERR_NOT_FOUND;
+
+    pmix_output(0, "SERVER: LOOKUP");
+
+    PMIX_CONSTRUCT(&results, pmix_list_t);
+
+    for (n=0; NULL != keys[n]; n++) {
+        PMIX_LIST_FOREACH(p, &pubdata, pmix_locdat_t) {
+            if (0 == strncmp(keys[n], p->pdata.key, PMIX_MAX_KEYLEN)) {
+                p2 = PMIX_NEW(pmix_locdat_t);
+                (void)strncpy(p2->pdata.proc.nspace, p->pdata.proc.nspace, PMIX_MAX_NSLEN);
+                p2->pdata.proc.rank = p->pdata.proc.rank;
+                (void)strncpy(p2->pdata.key, p->pdata.key, PMIX_MAX_KEYLEN);
+                pmix_value_xfer(&p2->pdata.value, &p->pdata.value);
+                pmix_list_append(&results, &p2->super);
+                break;
+            }
+        }
+    }
+    if (0 < (n = pmix_list_get_size(&results))) {
+        ret = PMIX_SUCCESS;
+        PMIX_PDATA_CREATE(pd, n);
+        for (i=0; i < n; i++) {
+            p = (pmix_locdat_t*)pmix_list_remove_first(&results);
+            if (p) {
+                (void)strncpy(pd[i].proc.nspace, p->pdata.proc.nspace, PMIX_MAX_NSLEN);
+                pd[i].proc.rank = p->pdata.proc.rank;
+                (void)strncpy(pd[i].key, p->pdata.key, PMIX_MAX_KEYLEN);
+                pmix_value_xfer(&pd[i].value, &p->pdata.value);
+            }
+        }
+    }
+    PMIX_LIST_DESTRUCT(&results);
+    if (NULL != cbfunc) {
+        cbfunc(ret, pd, n, cbdata);
+    }
+    if (0 < n) {
+        PMIX_PDATA_FREE(pd, n);
+    }
+    return PMIX_SUCCESS;
+}
+
+
+static pmix_status_t unpublish_fn(const pmix_proc_t *proc, char **keys,
+                        const pmix_info_t info[], size_t ninfo,
+                        pmix_op_cbfunc_t cbfunc, void *cbdata)
+{
+    pmix_locdat_t *p, *p2;
+    size_t n;
+
+    pmix_output(0, "SERVER: UNPUBLISH");
+
+    for (n=0; NULL != keys[n]; n++) {
+        PMIX_LIST_FOREACH_SAFE(p, p2, &pubdata, pmix_locdat_t) {
+            if (0 == strncmp(keys[n], p->pdata.key, PMIX_MAX_KEYLEN)) {
+                pmix_list_remove_item(&pubdata, &p->super);
+                PMIX_RELEASE(p);
+                break;
+            }
+        }
+    }
+    if (NULL != cbfunc) {
+        cbfunc(PMIX_SUCCESS, cbdata);
+    }
+    return PMIX_SUCCESS;
+}
+
+static void spcbfunc(pmix_status_t status, void *cbdata)
+{
+    myxfer_t *x = (myxfer_t*)cbdata;
+
+    if (NULL != x->spcbfunc) {
+        x->spcbfunc(PMIX_SUCCESS, "DYNSPACE", x->cbdata);
+    }
+}
+
+static pmix_status_t spawn_fn(const pmix_proc_t *proc,
+                    const pmix_info_t job_info[], size_t ninfo,
+                    const pmix_app_t apps[], size_t napps,
+                    pmix_spawn_cbfunc_t cbfunc, void *cbdata)
+{
+    myxfer_t *x;
+
+    pmix_output(0, "SERVER: SPAWN");
+
+    /* in practice, we would pass this request to the local
+     * resource manager for launch, and then have that server
+     * execute our callback function. For now, we will fake
+     * the spawn and just pretend */
+
+    /* must register the nspace for the new procs before
+     * we return to the caller */
+    x = PMIX_NEW(myxfer_t);
+    x->spcbfunc = cbfunc;
+    x->cbdata = cbdata;
+
+    set_namespace(2, "0,1", "DYNSPACE", spcbfunc, x);
+
+    return PMIX_SUCCESS;
+}
+
+
+static pmix_status_t connect_fn(const pmix_proc_t procs[], size_t nprocs,
+                                const pmix_info_t info[], size_t ninfo,
+                                pmix_op_cbfunc_t cbfunc, void *cbdata)
+{
+    pmix_output(0, "SERVER: CONNECT");
+
+    /* in practice, we would pass this request to the local
+     * resource manager for handling */
+
+    if (NULL != cbfunc) {
+        cbfunc(PMIX_SUCCESS, cbdata);
+    }
+
+    return PMIX_SUCCESS;
+}
+
+
+static pmix_status_t disconnect_fn(const pmix_proc_t procs[], size_t nprocs,
+                                   const pmix_info_t info[], size_t ninfo,
+                                   pmix_op_cbfunc_t cbfunc, void *cbdata)
+{
+    pmix_output(0, "SERVER: DISCONNECT");
+
+    /* in practice, we would pass this request to the local
+     * resource manager for handling */
+
+    if (NULL != cbfunc) {
+        cbfunc(PMIX_SUCCESS, cbdata);
+    }
+
+    return PMIX_SUCCESS;
+}
+
+static pmix_status_t register_event_fn(pmix_status_t *codes, size_t ncodes,
+                                       const pmix_info_t info[], size_t ninfo,
+                                       pmix_op_cbfunc_t cbfunc, void *cbdata)
+{
+    if (NULL != cbfunc) {
+        cbfunc(PMIX_SUCCESS, cbdata);
+    }
+    return PMIX_SUCCESS;
+}
+
+static pmix_status_t deregister_events(pmix_status_t *codes, size_t ncodes,
+                                       pmix_op_cbfunc_t cbfunc, void *cbdata)
+{
+    return PMIX_SUCCESS;
+}
+
+static pmix_status_t notify_event(pmix_status_t code,
+                                  const pmix_proc_t *source,
+                                  pmix_data_range_t range,
+                                  pmix_info_t info[], size_t ninfo,
+                                  pmix_op_cbfunc_t cbfunc, void *cbdata)
+{
+    return PMIX_SUCCESS;
+}
+
+typedef struct query_data_t {
+    pmix_info_t *data;
+    size_t ndata;
+} query_data_t;
+
+static pmix_status_t query_fn(pmix_proc_t *proct,
+                              pmix_query_t *queries, size_t nqueries,
+                              pmix_info_cbfunc_t cbfunc,
+                              void *cbdata)
+{
+    size_t n;
+    pmix_info_t *info;
+
+    pmix_output(0, "SERVER: QUERY");
+
+    if (NULL == cbfunc) {
+        return PMIX_ERROR;
+    }
+    /* keep this simple */
+    PMIX_INFO_CREATE(info, nqueries);
+    for (n=0; n < nqueries; n++) {
+        (void)strncpy(info[n].key, queries[n].keys[0], PMIX_MAX_KEYLEN);
+        info[n].value.type = PMIX_STRING;
+        if (0 > asprintf(&info[n].value.data.string, "%d", (int)n)) {
+            return PMIX_ERROR;
+        }
+    }
+    cbfunc(PMIX_SUCCESS, info, nqueries, cbdata, NULL, NULL);
+    return PMIX_SUCCESS;
+}
+
+static void tool_connect_fn(pmix_info_t *info, size_t ninfo,
+                            pmix_tool_connection_cbfunc_t cbfunc,
+                            void *cbdata)
+{
+    pmix_proc_t proc;
+
+    pmix_output(0, "SERVER: TOOL CONNECT");
+
+    /* just pass back an arbitrary nspace */
+    (void)strncpy(proc.nspace, "TOOL", PMIX_MAX_NSLEN);
+    proc.rank = 0;
+
+    if (NULL != cbfunc) {
+        cbfunc(PMIX_SUCCESS, &proc, cbdata);
+    }
+}
+
+static void log_fn(const pmix_proc_t *client,
+                   const pmix_info_t data[], size_t ndata,
+                   const pmix_info_t directives[], size_t ndirs,
+                   pmix_op_cbfunc_t cbfunc, void *cbdata)
+{
+    pmix_output(0, "SERVER: LOG");
+
+    if (NULL != cbfunc) {
+        cbfunc(PMIX_SUCCESS, cbdata);
+    }
+}
+
+static void wait_signal_callback(int fd, short event, void *arg)
+{
+    pmix_event_t *sig = (pmix_event_t*) arg;
+    int status;
+    pid_t pid;
+    wait_tracker_t *t2;
+
+    if (SIGCHLD != event_get_signal(sig)) {
+        return;
+    }
+
+    /* we can have multiple children leave but only get one
+     * sigchild callback, so reap all the waitpids until we
+     * don't get anything valid back */
+    while (1) {
+        pid = waitpid(-1, &status, WNOHANG);
+        if (-1 == pid && EINTR == errno) {
+            /* try it again */
+            continue;
+        }
+        /* if we got garbage, then nothing we can do */
+        if (pid <= 0) {
+            return;
+        }
+
+        /* we are already in an event, so it is safe to access the list */
+        PMIX_LIST_FOREACH(t2, &children, wait_tracker_t) {
+            if (pid == t2->pid) {
+                /* found it! */
+                --wakeup;
+                break;
+            }
+        }
+    }
+}
diff --git a/test/simple/simptool.c b/test/simple/simptool.c
new file mode 100644
index 0000000..ea31ced
--- /dev/null
+++ b/test/simple/simptool.c
@@ -0,0 +1,117 @@
+/*
+ * Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2011 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2006-2013 Los Alamos National Security, LLC.
+ *                         All rights reserved.
+ * Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2011      Oak Ridge National Labs.  All rights reserved.
+ * Copyright (c) 2013-2016 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2015      Mellanox Technologies, Inc.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ *
+ */
+
+#include <src/include/pmix_config.h>
+#include <pmix_tool.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <time.h>
+
+#include "src/class/pmix_object.h"
+#include "src/buffer_ops/types.h"
+#include "src/util/argv.h"
+#include "src/util/output.h"
+#include "src/util/printf.h"
+
+static pmix_proc_t myproc;
+
+static void cbfunc(pmix_status_t status,
+                   pmix_info_t *info, size_t ninfo,
+                   void *cbdata,
+                   pmix_release_cbfunc_t release_fn,
+                   void *release_cbdata)
+{
+    volatile bool *active = (volatile bool*)cbdata;
+
+    if (0 != strncmp(info[0].key, "foobar", PMIX_MAX_KEYLEN)) {
+        pmix_output(0, "Client ns %s rank %d: PMIx_Query_info[0] key wrong: %s vs foobar",
+                    myproc.nspace, myproc.rank, info[0].key);
+    }
+    if (0 != strncmp(info[1].key, "spastic", PMIX_MAX_KEYLEN)) {
+        pmix_output(0, "Client ns %s rank %d: PMIx_Query_info[1] key wrong: %s vs spastic",
+                    myproc.nspace, myproc.rank, info[1].key);
+    }
+    if (PMIX_STRING != info[0].value.type) {
+        pmix_output(0, "Client ns %s rank %d: PMIx_Query_info key[0] wrong type: %d vs %d",
+                    myproc.nspace, myproc.rank, info[0].value.type, PMIX_STRING);
+    }
+    if (PMIX_STRING != info[1].value.type) {
+        pmix_output(0, "Client ns %s rank %d: PMIx_Query_info key[1] wrong type: %d vs %d",
+                    myproc.nspace, myproc.rank, info[1].value.type, PMIX_STRING);
+    }
+    if (0 != strcmp(info[0].value.data.string, "0")) {
+        pmix_output(0, "Client ns %s rank %d: PMIx_Query_info key[0] wrong value: %s vs 0",
+                    myproc.nspace, myproc.rank, info[1].value.data.string);
+    }
+    if (0 != strcmp(info[1].value.data.string, "1")) {
+        pmix_output(0, "Client ns %s rank %d: PMIx_Query_info key[1] wrong value: %s vs 1",
+                    myproc.nspace, myproc.rank, info[1].value.data.string);
+    }
+
+    if (NULL != release_fn) {
+        release_fn(release_cbdata);
+    }
+    *active = false;
+}
+
+int main(int argc, char **argv)
+{
+    pmix_status_t rc;
+    pmix_query_t *query;
+    size_t nq;
+    volatile bool active;
+    /* init us */
+    if (PMIX_SUCCESS != (rc = PMIx_tool_init(&myproc, NULL, 0))) {
+        fprintf(stderr, "PMIx_tool_init failed: %d\n", rc);
+        exit(rc);
+    }
+    pmix_output(0, "Tool ns %s rank %d: Running", myproc.nspace, myproc.rank);
+
+    /* query something */
+    nq = 2;
+    PMIX_QUERY_CREATE(query, nq);
+    pmix_argv_append_nosize(&query[0].keys, "foobar");
+    pmix_argv_append_nosize(&query[1].keys, "spastic");
+    active = true;
+    if (PMIX_SUCCESS != (rc = PMIx_Query_info_nb(query, nq, cbfunc, (void*)&active))) {
+        pmix_output(0, "Client ns %s rank %d: PMIx_Query_info failed: %d", myproc.nspace, myproc.rank, rc);
+        goto done;
+    }
+    while(active) {
+        usleep(10);
+    }
+ done:
+    /* finalize us */
+    pmix_output(0, "Client ns %s rank %d: Finalizing", myproc.nspace, myproc.rank);
+    if (PMIX_SUCCESS != (rc = PMIx_Finalize(NULL, 0))) {
+        fprintf(stderr, "Client ns %s rank %d:PMIx_Finalize failed: %d\n", myproc.nspace, myproc.rank, rc);
+    } else {
+        fprintf(stderr, "Client ns %s rank %d:PMIx_Finalize successfully completed\n", myproc.nspace, myproc.rank);
+    }
+    fflush(stderr);
+    return(rc);
+}
diff --git a/test/simple/test_pmix.c b/test/simple/test_pmix.c
new file mode 100644
index 0000000..8ecf6c1
--- /dev/null
+++ b/test/simple/test_pmix.c
@@ -0,0 +1,67 @@
+
+#include <stdio.h>
+#include <pmix.h>
+#include <assert.h>
+
+int main(int argc, char **argv)
+{
+	pmix_proc_t myproc;
+	pmix_status_t rc;
+
+	int rank;
+	rc = PMIx_Init(&myproc, NULL, 0);
+	assert(PMIX_SUCCESS == rc);
+
+	{
+		pmix_value_t *value;
+		rc = PMIx_Get(&myproc, PMIX_RANK, NULL, 0, &value);
+		assert(PMIX_SUCCESS == rc);
+		printf("%d\n", value->type);
+		assert(value->type == PMIX_INT);
+		rank = value->data.uint32;
+		PMIX_VALUE_RELEASE(value);
+	}
+
+	if (rank == 0 ) {
+		pmix_info_t *info;
+		PMIX_INFO_CREATE(info, 1);
+		snprintf(info[0].key, PMIX_MAX_KEYLEN, "magic-found");
+		info[0].value.type = PMIX_STRING;
+		info[0].value.data.string = "yes";
+		rc = PMIx_Publish(info, 1);
+		assert(PMIX_SUCCESS == rc);
+	}
+
+	printf("I am rank %d\n", rank);
+
+	{
+		bool flag;
+		pmix_info_t *info;
+		PMIX_INFO_CREATE(info, 1);
+		flag = true;
+		PMIX_INFO_LOAD(info, PMIX_COLLECT_DATA, &flag, PMIX_BOOL);
+		rc = PMIx_Fence(&myproc, 1, info, 1);
+		assert(PMIX_SUCCESS == rc);
+		PMIX_INFO_FREE(info, 1);
+	}
+
+	if (rank == 1) {
+		int i;
+		pmix_pdata_t *pdata;
+		PMIX_PDATA_CREATE(pdata, 2);
+		snprintf(pdata[0].key, PMIX_MAX_KEYLEN, "magic-found");
+		snprintf(pdata[1].key, PMIX_MAX_KEYLEN, "magic-not-found");
+		rc = PMIx_Lookup(&pdata[0], 2, NULL, 0);
+		assert((PMIX_SUCCESS == rc) || (PMIX_ERR_NOT_FOUND == rc));
+		for ( i = 0 ; i < 2 ; i++ )
+			if (pdata[i].value.type == PMIX_STRING)
+				printf("Found[%d] %d %s\n", i, pdata[i].value.type, pdata[i].value.data.string);
+			else
+				printf("Found[%d] %d\n", i, pdata[i].value.type);
+		PMIX_PDATA_FREE(pdata, 1);
+	}
+
+	rc = PMIx_Finalize(NULL, 0);
+	assert(PMIX_SUCCESS == rc);
+
+}
diff --git a/test/test_cd.c b/test/test_cd.c
new file mode 100644
index 0000000..65471df
--- /dev/null
+++ b/test/test_cd.c
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2015-2017 Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ *
+ */
+
+#include "test_cd.h"
+#include <time.h>
+
+typedef struct {
+    int in_progress;
+    int status;
+} cd_cbdata;
+
+static void cd_cb(pmix_status_t status, void *cbdata)
+{
+    cd_cbdata *cb = (cd_cbdata*)cbdata;
+
+    cb->in_progress = 0;
+    cb->status = status;
+}
+
+int test_cd_common(pmix_proc_t *procs, size_t nprocs, int blocking, int disconnect)
+{
+    int rc;
+    if (blocking) {
+        if (!disconnect) {
+            rc = PMIx_Connect(procs, nprocs, NULL, 0);
+        } else {
+            rc = PMIx_Disconnect(procs, nprocs, NULL, 0);
+        }
+    } else {
+        cd_cbdata cbdata;
+        cbdata.in_progress = 1;
+        if (!disconnect) {
+            rc = PMIx_Connect_nb(procs, nprocs, NULL, 0, cd_cb, (void*)&cbdata);
+        } else {
+            rc = PMIx_Disconnect_nb(procs, nprocs, NULL, 0, cd_cb, (void*)&cbdata);
+        }
+        if (PMIX_SUCCESS == rc) {
+            PMIX_WAIT_FOR_COMPLETION(cbdata.in_progress);
+            rc = cbdata.status;
+        }
+    }
+    /* the host server callback currently returns PMIX_EXISTS status for checking purposes */
+    if (PMIX_EXISTS == rc) {
+        rc = PMIX_SUCCESS;
+    }
+    return rc;
+}
+
+int test_connect_disconnect(char *my_nspace, int my_rank)
+{
+    int rc;
+    pmix_proc_t proc;
+    (void)strncpy(proc.nspace, my_nspace, PMIX_MAX_NSLEN);
+    proc.rank = PMIX_RANK_WILDCARD;
+    rc = test_cd_common(&proc, 1, 1, 0);
+    if (PMIX_SUCCESS != rc) {
+        TEST_ERROR(("%s:%d: Connect blocking test failed.", my_nspace, my_rank));
+        return PMIX_ERROR;
+    }
+    TEST_VERBOSE(("%s:%d: Connect blocking test succeded.", my_nspace, my_rank));
+    rc = test_cd_common(&proc, 1, 1, 1);
+    if (PMIX_SUCCESS != rc) {
+        TEST_ERROR(("%s:%d: Disconnect blocking test failed.", my_nspace, my_rank));
+        return PMIX_ERROR;
+    }
+    TEST_VERBOSE(("%s:%d: Disconnect blocking test succeded.", my_nspace, my_rank));
+    rc = test_cd_common(&proc, 1, 0, 0);
+    if (PMIX_SUCCESS != rc) {
+        TEST_ERROR(("%s:%d: Connect non-blocking test failed.", my_nspace, my_rank));
+        return PMIX_ERROR;
+    }
+    TEST_VERBOSE(("%s:%d: Connect non-blocking test succeded.", my_nspace, my_rank));
+    rc = test_cd_common(&proc, 1, 0, 1);
+    if (PMIX_SUCCESS != rc) {
+        TEST_ERROR(("%s:%d: Disconnect non-blocking test failed.", my_nspace, my_rank));
+        return PMIX_ERROR;
+    }
+    TEST_VERBOSE(("%s:%d: Disconnect non-blocking test succeded.", my_nspace, my_rank));
+    return PMIX_SUCCESS;
+}
diff --git a/test/test_cd.h b/test/test_cd.h
new file mode 100644
index 0000000..d4e7891
--- /dev/null
+++ b/test/test_cd.h
@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2015      Intel, Inc.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ *
+ */
+
+#include <src/include/pmix_config.h>
+#include <pmix.h>
+
+#include "test_common.h"
+
+int test_connect_disconnect(char *my_nspace, int my_rank);
+int test_cd_common(pmix_proc_t *procs, size_t nprocs, int blocking, int disconnect);
diff --git a/test/test_common.c b/test/test_common.c
new file mode 100644
index 0000000..d049a0c
--- /dev/null
+++ b/test/test_common.c
@@ -0,0 +1,634 @@
+/*
+ * Copyright (c) 2013-2016 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2015      Artem Y. Polyakov <artpol84 at gmail.com>.
+ *                         All rights reserved.
+ * Copyright (c) 2015-2017 Mellanox Technologies, Inc.
+ *                         All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ *
+ */
+
+#include <src/include/pmix_config.h>
+#include <pmix_common.h>
+
+#include "test_common.h"
+#include <stdarg.h>
+#include <stdio.h>
+#include <ctype.h>
+
+int pmix_test_verbose = 0;
+
+FILE *file;
+
+#define OUTPUT_MAX 1024
+char *pmix_test_output_prepare(const char *fmt, ... )
+{
+    static char output[OUTPUT_MAX];
+    va_list args;
+    va_start( args, fmt );
+    memset(output, 0, sizeof(output));
+    vsnprintf(output, OUTPUT_MAX - 1, fmt, args);
+    va_end(args);
+    return output;
+}
+
+void parse_cmd(int argc, char **argv, test_params *params)
+{
+    int i;
+
+    /* set output to stderr by default */
+    file = stdout;
+    if( params->nspace != NULL ) {
+        params->nspace = NULL;
+    }
+
+    /* parse user options */
+    for (i=1; i < argc; i++) {
+        if (0 == strcmp(argv[i], "--n") || 0 == strcmp(argv[i], "-n")) {
+            i++;
+            if (NULL != argv[i]) {
+                params->np = strdup(argv[i]);
+                params->nprocs = strtol(argv[i], NULL, 10);
+                if (-1 == params->ns_size) {
+                    params->ns_size = params->nprocs;
+                }
+            }
+        } else if (0 == strcmp(argv[i], "--h") || 0 == strcmp(argv[i], "-h")) {
+            /* print help */
+            fprintf(stderr, "usage: pmix_test [-h] [-e foo] [-b] [-c] [-nb]\n");
+            fprintf(stderr, "\t-n       provides information about the job size (for checking purposes)\n");
+            fprintf(stderr, "\t-e foo   use foo as test client\n");
+            fprintf(stderr, "\t-v       verbose output\n");
+            fprintf(stderr, "\t-t <>    set timeout\n");
+            fprintf(stderr, "\t-o out   redirect clients logs to file out.<rank>\n");
+            fprintf(stderr, "\t--early-fail    force client process with rank 0 to fail before PMIX_Init.\n");
+            fprintf(stderr, "\t--ns-dist n1:n2:n3   register n namespaces (3 in this example) each with ni ranks (n1, n2 or n3).\n");
+            fprintf(stderr, "\t--fence \"[<data_exchange><blocking> | ns0:ranks;ns1:ranks...][...]\"  specify fences in different configurations.\n");
+            fprintf(stderr, "\t--use-same-keys relative to the --fence option: put the same keys in the interim between multiple fences.\n");
+            fprintf(stderr, "\t--job-fence  test fence inside its own namespace.\n");
+            fprintf(stderr, "\t-c       relative to the --job-fence option: fence[_nb] callback shall include all collected data\n");
+            fprintf(stderr, "\t-nb      relative to the --job-fence option: use non-blocking fence\n");
+            fprintf(stderr, "\t--noise \"[ns0:ranks;ns1:ranks...]\"  add system noise to specified processes.\n");
+            fprintf(stderr, "\t--test-publish     test publish/lookup/unpublish api.\n");
+            fprintf(stderr, "\t--test-spawn       test spawn api.\n");
+            fprintf(stderr, "\t--test-connect     test connect/disconnect api.\n");
+            fprintf(stderr, "\t--test-resolve-peers    test resolve_peers api.\n");
+            fprintf(stderr, "\t--test-error test error handling api.\n");
+            fprintf(stderr, "\t--test-replace N:k0,k1,...,k(N-1)   test key replace for N keys, k0,k1,k(N-1) - key indexes to replace  \n");
+            fprintf(stderr, "\t--test-internal N  test store internal key, N - number of internal keys\n");
+            exit(0);
+        } else if (0 == strcmp(argv[i], "--exec") || 0 == strcmp(argv[i], "-e")) {
+            i++;
+            if (NULL != argv[i]) {
+                params->binary = strdup(argv[i]);
+            }
+        } else if( 0 == strcmp(argv[i], "--verbose") || 0 == strcmp(argv[i],"-v") ){
+            TEST_VERBOSE_ON();
+            params->verbose = 1;
+        } else if (0 == strcmp(argv[i], "--timeout") || 0 == strcmp(argv[i], "-t")) {
+            i++;
+            if (NULL != argv[i]) {
+                params->timeout = atoi(argv[i]);
+                if( params->timeout == 0 ){
+                    params->timeout = TEST_DEFAULT_TIMEOUT;
+                }
+            }
+        } else if( 0 == strcmp(argv[i], "-o")) {
+            i++;
+            if (NULL != argv[i]) {
+                params->prefix = strdup(argv[i]);
+            }
+        } else if( 0 == strcmp(argv[i], "-s")) {
+            i++;
+            if (NULL != argv[i]) {
+                params->nspace = strdup(argv[i]);
+            }
+        } else if (0 == strcmp(argv[i], "--rank") || 0 == strcmp(argv[i], "-r")) {
+            i++;
+            if (NULL != argv[i]) {
+                params->rank = strtol(argv[i], NULL, 10);
+            }
+        } else if( 0 == strcmp(argv[i], "--early-fail") ){
+            params->early_fail = 1;
+        } else if (0 == strcmp(argv[i], "--fence")) {
+            i++;
+            if (NULL != argv[i]) {
+                params->fences = strdup(argv[i]);
+                if (0 != parse_fence(params->fences, 0)) {
+                    fprintf(stderr, "Incorrect --fence option format: %s\n", params->fences);
+                    exit(1);
+                }
+            }
+        } else if (0 == strcmp(argv[i], "--use-same-keys")) {
+            params->use_same_keys = 1;
+        } else if (0 == strcmp(argv[i], "--job-fence")) {
+            params->test_job_fence = 1;
+        } else if (0 == strcmp(argv[i], "--collect-corrupt")) {
+            params->collect_bad = 1;
+        } else if (0 == strcmp(argv[i], "--collect") || 0 == strcmp(argv[i], "-c")) {
+            params->collect = 1;
+        } else if (0 == strcmp(argv[i], "--non-blocking") || 0 == strcmp(argv[i], "-nb")) {
+            params->nonblocking = 1;
+        } else if (0 == strcmp(argv[i], "--noise")) {
+            i++;
+            if (NULL != argv[i]) {
+                params->noise = strdup(argv[i]);
+                if (0 != parse_noise(params->noise, 0)) {
+                    fprintf(stderr, "Incorrect --noise option format: %s\n", params->noise);
+                    exit(1);
+                }
+            }
+        } else if (0 == strcmp(argv[i], "--ns-dist")) {
+            i++;
+            if (NULL != argv[i]) {
+                params->ns_dist = strdup(argv[i]);
+            }
+        } else if (0 == strcmp(argv[i], "--ns-size")) {
+            i++;
+            if (NULL != argv[i]) {
+                params->ns_size = strtol(argv[i], NULL, 10);
+            }
+        } else if (0 == strcmp(argv[i], "--ns-id")) {
+            i++;
+            if (NULL != argv[i]) {
+                params->ns_id = strtol(argv[i], NULL, 10);
+            }
+        } else if (0 == strcmp(argv[i], "--base-rank")) {
+            i++;
+            if (NULL != argv[i]) {
+                params->base_rank = strtol(argv[i], NULL, 10);
+            }
+        } else if( 0 == strcmp(argv[i], "--test-publish") ){
+            params->test_publish = 1;
+        } else if( 0 == strcmp(argv[i], "--test-spawn") ){
+            params->test_spawn = 1;
+        } else if( 0 == strcmp(argv[i], "--test-connect") ){
+            params->test_connect = 1;
+        } else if( 0 == strcmp(argv[i], "--test-resolve-peers") ){
+            params->test_resolve_peers = 1;
+        } else if( 0 == strcmp(argv[i], "--test-error") ){
+            params->test_error = 1;
+        } else if(0 == strcmp(argv[i], "--test-replace") ) {
+            i++;
+            if (NULL != argv[i] && (*argv[i] != '-')) {
+                params->key_replace = strdup(argv[i]);
+                if (0 != parse_replace(params->key_replace, 0, NULL)) {
+                    fprintf(stderr, "Incorrect --test-replace option format: %s\n", params->key_replace);
+                    exit(1);
+                }
+            } else {
+                params->key_replace = strdup(TEST_REPLACE_DEFAULT);
+            }
+        } else if(0 == strcmp(argv[i], "--test-internal")) {
+            i++;
+            if ((NULL != argv[i]) && (*argv[i] != '-')) {
+                params->test_internal = strtol(argv[i], NULL, 10);
+            } else {
+                params->test_internal = 1;
+            }
+        }
+
+        else {
+            fprintf(stderr, "unrecognized option: %s\n", argv[i]);
+            exit(1);
+        }
+    }
+    if (NULL == params->binary) {
+        char *basename = NULL;
+        basename = strrchr(argv[0], '/');
+        if (basename) {
+            *basename = '\0';
+            /* pmix_test and pmix_clients are the shell scripts that
+             * make sure that actual binary placed in "./.libs" directory
+             * is properly linked.
+             * after launch pmix_test you'll find the following process:
+             *      <pmix-root-dir>/test/.libs/lt-pmix_test
+             *
+             * To launch
+             *      <pmix-root-dir>/test/pmix_client
+             * instead of
+             *      <pmix-root-dir>/test/.libs/pmix_client
+             * we need to do a step back in directory tree.
+             */
+            asprintf(&params->binary, "%s/../pmix_client", argv[0]);
+            *basename = '/';
+        } else {
+            asprintf(&params->binary, "pmix_client");
+        }
+    }
+
+    if( params->collect_bad ){
+        params->collect = params->rank % 2;
+    }
+
+    // Fix rank if running under SLURM
+    if( PMIX_RANK_UNDEF == params->rank ){
+        char *ranklist = getenv("SLURM_GTIDS");
+        char *rankno = getenv("SLURM_LOCALID");
+        if( NULL != ranklist && NULL != rankno ){
+            char **argv = pmix_argv_split(ranklist, ',');
+            int count = pmix_argv_count(argv);
+            int rankidx = strtoul(rankno, NULL, 10);
+            if( rankidx >= count ){
+                fprintf(stderr, "It feels like we are running under SLURM:\n\t"
+                        "SLURM_GTIDS=%s, SLURM_LOCALID=%s\nbut env vars are conflicting\n",
+                        ranklist, rankno);
+                exit(1);
+            }
+            params->rank = strtoul(argv[rankidx], NULL, 10);
+            pmix_argv_free(argv);
+        }
+    }
+
+    // Fix namespace if running under SLURM
+    if( NULL == params->nspace ){
+        char *nspace = getenv("PMIX_NAMESPACE");
+        if( NULL != nspace ){
+            params->nspace = strdup(nspace);
+        }
+    }
+}
+
+static void fcon(fence_desc_t *p)
+{
+    p->blocking = 0;
+    p->data_exchange = 0;
+    p->participants = PMIX_NEW(pmix_list_t);
+}
+
+static void fdes(fence_desc_t *p)
+{
+    PMIX_LIST_RELEASE(p->participants);
+}
+
+PMIX_CLASS_INSTANCE(fence_desc_t,
+                    pmix_list_item_t,
+                    fcon, fdes);
+
+PMIX_CLASS_INSTANCE(participant_t,
+                    pmix_list_item_t,
+                    NULL, NULL);
+
+PMIX_CLASS_INSTANCE(key_replace_t,
+                    pmix_list_item_t,
+                    NULL, NULL);
+
+static int ns_id = -1;
+static fence_desc_t *fdesc = NULL;
+pmix_list_t *participants = NULL;
+pmix_list_t test_fences;
+pmix_list_t *noise_range = NULL;
+pmix_list_t key_replace;
+
+#define CHECK_STRTOL_VAL(val, str, store) do {                  \
+    if (0 == val) {                                             \
+        if (0 != strncmp(str, "0", 1)) {                         \
+            if (!store) {                                       \
+                return 1;                                       \
+            }                                                   \
+        }                                                       \
+    }                                                           \
+} while (0)
+
+static int parse_token(char *str, int step, int store)
+{
+    char *pch;
+    int count = 0;
+    int remember = -1;
+    int i;
+    int rank;
+    participant_t *proc;
+
+    switch (step) {
+    case 0:
+        if (store) {
+            fdesc = PMIX_NEW(fence_desc_t);
+            participants = fdesc->participants;
+        }
+        pch = strchr(str, '|');
+        if (NULL != pch) {
+            while (pch != str) {
+                if ('d' == *str) {
+                    if (store && NULL != fdesc) {
+                        fdesc->data_exchange = 1;
+                    }
+                } else if ('b' == *str) {
+                    if (store && NULL != fdesc) {
+                        fdesc->blocking = 1;
+                    }
+                } else if (' ' != *str) {
+                    if (!store) {
+                        return 1;
+                    }
+                }
+                str++;
+            }
+            if (0 < parse_token(pch+1, 1, store)) {
+                if (!store) {
+                    return 1;
+                }
+            }
+        } else {
+            if (0 < parse_token(str, 1, store)) {
+                if (!store) {
+                    return 1;
+                }
+            }
+        }
+        if (store && NULL != fdesc) {
+            pmix_list_append(&test_fences, &fdesc->super);
+        }
+        break;
+    case 1:
+        if (store && NULL == participants) {
+            participants = PMIX_NEW(pmix_list_t);
+            noise_range = participants;
+        }
+        pch = strtok(str, ";");
+        while (NULL != pch) {
+            if (0 < parse_token(pch, 2, store)) {
+                if (!store) {
+                    return 1;
+                }
+            }
+            pch = strtok (NULL, ";");
+        }
+        break;
+    case 2:
+        pch = strchr(str, ':');
+        if (NULL != pch) {
+            *pch = '\0';
+            pch++;
+            while (' ' == *str) {
+                str++;
+            }
+            ns_id = (int)(strtol(str, NULL, 10));
+            CHECK_STRTOL_VAL(ns_id, str, store);
+            if (0 < parse_token(pch, 3, store)) {
+                if (!store) {
+                    return 1;
+                }
+            }
+        } else {
+            if (!store) {
+                return 1;
+            }
+        }
+        break;
+    case 3:
+        while (' ' == *str) {
+            str++;
+        }
+        if ('\0' == *str) {
+            /* all ranks from namespace participate */
+            if (store && NULL != participants) {
+                proc = PMIX_NEW(participant_t);
+                (void)snprintf(proc->proc.nspace, PMIX_MAX_NSLEN, "%s-%d", TEST_NAMESPACE, ns_id);
+                proc->proc.rank = PMIX_RANK_WILDCARD;
+                pmix_list_append(participants, &proc->super);
+            }
+        }
+        while ('\0' != *str) {
+            if (',' == *str && 0 != count) {
+                *str = '\0';
+                if (-1 != remember) {
+                    rank = (int)(strtol(str-count, NULL, 10));
+                    CHECK_STRTOL_VAL(rank, str-count, store);
+                    for (i = remember; i < rank; i++) {
+                        if (store && NULL != participants) {
+                            proc = PMIX_NEW(participant_t);
+                            (void)snprintf(proc->proc.nspace, PMIX_MAX_NSLEN, "%s-%d", TEST_NAMESPACE, ns_id);
+                            proc->proc.rank = i;
+                            pmix_list_append(participants, &proc->super);
+                        }
+                    }
+                    remember = -1;
+                }
+                rank = (int)(strtol(str-count, NULL, 10));
+                CHECK_STRTOL_VAL(rank, str-count, store);
+                if (store && NULL != participants) {
+                    proc = PMIX_NEW(participant_t);
+                    (void)snprintf(proc->proc.nspace, PMIX_MAX_NSLEN, "%s-%d", TEST_NAMESPACE, ns_id);
+                    proc->proc.rank = rank;
+                    pmix_list_append(participants, &proc->super);
+                }
+                count = -1;
+            } else if ('-' == *str && 0 != count) {
+                *str = '\0';
+                remember = (int)(strtol(str-count, NULL, 10));
+                CHECK_STRTOL_VAL(remember, str-count, store);
+                count = -1;
+            }
+            str++;
+            count++;
+        }
+        if (0 != count) {
+            if (-1 != remember) {
+                rank = (int)(strtol(str-count, NULL, 10));
+                CHECK_STRTOL_VAL(rank, str-count, store);
+                for (i = remember; i < rank; i++) {
+                    if (store && NULL != participants) {
+                        proc = PMIX_NEW(participant_t);
+                        (void)snprintf(proc->proc.nspace, PMIX_MAX_NSLEN, "%s-%d", TEST_NAMESPACE, ns_id);
+                        proc->proc.rank = i;
+                        pmix_list_append(participants, &proc->super);
+                    }
+                }
+                remember = -1;
+            }
+            rank = (int)(strtol(str-count, NULL, 10));
+            CHECK_STRTOL_VAL(rank, str-count, store);
+            if (store && NULL != participants) {
+                proc = PMIX_NEW(participant_t);
+                (void)snprintf(proc->proc.nspace, PMIX_MAX_NSLEN, "%s-%d", TEST_NAMESPACE, ns_id);
+                proc->proc.rank = rank;
+                pmix_list_append(participants, &proc->super);
+            }
+        }
+        break;
+    default:
+        fprintf(stderr, "Incorrect parsing step.\n");
+        return 1;
+    }
+    return 0;
+}
+
+int parse_fence(char *fence_param, int store)
+{
+    int ret = 0;
+    char *tmp = strdup(fence_param);
+    char * pch, *ech;
+
+    pch = strchr(tmp, '[');
+    while (NULL != pch) {
+        pch++;
+        ech = strchr(pch, ']');
+        if (NULL != ech) {
+            *ech = '\0';
+            ech++;
+            ret += parse_token(pch, 0, store);
+            pch = strchr(ech, '[');
+        } else {
+            ret = 1;
+            break;
+        }
+    }
+    free(tmp);
+    return ret;
+}
+
+int parse_noise(char *noise_param, int store)
+{
+    int ret = 0;
+    char *tmp = strdup(noise_param);
+    char * pch, *ech;
+
+    pch = strchr(tmp, '[');
+    if (NULL != pch) {
+        pch++;
+        ech = strchr(pch, ']');
+        if (NULL != ech) {
+            *ech = '\0';
+            ech++;
+            if ('\0' != *ech) {
+                ret = 1;
+            } else {
+                ret = parse_token(pch, 1, store);
+            }
+        } else {
+            ret = 1;
+        }
+    }
+    free(tmp);
+    return ret;
+}
+
+static int is_digit(const char *str)
+{
+    if (NULL == str)
+        return 0;
+
+    while (0 != *str) {
+        if (!isdigit(*str)) {
+        return 0;
+        }
+        else {
+            str++;
+        }
+    }
+    return 1;
+}
+
+int parse_replace(char *replace_param, int store, int *key_num) {
+    int ret = 0;
+    char *tmp = strdup(replace_param);
+    char tmp_str[32];
+    char * pch, *ech;
+    key_replace_t *item;
+    int cnt = 0;
+
+    if (NULL == replace_param) {
+        free(tmp);
+        return 1;
+    }
+
+    pch = strchr(tmp, ':');
+    snprintf(tmp_str, pch - tmp + 1, "%s", tmp);
+    cnt = atol(tmp_str);
+
+    if (NULL != key_num) {
+        *key_num = cnt;
+    }
+
+    while(NULL != pch) {
+        pch++;
+        ech = strchr(pch, ',');
+        if (strlen(pch) > 0) {
+            if (NULL != ech) {
+                snprintf(tmp_str, ech - pch + 1, "%s", pch);
+            } else {
+                snprintf(tmp_str, strlen(pch) + 1, "%s", pch);
+            }
+            if ((0 == is_digit(tmp_str)) || ((atoi(tmp_str) + 1) > cnt)) {
+                ret = 1;
+                break;
+            }
+            pch = ech;
+            if (store) {
+                item = PMIX_NEW(key_replace_t);
+                item->key_idx = atoi(tmp_str);
+                pmix_list_append(&key_replace, &item->super);
+            }
+        } else {
+            ret = 1;
+            break;
+        }
+    }
+    free(tmp);
+    return ret;
+}
+
+int get_total_ns_number(test_params params)
+{
+    int num = 0;
+    if (NULL == params.ns_dist) {
+        return 1;
+    } else {
+        char *tmp = strdup(params.ns_dist);
+        char *pch = tmp;
+        while (NULL != pch) {
+            num++;
+            pch = strtok((1 == num ) ? tmp : NULL, ":");
+        }
+        num--;
+        free(tmp);
+    }
+    return num;
+}
+
+int get_all_ranks_from_namespace(test_params params, char *nspace, pmix_proc_t **ranks, size_t *nranks)
+{
+    int base_rank = 0;
+    size_t num_ranks = 0;
+    int num = -1;
+    size_t j;
+    if (NULL == params.ns_dist) {
+        *nranks = params.ns_size;
+        PMIX_PROC_CREATE(*ranks, params.ns_size);
+        for (j = 0; j < (size_t)params.ns_size; j++) {
+            (void)strncpy((*ranks)[j].nspace, nspace, PMIX_MAX_NSLEN);
+            (*ranks)[j].rank = j;
+        }
+    } else {
+        char *tmp = strdup(params.ns_dist);
+        char *pch = tmp;
+        int ns_id = (int)strtol(nspace + strlen(TEST_NAMESPACE) + 1, NULL, 10);
+        while (NULL != pch && num != ns_id) {
+            base_rank += num_ranks;
+            pch = strtok((-1 == num ) ? tmp : NULL, ":");
+            if (NULL == pch) {
+                break;
+            }
+            num++;
+            num_ranks = (size_t)strtol(pch, NULL, 10);
+        }
+        if (num == ns_id && 0 != num_ranks) {
+            *nranks = num_ranks;
+            PMIX_PROC_CREATE(*ranks, num_ranks);
+            for (j = 0; j < num_ranks; j++) {
+                (void)strncpy((*ranks)[j].nspace, nspace, PMIX_MAX_NSLEN);
+                (*ranks)[j].rank = base_rank+j;
+            }
+        } else {
+            free(tmp);
+            return PMIX_ERROR;
+        }
+        free(tmp);
+    }
+    return PMIX_SUCCESS;
+}
+
diff --git a/test/test_common.h b/test/test_common.h
new file mode 100644
index 0000000..d770317
--- /dev/null
+++ b/test/test_common.h
@@ -0,0 +1,335 @@
+/*
+ * Copyright (c) 2013-2016 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2015      Artem Y. Polyakov <artpol84 at gmail.com>.
+ *                         All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2015-2017 Mellanox Technologies, Inc.
+ *                         All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ *
+ */
+
+#ifndef TEST_COMMON_H
+#define TEST_COMMON_H
+
+#include <src/include/pmix_config.h>
+#include <pmix_common.h>
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <stdint.h>
+
+#include "src/include/pmix_globals.h"
+#include "src/class/pmix_list.h"
+#include "src/util/argv.h"
+
+#define TEST_NAMESPACE "smoky_nspace"
+#define TEST_CREDENTIAL "dummy"
+
+/* WARNING: pmix_test_output_prepare is currently not threadsafe!
+ * fix it once needed!
+ */
+char *pmix_test_output_prepare(const char *fmt,... );
+extern int pmix_test_verbose;
+extern FILE *file;
+
+#define STRIPPED_FILE_NAME (strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILE__)
+
+#define TEST_OUTPUT(x) { \
+    fprintf(file,"%s:%s: %s\n",STRIPPED_FILE_NAME, __func__, \
+            pmix_test_output_prepare x ); \
+    fflush(file); \
+}
+
+// Write output wightout adding anything to it.
+// Need for automate tests to receive "OK" string
+#define TEST_OUTPUT_CLEAR(x) { \
+    fprintf(file, "%s", pmix_test_output_prepare x ); \
+    fflush(file); \
+}
+
+// Always write errors to the stderr
+#define TEST_ERROR(x) { \
+    fprintf(stderr,"ERROR [%s:%d:%s]: %s\n", STRIPPED_FILE_NAME, __LINE__, __func__, \
+            pmix_test_output_prepare x ); \
+    fflush(stderr); \
+}
+
+#define TEST_VERBOSE_ON() (pmix_test_verbose = 1)
+#define TEST_VERBOSE_GET() (pmix_test_verbose)
+
+#define TEST_VERBOSE(x) { \
+    if( pmix_test_verbose ){ \
+        TEST_OUTPUT(x); \
+    } \
+}
+
+#define TEST_DEFAULT_TIMEOUT 10
+#define MAX_DIGIT_LEN 10
+#define TEST_REPLACE_DEFAULT "3:1"
+
+#define TEST_SET_FILE(prefix, ns_id, rank) { \
+    char *fname = malloc( strlen(prefix) + MAX_DIGIT_LEN + 2 ); \
+    sprintf(fname, "%s.%d.%d", prefix, ns_id, rank); \
+    file = fopen(fname, "w"); \
+    free(fname); \
+    if( NULL == file ){ \
+        fprintf(stderr, "Cannot open file %s for writing!", fname); \
+        exit(1); \
+    } \
+}
+
+#define TEST_CLOSE_FILE() { \
+    if ( stderr != file ) { \
+        fclose(file); \
+    } \
+}
+
+typedef struct {
+    char *binary;
+    char *np;
+    char *prefix;
+    char *nspace;
+    uint32_t nprocs;
+    int timeout;
+    int verbose;
+    pmix_rank_t rank;
+    int early_fail;
+    int test_job_fence;
+    int collect_bad;
+    int use_same_keys;
+    int collect;
+    int nonblocking;
+    char *fences;
+    char *noise;
+    char *ns_dist;
+    int ns_size;
+    int ns_id;
+    pmix_rank_t base_rank;
+    int test_publish;
+    int test_spawn;
+    int test_connect;
+    int test_resolve_peers;
+    int test_error;
+    char *key_replace;
+    int test_internal;
+} test_params;
+
+#define INIT_TEST_PARAMS(params) do { \
+    params.nprocs = 1;                \
+    params.verbose = 0;               \
+    params.rank = PMIX_RANK_UNDEF;    \
+    params.base_rank = 0;             \
+    params.early_fail = 0;            \
+    params.ns_size = -1;              \
+    params.ns_id = -1;                \
+    params.timeout = TEST_DEFAULT_TIMEOUT; \
+    params.test_job_fence = 0;        \
+    params.use_same_keys = 0;         \
+    params.collect = 0;               \
+    params.collect_bad = 0;           \
+    params.nonblocking = 0;           \
+    params.test_publish = 0;          \
+    params.test_spawn = 0;            \
+    params.test_connect = 0;          \
+    params.test_resolve_peers = 0;    \
+    params.binary = NULL;             \
+    params.np = NULL;                 \
+    params.prefix = NULL;             \
+    params.nspace = NULL;             \
+    params.fences = NULL;             \
+    params.noise = NULL;              \
+    params.ns_dist = NULL;            \
+    params.test_error = 0;            \
+    params.key_replace = NULL;        \
+    params.test_internal = 0;         \
+} while (0)
+
+#define FREE_TEST_PARAMS(params) do { \
+    if (NULL != params.binary) {      \
+        free(params.binary);          \
+    }                                 \
+    if (NULL != params.np) {          \
+        free(params.np);              \
+    }                                 \
+    if (NULL != params.prefix) {      \
+        free(params.prefix);          \
+    }                                 \
+    if (NULL != params.nspace) {      \
+        free(params.nspace);          \
+    }                                 \
+    if (NULL != params.fences) {      \
+        free(params.fences);          \
+    }                                 \
+    if (NULL != params.noise) {       \
+        free(params.noise);           \
+    }                                 \
+    if (NULL != params.ns_dist) {     \
+        free(params.ns_dist);         \
+    }                                 \
+} while (0)
+
+void parse_cmd(int argc, char **argv, test_params *params);
+int parse_fence(char *fence_param, int store);
+int parse_noise(char *noise_param, int store);
+int parse_replace(char *replace_param, int store, int *key_num);
+
+typedef struct {
+    pmix_list_item_t super;
+    int blocking;
+    int data_exchange;
+    pmix_list_t *participants;  // list of participants
+} fence_desc_t;
+PMIX_CLASS_DECLARATION(fence_desc_t);
+
+typedef struct {
+    pmix_list_item_t super;
+    pmix_proc_t proc;
+} participant_t;
+PMIX_CLASS_DECLARATION(participant_t);
+
+typedef struct {
+    pmix_list_item_t super;
+    int key_idx;
+} key_replace_t;
+PMIX_CLASS_DECLARATION(key_replace_t);
+
+extern pmix_list_t test_fences;
+extern pmix_list_t *noise_range;
+extern pmix_list_t key_replace;
+
+#define NODE_NAME "node1"
+int get_total_ns_number(test_params params);
+int get_all_ranks_from_namespace(test_params params, char *nspace, pmix_proc_t **ranks, size_t *nranks);
+
+typedef struct {
+    int in_progress;
+    pmix_value_t *kv;
+    int status;
+} get_cbdata;
+
+#define SET_KEY(key, fence_num, ind, use_same_keys) do {                                                            \
+    if (use_same_keys) {                                                                                            \
+        (void)snprintf(key, sizeof(key)-1, "key-%d", ind);                                                            \
+    } else {                                                                                                        \
+        (void)snprintf(key, sizeof(key)-1, "key-f%d:%d", fence_num, ind);                                             \
+    }                                                                                                               \
+} while (0)
+
+#define PUT(dtype, data, flag, fence_num, ind, use_same_keys) do {                                                  \
+    char key[50];                                                                                                   \
+    pmix_value_t value;                                                                                             \
+    SET_KEY(key, fence_num, ind, use_same_keys);                                                                    \
+    PMIX_VAL_SET(&value, dtype, data);                                                                              \
+    TEST_VERBOSE(("%s:%d put key %s", my_nspace, my_rank, key));                                                  \
+    if (PMIX_SUCCESS != (rc = PMIx_Put(flag, key, &value))) {                                                       \
+        TEST_ERROR(("%s:%d: PMIx_Put key %s failed: %d", my_nspace, my_rank, key, rc));                             \
+        rc = PMIX_ERROR;                                                                                            \
+    }                                                                                                               \
+    PMIX_VALUE_DESTRUCT(&value);                                                                                    \
+} while (0)
+
+#define GET(dtype, data, ns, r, fence_num, ind, use_same_keys, blocking, ok_notfnd) do {                        \
+    char key[50];                                                                                                   \
+    pmix_value_t *val;                                                                                              \
+    get_cbdata cbdata;                                                                                              \
+    cbdata.status = PMIX_SUCCESS;                                                                                   \
+    pmix_proc_t foobar; \
+    SET_KEY(key, fence_num, ind, use_same_keys);                                                                    \
+    (void)strncpy(foobar.nspace, ns, PMIX_MAX_NSLEN); \
+    foobar.rank = r; \
+    TEST_VERBOSE(("%s:%d want to get from %s:%d key %s", my_nspace, my_rank, ns, r, key));                          \
+    if (blocking) {                                                                                                 \
+        if (PMIX_SUCCESS != (rc = PMIx_Get(&foobar, key, NULL, 0, &val))) {                                         \
+            if( !( rc == PMIX_ERR_NOT_FOUND && ok_notfnd ) ){                                                       \
+                TEST_ERROR(("%s:%d: PMIx_Get failed: %d from %s:%d, key %s", my_nspace, my_rank, rc, ns, r, key));  \
+            }                                                                                                       \
+            rc = PMIX_ERROR;                                                                                        \
+        }                                                                                                           \
+    } else {                                                                                                        \
+        int count;                                                                                                  \
+        cbdata.in_progress = 1;                                                                                     \
+        PMIX_VALUE_CREATE(val, 1);                                                                                  \
+        cbdata.kv = val;                                                                                            \
+        if (PMIX_SUCCESS != (rc = PMIx_Get_nb(&foobar, key, NULL, 0, get_cb, (void*)&cbdata))) {                    \
+            TEST_VERBOSE(("%s:%d: PMIx_Get_nb failed: %d from %s:%d, key=%s", my_nspace, my_rank, rc, ns, r, key)); \
+            rc = PMIX_ERROR;                                                                                        \
+        } else {                                                                                                    \
+            count = 0;                                                                                              \
+            while(cbdata.in_progress){                                                                              \
+                struct timespec ts;                                                                                 \
+                ts.tv_sec = 0;                                                                                      \
+                ts.tv_nsec = 100;                                                                                   \
+                nanosleep(&ts,NULL);                                                                                \
+                count++;                                                                                            \
+            }                                                                                                       \
+            PMIX_ACQUIRE_OBJECT(&cbdata);                                                                            \
+        }                                                                                                           \
+    }                                                                                                               \
+    if (PMIX_SUCCESS == rc) {                                                                                       \
+        if( PMIX_SUCCESS != cbdata.status ){                                                                        \
+            if( !( cbdata.status == PMIX_ERR_NOT_FOUND && ok_notfnd ) ){                                                       \
+                TEST_ERROR(("%s:%d: PMIx_Get_nb failed: %d from %s:%d, key=%s",                                   \
+                            my_nspace, my_rank, rc, my_nspace, r));                                                 \
+            }                                                                                                       \
+            rc = PMIX_ERROR;                                                                                        \
+        } else if (NULL == val) {                                                                                   \
+            TEST_VERBOSE(("%s:%d: PMIx_Get returned NULL value", my_nspace, my_rank));                              \
+            rc = PMIX_ERROR;                                                                                        \
+        }                                                                                                           \
+        else if (val->type != PMIX_VAL_TYPE_ ## dtype || PMIX_VAL_CMP(dtype, PMIX_VAL_FIELD_ ## dtype((val)), data)) {  \
+            TEST_ERROR(("%s:%u: from %s:%d Key %s value or type mismatch,"                                        \
+                        " want type %d get type %d",                                                                \
+                        my_nspace, my_rank, ns, r, key, PMIX_VAL_TYPE_ ## dtype, val->type));                    \
+            rc = PMIX_ERROR;                                                                                        \
+        }                                                                                                           \
+    }                                                                                                               \
+    if (PMIX_SUCCESS == rc) {                                                                                       \
+        TEST_VERBOSE(("%s:%d: GET OF %s from %s:%d SUCCEEDED", my_nspace, my_rank, key, ns, r));                 \
+        PMIX_VALUE_RELEASE(val);                                                                                    \
+    }                                                                                                               \
+} while (0)
+
+#define FENCE(blocking, data_ex, pcs, nprocs) do {                              \
+    if( blocking ){                                                             \
+        pmix_info_t *info = NULL;                                               \
+        size_t ninfo = 0;                                                       \
+        if (data_ex) {                                                          \
+            bool value = 1;                                            \
+            PMIX_INFO_CREATE(info, 1);                                          \
+            (void)strncpy(info->key, PMIX_COLLECT_DATA, PMIX_MAX_KEYLEN);       \
+            pmix_value_load(&info->value, &value, PMIX_BOOL);                   \
+            ninfo = 1;                                                          \
+        }                                                                       \
+        rc = PMIx_Fence(pcs, nprocs, info, ninfo);                              \
+        PMIX_INFO_FREE(info, ninfo);                                            \
+    } else {                                                                    \
+        int in_progress = 1, count;                                             \
+        rc = PMIx_Fence_nb(pcs, nprocs, NULL, 0, release_cb, &in_progress);     \
+        if ( PMIX_SUCCESS == rc ) {                                             \
+            count = 0;                                                          \
+            while( in_progress ){                                               \
+                struct timespec ts;                                             \
+                ts.tv_sec = 0;                                                  \
+                ts.tv_nsec = 100;                                               \
+                nanosleep(&ts,NULL);                                            \
+                count++;                                                        \
+            }                                                                   \
+            TEST_VERBOSE(("PMIx_Fence_nb(barrier,collect): free time: %lfs",    \
+                            count*100*1E-9));                                   \
+        }                                                                       \
+    }                                                                           \
+    if (PMIX_SUCCESS == rc) {                                                   \
+        TEST_VERBOSE(("%s:%d: Fence successfully completed",                    \
+                        my_nspace, my_rank));                                   \
+    }                                                                           \
+} while (0)
+
+#endif // TEST_COMMON_H
diff --git a/test/test_error.c b/test/test_error.c
new file mode 100644
index 0000000..f5217f0
--- /dev/null
+++ b/test/test_error.c
@@ -0,0 +1,115 @@
+/*
+ * Copyright (c) 2015-2016 Intel, Inc.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ *
+ */
+#include <time.h>
+#include "test_error.h"
+#include "test_common.h"
+
+#define MAX_ERR_HANDLERS 5
+#define TEST_NOTIFY PMIX_ERR_TIMEOUT
+static bool done;
+static void comfail_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)
+{
+    TEST_ERROR(("comfail errhandler called for error status = %d ninfo = %lu",
+                  status, (unsigned long)ninfo));
+    if (NULL != cbfunc) {
+        cbfunc(PMIX_SUCCESS, NULL, 0, NULL, NULL, cbdata);
+    }
+}
+
+static void timeout_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)
+{
+    TEST_ERROR(("timeout errhandler called for error status = %d ninfo = %d",
+                  status, ninfo));
+    if (NULL != cbfunc) {
+        cbfunc(PMIX_SUCCESS, NULL, 0, NULL, NULL, cbdata);
+    }
+}
+
+static void op1_callbk(pmix_status_t status,
+                       void *cbdata)
+{
+    TEST_VERBOSE(( "op1_callbk CALLED WITH STATUS %d", status));
+    done = true;
+}
+
+static void errhandler_reg_callbk1 (pmix_status_t status,
+                                   size_t errhandler_ref,
+                                   void *cbdata)
+{
+    size_t *ref = (size_t*) cbdata;
+    *ref = errhandler_ref;
+    TEST_VERBOSE(("PMIX client ERRHANDLER REGISTRATION CALLED WITH STATUS %d, ref=%lu",
+                  status, *ref, (unsigned long)errhandler_ref));
+
+}
+
+int test_error(char *my_nspace, int my_rank, test_params params)
+{
+    size_t errhandler_refs[MAX_ERR_HANDLERS];
+    struct timespec ts;
+    pmix_status_t status;
+    pmix_proc_t source;
+
+    TEST_VERBOSE(("test-error: running  error handling test cases"));
+    /* register specific client error handlers and test their invocation
+     * by  trigerring events  from server side*/
+    status = PMIX_ERR_TIMEOUT;
+    PMIx_Register_event_handler(&status, 1, NULL, 0,
+                                timeout_errhandler, errhandler_reg_callbk1, &errhandler_refs[0]);
+
+    /* reg a handler for comm errors */
+    status = PMIX_ERR_LOST_PEER_CONNECTION;
+    PMIx_Register_event_handler(&status, 1, NULL, 0,
+                                comfail_errhandler, errhandler_reg_callbk1, &errhandler_refs[1]);
+    /* inject error from client */
+    done = false;
+    (void)strncpy(source.nspace, my_nspace, PMIX_MAX_NSLEN);
+    source.rank = my_rank;
+    /* change error value to test other error notifications */
+    PMIx_Notify_event(TEST_NOTIFY,
+                      &source, PMIX_RANGE_NAMESPACE,
+                      NULL, 0,
+                      op1_callbk, NULL);
+    while(!done) {
+        ts.tv_sec = 0;
+        ts.tv_nsec = 100000;
+        nanosleep(&ts, NULL);
+    }
+    done = false;
+    /* dereg all handlers*/
+    PMIx_Deregister_event_handler( errhandler_refs[0], op1_callbk, NULL);
+    /* loop until we get callback */
+    while(!done) {
+        ts.tv_sec = 0;
+        ts.tv_nsec = 100000;
+        nanosleep(&ts, NULL);
+    }
+    done = false;
+    PMIx_Deregister_event_handler( errhandler_refs[1], op1_callbk, NULL);
+    /* loop until we get callback */
+    while(!done) {
+        ts.tv_sec = 0;
+        ts.tv_nsec = 100000;
+        nanosleep(&ts, NULL);
+    }
+    return PMIX_SUCCESS;
+}
diff --git a/test/test_error.h b/test/test_error.h
new file mode 100644
index 0000000..ed17831
--- /dev/null
+++ b/test/test_error.h
@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2015      Intel, Inc.  All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ *
+ */
+
+#include <src/include/pmix_config.h>
+#include <pmix.h>
+
+#include "test_common.h"
+
+int test_error(char *my_nspace, int my_rank, test_params params);
diff --git a/test/test_fence.c b/test/test_fence.c
new file mode 100644
index 0000000..37fd7ac
--- /dev/null
+++ b/test/test_fence.c
@@ -0,0 +1,439 @@
+/*
+ * Copyright (c) 2016      Intel, Inc.  All rights reserved.
+ * Copyright (c) 2015-2017 Mellanox Technologies, Inc.
+ *                         All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ *
+ */
+
+#include "test_fence.h"
+#include "src/buffer_ops/buffer_ops.h"
+
+static void get_cb(pmix_status_t status, pmix_value_t *kv, void *cbdata)
+{
+    get_cbdata *cb = (get_cbdata*)cbdata;
+    PMIX_ACQUIRE_OBJECT(cb);
+    if (PMIX_SUCCESS == status) {
+        pmix_value_xfer(cb->kv, kv);
+    }
+    cb->status = status;
+    PMIX_POST_OBJECT(cb);
+    cb->in_progress = 0;
+}
+
+static void add_noise(char *noise_param, char *my_nspace, pmix_rank_t my_rank)
+{
+    bool participate = false;
+    participant_t *p;
+
+    parse_noise(noise_param, 1);
+    if (NULL != noise_range) {
+        PMIX_LIST_FOREACH(p, noise_range, participant_t) {
+            if (0 == strncmp(my_nspace, p->proc.nspace, strlen(my_nspace)) &&
+                (my_rank == p->proc.rank || PMIX_RANK_WILDCARD == p->proc.rank)) {
+                participate = true;
+                break;
+            }
+        }
+        if (participate) {
+            sleep(2);
+            TEST_VERBOSE(("I'm %s:%d sleeping\n", my_nspace, my_rank));
+        }
+        PMIX_LIST_RELEASE(noise_range);
+        noise_range = NULL;
+    }
+}
+
+static void release_cb(pmix_status_t status, void *cbdata)
+{
+    int *ptr = (int*)cbdata;
+    *ptr = 0;
+}
+
+int test_fence(test_params params, char *my_nspace, pmix_rank_t my_rank)
+{
+    int len;
+    int rc;
+    size_t i, npcs;
+    fence_desc_t *desc;
+    participant_t *p, *next;
+    pmix_proc_t *pcs;
+    bool participate;
+    int fence_num = 0;
+    char sval[50];
+    int put_ind;
+
+    if (NULL != params.noise) {
+        add_noise(params.noise, my_nspace, my_rank);
+    }
+
+    PMIX_CONSTRUCT(&test_fences, pmix_list_t);
+    parse_fence(params.fences, 1);
+
+    TEST_VERBOSE(("fences %s\n", params.fences));
+
+    /* cycle thru all the test fence descriptors to find
+     * those that include my nspace/rank */
+    PMIX_LIST_FOREACH(desc, &test_fences, fence_desc_t) {
+        char tmp[256] = {0};
+        len = sprintf(tmp, "fence %d: block = %d de = %d ", fence_num, desc->blocking, desc->data_exchange);
+        participate = false;
+        /* search the participants */
+        PMIX_LIST_FOREACH(p, desc->participants, participant_t) {
+            if (0 == strncmp(my_nspace, p->proc.nspace, strlen(my_nspace)) &&
+                (my_rank == p->proc.rank || PMIX_RANK_WILDCARD == p->proc.rank)) {
+                participate = true;
+            }
+            if (PMIX_RANK_WILDCARD == p->proc.rank) {
+                len += sprintf(tmp+len, "all; ");
+            } else {
+                len += sprintf(tmp+len, "%d,", p->proc.rank);
+            }
+        }
+        TEST_VERBOSE(("%s\n", tmp));
+        if (participate) {
+            /*run fence test on this range */
+            /* first put value (my_ns, my_rank) with key based on fence_num to split results of different fences*/
+            put_ind = 0;
+            (void)snprintf(sval, 50, "%d:%s:%d", fence_num, my_nspace, my_rank);
+            PUT(string, sval, PMIX_GLOBAL, fence_num, put_ind++, params.use_same_keys);
+            if (PMIX_SUCCESS != rc) {
+                TEST_ERROR(("%s:%d: PMIx_Put failed: %d", my_nspace, my_rank, rc));
+                PMIX_LIST_DESTRUCT(&test_fences);
+                return rc;
+            }
+
+            PUT(int, fence_num+my_rank, PMIX_GLOBAL, fence_num, put_ind++, params.use_same_keys);
+            if (PMIX_SUCCESS != rc) {
+                TEST_ERROR(("%s:%d: PMIx_Put failed: %d", my_nspace, my_rank, rc));
+                PMIX_LIST_DESTRUCT(&test_fences);
+                return rc;
+            }
+
+            PUT(float, fence_num+1.1, PMIX_GLOBAL, fence_num, put_ind++, params.use_same_keys);
+            if (PMIX_SUCCESS != rc) {
+                TEST_ERROR(("%s:%d: PMIx_Put failed: %d", my_nspace, my_rank, rc));
+                PMIX_LIST_DESTRUCT(&test_fences);
+                return rc;
+            }
+
+            PUT(uint32_t, fence_num+14, PMIX_GLOBAL, fence_num, put_ind++, params.use_same_keys);
+            if (PMIX_SUCCESS != rc) {
+                TEST_ERROR(("%s:%d: PMIx_Put failed: %d", my_nspace, my_rank, rc));
+                PMIX_LIST_DESTRUCT(&test_fences);
+                return rc;
+            }
+
+            PUT(uint16_t, fence_num+15, PMIX_GLOBAL, fence_num, put_ind++, params.use_same_keys);
+            if (PMIX_SUCCESS != rc) {
+                TEST_ERROR(("%s:%d: PMIx_Put failed: %d", my_nspace, my_rank, rc));
+                PMIX_LIST_DESTRUCT(&test_fences);
+                return rc;
+            }
+
+            /* Submit the data */
+            if (PMIX_SUCCESS != (rc = PMIx_Commit())) {
+                TEST_ERROR(("%s:%d: PMIx_Commit failed: %d", my_nspace, my_rank, rc));
+                PMIX_LIST_DESTRUCT(&test_fences);
+                return rc;
+            }
+
+            /* setup the fence */
+            npcs = pmix_list_get_size(desc->participants);
+            PMIX_PROC_CREATE(pcs, npcs);
+            i = 0;
+            PMIX_LIST_FOREACH(p, desc->participants, participant_t) {
+                (void)strncpy(pcs[i].nspace, p->proc.nspace, PMIX_MAX_NSLEN);
+                pcs[i].rank = p->proc.rank;
+                i++;
+            }
+
+            /* perform fence */
+            FENCE(desc->blocking, desc->data_exchange, pcs, npcs);
+            if (PMIX_SUCCESS != rc) {
+                TEST_ERROR(("%s:%d: PMIx_Fence failed: %d", my_nspace, my_rank, rc));
+                PMIX_LIST_DESTRUCT(&test_fences);
+                PMIX_PROC_FREE(pcs, npcs);
+                return rc;
+            }
+
+            /* replace all items in the list with PMIX_RANK_WILDCARD rank by real ranks to get their data. */
+            pmix_proc_t *ranks;
+            size_t nranks;
+            PMIX_LIST_FOREACH_SAFE(p, next, desc->participants, participant_t) {
+                if (PMIX_RANK_WILDCARD == p->proc.rank) {
+                    rc = get_all_ranks_from_namespace(params, p->proc.nspace, &ranks, &nranks);
+                    if (PMIX_SUCCESS != rc) {
+                        TEST_ERROR(("%s:%d: Can't parse --ns-dist value in order to get ranks for namespace %s", my_nspace, my_rank, p->proc.nspace));
+                        PMIX_LIST_DESTRUCT(&test_fences);
+                        return PMIX_ERROR;
+                    }
+                    pmix_list_remove_item(desc->participants, (pmix_list_item_t*)p);
+                    for (i = 0; i < nranks; i++) {
+                        participant_t *prt;
+                        prt = PMIX_NEW(participant_t);
+                        strncpy(prt->proc.nspace, ranks[i].nspace, strlen(ranks[i].nspace)+1);
+                        prt->proc.rank = ranks[i].rank;
+                        pmix_list_append(desc->participants, &prt->super);
+                    }
+                    PMIX_PROC_FREE(ranks, nranks);
+                }
+            }
+
+            /* get data from all participating in this fence clients */
+            PMIX_LIST_FOREACH(p, desc->participants, participant_t) {
+                put_ind = 0;
+                snprintf(sval, 50, "%d:%s:%d", fence_num, p->proc.nspace, p->proc.rank);
+                GET(string, sval, p->proc.nspace, p->proc.rank, fence_num, put_ind++, params.use_same_keys, 1, 0);
+                if (PMIX_SUCCESS != rc) {
+                    TEST_ERROR(("%s:%d: PMIx_Get failed (%d) from %s:%d", my_nspace, my_rank, rc, p->proc.nspace, p->proc.rank));
+                    PMIX_PROC_FREE(pcs, npcs);
+                    PMIX_LIST_DESTRUCT(&test_fences);
+                    return rc;
+                }
+                GET(int, (int)(fence_num+p->proc.rank), p->proc.nspace, p->proc.rank, fence_num, put_ind++, params.use_same_keys, 0, 0);
+                if (PMIX_SUCCESS != rc) {
+                    TEST_ERROR(("%s:%d: PMIx_Get failed (%d) from %s:%d", my_nspace, my_rank, rc, p->proc.nspace, p->proc.rank));
+                    PMIX_PROC_FREE(pcs, npcs);
+                    PMIX_LIST_DESTRUCT(&test_fences);
+                    return rc;
+                }
+                GET(float, fence_num+1.1, p->proc.nspace, p->proc.rank, fence_num, put_ind++, params.use_same_keys, 1, 0);
+                if (PMIX_SUCCESS != rc) {
+                    TEST_ERROR(("%s:%d: PMIx_Get failed (%d) from %s:%d", my_nspace, my_rank, rc, p->proc.nspace, p->proc.rank));
+                    PMIX_PROC_FREE(pcs, npcs);
+                    PMIX_LIST_DESTRUCT(&test_fences);
+                    return rc;
+                }
+                GET(uint32_t, (uint32_t)fence_num+14, p->proc.nspace, p->proc.rank, fence_num, put_ind++, params.use_same_keys, 0, 0);
+                if (PMIX_SUCCESS != rc) {
+                    TEST_ERROR(("%s:%d: PMIx_Get failed (%d) from %s:%d", my_nspace, my_rank, rc, p->proc.nspace, p->proc.rank));
+                    PMIX_PROC_FREE(pcs, npcs);
+                    PMIX_LIST_DESTRUCT(&test_fences);
+                    return rc;
+                }
+                GET(uint16_t, fence_num+15, p->proc.nspace, p->proc.rank, fence_num, put_ind++, params.use_same_keys, 1, 0);
+                if (PMIX_SUCCESS != rc) {
+                    TEST_ERROR(("%s:%d: PMIx_Get failed (%d) from %s:%d", my_nspace, my_rank, rc, p->proc.nspace, p->proc.rank));
+                    PMIX_PROC_FREE(pcs, npcs);
+                    PMIX_LIST_DESTRUCT(&test_fences);
+                    return rc;
+                }
+            }
+            /* barrier across participating processes to prevent putting new values with the same key
+             * before finishing data exchange with other processes. */
+            FENCE(1, 0, pcs, npcs);
+            PMIX_PROC_FREE(pcs, npcs);
+        }
+        fence_num++;
+    }
+
+    PMIX_LIST_DESTRUCT(&test_fences);
+    return PMIX_SUCCESS;
+}
+
+static int get_local_peers(char *my_nspace, int my_rank, pmix_rank_t **_peers, pmix_rank_t *count)
+{
+    pmix_value_t *val;
+    pmix_rank_t *peers = NULL;
+    char *sptr, *token, *eptr, *str;
+    pmix_rank_t npeers;
+    int rc;
+    pmix_proc_t proc;
+
+    (void)strncpy(proc.nspace, my_nspace, PMIX_MAX_NSLEN);
+    proc.rank = PMIX_RANK_WILDCARD;
+    /* get number of neighbours on this node */
+    if (PMIX_SUCCESS != (rc = PMIx_Get(&proc, PMIX_LOCAL_SIZE, NULL, 0, &val))) {
+        TEST_ERROR(("%s:%d: PMIx_Get local peer # failed: %d", my_nspace, my_rank, rc));
+        return rc;
+    }
+    if (NULL == val) {
+        TEST_ERROR(("%s:%d: PMIx_Get local peer # returned NULL value", my_nspace, my_rank));
+        return PMIX_ERROR;
+    }
+
+    if (val->type != PMIX_UINT32  ) {
+        TEST_ERROR(("%s:%d: local peer # attribute value type mismatch,"
+                " want %d get %d(%d)",
+                my_nspace, my_rank, PMIX_UINT32, val->type));
+        return PMIX_ERROR;
+    }
+    npeers = val->data.uint32;
+    peers = malloc(sizeof(pmix_rank_t) * npeers);
+
+    /* get ranks of neighbours on this node */
+    if (PMIX_SUCCESS != (rc = PMIx_Get(&proc, PMIX_LOCAL_PEERS, NULL, 0, &val))) {
+        TEST_ERROR(("%s:%d: PMIx_Get local peers failed: %d", my_nspace, my_rank, rc));
+        free(peers);
+        return rc;
+    }
+    if (NULL == val) {
+        TEST_ERROR(("%s:%d: PMIx_Get local peers returned NULL value", my_nspace, my_rank));
+        free(peers);
+        return PMIX_ERROR;
+    }
+
+    if (val->type != PMIX_STRING  ) {
+        TEST_ERROR(("%s:%d: local peers attribute value type mismatch,"
+                " want %d get %d(%d)",
+                my_nspace, my_rank, PMIX_UINT32, val->type));
+        free(peers);
+        return PMIX_ERROR;
+    }
+
+    *count = 0;
+    sptr = NULL;
+    str = val->data.string;
+    do{
+        if( *count > npeers ){
+            TEST_ERROR(("%s:%d: Bad peer ranks number: should be %d, actual %d (%s)",
+                my_nspace, my_rank, npeers, *count, val->data.string));
+            free(peers);
+            return PMIX_ERROR;
+        }
+        token = strtok_r(str, ",", &sptr);
+        str = NULL;
+        if( NULL != token ){
+            peers[(*count)++] = strtol(token,&eptr,10);
+            if( *eptr != '\0' ){
+                TEST_ERROR(("%s:%d: Bad peer ranks string", my_nspace, my_rank));
+                free(peers);
+                return PMIX_ERROR;
+            }
+        }
+
+    } while( NULL != token );
+
+    if( *count != npeers ){
+        TEST_ERROR(("%s:%d: Bad peer ranks number: should be %d, actual %d (%s)",
+                my_nspace, my_rank, npeers, *count, val->data.string));
+        free(peers);
+        return PMIX_ERROR;
+    }
+    *_peers = peers;
+    return PMIX_SUCCESS;
+}
+
+int test_job_fence(test_params params, char *my_nspace, pmix_rank_t my_rank)
+{
+    int rc;
+    int i, j;
+    char sval[50];
+    pmix_rank_t *peers, npeers;
+    pmix_value_t value;
+    pmix_value_t *val = &value;
+    pmix_proc_t proc;
+
+    (void)strncpy(proc.nspace, my_nspace, PMIX_MAX_NSLEN);
+    proc.rank = my_rank;
+
+    for (i=0; i < 3; i++) {
+        PUT(int, 12340 + i, PMIX_LOCAL, 100, i, 0);
+        if (PMIX_SUCCESS != rc) {
+            TEST_ERROR(("%s:%d: PMIx_Put failed: %d", my_nspace, my_rank, rc));
+            return rc;
+        }
+
+        (void)snprintf(sval, 50, "%s:%d", my_nspace, my_rank);
+        PUT(string, sval, PMIX_REMOTE, 101, i, 0);
+        if (PMIX_SUCCESS != rc) {
+            TEST_ERROR(("%s:%d: PMIx_Put failed: %d", my_nspace, my_rank, rc));
+            return PMIX_ERROR;
+        }
+
+        PUT(float, (float)12.15 + i, PMIX_GLOBAL, 102, i, 0);
+        if (PMIX_SUCCESS != rc) {
+            TEST_ERROR(("%s:%d: PMIx_Put failed: %d", my_nspace, my_rank, rc));
+            return PMIX_ERROR;
+        }
+    }
+
+    /* Submit the data */
+    if (PMIX_SUCCESS != (rc = PMIx_Commit())) {
+        TEST_ERROR(("%s:%d: PMIx_Commit failed: %d", my_nspace, my_rank, rc));
+        return PMIX_ERROR;
+    }
+
+    /* Perform a fence if was requested */
+    FENCE(!params.nonblocking, params.collect, NULL, 0);
+    if (PMIX_SUCCESS != rc) {
+        TEST_ERROR(("%s:%d: PMIx_Fence failed: %d", my_nspace, my_rank, rc));
+        return rc;
+    }
+
+    if (PMIX_SUCCESS != (rc = get_local_peers(my_nspace, my_rank, &peers, &npeers))) {
+        return PMIX_ERROR;
+    }
+
+    /* Check the predefined output */
+    for (i=0; i < (int)params.ns_size; i++) {
+
+        for (j=0; j < 3; j++) {
+
+            int local = 0;
+            pmix_rank_t k;
+            for(k=0; k<npeers; k++){
+                if( peers[k] == i+params.base_rank){
+                    local = 1;
+                }
+            }
+            if( local ){
+                GET(int, (12340+j), my_nspace, i+params.base_rank, 100, j, 0, 0, 0);
+                if (PMIX_SUCCESS != rc) {
+                    TEST_ERROR(("%s:%d: PMIx_Get failed: %d", my_nspace, my_rank, rc));
+                    return PMIX_ERROR;
+                }
+
+                snprintf(sval, 50, "%s:%d", my_nspace, i+params.base_rank);
+                GET(string, sval, my_nspace, i+params.base_rank, 101, j, 0, 1, 1);
+                if (PMIX_SUCCESS == rc && (i+params.base_rank) != my_rank ) {
+                    TEST_ERROR(("%s:%d: PMIx_Get of remote key on local proc", my_nspace, my_rank));
+                    return PMIX_ERROR;
+                }
+            } else {
+                GET(int, (12340+j), my_nspace, i+params.base_rank, 100, j, 0, 0, 1);
+                if (PMIX_SUCCESS == rc && (i+params.base_rank) != my_rank) {
+                    TEST_ERROR(("%s:%d: PMIx_Get of local key on the remote proc", my_nspace, my_rank));
+                    return PMIX_ERROR;
+                }
+
+                snprintf(sval, 50, "%s:%d", my_nspace, i+params.base_rank);
+                GET(string, sval, my_nspace, i+params.base_rank, 101, j, 0, 1, 0);
+                if (PMIX_SUCCESS != rc) {
+                    TEST_ERROR(("%s:%d: PMIx_Get failed (%d)", my_nspace, my_rank, rc));
+                    return PMIX_ERROR;
+                }
+            }
+
+            GET(float, (float)12.15 + j, my_nspace, i+params.base_rank, 102, j, 0, 0, 0);
+            if (PMIX_SUCCESS != rc) {
+                TEST_ERROR(("%s:%d: PMIx_Get failed (%d)", my_nspace, my_rank, rc));
+                return PMIX_ERROR;
+            }
+        }
+
+        /* ask for a non-existent key */
+        proc.rank = i+params.base_rank;
+        if (PMIX_SUCCESS == (rc = PMIx_Get(&proc, "foobar", NULL, 0, &val))) {
+            TEST_ERROR(("%s:%d: PMIx_Get returned success instead of failure",
+                        my_nspace, my_rank));
+            return PMIX_ERROR;
+        }
+        if (PMIX_ERR_NOT_FOUND != rc) {
+            TEST_ERROR(("%s:%d [ERROR]: PMIx_Get returned %d instead of not_found",
+                        my_nspace, my_rank, rc));
+        }
+        if (NULL != val) {
+            TEST_ERROR(("%s:%d [ERROR]: PMIx_Get did not return NULL value", my_nspace, my_rank));
+            return PMIX_ERROR;
+        }
+        TEST_VERBOSE(("%s:%d: rank %d is OK", my_nspace, my_rank, i+params.base_rank));
+    }
+    return PMIX_SUCCESS;
+}
+
diff --git a/test/test_fence.h b/test/test_fence.h
new file mode 100644
index 0000000..ec273c2
--- /dev/null
+++ b/test/test_fence.h
@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2016      Intel, Inc.  All rights reserved.
+ * Copyright (c) 2015      Mellanox Technologies, Inc.
+ *                         All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ *
+ */
+
+#include <src/include/pmix_config.h>
+#include <pmix.h>
+
+#include <time.h>
+#include "test_common.h"
+
+int test_fence(test_params params, char *my_nspace, pmix_rank_t my_rank);
+int test_job_fence(test_params params, char *my_nspace, pmix_rank_t my_rank);
diff --git a/test/test_internal.c b/test/test_internal.c
new file mode 100644
index 0000000..3f76f3c
--- /dev/null
+++ b/test/test_internal.c
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2017      Mellanox Technologies, Inc.
+ *                         All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ *
+ */
+
+#include "test_internal.h"
+
+static void release_cb(pmix_status_t status, void *cbdata)
+{
+    int *ptr = (int*)cbdata;
+    *ptr = 0;
+}
+
+static void get_cb(pmix_status_t status, pmix_value_t *kv, void *cbdata)
+{
+    get_cbdata *cb = (get_cbdata*)cbdata;
+    if (PMIX_SUCCESS == status) {
+        pmix_value_xfer(cb->kv, kv);
+    }
+    cb->in_progress = 0;
+    cb->status = status;
+}
+
+int test_internal(char *my_nspace, pmix_rank_t my_rank, test_params params) {
+    int idx;
+    char sval[PMIX_MAX_NSLEN];
+    char key[PMIX_MAX_KEYLEN];
+    pmix_value_t value;
+    pmix_proc_t proc;
+    pmix_status_t rc;
+
+    PMIX_PROC_CONSTRUCT(&proc);
+    (void)strncpy(proc.nspace, my_nspace, PMIX_MAX_NSLEN);
+    proc.rank = my_rank;
+
+    for (idx = 0; idx < params.test_internal; idx++) {
+        memset(sval, 0, PMIX_MAX_NSLEN);
+        sprintf(sval, "test_internal:%s:%d:%d", my_nspace, my_rank, idx);
+
+        SET_KEY(key, 0, idx, 1);
+        value.type = PMIX_STRING;
+        value.data.string = sval;
+        if (PMIX_SUCCESS != (rc = PMIx_Store_internal(&proc, key, &value))) {
+            TEST_ERROR(("%s:%d: PMIx_Store_internal failed: %d", my_nspace, my_rank, rc));
+            PMIX_PROC_DESTRUCT(&proc);
+            return PMIX_ERROR;
+        }
+    }
+
+    /* Submit the data */
+    if (PMIX_SUCCESS != (rc = PMIx_Commit())) {
+        TEST_ERROR(("%s:%d: PMIx_Commit failed: %d", my_nspace, my_rank, rc));
+        PMIX_LIST_DESTRUCT(&key_replace);
+        PMIX_PROC_DESTRUCT(&proc);
+        return PMIX_ERROR;
+    }
+
+    proc.rank = PMIX_RANK_WILDCARD;
+    FENCE(1, 1, (&proc), 1);
+    if (PMIX_SUCCESS != rc) {
+        TEST_ERROR(("%s:%d: PMIx_Fence failed: %d", my_nspace, my_rank, rc));
+        PMIX_LIST_DESTRUCT(&key_replace);
+        PMIX_PROC_DESTRUCT(&proc);
+        return rc;
+    }
+
+    for (idx = 0; idx < params.test_internal; idx++) {
+        memset(sval, 0, PMIX_MAX_NSLEN);
+        sprintf(sval, "test_internal:%s:%d:%d", my_nspace, my_rank, idx);
+
+        GET(string, sval, my_nspace, my_rank, 0, idx, 1, 1, 0);
+        if (PMIX_SUCCESS != rc) {
+            TEST_ERROR(("%s:%d: PMIx_Get of remote key on local proc", my_nspace, my_rank));
+            PMIX_PROC_DESTRUCT(&proc);
+            return PMIX_ERROR;
+        }
+    }
+
+    PMIX_PROC_DESTRUCT(&proc);
+    return PMIX_SUCCESS;
+}
diff --git a/test/test_internal.h b/test/test_internal.h
new file mode 100644
index 0000000..6d60952
--- /dev/null
+++ b/test/test_internal.h
@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2017      Mellanox Technologies, Inc.
+ *                         All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ *
+ */
+
+#include <src/include/pmix_config.h>
+#include <pmix.h>
+
+#include "test_common.h"
+
+int test_internal(char *my_nspace, pmix_rank_t my_rank, test_params params);
diff --git a/test/test_publish.c b/test/test_publish.c
new file mode 100644
index 0000000..86f799b
--- /dev/null
+++ b/test/test_publish.c
@@ -0,0 +1,196 @@
+/*
+ * Copyright (c) 2015      Intel, Inc.  All rights reserved.
+ * Copyright (c) 2015      Mellanox Technologies, Inc.
+ *                         All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ *
+ */
+
+#include "test_publish.h"
+#include <time.h>
+#include "src/buffer_ops/buffer_ops.h"
+
+typedef struct {
+    int in_progress;
+    size_t npdata;
+    pmix_pdata_t *pdata;
+} lookup_cbdata;
+
+static void release_cb(pmix_status_t status, void *cbdata)
+{
+    int *ptr = (int*)cbdata;
+    *ptr = 0;
+}
+
+static void lookup_cb(pmix_status_t status,
+                      pmix_pdata_t pdata[], size_t npdata,
+                      void *cbdata)
+{
+    size_t i, j;
+    lookup_cbdata *cb = (lookup_cbdata*)cbdata;
+    pmix_pdata_t *tgt = cb->pdata;
+
+    /* find the matching key in the provided info array - error if not found */
+    for (i=0; i < npdata; i++) {
+        for (j=0; j < cb->npdata; j++) {
+            if (0 == strcmp(pdata[i].key, tgt[j].key)) {
+                /* transfer the value to the pmix_pdata_t */
+                (void)strncpy(tgt[j].proc.nspace, pdata[i].proc.nspace, PMIX_MAX_NSLEN);
+                tgt[j].proc.rank = pdata[i].proc.rank;
+                pmix_value_xfer(&tgt[j].value, &pdata[i].value);
+                break;
+            }
+        }
+    }
+    cb->in_progress = 0;
+}
+
+static int test_publish(char *my_nspace, int my_rank, int blocking)
+{
+    int rc;
+    pmix_info_t info;
+    char data[512];
+
+    PMIX_INFO_CONSTRUCT(&info);
+    (void)snprintf(info.key, PMIX_MAX_KEYLEN, "%s:%d", my_nspace, my_rank);
+    (void)snprintf(data, 512, "data from proc %s:%d", my_nspace, my_rank);
+    info.value.type = PMIX_STRING;
+    info.value.data.string = strdup(data);
+    if (blocking) {
+        rc = PMIx_Publish(&info, 1);
+    } else {
+        int in_progress = 1;
+        rc = PMIx_Publish_nb(&info, 1, release_cb, &in_progress);
+        if (PMIX_SUCCESS == rc) {
+            PMIX_WAIT_FOR_COMPLETION(in_progress);
+        }
+    }
+    PMIX_INFO_DESTRUCT(&info);
+    return rc;
+}
+
+static int test_lookup(char *my_nspace, int my_rank, int blocking)
+{
+    int rc;
+    pmix_pdata_t pdata;
+    char data[512];
+    char *keys[2];
+
+    PMIX_PDATA_CONSTRUCT(&pdata);
+    (void)snprintf(pdata.key, PMIX_MAX_KEYLEN, "%s:%d", my_nspace, my_rank);
+    (void)snprintf(data, 512, "data from proc %s:%d", my_nspace, my_rank);
+
+    if (blocking) {
+        if (PMIX_SUCCESS != (rc = PMIx_Lookup(&pdata, 1, NULL, 0))) {
+            PMIX_PDATA_DESTRUCT(&pdata);
+            return rc;
+        }
+    } else {
+        keys[0] = (char*)malloc(PMIX_MAX_KEYLEN * sizeof(char));
+        (void)snprintf(keys[0], PMIX_MAX_KEYLEN, "%s:%d", my_nspace, my_rank);
+        keys[1] = NULL;
+
+        lookup_cbdata cbdata;
+        cbdata.in_progress = 1;
+        cbdata.npdata = 1;
+        cbdata.pdata = &pdata;
+        /* copy the key across */
+        (void)strncpy(pdata.key, keys[0], PMIX_MAX_KEYLEN);
+        rc = PMIx_Lookup_nb(keys, NULL, 0, lookup_cb, (void*)&cbdata);
+        if (PMIX_SUCCESS != rc) {
+            PMIX_PDATA_DESTRUCT(&pdata);
+            return rc;
+        }
+        PMIX_WAIT_FOR_COMPLETION(cbdata.in_progress);
+    }
+
+    if (PMIX_STRING != pdata.value.type ||
+            NULL == pdata.value.data.string) {
+        PMIX_PDATA_DESTRUCT(&pdata);
+        return PMIX_ERR_NOT_FOUND;
+    }
+
+    if (strncmp(data, pdata.value.data.string, strlen(data))) {
+        PMIX_PDATA_DESTRUCT(&pdata);
+        return PMIX_ERR_NOT_FOUND;
+    }
+    PMIX_PDATA_DESTRUCT(&pdata);
+    return rc;
+}
+
+static int test_unpublish(char *my_nspace, int my_rank, int blocking)
+{
+    int rc;
+    char *keys[2];
+
+    keys[0] = (char*)malloc(PMIX_MAX_KEYLEN * sizeof(char));
+    (void)snprintf(keys[0], PMIX_MAX_KEYLEN, "%s:%d", my_nspace, my_rank);
+    keys[1] = NULL;
+
+    if (blocking) {
+        rc = PMIx_Unpublish(keys, NULL, 0);
+    } else {
+        int in_progress = 1;
+        rc = PMIx_Unpublish_nb(keys, NULL, 0, release_cb, &in_progress);
+        if (PMIX_SUCCESS == rc) {
+            PMIX_WAIT_FOR_COMPLETION(in_progress);
+        }
+    }
+    free(keys[0]);
+    return rc;
+}
+
+static int test_publish_lookup_common(char *my_nspace, int my_rank, int blocking)
+{
+    int rc;
+    rc = test_publish(my_nspace, my_rank, blocking);
+    if (PMIX_SUCCESS != rc) {
+        TEST_ERROR(("%s:%d: %s failed.", my_nspace, my_rank, blocking ? "PMIX_Publish" : "PMIX_Publish_nb"));
+        return PMIX_ERROR;
+    }
+    TEST_VERBOSE(("%s:%d: %s succeeded.", my_nspace, my_rank, blocking ? "PMIX_Publish" : "PMIX_Publish_nb"));
+
+    rc = test_lookup(my_nspace, my_rank, blocking);
+    if (PMIX_SUCCESS != rc) {
+        TEST_ERROR(("%s:%d: %s failed.", my_nspace, my_rank, blocking ? "PMIX_Lookup" : "PMIX_Lookup_nb"));
+        return PMIX_ERROR;
+    }
+    TEST_VERBOSE(("%s:%d: %s succeeded.\n", my_nspace, my_rank, blocking ? "PMIX_Lookup" : "PMIX_Lookup_nb"));
+
+    rc = test_unpublish(my_nspace, my_rank, blocking);
+    if (PMIX_SUCCESS != rc) {
+        TEST_ERROR(("%s:%d: %s failed.", my_nspace, my_rank, blocking ? "PMIX_Unpublish" : "PMIX_Unpublish_nb"));
+        return PMIX_ERROR;
+    }
+    TEST_VERBOSE(("%s:%d: %s succeeded.", my_nspace, my_rank, blocking ? "PMIX_Unpublish" : "PMIX_Unpublish_nb"));
+
+    rc = test_lookup(my_nspace, my_rank, blocking);
+    if (PMIX_ERR_NOT_FOUND != rc) {
+        TEST_ERROR(("%s:%d: %s function returned %d instead of PMIX_ERR_NOT_FOUND.", my_nspace, my_rank, blocking ? "PMIX_Lookup" : "PMIX_Lookup_nb", rc));
+        return PMIX_ERROR;
+    }
+    return PMIX_SUCCESS;
+}
+
+int test_publish_lookup(char *my_nspace, int my_rank)
+{
+    int rc;
+    /* test blocking */
+    rc = test_publish_lookup_common(my_nspace, my_rank, 1);
+    if (PMIX_SUCCESS != rc) {
+        TEST_ERROR(("%s:%d: Publish/Lookup blocking test failed.", my_nspace, my_rank));
+        return PMIX_ERROR;
+    }
+    /* test non-blocking */
+    rc = test_publish_lookup_common(my_nspace, my_rank, 0);
+    if (PMIX_SUCCESS != rc) {
+        TEST_ERROR(("%s:%d: Publish/Lookup non-blocking test failed.", my_nspace, my_rank));
+        return PMIX_ERROR;
+    }
+    return PMIX_SUCCESS;
+}
+
diff --git a/test/test_publish.h b/test/test_publish.h
new file mode 100644
index 0000000..bd436b8
--- /dev/null
+++ b/test/test_publish.h
@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2015      Intel, Inc.  All rights reserved.
+ * Copyright (c) 2015      Mellanox Technologies, Inc.
+ *                         All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ *
+ */
+
+#include <src/include/pmix_config.h>
+#include <pmix.h>
+
+#include "test_common.h"
+
+int test_publish_lookup(char *my_nspace, int my_rank);
diff --git a/test/test_replace.c b/test/test_replace.c
new file mode 100644
index 0000000..4bcd5d2
--- /dev/null
+++ b/test/test_replace.c
@@ -0,0 +1,135 @@
+/*
+ * Copyright (c) 2017      Mellanox Technologies, Inc.
+ *                         All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ *
+ */
+
+#include "test_replace.h"
+
+static void release_cb(pmix_status_t status, void *cbdata)
+{
+    int *ptr = (int*)cbdata;
+    *ptr = 0;
+}
+
+static void get_cb(pmix_status_t status, pmix_value_t *kv, void *cbdata)
+{
+    get_cbdata *cb = (get_cbdata*)cbdata;
+    if (PMIX_SUCCESS == status) {
+        pmix_value_xfer(cb->kv, kv);
+    }
+    cb->in_progress = 0;
+    cb->status = status;
+}
+
+static int key_is_replace(int key_idx) {
+    key_replace_t *item;
+
+    PMIX_LIST_FOREACH(item, &key_replace, key_replace_t) {
+        if (item->key_idx == key_idx)
+            return 1;
+    }
+    return 0;
+}
+
+int test_replace(char *my_nspace, pmix_rank_t my_rank, test_params params) {
+    int key_idx = 0;
+    int key_cnt = 0;
+    char sval[PMIX_MAX_NSLEN];
+    pmix_proc_t proc;
+    pmix_status_t rc;
+    key_replace_t *item;
+
+    PMIX_CONSTRUCT(&key_replace, pmix_list_t);
+    parse_replace(params.key_replace, 1, &key_cnt);
+
+    for (key_idx = 0; key_idx < key_cnt; key_idx++) {
+        memset(sval, 0, PMIX_MAX_NSLEN);
+        sprintf(sval, "test_replace:%s:%d:%d", my_nspace, my_rank, key_idx);
+
+        PUT(string, sval, PMIX_GLOBAL, 0, key_idx, 1);
+        if (PMIX_SUCCESS != rc) {
+            TEST_ERROR(("%s:%d: PMIx_Put failed: %d", my_nspace, my_rank, rc));
+            PMIX_LIST_DESTRUCT(&key_replace);
+            return rc;
+        }
+    }
+
+    PMIX_PROC_CONSTRUCT(&proc);
+    (void)strncpy(proc.nspace, my_nspace, PMIX_MAX_NSLEN);
+    proc.rank = PMIX_RANK_WILDCARD;
+
+    /* Submit the data */
+    if (PMIX_SUCCESS != (rc = PMIx_Commit())) {
+        TEST_ERROR(("%s:%d: PMIx_Commit failed: %d", my_nspace, my_rank, rc));
+        PMIX_LIST_DESTRUCT(&key_replace);
+        PMIX_PROC_DESTRUCT(&proc);
+        return PMIX_ERROR;
+    }
+
+    FENCE(1, 1, (&proc), 1);
+    if (PMIX_SUCCESS != rc) {
+        TEST_ERROR(("%s:%d: PMIx_Fence failed: %d", my_nspace, my_rank, rc));
+        PMIX_LIST_DESTRUCT(&key_replace);
+        PMIX_PROC_DESTRUCT(&proc);
+        return rc;
+    }
+
+    PMIX_LIST_FOREACH(item, &key_replace, key_replace_t) {
+        memset(sval, 0, PMIX_MAX_NSLEN);
+        sprintf(sval, "test_replace:%s:%d:%d: replaced key", my_nspace, my_rank, item->key_idx);
+
+        PUT(string, sval, PMIX_GLOBAL, 0, item->key_idx, 1);
+        if (PMIX_SUCCESS != rc) {
+            TEST_ERROR(("%s:%d: PMIx_Put failed: %d", my_nspace, my_rank, rc));
+            PMIX_LIST_DESTRUCT(&key_replace);
+            PMIX_PROC_DESTRUCT(&proc);
+            return rc;
+        }
+    }
+
+
+    /* Submit the data */
+    if (PMIX_SUCCESS != (rc = PMIx_Commit())) {
+        TEST_ERROR(("%s:%d: PMIx_Commit failed: %d", my_nspace, my_rank, rc));
+        PMIX_LIST_DESTRUCT(&key_replace);
+        PMIX_PROC_DESTRUCT(&proc);
+        return PMIX_ERROR;
+    }
+
+    FENCE(1, 1, (&proc), 1);
+    if (PMIX_SUCCESS != rc) {
+        TEST_ERROR(("%s:%d: PMIx_Fence failed: %d", my_nspace, my_rank, rc));
+        PMIX_LIST_DESTRUCT(&key_replace);
+        PMIX_PROC_DESTRUCT(&proc);
+        return rc;
+    }
+
+    for (key_idx = 0; key_idx < key_cnt; key_idx++) {
+        memset(sval, 0, PMIX_MAX_NSLEN);
+
+        if (key_is_replace(key_idx)) {
+            sprintf(sval, "test_replace:%s:%d:%d: replaced key", my_nspace, my_rank, key_idx);
+        } else {
+            sprintf(sval, "test_replace:%s:%d:%d", my_nspace, my_rank, key_idx);
+        }
+
+
+        GET(string, sval, my_nspace, my_rank, 0, key_idx, 1, 1, 0);
+        if (PMIX_SUCCESS != rc) {
+            TEST_ERROR(("%s:%d: PMIx_Get of remote key on local proc", my_nspace, my_rank));
+            PMIX_LIST_DESTRUCT(&key_replace);
+            PMIX_PROC_DESTRUCT(&proc);
+            return PMIX_ERROR;
+        }
+    }
+
+    PMIX_LIST_DESTRUCT(&key_replace);
+    PMIX_PROC_DESTRUCT(&proc);
+    return PMIX_SUCCESS;
+}
diff --git a/test/test_replace.h b/test/test_replace.h
new file mode 100644
index 0000000..0d9ddef
--- /dev/null
+++ b/test/test_replace.h
@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2017      Mellanox Technologies, Inc.
+ *                         All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ *
+ */
+
+#include <src/include/pmix_config.h>
+#include <pmix.h>
+
+#include "test_common.h"
+
+int test_replace(char *my_nspace, pmix_rank_t my_rank, test_params params);
diff --git a/test/test_resolve_peers.c b/test/test_resolve_peers.c
new file mode 100644
index 0000000..e9582cb
--- /dev/null
+++ b/test/test_resolve_peers.c
@@ -0,0 +1,125 @@
+/*
+ * Copyright (c) 2015      Intel, Inc.  All rights reserved.
+ * Copyright (c) 2015      Mellanox Technologies, Inc.
+ *                         All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ *
+ */
+
+#include "test_resolve_peers.h"
+#include "test_cd.h"
+
+static int resolve_nspace(char *nspace, test_params params, char *my_nspace, int my_rank)
+{
+    int rc;
+    pmix_proc_t *procs;
+    size_t nprocs, nranks, i;
+    pmix_proc_t *ranks;
+    rc = PMIx_Resolve_peers(NODE_NAME, nspace, &procs, &nprocs);
+    if (PMIX_SUCCESS != rc) {
+        TEST_ERROR(("%s:%d: Resolve peers test failed: rc = %d", my_nspace, my_rank, rc));
+        return rc;
+    }
+    if (NULL == procs || 0 == nprocs) {
+        TEST_ERROR(("%s:%d: Resolve peers didn't find any process from ns %s at this node\n", my_nspace, my_rank,my_nspace));
+        return PMIX_ERROR;
+    }
+    rc = get_all_ranks_from_namespace(params, nspace, &ranks, &nranks);
+    if (PMIX_SUCCESS != rc) {
+        TEST_ERROR(("%s:%d: get_all_ranks_from_namespace function failed", my_nspace, my_rank));
+        PMIX_PROC_FREE(procs, nprocs);
+        return rc;
+    }
+    if (nprocs != nranks) {
+        TEST_ERROR(("%s:%d: Resolve peers returned incorect result: returned %lu processes, expected %lu", my_nspace, my_rank, nprocs, nranks));
+        PMIX_PROC_FREE(procs, nprocs);
+        PMIX_PROC_FREE(ranks, nranks);
+        return PMIX_ERROR;
+    }
+    for (i = 0; i < nprocs; i++) {
+        if (procs[i].rank != ranks[i].rank) {
+            TEST_ERROR(("%s:%d: Resolve peers returned incorrect result: returned value %s:%d, expected rank %d", my_nspace, my_rank, procs[i].nspace, ranks[i].rank, procs[i].rank));
+            rc = PMIX_ERROR;
+            break;
+        }
+    }
+    PMIX_PROC_FREE(procs, nprocs);
+    PMIX_PROC_FREE(ranks, nranks);
+    return rc;
+}
+
+int test_resolve_peers(char *my_nspace, int my_rank, test_params params)
+{
+    int rc, n;
+    int ns_num;
+    char nspace[PMIX_MAX_NSLEN+1];
+    pmix_proc_t procs[2];
+
+    /* first resolve peers from the own namespace. */
+    rc = resolve_nspace(my_nspace, params, my_nspace, my_rank);
+    if (PMIX_SUCCESS == rc) {
+        TEST_VERBOSE(("%s:%d: Resolve peers succeeded for the own namespace\n", my_nspace, my_rank));
+    } else {
+        TEST_ERROR(("%s:%d: Resolve peers failed for the own namespace\n", my_nspace, my_rank));
+        return PMIX_ERROR;
+    }
+
+    /* then get number of namespaces and try to resolve peers from them. */
+    ns_num = get_total_ns_number(params);
+    if (0 >= ns_num) {
+        TEST_ERROR(("%s:%d: get_total_ns_number function failed", my_nspace, my_rank));
+        return PMIX_ERROR;
+    }
+    for (n = 0; n < ns_num; n++) {
+        /* then connect to processes from different namespaces and resolve peers. */
+        (void)snprintf(nspace, PMIX_MAX_NSLEN, "%s-%d", TEST_NAMESPACE, n);
+        if (0 == strncmp(my_nspace, nspace, strlen(nspace)+1)) {
+            continue;
+        }
+
+        /* add to procs array all processes from own namespace and all processes from this namespace.
+         * Make sure that processes are placed in the same order. */
+        if (0 < strncmp(nspace, my_nspace, PMIX_MAX_NSLEN)) {
+            (void)strncpy(procs[0].nspace, nspace, PMIX_MAX_NSLEN);
+            (void)strncpy(procs[1].nspace, my_nspace, PMIX_MAX_NSLEN);
+        } else {
+            (void)strncpy(procs[1].nspace, nspace, PMIX_MAX_NSLEN);
+            (void)strncpy(procs[0].nspace, my_nspace, PMIX_MAX_NSLEN);
+        }
+        procs[0].rank = PMIX_RANK_WILDCARD;
+        procs[1].rank = PMIX_RANK_WILDCARD;
+
+        /* make a connection between processes from own namespace and processes from this namespace. */
+        rc = test_cd_common(procs, 2, 1, 0);
+        if (PMIX_SUCCESS == rc) {
+            TEST_VERBOSE(("%s:%d: Connect to %s succeeded %s.", my_nspace, my_rank, nspace));
+        } else {
+            TEST_ERROR(("%s:%d: Connect to %s failed %s.", my_nspace, my_rank, nspace));
+            return PMIX_ERROR;
+        }
+        /* then resolve peers from this namespace. */
+        rc = resolve_nspace(nspace, params, my_nspace, my_rank);
+        if (PMIX_SUCCESS == rc) {
+            TEST_VERBOSE(("%s:%d: Resolve peers succeeded for ns %s\n", my_nspace, my_rank, nspace));
+        } else {
+            test_cd_common(procs, 2, 1, 1);
+            break;
+        }
+        /* disconnect from the processes of this namespace. */
+        rc = test_cd_common(procs, 2, 1, 0);
+        if (PMIX_SUCCESS == rc) {
+            TEST_VERBOSE(("%s:%d: Disconnect from %s succeeded %s.", my_nspace, my_rank, nspace));
+        } else {
+            TEST_ERROR(("%s:%d: Disconnect from %s failed %s.", my_nspace, my_rank, nspace));
+            return PMIX_ERROR;
+        }
+    }
+    if (PMIX_SUCCESS == rc) {
+        TEST_VERBOSE(("%s:%d: Resolve peers test succeeded.", my_nspace, my_rank));
+    }
+    return rc;
+}
diff --git a/test/test_resolve_peers.h b/test/test_resolve_peers.h
new file mode 100644
index 0000000..d928836
--- /dev/null
+++ b/test/test_resolve_peers.h
@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2015      Intel, Inc.  All rights reserved.
+ * Copyright (c) 2015      Mellanox Technologies, Inc.
+ *                         All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ *
+ */
+
+#include <src/include/pmix_config.h>
+#include <pmix.h>
+
+#include "test_common.h"
+
+int test_resolve_peers(char *my_nspace, int my_rank, test_params params);
diff --git a/test/test_spawn.c b/test/test_spawn.c
new file mode 100644
index 0000000..9251d4d
--- /dev/null
+++ b/test/test_spawn.c
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2015-2017 Intel, Inc. All rights reserved.
+ * Copyright (c) 2015      Mellanox Technologies, Inc.
+ *                         All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ *
+ */
+
+#include "test_spawn.h"
+#include <time.h>
+
+typedef struct {
+    int in_progress;
+    char nspace[PMIX_MAX_NSLEN];
+} spawn_cbdata;
+
+static void spawn_cb(pmix_status_t status,
+                      char nspace[], void *cbdata)
+{
+    spawn_cbdata *cb = (spawn_cbdata*)cbdata;
+
+    strncpy(cb->nspace, nspace, strlen(nspace)+1);
+    cb->in_progress = 0;
+}
+
+static int test_spawn_common(char *my_nspace, int my_rank, int blocking)
+{
+    int rc;
+    pmix_app_t *apps;
+    size_t napps;
+    char nspace[PMIX_MAX_NSLEN+1];
+    memset(nspace, 0, PMIX_MAX_NSLEN+1);
+    napps = 1;
+    PMIX_APP_CREATE(apps, napps);
+    if (blocking) {
+        if (PMIX_SUCCESS != (rc = PMIx_Spawn(NULL, 0, apps, napps, nspace))) {
+            PMIX_APP_FREE(apps, napps);
+            return rc;
+        }
+    } else {
+        spawn_cbdata cbdata;
+        cbdata.in_progress = 1;
+        memset(cbdata.nspace, 0, PMIX_MAX_NSLEN);
+        rc = PMIx_Spawn_nb(NULL, 0, apps, napps, spawn_cb, (void*)&cbdata);
+        if (PMIX_SUCCESS != rc) {
+            PMIX_APP_FREE(apps, napps);
+            return rc;
+        }
+        PMIX_WAIT_FOR_COMPLETION(cbdata.in_progress);
+        strncpy(nspace, cbdata.nspace, strlen(cbdata.nspace)+1);
+    }
+    PMIX_APP_FREE(apps, napps);
+    if (strncmp(nspace, "foobar", strlen(nspace)+1)) {
+        return PMIX_ERROR;
+    }
+    return rc;
+}
+
+int test_spawn(char *my_nspace, int my_rank)
+{
+    int rc;
+    rc = test_spawn_common(my_nspace, my_rank, 1);
+    if (PMIX_SUCCESS != rc) {
+        TEST_ERROR(("%s:%d: Spawn blocking test failed.", my_nspace, my_rank));
+        return PMIX_ERROR;
+    }
+    TEST_VERBOSE(("%s:%d: Spawn blocking test succeded.", my_nspace, my_rank));
+    rc = test_spawn_common(my_nspace, my_rank, 0);
+    if (PMIX_SUCCESS != rc) {
+        TEST_ERROR(("%s:%d: Spawn non-blocking test failed.", my_nspace, my_rank));
+        return PMIX_ERROR;
+    }
+    TEST_VERBOSE(("%s:%d: Spawn non-blocking test succeded.", my_nspace, my_rank));
+    return PMIX_SUCCESS;
+}
diff --git a/test/test_spawn.h b/test/test_spawn.h
new file mode 100644
index 0000000..d074be2
--- /dev/null
+++ b/test/test_spawn.h
@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2015      Intel, Inc.  All rights reserved.
+ * Copyright (c) 2015      Mellanox Technologies, Inc.
+ *                         All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ *
+ */
+
+#include <src/include/pmix_config.h>
+#include <pmix.h>
+
+#include "test_common.h"
+
+int test_spawn(char *my_nspace, int my_rank);
diff --git a/test/utils.c b/test/utils.c
new file mode 100644
index 0000000..dfcd285
--- /dev/null
+++ b/test/utils.c
@@ -0,0 +1,263 @@
+/*
+ * Copyright (c) 2015      Intel, Inc.  All rights reserved.
+ * Copyright (c) 2015-2017 Mellanox Technologies, Inc.
+ *                         All rights reserved.
+ * Copyright (c) 2016      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ *
+ */
+
+#include "utils.h"
+#include "test_common.h"
+#include "pmix_server.h"
+#include "cli_stages.h"
+
+static void release_cb(pmix_status_t status, void *cbdata)
+{
+    int *ptr = (int*)cbdata;
+    *ptr = 0;
+}
+
+static void fill_seq_ranks_array(size_t nprocs, int base_rank, char **ranks)
+{
+    uint32_t i;
+    int len = 0, max_ranks_len;
+    if (0 >= nprocs) {
+        return;
+    }
+    max_ranks_len = nprocs * (MAX_DIGIT_LEN+1);
+    *ranks = (char*) malloc(max_ranks_len);
+    for (i = 0; i < nprocs; i++) {
+        len += snprintf(*ranks + len, max_ranks_len-len-1, "%d", i+base_rank);
+        if (i != nprocs-1) {
+            len += snprintf(*ranks + len, max_ranks_len-len-1, "%c", ',');
+        }
+    }
+    if (len >= max_ranks_len-1) {
+        free(*ranks);
+        *ranks = NULL;
+        TEST_ERROR(("Not enough allocated space for global ranks array."));
+    }
+}
+
+static void set_namespace(int nprocs, char *ranks, char *name)
+{
+    size_t ninfo;
+    pmix_info_t *info;
+    ninfo = 8;
+    char *regex, *ppn;
+
+    PMIX_INFO_CREATE(info, ninfo);
+    (void)strncpy(info[0].key, PMIX_UNIV_SIZE, PMIX_MAX_KEYLEN);
+    info[0].value.type = PMIX_UINT32;
+    info[0].value.data.uint32 = nprocs;
+
+    (void)strncpy(info[1].key, PMIX_SPAWNED, PMIX_MAX_KEYLEN);
+    info[1].value.type = PMIX_UINT32;
+    info[1].value.data.uint32 = 0;
+
+    (void)strncpy(info[2].key, PMIX_LOCAL_SIZE, PMIX_MAX_KEYLEN);
+    info[2].value.type = PMIX_UINT32;
+    info[2].value.data.uint32 = nprocs;
+
+    (void)strncpy(info[3].key, PMIX_LOCAL_PEERS, PMIX_MAX_KEYLEN);
+    info[3].value.type = PMIX_STRING;
+    info[3].value.data.string = strdup(ranks);
+
+    PMIx_generate_regex(NODE_NAME, &regex);
+    (void)strncpy(info[4].key, PMIX_NODE_MAP, PMIX_MAX_KEYLEN);
+    info[4].value.type = PMIX_STRING;
+    info[4].value.data.string = regex;
+
+    PMIx_generate_ppn(ranks, &ppn);
+    (void)strncpy(info[5].key, PMIX_PROC_MAP, PMIX_MAX_KEYLEN);
+    info[5].value.type = PMIX_STRING;
+    info[5].value.data.string = ppn;
+
+    (void)strncpy(info[6].key, PMIX_JOB_SIZE, PMIX_MAX_KEYLEN);
+    info[6].value.type = PMIX_UINT32;
+    info[6].value.data.uint32 = nprocs;
+
+    (void)strncpy(info[7].key, PMIX_APPNUM, PMIX_MAX_KEYLEN);
+    info[7].value.type = PMIX_UINT32;
+    info[7].value.data.uint32 = getpid ();
+
+    int in_progress = 1, rc;
+    if (PMIX_SUCCESS == (rc = PMIx_server_register_nspace(name, nprocs, info, ninfo, release_cb, &in_progress))) {
+        PMIX_WAIT_FOR_COMPLETION(in_progress);
+    }
+    PMIX_INFO_FREE(info, ninfo);
+}
+
+void set_client_argv(test_params *params, char ***argv)
+{
+    pmix_argv_append_nosize(argv, params->binary);
+    pmix_argv_append_nosize(argv, "-n");
+    if (NULL == params->np) {
+        pmix_argv_append_nosize(argv, "1");
+    } else {
+        pmix_argv_append_nosize(argv, params->np);
+    }
+    if( params->verbose ){
+        pmix_argv_append_nosize(argv, "-v");
+    }
+    if (NULL != params->prefix) {
+        pmix_argv_append_nosize(argv, "-o");
+        pmix_argv_append_nosize(argv, params->prefix);
+    }
+    if( params->early_fail ){
+        pmix_argv_append_nosize(argv, "--early-fail");
+    }
+    if (NULL != params->fences) {
+        pmix_argv_append_nosize(argv, "--fence");
+        pmix_argv_append_nosize(argv, params->fences);
+        if (params->use_same_keys) {
+            pmix_argv_append_nosize(argv, "--use-same-keys");
+        }
+    }
+    if (params->test_job_fence) {
+        pmix_argv_append_nosize(argv, "--job-fence");
+        if (params->nonblocking) {
+            pmix_argv_append_nosize(argv, "-nb");
+        }
+        if (params->collect) {
+            pmix_argv_append_nosize(argv, "-c");
+        }
+        if (params->collect_bad) {
+            pmix_argv_append_nosize(argv, "--collect-corrupt");
+        }
+    }
+    if (NULL != params->noise) {
+        pmix_argv_append_nosize(argv, "--noise");
+        pmix_argv_append_nosize(argv, params->noise);
+    }
+    if (NULL != params->ns_dist) {
+        pmix_argv_append_nosize(argv, "--ns-dist");
+        pmix_argv_append_nosize(argv, params->ns_dist);
+    }
+    if (params->test_publish) {
+        pmix_argv_append_nosize(argv, "--test-publish");
+    }
+    if (params->test_spawn) {
+        pmix_argv_append_nosize(argv, "--test-spawn");
+    }
+    if (params->test_connect) {
+        pmix_argv_append_nosize(argv, "--test-connect");
+    }
+    if (params->test_resolve_peers) {
+        pmix_argv_append_nosize(argv, "--test-resolve-peers");
+    }
+    if (params->test_error) {
+        pmix_argv_append_nosize(argv, "--test-error");
+    }
+    if (params->key_replace) {
+        pmix_argv_append_nosize(argv, "--test-replace");
+        pmix_argv_append_nosize(argv, params->key_replace);
+    }
+    if (params->test_internal) {
+        char tmp[32];
+        sprintf(tmp, "%d", params->test_internal);
+        pmix_argv_append_nosize(argv, "--test-internal");
+        pmix_argv_append_nosize(argv, tmp);
+    }
+}
+
+int launch_clients(int num_procs, char *binary, char *** client_env, char ***base_argv)
+{
+    int n;
+    uid_t myuid;
+    gid_t mygid;
+    char *ranks = NULL;
+    char digit[MAX_DIGIT_LEN];
+    int rc;
+    static int counter = 0;
+    static int num_ns = 0;
+    pmix_proc_t proc;
+
+    TEST_VERBOSE(("Setting job info"));
+    fill_seq_ranks_array(num_procs, counter, &ranks);
+    if (NULL == ranks) {
+        PMIx_server_finalize();
+        TEST_ERROR(("fill_seq_ranks_array failed"));
+        return PMIX_ERROR;
+    }
+    (void)snprintf(proc.nspace, PMIX_MAX_NSLEN, "%s-%d", TEST_NAMESPACE, num_ns);
+    set_namespace(num_procs, ranks, proc.nspace);
+    if (NULL != ranks) {
+        free(ranks);
+    }
+
+    myuid = getuid();
+    mygid = getgid();
+
+    /* fork/exec the test */
+    for (n = 0; n < num_procs; n++) {
+        proc.rank = counter;
+        if (PMIX_SUCCESS != (rc = PMIx_server_setup_fork(&proc, client_env))) {//n
+            TEST_ERROR(("Server fork setup failed with error %d", rc));
+            PMIx_server_finalize();
+            cli_kill_all();
+            return rc;
+        }
+        if (PMIX_SUCCESS != (rc = PMIx_server_register_client(&proc, myuid, mygid, NULL, NULL, NULL))) {//n
+            TEST_ERROR(("Server fork setup failed with error %d", rc));
+            PMIx_server_finalize();
+            cli_kill_all();
+            return rc;
+        }
+
+        cli_info[counter].pid = fork();
+        if (cli_info[counter].pid < 0) {
+            TEST_ERROR(("Fork failed"));
+            PMIx_server_finalize();
+            cli_kill_all();
+            return -1;
+        }
+        cli_info[counter].rank = counter;//n
+        cli_info[counter].ns = strdup(proc.nspace);
+
+        char **client_argv = pmix_argv_copy(*base_argv);
+
+        /* add two last arguments: -r <rank> */
+        sprintf(digit, "%d", counter);//n
+        pmix_argv_append_nosize(&client_argv, "-r");
+        pmix_argv_append_nosize(&client_argv, digit);
+
+        pmix_argv_append_nosize(&client_argv, "-s");
+        pmix_argv_append_nosize(&client_argv, proc.nspace);
+
+        sprintf(digit, "%d", num_procs);
+        pmix_argv_append_nosize(&client_argv, "--ns-size");
+        pmix_argv_append_nosize(&client_argv, digit);
+
+        sprintf(digit, "%d", num_ns);
+        pmix_argv_append_nosize(&client_argv, "--ns-id");
+        pmix_argv_append_nosize(&client_argv, digit);
+
+        sprintf(digit, "%d", (counter-n));
+        pmix_argv_append_nosize(&client_argv, "--base-rank");
+        pmix_argv_append_nosize(&client_argv, digit);
+
+        if (cli_info[counter].pid == 0) {
+            if( !TEST_VERBOSE_GET() ){
+                // Hide clients stdout
+                freopen("/dev/null","w", stdout);
+            }
+            execve(binary, client_argv, *client_env);
+            /* Does not return */
+            exit(0);
+        }
+        cli_info[counter].state = CLI_FORKED;
+
+        pmix_argv_free(client_argv);
+
+        counter++;
+    }
+    num_ns++;
+    return PMIX_SUCCESS;
+}
diff --git a/test/utils.h b/test/utils.h
new file mode 100644
index 0000000..bbeebaa
--- /dev/null
+++ b/test/utils.h
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2015      Intel, Inc.  All rights reserved.
+ * Copyright (c) 2015      Mellanox Technologies, Inc.
+ *                         All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ *
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <stdint.h>
+#include "src/util/argv.h"
+#include "test_common.h"
+
+void set_client_argv(test_params *params, char ***argv);
+int launch_clients(int num_procs, char *binary, char *** client_env, char ***client_argv);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pmix.git



More information about the debian-science-commits mailing list