Upgrade to waf 1.6.6

git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3418 a436a847-0d15-0410-975c-d299462d15a1

2 files changed, 10 insertions, 8 deletions

diff --git a/waf b/waf
index 686fe2ba..ef338a35 100755
--- a/waf
+++ b/waf
diff --git a/wscript b/wscript
index e128ad62..f778587e 100644
--- a/wscript
+++ b/wscript
@@ -17,6 +17,7 @@ out = 'build'
 
 def options(opt):
     autowaf.set_options(opt)
+    opt.load('compiler_cxx')
     opt.add_option('--data-dir', type='string', dest='datadir',
                    help="Ingen data install directory [Default: PREFIX/share/ingen]")
     opt.add_option('--module-dir', type='string', dest='moduledir',
@@ -38,6 +39,7 @@ def options(opt):
 def configure(conf):
     autowaf.configure(conf)
     conf.line_just = 67
+
     autowaf.display_header('Ingen Configuration')
     conf.load('compiler_cxx')
     autowaf.check_pkg(conf, 'glibmm-2.4', uselib_store='GLIBMM',
@@ -79,14 +81,14 @@ def configure(conf):
                define_name='HAVE_POSIX_MEMALIGN',
                mandatory=False)
 
-    autowaf.check_header(conf, 'lv2/lv2plug.in/ns/lv2core/lv2.h')
-    autowaf.check_header(conf, 'lv2/lv2plug.in/ns/ext/atom/atom.h')
-    autowaf.check_header(conf, 'lv2/lv2plug.in/ns/ext/contexts/contexts.h')
-    autowaf.check_header(conf, 'lv2/lv2plug.in/ns/ext/event/event-helpers.h')
-    autowaf.check_header(conf, 'lv2/lv2plug.in/ns/ext/event/event.h')
-    autowaf.check_header(conf, 'lv2/lv2plug.in/ns/ext/resize-port/resize-port.h')
-    autowaf.check_header(conf, 'lv2/lv2plug.in/ns/ext/uri-map/uri-map.h')
-    autowaf.check_header(conf, 'lv2/lv2plug.in/ns/ext/uri-unmap/uri-unmap.h')
+    autowaf.check_header(conf, 'c', 'lv2/lv2plug.in/ns/lv2core/lv2.h')
+    autowaf.check_header(conf, 'c', 'lv2/lv2plug.in/ns/ext/atom/atom.h')
+    autowaf.check_header(conf, 'c', 'lv2/lv2plug.in/ns/ext/contexts/contexts.h')
+    autowaf.check_header(conf, 'c', 'lv2/lv2plug.in/ns/ext/event/event-helpers.h')
+    autowaf.check_header(conf, 'c', 'lv2/lv2plug.in/ns/ext/event/event.h')
+    autowaf.check_header(conf, 'c', 'lv2/lv2plug.in/ns/ext/resize-port/resize-port.h')
+    autowaf.check_header(conf, 'c', 'lv2/lv2plug.in/ns/ext/uri-map/uri-map.h')
+    autowaf.check_header(conf, 'c', 'lv2/lv2plug.in/ns/ext/uri-unmap/uri-unmap.h')
 
     autowaf.define(conf, 'INGEN_VERSION', INGEN_VERSION)