[FFmpeg-cvslog] configure: handle --disable-asm before check_deps
Mans Rullgard
git at videolan.org
Fri Aug 31 13:39:12 CEST 2012
ffmpeg | branch: master | Mans Rullgard <mans at mansr.com> | Fri Aug 31 01:56:03 2012 +0100| [d96d6ba61888c6a97d9426ca80bf36f3812cac76] | committer: Mans Rullgard
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 at mansr.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d96d6ba61888c6a97d9426ca80bf36f3812cac76
---
configure | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index efc01ad..b12df4e 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
More information about the ffmpeg-cvslog
mailing list