Bug 1656341 - Move --enable-pref-extensions from old-configure r=firefox-build-system-reviewers,mhentges,glandium

Differential Revision: https://phabricator.services.mozilla.com/D85463
This commit is contained in:
Ricky Stewart 2020-08-05 00:26:16 +00:00
parent 729697662f
commit adbb976913
3 changed files with 6 additions and 12 deletions

View File

@ -221,7 +221,6 @@ def old_configure_options(*options):
'--enable-negotiateauth',
'--enable-official-branding',
'--enable-parental-controls',
'--enable-pref-extensions',
'--enable-sandbox',
'--enable-startupcache',
'--enable-system-cairo',

View File

@ -1493,7 +1493,6 @@ ENABLE_SYSTEM_EXTENSION_DIRS=1
MOZ_BRANDING_DIRECTORY=
MOZ_OFFICIAL_BRANDING=
MOZ_AUTH_EXTENSION=1
MOZ_PREF_EXTENSIONS=1
MOZ_SPELLCHECK=1
MOZ_UNIVERSALCHARDET=1
MOZ_XUL=1
@ -1801,15 +1800,6 @@ MOZ_ARG_DISABLE_BOOL(negotiateauth,
MOZ_AUTH_EXTENSION=,
MOZ_AUTH_EXTENSION=1 )
dnl ========================================================
dnl Pref extensions (autoconfig)
dnl ========================================================
MOZ_ARG_DISABLE_BOOL(pref-extensions,
[ --disable-pref-extensions
Disable pref extensions such as autoconfig],
MOZ_PREF_EXTENSIONS=,
MOZ_PREF_EXTENSIONS=1 )
dnl ========================================================
dnl Searching of system directories for extensions.
dnl Note: this switch is meant to be used for test builds
@ -2562,7 +2552,6 @@ AC_SUBST(RCFLAGS)
AC_SUBST(IMPLIB)
AC_SUBST(FILTER)
AC_SUBST(MOZ_AUTH_EXTENSION)
AC_SUBST(MOZ_PREF_EXTENSIONS)
AC_SUBST_LIST(MOZ_DEBUG_LDFLAGS)
AC_SUBST_LIST(WARNINGS_CFLAGS)
AC_SUBST_SET(MOZ_EXTENSIONS)

View File

@ -2044,3 +2044,9 @@ set_define('MOZ_GFX_OPTIMIZE_MOBILE', True, when='--enable-mobile-optimize')
# We may want to revisit this later.
set_define('MOZ_IGNORE_PAINT_WILL_RESAMPLE', True,
when='--enable-mobile-optimize')
# Pref extensions
# ==============================================================
option('--disable-pref-extensions',
help='Disable pref extensions such as autoconfig')
set_config('MOZ_PREF_EXTENSIONS', True, when='--enable-pref-extensions')