From: Luca Barbato Date: Wed, 11 Dec 2013 13:21:48 +0000 (+0100) Subject: configure: Move the bz2 and zlib checks below phtreads X-Git-Tag: android-x86-6.0-r1~10^2~2514 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7cbe1ea9df83ec66403fbf6400353bcb2242bf06;p=android-x86%2Fexternal-ffmpeg.git configure: Move the bz2 and zlib checks below phtreads There are alternate implementations of those libraries that use pthreads. --- diff --git a/configure b/configure index f099e75b86..541d0805a3 100755 --- a/configure +++ b/configure @@ -3834,9 +3834,6 @@ check_header VideoDecodeAcceleration/VDADecoder.h check_header windows.h check_header X11/extensions/XvMClib.h -disabled zlib || check_lib zlib.h zlibVersion -lz || disable zlib -disabled bzlib || check_lib2 bzlib.h BZ2_bzlibVersion -lbz2 || disable bzlib - if ! disabled w32threads && ! enabled pthreads; then check_func_headers "windows.h process.h" _beginthreadex && enable w32threads fi @@ -3868,6 +3865,9 @@ for thread in $THREADS_LIST; do fi done +disabled zlib || check_lib zlib.h zlibVersion -lz || disable zlib +disabled bzlib || check_lib2 bzlib.h BZ2_bzlibVersion -lbz2 || disable bzlib + enabled sync_val_compare_and_swap && enable atomics_gcc enabled_all atomic_cas_ptr machine_rw_barrier && enable atomics_suncc enabled MemoryBarrier && enable atomics_win32