Skip to content

Commit b205039

Browse files
committed
event/external: fix version requirement
Only default to the external component if its version is greater or equal than the internal libevent (2.0.22) Signed-off-by: Gilles Gouaillardet <gilles@rist.or.jp>
1 parent 35e77a2 commit b205039

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

opal/mca/event/external/configure.m4

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -137,18 +137,20 @@ AC_DEFUN([MCA_opal_event_external_CONFIG],[
137137

138138
AS_IF([test "$opal_event_external_support" = "yes"],
139139
[AS_IF([test -z "$with_libevent" || test "$with_libevent" = "yes"],
140-
[AC_MSG_CHECKING([if external libevent version is 2.0.21 or greater])
140+
[AC_MSG_CHECKING([if external libevent version is 2.0.22 or greater])
141141
AC_COMPILE_IFELSE(
142-
[AC_LANG_PROGRAM([[#include <event.h>]],
142+
[AC_LANG_PROGRAM([[#include <event2/event.h>]],
143143
[[
144-
#if _EVENT_NUMERIC_VERSION < 0x02001500
145-
#error "libevent API version is less than 0x02001500"
144+
#if defined(_EVENT_NUMERIC_VERSION) && _EVENT_NUMERIC_VERSION < 0x02001600
145+
#error "libevent API version is less than 0x02001600"
146+
#elif defined(EVENT__NUMERIC_VERSION) && EVENT__NUMERIC_VERSION < 0x02001600
147+
#error "libevent API version is less than 0x02001600"
146148
#endif
147149
]])],
148150
[AC_MSG_RESULT([yes])],
149151
[AC_MSG_RESULT([no])
150-
opal_event_summary_msg="internal (external libevent version is less that internal version 2.0.21)"
151-
AC_MSG_WARN([external libevent version is less than internal version (2.0.21)])
152+
opal_event_summary_msg="internal (external libevent version is less that internal version 2.0.22)"
153+
AC_MSG_WARN([external libevent version is less than internal version (2.0.22)])
152154
AC_MSG_WARN([using internal libevent])
153155
opal_event_external_support=no])])])
154156

0 commit comments

Comments
 (0)