From a2b4d7e8ebf24bc65cceb38bf23d8d8dc3307d27 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Mon, 29 Mar 2010 00:08:38 +1100
Subject: s4-waf: ensure we don't end up with mixed versions of
 talloc/tdb/tevent

---
 source4/lib/ldb/wscript | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'source4')

diff --git a/source4/lib/ldb/wscript b/source4/lib/ldb/wscript
index e0269d7607..ffbb68e4b8 100644
--- a/source4/lib/ldb/wscript
+++ b/source4/lib/ldb/wscript
@@ -31,7 +31,8 @@ def configure(conf):
 
 
     if not s4_build:
-        if conf.CHECK_BUNDLED_SYSTEM('ldb', minversion=VERSION):
+        if conf.CHECK_BUNDLED_SYSTEM('ldb', minversion=VERSION,
+                                     onlyif='talloc tdb tevent'):
             conf.define('USING_SYSTEM_LDB', 1)
         # we need this for the ldap backend
         conf.CHECK_FUNCS_IN('ber_flush ldap_open', 'lber ldap', headers='lber.h ldap.h', mandatory=True)
-- 
cgit