master 7c32f3bcd6d 1/2: Adjust to recent Gnulib nstrftime changes

[Paul Eggert]

branch: master
commit 7c32f3bcd6d390510d9463b3100255cecab41e1c
Author: Paul Eggert <eggert@cs.ucla.edu>
Commit: Paul Eggert <eggert@cs.ucla.edu>

    Adjust to recent Gnulib nstrftime changes
    
    * admin/merge-gnulib (AVOIDED_MODULES): Add localename.
    * configure.ac (REQUIRE_GNUISH_STRFTIME_AM_PM): Define.
---
 admin/merge-gnulib | 2 +-
 configure.ac       | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

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
diff --git a/configure.ac b/configure.ac
index 847fdbd54d2..c162f880e48 100644
--- 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.