diff options
| author | Andreas Schneider <asn@samba.org> | 2017-11-07 10:51:11 +0100 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2017-11-25 10:14:13 +0100 |
| commit | 22bf36c85ae11cd280a58729348c76032910dc16 (patch) | |
| tree | bf049502c4c965c34e54053e2a0afa7323f01bf4 /ctdb | |
| parent | 6cf7abbcfdad84fee57852862ebe44aa6115ca25 (diff) | |
| download | samba-22bf36c85ae11cd280a58729348c76032910dc16.tar.gz | |
build: Move socket_wrapper to third_party
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>
Diffstat (limited to 'ctdb')
| -rw-r--r-- | ctdb/wscript | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/ctdb/wscript b/ctdb/wscript index fdd187b7d26..f5a248191d2 100644 --- a/ctdb/wscript +++ b/ctdb/wscript @@ -30,7 +30,7 @@ default_prefix = Options.default_prefix = '/usr/local' samba_dist.DIST_DIRS('''ctdb:. lib/replace:lib/replace lib/talloc:lib/talloc lib/tevent:lib/tevent lib/tdb:lib/tdb - lib/socket_wrapper:lib/socket_wrapper + third_party/socket_wrapper:third_party/socket_wrapper third_party/popt:third_party/popt lib/util:lib/util lib/tdb_wrap:lib/tdb_wrap lib/ccan:lib/ccan libcli/util:libcli/util @@ -112,20 +112,29 @@ def configure(conf): if conf.CHECK_FOR_THIRD_PARTY(): conf.RECURSE('third_party/popt') + if conf.env.standalone_ctdb or conf.CONFIG_GET('ENABLE_SELFTEST'): + conf.RECURSE('third_party/socket_wrapper') + conf.env.SOCKET_WRAPPER_SO_PATH = conf.CONFIG_GET('LIBSOCKET_WRAPPER_SO_PATH') else: if not conf.CHECK_POPT(): raise Utils.WafError('popt development packages have not been found\nIf third_party is installed, check that it is in the proper place.') else: conf.define('USING_SYSTEM_POPT', 1) + conf.env.SOCKET_WRAPPER_SO_PATH = '' + + + if conf.env.standalone_ctdb or conf.CONFIG_GET('ENABLE_SELFTEST'): + if not conf.CHECK_SOCKET_WRAPPER(): + raise Utils.WafError('socket_wrapper package has not been found.\nIf third_party is installed, check that it is in the proper place.') + else: + conf.define('USING_SYSTEM_SOCKET_WRAPPER', 1) + conf.env.SOCKET_WRAPPER_SO_PATH = conf.CONFIG_GET('LIBSOCKET_WRAPPER_SO_PATH') conf.RECURSE('lib/util') conf.RECURSE('lib/talloc') conf.RECURSE('lib/tevent') conf.RECURSE('lib/tdb') - if conf.env.standalone_ctdb or conf.CONFIG_GET('ENABLE_SELFTEST'): - conf.RECURSE('lib/socket_wrapper') - conf.env.SOCKET_WRAPPER_SO_PATH = conf.CONFIG_GET('LIBSOCKET_WRAPPER_SO_PATH') conf.CHECK_HEADERS('sched.h') conf.CHECK_HEADERS('procinfo.h') @@ -315,6 +324,8 @@ def build(bld): bld.RECURSE('lib/replace') if bld.CHECK_FOR_THIRD_PARTY(): bld.RECURSE('third_party/popt') + if bld.env.standalone_ctdb or bld.CONFIG_GET('SOCKET_WRAPPER'): + bld.RECURSE('third_party/socket_wrapper') bld.RECURSE('lib/tdb_wrap') bld.RECURSE('lib/util') @@ -323,8 +334,6 @@ def build(bld): bld.RECURSE('lib/talloc') bld.RECURSE('lib/tevent') bld.RECURSE('lib/tdb') - if bld.env.standalone_ctdb or bld.CONFIG_GET('SOCKET_WRAPPER'): - bld.RECURSE('lib/socket_wrapper') if bld.env.standalone_ctdb: # If a combined build is implemented, CTDB will want to |