summaryrefslogtreecommitdiff
path: root/admin
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2024-02-14 21:18:25 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2024-02-14 22:04:58 -0800
commit7c32f3bcd6d390510d9463b3100255cecab41e1c (patch)
tree71c92c988055d3f072050e31267d167245566e22 /admin
parentfbef8ff2a4106ff7f0f3d026071fb8096280cc61 (diff)
downloademacs-7c32f3bcd6d390510d9463b3100255cecab41e1c.tar.gz
Adjust to recent Gnulib nstrftime changes
* admin/merge-gnulib (AVOIDED_MODULES): Add localename. * configure.ac (REQUIRE_GNUISH_STRFTIME_AM_PM): Define.
Diffstat (limited to 'admin')
-rwxr-xr-xadmin/merge-gnulib2
1 files changed, 1 insertions, 1 deletions
diff --git a/admin/merge-gnulib b/admin/merge-gnulib
index 5246fb14e1e..35966852e27 100755
--- a/admin/merge-gnulib
+++ b/admin/merge-gnulib
@@ -53,7 +53,7 @@ GNULIB_MODULES='
AVOIDED_MODULES='
access btowc chmod close crypto/af_alg dup fchdir fstat
- iswblank iswctype iswdigit iswxdigit langinfo lock
+ iswblank iswctype iswdigit iswxdigit langinfo localename lock
mbrtowc mbsinit memchr mkdir msvc-inval msvc-nothrow nl_langinfo
openat-die opendir pthread-h raise
save-cwd select setenv sigprocmask stat stdarg