Skip to content

Commit 6b828bd

Browse files
committed
correctly handle --with-hwloc and --with-libevent
fix a typo Signed-off-by: Gilles Gouaillardet <[email protected]>
1 parent 1978ab8 commit 6b828bd

File tree

2 files changed

+26
-26
lines changed

2 files changed

+26
-26
lines changed

opal/mca/event/external/configure.m4

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -143,22 +143,22 @@ AC_DEFUN([MCA_opal_event_external_CONFIG],[
143143
AC_MSG_WARN([thread support enabled])
144144
opal_event_external_support=no])])
145145

146-
AS_IF([test "$opal_event_external_support" = "yes" &&
147-
test -z "$with_libevent"],
148-
[AC_MSG_CHECKING([if external libevent version is 2.0.21 or greater])
149-
AC_COMPILE_IFELSE(
150-
[AC_LANG_PROGRAM([[#include <event.h>]],
151-
[[
146+
AS_IF([test "$opal_event_external_support" = "yes"],
147+
[AS_IF([test -z "$with_libevent" || test "$with_libevent" = "yes"],
148+
[AC_MSG_CHECKING([if external libevent version is 2.0.21 or greater])
149+
AC_COMPILE_IFELSE(
150+
[AC_LANG_PROGRAM([[#include <event.h>]],
151+
[[
152152
#if _EVENT_NUMERIC_VERSION < 0x02001500
153153
#error "libevent API version is less than 0x02001500"
154154
#endif
155-
]])],
156-
[AC_MSG_RESULT([yes])],
157-
[AC_MSG_RESULT([no])
158-
opal_event_summary_msg="internal (external libevent version is less that internal version 2.0.21)"
159-
AC_MSG_WARN([external libevent version is less than internal version (2.0.21)])
160-
AC_MSG_WARN([using internal libevent])
161-
opal_hwloc_external_support=no])])
155+
]])],
156+
[AC_MSG_RESULT([yes])],
157+
[AC_MSG_RESULT([no])
158+
opal_event_summary_msg="internal (external libevent version is less that internal version 2.0.21)"
159+
AC_MSG_WARN([external libevent version is less than internal version (2.0.21)])
160+
AC_MSG_WARN([using internal libevent])
161+
opal_event_external_support=no])])])
162162

163163
CPPFLAGS=$opal_event_external_CPPFLAGS_save
164164
CFLAGS=$opal_event_external_CFLAGS_save

opal/mca/hwloc/external/configure.m4

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -150,22 +150,22 @@ AC_DEFUN([MCA_opal_hwloc_external_CONFIG],[
150150

151151
# If external hwloc is not explicitly requested, check external version
152152
# is not lower than the internal one
153-
AS_IF([test "$opal_hwloc_external_support" = "yes" &&
154-
test -z "$with_hwloc"],
155-
[AC_MSG_CHECKING([if external hwloc version is 2.0 or greater])
156-
AC_COMPILE_IFELSE(
157-
[AC_LANG_PROGRAM([[#include <hwloc.h>]],
158-
[[
153+
AS_IF([test "$opal_hwloc_external_support" = "yes"],
154+
[AS_IF([test -z "$with_hwloc" || test "$with_hwloc" = "yes"],
155+
[AC_MSG_CHECKING([if external hwloc version is 2.0 or greater])
156+
AC_COMPILE_IFELSE(
157+
[AC_LANG_PROGRAM([[#include <hwloc.h>]],
158+
[[
159159
#if HWLOC_API_VERSION < 0x00020000
160160
#error "hwloc API version is less than 0x00020000"
161161
#endif
162-
]])],
163-
[AC_MSG_RESULT([yes])],
164-
[AC_MSG_RESULT([no])
165-
opal_hwloc_summary_msg="internal (external hlwoc version is less than internal version 2.0)"
166-
AC_MSG_WARN([external hwloc version is less than internal version 2.0])
167-
AC_MSG_WARN([using internal hwloc])
168-
opal_hwloc_external_support=no])])
162+
]])],
163+
[AC_MSG_RESULT([yes])],
164+
[AC_MSG_RESULT([no])
165+
opal_hwloc_summary_msg="internal (external hlwoc version is less than internal version 2.0)"
166+
AC_MSG_WARN([external hwloc version is less than internal version 2.0])
167+
AC_MSG_WARN([using internal hwloc])
168+
opal_hwloc_external_support=no])])])
169169

170170
AS_IF([test "$opal_hwloc_external_support" = "yes"],
171171
[AC_DEFINE_UNQUOTED([HWLOC_EXTERNAL_HWLOC_VERSION],

0 commit comments

Comments
 (0)