Bug 1292653 - invoke subconfigure script from original srcdir; r?glandium draft
authorMyk Melez <myk@mykzilla.org>
Fri, 05 Aug 2016 12:30:47 -0700
changeset 397393 8c734f5f98aab5dce229282023a7e6503ebcf808
parent 397385 192132a4cbc78fa948ad1e37c204f537043fc37e
child 527444 d743d640b9d88cfbd49e4226e725667d5f2d559f
push id25285
push userbmo:myk@mykzilla.org
push dateFri, 05 Aug 2016 19:31:04 +0000
reviewersglandium
bugs1292653
milestone51.0a1
Bug 1292653 - invoke subconfigure script from original srcdir; r?glandium MozReview-Commit-ID: ItagP7A3aMR
old-configure.in
--- a/old-configure.in
+++ b/old-configure.in
@@ -6569,23 +6569,20 @@ if test -z "$direct_nspr_config"; then
     RC=
 fi
 
 unset MAKEFILES
 unset CONFIG_FILES
 
 # Run all configure scripts specified by a subconfigure
 if test -n "$_subconfigure_subdir"; then
-  _save_srcdir="$srcdir"
-  srcdir="$srcdir/.."
   _save_ac_configure_args="$ac_configure_args"
   ac_configure_args="$_subconfigure_config_args"
   AC_OUTPUT_SUBDIRS_NOW("$_subconfigure_subdir",$cache_file)
   ac_configure_args="$_save_ac_configure_args"
-  srcdir="$_save_srcdir"
 fi
 
 if test "$COMPILE_ENVIRONMENT"; then
 
 export WRAP_LDFLAGS
 
 dnl ========================================================
 dnl = Setup a nice relatively clean build environment for