X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=aclocal.m4;h=8593b897888fe4512441b75bba740062cdebf1dd;hp=f0ad4cf4c30d9572595a5720795e2439273322ba;hb=4cc1ed3b25dd2c565341665b3b4175dfdbc4328f;hpb=9a17dfd7f10952762cd8aff1ef4dbd0ae6daec37

diff --git a/aclocal.m4 b/aclocal.m4
index f0ad4cf..8593b89 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -268,6 +268,16 @@ dnl for a happy source tree and point the build system at that instead.
 dnl
 AC_DEFUN([FPTOOLS_HAPPY],
 [AC_PATH_PROG(HappyCmd,happy,)
+# Happy is passed to Cabal, so we need a native path
+if test "x$HostPlatform"  = "xi386-unknown-mingw32" && \
+   test "${OSTYPE}"      != "msys"                  && \
+   test "${HappyCmd}"    != ""
+then
+    # Canonicalise to <drive>:/path/to/gcc
+    HappyCmd=`cygpath -m ${HappyCmd}`
+    AC_MSG_NOTICE([normalized happy command to $HappyCmd])
+fi
+
 AC_CACHE_CHECK([for version of happy], fptools_cv_happy_version,
 changequote(, )dnl
 [if test x"$HappyCmd" != x; then
@@ -297,6 +307,15 @@ dnl Darn, I forgot to make Haddock print out its version number when
 dnl invoked with -v.  We could try generating some HTML and grepping
 dnl through that to find the version number, but I think we'll make
 dnl do without it for now.
+# Haddock is passed to Cabal, so we need a native path
+if test "x$HostPlatform"  = "xi386-unknown-mingw32" && \
+   test "${OSTYPE}"      != "msys"                  && \
+   test "${HaddockCmd}"  != ""
+then
+    # Canonicalise to <drive>:/path/to/gcc
+    HaddockCmd=`cygpath -m ${HaddockCmd}`
+    AC_MSG_NOTICE([normalized haddock command to $HaddockCmd])
+fi
 ])
 
 dnl