4 files changed, 8 insertions, 6 deletions
diff --git a/libs/backends/jack/jack_connection.cc b/libs/backends/jack/jack_connection.cc
index 09e6c9d6e7..fee1b299ba 100644
--- a/libs/backends/jack/jack_connection.cc
+++ b/libs/backends/jack/jack_connection.cc
@@ -21,6 +21,8 @@
 #include <boost/scoped_ptr.hpp>
 #include <jack/session.h>
 
+#include <glibmm/timer.h>
+
 #include "pbd/epa.h"
 
 #include "jack_connection.h"
@@ -145,7 +147,7 @@ JackConnection::close ()
 		_jack = 0;
 
 		/* If we started JACK, it will be closing down */
-		usleep (500000);
+		Glib::usleep (500000);
 
 		Disconnected (""); /* EMIT SIGNAL */
 
diff --git a/libs/backends/jack/jack_session.cc b/libs/backends/jack/jack_session.cc
index 7cd7f6c62b..60d11a8f0c 100644
--- a/libs/backends/jack/jack_session.cc
+++ b/libs/backends/jack/jack_session.cc
@@ -25,6 +25,8 @@
 #include <jack/jack.h>
 #include <jack/transport.h>
 
+#include "pbd/localtime_r.h"
+
 #include "ardour/audioengine.h"
 #include "ardour/filename_extensions.h"
 #include "ardour/session.h"
diff --git a/libs/backends/jack/jack_utils.cc b/libs/backends/jack/jack_utils.cc
index 331c164353..01af13fe9c 100644
--- a/libs/backends/jack/jack_utils.cc
+++ b/libs/backends/jack/jack_utils.cc
@@ -891,11 +891,7 @@ ARDOUR::get_jack_command_line_string (JackCommandLineOptions& options, string& c
 	ostringstream oss;
 
 	for (vector<string>::const_iterator i = args.begin(); i != args.end();) {
-#ifdef WIN32
-		oss << quote_string (*i);
-#else
 		oss << *i;
-#endif
 		if (++i != args.end()) oss << ' ';
 	}
 
diff --git a/libs/backends/jack/wscript b/libs/backends/jack/wscript
index 4e54af0be5..b31d9b5d56 100644
--- 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,7 +45,7 @@ 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' ]