X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fstrftime.m4;h=dd30ccfc0540a28107f770daee710191ec107b76;hb=49c136f53f6b22e91f2bb4c636e81e5930613d04;hp=b47ea8ccc355e7a59848d5cdaae312bcebec0e43;hpb=62a39c7d945eb4160c206242b85c624fb2fb21fd;p=gnulib.git diff --git a/m4/strftime.m4 b/m4/strftime.m4 index b47ea8ccc..dd30ccfc0 100644 --- a/m4/strftime.m4 +++ b/m4/strftime.m4 @@ -1,7 +1,6 @@ -#serial 24 +# serial 33 -# Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -# Free Software Foundation, Inc. +# Copyright (C) 1996-1997, 1999-2007, 2009-2011 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -10,29 +9,19 @@ # 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 +[ + gl_FUNC_STRFTIME ]) # These are the prerequisite macros for GNU's strftime.c replacement. AC_DEFUN([gl_FUNC_STRFTIME], [ - AC_LIBSOURCES([strftime.c, strftime.h]) - AC_LIBOBJ([strftime]) - - # 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_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]) - AC_CHECK_FUNCS_ONCE(mblen mbrlen mempcpy tzset) - AC_CHECK_HEADERS_ONCE(sys/time.h wchar.h) + AC_CHECK_FUNCS_ONCE([tzset]) AC_DEFINE([my_strftime], [nstrftime], [Define to the name of the strftime replacement function.])