X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fstrftime.m4;h=356224009d99cc2bb67785ba043d2da840bbd8a3;hb=0f6dd806d5fd7c45d9366cd35c793958b14dd75b;hp=84a1996ae5446a689e94af52a9279810423a10d7;hpb=29ad412dbc385c088c5ad61b6f1856966c477b7f;p=gnulib.git

diff --git a/m4/strftime.m4 b/m4/strftime.m4
index 84a1996ae..356224009 100644
--- a/m4/strftime.m4
+++ b/m4/strftime.m4
@@ -1,41 +1,32 @@
-#serial 20
+# 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],
+# 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.
+
+# Written by Jim Meyering and Paul Eggert.
+
+AC_DEFUN([gl_FUNC_GNU_STRFTIME],
 [
- dnl strftime.c uses the underyling system strftime if it exists.
- AC_FUNC_STRFTIME
+  gl_FUNC_STRFTIME
+])
 
- AC_CHECK_HEADERS_ONCE(limits.h)
- AC_CHECK_FUNCS_ONCE(memcpy mempcpy)
- AC_CHECK_FUNCS(tzset memset)
+# These are the prerequisite macros for GNU's strftime.c replacement.
+AC_DEFUN([gl_FUNC_STRFTIME],
+[
+ AC_LIBOBJ([strftime])
 
  # This defines (or not) HAVE_TZNAME and HAVE_TM_ZONE.
- AC_STRUCT_TIMEZONE
-
- AC_CHECK_FUNCS(mblen mbrlen)
- AC_TYPE_MBSTATE_T
+ AC_REQUIRE([AC_STRUCT_TIMEZONE])
 
+ AC_REQUIRE([AC_TYPE_MBSTATE_T])
  AC_REQUIRE([gl_TM_GMTOFF])
- AC_REQUIRE([gl_FUNC_TZSET_CLOBBER])
-])
-
-dnl From Jim Meyering.
-dnl
-AC_DEFUN([jm_FUNC_GNU_STRFTIME],
-[AC_REQUIRE([AC_HEADER_TIME])dnl
 
- _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_ONCE(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
-])