Bug 1294864 - Move MOZ_PERMISSIONS to Python configure. r=glandium
MozReview-Commit-ID: 1O9vAnUDIqE
--- a/build/moz.configure/old.configure
+++ b/build/moz.configure/old.configure
@@ -211,17 +211,16 @@ def old_configure_options(*options):
'--enable-nfc',
'--enable-nspr-build',
'--enable-official-branding',
'--enable-omx-plugin',
'--enable-oom-breakpoint',
'--enable-optimize',
'--enable-parental-controls',
'--enable-perf',
- '--enable-permissions',
'--enable-pie',
'--enable-png-arm-neon-support',
'--enable-posix-nspr-emulation',
'--enable-pref-extensions',
'--enable-printing',
'--enable-pulseaudio',
'--enable-raw',
'--enable-readline',
--- a/old-configure.in
+++ b/old-configure.in
@@ -2420,17 +2420,16 @@ MOZ_WEBSPEECH_POCKETSPHINX=
MOZ_WEBSPEECH_TEST_BACKEND=1
VPX_USE_YASM=
VPX_ASFLAGS=
VPX_AS_CONVERSION=
VPX_X86_ASM=
VPX_ARM_ASM=
LIBJPEG_TURBO_AS=
LIBJPEG_TURBO_ASFLAGS=
-MOZ_PERMISSIONS=1
MOZ_PREF_EXTENSIONS=1
MOZ_REFLOW_PERF=
MOZ_SAFE_BROWSING=
MOZ_SPELLCHECK=1
MOZ_TOOLKIT_SEARCH=1
MOZ_UI_LOCALE=en-US
MOZ_UNIVERSALCHARDET=1
MOZ_URL_CLASSIFIER=
@@ -3600,30 +3599,16 @@ if test -n "$MOZ_PULSEAUDIO"; then
else
MOZ_PULSEAUDIO_CFLAGS="-I$gonkdir/external/pulseaudio/pulseaudio/src"
fi
fi
AC_SUBST(MOZ_PULSEAUDIO)
dnl ========================================================
-dnl Permissions System
-dnl ========================================================
-MOZ_ARG_DISABLE_BOOL(permissions,
-[ --disable-permissions Disable permissions (popup and cookie blocking)],
- MOZ_PERMISSIONS=,
- MOZ_PERMISSIONS=1
-)
-
-AC_SUBST(MOZ_PERMISSIONS)
-if test -n "$MOZ_PERMISSIONS"; then
- AC_DEFINE(MOZ_PERMISSIONS)
-fi
-
-dnl ========================================================
dnl NegotiateAuth
dnl ========================================================
MOZ_ARG_DISABLE_BOOL(negotiateauth,
[ --disable-negotiateauth Disable GSS-API negotiation ],
MOZ_AUTH_EXTENSION=,
MOZ_AUTH_EXTENSION=1 )
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -439,16 +439,26 @@ project_flag('MOZ_ANDROID_HISTORY',
help='Enable Android History instead of Places',
set_as_define=True)
@depends('MOZ_PLACES', 'MOZ_ANDROID_HISTORY')
def check_places_and_android_history(places, android_history):
if places and android_history:
die('Cannot use MOZ_ANDROID_HISTORY alongside MOZ_PLACES.')
+# Permissions system
+# ==============================================================
+option(name='--disable-permissions',
+ help='Disable permissions (popup and cookie blocking)')
+
+moz_permissions = depends_if('--disable-permissions')(lambda _: True)
+
+set_config('MOZ_PERMISSIONS', moz_permissions)
+set_define('MOZ_PERMISSIONS', moz_permissions)
+
# gpsd support
# ==============================================================
option('--enable-gpsd', env='MOZ_GPSD',
help='Enable gpsd support')
@depends('--enable-gpsd')
def gpsd(value):
return bool(value)