summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-10-31 15:51:50 +0000
committerCarl Hetherington <cth@carlh.net>2016-10-31 15:51:50 +0000
commitcb7cd5d75d324afffeb35b284cfd31024415cbcd (patch)
tree04ec668e98d8653efb0a31a964e7bf1456107a6c
parent8bdbeb17890d3d7a58473dc2caa4824e91411c8b (diff)
More proper checking for locked_sstream.
-rw-r--r--cscript2
-rw-r--r--libcxml.pc.in2
-rw-r--r--src/wscript2
-rw-r--r--wscript1
4 files changed, 4 insertions, 3 deletions
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 <boost/filesystem.hpp>\n