From 055f017b3693af95864f6595cf4ead041c389c52 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Thu, 1 Sep 2011 12:45:38 +1000 Subject: build: Reduce build systems to just top level waf and autoconf The s3-waf build system is a key component of the top level build, but with this commit is is no longer available directly. This reduces the number of build system combinations in master as we prepare for the Samba 4.0 release. Andrew Bartlett --- buildtools/wafsamba/samba3.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'buildtools/wafsamba/samba3.py') diff --git a/buildtools/wafsamba/samba3.py b/buildtools/wafsamba/samba3.py index b2a3655d13..1426029839 100644 --- a/buildtools/wafsamba/samba3.py +++ b/buildtools/wafsamba/samba3.py @@ -52,7 +52,7 @@ def s3_fix_kwargs(bld, kwargs): # the extra_includes list is relative to the source3 directory extra_includes = [ '.', 'include', 'lib', '../lib/tdb_compat' ] - if bld.env.use_intree_heimdal: + if not bld.CONFIG_SET("USING_SYSTEM_KRB5"): extra_includes += [ '../source4/heimdal/lib/com_err', '../source4/heimdal/lib/gssapi', '../source4/heimdal_build' ] -- cgit