From c1ef7b14a3e1200817180cfaf6425e9bdf0eb51b Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Thu, 29 Sep 2011 19:58:05 +0000
Subject: Remove use of waf compat15 tool. Always load waf tools first (prevent
 smashing of --debug, DATADIR, etc).

git-svn-id: svn://localhost/ardour2/branches/3.0@10163 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 libs/timecode/wscript | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'libs/timecode/wscript')

diff --git a/libs/timecode/wscript b/libs/timecode/wscript
index f919649e25..034292b1dd 100644
--- a/libs/timecode/wscript
+++ b/libs/timecode/wscript
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 from waflib.extras import autowaf as autowaf
-import Options
+from waflib import Options
 import os
 
 # Version of this package (even if built as a child)
@@ -26,10 +26,9 @@ def options(opt):
     autowaf.set_options(opt)
 
 def configure(conf):
+    conf.load('compiler_cxx')
     autowaf.configure(conf)
 
-    conf.check_tool('compiler_cxx')
-
 def build(bld):
     # Library
     obj = bld(features = 'cxx cxxshlib')
-- 
cgit v1.2.3