From 764706c2b083b210917dd3966426851c2767b67e Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Fri, 14 Mar 2014 10:18:18 +0100 Subject: wafsamba: allow CHECK_BUNDLED_SYSTEM() to check headers without functions Signed-off-by: Stefan Metzmacher Reviewed-by: Andrew Bartlett --- buildtools/wafsamba/samba_bundled.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'buildtools/wafsamba') diff --git a/buildtools/wafsamba/samba_bundled.py b/buildtools/wafsamba/samba_bundled.py index 1cab6344197..5926ae2d6eb 100644 --- a/buildtools/wafsamba/samba_bundled.py +++ b/buildtools/wafsamba/samba_bundled.py @@ -126,12 +126,15 @@ def CHECK_BUNDLED_SYSTEM(conf, libname, minversion='0.0.0', def check_functions_headers(): '''helper function for CHECK_BUNDLED_SYSTEM''' - if checkfunctions is None: - return True if require_headers and headers and not conf.CHECK_HEADERS(headers, lib=libname): return False - return conf.CHECK_FUNCS_IN(checkfunctions, libname, headers=headers, - empty_decl=False, set_target=False) + if checkfunctions is not None: + ok = conf.CHECK_FUNCS_IN(checkfunctions, libname, headers=headers, + empty_decl=False, set_target=False) + if not ok: + return False + return True + # see if the library should only use a system version if another dependent # system version is found. That prevents possible use of mixed library -- cgit