jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-18 06:50:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add XBSA_XLIBS to XLIBS after it’s computed

Browse Source 
Commit 353aa7ef2c (after 1.6 was
branched) reordered things such that XBSA_XLIBS was being added to
XLIBS before it was computed, which caused link failures with
--enable-tivoli-tsm.

Change-Id: I791add1b916c845d975d1ee21652c13244c50736
Reviewed-on: http://gerrit.openafs.org/11959
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
This commit is contained in:
Anders Kaseorg 2015-08-01 03:58:19 -04:00 committed by Benjamin Kaduk
parent ac39d879f8
commit 8f78afa65b
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
acinclude.m4
View File

@ -1445,6 +1445,7 @@ else
fi
AC_SUBST(XBSA_CFLAGS)
AC_SUBST(XBSA_XLIBS)
XLIBS="$XBSA_XLIBS $XLIBS"
dnl checks for header files.
AC_HEADER_STDC

12
src/cf/osconf.m4
View File

@ -6,7 +6,7 @@ RXDEBUG="-DRXDEBUG"
SHLIB_SUFFIX="so"
CCOBJ="\$(CC)"
MT_CC="\$(CC)"
XLIBS="${LIB_AFSDB} ${XBSA_XLIBS} ${LIB_libintl}"
XLIBS="${LIB_AFSDB} ${LIB_libintl}"
MT_LIBS='-lpthread ${XLIBS}'
XCFLAGS=
@ -287,7 +287,7 @@ case $AFS_SYSNAME in
EXTRA_VLIBOBJS="fstab.o"
SHLIB_LINKER="${CC} \${ARCHFLAGS} -dynamiclib"
SHLIB_SUFFIX="dylib"
XLIBS="${LIB_AFSDB} ${XBSA_XLIBS} -framework CoreFoundation"
XLIBS="${LIB_AFSDB} -framework CoreFoundation"
;;
*_darwin_80)
@ -304,7 +304,7 @@ case $AFS_SYSNAME in
SHLIB_LINKER="${CC} \${ARCHFLAGS} -dynamiclib"
SHLIB_SUFFIX="dylib"
RANLIB="ranlib -c"
XLIBS="${LIB_AFSDB} ${XBSA_XLIBS} -framework CoreFoundation"
XLIBS="${LIB_AFSDB} -framework CoreFoundation"
;;
*_darwin_90)
@ -321,7 +321,7 @@ case $AFS_SYSNAME in
SHLIB_LINKER="${CC} \${ARCHFLAGS} -dynamiclib"
SHLIB_SUFFIX="dylib"
RANLIB="ranlib -c"
XLIBS="${LIB_AFSDB} ${XBSA_XLIBS} -framework CoreFoundation"
XLIBS="${LIB_AFSDB} -framework CoreFoundation"
;;
arm_darwin_100)
@ -341,7 +341,7 @@ case $AFS_SYSNAME in
SHLIB_LINKER="${CC} -dynamiclib"
SHLIB_SUFFIX="dylib"
RANLIB="ranlib"
XLIBS="${LIB_AFSDB} ${XBSA_XLIBS} -framework CoreFoundation"
XLIBS="${LIB_AFSDB} -framework CoreFoundation"
;;
*_darwin_100 | *_darwin_110 | *_darwin_120 | *_darwin_130 | *_darwin_140 )
@ -360,7 +360,7 @@ case $AFS_SYSNAME in
SHLIB_LINKER="${CC} \${ARCHFLAGS} -dynamiclib"
SHLIB_SUFFIX="dylib"
RANLIB="ranlib"
XLIBS="${LIB_AFSDB} ${XBSA_XLIBS} -framework CoreFoundation"
XLIBS="${LIB_AFSDB} -framework CoreFoundation"
;;
ppc_linux*)