Backed out changeset 818165fa787b (bug 1257415) for breaking l10n nightly's

build/moz.configure/init.configure

@@ -255,7 +255,6 @@ def wanted_mozconfig_variables(help):
          'DSYMUTIL',
          'EXTERNAL_SOURCE_DIR',
          'GENISOIMAGE',
-         'L10NBASEDIR',
          'MOZILLABUILD',
          'MOZ_ARTIFACT_BUILDS',
          'MOZ_BUILD_APP',

build/moz.configure/old.configure

@@ -335,6 +335,7 @@ def old_configure_options(*options):
     '--with-ios-sdk',
     '--with-java-bin-path',
     '--with-jitreport-granularity',
+    '--with-l10n-base',
     '--with-linux-headers',
     '--with-macbundlename-prefix',
     '--with-macos-private-frameworks',

old-configure.in

@@ -96,6 +96,20 @@ DIST="$MOZ_BUILD_ROOT/dist"
 
 MOZ_DEFAULT_COMPILER
 
+MOZ_ARG_WITH_STRING(l10n-base,
+[  --with-l10n-base=DIR    path to l10n repositories],
+    L10NBASEDIR=$withval)
+if test -n "$L10NBASEDIR"; then
+    if test "$L10NBASEDIR" = "yes" -o "$L10NBASEDIR" = "no"; then
+        AC_MSG_ERROR([--with-l10n-base must specify a path])
+    elif test -d "$L10NBASEDIR"; then
+        L10NBASEDIR=`cd "$L10NBASEDIR" && pwd -P`
+    else
+        AC_MSG_ERROR([Invalid value --with-l10n-base, $L10NBASEDIR doesn't exist])
+    fi
+fi
+AC_SUBST(L10NBASEDIR)
+
 if test -n "$MOZTTDIR" -a ! -d "$MOZTTDIR" ; then
     AC_MSG_ERROR([MOZTTDIR '$MOZTTDIR' isn't a valid directory])
 fi
@@ -1784,6 +1798,14 @@ case "$target" in
     BIN_SUFFIX='.exe'
     MOZ_USER_DIR="Mozilla"
 
+    case "$host" in
+    *-mingw*)
+        if test -n "$L10NBASEDIR"; then
+            L10NBASEDIR=`cd $L10NBASEDIR && pwd -W`
+        fi
+        ;;
+    esac
+
     case "$host_os" in
     cygwin*|msvc*|mks*)
         AC_MSG_ERROR([Using a Cygwin build environment is unsupported. Configure cannot check for presence of necessary headers. Please upgrade to MozillaBuild; see https://developer.mozilla.org/en/Windows_Build_Prerequisites.])

toolkit/moz.configure

@@ -7,20 +7,6 @@
 include('../js/moz.configure')
 
 
-# L10N
-# ==============================================================
-option('--with-l10n-base', env='L10NBASEDIR', help='Path to l10n repositories')
-
-@depends('--with-l10n-base')
-def l10n_base(value):
-    if value:
-        path = value[0]
-        if not os.path.isdir(path):
-            error("Invalid value --with-l10n-base, %s doesn't exist" % path)
-
-        set_config('L10NBASEDIR', os.path.realpath(os.path.abspath(path)))
-
-
 # Default toolkit
 # ==============================================================
 # Normally, we'd want to use the `default` field on the option, but that