From: Jonathan Liu <net147@gmail.com>
Date: Fri, 24 Feb 2012 11:36:59 +0000 (+1100)
Subject: Fix MinGW configure bootstrap
X-Git-Tag: qt-v5.0.0-alpha1~768
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bc8bc6018e8ad34512d3de3265f7ad34f91f59ff;p=profile%2Fivi%2Fqtbase.git

Fix MinGW configure bootstrap

Makefile.mingw was using the test command which requires sh.exe. This
adds support for bootstrap using cmd.exe instead.

Change-Id: Ieb67843170d2745ce119cc8feaa5433aa82fd7d7
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
---

diff --git a/tools/configure/Makefile.mingw b/tools/configure/Makefile.mingw
index 5951cb4..086dd71 100644
--- a/tools/configure/Makefile.mingw
+++ b/tools/configure/Makefile.mingw
@@ -74,10 +74,38 @@ $(TARGET): $(OBJECTS)
 
 $(OBJECTS): $(PCH)
 
-CHK_DIR_EXISTS = test -d
-MKDIR=mkdir -p
+# SHELL is the full path of sh.exe, unless
+# 1) it is found in the current directory
+# 2) it is not found at all
+# 3) it is overridden on the command line with an existing file
+# ... otherwise it is always sh.exe. Specifically, SHELL from the
+# environment has no effect.
+#
+# This check will fail if SHELL is explicitly set to a not
+# sh-compatible shell. This is not a problem, because configure.bat
+# will not do that.
+ifeq ($(SHELL), sh.exe)
+    ifeq ($(wildcard $(CURDIR)/sh.exe), )
+        SH = 0
+    else
+        SH = 1
+    endif
+else
+    SH = 1
+endif
+
+ifeq ($(SH), 1)
+    CHK_DIR_EXISTS = test -d
+    CHK_DIR_EXISTS_GLUE = ||
+    MKDIR = mkdir -p
+else
+    CHK_DIR_EXISTS = if not exist
+    CHK_DIR_EXISTS_GLUE =
+    MKDIR = md
+endif
+
 $(PCH): $(CONFSRC)/configure_pch.h
-	@$(CHK_DIR_EXISTS) $(RAW_PCH).gch || $(MKDIR) $(RAW_PCH).gch
+	@$(CHK_DIR_EXISTS) $(RAW_PCH).gch $(CHK_DIR_EXISTS_GLUE) $(MKDIR) $(RAW_PCH).gch
 	$(CXX) -x c++-header -c $(CXXFLAGS_BARE) -o $@ $<
 
 VPATH = $(CONFSRC):$(TOOLSRC)/shared/windows:$(CORESRC)/global:$(CORESRC)/kernel:$(CORESRC)/tools:$(CORESRC)/codecs:$(CORESRC)/io:$(CORESRC)/xml:$(CORESRC)/plugin