Adjust to recent Gnulib changes

* admin/merge-gnulib: Also remove the new Gnulib file
m4/off64_t.m4, as Emacs doesn’t need off64_t.
* configure.ac (gl_TYPE_OFF64_T): Define a nearly no-op.

1 files changed, 1 insertions, 0 deletions

diff --git a/admin/merge-gnulib b/admin/merge-gnulib
index 41531d573b0..c4daaded015 100755
--- a/admin/merge-gnulib
+++ b/admin/merge-gnulib
@@ -126,6 +126,7 @@ rm -- "$src"lib/gl_openssl.h \
       "$src"m4/gnulib-cache.m4 "$src"m4/gnulib-tool.m4 \
       "$src"m4/locale-fr.m4 \
       "$src"m4/manywarnings-c++.m4 \
+      "$src"m4/off64_t.m4 \
       "$src"m4/warn-on-use.m4 "$src"m4/wint_t.m4 &&
 cp -- "$gnulib_srcdir"/build-aux/texinfo.tex "$src"doc/misc &&
 cp -- "$gnulib_srcdir"/build-aux/config.guess \