From da0dde65192118e8d913318aad3f6284fd89f83e Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Sat, 17 Aug 2013 14:18:55 +0900 Subject: [PATCH] Bug 906260 - Make MOZILLA_OFFICIAL turn --enable-release on automatically. r=khuey Still allow MOZILLA_OFFICIAL + --disable-release --- build/autoconf/compiler-opts.m4 | 10 +++++----- js/src/build/autoconf/compiler-opts.m4 | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/build/autoconf/compiler-opts.m4 b/build/autoconf/compiler-opts.m4 index ab70145180d..6914853f14c 100644 --- a/build/autoconf/compiler-opts.m4 +++ b/build/autoconf/compiler-opts.m4 @@ -81,15 +81,15 @@ fi dnl A high level macro for selecting compiler options. AC_DEFUN([MOZ_COMPILER_OPTS], [ - DEVELOPER_OPTIONS=1 + if test -z "$MOZILLA_OFFICIAL"; then + DEVELOPER_OPTIONS=1 + fi MOZ_ARG_ENABLE_BOOL(release, [ --enable-release Build with more conservative, release engineering-oriented options. This may slow down builds.], - DEVELOPER_OPTIONS=) + DEVELOPER_OPTIONS=, + DEVELOPER_OPTIONS=1) - if test -n "$MOZILLA_OFFICIAL" -a -n "$DEVELOPER_OPTIONS"; then - AC_MSG_ERROR([You cannot set MOZILLA_OFFICIAL without --enable-release]) - fi AC_SUBST(DEVELOPER_OPTIONS) MOZ_DEBUGGING_OPTS diff --git a/js/src/build/autoconf/compiler-opts.m4 b/js/src/build/autoconf/compiler-opts.m4 index ab70145180d..6914853f14c 100644 --- a/js/src/build/autoconf/compiler-opts.m4 +++ b/js/src/build/autoconf/compiler-opts.m4 @@ -81,15 +81,15 @@ fi dnl A high level macro for selecting compiler options. AC_DEFUN([MOZ_COMPILER_OPTS], [ - DEVELOPER_OPTIONS=1 + if test -z "$MOZILLA_OFFICIAL"; then + DEVELOPER_OPTIONS=1 + fi MOZ_ARG_ENABLE_BOOL(release, [ --enable-release Build with more conservative, release engineering-oriented options. This may slow down builds.], - DEVELOPER_OPTIONS=) + DEVELOPER_OPTIONS=, + DEVELOPER_OPTIONS=1) - if test -n "$MOZILLA_OFFICIAL" -a -n "$DEVELOPER_OPTIONS"; then - AC_MSG_ERROR([You cannot set MOZILLA_OFFICIAL without --enable-release]) - fi AC_SUBST(DEVELOPER_OPTIONS) MOZ_DEBUGGING_OPTS