Commit fb3b2f5d authored by Diego Biurrun's avatar Diego Biurrun Committed by Martin Storsjö
Browse files

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: default avatarMartin Storsjö <martin@martin.st>
parent 2f02bbcc
......@@ -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"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment