summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
l---------INSTALL1
l---------waf1
-rw-r--r--wscript7
3 files changed, 4 insertions, 5 deletions
diff --git a/INSTALL b/INSTALL
deleted file mode 120000
index 4d35fcc..0000000
--- 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 cf2d494..0000000
--- a/waf
+++ /dev/null
@@ -1 +0,0 @@
-autowaf/waf \ No newline at end of file
diff --git a/wscript b/wscript
index 28ca542..bd39ede 100644
--- a/wscript
+++ b/wscript
@@ -1,8 +1,9 @@
#!/usr/bin/env python
-import autowaf
-import Options
import os
+from waflib.extras import autowaf as autowaf
+import waflib.Options as Options
+
# Version of this package (even if built as a child)
RAUL_VERSION = '0.8.0'
@@ -45,7 +46,7 @@ def options(opt):
def configure(conf):
autowaf.configure(conf)
autowaf.display_header('Raul Configuration')
- conf.check_tool('compiler_cxx')
+ conf.load('compiler_cxx')
autowaf.check_pkg(conf, 'glib-2.0', atleast_version='2.2',
uselib_store='GLIB', mandatory=True)
autowaf.check_pkg(conf, 'gthread-2.0', atleast_version='2.14.0',