From cee5a75d198db0757a91dc5c9352fab70e5aa710 Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Mon, 11 Jun 2012 20:52:28 +0000 Subject: [PATCH] Revert the default configuration to no orte progress thread and no libevent thread support until we can get more of the kinks ironed out. This commit was SVN r26593. --- opal/mca/event/libevent2019/configure.m4 | 8 ++++---- orte/config/orte_configure_options.m4 | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/opal/mca/event/libevent2019/configure.m4 b/opal/mca/event/libevent2019/configure.m4 index 357916481a..7e5203d825 100644 --- a/opal/mca/event/libevent2019/configure.m4 +++ b/opal/mca/event/libevent2019/configure.m4 @@ -94,13 +94,13 @@ AC_DEFUN([MCA_opal_event_libevent2019_CONFIG],[ AC_ARG_ENABLE(event-thread-support, AC_HELP_STRING([--enable-event-thread-support], [enable event library internal thread support])) - if test "$enable_event_thread_support" = "no"; then + if test "$enable_event_thread_support" = "yes"; then + AC_DEFINE_UNQUOTED(OPAL_EVENT_HAVE_THREAD_SUPPORT, 1, + [Thread support was configured into the event library]) + else event_args="$event_args --disable-thread-support" AC_DEFINE_UNQUOTED(OPAL_EVENT_HAVE_THREAD_SUPPORT, 0, [Thread support was not configured into the event library]) - else - AC_DEFINE_UNQUOTED(OPAL_EVENT_HAVE_THREAD_SUPPORT, 1, - [Thread support was configured into the event library]) fi AM_CONDITIONAL(OPAL_EVENT_HAVE_THREAD_SUPPORT, test "$enable_event_thread_support" = "yes") diff --git a/orte/config/orte_configure_options.m4 b/orte/config/orte_configure_options.m4 index 6198d4b238..4387f8cc08 100644 --- a/orte/config/orte_configure_options.m4 +++ b/orte/config/orte_configure_options.m4 @@ -118,17 +118,17 @@ AC_DEFINE_UNQUOTED([ORTE_ENABLE_HEARTBEAT], AC_MSG_CHECKING([if want orte progress threads]) AC_ARG_ENABLE([orte-progress-threads], [AC_HELP_STRING([--enable-orte-progress-threads], - [Enable orte progress thread - for experiment by developers only! (default: enabled)])]) -if test "$enable_orte_progress_threads" = "no"; then - AC_MSG_RESULT([no]) - orte_enable_progress_threads=0 - require_event_thread_support=0 -else + [Enable orte progress thread - for experiment by developers only! (default: disabled)])]) +if test "$enable_orte_progress_threads" = "yes"; then AC_MSG_RESULT([yes]) orte_enable_progress_threads=1 require_event_thread_support=1 AC_DEFINE_UNQUOTED(OPAL_EVENT_HAVE_THREAD_SUPPORT, 1, [Thread support must be configured into the event library]) +else + AC_MSG_RESULT([no]) + orte_enable_progress_threads=0 + require_event_thread_support=0 fi AC_DEFINE_UNQUOTED([ORTE_ENABLE_PROGRESS_THREADS], [$orte_enable_progress_threads],