aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMans Rullgard <mans@mansr.com>2012-08-31 01:56:03 +0100
committerMans Rullgard <mans@mansr.com>2012-08-31 01:59:23 +0100
commitd96d6ba61888c6a97d9426ca80bf36f3812cac76 (patch)
tree11d819970518ef0c0e210dd68b64de9bcce165de
parent17337f54c057accf12b0e87d12f576194ad085a8 (diff)
downloadffmpeg-d96d6ba61888c6a97d9426ca80bf36f3812cac76.tar.gz
configure: handle --disable-asm before check_deps
This is necessary to avoid spuriously enabling _external or _inline variants of arch extensions when they should be disabled. Signed-off-by: Mans Rullgard <mans@mansr.com>
-rwxr-xr-xconfigure4
1 files changed, 2 insertions, 2 deletions
diff --git a/configure b/configure
index efc01adfc5..b12df4e8e5 100755
--- a/configure
+++ b/configure
@@ -3403,14 +3403,14 @@ fi
enabled_any $THREADS_LIST && enable threads
+enabled asm || { arch=c; disable $ARCH_LIST $ARCH_EXT_LIST; }
+
check_deps $CONFIG_LIST \
$CONFIG_EXTRA \
$HAVE_LIST \
$ALL_COMPONENTS \
$ALL_TESTS \
-enabled asm || { arch=c; disable $ARCH_LIST $ARCH_EXT_LIST; }
-
! enabled_any memalign posix_memalign aligned_malloc &&
enabled_any $need_memalign && enable memalign_hack