X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=configure.in;h=d298e50cbb13f3d9c50249f88189f826b7581740;hb=d34cca401fa00c7ebbf2085bf5490baf4fa5c0d3;hp=ce91af44b09165071dc9722855b51ab0349cdf30;hpb=d3944fcec5177e08799b122be4c2b8435f1b0e93;p=ghc-hetmet.git

diff --git a/configure.in b/configure.in
index ce91af4..d298e50 100644
--- a/configure.in
+++ b/configure.in
@@ -432,6 +432,10 @@ AC_ARG_WITH(gcc,
         Use a different command instead of 'gcc' for the GNU C compiler.
 ],
 [WhatGccIsCalled="$withval"
+ if test "x$HostPlatform" = "xi386-unknown-mingw32"; then
+    # Canonicalise to <drive>:/path/to/gcc
+    withval=`cygpath -w ${withval} | sed -e 's@\\\\@/@g' `
+ fi;
  CC="$withval"],
 [WhatGccIsCalled="gcc"]
 )
@@ -670,6 +674,19 @@ fi
 AC_SUBST(CompressCmd)
 AC_SUBST(CompressSuffix)
 
+dnl ** check for ghc-pkg command
+AC_PATH_PROG(GhcPkgCmd,ghc-pkg)
+
+AC_ARG_WITH(greencard,
+[  --with-greencard=<greencard compiler>
+        Use a command different from 'green-card' to compile GreenCard files
+],
+[
+GreencardCmd=$withval;
+FPTOOLS_GREENCARD(3.00)
+]
+)
+
 AC_ARG_ENABLE(src-tree-happy,
 [  --enable-src-tree-happy
         Build and use source tree (fptools/happy) version of happy.
@@ -841,6 +858,7 @@ FPTOOLS_CHECK_HTYPE(tcflag_t)
 FPTOOLS_CHECK_HTYPE(blkcnt_t)
 FPTOOLS_CHECK_HTYPE(nlink_t)
 FPTOOLS_CHECK_HTYPE(ssize_t)
+FPTOOLS_CHECK_HTYPE(rlim_t)
 
 dnl ** Map OpenGL data types to Haskell types
 if test $GhcLibsWithHOpenGL = YES ; then
@@ -940,6 +958,14 @@ AC_CHECK_FUNCS(pclose    _pclose )
 dnl ** check for specific library functions that we are interested in
 AC_CHECK_FUNCS(access ftime getclock getpagesize getrusage gettimeofday mktime mprotect readlink setitimer stat lstat symlink sysconf timelocal times vadvise vfork localtime_r gmtime_r readdir_r getgrgid_r getgrnam_r getpwuid_r getpwnam_r)
 
+dnl ** Solaris2 needs additionl flag for getpw*_r()
+case "$TargetPlatform" in
+  *-solaris2*)
+    unix_SRC_HSC2HS_OPTS="-D_POSIX_PTHREAD_SEMANTICS"
+    AC_SUBST(unix_SRC_HSC2HS_OPTS)
+  ;;
+esac
+
 dnl ** check whether this machine has gmp3 installed
 AC_CHECK_LIB(gmp,  __gmpz_fdiv_qr, HaveLibGmp=YES; LibGmp=gmp,
   AC_CHECK_LIB(gmp3, __gmpz_fdiv_qr,  HaveLibGmp=YES; LibGmp=gmp3,