diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-03-29 22:27:17 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-04-06 20:27:17 +1000 |
| commit | 874e39cbf00325cb379ddea274ae4288e32f8f72 (patch) | |
| tree | 249dfe4463f3c302f8a1737b43c129b893d76fa0 /lib/talloc | |
| parent | ed5522adf24903a500e3565ea5eb443ed28440cc (diff) | |
| download | samba-874e39cbf00325cb379ddea274ae4288e32f8f72.tar.gz samba-874e39cbf00325cb379ddea274ae4288e32f8f72.tar.xz 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 'lib/talloc')
| -rw-r--r-- | lib/talloc/wscript | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/talloc/wscript b/lib/talloc/wscript index e8aa1774e4e..3526d5a730b 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() |