Fix --static-xmlsec option and use it for Centos 9 (#2858).

diff --git a/cscript b/cscript
index 65bead68779f5bcdf4127af6db4d994a9ced2f90..3d988ae4c02322de0be702406ecb20356588ceee 100644 (file)
--- a/cscript
+++ b/cscript
@@ -574,6 +574,8 @@ def configure_options(target, options, for_package=False):
                 opt += ' --static-boost --static-xmlpp'
             elif target.version == '7':
                 opt += ' --workaround-gssapi'
+            elif target.version == 'stream9':
+                opt += ' --static-xmlsec'
 
     if not options['gui']:
         opt += ' --disable-gui'

diff --git a/wscript b/wscript
index d418ab6f43fa32776be3269c9c50c8dafa8904fb..83b69bd31e1455075f6307fe3b4baf4f940abcc0 100644 (file)
--- a/wscript
+++ b/wscript
@@ -383,8 +383,10 @@ def configure(conf):
     if conf.options.static_xmlsec:
         if conf.check_cxx(lib='xmlsec1-openssl', mandatory=False):
             conf.env.STLIB_XMLSEC = ['xmlsec1-openssl', 'xmlsec1']
+            conf.env.LIB_XMLSEC = ['ltdl']
         else:
             conf.env.STLIB_XMLSEC = ['xmlsec1']
+            conf.env.LIB_XMLSEC = ['ltdl']
     else:
         conf.env.LIB_XMLSEC = ['xmlsec1-openssl', 'xmlsec1']