diff options
| author | Matthieu Patou <mat@matws.net> | 2010-10-30 20:47:45 +0400 |
|---|---|---|
| committer | Matthieu Patou <mat@samba.org> | 2010-10-30 16:50:03 +0000 |
| commit | a509b93518b17309f401a6fd107c726c7ab7582f (patch) | |
| tree | 567f03224ae1759e81fbed52b9e768c81ee46f10 /lib/zlib | |
| parent | 4e30a5dd0b3ca2b56d228730ad4d43f1986f39fa (diff) | |
| download | samba-a509b93518b17309f401a6fd107c726c7ab7582f.tar.gz samba-a509b93518b17309f401a6fd107c726c7ab7582f.tar.bz2 samba-a509b93518b17309f401a6fd107c726c7ab7582f.zip | |
build: Remove zlib from the cache if we failed to pass all the tests
This will avoid problems with redefinition of libs tests
Diffstat (limited to 'lib/zlib')
| -rw-r--r-- | lib/zlib/wscript | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/zlib/wscript b/lib/zlib/wscript index bc6de34611..a091de6b5f 100644 --- a/lib/zlib/wscript +++ b/lib/zlib/wscript @@ -15,6 +15,12 @@ def configure(conf): msg='Checking for ZLIB_VERNUM >= 0x1230', define='HAVE_ZLIB') + # If we don't do this then we will receive an error that lib 'z' + # is already declared as a system lib (for the cases where zlibVersion + # is defined + if not conf.env['HAVE_ZLIB']: + conf.LOCAL_CACHE_SET('TARGET_TYPE', 'z', 'EMPTY') + def build(bld): if not bld.CONFIG_SET('HAVE_ZLIB'): bld.SAMBA_LIBRARY('z', |