diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2010-10-23 20:41:27 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2010-10-23 19:24:25 +0000 |
| commit | c25afb6aa16b3e527c6050985e9aeaca0beec355 (patch) | |
| tree | 6d60659c1a6e5354019b72a38cf98d90ee185f36 | |
| parent | 9a2f83a86ae9068c9c63b0c701f5625d19114028 (diff) | |
| download | samba-c25afb6aa16b3e527c6050985e9aeaca0beec355.tar.gz samba-c25afb6aa16b3e527c6050985e9aeaca0beec355.tar.bz2 samba-c25afb6aa16b3e527c6050985e9aeaca0beec355.zip | |
ldb: Support using system pyldb library.
Autobuild-User: Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date: Sat Oct 23 19:24:25 UTC 2010 on sn-devel-104
| -rw-r--r-- | source4/lib/ldb/wscript | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/source4/lib/ldb/wscript b/source4/lib/ldb/wscript index 7a233d4a9d..e67ff9482f 100644 --- a/source4/lib/ldb/wscript +++ b/source4/lib/ldb/wscript @@ -46,6 +46,10 @@ def configure(conf): onlyif='talloc tdb tevent', implied_deps='replace talloc tdb tevent'): conf.define('USING_SYSTEM_LDB', 1) + if conf.CHECK_BUNDLED_SYSTEM('pyldb', minversion=VERSION, + onlyif='talloc tdb tevent ldb', + implied_deps='replace talloc tdb tevent ldb'): + conf.define('USING_SYSTEM_PYLDB', 1) if conf.env.standalone_ldb: conf.CHECK_XSLTPROC_MANPAGES() @@ -101,14 +105,14 @@ def build(bld): bld.env.PACKAGE_VERSION = VERSION bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig' - - bld.SAMBA_LIBRARY('pyldb_util', - deps='ldb', - source='pyldb_util.c', - public_headers='pyldb.h', - vnum=VERSION, - pc_files='pyldb.pc', - pyext=True) + if not bld.CONFIG_SET('USING_SYSTEM_PYLDB'): + bld.SAMBA_LIBRARY('pyldb_util', + deps='ldb', + source='pyldb_util.c', + public_headers='pyldb.h', + vnum=VERSION, + pc_files='pyldb.pc', + pyext=True) if not bld.CONFIG_SET('USING_SYSTEM_LDB'): if Options.is_install: |