diff options
| author | David Robillard <d@drobilla.net> | 2011-09-29 19:58:05 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2011-09-29 19:58:05 +0000 |
| commit | c1ef7b14a3e1200817180cfaf6425e9bdf0eb51b (patch) | |
| tree | fe7355824aa3c2640b2ae016ac242997763ec41e /libs/evoral/wscript | |
| parent | 723ab60b39aed9a9190e047fc5803c1f4e1adac3 (diff) | |
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
Diffstat (limited to 'libs/evoral/wscript')
| -rw-r--r-- | libs/evoral/wscript | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/evoral/wscript b/libs/evoral/wscript index 24a5f4dd1f..11cb749a99 100644 --- a/libs/evoral/wscript +++ b/libs/evoral/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) @@ -28,10 +28,10 @@ def options(opt): help="Build unit tests") def configure(conf): + conf.load('compiler_cxx') autowaf.configure(conf) #autowaf.display_header('Evoral Configuration') - conf.check_tool('compiler_cxx') autowaf.check_pkg(conf, 'cppunit', uselib_store='CPPUNIT', atleast_version='1.12.0', mandatory=False) autowaf.check_pkg(conf, 'glib-2.0', uselib_store='GLIB', atleast_version='2.2') autowaf.check_pkg(conf, 'glibmm-2.4', uselib_store='GLIBMM', atleast_version='2.14.0') |