diff options
author | Stefan Metzmacher <metze@samba.org> | 2014-03-14 10:18:18 +0100 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2014-04-02 09:03:41 +0200 |
commit | 764706c2b083b210917dd3966426851c2767b67e (patch) | |
tree | 3b1033174b94ab7005acd59eb569b98e2ca62ed2 | |
parent | cec109ccf9ffe3079a9905bad9b2c52abf253a16 (diff) | |
download | samba-764706c2b083b210917dd3966426851c2767b67e.tar.gz |
wafsamba: allow CHECK_BUNDLED_SYSTEM() to check headers without functions
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
-rw-r--r-- | buildtools/wafsamba/samba_bundled.py | 11 |
1 files changed, 7 insertions, 4 deletions
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 |