replace: Make EWOULDBLOCK always available

[samba.git] / wscript

diff --git a/wscript b/wscript
index 377ab66edc66339e303b797cbaf957ad6ba99427..73c113cc0946bd07235fdb8218cb9abaa8d1c805 100644 (file)
--- a/wscript
+++ b/wscript
@@ -99,7 +99,7 @@ def configure(conf):
     conf.env.replace_add_global_pthread = True
     conf.RECURSE('lib/replace')
 
-    conf.find_program('perl', var='PERL', mandatory=True)
+    conf.SAMBA_CHECK_PERL(mandatory=True)
     conf.find_program('xsltproc', var='XSLTPROC')
 
     conf.SAMBA_CHECK_PYTHON(mandatory=True, version=(2,5,0))
@@ -122,18 +122,18 @@ def configure(conf):
     conf.RECURSE('dynconfig')
 
     if conf.CHECK_FOR_THIRD_PARTY():
-        conf.RECURSE('third_party/iniparser/src')
         conf.RECURSE('third_party/zlib')
+        conf.RECURSE('third_party/popt')
     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.define('USING_SYSTEM_ZLIB',1)
+
+        if not conf.CHECK_POPT():
+            raise Utils.WafError('popt development packages have not been found.\nIf third_party is installed, check that it is in the proper place.')
+        else:
+            conf.define('USING_SYSTEM_POPT', 1)
 
     conf.RECURSE('lib/ldb')
 
@@ -159,13 +159,13 @@ def configure(conf):
     conf.RECURSE('nsswitch')
     conf.RECURSE('lib/socket_wrapper')
     conf.RECURSE('lib/uid_wrapper')
-    conf.RECURSE('lib/popt')
     conf.RECURSE('lib/subunit/c')
     conf.RECURSE('libcli/smbreadline')
     conf.RECURSE('lib/crypto')
     conf.RECURSE('pidl')
     conf.RECURSE('selftest')
     conf.RECURSE('source3')
+    conf.RECURSE('lib/texpect')
 
     conf.SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS()