More proper checking for locked_sstream.
authorCarl Hetherington <cth@carlh.net>
Mon, 31 Oct 2016 15:51:50 +0000 (15:51 +0000)
committerCarl Hetherington <cth@carlh.net>
Mon, 31 Oct 2016 15:51:50 +0000 (15:51 +0000)
cscript
libcxml.pc.in
src/wscript
wscript

diff --git a/cscript b/cscript
index 8c90300621922a2c2c88006f5895f0aa4e3d18c2..5e33e0efae6e5af655f7bb14df6cbae6f98809c4 100644 (file)
--- 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
index 8b7c15cf7efd43519d5476dcbf963d4e9a1e95ec..12bee18ba7e0345108667d903c4dc652aaf48ac0 100644 (file)
@@ -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}
index 5d24f84a4248ccfb4f68624d5711990f7a6bbd84..2d7673506e5261aafa97e1f7bfb5bcc79438309a 100644 (file)
@@ -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 2c5f3898ac3501e7179f2bb69fcbf85b456566ff..4430532cea020ea065288e9835fe9771f49948b6 100644 (file)
--- 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