prepare for update to waf 1.8

uselib is no longer implicit (inherited by .use). This is still incomplete,
some uselibs for non-linux variants may be missing.

bld.is_defined("HAVE_XXX") also no longer works and will have to be
changed (I think to bld.env["HAVE_XXX"]) in countless places.

5 files changed, 6 insertions, 2 deletions

diff --git a/libs/backends/alsa/wscript b/libs/backends/alsa/wscript
index 7a4649f779..465260d265 100644
--- a/libs/backends/alsa/wscript
+++ b/libs/backends/alsa/wscript
@@ -29,7 +29,7 @@ def build(bld):
     obj.name     = 'alsa_audiobackend'
     obj.target   = 'alsa_audiobackend'
     obj.use      = 'libardour libpbd ardouralsautil'
-    obj.uselib   = 'ALSA'
+    obj.uselib   = 'ALSA GLIBMM XML'
     obj.install_path  = os.path.join(bld.env['LIBDIR'], 'backends')
     obj.defines = ['PACKAGE="' + I18N_PACKAGE + '"',
                    'ARDOURBACKEND_DLL_EXPORTS'
diff --git a/libs/backends/coreaudio/wscript b/libs/backends/coreaudio/wscript
index 9aad9cde4f..8030af2be8 100644
--- a/libs/backends/coreaudio/wscript
+++ b/libs/backends/coreaudio/wscript
@@ -29,6 +29,7 @@ def build(bld):
     obj.name     = 'coreaudio_backend'
     obj.target   = 'coreaudio_backend'
     obj.use      = 'libardour libpbd'
+    obj.uselib   = 'GLIBMM XML'
     obj.framework = [ 'CoreAudio', 'AudioToolbox', 'CoreServices' ]
     if bld.env['build_target'] not in [ 'lion' ] and (not bld.env['build_arch'] == "ppc"):
         obj.framework += [ 'CoreMidi' ]
diff --git a/libs/backends/dummy/wscript b/libs/backends/dummy/wscript
index e1a598525c..e674d3579b 100644
--- a/libs/backends/dummy/wscript
+++ b/libs/backends/dummy/wscript
@@ -25,6 +25,7 @@ def build(bld):
     obj.name     = 'dummy_audiobackend'
     obj.target   = 'dummy_audiobackend'
     obj.use      = 'libardour libpbd'
+    obj.uselib   = 'GLIBMM XML'
     obj.install_path  = os.path.join(bld.env['LIBDIR'], 'backends')
     obj.defines = ['PACKAGE="' + I18N_PACKAGE + '"',
                    'ARDOURBACKEND_DLL_EXPORTS'
diff --git a/libs/backends/jack/wscript b/libs/backends/jack/wscript
index 17b4d160dc..d9dbbb785f 100644
--- a/libs/backends/jack/wscript
+++ b/libs/backends/jack/wscript
@@ -108,6 +108,8 @@ def build(bld):
         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.
diff --git a/libs/backends/portaudio/wscript b/libs/backends/portaudio/wscript
index 1c6af9fea7..150b176d00 100644
--- a/libs/backends/portaudio/wscript
+++ b/libs/backends/portaudio/wscript
@@ -32,7 +32,7 @@ def build_portaudio (bld, name, defines):
     obj.name     = name
     obj.target   = name
     obj.use      = 'libardour libpbd'
-    obj.uselib   = ['PORTAUDIO']
+    obj.uselib   = 'PORTAUDIO GLIBMM XML'
     obj.install_path  = os.path.join(bld.env['LIBDIR'], 'backends')
     obj.defines = ['PACKAGE="' + I18N_PACKAGE + '"',
                    'ARDOURBACKEND_DLL_EXPORTS',