summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2010-08-11 12:45:51 +0200
committerGünther Deschner <gd@samba.org>2010-08-11 12:47:57 +0200
commitc43e832c5160fbffb31ddd64b43dbbc8124b1ca0 (patch)
treeec424500a1d305ec4ed0839494f515336bed378e /source3
parent03bfd4290f70ab2de46ccd82a429fda57c8c6bb9 (diff)
downloadsamba-c43e832c5160fbffb31ddd64b43dbbc8124b1ca0.tar.gz
samba-c43e832c5160fbffb31ddd64b43dbbc8124b1ca0.tar.bz2
samba-c43e832c5160fbffb31ddd64b43dbbc8124b1ca0.zip
s3-waf: fix the waf build with more recent MIT krb5 libs.
(such as MIT krb5 1.7.1 on fedora 13). This whole area needs more work and love later, for now it builds at least. Kai, please check. Guenther
Diffstat (limited to 'source3')
-rw-r--r--source3/wscript3
-rw-r--r--source3/wscript_build2
2 files changed, 4 insertions, 1 deletions
diff --git a/source3/wscript b/source3/wscript
index 66bddcf858..b61d110667 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -542,11 +542,14 @@ return 0;
headers='krb5.h stdlib.h', lib='krb5',
addmain=False, cflags='-Werror',
msg="Checking whether krb5_enctype_to_string takes krb5_context argument")
+ conf.DEFINE('HAVE_KRB5', '1')
else:
conf.SET_TARGET_TYPE('krb5', 'EMPTY')
conf.SET_TARGET_TYPE('gssapi', 'EMPTY')
conf.SET_TARGET_TYPE('gssapi_krb5', 'EMPTY')
+ conf.SET_TARGET_TYPE('com_err', 'EMPTY')
+ conf.SET_TARGET_TYPE('k5crypto', 'EMPTY')
if Options.options.with_utmp:
conf.CHECK_FUNCS('pututline pututxline updwtmp updwtmpx getutmpx getutxent')
diff --git a/source3/wscript_build b/source3/wscript_build
index 7f5414d4c1..3a9e17d742 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -911,7 +911,7 @@ bld.SAMBA_SUBSYSTEM('POPT_SAMBA',
bld.SAMBA_SUBSYSTEM('KRBCLIENT',
source=KRBCLIENT_SRC,
- deps='krb5 gssapi gssapi_krb5',
+ deps='krb5 k5crypto com_err gssapi gssapi_krb5',
vars=locals())
bld.SAMBA_SUBSYSTEM('LIBS',