summaryrefslogtreecommitdiff
path: root/lib/tdb
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-04-13 21:33:04 +1000
committerAndrew Tridgell <tridge@samba.org>2010-04-13 23:03:27 +1000
commitc10d267a7620d53e34f79c2514849cd82a47b9aa (patch)
treeeff77c4b1036a66a4f313819b744adeedafcbb4c /lib/tdb
parent483d059c8e08473c9c9b27025bfb80f0d6b89c4a (diff)
downloadsamba-c10d267a7620d53e34f79c2514849cd82a47b9aa.tar.gz
samba-c10d267a7620d53e34f79c2514849cd82a47b9aa.tar.bz2
samba-c10d267a7620d53e34f79c2514849cd82a47b9aa.zip
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>
Diffstat (limited to 'lib/tdb')
-rw-r--r--lib/tdb/wscript11
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/tdb/wscript b/lib/tdb/wscript
index c5706a2f16..de62d4a758 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)