From 42759d62ece59ed0087a7254c2f486140fea5692 Mon Sep 17 00:00:00 2001
From: Nick Bowler <nbowler@draconx.ca>
Date: Mon, 29 May 2023 22:10:54 -0400
Subject: [PATCH] Restore gperf-related definitions to makefile.

Previously, gnulib was providing definitions for GPERF and other
variables in the makefile indirectly via the striconv module.  But
since we removed that module, the definitions disappeared, leading
to build failures after maintainer-clean.

Easy enough to just do the same thing explicitly.  In the future
we might want to use configure to locate gperf but for now this
will do.
---
 Makefile.am        | 5 +++++
 m4/gnulib-cache.m4 | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index b8749b4..cfb2427 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -296,6 +296,11 @@ endif
 		$(MAKE) $(AM_MAKEFLAGS) $<; \
 	fi
 
+GPERF     = gperf
+V_GPERF   = $(V_GPERF_@AM_V@)
+V_GPERF_  = $(V_GPERF_@AM_DEFAULT_V@)
+V_GPERF_0 = @printf '  %$(DX_ALIGN_V)s %s\n' 'GPERF   ' $@;
+
 GPERFFILES = src/execute.gperf
 .gperf.c:
 	$(V_GPERF) $(GPERF) $< >$@.tmp
diff --git a/m4/gnulib-cache.m4 b/m4/gnulib-cache.m4
index 3c2bb31..b01b510 100644
--- a/m4/gnulib-cache.m4
+++ b/m4/gnulib-cache.m4
@@ -39,6 +39,7 @@
 #  --libtool \
 #  --macro-prefix=gl \
 #  --no-vc-files \
+#  --avoid=gperf \
 #  --avoid=std-gnu11 \
 #  getline \
 #  getopt-gnu \
@@ -67,7 +68,7 @@ gl_MODULES([
   snprintf
   tls
 ])
-gl_AVOID([std-gnu11])
+gl_AVOID([gperf std-gnu11])
 gl_SOURCE_BASE([lib])
 gl_M4_BASE([m4])
 gl_PO_BASE([])
-- 
2.43.2