Bring over m4 quoting fix from v1.7 branch (in r29894) that was

discovered when removing some components.

This commit was SVN r29895.

The following SVN revision numbers were found above:
  r29894 --> open-mpi/ompi@58ed00296c

ompi/mca/btl/openib/configure.m4

@@ -41,8 +41,8 @@ AC_DEFUN([MCA_ompi_btl_openib_CONFIG],[
     cpcs="oob"
 
     OMPI_CHECK_OPENFABRICS([btl_openib],
-                     [btl_openib_happy="yes"]
+                     [btl_openib_happy="yes"
-                     OMPI_CHECK_OPENFABRICS_CM([btl_openib]),
+                      OMPI_CHECK_OPENFABRICS_CM([btl_openib])],
                      [btl_openib_happy="no"])
 
     AS_IF([test "$btl_openib_happy" = "yes"],