X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=configure.ac;h=e677ad89e7fe347370b555674deaa349ec7dfee3;hb=4267e8dea62ca55a6dd623b09e81a9e70536bcca;hp=31e827b21ff03dc4b3035e478e4c158e2134f62b;hpb=eceaec37643c089f03677faa86481b03c0fd784f;p=ghc-hetmet.git

diff --git a/configure.ac b/configure.ac
index 31e827b..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,
@@ -683,13 +691,12 @@ AC_ARG_WITH(gcc,
 [AC_HELP_STRING([--with-gcc=ARG],
         [Use ARG as the path to GCC  [default=autodetect]])],
 [WhatGccIsCalled="$withval"
- if test "x$HostPlatform" = "xi386-unknown-mingw32"
-    then
-       if test "${OSTYPE}" != "msys"
-         then
-         # Canonicalise to <drive>:/path/to/gcc
-         withval=`cygpath -m ${withval}`
-       fi
+ if test "x$HostPlatform"  = "xi386-unknown-mingw32" && \
+    test "${OSTYPE}"      != "msys"                  && \
+    test "${withval}"     != ""
+ then
+     # Canonicalise to <drive>:/path/to/gcc
+     withval=`cygpath -m ${withval}`
  fi;
  CC="$withval"
  export CC
@@ -703,13 +710,12 @@ dnl --------------------------------------------------------------
 AC_ARG_WITH(ld,
 [AC_HELP_STRING([--with-ld=ARG],
         [Use ARG as the path to LD  [default=autodetect]])],
-[if test "x$HostPlatform" = "xi386-unknown-mingw32"
-    then
-       if test "${OSTYPE}" != "msys"
-         then
-         # Canonicalise to <drive>:/path/to/ld
-         withval=`cygpath -m ${withval}`
-       fi
+[if test "x$HostPlatform"  = "xi386-unknown-mingw32" && \
+    test "${OSTYPE}"      != "msys"                  && \
+    test "${withval}"     != ""
+ then
+     # Canonicalise to <drive>:/path/to/ld
+     withval=`cygpath -m ${withval}`
  fi;
  LD=$withval
  FP_PROG_LD([$LD])
@@ -801,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,
@@ -911,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
@@ -956,13 +943,12 @@ 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 -m ${HSCOLOUR}`
-       fi
+if test "x$HostPlatform"  = "xi386-unknown-mingw32" && \
+   test "${OSTYPE}"      != "msys"                  && \
+   test "${HSCOLOUR}"    != ""
+then
+    # Canonicalise to <drive>:/path/to/gcc
+    HSCOLOUR=`cygpath -m ${HSCOLOUR}`
 fi
 
 dnl ** check for DocBook toolchain