On 2014-02-28 20:22:58 +0200, Martin Storsjö wrote:
> From: Diego Biurrun <[email protected]>
> 
> 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.
> ---
> Removed a superfluous "if enabled threads" from Diego's original
> patch, and tested in a mingw setup with -arch i386.
> ---
>  configure | 16 ++++++++--------
>  1 file changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/configure b/configure
> index a7c0043..3e368e9 100755
> --- a/configure
> +++ b/configure
> @@ -3923,14 +3923,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
>  
> @@ -4274,6 +4266,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"

ok

Janne
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel

Reply via email to