X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=configure.in;h=13c01a9659f2732b220f1f7fd6625efa214709fb;hb=b301b6ecef42b3787c0b6bbf81ad3301c36331fc;hp=6e8d6c171b01d8f78f18978f389c9d12822c7e29;hpb=a08aa16ae39b5fc2f4541e9fd33009a5288ba0ae;p=ghc-hetmet.git

diff --git a/configure.in b/configure.in
index 6e8d6c1..13c01a9 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"]
 )
@@ -949,11 +953,20 @@ AC_CHECK_FUNCS(vsnprintf _vsnprintf)
 AC_CHECK_FUNCS(snprintf  _snprintf )  
 AC_CHECK_FUNCS(popen     _popen )  
 AC_CHECK_FUNCS(pclose    _pclose )  
+AC_CHECK_FUNCS(setenv unsetenv)
 
 
 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,
@@ -1264,22 +1277,28 @@ we_have_sigpoll
 ], AC_DEFINE(HAVE_SIGPOLL) haveSIGPOLL=yes, haveSIGPOLL=no)
 AC_MSG_RESULT([$haveSIGPOLL])
 
-AC_MSG_CHECKING(for _SC_GETGR_R_SIZE_MAX)
+AC_MSG_CHECKING([for _SC_GETGR_R_SIZE_MAX])
 AC_EGREP_CPP(we_have_that_sysconf_thing,
 [
 #include <unistd.h>
 #ifdef _SC_GETGR_R_SIZE_MAX
 we_have_that_sysconf_thing
 #endif
-], AC_MSG_RESULT(yes) AC_DEFINE(HAVE_SC_GETGR_R_SIZE_MAX), AC_MSG_RESULT(no))    
+],
+[AC_MSG_RESULT([yes])
+AC_DEFINE(HAVE_SC_GETGR_R_SIZE_MAX)],
+[AC_MSG_RESULT([no])])
 
-AC_MSG_CHECKING(for _SC_GETPW_R_SIZE_MAX)
+AC_MSG_CHECKING([for _SC_GETPW_R_SIZE_MAX])
 AC_EGREP_CPP(we_have_that_sysconf_thing,
 [
 #include <unistd.h>
 #ifdef _SC_GETPW_R_SIZE_MAX
 we_have_that_sysconf_thing
 #endif
-], AC_MSG_RESULT(yes) AC_DEFINE(HAVE_SC_GETPW_R_SIZE_MAX), AC_MSG_RESULT(no))    
+],
+[AC_MSG_RESULT([yes])
+AC_DEFINE(HAVE_SC_GETPW_R_SIZE_MAX)],
+[AC_MSG_RESULT([no])])
 
 AC_OUTPUT(mk/config.mk, echo timestamp > mk/stamp-h )