X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=configure.in;h=e00ce22540c629577869db731f93266361f89432;hb=a169003f1e0d92cb1e77abbad1cac52aed442a58;hp=2b8d7c78900b452b2d8443e935fe602c891c02ab;hpb=984b949e3a84ef9f6455640fb3d2b69b7937bd6c;p=ghc-hetmet.git

diff --git a/configure.in b/configure.in
index 2b8d7c7..e00ce22 100644
--- 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;
 
@@ -843,6 +847,14 @@ else
 fi
 AC_SUBST(LibsReadline)
 
+if test "$HaveLibReadline"; then
+  AC_CHECK_LIB(readline, rl_erase_empty_line,
+    [AC_DEFINE(HAVE_READLINE_4, 1)],
+    [AC_DEFINE(HAVE_READLINE_4, 0)])
+else
+  AC_DEFINE(HAVE_READLINE_4, 0)
+fi
+
 dnl ** check for math library
 FPTOOLS_CHECK_LIBM()
 AC_SUBST(LIBM)