From 7c3bc9dd1b23f327da37473e8828bcaf8db5a554 Mon Sep 17 00:00:00 2001
From: brian <brian>
Date: Thu, 8 May 2008 14:05:58 +0000
Subject: [PATCH] b=15316

Small logic thinko that fails the case where no o2iblnd tree is specifed.
---
 lnet/autoconf/lustre-lnet.m4 | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/lnet/autoconf/lustre-lnet.m4 b/lnet/autoconf/lustre-lnet.m4
index 5b027cde33..216698026f 100644
--- a/lnet/autoconf/lustre-lnet.m4
+++ b/lnet/autoconf/lustre-lnet.m4
@@ -578,11 +578,13 @@ else
 		])
 
 		# we know at this point that the found OFED source is good
-		if test \( $ENABLEO2IB = 3 -a -f $O2IBPATH/Module.symvers \); then
-			AC_MSG_NOTICE([adding $O2IBPATH/Module.symvers to $PWD/Module.symvers])
-			cat $O2IBPATH/Module.symvers >> $PWD/Module.symvers
-		else
-			AC_MSG_ERROR([an external source tree was specified for o2iblnd however I  could not find a $O2IBPATH/Module.symvers there])
+		if test \( $ENABLEO2IB = 3 \); then
+			if test \( -f $O2IBPATH/Module.symvers \); then
+				AC_MSG_NOTICE([adding $O2IBPATH/Module.symvers to $PWD/Module.symvers])
+				cat $O2IBPATH/Module.symvers >> $PWD/Module.symvers
+			else
+				AC_MSG_ERROR([an external source tree was specified for o2iblnd however I could not find a $O2IBPATH/Module.symvers there])
+			fi
 		fi
 
 		# version checking is a hack and isn't reliable,
-- 
GitLab