summaryrefslogtreecommitdiff
path: root/source4/lib/ldb
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-03-29 22:27:17 +1100
committerAndrew Tridgell <tridge@samba.org>2010-04-06 20:27:17 +1000
commit874e39cbf00325cb379ddea274ae4288e32f8f72 (patch)
tree249dfe4463f3c302f8a1737b43c129b893d76fa0 /source4/lib/ldb
parented5522adf24903a500e3565ea5eb443ed28440cc (diff)
downloadsamba-874e39cbf00325cb379ddea274ae4288e32f8f72.tar.gz
samba-874e39cbf00325cb379ddea274ae4288e32f8f72.tar.bz2
samba-874e39cbf00325cb379ddea274ae4288e32f8f72.zip
s4-waf: added implied_deps for system libraries
when we use a system version of a library such as talloc, then we no longer get the automtica dependency propogation of talloc implying libreplace. That means we don't get the includes for libreplace, which means things can fail to build. To fix this this change adds an implied_deps option to CHECK_BUNDLED_SYSTEM(), which tells the samba_deps module to add an implied dependency on the listed targets if the system library is chosen.
Diffstat (limited to 'source4/lib/ldb')
-rw-r--r--source4/lib/ldb/wscript3
1 files changed, 2 insertions, 1 deletions
diff --git a/source4/lib/ldb/wscript b/source4/lib/ldb/wscript
index a7419e1981..18a9f4c271 100644
--- a/source4/lib/ldb/wscript
+++ b/source4/lib/ldb/wscript
@@ -32,7 +32,8 @@ def configure(conf):
if not s4_build:
if conf.CHECK_BUNDLED_SYSTEM('ldb', minversion=VERSION,
- onlyif='talloc tdb tevent'):
+ onlyif='talloc tdb tevent',
+ implied_deps='replace 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)