diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-14 11:56:22 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-14 12:37:40 +0100 |
| commit | f5013913da3691121df74c7d57a517c1ca279c53 (patch) | |
| tree | f8e1bba62046427c74e684730d7a38ebbfa79f2b | |
| parent | 7431923da8b75835dcabdebc8dcc8c8e28b60a87 (diff) | |
| parent | a5a3b398fd9dce38ca50b20f182b17a256d209f2 (diff) | |
| download | ffmpeg-f5013913da3691121df74c7d57a517c1ca279c53.tar.gz | |
Merge commit 'a5a3b398fd9dce38ca50b20f182b17a256d209f2'
* commit 'a5a3b398fd9dce38ca50b20f182b17a256d209f2':
configure: Reorder pthreads checks
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rwxr-xr-x | configure | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -4319,9 +4319,7 @@ 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_join && check_func pthread_create; then - : - elif check_func pthread_join -pthread && check_func pthread_create -pthread; then + if check_func pthread_join -pthread && check_func pthread_create -pthread; then add_cflags -pthread add_extralibs -pthread elif check_func pthread_join -pthreads && check_func pthread_create -pthreads; then @@ -4329,7 +4327,9 @@ if ! disabled pthreads && ! enabled w32threads && ! enabled os2threads; then add_extralibs -pthreads elif check_func pthread_join -lpthreadGC2 && check_func pthread_create -lpthreadGC2; then add_extralibs -lpthreadGC2 - elif ! check_lib pthread.h pthread_join -lpthread && ! check_lib pthread.h pthread_create -lpthread; then + elif check_lib pthread.h pthread_join -lpthread && check_lib pthread.h pthread_create -lpthread; then + : + elif ! check_func pthread_join && ! check_func pthread_create; then disable pthreads fi fi |