From: Jelmer Vernooij Date: Sat, 12 Nov 2011 15:36:39 +0000 (+0100) Subject: ldb: Only check for pkg-config file when checking for system ldb. X-Git-Tag: ldb-1.1.4~350 X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=c5260788067a3fe1e2f10120e99a16e7cd28bac9;p=ddiss%2Fsamba.git ldb: Only check for pkg-config file when checking for system ldb. --- diff --git a/lib/ldb/wscript b/lib/ldb/wscript index 04373834199..a3af27515cb 100755 --- a/lib/ldb/wscript +++ b/lib/ldb/wscript @@ -50,11 +50,11 @@ def configure(conf): conf.env.standalone_ldb = conf.IN_LAUNCH_DIR() if not conf.env.standalone_ldb: - if conf.CHECK_BUNDLED_SYSTEM('ldb', minversion=VERSION, + 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('pyldb-util', minversion=VERSION, + 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)