diff options
| author | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2017-07-14 22:21:00 -0400 |
|---|---|---|
| committer | Ashod Nakashian <ashnakash@gmail.com> | 2017-07-15 20:52:39 +0200 |
| commit | 522d211764725b19b7975f500f315444601cdf6b (patch) | |
| tree | 5884a9201dbefa6a1c8a054591f2f9407f079751 /svl/Library_svl.mk | |
| parent | the font installation code is now controlled by ENABLE_GIO (diff) | |
| download | core-522d211764725b19b7975f500f315444601cdf6b.tar.gz core-522d211764725b19b7975f500f315444601cdf6b.zip | |
svl: move byte-array signing from vcl
Signing a generic byte-array can (and will be) used
by more than the existing PDF signing code, hence
the move into comphelper from vcl and ourside of
the PDF-specific logic.
Change-Id: I7257b5218c6ba37960c6a013746eb387917a23a4
Reviewed-on: https://gerrit.libreoffice.org/39717
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Diffstat (limited to 'svl/Library_svl.mk')
| -rw-r--r-- | svl/Library_svl.mk | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/svl/Library_svl.mk b/svl/Library_svl.mk index 292e7f14815d..e3969b1d90a3 100644 --- a/svl/Library_svl.mk +++ b/svl/Library_svl.mk @@ -21,6 +21,8 @@ $(eval $(call gb_Library_Library,svl)) $(eval $(call gb_Library_use_externals,svl,\ boost_headers \ + $(if $(filter LINUX MACOSX %BSD SOLARIS,$(OS)), \ + curl) \ icu_headers \ icuuc \ mdds_headers \ @@ -46,6 +48,20 @@ $(eval $(call gb_Library_add_defs,svl,\ -DSVL_DLLIMPLEMENTATION \ )) +ifeq ($(TLS),NSS) +$(eval $(call gb_Library_use_externals,svl,\ + plc4 \ + nss3 \ +)) +else +ifeq ($(TLS),OPENSSL) +$(eval $(call gb_Library_use_externals,svl,\ + openssl \ + openssl_headers \ +)) +endif +endif + $(eval $(call gb_Library_use_libraries,svl,\ basegfx \ comphelper \ @@ -62,12 +78,30 @@ $(eval $(call gb_Library_use_libraries,svl,\ utl \ )) +$(eval $(call gb_Library_use_system_win32_libs,svl,\ + advapi32 \ + crypt32 \ + gdi32 \ + gdiplus \ + imm32 \ + mpr \ + ole32 \ + shell32 \ + usp10 \ + uuid \ + version \ + winspool \ + setupapi \ + shlwapi \ +)) + $(eval $(call gb_Library_add_exception_objects,svl,\ svl/source/config/asiancfg \ svl/source/config/cjkoptions \ svl/source/config/ctloptions \ svl/source/config/itemholder2 \ svl/source/config/languageoptions \ + svl/source/crypto/cryptosign \ svl/source/filepicker/pickerhistory \ svl/source/filerec/filerec \ svl/source/items/aeitem \ |