--- a/src/config.h.in	Mon Aug 13 09:47:55 2007 +0200
+++ b/src/config.h.in	Mon Aug 13 09:49:09 2007 +0200
@@ -54,6 +54,9 @@
    for the lib-src programs. */
 #undef EMACS_CONFIGURATION
 
+/* The configuration options.  This is exported to Lisp. */
+#undef EMACS_CONFIG_OPTIONS
+
 /* The version info from version.sh. Used in #pragma ident in emacs.c */
 #undef EMACS_MAJOR_VERSION
 #undef EMACS_MINOR_VERSION
@@ -65,6 +68,9 @@
 /* Used to identify the XEmacs version in stack traces. */
 #undef CANONICAL_VERSION
 
+/* Allow the configurer to specify (additional) package directories. */
+#undef PACKAGE_PATH
+
 /* This will be removed in 19.15. */
 /* Hah!  Try 20.3 ... */
 /* Hah!  Try never ... */
@@ -164,9 +170,8 @@
 
 #undef HAVE_LONG_FILE_NAMES
 
-#ifdef HAVE_LONG_FILE_NAMES
-#define CLASH_DETECTION
-#endif
+/* Use lock files to detect multiple edits of the same file? */
+#undef CLASH_DETECTION
 
 #undef HAVE_LIBKSTAT
 #undef HAVE_LIBINTL
@@ -467,28 +472,6 @@
 #define SYSTEM_MALLOC
 #endif
 
-#if 0 /* RMSmacs */
-/* These typedefs shouldn't appear when alloca.s or Makefile.in
-   includes config.h.  */
-#ifndef NOT_C_CODE
-#ifndef SPECIAL_EMACS_INT
-typedef long EMACS_INT;
-typedef unsigned long EMACS_UINT;
-#endif
-#endif
-#endif /* 0 */
-
-/* Load in the conversion definitions if this system
-   needs them and the source file being compiled has not
-   said to inhibit this.  There should be no need for you
-   to alter these lines. */
-
-#ifdef SHORTNAMES
-#ifndef NO_SHORTNAMES
-#include "../shortnames/remap.h"
-#endif /* not NO_SHORTNAMES */
-#endif /* SHORTNAMES */
-
 /* Use the relocating allocator for buffer space? */
 #undef REL_ALLOC