X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fstrftime.m4;h=0143a2e9153a7879d1006a8d55ff4da59df3595b;hb=3f664fb52ec6909f47840e3c6101b8735edf5cfb;hp=1a0559eaae2f3b3fb2e69520681aa59426fd26f7;hpb=695ec95950cae0f110903706d339d9414470f6b3;p=gnulib.git

diff --git a/m4/strftime.m4 b/m4/strftime.m4
index 1a0559eaa..0143a2e91 100644
--- a/m4/strftime.m4
+++ b/m4/strftime.m4
@@ -1,45 +1,39 @@
-#serial 16
+#serial 22
 
 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,
+AC_DEFUN([_gl_STRFTIME_PREREQS],
 [
- dnl strftime.c uses localtime_r and the underyling system strftime
- dnl if they exist.
- AC_CHECK_FUNCS(localtime_r strftime)
+ dnl strftime.c uses the underyling system strftime if it exists.
+ 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.
 dnl
-AC_DEFUN(jm_FUNC_GNU_STRFTIME,
+AC_DEFUN([gl_FUNC_GNU_STRFTIME],
 [AC_REQUIRE([AC_HEADER_TIME])dnl
 
- _jm_STRFTIME_PREREQS
+ _gl_STRFTIME_PREREQS
 
  AC_REQUIRE([AC_C_CONST])dnl
- AC_REQUIRE([AC_HEADER_STDC])dnl
- AC_CHECK_HEADERS(sys/time.h)
- AC_LIBOBJ(strftime)
+ AC_CHECK_HEADERS_ONCE(sys/time.h)
  AC_DEFINE([my_strftime], [nstrftime],
    [Define to the name of the strftime replacement function.])
 ])
 
-AC_DEFUN(jm_FUNC_STRFTIME,
+AC_DEFUN([gl_FUNC_STRFTIME],
 [
-  _jm_STRFTIME_PREREQS
-  AC_REPLACE_FUNCS(strftime)
+  _gl_STRFTIME_PREREQS
 ])