diff options
| author | Dmitry Baryshkov <dbaryshkov@gmail.com> | 2020-07-04 11:27:14 +0000 |
|---|---|---|
| committer | Dmitry Baryshkov <dbaryshkov@gmail.com> | 2020-07-04 11:27:14 +0000 |
| commit | 6e57d1dd6c8fa9307b818ad15c9795d5d0282106 (patch) | |
| tree | 91d950be96e96f1c031f0ae4bb51b0526c9857ce /lib | |
| parent | 1edec08058e8678a9c1189789746aca506bd097a (diff) | |
| parent | f15c02b1fb9faf3e06db2c51196a27b0f9d72672 (diff) | |
| download | gnutls-6e57d1dd6c8fa9307b818ad15c9795d5d0282106.tar.gz | |
Merge branch 'tmp-pthread' into 'master'
build: use $(LIBPTHREAD) rather than non-existent $(LTLIBPTHREAD)
See merge request gnutls/gnutls!1296
Diffstat (limited to 'lib')
| -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 |