Bug 1260327 - Switch buildconfig.html to using MOZ_CONFIGURE_OPTIONS. r=chmanchester
authorMike Hommey <mh+mozilla@glandium.org>
Wed, 13 Apr 2016 11:54:02 +0900
changeset 331187 993766c094cfa8d3d8b8f34617bdf321d5fc4737
parent 331186 450647e36329144c9a3de6bc6642cad717ee0c30
child 331188 bba8a0264e24d8c5231d12ecfd518a2ede9d255b
push id6048
push userkmoir@mozilla.com
push dateMon, 06 Jun 2016 19:02:08 +0000
treeherdermozilla-beta@46d72a56c57d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerschmanchester
bugs1260327
milestone48.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1260327 - Switch buildconfig.html to using MOZ_CONFIGURE_OPTIONS. r=chmanchester
old-configure.in
toolkit/content/buildconfig.html
toolkit/content/moz.build
--- a/old-configure.in
+++ b/old-configure.in
@@ -7327,18 +7327,16 @@ aurora|beta|release|esr)
 esac
 AC_SUBST(A11Y_LOG)
 if test -n "$A11Y_LOG"; then
     AC_DEFINE(A11Y_LOG)
 fi
 
 AC_SUBST(MOZILLA_VERSION)
 
-AC_SUBST(ac_configure_args)
-
 dnl Spit out some output
 dnl ========================================================
 
 dnl The following defines are used by xpcom
 _NON_GLOBAL_ACDEFINES="$_NON_GLOBAL_ACDEFINES
 CPP_THROW_NEW
 HAVE_CPP_AMBIGUITY_RESOLVING_USING
 HAVE_CPP_DYNAMIC_CAST_TO_VOID_PTR
--- a/toolkit/content/buildconfig.html
+++ b/toolkit/content/buildconfig.html
@@ -51,16 +51,16 @@
       <td>@CXX@</td>
       <td>@CXX_VERSION@</td>
 #ifndef BUILD_FASTER
       <td>@CXXFLAGS@ @CPPFLAGS@</td>
 #endif
     </tr>
   </tbody>
 </table>
-<h2>Configure arguments</h2>
-<p>@ac_configure_args@</p>
+<h2>Configure options</h2>
+<p>@MOZ_CONFIGURE_OPTIONS@</p>
 #ifdef ANDROID
 <h2>Package name</h2>
 <p>@ANDROID_PACKAGE_NAME@</p>
 #endif
 </body>
 </html>
--- a/toolkit/content/moz.build
+++ b/toolkit/content/moz.build
@@ -1,17 +1,17 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 TEST_DIRS += ['tests']
 
-for var in ('target', 'ac_configure_args', 'CC', 'CC_VERSION',
+for var in ('target', 'MOZ_CONFIGURE_OPTIONS', 'CC', 'CC_VERSION',
             'CXX', 'CXX_VERSION'):
     DEFINES[var] = CONFIG[var]
 
 DEFINES['CFLAGS'] = CONFIG['OS_CFLAGS']
 
 if CONFIG['OS_TARGET'] == 'Android':
     DEFINES['ANDROID_PACKAGE_NAME'] = CONFIG['ANDROID_PACKAGE_NAME']