From 65ed6034496af9d51abeb4f258205e2ea8131c26 Mon Sep 17 00:00:00 2001
From: Michal Berger <michalx.berger@intel.com>
Date: Wed, 21 Oct 2020 19:06:08 +0200
Subject: [PATCH] configure: Fix check against NASM version

Currently, NASM in version 2.14 or newer is required. However, the
old code assumed that nasm -v returns version in the form of x.y.z,
however, some builds return only the x.y. In such a case, check would
always fail to detect proper version since the following would be
be always true:

NASM version 2.14

2.14 -> 214 -> [[ 214 -lt "21400" ]]

Change-Id: I63bfc7aa84383bf2d71e936ae534536ecf25723a
Signed-off-by: Michal Berger <michalx.berger@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4809
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
---
 configure | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index 55e4cb163..707bff557 100755
--- a/configure
+++ b/configure
@@ -5,6 +5,7 @@ set -e
 trap 'echo -e "\n\nConfiguration failed\n\n" >&2' ERR
 
 rootdir=$(readlink -f $(dirname $0))
+source "$rootdir/scripts/common.sh"
 
 function usage()
 {
@@ -158,8 +159,8 @@ fi
 
 #check nasm only on x86
 if [[ $arch == x86_64* ]]; then
-	ver=$(nasm -v 2>/dev/null | awk '{print $3}' | sed 's/[^0-9]*//g')
-	if [[ "${ver:0:1}" -le "2" ]] && [[ "${ver:0:3}" -le "214" ]] && [[ "${ver:0:5}" -lt "21400" ]]; then
+	ver=$(nasm -v 2>/dev/null | awk '{print $3}')
+	if lt "$ver" 2.14; then
 		# ISA-L, compression & crypto require NASM version 2.14 or newer.
 		CONFIG[ISAL]=n
 		CONFIG[CRYPTO]=n