From 9d6a4b3b2de99dc5a4efa4df3ea6da83e24396d2 Mon Sep 17 00:00:00 2001 From: Boris Karasev Date: Thu, 4 Aug 2016 16:15:40 +0600 Subject: [PATCH] configury/libevent: fix incorrect drop of OPAL_HAVE_WORKING_EVENTOPS Fixes PR https://github.com/open-mpi/ompi/pull/1687 The code that sets OPAL_HAVE_WORKING_EVENTOPS for internal libevent was executed even if the external libevent component was configured. As the result libevent progress wasn't called in opal_progress which for example caused ring_c to hang when pml/ob1 was used. --- opal/mca/event/libevent2022/configure.m4 | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/opal/mca/event/libevent2022/configure.m4 b/opal/mca/event/libevent2022/configure.m4 index 5ace9dc57d6..4db7ae77696 100644 --- a/opal/mca/event/libevent2022/configure.m4 +++ b/opal/mca/event/libevent2022/configure.m4 @@ -190,13 +190,15 @@ AC_DEFUN([MCA_opal_event_libevent2022_CONFIG],[ AS_IF([test "$with_libevent" != "internal" && test -n "$with_libevent" && test "$with_libevent" != "yes"], [AC_MSG_WARN([using an external libevent; disqualifying this component]) - libevent_happy=no]) - - AS_IF([test "$libevent_happy" = "yes" && test -r $libevent_file], - [OPAL_HAVE_WORKING_EVENTOPS=`grep HAVE_WORKING_EVENTOPS $libevent_file | awk '{print [$]3 }'` - $1], - [$2 - OPAL_HAVE_WORKING_EVENTOPS=0]) + libevent_happy=no], + + [AS_IF([test "$libevent_happy" = "yes" && test -r $libevent_file], + [OPAL_HAVE_WORKING_EVENTOPS=`grep HAVE_WORKING_EVENTOPS $libevent_file | awk '{print [$]3 }'` + $1], + [$2 + OPAL_HAVE_WORKING_EVENTOPS=0]) + ] + ) OPAL_VAR_SCOPE_POP ])