The branch, master has been updated
via 44aff1a ctdb-build: Use socket_wrapper only with selftest
from d493ec1 s4: torture: Fix directory test against a server that
actually uses index returns.
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 44aff1a1647b2a5e21b06750515410eb3ca03ab1
Author: Mathieu Parent <[email protected]>
Date: Thu Sep 24 04:39:17 2015 +0200
ctdb-build: Use socket_wrapper only with selftest
Signed-off-by: Mathieu Parent <[email protected]>
Reviewed-by: Amitay Isaacs <[email protected]>
Reviewed-by: Andreas Schneider <[email protected]>
Autobuild-User(master): Amitay Isaacs <[email protected]>
Autobuild-Date(master): Sat Sep 26 16:52:28 CEST 2015 on sn-devel-104
-----------------------------------------------------------------------
Summary of changes:
ctdb/wscript | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/ctdb/wscript b/ctdb/wscript
index 188295d..e04891b 100755
--- a/ctdb/wscript
+++ b/ctdb/wscript
@@ -107,7 +107,8 @@ def configure(conf):
conf.RECURSE('lib/talloc')
conf.RECURSE('lib/tevent')
conf.RECURSE('lib/tdb')
- conf.RECURSE('lib/socket_wrapper')
+ if conf.env.standalone_ctdb or conf.CONFIG_GET('ENABLE_SELFTEST'):
+ conf.RECURSE('lib/socket_wrapper')
conf.CHECK_HEADERS('sched.h')
conf.CHECK_HEADERS('procinfo.h')
@@ -269,7 +270,8 @@ def build(bld):
bld.RECURSE('lib/talloc')
bld.RECURSE('lib/tevent')
bld.RECURSE('lib/tdb')
- bld.RECURSE('lib/socket_wrapper')
+ if bld.env.standalone_ctdb or bld.CONFIG_GET('SOCKET_WRAPPER'):
+ bld.RECURSE('lib/socket_wrapper')
if bld.env.standalone_ctdb:
# In a combined build is implemented, CTDB will wanted to
--
Samba Shared Repository
