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

[gnu-emacs] / src / config.in

diff --git a/src/config.in b/src/config.in
index e09c9f52a62c0c962e18b162454cfe8869ce5c4c..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
@@ -122,6 +125,7 @@ Boston, MA 02111-1307, USA.  */
 #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
 
@@ -133,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
@@ -176,11 +185,14 @@ 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
 #undef HAVE_FPATHCONF
 #undef HAVE_SELECT
+#undef HAVE_MKTIME
 #undef HAVE_EUIDACCESS
 #undef HAVE_GETPAGESIZE
 #undef HAVE_TZSET
@@ -195,11 +207,6 @@ Boston, MA 02111-1307, USA.  */
 
 #undef HAVE_AIX_SMT_EXP
 
-#undef HAVE_MKTIME
-#if ! HAVE_MKTIME || defined (_NEXT_SOURCE)
-#define mktime emacs_mktime
-#endif
-
 /* Define if you have the ANSI `strerror' function.
    Otherwise you must have the variable `char *sys_errlist[]'.  */
 #undef HAVE_STRERROR
@@ -318,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.  */