x86: Require yasm OR --disable-asm OR --disable-mmx OR --disable-yasm to build.
authorAlex Converse <alex.converse@gmail.com>
Thu, 26 Aug 2010 18:29:32 +0000 (18:29 +0000)
committerAlex Converse <alex.converse@gmail.com>
Thu, 26 Aug 2010 18:29:32 +0000 (18:29 +0000)
Originally committed as revision 24950 to svn://svn.ffmpeg.org/ffmpeg/trunk

configure

index d141089..6311ef0 100755 (executable)
--- 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