1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00

Merge commit 'f058f384a0d76bfd125f4738dceab7c890186432'

* commit 'f058f384a0d76bfd125f4738dceab7c890186432':
  configure: Do not use pthread_create to check for pthread

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-11-30 20:37:34 +01:00
commit d43d627a24

10
configure vendored
View File

@ -4254,17 +4254,17 @@ fi
# do this before the optional library checks as some of them require pthreads
if ! disabled pthreads && ! enabled w32threads && ! enabled os2threads; then
enable pthreads
if check_func pthread_create; then
if check_func pthread_join; then
:
elif check_func pthread_create -pthread; then
elif check_func pthread_join -pthread; then
add_cflags -pthread
add_extralibs -pthread
elif check_func pthread_create -pthreads; then
elif check_func pthread_join -pthreads; then
add_cflags -pthreads
add_extralibs -pthreads
elif check_func pthread_create -lpthreadGC2; then
elif check_func pthread_join -lpthreadGC2; then
add_extralibs -lpthreadGC2
elif ! check_lib pthread.h pthread_create -lpthread; then
elif ! check_lib pthread.h pthread_join -lpthread; then
disable pthreads
fi
fi