Bug 467583: Make js/src share the 'dist' tree with the enclosing build. r=ted.mielczarek

configure.in

@@ -8334,6 +8334,7 @@ if test -z "$MOZ_NATIVE_NSPR"; then
     ac_configure_args="$ac_configure_args --with-nspr-cflags='$NSPR_CFLAGS'"
     ac_configure_args="$ac_configure_args --with-nspr-libs='$NSPR_LIBS'"
 fi
+ac_configure_args="$ac_configure_args --with-dist-dir=../../dist"
 ac_configure_args="$ac_configure_args --includedir=$dist/include"
 ac_configure_args="$ac_configure_args --bindir=$dist/bin"
 ac_configure_args="$ac_configure_args --libdir=$dist/lib"

js/src/config/autoconf.mk.in

@@ -64,7 +64,12 @@ mandir		= @mandir@
 installdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
 sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
 
-DIST		= $(DEPTH)/dist
+TOP_DIST	= @TOP_DIST@
+ifneq (,$(filter /%,$(TOP_DIST)))
+DIST		= $(TOP_DIST)
+else
+DIST		= $(DEPTH)/$(TOP_DIST)
+endif
 
 MOZ_JS_LIBS		   = @MOZ_JS_LIBS@
 

js/src/configure.in

@@ -160,6 +160,17 @@ then
 fi
 MOZ_BUILD_ROOT=`pwd`
 
+dnl Choose where to put the 'dist' directory.
+dnl ==============================================================
+
+MOZ_ARG_WITH_STRING(dist-dir,
+[  --with-dist-dir=DIR     Use DIR as 'dist' staging area.  DIR may be
+                          relative to the top of SpiderMonkey build tree,
+                          or absolute.],
+    TOP_DIST=$withval,
+    TOP_DIST=dist)
+AC_SUBST(TOP_DIST)
+
 dnl Default to MSVC for win32
 dnl ==============================================================
 if test -z "$CROSS_COMPILE"; then