X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=configure.in;h=515855115a3324451ea753f259e1612bed8b978f;hb=3f140a80a123e047432b4e16e8be76bce92d3602;hp=9b4947f79aa5ecbf0654ac22487b9b16e087833c;hpb=afb29a3fcbc4fe82e0421bf17abed2069e57e6b5;p=ghc-hetmet.git

diff --git a/configure.in b/configure.in
index 9b4947f..5158551 100644
--- a/configure.in
+++ b/configure.in
@@ -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"
+   ;;
+esac
 
 dnl ** figure out how to do context diffs
 FPTOOLS_PROG_DIFF
@@ -842,12 +847,22 @@ else
 fi
 AC_SUBST(LibsReadline)
 
+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 --------------------------------------------------