s3-waf: Really disable winbindd build when --without-winbind is specified

diff --git a/source3/wscript b/source3/wscript
index 30736ad2095a93b3c3a3ebee42b098c5a98f2c53..a50510739d83da3ba1c2b5972f46a1636bdca3ca 100644 (file)
--- 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 222dab68372a32470ecebed0b0582ea4c62f05db..04f47dd1707f4c44f4048101a5848cd99159520f 100644 (file)
--- 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())