--- a/old-configure.in
+++ b/old-configure.in
@@ -7470,18 +7470,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']