--- a/src/config.h.in	Mon Aug 13 11:33:40 2007 +0200
+++ b/src/config.h.in	Mon Aug 13 11:35:02 2007 +0200
@@ -26,6 +26,7 @@
 #ifndef _SRC_CONFIG_H_
 #define _SRC_CONFIG_H_
 
+
 /* alloca twiddling belongs in one place, not the s&m headers
    AIX requires this to be the first thing in the file.  */
 #undef HAVE_ALLOCA_H
@@ -38,15 +39,17 @@
 #elif defined(_AIX)
 #pragma alloca
 #elif ! defined (alloca)
-char *alloca();
+char *alloca ();
 #endif
 #endif /* C code */
 
-
 /* Use this to add code in a structured way to FSF-maintained source
    files so as to make it obvious where XEmacs changes are. */
 #define XEMACS 1
 
+/* Program name */
+#undef EMACS_PROGNAME
+
 /* Allow s&m files to differentiate OS versions without having
    multiple files to maintain. */
 #undef OS_RELEASE
@@ -70,12 +73,24 @@
 #undef INFODOCK_MINOR_VERSION
 #undef INFODOCK_BUILD_VERSION
 
+/* Make functions from IEEE Stds 1003.[123] available. */
+#undef _POSIX_C_SOURCE
+
+/* Make some functions from Unix98 available. */
+#undef _XOPEN_SOURCE
+
+/* Make "extensions" from Unix98 available. */
+#undef _XOPEN_SOURCE_EXTENDED
+
 /* Make all functions available on AIX.  See AC_AIX. */
 #undef _ALL_SOURCE
 
 /* Make all functions available on GNU libc systems.  See features.h. */
 #undef _GNU_SOURCE
 
+/* Make all functions available on Solaris 2 systems. */
+#undef __EXTENSIONS__
+
 /* Used to identify the XEmacs version in stack traces. */
 #undef STACK_TRACE_EYE_CATCHER
 
@@ -164,6 +179,10 @@
 #undef THIS_IS_X11R5
 #undef THIS_IS_X11R6
 
+#undef HAVE_XCONVERTCASE
+
+#undef HAVE_BALLOON_HELP
+
 /* Where do we find bitmaps? */
 #undef BITMAPDIR
 
@@ -184,30 +203,29 @@
 /* Some things figured out by the configure script, grouped as they are in
    configure.in. */
 #undef HAVE_MCHECK_H
+#undef HAVE_A_OUT_H
+#undef HAVE_CYGWIN_VERSION_H
+#undef HAVE_FCNTL_H
+#undef HAVE_INTTYPES_H
+#undef HAVE_LIBGEN_H
+#undef HAVE_LOCALE_H
 #undef HAVE_MACH_MACH_H
-#undef HAVE_SYS_STROPTS_H
+#undef HAVE_SYS_PARAM_H
+#undef HAVE_SYS_PSTAT_H
+#undef HAVE_SYS_TIME_H
 #undef HAVE_SYS_TIMEB_H
-#undef HAVE_SYS_TIME_H
+#undef HAVE_SYS_UN_H
+#undef HAVE_ULIMIT_H
 #undef HAVE_UNISTD_H
 #undef HAVE_UTIME_H
+
 #undef HAVE_SYS_WAIT_H
 #undef HAVE_LIBINTL_H
-#undef HAVE_LIBGEN_H
-#undef HAVE_LOCALE_H
-#undef HAVE_FCNTL_H
-#undef HAVE_ULIMIT_H
 #undef HAVE_X11_XLOCALE_H
-#undef HAVE_LINUX_VERSION_H
-#undef HAVE_CYGWIN_VERSION_H
-#undef HAVE_INTTYPES_H
-#undef HAVE_SYS_UN_H
-#undef HAVE_A_OUT_H
 #undef STDC_HEADERS
 #undef TIME_WITH_SYS_TIME
 #undef WORDS_BIGENDIAN
 #undef HAVE_VFORK_H
-#undef HAVE_KSTAT_H
-#undef HAVE_SYS_PSTAT_H
 #undef vfork
 
 #undef HAVE_LONG_FILE_NAMES
@@ -224,7 +242,6 @@
 #undef HAVE_SHLIB
 #undef HAVE_DLFCN_H
 
-#undef HAVE_LIBKSTAT
 #undef HAVE_LIBINTL
 #undef HAVE_LIBDNET
 #undef HAVE_LIBRESOLV
@@ -243,6 +260,13 @@
 #undef HAVE_TM_ZONE
 #undef HAVE_TZNAME
 
+/* For `getloadavg' provided by system */
+#undef HAVE_GETLOADAVG
+#undef HAVE_SYS_LOADAVG_H
+/* For implementing `getloadavg' ourselves */
+#undef HAVE_LIBKSTAT
+#undef HAVE_KSTAT_H
+
 /* Is `h_errno' declared by <netdb.h>? */
 #undef HAVE_H_ERRNO
 
@@ -274,7 +298,6 @@
 #undef HAVE_GETTIMEOFDAY
 #undef HAVE_GETWD
 #undef HAVE_GETCWD
-#undef HAVE_GETPT
 #undef HAVE_LOGB
 #undef HAVE_LRAND48
 #undef HAVE_MATHERR
@@ -298,7 +321,6 @@
 #undef HAVE_SIGSETJMP
 #undef HAVE_SNPRINTF
 #undef HAVE_STPCPY
-#undef HAVE_STRCASECMP
 #undef HAVE_STRERROR
 #undef HAVE_TZSET
 #undef HAVE_ULIMIT
@@ -306,6 +328,22 @@
 #undef HAVE_UTIMES
 #undef HAVE_WAITPID
 #undef HAVE_VSNPRINTF
+
+/* PTY support functions */
+#undef HAVE_GETPT	/* glibc's easy pty allocation function */
+#undef HAVE__GETPT	/*   SGI's easy pty allocation function */
+#undef HAVE_OPENPTY	/*   BSD's easy pty allocation function */
+#undef HAVE_GRANTPT	/* Unix98 */
+#undef HAVE_UNLOCKPT	/* Unix98 */
+#undef HAVE_PTSNAME	/* Unix98 */
+#undef HAVE_KILLPG	/* BSD */
+#undef HAVE_TCGETPGRP	/* Posix 1 */
+#undef HAVE_ISASTREAM	/* SysV streams */
+#undef HAVE_PTY_H	/* Linux, Tru64 openpty */
+#undef HAVE_LIBUTIL_H	/* BSD openpty */
+#undef HAVE_SYS_STROPTS_H /* SysV streams */
+#undef HAVE_SYS_STRTIO_H  /* SysV streams TIOCSIGNAL */
+
 #undef HAVE_SOCKETS
 #undef HAVE_SOCKADDR_SUN_LEN
 #undef HAVE_MULTICAST
@@ -359,7 +397,7 @@
 /* Compile in support for Berkeley DB style databases?  May require libdb. */
 #undef HAVE_BERKELEY_DB
 /* Full #include file path for Berkeley DB's db.h */
-#undef DB_H_PATH
+#undef DB_H_FILE
 
 /* Do we have either DBM or Berkeley DB database support? */
 #undef HAVE_DATABASE
@@ -375,6 +413,11 @@
 /* Does the library define ldap_parse_result () ? */
 #undef HAVE_LDAP_PARSE_RESULT
 
+/* Do we have PostgreSQL RDBMS support? */
+#undef HAVE_POSTGRESQL
+#undef HAVE_POSTGRESQLV7
+#undef LIBPQ_FE_H_FILE /* main PostgreSQL header file */
+
 /* Do you have the Xauth library present?  This will add some extra
    functionality to gnuserv. */
 #undef HAVE_XAUTH
@@ -385,8 +428,8 @@
 /* Compile in support for ncurses?  */
 #undef HAVE_NCURSES
 /* Full #include file paths for ncurses' curses.h and term.h. */
-#undef CURSES_H_PATH
-#undef TERM_H_PATH
+#undef CURSES_H_FILE
+#undef TERM_H_FILE
 
 /* Define USE_ASSERTIONS if you want the abort() to be changed to assert().
    If the assertion fails, assert_failed() will be called.  This is
@@ -424,6 +467,11 @@
 
 /* Attempt to catch bugs related to garbage collection (e.g. not GCPRO'ing). */
 #undef ERROR_CHECK_GC
+#ifdef ERROR_CHECK_GC
+#define gc_checking_assert(assertion) assert (assertion)
+#else
+#define gc_checking_assert(assertion)
+#endif
 
 /* Attempt to catch freeing of a non-malloc()ed block, heap corruption, etc. */
 #undef ERROR_CHECK_MALLOC
@@ -432,6 +480,10 @@
    debugging the byte compiler.  */
 #undef ERROR_CHECK_BYTE_CODE
 
+/* Minor sanity checking of glyphs, especially subwindows and
+   widgets. */
+#undef ERROR_CHECK_GLYPHS
+
 /* Define DEBUG_XEMACS if you want extra debugging code compiled in.
    This is mainly intended for use by developers. */
 #undef DEBUG_XEMACS
@@ -511,16 +563,18 @@
 /* Enable special GNU Make features in the Makefiles. */
 #undef USE_GNU_MAKE
 
-/* Debugging option: Don't automatically rebuild the DOC file.
-   This saves a lot of time when you're repeatedly
-   compiling-running-crashing. */
-#undef NO_DOC_FILE
+/* Debugging development option: Remove inessential but time consuming
+   actions from happening during build.  This saves a lot of time when
+   you're repeatedly compiling-running-crashing.  This (1) doesn't
+   garbage-collect after loading each file during dumping, and (2)
+   doesn't automatically rebuild the DOC file. (Remove it by hand to
+   get it rebuilt.)
+ */
+#undef QUICK_BUILD
 
 /* Defined by AC_C_CONST in configure.in */
 #undef const
 
-#define CONST const
-
 /* Allow the source to use standard types. Include these before the
  s&m files so that they can use them. */
 #undef ssize_t
@@ -530,37 +584,35 @@
 #undef off_t
 #undef uid_t
 #undef gid_t
+#undef socklen_t
 
 /* If defined, use unions instead of ints.  A few systems (DEC Alpha)
    seem to require this, probably because something with the int
    definitions isn't right with 64-bit systems.  */
 #undef USE_UNION_TYPE
 
-/* The configuration script defines opsysfile to be the name of the
-   s/...h file that describes the system type you are using.
-   The file is chosen based on the configuration name you give.
-
-   See the file ../etc/MACHINES for a list of systems and the
-   configuration names to use for them.
-
-   See s/template.h for documentation on writing s/...h files. */
+/* The configuration script may define `opsysfile' to be the name of
+   the s/...h file that describes your operating system.
+   The file name is chosen based on the configuration name. */
 
 #if defined (__cplusplus) && !defined (NOT_C_CODE)
 extern "C" {
 #endif
+
 #undef config_opsysfile
+#ifdef config_opsysfile
 #include config_opsysfile
-
-/* The configuration script defines machfile to be the name of the
-   m/...h file that describes the machine you are using.  The file is
-   chosen based on the configuration name you give.
+#endif
 
-   See the file ../etc/MACHINES for a list of machines and the
-   configuration names to use for them.
+/* The configuration script may define `machfile' to be the name of
+   the m/...h file that describes the machine you are using.
+   The file name is chosen based on the configuration name. */
 
-   See m/template.h for documentation on writing m/...h files. */
 #undef config_machfile
+#ifdef config_machfile
 #include config_machfile
+#endif
+
 #if defined (__cplusplus) && !defined (NOT_C_CODE)
 }
 #endif
@@ -595,7 +647,7 @@
    "SUNWaudmo" package.) */
 #undef HAVE_NATIVE_SOUND
 /* Native sound may be provided via soundcard.h, in various directories */
-#undef SOUNDCARD_H_PATH
+#undef SOUNDCARD_H_FILE
 
 /* Compile in support for NAS (Network Audio System)?
    NAS_NO_ERROR_JUMP means that the NAS libraries don't include some
@@ -612,7 +664,7 @@
 /* Compile in support for Tooltalk? */
 #undef TOOLTALK
 /* tt_c.h might be in "Tt" or "desktop" subdirectories */
-#undef TT_C_H_PATH
+#undef TT_C_H_FILE
 
 /* Toolkits used by lwlib for various widgets... */
 #undef LWLIB_USES_MOTIF
@@ -730,10 +782,6 @@
 #  define CANNA_PURESIZE 0
 #endif /* not CANNA */
 
-#if (defined (MSDOS) && defined (FEPCTRL)) || (defined (WIN32) && defined (USE_IME))
-#define HAVE_FEP
-#endif
-
 #if defined (HAVE_SOCKS) && !defined (DO_NOT_SOCKSIFY)
 #define accept Raccept
 #define bind Rbind
@@ -757,38 +805,35 @@
 #define LONG_LONG_BITS (SIZEOF_LONG_LONG * BITS_PER_CHAR)
 #define VOID_P_BITS (SIZEOF_VOID_P * BITS_PER_CHAR)
 
-#ifndef NOT_C_CODE
-#ifdef __cplusplus
-#define HAVE_INLINE 1
-#define INLINE inline
-#else /* not C++ */
+/* Use `INLINE_HEADER' to define inline functions in .h files.
+   Use `inline static' to define inline functions in .c files.
+   See the Internals manual for examples and more information. */
+
 /* Does the keyword `inline' exist?  */
-#undef HAVE_INLINE
 #undef inline
 
-# ifdef HAVE_INLINE
-#  ifdef __GNUC__
-#   ifdef DONT_EXTERN_INLINE_FUNCTIONS
-#    define INLINE inline
-#   else
-#    define INLINE extern inline
-#   endif
-#  else
-#   define INLINE static inline
-#  endif /* __GNUC__ */
-# else
-#  define INLINE static
-# endif /* HAVE_INLINE */
-#endif /* not C++ */
-#endif /* C code */
+#if defined (__cplusplus) || ! defined (__GNUC__)
+# define INLINE_HEADER inline static
+#elif defined (DONT_EXTERN_INLINE_HEADER_FUNCTIONS)
+# define INLINE_HEADER inline
+#else
+# define INLINE_HEADER inline extern
+#endif
 
-#if defined (__cplusplus) && !defined (NOT_C_CODE)
+#ifndef NOT_C_CODE /* Actually means C or C++ */
+# if defined (__cplusplus)
 /* Avoid C++ keywords used as ordinary C identifiers */
-#define class c_class
-#define new   c_new
-#define this  c_this
-#define catch c_catch
-#endif /* C++ */
+#  define class c_class
+#  define new   c_new
+#  define this  c_this
+#  define catch c_catch
+#  define not   c_not
+
+#  define EXTERN_C extern "C"
+# else /* C code */
+#  define EXTERN_C extern
+# endif
+#endif /* C or C++ */
 
 /* Strictly speaking, only int or unsigned int are valid types in a
    bitfield.  In practice, we would like to use enums as bitfields.
@@ -836,7 +881,6 @@
 #undef SITELISPDIR_USER_DEFINED
 #undef ARCHLIBDIR_USER_DEFINED
 #undef ETCDIR_USER_DEFINED
-#undef LOCKDIR_USER_DEFINED
 #undef INFODIR_USER_DEFINED
 #undef INFOPATH_USER_DEFINED