X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fmktime.m4;h=94468eefa6a1d97b3225c9e5380c8e65377eb300;hb=69a9b8f8d7acc8677b5657adb83a8ba448737e0c;hp=4be030aa141e4763b83ac34739e75668d8f9e1b1;hpb=391b9b9a642f09d9b6303afdc6900f72eef20f9b;p=gnulib.git

diff --git a/m4/mktime.m4 b/m4/mktime.m4
index 4be030aa1..94468eefa 100644
--- a/m4/mktime.m4
+++ b/m4/mktime.m4
@@ -1,75 +1,25 @@
-#serial 2
+# mktime.m4 serial 1
+dnl Copyright (C) 2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
 
 dnl From Jim Meyering.
-dnl FIXME: this should migrate into libit.
 
-AC_DEFUN(AM_FUNC_MKTIME,
-[AC_REQUIRE([AC_HEADER_TIME])dnl
- AC_CHECK_HEADERS(sys/time.h)
- AC_CACHE_CHECK([for working mktime], am_cv_func_working_mktime,
-  [AC_TRY_RUN(
-changequote(<<, >>)dnl
-<</* Test program from Paul Eggert (eggert@twinsun.com)
-   and Tony Leneis (tony@plaza.ds.adp.com).  */
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
-#endif
-
-static time_t time_t_max;
-
-/* Values we'll use to set the TZ environment variable.  */
-static const char *const tz_strings[] = {
-  NULL, "GMT0", "JST-9", "EST+3EDT+2,M10.1.0/00:00:00,M2.3.0/00:00:00"
-};
-#define N_STRINGS (sizeof (tz_strings) / sizeof (tz_strings[0]))
-
-static void
-mktime_test (now)
-     time_t now;
-{
-  if (mktime (localtime (&now)) != now)
-    exit (1);
-  now = time_t_max - now;
-  if (mktime (localtime (&now)) != now)
-    exit (1);
-}
-
-int
-main ()
-{
-  time_t t, delta;
-  int i;
-
-  for (time_t_max = 1; 0 < time_t_max; time_t_max *= 2)
-    continue;
-  time_t_max--;
-  delta = time_t_max / 997; /* a suitable prime number */
-  for (i = 0; i < N_STRINGS; i++)
-    {
-      if (tz_strings[i])
-	putenv (tz_strings[i]);
-
-      for (t = 0; t <= time_t_max - delta; t += delta)
-	mktime_test (t);
-      mktime_test ((time_t) 60 * 60);
-      mktime_test ((time_t) 60 * 60 * 24);
-    }
-  exit (0);
-}
-	      >>,
-changequote([, ])dnl
-	     am_cv_func_working_mktime=yes, am_cv_func_working_mktime=no,
-	     dnl When crosscompiling, assume mktime is missing or broken.
-	     am_cv_func_working_mktime=no)
-  ])
-  if test $am_cv_func_working_mktime = no; then
-    LIBOBJS="$LIBOBJS mktime.o"
+AC_DEFUN([gl_FUNC_MKTIME],
+[
+  AC_REQUIRE([AC_FUNC_MKTIME])
+  if test $ac_cv_func_working_mktime = no; then
+    AC_DEFINE(mktime, rpl_mktime,
+      [Define to rpl_mktime if the replacement function should be used.])
+    gl_PREREQ_MKTIME
   fi
 ])
+
+# Prerequisites of lib/mktime.c.
+AC_DEFUN([gl_PREREQ_MKTIME], [
+  AC_REQUIRE([AC_HEADER_STDC])
+  AC_CHECK_HEADERS_ONCE(limits.h)
+])