diff --git a/config/ompi_check_gm.m4 b/config/ompi_check_gm.m4
index bbf9e26b78..30f2eb2fcf 100644
--- a/config/ompi_check_gm.m4
+++ b/config/ompi_check_gm.m4
@@ -128,20 +128,23 @@ AC_DEFUN([OMPI_CHECK_GM],[
        [AC_HELP_STRING([--with-gm-libdir=GMLIBDIR],
                        [directory where the GM library can be found, if it is not in GM_DIR/lib or GM_DIR/lib64])])
 
-    AS_IF([test ! -z "$with_gm" -a "$with_gm" != "yes"],
-          [ompi_check_gm_dir="$with_gm"])
-    AS_IF([test ! -z "$with_gm_libdir" -a "$with_gm_libdir" != "yes"],
-          [ompi_check_gm_libdir="$with_gm_libdir"])
 
-    OMPI_CHECK_PACKAGE([$1],
-                       [gm.h],
-                       [gm],
-                       [gm_init],
-                       [],
-                       [$ompi_check_gm_dir],
-                       [$ompi_check_gm_libdir],
-                       [ompi_check_gm_happy="yes"],
-                       [ompi_check_gm_happy="no"])
+    AS_IF([test "$with_gm" != "no"],
+          [AS_IF([test ! -z "$with_gm" -a "$with_gm" != "yes"],
+                 [ompi_check_gm_dir="$with_gm"])
+           AS_IF([test ! -z "$with_gm_libdir" -a "$with_gm_libdir" != "yes"],
+                 [ompi_check_gm_libdir="$with_gm_libdir"])
+
+           OMPI_CHECK_PACKAGE([$1],
+                              [gm.h],
+                              [gm],
+                              [gm_init],
+                              [],
+                              [$ompi_check_gm_dir],
+                              [$ompi_check_gm_libdir],
+                              [ompi_check_gm_happy="yes"],
+                              [ompi_check_gm_happy="no"])],
+          [ompi_check_gm_happy="no"])
 
     AS_IF([test "$ompi_check_gm_happy" = "yes"],
           [_OMPI_CHECK_GM_CONFIG($1)
diff --git a/config/ompi_check_mx.m4 b/config/ompi_check_mx.m4
index ce268baa88..1d5eaaef62 100644
--- a/config/ompi_check_mx.m4
+++ b/config/ompi_check_mx.m4
@@ -64,20 +64,22 @@ AC_DEFUN([OMPI_CHECK_MX],[
     ompi_check_mx_$1_save_LDFLAGS="$LDFLAGS"
     ompi_check_mx_$1_save_LIBS="$LIBS"
 
-    AS_IF([test ! -z "$with_mx" -a "$with_mx" != "yes"],
-          [ompi_check_mx_dir="$with_mx"])
-    AS_IF([test ! -z "$with_mx_libdir" -a "$with_mx_libdir" != "yes"],
-          [ompi_check_mx_libdir="$with_mx_libdir"])
+    AS_IF([test "$with_mx" != "no"],
+          [AS_IF([test ! -z "$with_mx" -a "$with_mx" != "yes"],
+                 [ompi_check_mx_dir="$with_mx"])
+           AS_IF([test ! -z "$with_mx_libdir" -a "$with_mx_libdir" != "yes"],
+                 [ompi_check_mx_libdir="$with_mx_libdir"])
 
-    OMPI_CHECK_PACKAGE([$1],
-                       [myriexpress.h],
-                       [myriexpress],
-                       [mx_finalize],
-                       [],
-                       [$ompi_check_mx_dir],
-                       [$ompi_check_mx_libdir],
-                       [ompi_check_mx_happy="yes"],
-                       [ompi_check_mx_happy="no"])
+           OMPI_CHECK_PACKAGE([$1],
+                              [myriexpress.h],
+                              [myriexpress],
+                              [mx_finalize],
+                              [],
+                              [$ompi_check_mx_dir],
+                              [$ompi_check_mx_libdir],
+                              [ompi_check_mx_happy="yes"],
+                              [ompi_check_mx_happy="no"])],
+          [ompi_check_mx_happy="no"])
 
     AS_IF([test "$ompi_check_mx_happy" = "yes"],
           [_OMPI_CHECK_MX_CONFIG($1, [ompi_check_mx_happy="yes"],