From: Carl Hetherington <cth@carlh.net>
Date: Wed, 3 Feb 2016 11:42:35 +0000 (+0000)
Subject: Use -std=c++11 for new libxml++ versions.
X-Git-Tag: v0.15.1~1
X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;h=53d49acd4079197873bd93fbf5f2adcd1d09bdd6;p=libcxml.git

Use -std=c++11 for new libxml++ versions.
---

diff --git a/waf b/waf
index 178461f..4b322f1 100755
Binary files a/waf and b/waf differ
diff --git a/wscript b/wscript
index 9a2d469..6042358 100644
--- a/wscript
+++ b/wscript
@@ -1,3 +1,5 @@
+from waflib import Context
+
 APPNAME = 'libcxml'
 VERSION = '0.15.0devel'
 API_VERSION = '0.0.0'
@@ -45,6 +47,13 @@ def configure(conf):
 
         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):
 
     bld(source='libcxml.pc.in',