X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=configure.ac;h=e677ad89e7fe347370b555674deaa349ec7dfee3;hb=9f7dc57027046a350b57f99059f18819c2cf2ae2;hp=f22ffbe5714711cedfac363a2957f4d6d260aeed;hpb=cf071813ab8d7edd8ca92a2191812a96e9cb20f0;p=ghc-hetmet.git

diff --git a/configure.ac b/configure.ac
index f22ffbe..e677ad8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -644,6 +644,14 @@ AC_ARG_WITH([ghc],
     AC_PATH_PROG([GHC], [ghc])
   fi
   WithGhc="$GHC"])
+# GHC is passed to Cabal, so we need a native path
+if test "x$HostPlatform"  = "xi386-unknown-mingw32" && \
+   test "${OSTYPE}"      != "msys"                  && \
+   test "${WithGhc}"     != ""
+then
+    # Canonicalise to <drive>:/path/to/ghc
+    WithGhc=`cygpath -m ${WithGhc}`
+fi
 AC_SUBST([WithGhc])
 
 AC_ARG_WITH(hc,
@@ -799,21 +807,6 @@ dnl if test x"$EnableWin32DLLs" = "xYES" ; then
 dnl  AC_DEFINE(HAVE_WIN32_DLL_SUPPORT)
 dnl fi
 
-dnl ** Enable the building of the ObjectIO?
-dnl --------------------------------------------------------------
-AC_ARG_ENABLE(objectio,
-[AC_HELP_STRING([--enable-objectio],
-[Build ObjectIO, a portable GUI library for Haskell. [default=no]])],
-[ if test x"$enableval" = x"yes"; then
-        GhcLibsWithObjectIO=YES
-  else
-        GhcLibsWithObjectIO=NO
-  fi
-],
-[GhcLibsWithObjectIO=NO]
-)
-AC_SUBST(GhcLibsWithObjectIO)
-
 dnl ** .NET interop support?
 dnl --------------------------------------------------------------
 AC_ARG_ENABLE(dotnet,
@@ -909,10 +902,6 @@ AC_PROG_CPP
 dnl ** Without optimization some INLINE trickery fails for GHCi
 SRC_CC_OPTS="-O"
 
-dnl ** Try to add -mno-cygwin to the C compiler options
-FP_CHECK_FLAG([-mno-cygwin], [
-SRC_CC_OPTS="-mno-cygwin $SRC_CC_OPTS"
-CPPFLAGS="-mno-cygwin $CPPFLAGS"])
 AC_SUBST(SRC_CC_OPTS)
 
 dnl ** figure out how to do context diffs