From c43e832c5160fbffb31ddd64b43dbbc8124b1ca0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?G=C3=BCnther=20Deschner?= Date: Wed, 11 Aug 2010 12:45:51 +0200 Subject: [PATCH] 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 --- source3/wscript | 3 +++ source3/wscript_build | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/source3/wscript b/source3/wscript index 66bddcf8580..b61d1106676 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 7f5414d4c1f..3a9e17d7427 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', -- 2.34.1