BuildSystem: fix darwin/xcode to avoid double-configure/build after svn up

- build system automagically rebuilds certain files from libhb upwards after
  an svn up to maintain accurate repository information in binaries; if building
  with xcode the process was inadvertantly repeated on subsequent 'make'.
- enhanced make/xcodemake to record the user's environment when shunted through
  xcode. this should help in diagnosing build issues from Xcode.app in the future.


git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2344 b64f7644-9d1e-0410-96f1-a4d463321fa5

1 files changed, 4 insertions, 3 deletions

diff --git a/make/include/main.rules b/make/include/main.rules
index 2b288ab31..132567c1e 100644
--- a/make/include/main.rules
+++ b/make/include/main.rules
@@ -4,7 +4,8 @@
 ###############################################################################
 
 ## file-wide conditional to use xcode rules if xcode=1 method=terminal
-ifeq ($(FEATURE.xcode):$(BUILD.method),1:terminal)
+## xcodemake will set BUILD.method != terminal to prevent infinite recursion
+ifeq (1:terminal,$(FEATURE.xcode):$(BUILD.method))
     include $(SRC/)macosx/module.xcode
 else
 
@@ -40,12 +41,12 @@ include $(MODULES:%=$(SRC/)%/module.rules)
 
 ## target which causes re-configure if project-root is svn update'd
 $(BUILD/)GNUmakefile: $(wildcard $(SRC/).svn/entries)
-	$(SRC/)configure --force $(CONF.args)
+	$(SRC/)configure --force --conf-method=$(CONF.method) $(CONF.args)
 
 ## target useful to force reconfigure; only helpful for build-system development
 .PHONY: reconfigure
 reconfigure:
-	$(SRC/)configure --force $(CONF.args)
+	$(SRC/)configure --force --conf-method=$(CONF.method) $(CONF.args)
 
 ###############################################################################