summaryrefslogtreecommitdiff
path: root/buildtools/wafsamba
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
parent83f0dc44a70ed7e49bcee3718ff17b2063b2a01e (diff)
downloadsamba-055f017b3693af95864f6595cf4ead041c389c52.tar.gz
samba-055f017b3693af95864f6595cf4ead041c389c52.tar.bz2
samba-055f017b3693af95864f6595cf4ead041c389c52.zip
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')
-rw-r--r--buildtools/wafsamba/samba3.py2
-rw-r--r--buildtools/wafsamba/samba_autoconf.py3
2 files changed, 2 insertions, 3 deletions
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' ]
diff --git a/buildtools/wafsamba/samba_autoconf.py b/buildtools/wafsamba/samba_autoconf.py
index 207d7320b9..909e836fdb 100644
--- a/buildtools/wafsamba/samba_autoconf.py
+++ b/buildtools/wafsamba/samba_autoconf.py
@@ -599,8 +599,7 @@ def SAMBA_CONFIG_H(conf, path=None):
# we add these here to ensure that -Wstrict-prototypes is not set during configure
conf.ADD_CFLAGS('-Wall -g -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-align -Wwrite-strings -Werror-implicit-function-declaration -Wformat=2 -Wno-format-y2k -Wmissing-prototypes -fno-common',
testflags=True)
- if os.getenv('TOPLEVEL_BUILD'):
- conf.ADD_CFLAGS('-Wcast-qual', testflags=True)
+ conf.ADD_CFLAGS('-Wcast-qual', testflags=True)
conf.env.DEVELOPER_MODE = True
if Options.options.picky_developer: