correctly handle --with-hwloc and --with-libevent

fix a typo

Signed-off-by: Gilles Gouaillardet <[email protected]>

Author: ggouaillardet

opal/mca/event/external/configure.m4

@@ -143,22 +143,22 @@ AC_DEFUN([MCA_opal_event_external_CONFIG],[
                                 AC_MSG_WARN([thread support enabled])
                                 opal_event_external_support=no])])
 
-           AS_IF([test "$opal_event_external_support" = "yes" &&
-                  test -z "$with_libevent"],
-                 [AC_MSG_CHECKING([if external libevent version is 2.0.21 or greater])
-                  AC_COMPILE_IFELSE(
-                      [AC_LANG_PROGRAM([[#include <event.h>]],
-                          [[
+           AS_IF([test "$opal_event_external_support" = "yes"],
+                 [AS_IF([test -z "$with_libevent" || test "$with_libevent" = "yes"],
+                        [AC_MSG_CHECKING([if external libevent version is 2.0.21 or greater])
+                         AC_COMPILE_IFELSE(
+                             [AC_LANG_PROGRAM([[#include <event.h>]],
+                                 [[
 #if _EVENT_NUMERIC_VERSION < 0x02001500
 #error "libevent API version is less than 0x02001500"
 #endif
-                          ]])],
-                      [AC_MSG_RESULT([yes])],
-                      [AC_MSG_RESULT([no])
-                       opal_event_summary_msg="internal (external libevent version is less that internal version 2.0.21)"
-                       AC_MSG_WARN([external libevent version is less than internal version (2.0.21)])
-                       AC_MSG_WARN([using internal libevent])
-                       opal_hwloc_external_support=no])])
+                                 ]])],
+                             [AC_MSG_RESULT([yes])],
+                             [AC_MSG_RESULT([no])
+                              opal_event_summary_msg="internal (external libevent version is less that internal version 2.0.21)"
+                              AC_MSG_WARN([external libevent version is less than internal version (2.0.21)])
+                              AC_MSG_WARN([using internal libevent])
+                              opal_event_external_support=no])])])
 
            CPPFLAGS=$opal_event_external_CPPFLAGS_save
            CFLAGS=$opal_event_external_CFLAGS_save

opal/mca/hwloc/external/configure.m4

@@ -150,22 +150,22 @@ AC_DEFUN([MCA_opal_hwloc_external_CONFIG],[
 
            # If external hwloc is not explicitly requested, check external version
            # is not lower than the internal one
-           AS_IF([test "$opal_hwloc_external_support" = "yes" &&
-                  test -z "$with_hwloc"],
-                 [AC_MSG_CHECKING([if external hwloc version is 2.0 or greater])
-                  AC_COMPILE_IFELSE(
-                      [AC_LANG_PROGRAM([[#include <hwloc.h>]],
-                          [[
+           AS_IF([test "$opal_hwloc_external_support" = "yes"],
+                 [AS_IF([test -z "$with_hwloc" || test "$with_hwloc" = "yes"],
+                        [AC_MSG_CHECKING([if external hwloc version is 2.0 or greater])
+                         AC_COMPILE_IFELSE(
+                             [AC_LANG_PROGRAM([[#include <hwloc.h>]],
+                                 [[
 #if HWLOC_API_VERSION < 0x00020000
 #error "hwloc API version is less than 0x00020000"
 #endif
-                          ]])],
-                      [AC_MSG_RESULT([yes])],
-                      [AC_MSG_RESULT([no])
-                       opal_hwloc_summary_msg="internal (external hlwoc version is less than internal version 2.0)"
-                       AC_MSG_WARN([external hwloc version is less than internal version 2.0])
-                       AC_MSG_WARN([using internal hwloc])
-                       opal_hwloc_external_support=no])])
+                                 ]])],
+                             [AC_MSG_RESULT([yes])],
+                             [AC_MSG_RESULT([no])
+                              opal_hwloc_summary_msg="internal (external hlwoc version is less than internal version 2.0)"
+                              AC_MSG_WARN([external hwloc version is less than internal version 2.0])
+                              AC_MSG_WARN([using internal hwloc])
+                              opal_hwloc_external_support=no])])])
 
            AS_IF([test "$opal_hwloc_external_support" = "yes"],
                  [AC_DEFINE_UNQUOTED([HWLOC_EXTERNAL_HWLOC_VERSION],