Merge pull request #9955 from awlauria/fix_some_misc_build_stuff

Fix some misc build stuff

Author: awlauria

autogen.pl

@@ -1409,6 +1409,13 @@ sub replace_config_sub_guess {
 ++$step;
 verbose "\n$step. Checking for git submodules\n\n";
 
+my @enabled_3rdparty_packages = ();
+my @disabled_3rdparty_packages = split(/,/, $no_3rdparty_arg);
+if ($no_prrte_arg) {
+    push(@disabled_3rdparty_packages, "prrte");
+}
+
+
 # Make sure we got a submodule-full clone.  If not, abort and let a
 # human figure it out.
 if (-f ".gitmodules") {
@@ -1423,6 +1430,14 @@ sub replace_config_sub_guess {
         my $extra      = $4;
 
         print("=== Submodule: $path\n");
+        if (index($path, "pmix") != -1 and list_contains("pmix", @disabled_3rdparty_packages)) {
+          print("Disabled - skipping openpmix");
+          next;
+        }
+        if (index($path, "prrte") != -1 and list_contains("prrte", @disabled_3rdparty_packages)) {
+          print("Disabled - skipping prrte");
+          next;
+        }
 
         # Make sure the submodule is there
         if ($status eq "-") {
@@ -1588,12 +1603,6 @@ sub replace_config_sub_guess {
 ++$step;
 verbose "\n$step. Setup for 3rd-party packages\n";
 
-my @enabled_3rdparty_packages = ();
-my @disabled_3rdparty_packages = split(/,/, $no_3rdparty_arg);
-if ($no_prrte_arg) {
-    push(@disabled_3rdparty_packages, "prrte");
-}
-
 $m4 .= "\n$dnl_line
 $dnl_line
 $dnl_line

config/opal_config_hwloc.m4

@@ -106,7 +106,9 @@ AC_DEFUN([OPAL_CONFIG_HWLOC], [
     OPAL_3RDPARTY_EXTRA_DIST="$OPAL_3RDPARTY_EXTRA_DIST hwloc_tarball"
     OPAL_3RDPARTY_DISTCLEAN_DIRS="$OPAL_3RDPARTY_DISTCLEAN_DIRS hwloc_directory"
 
+    AC_SUBST(opal_hwloc_CPPFLAGS)
     AC_SUBST(opal_hwloc_LIBS)
+    AC_SUBST(opal_hwloc_LDFLAGS)
 
     OPAL_SUMMARY_ADD([[Miscellaneous]], [[hwloc]], [hwloc], [$opal_hwloc_mode])
 

config/opal_config_libevent.m4

@@ -118,7 +118,9 @@ AC_DEFUN([OPAL_CONFIG_LIBEVENT], [
     OPAL_3RDPARTY_EXTRA_DIST="$OPAL_3RDPARTY_EXTRA_DIST libevent_tarball"
     OPAL_3RDPARTY_DISTCLEAN_DIRS="$OPAL_3RDPARTY_DISTCLEAN_DIRS libevent_directory"
 
+    AC_SUBST(opal_libevent_CPPFLAGS)
     AC_SUBST(opal_libevent_LIBS)
+    AC_SUBST(opal_libevent_LDFLAGS)
 
     OPAL_SUMMARY_ADD([[Miscellaneous]],[[libevent]],[libevent], [$opal_libevent_mode])
 

config/opal_config_pmix.m4

@@ -152,7 +152,7 @@ AC_DEFUN([OPAL_CONFIG_PMIX], [
     AS_IF([test "$opal_pmix_mode" = "internal"],
           [pkg_config_file="${OMPI_TOP_BUILDDIR}/3rd-party/openpmix/maint/pmix.pc"
            PKG_CONFIG_PATH="${OMPI_TOP_BUILDDIR}/3rd-party/openpmix/maint:${PKG_CONFIG_PATH}"],
-          [test -n "$with_hwloc"],
+          [test -n "$with_pmix"],
           [pkg_config_file="${with_pmix}/lib/pkgconfig/pmix.pc"
            PKG_CONFIG_PATH="${with_pmix}/lib/pkgconfig:${PKG_CONFIG_PATH}"],
           [pkg_config_file="pmix"])