diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-06-21 21:59:11 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-06-22 15:50:01 +0200 |
| commit | ab50f0b08b22af1e60a0b6ce5e7e8e7d1f665216 (patch) | |
| tree | 8c6567bda0948280c211dcbb7166d2535983f1df /config_host.mk.in | |
| parent | c7782c7c27d85866872cc24a618df02504ff12ca (diff) | |
xmlsecurity: implement support for building against system-xmlsec
The only remaining difference is that in the system-xmlsec case we work
with the default key manager, not with the one that's only added by our
xmlsec patches.
This works for me for the uses I know of (see
<https://lists.freedesktop.org/archives/libreoffice/2017-February/076947.html>
for the motivation): signing and verifying of different signatures (bad
signature, good with non-trusted CA, good with trusted CA) with
software-based certificates all behave as expected.
Change-Id: If3f3e2b8373ab7397db3f98070a5a2ce51fa7c06
Reviewed-on: https://gerrit.libreoffice.org/39075
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'config_host.mk.in')
| -rw-r--r-- | config_host.mk.in | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index 5bce0b32697b..2643035f7886 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -557,6 +557,7 @@ export SYSTEM_VISIO=@SYSTEM_VISIO@ export SYSTEM_WPD=@SYSTEM_WPD@ export SYSTEM_WPG=@SYSTEM_WPG@ export SYSTEM_WPS=@SYSTEM_WPS@ +export SYSTEM_XMLSEC=@SYSTEM_XMLSEC@ export SYSTEM_ZLIB=@SYSTEM_ZLIB@ export SYSTEM_ZMF=@SYSTEM_ZMF@ export TARFILE_LOCATION=@TARFILE_LOCATION@ @@ -611,6 +612,8 @@ export XCODE_ARCHS=@XCODE_ARCHS@ export XCODEBUILD_SDK=@XCODEBUILD_SDK@ export XINERAMA_LINK=@XINERAMA_LINK@ export XMLLINT=@XMLLINT@ +export XMLSEC_CFLAGS=$(gb_SPACE)@XMLSEC_CFLAGS@ +export XMLSEC_LIBS=$(gb_SPACE)@XMLSEC_LIBS@ export XRANDR_CFLAGS=$(gb_SPACE)@XRANDR_CFLAGS@ export XRANDR_LIBS=$(gb_SPACE)@XRANDR_LIBS@ export XRENDER_CFLAGS=$(gb_SPACE)@XRENDER_CFLAGS@ |