Bug 599567: Followup to make new checks conditioned on COMPILE_ENVIRONMENT too. r=me a=me
authorKyle Huey <khuey@kylehuey.com>
Fri, 24 Sep 2010 23:36:25 -0400
changeset 54653 71e8b5aee972e1cd17226463be7a31b71dc50774
parent 54652 60611631d69c140c76768e7424a813f9c1c9c4b4
child 54654 ec28605a1fc8e10e1b74a1d2243e4af3e2bb42b4
push id15973
push userkhuey@kylehuey.com
push dateSat, 25 Sep 2010 03:37:01 +0000
treeherdermozilla-central@71e8b5aee972 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme, me
bugs599567
milestone2.0b7pre
first release with
nightly linux32
71e8b5aee972 / 4.0b7pre / 20100925030114 / files
nightly linux64
71e8b5aee972 / 4.0b7pre / 20100925030705 / files
nightly mac
71e8b5aee972 / 4.0b7pre / 20100925030707 / files
nightly win32
71e8b5aee972 / 4.0b7pre / 20100925041313 / files
nightly win64
71e8b5aee972 / 4.0b7pre / 20100925020616 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 599567: Followup to make new checks conditioned on COMPILE_ENVIRONMENT too. r=me a=me
configure.in
--- a/configure.in
+++ b/configure.in
@@ -5996,19 +5996,19 @@ if test -n "$MOZ_WEBM"; then
       if test -z "$GNU_CC"; then
         VPX_ASFLAGS="-f x64 -rnasm -pnasm"
         VPX_X86_ASM=1
       fi
     ;;
     WINNT:x86)
       if test -z "$GNU_CC"; then
         dnl Check for yasm 1.1 or greater.
-        if test -z "$YASM"; then
+        if test -n "$COMPILE_ENVIRONMENT" -a -z "$YASM"; then
           AC_MSG_ERROR([yasm 1.1 or greater is required to build libvpx on Win32, but it appears not to be installed.  Install it (included in MozillaBuild 1.5.1 and newer) or configure with --disable-webm (which disables the WebM video format). See https://developer.mozilla.org/en/YASM for more details.])
-        elif test "$_YASM_MAJOR_VERSION" -lt "1" -o \( "$_YASM_MAJOR_VERSION" -eq "1" -a "$_YASM_MINOR_VERSION" -lt "1" \) ; then
+        elif test -n "$COMPILE_ENVIRONMENT" -a "$_YASM_MAJOR_VERSION" -lt "1" -o \( "$_YASM_MAJOR_VERSION" -eq "1" -a "$_YASM_MINOR_VERSION" -lt "1" \) ; then
           AC_MSG_ERROR([yasm 1.1 or greater is required to build libvpx on Win32, but you appear to have version $_YASM_MAJOR_VERSION.$_YASM_MINOR_VERSION.  Upgrade to the newest version (included in MozillaBuild 1.5.1 and newer) or configure with --disable-webm (which disables the WebM video format). See https://developer.mozilla.org/en/YASM for more details.])
         else
           VPX_ASFLAGS="-f win32 -rnasm -pnasm -DPIC"
           VPX_X86_ASM=1
         fi
       fi
     ;;
     esac