diff options
| author | Michael Stahl <michael.stahl@allotropia.de> | 2023-12-18 20:50:05 +0100 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@allotropia.de> | 2023-12-19 19:55:55 +0100 |
| commit | caefdeb07557299b549eadb669648fd0884b5d17 (patch) | |
| tree | f3c3a734d2c0129c02d97919260b4bfc1804dbca /configure.ac | |
| parent | 9800a7106223bd7759aa851574ef720d15a146cd (diff) | |
argon2: add new external library
Change-Id: I81860a94b33eba95918c30b0e92b583cc2d02ff3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160969
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit 77c921302b7ef869aed28fcd0187c80095d6a766)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161013
Tested-by: René Engelhard <rene@debian.org>
Reviewed-by: René Engelhard <rene@debian.org>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 8cacd9a673e8..fce08fb0cac3 100644 --- a/configure.ac +++ b/configure.ac @@ -11203,6 +11203,14 @@ if test "$build_crypto" = yes; then fi fi +ARGON2_CFLAGS_internal="-I${WORKDIR}/UnpackedTarball/argon2/include" +if test "$COM" = "MSC"; then + ARGON2_LIBS_internal="${WORKDIR}/UnpackedTarball/argon2/vs2015/build/Argon2OptDll.lib" +else + ARGON2_LIBS_internal="${WORKDIR}/UnpackedTarball/argon2/libargon2.a" +fi +libo_CHECK_SYSTEM_MODULE([argon2],[ARGON2],[libargon2]) + dnl =================================================================== dnl Check for system redland dnl =================================================================== |