Re: Compiling coreutils-5.0 on a Mac Powerbook under OS X

[Paul Eggert]

John Lowe <address@hidden> writes:

> Yes that does work.

Thanks.  I installed this change to gnulib and to coreutils.

The new strftime.m4 is still a bit odd -- why have two macros
gl_FUNC_GNU_STRFTIME and gl_FUNC_STRFTIME?  But I left that alone.

2004-11-09  Paul Eggert  <address@hidden>

        * lib/strftime.c (DO_MULTIBYTE): Check for wchar.h, too.
        * m4/strftime.m4: Add copyright notice.
        (_gl_STRFTIME_PREREQS): Remove.  Move its body to gl_FUNC_STRFTIME.
        (gl_FUNC_STRFTIME): Use AC_CHECK_FUNCS_ONCE and AC_CHECK_HEADERS_ONCE
        and AC_REQUIRE when possible, to avoid duplicate checks.
        Check for <wchar.h>.

Index: lib/strftime.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/strftime.c,v
retrieving revision 1.74
diff -p -u -r1.74 strftime.c
--- lib/strftime.c      30 Sep 2003 06:11:03 -0000      1.74
+++ lib/strftime.c      9 Nov 2004 20:49:37 -0000
@@ -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 address@hidden
@@ -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
Index: m4/strftime.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/strftime.m4,v
retrieving revision 1.30
diff -p -u -r1.30 strftime.m4
--- m4/strftime.m4      18 Apr 2004 18:12:50 -0000      1.30
+++ m4/strftime.m4      9 Nov 2004 20:49:37 -0000
@@ -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 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 defines (or not) HAVE_TZNAME and HAVE_TM_ZONE.
- AC_STRUCT_TIMEZONE
+# 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],
+[
+ # strftime.c uses the underyling system strftime if it exists.
+ AC_REQUIRE([AC_FUNC_STRFTIME])
 
- AC_CHECK_FUNCS(mblen mbrlen)
- AC_TYPE_MBSTATE_T
+ # 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])
-])
 
-dnl From Jim Meyering.
-dnl
-AC_DEFUN([gl_FUNC_GNU_STRFTIME],
-[AC_REQUIRE([AC_HEADER_TIME])dnl
+ AC_CHECK_FUNCS_ONCE(mblen mbrlen mempcpy tzset)
+ AC_CHECK_HEADERS_ONCE(sys/time.h wchar.h)
 
- _gl_STRFTIME_PREREQS
-
- 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([gl_FUNC_STRFTIME],
-[
-  _gl_STRFTIME_PREREQS
-])