Bug 587363: Don't error when YASM is missing in a --disable-compile-environment build. r=Callek a=Mossop
authorKyle Huey <me@kylehuey.com>
Sun, 15 Aug 2010 23:32:10 -0700
changeset 50647 07822d2a6758a1bf429370de1935089a28487015
parent 50646 9825a728b2cb340c34b663944f28725f61ef1531
child 50648 9cb9cb9dd8fafa7164445ec5037f2a41d5375a81
push idunknown
push userunknown
push dateunknown
reviewersCallek, Mossop
bugs587363
milestone2.0b4pre
Bug 587363: Don't error when YASM is missing in a --disable-compile-environment build. r=Callek a=Mossop
configure.in
--- a/configure.in
+++ b/configure.in
@@ -5972,17 +5972,17 @@ if test -n "$MOZ_WEBM"; then
       ;;
       WINNT:x86_64)
         if test -z "$GNU_CC"; then
           VPX_ASFLAGS="-f x64 -rnasm -pnasm"
           VPX_X86_ASM=1
         fi
       ;;
       esac
-      if test -n "$VPX_X86_ASM" -a -z "$VPX_AS"; then
+      if test "$COMPILE_ENVIROMENT" -a -n "$VPX_X86_ASM" -a -z "$VPX_AS"; then
         AC_MSG_ERROR([yasm is a required build tool for this architecture when webm is enabled. You may either install yasm or --disable-webm (which disables the WebM video format). See https://developer.mozilla.org/en/YASM for more details.])
       fi
     fi # end !WINNT_x86_MSVC
 
     if test -n "$VPX_X86_ASM"; then
       AC_DEFINE(VPX_X86_ASM)
     else
       AC_MSG_WARN([No assembler or assembly support for libvpx, using unoptimized C routines.])