summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorAlexander Bokovoy <ab@samba.org>2012-05-28 19:03:00 +0300
committerAlexander Bokovoy <ab@samba.org>2012-05-28 23:40:30 +0200
commit27503cea09f207be23679162e9570ef40ee7fe61 (patch)
treede9d6d6a61f9d7e80b5f395763ff9e927d3ea793 /source3
parente4c59a66aa8ea113c38cc9c2f04a825983ee4fdc (diff)
downloadsamba-27503cea09f207be23679162e9570ef40ee7fe61.tar.gz
samba-27503cea09f207be23679162e9570ef40ee7fe61.tar.bz2
samba-27503cea09f207be23679162e9570ef40ee7fe61.zip
freebsd9: support both WAF MIT krb5 build and autoconf build against MIT krb5
System-provided Heimdal Kerberos in FreeBSD 9 lacks proper support for parsing MS PAC. This leaves us with MIT krb5 package from ports or embedded Heimdal in source4. MIT krb5 from ports is 1.9.2, it supports all needed features for AD support in smbd, as well as WAF MIT krb5 build. In order to use it, one needs to install 'krb5' package. Autoconf build: --with-krb5=/usr/local WAF build: --with-system-mitkrb5 /usr/local or otherwise krb5-config from system Heimdal will overtake and break the detection, leaving you with a mixture of Kerberos libraries from different locations. WAF build accepts multiple paths as sub-arguments of the --with-system-mitkrb5 and searches through them for krb5-config, i.e. /usr/local /usr/kerberos ... Autobuild-User: Alexander Bokovoy <ab@samba.org> Autobuild-Date: Mon May 28 23:40:30 CEST 2012 on sn-devel-104
Diffstat (limited to 'source3')
-rw-r--r--source3/m4/aclocal.m41
1 files changed, 1 insertions, 0 deletions
diff --git a/source3/m4/aclocal.m4 b/source3/m4/aclocal.m4
index a4db42e5ca..5d9ce30144 100644
--- a/source3/m4/aclocal.m4
+++ b/source3/m4/aclocal.m4
@@ -412,6 +412,7 @@ AC_DEFUN(LIB_REMOVE_USR_LIB,[
-Wl,-rpath-Wl,/usr/lib/) l="";;
-Wl,-rpath-Wl,/usr/lib64) l="";;
-Wl,-rpath-Wl,/usr/lib64/) l="";;
+ -rpath=/usr/lib:*) l="-rpath=${i#-rpath=*:}";;
*)
s=" "
if test x"[$]ac_new_flags" = x""; then