From fb3b2f5d923a6e19d80f21eb4e081674bceec810 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Mon, 23 Dec 2013 04:24:53 +0100 Subject: [PATCH] configure: Set the thread type after resolving dependencies MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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ö --- configure | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/configure b/configure index 6344423..56f453b 100755 --- a/configure +++ b/configure @@ -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" -- 2.7.4