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

diff --git a/m4/jm-mktime.m4 b/m4/jm-mktime.m4
index ab78db707..5bb735762 100644
--- a/m4/jm-mktime.m4
+++ b/m4/jm-mktime.m4
@@ -1,14 +1,16 @@
-#serial 1
+#serial 7
 
 dnl From Jim Meyering.
-dnl If you use this macro in a package, you should
-dnl add the following two lines to acconfig.h:
-dnl   /* Define to rpl_mktime if the replacement function should be used.  */
-dnl   #undef mktime
-dnl
+dnl A wrapper around AC_FUNC_MKTIME.
+
 AC_DEFUN(jm_FUNC_MKTIME,
-[AC_REQUIRE([AM_FUNC_MKTIME])dnl
- if test $am_cv_func_working_mktime = no; then
-   AC_DEFINE_UNQUOTED(mktime, rpl_mktime)
+[AC_REQUIRE([AC_FUNC_MKTIME])dnl
+
+ dnl mktime.c uses localtime_r if it exists.  Check for it.
+ AC_CHECK_FUNCS(localtime_r)
+
+ if test $ac_cv_func_working_mktime = no; then
+   AC_DEFINE_UNQUOTED(mktime, rpl_mktime,
+    [Define to rpl_mktime if the replacement function should be used.])
  fi
 ])