From 136ea7b91d0a712bf78ee325f06ab2d75f712507 Mon Sep 17 00:00:00 2001
From: Kai Blin <kai@samba.org>
Date: Thu, 20 May 2010 23:05:21 +0200
Subject: [PATCH] s3-waf: Actually make --with/--without-swat work

---
 source3/wscript       | 3 +++
 source3/wscript_build | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/source3/wscript b/source3/wscript
index a50510739d8..a58c524cb5b 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 04f47dd1707..636091e2435 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())
 
-- 
2.11.4.GIT