From 9c6e6d4c34d867639ac90ba9a46084f3700b57d1 Mon Sep 17 00:00:00 2001 From: Jonathon Weiss Date: Fri, 15 Apr 2016 19:29:58 -0400 Subject: [PATCH] Find Tivoli TSM headers in 64 bit location When building with --enable-tivoli-tsm locate the Tivoli TSM headers if they are installed in the path used by the 64 bit Tivoli TSM installation. Change-Id: I4f114a4ada1babcbe1e52f451f10e78d861b7fd0 Reviewed-on: https://gerrit.openafs.org/12258 Tested-by: BuildBot Reviewed-by: Mark Vitale Reviewed-by: Michael Meffie Reviewed-by: Benjamin Kaduk --- acinclude.m4 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/acinclude.m4 b/acinclude.m4 index f50099a..67fa158 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1429,6 +1429,8 @@ if test "$enable_tivoli_tsm" = "yes"; then XBSADIR2=/opt/tivoli/tsm/client/api/bin/xopen XBSADIR3=/usr/tivoli/tsm/client/api/bin/sample XBSADIR4=/opt/tivoli/tsm/client/api/bin/sample + XBSADIR5=/usr/tivoli/tsm/client/api/bin64/sample + XBSADIR6=/opt/tivoli/tsm/client/api/bin64/sample if test -r "$XBSADIR3/dsmapifp.h"; then XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I$XBSADIR3" @@ -1438,6 +1440,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 "$XBSADIR5/dsmapifp.h"; then + XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I$XBSADIR5" + XBSA_XLIBS="-ldl" + AC_MSG_RESULT([yes, $XBSA_CFLAGS]) + elif test -r "$XBSADIR6/dsmapifp.h"; then + XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I$XBSADIR6" + XBSA_XLIBS="-ldl" + AC_MSG_RESULT([yes, $XBSA_CFLAGS]) elif test -r "$XBSADIR1/xbsa.h"; then XBSA_CFLAGS="-Dxbsa -I$XBSADIR1" XBSA_XLIBS="" -- 1.9.4