From 7a6e7ed0f5b0e908d61347ad9fa166ffeea1d349 Mon Sep 17 00:00:00 2001
From: "Matt A. Tobin" <email@mattatobin.com>
Date: Sat, 24 Feb 2018 09:49:34 -0500
Subject: Developer Tools client should be a disable bool in ac configure

---
 browser/confvars.sh |  8 +-------
 old-configure.in    | 10 +++++-----
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/browser/confvars.sh b/browser/confvars.sh
index 0cccede38..288b842a6 100755
--- a/browser/confvars.sh
+++ b/browser/confvars.sh
@@ -56,14 +56,8 @@ MOZ_JSDOWNLOADS=1
 MOZ_RUST_MP4PARSE=1
 MOZ_RUST_URLPARSE=1
 MOZ_WEBEXTENSIONS=1
+MOZ_DEVTOOLS=1
 
 # Disable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=0
 MOZ_REQUIRE_SIGNING=0
-
-# Include the DevTools client, not just the server (which is the default)
-if test -n "$BASILISK_DISABLE_DEVTOOLS" ; then
-MOZ_DEVTOOLS=
-else
-MOZ_DEVTOOLS=1
-fi
diff --git a/old-configure.in b/old-configure.in
index 17e1a4eca..203a12bea 100644
--- a/old-configure.in
+++ b/old-configure.in
@@ -4750,12 +4750,12 @@ fi
 AC_SUBST(MOZ_DEVTOOLS_SERVER)
 
 dnl ========================================================
-dnl = Enable Mozilla Developer Tools (client)
+dnl = Disable Mozilla Developer Tools (client)
 dnl ========================================================
-MOZ_ARG_ENABLE_BOOL(devtools,
-[  --enable-devtools           Enable Mozilla Developer Tools (client)],
-    MOZ_DEVTOOLS=1,
-    MOZ_DEVTOOLS=)
+MOZ_ARG_DISABLE_BOOL(devtools,
+[  --disable-devtools           Disable Mozilla Developer Tools (client)],
+    MOZ_DEVTOOLS=,
+    MOZ_DEVTOOLS=1)
 
 if test -n "$MOZ_DEVTOOLS"; then
     if test ! -n "$MOZ_DEVTOOLS_SERVER"; then
-- 
cgit v1.2.3


From fd6b1ad6f9768556bb03a0fbdb16587fdfd0a962 Mon Sep 17 00:00:00 2001
From: "Matt A. Tobin" <email@mattatobin.com>
Date: Sat, 24 Feb 2018 09:56:36 -0500
Subject: WebRTC should be an enable bool in ac configure but enabled in
 Basilisk

---
 browser/confvars.sh |  1 +
 old-configure.in    | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/browser/confvars.sh b/browser/confvars.sh
index 288b842a6..503e940b3 100755
--- a/browser/confvars.sh
+++ b/browser/confvars.sh
@@ -55,6 +55,7 @@ MOZ_WEBGL_CONFORMANT=1
 MOZ_JSDOWNLOADS=1
 MOZ_RUST_MP4PARSE=1
 MOZ_RUST_URLPARSE=1
+MOZ_WEBRTC=1
 MOZ_WEBEXTENSIONS=1
 MOZ_DEVTOOLS=1
 
diff --git a/old-configure.in b/old-configure.in
index 203a12bea..f01f8fcb0 100644
--- a/old-configure.in
+++ b/old-configure.in
@@ -2878,12 +2878,12 @@ x86_64 | arm | aarch64 | x86 | ppc* | ia64)
 esac
 
 dnl ========================================================
-dnl = Disable WebRTC code
+dnl = Enable WebRTC code
 dnl ========================================================
-MOZ_ARG_DISABLE_BOOL(webrtc,
-[  --disable-webrtc        Disable support for WebRTC],
-    MOZ_WEBRTC=,
-    MOZ_WEBRTC=1)
+MOZ_ARG_ENABLE_BOOL(webrtc,
+[  --enable-webrtc        Enable support for WebRTC],
+    MOZ_WEBRTC=1,
+    MOZ_WEBRTC=)
 
 if test -n "$MOZ_WEBRTC"; then
     AC_DEFINE(MOZ_WEBRTC)
-- 
cgit v1.2.3