diff options
Diffstat (limited to 'old-configure.in')
| -rw-r--r-- | old-configure.in | 42 |
1 files changed, 1 insertions, 41 deletions
diff --git a/old-configure.in b/old-configure.in index 7d336d37f..0b5f055c7 100644 --- a/old-configure.in +++ b/old-configure.in @@ -2306,7 +2306,6 @@ MOZ_INSTALL_TRACKING= ACCESSIBILITY=1 MOZ_TIME_MANAGER= MOZ_AUDIO_CHANNEL_MANAGER= -MOZ_CONTENT_SANDBOX= MOZ_GMP_SANDBOX= MOZ_SANDBOX= MOZ_BINARY_EXTENSIONS= @@ -3861,45 +3860,6 @@ if test -n "$MOZ_TSAN" -o -n "$MOZ_ASAN"; then fi dnl ======================================================== -dnl = Content process sandboxing -dnl ======================================================== -if test -n "$gonkdir"; then - MOZ_CONTENT_SANDBOX=$MOZ_SANDBOX -fi - -case "$OS_TARGET:$NIGHTLY_BUILD" in -WINNT:*) - MOZ_CONTENT_SANDBOX=$MOZ_SANDBOX - ;; -Darwin:*) - MOZ_CONTENT_SANDBOX=$MOZ_SANDBOX - ;; -Linux:1) - case $CPU_ARCH in - x86_64|x86) - MOZ_CONTENT_SANDBOX=$MOZ_SANDBOX - ;; - esac - ;; -esac - -MOZ_ARG_ENABLE_BOOL(content-sandbox, -[ --enable-content-sandbox Enable sandboxing support for content-processes - --disable-content-sandbox Disable sandboxing support for content-processes], - MOZ_CONTENT_SANDBOX=1, - MOZ_CONTENT_SANDBOX=) - -if test -n "$MOZ_CONTENT_SANDBOX" -a -z "$MOZ_SANDBOX"; then - AC_MSG_ERROR([--enable-content-sandbox and --disable-sandbox are conflicting options]) -fi - -if test -n "$MOZ_CONTENT_SANDBOX"; then - AC_DEFINE(MOZ_CONTENT_SANDBOX) -fi - -AC_SUBST(MOZ_CONTENT_SANDBOX) - -dnl ======================================================== dnl = Gecko Media Plugin sandboxing dnl ======================================================== case $OS_TARGET in @@ -3924,7 +3884,7 @@ fi AC_SUBST(MOZ_GMP_SANDBOX) -if test -z "$MOZ_CONTENT_SANDBOX" -a -z "$MOZ_GMP_SANDBOX"; then +if test -z "$MOZ_GMP_SANDBOX"; then MOZ_SANDBOX= fi |