summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2010-10-04 13:38:39 +0200
committerJelmer Vernooij <jelmer@samba.org>2010-10-04 13:52:09 +0200
commite805bf52c9ed32bd53759996b5700c5d582a2a58 (patch)
tree21d323034da2ab19a6b3c3aca42c02d9824ba332
parente604532b495a82da09f3a5dea5fc2a0aa59590f7 (diff)
downloadsamba-e805bf52c9ed32bd53759996b5700c5d582a2a58.tar.gz
samba-e805bf52c9ed32bd53759996b5700c5d582a2a58.tar.bz2
samba-e805bf52c9ed32bd53759996b5700c5d582a2a58.zip
tdb: Support using system pytdb.
-rw-r--r--lib/tdb/wscript17
1 files changed, 9 insertions, 8 deletions
diff --git a/lib/tdb/wscript b/lib/tdb/wscript
index d9c0ceb41b..bbd270095c 100644
--- a/lib/tdb/wscript
+++ b/lib/tdb/wscript
@@ -36,6 +36,8 @@ def configure(conf):
if conf.CHECK_BUNDLED_SYSTEM('tdb', minversion=VERSION,
implied_deps='replace'):
conf.define('USING_SYSTEM_TDB', 1)
+ if conf.CHECK_BUNDLED_SYSTEM_PYTHON('pytdb', 'tdb', minversion=VERSION):
+ conf.define('USING_SYSTEM_PYTDB', 1)
conf.env.disable_python = getattr(Options.options, 'disable_python', False)
@@ -92,14 +94,13 @@ def build(bld):
'tools/tdbtool.c',
'tdb', manpages='manpages/tdbtool.8')
- s4_build = getattr(bld.env, '_SAMBA_BUILD_', 0) == 4
-
- bld.SAMBA_PYTHON('pytdb',
- 'pytdb.c',
- deps='tdb',
- enabled=not bld.env.disable_python,
- realname='tdb.so',
- cflags='-DPACKAGE_VERSION=\"%s\"' % VERSION)
+ if not bld.CONFIG_SET('USING_SYSTEM_PYTDB'):
+ bld.SAMBA_PYTHON('pytdb',
+ 'pytdb.c',
+ deps='tdb',
+ enabled=not bld.env.disable_python,
+ realname='tdb.so',
+ cflags='-DPACKAGE_VERSION=\"%s\"' % VERSION)
if bld.env.standalone_tdb:
bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig'