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.

diff --git a/Makefile.am b/Makefile.am
index b8749b45f3f6b3f2d8d6e667e176d4a2e4dc31f1..cfb242710ec95109b42c5cd7bd48885a5db10efb 100644 (file)
--- 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 3c2bb31fe27f0a82c72b2d0786ff7a84b84b2767..b01b510061691931204921c373324f84ca5fdca2 100644 (file)
--- 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([])