Bug 571381 - Require NSIS 2.46 Unicode. r=mbanner
authorRobert Strong <robert.bugzilla@gmail.com>
Mon, 14 Jan 2013 11:37:34 -0800
changeset 14721 76eb09d4c8d956814c44812885ff6a2383e7dfeb
parent 14720 50104004f24ddf20dffa537be85c0d4a391a0c74
child 14722 bc0de6d8ef78bfbbecccdd2e325fffe232bb0ce7
push id867
push userbugzilla@standard8.plus.com
push dateMon, 01 Apr 2013 20:44:27 +0000
treeherdercomm-beta@797726b8d244 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmbanner
bugs571381
Bug 571381 - Require NSIS 2.46 Unicode. r=mbanner
configure.in
--- a/configure.in
+++ b/configure.in
@@ -4646,18 +4646,18 @@ dnl ====================================
 dnl Installer
 dnl ========================================================
 dnl Abort Windows build if the required major version and
 dnl minimum minor version of Unicode NSIS isn't in the path
 dnl (unless in case of cross compiling, for which Unicode
 dnl is not yet sufficient).
 if test "$OS_ARCH" = "WINNT"; then
     REQ_NSIS_MAJOR_VER=2
-    MIN_NSIS_MINOR_VER=33
-    MOZ_PATH_PROGS(MAKENSISU, $MAKENSISU makensisu-2.46 makensisu makensis)
+    MIN_NSIS_MINOR_VER=46
+    MOZ_PATH_PROGS(MAKENSISU, $MAKENSISU makensisu-2.46 makensis)
     if test -n "$MAKENSISU" -o "$MAKENSISU" = ":"; then
         AC_MSG_RESULT([yes])
         changequote(,)
         MAKENSISU_VER=`"$MAKENSISU" -version 2>/dev/null | sed -e '/-Unicode/!s/.*//g' -e 's/^v\([0-9]\+\.[0-9]\+\)\-Unicode$/\1/g'`
         changequote([,])
         if test ! "$MAKENSISU_VER" = ""; then
             MAKENSISU_MAJOR_VER=`echo $MAKENSISU_VER | $AWK -F\. '{ print $1 }'`
             MAKENSISU_MINOR_VER=`echo $MAKENSISU_VER | $AWK -F\. '{ print $2 }'`