From 0b24e46723d5b65993fb4239def85101574dc751 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 27 Aug 2015 11:14:51 +0200 Subject: [PATCH] ldb:wscript: make it possible to build samba with a system ldb again This fixes a regression in commit fcf4a891945b22dc6eccdc71fd441f1a879f556a. If we check for 'ldb' later the 'pyldb-util' can't depend on the 'ldb' check. BUG: https://bugzilla.samba.org/show_bug.cgi?id=11458 Signed-off-by: Stefan Metzmacher Reviewed-by: Andreas Schneider Autobuild-User(master): Andreas Schneider Autobuild-Date(master): Mon Aug 31 18:53:16 CEST 2015 on sn-devel-104 (cherry picked from commit 2947a7041ba22b52a8a4ce0ad5ebc6095ea09ea0) --- lib/ldb/wscript | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/ldb/wscript b/lib/ldb/wscript index 0e81932..0996f51 100755 --- a/lib/ldb/wscript +++ b/lib/ldb/wscript @@ -56,11 +56,11 @@ def configure(conf): if not conf.env.standalone_ldb: if conf.CHECK_BUNDLED_SYSTEM_PKG('pyldb-util', minversion=VERSION, - onlyif='talloc tdb tevent ldb', + onlyif='talloc tdb tevent', 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', + onlyif='talloc tdb tevent pyldb-util', implied_deps='replace talloc tdb tevent'): conf.define('USING_SYSTEM_LDB', 1) -- 1.9.1