bug 998844 - part 1 - add configure option to support for bundled fonts (enabled on b2g desktop products). r=gps
authorJonathan Kew <jkew@mozilla.com>
Thu, 29 May 2014 13:00:49 +0100
changeset 205910 67d1085b1d5aec2af09b79107f9b6e457ab522c7
parent 205858 9a72db713446a82b2524db27cacb5b03cb112894
child 205911 a28f07f4c3c77b70e79feef16cef322f07ce9bf2
push id494
push userraliiev@mozilla.com
push dateMon, 25 Aug 2014 18:42:16 +0000
treeherdermozilla-release@a3cc3e46b571 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs998844
milestone32.0a1
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 998844 - part 1 - add configure option to support for bundled fonts (enabled on b2g desktop products). r=gps
b2g/confvars.sh
b2g/dev/confvars.sh
configure.in
--- a/b2g/confvars.sh
+++ b/b2g/confvars.sh
@@ -59,8 +59,10 @@ MOZ_B2G=1
 if test "$OS_TARGET" = "Android"; then
 MOZ_NUWA_PROCESS=1
 fi
 MOZ_FOLD_LIBS=1
 
 MOZ_JSDOWNLOADS=1
 
 MOZ_SERVICES_FXACCOUNTS=1
+
+MOZ_BUNDLED_FONTS=1
--- a/b2g/dev/confvars.sh
+++ b/b2g/dev/confvars.sh
@@ -2,8 +2,10 @@
 # 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/.
 
 MOZ_B2G=1
 MOZ_MULET=1
 
 . ${srcdir}/browser/confvars.sh
+
+MOZ_BUNDLED_FONTS=1
--- a/configure.in
+++ b/configure.in
@@ -6348,16 +6348,29 @@ if test -n "$MOZ_MAINTENANCE_SERVICE"; t
   if test "$OS_ARCH" = "WINNT"; then
     AC_DEFINE(MOZ_MAINTENANCE_SERVICE)
   else
     AC_MSG_ERROR([Can only build with --enable-maintenance-service with a Windows target])
   fi
 fi
 
 dnl ========================================================
+dnl Bundled fonts on desktop platforms
+dnl ========================================================
+
+MOZ_ARG_ENABLE_BOOL(bundled-fonts,
+[  --enable-bundled-fonts  Enable support for bundled fonts on desktop platforms],
+    MOZ_BUNDLED_FONTS=1,
+    MOZ_BUNDLED_FONTS=)
+
+if test -n "$MOZ_BUNDLED_FONTS"; then
+  AC_DEFINE(MOZ_BUNDLED_FONTS)
+fi
+
+dnl ========================================================
 dnl Verify MAR signatures
 dnl ========================================================
 
 MOZ_ARG_ENABLE_BOOL(verify-mar,
 [  --enable-verify-mar     Enable verifying MAR signatures],
     MOZ_VERIFY_MAR_SIGNATURE=1,
     MOZ_VERIFY_MAR_SIGNATURE= )