>From 2e2597af089f5848f224964c7000dea44d8b0107 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 16 Apr 2023 01:24:34 +0200 Subject: [PATCH] AC_SYS_YEAR2038_REQUIRED: Fix configure failure with MSVC. * lib/autoconf/specific.m4 (_AC_SYS_LARGEFILE_PROBE): Require AC_CANONICAL_HOST. Distinguish the results "support not detected" and "supported through gnulib". If the result is "supported through gnulib", don't fail. --- lib/autoconf/specific.m4 | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/lib/autoconf/specific.m4 b/lib/autoconf/specific.m4 index 3bf1a0ed..e74d2296 100644 --- a/lib/autoconf/specific.m4 +++ b/lib/autoconf/specific.m4 @@ -310,7 +310,8 @@ m4_define([_AC_SYS_LARGEFILE_OPTIONS], m4_normalize( # If you change this macro you may also need to change # _AC_SYS_LARGEFILE_OPTIONS. AC_DEFUN([_AC_SYS_LARGEFILE_PROBE], -[AC_CACHE_CHECK([for $CC option to enable large file support], +[AC_REQUIRE([AC_CANONICAL_HOST]) +AC_CACHE_CHECK([for $CC option to enable large file support], [ac_cv_sys_largefile_opts], [ac_save_CC="$CC" ac_opt_found=no @@ -323,11 +324,23 @@ AC_DEFUN([_AC_SYS_LARGEFILE_PROBE], test $ac_opt_found = no || break done CC="$ac_save_CC" + dnl Gnulib implements large file support for native Windows, based on the + dnl variables WINDOWS_64_BIT_OFF_T, WINDOWS_64_BIT_ST_SIZE. + m4_ifdef([gl_LARGEFILE], [ + if test $ac_opt_found != yes; then + AS_CASE([$host_os], + [mingw*], + [ac_cv_sys_largefile_opts="supported through gnulib" + ac_opt_found=yes] + ) + fi + ]) test $ac_opt_found = yes || ac_cv_sys_largefile_opts="support not detected"]) ac_have_largefile=yes AS_CASE([$ac_cv_sys_largefile_opts], ["none needed"], [], + ["supported through gnulib"], [], ["support not detected"], [ac_have_largefile=no AS_IF([test $ac_largefile_required,$ac_year2038_required != no,no], -- 2.34.1