From 717e9390dffa504fc0a99c60bf1e47604cc92627 Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Fri, 30 Oct 2009 18:12:18 +0000
Subject: [PATCH] more configure adjustements related to pthreads

svn: r16483
---
 src/configure             | 7 +++++--
 src/mzscheme/configure.ac | 5 ++++-
 src/mzscheme/sconfig.h    | 4 ++--
 src/mzscheme/uconfig.h    | 3 +--
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/configure b/src/configure
index d04652e4a2..4a1a8833d1 100755
--- a/src/configure
+++ b/src/configure
@@ -5839,7 +5839,7 @@ case $OS in
     EXTRALIBS="-Wl,-brtl,-bE:\$(srcdir)/../mzscheme/include/mzscheme.exp"
     ;;
   FreeBSD)
-    LIBS="$LIBS -rdynamic"
+    LIBS="$LIBS -rdynamic -pthread"
     DYN_CFLAGS="-fPIC"
     ;;
   OpenBSD)
@@ -10705,7 +10705,10 @@ fi
 if test "${enable_pthread}" = "yes" ; then
   PREFLAGS="$PREFLAGS -D_THREAD_SAFE"
   X_EXTRA_LIBS="$X_EXTRA_LIBS -pthread"
-  MZOPTIONS="$MZOPTIONS -DASSUME_FIXED_STACK_SIZE -DFIXED_STACK_SIZE=1048576 -DDONT_ITIMER"
+  MZOPTIONS="$MZOPTIONS -DUSE_PTHREAD_INSTEAD_OF_ITIMER"
+  # Historically needed for FreeBSD, where the initial thread stack was
+  #  only 1MB when pthreads linked in:
+  # MZOPTIONS="$MZOPTIONS -DASSUME_FIXED_STACK_SIZE -DFIXED_STACK_SIZE=1048576"
   GC2OPTIONS="$GC2OPTIONS -DNO_GC_SIGNALS"
 fi
 
diff --git a/src/mzscheme/configure.ac b/src/mzscheme/configure.ac
index e90e62eb57..75c8083472 100644
--- a/src/mzscheme/configure.ac
+++ b/src/mzscheme/configure.ac
@@ -1135,7 +1135,10 @@ fi
 if test "${enable_pthread}" = "yes" ; then
   PREFLAGS="$PREFLAGS -D_THREAD_SAFE"
   X_EXTRA_LIBS="$X_EXTRA_LIBS -pthread"
-  MZOPTIONS="$MZOPTIONS -DASSUME_FIXED_STACK_SIZE -DFIXED_STACK_SIZE=1048576 -DDONT_ITIMER"
+  MZOPTIONS="$MZOPTIONS -DUSE_PTHREAD_INSTEAD_OF_ITIMER"
+  # Historically needed for FreeBSD, where the initial thread stack was
+  #  only 1MB when pthreads linked in:
+  # MZOPTIONS="$MZOPTIONS -DASSUME_FIXED_STACK_SIZE -DFIXED_STACK_SIZE=1048576"
   GC2OPTIONS="$GC2OPTIONS -DNO_GC_SIGNALS"
 fi
 
diff --git a/src/mzscheme/sconfig.h b/src/mzscheme/sconfig.h
index 1a95fa7d8d..7863f4d321 100644
--- a/src/mzscheme/sconfig.h
+++ b/src/mzscheme/sconfig.h
@@ -340,8 +340,8 @@
 # include "uconfig.h"
 # undef HAS_STANDARD_IOB
 
-#undef USE_ITIMER
-#define USE_PTHREAD_THREAD_TIMER
+# undef USE_ITIMER
+# define USE_PTHREAD_THREAD_TIMER
 
 # define HAS_BSD_IOB
 
diff --git a/src/mzscheme/uconfig.h b/src/mzscheme/uconfig.h
index 463f2ad6f8..20b0dbdffc 100644
--- a/src/mzscheme/uconfig.h
+++ b/src/mzscheme/uconfig.h
@@ -36,8 +36,7 @@
 
 #define USE_GETRUSAGE
 
-#if defined MZ_USE_PLACES
-# undef USE_ITIMER
+#if defined(MZ_USE_PLACES) || defined(USE_PTHREAD_INSTEAD_OF_ITIMER)
 # define USE_PTHREAD_THREAD_TIMER
 #else
 # define USE_ITIMER