summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2018-02-24 11:57:59 -0500
committerMatt A. Tobin <email@mattatobin.com>2018-02-24 11:57:59 -0500
commit27727874636868dc6d61e8117f81cd761c91e2ed (patch)
treee3162c57574bcf7f91d262d9a8cd70ece01f9edb
parent1dbd9799db37d8491a1ddb2d47e89f40fefd9c63 (diff)
parentfd6b1ad6f9768556bb03a0fbdb16587fdfd0a962 (diff)
downloadUXP-27727874636868dc6d61e8117f81cd761c91e2ed.tar
UXP-27727874636868dc6d61e8117f81cd761c91e2ed.tar.gz
UXP-27727874636868dc6d61e8117f81cd761c91e2ed.tar.lz
UXP-27727874636868dc6d61e8117f81cd761c91e2ed.tar.xz
UXP-27727874636868dc6d61e8117f81cd761c91e2ed.zip
Merge branch 'master' into EME-work
-rwxr-xr-xbrowser/confvars.sh9
-rw-r--r--old-configure.in20
2 files changed, 12 insertions, 17 deletions
diff --git a/browser/confvars.sh b/browser/confvars.sh
index 0cccede38..503e940b3 100755
--- a/browser/confvars.sh
+++ b/browser/confvars.sh
@@ -55,15 +55,10 @@ MOZ_WEBGL_CONFORMANT=1
MOZ_JSDOWNLOADS=1
MOZ_RUST_MP4PARSE=1
MOZ_RUST_URLPARSE=1
+MOZ_WEBRTC=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 34da223ed..3cb499b93 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)
@@ -4779,12 +4779,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