Merge pull request #6365 from rhc54/topic/pcfg

Update PMIx configure logic and gitignore

.gitignore

@@ -199,6 +199,8 @@ ompi/mca/rte/orte/mpirun.1
 
 ompi/mca/sharedfp/addproc/mca_sharedfp_addproc_control
 
+ompi/mca/topo/treematch/config.h
+
 ompi/mpi/c/profile/p*.c
 
 ompi/mpi/fortran/configure-fortran-output.h

opal/mca/pmix/pmix4x/configure.m4

@@ -37,10 +37,6 @@ AC_DEFUN([MCA_opal_pmix_pmix4x_CONFIG],[
     opal_pmix_pmix4x_save_LDFLAGS=$LDFLAGS
     opal_pmix_pmix4x_save_LIBS=$LIBS
 
-    AC_ARG_ENABLE([install-libpmix],
-                  [AC_HELP_STRING([--enable-install-libpmix],
-                                  [Enable a native PMIx library and headers in the OMPI install location (default: disabled)])])
-
     AC_ARG_ENABLE([pmix-timing],
                   [AC_HELP_STRING([--enable-pmix-timing],
                                   [Enable PMIx timing measurements (default: disabled)])])
@@ -53,17 +49,12 @@ AC_DEFUN([MCA_opal_pmix_pmix4x_CONFIG],[
         opal_pmix_pmix4x_timing_flag=--disable-pmix-timing
     fi
 
-    opal_pmix_pmix4x_args="$opal_pmix_pmix4x_timing_flag --without-tests-examples --disable-pmix-binaries --disable-pmix-backward-compatibility --disable-visibility --enable-embedded-libevent --with-libevent-header=\\\"opal/mca/event/$opal_event_base_include\\\" --enable-embedded-hwloc --with-hwloc-header=\\\"$opal_hwloc_base_include\\\""
+    opal_pmix_pmix4x_args="$opal_pmix_pmix4x_timing_flag --without-tests-examples --with-pmix-symbol-rename=OPAL_MCA_PMIX4X_ --disable-pmix-binaries --disable-pmix-backward-compatibility --disable-visibility --enable-embedded-mode --with-libevent-header=\\\"opal/mca/event/$opal_event_base_include\\\" --with-hwloc-header=\\\"$opal_hwloc_base_include\\\""
     AS_IF([test "$enable_debug" = "yes"],
           [opal_pmix_pmix4x_args="--enable-debug $opal_pmix_pmix4x_args"
            CFLAGS="$OPAL_CFLAGS_BEFORE_PICKY $OPAL_VISIBILITY_CFLAGS -g"],
           [opal_pmix_pmix4x_args="--disable-debug $opal_pmix_pmix4x_args"
            CFLAGS="$OPAL_CFLAGS_BEFORE_PICKY $OPAL_VISIBILITY_CFLAGS"])
-    AC_MSG_CHECKING([if want to install standalone libpmix])
-    AS_IF([test "$enable_install_libpmix" = "yes"],
-          [AC_MSG_RESULT([yes])],
-          [AC_MSG_RESULT([no])
-           opal_pmix_pmix4x_args="--with-pmix-symbol-rename=OPAL_MCA_PMIX4X_ --enable-embedded-mode $opal_pmix_pmix4x_args"])
     AS_IF([test "$with_devel_headers" = "yes"],
           [opal_pmix_pmix4x_args="--with-devel-headers  $opal_pmix_pmix4x_args"])
     CPPFLAGS="-I$OPAL_TOP_SRCDIR -I$OPAL_TOP_BUILDDIR -I$OPAL_TOP_SRCDIR/opal/include -I$OPAL_TOP_BUILDDIR/opal/include $CPPFLAGS"

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

@@ -17,11 +17,7 @@ AC_DEFUN([PMIX_HWLOC_CONFIG],[
                 [AC_HELP_STRING([--with-hwloc-header=HEADER],
                                 [The value that should be included in C files to include hwloc.h])])
 
-    AC_ARG_ENABLE([embedded-hwloc],
-                  [AC_HELP_STRING([--enable-embedded-hwloc],
-                                  [Enable use of locally embedded hwloc])])
-
-    AS_IF([test "$enable_embedded_hwloc" = "yes"],
+    AS_IF([test "$pmix_mode" = "embedded"],
           [_PMIX_HWLOC_EMBEDDED_MODE],
           [_PMIX_HWLOC_EXTERNAL])
 

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

@@ -19,11 +19,7 @@ AC_DEFUN([PMIX_LIBEVENT_CONFIG],[
                 [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"],
+    AS_IF([test "$pmix_mode" = "embedded"],
           [_PMIX_LIBEVENT_EMBEDDED_MODE],
           [_PMIX_LIBEVENT_EXTERNAL])