Ready for 1.6a1. Reordered the defines to be in line with config.h.in again, so tracking the new defines will be easier in future.
diff --git a/Mac/Include/config.h b/Mac/Include/config.h
index e1ab9ab..5b6fa0a 100644
--- a/Mac/Include/config.h
+++ b/Mac/Include/config.h
@@ -23,9 +23,7 @@
 ******************************************************************/
 
 /* config.h for Macintosh.
-   Most recently tested with CodeWarrior C (define: __MWERKS__),
-   but there are some provisions for Think C (define: THINK_C),
-   Apple C for MPW (define: applec), or Symantec C for MPW (define: __SC__).
+   Valid only for CodeWarrior.
    There's no point in giving exact version numbers of the compilers
    since we don't update this file as each compiler comes out;
    with CodeWarrior, we generally use the most recent version.
@@ -33,160 +31,148 @@
 
 #define USE_STACKCHECK
 
-#ifdef applec
-#define MPW
-#endif
-
 /* Define if on Macintosh (THINK_C, MPW or __MWERKS__ should also be defined) */
 #ifndef macintosh
 #define macintosh
 #endif
 
-#define SIZEOF_INT 4
-#define SIZEOF_LONG 4
-#define SIZEOF_VOID_P 4
-#define HAVE_LONG_LONG 1
-
+/* Define if you have the fopenRF function. */
 #ifdef THINK_C
 #define HAVE_FOPENRF
 #endif
 
-#ifdef __MWERKS__
-#define HAVE_STRFTIME
-#ifndef __MC68K__
-/* 68K hypot definition (and implementation) are unuseable
-** because they use 10-byte floats.
-*/
-#define HAVE_HYPOT
-#endif
-#endif
-
-#define HAVE_LIMITS_H
-#define HAVE_MEMMOVE
+/* Define to case-check imported modules (why is this here?) */
 #define CHECK_IMPORT_CASE
-#define HAVE_STRERROR
-#define HAVE_LOCALE_H
-#define HAVE_MKTIME
 
-#ifdef USE_GUSI
-/* GUSI provides a lot of unixisms */
-#define HAVE_SELECT
-#define DIRENT
-#define HAVE_GETPEERNAME
-#define HAVE_SELECT
-#define HAVE_FCNTL_H
-#define HAVE_SYS_TIME_H
-#define HAVE_UNISTD_H
-#endif
-
-#ifdef SYMANTEC__CFM68K__
-#define atof Py_AtoF
-#define strtod Py_StrToD
+#if defined(USE_GUSI1) || defined(USE_GUSI2)
+#define USE_GUSI
 #endif
 
 /* Define if on AIX 3.
    System headers sometimes define this.
    We just want to avoid a redefinition error message.  */
 #ifndef _ALL_SOURCE
-/* #undef _ALL_SOURCE */
+#undef _ALL_SOURCE
 #endif
 
 /* Define if type char is unsigned and you are not using gcc.  */
-/* #undef __CHAR_UNSIGNED__ */
+#ifndef __CHAR_UNSIGNED__
+#undef __CHAR_UNSIGNED__
+#endif
 
 /* Define to empty if the keyword does not work.  */
-/* #undef const */
-
-/* Define if you have dirent.h.  */
-/* #undef DIRENT */
-
-/* Define to the type of elements in the array set by `getgroups'.
-   Usually this is either `int' or `gid_t'.  */
-/* #undef GETGROUPS_T */
+#undef const
 
 /* Define to `int' if <sys/types.h> doesn't define.  */
-/* #undef gid_t */
+#undef gid_t
 
 /* Define if your struct tm has tm_zone.  */
-/* #undef HAVE_TM_ZONE */
+#undef HAVE_TM_ZONE
 
 /* Define if you don't have tm_zone but do have the external array
    tzname.  */
-/* #undef HAVE_TZNAME */
+#undef HAVE_TZNAME
+
+/* Define as __inline if that's what the C compiler calls it.  */
+#undef inline
 
 /* Define if on MINIX.  */
-/* #undef _MINIX */
+#undef _MINIX
 
 /* Define to `int' if <sys/types.h> doesn't define.  */
-/* #undef mode_t */
-
-/* Define if you don't have dirent.h, but have ndir.h.  */
-/* #undef NDIR */
+#undef mode_t
 
 /* Define to `long' if <sys/types.h> doesn't define.  */
-/* #undef off_t */
+#undef off_t
 
 /* Define to `int' if <sys/types.h> doesn't define.  */
-/* #undef pid_t */
+#undef pid_t
 
 /* Define if the system does not provide POSIX.1 features except
    with this defined.  */
-/* #undef _POSIX_1_SOURCE */
+#undef _POSIX_1_SOURCE
 
 /* Define if you need to in order for stat and other things to work.  */
-/* #undef _POSIX_SOURCE */
+#undef _POSIX_SOURCE
 
 /* Define as the return type of signal handlers (int or void).  */
 #define RETSIGTYPE void
 
 /* Define to `unsigned' if <sys/types.h> doesn't define.  */
-/* #undef size_t */
+#undef size_t
 
 /* Define if you have the ANSI C header files.  */
 #define STDC_HEADERS 1
 
-/* Define if you don't have dirent.h, but have sys/dir.h.  */
-/* #undef SYSDIR */
-
-/* Define if you don't have dirent.h, but have sys/ndir.h.  */
-/* #undef SYSNDIR */
-
 /* Define if you can safely include both <sys/time.h> and <time.h>.  */
-/* #undef TIME_WITH_SYS_TIME */
+#undef TIME_WITH_SYS_TIME
 
 /* Define if your <sys/time.h> declares struct tm.  */
-/* #undef TM_IN_SYS_TIME */
+#undef TM_IN_SYS_TIME
 
 /* Define to `int' if <sys/types.h> doesn't define.  */
-/* #undef uid_t */
+#undef uid_t
 
-/* Define if the closedir function returns void instead of int.  */
-/* #undef VOID_CLOSEDIR */
+/* Define if your processor stores words with the most significant
+   byte first (like Motorola and SPARC, unlike Intel and VAX).  */
+#define WORDS_BIGENDIAN 1
 
 /* Define if your <unistd.h> contains bad prototypes for exec*()
    (as it does on SGI IRIX 4.x) */
-/* #undef BAD_EXEC_PROTOTYPES */
+#undef BAD_EXEC_PROTOTYPES
 
 /* Define if your compiler botches static forward declarations */
-#ifdef __MWERKS__
 #define BAD_STATIC_FORWARD
-#endif
-#ifdef __SC__
-#define BAD_STATIC_FORWARD
-#endif
-#ifdef __MRC__
-#define BAD_STATIC_FORWARD
-#endif
+
+/* Define for AIX if your compiler is a genuine IBM xlC/xlC_r
+   and you want support for AIX C++ shared extension modules. */
+#undef AIX_GENUINE_CPLUSPLUS
+
+/* Define this if you have BeOS threads */
+#undef BEOS_THREADS
+
+/* Define if you have the Mach cthreads package */
+#undef C_THREADS
 
 /* Define to `long' if <time.h> doesn't define.  */
-/* #undef clock_t */
+#undef clock_t
 
-/* Define if getpgrp() must be called as getpgrp(0)
-   and (consequently) setpgrp() as setpgrp(0, 0). */
-/* #undef GETPGRP_HAVE_ARG */
+/* Used for BeOS configuration */
+#undef DL_EXPORT_HEADER
+#ifdef DL_EXPORT_HEADER
+#include DL_EXPORT_HEADER
+#endif
+
+/* Define if getpgrp() must be called as getpgrp(0). */
+#undef GETPGRP_HAVE_ARG
+
+/* Define if gettimeofday() does not have second (timezone) argument
+   This is the case on Motorola V4 (R40V4.2) */
+#undef GETTIMEOFDAY_NO_TZ
 
 /* Define this if your time.h defines altzone */
-/* #undef HAVE_ALTZONE */
+#undef HAVE_ALTZONE
+
+/* Define this if you have gethostbyname() */
+#undef HAVE_GETHOSTBYNAME
+
+/* Define this if you have some version of gethostbyname_r() */
+#undef HAVE_GETHOSTBYNAME_R
+
+/* Define this if you have the 3-arg version of gethostbyname_r() */
+#undef HAVE_GETHOSTBYNAME_R_3_ARG
+
+/* Define this if you have the 5-arg version of gethostbyname_r() */
+#undef HAVE_GETHOSTBYNAME_R_5_ARG
+
+/* Define this if you have the 6-arg version of gethostbyname_r() */
+#undef HAVE_GETHOSTBYNAME_R_6_ARG
+
+/* Define this if you have the type long long */
+#undef HAVE_LONG_LONG
+
+/* Define this if you have a K&R style C preprocessor */
+#undef HAVE_OLD_CPP
 
 /* Define if your compiler supports function prototypes */
 #define HAVE_PROTOTYPES 1
@@ -195,22 +181,54 @@
    (e.g. void fprintf(FILE *, char *, ...);) *and* <stdarg.h> */
 #define HAVE_STDARG_PROTOTYPES
 
+/* Define if malloc(0) returns a NULL pointer */
+#undef MALLOC_ZERO_RETURNS_NULL
+
 /* Define if you have POSIX threads */
-/* #undef _POSIX_THREADS */
+#ifdef USE_GUSI2
+#define _POSIX_THREADS
+#endif
+
+/* Define to force use of thread-safe errno, h_errno, and other functions */
+#undef _REENTRANT
+
+/* Define if setpgrp() must be called as setpgrp(0, 0). */
+#undef SETPGRP_HAVE_ARG
 
 /* Define to empty if the keyword does not work.  */
-/* #undef signed */
+#undef signed
 
 /* Define if  you can safely include both <sys/select.h> and <sys/time.h>
    (which you can't on SCO ODT 3.0). */
-/* #undef SYS_SELECT_WITH_SYS_TIME */
+#undef SYS_SELECT_WITH_SYS_TIME
+
+/* Define if a va_list is an array of some kind */
+#undef VA_LIST_IS_ARRAY
+
+/* Define to empty if the keyword does not work.  */
+#undef volatile
+
+/* Define if you want SIGFPE handled (see Include/pyfpe.h). */
+#undef WANT_SIGFPE_HANDLER
+
+/* Define if the compiler provides a wchar.h header file. */
+#undef HAVE_WCHAR_H
+
+/* Define if you have a useable wchar_t type defined in wchar.h; useable
+   means wchar_t must be 16-bit unsigned type. (see
+   Include/unicodeobject.h). */
+#undef HAVE_USABLE_WCHAR_T
+
+/* Define if you want wctype.h functions to be used instead of the
+   one supplied by Python itself. (see Include/unicodectype.h). */
+#undef WANT_WCTYPE_FUNCTIONS
 
 /* Define if you want to use SGI (IRIX 4) dynamic linking.
    This requires the "dl" library by Jack Jansen,
    ftp://ftp.cwi.nl/pub/dynload/dl-1.6.tar.Z.
    Don't bother on IRIX 5, it already has dynamic linking using SunOS
    style shared libraries */ 
-/* #undef WITH_SGI_DL */
+#undef WITH_SGI_DL
 
 /* Define if you want to emulate SGI (IRIX 4) dynamic linking.
    This is rumoured to work on VAX (Ultrix), Sun3 (SunOS 3.4),
@@ -221,100 +239,321 @@
    ftp://ftp.cwi.nl/pub/dynload/dld-3.2.3.tar.Z.
    Don't bother on SunOS 4 or 5, they already have dynamic linking using
    shared libraries */ 
-/* #undef WITH_DL_DLD */
+#undef WITH_DL_DLD
+
+/* Define if you want to use the new-style (Openstep, Rhapsody, MacOS)
+   dynamic linker (dyld) instead of the old-style (NextStep) dynamic
+   linker (rld). Dyld is necessary to support frameworks. */
+#undef WITH_DYLD
 
 /* Define if you want to compile in rudimentary thread support */
+/* On the Mac this is optionally defined the the mwerks_*_config.h file */
 /* #undef WITH_THREAD */
 
-/* Define if you want to use the GNU readline library */
-/* #undef WITH_READLINE */
+/* Define if you want to produce an OpenStep/Rhapsody framework
+   (shared library plus accessory files). */
+#undef WITH_NEXT_FRAMEWORK
 
-/* Define if you have chown.  */
-/* #undef HAVE_CHOWN */
+/* The number of bytes in an off_t. */
+#undef SIZEOF_OFF_T
+
+/* Defined to enable large file support when an off_t is bigger than a long
+   and long long is available and at least as big as an off_t. You may need
+   to add some flags for configuration and compilation to enable this mode.
+   E.g, for Solaris 2.7:
+   CFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" OPT="-O2 $CFLAGS" \
+ configure
+*/
+#undef HAVE_LARGEFILE_SUPPORT
+
+/* Defined when any dynamic module loading is enabled */
+#ifndef HAVE_DYNAMIC_LOADING
+#undef HAVE_DYNAMIC_LOADING
+#endif
+
+/* The number of bytes in a char.  */
+#define SIZEOF_CHAR 1
+
+/* The number of bytes in a double.  */
+#define SIZEOF_DOUBLE 8
+
+/* The number of bytes in a float.  */
+#define SIZEOF_FLOAT 4
+
+/* The number of bytes in a int.  */
+#define SIZEOF_INT 4
+
+/* The number of bytes in a long.  */
+#define SIZEOF_LONG 4
+
+/* The number of bytes in a long long.  */
+#undef SIZEOF_LONG_LONG
+
+/* The number of bytes in a short.  */
+#define SIZEOF_SHORT 2
+
+/* The number of bytes in a void *.  */
+#define SIZEOF_VOID_P 4
+
+/* Define if you have the alarm function.  */
+#undef HAVE_ALARM
+
+/* Define if you have the chown function.  */
+#undef HAVE_CHOWN
 
 /* Define if you have clock.  */
 #define HAVE_CLOCK
 
-/* Define if you have dlopen.  */
-/* #undef HAVE_DLOPEN */
+/* Define if you have the confstr function.  */
+#undef HAVE_CONFSTR
 
-/* Define if you have ftime.  */
-/* #undef HAVE_FTIME */
+/* Define if you have the ctermid function.  */
+#undef HAVE_CTERMID
 
-/* Define if you have getpeername.  */
-/* #undef HAVE_GETPEERNAME */
+/* Define if you have the ctermid_r function.  */
+#undef HAVE_CTERMID_R
+
+/* Define if you have the dlopen function.  */
+#undef HAVE_DLOPEN
+
+/* Define if you have the dup2 function.  */
+#undef HAVE_DUP2
+
+/* Define if you have the execv function.  */
+#undef HAVE_EXECV
+
+/* Define if you have the fdatasync function.  */
+#undef HAVE_FDATASYNC
+
+/* Define if you have the flock function.  */
+#undef HAVE_FLOCK
+
+/* Define if you have the fork function.  */
+#undef HAVE_FORK
+
+/* Define if you have the fpathconf function.  */
+#undef HAVE_FPATHCONF
+
+/* Define if you have the fseek64 function.  */
+#undef HAVE_FSEEK64
+
+/* Define if you have the fseeko function.  */
+#undef HAVE_FSEEKO
+
+/* Define if you have the fstatvfs function.  */
+#undef HAVE_FSTATVFS
+
+/* Define if you have the fsync function.  */
+#define HAVE_FSYNC
+
+/* Define if you have the ftell64 function.  */
+#undef HAVE_FTELL64
+
+/* Define if you have the ftello function.  */
+#undef HAVE_FTELLO
+
+/* Define if you have the ftime function.  */
+#undef HAVE_FTIME
+
+/* Define if you have the ftruncate function.  */
+#ifdef USE_GUSI
+#define HAVE_FTRUNCATE
+#endif
+
+/* Define if you have the getcwd function.  */
+#define HAVE_GETCWD
+
+/* Define if you have the getgroups function.  */
+#undef HAVE_GETGROUPS
+
+/* Define if you have the getlogin function.  */
+#undef HAVE_GETLOGIN
+
+/* Define if you have the getpeername function.  */
+#ifdef USE_GUSI
+#define HAVE_GETPEERNAME
+#endif
 
 /* Define if you have getpgrp.  */
-/* #undef HAVE_GETPGRP */
+#undef HAVE_GETPGRP
 
-/* Define if you have getpid.  */
-/* #undef HAVE_GETPID */
+/* Define if you have the getpid function.  */
+#undef HAVE_GETPID
 
-/* Define if you have gettimeofday.  */
-/* #undef HAVE_GETTIMEOFDAY */
+/* Define if you have the getpwent function.  */
+#undef HAVE_GETPWENT
 
-/* Define if you have getwd.  */
-/* #undef HAVE_GETWD */
+/* Define if you have the gettimeofday function.  */
+#define HAVE_GETTIMEOFDAY
 
-/* Define if you have link.  */
-/* #undef HAVE_LINK */
+/* Define if you have the getwd function.  */
+#undef HAVE_GETWD
 
-/* Define if you have lstat.  */
-/* #undef HAVE_LSTAT */
+/* Define if you have the hypot function.  */
+#ifndef __MC68K__
+/* 68K hypot definition (and implementation) are unuseable
+** because they use 10-byte floats.
+*/
+#define HAVE_HYPOT
+#endif
 
-/* Define if you have nice.  */
-/* #undef HAVE_NICE */
+/* Define if you have the kill function.  */
+#undef HAVE_KILL
 
-/* Define if you have readlink.  */
-/* #undef HAVE_READLINK */
+/* Define if you have the link function.  */
+#undef HAVE_LINK
 
-/* Define if you have select.  */
-/* #undef HAVE_SELECT */
+/* Define if you have the lstat function.  */
+#undef HAVE_LSTAT
 
-/* Define if you have setgid.  */
-/* #undef HAVE_SETGID */
+/* Define if you have the memmove function.  */
+#define HAVE_MEMMOVE
 
-/* Define if you have setpgid.  */
-/* #undef HAVE_SETPGID */
+/* Define if you have the mkfifo function.  */
+#undef HAVE_MKFIFO
 
-/* Define if you have setpgrp.  */
-/* #undef HAVE_SETPGRP */
+/* Define if you have the mktime function.  */
+#define HAVE_MKTIME
 
-/* Define if you have setsid.  */
-/* #undef HAVE_SETSID */
+/* Define if you have the nice function.  */
+#undef HAVE_NICE
 
-/* Define if you have setuid.  */
-/* #undef HAVE_SETUID */
+/* Define if you have the pathconf function.  */
+#undef HAVE_PATHCONF
 
-/* Define if you have setvbuf.  */
+/* Define if you have the pause function.  */
+#undef HAVE_PAUSE
+
+/* Define if you have the plock function.  */
+/* XXXX GUSI threads* */
+#undef HAVE_PLOCK
+
+/* Define if you have the pthread_init function.  */
+/* XXXX GUSI threads* */
+#undef HAVE_PTHREAD_INIT
+
+/* Define if you have the putenv function.  */
+#undef HAVE_PUTENV
+
+/* Define if you have the readlink function.  */
+#undef HAVE_READLINK
+
+/* Define if you have the select function.  */
+#ifdef USE_GUSI
+#define HAVE_SELECT
+#endif
+
+/* Define if you have the setgid function.  */
+#undef HAVE_SETGID
+
+/* Define if you have the setlocale function.  */
+#undef HAVE_SETLOCALE
+
+/* Define if you have the setpgid function.  */
+#undef HAVE_SETPGID
+
+/* Define if you have the setpgrp function.  */
+#undef HAVE_SETPGRP
+
+/* Define if you have the setsid function.  */
+#undef HAVE_SETSID
+
+/* Define if you have the setuid function.  */
+#undef HAVE_SETUID
+
+/* Define if you have the setvbuf function.  */
 #define HAVE_SETVBUF
 
-/* Define if you have siginterrupt.  */
-/* #undef HAVE_SIGINTERRUPT */
+/* Define if you have the sigaction function.  */
+#undef HAVE_SIGACTION
 
-/* Define if you have symlink.  */
-/* #undef HAVE_SYMLINK */
+/* Define if you have the siginterrupt function.  */
+#undef HAVE_SIGINTERRUPT
 
-/* Define if you have tcgetpgrp.  */
-/* #undef HAVE_TCGETPGRP */
+/* Define if you have the sigrelse function.  */
+#undef HAVE_SIGRELSE
 
-/* Define if you have tcsetpgrp.  */
-/* #undef HAVE_TCSETPGRP */
+/* Define if you have the statvfs function.  */
+#undef HAVE_STATVFS
 
-/* Define if you have times.  */
-/* #undef HAVE_TIMES */
+/* Define if you have the strdup function.  */
+#undef HAVE_STRDUP
 
-/* Define if you have uname.  */
-/* #undef HAVE_UNAME */
+/* Define if you have the strerror function.  */
+#define HAVE_STRERROR
 
-/* Define if you have waitpid.  */
-/* #undef HAVE_WAITPID */
+/* Define if you have the strftime function.  */
+#define HAVE_STRFTIME
+
+/* Define if you have the strptime function.  */
+#undef HAVE_STRPTIME
+
+/* Define if you have the symlink function.  */
+#undef HAVE_SYMLINK
+
+/* Define if you have the sysconf function.  */
+#undef HAVE_SYSCONF
+
+/* Define if you have the tcgetpgrp function.  */
+#undef HAVE_TCGETPGRP
+
+/* Define if you have the tcsetpgrp function.  */
+#undef HAVE_TCSETPGRP
+
+/* Define if you have the tempnam function.  */
+#undef HAVE_TEMPNAM
+
+/* Define if you have the timegm function.  */
+#undef HAVE_TIMEGM
+
+/* Define if you have the times function.  */
+#undef HAVE_TIMES
+
+/* Define if you have the tmpfile function.  */
+#define HAVE_TMPFILE
+
+/* Define if you have the tmpnam function.  */
+#define HAVE_TMPNAM
+
+/* Define if you have the tmpnam_r function.  */
+#undef HAVE_TMPNAM_R
+
+/* Define if you have the truncate function.  */
+#define HAVE_TRUNCATE
+
+/* Define if you have the uname function.  */
+#undef HAVE_UNAME
+
+/* Define if you have the waitpid function.  */
+#undef HAVE_WAITPID
+
+/* Define if you have the <dirent.h> header file.  */
+#ifdef USE_GUSI
+#define HAVE_DIRENT_H
+#endif
 
 /* Define if you have the <dlfcn.h> header file.  */
-/* #undef HAVE_DLFCN_H */
+#undef HAVE_DLFCN_H
 
 /* Define if you have the <fcntl.h> header file.  */
-/* #undef HAVE_FCNTL_H */
+#define HAVE_FCNTL_H
+
+/* Define if you have the <limits.h> header file.  */
+#define HAVE_LIMITS_H
+
+/* Define if you have the <locale.h> header file.  */
+#define HAVE_LOCALE_H
+
+/* Define if you have the <ncurses.h> header file.  */
+#undef HAVE_NCURSES_H
+
+/* Define if you have the <ndir.h> header file.  */
+#undef HAVE_NDIR_H
+
+/* Define if you have the <pthread.h> header file.  */
+#ifdef USE_GUSI2
+#define HAVE_PTHREAD_H
+#endif
 
 /* Define if you have the <signal.h> header file.  */
 #define HAVE_SIGNAL_H
@@ -322,68 +561,64 @@
 /* Define if you have the <stdarg.h> header file.  */
 #define HAVE_STDARG_H
 
+/* Define if you have the <stddef.h> header file.  */
+#define HAVE_STDDEF_H
+
 /* Define if you have the <stdlib.h> header file.  */
 #define HAVE_STDLIB_H
 
 /* Define if you have the <sys/audioio.h> header file.  */
-/* #undef HAVE_SYS_AUDIOIO_H */
+#undef HAVE_SYS_AUDIOIO_H
+
+/* Define if you have the <sys/dir.h> header file.  */
+#undef HAVE_SYS_DIR_H
+
+/* Define if you have the <sys/file.h> header file.  */
+#undef HAVE_SYS_FILE_H
+
+/* Define if you have the <sys/lock.h> header file.  */
+#undef HAVE_SYS_LOCK_H
+
+/* Define if you have the <sys/ndir.h> header file.  */
+#undef HAVE_SYS_NDIR_H
 
 /* Define if you have the <sys/param.h> header file.  */
-/* #undef HAVE_SYS_PARAM_H */
+#undef HAVE_SYS_PARAM_H
 
 /* Define if you have the <sys/select.h> header file.  */
-/* #undef HAVE_SYS_SELECT_H */
+#undef HAVE_SYS_SELECT_H
 
 /* Define if you have the <sys/time.h> header file.  */
-/* #undef HAVE_SYS_TIME_H */
+#ifdef USE_GUSI
+#define HAVE_SYS_TIME_H
+#endif
 
 /* Define if you have the <sys/times.h> header file.  */
-/* #undef HAVE_SYS_TIMES_H */
+#undef HAVE_SYS_TIMES_H
 
 /* Define if you have the <sys/un.h> header file.  */
-/* #undef HAVE_SYS_UN_H */
+#undef HAVE_SYS_UN_H
 
 /* Define if you have the <sys/utsname.h> header file.  */
-/* #undef HAVE_SYS_UTSNAME_H */
+#undef HAVE_SYS_UTSNAME_H
+
+/* Define if you have the <sys/wait.h> header file.  */
+#undef HAVE_SYS_WAIT_H
 
 /* Define if you have the <thread.h> header file.  */
-/* #undef HAVE_THREAD_H */
+#undef HAVE_THREAD_H
 
 /* Define if you have the <unistd.h> header file.  */
-/* #undef HAVE_UNISTD_H */
+#define HAVE_UNISTD_H
 
 /* Define if you have the <utime.h> header file.  */
-/* #undef HAVE_UTIME_H */
+#define HAVE_UTIME_H
 
 /* Define if you have the dl library (-ldl).  */
-/* #undef HAVE_LIBDL */
+#undef HAVE_LIBDL
 
-/* Define if you have the inet library (-linet).  */
-/* #undef HAVE_LIBINET */
+/* Define if you have the dld library (-ldld).  */
+#undef HAVE_LIBDLD
 
-/* Define if you have the mpc library (-lmpc).  */
-/* #undef HAVE_LIBMPC */
-
-/* Define if you have the nsl library (-lnsl).  */
-/* #undef HAVE_LIBNSL */
-
-/* Define if you have the pthreads library (-lpthreads).  */
-/* #undef HAVE_LIBPTHREADS */
-
-/* Define if you have the seq library (-lseq).  */
-/* #undef HAVE_LIBSEQ */
-
-/* Define if you have the socket library (-lsocket).  */
-/* #undef HAVE_LIBSOCKET */
-
-/* Define if you have the sun library (-lsun).  */
-/* #undef HAVE_LIBSUN */
-
-/* Define if you have the termcap library (-ltermcap).  */
-/* #undef HAVE_LIBTERMCAP */
-
-/* Define if you have the termlib library (-ltermlib).  */
-/* #undef HAVE_LIBTERMLIB */
-
-/* Define if you have the thread library (-lthread).  */
-/* #undef HAVE_LIBTHREAD */
+/* Define if you have the ieee library (-lieee).  */
+#undef HAVE_LIBIEEE