From c2de56b0a1332a2fff4968cc128baa601975c05c Mon Sep 17 00:00:00 2001
From: Michal Berger <michalx.berger@intel.com>
Date: Tue, 21 Sep 2021 19:08:31 +0200
Subject: [PATCH] configure: Fix DPDK version lookup in case submodule is in
 use

Signed-off-by: Michal Berger <michalx.berger@intel.com>
Change-Id: I6184557bfd8ca24168324f874a032badd4f51477
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/9558
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
---
 configure | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/configure b/configure
index 7a0d5b8e4..8724c61a1 100755
--- a/configure
+++ b/configure
@@ -753,16 +753,21 @@ if [[ "${CONFIG[REDUCE]}" = "y" ]]; then
 		fi
 	else
 		# Check DPDK version to determine if mlx5_pci driver is supported
-		if [ ! -f "${CONFIG[DPDK_DIR]}"/../VERSION ]; then
-			echo "Can get DPDK version, so disabling DPDK mlx5_pci compress PMD"
-			CONFIG[REDUCE_MLX5]="n"
+		dpdk_ver=""
+		if [[ "${CONFIG[DPDK_DIR]}" == "$rootdir/dpdk/build" ]]; then
+			# DPDK_DIR points at our submodule so ./build may not exist yet. Use
+			# absolute path to lookup the version.
+			dpdk_ver=$(< "$rootdir/dpdk/VERSION")
+		elif [[ -f "${CONFIG[DPDK_DIR]}"/../VERSION ]]; then
+			dpdk_ver=$(< "${CONFIG[DPDK_DIR]}"/../VERSION)
 		else
-			# mlx5_pci is supported by DPDK >- 21.02.0
-			dpdk_ver=$(cat "${CONFIG[DPDK_DIR]}"/../VERSION)
-			if lt "$dpdk_ver" 21.02.0; then
-				echo "DPDK version ${dpdk_ver} doesn't support mlx5_pci compress PMD"
-				CONFIG[REDUCE_MLX5]="n"
-			fi
+			echo "Cannot get DPDK version, so disabling DPDK mlx5_pci compress PMD"
+			CONFIG[REDUCE_MLX5]="n"
+		fi
+		# mlx5_pci is supported by DPDK >- 21.02.0
+		if [[ -n $dpdk_ver ]] && lt "$dpdk_ver" 21.02.0; then
+			echo "DPDK version ${dpdk_ver} doesn't support mlx5_pci compress PMD"
+			CONFIG[REDUCE_MLX5]="n"
 		fi
 	fi
 fi