Add a configure option to disable including jetpack

This commit is contained in:
NTD 2018-02-17 14:06:01 -05:00 • committed by Roy Tam
commit 5672cd8138
2 changed files with 18 additions and 1 deletions

View file

@ -2315,6 +2315,7 @@ MOZ_GMP_SANDBOX=
MOZ_SANDBOX=1 MOZ_SANDBOX=1
MOZ_BINARY_EXTENSIONS= MOZ_BINARY_EXTENSIONS=
MOZ_DEVTOOLS=server MOZ_DEVTOOLS=server
MOZ_JETPACK=1
case "$target_os" in case "$target_os" in
mingw*) mingw*)
@ -4791,6 +4792,20 @@ dnl =
dnl ======================================================== dnl ========================================================
MOZ_ARG_HEADER(Misc. Options) MOZ_ARG_HEADER(Misc. Options)
dnl ========================================================
dnl = Disable Jetpack
dnl ========================================================
MOZ_ARG_DISABLE_BOOL(jetpack,
[ --disable-jetpack Disable Jetpack Support Code],
MOZ_JETPACK=,
MOZ_JETPACK=1)
if test -n "$MOZ_JETPACK"; then
AC_DEFINE(MOZ_JETPACK)
fi
AC_SUBST(MOZ_JETPACK)
dnl ======================================================== dnl ========================================================
dnl = Define default location for MOZILLA_FIVE_HOME dnl = Define default location for MOZILLA_FIVE_HOME
dnl ======================================================== dnl ========================================================

View file

@ -9,7 +9,6 @@ DIRS += [
'content', 'content',
'forgetaboutsite', 'forgetaboutsite',
'identity', 'identity',
'jetpack',
'locales', 'locales',
'modules', 'modules',
'mozapps/downloads', 'mozapps/downloads',
@ -21,6 +20,9 @@ DIRS += [
'themes', 'themes',
] ]
if CONFIG['MOZ_JETPACK']:
DIRS += ['jetpack']
if CONFIG['MOZ_WEBEXTENSIONS']: if CONFIG['MOZ_WEBEXTENSIONS']:
DIRS += ['mozapps/webextensions'] DIRS += ['mozapps/webextensions']
else: else: