From bfbf43cc36ab360b34b49d7e07c2f594e2b7e7c9 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sun, 28 Mar 2010 16:38:27 +1100 Subject: s4-waf: support the use of system libraries distros can set --bundled-libraries=NONE to force use of all system libraries. If the right version isn't found then configure will fail. Users may choose which libraries to use from the system, and which to use bundled libs. The default is to try system libs, and use them if their version matches the one in the source tree. --- lib/tevent/wscript | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'lib/tevent') diff --git a/lib/tevent/wscript b/lib/tevent/wscript index f017581fae..e6ef67a8d6 100644 --- a/lib/tevent/wscript +++ b/lib/tevent/wscript @@ -22,6 +22,9 @@ def configure(conf): conf.sub_config(LIBREPLACE_DIR) conf.sub_config(LIBTALLOC_DIR) + if conf.CHECK_BUNDLED_SYSTEM('tevent', minversion=VERSION): + conf.define('USING_SYSTEM_TEVENT', 1) + if conf.CHECK_FUNCS('epoll_create', headers='sys/epoll.h'): conf.DEFINE('HAVE_EPOLL', 1) @@ -38,7 +41,9 @@ def build(bld): if bld.CONFIG_SET('HAVE_EPOLL'): SRC += ' tevent_epoll.c' - bld.SAMBA_LIBRARY('tevent', - SRC, - deps='replace talloc', - vnum=VERSION) + if not bld.CONFIG_SET('USING_SYSTEM_TEVENT'): + bld.SAMBA_LIBRARY('tevent', + SRC, + deps='replace talloc', + enabled= not bld.CONFIG_SET('USING_SYSTEM_TEVENT'), + vnum=VERSION) -- cgit