diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2025-03-22 18:00:25 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2025-03-22 18:00:25 +0100 |
| commit | 0737819efdd0bae112d16d874cac7e747e43cd08 (patch) | |
| tree | 98a9ac84f7f347ae530c14852c68870682f3d04c /gnulib-m4/wcrtomb.m4 | |
| parent | 163a663518f33bab48b28431972e580b366b4d49 (diff) | |
| parent | e670957a8693f860cf7d77fed4ce6b4b056a8083 (diff) | |
Merge branch 'release/debian/1.3-1'debian/1.3-1
Diffstat (limited to 'gnulib-m4/wcrtomb.m4')
| -rw-r--r-- | gnulib-m4/wcrtomb.m4 | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/gnulib-m4/wcrtomb.m4 b/gnulib-m4/wcrtomb.m4 index f00f6452..cc0e935f 100644 --- a/gnulib-m4/wcrtomb.m4 +++ b/gnulib-m4/wcrtomb.m4 @@ -1,4 +1,5 @@ -# wcrtomb.m4 serial 19 +# wcrtomb.m4 +# serial 21 dnl Copyright (C) 2008-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -35,7 +36,7 @@ AC_DEFUN([gl_FUNC_WCRTOMB], dnl sometimes returns 0 instead of 1. AC_REQUIRE([AC_PROG_CC]) AC_REQUIRE([gt_LOCALE_FR]) - AC_REQUIRE([gt_LOCALE_FR_UTF8]) + AC_REQUIRE([gt_LOCALE_EN_UTF8]) AC_REQUIRE([gt_LOCALE_JA]) AC_REQUIRE([gt_LOCALE_ZH_CN]) AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles @@ -89,7 +90,7 @@ changequote(,)dnl gl_cv_func_wcrtomb_retval="guessing yes" ;; esac changequote([,])dnl - if test $LOCALE_FR != none || test $LOCALE_FR_UTF8 != none || test $LOCALE_JA != none || test $LOCALE_ZH_CN != none; then + if test $LOCALE_FR != none || test "$LOCALE_EN_UTF8" != none || test $LOCALE_JA != none || test $LOCALE_ZH_CN != none; then AC_RUN_IFELSE( [AC_LANG_SOURCE([[ #include <locale.h> @@ -105,8 +106,8 @@ int main () if (wcrtomb (NULL, 0, NULL) != 1) result |= 1; } - if (strcmp ("$LOCALE_FR_UTF8", "none") != 0 - && setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL) + if (strcmp ("$LOCALE_EN_UTF8", "none") != 0 + && setlocale (LC_ALL, "$LOCALE_EN_UTF8") != NULL) { if (wcrtomb (NULL, 0, NULL) != 1) result |= 2; |