(mktime):

Use BROKEN_MKTIME instead of system-specific macros to determine
whether mktime is broken.

diff --git a/src/config.in b/src/config.in
index b7332449925631c9d992182ed6bccccd063bb6ed..3925f242fd8736201a90647387aae48af800c68d 100644 (file)
--- a/src/config.in
+++ b/src/config.in
@@ -187,6 +187,7 @@ Boston, MA 02111-1307, USA.  */
 #undef HAVE_SETSID
 #undef HAVE_FPATHCONF
 #undef HAVE_SELECT
+#undef HAVE_MKTIME
 #undef HAVE_EUIDACCESS
 #undef HAVE_GETPAGESIZE
 #undef HAVE_TZSET
@@ -201,11 +202,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
@@ -324,6 +320,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.  */