From: Russ Allbery <rra@debian.org>
Date: Thu, 12 Feb 2009 18:37:25 +0000 (-0800)
Subject: Merge branch 'upstream' into bug/compiler-flags
X-Git-Tag: debian/1.4.8.dfsg1-1~37^2
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=9d3cef3411af638d94bf8fd260be51a9951263c8;p=packages%2Fo%2Fopenafs.git

Merge branch 'upstream' into bug/compiler-flags

Conflicts:

	src/cf/osconf.m4
---

9d3cef3411af638d94bf8fd260be51a9951263c8
diff --cc src/cf/osconf.m4
index f66ed066b,f4b25a79f..88841e879
--- a/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