Bug 599567: Fix YASM detection on Win32 and COMPILE_ENVIRONMENT check on all platforms. r=khuey a=blocking-beta-7
authorSerge Gautherie <sgautherie.bz@free.fr>
Fri, 24 Sep 2010 23:18:13 -0400
changeset 54652 60611631d69c140c76768e7424a813f9c1c9c4b4
parent 54651 e52f5e198ddcbab1c59238a74257cd0bed64a4c3
child 54653 71e8b5aee972e1cd17226463be7a31b71dc50774
push id15972
push userkhuey@kylehuey.com
push dateSat, 25 Sep 2010 03:19:32 +0000
treeherdermozilla-central@60611631d69c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskhuey, blocking-beta-7
bugs599567
milestone2.0b7pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 599567: Fix YASM detection on Win32 and COMPILE_ENVIRONMENT check on all platforms. r=khuey a=blocking-beta-7
configure.in
--- a/configure.in
+++ b/configure.in
@@ -5996,27 +5996,29 @@ 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 "$_YASM_MAJOR_VERSION" -gt "1" -o \( "$_YASM_MAJOR_VERSION" -eq "1" -a "$_YASM_MINOR_VERSION" -ge "1" \) ; then
+        if test -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
+          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
-        else
-          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.])
         fi
       fi
     ;;
     esac
 
-    if test "$COMPILE_ENVIROMENT" -a -n "$VPX_X86_ASM" -a -z "$VPX_AS"; then
+    if test -n "$COMPILE_ENVIRONMENT" -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
 
     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.])
     fi