diff options
| author | Ira Cooper <ira@samba.org> | 2014-07-22 21:27:13 -0700 |
|---|---|---|
| committer | Ira Cooper <ira@samba.org> | 2014-08-09 18:26:16 +0200 |
| commit | ba8ee8c9e011361cfc405b1355172d38718ba0cc (patch) | |
| tree | 2b13f2112b61edb3da204719c1a3184de63a1605 /wscript | |
| parent | e8e85689756eaf74e82f55b8ae6f706b430b01cd (diff) | |
| download | samba-ba8ee8c9e011361cfc405b1355172d38718ba0cc.tar.gz | |
third_party/zlib: Initial support for zlib
Signed-off-by: Ira Cooper <ira@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'wscript')
| -rw-r--r-- | wscript | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -123,12 +123,18 @@ def configure(conf): if conf.CHECK_FOR_THIRD_PARTY(): conf.RECURSE('third_party/iniparser/src') + conf.RECURSE('third_party/zlib') else: if not conf.CHECK_INIPARSER(): raise Utils.WafError('iniparser development packages have not been found.\nIf third_party is installed, check that it is in the proper place.') else: conf.define('USING_SYSTEM_INIPARSER', 1) + if not conf.CHECK_ZLIB(): + raise Utils.WafError('zlib development packages have not been found.\nIf third_party is installed, check that it is in the proper place.') + else: + conf.define('USING_SYSTEM_ZLIB',1); + conf.RECURSE('lib/ldb') if Options.options.with_system_mitkrb5: @@ -147,7 +153,6 @@ def configure(conf): conf.RECURSE('lib/util') conf.RECURSE('lib/ccan') conf.RECURSE('lib/ntdb') - conf.RECURSE('lib/zlib') conf.RECURSE('lib/util/charset') conf.RECURSE('source4/auth') conf.RECURSE('lib/nss_wrapper') |