generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'a5a3b398fd9dce38ca50b20f182b17a256d209f2'

Browse Source 
* commit 'a5a3b398fd9dce38ca50b20f182b17a256d209f2':
  configure: Reorder pthreads checks

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-12-14 11:56:22 +01:00
commit f5013913da
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure vendored
View File

@ -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