From d0352b4a601210216b54a34b37b4c0e6da0709f4 Mon Sep 17 00:00:00 2001
From: Karl Linden <karl.j.linden@gmail.com>
Date: Sun, 13 Dec 2015 20:38:31 +0100
Subject: [PATCH] Link all drivers against serverlib on MacOSX and Windows.

---
 wscript | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/wscript b/wscript
index 32c96e93..4d83f77e 100644
--- a/wscript
+++ b/wscript
@@ -722,6 +722,15 @@ def build_jackd(bld):
 
 # FIXME: Is SERVER_SIDE needed?
 def create_driver_obj(bld, **kw):
+    if bld.env['IS_MACOSX'] or bld.env['IS_WINDOWS']:
+        # On MacOSX this is necessary.
+        # I do not know if this is necessary on Windows.
+        # Note added on 2015-12-13 by lilrc.
+        if 'use' in kw:
+            kw['use'] += ['serverlib']
+        else:
+            kw['use'] = ['serverlib']
+
     driver = bld(
         features = ['c', 'cshlib', 'cxx', 'cxxshlib'],
         defines = ['HAVE_CONFIG_H', 'SERVER_SIDE'],
@@ -907,28 +916,26 @@ def build_drivers(bld):
             bld,
             target = 'portaudio',
             source = portaudio_src,
-            use = ['serverlib', 'PORTAUDIO']) # FIXME: Is serverlib needed here?
+            use = ['PORTAUDIO'])
 
     if bld.env['BUILD_DRIVER_WINMME']:
         create_driver_obj(
             bld,
             target = 'winmme',
             source = winmme_src,
-            use = ['serverlib', 'WINMME']) # FIXME: Is serverlib needed here?
+            use = ['WINMME'])
 
     if bld.env['IS_MACOSX']:
         create_driver_obj(
             bld,
             target = 'coreaudio',
             source = coreaudio_src,
-            use = ['serverlib'], # FIXME: Is this needed?
             framework = ['AudioUnit', 'CoreAudio', 'CoreServices'])
 
         create_driver_obj(
             bld,
             target = 'coremidi',
             source = coremidi_src,
-            use = ['serverlib'], # FIXME: Is this needed?
             framework = ['AudioUnit', 'CoreMIDI', 'CoreServices'])
 
     if bld.env['IS_SUN']: