fix merge with master

diff --cc gtk2_ardour/wscript
index f4cb37dfc369139421a1128c055a00e716030c13,b657e5fcd5306c77cce442f8c8d8c38d130bc363..fc40276fac22a44bf363aa180e8b51327ef32aa1
--- 1/gtk2_ardour/wscript
--- 2/gtk2_ardour/wscript
+++ b/gtk2_ardour/wscript
@@@ -365,17 -378,16 +365,16 @@@ def build(bld)
                  ../libs/fst/vstwin.c
                  ../vst/winmain.c
          '''
-         obj.uselib = 'ALSA'
          obj.use          = [ 'libpbd',
                               'libmidipp',
--                             'libtaglib',
                               'libardour',
                               'libardour_cp',
+                              'libtimecode',
+                              'libmidipp',
                               'libgtk2_ardour',
                               'libgtkmm2ext',
-                              'libtaglib',
 -                             'libtaglib']
 +                             'libcanvas'
 +                             ]
          obj.target = 'ardour-' + bld.env['VERSION'] + '-vst.exe.so'
          obj.includes  = [ '../libs/fst', '.' ]
          obj.linkflags = ['-mwindows', '-Wl,--export-dynamic']
@@@ -400,17 -420,9 +407,10 @@@
      # or an executable.
  
      obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
- 
-     obj.uselib       = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD GTK OGG ALSA CURL DL'
+     obj.uselib       = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD GTK OGG CURL DL'
      obj.uselib       += ' GTKMM GNOMECANVASMM GNOMECANVAS FFTW3F'
      obj.uselib       += ' AUDIOUNITS OSX GTKOSX LO '
-     obj.use          = [ 'libpbd',
-                          'libmidipp',
-                          'ardour',
-                          'libardour_cp',
-                          'libgtkmm2ext',
-                          'libcanvas'
-                          ]
++
      if bld.is_defined('USE_EXTERNAL_LIBS'):
          obj.uselib += ' TAGLIB'
      else:

diff --cc libs/backends/jack/jack_audiobackend.cc
Simple merge