Merge branch 'upstream' into bug/compiler-flags

Conflicts:

	src/cf/osconf.m4

diff --cc src/cf/osconf.m4
index f66ed066b86e87583351253d99343afc74452156,f4b25a79fb1d0257609e137d64f0821bf0b02457..88841e879762ff1d3663d9214314b6a12ac97c24
--- 1/src/cf/osconf.m4
--- 2/src/cf/osconf.m4
+++ b/src/cf/osconf.m4
@@@ -4,9 -4,10 +4,9 @@@ AC_DEFUN([OPENAFS_OSCONF], 
  dnl defaults, override in case below as needed
  XCFLAGS='${DBG} ${OPTMZ}'
  SHLIB_SUFFIX="so"
 -CC="cc"
 -CCOBJ="cc"
 -MT_CC="cc"
 +CCOBJ=$CC
 +MT_CC=$CC
- XLIBS="${LIB_AFSDB}"
+ XLIBS="${LIB_AFSDB} ${XBSA_XLIBS}"
  
  dnl debugging and optimization flag defaults
  dnl Note, these are all the defaults for if debug/optimize turned on, and