From 0f94be12684ce2e074d97cf96a5fdd76eeda5b40 Mon Sep 17 00:00:00 2001
From: Ralph Castain <rhc@open-mpi.org>
Date: Wed, 3 Dec 2014 07:10:54 -0800
Subject: [PATCH] Revert "If someone specifically asks for knem support and we
 can't do it, then we really should abort."

This reverts commit 6287d43c475fe6de6e3e44cbc3fdbe4f7e08e9a2.
---
 config/opal_check_knem.m4 | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/config/opal_check_knem.m4 b/config/opal_check_knem.m4
index 1bb3229f2d..4229692e6d 100644
--- a/config/opal_check_knem.m4
+++ b/config/opal_check_knem.m4
@@ -22,15 +22,14 @@
 AC_DEFUN([OPAL_CHECK_KNEM],[
     OPAL_VAR_SCOPE_PUSH([opal_check_knem_happy opal_check_knem_$1_save_CPPFLAGS opal_check_knem_dir])
     AC_ARG_WITH([knem],
-                [AC_HELP_STRING([--with-knem(=DIR)],
-                                [Build knem Linux kernel module support, searching for headers in DIR ])],
-                [], [with_knem=no])
+        [AC_HELP_STRING([--with-knem(=DIR)],
+             [Build knem Linux kernel module support, searching for headers in DIR])])
 
     OPAL_CHECK_WITHDIR([knem], [$with_knem], [include/knem_io.h])
     opal_check_knem_$1_save_CPPFLAGS="$CPPFLAGS"
 
     AS_IF([test "$with_knem" != "no"],
-          [AS_IF([test "$with_knem" != "yes"],
+          [AS_IF([test ! -z "$with_knem" -a "$with_knem" != "yes"],
                  [opal_check_knem_dir="$with_knem"])
 
            _OPAL_CHECK_PACKAGE_HEADER([$1],
@@ -61,7 +60,7 @@ AC_DEFUN([OPAL_CHECK_KNEM],[
 
     AS_IF([test "$opal_check_knem_happy" = "yes" -a "$opal_cv_knem_version_ok" = "yes"],
           [$2],
-          [AS_IF([test "$with_knem" != "no"],
+          [AS_IF([test ! -z "$with_knem" -a "$with_knem" != "no"],
                  [AC_MSG_ERROR([KNEM support requested but not found.  Aborting])])
            $3])
     OPAL_VAR_SCOPE_POP