configury: revamp and re-ident sub configure.m4 after open-mpi/ompi@846360fd4c

opal/mca/event/libevent2022/configure.m4

@@ -91,15 +91,6 @@ AC_DEFUN([MCA_opal_event_libevent2022_CONFIG],[
     AC_CONFIG_FILES([opal/mca/event/libevent2022/Makefile])
     libevent_basedir="opal/mca/event/libevent2022"
 
-    # If we're not building externally, configure this component
-    AS_IF([true],
-          [MCA_opal_event_libevent2022_DO_THE_CONFIG],
-          [AC_MSG_WARN([using an external libevent; disqualifiying this component])
-           $2])
-    OPAL_VAR_SCOPE_POP
-])
-
-AC_DEFUN([MCA_opal_event_libevent2022_DO_THE_CONFIG], [
     CFLAGS_save="$CFLAGS"
     CFLAGS="$OPAL_CFLAGS_BEFORE_PICKY $OPAL_VISIBILITY_CFLAGS"
     CPPFLAGS_save="$CPPFLAGS"
@@ -206,4 +197,6 @@ AC_DEFUN([MCA_opal_event_libevent2022_DO_THE_CONFIG], [
            $1],
           [$2
            OPAL_HAVE_WORKING_EVENTOPS=0])
+
+    OPAL_VAR_SCOPE_POP
 ])

opal/mca/hwloc/hwloc1113/configure.m4

@@ -82,12 +82,11 @@ AC_DEFUN([MCA_opal_hwloc_hwloc1113_CONFIG],[
           [opal_hwloc_external="no"],
           [opal_hwloc_external="yes"])
 
-    if true; then
     opal_hwloc_hwloc1113_save_CPPFLAGS=$CPPFLAGS
     opal_hwloc_hwloc1113_save_LDFLAGS=$LDFLAGS
     opal_hwloc_hwloc1113_save_LIBS=$LIBS
 
-        # Run the hwloc configuration - if no external hwloc, then set the prefix
+    # Run the hwloc configuration - if no external hwloc, then set the prefixi
     # to minimize the chance that someone will use the internal symbols
     AS_IF([test "$opal_hwloc_external" = "no"],
           [HWLOC_SET_SYMBOL_PREFIX([opal_hwloc1113_])])
@@ -168,7 +167,6 @@ AC_DEFUN([MCA_opal_hwloc_hwloc1113_CONFIG],[
     hwloc_hwloc1113_WRAPPER_EXTRA_LDFLAGS="$HWLOC_EMBEDDED_LDFLAGS"
     hwloc_hwloc1113_WRAPPER_EXTRA_LIBS="$HWLOC_EMBEDDED_LIBS"
     hwloc_hwloc1113_WRAPPER_EXTRA_CPPFLAGS='-I${pkgincludedir}/'"$opal_hwloc_hwloc1113_basedir/hwloc/include"
-    fi
 
     # If we are not building the internal hwloc, then indicate that
     # this component should not be built.  NOTE: we still did all the

opal/mca/pmix/pmix2x/configure.m4

@@ -30,10 +30,7 @@ AC_DEFUN([MCA_opal_pmix_pmix2x_CONFIG],[
 
     OPAL_VAR_SCOPE_PUSH([PMIX_VERSION opal_pmix_pmix2x_save_CPPFLAGS opal_pmix_pmix2x_save_LDFLAGS opal_pmix_pmix2x_save_LIBS opal_pmix_pmix2x_basedir opal_pmix_pmix2x_save_cflags])
 
-    AS_IF([false],
-          [AC_MSG_WARN([using an external pmix; disqualifiying this component])
-           opal_pmix_pmix2x_happy=0],
-          [PMIX_VERSION=
+    PMIX_VERSION=
     opal_pmix_pmix2x_basedir=opal/mca/pmix/pmix2x
 
     opal_pmix_pmix2x_save_CFLAGS=$CFLAGS
@@ -67,7 +64,6 @@ AC_DEFUN([MCA_opal_pmix_pmix2x_CONFIG],[
     CPPFLAGS=$opal_pmix_pmix2x_save_CPPFLAGS
     LDFLAGS=$opal_pmix_pmix2x_save_LDFLAGS
     LIBS=$opal_pmix_pmix2x_save_LIBS
-          ])
 
     # If we are not building the internal pmix, then indicate that
     # this component should not be built.  NOTE: we still did all the