Fix erroneous libxml++ dependency on Centos 7.

diff --git a/cscript b/cscript
index 5ed7e76c04666026e8933bc4351674fd412dff6f..049c0a842c8d0dd9e2be501fe19dd98f48c29aa7 100644 (file)
--- a/cscript
+++ b/cscript
@@ -261,7 +261,7 @@ def configure_options(target):
             if target.version == '6.5':
                 opt += ' --static-boost --static-xmlpp'
             elif target.version == '7':
-                opt += ' --workaround-gssapi'
+                opt += ' --workaround-gssapi --static-xmlpp'
 
     return opt
 

diff --git a/wscript b/wscript
index 1f39eb5aca009498daf5ad82ea7ff5a8375fc147..d77fadb8e9591904b01ca17089b40af1ed1cb15f 100644 (file)
--- a/wscript
+++ b/wscript
@@ -239,6 +239,7 @@ def configure(conf):
     # libxml++
     if conf.options.static_xmlpp:
         conf.env.STLIB_XMLPP = ['xml++-2.6']
+        conf.env.LIB_XMLPP = ['xml2']
     else:
         conf.check_cfg(package='libxml++-2.6', args='--cflags --libs', uselib_store='XMLPP', mandatory=True)