summaryrefslogtreecommitdiff
path: root/lib/crypto
diff options
context:
space:
mode:
authorAlexander Bokovoy <ab@samba.org>2018-02-02 16:34:31 +0200
committerAndrew Bartlett <abartlet@samba.org>2018-09-05 06:37:22 +0200
commitb0a12c81b1afb3fab3ce9ecb4d3ddfe59b624fa8 (patch)
tree39e54675ee6dba3d9cf9291996e35192b598c26c /lib/crypto
parentb999fd3c25648af902d57e921e5d3efc1cc6a81c (diff)
downloadsamba-b0a12c81b1afb3fab3ce9ecb4d3ddfe59b624fa8.tar.gz
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>
Diffstat (limited to 'lib/crypto')
-rw-r--r--lib/crypto/wscript_configure8
1 files changed, 4 insertions, 4 deletions
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)