Merge pull request #5 from shintaro-iwasaki/threads-squash-rebase-con…

…figfix Minor fix of configury
npe9 · Feb 14, 2019 · e5791f9 · e5791f9
2 parents 026bb89 + de2b838
commit e5791f9
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/config/opal_config_argobots.m4 b/config/opal_config_argobots.m4
@@ -19,17 +19,19 @@ dnl Additional copyrights may follow
 dnl
 dnl $HEADER$
 dnl
-dnl OPAL_CONFIG_ARGOBOT_THREADS()
+dnl OPAL_CONFIG_ARGOBOTS_THREADS()
 dnl
-dnl Configure argobot threads, setting the following variables (but
+dnl Configure Argobots threads, setting the following variables (but
 dnl  not calling AC_SUBST on them).
 
-#********************************************************************
-#
-# TODO: work in progress
-#
-#********************************************************************
-AC_DEFUN([OPAL_CONFIG_ARGOBOT_THREADS],[
-    AC_REQUIRE([AC_PROG_GREP])
-    [$2]
+AC_DEFUN([OPAL_CONFIG_ARGOBOTS_THREADS],[
+    AC_CHECK_HEADERS([abt.h],
+                     [AC_CHECK_LIB([abt],[ABT_init],
+                                    [threads_argobots_happy="yes"],
+                                    [threads_argobots_happy="no"])],
+                     [threads_argobots_happy="no"])
+
+    AS_IF([test "$threads_argobots_happy" = "yes"],
+          [$1],
+          [$2])
 ])dnl
diff --git a/config/opal_config_threads.m4 b/config/opal_config_threads.m4
@@ -63,16 +63,16 @@ AS_IF([test -z "$with_threads" || test "$with_threads" = "pthreads" || test "$wi
 #
 # see if argobots is called for
 #
-AS_IF([test -z "$thread_type_found" && test "$with_threads" = argobots"],
-      [OPAL_CONFIG_ARGOBOT_THREADS(HAVE_THREAD_PKG=1, HAVE_THREAD_PKG=0)
+AS_IF([test -z "$thread_type_found" && test "$with_threads" = "argobots"],
+      [OPAL_CONFIG_ARGOBOTS_THREADS(HAVE_THREAD_PKG=1, HAVE_THREAD_PKG=0)
        AC_MSG_CHECKING([for working ARGOBOTS threads package])
        AS_IF([test "$HAVE_THREAD_PKG" = "1"],
              [AC_MSG_RESULT([yes])
               thread_type_found="argobots"],
              [AC_MSG_RESULT([no])])],
       [])
 
-AS_IF([test -z "$thread_type_found" && test "$with_threads" = qthreads"],
+AS_IF([test -z "$thread_type_found" && test "$with_threads" = "qthreads"],
       [OPAL_CONFIG_QTHREADS(HAVE_THREAD_PKG=1, HAVE_THREAD_PKG=0)
        AC_MSG_CHECKING([for working Qthreads package])
        AS_IF([test "$HAVE_THREAD_PKG" = "1"],