--- a/src/config.h.in	Mon Aug 13 09:35:15 2007 +0200
+++ b/src/config.h.in	Mon Aug 13 09:36:16 2007 +0200
@@ -18,14 +18,29 @@
 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-/* Synched up with: FSF 19.30 (more or less). */
+/* Significantly divergent from FSF. */
 
 /* No code in XEmacs #includes config.h twice, but some of the code
-   intended to work with other packages as well (like gmalloc.c) 
+   intended to work with other packages as well (like gmalloc.c)
    think they can include it as many times as they like.  */
 #ifndef _CONFIG_H_
 #define _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
+
+#ifndef NOT_C_CODE
+#ifdef __GNUC__
+#undef  alloca
+#define alloca __builtin_alloca
+#elif defined(_AIX)
+#pragma alloca
+#elif HAVE_ALLOCA_H
+#include <alloca.h>
+#endif
+#endif /* NOT C */
+
 /* #### This will be removed in 19.15. */
 #define LOSING_BYTECODE
 
@@ -33,22 +48,19 @@
    files so as to make it obvious where XEmacs changes are. */
 #define XEMACS
 
-/* These are all defined in the top-level Makefile by configure.
-   They're here only for reference. */
-
 /* Does XEmacs support floating-point numbers? */
 #undef LISP_FLOAT_TYPE
 
-/* Do you want to use the *new* GNU memory allocator? */
+/* Use the *new* GNU memory allocator? */
 #undef GNU_MALLOC
 
-/* Do you want to use the system malloc? */
+/* Use the system malloc? */
 #undef USE_SYSTEM_MALLOC
 
-/* Do you want TTY support compiled in? */
+/* Compile in TTY support? */
 #undef HAVE_TTY
 
-/* Do you have the X window system and want to use it? */
+/* Compile in support for the X window system? */
 #undef HAVE_X_WINDOWS
 
 /* Slightly better type checking in X header files */
@@ -103,10 +115,10 @@
 #undef HAVE_LOCALE_H
 #undef HAVE_X11_XLOCALE_H
 #undef HAVE_LINUX_VERSION_H
+#undef HAVE_INTTYPES_H
 #undef STDC_HEADERS
 #undef TIME_WITH_SYS_TIME
 #undef WORDS_BIGENDIAN
-#undef HAVE_ALLOCA_H
 #undef HAVE_VFORK_H
 #undef HAVE_KSTAT_H
 #undef HAVE_SYS_PSTAT_H
@@ -119,6 +131,7 @@
 #endif
 
 #undef HAVE_LIBKSTAT
+#undef HAVE_LIBINTL
 #undef HAVE_LIBDNET
 #undef HAVE_LIBRESOLV
 
@@ -218,80 +231,58 @@
 #undef UNEXEC_SRC
 #undef AIX_SMT_EXP
 
-/* Do you have the `socks' library and want XEmacs to use it? */
+/* Compile in support for SOCKS? */
 #undef HAVE_SOCKS
 
-/* Do you run the `term' program (e.g. under Linux) and want XEmacs to
-   use it? */
+/* Compile in support for using the `term' program (e.g. under Linux)? */
 #undef HAVE_TERM
 
-/* Do you have the `xpm' library and want XEmacs to use it? */
+/* Compile in support for X pixmaps via the `xpm' library? */
 #undef HAVE_XPM
 
-/* Do you have the `compface' library and want XEmacs to use it?
-   This will permit X-face pixmaps in mail and news messages to display
-   quickly. */
+/* Compile in support for "X faces" via the `compface' library?
+   This enables graphical display of X-face headers in mail/news messages */
 #undef HAVE_XFACE
 
-/* Do you want XEmacs to have native support for converting
-   GIF (Graphics Interchange Format) images? */
+/* Compile in support for GIF (Graphics Interchange Format) images? */
 #undef HAVE_GIF
 
-/* Do you have the JPEG library and want XEmacs to use it?
-   This is for converting JPEG images. */
+/* Compile in support for displaying JPEG images via the `jpeg' library? */
 #undef HAVE_JPEG
 
-/* Do you have the PNG library and want XEmacs to use it?
-   This is for converting PNG images. */
+/* Compile in support for displaying PNG images via the `png' library? */
 #undef HAVE_PNG
 
-/* Do you want to use -lgz instead of -lz for PNG. */
-#undef HAVE_PNG_GNUZ
-
-/* Do you have the TIFF library and want XEmacs to use it?
-   This is for converting TIFF images. */
+/* Compile in support for displaying TIFF images via the `tiff' library? */
 #undef HAVE_TIFF
 
 /* Do you have the Xmu library?
    This should always be the case except on losing HP-UX systems. */
 #undef HAVE_XMU
 
-/* Do you have the DBM libraries and want XEmacs to use them? */
+/* Compile in support for DBM databases?  May require libgdbm or libdbm. */
 #undef HAVE_DBM
 
-/* Do you have the GNU DBM libraries and want XEmacs to use them?
-   HAVE_GNU_DBM requires that HAVE_DBM be defined as well. */
-#undef HAVE_GNU_DBM
-
-/* Do you have the BerkDB libraries and want XEmacs to use them? */
+/* 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
 
-/* Do you have the -lgdbm library? (separated from HAVE_GNU_DBM stuff
-   because FreeBSD has the DBM routines in libc) */
-#undef HAVE_LIBGDBM
-
-/* Do you have the -ldbm library? */
-#undef HAVE_LIBDBM
-
-/* Do you have the -ldb library? */
-#undef HAVE_LIBDB
-
-#if defined (HAVE_DBM) || defined (HAVE_BERKELEY_DB)
-# define HAVE_DATABASE
-#endif
+/* Do we have either DBM or Berkeley DB database support? */
+#undef HAVE_DATABASE
 
 /* Do you have the Xauth library present?  This will add some extra
    functionality to gnuserv. */
 #undef HAVE_XAUTH
 
-/* Do you have the library -lncurses ? */
-#undef HAVE_NCURSES
+/* Compile in support for gpm (General Purpose Mouse)?  */
+#undef HAVE_GPM
 
-/* Do you have ncurses or curses.h ? */
-#undef HAVE_NCURSES_CURSES_H
-
-/* Define HAVE_NCURSES_TERM_H if ncurses/term.h is present. */
-#undef HAVE_NCURSES_TERM_H
+/* 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
 
 #define LOWTAGS
 
@@ -316,11 +307,9 @@
 #undef ERROR_CHECK_TYPECHECK
 /* Make sure valid buffer positions are passed to BUF_* macros. */
 #undef ERROR_CHECK_BUFPOS
-/* Attempt to catch bugs related to garbage collection (e.g.
-   insufficient GCPRO'ing). */
+/* Attempt to catch bugs related to garbage collection (e.g. not GCPRO'ing). */
 #undef ERROR_CHECK_GC
-/* Attempt to catch freeing of a non-malloc()ed block, heap corruption,
-   etc. */
+/* Attempt to catch freeing of a non-malloc()ed block, heap corruption, etc. */
 #undef ERROR_CHECK_MALLOC
 
 /* Define DEBUG_XEMACS if you want extra debugging code compiled in.
@@ -328,16 +317,16 @@
 #undef DEBUG_XEMACS
 
 /* Define MEMORY_USAGE_STATS if you want extra code compiled in to
-   determine where XEmacs's memory is going. */
+   determine where XEmacs' memory is going. */
 #undef MEMORY_USAGE_STATS
 
-/* Define QUANTIFY if using Quantify from Pure Software.  This adds
-   some additional calls to control data collection.  This is only
-   intended for use by the developers. */
+/* Define QUANTIFY if using Quantify from Pure/Atria Software.
+   This adds some additional calls to control data collection.
+   It is only intended for use by the developers. */
 #undef QUANTIFY
 
 /* Define EXTERNAL_WIDGET to compile support for using the editor as a
-   widget in another program. */
+   widget within another program. */
 #undef EXTERNAL_WIDGET
 
 /* There are some special-case defines for gcc and lcc. */
@@ -351,9 +340,9 @@
 
 /* Define this if you want level 2 internationalization compliance
    (localized collation and formatting).  Generally this should be
-   defined, unless your system doesn't have the strcoll() and 
-   setlocale() library routines.  This really should be defined in
-   the appropriate s/ or m/ file. */
+   defined, unless your system doesn't have the strcoll() and
+   setlocale() library routines.  This really should be (NOT! -mrb)
+   defined in the appropriate s/ or m/ file. */
 #undef I18N2
 
 /* Define this if you want level 3 internationalization compliance
@@ -363,10 +352,11 @@
    WARNING, this code is under construction. */
 #undef I18N3
 
-/* Define this if you want to use the Common Desktop Environment. */
+/* Compile in support for CDE (Common Desktop Environment) drag and drop?
+   Requires libDtSvc, which typically must be present at runtime.  */
 #undef HAVE_CDE
 
-/* Define this if you want to use the OffiX Drag and Drop. */
+/* Compile in support for OffiX Drag and Drop?  Requires libdnd. */
 #undef HAVE_OFFIX_DND
 
 /* Define this if you want Mule support (multi-byte character support).
@@ -388,7 +378,7 @@
 /* Mocklisp Support. */
 #undef MOCKLISP_SUPPORT
 
-/* enable special GNU Make features in the Makefiles. */
+/* Enable special GNU Make features in the Makefiles. */
 #undef USE_GNU_MAKE
 
 /* Debugging option: Don't automatically rebuild the DOC file.
@@ -422,7 +412,7 @@
    configuration names to use for them.
 
    See s/template.h for documentation on writing s/...h files. */
-#undef config_opsysfile 
+#undef config_opsysfile
 #include config_opsysfile
 
 /* The configuration script defines machfile to be the name of the
@@ -449,7 +439,7 @@
 typedef unsigned long EMACS_UINT;
 #endif
 #endif
-#endif
+#endif /* 0 */
 
 /* The configuration name.  This is used as the install directory name
    for the lib-src programs. */
@@ -469,35 +459,10 @@
 #endif /* not NO_SHORTNAMES */
 #endif /* SHORTNAMES */
 
-/* Define REL_ALLOC if you want to use the relocating allocator for
-   buffer space. */
+/* Use the relocating allocator for buffer space? */
 #undef REL_ALLOC
 
-/* Define LD_SWITCH_SITE to contain any special flags your loader may need. */
-#undef LD_SWITCH_SITE
-
-/* Define C_SWITCH_SITE to contain any special flags your compiler needs. */
-#undef C_SWITCH_SITE
-
-/* Define LD_SWITCH_X_SITE to contain any special flags your loader
-   may need to deal with X Windows.  For instance, if you've defined
-   HAVE_X_WINDOWS above and your X libraries aren't in a place that
-   your loader can find on its own, you might want to add "-L/..." or
-   something similar. */
-#undef LD_SWITCH_X_SITE
-
-/* Define LD_SWITCH_X_SITE_AUX with an -R option
-   in case it's needed (for Solaris, for example). */
-#undef LD_SWITCH_X_SITE_AUX
-
-/* Define C_SWITCH_X_SITE to contain any special flags your compiler
-   may need to deal with X Windows.  For instance, if you've defined
-   HAVE_X_WINDOWS above and your X include files aren't in a place
-   that your compiler can find on its own, you might want to add
-   "-I/..." or something similar. */
-#undef C_SWITCH_X_SITE
-
-/* Define the return type of signal handlers if the s-xxx file
+/* Define the return type of signal handlers if the s/xxx.h file
    did not already do so. */
 #define RETSIGTYPE void
 
@@ -508,14 +473,9 @@
 #endif
 
 /* Define DYNODUMP if it is necessary to properly dump on this system.
-   Currently this is only Solaris. */
+   Currently this is only Solaris 2.x, for x < 6. */
 #undef DYNODUMP
 
-/* Define NEED_XILDOFF if the -xildoff flag must be passed to cc to
-   avoid invoking the incremental linker ild which is incompatible
-   with dynodump.  This is needed for recent Sun compilers. */
-#undef NEED_XILDOFF
-
 /* Define ENERGIZE to compile with support for the Energize Programming System.
    If you do this, don't forget to define ENERGIZE in lwlib/Imakefile as well.
    You will need to set your C_SWITCH_SITE and LD_SWITCH_SITE to point at the
@@ -524,30 +484,32 @@
 #undef ENERGIZE_2
 #undef ENERGIZE_3
 
-/* Define SUNPRO to compiled in support for Sun Sparcworks. */
+/* Compile in support for Sun Sparcworks/WorkShop? */
 #undef SUNPRO
 
-/* Sun SparcStations, SGI machines, and HP9000s700s have support for playing
-   different sound files as beeps.  If you are on a SparcStation but do not 
-   have the sound option installed for some reason, then undefine
-   HAVE_NATIVE_SOUND.  (It's usually found in /usr/demo/SOUND/ on SunOS 4
-   and Solaris systems; on Solaris, you may need to install the "SUNWaudmo"
-   package.) */
+/* Sun SparcStations, SGI machines, and HP9000s700s have built-in
+   support for playing sound files. (On Suns, the sound support is
+   usually found in /usr/demo/SOUND - you may need to install the
+   "SUNWaudmo" package.) */
 #undef HAVE_NATIVE_SOUND
+/* Native sound may be provided via soundcard.h, in various directories */
+#undef SOUNDCARD_H_PATH
 
-/* If you wish to compile with support for the Network Audio System
-   system define HAVE_NAS_SOUND.
-   NAS_NO_ERROR_JUMP means that the NAS libraries don't inlcude some
+/* Compile in support for NAS (Network Audio System)?
+   NAS_NO_ERROR_JUMP means that the NAS libraries don't include some
    error handling changes. */
 #undef HAVE_NAS_SOUND
 #undef NAS_NO_ERROR_JUMP
 
-/* Compile in support for SunPro usage-tracking code. */
+/* Compile in support for SunPro usage-tracking code? */
 #undef USAGE_TRACKING
 
-/* Define TOOLTALK if your site supports the ToolTalk library. */
+/* Compile in support for Tooltalk? */
 #undef TOOLTALK
+/* tt_c.h might be in "Tt" or "desktop" subdirectories */
+#undef TT_C_H_PATH
 
+/* Toolkits used by lwlib for various widgets... */
 #undef LWLIB_USES_MOTIF
 #undef LWLIB_USES_ATHENA
 #undef LWLIB_MENUBARS_LUCID
@@ -576,7 +538,7 @@
    uses, mbstowcs() and wcstombs(), are unusable when programs are
    statically linked (as XEmacs must be) because the static version of
    libc.a contains the *dynamic* versions of these functions.  These
-   functions don't seem to be called when XEmacs is running, so it's 
+   functions don't seem to be called when XEmacs is running, so it's
    enough to define stubs for them.
 
    This appears to be fixed in SunOS 4.1.2.
@@ -706,11 +668,23 @@
 #endif
 
 /* movemail options */
-/* define to POP3 for mail access */
+/* Should movemail use POP3 for mail access? */
 #undef MAIL_USE_POP
-/* define to use kerberos for POP authentication */
+/* Should movemail use kerberos for POP authentication? */
 #undef KERBEROS
-/* define to use hesiod for getting POP server host */
+/* Should movemail use hesiod for getting POP server host? */
 #undef HESIOD
+/* Determine type of mail locking. */
+/* Play preprocessor games so that configure options override s&m files */
+#undef REAL_MAIL_USE_LOCKF
+#undef REAL_MAIL_USE_FLOCK
+#undef MAIL_USE_LOCKF
+#undef MAIL_USE_FLOCK
+#ifdef REAL_MAIL_USE_FLOCK
+#define MAIL_USE_FLOCK
+#endif
+#ifdef REAL_MAIL_USE_LOCKF
+#define MAIL_USE_LOCKF
+#endif
 
 #endif /* _CONFIG_H_ */