pmix/external: revamp external pmix package detection

(cherry picked from commit open-mpi/ompi@08d91b9)

opal_check_pmi.m4: remove stale code and comments

Signed-off-by: Jeff Squyres <[email protected]>
(cherry picked from commit open-mpi/ompi@f3e3b80)

Bring this to fully replicate what is on master - avoids future confusion over use of "external" in PMIx configure

Author: ggouaillardet

config/opal_check_pmi.m4

@@ -14,7 +14,7 @@
 # Copyright (c) 2011-2014 Los Alamos National Security, LLC. All rights
 #                         reserved.
 # Copyright (c) 2014      Intel, Inc. All rights reserved.
-# Copyright (c) 2014      Research Organization for Information Science
+# Copyright (c) 2014-2016 Research Organization for Information Science
 #                         and Technology (RIST). All rights reserved.
 # $COPYRIGHT$
 #
@@ -232,35 +232,26 @@ AC_DEFUN([OPAL_CHECK_PMIX],[
 
     OPAL_VAR_SCOPE_PUSH([pmix_ext_install_dir])
 
-    AC_ARG_WITH([external-pmix],
-                [AC_HELP_STRING([--with-external-pmix(=DIR)],
-                                [Use external PMIx support, optionally adding DIR to the search path (default: no)])],
-                                [], with_external_pmix=no)
+    AC_ARG_WITH([pmix],
+                [AC_HELP_STRING([--with-pmix(=DIR)],
+                                [Build PMIx support.  DIR can take one of three values: "internal", "external", or a valid directory name.  "internal" (or no DIR value) forces Open MPI to use its internal copy of PMIx.  "external" forces Open MPI to use an external installation of PMIx.  Supplying a valid directory name also forces Open MPI to use an external installation of PMIx, and adds DIR/include, DIR/lib, and DIR/lib64 to the search path for headers and libraries. Note that Open MPI does not support --without-pmix.])])
 
-    AC_MSG_CHECKING([if user requested PMIx support])
-    AS_IF([test "$with_external_pmix" = "no"],
+    AS_IF([test "$with_pmix" = "no"],
+          [AC_MSG_WARN([Open MPI requires PMIx support. It can be built])
+           AC_MSG_WARN([with either its own internal copy of PMIx, or with])
+           AC_MSG_WARN([an external copy that you supply.])
+           AC_MSG_ERROR([Cannot continue])])
+
+    AC_MSG_CHECKING([if user requested PMIx support($with_pmix)])
+    AS_IF([test -z "$with_pmix" || test "$with_pmix" = "yes" || test "$with_pmix" = "internal"],
           [AC_MSG_RESULT([no])
            opal_external_pmix_happy="no"],
           [AC_MSG_RESULT([yes])
            # check for external pmix lib */
-           AS_IF([test "$with_external_pmix" == "yes" || test -z "$with_external_pmix"],
+           AS_IF([test "$with_pmix" = "external"],
                  [pmix_ext_install_dir=/usr],
-                 [pmix_ext_install_dir=$with_external_pmix])
-
-           # cannot use check_package because there are
-           # external dependencies to make the headers
-           # build, so just check for presence of header
-           # and library files - these checks will error
-           # out if the files aren't found, which is okay
-           # as we are only executing here if the user
-           # specified external pmix
-           OPAL_CHECK_WITHDIR([external-pmix], [$pmix_ext_install_dir/include], [pmix.h])
-           OPAL_CHECK_WITHDIR([external-libpmix], [$pmix_ext_install_dir/lib], [libpmix.*])
-
-           opal_pmix_ext_CPPFLAGS="-I$pmix_ext_install_dir -I$pmix_ext_install_dir/include -I$pmix_ext_install_dir/include/pmix -I$pmix_ext_install_dir/include/pmix/include"
-           opal_pmix_ext_LDFLAGS="-L$pmix_ext_install_dir/lib"
-           opal_pmix_ext_LIBS="-lpmix"
-           opal_external_pmix_happy="yes"
+                 [pmix_ext_install_dir=$with_pmix])
+           OPAL_CHECK_PACKAGE([opal_pmix_ext], [pmix.h], [pmix], [PMIx_Init], [], [$pmix_ext_install_dir], [], [opal_external_pmix_happy=yes], [])
           ])
     AC_SUBST(opal_pmix_ext_CPPFLAGS)
     AC_SUBST(opal_pmix_ext_LDFLAGS)

opal/mca/pmix/external/pmix_ext.c

@@ -37,7 +37,7 @@
 #include "pmix_ext.h"
 #include "opal/mca/pmix/base/base.h"
 
-#include "pmix_common.h"
+#include <pmix/pmix_common.h>
 
 /****    C.O.M.M.O.N   I.N.T.E.R.F.A.C.E.S     ****/