Merge branch 'master' of git.carlh.net:git/libcxml

[libcxml.git] / wscript

diff --git a/wscript b/wscript
index 0d91d698dbdc20fa561bc555ee1cb4f291ef8b87..d6749aa89e7da2d172f7a68b33929c0ef45c1286 100644 (file)
--- a/wscript
+++ b/wscript
@@ -1,5 +1,27 @@
+# -*- mode: python -*-
+#
+#    Copyright (C) 2016 Carl Hetherington <cth@carlh.net>
+#
+#    This file is part of libcxml.
+#
+#    libcxml is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    libcxml is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with libcxml.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+from waflib import Context
+
 APPNAME = 'libcxml'
-VERSION = '0.12.0devel'
+VERSION = '0.15.2devel'
 API_VERSION = '0.0.0'
 
 def options(opt):
@@ -23,6 +45,7 @@ def configure(conf):
         boost_lib_suffix = ''
 
     conf.check_cfg(package='libxml++-2.6', args='--cflags --libs', uselib_store='LIBXML++', mandatory=True)
+    conf.check_cfg(package='locked_sstream', args='--cflags --libs', uselib_store='LOCKED_SSTREAM', mandatory=True)
 
     conf.check_cxx(fragment="""
                   #include <boost/filesystem.hpp>\n
@@ -45,6 +68,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',