From f26b2fef0cbb13706401e091f42f242023a49813 Mon Sep 17 00:00:00 2001
From: Nathan Hjelm <hjelmn@lanl.gov>
Date: Mon, 3 Apr 2017 10:42:07 -0600
Subject: [PATCH] cma: restore --with-cma=no configure option

This support broke when we enabled CMA by default. Addreses the issue
raised by #3270.

Signed-off-by: Nathan Hjelm <hjelmn@lanl.gov>
(cherry picked from commit 533a8e6dae07c44f68659a19c2a326fc89959a04)
Signed-off-by: Nathan Hjelm <hjelmn@lanl.gov>
---
 config/opal_check_cma.m4 | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/config/opal_check_cma.m4 b/config/opal_check_cma.m4
index 2930debf911..013f39477d1 100644
--- a/config/opal_check_cma.m4
+++ b/config/opal_check_cma.m4
@@ -22,6 +22,10 @@ AC_DEFUN([OPAL_CHECK_CMA],[
                 [AC_HELP_STRING([--with-cma],
                                 [Build Cross Memory Attach support (default: autodetect)])])
 
+    if test "x$with_cma" = "xno" ; then
+        opal_check_cma_happy=0
+    fi
+
     # We only need to do the back-end test once
     if test -z "$opal_check_cma_happy" ; then
         OPAL_CHECK_CMA_BACKEND