aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2013-12-18 21:52:28 +0100
committerDiego Biurrun <diego@biurrun.de>2013-12-19 20:53:56 +0100
commit8558595a59913a4667f57d5a4658b1340f1a4354 (patch)
tree20db1972718606d1525b083ce5e2c83a80616f8c
parente121a725c38fe9f0749e96d45738c55fdcfe2ac5 (diff)
downloadffmpeg-8558595a59913a4667f57d5a4658b1340f1a4354.tar.gz
configure: Express atomics/thread deps through the dependency system
-rwxr-xr-xconfigure14
1 files changed, 7 insertions, 7 deletions
diff --git a/configure b/configure
index 52993d71ec..49f1e734e9 100755
--- a/configure
+++ b/configure
@@ -1583,6 +1583,13 @@ log2_deps="!libc_msvcrt"
symver_if_any="symver_asm_label symver_gnu_asm"
+# threading support
+atomics_gcc_if="sync_val_compare_and_swap"
+atomics_suncc_if="atomic_cas_ptr machine_rw_barrier"
+atomics_win32_if="MemoryBarrier"
+atomics_native_if_any="$ATOMICS_LIST"
+threads_if_any="$THREADS_LIST"
+
# subsystems
dct_select="rdft"
error_resilience_select="dsputil"
@@ -3873,10 +3880,6 @@ done
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
-
check_lib math.h sin -lm && LIBM="-lm"
enabled vaapi && require vaapi va/va.h vaInitialize -lva
@@ -4178,9 +4181,6 @@ case $target_os in
;;
esac
-enabled_any $THREADS_LIST && enable threads
-enabled_any $ATOMICS_LIST && enable atomics_native
-
enabled asm || { arch=c; disable $ARCH_LIST $ARCH_EXT_LIST; }
check_deps $CONFIG_LIST \