diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2010-06-19 14:02:18 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2010-06-19 14:02:18 +0200 |
| commit | 7646eb6a0fe9c28cdd006493502bd4b36ccfd2bc (patch) | |
| tree | 835d05ebdf72ff9bdfa2b779433a1a6b9a8d50c5 /buildtools/wafsamba/samba_bundled.py | |
| parent | ccaf0c60380b80ade3b1ac6085518218d236c281 (diff) | |
| download | samba-7646eb6a0fe9c28cdd006493502bd4b36ccfd2bc.tar.gz samba-7646eb6a0fe9c28cdd006493502bd4b36ccfd2bc.tar.bz2 samba-7646eb6a0fe9c28cdd006493502bd4b36ccfd2bc.zip | |
wafsamba: Use convenience function to find out if bundling is necessary.
Diffstat (limited to 'buildtools/wafsamba/samba_bundled.py')
| -rw-r--r-- | buildtools/wafsamba/samba_bundled.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/buildtools/wafsamba/samba_bundled.py b/buildtools/wafsamba/samba_bundled.py index caf5361ac6..c8d49672e2 100644 --- a/buildtools/wafsamba/samba_bundled.py +++ b/buildtools/wafsamba/samba_bundled.py @@ -107,7 +107,7 @@ def CHECK_BUNDLED_SYSTEM(conf, libname, minversion='0.0.0', for syslib in TO_LIST(onlyif): f = 'FOUND_SYSTEMLIB_%s' % syslib if not f in conf.env: - if 'NONE' in conf.env.BUNDLED_LIBS or '!'+libname in conf.env.BUNDLED_LIBS: + if not conf.LIB_MAY_BE_BUNDLED(libname): Logs.error('ERROR: Use of system library %s depends on missing system library %s' % (libname, syslib)) sys.exit(1) conf.env[found] = False @@ -134,7 +134,7 @@ def CHECK_BUNDLED_SYSTEM(conf, libname, minversion='0.0.0', conf.SET_SYSLIB_DEPS(libname, implied_deps) return True conf.env[found] = False - if conf.LIB_MAY_BE_BUNDLED(libname): + if not conf.LIB_MAY_BE_BUNDLED(libname): Logs.error('ERROR: System library %s of version %s not found, and bundling disabled' % (libname, minversion)) sys.exit(1) return False |