summaryrefslogtreecommitdiff
path: root/buildtools/wafsamba/samba3.py
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-09-01 12:45:38 +1000
committerAndrew Bartlett <abartlet@samba.org>2011-10-07 17:42:03 +1100
commit055f017b3693af95864f6595cf4ead041c389c52 (patch)
tree9e59e56dc7dc3345722bf678027db66a75eb1062 /buildtools/wafsamba/samba3.py
parent83f0dc44a70ed7e49bcee3718ff17b2063b2a01e (diff)
downloadsamba-055f017b3693af95864f6595cf4ead041c389c52.tar.gz
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
Diffstat (limited to 'buildtools/wafsamba/samba3.py')
-rw-r--r--buildtools/wafsamba/samba3.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/buildtools/wafsamba/samba3.py b/buildtools/wafsamba/samba3.py
index b2a3655d133..14260298397 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' ]