From cbc1e069ee843495f26f108e0614098d8359bfc4 Mon Sep 17 00:00:00 2001
From: Seth Howell <seth.howell@intel.com>
Date: Wed, 8 Jan 2020 10:19:49 -0700
Subject: [PATCH] configure: allow cuncurrent build of RBD and reduce

This was disabled in configure because at one time there was an ISA-L
dependency break between the RBD libraries and our own submodule.
It seems that the dependency break was fixed a while ago, but the check
to not allow one to build with the other was never removed.
Unfortunately, I don't have the details on what that fix was.

Either way, this compilation works now.

Change-Id: Ic249791549dae36c7279114d67e77be94e842ddf
Signed-off-by: Seth Howell <seth.howell@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/479726
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: SPDK CI Jenkins <sys_sgci@intel.com>
---
 configure                      | 20 +++++++-------------
 test/common/autotest_common.sh |  6 +-----
 2 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/configure b/configure
index 4aa86608c..e2c0448d1 100755
--- a/configure
+++ b/configure
@@ -574,19 +574,13 @@ if [[ "${CONFIG[ISAL]}" = "y" ]]; then
 		exit 1
 	fi
 
-	if [[ "${CONFIG[RBD]}" = "y" ]]; then
-		echo "ISAL and RBD cannot co-exist currently so disabling ISAL and compression."
-		CONFIG[ISAL]=n
-		CONFIG[REDUCE]=n
-	else
-		cd $rootdir/isa-l
-		ISAL_LOG=$rootdir/isa-l/spdk-isal.log
-		echo -n "Configuring ISA-L (logfile: $ISAL_LOG)..."
-		./autogen.sh &> $ISAL_LOG
-		./configure CFLAGS="-fPIC -g -O2" --enable-shared=no >> $ISAL_LOG 2>&1
-		echo "done."
-		cd $rootdir
-	fi
+	cd $rootdir/isa-l
+	ISAL_LOG=$rootdir/isa-l/spdk-isal.log
+	echo -n "Configuring ISA-L (logfile: $ISAL_LOG)..."
+	./autogen.sh &> $ISAL_LOG
+	./configure CFLAGS="-fPIC -g -O2" --enable-shared=no >> $ISAL_LOG 2>&1
+	echo "done."
+	cd $rootdir
 fi
 
 if [[ "${CONFIG[PMDK]}" = "y" ]]; then
diff --git a/test/common/autotest_common.sh b/test/common/autotest_common.sh
index 6a992158b..95666fc5f 100644
--- a/test/common/autotest_common.sh
+++ b/test/common/autotest_common.sh
@@ -207,11 +207,7 @@ if [ -f /usr/include/libpmem.h ] && [ $SPDK_TEST_REDUCE -eq 1 ]; then
 fi
 
 if [ -d /usr/include/rbd ] &&  [ -d /usr/include/rados ] && [ $SPDK_TEST_RBD -eq 1 ]; then
-	if [ $SPDK_TEST_ISAL -eq 0 ]; then
-		config_params+=' --with-rbd'
-	else
-		echo "rbd not enabled because isal is enabled."
-	fi
+	config_params+=' --with-rbd'
 fi
 
 if [ $SPDK_TEST_VPP -eq 1 ]; then