aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Converse <alex.converse@gmail.com>2010-08-26 18:29:32 +0000
committerAlex Converse <alex.converse@gmail.com>2010-08-26 18:29:32 +0000
commit9cca1e40965bb2955a15f3bfa6aeeb1565b23bb5 (patch)
treeb5995c3aa7ff65d745186e554cbb00da307b0225
parente90aa6ed2d6c08764fac5974789c94dc2dfe50fc (diff)
downloadffmpeg-9cca1e40965bb2955a15f3bfa6aeeb1565b23bb5.tar.gz
x86: Require yasm OR --disable-asm OR --disable-mmx OR --disable-yasm to build.
Originally committed as revision 24950 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rwxr-xr-xconfigure5
1 files changed, 3 insertions, 2 deletions
diff --git a/configure b/configure
index d141089dfc..6311ef0a66 100755
--- a/configure
+++ b/configure
@@ -2569,9 +2569,10 @@ EOF
case "$objformat" in
elf) enabled debug && append YASMFLAGS "-g dwarf2" ;;
esac
- if ! disabled yasm; then
+ if ! disabled_any asm mmx yasm; then
check_yasm "pabsw xmm0, xmm0" && enable yasm ||
- warn "yasm not found, performance will suffer"
+ die "yasm not found, performance will suffer. " \
+ "If you really want to compile without yasm, configure with --disable-yasm."
fi
case "$cpu" in