From c0a463d94abb5c50eaca7b1d402c979684f96a97 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Mon, 23 Feb 2015 17:12:46 +0100 Subject: [PATCH] waf: Only build the wrappers if we enable selftest Signed-off-by: Andreas Schneider Reviewed-by: Michael Adam Autobuild-User(master): Andreas Schneider Autobuild-Date(master): Mon Feb 23 22:31:22 CET 2015 on sn-devel-104 --- wscript | 9 +++++---- wscript_build | 13 +++++++++---- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/wscript b/wscript index d5a4ccb7bac..2644cbc1328 100644 --- a/wscript +++ b/wscript @@ -156,16 +156,17 @@ def configure(conf): conf.RECURSE('lib/ntdb') conf.RECURSE('lib/util/charset') conf.RECURSE('source4/auth') - conf.RECURSE('lib/nss_wrapper') conf.RECURSE('nsswitch') - conf.RECURSE('lib/resolv_wrapper') - conf.RECURSE('lib/socket_wrapper') - conf.RECURSE('lib/uid_wrapper') conf.RECURSE('lib/subunit/c') conf.RECURSE('libcli/smbreadline') conf.RECURSE('lib/crypto') conf.RECURSE('pidl') conf.RECURSE('selftest') + if conf.CONFIG_GET('ENABLE_SELFTEST'): + conf.RECURSE('lib/nss_wrapper') + conf.RECURSE('lib/resolv_wrapper') + conf.RECURSE('lib/socket_wrapper') + conf.RECURSE('lib/uid_wrapper') conf.RECURSE('source3') conf.RECURSE('lib/texpect') if conf.env.with_ctdb: diff --git a/wscript_build b/wscript_build index fc4197441f4..d0fa87b81ea 100644 --- a/wscript_build +++ b/wscript_build @@ -2,6 +2,7 @@ # top level waf build script for samba4 +import Options import os srcdir = "." @@ -70,10 +71,14 @@ bld.RECURSE('source4/lib/messaging') bld.RECURSE('source4/lib/events') bld.RECURSE('source4/lib/cmdline') bld.RECURSE('source4/lib/http') -bld.RECURSE('lib/socket_wrapper') -bld.RECURSE('lib/resolv_wrapper') -bld.RECURSE('lib/nss_wrapper') -bld.RECURSE('lib/uid_wrapper') +if bld.CONFIG_GET('NSS_WRAPPER'): + bld.RECURSE('lib/nss_wrapper') +if bld.CONFIG_GET('SOCKET_WRAPPER'): + bld.RECURSE('lib/socket_wrapper') +if bld.CONFIG_GET('RESOLV_WRAPPER'): + bld.RECURSE('lib/resolv_wrapper') +if bld.CONFIG_GET('UID_WRAPPER'): + bld.RECURSE('lib/uid_wrapper') if bld.CHECK_FOR_THIRD_PARTY(): bld.RECURSE('third_party') bld.RECURSE('source4/lib/stream') -- 2.34.1