(substitute-key-definition): Fix previous change.

[gnu-emacs] / src / config.in

diff --git a/src/config.in b/src/config.in
index d45248fdc99f6de5c5c146b85435d60b3b3add88..0ab350f0abe2d5dcc299a50469e4840dc9e25ff2 100644 (file)
--- a/src/config.in
+++ b/src/config.in
@@ -33,9 +33,12 @@ Boston, MA 02111-1307, USA.  */
    numbers. */
 #undef LISP_FLOAT_TYPE
 
-/* Define GNU_MALLOC if you want to use the *new* GNU memory allocator. */
+/* Define GNU_MALLOC if you want to use the GNU memory allocator. */
 #undef GNU_MALLOC
 
+/* Define if you are using the GNU C Library. */
+#undef DOUG_LEA_MALLOC
+
 /* Define REL_ALLOC if you want to use the relocating allocator for
    buffer space. */
 #undef REL_ALLOC
@@ -70,9 +73,6 @@ Boston, MA 02111-1307, USA.  */
 /* Define if netdb.h declares h_errno.  */
 #undef HAVE_H_ERRNO
 
-/* Nowadays we have frame objects even if we support only ASCII terminals.  */
-#define MULTI_FRAME
-
 /* If we're using any sort of window system, define some consequences.  */
 #ifdef HAVE_X_WINDOWS
 #define HAVE_WINDOW_SYSTEM
@@ -123,6 +123,9 @@ Boston, MA 02111-1307, USA.  */
 #undef HAVE_UNISTD_H
 #undef HAVE_UTIME_H
 #undef HAVE_LINUX_VERSION_H
+#undef HAVE_SYS_SYSTEMINFO_H
+#undef HAVE_TERMIOS_H
+#undef HAVE_LIMITS_H
 #undef STDC_HEADERS
 #undef TIME_WITH_SYS_TIME
 
@@ -134,6 +137,11 @@ Boston, MA 02111-1307, USA.  */
 #undef HAVE_LIBKRB
 #undef HAVE_LIBDES
 
+/* Mail-file locking */
+#undef HAVE_LIBMAIL
+#undef HAVE_MAILLOCK_H
+#undef HAVE_TOUCHLOCK
+
 #undef HAVE_ALLOCA_H
 
 #undef HAVE_GETTIMEOFDAY
@@ -144,6 +152,7 @@ Boston, MA 02111-1307, USA.  */
 #undef GETTIMEOFDAY_ONE_ARGUMENT
 #endif
 #undef HAVE_GETHOSTNAME
+#undef HAVE_GETDOMAINNAME
 #undef HAVE_DUP2
 #undef HAVE_RENAME
 #undef HAVE_CLOSEDIR
@@ -168,6 +177,7 @@ Boston, MA 02111-1307, USA.  */
 
 #undef HAVE_MKDIR
 #undef HAVE_RMDIR
+#undef HAVE_SYSINFO
 #undef HAVE_RANDOM
 #undef HAVE_LRAND48
 #undef HAVE_BCOPY
@@ -175,6 +185,8 @@ Boston, MA 02111-1307, USA.  */
 #undef HAVE_LOGB
 #undef HAVE_FREXP
 #undef HAVE_FMOD
+#undef HAVE_RINT
+#undef HAVE_CBRT
 #undef HAVE_FTIME
 #undef HAVE_RES_INIT /* For -lresolv on Suns.  */
 #undef HAVE_SETSID
@@ -185,6 +197,11 @@ Boston, MA 02111-1307, USA.  */
 #undef HAVE_GETPAGESIZE
 #undef HAVE_TZSET
 #undef HAVE_SETLOCALE
+#undef HAVE_UTIMES
+#undef HAVE_SETRLIMIT
+#undef HAVE_SETPGID
+#undef HAVE_GETCWD
+
 #undef LOCALTIME_CACHE
 #undef HAVE_INET_SOCKETS
 
@@ -194,8 +211,6 @@ Boston, MA 02111-1307, USA.  */
    Otherwise you must have the variable `char *sys_errlist[]'.  */
 #undef HAVE_STRERROR
 
-#undef HAVE_UTIMES
-
 /* Define if `sys_siglist' is declared by <signal.h>.  */
 #undef SYS_SIGLIST_DECLARED
 
@@ -310,6 +325,11 @@ Boston, MA 02111-1307, USA.  */
 #define RE_TRANSLATE_TYPE Lisp_Object *
 #endif
 
+/* Avoid link-time collision with system mktime if we will use our own.  */
+#if ! HAVE_MKTIME || BROKEN_MKTIME
+#define mktime emacs_mktime
+#endif
+
 /* The rest of the code currently tests the CPP symbol BSTRING.
    Override any claims made by the system-description files.
    Note that on some SCO version it is possible to have bcopy and not bcmp.  */