From f28984b853667da9f9841e9fa090162e4a3af499 Mon Sep 17 00:00:00 2001
From: "Matt A. Tobin" <email@mattatobin.com>
Date: Sat, 17 Feb 2018 14:06:01 -0500
Subject: Add a configure option to disable including jetpack

---
 old-configure.in  | 15 +++++++++++++++
 toolkit/moz.build |  4 +++-
 2 files changed, 18 insertions(+), 1 deletion(-)

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*)
@@ -4791,6 +4792,20 @@ dnl =
 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 ========================================================
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:
-- 
cgit v1.2.3