Merge branch 'master' into cairocanvas

[ardour.git] / libs / vamp-plugins / wscript

diff --git a/libs/vamp-plugins/wscript b/libs/vamp-plugins/wscript
index 4ec6c198b3cf9fa7fecc2ae0ca99014f6acd349e..9568e963670e9e231c06a753921cbb73e5e1d58a 100644 (file)
--- a/libs/vamp-plugins/wscript
+++ b/libs/vamp-plugins/wscript
@@ -23,10 +23,11 @@ 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, 'fftw3f', uselib_store='FFTW3F', mandatory=True)
-    autowaf.check_pkg(conf, 'aubio', uselib_store='AUBIO', mandatory=False)
+    autowaf.check_pkg(conf, 'aubio', uselib_store='AUBIO', mandatory=False,
+                      exact_version='0.3.2')
     conf.write_config_header('libvampplugins-config.h', remove=False)
 
 def build(bld):
@@ -46,7 +47,7 @@ def build(bld):
     obj.target       = 'ardourvampplugins'
     obj.uselib       = 'FFTW3F'
     obj.use          = 'libvampplugin libqmdsp'
-    if bld.env['HAVE_AUBIO']:
+    if bld.is_defined('HAVE_AUBIO'):
         obj.source += ' Onset.cpp '
         obj.uselib += ' AUBIO '
     obj.vnum         = LIBARDOURVAMPPLUGINS_LIB_VERSION