diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-14 11:23:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-14 11:23:57 +0100 |
| commit | 7431923da8b75835dcabdebc8dcc8c8e28b60a87 (patch) | |
| tree | 5481e1ba340aefdefd920599f6991acfac5478d2 | |
| parent | acda7c8e20dc7cfda038edd0dfbac98f40970111 (diff) | |
| parent | 7cbe1ea9df83ec66403fbf6400353bcb2242bf06 (diff) | |
| download | ffmpeg-7431923da8b75835dcabdebc8dcc8c8e28b60a87.tar.gz | |
Merge commit '7cbe1ea9df83ec66403fbf6400353bcb2242bf06'
* commit '7cbe1ea9df83ec66403fbf6400353bcb2242bf06':
configure: Move the bz2 and zlib checks below phtreads
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rwxr-xr-x | configure | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -4311,9 +4311,6 @@ 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 @@ -4349,6 +4346,9 @@ 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 |