X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=configure.in;h=36ccd58ae6aa813fd8ab891c9aef9fe8cc87a080;hb=90cdb78726795320190f5dac8e82c4f0a068014a;hp=7bb7ab9324e69a9205c9de303b389044908e34d2;hpb=e1cb536778a88699ab396a1faaa1125351f28fb4;p=ghc-hetmet.git

diff --git a/configure.in b/configure.in
index 7bb7ab9..36ccd58 100644
--- a/configure.in
+++ b/configure.in
@@ -442,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,
@@ -546,10 +557,9 @@ 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)
 
-EXTRA_CC_OPTS="$CC_SUPPORTS_MNO_CYGWIN $CC_SUPPORTS_MWIN32"
+EXTRA_CC_OPTS="$CC_SUPPORTS_MNO_CYGWIN"
 SRC_CC_OPTS="-O $EXTRA_CC_OPTS"
 CPPFLAGS="$EXTRA_CC_OPTS $CPPFLAGS"
 AC_SUBST(SRC_CC_OPTS)
@@ -579,7 +589,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
 
@@ -607,6 +616,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)
@@ -654,7 +666,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 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)
+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)
@@ -689,6 +701,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
 
@@ -936,6 +953,8 @@ mingw32)  ;;
 *) AC_PATH_XTRA() ;;
 esac
 
+FPTOOLS_HAVE_OPENGL
+
 dnl ################################################################
 dnl Check for libraries
 dnl ################################################################
@@ -1008,7 +1027,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 )