From 78f1853c94a834c76a4b2710cebcadc9c6bd9b1a Mon Sep 17 00:00:00 2001
From: Ms2ger <Ms2ger@gmail.com>
Date: Wed, 10 Aug 2016 13:06:55 +0200
Subject: [PATCH] Bug 1293981 - Move --enable-more-deterministic to
 moz.configure. r=chmanchester

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

diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configure
index 03b266bf6fbd..e2c92e927317 100644
--- a/build/moz.configure/old.configure
+++ b/build/moz.configure/old.configure
@@ -202,7 +202,6 @@ def old_configure_options(*options):
     '--enable-media-navigator',
     '--enable-memory-sanitizer',
     '--enable-mobile-optimize',
-    '--enable-more-deterministic',
     '--enable-mozril-geoloc',
     '--enable-necko-protocols',
     '--enable-necko-wifi',
diff --git a/js/moz.configure b/js/moz.configure
index 3b98a5242db5..77838bd97f86 100644
--- a/js/moz.configure
+++ b/js/moz.configure
@@ -194,3 +194,14 @@ def ion_perf(value):
         return True
 
 set_define('JS_ION_PERF', ion_perf)
+
+
+js_option('--enable-more-deterministic', env='JS_MORE_DETERMINISTIC',
+          help='Enable changes that make the shell more deterministic')
+
+@depends('--enable-more-deterministic')
+def more_deterministic(value):
+    if value:
+        return True
+
+set_define('JS_MORE_DETERMINISTIC', more_deterministic)
diff --git a/js/src/old-configure.in b/js/src/old-configure.in
index f85d11a3f731..bbe929d1df6d 100644
--- a/js/src/old-configure.in
+++ b/js/src/old-configure.in
@@ -1919,18 +1919,6 @@ if test -n "$JS_GC_ZEAL" -o -n "$MOZ_DEBUG"; then
     AC_DEFINE(JS_GC_ZEAL)
 fi
 
-dnl ========================================================
-dnl Enable changes that make the shell more deterministic
-dnl ========================================================
-MOZ_ARG_ENABLE_BOOL(more-deterministic,
-[  --enable-more-deterministic
-                          Enable changes that make the shell more deterministic],
-    JS_MORE_DETERMINISTIC=1,
-    JS_MORE_DETERMINISTIC= )
-if test -n "$JS_MORE_DETERMINISTIC"; then
-    AC_DEFINE(JS_MORE_DETERMINISTIC)
-fi
-
 dnl ========================================================
 dnl Enable breakpoint for artificial OOMs
 dnl ========================================================