Fix conflict.

2 files changed, 5 insertions, 3 deletions

diff --git a/cscript b/cscript
index 9647154..a9ddb05 100644
--- a/cscript
+++ b/cscript
@@ -9,6 +9,8 @@ def build(target, options):
         cmd += ' --static'
         if target.distro == 'centos':
             cmd += ' --disable-tests'
+        if (target.distro == 'debian' and target.version == 'unstable' or target.distro == 'fedora' and target.version == '23'):
+            target.append_with_space('CXXFLAGS', '-std=c++11')
     if target.debug:
         cmd += ' --enable-debug'
     if target.platform == 'windows':
diff --git a/wscript b/wscript
index b827ad9..7f3aeb2 100644
--- a/wscript
+++ b/wscript
@@ -2,7 +2,7 @@ import subprocess
 import os
 
 APPNAME = 'libsub'
-VERSION = '1.1.5devel'
+VERSION = '1.1.8devel'
 API_VERSION = '-1.0'
 
 def options(opt):
@@ -34,9 +34,9 @@ def configure(conf):
         conf.env.HAVE_CXML = 1
         conf.env.LIB_CXML = ['glibmm-2.4', 'glib-2.0', 'pcre', 'sigc-2.0', 'rt', 'xml++-2.6', 'xml2', 'pthread', 'lzma', 'dl', 'z']
         conf.env.STLIB_CXML = ['cxml']
-        conf.check_cfg(package='libcxml', atleast_version='0.08', args='--cflags', uselib_store='CXML', mandatory=True)
+        conf.check_cfg(package='libcxml', atleast_version='0.14.0', args='--cflags', uselib_store='CXML', mandatory=True)
     else:
-        conf.check_cfg(package='libcxml', atleast_version='0.08', args='--cflags --libs', uselib_store='CXML', mandatory=True)
+        conf.check_cfg(package='libcxml', atleast_version='0.14.0', args='--cflags --libs', uselib_store='CXML', mandatory=True)
 
     boost_lib_suffix = ''
     if conf.env.TARGET_WINDOWS: