X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fstrftime.m4;h=dfcf320bdebbc3588566b6dd535b2fdec8bf3568;hb=f68c57a7466a299f333352b6d6c958a3a36c0e3c;hp=219a3fd6ab2bfa33599b7bf330b6fc0a0562947d;hpb=84574c0b3f9981ea446358f6ad80f072ac270661;p=gnulib.git

diff --git a/m4/strftime.m4 b/m4/strftime.m4
index 219a3fd6a..dfcf320bd 100644
--- a/m4/strftime.m4
+++ b/m4/strftime.m4
@@ -1,25 +1,23 @@
-#serial 17
+#serial 21
 
 dnl This macro is intended to be used solely in this file.
 dnl These are the prerequisite macros for GNU's strftime.c replacement.
 AC_DEFUN([_jm_STRFTIME_PREREQS],
 [
  dnl strftime.c uses the underyling system strftime if it exists.
- AC_CHECK_FUNCS(strftime)
+ AC_FUNC_STRFTIME
 
- AC_CHECK_HEADERS(limits.h)
- AC_CHECK_FUNCS(bcopy tzset mempcpy memcpy memset)
+ AC_CHECK_FUNCS_ONCE(mempcpy)
+ AC_CHECK_FUNCS(tzset)
 
  # This defines (or not) HAVE_TZNAME and HAVE_TM_ZONE.
  AC_STRUCT_TIMEZONE
 
  AC_CHECK_FUNCS(mblen mbrlen)
+ AC_TYPE_MBSTATE_T
 
- AC_CHECK_MEMBER([struct tm.tm_gmtoff],
-                 [AC_DEFINE(HAVE_TM_GMTOFF, 1,
-                            [Define if struct tm has the tm_gmtoff member.])],
-                 ,
-                 [#include <time.h>])
+ AC_REQUIRE([gl_TM_GMTOFF])
+ AC_REQUIRE([gl_FUNC_TZSET_CLOBBER])
 ])
 
 dnl From Jim Meyering.
@@ -30,8 +28,7 @@ AC_DEFUN([jm_FUNC_GNU_STRFTIME],
  _jm_STRFTIME_PREREQS
 
  AC_REQUIRE([AC_C_CONST])dnl
- AC_REQUIRE([AC_HEADER_STDC])dnl
- AC_CHECK_HEADERS(sys/time.h)
+ AC_CHECK_HEADERS_ONCE(sys/time.h)
  AC_DEFINE([my_strftime], [nstrftime],
    [Define to the name of the strftime replacement function.])
 ])