From: Alexander Bokovoy <ab@samba.org>
Date: Fri, 2 Feb 2018 14:34:31 +0000 (+0200)
Subject: lib/crypto/wscript_configure: update to handle waf 2.0.4
X-Git-Tag: tdb-1.3.17~1848
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b0a12c81b1afb3fab3ce9ecb4d3ddfe59b624fa8;p=thirdparty%2Fsamba.git

lib/crypto/wscript_configure: update to handle waf 2.0.4

Signed-off-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/lib/crypto/wscript_configure b/lib/crypto/wscript_configure
index 9fdaf9f3d14..09dfe0433bb 100644
--- a/lib/crypto/wscript_configure
+++ b/lib/crypto/wscript_configure
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
-import Options
-import Utils
+from waflib import Options
+from waflib import Errors, Logs
 
 if not conf.CHECK_FUNCS_IN('MD5Init', 'bsd', headers='bsd/md5.h',
     checklibc=True):
@@ -23,6 +23,6 @@ if conf.CHECK_FUNCS('SHA512_Update'):
 # Default is none.
 #
 if Options.options.accel_aes.lower() == "intelaesni":
-        print("Attempting to compile with runtime-switchable x86_64 Intel AES instructions. WARNING - this is temporary.")
+        Logs.info("Attempting to compile with runtime-switchable x86_64 Intel AES instructions. WARNING - this is temporary.")
 elif Options.options.accel_aes.lower() != "none":
-        raise Utils.WafError('--aes-accel=%s is not a valid option. Valid options are [none|intelaesni]' % Options.options.accel_aes)
+        raise Errors.WafError('--aes-accel=%s is not a valid option. Valid options are [none|intelaesni]' % Options.options.accel_aes)