Merge.

5 files changed, 11 insertions, 2 deletions

diff --git a/.gitignore b/.gitignore
index 3a089a6..0298207 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 *~
 build
 .waf-*
+.waf3-*
 .lock-waf*
 src/version.cc
 UnicodeData.txt
diff --git a/test/wscript b/test/wscript
index 6c03ecf..94965ec 100644
--- a/test/wscript
+++ b/test/wscript
@@ -17,7 +17,7 @@ def configure(conf):
 def build(bld):
     obj = bld(features='cxx cxxprogram')
     obj.name   = 'tests'
-    obj.uselib = 'BOOST_TEST DCP CXML ASDCPLIB_CTH'
+    obj.uselib = 'BOOST_TEST BOOST_REGEX BOOST_FILESYSTEM DCP CXML ASDCPLIB_CTH'
     obj.use    = 'libsub-1.0'
     obj.source = """
                  dcp_reader_test.cc
diff --git a/tools/wscript b/tools/wscript
index 98250be..077035d 100644
--- a/tools/wscript
+++ b/tools/wscript
@@ -1,6 +1,6 @@
 def build(bld):
     obj = bld(features='cxx cxxprogram')
     obj.use = ['libsub-1.0']
-    obj.uselib = 'OPENJPEG DCP CXML ASDCPLIB_CTH'
+    obj.uselib = 'OPENJPEG DCP CXML ASDCPLIB_CTH BOOST_FILESYSTEM'
     obj.source = 'dumpsubs.cc'
     obj.target = 'dumpsubs'
diff --git a/waf b/waf
index 178461f..4b322f1 100755
--- a/waf
+++ b/waf
diff --git a/wscript b/wscript
index 89fcf6d..2dc6682 100644
--- a/wscript
+++ b/wscript
@@ -1,5 +1,6 @@
 import subprocess
 import os
+from waflib import Context
 
 APPNAME = 'libsub'
 VERSION = '1.1.9devel'
@@ -89,6 +90,13 @@ def configure(conf):
     if not conf.env.DISABLE_TESTS:
         conf.recurse('test')
 
+    # libxml++ 2.39.1 and later must be built with -std=c++11
+    libxmlpp_version = conf.cmd_and_log(['pkg-config', '--modversion', 'libxml++-2.6'], output=Context.STDOUT, quiet=Context.BOTH)
+    s = libxmlpp_version.split('.')
+    v = (int(s[0]) << 16) | (int(s[1]) << 8) | int(s[2])
+    if v >= 0x022701:
+        conf.env.append_value('CXXFLAGS', '-std=c++11')
+        
 def build(bld):
     create_version_cc(bld, VERSION)