unsupported locales on OpenBSD 4.0

[Bruno Haible]

On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
succeeds but then nl_langinfo(CODESET) is "646". In this situations,
some unit tests fail. This patch works around it.

2008-01-13  Bruno Haible  <address@hidden>

        * m4/locale-fr.m4 (gt_LOCALE_FR, gt_LOCALE_FR_UTF8): Check that the
        locale encoding is not ASCII. Needed for OpenBSD 4.0.
        * m4/locale-tr.m4 (gt_LOCALE_TR_UTF8): Likewise.
        * m4/locale-zh.m4 (gt_LOCALE_ZH_CN): Likewise.

*** m4/locale-fr.m4.orig        2008-01-13 17:45:32.000000000 +0100
--- m4/locale-fr.m4     2008-01-13 13:03:45.000000000 +0100
***************
*** 1,5 ****
! # locale-fr.m4 serial 7
! dnl Copyright (C) 2003, 2005-2007 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.
--- 1,5 ----
! # locale-fr.m4 serial 8
! dnl Copyright (C) 2003, 2005-2008 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.
***************
*** 44,54 ****
  int main () {
    /* Check whether the given locale name is recognized by the system.  */
    if (setlocale (LC_ALL, "") == NULL) return 1;
!   /* Check whether nl_langinfo(CODESET) is nonempty.
       On MacOS 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.  */
  #if HAVE_LANGINFO_CODESET
!   if (nl_langinfo (CODESET) [0] == '\0') return 1;
  #endif
  #ifdef __CYGWIN__
    /* On Cygwin, avoid locale names without encoding suffix, because the
--- 44,61 ----
  int main () {
    /* Check whether the given locale name is recognized by the system.  */
    if (setlocale (LC_ALL, "") == NULL) return 1;
!   /* 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)
!      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 situations,
!      some unit tests fail.  */
  #if HAVE_LANGINFO_CODESET
!   {
!     const char *cs = nl_langinfo (CODESET);
!     if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0)
!       return 1;
!   }
  #endif
  #ifdef __CYGWIN__
    /* On Cygwin, avoid locale names without encoding suffix, because the
***************
*** 132,142 ****
  #if !defined(__BEOS__)
    /* Check whether the given locale name is recognized by the system.  */
    if (setlocale (LC_ALL, "") == NULL) return 1;
!   /* Check whether nl_langinfo(CODESET) is nonempty.
       On MacOS 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.  */
  # if HAVE_LANGINFO_CODESET
!   if (nl_langinfo (CODESET) [0] == '\0') return 1;
  # endif
  # ifdef __CYGWIN__
    /* On Cygwin, avoid locale names without encoding suffix, because the
--- 139,156 ----
  #if !defined(__BEOS__)
    /* Check whether the given locale name is recognized by the system.  */
    if (setlocale (LC_ALL, "") == NULL) return 1;
!   /* 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)
!      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 situations,
!      some unit tests fail.  */
  # if HAVE_LANGINFO_CODESET
!   {
!     const char *cs = nl_langinfo (CODESET);
!     if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0)
!       return 1;
!   }
  # endif
  # ifdef __CYGWIN__
    /* On Cygwin, avoid locale names without encoding suffix, because the
*** m4/locale-tr.m4.orig        2008-01-13 17:45:32.000000000 +0100
--- m4/locale-tr.m4     2008-01-13 13:03:46.000000000 +0100
***************
*** 1,5 ****
! # locale-tr.m4 serial 4
! dnl Copyright (C) 2003, 2005-2007 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.
--- 1,5 ----
! # locale-tr.m4 serial 5
! dnl Copyright (C) 2003, 2005-2008 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.
***************
*** 30,40 ****
       program return 1 on BeOS.  */
    /* Check whether the given locale name is recognized by the system.  */
    if (setlocale (LC_ALL, "") == NULL) return 1;
!   /* Check whether nl_langinfo(CODESET) is nonempty.
       On MacOS X 10.3.5 (Darwin 7.5) in the tr_TR locale, nl_langinfo(CODESET)
!      is empty, and the behaviour of Tcl 8.4 in this locale is not useful.  */
  #if HAVE_LANGINFO_CODESET
!   if (nl_langinfo (CODESET) [0] == '\0') return 1;
  #endif
  #ifdef __CYGWIN__
    /* On Cygwin, avoid locale names without encoding suffix, because the
--- 30,47 ----
       program return 1 on BeOS.  */
    /* Check whether the given locale name is recognized by the system.  */
    if (setlocale (LC_ALL, "") == NULL) return 1;
!   /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
       On MacOS X 10.3.5 (Darwin 7.5) in the tr_TR 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 situations,
!      some unit tests fail.  */
  #if HAVE_LANGINFO_CODESET
!   {
!     const char *cs = nl_langinfo (CODESET);
!     if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0)
!       return 1;
!   }
  #endif
  #ifdef __CYGWIN__
    /* On Cygwin, avoid locale names without encoding suffix, because the
*** m4/locale-zh.m4.orig        2008-01-13 17:45:32.000000000 +0100
--- m4/locale-zh.m4     2008-01-13 13:03:46.000000000 +0100
***************
*** 1,5 ****
! # locale-zh.m4 serial 3
! dnl Copyright (C) 2003, 2005-2007 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.
--- 1,5 ----
! # locale-zh.m4 serial 4
! dnl Copyright (C) 2003, 2005-2008 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.
***************
*** 47,57 ****
    const char *p;
    /* Check whether the given locale name is recognized by the system.  */
    if (setlocale (LC_ALL, "") == NULL) return 1;
!   /* Check whether nl_langinfo(CODESET) is nonempty.
       On MacOS 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.  */
  #if HAVE_LANGINFO_CODESET
!   if (nl_langinfo (CODESET) [0] == '\0') return 1;
  #endif
  #ifdef __CYGWIN__
    /* On Cygwin, avoid locale names without encoding suffix, because the
--- 47,64 ----
    const char *p;
    /* Check whether the given locale name is recognized by the system.  */
    if (setlocale (LC_ALL, "") == NULL) return 1;
!   /* 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)
!      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 situations,
!      some unit tests fail.  */
  #if HAVE_LANGINFO_CODESET
!   {
!     const char *cs = nl_langinfo (CODESET);
!     if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0)
!       return 1;
!   }
  #endif
  #ifdef __CYGWIN__
    /* On Cygwin, avoid locale names without encoding suffix, because the