Merge commit '7cbe1ea9df83ec66403fbf6400353bcb2242bf06'

* commit '7cbe1ea9df83ec66403fbf6400353bcb2242bf06':
  configure: Move the bz2 and zlib checks below phtreads

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc configure
index 165d239,541d080..82f64e5
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -4309,11 -3833,7 +4309,8 @@@ check_header vdpau/vdpau_x11.
  check_header VideoDecodeAcceleration/VDADecoder.h
  check_header windows.h
  check_header X11/extensions/XvMClib.h
 +check_header asm/types.h
  
- disabled  zlib || check_lib   zlib.h      zlibVersion -lz   || disable  zlib
- disabled bzlib || check_lib2 bzlib.h BZ2_bzlibVersion -lbz2 || disable bzlib
- 
  if ! disabled w32threads && ! enabled pthreads; then
      check_func_headers "windows.h process.h" _beginthreadex && enable w32threads
  fi
@@@ -4345,10 -3865,9 +4342,13 @@@ for thread in $THREADS_LIST; d
      fi
  done
  
 +if enabled pthreads; then
 +  check_func pthread_cancel
 +fi
 +
+ disabled  zlib || check_lib   zlib.h      zlibVersion -lz   || disable  zlib
+ disabled bzlib || check_lib2 bzlib.h BZ2_bzlibVersion -lbz2 || disable bzlib
+ 
  enabled sync_val_compare_and_swap && enable atomics_gcc
  enabled_all atomic_cas_ptr machine_rw_barrier && enable atomics_suncc
  enabled MemoryBarrier && enable atomics_win32