X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=configure.in;h=f61558e4c1361b74bcda4b8b3b10d04719916e1f;hb=ac03720e6db47c882418a2237770ad52ef97ecc4;hp=f0376d9f3638f07a22aa16150b6f54cdd4868121;hpb=018a827a59413719ff73cf296d3f3f943b71a3b3;p=ghc-hetmet.git

diff --git a/configure.in b/configure.in
index f0376d9..f61558e 100644
--- a/configure.in
+++ b/configure.in
@@ -44,7 +44,7 @@ hardtop=`echo $hardtop | sed 's|^/tmp_mnt.*\(/local/.*\)$|\1|' | sed 's|^/tmp_mn
 
 echo ''
 echo "*** The top of your build tree is: $hardtop"
-AC_SUBST(hardtop)
+# subst of hardtop is done below after we've computed hardtop_plat.
 
 dnl--------------------------------------------------------------------
 dnl * Choose host(/target/build) platform
@@ -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
@@ -336,6 +336,22 @@ dnl AC_SUBST(TargetVendor_CPP)
 
 AC_SUBST(exeext)
 
+#
+# The native format for 'hardtop' (i.e., right kind of slashes on a Win32 box).
+# (but with b-slashes being escaped).
+case $HostPlatform in
+  i386-unknown-mingw32 | i386-unknown-cygwin32)
+  	# get rid off /cygdrive/ prefix
+	hardtop=`echo ${hardtop} | sed -e 's%^/cygdrive/\(.\)/%\1:/%' `
+  	hardtop_plat=`cygpath -w ${hardtop} | sed -e 's@\\\\@\\\\\\\\@g' `
+	;;
+  *)
+  	hardtop_plat=${hardtop}
+	;;
+esac
+AC_SUBST(hardtop)
+AC_SUBST(hardtop_plat)
+
 dnl --------------------------------------------------------------
 dnl * Project specific configuration options
 dnl --------------------------------------------------------------
@@ -346,17 +362,19 @@ dnl use either is considered a Feature.
 
 dnl ** What command to use to compile compiler sources ?
 dnl --------------------------------------------------------------
-if test "$GHC" = ""; then
-  AC_PATH_PROG(GHC,ghc)
-fi
 
 AC_ARG_WITH(ghc,
 [  --with-ghc=<haskell compiler>
         Use a command different from 'ghc' to compile GHC-specific Haskell code
 	    (including GHC itself).
 ],
-[WithGhc="$withval"],
-[WithGhc=$GHC]
+[ WithGhc="$withval" ],
+[ 
+  if test "$GHC" = ""; then
+    AC_PATH_PROG(GHC,ghc)
+  fi
+  WithGhc=$GHC
+]
 )
 AC_SUBST(WithGhc)
 
@@ -424,6 +442,17 @@ fi;
 fi;
 
 
+dnl ** Enable multi-thread friendly RTS?
+dnl --------------------------------------------------------------
+AC_ARG_ENABLE(threaded-rts,
+[  --enable-threaded-rts
+        Support better interop with OS threads.
+],
+[ThreadedRts=YES],
+[ThreadedRts=NO]
+)
+AC_SUBST(ThreadedRts)
+
 dnl ** Enable the construction of Win32 DLLs?
 dnl --------------------------------------------------------------
 AC_ARG_ENABLE(win32-dlls,
@@ -527,20 +556,22 @@ FPTOOLS_HAVE_GCC
 dnl ** figure out how to invoke cpp directly (gcc -E is no good)
 AC_PROG_CPP
 
-dnl ** does the C compiler support the following options?
-FPTOOLS_CC_FLAG(-mwin32,CC_SUPPORTS_MWIN32)
-FPTOOLS_CC_FLAG(-mno-cygwin,CC_SUPPORTS_MNO_CYGWIN)
+dnl ** Without optimization some INLINE trickery fails for GHCi
+SRC_CC_OPTS="-O"
 
-EXTRA_CC_OPTS="$CC_SUPPORTS_MNO_CYGWIN $CC_SUPPORTS_MWIN32"
-SRC_CC_OPTS="-O $EXTRA_CC_OPTS"
-CPPFLAGS="$EXTRA_CC_OPTS $CPPFLAGS"
+dnl ** Try to add -mno-cygwin to the C compiler options for mingw32 targets
+if test x"$TargetOS_CPP" = x"mingw32"; then
+  FPTOOLS_CC_FLAG(-mno-cygwin,CC_SUPPORTS_MNO_CYGWIN)
+  SRC_CC_OPTS="$CC_SUPPORTS_MNO_CYGWIN $SRC_CC_OPTS"
+  CPPFLAGS="$CC_SUPPORTS_MNO_CYGWIN $CPPFLAGS"
+fi
 AC_SUBST(SRC_CC_OPTS)
 
 dnl ** figure out how to do context diffs
 FPTOOLS_PROG_DIFF
 
 dnl ** Find find command (for Win32's benefit)
-AC_PATH_PROG(FindCmd, find)
+FPTOOLS_FIND_FIND
 
 dnl ** look for a decent parser generator (bison preferred)
 dnl (FPTOOLS_PROG_YACCY is AC_PROG_YACC, but with some extra testing 
@@ -561,7 +592,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
 
@@ -589,6 +619,9 @@ if test -z "$Catalog"; then
   AC_MSG_RESULT([Warning: You will not be able to build the documentation.])
 fi
 case $Catalog in
+   yes) # assume it is provided by other means (e.g., SGML_CATALOG_FILES env var).
+        Catalog=
+   	;;
    glafp*) 
 	case $HostOS_CPP in
 	   mingw32)
@@ -611,6 +644,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
@@ -629,7 +669,7 @@ dnl ** check for full ANSI header (.h) files
 AC_HEADER_STDC
 
 dnl ** check for specific header (.h) files that we are interested in
-AC_CHECK_HEADERS(Files.h arpa/inet.h assert.h console.h ctype.h dirent.h errno.h fcntl.h float.h ftw.h grp.h ieee754.h inttypes.h limits.h malloc.h memory.h nlist.h pascal.h pwd.h sgtty.h siginfo.h signal.h stat.h stdint.h stdlib.h stdarg.h string.h sys/fault.h sys/file.h sys/ioctl.h sys/limits.h sys/mman.h sys/param.h sys/procfs.h sys/resource.h sys/signal.h sys/socket.h netdb.h netinet/in.h netinet/tcp.h sys/stat.h sys/syscall.h sys/time.h sys/timeb.h sys/timers.h sys/times.h sys/types.h sys/un.h sys/utsname.h sys/vadvise.h sys/wait.h termio.h termios.h time.h types.h unistd.h utime.h values.h vfork.h bfd.h winsock.h)
+AC_CHECK_HEADERS(Files.h arpa/inet.h assert.h console.h ctype.h dirent.h errno.h fcntl.h float.h ftw.h grp.h ieee754.h inttypes.h limits.h malloc.h memory.h nlist.h pascal.h pwd.h sgtty.h siginfo.h signal.h stat.h stdint.h stdlib.h stddef.h stdarg.h string.h sys/fault.h sys/file.h sys/ioctl.h sys/limits.h sys/mman.h sys/param.h sys/procfs.h sys/resource.h sys/signal.h sys/socket.h netdb.h netinet/in.h netinet/tcp.h sys/stat.h sys/syscall.h sys/time.h sys/timeb.h sys/timers.h sys/times.h sys/types.h sys/un.h sys/utsname.h sys/vadvise.h sys/wait.h termio.h termios.h time.h types.h unistd.h utime.h values.h vfork.h bfd.h winsock.h pthread.h)
 
 AC_CHECK_HEADER(readline/readline.h, HaveReadlineReadlineH=YES, HaveReadlineReadlineH=NO)
 AC_CHECK_HEADER(readline/history.h, HaveReadlineHistoryH=YES, HaveReadlineHistoryH=NO)
@@ -664,6 +704,11 @@ AC_CHECK_HEADER(alloc.h,AC_CHECK_FUNCS(farcalloc))
 dnl ** check for valloc (in sunos, solaris, mips, amiga, next, minix, ultrix)
 AC_CHECK_HEADER(malloc.h,AC_CHECK_FUNCS(valloc))
 
+dnl ** check for POSIX regex
+HavePosixRegex=NO
+AC_CHECK_HEADER(regex.h,AC_CHECK_FUNC(regcomp, HavePosixRegex=YES))
+AC_SUBST(HavePosixRegex)
+
 dnl ** how do we get a timezone name, and UTC offset ?
 AC_STRUCT_TIMEZONE
 
@@ -742,6 +787,18 @@ 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(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
@@ -761,8 +818,6 @@ FPTOOLS_CHECK_HTYPE(GLdouble)
 FPTOOLS_CHECK_HTYPE(GLclampd)
 fi
 
-FPTOOLS_CHECK_CCONSTS(E2BIG EACCES EADDRINUSE EADDRNOTAVAIL EADV EAFNOSUPPORT EAGAIN EALREADY EBADF EBADMSG EBADRPC EBUSY ECHILD ECOMM ECONNABORTED ECONNREFUSED ECONNRESET EDEADLK EDESTADDRREQ EDIRTY EDOM EDQUOT EEXIST EFAULT EFBIG EFTYPE EHOSTDOWN EHOSTUNREACH EIDRM EILSEQ EINPROGRESS EINTR EINVAL EIO EISCONN EISDIR ELOOP EMFILE EMLINK EMSGSIZE EMULTIHOP ENAMETOOLONG ENETDOWN ENETRESET ENETUNREACH ENFILE ENOBUFS ENODATA ENODEV ENOENT ENOEXEC ENOLCK ENOLINK ENOMEM ENOMSG ENONET ENOPROTOOPT ENOSPC ENOSR ENOSTR ENOSYS ENOTBLK ENOTCONN ENOTDIR ENOTEMPTY ENOTSOCK ENOTTY ENXIO EOPNOTSUPP EPERM EPFNOSUPPORT EPIPE EPROCLIM EPROCUNAVAIL EPROGMISMATCH EPROGUNAVAIL EPROTO EPROTONOSUPPORT EPROTOTYPE ERANGE EREMCHG EREMOTE EROFS ERPCMISMATCH ERREMOTE ESHUTDOWN ESOCKTNOSUPPORT ESPIPE ESRCH ESRMNT ESTALE ETIME ETIMEDOUT ETOOMANYREFS ETXTBSY EUSERS EWOULDBLOCK EXDEV)
-
 dnl ** can we open files in binary mode?
 FPTOOLS_O_BINARY
 
@@ -839,7 +894,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,
@@ -900,10 +955,14 @@ mingw32)  ;;
 *) AC_PATH_XTRA() ;;
 esac
 
+FPTOOLS_HAVE_OPENGL
+
 dnl ################################################################
 dnl Check for libraries
 dnl ################################################################
 
+dnl ** check for libdl & RTLD_NEXT
+
 AC_CHECK_LIB(dl, dlopen, 
 	[HaveLibDL=YES
 	 AC_DEFINE(HAVE_LIBDL)
@@ -912,6 +971,42 @@ AC_CHECK_LIB(dl, dlopen,
 AC_CHECK_FUNCS(dlopen)
 AC_SUBST(HaveLibDL)
 
+dnl ** sometimes RTLD_NEXT is hidden in #ifdefs we really don't wan to set
+AC_MSG_CHECKING(for RTLD_NEXT from dlfcn.h)
+AC_EGREP_CPP(yes,
+[
+ #include <dlfcn.h>
+ #ifdef RTLD_NEXT
+        yes
+ #endif
+], [
+  AC_MSG_RESULT(yes)
+  AC_DEFINE(HAVE_RTLDNEXT)
+  HaveRtldNext=YES
+], [
+  AC_MSG_RESULT(no)
+  HaveRtldNext=NO
+  ])    
+AC_SUBST(HaveRtldNext)
+
+dnl ** RTLD_LOCAL isn't available on cygwin
+AC_MSG_CHECKING(for RTLD_LOCAL from dlfcn.h)
+AC_EGREP_CPP(yes,
+[
+ #include <dlfcn.h>
+ #ifdef RTLD_LOCAL
+        yes
+ #endif
+], [
+  AC_MSG_RESULT(yes)
+  AC_DEFINE(HAVE_RTLDLOCAL)
+  HaveRtldLocal=YES
+], [
+  AC_MSG_RESULT(no)
+  HaveRtldLocal=NO
+  ])    
+AC_SUBST(HaveRtldLocal)
+
 FPTOOLS_CHECK_LIB_NOWARN(m, atan)
 
 dnl --------------------------------------------------
@@ -971,5 +1066,15 @@ FPTOOLS_END_DATA_SECTION
 dnl ** code before data?
 FPTOOLS_CODE_BEFORE_DATA
 
+dnl ** check for ld, and whether ld has -x option
+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 )