[PATCH 38/55] Force rebuild of ldb if pyldb-util is not available.
Jelmer Vernooij
jelmer at samba.org
Fri Feb 6 12:04:10 MST 2015
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 at samba.org>
---
lib/ldb/wscript | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/ldb/wscript b/lib/ldb/wscript
index 514db88..1067a00 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()
--
2.1.4
More information about the samba-technical
mailing list