[Windows only] remove iconv requirement for installer patch for Bug 570689 - Convert preprocess-locale.pl to a python script. r=callek
authorRobert Strong <robert.bugzilla@gmail.com>
Fri, 30 Jul 2010 12:35:25 -0700
changeset 6046 2f35246bf41f869bf79c797b9e058a5e1c8be8db
parent 6045 c05c5d941d2be72cb4fd6c6076dbd87b9f6dbea3
child 6047 b6917aa809290681d1798805cb4eba442ed91219
push idunknown
push userunknown
push dateunknown
reviewerscallek
bugs570689
[Windows only] remove iconv requirement for installer patch for Bug 570689 - Convert preprocess-locale.pl to a python script. r=callek
configure.in
--- a/configure.in
+++ b/configure.in
@@ -5446,23 +5446,16 @@ if test -n "$MOZ_INSTALLER" -a "$OS_ARCH
     if test "$MAKENSISU_VER" == "" ||
        test ! "$MAKENSISU_MAJOR_VER" == "$REQ_NSIS_MAJOR_VER" ||
        test ! "$MAKENSISU_MINOR_VER" -ge $MIN_NSIS_MINOR_VER; then
         AC_MSG_RESULT([no])
         AC_MSG_ERROR([To build the installer you must have the latest MozillaBuild or Unicode NSIS with a major version of $REQ_NSIS_MAJOR_VER and a minimum minor version of $MIN_NSIS_MINOR_VER in your path. To build without the installer reconfigure using --disable-installer.])
     fi
     AC_MSG_RESULT([yes])
     MAKENSISU="${CYGWIN_WRAPPER} $MAKENSISU"
-
-    # The Windows build for NSIS requires the iconv command line utility to
-    # convert the charset of the locale files.
-    MOZ_PATH_PROGS(HOST_ICONV, $HOST_ICONV "iconv", "")
-    if test -z "$HOST_ICONV"; then
-        AC_MSG_ERROR([To build the installer iconv is required in your path. To build without the installer reconfigure using --disable-installer.])
-    fi
 fi
 
 AC_SUBST(MOZ_INSTALLER)
 
 AC_MSG_CHECKING([for tar archiver])
 AC_CHECK_PROGS(TAR, gnutar gtar tar, "")
 if test -z "$TAR"; then
     AC_MSG_ERROR([no tar archiver found in \$PATH])