X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=configure.in;h=af910e2e2c843dc5ed65c217a7ebe1c2f2bf334d;hb=3dfd7d76aa269a1a5a68427aeb7c93ae42948af6;hp=d7f637d98b5dc84cb72c23f42ec06973701e23b5;hpb=781ab03649067441ab2681fbb84b0dbd7c80b055;p=ghc-hetmet.git

diff --git a/configure.in b/configure.in
index d7f637d..af910e2 100644
--- a/configure.in
+++ b/configure.in
@@ -266,15 +266,15 @@ powerpc-ibm-aix*)
         HostVendor_CPP='ibm'
         HostOS_CPP='aix'
         ;;
-powerpc-apple-macosx*)
-      HostPlatform=powerpc-apple-macosx
-      TargetPlatform=powerpc-apple-macosx #hack
-      BuildPlatform=powerpc-apple-macosx #hack
-        HostPlatform_CPP='powerpc_apple_macosx'
-        HostArch_CPP='powerpc'
-        HostVendor_CPP='apple'
-        HostOS_CPP='macosx'
-        ;;
+powerpc-apple-darwin*)
+	HostPlatform=powerpc-apple-darwin
+	TargetPlatform=powerpc-apple-darwin #hack
+	BuildPlatform=powerpc-apple-darwin #hack
+	HostPlatform_CPP='powerpc_apple_darwin'
+	HostArch_CPP='powerpc'
+	HostVendor_CPP='apple'
+	HostOS_CPP='darwin'
+	;;
 sparc-sun-sunos4*)
 	HostPlatform=sparc-sun-sunos4
 	TargetPlatform=sparc-sun-sunos4 #hack
@@ -342,7 +342,7 @@ AC_SUBST(exeext)
 case $HostPlatform in
   i386-unknown-mingw32 | i386-unknown-cygwin32)
   	# get rid off /cygdrive/ prefix
-	hardtop=`echo ${hardtop} | sed -e 's%/cygdrive/\(.\)/%\1:/%g' `
+	hardtop=`echo ${hardtop} | sed -e 's%^/cygdrive/\(.\)/%\1:/%' `
   	hardtop_plat=`cygpath -w ${hardtop} | sed -e 's@\\\\@\\\\\\\\@g' `
 	;;
   *)
@@ -579,7 +579,6 @@ AC_DEFINE(HAVE_BIN_SH)
 dnl ** how to invoke `ar' and `ranlib'
 FPTOOLS_PROG_AR_AND_RANLIB
 
-
 dnl ** Check to see whether ln -s works
 AC_PROG_LN_S
 
@@ -629,6 +628,13 @@ fi
 AC_SUBST(CompressCmd)
 AC_SUBST(CompressSuffix)
 
+AC_ARG_ENABLE(src-tree-happy,
+[  --enable-src-tree-happy
+        Build and use source tree (fptools/happy) version of happy.
+],
+[UseSrcTreeHappy=YES],
+[UseSrcTreeHappy=NO]
+)
 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
@@ -760,6 +766,19 @@ dnl Int32 is a HACK for non-ISO C compilers
 FPTOOLS_CHECK_HTYPE(sig_atomic_t, Int32)
 FPTOOLS_CHECK_HTYPE(clock_t)
 FPTOOLS_CHECK_HTYPE(time_t)
+FPTOOLS_CHECK_HTYPE(dev_t, Word32)
+FPTOOLS_CHECK_HTYPE(ino_t)
+FPTOOLS_CHECK_HTYPE(mode_t)
+FPTOOLS_CHECK_HTYPE(off_t)
+FPTOOLS_CHECK_HTYPE(pid_t)
+FPTOOLS_CHECK_HTYPE(size_t)
+FPTOOLS_CHECK_HTYPE(gid_t)
+FPTOOLS_CHECK_HTYPE(uid_t)
+FPTOOLS_CHECK_HTYPE(cc_t)
+FPTOOLS_CHECK_HTYPE(speed_t)
+FPTOOLS_CHECK_HTYPE(tcflag_t)
+FPTOOLS_CHECK_HTYPE(nlink_t)
+FPTOOLS_CHECK_HTYPE(ssize_t)
 
 dnl ** Map OpenGL data types to Haskell types
 if test $GhcLibsWithHOpenGL = YES ; then
@@ -855,7 +874,7 @@ 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)
+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)
 
 dnl ** check whether this machine has gmp3 installed
 AC_CHECK_LIB(gmp,  __gmpz_fdiv_qr, HaveLibGmp=YES; LibGmp=gmp,
@@ -988,7 +1007,14 @@ dnl ** code before data?
 FPTOOLS_CODE_BEFORE_DATA
 
 dnl ** check for ld, and whether ld has -x option
-AC_PATH_PROG(LdCmd, ld)
+AC_PATH_PROG(LdCmdRaw, ld)
+case $HostOS_CPP in
+ mingw32) LdCmd=`cygpath -w ${LdCmdRaw} | sed -e 's@\\\\@/@g' `
+ 	   ;;
+ *) LdCmd=${LdCmdRaw}
+    ;;
+esac
+AC_SUBST(LdCmd)
 FPTOOLS_LD_X
 
 AC_OUTPUT(mk/config.mk, echo timestamp > mk/stamp-h )