third_party: Remove zlib from third_party

[garming/samba-autobuild/.git] / wscript

diff --git a/wscript b/wscript
index 0557fa7070ea089b7e0a7fca792964c6db36444b..c4848389feb21a45fa91b766debc9db1bf9f13a0 100644 (file)
--- a/wscript
+++ b/wscript
@@ -167,13 +167,14 @@ def configure(conf):
     conf.RECURSE('dynconfig')
     conf.RECURSE('selftest')
 
+    conf.CHECK_CFG(package='zlib', minversion='1.2.3',
+                   args='--cflags --libs',
+                   msg='Checking for zlib', mandetory=True)
+    conf.CHECK_FUNCS_IN('inflateInit2', 'z')
+
     if conf.CHECK_FOR_THIRD_PARTY():
         conf.RECURSE('third_party')
     else:
-        if not conf.CHECK_ZLIB():
-            raise Errors.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)
 
         if not conf.CHECK_POPT():
             raise Errors.WafError('popt development packages have not been found.\nIf third_party is installed, check that it is in the proper place.')