diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2018-02-17 14:06:01 -0500 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2018-02-17 14:06:01 -0500 |
| commit | f28984b853667da9f9841e9fa090162e4a3af499 (patch) | |
| tree | 8f0bff3a8de032b489bea081d270439a1351fac0 | |
| parent | 8a119434ac94d18b888550bea1b125aba1ad446e (diff) | |
| download | UXP-f28984b853667da9f9841e9fa090162e4a3af499.tar UXP-f28984b853667da9f9841e9fa090162e4a3af499.tar.gz UXP-f28984b853667da9f9841e9fa090162e4a3af499.tar.lz UXP-f28984b853667da9f9841e9fa090162e4a3af499.tar.xz UXP-f28984b853667da9f9841e9fa090162e4a3af499.zip | |
Add a configure option to disable including jetpack
| -rw-r--r-- | old-configure.in | 15 | ||||
| -rw-r--r-- | toolkit/moz.build | 4 |
2 files changed, 18 insertions, 1 deletions
diff --git a/old-configure.in b/old-configure.in index 045257cd8..0b78f2b23 100644 --- a/old-configure.in +++ b/old-configure.in @@ -2315,6 +2315,7 @@ MOZ_GMP_SANDBOX= MOZ_SANDBOX=1 MOZ_BINARY_EXTENSIONS= MOZ_DEVTOOLS=server +MOZ_JETPACK=1 case "$target_os" in mingw*) @@ -4792,6 +4793,20 @@ dnl ======================================================== 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 = Define default location for MOZILLA_FIVE_HOME dnl ======================================================== MOZ_ARG_WITH_STRING(default-mozilla-five-home, diff --git a/toolkit/moz.build b/toolkit/moz.build index ea7cc390d..9444a5179 100644 --- a/toolkit/moz.build +++ b/toolkit/moz.build @@ -9,7 +9,6 @@ DIRS += [ 'content', 'forgetaboutsite', 'identity', - 'jetpack', 'locales', 'modules', 'mozapps/downloads', @@ -21,6 +20,9 @@ DIRS += [ 'themes', ] +if CONFIG['MOZ_JETPACK']: + DIRS += ['jetpack'] + if CONFIG['MOZ_WEBEXTENSIONS']: DIRS += ['mozapps/webextensions'] else: |