summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorKai Blin <kai@samba.org>2010-05-20 22:58:59 +0200
committerKai Blin <kai@samba.org>2010-05-21 00:15:52 +0200
commitc926acf7f1b49191b18f04a9caf484d8ef1033b9 (patch)
tree769efb44930304fa84873c54b06c51a38c56210b /source3
parent2bbf055dbb15ea99b80ae66adc906ad5494a3999 (diff)
downloadsamba-c926acf7f1b49191b18f04a9caf484d8ef1033b9.tar.gz
samba-c926acf7f1b49191b18f04a9caf484d8ef1033b9.tar.bz2
samba-c926acf7f1b49191b18f04a9caf484d8ef1033b9.zip
s3-waf: Really disable winbindd build when --without-winbind is specified
Diffstat (limited to 'source3')
-rw-r--r--source3/wscript1
-rw-r--r--source3/wscript_build2
2 files changed, 2 insertions, 1 deletions
diff --git a/source3/wscript b/source3/wscript
index 30736ad209..a50510739d 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -317,6 +317,7 @@ updwtmp updwtmpx utimensat vsyslog _write __write __xstat
conf.env[shared_env].append('%s' % entry.upper())
if Options.options.with_winbind:
+ conf.env.build_winbind = True
conf.DEFINE('WITH_WINBIND', '1')
#FIXME: Should just be set when krb5 and ldap requirements are fulfilled
diff --git a/source3/wscript_build b/source3/wscript_build
index 222dab6837..04f47dd170 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -923,7 +923,7 @@ bld.SAMBA_BINARY('winbindd/winbindd',
deps='''talloc tdb tevent cap dl DYNCONFIG ZLIB NSS_WRAPPER
LIBWBCLIENT PASSDB ldap resolv PARAM LIB_NONSMBD LIBSMB
POPT_SAMBA KRBCLIENT''',
- enabled=Options.options.with_winbind,
+ enabled=bld.env.build_winbind,
install_path='${SBINDIR}',
vars=locals())