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

diff --git a/m4/strftime.m4 b/m4/strftime.m4
index 219a3fd6a..7abad56dc 100644
--- a/m4/strftime.m4
+++ b/m4/strftime.m4
@@ -1,42 +1,33 @@
-#serial 17
+#serial 28
 
-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)
+# Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+# 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],
+[AC_REQUIRE([gl_FUNC_STRFTIME])dnl
+])
 
- 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_HEADER_TIME])
+ AC_REQUIRE([AC_TYPE_MBSTATE_T])
+ AC_REQUIRE([gl_TM_GMTOFF])
 
- _jm_STRFTIME_PREREQS
+ AC_CHECK_FUNCS_ONCE(mblen mbrlen mempcpy tzset)
+ AC_CHECK_HEADERS_ONCE(sys/time.h 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
-])