Some more configure tests use the LOCALE_FR_UTF8 value. This patch changes
them to use the LOCALE_EN_UTF8 value instead, thus making the configure
tests produce actual results instead of guesses.
The real effects are:
OpenBSD:
$ diff openbsd-config.cache-before openbsd-config.cache
330c330
<
gl_cv_func_mbrtoc16_null_destination=${gl_cv_func_mbrtoc16_null_destination='guessing
yes'}
---
> gl_cv_func_mbrtoc16_null_destination=${gl_cv_func_mbrtoc16_null_destination=no}
Android:
$ diff android-config.cache-before android-config.cache
348c348
<
gl_cv_func_mbrtoc16_null_destination=${gl_cv_func_mbrtoc16_null_destination='guessing
yes'}
---
> gl_cv_func_mbrtoc16_null_destination=${gl_cv_func_mbrtoc16_null_destination='no'}
Haiku:
$ diff haiku-config.cache-before haiku-config.cache
429c429
< gl_cv_macro_MB_CUR_MAX_good=${gl_cv_macro_MB_CUR_MAX_good='guessing yes'}
---
> gl_cv_macro_MB_CUR_MAX_good=${gl_cv_macro_MB_CUR_MAX_good=no}
So, this demonstrates that two configure tests produced incorrect guesses.
2024-08-31 Bruno Haible <br...@clisp.org>
Strengthen LC_CTYPE configure tests on OpenBSD, Android, Haiku.
* m4/mbrlen.m4 (gl_MBRLEN_RETVAL): Require gt_LOCALE_EN_UTF8 instead of
gt_LOCALE_FR_UTF8. Use LOCALE_EN_UTF8 instead of LOCALE_FR_UTF8.
* m4/mbrtowc.m4 (gl_MBRTOWC_INCOMPLETE_STATE, gl_MBRTOWC_SANITYCHECK,
gl_MBRTOWC_NULL_ARG1, gl_MBRTOWC_NULL_ARG2, gl_MBRTOWC_RETVAL,
gl_MBRTOWC_STORES_INCOMPLETE): Likewise.
* m4/mbsrtowcs.m4 (gl_MBSRTOWCS_WORKS): Likewise.
* m4/wcrtomb.m4 (gl_FUNC_WCRTOMB): Likewise.
* m4/mbrtoc16.m4 (gl_MBRTOC16_NULL_DESTINATION): Require
gt_LOCALE_EN_UTF8 instead of gt_LOCALE_FR_UTF8. Use LOCALE_EN_UTF8
instead of LOCALE_FR_UTF8. Update cross-compilation guess.
* m4/stdlib_h.m4 (gl_STDLIB_H): Likewise.
* modules/btowc (Files): Add m4/locale-en.m4.
* modules/c32isalnum (Files): Likewise.
* modules/c32isalpha (Files): Likewise.
* modules/c32isblank (Files): Likewise.
* modules/c32iscntrl (Files): Likewise.
* modules/c32isdigit (Files): Likewise.
* modules/c32isgraph (Files): Likewise.
* modules/c32islower (Files): Likewise.
* modules/c32isprint (Files): Likewise.
* modules/c32ispunct (Files): Likewise.
* modules/c32isspace (Files): Likewise.
* modules/c32isupper (Files): Likewise.
* modules/c32isxdigit (Files): Likewise.
* modules/c32rtomb (Files): Likewise.
* modules/c32tob (Files): Likewise.
* modules/c32tolower (Files): Likewise.
* modules/c32toupper (Files): Likewise.
* modules/c32width (Files): Likewise.
* modules/iswdigit (Files): Likewise.
* modules/mbrtoc16 (Files): Likewise.
* modules/mbrtoc32 (Files): Likewise.
* modules/mbsnrtowcs (Files): Likewise.
* modules/mbsrtowcs (Files): Likewise.
* modules/wcrtomb (Files): Likewise.
* modules/wcsnrtombs (Files): Likewise.
* modules/wcsrtombs (Files): Likewise.
* modules/wctob (Files): Likewise.
* modules/mbrlen (Files): Add m4/locale-en.m4. Remove m4/locale-fr.m4.
* modules/mbrtowc (Files): Likewise.
* modules/stdlib (Files): Likewise.
diff --git a/m4/mbrlen.m4 b/m4/mbrlen.m4
index f7fad22d67..5602c0596b 100644
--- a/m4/mbrlen.m4
+++ b/m4/mbrlen.m4
@@ -1,5 +1,5 @@
# mbrlen.m4
-# serial 12
+# serial 13
dnl Copyright (C) 2008, 2010-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,
@@ -91,7 +91,7 @@ AC_DEFUN([gl_MBRLEN_INCOMPLETE_STATE]
AC_DEFUN([gl_MBRLEN_RETVAL],
[
AC_REQUIRE([AC_PROG_CC])
- AC_REQUIRE([gt_LOCALE_FR_UTF8])
+ AC_REQUIRE([gt_LOCALE_EN_UTF8])
AC_REQUIRE([gt_LOCALE_JA])
AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
AC_CACHE_CHECK([whether mbrlen has a correct return value],
@@ -107,7 +107,7 @@ AC_DEFUN([gl_MBRLEN_RETVAL]
*) gl_cv_func_mbrlen_retval="guessing yes" ;;
esac
changequote([,])dnl
- if test $LOCALE_FR_UTF8 != none || test $LOCALE_JA != none; then
+ if test $LOCALE_EN_UTF8 != none || test $LOCALE_JA != none; then
AC_RUN_IFELSE(
[AC_LANG_SOURCE([[
#include <locale.h>
@@ -117,8 +117,8 @@ AC_DEFUN([gl_MBRLEN_RETVAL]
{
int result = 0;
/* This fails on Solaris. */
- 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)
{
char input[] = "B\303\274\303\237er"; /* "Büßer" */
mbstate_t state;
diff --git a/m4/mbrtoc16.m4 b/m4/mbrtoc16.m4
index c1033cb61f..a562c7dc7b 100644
--- a/m4/mbrtoc16.m4
+++ b/m4/mbrtoc16.m4
@@ -1,5 +1,5 @@
# mbrtoc16.m4
-# serial 2
+# serial 3
dnl Copyright (C) 2014-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,
@@ -73,7 +73,7 @@ AC_DEFUN([gl_MBRTOC16_NULL_DESTINATION]
[
AC_REQUIRE([AC_PROG_CC])
AC_REQUIRE([gl_TYPE_CHAR16_T])
- AC_REQUIRE([gt_LOCALE_FR_UTF8])
+ AC_REQUIRE([gt_LOCALE_EN_UTF8])
AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
AC_CACHE_CHECK([whether mbrtoc16 supports a NULL destination],
[gl_cv_func_mbrtoc16_null_destination],
@@ -82,13 +82,15 @@ AC_DEFUN([gl_MBRTOC16_NULL_DESTINATION]
dnl is present.
changequote(,)dnl
case "$host_os" in
- # Guess no on glibc systems.
- *-gnu* | gnu*) gl_cv_func_mbrtoc16_null_destination="guessing no" ;;
- # Guess yes otherwise.
- *) gl_cv_func_mbrtoc16_null_destination="guessing yes" ;;
+ # Guess no on glibc systems, on OpenBSD, and on Android.
+ *-gnu* | gnu* | openbsd* | *-android*)
+ gl_cv_func_mbrtoc16_null_destination="guessing no" ;;
+ # Guess yes otherwise.
+ *)
+ gl_cv_func_mbrtoc16_null_destination="guessing yes" ;;
esac
changequote([,])dnl
- if test $LOCALE_FR_UTF8 != none; then
+ if test $LOCALE_EN_UTF8 != none; then
AC_RUN_IFELSE(
[AC_LANG_SOURCE([[
#include <locale.h>
@@ -100,7 +102,7 @@ AC_DEFUN([gl_MBRTOC16_NULL_DESTINATION]
int
main (void)
{
- if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") == NULL
+ if (setlocale (LC_ALL, "$LOCALE_EN_UTF8") == NULL
return 1;
mbstate_t state;
size_t ret;
diff --git a/m4/mbrtowc.m4 b/m4/mbrtowc.m4
index 4ea8184049..618ab8ffe1 100644
--- a/m4/mbrtowc.m4
+++ b/m4/mbrtowc.m4
@@ -1,5 +1,5 @@
# mbrtowc.m4
-# serial 44
+# serial 45
dnl Copyright (C) 2001-2002, 2004-2005, 2008-2024 Free Software Foundation,
dnl Inc.
dnl This file is free software; the Free Software Foundation
@@ -160,7 +160,7 @@ AC_DEFUN([gl_MBRTOWC_INCOMPLETE_STATE]
[
AC_REQUIRE([AC_PROG_CC])
AC_REQUIRE([gt_LOCALE_JA])
- AC_REQUIRE([gt_LOCALE_FR_UTF8])
+ AC_REQUIRE([gt_LOCALE_EN_UTF8])
AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
AC_CACHE_CHECK([whether mbrtowc handles incomplete characters],
[gl_cv_func_mbrtowc_incomplete_state],
@@ -200,7 +200,7 @@ AC_DEFUN([gl_MBRTOWC_INCOMPLETE_STATE]
[gl_cv_func_mbrtowc_incomplete_state=no],
[:])
else
- if test $LOCALE_FR_UTF8 != none; then
+ if test $LOCALE_EN_UTF8 != none; then
AC_RUN_IFELSE(
[AC_LANG_SOURCE([[
#include <locale.h>
@@ -208,7 +208,7 @@ AC_DEFUN([gl_MBRTOWC_INCOMPLETE_STATE]
#include <wchar.h>
int main ()
{
- if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL)
+ if (setlocale (LC_ALL, "$LOCALE_EN_UTF8") != NULL)
{
const char input[] = "B\303\274\303\237er"; /* "Büßer" */
mbstate_t state;
@@ -288,7 +288,7 @@ AC_DEFUN([gl_MBRTOWC_SANITYCHECK]
AC_DEFUN([gl_MBRTOWC_NULL_ARG1],
[
AC_REQUIRE([AC_PROG_CC])
- AC_REQUIRE([gt_LOCALE_FR_UTF8])
+ AC_REQUIRE([gt_LOCALE_EN_UTF8])
AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
AC_CACHE_CHECK([whether mbrtowc handles a NULL pwc argument],
[gl_cv_func_mbrtowc_null_arg1],
@@ -303,7 +303,7 @@ AC_DEFUN([gl_MBRTOWC_NULL_ARG1]
*) gl_cv_func_mbrtowc_null_arg1="guessing yes" ;;
esac
changequote([,])dnl
- if test $LOCALE_FR_UTF8 != none; then
+ if test $LOCALE_EN_UTF8 != none; then
AC_RUN_IFELSE(
[AC_LANG_SOURCE([[
#include <locale.h>
@@ -314,7 +314,7 @@ AC_DEFUN([gl_MBRTOWC_NULL_ARG1]
{
int result = 0;
- if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL)
+ if (setlocale (LC_ALL, "$LOCALE_EN_UTF8") != NULL)
{
char input[] = "\303\237er";
mbstate_t state;
@@ -351,7 +351,7 @@ AC_DEFUN([gl_MBRTOWC_NULL_ARG1]
AC_DEFUN([gl_MBRTOWC_NULL_ARG2],
[
AC_REQUIRE([AC_PROG_CC])
- AC_REQUIRE([gt_LOCALE_FR_UTF8])
+ AC_REQUIRE([gt_LOCALE_EN_UTF8])
AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
AC_CACHE_CHECK([whether mbrtowc handles a NULL string argument],
[gl_cv_func_mbrtowc_null_arg2],
@@ -366,7 +366,7 @@ AC_DEFUN([gl_MBRTOWC_NULL_ARG2]
*) gl_cv_func_mbrtowc_null_arg2="guessing yes" ;;
esac
changequote([,])dnl
- if test $LOCALE_FR_UTF8 != none; then
+ if test $LOCALE_EN_UTF8 != none; then
AC_RUN_IFELSE(
[AC_LANG_SOURCE([[
#include <locale.h>
@@ -374,7 +374,7 @@ AC_DEFUN([gl_MBRTOWC_NULL_ARG2]
#include <wchar.h>
int main ()
{
- if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL)
+ if (setlocale (LC_ALL, "$LOCALE_EN_UTF8") != NULL)
{
mbstate_t state;
wchar_t wc;
@@ -404,7 +404,7 @@ AC_DEFUN([gl_MBRTOWC_NULL_ARG2]
AC_DEFUN([gl_MBRTOWC_RETVAL],
[
AC_REQUIRE([AC_PROG_CC])
- AC_REQUIRE([gt_LOCALE_FR_UTF8])
+ AC_REQUIRE([gt_LOCALE_EN_UTF8])
AC_REQUIRE([gt_LOCALE_JA])
AC_REQUIRE([AC_CANONICAL_HOST])
AC_CACHE_CHECK([whether mbrtowc has a correct return value],
@@ -422,7 +422,7 @@ AC_DEFUN([gl_MBRTOWC_RETVAL]
gl_cv_func_mbrtowc_retval="guessing yes" ;;
esac
changequote([,])dnl
- if test $LOCALE_FR_UTF8 != none || test $LOCALE_JA != none \
+ if test $LOCALE_EN_UTF8 != none || test $LOCALE_JA != none \
|| { case "$host_os" in mingw* | windows*) true;; *) false;; esac; };
then
AC_RUN_IFELSE(
[AC_LANG_SOURCE([[
@@ -434,8 +434,8 @@ AC_DEFUN([gl_MBRTOWC_RETVAL]
int result = 0;
int found_some_locale = 0;
/* This fails on Solaris. */
- 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)
{
char input[] = "B\303\274\303\237er"; /* "Büßer" */
mbstate_t state;
@@ -649,8 +649,8 @@ AC_DEFUN([gl_MBRTOWC_STORES_INCOMPLETE]
[:])
;;
*)
- AC_REQUIRE([gt_LOCALE_FR_UTF8])
- if test $LOCALE_FR_UTF8 != none; then
+ AC_REQUIRE([gt_LOCALE_EN_UTF8])
+ if test $LOCALE_EN_UTF8 != none; then
AC_RUN_IFELSE(
[AC_LANG_SOURCE([[
#include <locale.h>
@@ -658,7 +658,7 @@ AC_DEFUN([gl_MBRTOWC_STORES_INCOMPLETE]
#include <wchar.h>
int main ()
{
- if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL)
+ if (setlocale (LC_ALL, "$LOCALE_EN_UTF8") != NULL)
{
wchar_t wc = (wchar_t) 0xBADFACE;
mbstate_t state;
diff --git a/m4/mbsrtowcs.m4 b/m4/mbsrtowcs.m4
index 2001e22b9f..29ab325869 100644
--- a/m4/mbsrtowcs.m4
+++ b/m4/mbsrtowcs.m4
@@ -1,5 +1,5 @@
# mbsrtowcs.m4
-# serial 17
+# serial 18
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,
@@ -51,7 +51,7 @@ AC_DEFUN([gl_MBSRTOWCS_WORKS]
[
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
@@ -70,7 +70,7 @@ AC_DEFUN([gl_MBSRTOWCS_WORKS]
gl_cv_func_mbsrtowcs_works="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>
@@ -95,8 +95,8 @@ AC_DEFUN([gl_MBSRTOWCS_WORKS]
}
/* Test whether the function works when started with a conversion state
in non-initial state. This fails on HP-UX 11.11 and Solaris 10. */
- 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)
{
const char input[] = "B\303\274\303\237er";
mbstate_t state;
diff --git a/m4/stdlib_h.m4 b/m4/stdlib_h.m4
index 332669f946..b546a438b8 100644
--- a/m4/stdlib_h.m4
+++ b/m4/stdlib_h.m4
@@ -1,5 +1,5 @@
# stdlib_h.m4
-# serial 79
+# serial 80
dnl Copyright (C) 2007-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,
@@ -37,7 +37,7 @@ AC_DEFUN_ONCE([gl_STDLIB_H]
dnl On Solaris 10, in UTF-8 locales, its value is 3 but needs to be 4.
dnl Fortunately, we can do this because on this platform MB_LEN_MAX is 5.
AC_REQUIRE([AC_CANONICAL_HOST])
- AC_REQUIRE([gt_LOCALE_FR_UTF8])
+ AC_REQUIRE([gt_LOCALE_EN_UTF8])
AC_CACHE_CHECK([whether MB_CUR_MAX is correct],
[gl_cv_macro_MB_CUR_MAX_good],
[
@@ -45,13 +45,13 @@ AC_DEFUN_ONCE([gl_STDLIB_H]
dnl is present.
changequote(,)dnl
case "$host_os" in
- # Guess no on Solaris.
- solaris*) gl_cv_macro_MB_CUR_MAX_good="guessing no" ;;
- # Guess yes otherwise.
- *) gl_cv_macro_MB_CUR_MAX_good="guessing yes" ;;
+ # Guess no on Solaris and Haiku.
+ solaris* | haiku*) gl_cv_macro_MB_CUR_MAX_good="guessing no" ;;
+ # Guess yes otherwise.
+ *) gl_cv_macro_MB_CUR_MAX_good="guessing yes" ;;
esac
changequote([,])dnl
- if test $LOCALE_FR_UTF8 != none; then
+ if test $LOCALE_EN_UTF8 != none; then
AC_RUN_IFELSE(
[AC_LANG_SOURCE([[
#include <locale.h>
@@ -59,7 +59,7 @@ AC_DEFUN_ONCE([gl_STDLIB_H]
int main ()
{
int result = 0;
- if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL)
+ if (setlocale (LC_ALL, "$LOCALE_EN_UTF8") != NULL)
{
if (MB_CUR_MAX < 4)
result |= 1;
diff --git a/m4/wcrtomb.m4 b/m4/wcrtomb.m4
index 35dff6f037..5d8388c344 100644
--- a/m4/wcrtomb.m4
+++ b/m4/wcrtomb.m4
@@ -1,5 +1,5 @@
# wcrtomb.m4
-# serial 19
+# serial 20
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,
@@ -36,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
@@ -90,7 +90,7 @@ AC_DEFUN([gl_FUNC_WCRTOMB]
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>
@@ -106,8 +106,8 @@ AC_DEFUN([gl_FUNC_WCRTOMB]
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;
diff --git a/modules/btowc b/modules/btowc
index 99957c83b0..cbcbddb792 100644
--- a/modules/btowc
+++ b/modules/btowc
@@ -5,6 +5,7 @@ Files:
lib/btowc.c
m4/btowc.m4
m4/mbrtowc.m4
+m4/locale-en.m4
m4/locale-fr.m4
m4/codeset.m4
diff --git a/modules/c32isalnum b/modules/c32isalnum
index 4626d15373..8b82528b00 100644
--- a/modules/c32isalnum
+++ b/modules/c32isalnum
@@ -7,6 +7,7 @@ lib/c32is-impl.h
m4/mbrtoc32.m4
m4/c32rtomb.m4
m4/mbrtowc.m4
+m4/locale-en.m4
m4/locale-fr.m4
m4/locale-ja.m4
m4/locale-zh.m4
diff --git a/modules/c32isalpha b/modules/c32isalpha
index 8d2a33ebce..c1470238b8 100644
--- a/modules/c32isalpha
+++ b/modules/c32isalpha
@@ -7,6 +7,7 @@ lib/c32is-impl.h
m4/mbrtoc32.m4
m4/c32rtomb.m4
m4/mbrtowc.m4
+m4/locale-en.m4
m4/locale-fr.m4
m4/locale-ja.m4
m4/locale-zh.m4
diff --git a/modules/c32isblank b/modules/c32isblank
index 08d9038790..f231f95600 100644
--- a/modules/c32isblank
+++ b/modules/c32isblank
@@ -7,6 +7,7 @@ lib/c32is-impl.h
m4/mbrtoc32.m4
m4/c32rtomb.m4
m4/mbrtowc.m4
+m4/locale-en.m4
m4/locale-fr.m4
m4/locale-ja.m4
m4/locale-zh.m4
diff --git a/modules/c32iscntrl b/modules/c32iscntrl
index b1a56eba04..cc4c80cb08 100644
--- a/modules/c32iscntrl
+++ b/modules/c32iscntrl
@@ -7,6 +7,7 @@ lib/c32is-impl.h
m4/mbrtoc32.m4
m4/c32rtomb.m4
m4/mbrtowc.m4
+m4/locale-en.m4
m4/locale-fr.m4
m4/locale-ja.m4
m4/locale-zh.m4
diff --git a/modules/c32isdigit b/modules/c32isdigit
index 9f295b3ad1..986bf79e28 100644
--- a/modules/c32isdigit
+++ b/modules/c32isdigit
@@ -7,6 +7,7 @@ lib/c32is-impl.h
m4/mbrtoc32.m4
m4/c32rtomb.m4
m4/mbrtowc.m4
+m4/locale-en.m4
m4/locale-fr.m4
m4/locale-ja.m4
m4/locale-zh.m4
diff --git a/modules/c32isgraph b/modules/c32isgraph
index b5a02b0405..a6519a6208 100644
--- a/modules/c32isgraph
+++ b/modules/c32isgraph
@@ -7,6 +7,7 @@ lib/c32is-impl.h
m4/mbrtoc32.m4
m4/c32rtomb.m4
m4/mbrtowc.m4
+m4/locale-en.m4
m4/locale-fr.m4
m4/locale-ja.m4
m4/locale-zh.m4
diff --git a/modules/c32islower b/modules/c32islower
index 77f17a861f..378ac90a2b 100644
--- a/modules/c32islower
+++ b/modules/c32islower
@@ -7,6 +7,7 @@ lib/c32is-impl.h
m4/mbrtoc32.m4
m4/c32rtomb.m4
m4/mbrtowc.m4
+m4/locale-en.m4
m4/locale-fr.m4
m4/locale-ja.m4
m4/locale-zh.m4
diff --git a/modules/c32isprint b/modules/c32isprint
index 10f74e6887..5d6d4703d0 100644
--- a/modules/c32isprint
+++ b/modules/c32isprint
@@ -7,6 +7,7 @@ lib/c32is-impl.h
m4/mbrtoc32.m4
m4/c32rtomb.m4
m4/mbrtowc.m4
+m4/locale-en.m4
m4/locale-fr.m4
m4/locale-ja.m4
m4/locale-zh.m4
diff --git a/modules/c32ispunct b/modules/c32ispunct
index 7a8af0e392..39c1286a78 100644
--- a/modules/c32ispunct
+++ b/modules/c32ispunct
@@ -8,6 +8,7 @@ lib/c32is-impl.h
m4/mbrtoc32.m4
m4/c32rtomb.m4
m4/mbrtowc.m4
+m4/locale-en.m4
m4/locale-fr.m4
m4/locale-ja.m4
m4/locale-zh.m4
diff --git a/modules/c32isspace b/modules/c32isspace
index 28befaacc5..a2dd36876d 100644
--- a/modules/c32isspace
+++ b/modules/c32isspace
@@ -7,6 +7,7 @@ lib/c32is-impl.h
m4/mbrtoc32.m4
m4/c32rtomb.m4
m4/mbrtowc.m4
+m4/locale-en.m4
m4/locale-fr.m4
m4/locale-ja.m4
m4/locale-zh.m4
diff --git a/modules/c32isupper b/modules/c32isupper
index 75cd04327f..2e5972d137 100644
--- a/modules/c32isupper
+++ b/modules/c32isupper
@@ -7,6 +7,7 @@ lib/c32is-impl.h
m4/mbrtoc32.m4
m4/c32rtomb.m4
m4/mbrtowc.m4
+m4/locale-en.m4
m4/locale-fr.m4
m4/locale-ja.m4
m4/locale-zh.m4
diff --git a/modules/c32isxdigit b/modules/c32isxdigit
index 9447744bb7..a1c498fe3b 100644
--- a/modules/c32isxdigit
+++ b/modules/c32isxdigit
@@ -8,6 +8,7 @@ lib/c32is-impl.h
m4/mbrtoc32.m4
m4/c32rtomb.m4
m4/mbrtowc.m4
+m4/locale-en.m4
m4/locale-fr.m4
m4/locale-ja.m4
m4/locale-zh.m4
diff --git a/modules/c32rtomb b/modules/c32rtomb
index 1662333e8d..8331aa178a 100644
--- a/modules/c32rtomb
+++ b/modules/c32rtomb
@@ -5,6 +5,7 @@ Files:
lib/c32rtomb.c
m4/c32rtomb.m4
m4/mbrtoc32.m4
+m4/locale-en.m4
m4/locale-fr.m4
m4/locale-zh.m4
m4/codeset.m4
diff --git a/modules/c32tob b/modules/c32tob
index 9e8c0a2869..6637b82492 100644
--- a/modules/c32tob
+++ b/modules/c32tob
@@ -5,6 +5,7 @@ Files:
lib/c32tob.c
m4/mbrtoc32.m4
m4/c32rtomb.m4
+m4/locale-en.m4
m4/locale-fr.m4
m4/locale-zh.m4
m4/codeset.m4
diff --git a/modules/c32tolower b/modules/c32tolower
index e4140f34a8..eb139aa16f 100644
--- a/modules/c32tolower
+++ b/modules/c32tolower
@@ -7,6 +7,7 @@ lib/c32to-impl.h
m4/mbrtoc32.m4
m4/c32rtomb.m4
m4/mbrtowc.m4
+m4/locale-en.m4
m4/locale-fr.m4
m4/locale-ja.m4
m4/locale-zh.m4
diff --git a/modules/c32toupper b/modules/c32toupper
index 16c7a0c7ae..9f7c3c516b 100644
--- a/modules/c32toupper
+++ b/modules/c32toupper
@@ -7,6 +7,7 @@ lib/c32to-impl.h
m4/mbrtoc32.m4
m4/c32rtomb.m4
m4/mbrtowc.m4
+m4/locale-en.m4
m4/locale-fr.m4
m4/locale-ja.m4
m4/locale-zh.m4
diff --git a/modules/c32width b/modules/c32width
index 1db9002bb4..d2e262abab 100644
--- a/modules/c32width
+++ b/modules/c32width
@@ -7,6 +7,7 @@ lib/c32width.c
m4/mbrtoc32.m4
m4/c32rtomb.m4
m4/mbrtowc.m4
+m4/locale-en.m4
m4/locale-fr.m4
m4/locale-ja.m4
m4/locale-zh.m4
diff --git a/modules/mbrlen b/modules/mbrlen
index 517139f7e5..974de786e8 100644
--- a/modules/mbrlen
+++ b/modules/mbrlen
@@ -5,7 +5,7 @@ Files:
lib/mbrlen.c
m4/mbrlen.m4
m4/mbstate_t.m4
-m4/locale-fr.m4
+m4/locale-en.m4
m4/locale-ja.m4
m4/locale-zh.m4
m4/codeset.m4
diff --git a/modules/mbrtoc16 b/modules/mbrtoc16
index 8f4599fba8..19cc559fb6 100644
--- a/modules/mbrtoc16
+++ b/modules/mbrtoc16
@@ -4,6 +4,7 @@ mbrtoc16() function: convert multibyte character and return
next 16-bit wide cha
Files:
lib/mbrtoc16.c
m4/mbrtoc16.m4
+m4/locale-en.m4
m4/locale-fr.m4
m4/locale-zh.m4
m4/codeset.m4
diff --git a/modules/mbrtoc32 b/modules/mbrtoc32
index 463756d08b..75c2b6fe45 100644
--- a/modules/mbrtoc32
+++ b/modules/mbrtoc32
@@ -12,6 +12,7 @@ lib/mbtowc-lock.c
lib/windows-initguard.h
m4/mbrtoc32.m4
m4/c32rtomb.m4
+m4/locale-en.m4
m4/locale-fr.m4
m4/locale-zh.m4
m4/codeset.m4
diff --git a/modules/mbrtowc b/modules/mbrtowc
index 4fbffab1de..64885a922c 100644
--- a/modules/mbrtowc
+++ b/modules/mbrtowc
@@ -12,7 +12,7 @@ lib/mbtowc-lock.c
lib/windows-initguard.h
m4/mbrtowc.m4
m4/mbstate_t.m4
-m4/locale-fr.m4
+m4/locale-en.m4
m4/locale-ja.m4
m4/locale-zh.m4
m4/codeset.m4
diff --git a/modules/mbsnrtowcs b/modules/mbsnrtowcs
index 59a205d465..c7b8532440 100644
--- a/modules/mbsnrtowcs
+++ b/modules/mbsnrtowcs
@@ -8,6 +8,7 @@ lib/mbsrtowcs-state.c
m4/mbsnrtowcs.m4
m4/mbstate_t.m4
m4/mbrtowc.m4
+m4/locale-en.m4
m4/locale-fr.m4
m4/codeset.m4
diff --git a/modules/mbsrtowcs b/modules/mbsrtowcs
index 70e7d0c36f..9fc971dc19 100644
--- a/modules/mbsrtowcs
+++ b/modules/mbsrtowcs
@@ -8,6 +8,7 @@ lib/mbsrtowcs-state.c
m4/mbsrtowcs.m4
m4/mbstate_t.m4
m4/mbrtowc.m4
+m4/locale-en.m4
m4/locale-fr.m4
m4/locale-ja.m4
m4/locale-zh.m4
diff --git a/modules/stdlib b/modules/stdlib
index 009dec8ee6..9646c3b336 100644
--- a/modules/stdlib
+++ b/modules/stdlib
@@ -4,7 +4,7 @@ A GNU-like <stdlib.h>.
Files:
lib/stdlib.in.h
m4/stdlib_h.m4
-m4/locale-fr.m4
+m4/locale-en.m4
m4/codeset.m4
Depends-on:
diff --git a/modules/wcrtomb b/modules/wcrtomb
index b287614318..de87c7ec92 100644
--- a/modules/wcrtomb
+++ b/modules/wcrtomb
@@ -6,6 +6,7 @@ lib/wcrtomb.c
m4/wcrtomb.m4
m4/mbrtowc.m4
m4/mbstate_t.m4
+m4/locale-en.m4
m4/locale-fr.m4
m4/locale-ja.m4
m4/locale-zh.m4
diff --git a/modules/wcsnrtombs b/modules/wcsnrtombs
index 4e344a1952..f29aa37c0e 100644
--- a/modules/wcsnrtombs
+++ b/modules/wcsnrtombs
@@ -8,6 +8,7 @@ lib/wcsrtombs-state.c
m4/wcsnrtombs.m4
m4/mbrtowc.m4
m4/mbstate_t.m4
+m4/locale-en.m4
m4/locale-fr.m4
m4/locale-ja.m4
m4/locale-zh.m4
diff --git a/modules/wcsrtombs b/modules/wcsrtombs
index 127be1df77..b478f86b6a 100644
--- a/modules/wcsrtombs
+++ b/modules/wcsrtombs
@@ -8,6 +8,7 @@ lib/wcsrtombs-state.c
m4/wcsrtombs.m4
m4/mbrtowc.m4
m4/mbstate_t.m4
+m4/locale-en.m4
m4/locale-fr.m4
m4/locale-ja.m4
m4/locale-zh.m4
diff --git a/modules/wctob b/modules/wctob
index b2b96965db..20abcb5c4b 100644
--- a/modules/wctob
+++ b/modules/wctob
@@ -4,6 +4,7 @@ wctob() function: convert wide character to unibyte character.
Files:
lib/wctob.c
m4/wctob.m4
+m4/locale-en.m4
m4/locale-fr.m4
m4/codeset.m4
