summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorKai Blin <kai@samba.org>2010-05-20 23:05:21 +0200
committerKai Blin <kai@samba.org>2010-05-21 00:15:52 +0200
commit136ea7b91d0a712bf78ee325f06ab2d75f712507 (patch)
treeb4861084f492b039abcf7f221e062dffa1bef76e /source3
parentc926acf7f1b49191b18f04a9caf484d8ef1033b9 (diff)
downloadsamba-136ea7b91d0a712bf78ee325f06ab2d75f712507.tar.gz
samba-136ea7b91d0a712bf78ee325f06ab2d75f712507.tar.bz2
samba-136ea7b91d0a712bf78ee325f06ab2d75f712507.zip
s3-waf: Actually make --with/--without-swat work
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 a50510739d..a58c524cb5 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -62,6 +62,9 @@ def configure(conf):
if Options.options.developer:
conf.ADD_CFLAGS('-DDEVELOPER -DDEBUG_PASSWORD')
+ if Options.options.with_swat:
+ conf.env['build_swat'] = True
+
# set a limit on recursing in the waf preprocessor
conf.env.preprocessor_recursion_limit = 10
diff --git a/source3/wscript_build b/source3/wscript_build
index 04f47dd170..636091e243 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -931,7 +931,7 @@ bld.SAMBA_BINARY('web/swat',
source=SWAT_SRC,
deps='''talloc tevent cap DYNCONFIG LIBS LIBSMB LIBWBCLIENT PARAM
LIB_NONSMBD resolv PASSDB POPT_SAMBA KRBCLIENT''',
- enabled=Options.options.with_swat,
+ enabled=bld.env.build_swat,
install_path='${SBINDIR}',
vars=locals())