summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2015-01-21 02:58:49 +0100
committerAndreas Schneider <asn@cryptomilk.org>2015-02-17 15:41:11 +0100
commitfcf4a891945b22dc6eccdc71fd441f1a879f556a (patch)
treef1890de1c6d65da010039480c280dc99ab19c8d5 /lib
parent92e21167c32bb67f0a3c97b1e64e4372cb069e06 (diff)
downloadsamba-fcf4a891945b22dc6eccdc71fd441f1a879f556a.tar.gz
samba-fcf4a891945b22dc6eccdc71fd441f1a879f556a.tar.xz
samba-fcf4a891945b22dc6eccdc71fd441f1a879f556a.zip
Force rebuild of ldb if pyldb-util is not available.
This is necessary since pyldb-util uses ldb_private.h, so we want to build against the same source ldb. Change-Id: I802974b9eef7deb102fea15b67ec5f87e8e353bd Signed-off-by: Jelmer Vernooij <jelmer@samba.org> Reviewed-by: Andreas Schneider <asn@samba.org>
Diffstat (limited to 'lib')
-rwxr-xr-xlib/ldb/wscript8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/ldb/wscript b/lib/ldb/wscript
index 514db88b57..1067a00ec6 100755
--- a/lib/ldb/wscript
+++ b/lib/ldb/wscript
@@ -55,14 +55,14 @@ def configure(conf):
conf.env.standalone_ldb = conf.IN_LAUNCH_DIR()
if not conf.env.standalone_ldb:
- if conf.CHECK_BUNDLED_SYSTEM_PKG('ldb', minversion=VERSION,
- onlyif='talloc tdb tevent',
- implied_deps='replace talloc tdb tevent'):
- conf.define('USING_SYSTEM_LDB', 1)
if conf.CHECK_BUNDLED_SYSTEM_PKG('pyldb-util', minversion=VERSION,
onlyif='talloc tdb tevent ldb',
implied_deps='replace talloc tdb tevent ldb'):
conf.define('USING_SYSTEM_PYLDB_UTIL', 1)
+ if conf.CHECK_BUNDLED_SYSTEM_PKG('ldb', minversion=VERSION,
+ onlyif='talloc tdb tevent',
+ implied_deps='replace talloc tdb tevent'):
+ conf.define('USING_SYSTEM_LDB', 1)
if conf.env.standalone_ldb:
conf.CHECK_XSLTPROC_MANPAGES()