[SCM] Samba Shared Repository - branch master updated

[Kai Blin]

The branch, master has been updated
       via  136ea7b... s3-waf: Actually make --with/--without-swat work
       via  c926acf... s3-waf: Really disable winbindd build when --without-winbind is specified
      from  2bbf055... Make -k a simple non-bool option.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 136ea7b91d0a712bf78ee325f06ab2d75f712507
Author: Kai Blin <kai at samba.org>
Date:   Thu May 20 23:05:21 2010 +0200

    s3-waf: Actually make --with/--without-swat work

commit c926acf7f1b49191b18f04a9caf484d8ef1033b9
Author: Kai Blin <kai at samba.org>
Date:   Thu May 20 22:58:59 2010 +0200

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

-----------------------------------------------------------------------

Summary of changes:
 source3/wscript       |    4 ++++
 source3/wscript_build |    4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/wscript b/source3/wscript
index 30736ad..a58c524 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
 
@@ -317,6 +320,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 222dab6..636091e 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())
 
@@ -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())
 


-- 
Samba Shared Repository