From 21fe014265b2b5a46fd880b8b05ca0a431dc6122 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sat, 4 May 2024 09:55:27 -0700 Subject: [PATCH] Adjust to recent Gnulib changes MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit * 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) --- admin/merge-gnulib | 1 + configure.ac | 4 ++++ 2 files changed, 5 insertions(+) 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 \ diff --git a/configure.ac b/configure.ac index 7119d184db4..8821d3b3330 100644 --- 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. -- 2.39.5