From f999640373ee13e94487b2322e804260d06c81b6 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@debian.org>
Date: Sun, 2 Jan 2022 00:08:04 +0000
Subject: Trim down direct Gnulib dependencies a little

* bootstrap.conf (gnulib_modules): Add c99 (already used indirectly, but
seems like a good idea to request directly now).  Remove getopt-gnu,
lock, and unsetenv, none of which we use directly.  Replace fcntl with
fcntl-h and signal with signal-h, since we use the corresponding header
files directly but not the corresponding functions.
* .gitignore: Remove lib/getopt.h.
---
 bootstrap.conf | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'bootstrap.conf')

diff --git a/bootstrap.conf b/bootstrap.conf
index aa98dc55..9a2c7201 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -23,18 +23,18 @@ gnulib_modules="
   argp
   array-list
   attribute
+  c99
   canonicalize
   closedir
   dirent
   dirname
   error
-  fcntl
+  fcntl-h
   flock
   fnmatch-gnu
   fstat
   futimens
   getline
-  getopt-gnu
   gettext-h
   gitlog-to-changelog
   glob
@@ -49,7 +49,6 @@ gnulib_modules="
   lib-ignore
   linkedhash-list
   localcharset
-  lock
   manywarnings
   memmem
   minmax
@@ -66,7 +65,7 @@ gnulib_modules="
   renameat
   setenv
   sigaction
-  signal
+  signal-h
   sigprocmask
   stat-time
   stdbool
@@ -77,7 +76,6 @@ gnulib_modules="
   tempname
   timespec
   unlinkat
-  unsetenv
   utimens
   warnings
   xalloc
-- 
cgit v1.2.3