X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=configure.ac;h=b20a11ffffb2257b335acc282d014043b11fb120;hb=d5183f31fccf9009768eab3f9261dac6c66df59e;hp=84d6c6df053878528e57fb4b38aa2425253b07ba;hpb=ac4610c4da6966803b851cb4264bcb4427d6e2d0;p=ghc-hetmet.git

diff --git a/configure.ac b/configure.ac
index 84d6c6d..b20a11f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -637,8 +637,6 @@ AC_ARG_WITH([ghc],
   WithGhc="$GHC"])
 AC_SUBST([WithGhc])
 
-FP_FIND_ROOT
-
 AC_ARG_WITH(hc,
 [AC_HELP_STRING([--with-hc=ARG],
         [Use ARG as the path to the compiler for compiling ordinary
@@ -758,6 +756,9 @@ if test "$BootingFromHc" = "NO" -a "$WithGhc" = "" -a -d "$srcdir/compiler"; the
 AC_MSG_ERROR([GHC is required unless bootstrapping from .hc files.])
 fi;
 
+# This uses GHC, so put it after the "GHC is required" check above:
+FP_FIND_ROOT
+
 dnl ** Enable the construction of Win32 DLLs?
 dnl --------------------------------------------------------------
 dnl
@@ -928,6 +929,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