X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=configure.in;h=e00ce22540c629577869db731f93266361f89432;hb=84b502f0d99b597af4d37791021f4032ca8aef0e;hp=7214401148f6655d3090d7dff51acbe9b939f11d;hpb=9cad56b2f576fec272c3613612ee2749cc0d0ec0;p=ghc-hetmet.git

diff --git a/configure.in b/configure.in
index 7214401..e00ce22 100644
--- a/configure.in
+++ b/configure.in
@@ -204,9 +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"
+	# 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'
@@ -355,15 +355,6 @@ if test "$GHC" = ""; then
   AC_PATH_PROG(GHC,ghc)
 fi
 
-AC_ARG_WITH(hc,
-[  --with-hc=<haskell compiler>
-        Use a command different from 'ghc' to compile generic Haskell code.
-],
-[WithHc="$withval"],
-[WithHc=$GHC]
-)
-AC_SUBST(WithHc)
-
 AC_ARG_WITH(ghc,
 [  --with-ghc=<haskell compiler>
         Use a command different from 'ghc' to compile GHC-specific Haskell code
@@ -374,6 +365,15 @@ AC_ARG_WITH(ghc,
 )
 AC_SUBST(WithGhc)
 
+AC_ARG_WITH(hc,
+[  --with-hc=<haskell compiler>
+        Use a command different from 'ghc' to compile generic Haskell code.
+],
+[WithHc="$withval"],
+[WithHc=$WithGhc]
+)
+AC_SUBST(WithHc)
+
 if test "$WithGhc" != ""; then
   FPTOOLS_GHC_VERSION([GhcVersion], [GhcMajVersion], [GhcMinVersion], [GhcPatchLevel])dnl
   AC_SUBST(GhcVersion)dnl
@@ -510,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
@@ -577,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;
 
@@ -842,12 +847,30 @@ 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)
+
 dnl ################################################################
 dnl Check for libraries
 dnl ################################################################
 
-FPTOOLS_CHECK_LIB_NOWARN(dl, dlopen)
-FPTOOLS_CHECK_LIB_NOWARN(dld, shl_load)
+AC_CHECK_LIB(dl, dlopen, 
+	[HaveLibDL=YES
+	 AC_DEFINE(HAVE_LIBDL)
+	 LIBS="$LIBS -ldl"], 
+	[HaveLibDL=NO])
+AC_CHECK_FUNCS(dlopen)
+AC_SUBST(HaveLibDL)
+
 FPTOOLS_CHECK_LIB_NOWARN(m, atan)
 
 dnl --------------------------------------------------
@@ -906,10 +929,3 @@ dnl ** code before data?
 FPTOOLS_CODE_BEFORE_DATA
 
 AC_OUTPUT(mk/config.mk, echo timestamp > mk/stamp-h )
-
-echo ''
-echo '************************************************'
-echo '*** NOW DO: gmake boot followed by gmake all'
-echo '***         (where gmake == GNU make)'
-echo '************************************************'
-exit 0