Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: configure.in

Issue 29342994: Issue 2490 - Investigate another way to disable the crash reporter (Closed)
Patch Set: Created May 24, 2016, 2:34 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 dnl -*- Mode: Autoconf; tab-width: 4; indent-tabs-mode: nil; -*- 1 dnl -*- Mode: Autoconf; tab-width: 4; indent-tabs-mode: nil; -*-
2 dnl vi: set tabstop=4 shiftwidth=4 expandtab syntax=m4: 2 dnl vi: set tabstop=4 shiftwidth=4 expandtab syntax=m4:
3 dnl This Source Code Form is subject to the terms of the Mozilla Public 3 dnl This Source Code Form is subject to the terms of the Mozilla Public
4 dnl License, v. 2.0. If a copy of the MPL was not distributed with this 4 dnl License, v. 2.0. If a copy of the MPL was not distributed with this
5 dnl file, You can obtain one at http://mozilla.org/MPL/2.0/. 5 dnl file, You can obtain one at http://mozilla.org/MPL/2.0/.
6 6
7 dnl Process this file with autoconf to produce a configure script. 7 dnl Process this file with autoconf to produce a configure script.
8 dnl ======================================================== 8 dnl ========================================================
9 9
10 AC_PREREQ(2.13) 10 AC_PREREQ(2.13)
(...skipping 6022 matching lines...) Expand 10 before | Expand all | Expand 10 after
6033 6033
6034 AC_DEFINE(MOZ_GAMEPAD) 6034 AC_DEFINE(MOZ_GAMEPAD)
6035 fi 6035 fi
6036 AC_SUBST(MOZ_GAMEPAD) 6036 AC_SUBST(MOZ_GAMEPAD)
6037 AC_SUBST(MOZ_GAMEPAD_BACKEND) 6037 AC_SUBST(MOZ_GAMEPAD_BACKEND)
6038 6038
6039 dnl ======================================================== 6039 dnl ========================================================
6040 dnl = Breakpad crash reporting (on by default on supported platforms) 6040 dnl = Breakpad crash reporting (on by default on supported platforms)
6041 dnl ======================================================== 6041 dnl ========================================================
6042 6042
6043 case $target in 6043 # case $target in
anton 2016/09/12 11:26:57 should not we remove the lines instead of commenti
diegocarloslima 2016/09/14 23:31:24 Yeah, you're right. I'll fix that.
6044 i?86-*-mingw*|x86_64-*-mingw*) 6044 # i?86-*-mingw*|x86_64-*-mingw*)
6045 MOZ_CRASHREPORTER=1 6045 # MOZ_CRASHREPORTER=1
6046 ;; 6046 # ;;
6047 i?86-apple-darwin*|x86_64-apple-darwin*) 6047 # i?86-apple-darwin*|x86_64-apple-darwin*)
6048 if test -z "$MOZ_IOS"; then 6048 # if test -z "$MOZ_IOS"; then
6049 MOZ_CRASHREPORTER=1 6049 # MOZ_CRASHREPORTER=1
6050 fi 6050 # fi
6051 ;; 6051 # ;;
6052 i?86-*-linux*|x86_64-*-linux*|arm-*-linux*) 6052 # i?86-*-linux*|x86_64-*-linux*|arm-*-linux*)
6053 if test "$MOZ_ENABLE_GTK"; then 6053 # if test "$MOZ_ENABLE_GTK"; then
6054 MOZ_CRASHREPORTER=1 6054 # MOZ_CRASHREPORTER=1
6055 fi 6055 # fi
6056 ;; 6056 # ;;
6057 *-android*|*-linuxandroid*) 6057 # *-android*|*-linuxandroid*)
6058 MOZ_CRASHREPORTER=1 6058 # MOZ_CRASHREPORTER=1
6059 ;; 6059 # ;;
6060 *solaris*) 6060 # *solaris*)
6061 MOZ_CRASHREPORTER=1 6061 # MOZ_CRASHREPORTER=1
6062 ;; 6062 # ;;
6063 esac 6063 # esac
6064 6064 #
6065 MOZ_ARG_DISABLE_BOOL(crashreporter, 6065 # MOZ_ARG_DISABLE_BOOL(crashreporter,
6066 [ --disable-crashreporter Disable breakpad crash reporting], 6066 # [ --disable-crashreporter Disable breakpad crash reporting],
6067 [MOZ_CRASHREPORTER=], 6067 # [MOZ_CRASHREPORTER=],
6068 [MOZ_CRASHREPORTER=F # Force enable breakpad]) 6068 # [MOZ_CRASHREPORTER=F # Force enable breakpad])
6069 6069 #
6070 if test "$OS_ARCH" != "$HOST_OS_ARCH" -a "$OS_ARCH" != "WINNT" -a "$OS_ARCH" != "Darwin"; then 6070 # if test "$OS_ARCH" != "$HOST_OS_ARCH" -a "$OS_ARCH" != "WINNT" -a "$OS_ARCH" ! = "Darwin"; then
6071 if test "$MOZ_CRASHREPORTER" = F; then 6071 # if test "$MOZ_CRASHREPORTER" = F; then
6072 AC_MSG_ERROR([Cannot --enable-crashreporter, as breakpad tools do not suppor t compiling on $HOST_OS_ARCH while targeting $OS_ARCH.]) 6072 # AC_MSG_ERROR([Cannot --enable-crashreporter, as breakpad tools do not supp ort compiling on $HOST_OS_ARCH while targeting $OS_ARCH.])
6073 fi 6073 # fi
6074 MOZ_CRASHREPORTER= 6074 # MOZ_CRASHREPORTER=
6075 fi 6075 # fi
6076 #
6077 # Force disable crashreporter
6078 # see https://issues.adblockplus.org/ticket/2490
6079 MOZ_CRASHREPORTER=
6076 6080
6077 if test -n "$MOZ_CRASHREPORTER"; then 6081 if test -n "$MOZ_CRASHREPORTER"; then
6078 AC_DEFINE(MOZ_CRASHREPORTER) 6082 AC_DEFINE(MOZ_CRASHREPORTER)
6079 6083
6080 if test "$OS_TARGET" = "Linux" -o "$OS_ARCH" = "SunOS" && \ 6084 if test "$OS_TARGET" = "Linux" -o "$OS_ARCH" = "SunOS" && \
6081 test -z "$SKIP_LIBRARY_CHECKS"; then 6085 test -z "$SKIP_LIBRARY_CHECKS"; then
6082 PKG_CHECK_MODULES(MOZ_GTHREAD, gthread-2.0) 6086 PKG_CHECK_MODULES(MOZ_GTHREAD, gthread-2.0)
6083 fi 6087 fi
6084 6088
6085 if test "$OS_ARCH" = "WINNT"; then 6089 if test "$OS_ARCH" = "WINNT"; then
(...skipping 3232 matching lines...) Expand 10 before | Expand all | Expand 10 after
9318 fi # COMPILE_ENVIRONMENT 9322 fi # COMPILE_ENVIRONMENT
9319 9323
9320 export WRITE_MOZINFO=1 9324 export WRITE_MOZINFO=1
9321 dnl we need to run config.status after js/src subconfigure because we're 9325 dnl we need to run config.status after js/src subconfigure because we're
9322 dnl traversing its moz.build and we need its config.status for that. 9326 dnl traversing its moz.build and we need its config.status for that.
9323 dnl However, writing our own config.status needs to happen before 9327 dnl However, writing our own config.status needs to happen before
9324 dnl subconfigures because the setup surrounding subconfigures alters 9328 dnl subconfigures because the setup surrounding subconfigures alters
9325 dnl many AC_SUBSTed variables. 9329 dnl many AC_SUBSTed variables.
9326 MOZ_RUN_CONFIG_STATUS() 9330 MOZ_RUN_CONFIG_STATUS()
9327 unset WRITE_MOZINFO 9331 unset WRITE_MOZINFO
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld