Skip to content

Commit b063cb6

Browse files
committed
libevent2022: only configure if event:external fails
We know that event:external will be configured first (because of its priority). Take advantage of that here in libevent2022 by having it refuse to configure / politely fail if event:external succeeded. Also print out some additional lines in configure output indicating what is going on (i.e., event:external succeeded, so this component will be skipped, or event:external failed, so this component will be used). Signed-off-by: Jeff Squyres <[email protected]>
1 parent 4e5f432 commit b063cb6

File tree

1 file changed

+16
-1
lines changed

1 file changed

+16
-1
lines changed

opal/mca/event/libevent2022/configure.m4

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# -*- shell-script -*-
22
#
3-
# Copyright (c) 2009-2015 Cisco Systems, Inc. All rights reserved.
3+
# Copyright (c) 2009-2018 Cisco Systems, Inc. All rights reserved.
44
# Copyright (c) 2012-2013 Los Alamos National Security, LLC. All rights reserved.
55
# Copyright (c) 2015 Intel, Inc. All rights reserved.
66
# Copyright (c) 2015-2016 Research Organization for Information Science
@@ -86,6 +86,21 @@ EOF
8686
# [action-if-cant-compile])
8787
# ------------------------------------------------
8888
AC_DEFUN([MCA_opal_event_libevent2022_CONFIG],[
89+
# We know that the external event component will be configured
90+
# before this one because of its priority. This component is only
91+
# needed if the external component was not successful in selecting
92+
# itself.
93+
AC_MSG_CHECKING([if event external component succeeded])
94+
AS_IF([test "$opal_event_external_support" = "yes"],
95+
[AC_MSG_RESULT([yes])
96+
AC_MSG_NOTICE([event:external succeeded, so this component will be skipped])
97+
$2],
98+
[AC_MSG_RESULT([no])
99+
AC_MSG_NOTICE([event:external failed, so this component will be used])
100+
MCA_opal_event_libevent2022_BACKEND_CONFIG($1, $2)])
101+
])
102+
103+
AC_DEFUN([MCA_opal_event_libevent2022_BACKEND_CONFIG],[
89104
OPAL_VAR_SCOPE_PUSH([CFLAGS_save CPPFLAGS_save libevent_file event_args libevent_happy])
90105

91106
AC_CONFIG_FILES([opal/mca/event/libevent2022/Makefile])

0 commit comments

Comments
 (0)