Don’t use Gnulib’s locale-h module

* admin/merge-gnulib (AVOIDED_MODULES):
Add locale-h, as Emacs should’t need this Gnulib module.
This change is needed for when we next run admin/merge-gnulib,
as some Gnulib dependencies changed recently.

(cherry picked from commit 30335bb73483fce9d4204f1e18618fe777d0f45e)

diff --git a/admin/merge-gnulib b/admin/merge-gnulib
index ae433961df34a49323f26c08e70d0a38d0f24c95..54dcf275d55a529a53925cf567809301e1d1b6ae 100755 (executable)
--- a/admin/merge-gnulib
+++ b/admin/merge-gnulib
@@ -58,7 +58,7 @@ GNULIB_MODULES='
 AVOIDED_MODULES='
   access btowc chmod close crypto/af_alg dup fchdir fstat gnulib-i18n
   iswblank iswctype iswdigit iswxdigit langinfo-h libgmp-mpq
-  localename-unsafe-limited lock
+  locale-h localename-unsafe-limited lock
   mbrtowc mbsinit memchr mkdir msvc-inval msvc-nothrow nl_langinfo
   openat-die opendir pthread-h raise
   save-cwd select setenv sigprocmask stat stdarg-h