From: Olaf Faaland <faaland1@llnl.gov>
Date: Wed, 31 Jan 2018 01:36:38 +0000 (-0800)
Subject: LU-8602 gss: Fix autoconf check for crypto_hash
X-Git-Tag: 2.10.58~2
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F95%2F31095%2F2;p=fs%2Flustre-release.git

LU-8602 gss: Fix autoconf check for crypto_hash

If earlier crypto_hash checks resulted in enable_gss=no, do not enable
GSS when gss_conf_test = success.

Fixes regression introduced by https://review.whamcloud.com/27823/
LU-9073 gss: remove newer kernel support

Signed-off-by: Olaf Faaland <faaland1@llnl.gov>
Change-Id: I6c135e638ec6b8350b916f18de73b83cc7dbfb09
Reviewed-on: https://review.whamcloud.com/31095
Tested-by: Jenkins
Reviewed-by: James Simmons <uja.ornl@yahoo.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
---

diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4
index 6420f4a..6ac4fd4 100644
--- a/lustre/autoconf/lustre-core.m4
+++ b/lustre/autoconf/lustre-core.m4
@@ -323,7 +323,7 @@ AS_IF([test "x$enable_gss" != xno], [
 		gss_conf_test="failure"
 	])
 
-	AS_IF([test "x$gss_conf_test" = xsuccess], [
+	AS_IF([test "x$gss_conf_test" = xsuccess && "x$enable_gss" != xno], [
 		AC_DEFINE([HAVE_GSS], [1], [Define this is if you enable gss])
 		enable_gss="yes"
 	], [