Spelling fixes s/touble/trouble/

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

diff --git a/wscript b/wscript
index 558b7754c28661b1b8930963b38de785664b7dac..579d35f27191de0feb1a822063784451874b650f 100644 (file)
--- a/wscript
+++ b/wscript
@@ -40,7 +40,6 @@ def options(opt):
     opt.RECURSE('packaging')
     opt.RECURSE('lib/ldb')
     opt.RECURSE('selftest')
-    opt.RECURSE('source4/lib/tls')
     opt.RECURSE('source4/dsdb/samdb/ldb_modules')
     opt.RECURSE('pidl')
     opt.RECURSE('source3')
@@ -168,13 +167,14 @@ def configure(conf):
     conf.RECURSE('dynconfig')
     conf.RECURSE('selftest')
 
+    conf.CHECK_CFG(package='zlib', minversion='1.2.3',
+                   args='--cflags --libs',
+                   mandatory=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.')
@@ -253,7 +253,6 @@ def configure(conf):
 
     conf.PROCESS_SEPARATE_RULE('system_gnutls')
 
-    conf.RECURSE('source4/lib/tls')
     conf.RECURSE('source4/dsdb/samdb/ldb_modules')
     conf.RECURSE('source4/ntvfs/sysdep')
     conf.RECURSE('lib/util')