X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fstrftime.m4;h=64cdf2b6aec7a94dba1a0b53e0eb44e8811736ce;hb=fa3d6ff6dda795a2d9a3a1fff4b0b7e18084b59d;hp=dfcf320bdebbc3588566b6dd535b2fdec8bf3568;hpb=addf390dade7222ee4a0183c413937065f3d0ea7;p=gnulib.git

diff --git a/m4/strftime.m4 b/m4/strftime.m4
index dfcf320bd..64cdf2b6a 100644
--- a/m4/strftime.m4
+++ b/m4/strftime.m4
@@ -1,39 +1,38 @@
-#serial 21
+#serial 25
 
-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, 2000, 2001, 2002, 2003, 2004, 2005
+# 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],
+[AC_REQUIRE([gl_FUNC_STRFTIME])dnl
+ AC_REQUIRE([AC_C_CONST])dnl
+])
+
+# These are the prerequisite macros for GNU's strftime.c replacement.
+AC_DEFUN([gl_FUNC_STRFTIME],
 [
- dnl strftime.c uses the underyling system strftime if it exists.
- AC_FUNC_STRFTIME
+ AC_LIBSOURCES([strftime.c, strftime.h])
+ AC_LIBOBJ([strftime])
 
- AC_CHECK_FUNCS_ONCE(mempcpy)
- AC_CHECK_FUNCS(tzset)
+ # strftime.c uses the underyling system strftime if it exists.
+ AC_REQUIRE([AC_FUNC_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_HEADER_TIME])
+ 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(mblen mbrlen mempcpy tzset)
+ AC_CHECK_HEADERS_ONCE(sys/time.h wchar.h)
 
- AC_REQUIRE([AC_C_CONST])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
-])