Bug 1031291 - Prepare comm-central to m-c changes from bug 762358 on a CLOSED TREE. r=jcranmer
authorMike Hommey <mh+mozilla@glandium.org>
Tue, 01 Jul 2014 14:24:43 +0900
changeset 20414 82fdf36eab593bdb093e33ae461ce94bd62a1313
parent 20413 2d0bf51fc537980321abd91ce7ff6a9915416034
child 20415 b82a9f18921f1929323ad154807a53d93e645b4d
push id1209
push usermbanner@mozilla.com
push dateTue, 02 Sep 2014 16:59:36 +0000
treeherdercomm-beta@842e0fd167ee [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjcranmer
bugs1031291, 762358
Bug 1031291 - Prepare comm-central to m-c changes from bug 762358 on a CLOSED TREE. r=jcranmer
configure.in
--- a/configure.in
+++ b/configure.in
@@ -4,26 +4,26 @@ dnl This Source Code Form is subject to 
 dnl License, v. 2.0. If a copy of the MPL was not distributed with this
 dnl file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 dnl Process this file with autoconf to produce a configure script.
 dnl ========================================================
 
 AC_PREREQ(2.13)
 AC_INIT(config/config.mk)
-MOZILLA_SRCDIR=$topsrcdir/mozilla
+MOZILLA_SRCDIR=$srcdir/mozilla
 AC_CONFIG_AUX_DIR(${MOZILLA_SRCDIR}/build/autoconf)
 AC_CANONICAL_SYSTEM
 
 dnl comm-central-specific options
 dnl (MOZILLA_SRCDIR would fit here, but is needed to find autoconf tools)
 COMM_BUILD=1
 
 dnl export this, so the var is set for mozilla/configure
-MOZCONFIG=`$_AUTOCONF_TOOLS_DIR/mozconfig-find $topsrcdir`
+MOZCONFIG=`$srcdir/build/autoconf/mozconfig-find $srcdir`
 export MOZCONFIG
 
 dnl Do not allow a separate objdir build if a srcdir build exists.
 dnl ==============================================================
 _topsrcdir=`cd \`dirname $0\`; pwd`
 _objdir=`pwd`
 
 if test "$_topsrcdir" != "$_objdir"
@@ -269,9 +269,9 @@ if test -n "$MOZ_CURRENT_PROJECT"; then
     export MOZ_BUILD_APP="$MOZ_CURRENT_PROJECT"
 fi
 
 export MOZ_PSEUDO_DERECURSE=
 AC_OUTPUT_SUBDIRS(mozilla)
 MOZ_BUILD_APP="$MOZ_BUILD_APP_CACHED"
 
 # Build the comm-central files with config.status
-test "$no_create" = yes || ${PYTHON} $CONFIG_STATUS || exit 1
+test "$no_create" = yes || WRITE_MOZINFO=1 ${PYTHON} $CONFIG_STATUS || exit 1