From fa5a15c961407f333c3bfc6283ac3551c38dc9f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B3zef=20Kucia?= Date: Tue, 19 Mar 2019 14:41:04 +0100 Subject: [PATCH] build: Fix pthread tests. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Józef Kucia Signed-off-by: Henri Verbeet Signed-off-by: Alexandre Julliard --- configure.ac | 4 +--- m4/check-pthread.m4 | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 m4/check-pthread.m4 diff --git a/configure.ac b/configure.ac index bfaa8f2d..6d2e1282 100644 --- a/configure.ac +++ b/configure.ac @@ -80,9 +80,7 @@ AC_CHECK_LIB([dl], [dlopen], [AS_IF([test "$ac_cv_header_dlfnc_h" = "xyes"], [AC_MSG_ERROR([libdl not found.])])]) AC_ARG_VAR([PTHREAD_LIBS], [linker flags for pthreads]) -AC_CHECK_LIB([pthread], [pthread_create], - [AC_SUBST([PTHREAD_LIBS], ["-lpthread"])], - [AC_MSG_ERROR([libpthread not found.])]) +VKD3D_CHECK_PTHREAD AC_SUBST([VULKAN_LIBS]) VKD3D_CHECK_SONAME([vulkan], [vkGetInstanceProcAddr], diff --git a/m4/check-pthread.m4 b/m4/check-pthread.m4 new file mode 100644 index 00000000..5fa82ecb --- /dev/null +++ b/m4/check-pthread.m4 @@ -0,0 +1,21 @@ +dnl VKD3D_CHECK_PTHREAD +AC_DEFUN([VKD3D_CHECK_PTHREAD], +[vkd3d_pthread_found=no + +AS_IF([test "x$PTHREAD_LIBS" != x], +[vkd3d_libs_saved="$LIBS" +LIBS="$LIBS $PTHREAD_LIBS" + +AC_MSG_CHECKING([checking for pthread_create in $PTHREAD_LIBS]) +AC_TRY_LINK_FUNC([pthread_create], [vkd3d_pthread_found=yes]) +AC_MSG_RESULT([$vkd3d_pthread_found]) + +AS_IF([test "x$vkd3d_pthread_found" = "xno"], [PTHREAD_LIBS=""]) + +LIBS="$vkd3d_libs_saved"]) + +AS_IF([test "x$vkd3d_pthread_found" != "xyes"], +AC_CHECK_LIB([pthread], [pthread_create], + [PTHREAD_LIBS="-lpthread"], + [AC_MSG_ERROR([libpthread not found.])])) +])