X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fbackends%2Fjack%2Fwscript;h=8de15ef74d93e9d384551021e931f9508ffb4337;hb=3c25d26e91d4703ba76c90d5175aa94e4ddd850b;hp=366fcd26874cc6ae9993f6b97c401a8966fb2a33;hpb=aaab1924367ea60d7332d96c2361422bea105f6d;p=ardour.git

diff --git a/libs/backends/jack/wscript b/libs/backends/jack/wscript
index 366fcd2687..8de15ef74d 100644
--- a/libs/backends/jack/wscript
+++ b/libs/backends/jack/wscript
@@ -41,14 +41,19 @@ def configure(conf):
     conf.check_cxx(fragment = "#include <jack/jack.h>\n#include <jack/metadata.h>\nint main(void) { jack_port_uuid(NULL); return 0; }\n",
                    mandatory = False,
                    msg = 'Checking for JACK metadata API',
+                   execute = False,
+                   features = ['cxx'],
                    okmsg = 'ok',
                    errmsg = 'not found (or broken). JACK metadata API will not be used',
                    define_name = 'HAVE_JACK_METADATA',
                    uselib = 'JACK')
 
     # Check to see if jack_port_rename() is available and working
-    conf.check_cxx(fragment = "#include <jack/jack.h>\nint main(void) { jack_client_t* c; jack_port_t* p; jack_port_rename (c, p, \"foo\"); return 0; }\n",
+    if conf.env['libjack_link'] == 'link':
+            conf.check_cxx(fragment = "#include <jack/jack.h>\nint main(void) { jack_client_t* c; jack_port_t* p; jack_port_rename (c, p, \"foo\"); return 0; }\n",
                    mandatory = False,
+                   execute = False,
+                   features = ['cxx'],
                    msg = 'Checking for jack_port_rename()',
                    okmsg = 'ok',
                    errmsg = 'not found (or broken). jack_port_rename() will not be used, and jack_port_set_name() will be used instead',
@@ -57,7 +62,7 @@ def configure(conf):
 
 def build(bld):
     obj = bld(features = 'c cxx cxxshlib')
-    obj.source = [ 
+    obj.source = [
             'jack_api.cc',
             'jack_connection.cc',
             'jack_audiobackend.cc',
@@ -69,7 +74,7 @@ def build(bld):
     obj.includes = ['.']
     obj.name     = 'jack_audiobackend'
     obj.target   = 'jack_audiobackend'
-    obj.defines = ['PACKAGE="' + I18N_PACKAGE + '"', 
+    obj.defines = ['PACKAGE="' + I18N_PACKAGE + '"',
                    'ARDOURBACKEND_DLL_EXPORTS'
                    ]
     obj.use      = 'libardour libpbd ardouralsautil'
@@ -77,6 +82,9 @@ def build(bld):
     if bld.env['build_target'] != 'mingw':
         obj.cxxflags = [ '-fPIC' ]
         obj.cflags   = [ '-fPIC' ]
+    else:
+        obj.cxxflags = [ ]
+        obj.cflags   = [ ]
 
     if bld.is_defined ('HAVE_JACK_METADATA'):
         obj.cxxflags += [ '-DHAVE_JACK_METADATA' ]
@@ -93,14 +101,19 @@ def build(bld):
 
     if bld.env['libjack_link'] == 'link':
         obj.uselib   += [ 'JACK' ]
-    else:
+    elif bld.env['build_target'] == 'mingw':
         obj.defines += [ 'USE_WEAK_JACK' ]
         obj.deps = [ 'weak_libjack.def' ]
+    else:
+        obj.defines += [ 'USE_WEAK_JACK', 'HAVE_JACK_PORT_RENAME' ]
+        obj.deps = [ 'weak_libjack.def' ]
+
+    obj.uselib   += [ 'GLIBMM', 'XML' ];
 
     #
     # device discovery code in the jack backend needs ALSA
     # on Linux.
-    # 
+    #
 
     if re.search ("linux", sys.platform) != None:
        obj.uselib += [ 'ALSA' ]