Thread support is turned on my default now. To disable building

threads use --without-threads.  No extra tests of thread/compiler
combinations have been added.

--with(out)-thread and --with(out)-threads are completely
interchangeable.

--with-threads still supports the =DIRECTORY option for specifying
where to find thread libraries.

config.h.in

@@ -285,6 +285,9 @@
 /* Define if you have the fork function.  */
 #undef HAVE_FORK
 
+/* Define if you have the forkpty function.  */
+#undef HAVE_FORKPTY
+
 /* Define if you have the fpathconf function.  */
 #undef HAVE_FPATHCONF
 
@@ -366,6 +369,9 @@
 /* Define if you have the nice function.  */
 #undef HAVE_NICE
 
+/* Define if you have the openpty function.  */
+#undef HAVE_OPENPTY
+
 /* Define if you have the pathconf function.  */
 #undef HAVE_PATHCONF
 
@@ -483,6 +489,9 @@
 /* Define if you have the <fcntl.h> header file.  */
 #undef HAVE_FCNTL_H
 
+/* Define if you have the <libutil.h> header file.  */
+#undef HAVE_LIBUTIL_H
+
 /* Define if you have the <limits.h> header file.  */
 #undef HAVE_LIMITS_H
 
@@ -498,6 +507,9 @@
 /* Define if you have the <pthread.h> header file.  */
 #undef HAVE_PTHREAD_H
 
+/* Define if you have the <pty.h> header file.  */
+#undef HAVE_PTY_H
+
 /* Define if you have the <signal.h> header file.  */
 #undef HAVE_SIGNAL_H
 

configure.in

@@ -33,9 +33,9 @@ if test -f /usr/lib/NextStep/software_version -o -f /System/Library/CoreServices
 fi
 
 AC_ARG_WITH(next-framework,
-[--with-next-framework     Build (OpenStep|Rhapsody|MacOS10) framework],,)
+[  --with-next-framework           Build (OpenStep|Rhapsody|MacOSX) framework],,)
 AC_ARG_WITH(dyld,
-[--with-dyld               Use (OpenStep|Rhapsody|MacOS10) dynamic linker],,)
+[  --with-dyld                     Use (OpenStep|Rhapsody|MacOSX) dynamic linker],,)
 
 # Set name for machine-dependent library files
 AC_SUBST(MACHDEP)
@@ -612,7 +612,8 @@ AC_CHECK_LIB(net, socket, [LIBS="-lnet $LIBS"], [], $LIBS) # BeOS
 esac
 
 AC_MSG_CHECKING(for --with-libs)
-AC_ARG_WITH(libs, [--with-libs='lib1 ...'    link against additional libs], [
+AC_ARG_WITH(libs,
+[  --with-libs='lib1 ...'          link against additional libs], [
 AC_MSG_RESULT($withval)
 LIBS="$withval $LIBS"
 ], AC_MSG_RESULT(no))
@@ -625,13 +626,13 @@ AC_ERROR(--with(out)-readline is obsolete, edit Modules/Setup instead)],
 [AC_MSG_RESULT(not specified.)])
 
 AC_SUBST(USE_THREAD_MODULE)
-USE_THREAD_MODULE="#"
+USE_THREAD_MODULE=""
 
 AC_MSG_CHECKING(for --with-dec-threads)
 AC_SUBST(LDLAST)
 AC_ARG_WITH(dec-threads,
-[--with-dec-threads        use DEC Alpha/OSF1 thread-safe libraries],
-[AC_MSG_RESULT($withval)
+[  --with-dec-threads              use DEC Alpha/OSF1 thread-safe libraries], [
+AC_MSG_RESULT($withval)
 LDLAST=-threads
 if test "${with_thread+set}" != set; then
    with_thread="$withval";
@@ -639,17 +640,24 @@ fi],
 AC_MSG_RESULT(no))
 
 AC_MSG_CHECKING(for --with-threads)
-AC_ARG_WITH(threads, [--with-threads            alias for --with-thread],
-[AC_MSG_RESULT($withval)
-if test "${with_thread+set}" != set; then
-   with_thread="$withval";
-fi],
-AC_MSG_RESULT(no))
+AC_ARG_WITH(threads,
+[  --with(out)-threads[=DIRECTORY] disable/enable thread support])
 
-AC_MSG_CHECKING(for --with-thread)
-AC_ARG_WITH(thread, [--with-thread[=DIRECTORY] make interpreter thread-safe], [
-USE_THREAD_MODULE=
-AC_MSG_RESULT($withval)
+# --with-thread is deprecated, but check for it anyway
+AC_ARG_WITH(thread,,[with_threads=$with_thread])
+
+if test -z "$with_threads"
+then with_threads="yes"
+fi
+AC_MSG_RESULT($with_threads)
+
+if test "$with_threads" = "no"
+then
+    USE_THREAD_MODULE="#"
+else
+    if test -d "$with_threads"
+    then LDFLAGS="$LDFLAGS -L$with_threads"
+    fi
     if test -d "$withval"
     then LDFLAGS="$LDFLAGS -L$withval"
     fi
@@ -695,14 +703,15 @@ LIBOBJS="$LIBOBJS thread.o"])
     AC_CHECK_LIB(thread, thr_create, [AC_DEFINE(WITH_THREAD)
     LIBS="$LIBS -lthread"
     LIBOBJS="$LIBOBJS thread.o"])
-], AC_MSG_RESULT(no))
+fi
 
 # -I${DLINCLDIR} is added to the compile rule for importdl.o
 AC_SUBST(DLINCLDIR)
 DLINCLDIR=/
 
 AC_MSG_CHECKING(for --with-sgi-dl)
-AC_ARG_WITH(sgi-dl, [--with-sgi-dl=DIRECTORY   IRIX 4 dynamic linking], [
+AC_ARG_WITH(sgi-dl,
+[  --with-sgi-dl=DIRECTORY         IRIX 4 dynamic linking], [
 AC_MSG_RESULT($withval)
 AC_DEFINE(WITH_SGI_DL)
 DYNLOADFILE="dynload_dl.o"
@@ -958,7 +967,8 @@ AC_CHECK_LIB(ieee, __fpu_control)
 
 # Check for --with-fpectl
 AC_MSG_CHECKING(for --with-fpectl)
-AC_ARG_WITH(fpectl, [--with-fpectl             enable SIGFPE catching], [
+AC_ARG_WITH(fpectl,
+[  --with-fpectl                   enable SIGFPE catching], [
 if test "$withval" != no
 then AC_DEFINE(WANT_SIGFPE_HANDLER) AC_MSG_RESULT(yes)
 else AC_MSG_RESULT(no)