diff options
| author | Daiki Ueno <ueno@gnu.org> | 2020-09-03 14:16:08 +0000 |
|---|---|---|
| committer | Daiki Ueno <ueno@gnu.org> | 2020-09-03 14:16:08 +0000 |
| commit | 999525211e1a5a22194411a4b078259137f5fe19 (patch) | |
| tree | 3927532d2baa80554b30d4d446d5250868f988a2 /lib/Makefile.am | |
| parent | 3c137c9f2888334596fb9f4313d4389d39afe8fd (diff) | |
| parent | b0be5d7c39d4a5f7d29db4630926a4cef7c3edce (diff) | |
| download | gnutls-999525211e1a5a22194411a4b078259137f5fe19.tar.gz | |
Merge branch 'tmp-backport-3.6' into 'gnutls_3_6_x'
Backport bug fixes from master to gnutls_3_6_x
See merge request gnutls/gnutls!1317
Diffstat (limited to 'lib/Makefile.am')
| -rw-r--r-- | lib/Makefile.am | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am index fa47ac5e62..02504d8d10 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -168,7 +168,13 @@ libgnutls_la_LIBADD += accelerated/libaccelerated.la endif if !WINDOWS -thirdparty_libadd += $(LTLIBPTHREAD) +# p11-kit does not work without threading support: +# https://github.com/p11-glue/p11-kit/pull/183 +if ENABLE_PKCS11 +thirdparty_libadd += $(LIBPMULTITHREAD) +else +thirdparty_libadd += $(LIBPTHREAD) +endif endif if NEEDS_LIBRT |