X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=configure.ac;h=66ed8a0b86449d2ef54be52e5cad67019531c791;hb=5109078b26bdbf226acdf1b0fe7c2861a7114571;hp=17b92ee874fb055099f22621acaf1b22f4dcbe39;hpb=b93e282a8c2e86ebdf2bc05fce91f001c53bd88d;p=ghc-hetmet.git

diff --git a/configure.ac b/configure.ac
index 17b92ee..66ed8a0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -899,11 +899,11 @@ FP_PROG_FIND
 dnl ** Find sort command (for the benefit of Win32 environs)
 FP_PROG_SORT
 
-dnl ** figure out how to do a BSD-ish install
-AC_PROG_INSTALL
 dnl Let's make sure install-sh is executable here.  If we got it from
 dnl a darcs repo, it might not be (see bug #978).
 chmod +x install-sh
+dnl ** figure out how to do a BSD-ish install
+AC_PROG_INSTALL
 
 dnl If you can run configure, you certainly have /bin/sh
 AC_DEFINE([HAVE_BIN_SH], [1], [Define to 1 if you have /bin/sh.])
@@ -928,6 +928,15 @@ dnl   if GNU tar is named gtar, look for it first.
 AC_PATH_PROGS(TarCmd,gtar tar,tar)
 
 AC_PATH_PROG(HSCOLOUR,HsColour)
+# HsColour is passed to Cabal, so we need a native path
+if test "x$HostPlatform" = "xi386-unknown-mingw32"
+    then
+       if test "${OSTYPE}" != "msys"
+         then
+         # Canonicalise to <drive>:/path/to/gcc
+         HSCOLOUR=`cygpath -w ${HSCOLOUR} | sed -e 's@\\\\@/@g' `
+       fi
+fi
 
 dnl ** check for DocBook toolchain
 FP_CHECK_DOCBOOK_DTD