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

diff --git a/m4/strftime.m4 b/m4/strftime.m4
index e28224d68..64cdf2b6a 100644
--- a/m4/strftime.m4
+++ b/m4/strftime.m4
@@ -1,21 +1,11 @@
-#serial 23
+#serial 25
 
-# Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2004
+# Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2004, 2005
 # Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# 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.
 
@@ -27,6 +17,9 @@ AC_DEFUN([gl_FUNC_GNU_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])
 
@@ -36,7 +29,6 @@ AC_DEFUN([gl_FUNC_STRFTIME],
  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)