X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Flocale-zh.m4;h=4eed73f4062eee13a53e7ca186c76dba6ca4b35f;hb=4ec4a8e6d91a7247cf7d5b819572026ef5e654c3;hp=0cf5adacc466df3627a1e2f894f319cd4321acb7;hpb=a4d796fb141dac5d85328872e2fefbd5c44870e1;p=gnulib.git diff --git a/m4/locale-zh.m4 b/m4/locale-zh.m4 index 0cf5adacc..4eed73f40 100644 --- a/m4/locale-zh.m4 +++ b/m4/locale-zh.m4 @@ -1,5 +1,5 @@ -# locale-zh.m4 serial 11 -dnl Copyright (C) 2003, 2005-2012 Free Software Foundation, Inc. +# locale-zh.m4 serial 12 +dnl Copyright (C) 2003, 2005-2013 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -40,7 +40,7 @@ int main () if (setlocale (LC_ALL, "") == NULL) return 1; #endif /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646". - On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) + On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) is empty, and the behaviour of Tcl 8.4 in this locale is not useful. On OpenBSD 4.0, when an unsupported locale is specified, setlocale() succeeds but then nl_langinfo(CODESET) is "646". In this situation, @@ -101,7 +101,7 @@ changequote([,])dnl ;; *) # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because - # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the + # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the # configure script would override the LC_ALL setting. Likewise for # LC_CTYPE, which is also set at the beginning of the configure script. # Test for the locale name without encoding suffix.