Bug 1225753: move $prefix default initialization before it gets used r=glandium
authorLandry Breuil <landry@openbsd.org>
Sat, 26 Dec 2015 13:40:54 -0500
changeset 277669 fcdaa7c034f48bae30943ffd9c8ccef2e9ba320d
parent 277668 3196d7dae075e80f1c62c461e30ebd50c5d13342
child 277670 4cf5c2224d1662822e9fd1a6c1dc922a3be37078
push id29829
push usercbook@mozilla.com
push dateMon, 28 Dec 2015 09:26:06 +0000
treeherdermozilla-central@7c83da46ea74 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs1225753
milestone46.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 1225753: move $prefix default initialization before it gets used r=glandium
build/autoconf/config.status.m4
build/autoconf/hooks.m4
--- a/build/autoconf/config.status.m4
+++ b/build/autoconf/config.status.m4
@@ -95,20 +95,16 @@ AC_SUBST(WIN_TOP_SRC)
 dnl Used in all Makefile.in files
 top_srcdir=$srcdir
 AC_SUBST(top_srcdir)
 
 dnl Picked from autoconf 2.13
 trap '' 1 2 15
 AC_CACHE_SAVE
 
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
 trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
 : ${CONFIG_STATUS=./config.status}
 
 dnl We're going to need [ ] for python syntax.
 changequote(<<<, >>>)dnl
 echo creating $CONFIG_STATUS
 
 extra_python_path=${COMM_BUILD:+"'mozilla', "}
--- a/build/autoconf/hooks.m4
+++ b/build/autoconf/hooks.m4
@@ -10,16 +10,21 @@ trap '[ "$?" != 0 ] && echo "------ conf
 changequote([, ])dnl
 ])
 
 dnl Wrap AC_INIT_PREPARE to add the above trap.
 define([_MOZ_AC_INIT_PREPARE], defn([AC_INIT_PREPARE]))
 define([AC_INIT_PREPARE],
 [_MOZ_AC_INIT_PREPARE($1)
 MOZ_CONFIG_LOG_TRAP
+
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+# Let make expand exec_prefix.
+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+
 > subconfigures
 > skip_subconfigures
 ])
 
 define([AC_OUTPUT_SUBDIRS],
 [for moz_config_dir in $1; do
   _CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
   case "$moz_config_dir" in