diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2010-10-16 00:41:34 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2010-10-16 01:32:05 +0000 |
| commit | 7af56875040c0d170d3313bb0e0c126d3f19aed8 (patch) | |
| tree | d096335eab6e90c90146877ad77997490d509779 | |
| parent | 06fc79f1fde5963ef89027e2cd297e866aa8c204 (diff) | |
| download | samba-7af56875040c0d170d3313bb0e0c126d3f19aed8.tar.gz samba-7af56875040c0d170d3313bb0e0c126d3f19aed8.tar.bz2 samba-7af56875040c0d170d3313bb0e0c126d3f19aed8.zip | |
heimdal_build: Use existing functions for finding system libraries.
| -rw-r--r-- | buildtools/wafsamba/samba_bundled.py | 2 | ||||
| -rw-r--r-- | source4/heimdal_build/wscript_configure | 7 |
2 files changed, 2 insertions, 7 deletions
diff --git a/buildtools/wafsamba/samba_bundled.py b/buildtools/wafsamba/samba_bundled.py index 29b0a501c8..822e49ce49 100644 --- a/buildtools/wafsamba/samba_bundled.py +++ b/buildtools/wafsamba/samba_bundled.py @@ -104,7 +104,7 @@ def CHECK_BUNDLED_SYSTEM(conf, libname, minversion='0.0.0', '''helper function for CHECK_BUNDLED_SYSTEM''' if checkfunctions is None: return True - if require_headers and headers and not conf.CHECK_HEADERS(headers): + 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) diff --git a/source4/heimdal_build/wscript_configure b/source4/heimdal_build/wscript_configure index e0c435dc5e..727344c3b4 100644 --- a/source4/heimdal_build/wscript_configure +++ b/source4/heimdal_build/wscript_configure @@ -72,12 +72,7 @@ def check_bundled_heimdal_lib(name, functions, headers): lib = name setattr(conf.env, "CPPPATH_%s" % name.upper(), ["/usr/include/heimdal"]) setattr(conf.env, "LIBPATH_%s" % name.upper(), ["/usr/lib/heimdal"]) - if not conf.CHECK_HEADERS(headers, lib=lib): - Logs.error('ERROR: Unable to find missing header %s' % headers) - sys.exit(1) - if not conf.CHECK_LIB([lib], mandatory=True, set_target=True): - Logs.error('ERROR: Unable to find missing library %s' % lib) - sys.exit(1) + conf.CHECK_BUNDLED_SYSTEM("wind", checkfunctions=functions, headers=headers) conf.define('USING_SYSTEM_%s' % name.upper(), 1) |