configury: misc pmix120 fixes

opal/mca/pmix/pmix120/configure.m4

@@ -28,13 +28,12 @@
 AC_DEFUN([MCA_opal_pmix_pmix120_CONFIG],[
     AC_CONFIG_FILES([opal/mca/pmix/pmix120/Makefile])
 
+    OPAL_VAR_SCOPE_PUSH([PMIX_VERSION opal_pmix_pmix120_save_CPPFLAGS opal_pmix_pmix120_save_LDFLAGS opal_pmix_pmix120_save_LIBS opal_pmix_pmix120_basedir opal_pmix_pmix120_save_cflags])
+
     AS_IF([test "$opal_external_pmix_happy" = "yes"],
           [AC_MSG_WARN([using an external pmix; disqualifiying this component])
            opal_pmix_pmix120_happy=0],
-
+          [PMIX_VERSION=
-          [OPAL_VAR_SCOPE_PUSH([PMIX_VERSION opal_pmix_pmix120_save_CPPFLAGS opal_pmix_pmix120_save_LDFLAGS opal_pmix_pmix120_save_LIBS opal_pmix_pmix120_basedir opal_pmix_pmix120_save_cflags])
-
-            PMIX_VERSION=
            opal_pmix_pmix120_basedir=opal/mca/pmix/pmix120
 
            opal_pmix_pmix120_save_CFLAGS=$CFLAGS
@@ -43,27 +42,24 @@ AC_DEFUN([MCA_opal_pmix_pmix120_CONFIG],[
            opal_pmix_pmix120_save_LIBS=$LIBS
 
            opal_pmix_pmix120_args="--enable-embedded-mode --with-pmix-symbol-prefix=opal_pmix_pmix120_ --with-libevent-header=\\\"opal/mca/event/$opal_event_base_include\\\" --with-hwloc-header=\\\"$opal_hwloc_base_include\\\""
-            if test "$enable_debug" = "yes"; then
+           AS_IF([test "$enable_debug" = "yes"],
-                opal_pmix_pmix120_args="--enable-debug $opal_pmix_pmix120_args"
+                 [opal_pmix_pmix120_args="--enable-debug $opal_pmix_pmix120_args"
-                CFLAGS="$OPAL_CFLAGS_BEFORE_PICKY $OPAL_VISIBILITY_CFLAGS -g"
+                  CFLAGS="$OPAL_CFLAGS_BEFORE_PICKY $OPAL_VISIBILITY_CFLAGS -g"],
-            else
+                 [opal_pmix_pmix120_args="--disable-debug $opal_pmix_pmix120_args"
-                opal_pmix_pmix120_args="--disable-debug $opal_pmix_pmix120_args"
+                  CFLAGS="$OPAL_CFLAGS_BEFORE_PICKY $OPAL_VISIBILITY_CFLAGS"])
-                CFLAGS="$OPAL_CFLAGS_BEFORE_PICKY $OPAL_VISIBILITY_CFLAGS"
-            fi
            CPPFLAGS="-I$OPAL_TOP_SRCDIR -I$OPAL_TOP_BUILDDIR -I$OPAL_TOP_SRCDIR/opal/include -I$OPAL_TOP_BUILDDIR/opal/include $CPPFLAGS"
 
            OPAL_CONFIG_SUBDIR([$opal_pmix_pmix120_basedir/pmix],
                [$opal_pmix_pmix120_args $opal_subdir_args 'CFLAGS=$CFLAGS' 'CPPFLAGS=$CPPFLAGS'],
                [opal_pmix_pmix120_happy=1], [opal_pmix_pmix120_happy=0])
 
-            if test $opal_pmix_pmix120_happy -eq 1; then
+           AS_IF([test $opal_pmix_pmix120_happy -eq 1],
-                PMIX_VERSION="internal v`$srcdir/$opal_pmix_pmix120_basedir/pmix/config/pmix_get_version.sh $srcdir/$opal_pmix_pmix120_basedir/pmix/VERSION`"
+                 [PMIX_VERSION="internal v`$srcdir/$opal_pmix_pmix120_basedir/pmix/config/pmix_get_version.sh $srcdir/$opal_pmix_pmix120_basedir/pmix/VERSION`"
                   # Build flags for our Makefile.am
                   opal_pmix_pmix120_LIBS='$(OPAL_TOP_BUILDDIR)/'"$opal_pmix_pmix120_basedir"'/pmix/libpmix.la'
                   opal_pmix_pmix120_CPPFLAGS='-I$(OPAL_TOP_BUILDDIR)/opal/mca/pmix/pmix120/pmix/include/pmix -I$(OPAL_TOP_BUILDDIR)/opal/mca/pmix/pmix120/pmix/include -I$(OPAL_TOP_BUILDDIR)/opal/mca/pmix/pmix120/pmix -I$(OPAL_TOP_SRCDIR)/opal/mca/pmix/pmix120/pmix'
                   AC_SUBST([opal_pmix_pmix120_LIBS])
-                AC_SUBST([opal_pmix_pmix120_CPPFLAGS])
+                  AC_SUBST([opal_pmix_pmix120_CPPFLAGS])])
-            fi
 
            # Finally, add a flag to support static builds
            pmix_pmix120_WRAPPER_EXTRA_LIBS=-lpmix