Sync from gnulib.

2 files changed, 36 insertions, 28 deletions

diff --git a/lib/strftime.c b/lib/strftime.c
index dccbaf7a1..2ef27c22a 100644
--- a/lib/strftime.c
+++ b/lib/strftime.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 1991-1999, 2000, 2001, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 1991-1999, 2000, 2001, 2003, 2004 Free Software
+   Foundation, Inc.
 
    NOTE: The canonical source of this file is maintained with the GNU C Library.
    Bugs can be reported to bug-glibc@prep.ai.mit.edu.
@@ -56,7 +57,7 @@ extern char *tzname[];
    conversion specifications.  The GNU C Library uses UTF8 multibyte
    encoding, which is safe for formats, but strftime.c can be used
    with other C libraries that use unsafe encodings.  */
-#define DO_MULTIBYTE (HAVE_MBLEN && ! MULTIBYTE_IS_FORMAT_SAFE)
+#define DO_MULTIBYTE (HAVE_MBLEN && HAVE_WCHAR_H && ! MULTIBYTE_IS_FORMAT_SAFE)
 
 #if DO_MULTIBYTE
 # if HAVE_MBRLEN
diff --git a/m4/strftime.m4 b/m4/strftime.m4
index 0143a2e91..e28224d68 100644
--- a/m4/strftime.m4
+++ b/m4/strftime.m4
@@ -1,39 +1,46 @@
-#serial 22
+#serial 23
 
-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([_gl_STRFTIME_PREREQS],
-[
- dnl strftime.c uses the underyling system strftime if it exists.
- AC_FUNC_STRFTIME
+# Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2004
+# Free Software Foundation, Inc.
 
- AC_CHECK_FUNCS_ONCE(mempcpy)
- AC_CHECK_FUNCS(tzset)
+# 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 defines (or not) HAVE_TZNAME and HAVE_TM_ZONE.
- AC_STRUCT_TIMEZONE
+# 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.
 
- AC_CHECK_FUNCS(mblen mbrlen)
- AC_TYPE_MBSTATE_T
+# 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.
 
- AC_REQUIRE([gl_TM_GMTOFF])
- AC_REQUIRE([gl_FUNC_TZSET_CLOBBER])
-])
+# Written by Jim Meyering and Paul Eggert.
 
-dnl From Jim Meyering.
-dnl
 AC_DEFUN([gl_FUNC_GNU_STRFTIME],
-[AC_REQUIRE([AC_HEADER_TIME])dnl
-
- _gl_STRFTIME_PREREQS
-
+[AC_REQUIRE([gl_FUNC_STRFTIME])dnl
  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.])
 ])
 
+# These are the prerequisite macros for GNU's strftime.c replacement.
 AC_DEFUN([gl_FUNC_STRFTIME],
 [
-  _gl_STRFTIME_PREREQS
+ # 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_DEFINE([my_strftime], [nstrftime],
+   [Define to the name of the strftime replacement function.])
 ])