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.

(cherry picked from commit 2e13c2adbad4fc609f560926f6e536b25281f925)

diff --git a/admin/merge-gnulib b/admin/merge-gnulib
index 41531d573b056d0319503bedd99dfa9df5f9c2ef..c4daaded0156ee7b74f5fcfe11cd74203ae971c7 100755 (executable)
--- 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 \

diff --git a/configure.ac b/configure.ac
index 7119d184db4f05d60b31e0f60cab40896724fe77..8821d3b3330274355946bbcc248e1fdac286c177 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1584,6 +1584,10 @@ AC_DEFUN([gt_TYPE_WINT_T],
 AC_DEFUN_ONCE([gl_STDLIB_H],
   [AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
    gl_NEXT_HEADERS([stdlib.h])])
+# Emacs does not need to check for off64_t.
+AC_DEFUN([gl_TYPE_OFF64_T],
+  [HAVE_OFF64_T=1
+   AC_SUBST([HAVE_OFF64_T])])
 
 # Initialize gnulib right after choosing the compiler.
 dnl Amongst other things, this sets AR and ARFLAGS.