3 files changed, 4 insertions, 6 deletions
diff --git a/INSTALL b/INSTALL
deleted file mode 120000
index 4d35fcc7..00000000
--- a/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-autowaf/INSTALL
-\ No newline at end of file
diff --git a/waf b/waf
deleted file mode 120000
index cf2d4942..00000000
--- a/waf
+++ /dev/null
@@ -1 +0,0 @@
-autowaf/waf
-\ No newline at end of file
diff --git a/wscript b/wscript
index d3e48382..50d3e18e 100644
--- a/wscript
+++ b/wscript
@@ -1,13 +1,13 @@
 #!/usr/bin/env python
-import Logs
-import Options
-import autowaf
 import filecmp
 import glob
 import os
 import shutil
 import subprocess
 
+import waflib.Logs as Logs, waflib.Options as Options
+from waflib.extras import autowaf as autowaf
+
 # Version of this package (even if built as a child)
 SERD_VERSION = '0.1.0'
 
@@ -40,7 +40,7 @@ def configure(conf):
 	autowaf.configure(conf)
 	autowaf.display_header('Serd Configuration')
 
-	conf.check_tool('compiler_cc')
+	conf.load('compiler_cc')
 	conf.env.append_value('CFLAGS', '-std=c99')
 
 	conf.env['BUILD_TESTS'] = Options.options.build_tests