diff options
author | Diego Biurrun <diego@biurrun.de> | 2013-12-23 04:24:53 +0100 |
---|---|---|
committer | Martin Storsjö <martin@martin.st> | 2014-02-28 22:27:05 +0200 |
commit | fb3b2f5d923a6e19d80f21eb4e081674bceec810 (patch) | |
tree | d3137fc0731926a7289ae8da3c0b85f8237d2ced | |
parent | 2f02bbcca050936686482453078e83dc25493da0 (diff) | |
download | ffmpeg-fb3b2f5d923a6e19d80f21eb4e081674bceec810.tar.gz |
configure: Set the thread type after resolving dependencies
A threading type might be detected originally, but later disabled
if one of its dependencies is unavailable.
This makes sure that the threading support item in the configure
output is right for setups where w32threads are available but
native atomics aren't.
Signed-off-by: Martin Storsjö <martin@martin.st>
-rwxr-xr-x | configure | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -3921,14 +3921,6 @@ if ! disabled pthreads && ! enabled w32threads; then fi fi -for thread in $THREADS_LIST; do - if enabled $thread; then - test -n "$thread_type" && - die "ERROR: Only one thread type must be selected." || - thread_type="$thread" - fi -done - disabled zlib || check_lib zlib.h zlibVersion -lz || disable zlib disabled bzlib || check_lib2 bzlib.h BZ2_bzlibVersion -lbz2 || disable bzlib @@ -4272,6 +4264,14 @@ check_deps $CONFIG_LIST \ ! enabled_any memalign posix_memalign aligned_malloc && enabled_any $need_memalign && enable memalign_hack +for thread in $THREADS_LIST; do + if enabled $thread; then + test -n "$thread_type" && + die "ERROR: Only one thread type must be selected." || + thread_type="$thread" + fi +done + echo "install prefix $prefix" echo "source path $source_path" echo "C compiler $cc" |