summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2014-01-09 19:14:09 +0100
committerWerner Koch <wk@gnupg.org>2014-01-27 14:17:38 +0100
commit79da0358fd555361e1ce4202f55494a8918eb8ae (patch)
treea65d01e82f517c3a03442f73320d0923d615cc29 /tests
parentbf34bfa5c458ee5ece91f25e3b4194d768498ab6 (diff)
downloadlibgcrypt-79da0358fd555361e1ce4202f55494a8918eb8ae.tar.gz
Update gpg-error autoconf macros to fix threading problems.
* m4/gpg-error.m4: Update to version 2014-01-24. * tests/Makefile.am (t_lock_LDADD): Use MT Libs.
Diffstat (limited to 'tests')
-rw-r--r--tests/Makefile.am9
1 files changed, 5 insertions, 4 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index ac5ab707..4cf7a449 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -46,9 +46,9 @@ AM_CPPFLAGS = -I../src -I$(top_srcdir)/src
AM_CFLAGS = $(GPG_ERROR_CFLAGS)
AM_LDFLAGS = -no-install
-default_ldadd = \
+standard_ldadd = \
../src/libgcrypt.la $(DL_LIBS) \
- ../compat/libcompat.la $(GPG_ERROR_LIBS)
+ ../compat/libcompat.la
EXTRA_PROGRAMS = testapi pkbench
noinst_PROGRAMS = $(tests_bin) $(tests_bin_last) fipsdrv rsacvt genhashdata
@@ -58,5 +58,6 @@ EXTRA_DIST = README rsa-16k.key cavs_tests.sh cavs_driver.pl \
pkcs1v2-oaep.h pkcs1v2-pss.h pkcs1v2-v15c.h pkcs1v2-v15s.h \
t-ed25519.inp stopwatch.h hashtest-256g.in
-LDADD = $(default_ldadd)
-t_lock_LDADD = $(default_ldadd) $(LIBMULTITHREAD)
+LDADD = $(standard_ldadd) $(GPG_ERROR_LIBS)
+t_lock_LDADD = $(standard_ldadd) $(GPG_ERROR_MT_LIBS)
+t_lock_CFLAGS = $(GPG_ERROR_MT_CFLAGS)