From 4f50cfecac13b0b35ae67f31e976c2680884e785 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
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/lilv@3497 a436a847-0d15-0410-975c-d299462d15a1
---
 wscript | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'wscript')

diff --git a/wscript b/wscript
index 9be2415..f6b8929 100644
--- a/wscript
+++ b/wscript
@@ -27,10 +27,10 @@ top = '.'
 out = 'build'
 
 def options(opt):
-    autowaf.set_options(opt)
     opt.load('compiler_c')
     opt.load('compiler_cxx')
     opt.load('python')
+    autowaf.set_options(opt)
     opt.add_option('--no-utils', action='store_true', default=False, dest='no_utils',
                    help="Do not build command line utilities")
     opt.add_option('--bindings', action='store_true', default=False, dest='bindings',
@@ -48,9 +48,6 @@ def options(opt):
                    help="Default LV2 path to use if $LV2_PATH is unset (globs and ~ supported)")
 
 def configure(conf):
-    conf.line_just = 63
-    autowaf.configure(conf)
-    autowaf.display_header('Lilv Configuration')
     conf.load('compiler_c')
     conf.load('compiler_cxx')
     conf.load('python')
@@ -63,6 +60,10 @@ def configure(conf):
         except:
             pass
 
+    conf.line_just = 63
+    autowaf.configure(conf)
+    autowaf.display_header('Lilv Configuration')
+
     autowaf.check_pkg(conf, 'lv2core', uselib_store='LV2CORE', mandatory=True)
     autowaf.check_pkg(conf, 'glib-2.0', uselib_store='GLIB',
                       atleast_version='2.0.0', mandatory=True)
-- 
cgit v1.2.1