merge and resolve conflict with master

diff --cc gtk2_ardour/wscript
index a4ec9deee8ed356ae3e3725c18a8fd42b183e270,b657e5fcd5306c77cce442f8c8d8c38d130bc363..97677bc5fc7e7cd8014fd13e3651eaf4e8c5086b
--- 1/gtk2_ardour/wscript
--- 2/gtk2_ardour/wscript
+++ b/gtk2_ardour/wscript
@@@ -412,21 -420,9 +421,14 @@@ def build(bld)
      # 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',
-                          ]
 +
 +    if bld.env['build_target'] == 'mingw':
 +      if bld.env['DEBUG'] == False:
 +            obj.linkflags = ['-mwindows']
 +
      if bld.is_defined('USE_EXTERNAL_LIBS'):
          obj.uselib += ' TAGLIB'
      else: