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

Enable pthreads automatically unless w32threads is requested

Browse Source 
Originally committed as revision 23733 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Måns Rullgård
2010-06-23 02:13:54 +00:00
parent 1d4c1c3b7a
commit 0dbfc1db21
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
configure vendored
View File

@@ -91,7 +91,7 @@ Configuration options:
--enable-postproc enable GPLed postprocessing support [no] --enable-postproc enable GPLed postprocessing support [no]
--disable-avfilter disable video filter support [no] --disable-avfilter disable video filter support [no]
--enable-avfilter-lavf video filters dependent on avformat [no] --enable-avfilter-lavf video filters dependent on avformat [no]
--enable-pthreads use pthreads [no] --disable-pthreads disable pthreads [auto]
--enable-w32threads use Win32 threads [no] --enable-w32threads use Win32 threads [no]
--enable-x11grab enable X11 grabbing [no] --enable-x11grab enable X11 grabbing [no]
--disable-network disable network support [no] --disable-network disable network support [no]
@@ -2522,7 +2522,8 @@ disabled bzlib || check_lib2 bzlib.h BZ2_bzlibVersion -lbz2 || disable bzlib
# check for some common methods of building with pthread support # check for some common methods of building with pthread support
# do this before the optional library checks as some of them require pthreads # do this before the optional library checks as some of them require pthreads
if enabled pthreads; then if ! disabled pthreads && ! enabled w32threads; then
enable pthreads
if check_func pthread_create; then if check_func pthread_create; then
: :
elif check_func pthread_create -pthread; then elif check_func pthread_create -pthread; then
@@ -2534,7 +2535,7 @@ if enabled pthreads; then
elif check_func pthread_create -lpthreadGC2; then elif check_func pthread_create -lpthreadGC2; then
add_extralibs -lpthreadGC2 add_extralibs -lpthreadGC2
elif ! check_lib pthread.h pthread_create -lpthread; then elif ! check_lib pthread.h pthread_create -lpthread; then
die "ERROR: can't find pthreads library" disable pthreads
fi fi
fi fi