From bc3ca9e0098cedec4254edd7345915a555b72749 Mon Sep 17 00:00:00 2001 From: Brian Barrett Date: Fri, 22 Mar 2013 16:56:09 +0000 Subject: [PATCH] Make the linux memory component do the failure path if it was disabled. This commit was SVN r28206. --- opal/mca/memory/linux/configure.m4 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/opal/mca/memory/linux/configure.m4 b/opal/mca/memory/linux/configure.m4 index fd80ef1a25..57e943c5a2 100644 --- a/opal/mca/memory/linux/configure.m4 +++ b/opal/mca/memory/linux/configure.m4 @@ -49,16 +49,16 @@ AC_DEFUN([MCA_opal_memory_linux_CONFIG],[ memory_linux_ummu_happy=no ;; esac - + AS_IF([test "$with_memory_manager" = "linux"], [memory_linux_ptmalloc2_happy=yes memory_linux_ummu_happy=yes memory_linux_requested=1], [memory_linux_requested=0 - AS_IF([test "$with_memory_manager" = ""], + AS_IF([test "$with_memory_manager" = "" -o "$with_memory_manager" = "yes"], [memory_linux_ptmalloc2_happy=yes memory_linux_ummu_happy=yes], - [memory_linux_ptmalloc2_happy=yes + [memory_linux_ptmalloc2_happy=no memory_linux_ummu_happy=no])]) ######################################################################