Merge branch 'master' of /home/carl/git/libcxml

[libcxml.git] / wscript

diff --git a/wscript b/wscript
index 1699f5acbcb2519ccc0eaf6b503f09138392065c..445d953a295c8adcadccc9acfe8f94a14f43cd2c 100644 (file)
--- a/wscript
+++ b/wscript
@@ -1,15 +1,17 @@
 APPNAME = 'libcxml'
-VERSION = '0.03pre'
+VERSION = '0.05pre'
 
 def options(opt):
     opt.load('compiler_cxx')
     opt.add_option('--target-windows', action='store_true', default = False, help = 'set up to do a cross-compile to Windows')
+    opt.add_option('--static', action='store_true', default = False, help = 'build statically')
 
 def configure(conf):
     conf.load('compiler_cxx')
     conf.env.append_value('CXXFLAGS', ['-Wall', '-Wextra', '-O2'])
 
     conf.env.TARGET_WINDOWS = conf.options.target_windows
+    conf.env.STATIC = conf.options.static
 
     if conf.options.target_windows:
         boost_lib_suffix = '-mt'
@@ -27,6 +29,15 @@ def configure(conf):
                    lib = ['boost_filesystem%s' % boost_lib_suffix, 'boost_system%s' % boost_lib_suffix],
                    uselib_store = 'BOOST_FILESYSTEM')
 
+    conf.check_cxx(fragment = """
+                              #define BOOST_TEST_MODULE Config test\n
+                             #include <boost/test/unit_test.hpp>\n
+                              int main() {}
+                              """,
+                              msg = 'Checking for boost unit testing library',
+                              lib = ['boost_unit_test_framework%s' % boost_lib_suffix, 'boost_system%s' % boost_lib_suffix],
+                              uselib_store = 'BOOST_TEST')
+
     conf.recurse('test')
 
 def build(bld):