From 2b6d9ce21f7c9ba33db01fda7e03ae0a02a8fb8e Mon Sep 17 00:00:00 2001
From: Seth Howell <seth.howell@intel.com>
Date: Wed, 10 Oct 2018 08:00:30 -0700
Subject: [PATCH] configure: Move checks for nasm and ipsec

The way they were previously being checked was triggering the trap and
printing out a "Configuration failed" message even though the
configuration was successful.

Change-Id: I9de4f390c603631ebf5af5555ea7164aae2b6213
Signed-off-by: Seth Howell <seth.howell@intel.com>
Reviewed-on: https://review.gerrithub.io/428663
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
---
 configure | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/configure b/configure
index 29a6efa36..116ae4360 100755
--- a/configure
+++ b/configure
@@ -347,16 +347,12 @@ fi
 
 if [[ "${CONFIG[CRYPTO]}" = "y" ]]; then
 	echo NOTE: Crypto is currently marked as experimental.  Do not use in production.
-	set +e
-	nasm_ver=$(nasm -v | sed 's/[^0-9]*//g' | awk '{print substr ($0, 0, 5)}')
-	ipsec="$(find /usr -name intel-ipsec-mb.h 2>/dev/null)"
-	set -e
-	if [[ $nasm_ver -lt "21202" ]]; then
+	if [[ $(nasm -v | sed 's/[^0-9]*//g' | awk '{print substr ($0, 0, 5)}') -lt "21202" ]]; then
 		echo Crypto requires NASM version 2.12.02 or newer.  Please install
 		echo or upgrade then re-run this script.
 		exit 1
         else
-		if [[ "$ipsec" == "" ]]; then
+		if [[ "$(find /usr -name intel-ipsec-mb.h 2>/dev/null)" == "" ]]; then
 			echo "To enable crypto you must first go to the intel-ipsec-mb directory and "
 			echo "run 'make' then 'sudo make install' then re-run this script."
 			exit 1