diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-30 20:37:34 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-30 20:40:59 +0100 |
commit | d43d627a24dba944c3c6bf08146ad4945c2bc9b3 (patch) | |
tree | 3ebcfb003a50bc14b0a55c5a4f98a5a09f1aa8ae /configure | |
parent | a235af93bd58e99089dcfd428461dc842c867feb (diff) | |
parent | f058f384a0d76bfd125f4738dceab7c890186432 (diff) | |
download | ffmpeg-d43d627a24dba944c3c6bf08146ad4945c2bc9b3.tar.gz |
Merge commit 'f058f384a0d76bfd125f4738dceab7c890186432'
* commit 'f058f384a0d76bfd125f4738dceab7c890186432':
configure: Do not use pthread_create to check for pthread
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -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 |