Update again and hope to fix the integration points

Signed-off-by: Ralph Castain <[email protected]>

Author: rhc54

config/ompi_setup_prrte.m4

@@ -62,32 +62,37 @@ AC_DEFUN([OMPI_SETUP_PRRTE],[
     if test "$enable_internal_rte" != "no"; then
         AC_MSG_RESULT([yes])
         ompi_want_prrte=yes
-        opal_prrte_extra_ldflags=
         opal_prrte_extra_libs=$OMPI_TOP_BUILDDIR/opal/libopen-pal.la
         opal_prrte_extra_ltlibs=$OMPI_TOP_BUILDDIR/opal/libopen-pal.la
 
         if test -z $with_libevent || test "$with_libevent" = "internal" || test "$with_libevent" = "yes"; then
             opal_prrte_libevent_arg="--with-libevent-header=$OMPI_TOP_SRCDIR/opal/mca/event/event.h"
-        elif test "$with_libevent" = "external"; then
-            opal_prrte_libevent_arg=""
         else
-            opal_prrte_libevent_arg="--with-libevent=$with_libevent"
+            if test "$with_libevent" = "external"; then
+                opal_prrte_libevent_arg="--with-libevent"
+            else
+                opal_prrte_libevent_arg="--with-libevent=$with_libevent"
+            fi
         fi
 
         if test -z $with_hwloc || test "$with_hwloc" = "internal" || test "$with_hwloc" = "yes"; then
                opal_prrte_hwloc_arg="--with-hwloc-header=$OMPI_TOP_SRCDIR/opal/mca/hwloc/hwloc-internal.h"
-        elif test "$with_hwloc" = "external"; then
-            opal_prrte_hwloc_arg=""
         else
-            opal_prrte_hwloc_arg="--with-hwloc=$with_hwloc"
+            if test "$with_hwloc" = "external"; then
+                opal_prrte_hwloc_arg="--with-hwloc"
+            else
+                opal_prrte_hwloc_arg="--with-hwloc=$with_hwloc"
+            fi
         fi
 
         if test -z $with_pmix || test "$with_pmix" = "internal" || test "$with_pmix" = "yes"; then
             opal_prrte_pmix_arg="--with-pmix-header=$OMPI_TOP_SRCDIR/opal/mca/pmix/pmix-internal.h"
-        elif test "$with_pmix" = "external"; then
-            opal_prrte_pmix_arg=""
         else
-            opal_prrte_pmix_arg="--with-pmix=$with_pmix"
+            if test "$with_pmix" = "external"; then
+                opal_prrte_pmix_arg="--with-pmix"
+            else
+                opal_prrte_pmix_arg="--with-pmix=$with_pmix"
+            fi
         fi
 
         if test -z $enable_prte_prefix_by_default || test "$enable_prte_prefix_by_default" = "yes" ||
@@ -109,11 +114,7 @@ AC_DEFUN([OMPI_SETUP_PRRTE],[
             opal_prrte_args="$opal_prrte_args --with-platform=$with_prrte_platform"
         fi
         # add the extra libs
-        if test "x$opal_prrte_extra_ldflags" != "x"; then
-            opal_prrte_args="$opal_prrte_args --with-prrte-extra-ldflags=\"$opal_prrte_extra_ldflags\" --with-prrte-extra-lib=\"$opal_prrte_extra_libs\" --with-prrte-extra-ltlib=\"$opal_prrte_extra_ltlibs\""
-        else
-            opal_prrte_args="$opal_prrte_args --with-prrte-extra-lib=\"$opal_prrte_extra_libs\" --with-prrte-extra-ltlib=\"$opal_prrte_extra_ltlibs\""
-        fi
+        opal_prrte_args="$opal_prrte_args --with-prrte-extra-lib=\"$opal_prrte_extra_libs\" --with-prrte-extra-ltlib=\"$opal_prrte_extra_ltlibs\""
 
         AC_MSG_CHECKING([final prrte configure args])
         AC_MSG_RESULT([$opal_prrte_args])

config/opal_config_asm.m4

@@ -18,6 +18,7 @@ dnl                         reserved.
 dnl Copyright (c) 2017      Amazon.com, Inc. or its affiliates.  All Rights
 dnl                         reserved.
 dnl Copyright (c) 2020      Google, LLC. All rights reserved.
+dnl Copyright (c) 2020      Intel, Inc.  All rights reserved.
 dnl $COPYRIGHT$
 dnl
 dnl Additional copyrights may follow
@@ -833,7 +834,7 @@ AC_DEFUN([OPAL_CHECK_ASM_GNU_STACKEXEC], [
 int testfunc() {return 0; }
 EOF
              OPAL_LOG_COMMAND([$CC $CFLAGS -c conftest.c -o conftest.$OBJEXT],
-                 [$OBJDUMP -x conftest.$OBJEXT | $GREP '\.note\.GNU-stack' > /dev/null && opal_cv_asm_gnu_stack_result=yes],
+                 [$OBJDUMP -x conftest.$OBJEXT 2>&1 | $GREP '\.note\.GNU-stack' &> /dev/null && opal_cv_asm_gnu_stack_result=yes],
                  [OPAL_LOG_MSG([the failed program was:], 1)
                   OPAL_LOG_FILE([conftest.c])
                   opal_cv_asm_gnu_stack_result=no])