emacs-28 984eafe: Unbreak the build after Gnulib update

[Eli Zaretskii]

branch: emacs-28
commit 984eafeb9890d8a6e4fa401d38f5e6de9d720f2b
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>

    Unbreak the build after Gnulib update
    
    * lib/gnulib.mk.in (GNULIBHEADERS_OVERRIDE_WINT_T): Rename from
    GNULIB_OVERRIDES_WINT_T.
    * configure.ac (GNULIBHEADERS_OVERRIDE_WINT_T): Define.
    (Bug#50985)
---
 configure.ac     | 3 +++
 lib/gnulib.mk.in | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 92b2225..62bf25e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -877,6 +877,9 @@ ac_func_list=$funcs
 AC_DEFUN([gt_TYPE_WINT_T],
   [GNULIB_OVERRIDES_WINT_T=0
    AC_SUBST([GNULIB_OVERRIDES_WINT_T])])
+AC_DEFUN([gt_TYPE_WINT_T],
+  [GNULIBHEADERS_OVERRIDE_WINT_T=0
+   AC_SUBST([GNULIBHEADERS_OVERRIDE_WINT_T])])
 
 # Initialize gnulib right after choosing the compiler.
 dnl Amongst other things, this sets AR and ARFLAGS.
diff --git a/lib/gnulib.mk.in b/lib/gnulib.mk.in
index 584c714..bac27f3 100644
--- a/lib/gnulib.mk.in
+++ b/lib/gnulib.mk.in
@@ -545,7 +545,7 @@ GL_GNULIB__EXIT = @GL_GNULIB__EXIT@
 GMALLOC_OBJ = @GMALLOC_OBJ@
 GMP_H = @GMP_H@
 GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@
-GNULIB_OVERRIDES_WINT_T = @GNULIB_OVERRIDES_WINT_T@
+GNULIBHEADERS_OVERRIDE_WINT_T = @GNULIBHEADERS_OVERRIDE_WINT_T@
 GNULIB_WARN_CFLAGS = @GNULIB_WARN_CFLAGS@
 GNUSTEP_CFLAGS = @GNUSTEP_CFLAGS@
 GNU_OBJC_CFLAGS = @GNU_OBJC_CFLAGS@