X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fjm-mktime.m4;h=af3611793b3b00bf29c4e0667e46b4b8c602820a;hb=f1df5643e969a40ddeeaf350724ef5c03f8170a3;hp=ab78db7079ad38b052eee95e3e12d52bdb0e1e16;hpb=409d8f2d902cc6e12e40b08200f5dac27d0e98cb;p=gnulib.git

diff --git a/m4/jm-mktime.m4 b/m4/jm-mktime.m4
index ab78db707..af3611793 100644
--- a/m4/jm-mktime.m4
+++ b/m4/jm-mktime.m4
@@ -1,4 +1,4 @@
-#serial 1
+#serial 3
 
 dnl From Jim Meyering.
 dnl If you use this macro in a package, you should
@@ -7,8 +7,12 @@ dnl   /* Define to rpl_mktime if the replacement function should be used.  */
 dnl   #undef mktime
 dnl
 AC_DEFUN(jm_FUNC_MKTIME,
-[AC_REQUIRE([AM_FUNC_MKTIME])dnl
- if test $am_cv_func_working_mktime = no; then
+[AC_REQUIRE([jm_AM_FUNC_MKTIME])dnl
+
+ dnl mktime.c uses localtime_r if it exists.  Check for it.
+ AC_CHECK_FUNCS(localtime_r)
+
+ if test $jm_am_cv_func_working_mktime = no; then
    AC_DEFINE_UNQUOTED(mktime, rpl_mktime)
  fi
 ])