X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fevoral%2Fwscript;h=9ceab182a5d30570212a53d2fe0819aec390ec91;hb=771a4a4e0c9b6653083f44081a81964c802eb549;hp=84d822a4bdcfc9e46f9edfd435adb3398463976e;hpb=b51321bd7dcf34055ba523506b35e2f38300cbb0;p=ardour.git

diff --git a/libs/evoral/wscript b/libs/evoral/wscript
index 84d822a4bd..9ceab182a5 100644
--- a/libs/evoral/wscript
+++ b/libs/evoral/wscript
@@ -43,7 +43,8 @@ def configure(conf):
     autowaf.check_pkg(conf, 'glib-2.0', uselib_store='GLIB', atleast_version='2.2')
     autowaf.check_pkg(conf, 'glibmm-2.4', uselib_store='GLIBMM', atleast_version='2.14.0')
     autowaf.check_pkg(conf, 'gthread-2.0', uselib_store='GTHREAD', atleast_version='2.14.0')
-    autowaf.check_pkg(conf, 'libpbd-4', uselib_store='LIBPBD', atleast_version='4.0.0', mandatory=True)
+    if not autowaf.is_child():
+        autowaf.check_pkg(conf, 'libpbd-4', uselib_store='LIBPBD', atleast_version='4.0.0', mandatory=True)
 
     # Boost headers
     autowaf.check_header(conf, 'cxx', 'boost/shared_ptr.hpp')
@@ -148,15 +149,14 @@ def build(bld):
                 test/testrunner.cpp
         '''
         obj.includes     = ['.', './src']
-        obj.use          = 'libevoral_static libboost_system'
+        obj.use          = 'libevoral_static'
         obj.uselib       = 'CPPUNIT SNDFILE LIBPBD'
         obj.target       = 'run-tests'
         obj.name         = 'libevoral-tests'
         obj.install_path = ''
         obj.defines      = ['PACKAGE="libevoraltest"']
-        obj.linkflags    = ['-lboost_system'] # FIXME: not sure why this is needed
         if bld.env['TEST_COVERAGE']:
-            obj.linkflags     += ['--coverage']
+            obj.linkflags      = ['--coverage']
             obj.cflags         = ['--coverage']
             obj.cxxflags       = ['--coverage']