From db5ff0eb0a8ebfa040b07b80b3aebb8d335ea3f9 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@fb.com>
Date: Sun, 29 Dec 2019 12:08:08 -0800
Subject: [PATCH] maint: avoid gnulib-tool deprecation warnings, and build
 failure

* bootstrap.conf (gnulib_modules): Use getopt-gnu, rather than
obsolete "getopt" module. Use nstrftime in place of strftime.
(avoided_gnulib_modules): Do not avoid the "lock" module. That
would lead to a build failure due to "glthread/lock.h not found".
---
 bootstrap.conf | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/bootstrap.conf b/bootstrap.conf
index e33d967..1b27c23 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -17,7 +17,6 @@
 
 avoided_gnulib_modules='
   --avoid=localename
-  --avoid=lock
   --avoid=lock-tests
   --avoid=setlocale
 '
@@ -42,7 +41,7 @@ fdl
 file-type
 filenamecat
 fnmatch-gnu
-getopt
+getopt-gnu
 gettext-h
 gettime
 git-version-gen
@@ -62,6 +61,7 @@ manywarnings
 mbrtowc
 mkstemp
 mktime
+nstrftime
 progname
 propername
 rawmemchr
@@ -74,7 +74,6 @@ stat-macros
 stat-time
 stdint
 strcase
-strftime
 strptime
 strtoimax
 sys_wait