From 874e39cbf00325cb379ddea274ae4288e32f8f72 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 29 Mar 2010 22:27:17 +1100 Subject: 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. --- lib/talloc/wscript | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib/talloc') diff --git a/lib/talloc/wscript b/lib/talloc/wscript index e8aa1774e4..3526d5a730 100644 --- a/lib/talloc/wscript +++ b/lib/talloc/wscript @@ -19,7 +19,8 @@ def set_options(opt): def configure(conf): conf.sub_config(LIBREPLACE_DIR) - if conf.CHECK_BUNDLED_SYSTEM('talloc', minversion=VERSION): + if conf.CHECK_BUNDLED_SYSTEM('talloc', minversion=VERSION, + implied_deps='replace'): conf.define('USING_SYSTEM_TALLOC', 1) conf.SAMBA_CONFIG_H() -- cgit