[project @ 2001-03-29 17:56:18 by qrczak]

[ghc-hetmet.git] / configure.in

diff --git a/configure.in b/configure.in
index 2b8d7c7..2a9bc24 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -204,10 +204,9 @@ i[[3456]]86-*-mingw32*)
        exeext='.exe'
        # We assume you're using mingw32 via the gcc that comes
        # with cygwin, and not the native port, so let's augment
-       # the gcc command-line used here with -mno-cygwin to
-       # arrange for good things to happen.
-       CFLAGS="-mno-cygwin $CFLAGS"
-       CPPFLAGS="-mno-cygwin $CPPFLAGS"
+       # the gcc command-line used here with -mno-cygwin -mwin32
+       # to arrange for good things to happen.
+       CFLAGS="-mno-cygwin -mwin32 $CFLAGS"
         ;;
 m68k-next-nextstep2)
         HostPlatform_CPP='m68k_next_nextstep2'
@@ -511,6 +510,11 @@ FPTOOLS_HAVE_GCC
 
 dnl ** figure out how to invoke cpp directly (gcc -E is no good)
 AC_PROG_CPP
+case $HostOS_CPP in
+mingw32)
+   CPP="$CPP -mno-cygwin -mwin32"
+   ;;
+esac
 
 dnl ** figure out how to do context diffs
 FPTOOLS_PROG_DIFF
@@ -578,7 +582,7 @@ AC_SUBST(CompressSuffix)
 
 dnl ** check for installed happy binary + version
 dnl    (don't do it if we're booting from .hc files though.)
-if (test "$BootingFromHc" = "NO"); then
+if test "$BootingFromHc" = "NO"; then
 FPTOOLS_HAPPY
 fi;