Commit 2b6d9ce2 authored by Seth Howell's avatar Seth Howell Committed by Jim Harris
Browse files

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: default avatarSeth Howell <seth.howell@intel.com>
Reviewed-on: https://review.gerrithub.io/428663


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent 5c263046
Loading
Loading
Loading
Loading
+2 −6
Original line number Diff line number Diff line
@@ -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