Revert "build: Explicitly link threaded test programs to libpthread"

This reverts commit dc4a6eaddbb36a344cc6a9c7eb12cab9df4899b0.

diff --git a/configure.ac b/configure.ac
index aa5a00b5691382a9cca0aeb3c4358b8248b84de3..e393b4d081ded6ea29fc3114b6f569340a8d27e5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -79,16 +79,6 @@ if test "$os_unix" = "yes"; then
                ])
        ])
 
-       SAVE_LIBS="$LIBS"
-       PTHREAD_LIBS=
-       AC_CHECK_FUNC([pthread_create], , [
-               AC_CHECK_LIB([pthread], [pthread_create],
-                       [PTHREAD_LIBS=-lpthread],
-                       [AC_MSG_ERROR([could not find pthread_create])])
-       ])
-       LIBS="$SAVE_LIBS"
-       AC_SUBST(PTHREAD_LIBS)
-
        AC_CHECK_FUNC([nanosleep], , [
                AC_SEARCH_LIBS([nanosleep], [rt], , [
                        AC_MSG_ERROR([could not find nanosleep])

diff --git a/p11-kit/Makefile.am b/p11-kit/Makefile.am
index 2ceeb7b6a05263323749b9a5c7219a9199424997..b6dffde2f92850d6e313d5fa28e6aca0c8b7dfbc 100644 (file)
--- a/p11-kit/Makefile.am
+++ b/p11-kit/Makefile.am
@@ -335,10 +335,10 @@ test_conf_SOURCES = p11-kit/test-conf.c
 test_conf_LDADD = $(p11_kit_LIBS)
 
 test_deprecated_SOURCES = p11-kit/test-deprecated.c
-test_deprecated_LDADD = $(p11_kit_LIBS) $(PTHREAD_LIBS)
+test_deprecated_LDADD = $(p11_kit_LIBS)
 
 test_init_SOURCES = p11-kit/test-init.c
-test_init_LDADD = $(p11_kit_LIBS) $(PTHREAD_LIBS)
+test_init_LDADD = $(p11_kit_LIBS)
 
 test_iter_SOURCES = p11-kit/test-iter.c
 test_iter_LDADD = $(p11_kit_LIBS)
@@ -356,7 +356,7 @@ test_proxy_SOURCES = p11-kit/test-proxy.c
 test_proxy_LDADD = $(p11_kit_LIBS)
 
 test_rpc_SOURCES = p11-kit/test-rpc.c
-test_rpc_LDADD = $(p11_kit_LIBS) $(PTHREAD_LIBS)
+test_rpc_LDADD = $(p11_kit_LIBS)
 
 test_server_SOURCES = p11-kit/test-server.c
 test_server_LDADD = $(p11_kit_LIBS)
@@ -397,7 +397,7 @@ test_managed_SOURCES = p11-kit/test-managed.c
 test_managed_LDADD = $(p11_kit_LIBS)
 
 test_transport_SOURCES = p11-kit/test-transport.c
-test_transport_LDADD = $(p11_kit_LIBS) $(PTHREAD_LIBS)
+test_transport_LDADD = $(p11_kit_LIBS)
 
 test_virtual_SOURCES = p11-kit/test-virtual.c
 test_virtual_LDADD = $(p11_kit_LIBS)