From af8a1c146dadeda43c2f8bcc3a5982ff13d69eb3 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Tue, 8 Oct 2013 16:13:39 -0400
Subject: [PATCH] move JACK configuration test(s) down to where they belong (in
 libs/backend/jack)

---
 libs/backends/jack/wscript | 2 +-
 wscript                    | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/libs/backends/jack/wscript b/libs/backends/jack/wscript
index 73b2005f84..06463bf3ec 100644
--- a/libs/backends/jack/wscript
+++ b/libs/backends/jack/wscript
@@ -19,6 +19,7 @@ def options(opt):
     autowaf.set_options(opt)
 
 def configure(conf):
+    autowaf.check_pkg(conf, 'jack', uselib_store='JACK', atleast_version='0.123.0')
     autowaf.configure(conf)
 
 def build(bld):
@@ -32,7 +33,6 @@ def build(bld):
             'jack_session.cc',
             ]
     obj.includes = ['.']
-    obj.cxxflags = [ '-fPIC' ]
     obj.name     = 'jack_audiobackend'
     obj.target   = 'jack_audiobackend'
     obj.uselib   = [ 'JACK' ]
diff --git a/wscript b/wscript
index fded3e1652..da7b39d883 100644
--- a/wscript
+++ b/wscript
@@ -612,8 +612,6 @@ def configure(conf):
     if Options.options.boost_sp_debug:
         conf.env.append_value('CXXFLAGS', '-DBOOST_SP_ENABLE_DEBUG_HOOKS')
 
-    autowaf.check_header(conf, 'cxx', 'jack/session.h', define="JACK_SESSION", mandatory = False)
-
     conf.check_cxx(fragment = "#include <boost/version.hpp>\nint main(void) { return (BOOST_VERSION >= 103900 ? 0 : 1); }\n",
                   execute = "1",
                   mandatory = True,
@@ -661,8 +659,6 @@ def configure(conf):
     if opts.lxvst:
         conf.define('LXVST_SUPPORT', 1)
         conf.env['LXVST_SUPPORT'] = True
-    if bool(conf.env['JACK_SESSION']):
-        conf.define('HAVE_JACK_SESSION', 1)
     conf.define('WINDOWS_KEY', opts.windows_key)
     conf.env['PROGRAM_NAME'] = opts.program_name
     if opts.rt_alloc_debug:
@@ -716,7 +712,6 @@ const char* const ardour_config_info = "\\n\\
     write_config_text('FLAC',                  conf.is_defined('HAVE_FLAC'))
     write_config_text('FPU optimization',      opts.fpu_optimization)
     write_config_text('Freedesktop files',     opts.freedesktop)
-    write_config_text('JACK session support',  conf.is_defined('JACK_SESSION'))
     write_config_text('LV2 UI embedding',      conf.is_defined('HAVE_SUIL'))
     write_config_text('LV2 support',           conf.is_defined('LV2_SUPPORT'))
     write_config_text('LXVST support',         conf.is_defined('LXVST_SUPPORT'))