Left: | ||
Right: |
OLD | NEW |
---|---|
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 6055 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
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 suppor t compiling on $HOST_OS_ARCH while targeting $OS_ARCH.]) |
6073 fi | 6073 fi |
6074 MOZ_CRASHREPORTER= | 6074 MOZ_CRASHREPORTER= |
6075 fi | 6075 fi |
6076 # Force disable crashreporter | |
Felix Dahlke
2016/10/25 15:15:03
Ultra nit: I guess I'd add an empty line on top of
diegocarloslima
2016/10/25 15:17:12
Ok, I'll add that
| |
6077 # See https://issues.adblockplus.org/ticket/2490 | |
6078 MOZ_CRASHREPORTER= | |
6076 | 6079 |
6077 if test -n "$MOZ_CRASHREPORTER"; then | 6080 if test -n "$MOZ_CRASHREPORTER"; then |
6078 AC_DEFINE(MOZ_CRASHREPORTER) | 6081 AC_DEFINE(MOZ_CRASHREPORTER) |
6079 | 6082 |
6080 if test "$OS_TARGET" = "Linux" -o "$OS_ARCH" = "SunOS" && \ | 6083 if test "$OS_TARGET" = "Linux" -o "$OS_ARCH" = "SunOS" && \ |
6081 test -z "$SKIP_LIBRARY_CHECKS"; then | 6084 test -z "$SKIP_LIBRARY_CHECKS"; then |
6082 PKG_CHECK_MODULES(MOZ_GTHREAD, gthread-2.0) | 6085 PKG_CHECK_MODULES(MOZ_GTHREAD, gthread-2.0) |
6083 fi | 6086 fi |
6084 | 6087 |
6085 if test "$OS_ARCH" = "WINNT"; then | 6088 if test "$OS_ARCH" = "WINNT"; then |
(...skipping 3232 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
9318 fi # COMPILE_ENVIRONMENT | 9321 fi # COMPILE_ENVIRONMENT |
9319 | 9322 |
9320 export WRITE_MOZINFO=1 | 9323 export WRITE_MOZINFO=1 |
9321 dnl we need to run config.status after js/src subconfigure because we're | 9324 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. | 9325 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 | 9326 dnl However, writing our own config.status needs to happen before |
9324 dnl subconfigures because the setup surrounding subconfigures alters | 9327 dnl subconfigures because the setup surrounding subconfigures alters |
9325 dnl many AC_SUBSTed variables. | 9328 dnl many AC_SUBSTed variables. |
9326 MOZ_RUN_CONFIG_STATUS() | 9329 MOZ_RUN_CONFIG_STATUS() |
9327 unset WRITE_MOZINFO | 9330 unset WRITE_MOZINFO |
OLD | NEW |