From 9e7fd10192013dfb0d5bf21342aef1ccaaec1f8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A5ns=20Rullg=C3=A5rd?= <mans@mansr.com>
Date: Sat, 18 Nov 2006 16:16:58 +0000
Subject: [PATCH] improved pthreads test
Originally committed as revision 7118 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
configure | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/configure b/configure
index ed24e7363a9..75f1b0bca5a 100755
--- a/configure
+++ b/configure
@@ -1426,11 +1426,17 @@ enabled zlib && check_lib zlib.h zlibVersion -lz || zlib="no"
# check for some common methods of building with pthread support
# do this before the optional library checks as some of them require pthreads
if enabled pthreads; then
- { check_cflags -pthread && check_ldflags -pthread; } ||
- { check_cflags -pthreads && check_ldflags -pthreads; } ||
- check_lib pthread.h pthread_create -lpthread ||
- check_func pthread_create ||
- die "ERROR: can't find pthreads library"
+ if check_func pthread_create; then
+ :
+ elif check_func pthread_create -pthread; then
+ add_cflags -pthread
+ add_ldflags -pthread
+ elif check_func pthread_create -pthreads; then
+ add_cflags -pthreads
+ add_ldflags -pthreads
+ elif ! check_lib pthread.h pthread_create -lpthread; then
+ die "ERROR: can't find pthreads library"
+ fi
fi
# these are off by default, so fail if requested and not available
--
GitLab