diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-04-13 21:33:04 +1000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-04-13 23:03:27 +1000 |
| commit | c10d267a7620d53e34f79c2514849cd82a47b9aa (patch) | |
| tree | eff77c4b1036a66a4f313819b744adeedafcbb4c | |
| parent | 483d059c8e08473c9c9b27025bfb80f0d6b89c4a (diff) | |
| download | samba-c10d267a7620d53e34f79c2514849cd82a47b9aa.tar.gz | |
s4-waf: don't try to use the system lib for the library build
when building library FOO, don't try to find the system library FOO
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
| -rw-r--r-- | lib/talloc/wscript | 9 | ||||
| -rw-r--r-- | lib/tdb/wscript | 11 | ||||
| -rw-r--r-- | source4/lib/ldb/wscript | 10 |
3 files changed, 17 insertions, 13 deletions
diff --git a/lib/talloc/wscript b/lib/talloc/wscript index bd47be8eaab..f6170effe47 100644 --- a/lib/talloc/wscript +++ b/lib/talloc/wscript @@ -33,12 +33,13 @@ def set_options(opt): def configure(conf): conf.RECURSE('lib/replace') - if conf.CHECK_BUNDLED_SYSTEM('talloc', minversion=VERSION, - implied_deps='replace'): - conf.define('USING_SYSTEM_TALLOC', 1) - conf.env.standalone_talloc = conf.IN_LAUNCH_DIR() + if not conf.env.standalone_talloc: + if conf.CHECK_BUNDLED_SYSTEM('talloc', minversion=VERSION, + implied_deps='replace'): + conf.define('USING_SYSTEM_TALLOC', 1) + conf.env.TALLOC_COMPAT1 = Options.options.TALLOC_COMPAT1 if conf.env.standalone_talloc: diff --git a/lib/tdb/wscript b/lib/tdb/wscript index c5706a2f161..de62d4a7581 100644 --- a/lib/tdb/wscript +++ b/lib/tdb/wscript @@ -30,11 +30,13 @@ def set_options(opt): def configure(conf): conf.RECURSE('lib/replace') - if conf.CHECK_BUNDLED_SYSTEM('tdb', minversion=VERSION, - implied_deps='replace'): - conf.define('USING_SYSTEM_TDB', 1) - conf.env.standalone_tdb = conf.IN_LAUNCH_DIR() + + if not conf.env.standalone_tdb: + if conf.CHECK_BUNDLED_SYSTEM('tdb', minversion=VERSION, + implied_deps='replace'): + conf.define('USING_SYSTEM_TDB', 1) + conf.env.disable_python = getattr(Options.options, 'disable_python', False) if conf.env.standalone_tdb: @@ -93,7 +95,6 @@ def build(bld): if bld.env.standalone_tdb: bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig' - bld.env.TALLOC_VERSION = VERSION bld.PKG_CONFIG_FILES('tdb.pc', vnum=VERSION) bld.INSTALL_FILES('${INCLUDEDIR}', 'include/tdb.h', flat=True) diff --git a/source4/lib/ldb/wscript b/source4/lib/ldb/wscript index d796bc00116..ea0219ff4bb 100644 --- a/source4/lib/ldb/wscript +++ b/source4/lib/ldb/wscript @@ -37,12 +37,14 @@ def configure(conf): s4_build = getattr(conf.env, '_SAMBA_BUILD_', 0) == 4 + conf.env.standalone_ldb = conf.IN_LAUNCH_DIR() if not s4_build: - if conf.CHECK_BUNDLED_SYSTEM('ldb', minversion=VERSION, - onlyif='talloc tdb tevent', - implied_deps='replace talloc tdb tevent'): - conf.define('USING_SYSTEM_LDB', 1) + if not conf.env.standalone_ldb: + if conf.CHECK_BUNDLED_SYSTEM('ldb', minversion=VERSION, + onlyif='talloc tdb tevent', + implied_deps='replace talloc tdb tevent'): + conf.define('USING_SYSTEM_LDB', 1) # we need this for the ldap backend if conf.CHECK_FUNCS_IN('ber_flush ldap_open', 'lber ldap', headers='lber.h ldap.h'): conf.env.ENABLE_LDAP_BACKEND = True |