Merge m-c to inbound, a=merge CLOSED TREE

MozReview-Commit-ID: 8OPSNnf1LiA

b2g/common.configure

@@ -1,21 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# Truetype fonts for B2G
-# ==============================================================
-option(env='MOZTTDIR', nargs=1, help='Path to truetype fonts for B2G')
-
-@depends('MOZTTDIR')
-def mozttdir(value):
-    if value:
-        path = value[0]
-        if not os.path.isdir(path):
-            error('MOZTTDIR "%s" is not a valid directory' % path)
-        set_config('MOZTTDIR', path)
-        set_define('PACKAGE_MOZTT', '1')
-
-
-include('../toolkit/moz.configure')

b2g/dev/moz.configure

@@ -4,4 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-include('../common/moz.configure')
+include('../../toolkit/moz.configure')

b2g/graphene/moz.configure

@@ -4,4 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-include('../common.configure')
+include('../../toolkit/moz.configure')

b2g/moz.configure

@@ -11,4 +11,4 @@ def gonkdir(value):
     return value[0] if value else ''
 
 
-include('common.configure')
+include('../toolkit/moz.configure')

build/moz.configure/init.configure

@@ -255,13 +255,11 @@ def wanted_mozconfig_variables(help):
          'DSYMUTIL',
          'EXTERNAL_SOURCE_DIR',
          'GENISOIMAGE',
-         'L10NBASEDIR',
          'MOZILLABUILD',
          'MOZ_ARTIFACT_BUILDS',
          'MOZ_BUILD_APP',
          'MOZ_FMP4',
          'MOZ_INSTRUMENT_EVENT_LOOP',
-         'MOZTTDIR',
          'PERL',
          'RPMBUILD',
          'TAR',

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',

js/src/old-configure.in

@@ -635,6 +635,8 @@ MOZ_USER_DIR=".mozilla"
 
 MOZ_FIX_LINK_PATHS="-Wl,-rpath-link,${DIST}/bin -Wl,-rpath-link,${prefix}/lib"
 
+USE_DEPENDENT_LIBS=1
+
 dnl Configure platform-specific CPU architecture compiler options.
 dnl ==============================================================
 MOZ_ARCH_OPTS
@@ -2803,6 +2805,8 @@ AC_SUBST(MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS)
 
 AC_SUBST(MOZ_FIX_LINK_PATHS)
 
+AC_SUBST(USE_DEPENDENT_LIBS)
+
 AC_SUBST(MOZ_POST_PROGRAM_COMMAND)
 
 AC_SUBST(MOZ_APP_NAME)

mobile/android/b2gdroid/moz.configure

@@ -4,4 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-include('../../../b2g/common.configure')
+include('../../../toolkit/moz.configure')

old-configure.in

@@ -96,6 +96,29 @@ 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
+
+AC_SUBST(MOZTTDIR)
+if test -n "$MOZTTDIR" ; then
+    AC_DEFINE(PACKAGE_MOZTT)
+fi
+
 MOZ_ARG_WITH_STRING(gonk-toolchain-prefix,
 [  --with-gonk-toolchain-prefix=DIR
                           prefix to gonk toolchain commands],
@@ -808,6 +831,8 @@ MOZ_FIX_LINK_PATHS="-Wl,-rpath-link,${DIST}/bin -Wl,-rpath-link,${prefix}/lib"
 
 MOZ_FS_LAYOUT=unix
 
+USE_DEPENDENT_LIBS=1
+
 dnl Configure platform-specific CPU architecture compiler options.
 dnl ==============================================================
 if test "$COMPILE_ENVIRONMENT"; then
@@ -1773,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.])
@@ -7524,6 +7557,8 @@ AC_SUBST(MOZ_COMPONENT_NSPR_LIBS)
 
 AC_SUBST(MOZ_FIX_LINK_PATHS)
 
+AC_SUBST(USE_DEPENDENT_LIBS)
+
 AC_SUBST(MOZ_POST_PROGRAM_COMMAND)
 AC_SUBST(MOZ_LINKER_EXTRACT)
 

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