threads: configury updates for argo and qthreads

The OAC_CHECK_PACKAGE macro doesn't have quite the same
functionality as the origina ?OPAL_CHECK_PACKAGE? macro,
so add some sed magic to get the path we need for
argo/qthread related header files.

related to open-mpi#10459

Signed-off-by: Howard Pritchard <[email protected]>

Author: hppritcha

opal/mca/threads/argobots/configure.m4

@@ -14,7 +14,7 @@
 # Copyright (c) 2015      Research Organization for Information Science
 #                         and Technology (RIST). All rights reserved.
 # Copyright (c) 2019      Sandia National Laboratories.  All rights reserved.
-# Copyright (c) 2019      Triad National Security, LLC. All rights
+# Copyright (c) 2019-2022 Triad National Security, LLC. All rights
 #                         Reserved.
 # Copyright (c) 2021      Argonne National Laboratory.  All rights reserved.
 # $COPYRIGHT$
@@ -56,8 +56,10 @@ AC_DEFUN([OPAL_CONFIG_ARGOBOTS_THREADS],[
 
     AS_IF([test $opal_argo_happy = yes && test $opal_argo11_happy = no],
           [AC_MSG_ERROR([Open MPI requires Argobots 1.1 or newer.])])
-    AS_IF([test $opal_argo_happy = yes && test $opal_argo11_happy = yes && test -n "$opal_argo_dir"],
-          [OPAL_ARGO_INCLUDE_PATH="$opal_argo_dir/include/"],
+dnl extract the fully qualified include path from the opal_argo_CPPFLAGS variable
+dnl for use in threads_argobots.h
+    AS_IF([test $opal_argo_happy = yes && test $opal_argo11_happy = yes],
+          [OPAL_ARGO_INCLUDE_PATH=`echo "${opal_argo_CPPFLAGS}/" | sed -e 's/\-I//g' | sed -e 's/ //g'`],
           [OPAL_ARGO_INCLUDE_PATH=""])
 
     AS_IF([test $opal_argo_happy = yes],

opal/mca/threads/qthreads/configure.m4

@@ -13,7 +13,7 @@
 # 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) 2019      Triad National Security, LLC. All rights
+# Copyright (c) 2019-2022 Triad National Security, LLC. All rights
 #                         reserved.
 #
 # $COPYRIGHT$
@@ -45,8 +45,10 @@ AC_DEFUN([OPAL_CONFIG_QTHREADS],[
                       [opal_qthreads_happy=yes],
                       [opal_qthreads_happy=no])
 
-    AS_IF([test $opal_qthreads_happy = yes && test -n "$opal_qthreads_dir"],
-          [OPAL_QTHREADS_INCLUDE_PATH="$opal_qthreads_dir/include/"],
+dnl extract the fully qualified include path from the opal_qthreads_CPPFLAGS variable
+dnl for use in threads_qthreads.h
+    AS_IF([test $opal_qthreads_happy = yes],
+          [OPAL_QTHREADS_INCLUDE_PATH=`echo "${opal_qthreads_CPPFLAGS}/" | sed -e 's/\-I//g' | sed -e 's/ //g'`],
           [OPAL_QTHREADS_INCLUDE_PATH=""])
 
     AS_IF([test $opal_qthreads_happy = yes],