diff options
Diffstat (limited to 'gl/m4/wcrtomb.m4')
| -rw-r--r-- | gl/m4/wcrtomb.m4 | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/gl/m4/wcrtomb.m4 b/gl/m4/wcrtomb.m4 index 35dff6f0..91530176 100644 --- a/gl/m4/wcrtomb.m4 +++ b/gl/m4/wcrtomb.m4 | |||
| @@ -1,9 +1,10 @@ | |||
| 1 | # wcrtomb.m4 | 1 | # wcrtomb.m4 |
| 2 | # serial 19 | 2 | # serial 21 |
| 3 | dnl Copyright (C) 2008-2024 Free Software Foundation, Inc. | 3 | dnl Copyright (C) 2008-2025 Free Software Foundation, Inc. |
| 4 | dnl This file is free software; the Free Software Foundation | 4 | dnl This file is free software; the Free Software Foundation |
| 5 | dnl gives unlimited permission to copy and/or distribute it, | 5 | dnl gives unlimited permission to copy and/or distribute it, |
| 6 | dnl with or without modifications, as long as this notice is preserved. | 6 | dnl with or without modifications, as long as this notice is preserved. |
| 7 | dnl This file is offered as-is, without any warranty. | ||
| 7 | 8 | ||
| 8 | AC_DEFUN([gl_FUNC_WCRTOMB], | 9 | AC_DEFUN([gl_FUNC_WCRTOMB], |
| 9 | [ | 10 | [ |
| @@ -36,7 +37,7 @@ AC_DEFUN([gl_FUNC_WCRTOMB], | |||
| 36 | dnl sometimes returns 0 instead of 1. | 37 | dnl sometimes returns 0 instead of 1. |
| 37 | AC_REQUIRE([AC_PROG_CC]) | 38 | AC_REQUIRE([AC_PROG_CC]) |
| 38 | AC_REQUIRE([gt_LOCALE_FR]) | 39 | AC_REQUIRE([gt_LOCALE_FR]) |
| 39 | AC_REQUIRE([gt_LOCALE_FR_UTF8]) | 40 | AC_REQUIRE([gt_LOCALE_EN_UTF8]) |
| 40 | AC_REQUIRE([gt_LOCALE_JA]) | 41 | AC_REQUIRE([gt_LOCALE_JA]) |
| 41 | AC_REQUIRE([gt_LOCALE_ZH_CN]) | 42 | AC_REQUIRE([gt_LOCALE_ZH_CN]) |
| 42 | AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles | 43 | AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles |
| @@ -90,7 +91,7 @@ changequote(,)dnl | |||
| 90 | gl_cv_func_wcrtomb_retval="guessing yes" ;; | 91 | gl_cv_func_wcrtomb_retval="guessing yes" ;; |
| 91 | esac | 92 | esac |
| 92 | changequote([,])dnl | 93 | changequote([,])dnl |
| 93 | if test $LOCALE_FR != none || test $LOCALE_FR_UTF8 != none || test $LOCALE_JA != none || test $LOCALE_ZH_CN != none; then | 94 | if test $LOCALE_FR != none || test "$LOCALE_EN_UTF8" != none || test $LOCALE_JA != none || test $LOCALE_ZH_CN != none; then |
| 94 | AC_RUN_IFELSE( | 95 | AC_RUN_IFELSE( |
| 95 | [AC_LANG_SOURCE([[ | 96 | [AC_LANG_SOURCE([[ |
| 96 | #include <locale.h> | 97 | #include <locale.h> |
| @@ -106,8 +107,8 @@ int main () | |||
| 106 | if (wcrtomb (NULL, 0, NULL) != 1) | 107 | if (wcrtomb (NULL, 0, NULL) != 1) |
| 107 | result |= 1; | 108 | result |= 1; |
| 108 | } | 109 | } |
| 109 | if (strcmp ("$LOCALE_FR_UTF8", "none") != 0 | 110 | if (strcmp ("$LOCALE_EN_UTF8", "none") != 0 |
| 110 | && setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL) | 111 | && setlocale (LC_ALL, "$LOCALE_EN_UTF8") != NULL) |
| 111 | { | 112 | { |
| 112 | if (wcrtomb (NULL, 0, NULL) != 1) | 113 | if (wcrtomb (NULL, 0, NULL) != 1) |
| 113 | result |= 2; | 114 | result |= 2; |
