[FFmpeg-cvslog] configure: Move the bz2 and zlib checks below phtreads
Luca Barbato
git at videolan.org
Sat Dec 14 11:33:49 CET 2013
ffmpeg | branch: master | Luca Barbato <lu_zero at gentoo.org> | Wed Dec 11 14:21:48 2013 +0100| [7cbe1ea9df83ec66403fbf6400353bcb2242bf06] | committer: Luca Barbato
configure: Move the bz2 and zlib checks below phtreads
There are alternate implementations of those libraries that use pthreads.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7cbe1ea9df83ec66403fbf6400353bcb2242bf06
---
configure | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/configure b/configure
index f099e75..541d080 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
More information about the ffmpeg-cvslog
mailing list