From 7a55d49ca78bcc157749c04027515f12b026ec33 Mon Sep 17 00:00:00 2001
From: Gilles Gouaillardet <gilles.gouaillardet@iferc.org>
Date: Tue, 21 Oct 2014 19:13:19 +0900
Subject: [PATCH] configury: per RFC, remove the --with-threads option

---
 config/opal_config_threads.m4 | 98 +++++++----------------------------
 1 file changed, 20 insertions(+), 78 deletions(-)

diff --git a/config/opal_config_threads.m4 b/config/opal_config_threads.m4
index ca1f1efc07..af5b2d8467 100644
--- a/config/opal_config_threads.m4
+++ b/config/opal_config_threads.m4
@@ -12,6 +12,8 @@ dnl                         All rights reserved.
 dnl Copyright (c) 2010      Cisco Systems, Inc.  All rights reserved.
 dnl Copyright (c) 2009-2011 Oak Ridge National Labs.  All rights reserved.
 dnl Copyright (c) 2014      Intel, Inc. All rights reserved
+dnl Copyright (c) 2015      Research Organization for Information Science
+dnl                         and Technology (RIST). All rights reserved.
 dnl $COPYRIGHT$
 dnl 
 dnl Additional copyrights may follow
@@ -50,88 +52,28 @@ export HAVE_POSIX_THREADS
 #
 # Ask what threading we want (allow posix right now)
 #
-AC_MSG_CHECKING([for type of thread support])
-AC_ARG_WITH(threads, 
-  	AC_HELP_STRING([--with-threads],
-		       [Set thread type (posix)]),
-	[THREAD_TYPE=$withval])
 
-if test "$THREAD_TYPE" = "posix"; then
-
-    if test "$HAVE_POSIX_THREADS" = "0"; then
-	AC_MSG_WARN(["*** You have chosen POSIX threads, which are not"])
-	AC_MSG_WARN(["*** available on your system "])
-	AC_MSG_ERROR(["*** Can not continue"])
-    fi
-elif test "$THREAD_TYPE" = "no"; then
-    THREAD_TYPE="none"
-elif test -z "$THREAD_TYPE" -o "$THREAD_TYPE" = "yes"; then
-
-    if test "$HAVE_POSIX_THREADS" = "1"; then
-	THREAD_TYPE="posix"
-    else
-	THREAD_TYPE="none found"
-    fi
-else
-
-    AC_MSG_WARN(["*** You have specified a thread type that I do not"])
-    AC_MSG_WARN(["*** understand.  Valid options are posix"])
-    AC_MSG_ERROR(["*** Can not continue."])
-fi
-AC_MSG_RESULT($THREAD_TYPE)
-
-
-#
-# Ok, now run the configuration for that thread package.
-#
-# Blah - this should be made better, but I don't know how...
-#
-if test "$THREAD_TYPE" = "posix"; then
-    AC_DEFINE(OPAL_HAVE_POSIX_THREADS, 1)
-
-    THREAD_CFLAGS="$PTHREAD_CFLAGS"
-    THREAD_FCFLAGS="$PTHREAD_FCFLAGS"
-    THREAD_CXXFLAGS="$PTHREAD_CXXFLAGS"
-    THREAD_CPPFLAGS="$PTHREAD_CPPFLAGS"
-    THREAD_CXXCPPFLAGS="$PTHREAD_CXXCPPFLAGS"
-    THREAD_LDFLAGS="$PTHREAD_LDFLAGS"
-    THREAD_LIBS="$PTHREAD_LIBS"
-
-    OPAL_CHECK_PTHREAD_PIDS
-else
-    AC_DEFINE(OPAL_HAVE_POSIX_THREADS, 0)
-
-    THREAD_CFLAGS=
-    THREAD_FCFLAGS=
-    THREAD_CXXFLAGS=
-    THREAD_CPPFLAGS=
-    THREAD_CXXCPPFLAGS=
-    THREAD_LDFLAGS=
-    THREAD_LIBS=
-    if test "$THREAD_TYPE" != "none" ; then
-        cat <<EOF
-
-************************************************************************
-
-Open MPI was unable to find threading support on your system.  The
-OMPI development team is considering requiring threading support for
-proper OMPI execution.  This is in part because we are not aware of
-any OpenFabrics users that do not have thread support -- so we need
-you to e-mail the Open MPI Users mailing list to tell us if this is a
-problem for you.
-
-************************************************************************
-
-EOF
-    fi
+if test "$HAVE_POSIX_THREADS" = "0"; then
+    AC_MSG_WARN(["*** POSIX threads are not"])
+    AC_MSG_WARN(["*** available on your system "])
+    AC_MSG_ERROR(["*** Can not continue"])
 fi
 
-AM_CONDITIONAL(OPAL_HAVE_POSIX_THREADS, test "$THREAD_TYPE" = "posix")
+AC_DEFINE(OPAL_HAVE_POSIX_THREADS, 1)
+
+THREAD_CFLAGS="$PTHREAD_CFLAGS"
+THREAD_FCFLAGS="$PTHREAD_FCFLAGS"
+THREAD_CXXFLAGS="$PTHREAD_CXXFLAGS"
+THREAD_CPPFLAGS="$PTHREAD_CPPFLAGS"
+THREAD_CXXCPPFLAGS="$PTHREAD_CXXCPPFLAGS"
+THREAD_LDFLAGS="$PTHREAD_LDFLAGS"
+THREAD_LIBS="$PTHREAD_LIBS"
+
+OPAL_CHECK_PTHREAD_PIDS
+
+THREAD_TYPE = "posix"
+AM_CONDITIONAL(OPAL_HAVE_POSIX_THREADS, 1)
 
-# Make sure we have threads
-if test "$THREAD_TYPE" = "none" ; then
-    AC_MSG_ERROR([User requested MPI threads, but no threading model supported])
-fi
 AC_DEFINE_UNQUOTED([OPAL_ENABLE_MULTI_THREADS], [1],
                    [Whether we should enable thread support within the OPAL code base])