Allow libcxml and libdcp builds with static boost.v1.9.16

4 files changed, 10 insertions, 3 deletions

diff --git a/cscript b/cscript
index 2db3725f..9ad72efa 100644
--- a/cscript
+++ b/cscript
@@ -36,7 +36,7 @@ import shutil
 
 def dependencies(target, options):
     deps = [
-        ('libcxml', 'v0.17.9', options),
+        ('libcxml', 'v0.17.10', options),
         ('openjpeg', 'ad8edaacd54a862940d0a77c41ecda5858b54d6e'),
         ('asdcplib', 'v1.0.2')
     ]
@@ -59,6 +59,8 @@ def build(target, options):
         if target.distro != 'ubuntu' or not target.version in ('16.04', '22.04'):
             # We only build tests on Ubuntu 16.04 and 22.04
             cmd += ' --disable-tests'
+        if target.distro == 'centos' or (target.distro == 'ubuntu' and target.version == '16.04'):
+            cmd += ' --static-boost'
     elif target.platform == 'windows':
         cmd += f' --target-windows-{target.bits}'
 
diff --git a/test/test.cc b/test/test.cc
index 2cde0776..65649efd 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -31,8 +31,9 @@
     files in the program, then also delete it here.
 */
 
-#define BOOST_TEST_DYN_LINK
+
 #define BOOST_TEST_MODULE libdcp_test
+
 #include "compose.hpp"
 #include "cpl.h"
 #include "dcp.h"
diff --git a/test/wscript b/test/wscript
index 64b3ed59..13493f1e 100644
--- a/test/wscript
+++ b/test/wscript
@@ -42,7 +42,7 @@ def configure(conf):
     conf.check_cxx(fragment="""
                             #define BOOST_TEST_MODULE Config test\n
                             #include <boost/test/unit_test.hpp>\n
-                            int main() {}
+                            BOOST_AUTO_TEST_CASE(foo) {}
                             """,
                    msg='Checking for boost unit testing library',
                    lib='boost_unit_test_framework%s' % boost_lib_suffix,
diff --git a/wscript b/wscript
index 89026bcd..6c90da88 100644
--- a/wscript
+++ b/wscript
@@ -60,6 +60,7 @@ def options(opt):
     opt.add_option('--target-windows-32', action='store_true', default=False, help='set up to do a cross-compile to Windows 32-bit')
     opt.add_option('--enable-debug', action='store_true', default=False, help='build with debugging information and without optimisation')
     opt.add_option('--static', action='store_true', default=False, help='build libdcp statically, and link statically to openjpeg, cxml, asdcplib-dcpomatic')
+    opt.add_option('--static-boost', action='store_true', default=False, help='link statically to boost')
     opt.add_option('--disable-tests', action='store_true', default=False, help='disable building of tests')
     opt.add_option('--disable-benchmarks', action='store_true', default=False, help='disable building of benchmarks')
     opt.add_option('--enable-gcov', action='store_true', default=False, help='use gcov in tests')
@@ -111,6 +112,9 @@ def configure(conf):
     elif int(gcc[0]) > 4:
         conf.env.append_value('CXXFLAGS', ['-Wsuggest-override'])
 
+    if not conf.options.static_boost:
+        conf.env.append_value('CXXFLAGS', '-DBOOST_TEST_DYN_LINK')
+
     # Disable libxml++ deprecation warnings for now
     conf.env.append_value('CXXFLAGS', ['-Wno-deprecated-declarations'])