From ee09ea78ed9c58b5a5962307d003374c51142583 Mon Sep 17 00:00:00 2001
From: Gabriel <g2p.code@gmail.com>
Date: Tue, 23 Oct 2012 01:44:11 +0200
Subject: [PATCH] Fix the mozjs special case in ./configure

Fix the mozjs special case so that build products are where rust-mozjs
expects them.
---
 configure | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/configure b/configure
index f6fb64ed054..0671a8f3955 100755
--- a/configure
+++ b/configure
@@ -351,9 +351,6 @@ then
 CFG_SUBMODULES="rust-cocoa rust-io-surface rust-core-foundation rust-core-graphics rust-core-text ${CFG_SUBMODULES}"
 fi
 
-# needed because Spidermonkey configure is in non-standard location
-CFG_CONFIGURE_PATHS="${CFG_SUBMODULES} mozjs/js/src/"
-
 step_msg "making build directories"
 
 cd "${CFG_BUILD_DIR}"
@@ -369,13 +366,17 @@ make_dir src/test/ref
 # see how Rust's configure script optionally reconfigures the LLVM module.
 step_msg "running submodule configure scripts"
 
-for i in ${CFG_CONFIGURE_PATHS}
+for i in ${CFG_SUBMODULES}
 do
     if [ -d ${CFG_BUILD_DIR}src/${i} ]
     then
 	cd ${CFG_BUILD_DIR}src/${i}
     fi
     CONFIGURE_SCRIPT="${CFG_SRC_DIR}src/${i}/configure"
+    # needed because Spidermonkey configure is in non-standard location
+    if [ $i = mozjs ]; then
+	CONFIGURE_SCRIPT="${CFG_SRC_DIR}src/${i}/js/src/configure"
+    fi
     if [ -f ${CONFIGURE_SCRIPT} ]
     then
 	sh ${CONFIGURE_SCRIPT}