Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-23 21:01:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1491419 - move --enable-bundled-fonts to moz.configure; r=nalexander

Browse Source
This commit is contained in:
Nathan Froyd 2018-10-01 14:51:28 -04:00
parent a259110dc9
commit dc14f73882
4 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
browser/confvars.sh
View File

@ -8,11 +8,6 @@ MOZ_APP_VENDOR=Mozilla
MOZ_UPDATER=1
MOZ_PHOENIX=1
if test "$OS_ARCH" = "WINNT" -o \
"$OS_ARCH" = "Linux"; then
MOZ_BUNDLED_FONTS=1
fi
if test "$OS_ARCH" = "WINNT"; then
if ! test "$HAVE_64BIT_BUILD"; then
if test "$MOZ_UPDATE_CHANNEL" = "nightly" -o \

1
build/moz.configure/old.configure
View File

@ -170,7 +170,6 @@ def old_configure_options(*options):
'--cache-file',
'--datadir',
'--enable-accessibility',
'--enable-bundled-fonts',
'--enable-content-sandbox',
'--enable-cookies',
'--enable-cpp-rtti',

13
old-configure.in
View File

@ -3002,19 +3002,6 @@ fi
AC_CHECK_PROGS(WGET, wget, "")
AC_SUBST(WGET)
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 ========================================================

18
toolkit/moz.configure
View File

@ -1097,3 +1097,21 @@ set_define('MOZ_MAINTENANCE_SERVICE',
set_config('MOZ_MAINTENANCE_SERVICE',
depends_if('--enable-maintenance-service',
when=target_is_windows)(lambda _: True))
# Bundled fonts on desktop platform
# ==============================================================
@depends(target)
def bundled_fonts_default(target):
return target.os == 'WINNT' or target.kernel == 'Linux'
@depends(build_project)
def allow_bundled_fonts(project):
return project == 'browser'
option('--enable-bundled-fonts', default=bundled_fonts_default,
when=allow_bundled_fonts,
help='Enable support for bundled fonts on desktop platforms')
set_define('MOZ_BUNDLED_FONTS',
depends_if('--enable-bundled-fonts', when=allow_bundled_fonts)(lambda _: True))