[FFmpeg-cvslog] configure: put pthread_create() check back

Michael Niedermayer git at videolan.org
Mon Dec 2 11:47:48 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Dec  2 11:11:08 2013 +0100| [749eb46d643a440892ae1d0f36f2a9d0b003d78b] | committer: Michael Niedermayer

configure: put pthread_create() check back

Unbreaks freebsd, broken since f058f384a0d76bfd125f4738dceab7c890186432

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=749eb46d643a440892ae1d0f36f2a9d0b003d78b
---

 configure |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/configure b/configure
index b9104bb..c5c58cf 100755
--- a/configure
+++ b/configure
@@ -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_join; then
+    if check_func pthread_join && check_func pthread_create; then
         :
-    elif check_func pthread_join -pthread; then
+    elif check_func pthread_join -pthread && check_func pthread_create -pthread; then
         add_cflags -pthread
         add_extralibs -pthread
-    elif check_func pthread_join -pthreads; then
+    elif check_func pthread_join -pthreads && check_func pthread_create -pthreads; then
         add_cflags -pthreads
         add_extralibs -pthreads
-    elif check_func pthread_join -lpthreadGC2; then
+    elif check_func pthread_join -lpthreadGC2 && check_func pthread_create -lpthreadGC2; then
         add_extralibs -lpthreadGC2
-    elif ! check_lib pthread.h pthread_join -lpthread; then
+    elif ! check_lib pthread.h pthread_join -lpthread && ! check_lib pthread.h pthread_create -lpthread; then
         disable pthreads
     fi
 fi



More information about the ffmpeg-cvslog mailing list