From: Carl Hetherington Date: Mon, 31 Oct 2016 15:51:50 +0000 (+0000) Subject: More proper checking for locked_sstream. X-Git-Tag: v0.15.2~1 X-Git-Url: https://git.carlh.net/gitweb/?p=libcxml.git;a=commitdiff_plain;h=cb7cd5d75d324afffeb35b284cfd31024415cbcd More proper checking for locked_sstream. --- diff --git a/cscript b/cscript index 8c90300..5e33e0e 100644 --- a/cscript +++ b/cscript @@ -21,7 +21,7 @@ import os def dependencies(target): - return (('locked_sstream', None),) + return (('locked_sstream', 'v0.0.2'),) def build(target, options): cmd = './waf configure --prefix=%s' % target.directory diff --git a/libcxml.pc.in b/libcxml.pc.in index 8b7c15c..12bee18 100644 --- a/libcxml.pc.in +++ b/libcxml.pc.in @@ -5,6 +5,6 @@ includedir=@includedir@ Name: libcxml Description: Library to simplify XML parsing with libxml++ Version: @version@ -Requires: libxml++-2.6 glibmm-2.4 +Requires: libxml++-2.6 glibmm-2.4 locked_sstream Libs: @libs@ Cflags: -I${includedir} diff --git a/src/wscript b/src/wscript index 5d24f84..2d76735 100644 --- a/src/wscript +++ b/src/wscript @@ -27,7 +27,7 @@ def build(bld): obj.vnum = bld.env.API_VERSION obj.target = 'cxml' obj.export_includes = ['.'] - obj.uselib = 'LIBXML++ BOOST_FILESYSTEM' + obj.uselib = 'LIBXML++ BOOST_FILESYSTEM LOCKED_SSTREAM' obj.source = "cxml.cc" bld.install_files('${PREFIX}/include/libcxml', "cxml.h") diff --git a/wscript b/wscript index 2c5f389..4430532 100644 --- a/wscript +++ b/wscript @@ -45,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 \n