diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-11-13 15:32:07 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-11-13 15:32:07 +0000 |
| commit | e4fde97bf6d479194cb8b3a12b9f64d41f754e84 (patch) | |
| tree | 488f202799f093b375190f333a2b30afdbd474ed /wscript | |
| parent | dc4b34424426c9d1acac00f4274312ee8edc715a (diff) | |
| parent | 8364c00735ac3912ffc8d61828db94ef9f537a60 (diff) | |
Fix conflict.
Diffstat (limited to 'wscript')
| -rw-r--r-- | wscript | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -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: |