Merge.

1 files changed, 8 insertions, 0 deletions

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)