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/audiographer/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/audiographer/wscript')
| -rw-r--r-- | libs/audiographer/wscript | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/libs/audiographer/wscript b/libs/audiographer/wscript index 1c651e834a..996329777f 100644 --- a/libs/audiographer/wscript +++ b/libs/audiographer/wscript @@ -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') - autowaf.check_pkg(conf, 'cppunit', uselib_store='CPPUNIT', atleast_version='1.12.0', mandatory=False) autowaf.check_pkg(conf, 'sigc++-2.0', uselib_store='SIGCPP', atleast_version='2.0', mandatory=False) autowaf.check_pkg(conf, 'glib-2.0', uselib_store='GLIB', atleast_version='2.2', mandatory=False) @@ -62,7 +61,7 @@ def build(bld): src/general/broadcast_info.cc ''' - if bld.env['HAVE_SAMPLERATE']: + if bld.is_defined('HAVE_SAMPLERATE'): audiographer.source += ''' src/general/sr_converter.cc ''' @@ -77,7 +76,7 @@ def build(bld): audiographer.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3') - if bld.env['BUILD_TESTS'] and bld.env['HAVE_CPPUNIT']: + if bld.env['BUILD_TESTS'] and bld.is_defined('HAVE_CPPUNIT'): # Unit tests obj = bld(features = 'cxx cxxprogram') obj.source = ''' @@ -99,12 +98,12 @@ def build(bld): tests/general/threader_test.cc ''' - if bld.env['HAVE_SNDFILE']: + if bld.is_defined('HAVE_SNDFILE'): obj.source += ''' tests/sndfile/tmp_file_test.cc ''' - if bld.env['HAVE_SAMPLERATE']: + if bld.is_defined('HAVE_SAMPLERATE'): obj.source += ''' tests/general/sr_converter_test.cc ''' |