From e8ae74ebe554bb5cbe6ad0c2fd2952412f16e1b3 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Tue, 27 Sep 2011 19:57:14 +0000 Subject: Load tools before autowaf.configure so e.g. --debug works correctly. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3497 a436a847-0d15-0410-975c-d299462d15a1 --- wscript | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wscript b/wscript index 577c492b..375b0597 100644 --- a/wscript +++ b/wscript @@ -16,8 +16,8 @@ top = '.' out = 'build' def options(opt): - autowaf.set_options(opt) opt.load('compiler_cxx') + autowaf.set_options(opt) 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', @@ -37,11 +37,11 @@ def options(opt): help="Use liblo bundle support (experimental, requires patched liblo)") def configure(conf): + conf.load('compiler_cxx') 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', atleast_version='2.14.0', mandatory=True) autowaf.check_pkg(conf, 'gthread-2.0', uselib_store='GTHREAD', -- cgit v1.2.1