Merge.

3 files changed, 10 insertions, 4 deletions

diff --git a/cscript b/cscript
index 5e7c29f..5f2d151 100644
--- a/cscript
+++ b/cscript
@@ -5,5 +5,3 @@ def build(env, target):
         cmd += ' --target-windows'
     env.command(cmd)
     env.command('./waf build install')
-
-
diff --git a/src/wscript b/src/wscript
index e1c405a..70f4b27 100644
--- a/src/wscript
+++ b/src/wscript
@@ -1,5 +1,8 @@
 def build(bld):
-    obj = bld(features = 'cxx cxxshlib')
+    if bld.env.STATIC:
+        obj = bld(features = 'cxx cxxstlib')
+    else:
+        obj = bld(features = 'cxx cxxshlib')
     obj.name = 'libcxml'
     obj.target = 'cxml'
     obj.export_includes = ['.']
@@ -7,3 +10,6 @@ def build(bld):
     obj.source = "cxml.cc"
 
     bld.install_files('${PREFIX}/include/libcxml', "cxml.h")
+    if bld.env.STATIC:
+        bld.install_files('${PREFIX}/lib', 'libcxml.a')
+
diff --git a/wscript b/wscript
index d3d2764..445d953 100644
--- a/wscript
+++ b/wscript
@@ -1,15 +1,17 @@
 APPNAME = 'libcxml'
-VERSION = '0.04pre'
+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'