Adjust to recent Gnulib nstrftime changes

* admin/merge-gnulib (AVOIDED_MODULES): Add localename.
* configure.ac (REQUIRE_GNUISH_STRFTIME_AM_PM): Define.

(cherry picked from commit 7c32f3bcd6d390510d9463b3100255cecab41e1c)

diff --git a/admin/merge-gnulib b/admin/merge-gnulib
index 5246fb14e1e25e10abd77af5586ebd284a547fc4..35966852e27a2ea856436513f47c5c519893e73e 100755 (executable)
--- 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

diff --git a/configure.ac b/configure.ac
index b9bcb9a4648ab44f18722ff6f433e0e8f8f3e6ca..81f47146bc5494b0e02192630511e42034e5b9d7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1566,6 +1566,8 @@ AC_DEFUN([gt_TYPE_WINT_T],
 AC_DEFUN_ONCE([gl_STDLIB_H],
   [AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
    gl_NEXT_HEADERS([stdlib.h])])
+AC_DEFINE([REQUIRE_GNUISH_STRFTIME_AM_PM], [false],
+  [Emacs does not need glibc strftime behavior for AM and PM indicators.])
 
 # Initialize gnulib right after choosing the compiler.
 dnl Amongst other things, this sets AR and ARFLAGS.