From 36e656390d25a094209032c9588bcf3df6736c94 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 30 Dec 2024 11:51:25 -0800
Subject: [PATCH] maint: adjust to Gnulib module renaming
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

* bootstrap.conf, gl/modules/buffer-lcm, gl/modules/randperm:
* gl/modules/randread, gl/modules/strnumcmp, gl/modules/targetdir:
* gl/modules/xdectoint, gl/modules/xfts:
Adjust to recent renaming of Gnulib modules, e.g., stdbool → bool,
inttypes → inttypes-h.
---
 bootstrap.conf        | 18 +++++++++---------
 gl/modules/buffer-lcm |  2 +-
 gl/modules/randperm   |  2 +-
 gl/modules/randread   |  4 ++--
 gl/modules/strnumcmp  |  2 +-
 gl/modules/targetdir  |  2 +-
 gl/modules/xdectoint  |  4 ++--
 gl/modules/xfts       |  2 +-
 8 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/bootstrap.conf b/bootstrap.conf
index e10c1ac541..ec38e36d2d 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -46,6 +46,7 @@ gnulib_modules="
   backupfile
   base32
   base64
+  bool
   btoc32
   buffer-lcm
   c-strcase
@@ -146,7 +147,7 @@ gnulib_modules="
   idx
   ignore-value
   inttostr
-  inttypes
+  inttypes-h
   isapipe
   isatty
   isblank
@@ -247,10 +248,9 @@ gnulib_modules="
   stat-macros
   stat-size
   stat-time
-  stdbool
   stdc_leading_zeros
   stdc_trailing_zeros
-  stdckdint
+  stdckdint-h
   stdlib-safer
   stpcpy
   strdup-posix
@@ -260,14 +260,14 @@ gnulib_modules="
   strtoimax
   strtoumax
   symlinkat
-  sys_ioctl
-  sys_resource
-  sys_stat
-  sys_types
-  sys_wait
+  sys_ioctl-h
+  sys_resource-h
+  sys_stat-h
+  sys_types-h
+  sys_wait-h
   targetdir
   tempname
-  termios
+  termios-h
   time_rz
   timer-time
   timespec
diff --git a/gl/modules/buffer-lcm b/gl/modules/buffer-lcm
index 1d86f715e8..4479ab0f1b 100644
--- a/gl/modules/buffer-lcm
+++ b/gl/modules/buffer-lcm
@@ -6,7 +6,7 @@ lib/buffer-lcm.c
 lib/buffer-lcm.h
 
 Depends-on:
-stddef
+stddef-h
 
 configure.ac:
 
diff --git a/gl/modules/randperm b/gl/modules/randperm
index ae54bf7ab6..98cbf06b83 100644
--- a/gl/modules/randperm
+++ b/gl/modules/randperm
@@ -9,7 +9,7 @@ Depends-on:
 assert-h
 randint
 stdc_bit_width
-stdint
+stdint-h
 xalloc
 hash
 
diff --git a/gl/modules/randread b/gl/modules/randread
index c5fe8207c2..7a877597a4 100644
--- a/gl/modules/randread
+++ b/gl/modules/randread
@@ -9,6 +9,7 @@ lib/randread.h
 
 Depends-on:
 alignasof
+bool
 error
 exitfail
 inline
@@ -16,8 +17,7 @@ fopen-safer
 getrandom
 quote
 minmax
-stdbool
-stdint
+stdint-h
 unlocked-io
 xalloc
 
diff --git a/gl/modules/strnumcmp b/gl/modules/strnumcmp
index f36da19d0a..4d9c9c9250 100644
--- a/gl/modules/strnumcmp
+++ b/gl/modules/strnumcmp
@@ -10,7 +10,7 @@ lib/strnumcmp-in.h
 Depends-on:
 c-ctype
 inline
-stddef
+stddef-h
 
 configure.ac:
 
diff --git a/gl/modules/targetdir b/gl/modules/targetdir
index 25ccfb8998..1a6f097a8d 100644
--- a/gl/modules/targetdir
+++ b/gl/modules/targetdir
@@ -7,8 +7,8 @@ lib/targetdir.h
 
 Depends-on:
 attribute
+bool
 fcntl-h
-stdbool
 
 configure.ac:
 
diff --git a/gl/modules/xdectoint b/gl/modules/xdectoint
index 90a278c0be..9f8d8d65a8 100644
--- a/gl/modules/xdectoint
+++ b/gl/modules/xdectoint
@@ -8,10 +8,10 @@ lib/xdectoimax.c
 lib/xdectoumax.c
 
 Depends-on:
+bool
 error
-errno
+errno-h
 quote
-stdbool
 verify
 xstrtoimax
 xstrtoumax
diff --git a/gl/modules/xfts b/gl/modules/xfts
index 335946e2f5..5ead98a386 100644
--- a/gl/modules/xfts
+++ b/gl/modules/xfts
@@ -6,7 +6,7 @@ lib/xfts.c
 lib/xfts.h
 
 Depends-on:
-stddef
+stddef-h
 
 configure.ac:
 
-- 
2.47.3