From: Derrick Brashear <shadow@dementia.org>
Date: Tue, 7 Oct 2008 19:51:45 +0000 (+0000)
Subject: STABLE14-find-new-xbsa-first-20081007
X-Git-Tag: openafs-stable-1_4_8pre2~3
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=797645eb78f3dc8dd9efb11be6f80725d70e7d44;p=packages%2Fo%2Fopenafs.git

STABLE14-find-new-xbsa-first-20081007

LICENSE IPL10
FIXES 119162

change test order


(cherry picked from commit af0b03055e8a3244881d8ac3e7c52ed775ae86d1)
---

diff --git a/acinclude.m4 b/acinclude.m4
index 733e72683..ce0b7ea5b 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1261,15 +1261,7 @@ if test "$enable_tivoli_tsm" = "yes"; then
 	XBSADIR3=/usr/tivoli/tsm/client/api/bin/sample
 	XBSADIR4=/opt/tivoli/tsm/client/api/bin/sample
 
-	if test -r "$XBSADIR1/xbsa.h"; then
-		XBSA_CFLAGS="-Dxbsa -I$XBSADIR1"
-		XBSA_XLIBS=""
-		AC_MSG_RESULT([yes, $XBSA_CFLAGS])
-	elif test -r "$XBSADIR2/xbsa.h"; then
-		XBSA_CFLAGS="-Dxbsa -I$XBSADIR2"
-		XBSA_XLIBS=""
-		AC_MSG_RESULT([yes, $XBSA_CFLAGS])
-	elif test -r "$XBSADIR3/dsmapifp.h"; then
+	if test -r "$XBSADIR3/dsmapifp.h"; then
 		XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I$XBSADIR3"
 		XBSA_XLIBS="-ldl"
 		AC_MSG_RESULT([yes, $XBSA_CFLAGS])
@@ -1277,6 +1269,14 @@ if test "$enable_tivoli_tsm" = "yes"; then
 		XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I$XBSADIR4"
 		XBSA_XLIBS="-ldl"
 		AC_MSG_RESULT([yes, $XBSA_CFLAGS])
+	elif test -r "$XBSADIR1/xbsa.h"; then
+		XBSA_CFLAGS="-Dxbsa -I$XBSADIR1"
+		XBSA_XLIBS=""
+		AC_MSG_RESULT([yes, $XBSA_CFLAGS])
+	elif test -r "$XBSADIR2/xbsa.h"; then
+		XBSA_CFLAGS="-Dxbsa -I$XBSADIR2"
+		XBSA_XLIBS=""
+		AC_MSG_RESULT([yes, $XBSA_CFLAGS])
 	else
 		AC_MSG_RESULT([no, missing xbsa.h and dsmapifp.h header files])
 	fi