Port build system changes from bug 1031291 for im/ (following m-c changes in bug 762358). rs=florian over IRC
authoraleth <aleth@instantbird.org>
Sun, 06 Jul 2014 15:56:37 +0200
changeset 18384 fc5f846ae8942d73eefad88463254a0559350bdf
parent 18383 48940e271326f70789bce6bc4dd2f564a14a75a4
child 18385 e8d6763ac8d635ecc60db94b1d2862d1fd7b59e0
push id1249
push userCallek@gmail.com
push dateMon, 21 Jul 2014 23:08:34 +0000
treeherdercomm-aurora@5c8e1ea122aa [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersflorian
bugs1031291, 762358
Port build system changes from bug 1031291 for im/ (following m-c changes in bug 762358). rs=florian over IRC
im/configure.in
--- a/im/configure.in
+++ b/im/configure.in
@@ -2,19 +2,19 @@ dnl -*- Mode: Autoconf; tab-width: 2; in
 dnl vi: set tabstop=2 shiftwidth=2 expandtab:
 dnl This Source Code Form is subject to the terms of the Mozilla Public
 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 Things we need to carry from confvars.sh
 AC_SUBST(INSTANTBIRD_VERSION)
 
-if test -d $topsrcdir/extensions/purple ; then
+if test -d $srcdir/extensions/purple ; then
   tmpscript=`$PYTHON -c 'import os, tempfile; print tempfile.mktemp(prefix="subscript.").replace(os.sep, "/")'` || exit 1
-  m4 "${topsrcdir}/build/autoconf/subconfigure.m4" \
-   "${topsrcdir}/build/autoconf/altoptions.m4" \
-   "${topsrcdir}/extensions/purple/configure.in" > $tmpscript
+  m4 "${srcdir}/build/autoconf/subconfigure.m4" \
+   "${srcdir}/build/autoconf/altoptions.m4" \
+   "${srcdir}/extensions/purple/configure.in" > $tmpscript
   . $tmpscript
   rm -f $tmpscript
 
   MOZ_PURPLE=1
   AC_SUBST(MOZ_PURPLE)
 fi