From 06634bfcb4fcae4ff46103673b32526703618316 Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Wed, 9 Mar 2016 15:27:42 +0900
Subject: [PATCH] Bug 1251324 - Add a --disable-js-shell option to
 js/src/configure. r=chmanchester

---
 js/moz.configure        | 7 +++++++
 js/src/moz.build        | 1 -
 js/src/old-configure.in | 2 --
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/js/moz.configure b/js/moz.configure
index c271ec3908ce..48f88948a995 100644
--- a/js/moz.configure
+++ b/js/moz.configure
@@ -3,3 +3,10 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+option('--disable-js-shell', help='Do not build the JS shell')
+
+@depends('--disable-js-shell')
+def js_shell(value):
+    if not value:
+        set_config('JS_DISABLE_SHELL', '1')
diff --git a/js/src/moz.build b/js/src/moz.build
index b1fff712072c..747c15f51e77 100644
--- a/js/src/moz.build
+++ b/js/src/moz.build
@@ -53,7 +53,6 @@ with Files('../public/TrackedOptimizationInfo.h'):
 if CONFIG['JS_BUNDLED_EDITLINE']:
     DIRS += ['editline']
 
-# editline needs to get built before the shell
 if not CONFIG['JS_DISABLE_SHELL']:
     DIRS += ['shell']
 
diff --git a/js/src/old-configure.in b/js/src/old-configure.in
index bf7ee03029ff..ae044507aef2 100644
--- a/js/src/old-configure.in
+++ b/js/src/old-configure.in
@@ -3273,7 +3273,6 @@ MOZ_ARG_ENABLE_BOOL(readline,
 
 JS_BUNDLED_EDITLINE=
 EDITLINE_LIBS=
-JS_DISABLE_SHELL=
 
 case "$target" in
 *-mingw*)
@@ -3297,7 +3296,6 @@ if test -z "$SKIP_LIBRARY_CHECKS" -a -z "$NO_EDITLINE"; then
   AC_DEFINE(EDITLINE)
 fi
 AC_SUBST(JS_BUNDLED_EDITLINE)
-AC_SUBST(JS_DISABLE_SHELL)
 AC_SUBST_LIST(EDITLINE_LIBS)
 
 dnl ========================================================