comm-central bustage fix from
bug 97954 (autoconf build environment for SpiderMonkey), r=Standard8
--- a/client.mk
+++ b/client.mk
@@ -157,17 +157,19 @@ ifdef MOZ_OBJDIR
else
OBJDIR := $(TOPSRCDIR)
MOZ_MAKE := $(MAKE) $(MOZ_MAKE_FLAGS)
endif
endif # MOZ_BUILD_PROJECTS
# 'configure' scripts generated by autoconf.
-CONFIGURES := $(TOPSRCDIR)/configure $(TOPSRCDIR)/mozilla/configure
+CONFIGURES := $(TOPSRCDIR)/configure
+CONFIGURES += $(TOPSRCDIR)/mozilla/configure
+CONFIGURES += $(TOPSRCDIR)/mozilla/js/src/configure
#######################################################################
# Rules
# The default rule is build
build::
# Print out any options loaded from mozconfig.
@@ -242,28 +244,30 @@ else
CONFIG_STATUS = $(wildcard $(OBJDIR)/config.status)
CONFIG_CACHE = $(wildcard $(OBJDIR)/config.cache)
EXTRA_CONFIG_DEPS := \
$(TOPSRCDIR)/aclocal.m4 \
$(TOPSRCDIR)/mozilla/aclocal.m4 \
$(wildcard $(TOPSRCDIR)/mozilla/build/autoconf/*.m4) \
+ $(TOPSRCDIR)/mozilla/js/src/aclocal.m4 \
$(NULL)
$(CONFIGURES): %: %.in $(EXTRA_CONFIG_DEPS)
@echo Generating $@ using autoconf
cd $(@D); $(AUTOCONF)
CONFIG_STATUS_DEPS := \
$(wildcard $(CONFIGURES)) \
$(TOPSRCDIR)/allmakefiles.sh \
$(TOPSRCDIR)/.mozconfig.mk \
$(TOPSRCDIR)/mozilla/allmakefiles.sh \
$(wildcard $(TOPSRCDIR)/mozilla/nsprpub/configure) \
+ $(wildcard $(TOPSRCDIR)/mozilla/js/src/configure) \
$(wildcard $(TOPSRCDIR)/mozilla/config/milestone.txt) \
$(wildcard $(TOPSRCDIR)/directory/c-sdk/configure) \
$(wildcard $(addsuffix confvars.sh,$(wildcard $(TOPSRCDIR)/*/))) \
$(NULL)
# configure uses the program name to determine @srcdir@. Calling it without
# $(TOPSRCDIR) will set @srcdir@ to "."; otherwise, it is set to the full
# path of $(TOPSRCDIR).