configury: do not abort by default when event/external cannot be built

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

Author: ggouaillardet

opal/mca/event/external/configure.m4

@@ -2,7 +2,7 @@
 #
 # Copyright (c) 2009-2013 Cisco Systems, Inc.  All rights reserved.
 # Copyright (c) 2013      Los Alamos National Security, LLC.  All rights reserved.
-# Copyright (c) 2015-2017 Research Organization for Information Science
+# Copyright (c) 2015-2018 Research Organization for Information Science
 #                         and Technology (RIST). All rights reserved.
 #
 # Copyright (c) 2017      Intel, Inc. All rights reserved.
@@ -56,7 +56,7 @@ AC_DEFUN([MCA_opal_event_external_POST_CONFIG],[
 AC_DEFUN([MCA_opal_event_external_CONFIG],[
     AC_CONFIG_FILES([opal/mca/event/external/Makefile])
 
-    OPAL_VAR_SCOPE_PUSH([opal_event_external_CPPFLAGS_save opal_event_external_CFLAGS_save opal_event_external_LDFLAGS_save opal_event_external_LIBS_save opal_event_dir])
+    OPAL_VAR_SCOPE_PUSH([opal_event_external_CPPFLAGS_save opal_event_external_CFLAGS_save opal_event_external_LDFLAGS_save opal_event_external_LIBS_save opal_event_dir opal_event_external_support])
 
     # Make some processing below easier ($with_libevent==yes and
     # $with_libevent==no has already been filtered out).
@@ -73,7 +73,8 @@ AC_DEFUN([MCA_opal_event_external_CONFIG],[
 
     # Did the user want us to check for libevent in a specific location?
     AC_MSG_CHECKING([for external libevent in])
-    AS_IF([test "$with_libevent" != "external" && \
+    AS_IF([test -n "$with_libevent" && \
+           test "$with_libevent" != "external" && \
            test "$with_libevent" != "internal" && \
            test "$with_libevent" != "yes" && \
            test "$with_libevent" != "no"],
@@ -104,70 +105,76 @@ AC_DEFUN([MCA_opal_event_external_CONFIG],[
     AS_IF([test ! -z "$with_libevent_libdir" && test "$with_libevent_libdir" != "yes"],
           [opal_event_libdir="$with_libevent_libdir"])
 
-    opal_event_external_CPPFLAGS_save=$CPPFLAGS
-    opal_event_external_CFLAGS_save=$CFLAGS
-    opal_event_external_LDFLAGS_save=$LDFLAGS
-    opal_event_external_LIBS_save=$LIBS
-
-    OPAL_CHECK_PACKAGE([opal_event_external],
-                       [event.h],
-                       [event],
-                       [event_config_new],
-                       [-levent_pthreads],
-                       [$opal_event_dir],
-                       [$opal_event_libdir],
-                       [opal_event_external_support=yes],
-                       [opal_event_external_support=no])
-
-    # Ensure that this libevent has the symbol
-    # "evthread_set_lock_callbacks", which will only exist if
-    # libevent was configured with thread support.
-    LIBS="$opal_event_external_LDFLAGS $LIBS"
-    AC_CHECK_LIB([event], [evthread_set_lock_callbacks],
-                 [],
-                 [AC_MSG_WARN([External libevent does not have thread support])
-                  AC_MSG_WARN([Open MPI requires libevent to be compiled with])
-                  AC_MSG_WARN([thread support enabled])
-                  AC_MSG_ERROR([Cannot continue])])
-
-    AC_CHECK_LIB([event_pthreads], [evthread_use_pthreads],
-                 [],
-                 [AC_MSG_WARN([External libevent does not have thread support])
-                  AC_MSG_WARN([Open MPI requires libevent to be compiled with])
-                  AC_MSG_WARN([thread support enabled])
-                  AC_MSG_ERROR([Cannot continue])])
-
-    CPPFLAGS=$opal_event_external_CPPFLAGS_save
-    CFLAGS=$opal_event_external_CFLAGS_save
-    LDFLAGS=$opal_event_external_LDFLAGS_save
-    LIBS=$opal_event_external_LIBS_save
-
-    AC_SUBST(opal_event_external_CPPFLAGS)
-    AC_SUBST(opal_event_external_LDFLAGS)
-    AC_SUBST(opal_event_external_LIBS)
-
-    # These flags need to get passed to the wrapper compilers
-    # (this is unnecessary for the internal/embedded event)
-    event_external_WRAPPER_EXTRA_CPPFLAGS=$opal_event_external_CPPFLAGS
-
-    # Finally, add some flags to the wrapper compiler if we're
-    # building with developer headers so that our headers can
-    # be found.
-    event_external_WRAPPER_EXTRA_LDFLAGS=$opal_event_external_LDFLAGS
-    event_external_WRAPPER_EXTRA_LIBS=$opal_event_external_LIBS
+    AS_IF([test "$with_libevent" != "internal"],
+          [opal_event_external_CPPFLAGS_save=$CPPFLAGS
+           opal_event_external_CFLAGS_save=$CFLAGS
+           opal_event_external_LDFLAGS_save=$LDFLAGS
+           opal_event_external_LIBS_save=$LIBS
+
+           OPAL_CHECK_PACKAGE([opal_event_external],
+                              [event.h],
+                              [event],
+                              [event_config_new],
+                              [-levent_pthreads],
+                              [$opal_event_dir],
+                              [$opal_event_libdir],
+                              [opal_event_external_support=yes],
+                              [opal_event_external_support=no])
+
+           AS_IF([test "$opal_event_external_support" = "yes"],
+                 [# Ensure that this libevent has the symbol
+                  # "evthread_set_lock_callbacks", which will only exist if
+                  # libevent was configured with thread support.
+                  LIBS="$opal_event_external_LDFLAGS $LIBS"
+                  AC_CHECK_LIB([event], [evthread_set_lock_callbacks],
+                               [],
+                               [AC_MSG_WARN([External libevent does not have thread support])
+                                AC_MSG_WARN([Open MPI requires libevent to be compiled with])
+                                AC_MSG_WARN([thread support enabled])
+                                opal_event_external_support=no])])
+
+           AS_IF([test "$opal_event_external_support" = "yes"],
+                 [AC_CHECK_LIB([event_pthreads], [evthread_use_pthreads],
+                               [],
+                               [AC_MSG_WARN([External libevent does not have thread support])
+                                AC_MSG_WARN([Open MPI requires libevent to be compiled with])
+                                AC_MSG_WARN([thread support enabled])
+                                opal_event_external_support=no])])
+
+           CPPFLAGS=$opal_event_external_CPPFLAGS_save
+           CFLAGS=$opal_event_external_CFLAGS_save
+           LDFLAGS=$opal_event_external_LDFLAGS_save
+           LIBS=$opal_event_external_LIBS_save
+
+           AC_SUBST(opal_event_external_CPPFLAGS)
+           AC_SUBST(opal_event_external_LDFLAGS)
+           AC_SUBST(opal_event_external_LIBS)
+
+           # These flags need to get passed to the wrapper compilers
+           # (this is unnecessary for the internal/embedded event)
+           event_external_WRAPPER_EXTRA_CPPFLAGS=$opal_event_external_CPPFLAGS
+
+           # Finally, add some flags to the wrapper compiler if we're
+           # building with developer headers so that our headers can
+           # be found.
+           event_external_WRAPPER_EXTRA_LDFLAGS=$opal_event_external_LDFLAGS
+           event_external_WRAPPER_EXTRA_LIBS=$opal_event_external_LIBS])
 
 ##################################################################    
 
     # Done!
     AS_IF([test "$opal_event_external_support" = "yes"],
-          [ # If we configured successfully, set
+          [# If we configured successfully, set
            # OPAL_HAVE_WORKING_EVENTOPS to 1 (it's a calculated value
            # in the embedded Open MPI libevent, so we can only assume
            # what it is in the installed libevent :-\ ).
            file=$opal_event_dir/include/libevent/config.h
            OPAL_HAVE_WORKING_EVENTOPS=1
            $1],
           [OPAL_HAVE_WORKING_EVENTOPS=0
+           AS_IF([test "$with_libevent" != internal && test -n "$with_libevent"],
+                 [AC_MSG_WARN([external libevent requested but cannot be built])
+                  AC_MSG_ERROR([Cannot continue.])])
            $2])
 
     OPAL_VAR_SCOPE_POP