LU-7090 deb: fix wrong IB path for configure

There are two problems:

Firstly, we need check whether O2IBPATH is valid before using
if not, asssign '--with-o2ib=no'instead.

Secondly, macro O2IBPATHS might be "$LINUX $LINUX/drivers/infiniband".
--with-o2ib only expect one string assignment here

Signed-off-by: Wang Shilong <wshilong@ddn.com>
Change-Id: I86172056c57ec8e649c2e56455369e66bbbe3513
Reviewed-on: http://review.whamcloud.com/16183


Tested-by: Jenkins
Reviewed-by: James Simmons <uja.ornl@yahoo.com>
Reviewed-by: Dmitry Eremin <dmitry.eremin@intel.com>
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>

autoMakefile.am

@@ -175,8 +175,13 @@ debs:
 	echo "lustre" > usr_share_modass/compliant.list && \
 	export MA_DIR=$$(pwd)/usr_share_modass && \
 	KVERS=$${KVERS:-$(LINUXRELEASE)} && \
-	[ "x@ENABLEO2IB@" != "x" ] && \
-	export IB_OPTIONS="--with-o2ib=@O2IBPATHS@" && \
+	if test "x@ENABLEO2IB@" = "xno"; then \
+		export IB_OPTIONS="--with-o2ib=no"; \
+	else \
+		if test -n "@O2IBPATH@"; then \
+			export IB_OPTIONS="--with-o2ib=@O2IBPATH@"; \
+		fi; \
+	fi; \
 	export KSRC_TREE=$(LINUX) && \
 	KSRC=$${KSRC:-$(LINUX_OBJ)} && \
 	m-a build $${KSRC:+-k $$KSRC} $${KVERS:+-l $$KVERS} -i -u $$(pwd) lustre && \

lnet/autoconf/lustre-lnet.m4

@@ -310,7 +310,7 @@ AS_IF([test $ENABLEO2IB = "no"], [
 ])
 AC_SUBST(EXTRA_OFED_INCLUDE)
 AC_SUBST(O2IBLND)
-AC_SUBST(O2IBPATHS)
+AC_SUBST(O2IBPATH)
 AC_SUBST(ENABLEO2IB)
 
 # In RHEL 6.2, rdma_create_id() takes the queue-pair type as a fourth argument