STABLE14-find-new-xbsa-first-20081007

LICENSE IPL10
FIXES 119162

change test order


(cherry picked from commit af0b03055e8a3244881d8ac3e7c52ed775ae86d1)
This commit is contained in:
Derrick Brashear 2008-10-07 19:51:45 +00:00
parent 39ecc64e1d
commit 797645eb78

View File

@ -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