summaryrefslogtreecommitdiff
path: root/admin/merge-gnulib
diff options
context:
space:
mode:
Diffstat (limited to 'admin/merge-gnulib')
-rwxr-xr-xadmin/merge-gnulib7
1 files changed, 2 insertions, 5 deletions
diff --git a/admin/merge-gnulib b/admin/merge-gnulib
index 6378a5f9a22..41531d573b0 100755
--- a/admin/merge-gnulib
+++ b/admin/merge-gnulib
@@ -52,8 +52,8 @@ GNULIB_MODULES='
'
AVOIDED_MODULES='
- btowc chmod close crypto/af_alg dup fchdir fstat
- iswblank iswctype iswdigit iswxdigit langinfo lock
+ access btowc chmod close crypto/af_alg dup fchdir fstat
+ iswblank iswctype iswdigit iswxdigit langinfo 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
@@ -107,9 +107,6 @@ test -x "$gnulib_srcdir"/gnulib-tool || {
# gnulib-tool has problems with a bare checkout (Bug#32452#65).
test -f configure || ./autogen.sh || exit
-# Old caches can confuse autoconf when some Gnulib-related changes take effect.
-rm -fr autom4te.cache || exit
-
avoided_flags=
for module in $AVOIDED_MODULES; do
avoided_flags="$avoided_flags --avoid=$module"