lib/crypto/wscript_configure: update to handle waf 2.0.4

[amitay/samba.git] / lib / crypto / wscript_configure

diff --git a/lib/crypto/wscript_configure b/lib/crypto/wscript_configure
index 9fdaf9f3d14dfec8138f3458361fc9e38d3af6ed..09dfe0433bbbd3e02d4cbec65dcf83976a770d92 100644 (file)
--- 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)