tjh.dev
1diff -ru openafs-1.8.0/src/butc/afsxbsa.c openafs-1.8.0.new/src/butc/afsxbsa.c
2--- openafs-1.8.0/src/butc/afsxbsa.c 2018-04-06 03:21:12.000000000 +0200
3+++ openafs-1.8.0.new/src/butc/afsxbsa.c 2018-06-12 16:26:26.272522305 +0200
4@@ -651,7 +651,7 @@
5 #if defined(AFS_AIX_ENV)
6 dynlib = dlopen("/usr/lib/libApiDS.a(dsmapish.o)", RTLD_NOW | RTLD_LOCAL | RTLD_MEMBER);
7 #elif defined (AFS_AMD64_LINUX26_ENV)
8- dynlib = dlopen("/usr/lib64/libApiTSM64.so", RTLD_NOW | RTLD_LOCAL);
9+ dynlib = dlopen(XBSA_TSMLIB, RTLD_NOW | RTLD_LOCAL);
10 #elif defined(AFS_SUN5_ENV) || defined(AFS_LINUX26_ENV)
11 dynlib = dlopen("/usr/lib/libApiDS.so", RTLD_NOW | RTLD_LOCAL);
12 #else
13diff -ru openafs-1.8.0/src/cf/tivoli.m4 openafs-1.8.0.new/src/cf/tivoli.m4
14--- openafs-1.8.0/src/cf/tivoli.m4 2018-04-06 03:21:12.000000000 +0200
15+++ openafs-1.8.0.new/src/cf/tivoli.m4 2018-06-12 16:26:26.072522485 +0200
16@@ -1,45 +1,7 @@
17 AC_DEFUN([OPENAFS_TIVOLI_TESTS],[
18 dnl check for tivoli
19 AC_MSG_CHECKING(for tivoli tsm butc support)
20-XBSA_CFLAGS=""
21-if test "$enable_tivoli_tsm" = "yes"; then
22- XBSADIR1=/usr/tivoli/tsm/client/api/bin/xopen
23- XBSADIR2=/opt/tivoli/tsm/client/api/bin/xopen
24- XBSADIR3=/usr/tivoli/tsm/client/api/bin/sample
25- XBSADIR4=/opt/tivoli/tsm/client/api/bin/sample
26- XBSADIR5=/usr/tivoli/tsm/client/api/bin64/sample
27- XBSADIR6=/opt/tivoli/tsm/client/api/bin64/sample
28-
29- if test -r "$XBSADIR3/dsmapifp.h"; then
30- XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I$XBSADIR3"
31- XBSA_XLIBS="-ldl"
32- AC_MSG_RESULT([yes, $XBSA_CFLAGS])
33- elif test -r "$XBSADIR4/dsmapifp.h"; then
34- XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I$XBSADIR4"
35- XBSA_XLIBS="-ldl"
36- AC_MSG_RESULT([yes, $XBSA_CFLAGS])
37- elif test -r "$XBSADIR5/dsmapifp.h"; then
38- XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I$XBSADIR5"
39- XBSA_XLIBS="-ldl"
40- AC_MSG_RESULT([yes, $XBSA_CFLAGS])
41- elif test -r "$XBSADIR6/dsmapifp.h"; then
42- XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I$XBSADIR6"
43- XBSA_XLIBS="-ldl"
44- AC_MSG_RESULT([yes, $XBSA_CFLAGS])
45- elif test -r "$XBSADIR1/xbsa.h"; then
46- XBSA_CFLAGS="-Dxbsa -I$XBSADIR1"
47- XBSA_XLIBS=""
48- AC_MSG_RESULT([yes, $XBSA_CFLAGS])
49- elif test -r "$XBSADIR2/xbsa.h"; then
50- XBSA_CFLAGS="-Dxbsa -I$XBSADIR2"
51- XBSA_XLIBS=""
52- AC_MSG_RESULT([yes, $XBSA_CFLAGS])
53- else
54- AC_MSG_RESULT([no, missing xbsa.h and dsmapifp.h header files])
55- fi
56-else
57- AC_MSG_RESULT([no])
58-fi
59+AC_MSG_RESULT([yes])
60 AC_SUBST(XBSA_CFLAGS)
61 AC_SUBST(XBSA_XLIBS)
62 XLIBS="$XBSA_XLIBS $XLIBS"