Merge branch 'cairocanvas' of git.ardour.org:ardour/ardour into cairocanvas

[ardour.git] / libs / backends / jack / wscript

diff --git a/libs/backends/jack/wscript b/libs/backends/jack/wscript
index 4e54af0be5194334760bfc4e6e885708e2781546..1f54e7a5e704db701ddebba1913363197ac13f39 100644 (file)
--- a/libs/backends/jack/wscript
+++ b/libs/backends/jack/wscript
@@ -20,6 +20,8 @@ def options(opt):
     autowaf.set_options(opt)
 
 def configure(conf):
+    autowaf.check_pkg(conf, 'jack', uselib_store='JACK', atleast_version='0.121.0')
+
     #
     # PortAudio is currently used to get a list of audio device names.
     # We should find a better way to do this that doesn't involve this
@@ -43,13 +45,13 @@ def build(bld):
     obj.includes = ['.']
     obj.name     = 'jack_audiobackend'
     obj.target   = 'jack_audiobackend'
-    if Options.options.dist_target == 'mingw':
+    if (bld.env['build_target'] == 'mingw'):
         obj.uselib   = [ 'JACK', 'PORTAUDIO' ]
     else:
         obj.uselib   = [ 'JACK' ]
     obj.use      = 'libardour libpbd'
     obj.vnum     = JACKBACKEND_VERSION
-    obj.install_path  = os.path.join(bld.env['LIBDIR'], 'ardour3', 'backends')
+    obj.install_path  = os.path.join(bld.env['LIBDIR'], 'backends')
     obj.defines = ['PACKAGE="' + I18N_PACKAGE + '"', 
                    'ARDOURBACKEND_DLL_EXPORTS'
                    ]