Browse Source

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>
tags/n2.3
Diego Biurrun Martin Storsjö 12 years ago
parent
commit
fb3b2f5d92
1 changed files with 8 additions and 8 deletions
  1. +8
    -8
      configure

+ 8
- 8
configure View File

@@ -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"


Loading…
Cancel
Save