summaryrefslogtreecommitdiffstats
path: root/wscript
diff options
context:
space:
mode:
Diffstat (limited to 'wscript')
-rw-r--r--wscript7
1 files changed, 6 insertions, 1 deletions
diff --git a/wscript b/wscript
index 92e060f36f..377ab66edc 100644
--- a/wscript
+++ b/wscript
@@ -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')