Restore gperf-related definitions to makefile.

[cdecl99.git] / m4 / gnulib-cache.m4

diff --git a/m4/gnulib-cache.m4 b/m4/gnulib-cache.m4
index 7e15afe89b99c22997881c32e25e2e3243a683cb..b01b510061691931204921c373324f84ca5fdca2 100644 (file)
--- a/m4/gnulib-cache.m4
+++ b/m4/gnulib-cache.m4
@@ -39,8 +39,8 @@
 #  --libtool \
 #  --macro-prefix=gl \
 #  --no-vc-files \
+#  --avoid=gperf \
 #  --avoid=std-gnu11 \
-#  flexmember \
 #  getline \
 #  getopt-gnu \
 #  gettext-h \
@@ -51,13 +51,11 @@
 #  mbswidth \
 #  readline \
 #  snprintf \
-#  striconv \
 #  tls
 
 # Specification in the form of a few gnulib-tool.m4 macro invocations:
 gl_LOCAL_DIR([])
 gl_MODULES([
-  flexmember
   getline
   getopt-gnu
   gettext-h
@@ -68,10 +66,9 @@ gl_MODULES([
   mbswidth
   readline
   snprintf
-  striconv
   tls
 ])
-gl_AVOID([std-gnu11])
+gl_AVOID([gperf std-gnu11])
 gl_SOURCE_BASE([lib])
 gl_M4_BASE([m4])
 gl_PO_BASE([])