summaryrefslogtreecommitdiff
path: root/lib
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 /lib
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 'lib')
-rw-r--r--lib/talloc/wscript3
-rw-r--r--lib/tdb/wscript3
-rw-r--r--lib/tevent/wscript3
3 files changed, 6 insertions, 3 deletions
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()
diff --git a/lib/tdb/wscript b/lib/tdb/wscript
index 365c384201..d16516b8b5 100644
--- a/lib/tdb/wscript
+++ b/lib/tdb/wscript
@@ -20,7 +20,8 @@ def set_options(opt):
def configure(conf):
conf.sub_config(LIBREPLACE_DIR)
- if conf.CHECK_BUNDLED_SYSTEM('tdb', minversion=VERSION):
+ if conf.CHECK_BUNDLED_SYSTEM('tdb', minversion=VERSION,
+ implied_deps='replace'):
conf.define('USING_SYSTEM_TDB', 1)
conf.SAMBA_CONFIG_H()
diff --git a/lib/tevent/wscript b/lib/tevent/wscript
index a84dad663c..30db216de1 100644
--- a/lib/tevent/wscript
+++ b/lib/tevent/wscript
@@ -22,7 +22,8 @@ def configure(conf):
conf.sub_config(LIBREPLACE_DIR)
conf.sub_config(LIBTALLOC_DIR)
- if conf.CHECK_BUNDLED_SYSTEM('tevent', minversion=VERSION, onlyif='talloc'):
+ if conf.CHECK_BUNDLED_SYSTEM('tevent', minversion=VERSION,
+ onlyif='talloc', implied_deps='replace talloc'):
conf.define('USING_SYSTEM_TEVENT', 1)
if conf.CHECK_FUNCS('epoll_create', headers='sys/epoll.h'):