X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fstrftime.m4;h=356224009d99cc2bb67785ba043d2da840bbd8a3;hb=062cad2d07081f9a60adbb90fc1184a435a1a93f;hp=1a1423c71d20b5494763e4f9bb8d71cf4d092e30;hpb=76369d8f08d84e0288f09c507c4d04815ab9c9a6;p=gnulib.git

diff --git a/m4/strftime.m4 b/m4/strftime.m4
index 1a1423c71..356224009 100644
--- a/m4/strftime.m4
+++ b/m4/strftime.m4
@@ -1,43 +1,32 @@
-#serial 16
+# serial 32
 
-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 localtime_r and the underyling system strftime
- dnl if they exist.
- AC_CHECK_FUNCS(localtime_r strftime)
+# Copyright (C) 1996-1997, 1999-2007, 2009-2010 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
- AC_CHECK_HEADERS(limits.h)
- AC_CHECK_FUNCS(bcopy tzset mempcpy memcpy memset)
+# Written by Jim Meyering and Paul Eggert.
 
- # This defines (or not) HAVE_TZNAME and HAVE_TM_ZONE.
- AC_STRUCT_TIMEZONE
+AC_DEFUN([gl_FUNC_GNU_STRFTIME],
+[
+  gl_FUNC_STRFTIME
+])
 
- AC_CHECK_FUNCS(mblen mbrlen)
+# These are the prerequisite macros for GNU's strftime.c replacement.
+AC_DEFUN([gl_FUNC_STRFTIME],
+[
+ AC_LIBOBJ([strftime])
 
- 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>])
-])
+ # This defines (or not) HAVE_TZNAME and HAVE_TM_ZONE.
+ AC_REQUIRE([AC_STRUCT_TIMEZONE])
 
-dnl From Jim Meyering.
-dnl
-AC_DEFUN(jm_FUNC_GNU_STRFTIME,
-[AC_REQUIRE([AC_HEADER_TIME])dnl
+ AC_REQUIRE([AC_TYPE_MBSTATE_T])
+ AC_REQUIRE([gl_TM_GMTOFF])
 
- _jm_STRFTIME_PREREQS
+ AC_CHECK_FUNCS_ONCE([tzset])
+ AC_CHECK_HEADERS_ONCE([wchar.h])
 
- AC_REQUIRE([AC_C_CONST])dnl
- AC_REQUIRE([AC_HEADER_STDC])dnl
- AC_CHECK_HEADERS(sys/time.h)
  AC_DEFINE([my_strftime], [nstrftime],
    [Define to the name of the strftime replacement function.])
 ])
-
-AC_DEFUN(jm_FUNC_STRFTIME,
-[
-  _jm_STRFTIME_PREREQS
-])